diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-18 21:20:00 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-20 13:11:43 +1000 |
commit | c006717910e5f30ca65645f701541dfa176c1392 (patch) | |
tree | c64452b7f2fe6ab481ad90c424cb14bcb0328eda /sway/input/seat.c | |
parent | Merge pull request #2872 from RyanDwyer/cursor-rebase (diff) | |
download | sway-c006717910e5f30ca65645f701541dfa176c1392.tar.gz sway-c006717910e5f30ca65645f701541dfa176c1392.tar.zst sway-c006717910e5f30ca65645f701541dfa176c1392.zip |
Minor refactor of input manager
The input manager is a singleton object. Passing the sway_input_manager
argument to each of its functions is unnecessary, while removing the
argument makes it obvious to the caller that it's a singleton. This
patch removes the argument and makes the input manager use server.input
instead.
On a similar note:
* sway_input_manager.server is removed in favour of using the server
global.
* seat.input is removed because it can get it from server.input.
Due to a circular dependency, creating seat0 is now done directly in
server_init rather than in input_manager_create. This is because
creating seats must be done after server.input is set.
Lastly, it now stores the default seat name using a constant and removes
a second reference to seat0 (in input_manager_get_default_seat).
Diffstat (limited to 'sway/input/seat.c')
-rw-r--r-- | sway/input/seat.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c index d7733855..330b7bbe 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c | |||
@@ -95,8 +95,7 @@ static void seat_send_focus(struct sway_node *node, struct sway_seat *seat) { | |||
95 | if (view && seat_is_input_allowed(seat, view->surface)) { | 95 | if (view && seat_is_input_allowed(seat, view->surface)) { |
96 | #ifdef HAVE_XWAYLAND | 96 | #ifdef HAVE_XWAYLAND |
97 | if (view->type == SWAY_VIEW_XWAYLAND) { | 97 | if (view->type == SWAY_VIEW_XWAYLAND) { |
98 | struct wlr_xwayland *xwayland = | 98 | struct wlr_xwayland *xwayland = server.xwayland.wlr_xwayland; |
99 | seat->input->server->xwayland.wlr_xwayland; | ||
100 | wlr_xwayland_set_seat(xwayland, seat->wlr_seat); | 99 | wlr_xwayland_set_seat(xwayland, seat->wlr_seat); |
101 | } | 100 | } |
102 | #endif | 101 | #endif |
@@ -328,14 +327,13 @@ static void collect_focus_container_iter(struct sway_container *container, | |||
328 | collect_focus_iter(&container->node, data); | 327 | collect_focus_iter(&container->node, data); |
329 | } | 328 | } |
330 | 329 | ||
331 | struct sway_seat *seat_create(struct sway_input_manager *input, | 330 | struct sway_seat *seat_create(const char *seat_name) { |
332 | const char *seat_name) { | ||
333 | struct sway_seat *seat = calloc(1, sizeof(struct sway_seat)); | 331 | struct sway_seat *seat = calloc(1, sizeof(struct sway_seat)); |
334 | if (!seat) { | 332 | if (!seat) { |
335 | return NULL; | 333 | return NULL; |
336 | } | 334 | } |
337 | 335 | ||
338 | seat->wlr_seat = wlr_seat_create(input->server->wl_display, seat_name); | 336 | seat->wlr_seat = wlr_seat_create(server.wl_display, seat_name); |
339 | if (!sway_assert(seat->wlr_seat, "could not allocate seat")) { | 337 | if (!sway_assert(seat->wlr_seat, "could not allocate seat")) { |
340 | free(seat); | 338 | free(seat); |
341 | return NULL; | 339 | return NULL; |
@@ -361,10 +359,9 @@ struct sway_seat *seat_create(struct sway_input_manager *input, | |||
361 | wl_signal_add(&seat->wlr_seat->events.new_drag_icon, &seat->new_drag_icon); | 359 | wl_signal_add(&seat->wlr_seat->events.new_drag_icon, &seat->new_drag_icon); |
362 | seat->new_drag_icon.notify = handle_new_drag_icon; | 360 | seat->new_drag_icon.notify = handle_new_drag_icon; |
363 | 361 | ||
364 | seat->input = input; | ||
365 | wl_list_init(&seat->devices); | 362 | wl_list_init(&seat->devices); |
366 | 363 | ||
367 | wl_list_insert(&input->seats, &seat->link); | 364 | wl_list_insert(&server.input->seats, &seat->link); |
368 | 365 | ||
369 | return seat; | 366 | return seat; |
370 | } | 367 | } |