xdotool 1.0.49 → 1.0.54

package/out/xdo.d.ts

@@ -57,6 +57,7 @@ export interface XdoTool {
     enterText: (win: string, text: string, delay: number, callback: XdoCallback<void>) => void;
     searchWindows: (search: IXdoSearch, callback: XdoCallback<string[]>) => void;
     getViewportDimensions: (screen: number, callback: XdoCallback<IXdoViewportDimensions>) => void;
+    getFocusedWindow: (callback: XdoCallback<XWindow>) => void;
     /**
      * Get the PID owning a window. Not all applications support this.
      * It looks at the _NET_WM_PID property of the window.
@@ -64,6 +65,7 @@ export interface XdoTool {
      * @return the process id or 0 if no pid found.
      */
     getWindowPID: (window: XWindow, callback: XdoCallback<number>) => void;
+    sync: (callback: XdoCallback<void>) => void;
     activateWindow: (window: XWindow, callback: XdoCallback<void>) => void;
     windowHasProperty: (window: XWindow, property: string, callback: XdoCallback<boolean>) => void;
 }
@@ -87,6 +89,8 @@ export default class XdoToolAsync extends AsyncWrapper {
     private readonly xdo;
     constructor(xdo: XdoTool);
     windowHasProperty(window: XWindow, property: string): Promise<boolean>;
+    getFocusedWindow(): Promise<XWindow>;
+    sync(): Promise<void>;
     enterText(window: XWindow, text: string, delay: number): Promise<void>;
     sendKeysequence(window: XWindow, sequence: string, delay: number): Promise<void>;
     activateWindow(window: XWindow): Promise<void>;

package/out/xdo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"xdo.d.ts","sourceRoot":"","sources":["../typescript/xdo.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"xdo.d.ts","sourceRoot":"","sources":["../typescript/xdo.ts"],"names":[],"mappings":"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"}

package/out/xdo.js

@@ -17,6 +17,12 @@ class XdoToolAsync extends AsyncWrapper_1.default {
     windowHasProperty(window, property) {
         return new Promise((resolve, reject) => (this.xdo.windowHasProperty(window, property, this.resolveOrReject(resolve, reject))));
     }
+    getFocusedWindow() {
+        return new Promise((resolve, reject) => (this.xdo.getFocusedWindow(this.resolveOrReject(resolve, reject))));
+    }
+    sync() {
+        return new Promise((resolve, reject) => (this.xdo.sync(this.resolveOrReject(resolve, reject))));
+    }
     enterText(window, text, delay) {
         return new Promise((resolve, reject) => (this.xdo.enterText(window, text, delay, this.resolveOrReject(resolve, reject))));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xdotool",
-  "version": "1.0.49",
+  "version": "1.0.54",
   "description": "C++ bindings for Node.js to handle X11 using the full power of libxdo.",
   "main": "./out/index.js",
   "typings": "./out/index.d.ts",
@@ -28,7 +28,6 @@
     "@types/node": "^12.12.12",
     "sarg": "^4.0.2",
     "ts-node": "^8.5.2",
-    "typedoc": "^0.15.3",
     "typescript": "4.3.x"
   },
   "dependencies": {

package/src/Keyboard.cpp

@@ -32,7 +32,8 @@ void XKeyboard::Init(Local<Object>exports) {
         { "constructor", Constructor },
         { "queryKeymap", QueryKeymap },
         { "keycodeToKeysym", KeycodeToKeysym },
-        { "keysymToString", KeysymToString }
+        { "keysymToString", KeysymToString },
+        { "getActiveKeysToKeycodeList", GetActiveKeysToKeycodeList }
     };
     Set(
         exports,
@@ -62,7 +63,12 @@ NAN_METHOD(XKeyboard::KeysymToString) {
         Nan::ThrowError("First argument must be a valid keysym");
         return;
     }
-    info.GetReturnValue().Set(New<String>(XKeysymToString(keysym)).ToLocalChecked());
+    char* result = XKeysymToString(keysym);
+    if(!result) {
+        Nan::ThrowError(std::string("Keysym " + std::to_string(keysym) + " does not exist").c_str());
+        return;
+    }
+    info.GetReturnValue().Set(New<String>(result).ToLocalChecked());
 }
 
 NAN_METHOD(XKeyboard::Constructor) {
@@ -100,3 +106,7 @@ Local<Value> XKeyboard::GetBuffer() {
     }
     return Nan::New(arrayBuffer);
 }
+
+NAN_METHOD(XKeyboard::GetActiveKeysToKeycodeList) {
+
+}

package/src/Keyboard.h

@@ -18,6 +18,7 @@ private:
     static NAN_METHOD(Constructor);
     static NAN_METHOD(KeycodeToKeysym);
     static NAN_METHOD(KeysymToString);
+    static NAN_METHOD(GetActiveKeysToKeycodeList);
 };
 
 #endif // NODE_XDOTOOL_KEYBOARD_H_

package/src/Screenshooter.h

@@ -3,8 +3,6 @@
 
 #include "XService.h"
 
-#include <boost/optional.hpp>
-
 class XScreenshooter : public XService {
 public:
     XScreenshooter(Display*, Window);

package/src/TypeConverter.cpp

@@ -9,6 +9,7 @@ using v8::Local;
 using v8::Value;
 using v8::Object;
 using v8::Int32;
+using v8::Number;
 using v8::Uint32;
 using v8::Isolate;
 
@@ -75,9 +76,7 @@ bool TypeConverter::GetInt32(Local<Object> obj, const char* prop, int32_t* out_n
     if(value->IsUndefined() || !value->IsInt32()) {
         return false;
     }
-    if(!value->Int32Value(Nan::GetCurrentContext()).To(out_n)) {
-        std::cerr << "Received empty value for property name: " << prop << std::endl;
-    }
+    *out_n = Nan::To<Int32>(value).ToLocalChecked()->Value();
     return true;
 }
 
@@ -106,3 +105,11 @@ bool TypeConverter::GetUint32(Local<Value> val, uint32_t& out) {
     out = To<Uint32>(val).ToLocalChecked()->Value();
     return true;
 }
+
+bool TypeConverter::GetDouble(v8::Local<v8::Value> val, double& out) {
+    if(!val->IsNumber()) {
+        return false;
+    }
+    out = Nan::To<v8::Number>(val).ToLocalChecked()->Value();
+    return true;
+}

package/src/TypeConverter.h

@@ -11,6 +11,7 @@ public:
     static bool GetString(v8::Local<v8::Object>, const char*, char**);
     static bool GetInt32(v8::Local<v8::Object>, const char*, int32_t*);
     static bool GetInt32(v8::Local<v8::Value>, int32_t&);
+    static bool GetDouble(v8::Local<v8::Value>, double&);
     static bool GetUint32(v8::Local<v8::Value> val, uint32_t&);
     static bool GetBool(v8::Local<v8::Object>, const char*, bool*);
     static bool GetWindow(v8::Local<v8::Value> value, Window&);

package/src/XService.cpp

@@ -6,7 +6,3 @@ using v8::Isolate;
 using Nan::New;
 
 XService::XService(Display* display): display(display) {}
-
-Display* XService::GetDisplay() {
-    return display;
-}

package/src/XService.h

@@ -6,10 +6,9 @@
 
 class XService : public Nan::ObjectWrap, public ResourceManager {
 public:
+    Display* display;
     explicit XService(Display*);
-    Display* GetDisplay();
 protected:
-    Display* display;
 };
 
 #endif // NODE_XDOTOOL_X_SERVICE_H_

package/src/XdoTool.cpp

@@ -11,6 +11,8 @@
 #include "ClassCreator.h"
 #include "TypeConverter.h"
 #include "XdoToolTaskWorker.h"
+#include "tasks/Sync.h"
+#include "tasks/GetFocusedWindow.h"
 
 #include <iostream>
 
@@ -38,14 +40,10 @@ XdoTool::~XdoTool() {
 }
 
 NAN_METHOD(XdoTool::GetViewportDimensions) {
-    if(!info[0]->IsNumber()) {
-        Nan::ThrowError("First argument must be a valid number");
-        return;
-    }
-
     int screen;
-    if(!info[0]->Int32Value(GetCurrentContext()).To(&screen)) {
-        std::cerr << "Empty value for screen" << std::endl;
+    if(!TypeConverter::GetInt32(info[0], screen)){
+        Nan::ThrowError("First argument must be a valid integer");
+        return;
     }
     XdoTool* tool;
     if(!TypeConverter::Unwrap(info.This(),&tool)) {
@@ -58,22 +56,26 @@ NAN_METHOD(XdoTool::GetViewportDimensions) {
 }
 
 NAN_METHOD(XdoTool::SendKeysequence) {
-    XdoTool* tool;
+    XdoTool* tool = nullptr;
+    char* keySequence = nullptr;
+    Window window;
+    int32_t delay;
     if(!TypeConverter::Unwrap(info.This(),&tool)) {
         Nan::ThrowError("Method called in invalid context");
         return;
     }
-    Window window;
     if(!TypeConverter::GetWindow(info[0],window)) {
         Nan::ThrowError("First argument must be a valid window identifier");
         return;
     }
-    char* keySequence;
     if(!TypeConverter::GetString(info[1], &keySequence)) {
         Nan::ThrowError("Second parameter must be a valid string");
         return;
     }
-    auto delay = info[2]->Int32Value(Nan::GetCurrentContext()).ToChecked();
+    if(!TypeConverter::GetInt32(info[2], delay)) {
+        Nan::ThrowError("Third parameter must be a valid integer");
+        return;
+    }
     auto callback = new Callback(To<Function>(info[3]).ToLocalChecked());
     auto task = new XdoToolTask_SendKeysequence(tool->xdo, window, keySequence, delay);
     AsyncQueueWorker(new XdoToolTaskWorker(callback, task));
@@ -183,6 +185,17 @@ NAN_METHOD(XdoTool::EnterText) {
     AsyncQueueWorker(new XdoToolTaskWorker(callback, task));
 }
 
+NAN_METHOD(XdoTool::GetFocusedWindow) {
+    XdoTool* tool;
+    if(!TypeConverter::Unwrap(info.This(),&tool)) {
+        Nan::ThrowError("Method called in invalid context");
+        return;
+    }
+    auto task = new XdoToolTask_GetFocusedWindow(tool->xdo);
+    auto callback = new Callback(To<Function>(info[0]).ToLocalChecked());
+    AsyncQueueWorker(new XdoToolTaskWorker(callback,task));
+}
+
 void XdoTool::Init(Local<Object> exports) {
     std::map<std::string, FunctionCallback> methods {
         { "constructor", Constructor },
@@ -190,7 +203,9 @@ void XdoTool::Init(Local<Object> exports) {
         { "searchWindows", SearchWindows },
         { "getWindowPID", GetWindowPID },
         { "moveMouse", MoveMouse },
+        { "getFocusedWindow", GetFocusedWindow },
         { "enterText", EnterText },
+        { "sync", Sync },
         { "sendKeysequence", SendKeysequence },
         { "windowHasProperty", WindowHasProperty },
         { "activateWindow", ActivateWindow },
@@ -304,4 +319,15 @@ NAN_METHOD(XdoTool::GetMouseLocation) {
     auto task = new XdoToolTask_GetMouseLocation(tool->xdo);
     auto callback = new Nan::Callback(Nan::To<Function>(info[0]).ToLocalChecked());
     AsyncQueueWorker(new XdoToolTaskWorker(callback, task));
-}
+}
+
+NAN_METHOD(XdoTool::Sync) {
+    XdoTool* tool;
+    if(!TypeConverter::Unwrap(info.This(),&tool)) {
+        Nan::ThrowError("Method called in invalid context");
+        return;
+    }
+    auto task = new XdoToolTask_Sync(tool->xdo->xdpy);
+    auto callback = new Nan::Callback(Nan::To<Function>(info[0]).ToLocalChecked());
+    AsyncQueueWorker(new XdoToolTaskWorker(callback, task));
+}

package/src/XdoTool.h

@@ -15,12 +15,14 @@ private:
     static NAN_METHOD(Constructor);
     static NAN_METHOD(SearchWindows);
     static NAN_METHOD(GetWindowPID);
+    static NAN_METHOD(GetFocusedWindow);
     static NAN_METHOD(GetMouseLocation);
     static NAN_METHOD(SendKeysequence);
     static NAN_METHOD(GetViewportDimensions);
     static NAN_METHOD(MoveMouse);
     static NAN_METHOD(ActivateWindow);
     static NAN_METHOD(EnterText);
+    static NAN_METHOD(Sync);
     static NAN_METHOD(WindowHasProperty);
 };
 

package/src/main.cpp

@@ -1,5 +1,4 @@
 #include <nan.h>
-#include <nan_object_wrap.h>
 
 #include "Screenshooter.h"
 #include "Keyboard.h"

package/src/tasks/GetActiveKeysToKeycodeList.cpp

@@ -0,0 +1,25 @@
+//
+// Created by victor on 7/22/21.
+//
+
+#include "GetActiveKeysToKeycodeList.h"
+
+using v8::Local;
+using v8::Value;
+
+void GetActiveKeysToKeycodeList::Execute() {
+    if(xdo_get_active_keys_to_keycode_list(xdo,&keys,&key_count) !=XDO_SUCCESS){
+        SetFailure("Failed to get active keys to keycode list");
+    }
+}
+
+GetActiveKeysToKeycodeList::GetActiveKeysToKeycodeList(XKeyboard* kbd):
+    XTask(kbd->display),
+    kbd(kbd)
+{
+
+}
+
+Local<Value> GetActiveKeysToKeycodeList::GetResult() {
+    return Nan::Null();
+}

package/src/tasks/GetActiveKeysToKeycodeList.h

@@ -0,0 +1,19 @@
+#ifndef NODE_XDOTOOL_GETACTIVEKEYSTOKEYCODELIST_H
+#define NODE_XDOTOOL_GETACTIVEKEYSTOKEYCODELIST_H
+
+#include "../XTask.h"
+#include "../Keyboard.h"
+
+class GetActiveKeysToKeycodeList : public XTask {
+public:
+    explicit GetActiveKeysToKeycodeList(XKeyboard*);
+    void Execute() override;
+    v8::Local<v8::Value> GetResult() override;
+private:
+    XKeyboard* kbd;
+    xdo_t* xdo;
+    charcodemap_t* keys;
+    int key_count;
+};
+
+#endif //NODE_XDOTOOL_GETACTIVEKEYSTOKEYCODELIST_H

package/src/tasks/GetFocusedWindow.cpp

@@ -0,0 +1,20 @@
+#include "GetFocusedWindow.h"
+
+
+XdoToolTask_GetFocusedWindow::XdoToolTask_GetFocusedWindow(xdo_t* xdo):
+    XdoToolTask(xdo),
+    result(0)
+{}
+
+void XdoToolTask_GetFocusedWindow::Execute() {
+    if(xdo_get_focused_window_sane(xdo,&result) != XDO_SUCCESS) {
+        SetFailure("Failed to get focused window");
+    }
+}
+
+v8::Local<v8::Value> XdoToolTask_GetFocusedWindow::GetResult() {
+    return Nan::New<v8::Number>(result);
+}
+
+
+

package/src/tasks/GetFocusedWindow.h

@@ -0,0 +1,17 @@
+#ifndef NODE_XDOTOOL_GETFOCUSEDWINDOW_H
+#define NODE_XDOTOOL_GETFOCUSEDWINDOW_H
+
+
+#include "../XdoToolTask.h"
+
+class XdoToolTask_GetFocusedWindow : public XdoToolTask {
+public:
+    explicit XdoToolTask_GetFocusedWindow(xdo_t*);
+    void Execute() override;
+    v8::Local<v8::Value> GetResult() override;
+private:
+    Window result;
+};
+
+
+#endif //NODE_XDOTOOL_GETFOCUSEDWINDOW_H

package/src/tasks/GetImage.cpp

@@ -4,7 +4,7 @@ using v8::Local;
 using v8::Value;
 using v8::ArrayBuffer;
 
-XdoToolTask_GetImage::XdoToolTask_GetImage(XScreenshooter* screenshooter): XTask(screenshooter->GetDisplay()), screenshooter(screenshooter) {
+XdoToolTask_GetImage::XdoToolTask_GetImage(XScreenshooter* screenshooter): XTask(screenshooter->display), screenshooter(screenshooter) {
 }
 
 void XdoToolTask_GetImage::Execute() {

package/src/tasks/QueryKeymap.cpp

@@ -5,7 +5,7 @@
 using v8::Local;
 using v8::Value;
 
-XTask_QueryKeymap::XTask_QueryKeymap(XKeyboard* keyboard): XTask(keyboard->GetDisplay()), keyboard(keyboard) {
+XTask_QueryKeymap::XTask_QueryKeymap(XKeyboard* keyboard): XTask(keyboard->display), keyboard(keyboard) {
 }
 
 void XTask_QueryKeymap::Execute() {

package/src/tasks/Sync.cpp

@@ -0,0 +1,17 @@
+//
+// Created by victor on 7/22/21.
+//
+
+#include "Sync.h"
+
+void XdoToolTask_Sync::Execute() {
+    XSync(display,0);
+}
+
+v8::Local<v8::Value> XdoToolTask_Sync::GetResult() {
+    return Nan::Undefined();
+}
+
+XdoToolTask_Sync::XdoToolTask_Sync(Display* display) : XTask(display){
+
+}

package/src/tasks/Sync.h

@@ -0,0 +1,19 @@
+//
+// Created by victor on 7/22/21.
+//
+
+#ifndef NODE_XDOTOOL_SYNC_H
+#define NODE_XDOTOOL_SYNC_H
+
+
+#include "../XTask.h"
+
+class XdoToolTask_Sync : public XTask {
+public:
+    explicit XdoToolTask_Sync(Display*);
+    void Execute() override;
+    v8::Local<v8::Value> GetResult() override;
+};
+
+
+#endif //NODE_XDOTOOL_SYNC_H