Merge pull request #443 from go-vgo/bitmap-pr

Refactor the Alert() code and remove some code

Author: vcaesar

base/snprintf.h

@@ -9,6 +9,14 @@
 
 /* Some generic, cross-platform types. */
 
+#ifdef RobotGo_64
+	typedef int64_t			intptr;	
+	typedef uint64_t		uintptr;	
+#else
+	typedef int32_t			 intptr;
+	typedef uint32_t		 uintptr;	// Unsigned pointer integer
+#endif
+
 struct _MMPoint {
 	size_t x;
 	size_t y;

base/snprintf_c.h

@@ -19,12 +19,11 @@ import (
 
 func alert() {
 	// show Alert Window
-	abool := robotgo.ShowAlert("hello", "robotgo")
+	abool := robotgo.Alert("hello", "robotgo")
 	if abool {
 		fmt.Println("ok@@@", "ok")
 	}
-	robotgo.ShowAlert("hello", "robotgo", "Ok", "Cancel")
-
+	robotgo.Alert("hello", "robotgo", "Ok", "Cancel")
 }
 
 func get() {

base/types.h

@@ -13,32 +13,9 @@
 
 // Global delays.
 int mouseDelay = 0;
-// int keyboardDelay = 10;
-
-
-// int CheckMouseButton(const char * const b,
-// 	MMMouseButton * const button){
-// 	if (!button) return -1;
-
-// 	if (strcmp(b, "left") == 0) {
-// 		*button = LEFT_BUTTON;
-// 	}
-// 	else if (strcmp(b, "right") == 0) {
-// 		*button = RIGHT_BUTTON;
-// 	}
-// 	else if (strcmp(b, "middle") == 0) {
-// 		*button = CENTER_BUTTON;
-// 	} else {
-// 		return -2;
-// 	}
-
-// 	return 0;
-// }
 
 int move_mouse(int32_t x, int32_t y){
 	MMPointInt32 point;
-	// int x = 103;
-	// int y = 104;
 	point = MMPointInt32Make(x, y);
 	moveMouse(point);
 
@@ -47,16 +24,11 @@ int move_mouse(int32_t x, int32_t y){
 
 
 int drag_mouse(int32_t x, int32_t y, MMMouseButton button){
-	// const size_t x = 10;
-	// const size_t y = 20;
-	// MMMouseButton button = LEFT_BUTTON;
-
 	MMPointInt32 point;
 	point = MMPointInt32Make(x, y);
 	dragMouse(point, button);
 	microsleep(mouseDelay);
 
-	// printf("%s\n", "gyp-----");
 	return 0;
 }
 
@@ -73,15 +45,10 @@ bool move_mouse_smooth(int32_t x, int32_t y, double lowSpeed,
 
 MMPointInt32 get_mouse_pos(){
 	MMPointInt32 pos = getMousePos();
-
-	// Return object with .x and .y.
-	// printf("%zu\n%zu\n", pos.x, pos.y );
 	return pos;
 }
 
 int mouse_click(MMMouseButton button, bool doubleC){
-	// MMMouseButton button = LEFT_BUTTON;
-	// bool doubleC = false;
 	if (!doubleC) {
 		clickMouse(button);
 	} else {
@@ -94,7 +61,6 @@ int mouse_click(MMMouseButton button, bool doubleC){
 }
 
 int mouse_toggle(char* d, MMMouseButton button){
-	// MMMouseButton button = LEFT_BUTTON;
 	bool down = false;
 	if (strcmp(d, "down") == 0) {
 		down = true;
@@ -111,9 +77,7 @@ int mouse_toggle(char* d, MMMouseButton button){
 }
 
 int set_mouse_delay(size_t val){
-	// int val = 10;
 	mouseDelay = val;
-
 	return 0;
 }
 
@@ -125,15 +89,13 @@ int scroll(int x, int y, int msDelay){
 }
 
 int scroll_mouse(size_t scrollMagnitude, char *s){
-	// int scrollMagnitude = 20;
 	MMMouseWheelDirection scrollDirection;
 
 	if (strcmp(s, "up") == 0) {
 		scrollDirection = DIRECTION_UP;
 	} else if (strcmp(s, "down") == 0) {
 		scrollDirection = DIRECTION_DOWN;
 	} else {
-		// return "Invalid scroll direction specified.";
 		return 1;
 	}
 

examples/window/main.go

@@ -1214,30 +1214,26 @@ ____    __    ____  __  .__   __.  _______   ______   ____    __    ____
 
 */
 
-// ShowAlert show a alert window
-// Displays alert with the attributes.
-// If cancel button is not given, only the default button is displayed
-//
-// Examples:
-//	robotgo.ShowAlert("hi", "window", "ok", "cancel")
-func ShowAlert(title, msg string, args ...string) bool {
+func alertArgs(args ...string) (string, string) {
 	var (
-		// title         string
-		// msg           string
 		defaultBtn = "Ok"
 		cancelBtn  = "Cancel"
 	)
 
 	if len(args) > 0 {
-		// title = args[0]
-		// msg = args[1]
 		defaultBtn = args[0]
 	}
 
 	if len(args) > 1 {
 		cancelBtn = args[1]
 	}
 
+	return defaultBtn, cancelBtn
+}
+
+func showAlert(title, msg string, args ...string) bool {
+	defaultBtn, cancelBtn := alertArgs(args...)
+
 	cTitle := C.CString(title)
 	cMsg := C.CString(msg)
 	defaultButton := C.CString(defaultBtn)

mouse/goMouse.h

@@ -55,3 +55,13 @@ func ActivePID(pid int32, args ...int) error {
 func DisplaysNum() int {
 	return getNumDisplays()
 }
+
+// Alert show a alert window
+// Displays alert with the attributes.
+// If cancel button is not given, only the default button is displayed
+//
+// Examples:
+//	robotgo.Alert("hi", "window", "ok", "cancel")
+func Alert(title, msg string, args ...string) bool {
+	return showAlert(title, msg, args...)
+}

robotgo.go

@@ -15,6 +15,7 @@ package robotgo
 
 import (
 	"errors"
+	"fmt"
 	"log"
 
 	"github.com/robotn/xgb"
@@ -172,3 +173,25 @@ func DisplaysNum() int {
 
 	return int(reply.Number)
 }
+
+// Alert show a alert window
+// Displays alert with the attributes.
+// If cancel button is not given, only the default button is displayed
+//
+// Examples:
+//	robotgo.Alert("hi", "window", "ok", "cancel")
+func Alert(title, msg string, args ...string) bool {
+	defaultBtn, cancelBtn := alertArgs(args...)
+	c := `xmessage -center ` + msg +
+		` -title ` + title + ` -buttons ` + defaultBtn + ":0," + cancelBtn + ":1" + ` -default Ok`
+	out, err := Run(c)
+	if err != nil {
+		fmt.Println("Alert: ", err, ". ", string(out))
+		return false
+	}
+
+	if string(out) == "1" {
+		return false
+	}
+	return true
+}

robotgo_mac_win.go

@@ -95,7 +95,7 @@ MMBitmapRef copyMMBitmapFromDisplayInRect(MMRectInt32 rect, int32_t display_id)
 	if (display_id == -1) {
 		screen = GetDC(NULL); /* Get entire screen */
 	} else {
-		screen = GetDC((HWND) display_id);
+		screen = GetDC((HWND) (uintptr) display_id);
 	}
 	if (screen == NULL) { return NULL; }