diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-02-13 08:30:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-13 08:30:54 -0500 |
| commit | 71cba94e73022d8cef8651055204a4706377ae11 (patch) | |
| tree | 8ea1a2b6a0414fd7904824ffac330cd4e1e96ca2 /rootston/desktop.c | |
| parent | 3497e53516d96ad67b26115e2e06218f68e1114d (diff) | |
| parent | c2e147401048aa53aebd52f1851b1da8c91043a3 (diff) | |
Merge pull request #627 from emersion/wlr-signal-emit-safe
Remove wlr_backend.events.{output_remove,device_remove}
Diffstat (limited to 'rootston/desktop.c')
| -rw-r--r-- | rootston/desktop.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/rootston/desktop.c b/rootston/desktop.c index 91661c05..80ccbc25 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -1,25 +1,25 @@ #define _POSIX_C_SOURCE 199309L #include <assert.h> -#include <time.h> -#include <stdlib.h> #include <math.h> +#include <stdlib.h> +#include <time.h> #include <wlr/config.h> #include <wlr/types/wlr_box.h> #include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_cursor.h> #include <wlr/types/wlr_gamma_control.h> #include <wlr/types/wlr_idle.h> +#include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_primary_selection.h> #include <wlr/types/wlr_server_decoration.h> -#include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_wl_shell.h> #include <wlr/types/wlr_xcursor_manager.h> #include <wlr/types/wlr_xdg_shell_v6.h> #include <wlr/util/log.h> -#include "rootston/server.h" #include "rootston/seat.h" -#include "rootston/xcursor.h" +#include "rootston/server.h" #include "rootston/view.h" +#include "rootston/xcursor.h" void view_get_box(const struct roots_view *view, struct wlr_box *box) { box->x = view->x; @@ -621,11 +621,8 @@ struct roots_desktop *desktop_create(struct roots_server *server, wl_list_init(&desktop->views); wl_list_init(&desktop->outputs); - desktop->output_add.notify = output_add_notify; - wl_signal_add(&server->backend->events.output_add, &desktop->output_add); - desktop->output_remove.notify = output_remove_notify; - wl_signal_add(&server->backend->events.output_remove, - &desktop->output_remove); + desktop->new_output.notify = handle_new_output; + wl_signal_add(&server->backend->events.new_output, &desktop->new_output); desktop->server = server; desktop->config = config; |