diff options
| author | Ryan Dwyer <[email protected]> | 2018-10-18 21:20:00 +1000 |
|---|---|---|
| committer | Ryan Dwyer <[email protected]> | 2018-10-20 13:11:43 +1000 |
| commit | c006717910e5f30ca65645f701541dfa176c1392 (patch) | |
| tree | c64452b7f2fe6ab481ad90c424cb14bcb0328eda /sway/desktop/layer_shell.c | |
| parent | 5b8257b88f703f48466f3b917f1ceaee7c457355 (diff) | |
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/desktop/layer_shell.c')
| -rw-r--r-- | sway/desktop/layer_shell.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c index 269864d4..cabb07f5 100644 --- a/sway/desktop/layer_shell.c +++ b/sway/desktop/layer_shell.c @@ -211,7 +211,7 @@ void arrange_layers(struct sway_output *output) { } struct sway_seat *seat; - wl_list_for_each(seat, &input_manager->seats, link) { + wl_list_for_each(seat, &server.input->seats, link) { seat_set_focus_layer(seat, topmost ? topmost->layer_surface : NULL); } } @@ -241,7 +241,7 @@ static void handle_output_destroy(struct wl_listener *listener, void *data) { wl_container_of(listener, sway_layer, output_destroy); // Determine if this layer is being used by an exclusive client. If it is, // try and find another layer owned by this client to pass focus to. - struct sway_seat *seat = input_manager_get_default_seat(input_manager); + struct sway_seat *seat = input_manager_get_default_seat(); struct wl_client *client = wl_resource_get_client(sway_layer->layer_surface->resource); bool set_focus = seat->exclusive_client == client; @@ -299,7 +299,7 @@ static void unmap(struct sway_layer_surface *sway_layer) { output_damage_surface(output, sway_layer->geo.x, sway_layer->geo.y, sway_layer->layer_surface->surface, true); - struct sway_seat *seat = input_manager_current_seat(input_manager); + struct sway_seat *seat = input_manager_current_seat(); if (seat->focused_layer == sway_layer->layer_surface) { seat_set_focus_layer(seat, NULL); } @@ -370,7 +370,7 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) { if (!layer_surface->output) { // Assign last active output struct sway_output *output = NULL; - struct sway_seat *seat = input_manager_get_default_seat(input_manager); + struct sway_seat *seat = input_manager_get_default_seat(); if (seat) { struct sway_workspace *ws = seat_get_focused_workspace(seat); |