laipeng/robotgo
1
0
Fork 0
mirror of https://github.com/go-vgo/robotgo.git synced 2025-05-31 06:13:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update code style fix non-standard code

Browse Source
This commit is contained in:
vcaesar 2018-07-07 22:47:47 +08:00
parent 962a413203
commit 6bd6565ce2
4 changed files with 66 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bitmap/goBitmap.h
View File

@ -68,7 +68,8 @@ MMPoint find_bitmap(MMBitmapRef bitmap, MMBitmapRef sbit, float tolerance){
}
MMRect rect = MMBitmapGetBounds(sbit);
// printf("x=%d,y=%d,width=%d,height=%d\n", rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
// printf("x=%d,y=%d,width=%d,height=%d\n", rect.origin.x,
// rect.origin.y, rect.size.width, rect.size.height);
if (findBitmapInRect(bitmap, sbit, &point,
rect, tolerance) == 0) {
@ -140,7 +141,6 @@ bool point_in_bounds(MMBitmapRef bitmap, MMPoint point){
MMBitmapRef bitmap_open(char *path, uint16_t ttype){
// MMImageType type;
MMBitmapRef bitmap;
MMIOError err;

118
key/goKey.h
View File

@ -101,12 +101,10 @@ struct KeyNames{
{ NULL, K_NOT_A_KEY } /* end marker */
};
int CheckKeyCodes(char* k, MMKeyCode *key)
{
if (!key) return -1;
int CheckKeyCodes(char* k, MMKeyCode *key){
if (!key) { return -1; }
if (strlen(k) == 1)
{
if (strlen(k) == 1){
*key = keyCodeForChar(*k);
return 0;
}
@ -114,50 +112,39 @@ int CheckKeyCodes(char* k, MMKeyCode *key)
*key = K_NOT_A_KEY;
struct KeyNames* kn = key_names;
while (kn->name)
{
if (strcmp(k, kn->name) == 0)
{
while (kn->name) {
if (strcmp(k, kn->name) == 0){
*key = kn->key;
break;
}
kn++;
}
if (*key == K_NOT_A_KEY)
{
if (*key == K_NOT_A_KEY){
return -2;
}
return 0;
}
int CheckKeyFlags(char* f, MMKeyFlags* flags)
{
if (!flags) return -1;
int CheckKeyFlags(char* f, MMKeyFlags* flags){
if (!flags) { return -1; }
if (strcmp(f, "alt") == 0)
{
if (strcmp(f, "alt") == 0){
*flags = MOD_ALT;
}
else if(strcmp(f, "command") == 0)
{
else if(strcmp(f, "command") == 0){
*flags = MOD_META;
}
else if(strcmp(f, "control") == 0)
{
else if(strcmp(f, "control") == 0){
*flags = MOD_CONTROL;
}
else if(strcmp(f, "shift") == 0)
{
else if(strcmp(f, "shift") == 0){
*flags = MOD_SHIFT;
}
else if(strcmp(f, "none") == 0)
{
else if(strcmp(f, "none") == 0){
*flags = (MMKeyFlags) MOD_NONE;
}
else
{
} else {
return -2;
}
@ -166,14 +153,14 @@ int CheckKeyFlags(char* f, MMKeyFlags* flags)
int GetFlagsFromValue(char* value[], MMKeyFlags* flags, int num){
if (!flags) {return -1;}
int i;
for ( i= 0; i <num; i++){
MMKeyFlags f = MOD_NONE;
const int rv = CheckKeyFlags(value[i], &f);
if (rv) return rv;
int i;
for ( i= 0; i <num; i++){
MMKeyFlags f = MOD_NONE;
const int rv = CheckKeyFlags(value[i], &f);
if (rv) {return rv;}
*flags = (MMKeyFlags)(*flags | f);
}
*flags = (MMKeyFlags)(*flags | f);
}
return 0;
// return CheckKeyFlags(fstr, flags);
}
@ -184,27 +171,27 @@ char* key_Tap(char *k, char* keyArr[], int num, int keyDelay){
// MMKeyFlags flags = 0;
MMKeyCode key;
switch(GetFlagsFromValue(keyArr, &flags, num)){
// switch (CheckKeyFlags(akey, &flags)){
case -1:
return "Null pointer in key flag.";
break;
case -2:
return "Invalid key flag specified.";
break;
}
switch(GetFlagsFromValue(keyArr, &flags, num)){
// switch (CheckKeyFlags(akey, &flags)){
case -1:
return "Null pointer in key flag.";
break;
case -2:
return "Invalid key flag specified.";
break;
}
switch(CheckKeyCodes(k, &key)){
case -1:
return "Null pointer in key code.";
break;
case -2:
return "Invalid key code specified.";
break;
default:
tapKeyCode(key, flags);
microsleep(keyDelay);
}
case -1:
return "Null pointer in key code.";
break;
case -2:
return "Invalid key code specified.";
break;
default:
tapKeyCode(key, flags);
microsleep(keyDelay);
}
return "0";
}
@ -265,11 +252,11 @@ char* key_toggle(char *k, char *d, char *akey, char *keyT){
if (d != 0){
// char *d;
// d = *dstr;
if (strcmp(d, "down") == 0){
if (strcmp(d, "down") == 0) {
down = true;
}else if (strcmp(d, "up") == 0){
} else if (strcmp(d, "up") == 0){
down = false;
}else{
} else {
return "Invalid key state specified.";
}
}
@ -284,17 +271,16 @@ char* key_toggle(char *k, char *d, char *akey, char *keyT){
return "Invalid key flag specified.";
break;
}
}else{
} else {
char* akeyArr[2] = {akey, keyT};
switch (GetFlagsFromValue(akeyArr, &flags, 2))
{
case -1:
return "Null pointer in key flag.";
break;
case -2:
return "Invalid key flag specified.";
break;
}
switch (GetFlagsFromValue(akeyArr, &flags, 2)){
case -1:
return "Null pointer in key flag.";
break;
case -2:
return "Invalid key flag specified.";
break;
}
}
}

31
mouse/goMouse.h
View File

@ -20,20 +20,15 @@ int mouseDelay = 10;
// MMMouseButton * const button){
// if (!button) return -1;
// if (strcmp(b, "left") == 0)
// {
// if (strcmp(b, "left") == 0) {
// *button = LEFT_BUTTON;
// }
// else if (strcmp(b, "right") == 0)
// {
// else if (strcmp(b, "right") == 0) {
// *button = RIGHT_BUTTON;
// }
// else if (strcmp(b, "middle") == 0)
// {
// else if (strcmp(b, "middle") == 0) {
// *button = CENTER_BUTTON;
// }
// else
// {
// } else {
// return -2;
// }
@ -85,10 +80,9 @@ MMPoint get_mouse_pos(){
int mouse_click(MMMouseButton button, bool doubleC){
// MMMouseButton button = LEFT_BUTTON;
// bool doubleC = false;
if (!doubleC){
if (!doubleC) {
clickMouse(button);
}else{
} else {
doubleClick(button);
}
@ -100,11 +94,11 @@ 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){
if (strcmp(d, "down") == 0) {
down = true;
}else if (strcmp(d, "up") == 0){
} else if (strcmp(d, "up") == 0) {
down = false;
}else{
} else {
return 1;
}
@ -130,14 +124,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){
if (strcmp(s, "up") == 0) {
scrollDirection = DIRECTION_UP;
}else if (strcmp(s, "down") == 0){
} else if (strcmp(s, "down") == 0) {
scrollDirection = DIRECTION_DOWN;
}else{
} else {
// return "Invalid scroll direction specified.";
return 1;
}

1
screen/goScreen.h
View File

@ -125,7 +125,6 @@ MMBitmapRef capture_screen(size_t x, size_t y, size_t w, size_t h){
// w = displaySize.width;
// h = displaySize.height;
// }
MMBitmapRef bitmap = copyMMBitmapFromDisplayInRect(MMRectMake(x, y, w, h));
// printf("%s\n", bitmap);
return bitmap;