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

wayland: drop ‘_surface’ suffix from subsurface struct instances

Browse source
This commit is contained in:
Daniel Eklöf 2021-02-12 12:00:40 +01:00
parent 438853a2d8
commit 5c8579043d
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
5 changed files with 42 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

26
wayland.c
View file

@ -1367,7 +1367,7 @@ wayl_win_init(struct terminal *term)
wl_surface_commit(win->surface);
if (conf->tweak.render_timer_osd) {
if (!wayl_win_subsurface_new(win, &win->render_timer_surface)) {
if (!wayl_win_subsurface_new(win, &win->render_timer)) {
LOG_ERR("failed to create render timer surface");
goto out;
}
@ -1398,20 +1398,20 @@ wayl_win_destroy(struct wl_window *win)
* nor mouse focus).
*/
if (win->render_timer_surface.surf != NULL) {
wl_surface_attach(win->render_timer_surface.surf, NULL, 0, 0);
wl_surface_commit(win->render_timer_surface.surf);
if (win->render_timer.surf != NULL) {
wl_surface_attach(win->render_timer.surf, NULL, 0, 0);
wl_surface_commit(win->render_timer.surf);
}
if (win->scrollback_indicator_surface.surf != NULL) {
wl_surface_attach(win->scrollback_indicator_surface.surf, NULL, 0, 0);
wl_surface_commit(win->scrollback_indicator_surface.surf);
if (win->scrollback_indicator.surf != NULL) {
wl_surface_attach(win->scrollback_indicator.surf, NULL, 0, 0);
wl_surface_commit(win->scrollback_indicator.surf);
}
/* Scrollback search */
if (win->search_surface.surf != NULL) {
wl_surface_attach(win->search_surface.surf, NULL, 0, 0);
wl_surface_commit(win->search_surface.surf);
if (win->search.surf != NULL) {
wl_surface_attach(win->search.surf, NULL, 0, 0);
wl_surface_commit(win->search.surf);
}
/* CSD */
@ -1437,9 +1437,9 @@ wayl_win_destroy(struct wl_window *win)
}
csd_destroy(win);
wayl_win_subsurface_destroy(&win->search_surface);
wayl_win_subsurface_destroy(&win->scrollback_indicator_surface);
wayl_win_subsurface_destroy(&win->render_timer_surface);
wayl_win_subsurface_destroy(&win->search);
wayl_win_subsurface_destroy(&win->scrollback_indicator);
wayl_win_subsurface_destroy(&win->render_timer);
if (win->frame_callback != NULL)
wl_callback_destroy(win->frame_callback);