summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristopher Michael <devilhorns@comcast.net>2021-03-01 11:22:58 -0500
committerChristopher Michael <devilhorns@comcast.net>2021-03-01 11:22:58 -0500
commit914a85159be2244e541b7f44f16ea4c7e4f3aca5 (patch)
tree60cb5a9bfa2e7868ad9ca866237e6f2e8983c9d5 /src
parentf174e739e162e1e2ce070deee97f3cf67517fc76 (diff)
ecore_wl2: Remove legacy teamwork stuff
This patch removes the remainder of the Teamwork protocol & implementation. The module has been removed from Enlightenment for some time now so there is no need to generate a protocol or have any legacy code remaining..
Diffstat (limited to 'src')
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_display.c6
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_private.h4
-rw-r--r--src/wayland_protocol/meson.build3
-rw-r--r--src/wayland_protocol/teamwork.xml39
4 files changed, 1 insertions, 51 deletions
diff --git a/src/lib/ecore_wl2/ecore_wl2_display.c b/src/lib/ecore_wl2/ecore_wl2_display.c
index efaa25363c..7a0e20cf31 100644
--- a/src/lib/ecore_wl2/ecore_wl2_display.c
+++ b/src/lib/ecore_wl2/ecore_wl2_display.c
@@ -326,12 +326,6 @@ _cb_global_add(void *data, struct wl_registry *registry, unsigned int id, const
326 EINA_INLIST_FOREACH(ewd->windows, window) 326 EINA_INLIST_FOREACH(ewd->windows, window)
327 if (window->surface) efl_aux_hints_get_supported_aux_hints(ewd->wl.efl_aux_hints, window->surface); 327 if (window->surface) efl_aux_hints_get_supported_aux_hints(ewd->wl.efl_aux_hints, window->surface);
328 } 328 }
329 else if (!strcmp(interface, "zwp_teamwork"))
330 {
331 ewd->wl.teamwork =
332 wl_registry_bind(registry, id,
333 &zwp_teamwork_interface, EFL_TEAMWORK_VERSION);
334 }
335 else if (!strcmp(interface, "wl_output")) 329 else if (!strcmp(interface, "wl_output"))
336 _ecore_wl2_output_add(ewd, id); 330 _ecore_wl2_output_add(ewd, id);
337 else if (!strcmp(interface, "wl_seat")) 331 else if (!strcmp(interface, "wl_seat"))
diff --git a/src/lib/ecore_wl2/ecore_wl2_private.h b/src/lib/ecore_wl2/ecore_wl2_private.h
index 0a662e7884..c374c67857 100644
--- a/src/lib/ecore_wl2/ecore_wl2_private.h
+++ b/src/lib/ecore_wl2/ecore_wl2_private.h
@@ -7,9 +7,6 @@
7# include <xkbcommon/xkbcommon-compose.h> 7# include <xkbcommon/xkbcommon-compose.h>
8# include "ecore_wl2_internal.h" 8# include "ecore_wl2_internal.h"
9 9
10# define EFL_TEAMWORK_VERSION 2
11# include "teamwork-client-protocol.h"
12
13# include "session-recovery-client-protocol.h" 10# include "session-recovery-client-protocol.h"
14 11
15# include "xdg-shell-client-protocol.h" 12# include "xdg-shell-client-protocol.h"
@@ -92,7 +89,6 @@ struct _Ecore_Wl2_Display
92 struct xdg_wm_base *xdg_wm_base; 89 struct xdg_wm_base *xdg_wm_base;
93 struct zwp_e_session_recovery *session_recovery; 90 struct zwp_e_session_recovery *session_recovery;
94 struct efl_aux_hints *efl_aux_hints; 91 struct efl_aux_hints *efl_aux_hints;
95 struct zwp_teamwork *teamwork;
96 struct efl_hints *efl_hints; 92 struct efl_hints *efl_hints;
97 int compositor_version; 93 int compositor_version;
98 } wl; 94 } wl;
diff --git a/src/wayland_protocol/meson.build b/src/wayland_protocol/meson.build
index 652dfd551d..3749e5d91b 100644
--- a/src/wayland_protocol/meson.build
+++ b/src/wayland_protocol/meson.build
@@ -7,8 +7,7 @@ wayland_client = dependency('wayland-client')
7wl_protocol_local = [ 7wl_protocol_local = [
8 'efl-aux-hints.xml', 8 'efl-aux-hints.xml',
9 'efl-hints.xml', 9 'efl-hints.xml',
10 'session-recovery.xml', 10 'session-recovery.xml'
11 'teamwork.xml'
12] 11]
13 12
14wl_unstable_protocol_sys = [ 13wl_unstable_protocol_sys = [
diff --git a/src/wayland_protocol/teamwork.xml b/src/wayland_protocol/teamwork.xml
deleted file mode 100644
index 99e2f33dfa..0000000000
--- a/src/wayland_protocol/teamwork.xml
+++ /dev/null
@@ -1,39 +0,0 @@
1<protocol name="teamwork">
2
3 <interface name="zwp_teamwork" version="2">
4 <request name="preload_uri">
5 <arg name="surface" type="object" interface="wl_surface"/>
6 <arg name="uri" type="string"/>
7 </request>
8 <request name="activate_uri">
9 <arg name="surface" type="object" interface="wl_surface"/>
10 <arg name="uri" type="string"/>
11 <arg name="x" type="fixed" summary="surface local coords"/>
12 <arg name="y" type="fixed" summary="surface local coords"/>
13 </request>
14 <request name="deactivate_uri">
15 <arg name="surface" type="object" interface="wl_surface"/>
16 <arg name="uri" type="string"/>
17 </request>
18 <request name="open_uri">
19 <arg name="surface" type="object" interface="wl_surface"/>
20 <arg name="uri" type="string"/>
21 </request>
22
23 <event name="fetching_uri">
24 <arg name="surface" type="object" interface="wl_surface"/>
25 <arg name="uri" type="string"/>
26 </event>
27 <event name="completed_uri">
28 <arg name="surface" type="object" interface="wl_surface"/>
29 <arg name="uri" type="string"/>
30 <arg name="valid" type="int" summary="1 if uri can be displayed, else 0"/>
31 </event>
32 <event name="fetch_info">
33 <arg name="surface" type="object" interface="wl_surface"/>
34 <arg name="uri" type="string"/>
35 <arg name="progress" type="uint" summary="percentage of download"/>
36 </event>
37 </interface>
38
39</protocol>