Krolyxon
Commit 2b7192b

Branches

Refs →

nsxiv2b7192b

Renamed scroll() to pan_screen()

Author
Bert
Date
2011-08-05 10:17 +0200
Parent
6b2a098
Commit
2b7192b1ac0a72e80cf5a06f406953a600ad54eb

+11 −11

4 files changed

Browse files Patch
−Context 3+
  1. M config.h +4 −4
  2. M events.c +1 −1
  3. M events.h +1 −1
  4. M image.c +5 −5
M config.h View
@@ -70,10 +70,10 @@ static const keymap_t keys[] = {
7070 { XK_l, move, DIR_RIGHT },
7171 { XK_Right, move, DIR_RIGHT },
7272
73− { XK_braceleft, scroll, DIR_LEFT },
74− { XK_Next, scroll, DIR_DOWN },
75− { XK_Prior, scroll, DIR_UP },
76− { XK_braceright, scroll, DIR_RIGHT },
73+ { XK_braceleft, pan_screen, DIR_LEFT },
74+ { XK_Next, pan_screen, DIR_DOWN },
75+ { XK_Prior, pan_screen, DIR_UP },
76+ { XK_braceright, pan_screen, DIR_RIGHT },
7777
7878 { XK_H, pan_edge, DIR_LEFT },
7979 { XK_J, pan_edge, DIR_DOWN },
M events.c View
@@ -483,7 +483,7 @@ int move(XEvent *e, arg_t dir) {
483483 return tns_move_selection(&tns, &win, dir);
484484 }
485485
486−int scroll(XEvent *e, arg_t dir) {
486+int pan_screen(XEvent *e, arg_t dir) {
487487 if (mode == MODE_NORMAL)
488488 return img_pan(&img, &win, dir, 1);
489489 else
M events.h View
@@ -56,7 +56,7 @@ int first(XEvent*, arg_t);
5656 int last(XEvent*, arg_t);
5757 int remove_image(XEvent*, arg_t);
5858 int move(XEvent*, arg_t);
59−int scroll(XEvent*, arg_t);
59+int pan_screen(XEvent*, arg_t);
6060 int pan_edge(XEvent*, arg_t);
6161 int drag(XEvent*, arg_t);
6262 int rotate(XEvent*, arg_t);
M image.c View
@@ -277,19 +277,19 @@ int img_move(img_t *img, win_t *win, int dx, int dy) {
277277 return ox != img->x || oy != img->y;
278278 }
279279
280−int img_pan(img_t *img, win_t *win, direction_t dir, int page) {
280+int img_pan(img_t *img, win_t *win, direction_t dir, int screen) {
281281 if (!img || !img->im || !win)
282282 return 0;
283283
284284 switch (dir) {
285285 case DIR_LEFT:
286− return img_move(img, win, win->w / (page ? 1 : 5), 0);
286+ return img_move(img, win, win->w / (screen ? 1 : 5), 0);
287287 case DIR_RIGHT:
288− return img_move(img, win, win->w / (page ? 1 : 5) * -1, 0);
288+ return img_move(img, win, win->w / (screen ? 1 : 5) * -1, 0);
289289 case DIR_UP:
290− return img_move(img, win, 0, win->h / (page ? 1 : 5));
290+ return img_move(img, win, 0, win->h / (screen ? 1 : 5));
291291 case DIR_DOWN:
292− return img_move(img, win, 0, win->h / (page ? 1 : 5) * -1);
292+ return img_move(img, win, 0, win->h / (screen ? 1 : 5) * -1);
293293 }
294294
295295 return 0;