mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup per PR review comments

Browse source
This commit is contained in:
Daniel Barlow 2021-08-23 20:33:42 +01:00
parent 39b1d92f9b
commit eb2d0918ba
1 changed files with 1 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/server.c
View file

@ -79,20 +79,6 @@ drop_permissions(void)
} }
} }
static void seat_clear_touch_points(struct seat *seat,
struct wl_client *active_client){
struct timespec now;
clock_gettime(CLOCK_MONOTONIC, &now);
struct wlr_touch_point *point;
wl_list_for_each(point, &seat->seat->touch_state.touch_points, link) {
if (point->client->client != active_client) {
wlr_seat_touch_point_clear_focus(seat->seat,
now.tv_nsec / 1000, point->touch_id);
}
}
}
static void seat_inhibit_input(struct seat *seat, struct wl_client *active_client) static void seat_inhibit_input(struct seat *seat, struct wl_client *active_client)
{ {
seat->active_client_while_inhibited = active_client; seat->active_client_while_inhibited = active_client;
@ -101,23 +87,19 @@ static void seat_inhibit_input(struct seat *seat, struct wl_client *active_clie
(wl_resource_get_client(seat->focused_layer->resource) != (wl_resource_get_client(seat->focused_layer->resource) !=
active_client)) active_client))
{ {
wlr_log(WLR_INFO, "defocus layer"); seat_set_focus_layer(seat, NULL);
seat_set_focus_layer(seat, NULL); /* ? */
} }
struct wlr_surface * previous_kb_surface = seat->seat->keyboard_state.focused_surface; struct wlr_surface * previous_kb_surface = seat->seat->keyboard_state.focused_surface;
if (previous_kb_surface && if (previous_kb_surface &&
wl_resource_get_client(previous_kb_surface->resource) != active_client) { wl_resource_get_client(previous_kb_surface->resource) != active_client) {
wlr_log(WLR_INFO, "defocus surface");
seat_focus_surface(seat, NULL); /* keyboard focus */ seat_focus_surface(seat, NULL); /* keyboard focus */
} }
struct wlr_seat_client * previous_ptr_client = seat->seat->pointer_state.focused_client; struct wlr_seat_client * previous_ptr_client = seat->seat->pointer_state.focused_client;
if (previous_ptr_client && if (previous_ptr_client &&
(previous_ptr_client->client != active_client)) { (previous_ptr_client->client != active_client)) {
wlr_log(WLR_INFO, "defocus ptr");
wlr_seat_pointer_clear_focus(seat->seat); wlr_seat_pointer_clear_focus(seat->seat);
} }
seat_clear_touch_points(seat, active_client);
} }
static void seat_disinhibit_input(struct seat *seat) static void seat_disinhibit_input(struct seat *seat)