nsxiv64a5366
Added <,> mappings to rotate image
+52 −2
6 files changed
| @@ -1,6 +1,6 @@ | |||
| 1 | 1 | all: sxiv | |
| 2 | 2 | ||
| 3 | − | VERSION=0.2 | |
| 3 | + | VERSION=git-20110126 | |
| 4 | 4 | ||
| 5 | 5 | CC?=gcc | |
| 6 | 6 | PREFIX?=/usr/local | |
| @@ -42,5 +42,6 @@ Use the following keys to control sxiv: | |||
| 42 | 42 | +,= Zoom in | |
| 43 | 43 | - Zoom out | |
| 44 | 44 | h,j,k,l Scroll left/down/up/right | |
| 45 | + | <,> Rotate image (counter-)clockwise by 90 degrees | |
| 45 | 46 | f Toggle fullscreen mode (requires an EWMH/NetWM compliant | |
| 46 | 47 | window manager) | |
| @@ -104,7 +104,7 @@ void img_render(img_t *img, win_t *win) { | |||
| 104 | 104 | if (!img || !win || !imlib_context_get_image()) | |
| 105 | 105 | return; | |
| 106 | 106 | ||
| 107 | − | if ((!img->re || !img->zoomed) && SCALE_MODE != SCALE_ZOOM) { | |
| 107 | + | if (!img->zoomed && SCALE_MODE != SCALE_ZOOM) { | |
| 108 | 108 | /* set zoom level to fit image into window */ | |
| 109 | 109 | zw = (float) win->w / (float) img->w; | |
| 110 | 110 | zh = (float) win->h / (float) img->h; | |
| @@ -241,3 +241,34 @@ int img_pan(img_t *img, win_t *win, pandir_t dir) { | |||
| 241 | 241 | ||
| 242 | 242 | return ox != img->x || oy != img->y; | |
| 243 | 243 | } | |
| 244 | + | ||
| 245 | + | int img_rotate(img_t *img, win_t *win, int d) { | |
| 246 | + | int ox, oy, tmp; | |
| 247 | + | ||
| 248 | + | if (!img || !win) | |
| 249 | + | return 0; | |
| 250 | + | ||
| 251 | + | ox = d == 1 ? img->x : win->w - img->x - img->w * img->zoom; | |
| 252 | + | oy = d == 3 ? img->y : win->h - img->y - img->h * img->zoom; | |
| 253 | + | ||
| 254 | + | imlib_image_orientate(d); | |
| 255 | + | ||
| 256 | + | img->x = oy + (win->w - win->h) / 2; | |
| 257 | + | img->y = ox + (win->h - win->w) / 2; | |
| 258 | + | ||
| 259 | + | tmp = img->w; | |
| 260 | + | img->w = img->h; | |
| 261 | + | img->h = tmp; | |
| 262 | + | ||
| 263 | + | img->checkpan = 1; | |
| 264 | + | ||
| 265 | + | return 1; | |
| 266 | + | } | |
| 267 | + | ||
| 268 | + | int img_rotate_left(img_t *img, win_t *win) { | |
| 269 | + | return img_rotate(img, win, 3); | |
| 270 | + | } | |
| 271 | + | ||
| 272 | + | int img_rotate_right(img_t *img, win_t *win) { | |
| 273 | + | return img_rotate(img, win, 1); | |
| 274 | + | } | |
| @@ -56,4 +56,7 @@ int img_zoom_out(img_t*); | |||
| 56 | 56 | ||
| 57 | 57 | int img_pan(img_t*, win_t*, pandir_t); | |
| 58 | 58 | ||
| 59 | + | int img_rotate_left(img_t*, win_t*); | |
| 60 | + | int img_rotate_right(img_t*, win_t*); | |
| 61 | + | ||
| 59 | 62 | #endif /* IMAGE_H */ | |
| @@ -219,6 +219,14 @@ void on_keypress(XEvent *ev) { | |||
| 219 | 219 | changed = img_pan(&img, &win, PAN_RIGHT); | |
| 220 | 220 | break; | |
| 221 | 221 | ||
| 222 | + | /* rotation */ | |
| 223 | + | case '<': | |
| 224 | + | changed = img_rotate_left(&img, &win); | |
| 225 | + | break; | |
| 226 | + | case '>': | |
| 227 | + | changed = img_rotate_right(&img, &win); | |
| 228 | + | break; | |
| 229 | + | ||
| 222 | 230 | /* Control window */ | |
| 223 | 231 | case 'f': | |
| 224 | 232 | win_toggle_fullscreen(&win); | |
| @@ -65,6 +65,13 @@ Pan up. | |||
| 65 | 65 | .TP | |
| 66 | 66 | .B l | |
| 67 | 67 | Pan right. | |
| 68 | + | .SS Rotation | |
| 69 | + | .TP | |
| 70 | + | .B < | |
| 71 | + | Rotate image counter-clockwise by 90 degrees. | |
| 72 | + | .TP | |
| 73 | + | .B > | |
| 74 | + | Rotate image clockwise by 90 degrees. | |
| 68 | 75 | .SS Control window | |
| 69 | 76 | .TP | |
| 70 | 77 | .B f | |