fix x11 c bool define for c++ usage ; add screen bounds check on mac osx

Author: pythoneer

XInputSimulator/xinputsimulatorimpllinux.cpp

@@ -17,6 +17,8 @@
 
 #ifdef __linux__
 
+#include <unistd.h> //usleep
+
 #include "xinputsimulatorimpllinux.h"
 #include "notimplementedexception.h"
 #include <iostream>
@@ -25,6 +27,8 @@
 #include <stdio.h>
 #include <cstring>
 
+
+
 XInputSimulatorImplLinux::XInputSimulatorImplLinux()
 {
     if((display = XOpenDisplay(NULL)) == NULL) {
@@ -33,6 +37,13 @@ XInputSimulatorImplLinux::XInputSimulatorImplLinux()
     }
 
     root = DefaultRootWindow(display);
+
+    Screen* pscr = DefaultScreenOfDisplay( display );
+
+    this->displayX = pscr->width;
+    this->displayY = pscr->height;
+
+    //XCloseDisplay( pdsp );
 }
 
 void XInputSimulatorImplLinux::initMouseEvent(int button)
@@ -77,27 +88,20 @@ void XInputSimulatorImplLinux::mouseMoveRelative(int x, int y)
 
 void XInputSimulatorImplLinux::mouseDown(int button)
 {
-    this->initMouseEvent(button);
-
-    event.type = ButtonPress;
-    if (XSendEvent(display, PointerWindow, True, ButtonPressMask, &event) == 0)
-        std::cout << "Error to send the event!\n";
+    XTestFakeButtonEvent(display, button, true, CurrentTime);
     XFlush(display);
 }
 
 void XInputSimulatorImplLinux::mouseUp(int button)
 {
-    this->initMouseEvent(button);
-
-    event.type = ButtonRelease;
-    if (XSendEvent(display, PointerWindow, True, ButtonReleaseMask, &event) == 0)
-       std::cout <<  "Error to send the event!\n";
+    XTestFakeButtonEvent(display, button, false, CurrentTime);
     XFlush(display);
 }
 
 void XInputSimulatorImplLinux::mouseClick(int button)
 {
     this->mouseDown(button);
+    usleep(100);
     this->mouseUp(button);
 }
 //kajsdölfkjasdölfkjasldökfjaölsdkjfalsdkjfalskdjfaldskjfkajsdölfkjasdölfkjasldökfjaölsdkjfalsdkjfalskdjfaldskjfkajsdölfkjasdölfkjasldökfjaölsdkjfalsdkjfalskdjfaldskjfkajsdölfkjasdölfkjasldökfjaölsdkjfalsdkjfalskdjfaldskjfkajsdölfkjasdölfkjasldökfjaölsdkjfalsdkjfalskdjfaldskjfkajsdölfkjasdölfkjasldökfjaölsdkjfalsdkjfalskdjfaldskjfkajsdölfkjasdölfkjasldökfjaölsdkjfalsdkjfalskdjfaldskjfkajsdölfkjasdölfkjasldökfjaölsdkjfalsdkjfalskdjfaldskjfkajsdölfkjasdölfkjasldökfjaölsdkjfalsdkjfalskdjfaldskjfkajsdölfkjasdölfkjasldökfjaölsdkjfalsdkjfalskdjfaldskjfkajsdölfkjasdölfkjasldökfjaölsdkjfalsdkjfalskdjfaldskjfkajsdölfkjasdölfkjasldökfjaölsdkjfalsdkjfalskdjfaldskjfkajsdölfkjasdölfkjasldökfjaölsdkjfalsdkjfalskdjfaldskjfkajsdölfkjasdölfkjasldökfjaölsdkjfalsdkjfalskdjfaldskjfkajsdölfkjasdölfkjasldökfjaölsdkjfalsdkjfalskdjfaldskjfkajsdölfkjasdölfkjasldökfjaölsdkjfalsdkjfalskdjfaldskjfkajsdölfkjasdölfkjasldökfjaölsdkjfalsdkjfalskdjfaldskjf
@@ -141,22 +145,20 @@ void XInputSimulatorImplLinux::mouseScrollY(int length)
 
 void XInputSimulatorImplLinux::keyDown(int key)
 {
-    //throw NotImplementedException();
     XTestFakeKeyEvent(display, key, True, 0);
     XFlush(display);
 }
 
 void XInputSimulatorImplLinux::keyUp(int key)
 {
-    //throw NotImplementedException();
     XTestFakeKeyEvent(display, key, False, 0);
     XFlush(display);
 }
 
 void XInputSimulatorImplLinux::keyClick(int key)
 {
     std::cout << "key click: " << key << std::endl;
-    //throw NotImplementedException();
+
     this->keyDown(key);
     this->keyUp(key);
 }
@@ -165,31 +167,15 @@ int XInputSimulatorImplLinux::charToKeyCode(char key_char)
 {
     std::cout << "cchar: " << (int)key_char << std::endl;
 
-    //throw NotImplementedException();
-
-//    KeySym sym = XStringToKeysym(&key_char);
-
-//    std::cout << "sym: " << sym << std::endl;
-
     int keyCode = XKeysymToKeycode(display, key_char);
     std::cout << "ccode: " << keyCode << std::endl;
 
     return keyCode;
 }
 void XInputSimulatorImplLinux::keySequence(const std::string &sequence)
 {
-    //throw NotImplementedException();
-
     std::cout << "key seq: " << sequence << std::endl;
 
-    //c++11 training
-//    for(auto it = sequence.begin(); it != sequence.end(); ++it) {
-//        std::cout << "key org: " << (int)(*it) << std::endl;
-//        int keyCode = this->charToKeyCode(*it);
-//        std::cout << "key code: " << keyCode << std::endl;
-//        this->keyClick(keyCode);
-//    }
-    //c++11 better
     for(const char c : sequence) {
         std::cout << "cahr: " << c << std::endl;
         int keyCode = this->charToKeyCode(c);

XInputSimulator/xinputsimulatorimpllinux.h

@@ -25,6 +25,8 @@
 #include <X11/keysym.h>
 #include <X11/extensions/XTest.h>
 
+#undef Bool //fix C #define Bool int in C++ Qt moc from x11
+
 #include "xinputsimulatorimpl.h"
 
 class XInputSimulatorImplLinux : public XInputSimulatorImpl
@@ -34,6 +36,9 @@ class XInputSimulatorImplLinux : public XInputSimulatorImpl
     Window root;
     XEvent event;
 
+    size_t displayX;
+    size_t displayY;
+
     void initMouseEvent(int button);
 
 public:

XInputSimulator/xinputsimulatorimplmacos.cpp

@@ -29,15 +29,21 @@
 #include "xinputsimulatorimplmacos.h"
 #include "notimplementedexception.h"
 
+#include <QDebug>
 
 
 XInputSimulatorImplMacOs::XInputSimulatorImplMacOs()
 {
     //TODO
     //this->initCurrentMousePosition();
-
+    std::cout << "constructor " << std::endl;
     this->currentX = 500;
     this->currentY = 500;
+
+    CGDirectDisplayID displayID = CGMainDisplayID();
+
+    this->displayX = CGDisplayPixelsWide(displayID);
+    this->displayY = CGDisplayPixelsHigh(displayID);
 }
 
 //void XInputSimulatorImplMacOs::initMouseEvent(int button)
@@ -53,6 +59,8 @@ void XInputSimulatorImplMacOs::initCurrentMousePosition()
 void XInputSimulatorImplMacOs::mouseMoveTo(int x, int y)
 {
 
+    //TODO screen check see moveRelative
+
     CGEventRef mouseEv = CGEventCreateMouseEvent(
                 NULL, kCGEventMouseMoved,
                 CGPointMake(x, y),
@@ -73,6 +81,12 @@ void XInputSimulatorImplMacOs::mouseMoveRelative(int x, int y)
     int newX = this->currentX + x;
     int newY = this->currentY + y;
 
+    if(newX < 0 || newX > this->displayX || newY < 0 || newY > this->displayY )
+    {
+        std::cout << "mouse moved beyound screensize." << endl;
+        return;
+    }
+
     std::cout << "newx: " << newX << " newy: " << newY << std::endl;
 
     CGEventRef mouseEv = CGEventCreateMouseEvent(

XInputSimulator/xinputsimulatorimplmacos.h

@@ -29,6 +29,9 @@ class XInputSimulatorImplMacOs : public XInputSimulatorImpl
     int currentX;
     int currentY;
 
+    size_t displayX;
+    size_t displayY;
+
     void initCurrentMousePosition();
 
 public: