mirrors/cage
1
0
Fork 0
mirror of https://github.com/cage-kiosk/cage.git synced 2025-11-02 09:01:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Damage whole views on map and unmap

Browse source
This commit is contained in:
Jente Hidskes 2019-02-13 18:50:29 +01:00
parent 1308c0ffc3
commit a114ddbbf3
4 changed files with 33 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
view.c
View file

@ -48,6 +48,8 @@ view_child_finish(struct cg_view_child *child)
return; return;
} }
view_damage_whole(child->view);
wl_list_remove(&child->link); wl_list_remove(&child->link);
wl_list_remove(&child->commit.link); wl_list_remove(&child->commit.link);
wl_list_remove(&child->new_subsurface.link); wl_list_remove(&child->new_subsurface.link);

26
xdg_shell.c
View file

@ -26,16 +26,32 @@ xdg_popup_destroy(struct cg_view_child *child)
struct cg_xdg_popup *popup = (struct cg_xdg_popup *) child; struct cg_xdg_popup *popup = (struct cg_xdg_popup *) child;
wl_list_remove(&popup->destroy.link); wl_list_remove(&popup->destroy.link);
wl_list_remove(&popup->map.link);
wl_list_remove(&popup->unmap.link);
wl_list_remove(&popup->new_popup.link); wl_list_remove(&popup->new_popup.link);
view_child_finish(&popup->view_child); view_child_finish(&popup->view_child);
free(popup); free(popup);
} }
static void
handle_xdg_popup_map(struct wl_listener *listener, void *data)
{
struct cg_xdg_popup *popup = wl_container_of(listener, popup, map);
view_damage_whole(popup->view_child.view);
}
static void
handle_xdg_popup_unmap(struct wl_listener *listener, void *data)
{
struct cg_xdg_popup *popup = wl_container_of(listener, popup, unmap);
view_damage_whole(popup->view_child.view);
}
static void static void
handle_xdg_popup_destroy(struct wl_listener *listener, void *data) handle_xdg_popup_destroy(struct wl_listener *listener, void *data)
{ {
struct cg_xdg_popup *popup = wl_container_of(listener, popup, destroy); struct cg_xdg_popup *popup = wl_container_of(listener, popup, destroy);
struct cg_view_child *view_child = (struct cg_view_child *) popup struct cg_view_child *view_child = (struct cg_view_child *) popup;
xdg_popup_destroy(view_child); xdg_popup_destroy(view_child);
} }
@ -81,6 +97,10 @@ xdg_popup_create(struct cg_view *view, struct wlr_xdg_popup *wlr_popup)
popup->view_child.destroy = xdg_popup_destroy; popup->view_child.destroy = xdg_popup_destroy;
popup->destroy.notify = handle_xdg_popup_destroy; popup->destroy.notify = handle_xdg_popup_destroy;
wl_signal_add(&wlr_popup->base->events.destroy, &popup->destroy); wl_signal_add(&wlr_popup->base->events.destroy, &popup->destroy);
popup->map.notify = handle_xdg_popup_map;
wl_signal_add(&wlr_popup->base->events.map, &popup->map);
popup->unmap.notify = handle_xdg_popup_unmap;
wl_signal_add(&wlr_popup->base->events.unmap, &popup->unmap);
popup->new_popup.notify = popup_handle_new_xdg_popup; popup->new_popup.notify = popup_handle_new_xdg_popup;
wl_signal_add(&wlr_popup->base->events.new_popup, &popup->new_popup); wl_signal_add(&wlr_popup->base->events.new_popup, &popup->new_popup);
@ -197,6 +217,8 @@ handle_xdg_shell_surface_unmap(struct wl_listener *listener, void *data)
struct cg_xdg_shell_view *xdg_shell_view = wl_container_of(listener, xdg_shell_view, unmap); struct cg_xdg_shell_view *xdg_shell_view = wl_container_of(listener, xdg_shell_view, unmap);
struct cg_view *view = &xdg_shell_view->view; struct cg_view *view = &xdg_shell_view->view;
view_damage_whole(view);
wl_list_remove(&xdg_shell_view->commit.link); wl_list_remove(&xdg_shell_view->commit.link);
view_unmap(view); view_unmap(view);
@ -212,6 +234,8 @@ handle_xdg_shell_surface_map(struct wl_listener *listener, void *data)
wl_signal_add(&xdg_shell_view->xdg_surface->surface->events.commit, &xdg_shell_view->commit); wl_signal_add(&xdg_shell_view->xdg_surface->surface->events.commit, &xdg_shell_view->commit);
view_map(view, xdg_shell_view->xdg_surface->surface); view_map(view, xdg_shell_view->xdg_surface->surface);
view_damage_whole(view);
} }
static void static void

2
xdg_shell.h
View file

@ -25,6 +25,8 @@ struct cg_xdg_popup {
struct wlr_xdg_popup *wlr_popup; struct wlr_xdg_popup *wlr_popup;
struct wl_listener destroy; struct wl_listener destroy;
struct wl_listener map;
struct wl_listener unmap;
struct wl_listener new_popup; struct wl_listener new_popup;
}; };

4
xwayland.c
View file

@ -121,6 +121,8 @@ handle_xwayland_surface_unmap(struct wl_listener *listener, void *data)
struct cg_xwayland_view *xwayland_view = wl_container_of(listener, xwayland_view, unmap); struct cg_xwayland_view *xwayland_view = wl_container_of(listener, xwayland_view, unmap);
struct cg_view *view = &xwayland_view->view; struct cg_view *view = &xwayland_view->view;
view_damage_whole(view);
wl_list_remove(&xwayland_view->commit.link); wl_list_remove(&xwayland_view->commit.link);
view_unmap(view); view_unmap(view);
@ -142,6 +144,8 @@ handle_xwayland_surface_map(struct wl_listener *listener, void *data)
xwayland_view->ever_been_mapped = true; xwayland_view->ever_been_mapped = true;
view_map(view, xwayland_view->xwayland_surface->surface); view_map(view, xwayland_view->xwayland_surface->surface);
view_damage_whole(view);
} }
static void static void