Improve TinyusbConnector::doHandshake

Disable temporarily Drag to Here context menu item

Author: volatilflerovium

README.md

@@ -103,19 +103,19 @@ to simulate user input.
 Using /dev/uinput is straight forward. 
 - create a new group and add your username to this group
 ```
-# groupadd the_new_group_name
-# usermod -aG the_new_group_name username
+# groupadd <new-group>
+# usermod -aG <new-group> <username>
 ```
 Notice that group membership is re-read on login so You will have log out 
 and back in for this to take effect.
 
 - Set the permissions
 ```
-# sudo chown root:the_new_group_name /dev/uinput;
+# sudo chown root:<new-group> /dev/uinput;
 chmod 720 /dev/uinput
 ```
 Permission 720 should be enough, but in some cases you will need to set 777. 
-Remember these permissions are not permanent, they will be revoke at reboot.
+Remember **_these permissions are not permanent, they will be revoke at reboot_**.
 Alternatively you can use a device rule file.
 
 ### TinyUSB

hid_keyboard_and_mouse/README.md

@@ -1,7 +1,7 @@
 # Companion Project for keyboard_and_mouse_input_recorder_and_player
 
 Build an image for RaspberryPi Pico W, making it into a proxy keyboard and mouse
-for keyboard_and_mouse_input_recorder_and_player.
+for KeyboardAndMouseRecorderPlayer.
 
 # How to build
 
@@ -10,13 +10,15 @@ for keyboard_and_mouse_input_recorder_and_player.
 # mkdir build
 # cd build
 # cmake .. -DFAMILY=rp2040 -DPICO_SDK_PATH=/path/to/pico-sdk
+-DWIFI_SSID="YOUR_SSID" -DWIFI_PASSWORD="YOUR_PASSWD"\
 [
--DWIFI_SSID="YOUR_SSID" -DWIFI_PASSWORD="YOUR_PASSWD"\ 
 -DUDP_SERVER_BUFFER_SIZE=512 -DUDP_SERVER_PORT=4444\
 -DLWIP_MODE=background
 ]
 ```
 
+Settings inside ```[]``` are optional.
+
 - LWIP_MODE accepts: background or poll. Default: background.
 
 After flashing your Pico W, it should connect to the local network and it will be
@@ -25,4 +27,8 @@ given an ip address. You can check the ip asigned to the UDP server with the com
 ```
 #nmap -sn 192.168.1.*
 ```
-Then repeat the command with Pico w plugged.
+Then repeat the command with Pico w plugged.
+
+After flashing the image into Pico W, just set the ip and port into
+the interface settings of KeyboardAndMouseRecorderPlayer and it is ready
+to be used by KeyboardAndMouseRecorderPlayer.

include/command_parser.h

@@ -89,11 +89,18 @@ struct CmdType2Bdr<CommandTypes::MouseRightBtn>
 };
 
 template<>
-struct CmdType2Bdr<CommandTypes::MouseSelection> // this cover drag command too
+struct CmdType2Bdr<CommandTypes::MouseSelection>
 {
 	typedef MouseSelectCommand Cmd;
 };
 
+
+template<>
+struct CmdType2Bdr<CommandTypes::MouseDrag>
+{
+	typedef MouseDragCommand Cmd;
+};
+
 //====================================================================
 
 template<CommandTypes CMDT>

include/enumerations.h

@@ -113,6 +113,7 @@ namespace WX
 			SCREENSHOT_CMD,
 			START_ROI,
 			START_DRAGGING,
+			DRAG_HERE,
 			CANCEL_NEW_ROI,
 			DISPLAY_KBOARD,
 			CLOSE_MENU,

include/input_command.h

@@ -67,6 +67,7 @@ enum class CommandTypes
 	Screenshot,// alias for Ctrl
 	Unicode,
 	Shortcut,
+	MouseDrag,
 };
 
 enum class CommandInputTypes
@@ -480,7 +481,7 @@ class MouseRightBtnCommand : public InputCommand, public WindowOffset
 class MouseSelectCommand : public InputCommand, public WindowOffset
 {
 	public:
-		MouseSelectCommand(const char* description, int wait, int posX, int posY, int width, int height, const char* windowName);
+		MouseSelectCommand(const char* description, int wait, uint posX, uint posY, int width, int height, const char* windowName);
 
 		virtual ~MouseSelectCommand()=default;
 
@@ -497,20 +498,32 @@ class MouseSelectCommand : public InputCommand, public WindowOffset
 		uint m_statusCode;
 };
 
+//====================================================================
 
-class MouseSelectCommand2 : public InputCommand, public WindowOffset
+class MouseDragCommand : public InputCommand, public WindowOffset
 {
 	public:
-		MouseSelectCommand2(const char* description, int wait, int endX, int endY, const char* windowName);
+		MouseDragCommand(const char* description, int wait, int startX, int startY, int endX, int endY, const char* windowName);
+		MouseDragCommand(const char* description, int wait, int endX, int endY, const char* windowName);
+
+		virtual ~MouseDragCommand()=default;
 
-		virtual ~MouseSelectCommand2()=default;
+		static InputCommand* Builder(const char* description, int wait, int startX, int startY, int endX, int endY, const char* windowName)
+		{
+			if(startX<0){				
+				return new MouseDragCommand(description, wait, endX, endY, windowName);
+			}
+			return new MouseDragCommand(description, wait, startX, startY, endX, endY, windowName);
+		}
 
 		static InputCommand* Builder(const char* description, int wait, int endX, int endY, const char* windowName)
 		{
-			return new MouseSelectCommand2(description, wait, endX, endY, windowName);
+			return new MouseDragCommand(description, wait, endX, endY, windowName);
 		}
 
 	private:
+		int m_startX;
+		int m_startY;
 		int m_endX; //relative to the current window
 		int m_endY;
 		uint m_statusCode;

include/mouse_emulator.h

@@ -39,30 +39,28 @@ class MouseEmulatorI : public ErrorReporting
 
 		void clickLeftBtn();
 		void clickRightBtn();
+
 		/*
 		 *	Move mouse to the relative position (dy, dy) in small steps
-		 * 
 		 * */
 		void move(const int dx, const int dy);
 
 		/*
 		 * Will move the mouse to the absolute position (absX, absY)
-		 * 
 		 * */
 		virtual void go2Position(const int absX, const int absY, ClientMousePosition getMousePosition);
 
 		/*
-		 * Drag the mouse width units on X and height units on Y relative
-		 * to the current mouse position.
+		 * Select rectangle: (absX, absY, width, height)
+		 * Note that width and height can be negative values
 		 * */
-		void drag(uint width, uint height);
-		void drag(uint width, uint height, ClientMousePosition getMousePosition);
+		void select(uint absX, uint absY, uint width, uint height, ClientMousePosition getMousePosition);
 
 		/*
-		 * Drag the mouse width units on X and height units on Y from the
-		 * absolute position (absX, absY).
+		 * Drag the mouse from absolute position (startX, startY)
+		 * to absolute position (endX, endY)
 		 * */
-		void drag(int absX, int absY, uint width, uint height, ClientMousePosition getMousePosition);
+		void drag(uint startX, uint startY, uint endX, uint endY, ClientMousePosition getMousePosition);
 
 		//void scroll(const int x, const int y);
 
@@ -74,15 +72,14 @@ class MouseEmulatorI : public ErrorReporting
 			THR=LOW+1,
 		};
 
-		//virtual int getMouseButton(const MOUSE_BUTTONS btn)=0;
-
 		/*
 		 * Move the mouse to the relative position (dx, dy)
 		 * */
 		virtual void setPosition(const int dx, const int dy)=0;
-
 		virtual void buttonDown(MOUSE_BUTTONS btn)=0;
 		virtual void buttonUp(MOUSE_BUTTONS btn)=0;
+
+		void moveAbs(const int absX, const int absY, ClientMousePosition getMousePosition);
 };
 
 //--------------------------------------------------------------------

include/tinyusb_connector.h

@@ -33,7 +33,7 @@ struct TinyusbConnector
 	static void sendAndWait(void* data, uint dataSize)
 	{
 		s_connector->send(data, dataSize);
-		if(s_connector->receive(500)){
+		if(s_connector->receive(600)){
 			std::this_thread::sleep_for(std::chrono::milliseconds(10));
 		}
 	}

src/command_parser.cpp

@@ -100,6 +100,16 @@ BaseCommand* ParserBuilder(const std::string& line)
 			case CommandTypes::MouseSelection:
 				commandPtr=CmdBuilder<CommandTypes::MouseSelection>::Builder(run, description, wait, std::atoi(parts[3]), std::atoi(parts[4]), std::atoi(parts[5]), std::atoi(parts[6]), parts[7]);
 				break;
+			case CommandTypes::MouseDrag:
+				{
+					if(std::atoi(parts[3])<0){
+						commandPtr=CmdBuilder<CommandTypes::MouseDrag>::Builder(run, description, wait, std::atoi(parts[5]), std::atoi(parts[6]), parts[7]);
+					}
+					else{
+						commandPtr=CmdBuilder<CommandTypes::MouseDrag>::Builder(run, description, wait, std::atoi(parts[3]), std::atoi(parts[4]), std::atoi(parts[5]), std::atoi(parts[6]), parts[7]);
+					}
+				}
+				break;
 			case CommandTypes::Shortcut:
 				commandPtr=CmdBuilder<CommandTypes::Shortcut>::Builder(run, description, wait, parts[3]);
 				break;

src/input_command.cpp

@@ -306,8 +306,8 @@ MouseRightBtnCommand::MouseRightBtnCommand(const char* description, int wait, in
 }
 
 //====================================================================
-
-MouseSelectCommand::MouseSelectCommand(const char* description, int wait, int posX, int posY, int width, int height, const char* windowName)
+//*
+MouseSelectCommand::MouseSelectCommand(const char* description, int wait, uint posX, uint posY, int width, int height, const char* windowName)
 :InputCommand(description, wait)
 , WindowOffset(windowName)
 , m_posX(posX)
@@ -321,13 +321,14 @@ MouseSelectCommand::MouseSelectCommand(const char* description, int wait, int po
 			m_statusCode=ExitCode::OUT_OF_BOUND;
 			if(isTargetValid(m_posX, m_posY)){
 				m_statusCode=ExitCode::OK;
-				s_MouseEmulator->drag(m_absoluteX, m_absoluteY, m_width, m_height, [](int& pX, int& pY){
+				s_MouseEmulator->select(m_absoluteX, m_absoluteY, m_width, m_height, [](int& pX, int& pY){
 					wxPoint mousePosition=wxGetMousePosition();
 					pX=mousePosition.x;
 					pY=mousePosition.y;
 				});
 			}
 		}
+		MouseCmdExitPosition::setExitPosition();
 	};
 
 	int ID=static_cast<int>(CommandTypes::MouseSelection);
@@ -337,37 +338,72 @@ MouseSelectCommand::MouseSelectCommand(const char* description, int wait, int po
 	};
 }
 
-MouseSelectCommand2::MouseSelectCommand2(const char* description, int wait, int endX, int endY, const char* windowName)
+//====================================================================
+
+MouseDragCommand::MouseDragCommand(const char* description, int wait, int startX, int startY, int endX, int endY, const char* windowName)
+:InputCommand(description, wait)
+, WindowOffset(windowName)
+, m_startX(startX)
+, m_startY(startY)
+, m_endX(endX)
+, m_endY(endY)
+{
+	m_cmd=[this](){
+		m_statusCode=ExitCode::TARGET_WINDOW_CLOSED;
+		if(windowExists()){
+			m_statusCode=ExitCode::OUT_OF_BOUND;
+			if(isTargetValid(m_startX, m_startY)){
+				int absStartX=m_absoluteX;
+				int absStartY=m_absoluteY;
+				if(isTargetValid(m_endX, m_endY)){
+					m_statusCode=ExitCode::OK;
+					int absEndX=m_absoluteX;
+					int absEndY=m_absoluteY;
+
+					s_MouseEmulator->drag(absStartX, absStartY, absEndX, absEndY, [](int& pX, int& pY){
+						wxPoint mousePosition=wxGetMousePosition();
+						pX=mousePosition.x;
+						pY=mousePosition.y;
+					});
+				}
+			}
+		}
+		MouseCmdExitPosition::setExitPosition();
+	};
+
+	int ID=static_cast<int>(CommandTypes::MouseDrag);
+
+	m_strCmd=[this, ID](){
+		return ToString2(ID, m_description, m_run, m_startX, m_startY, m_endX, m_endY, m_windowName);
+	};
+}
+
+//--------------------------------------------------------------------
+
+MouseDragCommand::MouseDragCommand(const char* description, int wait, int endX, int endY, const char* windowName)
 :InputCommand(description, wait)
 , WindowOffset(windowName)
+, m_startX(-1)
+, m_startY(-1)
 , m_endX(endX)
 , m_endY(endY)
 {
 	/*
-	 * Notice that if the current mouse changed is not the same as the
+	 * Notice that if the current mouse position is not the same as the
 	 * position of it when the last mouse command exit (it was moved accidently)
 	 * we might get different result. Therefore it would be better to keep
 	 * tract of the mouse position according to the last mouse command executed.
-	 * 
 	 * */
 	m_cmd=[this](){
 		m_statusCode=ExitCode::TARGET_WINDOW_CLOSED;
 		if(windowExists()){
 			m_statusCode=ExitCode::OUT_OF_BOUND;
 			if(isTargetValid(m_endX, m_endY)){
 				m_statusCode=ExitCode::OK;
+				int startX=MouseCmdExitPosition::s_x;
+				int startY=MouseCmdExitPosition::s_y;
 
-				wxPoint mousePosition=wxGetMousePosition();
-				int startX=mousePosition.x;
-				int startY=mousePosition.y;
-
-				WindowRect rect=getWindowRect(m_windowName.c_str(), true);
-				int endAbsoluteX=m_endX+rect.m_x;
-				int endAbsoluteY=m_endY+rect.m_y;
-				int width=endAbsoluteX-startX;
-				int height=endAbsoluteY-startY;
-
-				s_MouseEmulator->drag(startX, startY, width, height, [](int& pX, int& pY){
+				s_MouseEmulator->drag(startX, startY, m_absoluteX, m_absoluteY, [](int& pX, int& pY){
 					wxPoint mousePosition=wxGetMousePosition();
 					pX=mousePosition.x;
 					pY=mousePosition.y;
@@ -377,10 +413,10 @@ MouseSelectCommand2::MouseSelectCommand2(const char* description, int wait, int
 		MouseCmdExitPosition::setExitPosition();
 	};
 
-	int ID=static_cast<int>(CommandTypes::MouseSelection);
+	int ID=static_cast<int>(CommandTypes::MouseDrag);
 
 	m_strCmd=[this, ID](){
-		return ToString2(ID, m_description, m_run, m_endX, m_endY, m_windowName);
+		return ToString2(ID, m_description, m_run, -1, -1, m_endX, m_endY, m_windowName);
 	};
 }