aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--commands.c23
2 files changed, 10 insertions, 15 deletions
diff --git a/Makefile b/Makefile
index 3a64529..b8a71df 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = git-20130211
+VERSION = git-20130304
PREFIX = /usr/local
MANPREFIX = $(PREFIX)/share/man
diff --git a/commands.c b/commands.c
index 7ec7b88..f358ed3 100644
--- a/commands.c
+++ b/commands.c
@@ -262,6 +262,11 @@ Bool is_motionnotify(Display *d, XEvent *e, XPointer a)
return e != NULL && e->type == MotionNotify;
}
+#define WARP(x,y) \
+ XWarpPointer(win.env.dpy, None, win.xwin, 0, 0, 0, 0, x, y); \
+ ox = x, oy = y; \
+ break
+
bool i_drag(arg_t a)
{
int dx = 0, dy = 0, i, ox, oy, x, y;
@@ -290,28 +295,18 @@ bool i_drag(arg_t a)
x = e.xmotion.x;
y = e.xmotion.y;
-#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){
+ if (x < 0) {
WARP(win.w, y);
- }else if(x > win.w){
+ } else if (x > win.w) {
WARP(0, y);
- }else if(y < 0){
+ } else if (y < 0) {
WARP(x, win.h);
- }else if(y > win.h){
+ } else if (y > win.h) {
WARP(x, 0);
}
-
dx += x - ox;
dy += y - oy;
-
ox = x;
oy = y;
break;