X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin2_src%2FWM%2Finput.c;h=93869328602ad0549cf3c7e63d134fc010334c75;hb=94c9ee44d701154379842425b5ee0826995e000e;hp=f69e0562590831fafed7e41315d2f77a30000005;hpb=7428b02ff9e335e8a3c958d156bd221e6e86b051;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin2_src/WM/input.c b/Usermode/Applications/axwin2_src/WM/input.c
index f69e0562..93869328 100644
--- a/Usermode/Applications/axwin2_src/WM/input.c
+++ b/Usermode/Applications/axwin2_src/WM/input.c
@@ -3,8 +3,37 @@
  * By John Hodge (thePowersGang)
  */
 #include "common.h"
+#include <acess/sys.h>
+
+#define JOY_IOCTL_GETSETAXISLIMIT	6
+#define JOY_IOCTL_GETSETAXISPOSITION	7
 
 // === CODE ===
+int Input_Init(void)
+{
+	struct {
+		 int	Num, Value;
+	}	num_value;
+
+	// Open mouse for RW
+	giMouseFD = open(gsMouseDevice, 3);
+
+	// Set mouse limits
+	num_value.Num = 0;
+	num_value.Value = giScreenWidth;
+	ioctl(giMouseFD, JOY_IOCTL_GETSETAXISLIMIT, &num_value);
+	num_value.Value = giScreenWidth/2;
+	ioctl(giMouseFD, JOY_IOCTL_GETSETAXISPOSITION, &num_value);
+
+	num_value.Num = 1;
+	num_value.Value = giScreenHeight;
+	ioctl(giMouseFD, JOY_IOCTL_GETSETAXISLIMIT, &num_value);
+	num_value.Value = giScreenHeight/2;
+	ioctl(giMouseFD, JOY_IOCTL_GETSETAXISPOSITION, &num_value);
+
+	return 0;
+}
+
 void Input_FillSelect(int *nfds, fd_set *set)
 {
 	if(*nfds < giTerminalFD)	*nfds = giTerminalFD;
@@ -17,6 +46,46 @@ void Input_HandleSelect(fd_set *set)
 {
 	if(FD_ISSET(giTerminalFD, set))
 	{
-		
+		uint32_t	codepoint;
+		if( read(giTerminalFD, &codepoint, sizeof(codepoint)) != sizeof(codepoint) )
+		{
+			// oops, error
+		}
+		// TODO: pass on to message handler
+		_SysDebug("Keypress 0x%x", codepoint);
+	}
+
+	if(FD_ISSET(giMouseFD, set))
+	{
+		struct sMouseInfo {
+			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
+			return ;
+		}
+
+//		_SysDebug("sizeof(uint16_t) = %i, sizeof(int16_t) = %i",
+//			sizeof(uint16_t), sizeof(int16_t));
+//		_SysDebug("NAxies=%i,NButtons=%i", mouseinfo.NAxies, mouseinfo.NButtons);
+//		_SysDebug("offsetof(Axies[0].MinValue) = %i", offsetof(struct sMouseInfo, Axies[0].MinValue));
+//		_SysDebug("[0] = {MinValue=%i,MaxValue=%i,CurValue=%i}",
+//			mouseinfo.Axies[0].MinValue, mouseinfo.Axies[0].MaxValue,
+//			mouseinfo.Axies[0].CurValue
+//			);
+		// Handle movement
+		Video_SetCursorPos( mouseinfo.Axies[0].CursorPos, mouseinfo.Axies[1].CursorPos );
+//		_SysDebug("Cursor to %i,%i", mouseinfo.Axies[0].CursorPos, mouseinfo.Axies[1].CursorPos);
 	}
 }