Merge pointer warping in i_drag from Rob Pilling

This commit is contained in:
Bert Münnich 2013-03-04 19:18:58 +01:00
commit ce8460108a
1 changed files with 22 additions and 3 deletions

View File

@ -289,10 +289,29 @@ bool i_drag(arg_t a)
case MotionNotify:
x = e.xmotion.x;
y = e.xmotion.y;
if (x >= 0 && x <= win.w && y >= 0 && y <= win.h) {
dx += x - ox;
dy += y - oy;
#define WARP(x, y) \
XWarpPointer(win.env.dpy, \
None, win.xwin, \
0, 0, 0, 0, \
x, y); \
ox = x, oy = y; \
break
/* wrap the mouse around */
if(x < 0){
WARP(win.w, y);
}else if(x > win.w){
WARP(0, y);
}else if(y < 0){
WARP(x, win.h);
}else if(y > win.h){
WARP(x, 0);
}
dx += x - ox;
dy += y - oy;
ox = x;
oy = y;
break;