diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2019-09-01 21:26:39 -0600 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2019-09-01 21:26:39 -0600 |
| commit | 5a1714180dcd1d0836d3321aa88ae8a0bada14fe (patch) | |
| tree | cd0fcb6c2126a897da02518debb505d2d7629ad7 /lib/renderers/wayland/wayland.h | |
| parent | 442d2833f48590122e5ce54a2bca3a327ffa0311 (diff) | |
| download | bemenu-5a1714180dcd1d0836d3321aa88ae8a0bada14fe.tar.gz bemenu-5a1714180dcd1d0836d3321aa88ae8a0bada14fe.tar.bz2 bemenu-5a1714180dcd1d0836d3321aa88ae8a0bada14fe.zip | |
Diffstat (limited to 'lib/renderers/wayland/wayland.h')
| -rw-r--r-- | lib/renderers/wayland/wayland.h | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/lib/renderers/wayland/wayland.h b/lib/renderers/wayland/wayland.h index 752f095..1eb23f5 100644 --- a/lib/renderers/wayland/wayland.h +++ b/lib/renderers/wayland/wayland.h @@ -4,7 +4,7 @@ #include <wayland-client.h> #include <xkbcommon/xkbcommon.h> -#include "wayland-layer-shell-client-protocol.h" +#include "wayland-xdg-shell-client-protocol.h" #include "renderers/cairo.h" @@ -76,13 +76,13 @@ struct buffer { struct window { struct wl_surface *surface; + struct wl_shell_surface *shell_surface; struct wl_callback *frame_cb; - struct zwlr_layer_surface_v1 *layer_surface; + struct xdg_surface *xdg_surface; struct wl_shm *shm; struct buffer buffers[2]; uint32_t width, height, max_height; uint32_t displayed; - struct wl_list link; bool bottom; bool render_pending; @@ -91,12 +91,6 @@ struct window { } notify; }; -struct output { - struct wl_output *output; - struct wl_list link; - int height; -}; - struct wayland { struct { int32_t display; @@ -106,12 +100,13 @@ struct wayland { struct wl_display *display; struct wl_registry *registry; struct wl_compositor *compositor; - struct wl_list outputs; + struct wl_output *output; struct wl_seat *seat; - struct zwlr_layer_shell_v1 *layer_shell; + struct xdg_shell *xdg_shell; + struct wl_shell *shell; struct wl_shm *shm; struct input input; - struct wl_list windows; + struct window window; uint32_t formats; }; @@ -120,10 +115,7 @@ bool bm_wl_registry_register(struct wayland *wayland); void bm_wl_registry_destroy(struct wayland *wayland); void bm_wl_window_schedule_render(struct window *window); void bm_wl_window_render(struct window *window, struct wl_display *display, const struct bm_menu *menu); -void bm_wl_window_set_bottom(struct window *window, struct wl_display *display, bool bottom); -void bm_wl_window_grab_keyboard(struct window *window, struct wl_display *display, bool grab); -void bm_wl_window_set_overlap(struct window *window, struct wl_display *display, bool overlap); -bool bm_wl_window_create(struct window *window, struct wl_display *display, struct wl_shm *shm, struct wl_output *output, struct zwlr_layer_shell_v1 *layer_shell, struct wl_surface *surface); +bool bm_wl_window_create(struct window *window, struct wl_shm *shm, struct wl_shell *shell, struct xdg_shell *xdg_shell, struct wl_surface *surface); void bm_wl_window_destroy(struct window *window); #endif /* _BM_WAYLAND_H_ */ |