nsxiv9ee3447
Applied code style on merged changes
+10 −15
2 files changed
- M Makefile +1 −1
- M commands.c +9 −14
| @@ -1,4 +1,4 @@ | |||
| 1 | − | VERSION = git-20130211 | |
| 1 | + | VERSION = git-20130304 | |
| 2 | 2 | ||
| 3 | 3 | PREFIX = /usr/local | |
| 4 | 4 | MANPREFIX = $(PREFIX)/share/man | |
| @@ -262,6 +262,11 @@ Bool is_motionnotify(Display *d, XEvent *e, XPointer a) | |||
| 262 | 262 | return e != NULL && e->type == MotionNotify; | |
| 263 | 263 | } | |
| 264 | 264 | ||
| 265 | + | #define WARP(x,y) \ | |
| 266 | + | XWarpPointer(win.env.dpy, None, win.xwin, 0, 0, 0, 0, x, y); \ | |
| 267 | + | ox = x, oy = y; \ | |
| 268 | + | break | |
| 269 | + | ||
| 265 | 270 | bool i_drag(arg_t a) | |
| 266 | 271 | { | |
| 267 | 272 | int dx = 0, dy = 0, i, ox, oy, x, y; | |
| @@ -290,28 +295,18 @@ bool i_drag(arg_t a) | |||
| 290 | 295 | x = e.xmotion.x; | |
| 291 | 296 | y = e.xmotion.y; | |
| 292 | 297 | ||
| 293 | − | #define WARP(x, y) \ | |
| 294 | − | XWarpPointer(win.env.dpy, \ | |
| 295 | − | None, win.xwin, \ | |
| 296 | − | 0, 0, 0, 0, \ | |
| 297 | − | x, y); \ | |
| 298 | − | ox = x, oy = y; \ | |
| 299 | − | break | |
| 300 | − | ||
| 301 | 298 | /* wrap the mouse around */ | |
| 302 | − | if(x < 0){ | |
| 299 | + | if (x < 0) { | |
| 303 | 300 | WARP(win.w, y); | |
| 304 | − | }else if(x > win.w){ | |
| 301 | + | } else if (x > win.w) { | |
| 305 | 302 | WARP(0, y); | |
| 306 | − | }else if(y < 0){ | |
| 303 | + | } else if (y < 0) { | |
| 307 | 304 | WARP(x, win.h); | |
| 308 | − | }else if(y > win.h){ | |
| 305 | + | } else if (y > win.h) { | |
| 309 | 306 | WARP(x, 0); | |
| 310 | 307 | } | |
| 311 | − | ||
| 312 | 308 | dx += x - ox; | |
| 313 | 309 | dy += y - oy; | |
| 314 | − | ||
| 315 | 310 | ox = x; | |
| 316 | 311 | oy = y; | |
| 317 | 312 | break; | |