blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update layer shell example -o behavior

This commit is contained in:
Drew DeVault 2018-04-22 19:19:22 +02:00
parent edbf4a2f60
commit 4575f27932
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
examples/layer-shell.c
View File

@ -1,6 +1,7 @@
#define _POSIX_C_SOURCE 199309L #define _POSIX_C_SOURCE 199309L
#include <assert.h> #include <assert.h>
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include <limits.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -28,7 +29,7 @@ struct wl_egl_window *egl_window;
struct wlr_egl_surface *egl_surface; struct wlr_egl_surface *egl_surface;
struct wl_callback *frame_callback; struct wl_callback *frame_callback;
static uint32_t output = 0; static uint32_t output = UINT32_MAX;
static uint32_t layer = ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND; static uint32_t layer = ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND;
static uint32_t anchor = 0; static uint32_t anchor = 0;
static uint32_t width = 256, height = 256; static uint32_t width = 256, height = 256;
@ -283,11 +284,13 @@ static void handle_global(void *data, struct wl_registry *registry,
shm = wl_registry_bind(registry, name, shm = wl_registry_bind(registry, name,
&wl_shm_interface, 1); &wl_shm_interface, 1);
} else if (strcmp(interface, "wl_output") == 0) { } else if (strcmp(interface, "wl_output") == 0) {
if (output == 0 && !wl_output) { if (output != UINT32_MAX) {
wl_output = wl_registry_bind(registry, name, if (!wl_output) {
&wl_output_interface, 1); wl_output = wl_registry_bind(registry, name,
} else { &wl_output_interface, 1);
output--; } else {
output--;
}
} }
} else if (strcmp(interface, wl_seat_interface.name) == 0) { } else if (strcmp(interface, wl_seat_interface.name) == 0) {
seat = wl_registry_bind(registry, name, seat = wl_registry_bind(registry, name,
@ -426,10 +429,6 @@ int main(int argc, char **argv) {
fprintf(stderr, "layer_shell not available\n"); fprintf(stderr, "layer_shell not available\n");
return 1; return 1;
} }
if (wl_output == NULL) {
fprintf(stderr, "wl_output not available\n");
return 1;
}
cursor_theme = wl_cursor_theme_load(NULL, 16, shm); cursor_theme = wl_cursor_theme_load(NULL, 16, shm);
assert(cursor_theme); assert(cursor_theme);