MrBesen
/
XInputSimulator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge conflict

This commit is contained in:
Dustin Bensing 2013-07-16 14:06:42 +02:00
parent fd0dcf1ff2 a19473c46f
commit b5d69131b5
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
XInputSimulator/xinputsimulator.h
View File

@ -29,7 +29,7 @@
#elif __APPLE__ #elif __APPLE__
#include "xinputsimulatorimplmacos.h" #include "xinputsimulatorimplmacos.h"
#elif _WIN32 #elif _WIN32
#include "xinputsimularotimplwin.h" #include "xinputsimulatorimplwin.h"
#endif #endif
class XInputSimulator class XInputSimulator
@ -63,7 +63,7 @@ public:
#elif __APPLE__ #elif __APPLE__
instance.implementation = new XInputSimulatorImplMacOs; instance.implementation = new XInputSimulatorImplMacOs;
#elif _WIN32 #elif _WIN32
instance.implementation = new XInputSimularotImplWin; instance.implementation = new XInputSimulatorImplWin;
#endif #endif
return instance; return instance;
} }

25
XInputSimulator/xinputsimulatorimplwin.cpp
View File

@ -18,7 +18,7 @@
#ifdef _WIN32 #ifdef _WIN32
#include "xinputsimularotimplwin.h" #include "xinputsimulatorimplwin.h"
#include "notimplementedexception.h" #include "notimplementedexception.h"
#include <iostream> #include <iostream>
@ -26,12 +26,12 @@
#define MOUSEEVENTF_HWHEEL 0x01000 #define MOUSEEVENTF_HWHEEL 0x01000
XInputSimularotImplWin::XInputSimularotImplWin() XInputSimulatorImplWin::XInputSimulatorImplWin()
{ {
this->initCurrentMousePosition(); this->initCurrentMousePosition();
} }
void XInputSimularotImplWin::initCurrentMousePosition() void XInputSimulatorImplWin::initCurrentMousePosition()
{ {
POINT p; POINT p;
if (GetCursorPos(&p)) if (GetCursorPos(&p))
@ -41,8 +41,7 @@ void XInputSimularotImplWin::initCurrentMousePosition()
} }
} }
void XInputSimulatorImplWin::mouseMoveTo(int x, int y)
void XInputSimularotImplWin::mouseMoveTo(int x, int y)
{ {
SetCursorPos(x, y); SetCursorPos(x, y);
@ -50,7 +49,7 @@ void XInputSimularotImplWin::mouseMoveTo(int x, int y)
this->currentY = y; this->currentY = y;
} }
void XInputSimularotImplWin::mouseMoveRelative(int x, int y) void XInputSimulatorImplWin::mouseMoveRelative(int x, int y)
{ {
int newX = this->currentX + x; int newX = this->currentX + x;
int newY = this->currentY + y; int newY = this->currentY + y;
@ -62,7 +61,7 @@ void XInputSimularotImplWin::mouseMoveRelative(int x, int y)
} }
//TODO use the button from parameter list //TODO use the button from parameter list
void XInputSimularotImplWin::mouseDown(int button) void XInputSimulatorImplWin::mouseDown(int button)
{ {
INPUT in={0}; INPUT in={0};
in.type = INPUT_MOUSE; in.type = INPUT_MOUSE;
@ -72,7 +71,7 @@ void XInputSimularotImplWin::mouseDown(int button)
} }
//TODO use the button from parameter list //TODO use the button from parameter list
void XInputSimularotImplWin::mouseUp(int button) void XInputSimulatorImplWin::mouseUp(int button)
{ {
INPUT in={0}; INPUT in={0};
in.type = INPUT_MOUSE; in.type = INPUT_MOUSE;
@ -82,14 +81,14 @@ void XInputSimularotImplWin::mouseUp(int button)
} }
//TODO use the button from parameter list //TODO use the button from parameter list
void XInputSimularotImplWin::mouseClick(int button) void XInputSimulatorImplWin::mouseClick(int button)
{ {
this->mouseDown(button); this->mouseDown(button);
//std::this_thread::sleep_for(std::chrono::milliseconds(1000)); //std::this_thread::sleep_for(std::chrono::milliseconds(1000));
this->mouseUp(button); 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 //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
void XInputSimularotImplWin::mouseScrollX(int length) void XInputSimulatorImplWin::mouseScrollX(int length)
{ {
int scrollDirection = 1 * 50; // 1 left -1 right int scrollDirection = 1 * 50; // 1 left -1 right
@ -112,7 +111,7 @@ void XInputSimularotImplWin::mouseScrollX(int length)
} }
} }
void XInputSimularotImplWin::mouseScrollY(int length) void XInputSimulatorImplWin::mouseScrollY(int length)
{ {
int scrollDirection = -1 * 50; // 1 up -1 down int scrollDirection = -1 * 50; // 1 up -1 down
@ -135,12 +134,12 @@ void XInputSimularotImplWin::mouseScrollY(int length)
} }
} }
void XInputSimularotImplWin::keyDown(int key) void XInputSimulatorImplWin::keyDown(int key)
{ {
throw NotImplementedException(); throw NotImplementedException();
} }
void XInputSimularotImplWin::keyUp(int key) void XInputSimulatorImplWin::keyUp(int key)
{ {
throw NotImplementedException(); throw NotImplementedException();
} }

13
XInputSimulator/xinputsimulatorimplwin.h
View File

@ -17,12 +17,12 @@
#ifdef _WIN32 #ifdef _WIN32
#ifndef XINPUTSIMULAROTIMPLWIN_H #ifndef XINPUTSIMULATORIMPLWIN_H
#define XINPUTSIMULAROTIMPLWIN_H #define XINPUTSIMULATORIMPLWIN_H
#include "xinputsimulatorimpl.h" #include "xinputsimulatorimpl.h"
class XInputSimularotImplWin: public XInputSimulatorImpl class XInputSimulatorImplWin: public XInputSimulatorImpl
{ {
private: private:
int currentX; int currentX;
@ -31,8 +31,8 @@ private:
void initCurrentMousePosition(); void initCurrentMousePosition();
public: public:
XInputSimularotImplWin(); XInputSimulatorImplWin();
~XInputSimularotImplWin(){} ~XInputSimulatorImplWin(){}
virtual void mouseMoveTo(int x, int y) override; virtual void mouseMoveTo(int x, int y) override;
virtual void mouseMoveRelative(int x, int y) override; virtual void mouseMoveRelative(int x, int y) override;
@ -46,6 +46,7 @@ public:
virtual void keyUp(int key) override; virtual void keyUp(int key) override;
}; };
#endif // XINPUTSIMULAROTIMPLWIN_H
#endif // XINPUTSIMULATORIMPLWIN_H
#endif //win #endif //win