Implement input inhibit in rootston
This commit is contained in:
parent
3a8c7f283d
commit
56deff41b6
|
@ -182,7 +182,3 @@ struct wlr_backend *wlr_backend_autocreate(struct wl_display *display) {
|
|||
|
||||
return backend;
|
||||
}
|
||||
|
||||
uint32_t usec_to_msec(uint64_t usec) {
|
||||
return (uint32_t)(usec / 1000);
|
||||
}
|
||||
|
|
|
@ -191,3 +191,7 @@ struct libinput_device *wlr_libinput_get_device_handle(struct wlr_input_device *
|
|||
struct wlr_libinput_input_device *dev = (struct wlr_libinput_input_device *)_dev;
|
||||
return dev->handle;
|
||||
}
|
||||
|
||||
uint32_t usec_to_msec(uint64_t usec) {
|
||||
return (uint32_t)(usec / 1000);
|
||||
}
|
||||
|
|
|
@ -29,6 +29,8 @@ struct wlr_libinput_input_device {
|
|||
struct libinput_device *handle;
|
||||
};
|
||||
|
||||
uint32_t usec_to_msec(uint64_t usec);
|
||||
|
||||
void wlr_libinput_event(struct wlr_libinput_backend *state,
|
||||
struct libinput_event *event);
|
||||
|
||||
|
|
|
@ -59,6 +59,8 @@ struct roots_desktop {
|
|||
struct wl_listener wl_shell_surface;
|
||||
struct wl_listener layer_shell_surface;
|
||||
struct wl_listener decoration_new;
|
||||
struct wl_listener input_inhibit_activate;
|
||||
struct wl_listener input_inhibit_deactivate;
|
||||
|
||||
#ifdef WLR_HAS_XWAYLAND
|
||||
struct wlr_xwayland *xwayland;
|
||||
|
|
|
@ -19,6 +19,9 @@ struct roots_seat {
|
|||
// If the focused layer is set, views cannot receive keyboard focus
|
||||
struct wlr_layer_surface *focused_layer;
|
||||
|
||||
// If non-null, only this client can receive input events
|
||||
struct wl_client *exclusive_client;
|
||||
|
||||
struct wl_list views; // roots_seat_view::link
|
||||
bool has_focus;
|
||||
|
||||
|
@ -125,4 +128,10 @@ void roots_drag_icon_update_position(struct roots_drag_icon *icon);
|
|||
|
||||
void roots_drag_icon_damage_whole(struct roots_drag_icon *icon);
|
||||
|
||||
void roots_seat_set_exclusive_client(struct roots_seat *seat,
|
||||
struct wl_client *client);
|
||||
|
||||
bool roots_seat_allow_input(struct roots_seat *seat,
|
||||
struct wl_resource *resource);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -46,6 +46,4 @@ struct wlr_egl *wlr_backend_get_egl(struct wlr_backend *backend);
|
|||
*/
|
||||
struct wlr_renderer *wlr_backend_get_renderer(struct wlr_backend *backend);
|
||||
|
||||
uint32_t usec_to_msec(uint64_t usec);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -530,6 +530,7 @@ bool wlr_seat_touch_has_grab(struct wlr_seat *seat);
|
|||
*/
|
||||
bool wlr_seat_validate_grab_serial(struct wlr_seat *seat, uint32_t serial);
|
||||
|
||||
struct wlr_seat_client *wlr_seat_client_from_resource(struct wl_resource *resource);
|
||||
struct wlr_seat_client *wlr_seat_client_from_resource(
|
||||
struct wl_resource *resource);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -111,6 +111,9 @@ static void roots_passthrough_cursor(struct roots_cursor *cursor,
|
|||
if (surface) {
|
||||
client = wl_resource_get_client(surface->resource);
|
||||
}
|
||||
if (surface && !roots_seat_allow_input(cursor->seat, surface->resource)) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (cursor->cursor_client != client) {
|
||||
wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager,
|
||||
|
@ -327,7 +330,7 @@ void roots_cursor_handle_touch_down(struct roots_cursor *cursor,
|
|||
desktop, lx, ly, &sx, &sy, NULL);
|
||||
|
||||
uint32_t serial = 0;
|
||||
if (surface) {
|
||||
if (surface && roots_seat_allow_input(cursor->seat, surface->resource)) {
|
||||
serial = wlr_seat_touch_notify_down(cursor->seat->seat, surface,
|
||||
event->time_msec, event->touch_id, sx, sy);
|
||||
}
|
||||
|
@ -378,7 +381,7 @@ void roots_cursor_handle_touch_motion(struct roots_cursor *cursor,
|
|||
struct wlr_surface *surface = desktop_surface_at(
|
||||
desktop, lx, ly, &sx, &sy, NULL);
|
||||
|
||||
if (surface) {
|
||||
if (surface && roots_seat_allow_input(cursor->seat, surface->resource)) {
|
||||
wlr_seat_touch_point_focus(cursor->seat->seat, surface,
|
||||
event->time_msec, event->touch_id, sx, sy);
|
||||
wlr_seat_touch_notify_motion(cursor->seat->seat, event->time_msec,
|
||||
|
|
|
@ -756,6 +756,25 @@ static void handle_layout_change(struct wl_listener *listener, void *data) {
|
|||
}
|
||||
}
|
||||
|
||||
static void input_inhibit_activate(struct wl_listener *listener, void *data) {
|
||||
struct roots_desktop *desktop = wl_container_of(
|
||||
listener, desktop, input_inhibit_activate);
|
||||
struct roots_seat *seat;
|
||||
wl_list_for_each(seat, &desktop->server->input->seats, link) {
|
||||
roots_seat_set_exclusive_client(seat,
|
||||
desktop->input_inhibit->active_client);
|
||||
}
|
||||
}
|
||||
|
||||
static void input_inhibit_deactivate(struct wl_listener *listener, void *data) {
|
||||
struct roots_desktop *desktop = wl_container_of(
|
||||
listener, desktop, input_inhibit_deactivate);
|
||||
struct roots_seat *seat;
|
||||
wl_list_for_each(seat, &desktop->server->input->seats, link) {
|
||||
roots_seat_set_exclusive_client(seat, NULL);
|
||||
}
|
||||
}
|
||||
|
||||
struct roots_desktop *desktop_create(struct roots_server *server,
|
||||
struct roots_config *config) {
|
||||
wlr_log(L_DEBUG, "Initializing roots desktop");
|
||||
|
@ -855,8 +874,15 @@ struct roots_desktop *desktop_create(struct roots_server *server,
|
|||
wlr_primary_selection_device_manager_create(server->wl_display);
|
||||
desktop->idle = wlr_idle_create(server->wl_display);
|
||||
desktop->idle_inhibit = wlr_idle_inhibit_v1_create(server->wl_display);
|
||||
|
||||
desktop->input_inhibit =
|
||||
wlr_input_inhibit_manager_create(server->wl_display);
|
||||
desktop->input_inhibit_activate.notify = input_inhibit_activate;
|
||||
wl_signal_add(&desktop->input_inhibit->events.activate,
|
||||
&desktop->input_inhibit_activate);
|
||||
desktop->input_inhibit_deactivate.notify = input_inhibit_deactivate;
|
||||
wl_signal_add(&desktop->input_inhibit->events.deactivate,
|
||||
&desktop->input_inhibit_deactivate);
|
||||
|
||||
struct wlr_egl *egl = wlr_backend_get_egl(server->backend);
|
||||
desktop->linux_dmabuf = wlr_linux_dmabuf_create(server->wl_display, egl);
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
#define _POSIX_C_SOURCE 199309L
|
||||
#include <assert.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
#include <wayland-server.h>
|
||||
#include <wlr/config.h>
|
||||
#include <wlr/types/wlr_idle.h>
|
||||
|
@ -716,7 +718,17 @@ struct roots_seat_view *roots_seat_view_from_view(
|
|||
return seat_view;
|
||||
}
|
||||
|
||||
bool roots_seat_allow_input(struct roots_seat *seat,
|
||||
struct wl_resource *resource) {
|
||||
return !seat->exclusive_client ||
|
||||
wl_resource_get_client(resource) == seat->exclusive_client;
|
||||
}
|
||||
|
||||
void roots_seat_set_focus(struct roots_seat *seat, struct roots_view *view) {
|
||||
if (view && !roots_seat_allow_input(seat, view->wlr_surface->resource)) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Make sure the view will be rendered on top of others, even if it's
|
||||
// already focused in this seat
|
||||
if (view != NULL) {
|
||||
|
@ -811,11 +823,14 @@ void roots_seat_set_focus(struct roots_seat *seat, struct roots_view *view) {
|
|||
*/
|
||||
void roots_seat_set_focus_layer(struct roots_seat *seat,
|
||||
struct wlr_layer_surface *layer) {
|
||||
struct wlr_keyboard *keyboard = wlr_seat_get_keyboard(seat->seat);
|
||||
if (!layer) {
|
||||
seat->focused_layer = NULL;
|
||||
return;
|
||||
}
|
||||
struct wlr_keyboard *keyboard = wlr_seat_get_keyboard(seat->seat);
|
||||
if (!roots_seat_allow_input(seat, layer->resource)) {
|
||||
return;
|
||||
}
|
||||
if (seat->has_focus) {
|
||||
struct roots_view *prev_focus = roots_seat_get_focus(seat);
|
||||
wlr_seat_keyboard_clear_focus(seat->seat);
|
||||
|
@ -835,6 +850,46 @@ void roots_seat_set_focus_layer(struct roots_seat *seat,
|
|||
}
|
||||
}
|
||||
|
||||
void roots_seat_set_exclusive_client(struct roots_seat *seat,
|
||||
struct wl_client *client) {
|
||||
if (!client) {
|
||||
seat->exclusive_client = client;
|
||||
// Triggers a refocus of the topmost surface layer if necessary
|
||||
// TODO: Make layer surface focus per-output based on cursor position
|
||||
struct roots_output *output;
|
||||
wl_list_for_each(output, &seat->input->server->desktop->outputs, link) {
|
||||
arrange_layers(output);
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (seat->focused_layer) {
|
||||
if (wl_resource_get_client(seat->focused_layer->resource) != client) {
|
||||
roots_seat_set_focus_layer(seat, NULL);
|
||||
}
|
||||
}
|
||||
if (seat->has_focus) {
|
||||
struct roots_view *focus = roots_seat_get_focus(seat);
|
||||
if (wl_resource_get_client(focus->wlr_surface->resource) != client) {
|
||||
roots_seat_set_focus(seat, NULL);
|
||||
}
|
||||
}
|
||||
if (seat->seat->pointer_state.focused_client) {
|
||||
if (seat->seat->pointer_state.focused_client->client != client) {
|
||||
wlr_seat_pointer_clear_focus(seat->seat);
|
||||
}
|
||||
}
|
||||
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 != client) {
|
||||
wlr_seat_touch_point_clear_focus(seat->seat,
|
||||
now.tv_nsec / 1000, point->touch_id);
|
||||
}
|
||||
}
|
||||
seat->exclusive_client = client;
|
||||
}
|
||||
|
||||
void roots_seat_cycle_focus(struct roots_seat *seat) {
|
||||
if (wl_list_empty(&seat->views)) {
|
||||
return;
|
||||
|
|
Loading…
Reference in New Issue