Replaced the obsolete, unofficial protocols with official ones

wizbright · Feb 28, 2020 · ff54fec · ff54fec
1 parent 21de46f
commit ff54fec
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 324 deletions.
diff --git a/include/waybox/server.h b/include/waybox/server.h
@@ -17,7 +17,7 @@
 #include <wlr/types/wlr_screencopy_v1.h>
 #include <wlr/types/wlr_matrix.h>
 #include <wlr/types/wlr_gamma_control_v1.h>
-#include <wlr/types/wlr_gtk_primary_selection.h>
+#include <wlr/types/wlr_primary_selection_v1.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_xdg_shell.h>
 

diff --git a/meson.build b/meson.build
@@ -26,7 +26,7 @@ pixman = dependency('pixman-1')
 wlroots = dependency('wlroots', version: '>=0.9.0')
 wayland_server = dependency('wayland-server')
 wayland_client = dependency('wayland-client')
-wayland_protos  = dependency('wayland-protocols', version: '>=1.12')
+wayland_protos  = dependency('wayland-protocols', version: '>=1.17')
 xkbcommon  = dependency('xkbcommon')
 
 subdir('protocol')

diff --git a/protocol/gtk-primary-selection.xml b/protocol/gtk-primary-selection.xml
diff --git a/protocol/meson.build b/protocol/meson.build
@@ -24,11 +24,11 @@ protocols = [
 	[wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'],
 	[wl_protocol_dir, 'unstable/idle-inhibit/idle-inhibit-unstable-v1.xml'],
 	[wl_protocol_dir, 'unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml'],
+	[wl_protocol_dir, 'unstable/primary-selection/primary-selection-unstable-v1.xml'],
+	[wl_protocol_dir, 'unstable/xdg-decoration/xdg-decoration-unstable-v1.xml'],
 	'wlr-gamma-control-unstable-v1.xml',
-	'gtk-primary-selection.xml',
 	'idle.xml',
 	'wlr-screencopy-unstable-v1.xml',
-	'server-decoration.xml',
 	'wlr-layer-shell-unstable-v1.xml',
 ]
 

diff --git a/protocol/server-decoration.xml b/protocol/server-decoration.xml
diff --git a/waybox/server.c b/waybox/server.c
@@ -52,7 +52,7 @@ bool start_wb(struct wb_server* server) {
 
 	wlr_gamma_control_manager_v1_create(server->wl_display);
 	wlr_screencopy_manager_v1_create(server->wl_display);
-	wlr_gtk_primary_selection_device_manager_create(server->wl_display);
+	wlr_primary_selection_v1_device_manager_create(server->wl_display);
 	wlr_idle_create(server->wl_display);
 
 	wlr_data_device_manager_create(server->wl_display);