From 1d6d5ea7f5b2ad61ff53c15ccf1057e29ed8a1b1 Mon Sep 17 00:00:00 2001 From: Deltatiger Date: Sat, 25 Jul 2015 23:26:28 +0530 Subject: [PATCH] Revert "Fix for #15" This reverts commit c9b3e9bfd317e3dc5eb5de81e281eea1823f5ed8. --- .gitignore | 1 - src/robotjs.cc | 110 ++++++++++++++++++++++++------------------------- 2 files changed, 55 insertions(+), 56 deletions(-) diff --git a/.gitignore b/.gitignore index 23f35783..3e2e84b0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ build/ node_modules/ -test_scripts/ \ No newline at end of file diff --git a/src/robotjs.cc b/src/robotjs.cc index f8426eb5..ccc36ff6 100644 --- a/src/robotjs.cc +++ b/src/robotjs.cc @@ -14,20 +14,20 @@ using namespace v8; /* - __ __ -| \/ | ___ _ _ ___ ___ + __ __ +| \/ | ___ _ _ ___ ___ | |\/| |/ _ \| | | / __|/ _ \ | | | | (_) | |_| \__ \ __/ |_| |_|\___/ \__,_|___/\___| */ -NAN_METHOD(moveMouse) +NAN_METHOD(moveMouse) { NanScope(); - if (args.Length() < 2) + if (args.Length() < 2) { - return NanThrowError("Invalid number of arguments."); + return NanThrowError("Invalid number of arguments."); } size_t x = args[0]->Int32Value(); size_t y = args[1]->Int32Value(); @@ -38,12 +38,12 @@ NAN_METHOD(moveMouse) NanReturnValue(NanNew("1")); } -NAN_METHOD(moveMouseSmooth) +NAN_METHOD(moveMouseSmooth) { NanScope(); - if (args.Length() < 2) + if (args.Length() < 2) { - return NanThrowError("Invalid number of arguments."); + return NanThrowError("Invalid number of arguments."); } size_t x = args[0]->Int32Value(); size_t y = args[1]->Int32Value(); @@ -54,7 +54,7 @@ NAN_METHOD(moveMouseSmooth) NanReturnValue(NanNew("1")); } -NAN_METHOD(getMousePos) +NAN_METHOD(getMousePos) { NanScope(); @@ -62,12 +62,12 @@ NAN_METHOD(getMousePos) //Return object with .x and .y. Local obj = NanNew(); - obj->Set(NanNew("x"), NanNew((int)pos.x)); - obj->Set(NanNew("y"), NanNew((int)pos.y)); + obj->Set(NanNew("x"), NanNew(pos.x)); + obj->Set(NanNew("y"), NanNew(pos.y)); NanReturnValue(obj); } -NAN_METHOD(mouseClick) +NAN_METHOD(mouseClick) { NanScope(); @@ -91,7 +91,7 @@ NAN_METHOD(mouseClick) } else { - return NanThrowError("Invalid mouse button specified."); + return NanThrowError("Invalid mouse button specified."); } } else if (args.Length() > 1) @@ -104,7 +104,7 @@ NAN_METHOD(mouseClick) NanReturnValue(NanNew("1")); } -NAN_METHOD(mouseToggle) +NAN_METHOD(mouseToggle) { NanScope(); @@ -125,7 +125,7 @@ NAN_METHOD(mouseToggle) } else { - return NanThrowError("Invalid mouse button state specified."); + return NanThrowError("Invalid mouse button state specified."); } } @@ -147,7 +147,7 @@ NAN_METHOD(mouseToggle) } else { - return NanThrowError("Invalid mouse button specified."); + return NanThrowError("Invalid mouse button specified."); } } else if (args.Length() > 2) @@ -161,15 +161,15 @@ NAN_METHOD(mouseToggle) } /* - _ __ _ _ + _ __ _ _ | |/ /___ _ _| |__ ___ __ _ _ __ __| | | ' // _ \ | | | '_ \ / _ \ / _` | '__/ _` | | . \ __/ |_| | |_) | (_) | (_| | | | (_| | |_|\_\___|\__, |_.__/ \___/ \__,_|_| \__,_| - |___/ + |___/ */ -int CheckKeyCodes(char* k, MMKeyCode *key) +int CheckKeyCodes(char* k, MMKeyCode *key) { if (!key) return -1; @@ -247,7 +247,7 @@ int CheckKeyCodes(char* k, MMKeyCode *key) } else if (strlen(k) == 1) { - *key = keyCodeForChar(*k); + *key = keyCodeForChar(*k); } else { @@ -257,31 +257,31 @@ int CheckKeyCodes(char* k, MMKeyCode *key) return 0; } -int CheckKeyFlags(char* f, MMKeyFlags* flags) +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 = MOD_NONE; } - else + else { return -2; } @@ -289,10 +289,10 @@ int CheckKeyFlags(char* f, MMKeyFlags* flags) return 0; } -NAN_METHOD(keyTap) +NAN_METHOD(keyTap) { NanScope(); - + MMKeyFlags flags = MOD_NONE; MMKeyCode key; @@ -304,7 +304,7 @@ NAN_METHOD(keyTap) k = *kstr; f = *fstr; - switch (args.Length()) + switch (args.Length()) { case 2: break; @@ -315,26 +315,26 @@ NAN_METHOD(keyTap) return NanThrowError("Invalid number of arguments."); } - if (f) + if (f) { - switch(CheckKeyFlags(f, &flags)) + switch(CheckKeyFlags(f, &flags)) { case -1: return NanThrowError("Null pointer in key flag."); break; case -2: - return NanThrowError("Invalid key flag specified."); + return NanThrowError("Invalid key flag specified."); break; } } - switch(CheckKeyCodes(k, &key)) + switch(CheckKeyCodes(k, &key)) { case -1: return NanThrowError("Null pointer in key code."); break; case -2: - return NanThrowError("Invalid key code specified."); + return NanThrowError("Invalid key code specified."); break; default: tapKeyCode(key, flags); @@ -345,13 +345,13 @@ NAN_METHOD(keyTap) } -NAN_METHOD(keyToggle) +NAN_METHOD(keyToggle) { NanScope(); MMKeyFlags flags = MOD_NONE; MMKeyCode key; - + char *k; bool down; char *f; @@ -362,7 +362,7 @@ NAN_METHOD(keyToggle) k = *kstr; f = *fstr; - switch (args.Length()) + switch (args.Length()) { case 3: break; @@ -373,26 +373,26 @@ NAN_METHOD(keyToggle) return NanThrowError("Invalid number of arguments."); } - if (f) + if (f) { - switch(CheckKeyFlags(f, &flags)) + switch(CheckKeyFlags(f, &flags)) { case -1: return NanThrowError("Null pointer in key flag."); break; case -2: - return NanThrowError("Invalid key flag specified."); + return NanThrowError("Invalid key flag specified."); break; } } - switch(CheckKeyCodes(k, &key)) + switch(CheckKeyCodes(k, &key)) { case -1: return NanThrowError("Null pointer in key code."); break; case -2: - return NanThrowError("Invalid key code specified."); + return NanThrowError("Invalid key code specified."); break; default: toggleKeyCode(key, down, flags); @@ -402,7 +402,7 @@ NAN_METHOD(keyToggle) NanReturnValue(NanNew("1")); } -NAN_METHOD(typeString) +NAN_METHOD(typeString) { NanScope(); @@ -417,15 +417,15 @@ NAN_METHOD(typeString) } /* - ____ - / ___| ___ _ __ ___ ___ _ __ - \___ \ / __| '__/ _ \/ _ \ '_ \ + ____ + / ___| ___ _ __ ___ ___ _ __ + \___ \ / __| '__/ _ \/ _ \ '_ \ ___) | (__| | | __/ __/ | | | |____/ \___|_| \___|\___|_| |_| - + */ -NAN_METHOD(getPixelColor) +NAN_METHOD(getPixelColor) { NanScope(); @@ -438,11 +438,11 @@ NAN_METHOD(getPixelColor) bitmap = copyMMBitmapFromDisplayInRect(MMRectMake(x, y, 1, 1)); color = MMRGBHexAtPoint(bitmap, 0, 0); - + char hex [7]; //Length needs to be 7 because snprintf includes a terminating null. - //Use %06x to pad hex value with leading 0s. + //Use %06x to pad hex value with leading 0s. snprintf(hex, 7, "%06x", color); destroyMMBitmap(bitmap); @@ -450,10 +450,10 @@ NAN_METHOD(getPixelColor) NanReturnValue(NanNew(hex)); } -NAN_METHOD(getScreenSize) +NAN_METHOD(getScreenSize) { NanScope(); - + //Get display size. MMSize displaySize = getMainDisplaySize(); @@ -466,7 +466,7 @@ NAN_METHOD(getScreenSize) NanReturnValue(obj); } -void init(Handle target) +void init(Handle target) { target->Set(NanNew("moveMouse"), @@ -486,7 +486,7 @@ void init(Handle target) target->Set(NanNew("keyTap"), NanNew(keyTap)->GetFunction()); - + target->Set(NanNew("keyToggle"), NanNew(keyToggle)->GetFunction());