xdotool 1.0.52 → 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.
@@ -88,6 +89,7 @@ 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>;

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":"AACA,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,oBAAY,OAAO,GAAG,MAAM,CAAC;AAE7B,MAAM,WAAW,sBAAsB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAClB;AAED,oBAAY,iBAAiB;IACzB,SAAS,IAAA;IACT,SAAS,IAAA;CACZ;AAED,MAAM,WAAW,UAAU;IACvB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,cAAc;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,iBAAiB;IAC9B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,oBAAY,WAAW,CAAC,CAAC,IAAI,CACzB,GAAG,EAAE,KAAK,GAAG,SAAS,EACtB,KAAK,EAAE,CAAC,KACP,IAAI,CAAC;AAEV,MAAM,WAAW,OAAO;IACpB,gBAAgB,EAAE,CACd,QAAQ,EAAE,WAAW,CAAC,cAAc,CAAC,KACpC,IAAI,CAAC;IACV,eAAe,EAAE,CACb,MAAM,EAAE,OAAO,EACf,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,WAAW,CAAC,IAAI,CAAC,KAC1B,IAAI,CAAC;IACV,SAAS,EAAE,CACP,IAAI,EAAE,iBAAiB,EACvB,QAAQ,EAAE,WAAW,CAAC,IAAI,CAAC,KAC1B,IAAI,CAAC;IACV,SAAS,EAAE,CACP,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,WAAW,CAAC,IAAI,CAAC,KAC1B,IAAI,CAAC;IACV,aAAa,EAAE,CACX,MAAM,EAAE,UAAU,EAClB,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,KAC9B,IAAI,CAAC;IACV,qBAAqB,EAAE,CACnB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,WAAW,CAAC,sBAAsB,CAAC,KAC5C,IAAI,CAAC;IACV,gBAAgB,EAAE,CAAC,QAAQ,EAAE,WAAW,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC;IAC3D;;;;;OAKG;IACH,YAAY,EAAE,CACV,MAAM,EAAE,OAAO,EACf,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,KAC5B,IAAI,CAAC;IACV,IAAI,EAAE,CAAC,QAAQ,EAAE,WAAW,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC;IAC5C,cAAc,EAAE,CACZ,MAAM,EAAE,OAAO,EACf,QAAQ,EAAE,WAAW,CAAC,IAAI,CAAC,KAC1B,IAAI,CAAC;IACV,iBAAiB,EAAE,CACf,MAAM,EAAE,OAAO,EACf,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,WAAW,CAAC,OAAO,CAAC,KAC7B,IAAI,CAAC;CACb;AAED,MAAM,WAAW,SAAS;IACtB,WAAW,EAAE,CACT,QAAQ,EAAE,WAAW,CAAC,WAAW,CAAC,KACjC,IAAI,CAAC;IACV,eAAe,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC;IAC7C,cAAc,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,CAAC;CAC9C;AAED,MAAM,WAAW,QAAQ;IACrB,OAAO,EAAE;QACL,QAAO,OAAO,CAAC;KAClB,CAAC;IACF,aAAa,EAAE;QACX,KAAI,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,cAAc,CAAC;KACvD,CAAC;IACF,QAAQ,EAAE;QACN,KAAI,GAAG,EAAE,OAAO,GAAG,SAAS,CAAC;KAChC,CAAC;CACL;AAED,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,YAAY;IAC/B,OAAO,CAAC,QAAQ,CAAC,GAAG;gBAAH,GAAG,EAAE,OAAO;IAGzC,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAStE,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC;IAOpC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAQrB,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWtE,eAAe,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWhF,cAAc,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAS9C,SAAS,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAMjD,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAM7C,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAStE,gBAAgB,IAAI,OAAO,CAAC,cAAc,CAAC;IAM3C,aAAa,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAQ9D;AAED,QAAA,MACI,OAAO,YA3GI,OAAO,EA4GlB,aAAa,YAzGA,OAAO,kCAAqB,cAAc,EA0GvD,QAAQ,YAvGK,OAAO,KAAG,SA8GzB,CAAC;AAEH,OAAO,EACH,OAAO,IAAI,eAAe,EAC1B,aAAa,EACb,QAAQ,EACX,CAAC"}

package/out/xdo.js

@@ -17,6 +17,9 @@ 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))));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xdotool",
-  "version": "1.0.52",
+  "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",

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/XdoTool.cpp

@@ -12,6 +12,7 @@
 #include "TypeConverter.h"
 #include "XdoToolTaskWorker.h"
 #include "tasks/Sync.h"
+#include "tasks/GetFocusedWindow.h"
 
 #include <iostream>
 
@@ -184,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 },
@@ -191,6 +203,7 @@ void XdoTool::Init(Local<Object> exports) {
         { "searchWindows", SearchWindows },
         { "getWindowPID", GetWindowPID },
         { "moveMouse", MoveMouse },
+        { "getFocusedWindow", GetFocusedWindow },
         { "enterText", EnterText },
         { "sync", Sync },
         { "sendKeysequence", SendKeysequence },

package/src/XdoTool.h

@@ -15,6 +15,7 @@ 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);

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/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