From 5c2533e207f0564992321d6bfcadd99d86d1c429 Mon Sep 17 00:00:00 2001 From: Spoike Date: Sat, 6 Dec 2014 02:24:46 +0000 Subject: [PATCH] lets try using absolute mice even in fullscreen mode. esentually _windowed_mouse is treated as 1 while fullscreen, instead of forcing grabs+deltas even with the console focused etc. this should solve hardware cursor issues when fullscreen, and allow csqc ui code to handle only absolute coords. however, this does make sensitivity more awkward, and might not work with joysticks. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4797 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/in_win.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/engine/client/in_win.c b/engine/client/in_win.c index e66a81c02..39cfd13b3 100644 --- a/engine/client/in_win.c +++ b/engine/client/in_win.c @@ -525,9 +525,7 @@ void INS_UpdateGrabs(int fullscreen, int activeapp) if (!activeapp) grabmouse = false; - else if (fullscreen || in_simulatemultitouch.ival) - grabmouse = true; - else if (_windowed_mouse.value) + else if (fullscreen || in_simulatemultitouch.ival || _windowed_mouse.value) { if (!Key_MouseShouldBeFree()) grabmouse = true; @@ -538,7 +536,7 @@ void INS_UpdateGrabs(int fullscreen, int activeapp) grabmouse = false; //visiblity - if (!SCR_HardwareCursorIsActive() && (grabmouse || (activeapp && mousecursor_x > 0 && mousecursor_y > 0 && mousecursor_x < vid.pixelwidth-1 && mousecursor_y < vid.pixelheight-1))) + if (!SCR_HardwareCursorIsActive() && (fullscreen || in_simulatemultitouch.ival || grabmouse || (activeapp && mousecursor_x > 0 && mousecursor_y > 0 && mousecursor_x < vid.pixelwidth-1 && mousecursor_y < vid.pixelheight-1))) INS_HideMouse(); else {