diff --git a/key/goKey.h b/key/goKey.h index b01250e..7792a5c 100644 --- a/key/goKey.h +++ b/key/goKey.h @@ -163,7 +163,7 @@ int CheckKeyFlags(char* f, MMKeyFlags* flags) // return GetFlagsFromString(value, flags); // } -char* akeyTap(char *k,char *aval){ +char* aKeyTap(char *k,char *aval){ MMKeyFlags flags = (MMKeyFlags) MOD_NONE; // MMKeyFlags flags = 0; MMKeyCode key; @@ -197,7 +197,7 @@ char* akeyTap(char *k,char *aval){ return "0"; } -char* akeyToggle(char *k,char *d){ +char* aKeyToggle(char *k,char *d){ MMKeyFlags flags = (MMKeyFlags) MOD_NONE; MMKeyCode key; @@ -232,15 +232,15 @@ char* akeyToggle(char *k,char *d){ return "success"; } -void atypeString(char *str){ +void aTypeString(char *str){ typeString(str); } -void atypeStringDelayed(char *str,size_t cpm){ +void aTypeStringDelayed(char *str,size_t cpm){ typeStringDelayed(str, cpm); } -void asetKeyboardDelay(size_t val){ +void aSetKeyboardDelay(size_t val){ keyboardDelay =val; } \ No newline at end of file diff --git a/mouse/goMouse.h b/mouse/goMouse.h index ee46fe9..f1f7721 100644 --- a/mouse/goMouse.h +++ b/mouse/goMouse.h @@ -29,7 +29,7 @@ int mouseDelay = 10; // return 0; // } -int amoveMouse(size_t x, size_t y){ +int aMoveMouse(size_t x, size_t y){ MMPoint point; //int x =103; //int y =104; @@ -39,7 +39,7 @@ int amoveMouse(size_t x, size_t y){ return 0; } -int adragMouse(size_t x, size_t y){ +int aDragMouse(size_t x, size_t y){ // const size_t x=10; // const size_t y=20; MMMouseButton button = LEFT_BUTTON; @@ -53,7 +53,7 @@ int adragMouse(size_t x, size_t y){ return 0; } -int amoveMouseSmooth(size_t x, size_t y){ +int aMoveMouseSmooth(size_t x, size_t y){ MMPoint point; point = MMPointMake(x, y); smoothlyMoveMouse(point); @@ -63,7 +63,7 @@ int amoveMouseSmooth(size_t x, size_t y){ } -MMPoint agetMousePos(){ +MMPoint aGetMousePos(){ MMPoint pos = getMousePos(); //Return object with .x and .y. @@ -71,7 +71,7 @@ MMPoint agetMousePos(){ return pos; } -int amouseClick(){ +int aMouseClick(){ MMMouseButton button = LEFT_BUTTON; bool doubleC = false; @@ -86,21 +86,21 @@ int amouseClick(){ return 0; } -int amouseToggle(){ +int aMouseToggle(){ MMMouseButton button = LEFT_BUTTON; bool down = false; return 0; } -int asetMouseDelay(size_t val){ +int aSetMouseDelay(size_t val){ // int val=10; mouseDelay = val; return 0; } -int ascrollMouse(size_t scrollMagnitude,char *s){ +int aScrollMouse(size_t scrollMagnitude,char *s){ // int scrollMagnitude = 20; MMMouseWheelDirection scrollDirection; diff --git a/robotgo.go b/robotgo.go index ee8e96f..1255f92 100644 --- a/robotgo.go +++ b/robotgo.go @@ -42,20 +42,20 @@ type Bit_map struct { } func GetPixelColor(x, y C.size_t) string { - color := C.agetPixelColor(x, y) + color := C.aGetPixelColor(x, y) gcolor := C.GoString(color) defer C.free(unsafe.Pointer(color)) return gcolor } func GetScreenSize() (C.size_t, C.size_t) { - size := C.agetScreenSize() + size := C.aGetScreenSize() // Println("...", size, size.width) return size.width, size.height } func GetXDisplayName() string { - name := C.agetXDisplayName() + name := C.aGetXDisplayName() gname := C.GoString(name) defer C.free(unsafe.Pointer(name)) return gname @@ -63,13 +63,13 @@ func GetXDisplayName() string { func SetXDisplayName(name string) string { cname := C.CString(name) - str := C.asetXDisplayName(cname) + str := C.aSetXDisplayName(cname) gstr := C.GoString(str) return gstr } func CaptureScreen(x, y, w, h C.int) Bit_map { - bit := C.acaptureScreen(x, y, w, h) + bit := C.aCaptureScreen(x, y, w, h) // Println("...", bit) bit_map := Bit_map{ ImageBuffer: bit.imageBuffer, @@ -99,38 +99,38 @@ type MPoint struct { //C.size_t int func MoveMouse(x, y C.size_t) { - C.amoveMouse(x, y) + C.aMoveMouse(x, y) } func DragMouse(x, y C.size_t) { - C.adragMouse(x, y) + C.aDragMouse(x, y) } func MoveMouseSmooth(x, y C.size_t) { - C.amoveMouseSmooth(x, y) + C.aMoveMouseSmooth(x, y) } func GetMousePos() (C.size_t, C.size_t) { - pos := C.agetMousePos() + pos := C.aGetMousePos() // Println("pos:###", pos, pos.x, pos.y) return pos.x, pos.y } func MouseClick() { - C.amouseClick() + C.aMouseClick() } func MouseToggle() { - C.amouseToggle() + C.aMouseToggle() } func SetMouseDelay(x C.size_t) { - C.asetMouseDelay(x) + C.aSetMouseDelay(x) } func ScrollMouse(x C.size_t, y string) { z := C.CString(y) - C.ascrollMouse(x, z) + C.aScrollMouse(x, z) defer C.free(unsafe.Pointer(z)) } @@ -163,7 +163,7 @@ func KeyTap(args ...string) { zkey := C.CString(args[0]) amod := C.CString(apara) // defer func() { - C.akeyTap(zkey, amod) + C.aKeyTap(zkey, amod) // }() defer C.free(unsafe.Pointer(zkey)) @@ -182,7 +182,7 @@ func KeyToggle(args ...string) { zkey := C.CString(args[0]) amod := C.CString(apara) // defer func() { - str := C.akeyToggle(zkey, amod) + str := C.aKeyToggle(zkey, amod) Println(str) // }() defer C.free(unsafe.Pointer(zkey)) @@ -191,18 +191,18 @@ func KeyToggle(args ...string) { func TypeString(x string) { cx := C.CString(x) - C.atypeString(cx) + C.aTypeString(cx) defer C.free(unsafe.Pointer(cx)) } func TypeStringDelayed(x string, y C.size_t) { cx := C.CString(x) - C.atypeStringDelayed(cx, y) + C.aTypeStringDelayed(cx, y) defer C.free(unsafe.Pointer(cx)) } func SetKeyboardDelay(x C.size_t) { - C.asetKeyboardDelay(x) + C.aSetKeyboardDelay(x) } /* diff --git a/screen/goScreen.h b/screen/goScreen.h index 134bcfb..2dec9e4 100644 --- a/screen/goScreen.h +++ b/screen/goScreen.h @@ -10,7 +10,7 @@ void padHex(MMRGBHex color, char* hex){ } -char* agetPixelColor(size_t x, size_t y){ +char* aGetPixelColor(size_t x, size_t y){ MMBitmapRef bitmap; MMRGBHex color; @@ -40,13 +40,13 @@ char* agetPixelColor(size_t x, size_t y){ return s; } -MMSize agetScreenSize(){ +MMSize aGetScreenSize(){ //Get display size. MMSize displaySize = getMainDisplaySize(); return displaySize; } -char* agetXDisplayName(){ +char* aGetXDisplayName(){ #if defined(USE_X11) const char* display = getXDisplay(); char* sd=(char*)calloc(100,sizeof(char*)); @@ -58,7 +58,7 @@ char* agetXDisplayName(){ #endif } -char* asetXDisplayName(char* name){ +char* aSetXDisplayName(char* name){ #if defined(USE_X11) setXDisplay(name); return "success"; @@ -67,7 +67,7 @@ char* asetXDisplayName(char* name){ #endif } -MMBitmapRef acaptureScreen(int x,int y,int w,int h){ +MMBitmapRef aCaptureScreen(int x,int y,int w,int h){ // if (){ // x = 0; // y = 0;