aboutsummaryrefslogtreecommitdiffstats
path: root/protocols
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2015-12-03 08:35:22 -0500
committerLibravatar Drew DeVault <sir@cmpwn.com>2015-12-03 08:35:22 -0500
commit71afa388906bf29dcd937aa92b65a97c8b320f60 (patch)
tree7e7efa0fccde6eb99b1b1bd9d20b1d0f1b2b5f3b /protocols
parentRevert "Remove build badge (Travis is broken, not sway)" (diff)
downloadsway-71afa388906bf29dcd937aa92b65a97c8b320f60.tar.gz
sway-71afa388906bf29dcd937aa92b65a97c8b320f60.tar.zst
sway-71afa388906bf29dcd937aa92b65a97c8b320f60.zip
Add swaylock protocol, add resource destructors
This prevents sway crashing if swaybg or swaybar dies.
Diffstat (limited to 'protocols')
-rw-r--r--protocols/CMakeLists.txt11
-rw-r--r--protocols/libsway-protocols.abin0 -> 31798 bytes
-rw-r--r--protocols/swaylock.xml18
3 files changed, 29 insertions, 0 deletions
diff --git a/protocols/CMakeLists.txt b/protocols/CMakeLists.txt
index 07becc36..d7516d0c 100644
--- a/protocols/CMakeLists.txt
+++ b/protocols/CMakeLists.txt
@@ -13,10 +13,21 @@ WAYLAND_ADD_PROTOCOL_SERVER(proto-server-desktop-shell
13 desktop-shell 13 desktop-shell
14) 14)
15 15
16WAYLAND_ADD_PROTOCOL_CLIENT(proto-client-swaylock
17 swaylock.xml
18 swaylock
19)
20WAYLAND_ADD_PROTOCOL_SERVER(proto-server-swaylock
21 swaylock.xml
22 swaylock
23)
24
16add_library(sway-protocols 25add_library(sway-protocols
17 ${proto-client-xdg-shell} 26 ${proto-client-xdg-shell}
18 ${proto-client-desktop-shell} 27 ${proto-client-desktop-shell}
19 ${proto-server-desktop-shell} 28 ${proto-server-desktop-shell}
29 ${proto-client-swaylock}
30 ${proto-server-swaylock}
20 ) 31 )
21 32
22set(PROTOCOLS_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/protocols PARENT_SCOPE) 33set(PROTOCOLS_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/protocols PARENT_SCOPE)
diff --git a/protocols/libsway-protocols.a b/protocols/libsway-protocols.a
new file mode 100644
index 00000000..284f46c2
--- /dev/null
+++ b/protocols/libsway-protocols.a
Binary files differ
diff --git a/protocols/swaylock.xml b/protocols/swaylock.xml
new file mode 100644
index 00000000..c7a102dd
--- /dev/null
+++ b/protocols/swaylock.xml
@@ -0,0 +1,18 @@
1<protocol name="lock">
2
3 <interface name="lock" version="1">
4 <description summary="create lock screen UIs">
5 The Weston desktop-shell protocol's locking functionality depends more
6 on the behavior of the compositor than of a screen locking client, so
7 another protocol is necessary.
8 </description>
9
10 <request name="set_lock_surface">
11 <arg name="output" type="object" interface="wl_output"/>
12 <arg name="surface" type="object" interface="wl_surface"/>
13 </request>
14
15 <request name="unlock"/>
16
17 </interface>
18</protocol>