mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-03-15 05:33:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

seat: Listen for destroy signal of pressed.surface

Browse source
This commit is contained in:
John Lindgren 2022-09-13 10:55:59 -04:00
parent c8ddb0143c
commit b8c3fdaef9
6 changed files with 35 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/labwc.h
View file

@ -152,6 +152,7 @@ struct seat {
struct wl_listener destroy_drag; struct wl_listener destroy_drag;
struct wl_listener constraint_commit; struct wl_listener constraint_commit;
struct wl_listener idle_inhibitor_create; struct wl_listener idle_inhibitor_create;
struct wl_listener pressed_surface_destroy;
}; };
struct lab_data_buffer; struct lab_data_buffer;
@ -561,6 +562,8 @@ void seat_finish(struct server *server);
void seat_reconfigure(struct server *server); void seat_reconfigure(struct server *server);
void seat_focus_surface(struct seat *seat, struct wlr_surface *surface); void seat_focus_surface(struct seat *seat, struct wlr_surface *surface);
void seat_set_focus_layer(struct seat *seat, struct wlr_layer_surface_v1 *layer); void seat_set_focus_layer(struct seat *seat, struct wlr_layer_surface_v1 *layer);
void seat_set_pressed(struct seat *seat, struct view *view,
struct wlr_scene_node *node, struct wlr_surface *surface);
void seat_reset_pressed(struct seat *seat); void seat_reset_pressed(struct seat *seat);
void interactive_begin(struct view *view, enum input_mode mode, void interactive_begin(struct view *view, enum input_mode mode,

4
src/cursor.c
View file

@ -814,9 +814,7 @@ cursor_button(struct wl_listener *listener, void *data)
/* Handle _press */ /* Handle _press */
if (surface) { if (surface) {
seat->pressed.view = view; seat_set_pressed(seat, view, node, surface);
seat->pressed.node = node;
seat->pressed.surface = surface;
} }
if (server->input_mode == LAB_INPUT_STATE_MENU) { if (server->input_mode == LAB_INPUT_STATE_MENU) {

3
src/layers.c
View file

@ -145,9 +145,6 @@ unmap(struct lab_layer_surface *layer)
if (seat->focused_layer == layer->scene_layer_surface->layer_surface) { if (seat->focused_layer == layer->scene_layer_surface->layer_surface) {
seat_set_focus_layer(seat, NULL); seat_set_focus_layer(seat, NULL);
} }
if (seat->pressed.surface == layer->scene_layer_surface->layer_surface->surface) {
seat_reset_pressed(seat);
}
} }
static void static void

34
src/seat.c
View file

@ -370,10 +370,38 @@ seat_set_focus_layer(struct seat *seat, struct wlr_layer_surface_v1 *layer)
} }
} }
static void
pressed_surface_destroy(struct wl_listener *listener, void *data)
{
struct wlr_surface *surface = data;
struct seat *seat = wl_container_of(listener, seat,
pressed_surface_destroy);
assert(surface == seat->pressed.surface);
seat_reset_pressed(seat);
}
void
seat_set_pressed(struct seat *seat, struct view *view,
struct wlr_scene_node *node, struct wlr_surface *surface)
{
assert(surface);
seat_reset_pressed(seat);
seat->pressed.view = view;
seat->pressed.node = node;
seat->pressed.surface = surface;
seat->pressed_surface_destroy.notify = pressed_surface_destroy;
wl_signal_add(&surface->events.destroy, &seat->pressed_surface_destroy);
}
void void
seat_reset_pressed(struct seat *seat) seat_reset_pressed(struct seat *seat)
{ {
seat->pressed.view = NULL; if (seat->pressed.surface) {
seat->pressed.node = NULL; seat->pressed.view = NULL;
seat->pressed.surface = NULL; seat->pressed.node = NULL;
seat->pressed.surface = NULL;
wl_list_remove(&seat->pressed_surface_destroy.link);
}
} }

5
src/view.c
View file

@ -815,11 +815,6 @@ view_destroy(struct view *view)
need_cursor_update = true; need_cursor_update = true;
} }
if (server->seat.pressed.view == view) {
/* Mouse was pressed on surface and is still pressed */
seat_reset_pressed(&server->seat);
}
if (server->focused_view == view) { if (server->focused_view == view) {
server->focused_view = NULL; server->focused_view = NULL;
need_cursor_update = true; need_cursor_update = true;

3
src/xwayland-unmanaged.c
View file

@ -101,9 +101,6 @@ unmanaged_handle_unmap(struct wl_listener *listener, void *data)
* Mark the node as gone so a racing configure event * Mark the node as gone so a racing configure event
* won't try to reposition the node while unmapped. * won't try to reposition the node while unmapped.
*/ */
if (unmanaged->node && seat->pressed.node == unmanaged->node) {
seat_reset_pressed(seat);
}
unmanaged->node = NULL; unmanaged->node = NULL;
cursor_update_focus(unmanaged->server); cursor_update_focus(unmanaged->server);