diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-09-27 20:24:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-27 20:24:13 -0400 |
| commit | 38bb3b960852f9e358ec40c516f99eafeaf83ab2 (patch) | |
| tree | 755f57a424364aa991e9303760a2040ae324cfd8 /rootston/desktop.c | |
| parent | 1ddda91b1b647df339b5b0a6aefa383e48d634d8 (diff) | |
| parent | 4e70d36e61dd720e9caadb74b39d3a0cd6c8cad7 (diff) | |
Merge pull request #162 from emersion/wl_shell
Add wl_shell to rootston
Diffstat (limited to 'rootston/desktop.c')
| -rw-r--r-- | rootston/desktop.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/rootston/desktop.c b/rootston/desktop.c index f0495fa1..f9af3b8e 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -67,7 +67,6 @@ struct roots_desktop *desktop_create(struct roots_server *server, desktop->layout = wlr_output_layout_create(); desktop->compositor = wlr_compositor_create( server->wl_display, server->renderer); - desktop->wl_shell = wlr_wl_shell_create(server->wl_display); wlr_cursor_attach_output_layout(server->input->cursor, desktop->layout); wlr_cursor_map_to_region(server->input->cursor, config->cursor.mapped_box); @@ -79,6 +78,11 @@ struct roots_desktop *desktop_create(struct roots_server *server, &desktop->xdg_shell_v6_surface); desktop->xdg_shell_v6_surface.notify = handle_xdg_shell_v6_surface; + desktop->wl_shell = wlr_wl_shell_create(server->wl_display); + wl_signal_add(&desktop->wl_shell->events.new_surface, + &desktop->wl_shell_surface); + desktop->wl_shell_surface.notify = handle_wl_shell_surface; + desktop->gamma_control_manager = wlr_gamma_control_manager_create( server->wl_display); |