yosh
/
hikari
1
0
Fork 0
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

Correct list naming 

Unmanaged Xwayland views are not tracked by the server for a while now anymore,
this should be reflected in the naming of the list.
This commit is contained in:
raichoo 2020-08-31 09:19:16 +00:00
parent fd7d3c7fbb
commit e8fb5f3b28
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/hikari/xwayland_unmanaged_view.h
View File

@ -27,7 +27,7 @@ struct hikari_xwayland_unmanaged_view {
struct wl_listener request_configure;
struct wl_listener commit;
struct wl_list unmanaged_server_views;
struct wl_list unmanaged_output_views;
};
void

4
src/renderer.c
View File

@ -440,7 +440,7 @@ render_unmanaged_views(struct hikari_renderer *renderer)
struct hikari_xwayland_unmanaged_view *xwayland_unmanaged_view;
wl_list_for_each_reverse (xwayland_unmanaged_view,
&output->unmanaged_xwayland_views,
unmanaged_server_views) {
unmanaged_output_views) {
renderer->geometry = &xwayland_unmanaged_view->geometry;
@ -543,7 +543,7 @@ frame_done(struct hikari_output *output, struct timespec *now)
struct hikari_xwayland_unmanaged_view *xwayland_unmanaged_view;
wl_list_for_each_reverse (xwayland_unmanaged_view,
&output->unmanaged_xwayland_views,
unmanaged_server_views) {
unmanaged_output_views) {
wlr_surface_for_each_surface(
xwayland_unmanaged_view->surface->surface, send_frame_done, now);
}

2
src/server.c
View File

@ -368,7 +368,7 @@ node_at(double lx,
struct hikari_xwayland_unmanaged_view *xwayland_unmanaged_view = NULL;
wl_list_for_each (xwayland_unmanaged_view,
&output->unmanaged_xwayland_views,
unmanaged_server_views) {
unmanaged_output_views) {
node = (struct hikari_node *)xwayland_unmanaged_view;
if (surface_at(node, ox, oy, surface, sx, sy)) {

2
src/workspace.c
View File

@ -104,7 +104,7 @@ hikari_workspace_merge(
wl_list_for_each_reverse_safe (unmanaged_xwayland_view,
unmanaged_xwayland_view_temp,
&workspace->output->unmanaged_xwayland_views,
unmanaged_server_views) {
unmanaged_output_views) {
hikari_xwayland_unmanaged_evacuate(unmanaged_xwayland_view, into);
}
#endif

4
src/xwayland_unmanaged_view.c
View File

@ -83,7 +83,7 @@ map_handler(struct wl_listener *listener, void *data)
&xwayland_unmanaged_view->commit);
wl_list_insert(&output->unmanaged_xwayland_views,
&xwayland_unmanaged_view->unmanaged_server_views);
&xwayland_unmanaged_view->unmanaged_output_views);
hikari_output_add_damage(output, geometry);
}
@ -92,7 +92,7 @@ static void
unmap(struct hikari_xwayland_unmanaged_view *xwayland_unmanaged_view)
{
wl_list_remove(&xwayland_unmanaged_view->commit.link);
wl_list_remove(&xwayland_unmanaged_view->unmanaged_server_views);
wl_list_remove(&xwayland_unmanaged_view->unmanaged_output_views);
xwayland_unmanaged_view->hidden = true;