sam
/
nsxiv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Applied code style on merged changes

This commit is contained in:
Bert Münnich 2013-03-04 19:23:07 +01:00
parent ce8460108a
commit 9ee34477f8
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,4 +1,4 @@
VERSION = git-20130211 VERSION = git-20130304
PREFIX = /usr/local PREFIX = /usr/local
MANPREFIX = $(PREFIX)/share/man MANPREFIX = $(PREFIX)/share/man

23
commands.c
View File

@ -262,6 +262,11 @@ Bool is_motionnotify(Display *d, XEvent *e, XPointer a)
return e != NULL && e->type == MotionNotify; 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) bool i_drag(arg_t a)
{ {
int dx = 0, dy = 0, i, ox, oy, x, y; int dx = 0, dy = 0, i, ox, oy, x, y;
@ -290,28 +295,18 @@ bool i_drag(arg_t a)
x = e.xmotion.x; x = e.xmotion.x;
y = e.xmotion.y; 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 */ /* wrap the mouse around */
if(x < 0){ if (x < 0) {
WARP(win.w, y); WARP(win.w, y);
}else if(x > win.w){ } else if (x > win.w) {
WARP(0, y); WARP(0, y);
}else if(y < 0){ } else if (y < 0) {
WARP(x, win.h); WARP(x, win.h);
}else if(y > win.h){ } else if (y > win.h) {
WARP(x, 0); WARP(x, 0);
} }
dx += x - ox; dx += x - ox;
dy += y - oy; dy += y - oy;
ox = x; ox = x;
oy = y; oy = y;
break; break;