X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2FWM%2Finput.c;h=29ef0047e74ad22be0709655ff264e5add346e12;hb=2238e69eea50d2274553926f3f294822c1972ff0;hp=469c08eb270a93b05c15ecd5e7c4ebcde33d6a52;hpb=6516331968f11dd9e5c495572f27cc69fa3d4c48;p=tpg%2Facess2.git diff --git a/Usermode/Applications/axwin3_src/WM/input.c b/Usermode/Applications/axwin3_src/WM/input.c index 469c08eb..29ef0047 100644 --- a/Usermode/Applications/axwin3_src/WM/input.c +++ b/Usermode/Applications/axwin3_src/WM/input.c @@ -37,21 +37,21 @@ 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; } @@ -72,7 +72,7 @@ void Input_HandleSelect(fd_set *set) static uint32_t scancode; #define KEY_CODEPOINT_MASK 0x3FFFFFFF - size_t readlen = read(giTerminalFD_Input, &codepoint, sizeof(codepoint)); + size_t readlen = _SysRead(giTerminalFD_Input, &codepoint, sizeof(codepoint)); if( readlen != sizeof(codepoint) ) { // oops, error @@ -119,8 +119,8 @@ void Input_HandleSelect(fd_set *set) mouseinfo = (void*)data; - seek(giMouseFD, 0, SEEK_SET); - i = read(giMouseFD, data, sizeof(data)); + _SysSeek(giMouseFD, 0, SEEK_SET); + i = _SysRead(giMouseFD, data, sizeof(data)); i -= sizeof(*mouseinfo); if( i < 0 ) { _SysDebug("Mouse data undersized (no header)");