mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-05 04:06:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

input: do a full CSD repaint on pointer motion over CSD buttons

Browse source 
This fixes repainting issues on mutter.
This commit is contained in:
Daniel Eklöf 2020-03-03 18:22:32 +01:00
parent f0892988c0
commit 264acd6463
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 12 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

43
input.c
View file

@ -39,7 +39,6 @@ keyboard_keymap(void *data, struct wl_keyboard *wl_keyboard,
char *map_str = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0); char *map_str = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
/* TODO: free old context + keymap */
if (wayl->kbd.xkb_compose_state != NULL) { if (wayl->kbd.xkb_compose_state != NULL) {
xkb_compose_state_unref(wayl->kbd.xkb_compose_state); xkb_compose_state_unref(wayl->kbd.xkb_compose_state);
wayl->kbd.xkb_compose_state = NULL; wayl->kbd.xkb_compose_state = NULL;
@ -711,25 +710,15 @@ wl_pointer_enter(void *data, struct wl_pointer *wl_pointer,
case TERM_SURF_BUTTON_MINIMIZE: case TERM_SURF_BUTTON_MINIMIZE:
case TERM_SURF_BUTTON_MAXIMIZE: case TERM_SURF_BUTTON_MAXIMIZE:
case TERM_SURF_BUTTON_CLOSE: { case TERM_SURF_BUTTON_CLOSE:
enum csd_surface idx = quirk_weston_csd_on(term);
term->active_surface == TERM_SURF_BUTTON_MINIMIZE ? CSD_SURF_MINIMIZE : render_csd(term);
term->active_surface == TERM_SURF_BUTTON_MAXIMIZE ? CSD_SURF_MAXIMIZE : quirk_weston_csd_off(term);
CSD_SURF_CLOSE; render_refresh(term);
quirk_weston_subsurface_desync_on(term->window->csd.sub_surface[CSD_SURF_TITLE]);
quirk_weston_subsurface_desync_on(term->window->csd.sub_surface[idx]);
render_csd_button(term, idx);
quirk_weston_subsurface_desync_off(term->window->csd.sub_surface[idx]);
quirk_weston_subsurface_desync_off(term->window->csd.sub_surface[CSD_SURF_TITLE]);
wl_surface_commit(win->surface);
term->xcursor = "left_ptr"; term->xcursor = "left_ptr";
render_xcursor_set(term); render_xcursor_set(term);
break; break;
}
case TERM_SURF_NONE: case TERM_SURF_NONE:
assert(false); assert(false);
@ -778,22 +767,15 @@ wl_pointer_leave(void *data, struct wl_pointer *wl_pointer,
switch (active_surface) { switch (active_surface) {
case TERM_SURF_BUTTON_MINIMIZE: case TERM_SURF_BUTTON_MINIMIZE:
case TERM_SURF_BUTTON_MAXIMIZE: case TERM_SURF_BUTTON_MAXIMIZE:
case TERM_SURF_BUTTON_CLOSE: { case TERM_SURF_BUTTON_CLOSE:
enum csd_surface idx = if (old_moused->is_shutting_down)
active_surface == TERM_SURF_BUTTON_MINIMIZE ? CSD_SURF_MINIMIZE : break;
active_surface == TERM_SURF_BUTTON_MAXIMIZE ? CSD_SURF_MAXIMIZE :
CSD_SURF_CLOSE;
quirk_weston_subsurface_desync_on(old_moused->window->csd.sub_surface[CSD_SURF_TITLE]); quirk_weston_csd_on(old_moused);
quirk_weston_subsurface_desync_on(old_moused->window->csd.sub_surface[idx]); render_csd(old_moused);
quirk_weston_csd_off(old_moused);
render_csd_button(old_moused, idx); render_refresh(old_moused);
quirk_weston_subsurface_desync_off(old_moused->window->csd.sub_surface[idx]);
quirk_weston_subsurface_desync_off(old_moused->window->csd.sub_surface[CSD_SURF_TITLE]);
wl_surface_commit(old_moused->window->surface);
break; break;
}
case TERM_SURF_NONE: case TERM_SURF_NONE:
case TERM_SURF_GRID: case TERM_SURF_GRID:
@ -1054,7 +1036,6 @@ wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
case TERM_SURF_BUTTON_CLOSE: case TERM_SURF_BUTTON_CLOSE:
if (button == BTN_LEFT && state == WL_POINTER_BUTTON_STATE_PRESSED) if (button == BTN_LEFT && state == WL_POINTER_BUTTON_STATE_PRESSED)
term_shutdown(term); term_shutdown(term);
//LOG_ERR("unimplemented: terminate");
break; break;
case TERM_SURF_SEARCH: case TERM_SURF_SEARCH: