update code style

This commit is contained in:
vcaesar 2018-07-07 23:01:55 +08:00
parent 6bd6565ce2
commit 482d465472
3 changed files with 31 additions and 30 deletions

View File

@ -63,7 +63,7 @@ void dispatch_proc(iohook_event * const event) {
}
// printf("atoi(str)---%d\n", atoi(cevent));
if (akeyCode == atoi(cevent)){
if (akeyCode == atoi(cevent)) {
int stopEvent = stop_event();
// printf("%d\n", stopEvent);
cstatus = 0;
@ -88,7 +88,7 @@ void dispatch_proc(iohook_event * const event) {
free (buf);
#endif
if (strcmp(buf, cevent) == 0){
if (strcmp(buf, cevent) == 0) {
int stopEvent = stop_event();
// printf("%d\n", stopEvent);
cstatus = 0;
@ -110,25 +110,25 @@ void dispatch_proc(iohook_event * const event) {
int aclicks = event->data.mouse.clicks;
int amouse = -1;
if (strcmp(cevent, "mleft") == 0){
if (strcmp(cevent, "mleft") == 0) {
amouse = 1;
}
if (strcmp(cevent, "mright") == 0){
if (strcmp(cevent, "mright") == 0) {
amouse = 2;
}
if (strcmp(cevent, "wheelDown") == 0){
if (strcmp(cevent, "wheelDown") == 0) {
amouse = 4;
}
if (strcmp(cevent, "wheelUp") == 0){
if (strcmp(cevent, "wheelUp") == 0) {
amouse = 5;
}
if (strcmp(cevent, "wheelLeft") == 0){
if (strcmp(cevent, "wheelLeft") == 0) {
amouse = 6;
}
if (strcmp(cevent, "wheelRight") == 0){
if (strcmp(cevent, "wheelRight") == 0) {
amouse = 7;
}
if (abutton == amouse && aclicks == 1){
if (abutton == amouse && aclicks == 1) {
int stopEvent = stop_event();
cstatus = 0;
}

View File

@ -104,7 +104,7 @@ struct KeyNames{
int CheckKeyCodes(char* k, MMKeyCode *key){
if (!key) { return -1; }
if (strlen(k) == 1){
if (strlen(k) == 1) {
*key = keyCodeForChar(*k);
return 0;
}
@ -120,7 +120,7 @@ int CheckKeyCodes(char* k, MMKeyCode *key){
kn++;
}
if (*key == K_NOT_A_KEY){
if (*key == K_NOT_A_KEY) {
return -2;
}
@ -130,19 +130,19 @@ int CheckKeyCodes(char* k, MMKeyCode *key){
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 {
return -2;
@ -153,6 +153,7 @@ 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;
@ -171,7 +172,7 @@ char* key_Tap(char *k, char* keyArr[], int num, int keyDelay){
// MMKeyFlags flags = 0;
MMKeyCode key;
switch(GetFlagsFromValue(keyArr, &flags, num)){
switch(GetFlagsFromValue(keyArr, &flags, num)) {
// switch (CheckKeyFlags(akey, &flags)){
case -1:
return "Null pointer in key flag.";
@ -181,7 +182,7 @@ char* key_Tap(char *k, char* keyArr[], int num, int keyDelay){
break;
}
switch(CheckKeyCodes(k, &key)){
switch(CheckKeyCodes(k, &key)) {
case -1:
return "Null pointer in key code.";
break;
@ -203,9 +204,9 @@ char* key_tap(char *k, char *akey, char *keyT, int keyDelay){
// char *k;
// k = *kstr;
if (strcmp(akey, "null") != 0){
if (strcmp(keyT, "null") == 0){
switch (CheckKeyFlags(akey, &flags)){
if (strcmp(akey, "null") != 0) {
if (strcmp(keyT, "null") == 0) {
switch (CheckKeyFlags(akey, &flags)) {
case -1:
return "Null pointer in key flag.";
break;
@ -215,7 +216,7 @@ char* key_tap(char *k, char *akey, char *keyT, int keyDelay){
}
}else{
char* akeyArr[2] = {akey, keyT};
switch(GetFlagsFromValue(akeyArr, &flags, 2)){
switch(GetFlagsFromValue(akeyArr, &flags, 2)) {
case -1:
return "Null pointer in key flag.";
break;
@ -226,7 +227,7 @@ char* key_tap(char *k, char *akey, char *keyT, int keyDelay){
}
}
switch(CheckKeyCodes(k, &key)){
switch(CheckKeyCodes(k, &key)) {
case -1:
return "Null pointer in key code.";
break;
@ -254,16 +255,16 @@ char* key_toggle(char *k, char *d, char *akey, char *keyT){
// d = *dstr;
if (strcmp(d, "down") == 0) {
down = true;
} else if (strcmp(d, "up") == 0){
} else if (strcmp(d, "up") == 0) {
down = false;
} else {
return "Invalid key state specified.";
}
}
if (strcmp(akey, "null") != 0){
if (strcmp(keyT, "null") == 0){
switch (CheckKeyFlags(akey, &flags)){
if (strcmp(akey, "null") != 0) {
if (strcmp(keyT, "null") == 0) {
switch (CheckKeyFlags(akey, &flags)) {
case -1:
return "Null pointer in key flag.";
break;
@ -273,7 +274,7 @@ char* key_toggle(char *k, char *d, char *akey, char *keyT){
}
} else {
char* akeyArr[2] = {akey, keyT};
switch (GetFlagsFromValue(akeyArr, &flags, 2)){
switch (GetFlagsFromValue(akeyArr, &flags, 2)) {
case -1:
return "Null pointer in key flag.";
break;
@ -284,7 +285,7 @@ char* key_toggle(char *k, char *d, char *akey, char *keyT){
}
}
switch(CheckKeyCodes(k, &key)){
switch(CheckKeyCodes(k, &key)) {
case -1:
return "Null pointer in key code.";
break;

View File

@ -129,7 +129,7 @@ int scroll_mouse(size_t scrollMagnitude, char *s){
if (strcmp(s, "up") == 0) {
scrollDirection = DIRECTION_UP;
} else if (strcmp(s, "down") == 0) {
scrollDirection = DIRECTION_DOWN;
scrollDirection = DIRECTION_DOWN;
} else {
// return "Invalid scroll direction specified.";
return 1;