more clean up of IN_Activate, added cl_ignoremousemove to merge some code

[xonotic/darkplaces.git] / vid_glx.c

diff --git a/vid_glx.c b/vid_glx.c
index b0553f30ae54e9c7bda7a155531911851d6cea32..64fa66c7191bad153529ba154d1b9c2282153a9f 100644 (file)
--- a/vid_glx.c
+++ b/vid_glx.c
@@ -91,7 +91,6 @@ static qboolean vid_usingmouse = false;
 static qboolean vid_usemouse = false;
 static qboolean vid_usingvsync = false;
 static qboolean vid_usevsync = false;
-static qboolean ignoremousemove = false;
 static float   mouse_x, mouse_y;
 static int p_mouse_x, p_mouse_y;
 
@@ -292,7 +291,7 @@ static void IN_Activate (qboolean grab)
                        XGrabKeyboard(vidx11_display, win, False, GrabModeAsync, GrabModeAsync, CurrentTime);
 
                        mouse_x = mouse_y = 0;
-                       ignoremousemove = true;
+                       cl_ignoremousemove = true;
                        vid_usingmouse = true;
                }
        }
@@ -312,7 +311,7 @@ static void IN_Activate (qboolean grab)
                        if (win)
                                XUndefineCursor(vidx11_display, win);
 
-                       ignoremousemove = true;
+                       cl_ignoremousemove = true;
                        vid_usingmouse = false;
                }
        }
@@ -524,14 +523,6 @@ static void HandleEvents(void)
                p_mouse_y = scr_height / 2;
                XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, p_mouse_x, p_mouse_y);
        }
-
-       // if told to ignore one mouse move, do so
-       if (ignoremousemove)
-       {
-               ignoremousemove = false;
-               mouse_x = 0;
-               mouse_y = 0;
-       }
 }
 
 static void *prjobj = NULL;
@@ -885,7 +876,6 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
 
        vid_usingmouse = false;
        vid_usingvsync = false;
-       ignoremousemove = true;
        vid_hidden = false;
        vid_activewindow = true;
        GL_Init();