mirror of
https://github.com/go-vgo/robotgo.git
synced 2025-05-31 06:13:55 +00:00
update screen and event c name
This commit is contained in:
parent
fc9bb0f605
commit
4af3883371
@ -56,8 +56,8 @@ void dispatch_proc(iohook_event * const event) {
|
||||
int akeycode = (uint16_t) event->data.keyboard.keycode;
|
||||
// printf("atoi(str)---%d\n", atoi(cevent));
|
||||
if (akeycode == atoi(cevent)){
|
||||
int astop = aStop();
|
||||
// printf("%d\n", astop);
|
||||
int stopEvent = stop_event();
|
||||
// printf("%d\n", stopEvent);
|
||||
cstatus = 0;
|
||||
}
|
||||
break;
|
||||
@ -81,8 +81,8 @@ void dispatch_proc(iohook_event * const event) {
|
||||
#endif
|
||||
|
||||
if (strcmp(buf, cevent) == 0){
|
||||
int astop = aStop();
|
||||
// printf("%d\n", astop);
|
||||
int stopEvent = stop_event();
|
||||
// printf("%d\n", stopEvent);
|
||||
cstatus = 0;
|
||||
}
|
||||
// return (char*) event->data.keyboard.keychar;
|
||||
@ -121,7 +121,7 @@ void dispatch_proc(iohook_event * const event) {
|
||||
amouse = 7;
|
||||
}
|
||||
if (abutton == amouse && aclicks == 1){
|
||||
int astop = aStop();
|
||||
int stopEvent = stop_event();
|
||||
cstatus = 0;
|
||||
}
|
||||
|
||||
@ -141,7 +141,7 @@ void dispatch_proc(iohook_event * const event) {
|
||||
// fprintf(stdout, "----%s\n", buffer);
|
||||
}
|
||||
|
||||
int aEvent(char *aevent) {
|
||||
int add_event(char *aevent) {
|
||||
// (uint16_t *)
|
||||
cevent = aevent;
|
||||
// Set the logger callback for library output.
|
||||
@ -225,7 +225,7 @@ int aEvent(char *aevent) {
|
||||
return cstatus;
|
||||
}
|
||||
|
||||
int aStop(){
|
||||
int stop_event(){
|
||||
int status = hook_stop();
|
||||
switch (status) {
|
||||
// System level errors.
|
||||
|
@ -50,8 +50,8 @@ int rrevent;
|
||||
int cstatus = 1;
|
||||
|
||||
|
||||
int aStop();
|
||||
int aEvent(char *aevent);
|
||||
int stop_event();
|
||||
int add_event(char *aevent);
|
||||
// int allEvent(char *aevent);
|
||||
int allEvent(char *aevent, int vcode[], int size);
|
||||
|
||||
|
17
robotgo.go
17
robotgo.go
@ -158,7 +158,7 @@ func GetPxColor(x, y int) C.MMRGBHex {
|
||||
cx := C.size_t(x)
|
||||
cy := C.size_t(y)
|
||||
|
||||
color := C.get_Pixel_Color(cx, cy)
|
||||
color := C.get_px_color(cx, cy)
|
||||
return color
|
||||
}
|
||||
|
||||
@ -167,8 +167,7 @@ func GetPixelColor(x, y int) string {
|
||||
cx := C.size_t(x)
|
||||
cy := C.size_t(y)
|
||||
|
||||
color := C.aGetPixelColor(cx, cy)
|
||||
// color := C.aGetPixelColor(x, y)
|
||||
color := C.get_pixel_color(cx, cy)
|
||||
gcolor := C.GoString(color)
|
||||
defer C.free(unsafe.Pointer(color))
|
||||
|
||||
@ -177,7 +176,7 @@ func GetPixelColor(x, y int) string {
|
||||
|
||||
// GetScreenSize get screen size
|
||||
func GetScreenSize() (int, int) {
|
||||
size := C.aGetScreenSize()
|
||||
size := C.get_screen_size()
|
||||
// fmt.Println("...", size, size.width)
|
||||
return int(size.width), int(size.height)
|
||||
}
|
||||
@ -185,7 +184,7 @@ func GetScreenSize() (int, int) {
|
||||
// SetXDisplayName set XDisplay name
|
||||
func SetXDisplayName(name string) string {
|
||||
cname := C.CString(name)
|
||||
str := C.aSetXDisplayName(cname)
|
||||
str := C.set_XDisplay_name(cname)
|
||||
gstr := C.GoString(str)
|
||||
defer C.free(unsafe.Pointer(cname))
|
||||
|
||||
@ -194,7 +193,7 @@ func SetXDisplayName(name string) string {
|
||||
|
||||
// GetXDisplayName get XDisplay name
|
||||
func GetXDisplayName() string {
|
||||
name := C.aGetXDisplayName()
|
||||
name := C.get_XDisplay_name()
|
||||
gname := C.GoString(name)
|
||||
defer C.free(unsafe.Pointer(name))
|
||||
|
||||
@ -1035,7 +1034,7 @@ func AddEvent(aeve string) int {
|
||||
}
|
||||
|
||||
// cs := C.CString(aeve)
|
||||
eve := C.aEvent(cs)
|
||||
eve := C.add_event(cs)
|
||||
// fmt.Println("event@@", eve)
|
||||
geve := int(eve)
|
||||
defer C.free(unsafe.Pointer(cs))
|
||||
@ -1045,13 +1044,13 @@ func AddEvent(aeve string) int {
|
||||
|
||||
// StopEvent stop event listener
|
||||
func StopEvent() {
|
||||
C.aStop()
|
||||
C.stop_event()
|
||||
}
|
||||
|
||||
// LEvent add event listener, Wno-deprecated
|
||||
func LEvent(aeve string) int {
|
||||
cs := C.CString(aeve)
|
||||
eve := C.aEvent(cs)
|
||||
eve := C.add_event(cs)
|
||||
// fmt.Println("event@@", eve)
|
||||
geve := int(eve)
|
||||
defer C.free(unsafe.Pointer(cs))
|
||||
|
@ -45,7 +45,7 @@ uint32_t color_rgb_to_hex(uint8_t r, uint8_t g, uint8_t b){
|
||||
return RGB_TO_HEX(r, g, b);
|
||||
}
|
||||
|
||||
MMRGBHex get_Pixel_Color(size_t x, size_t y){
|
||||
MMRGBHex get_px_color(size_t x, size_t y){
|
||||
MMBitmapRef bitmap;
|
||||
MMRGBHex color;
|
||||
|
||||
@ -61,7 +61,7 @@ MMRGBHex get_Pixel_Color(size_t x, size_t y){
|
||||
return color;
|
||||
}
|
||||
|
||||
char* aGetPixelColor(size_t x, size_t y){
|
||||
char* get_pixel_color(size_t x, size_t y){
|
||||
MMBitmapRef bitmap;
|
||||
MMRGBHex color;
|
||||
|
||||
@ -91,13 +91,13 @@ char* aGetPixelColor(size_t x, size_t y){
|
||||
return s;
|
||||
}
|
||||
|
||||
MMSize aGetScreenSize(){
|
||||
MMSize get_screen_size(){
|
||||
//Get display size.
|
||||
MMSize displaySize = getMainDisplaySize();
|
||||
return displaySize;
|
||||
}
|
||||
|
||||
char* aSetXDisplayName(char* name){
|
||||
char* set_XDisplay_name(char* name){
|
||||
#if defined(USE_X11)
|
||||
setXDisplay(name);
|
||||
return "success";
|
||||
@ -106,7 +106,7 @@ char* aSetXDisplayName(char* name){
|
||||
#endif
|
||||
}
|
||||
|
||||
char* aGetXDisplayName(){
|
||||
char* get_XDisplay_name(){
|
||||
#if defined(USE_X11)
|
||||
const char* display = getXDisplay();
|
||||
char* sd = (char*)calloc(100, sizeof(char*));
|
||||
@ -118,7 +118,7 @@ char* aGetXDisplayName(){
|
||||
#endif
|
||||
}
|
||||
|
||||
// capture_screen aCaptureScreen
|
||||
// capture_screen capture screen
|
||||
MMBitmapRef capture_screen(size_t x, size_t y, size_t w, size_t h){
|
||||
// if (){
|
||||
// x = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user