update screen and event c name

This commit is contained in:
vcaesar 2017-12-29 20:18:28 +08:00
parent fc9bb0f605
commit 4af3883371
4 changed files with 23 additions and 24 deletions

View File

@ -56,8 +56,8 @@ void dispatch_proc(iohook_event * const event) {
int akeycode = (uint16_t) event->data.keyboard.keycode; int akeycode = (uint16_t) event->data.keyboard.keycode;
// printf("atoi(str)---%d\n", atoi(cevent)); // printf("atoi(str)---%d\n", atoi(cevent));
if (akeycode == atoi(cevent)){ if (akeycode == atoi(cevent)){
int astop = aStop(); int stopEvent = stop_event();
// printf("%d\n", astop); // printf("%d\n", stopEvent);
cstatus = 0; cstatus = 0;
} }
break; break;
@ -81,8 +81,8 @@ void dispatch_proc(iohook_event * const event) {
#endif #endif
if (strcmp(buf, cevent) == 0){ if (strcmp(buf, cevent) == 0){
int astop = aStop(); int stopEvent = stop_event();
// printf("%d\n", astop); // printf("%d\n", stopEvent);
cstatus = 0; cstatus = 0;
} }
// return (char*) event->data.keyboard.keychar; // return (char*) event->data.keyboard.keychar;
@ -121,7 +121,7 @@ void dispatch_proc(iohook_event * const event) {
amouse = 7; amouse = 7;
} }
if (abutton == amouse && aclicks == 1){ if (abutton == amouse && aclicks == 1){
int astop = aStop(); int stopEvent = stop_event();
cstatus = 0; cstatus = 0;
} }
@ -141,7 +141,7 @@ void dispatch_proc(iohook_event * const event) {
// fprintf(stdout, "----%s\n", buffer); // fprintf(stdout, "----%s\n", buffer);
} }
int aEvent(char *aevent) { int add_event(char *aevent) {
// (uint16_t *) // (uint16_t *)
cevent = aevent; cevent = aevent;
// Set the logger callback for library output. // Set the logger callback for library output.
@ -225,7 +225,7 @@ int aEvent(char *aevent) {
return cstatus; return cstatus;
} }
int aStop(){ int stop_event(){
int status = hook_stop(); int status = hook_stop();
switch (status) { switch (status) {
// System level errors. // System level errors.

View File

@ -50,8 +50,8 @@ int rrevent;
int cstatus = 1; int cstatus = 1;
int aStop(); int stop_event();
int aEvent(char *aevent); int add_event(char *aevent);
// int allEvent(char *aevent); // int allEvent(char *aevent);
int allEvent(char *aevent, int vcode[], int size); int allEvent(char *aevent, int vcode[], int size);

View File

@ -158,7 +158,7 @@ func GetPxColor(x, y int) C.MMRGBHex {
cx := C.size_t(x) cx := C.size_t(x)
cy := C.size_t(y) cy := C.size_t(y)
color := C.get_Pixel_Color(cx, cy) color := C.get_px_color(cx, cy)
return color return color
} }
@ -167,8 +167,7 @@ func GetPixelColor(x, y int) string {
cx := C.size_t(x) cx := C.size_t(x)
cy := C.size_t(y) cy := C.size_t(y)
color := C.aGetPixelColor(cx, cy) color := C.get_pixel_color(cx, cy)
// color := C.aGetPixelColor(x, y)
gcolor := C.GoString(color) gcolor := C.GoString(color)
defer C.free(unsafe.Pointer(color)) defer C.free(unsafe.Pointer(color))
@ -177,7 +176,7 @@ func GetPixelColor(x, y int) string {
// GetScreenSize get screen size // GetScreenSize get screen size
func GetScreenSize() (int, int) { func GetScreenSize() (int, int) {
size := C.aGetScreenSize() size := C.get_screen_size()
// fmt.Println("...", size, size.width) // fmt.Println("...", size, size.width)
return int(size.width), int(size.height) return int(size.width), int(size.height)
} }
@ -185,7 +184,7 @@ func GetScreenSize() (int, int) {
// SetXDisplayName set XDisplay name // SetXDisplayName set XDisplay name
func SetXDisplayName(name string) string { func SetXDisplayName(name string) string {
cname := C.CString(name) cname := C.CString(name)
str := C.aSetXDisplayName(cname) str := C.set_XDisplay_name(cname)
gstr := C.GoString(str) gstr := C.GoString(str)
defer C.free(unsafe.Pointer(cname)) defer C.free(unsafe.Pointer(cname))
@ -194,7 +193,7 @@ func SetXDisplayName(name string) string {
// GetXDisplayName get XDisplay name // GetXDisplayName get XDisplay name
func GetXDisplayName() string { func GetXDisplayName() string {
name := C.aGetXDisplayName() name := C.get_XDisplay_name()
gname := C.GoString(name) gname := C.GoString(name)
defer C.free(unsafe.Pointer(name)) defer C.free(unsafe.Pointer(name))
@ -1035,7 +1034,7 @@ func AddEvent(aeve string) int {
} }
// cs := C.CString(aeve) // cs := C.CString(aeve)
eve := C.aEvent(cs) eve := C.add_event(cs)
// fmt.Println("event@@", eve) // fmt.Println("event@@", eve)
geve := int(eve) geve := int(eve)
defer C.free(unsafe.Pointer(cs)) defer C.free(unsafe.Pointer(cs))
@ -1045,13 +1044,13 @@ func AddEvent(aeve string) int {
// StopEvent stop event listener // StopEvent stop event listener
func StopEvent() { func StopEvent() {
C.aStop() C.stop_event()
} }
// LEvent add event listener, Wno-deprecated // LEvent add event listener, Wno-deprecated
func LEvent(aeve string) int { func LEvent(aeve string) int {
cs := C.CString(aeve) cs := C.CString(aeve)
eve := C.aEvent(cs) eve := C.add_event(cs)
// fmt.Println("event@@", eve) // fmt.Println("event@@", eve)
geve := int(eve) geve := int(eve)
defer C.free(unsafe.Pointer(cs)) defer C.free(unsafe.Pointer(cs))

View File

@ -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); 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; MMBitmapRef bitmap;
MMRGBHex color; MMRGBHex color;
@ -61,7 +61,7 @@ MMRGBHex get_Pixel_Color(size_t x, size_t y){
return color; return color;
} }
char* aGetPixelColor(size_t x, size_t y){ char* get_pixel_color(size_t x, size_t y){
MMBitmapRef bitmap; MMBitmapRef bitmap;
MMRGBHex color; MMRGBHex color;
@ -91,13 +91,13 @@ char* aGetPixelColor(size_t x, size_t y){
return s; return s;
} }
MMSize aGetScreenSize(){ MMSize get_screen_size(){
//Get display size. //Get display size.
MMSize displaySize = getMainDisplaySize(); MMSize displaySize = getMainDisplaySize();
return displaySize; return displaySize;
} }
char* aSetXDisplayName(char* name){ char* set_XDisplay_name(char* name){
#if defined(USE_X11) #if defined(USE_X11)
setXDisplay(name); setXDisplay(name);
return "success"; return "success";
@ -106,7 +106,7 @@ char* aSetXDisplayName(char* name){
#endif #endif
} }
char* aGetXDisplayName(){ char* get_XDisplay_name(){
#if defined(USE_X11) #if defined(USE_X11)
const char* display = getXDisplay(); const char* display = getXDisplay();
char* sd = (char*)calloc(100, sizeof(char*)); char* sd = (char*)calloc(100, sizeof(char*));
@ -118,7 +118,7 @@ char* aGetXDisplayName(){
#endif #endif
} }
// capture_screen aCaptureScreen // capture_screen capture screen
MMBitmapRef capture_screen(size_t x, size_t y, size_t w, size_t h){ MMBitmapRef capture_screen(size_t x, size_t y, size_t w, size_t h){
// if (){ // if (){
// x = 0; // x = 0;