Format some code

This commit is contained in:
vCaesar 2017-05-10 13:50:28 +08:00
parent 0ebade43f7
commit 9298b9bc17
5 changed files with 29 additions and 29 deletions

View File

@ -28,7 +28,7 @@
#include <assert.h> #include <assert.h>
#include <stdio.h> #include <stdio.h>
MMPoint aFindBitmap(MMBitmapRef bit_map,MMRect rect){ MMPoint aFindBitmap(MMBitmapRef bit_map, MMRect rect){
// MMRect rect; // MMRect rect;
// rect.size.width = 10; // rect.size.width = 10;
// rect.size.height = 20; // rect.size.height = 20;
@ -47,7 +47,7 @@ MMPoint aFindBitmap(MMBitmapRef bit_map,MMRect rect){
return point; return point;
} }
MMBitmapRef aOpenBitmap(char *path ,uint16_t ttype){ MMBitmapRef aOpenBitmap(char *path, uint16_t ttype){
// MMImageType type; // MMImageType type;
MMBitmapRef bitmap; MMBitmapRef bitmap;
@ -59,7 +59,7 @@ MMBitmapRef aOpenBitmap(char *path ,uint16_t ttype){
} }
char *aSaveBitmap(MMBitmapRef bitmap,char *path, uint16_t type){ char *aSaveBitmap(MMBitmapRef bitmap, char *path, uint16_t type){
if (saveMMBitmapToFile(bitmap, path,(MMImageType) type) != 0) { if (saveMMBitmapToFile(bitmap, path,(MMImageType) type) != 0) {
return "Could not save image to file."; return "Could not save image to file.";
}else{ }else{

View File

@ -174,22 +174,22 @@ void dispatch_proc(iohook_event * const event) {
int aclicks = event->data.mouse.clicks; int aclicks = event->data.mouse.clicks;
int amouse = -1; int amouse = -1;
if (strcmp(cevent,"mleft") == 0){ if (strcmp(cevent, "mleft") == 0){
amouse = 1; amouse = 1;
} }
if (strcmp(cevent,"mright") == 0){ if (strcmp(cevent, "mright") == 0){
amouse = 2; amouse = 2;
} }
if (strcmp(cevent,"wheelDown") == 0){ if (strcmp(cevent, "wheelDown") == 0){
amouse = 4; amouse = 4;
} }
if (strcmp(cevent,"wheelUp") == 0){ if (strcmp(cevent, "wheelUp") == 0){
amouse = 5; amouse = 5;
} }
if (strcmp(cevent,"wheelLeft") == 0){ if (strcmp(cevent, "wheelLeft") == 0){
amouse = 6; amouse = 6;
} }
if (strcmp(cevent,"wheelRight") == 0){ if (strcmp(cevent, "wheelRight") == 0){
amouse = 7; amouse = 7;
} }
if (abutton == amouse && aclicks == 1){ if (abutton == amouse && aclicks == 1){

View File

@ -179,12 +179,12 @@ int GetFlagsFromValue(char* value[], MMKeyFlags* flags,int num){
} }
// If it's not an array, it should be a single string value. // If it's not an array, it should be a single string value.
char* aKey_Tap(char *k,char* keyarr[],int num){ char* aKey_Tap(char *k, char* keyarr[], int num){
MMKeyFlags flags = MOD_NONE; MMKeyFlags flags = MOD_NONE;
// MMKeyFlags flags = 0; // MMKeyFlags flags = 0;
MMKeyCode key; MMKeyCode key;
switch(GetFlagsFromValue(keyarr,&flags,num)){ switch(GetFlagsFromValue(keyarr, &flags, num)){
// switch (CheckKeyFlags(akey,&flags)){ // switch (CheckKeyFlags(akey,&flags)){
case -1: case -1:
return "Null pointer in key flag."; return "Null pointer in key flag.";
@ -209,7 +209,7 @@ char* aKey_Tap(char *k,char* keyarr[],int num){
return "0"; return "0";
} }
char* aKeyTap(char *k,char *akey,char *akeyt){ char* aKeyTap(char *k, char *akey, char *akeyt){
MMKeyFlags flags = (MMKeyFlags) MOD_NONE; MMKeyFlags flags = (MMKeyFlags) MOD_NONE;
// MMKeyFlags flags = 0; // MMKeyFlags flags = 0;
MMKeyCode key; MMKeyCode key;
@ -218,7 +218,7 @@ char* aKeyTap(char *k,char *akey,char *akeyt){
// k = *kstr; // k = *kstr;
if (strcmp(akey, "null") != 0){ if (strcmp(akey, "null") != 0){
if (strcmp(akeyt, "null") == 0){ if (strcmp(akeyt, "null") == 0){
switch (CheckKeyFlags(akey,&flags)){ switch (CheckKeyFlags(akey, &flags)){
case -1: case -1:
return "Null pointer in key flag."; return "Null pointer in key flag.";
break; break;
@ -227,8 +227,8 @@ char* aKeyTap(char *k,char *akey,char *akeyt){
break; break;
} }
}else{ }else{
char* akeyarr[2] = {akey,akeyt}; char* akeyarr[2] = {akey, akeyt};
switch(GetFlagsFromValue(akeyarr,&flags,2)){ switch(GetFlagsFromValue(akeyarr, &flags, 2)){
case -1: case -1:
return "Null pointer in key flag."; return "Null pointer in key flag.";
break; break;
@ -254,7 +254,7 @@ char* aKeyTap(char *k,char *akey,char *akeyt){
return "0"; return "0";
} }
char* aKeyToggle(char *k,char *d,char *akey,char *akeyt){ char* aKeyToggle(char *k, char *d, char *akey, char *akeyt){
MMKeyFlags flags = (MMKeyFlags) MOD_NONE; MMKeyFlags flags = (MMKeyFlags) MOD_NONE;
MMKeyCode key; MMKeyCode key;
@ -276,7 +276,7 @@ char* aKeyToggle(char *k,char *d,char *akey,char *akeyt){
if (strcmp(akey, "null") != 0){ if (strcmp(akey, "null") != 0){
if (strcmp(akeyt, "null") == 0){ if (strcmp(akeyt, "null") == 0){
switch (CheckKeyFlags(akey,&flags)){ switch (CheckKeyFlags(akey, &flags)){
case -1: case -1:
return "Null pointer in key flag."; return "Null pointer in key flag.";
break; break;
@ -285,8 +285,8 @@ char* aKeyToggle(char *k,char *d,char *akey,char *akeyt){
break; break;
} }
}else{ }else{
char* akeyarr[2] = {akey,akeyt}; char* akeyarr[2] = {akey, akeyt};
switch (GetFlagsFromValue(akeyarr, &flags,2)) switch (GetFlagsFromValue(akeyarr, &flags, 2))
{ {
case -1: case -1:
return "Null pointer in key flag."; return "Null pointer in key flag.";
@ -317,7 +317,7 @@ void aTypeString(char *str){
typeString(str); typeString(str);
} }
void aTypeStringDelayed(char *str,size_t cpm){ void aTypeStringDelayed(char *str, size_t cpm){
typeStringDelayed(str, cpm); typeStringDelayed(str, cpm);
} }

View File

@ -63,7 +63,7 @@ int aDragMouse(size_t x, size_t y){
return 0; return 0;
} }
int aMoveMouseSmooth(size_t x, size_t y,double lowSpeed,double highSpeed){ int aMoveMouseSmooth(size_t x, size_t y, double lowSpeed, double highSpeed){
MMPoint point; MMPoint point;
point = MMPointMake(x, y); point = MMPointMake(x, y);
smoothlyMoveMouse(point, lowSpeed, highSpeed); smoothlyMoveMouse(point, lowSpeed, highSpeed);
@ -81,7 +81,7 @@ MMPoint aGetMousePos(){
return pos; return pos;
} }
int aMouseClick(MMMouseButton button,bool doubleC){ int aMouseClick(MMMouseButton button, bool doubleC){
// MMMouseButton button = LEFT_BUTTON; // MMMouseButton button = LEFT_BUTTON;
// bool doubleC = false; // bool doubleC = false;
@ -96,7 +96,7 @@ int aMouseClick(MMMouseButton button,bool doubleC){
return 0; return 0;
} }
int aMouseToggle(char* d,MMMouseButton button){ int aMouseToggle(char* d, MMMouseButton button){
// MMMouseButton button = LEFT_BUTTON; // MMMouseButton button = LEFT_BUTTON;
bool down = false; bool down = false;
if (strcmp(d, "down") == 0){ if (strcmp(d, "down") == 0){
@ -119,7 +119,7 @@ int aSetMouseDelay(size_t val){
return 0; return 0;
} }
int aScrollMouse(size_t scrollMagnitude,char *s){ int aScrollMouse(size_t scrollMagnitude, char *s){
// int scrollMagnitude = 20; // int scrollMagnitude = 20;
MMMouseWheelDirection scrollDirection; MMMouseWheelDirection scrollDirection;

View File

@ -44,8 +44,8 @@ char* aGetPixelColor(size_t x, size_t y){
// return 0; // return 0;
char* s = (char*)calloc(100,sizeof(char*)); char* s = (char*)calloc(100, sizeof(char*));
if(s)strcpy(s,hex); if(s)strcpy(s, hex);
return s; return s;
} }
@ -68,8 +68,8 @@ char* aSetXDisplayName(char* name){
char* aGetXDisplayName(){ char* aGetXDisplayName(){
#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*));
if(sd)strcpy(sd,display); if(sd)strcpy(sd, display);
return sd; return sd;
#else #else
@ -77,7 +77,7 @@ char* aGetXDisplayName(){
#endif #endif
} }
MMBitmapRef aCaptureScreen(size_t x,size_t y,size_t w,size_t h){ MMBitmapRef aCaptureScreen(size_t x, size_t y, size_t w, size_t h){
// if (){ // if (){
// x = 0; // x = 0;
// y = 0; // y = 0;