alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix lock extension setup in compositor

Browse source
This commit is contained in:
Drew DeVault 2015-12-18 18:56:35 -05:00
parent 253efad437
commit eefc93db43
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sway/extensions.c
View file

@ -162,5 +162,5 @@ void register_extensions(void) {
desktop_shell.panel_position = DESKTOP_SHELL_PANEL_POSITION_BOTTOM; desktop_shell.panel_position = DESKTOP_SHELL_PANEL_POSITION_BOTTOM;
desktop_shell.lock_surfaces = create_list(); desktop_shell.lock_surfaces = create_list();
desktop_shell.is_locked = false; desktop_shell.is_locked = false;
wl_global_create(wlc_get_wl_display(), &lock_interface, 3, NULL, swaylock_bind); wl_global_create(wlc_get_wl_display(), &lock_interface, 1, NULL, swaylock_bind);
} }

6
swaylock/main.c
View file

@ -97,9 +97,9 @@ int main(int argc, char **argv) {
surfaces = create_list(); surfaces = create_list();
registry = registry_poll(); registry = registry_poll();
/*if (!registry->swaylock) { if (!registry->swaylock) {
sway_abort("swaylock requires the compositor to support the swaylock extension."); sway_abort("swaylock requires the compositor to support the swaylock extension.");
}*/ }
int i; int i;
for (i = 0; i < registry->outputs->length; ++i) { for (i = 0; i < registry->outputs->length; ++i) {
@ -108,7 +108,7 @@ int main(int argc, char **argv) {
if (!window) { if (!window) {
sway_abort("Failed to create surfaces."); sway_abort("Failed to create surfaces.");
} }
//lock_set_lock_surface(registry->swaylock, output->output, window->surface); lock_set_lock_surface(registry->swaylock, output->output, window->surface);
list_add(surfaces, window); list_add(surfaces, window);
} }