[patch] Fixes mouse problem.

warsow-0.3-mouse.patch (text/plain), 1.29 KB, created by adriancz on 2007-05-20 23:55:47 UTC

--- source/unix/unix_input.c	2007-05-15 19:10:00.000000000 +0200
+++ source/unix/unix_input.c	2007-05-21 01:07:45.000000000 +0200
@@ -566,9 +566,31 @@
 	unsigned char *p;
 	int key = 0;
 	unsigned int time = Sys_Milliseconds();
+	int root_x,root_y,win_x,win_y;
+	unsigned int mask;
+	Window root, child;
 
 	assert(x11display.dpy && x11display.win);
 
+	    if(mouse_active){
+	        if(XQueryPointer(x11display.dpy,x11display.win, &root, &child,
+	            &root_x,&root_y,&win_x,&win_y,&mask)){
+	
+	            mx += ((int)win_x - mwx);
+	            my += ((int)win_y - mwy);
+	            mwx = win_x;
+	            mwy = win_y;
+			            if (mx || my)
+	                dowarp = qtrue;
+	
+	            if (ignore_one) {
+	                mx = my = 0;
+	                ignore_one = qfalse;
+	            }
+	        }
+	    }
+	
+	
 	while (XPending(x11display.dpy))
 	{
 		XNextEvent (x11display.dpy, &event);
@@ -602,15 +624,5 @@
 						mx += event.xmotion.x_root;
 						my += event.xmotion.y_root;
 					}
-					else
-					{
-						mx += ((int)event.xmotion.x - mwx);
-						my += ((int)event.xmotion.y - mwy);
-						mwx = event.xmotion.x;
-						mwy = event.xmotion.y;
-
-						if (mx || my)
-							dowarp = qtrue;
-					}
 					if (ignore_one) {
 						mx = my = 0;