X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Usermode%2FApplications%2Faxwin3_src%2FWM%2Finput.c;h=29ef0047e74ad22be0709655ff264e5add346e12;hb=845b6f9d90bb87b5e760e4d49aa93b0e003ab750;hp=a35f913e39ce80acedca772d45c60e2a19263e99;hpb=5b6ff5b0698142d4f17a693c0d340df10b375926;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin3_src/WM/input.c b/Usermode/Applications/axwin3_src/WM/input.c
index a35f913e..29ef0047 100644
--- a/Usermode/Applications/axwin3_src/WM/input.c
+++ b/Usermode/Applications/axwin3_src/WM/input.c
@@ -7,6 +7,8 @@
  */
 #include <common.h>
 #include <acess/sys.h>
+#include <wm_input.h>
+#include <stddef.h>
 
 // TODO: Move out to a common header
 typedef struct
@@ -19,10 +21,8 @@ typedef struct
 
 // === IMPORTS ===
 extern void	Video_SetCursorPos(short X, short Y);
-extern void	WM_Input_MouseMoved(int OldX, int OldY, int NewX, int NewY);
-extern void	WM_Input_MouseButton(int X, int Y, int Button, int Pressed);
 const char	*gsMouseDevice;
-extern int	giTerminalFD;
+extern int	giTerminalFD_Input;
 extern int	giScreenWidth;
 extern int	giScreenHeight;
 
@@ -37,82 +37,131 @@ int Input_Init(void)
 	tNumValue	num_value;
 
 	// Open mouse for RW
-	giMouseFD = open(gsMouseDevice, 3);
+	giMouseFD = _SysOpen(gsMouseDevice, 3);
 
 	// Set mouse limits
 	// TODO: Update these if the screen resolution changes
 	num_value.Num = 0;	num_value.Value = giScreenWidth;
-	ioctl(giMouseFD, JOY_IOCTL_GETSETAXISLIMIT, &num_value);
+	_SysIOCtl(giMouseFD, JOY_IOCTL_GETSETAXISLIMIT, &num_value);
 	num_value.Value = giScreenWidth/2;
 	giInput_MouseX = giScreenWidth/2;
-	ioctl(giMouseFD, JOY_IOCTL_GETSETAXISPOSITION, &num_value);
+	_SysIOCtl(giMouseFD, JOY_IOCTL_GETSETAXISPOSITION, &num_value);
 
 	num_value.Num = 1;	num_value.Value = giScreenHeight;
-	ioctl(giMouseFD, JOY_IOCTL_GETSETAXISLIMIT, &num_value);
+	_SysIOCtl(giMouseFD, JOY_IOCTL_GETSETAXISLIMIT, &num_value);
 	num_value.Value = giScreenHeight/2;
 	giInput_MouseY = giScreenHeight/2;
-	ioctl(giMouseFD, JOY_IOCTL_GETSETAXISPOSITION, &num_value);
+	_SysIOCtl(giMouseFD, JOY_IOCTL_GETSETAXISPOSITION, &num_value);
 
 	return 0;
 }
 
 void Input_FillSelect(int *nfds, fd_set *set)
 {
-	if(*nfds < giTerminalFD)	*nfds = giTerminalFD;
+	if(*nfds < giTerminalFD_Input)	*nfds = giTerminalFD_Input;
 	if(*nfds < giMouseFD)	*nfds = giMouseFD;
-	FD_SET(giTerminalFD, set);
+	FD_SET(giTerminalFD_Input, set);
 	FD_SET(giMouseFD, set);
 }
 
 void Input_HandleSelect(fd_set *set)
 {
-	if(FD_ISSET(giTerminalFD, set))
+	if(FD_ISSET(giTerminalFD_Input, set))
 	{
 		uint32_t	codepoint;
-		if( read(giTerminalFD, &codepoint, sizeof(codepoint)) != sizeof(codepoint) )
+		static uint32_t	scancode;
+		#define KEY_CODEPOINT_MASK	0x3FFFFFFF
+		
+		size_t readlen = _SysRead(giTerminalFD_Input, &codepoint, sizeof(codepoint));
+		if( readlen != sizeof(codepoint) )
 		{
 			// oops, error
+			_SysDebug("Terminal read failed? (%i != %i)", readlen, sizeof(codepoint));
+		}
+	
+//		_SysDebug("Keypress 0x%x", codepoint);
+	
+		switch(codepoint & 0xC0000000)
+		{
+		case 0x00000000:	// Key pressed
+			WM_Input_KeyDown(codepoint & KEY_CODEPOINT_MASK, scancode);
+		case 0x80000000:	// Key release
+			WM_Input_KeyFire(codepoint & KEY_CODEPOINT_MASK, scancode);
+			scancode = 0;
+			break;
+		case 0x40000000:	// Key refire
+			WM_Input_KeyUp(codepoint & KEY_CODEPOINT_MASK, scancode);
+			scancode = 0;
+			break;
+		case 0xC0000000:	// Raw scancode
+			scancode = codepoint & KEY_CODEPOINT_MASK;
+			break;
 		}
-		// TODO: pass on to message handler
-		_SysDebug("Keypress 0x%x", codepoint);
 	}
 
 	if(FD_ISSET(giMouseFD, set))
 	{
+		const int c_n_axies = 4;
+		const int c_n_buttons = 5;
 		 int	i;
-		struct sMouseInfo {
+		struct sMouseAxis {
+			 int16_t	MinValue;
+			 int16_t	MaxValue;
+			 int16_t	CurValue;
+			uint16_t	CursorPos;
+		}	*axies;
+		uint8_t	*buttons;
+		struct sMouseHdr {
 			uint16_t	NAxies;
 			uint16_t	NButtons;
-			struct sMouseAxis {
-				 int16_t	MinValue;
-				 int16_t	MaxValue;
-				 int16_t	CurValue;
-				uint16_t	CursorPos;
-			}	Axies[2];
-			uint8_t	Buttons[3];
-		}	mouseinfo;
-	
-		seek(giMouseFD, 0, SEEK_SET);
-		if( read(giMouseFD, &mouseinfo, sizeof(mouseinfo)) != sizeof(mouseinfo) )
-		{
-			// Not a 3 button mouse, oops
+		}	*mouseinfo;
+		char	data[sizeof(*mouseinfo) + sizeof(*axies)*c_n_axies + c_n_buttons];
+
+		mouseinfo = (void*)data;
+
+		_SysSeek(giMouseFD, 0, SEEK_SET);
+		i = _SysRead(giMouseFD, data, sizeof(data));
+		i -= sizeof(*mouseinfo);
+		if( i < 0 ) {
+			_SysDebug("Mouse data undersized (no header)");
+			return ;
+		}
+		if( mouseinfo->NAxies > c_n_axies || mouseinfo->NButtons > c_n_buttons ) {
+			_SysDebug("%i axies, %i buttons above prealloc counts (%i, %i)",
+				mouseinfo->NAxies, mouseinfo->NButtons, c_n_axies, c_n_buttons
+				);
+			return ;
+		}
+		if( i < sizeof(*axies)*mouseinfo->NAxies + mouseinfo->NButtons ) {
+			_SysDebug("Mouse data undersized (body doesn't fit %i < %i)",
+				i, sizeof(*axies)*mouseinfo->NAxies + mouseinfo->NButtons
+				);
 			return ;
 		}
 
+		// What? No X/Y?
+		if( mouseinfo->NAxies < 2 )
+			return ;
+	
+		axies = (void*)( mouseinfo + 1 );
+		buttons = (void*)( axies + mouseinfo->NAxies );
+
 		// Handle movement
-		Video_SetCursorPos( mouseinfo.Axies[0].CursorPos, mouseinfo.Axies[1].CursorPos );
+		Video_SetCursorPos( axies[0].CursorPos, axies[1].CursorPos );
+
+//		_SysDebug("Mouse to %i,%i", axies[0].CursorPos, axies[1].CursorPos);
 
 		WM_Input_MouseMoved(
 			giInput_MouseX, giInput_MouseY,
-			mouseinfo.Axies[0].CursorPos, mouseinfo.Axies[1].CursorPos
+			axies[0].CursorPos, axies[1].CursorPos
 			);
-		giInput_MouseX = mouseinfo.Axies[0].CursorPos;
-		giInput_MouseY = mouseinfo.Axies[1].CursorPos;
+		giInput_MouseX = axies[0].CursorPos;
+		giInput_MouseY = axies[1].CursorPos;
 
-		for( i = 0; i < mouseinfo.NButtons; i ++ )
+		for( i = 0; i < mouseinfo->NButtons; i ++ )
 		{
-			int bit = 1 << i;
-			int cur = mouseinfo.Buttons[i] > 128;
+			 int	bit = 1 << i;
+			 int	cur = buttons[i] > 128;
 
 			if( !!(giInput_MouseButtonState & bit) != cur )
 			{