From ea70f162ade7d200868ea09497bb375b4e23e8da Mon Sep 17 00:00:00 2001 From: Dustin Bensing Date: Tue, 16 Jul 2013 19:39:22 +0200 Subject: [PATCH] changes --- XInputSimulator/xinputsimulator.cpp | 22 ++++++++++++++++++++ XInputSimulator/xinputsimulator.h | 13 ++++++++---- XInputSimulator/xinputsimulatorimpl.h | 7 +++++++ XInputSimulator/xinputsimulatorimpllinux.cpp | 14 +++++++++++++ XInputSimulator/xinputsimulatorimpllinux.h | 4 ++++ XInputSimulator/xinputsimulatorimplmacos.cpp | 14 +++++++++++++ XInputSimulator/xinputsimulatorimplmacos.h | 4 ++++ XInputSimulator/xinputsimulatorimplwin.cpp | 14 +++++++++++++ XInputSimulator/xinputsimulatorimplwin.h | 4 ++++ 9 files changed, 92 insertions(+), 4 deletions(-) diff --git a/XInputSimulator/xinputsimulator.cpp b/XInputSimulator/xinputsimulator.cpp index 117f54e..0a6e7e8 100644 --- a/XInputSimulator/xinputsimulator.cpp +++ b/XInputSimulator/xinputsimulator.cpp @@ -17,6 +17,10 @@ #include "xinputsimulator.h" + +//*************************************************// +//******************M O U S E**********************// +//*************************************************// void XInputSimulator::mouseMoveTo(int x, int y) { implementation->mouseMoveTo(x, y); @@ -52,6 +56,10 @@ void XInputSimulator::mouseScrollY(int length) implementation->mouseScrollY(length); } +//*************************************************// +//***************K E Y B O A R D*******************// +//*************************************************// + void XInputSimulator::keyDown(int key) { implementation->keyDown(key); @@ -62,3 +70,17 @@ void XInputSimulator::keyUp(int key) implementation->keyUp(key); } +void XInputSimulator::keyClick(int key) +{ + implementation->keyClick(key); +} + +void XInputSimulator::charToKeyCode(char key_char) +{ + implementation->charToKeyCode(key_char); +} + +void XInputSimulator::keySequence(const std::string &sequence) +{ + implementation->keySequence(sequence); +} diff --git a/XInputSimulator/xinputsimulator.h b/XInputSimulator/xinputsimulator.h index 7a15fca..d582c7f 100644 --- a/XInputSimulator/xinputsimulator.h +++ b/XInputSimulator/xinputsimulator.h @@ -60,10 +60,6 @@ public: return instance; } - static const int LEFT_MOUSE_BUTTON = 1; - static const int RIGHT_MOUSE_BUTTON = 2; - static const int MIDDLE_MOUSE_BUTTON = 3; - void mouseMoveTo(int x, int y); void mouseMoveRelative(int x, int y); void mouseDown(int button); @@ -74,6 +70,15 @@ public: void keyDown(int key); void keyUp(int key); + void keyClick(int key); + + void charToKeyCode(char key_char); + void keySequence(const std::string &sequence); + + // mouse + static const int LEFT_MOUSE_BUTTON = 1; + static const int RIGHT_MOUSE_BUTTON = 2; + static const int MIDDLE_MOUSE_BUTTON = 3; }; diff --git a/XInputSimulator/xinputsimulatorimpl.h b/XInputSimulator/xinputsimulatorimpl.h index 1eec3b7..ee17f4f 100644 --- a/XInputSimulator/xinputsimulatorimpl.h +++ b/XInputSimulator/xinputsimulatorimpl.h @@ -18,6 +18,8 @@ #ifndef XINPUTSIMULATORIMPL_H #define XINPUTSIMULATORIMPL_H +#include + class XInputSimulatorImpl { public: @@ -32,8 +34,13 @@ public: virtual void mouseScrollX(int length) = 0; virtual void mouseScrollY(int length) = 0; + virtual void keyDown(int key) = 0; virtual void keyUp(int key) = 0; + virtual void keyClick(int key) = 0; + + virtual void charToKeyCode(char key_char) = 0; + virtual void keySequence(const std::string &sequence) = 0; }; diff --git a/XInputSimulator/xinputsimulatorimpllinux.cpp b/XInputSimulator/xinputsimulatorimpllinux.cpp index a100f27..b4dfee7 100644 --- a/XInputSimulator/xinputsimulatorimpllinux.cpp +++ b/XInputSimulator/xinputsimulatorimpllinux.cpp @@ -149,5 +149,19 @@ void XInputSimulatorImplLinux::keyUp(int key) throw NotImplementedException(); } +void XInputSimulatorImplLinux::keyClick(int key) +{ + throw NotImplementedException(); +} + +void XInputSimulatorImplLinux::charToKeyCode(char key_char) +{ + throw NotImplementedException(); +} +void XInputSimulatorImplLinux::keySequence(const std::string &sequence) +{ + throw NotImplementedException(); +} + #endif // linux diff --git a/XInputSimulator/xinputsimulatorimpllinux.h b/XInputSimulator/xinputsimulatorimpllinux.h index d31c59d..df604b1 100644 --- a/XInputSimulator/xinputsimulatorimpllinux.h +++ b/XInputSimulator/xinputsimulatorimpllinux.h @@ -48,6 +48,10 @@ public: virtual void keyDown(int key) override; virtual void keyUp(int key) override; + virtual void keyClick(int key) override; + + virtual void charToKeyCode(char key_char) override; + virtual void keySequence(const std::string &sequence) override; }; diff --git a/XInputSimulator/xinputsimulatorimplmacos.cpp b/XInputSimulator/xinputsimulatorimplmacos.cpp index a959f60..cb14a5c 100644 --- a/XInputSimulator/xinputsimulatorimplmacos.cpp +++ b/XInputSimulator/xinputsimulatorimplmacos.cpp @@ -187,4 +187,18 @@ void XInputSimulatorImplMacOs::keyUp(int key) throw NotImplementedException(); } +void XInputSimulatorImplMacOs::keyClick(int key) +{ + throw NotImplementedException(); +} + +void XInputSimulatorImplMacOs::charToKeyCode(char key_char) +{ + throw NotImplementedException(); +} +void XInputSimulatorImplMacOs::keySequence(const std::string &sequence) +{ + throw NotImplementedException(); +} + #endif //apple diff --git a/XInputSimulator/xinputsimulatorimplmacos.h b/XInputSimulator/xinputsimulatorimplmacos.h index 6b6f2f8..e713545 100644 --- a/XInputSimulator/xinputsimulatorimplmacos.h +++ b/XInputSimulator/xinputsimulatorimplmacos.h @@ -45,6 +45,10 @@ public: virtual void keyDown(int key) override; virtual void keyUp(int key) override; + virtual void keyClick(int key) override; + + virtual void charToKeyCode(char key_char) override; + virtual void keySequence(const std::string &sequence) override; }; diff --git a/XInputSimulator/xinputsimulatorimplwin.cpp b/XInputSimulator/xinputsimulatorimplwin.cpp index dbcd1bd..32873e5 100644 --- a/XInputSimulator/xinputsimulatorimplwin.cpp +++ b/XInputSimulator/xinputsimulatorimplwin.cpp @@ -144,4 +144,18 @@ void XInputSimulatorImplWin::keyUp(int key) throw NotImplementedException(); } +void XInputSimulatorImplWin::keyClick(int key) +{ + throw NotImplementedException(); +} + +void XInputSimulatorImplWin::charToKeyCode(char key_char) +{ + throw NotImplementedException(); +} +void XInputSimulatorImplWin::keySequence(const std::string &sequence) +{ + throw NotImplementedException(); +} + #endif //win diff --git a/XInputSimulator/xinputsimulatorimplwin.h b/XInputSimulator/xinputsimulatorimplwin.h index f024998..b6b5414 100644 --- a/XInputSimulator/xinputsimulatorimplwin.h +++ b/XInputSimulator/xinputsimulatorimplwin.h @@ -44,6 +44,10 @@ public: virtual void keyDown(int key) override; virtual void keyUp(int key) override; + virtual void keyClick(int key) override; + + virtual void charToKeyCode(char key_char) override; + virtual void keySequence(const std::string &sequence) override; };