diff options
| author | Daniel Friesel <derf@derf.homelinux.org> | 2010-06-19 20:53:38 +0200 |
|---|---|---|
| committer | Daniel Friesel <derf@derf.homelinux.org> | 2010-06-19 20:53:38 +0200 |
| commit | e2ebaaa2cd997b553c772bafd082b5b2e69efeec (patch) | |
| tree | 36712442f46497a6d0a8cfc5078d7e4c725b8646 /src/events.c | |
| parent | add9cfa1ae859e5f728a2ec3fd1d02586008dfe0 (diff) | |
Make <keypad /> and <keypad *> actually useful
Diffstat (limited to 'src/events.c')
| -rw-r--r-- | src/events.c | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/src/events.c b/src/events.c index 7caa4d2..de2e3c0 100644 --- a/src/events.c +++ b/src/events.c @@ -61,7 +61,6 @@ void feh_event_init(void) static void feh_event_handle_ButtonPress(XEvent * ev) { winwidget winwid = NULL; - int scr_width, scr_height; /* get the heck out if it's a mouse-click on the cover, we'll hide the menus on release */ @@ -69,15 +68,6 @@ static void feh_event_handle_ButtonPress(XEvent * ev) return; } - scr_width = scr->width; - scr_height = scr->height; -#ifdef HAVE_LIBXINERAMA - if (opt.xinerama && xinerama_screens) { - scr_width = xinerama_screens[xinerama_screen].width; - scr_height = xinerama_screens[xinerama_screen].height; - } -#endif /* HAVE_LIBXINERAMA */ - winwid = winwidget_get_from_window(ev->xbutton.window); if (winwid && winwid->caption_entry) { return; @@ -132,23 +122,7 @@ static void feh_event_handle_ButtonPress(XEvent * ev) winwid->im_click_offset_y = (winwid->click_offset_y - winwid->im_y) / winwid->old_zoom; - /* center the image */ - if (winwid->full_screen) { - winwid->im_x = (scr_width - winwid->im_w) >> 1; - winwid->im_y = (scr_height - winwid->im_h) >> 1; - } else { - if (opt.geom_flags & WidthValue) { - winwid->im_x = (opt.geom_w - winwid->im_w) >> 1; - } else { - winwid->im_x = 0; - } - if (opt.geom_flags & HeightValue) { - winwid->im_y = (opt.geom_h - winwid->im_h) >> 1; - } else { - winwid->im_y = 0; - } - } - + winwidget_center_image(winwid); winwidget_render_image(winwid, 0, 0); } } else if (ev->xbutton.button == opt.reload_button) { |