summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2015-12-18 18:56:35 -0500
committerLibravatar Drew DeVault <sir@cmpwn.com>2015-12-18 19:30:19 -0500
commiteefc93db43ab6d5d308970afa43919a68bde2b79 (patch)
tree48207b80a75d969c8ebfecc8472582c2efd387f7
parentMerge pull request #361 from mikkeloscar/i3bar-command (diff)
downloadsway-eefc93db43ab6d5d308970afa43919a68bde2b79.tar.gz
sway-eefc93db43ab6d5d308970afa43919a68bde2b79.tar.zst
sway-eefc93db43ab6d5d308970afa43919a68bde2b79.zip
Fix lock extension setup in compositor
-rw-r--r--sway/extensions.c2
-rw-r--r--swaylock/main.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/sway/extensions.c b/sway/extensions.c
index 7769f86e..1ca66468 100644
--- a/sway/extensions.c
+++ b/sway/extensions.c
@@ -162,5 +162,5 @@ void register_extensions(void) {
162 desktop_shell.panel_position = DESKTOP_SHELL_PANEL_POSITION_BOTTOM; 162 desktop_shell.panel_position = DESKTOP_SHELL_PANEL_POSITION_BOTTOM;
163 desktop_shell.lock_surfaces = create_list(); 163 desktop_shell.lock_surfaces = create_list();
164 desktop_shell.is_locked = false; 164 desktop_shell.is_locked = false;
165 wl_global_create(wlc_get_wl_display(), &lock_interface, 3, NULL, swaylock_bind); 165 wl_global_create(wlc_get_wl_display(), &lock_interface, 1, NULL, swaylock_bind);
166} 166}
diff --git a/swaylock/main.c b/swaylock/main.c
index fbe2851b..4073da99 100644
--- a/swaylock/main.c
+++ b/swaylock/main.c
@@ -97,9 +97,9 @@ int main(int argc, char **argv) {
97 surfaces = create_list(); 97 surfaces = create_list();
98 registry = registry_poll(); 98 registry = registry_poll();
99 99
100 /*if (!registry->swaylock) { 100 if (!registry->swaylock) {
101 sway_abort("swaylock requires the compositor to support the swaylock extension."); 101 sway_abort("swaylock requires the compositor to support the swaylock extension.");
102 }*/ 102 }
103 103
104 int i; 104 int i;
105 for (i = 0; i < registry->outputs->length; ++i) { 105 for (i = 0; i < registry->outputs->length; ++i) {
@@ -108,7 +108,7 @@ int main(int argc, char **argv) {
108 if (!window) { 108 if (!window) {
109 sway_abort("Failed to create surfaces."); 109 sway_abort("Failed to create surfaces.");
110 } 110 }
111 //lock_set_lock_surface(registry->swaylock, output->output, window->surface); 111 lock_set_lock_surface(registry->swaylock, output->output, window->surface);
112 list_add(surfaces, window); 112 list_add(surfaces, window);
113 } 113 }
114 114