hyprwm
/
wlroots-hyprland
mirror of https://github.com/hyprwm/wlroots-hyprland.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

examples/layer-shell: remove wlroots dependency 

This is a client example, it shouldn't use a compositor library
like wlroots.
This commit is contained in:
Simon Ser 2021-12-07 16:19:26 +01:00
parent ad28490cf4
commit 83bdb3ad07
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
examples/layer-shell.c
View File

@ -11,7 +11,6 @@
#include <wayland-client.h> #include <wayland-client.h>
#include <wayland-cursor.h> #include <wayland-cursor.h>
#include <wayland-egl.h> #include <wayland-egl.h>
#include <wlr/util/log.h>
#include "egl_common.h" #include "egl_common.h"
#include "wlr-layer-shell-unstable-v1-client-protocol.h" #include "wlr-layer-shell-unstable-v1-client-protocol.h"
#include "xdg-shell-client-protocol.h" #include "xdg-shell-client-protocol.h"
@ -177,8 +176,7 @@ static const struct xdg_surface_listener xdg_surface_listener = {
static void xdg_popup_configure(void *data, struct xdg_popup *xdg_popup, static void xdg_popup_configure(void *data, struct xdg_popup *xdg_popup,
int32_t x, int32_t y, int32_t width, int32_t height) { int32_t x, int32_t y, int32_t width, int32_t height) {
wlr_log(WLR_DEBUG, "Popup configured %dx%d@%d,%d", fprintf(stderr, "Popup configured %dx%d@%d,%d\n", width, height, x, y);
width, height, x, y);
popup_width = width; popup_width = width;
popup_height = height; popup_height = height;
if (popup_egl_window) { if (popup_egl_window) {
@ -197,7 +195,7 @@ static void popup_destroy(void) {
} }
static void xdg_popup_done(void *data, struct xdg_popup *xdg_popup) { static void xdg_popup_done(void *data, struct xdg_popup *xdg_popup) {
wlr_log(WLR_DEBUG, "Popup done"); fprintf(stderr, "Popup done\n");
popup_destroy(); popup_destroy();
} }
@ -377,17 +375,17 @@ static void wl_keyboard_keymap(void *data, struct wl_keyboard *wl_keyboard,
static void wl_keyboard_enter(void *data, struct wl_keyboard *wl_keyboard, static void wl_keyboard_enter(void *data, struct wl_keyboard *wl_keyboard,
uint32_t serial, struct wl_surface *surface, struct wl_array *keys) { uint32_t serial, struct wl_surface *surface, struct wl_array *keys) {
wlr_log(WLR_DEBUG, "Keyboard enter"); fprintf(stderr, "Keyboard enter\n");
} }
static void wl_keyboard_leave(void *data, struct wl_keyboard *wl_keyboard, static void wl_keyboard_leave(void *data, struct wl_keyboard *wl_keyboard,
uint32_t serial, struct wl_surface *surface) { uint32_t serial, struct wl_surface *surface) {
wlr_log(WLR_DEBUG, "Keyboard leave"); fprintf(stderr, "Keyboard leave\n");
} }
static void wl_keyboard_key(void *data, struct wl_keyboard *wl_keyboard, static void wl_keyboard_key(void *data, struct wl_keyboard *wl_keyboard,
uint32_t serial, uint32_t time, uint32_t key, uint32_t state) { uint32_t serial, uint32_t time, uint32_t key, uint32_t state) {
wlr_log(WLR_DEBUG, "Key event: %d %d", key, state); fprintf(stderr, "Key event: %d %d\n", key, state);
} }
static void wl_keyboard_modifiers(void *data, struct wl_keyboard *wl_keyboard, static void wl_keyboard_modifiers(void *data, struct wl_keyboard *wl_keyboard,
@ -473,7 +471,6 @@ static const struct wl_registry_listener registry_listener = {
}; };
int main(int argc, char **argv) { int main(int argc, char **argv) {
wlr_log_init(WLR_DEBUG, NULL);
char *namespace = "wlroots"; char *namespace = "wlroots";
int exclusive_zone = 0; int exclusive_zone = 0;
int32_t margin_right = 0, margin_bottom = 0, margin_left = 0; int32_t margin_right = 0, margin_bottom = 0, margin_left = 0;

2
examples/meson.build
View File

@ -82,7 +82,7 @@ clients = {
}, },
'layer-shell': { 'layer-shell': {
'src': ['layer-shell.c', 'egl_common.c'], 'src': ['layer-shell.c', 'egl_common.c'],
'dep': [wayland_egl, wayland_cursor, wlroots, egl, glesv2], 'dep': [wayland_egl, wayland_cursor, egl, glesv2],
'proto': [ 'proto': [
'wlr-layer-shell-unstable-v1', 'wlr-layer-shell-unstable-v1',
'xdg-shell', 'xdg-shell',