From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 25 Dec 2007 10:00:31 +0000 (+0000)
Subject: vid_grabkeyboard 0 now works with fullscreen
X-Git-Tag: xonotic-v0.1.0preview~2628
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=488aa9900e37ef39fbd47acc43659deb1a9cf695;p=xonotic%2Fdarkplaces.git

vid_grabkeyboard 0 now works with fullscreen


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7863 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/vid_glx.c b/vid_glx.c
index 02911ed8..91c50d29 100644
--- a/vid_glx.c
+++ b/vid_glx.c
@@ -278,7 +278,7 @@ static void IN_Activate (qboolean grab)
 #endif
 				XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, vid.width / 2, vid.height / 2);
 
-			if (vid_grabkeyboard.integer || vid_isfullscreen)
+			if (vid_grabkeyboard.integer)
 				XGrabKeyboard(vidx11_display, win, False, GrabModeAsync, GrabModeAsync, CurrentTime);
 
 			mouse_x = mouse_y = 0;
@@ -568,8 +568,6 @@ void VID_Finish (qboolean allowmousegrab)
 		vid_usemouse = true;
 	if (!vid_activewindow)
 		vid_usemouse = false;
-	if (vid_isfullscreen)
-		vid_usemouse = true;
 	IN_Activate(vid_usemouse);
 
 	if (r_render.integer)