Skip to content

Fix zoom pan glitches on Wayland #828

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pscheyen wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix zoom pan glitches on Wayland #828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2441b2c
menu: restore focus to feh window after hiding menu
pscheyen Apr 25, 2026
366dbbe
Fix zoom, pan, and display glitches on Wayland. BUG REPORT: At rando…
pscheyen Apr 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/events.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ static void feh_event_handle_ButtonPress(XEvent * ev)
} else if (feh_is_bb(EVENT_zoom_in, button, state)) {
D(("Zoom_In Button Press event\n"));
D(("click offset is %d,%d\n", ev->xbutton.x, ev->xbutton.y));
winwid->manual_zoom = 1;
winwid->click_offset_x = ev->xbutton.x;
winwid->click_offset_y = ev->xbutton.y;
winwid->old_zoom = winwid->zoom;
Expand Down Expand Up @@ -281,6 +282,7 @@ static void feh_event_handle_ButtonPress(XEvent * ev)
} else if (feh_is_bb(EVENT_zoom_out, button, state)) {
D(("Zoom_Out Button Press event\n"));
D(("click offset is %d,%d\n", ev->xbutton.x, ev->xbutton.y));
winwid->manual_zoom = 1;
winwid->click_offset_x = ev->xbutton.x;
winwid->click_offset_y = ev->xbutton.y;
winwid->old_zoom = winwid->zoom;
Expand Down
2 changes: 2 additions & 0 deletions src/keyevents.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,6 +602,7 @@ void feh_event_handle_generic(winwidget winwid, unsigned int state, KeySym keysy
feh_event_invoke_action(winwid, 9);
}
else if (feh_is_kp(EVENT_zoom_in, state, keysym, button)) {
winwid->manual_zoom = 1;
winwid->old_zoom = winwid->zoom;
winwid->zoom = winwid->zoom * opt.zoom_rate;

Expand All @@ -616,6 +617,7 @@ void feh_event_handle_generic(winwidget winwid, unsigned int state, KeySym keysy
winwidget_render_image(winwid, 0, 0);
}
else if (feh_is_kp(EVENT_zoom_out, state, keysym, button)) {
winwid->manual_zoom = 1;
winwid->old_zoom = winwid->zoom;
winwid->zoom = winwid->zoom / opt.zoom_rate;

Expand Down
2 changes: 2 additions & 0 deletions src/menu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,8 @@ void feh_menu_hide(feh_menu * m, int func_free)
if (m == menu_root) {
if (menu_cover) {
D(("DESTROYING menu cover\n"));
if (m->fehwin)
XSetInputFocus(disp, m->fehwin->win, RevertToPointerRoot, CurrentTime);
XDestroyWindow(disp, menu_cover);
menu_cover = 0;
}
Expand Down
49 changes: 28 additions & 21 deletions src/winwidget.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,32 +485,36 @@ void winwidget_render_image(winwidget winwid, int resize, int force_alias)
double required_zoom = 1.0;
feh_calc_needed_zoom(&required_zoom, winwid->im_w, winwid->im_h, winwid->w, winwid->h);

winwid->zoom = opt.default_zoom ? (0.01 * opt.default_zoom) : 1.0;

if ((opt.scale_down || (winwid->full_screen && !opt.default_zoom))
&& winwid->zoom > required_zoom)
winwid->zoom = required_zoom;
else if ((opt.zoom_mode && required_zoom > 1)
&& (!opt.default_zoom || required_zoom < winwid->zoom))
winwid->zoom = required_zoom;

if (opt.offset_flags & XValue) {
if (opt.offset_flags & XNegative) {
winwid->im_x = winwid->w - (winwid->im_w * winwid->zoom) - opt.offset_x;
if (!winwid->manual_zoom) {
winwid->zoom = opt.default_zoom ? (0.01 * opt.default_zoom) : 1.0;

if ((opt.scale_down || (winwid->full_screen && !opt.default_zoom))
&& winwid->zoom > required_zoom)
winwid->zoom = required_zoom;
else if ((opt.zoom_mode && required_zoom > 1)
&& (!opt.default_zoom || required_zoom < winwid->zoom))
winwid->zoom = required_zoom;

if (opt.offset_flags & XValue) {
if (opt.offset_flags & XNegative) {
winwid->im_x = winwid->w - (winwid->im_w * winwid->zoom) - opt.offset_x;
} else {
winwid->im_x = - opt.offset_x * winwid->zoom;
}
} else {
winwid->im_x = - opt.offset_x * winwid->zoom;
winwid->im_x = (int) (winwid->w - (winwid->im_w * winwid->zoom)) >> 1;
}
} else {
winwid->im_x = (int) (winwid->w - (winwid->im_w * winwid->zoom)) >> 1;
}
if (opt.offset_flags & YValue) {
if (opt.offset_flags & YNegative) {
winwid->im_y = winwid->h - (winwid->im_h * winwid->zoom) - opt.offset_y;
if (opt.offset_flags & YValue) {
if (opt.offset_flags & YNegative) {
winwid->im_y = winwid->h - (winwid->im_h * winwid->zoom) - opt.offset_y;
} else {
winwid->im_y = - opt.offset_y * winwid->zoom;
}
} else {
winwid->im_y = - opt.offset_y * winwid->zoom;
winwid->im_y = (int) (winwid->h - (winwid->im_h * winwid->zoom)) >> 1;
}
} else {
winwid->im_y = (int) (winwid->h - (winwid->im_h * winwid->zoom)) >> 1;
winwidget_sanitise_offsets(winwid);
}
}

Expand Down Expand Up @@ -618,6 +622,7 @@ void winwidget_render_image(winwidget winwid, int resize, int force_alias)

XSetWindowBackgroundPixmap(disp, winwid->win, winwid->bg_pmap);
XClearWindow(disp, winwid->win);
XFlush(disp);
return;
}

Expand All @@ -640,6 +645,7 @@ void winwidget_render_image_cached(winwidget winwid)
feh_draw_info(winwid);
XSetWindowBackgroundPixmap(disp, winwid->win, winwid->bg_pmap);
XClearWindow(disp, winwid->win);
XFlush(disp);
}

double feh_calc_needed_zoom(double *zoom, int orig_w, int orig_h, int dest_w, int dest_h)
Expand Down Expand Up @@ -1103,6 +1109,7 @@ void winwidget_reset_image(winwidget winwid)
winwid->im_x = 0;
winwid->im_y = 0;
}
winwid->manual_zoom = 0;
winwid->im_angle = 0.0;
winwid->has_rotated = 0;
return;
Expand Down
2 changes: 1 addition & 1 deletion src/winwidget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ struct __winwidget {
int force_aliasing;
double im_angle;
enum win_type type;
unsigned char had_resize, full_screen;
unsigned char had_resize, full_screen, manual_zoom;
Imlib_Image im;
GC gc;
Pixmap bg_pmap;
Expand Down