diff options
| author | Drew DeVault <sir@cmpwn.com> | 2019-01-06 22:41:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-06 22:41:35 -0500 |
| commit | e61ea7706b36435836f341bc371124902d5fb412 (patch) | |
| tree | 96bb1ff88dc68f8367d169c1447dd4eb3a36982d /rootston | |
| parent | e1eceddecff801c7bd7b113704b74df4c6a63ca6 (diff) | |
| parent | 69e7fd61b7824ce683137b44beff02899d6ce78b (diff) | |
Merge pull request #1423 from emersion/data-control
Implement data-control-unstable-v1
Diffstat (limited to 'rootston')
| -rw-r--r-- | rootston/desktop.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/rootston/desktop.c b/rootston/desktop.c index 77a52571..d65266e5 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -7,24 +7,25 @@ #include <wlr/types/wlr_box.h> #include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_cursor.h> +#include <wlr/types/wlr_data_control_v1.h> #include <wlr/types/wlr_export_dmabuf_v1.h> -#include <wlr/types/wlr_gamma_control.h> #include <wlr/types/wlr_gamma_control_v1.h> +#include <wlr/types/wlr_gamma_control.h> +#include <wlr/types/wlr_gtk_primary_selection.h> #include <wlr/types/wlr_idle_inhibit_v1.h> #include <wlr/types/wlr_idle.h> #include <wlr/types/wlr_input_inhibitor.h> #include <wlr/types/wlr_layer_shell_v1.h> #include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_pointer_constraints_v1.h> -#include <wlr/types/wlr_gtk_primary_selection.h> #include <wlr/types/wlr_server_decoration.h> +#include <wlr/types/wlr_tablet_v2.h> #include <wlr/types/wlr_wl_shell.h> #include <wlr/types/wlr_xcursor_manager.h> #include <wlr/types/wlr_xdg_output_v1.h> +#include <wlr/types/wlr_xdg_output_v1.h> #include <wlr/types/wlr_xdg_shell_v6.h> #include <wlr/types/wlr_xdg_shell.h> -#include <wlr/types/wlr_xdg_output_v1.h> -#include <wlr/types/wlr_tablet_v2.h> #include <wlr/util/log.h> #include "rootston/layers.h" #include "rootston/seat.h" @@ -1084,6 +1085,8 @@ struct roots_desktop *desktop_create(struct roots_server *server, desktop->relative_pointer_manager = wlr_relative_pointer_manager_v1_create(server->wl_display); + wlr_data_control_manager_v1_create(server->wl_display); + return desktop; } |