mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-29 05:40:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

src/view.c: Cache server pointer

Browse source
This commit is contained in:
Consolatis 2022-06-09 16:38:17 +02:00
parent 9c37101ec0
commit 32dac72734
1 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/view.c
View file

@ -713,28 +713,29 @@ view_destroy(struct view *view)
} }
interactive_end(view); interactive_end(view);
if (view->server->seat.pressed.view == view) { struct server *server = view->server;
view->server->seat.pressed.view = NULL; if (server->seat.pressed.view == view) {
view->server->seat.pressed.surface = NULL; server->seat.pressed.view = NULL;
server->seat.pressed.surface = NULL;
} }
if (view->server->cycle_view == view) { if (server->cycle_view == view) {
/* If we are the current OSD selected view, cycle /* If we are the current OSD selected view, cycle
* to the next because we are dying. */ * to the next because we are dying. */
view->server->cycle_view = desktop_cycle_view(view->server, server->cycle_view = desktop_cycle_view(server,
view->server->cycle_view, LAB_CYCLE_DIR_BACKWARD); server->cycle_view, LAB_CYCLE_DIR_BACKWARD);
/* If we cycled back to ourselves, then we have no windows. /* If we cycled back to ourselves, then we have no windows.
* just remove it and close the OSD for good. */ * just remove it and close the OSD for good. */
if (view->server->cycle_view == view || !view->server->cycle_view) { if (server->cycle_view == view || !server->cycle_view) {
view->server->cycle_view = NULL; server->cycle_view = NULL;
osd_finish(view->server); osd_finish(server);
} }
} }
if (view->server->cycle_view) { if (server->cycle_view) {
/* Update the OSD to reflect the view has now gone. */ /* Update the OSD to reflect the view has now gone. */
osd_update(view->server); osd_update(server);
} }
if (view->scene_tree) { if (view->scene_tree) {
@ -750,7 +751,7 @@ view_destroy(struct view *view)
*/ */
if (view->fullscreen) { if (view->fullscreen) {
struct output *output = struct output *output =
output_from_wlr_output(view->server, view->fullscreen); output_from_wlr_output(server, view->fullscreen);
uint32_t top = ZWLR_LAYER_SHELL_V1_LAYER_TOP; uint32_t top = ZWLR_LAYER_SHELL_V1_LAYER_TOP;
wlr_scene_node_set_enabled(&output->layer_tree[top]->node, true); wlr_scene_node_set_enabled(&output->layer_tree[top]->node, true);
} }