]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
revert the vid_grabkeyboard 0 support in fullscreen, due to
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Tue, 25 Dec 2007 10:54:29 +0000 (10:54 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Tue, 25 Dec 2007 10:54:29 +0000 (10:54 +0000)
CWOverrideRedirect the window is never focused and thus completely
unusable with this approach, maybe a different method of initializing
fullscreen will be implemented in the future

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

vid_glx.c

index 91c50d29351d9312b15d8f2f7f8a62c93c00e195..02911ed859ace7808796cf6a4a4c9742ca233d80 100644 (file)
--- 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)
+                       if (vid_grabkeyboard.integer || vid_isfullscreen)
                                XGrabKeyboard(vidx11_display, win, False, GrabModeAsync, GrabModeAsync, CurrentTime);
 
                        mouse_x = mouse_y = 0;
@@ -568,6 +568,8 @@ 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)