nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-25 16:42:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland backend: switch to xdg shell

Browse Source 
Closes #72 and #96.
This commit is contained in:
Dominique Martinet 2017-08-16 19:19:31 +02:00
parent e7fa4f12e1
commit 577d2f6fcd
6 changed files with 72 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/meson.build
View File

@ -31,4 +31,4 @@ endif
lib_wlr_backend = static_library('wlr_backend', backend_files, lib_wlr_backend = static_library('wlr_backend', backend_files,
include_directories: wlr_inc, include_directories: wlr_inc,
dependencies: [wayland_server, egl, gbm, libinput, systemd]) dependencies: [wayland_server, egl, gbm, libinput, systemd, wlr_protos])

4
backend/wayland/backend.c
View File

@ -10,6 +10,8 @@
#include <wlr/interfaces/wlr_input_device.h> #include <wlr/interfaces/wlr_input_device.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "backend/wayland.h" #include "backend/wayland.h"
#include "xdg-shell-unstable-v6-client-protocol.h"
static int dispatch_events(int fd, uint32_t mask, void *data) { static int dispatch_events(int fd, uint32_t mask, void *data) {
struct wlr_wl_backend *backend = data; struct wlr_wl_backend *backend = data;
@ -89,7 +91,7 @@ static void wlr_wl_backend_destroy(struct wlr_backend *_backend) {
wlr_egl_free(&backend->egl); wlr_egl_free(&backend->egl);
if (backend->seat) wl_seat_destroy(backend->seat); if (backend->seat) wl_seat_destroy(backend->seat);
if (backend->shm) wl_shm_destroy(backend->shm); if (backend->shm) wl_shm_destroy(backend->shm);
if (backend->shell) wl_shell_destroy(backend->shell); if (backend->shell) zxdg_shell_v6_destroy(backend->shell);
if (backend->compositor) wl_compositor_destroy(backend->compositor); if (backend->compositor) wl_compositor_destroy(backend->compositor);
if (backend->registry) wl_registry_destroy(backend->registry); if (backend->registry) wl_registry_destroy(backend->registry);
if (backend->remote_display) wl_display_disconnect(backend->remote_display); if (backend->remote_display) wl_display_disconnect(backend->remote_display);

57
backend/wayland/output.c
View File

@ -11,6 +11,7 @@
#include <wlr/interfaces/wlr_output.h> #include <wlr/interfaces/wlr_output.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "backend/wayland.h" #include "backend/wayland.h"
#include "xdg-shell-unstable-v6-client-protocol.h"
int os_create_anonymous_file(off_t size); int os_create_anonymous_file(off_t size);
@ -136,7 +137,7 @@ static void wlr_wl_output_destroy(struct wlr_output *_output) {
} }
eglDestroySurface(output->backend->egl.display, output->surface); eglDestroySurface(output->backend->egl.display, output->surface);
wl_egl_window_destroy(output->egl_window); wl_egl_window_destroy(output->egl_window);
wl_shell_surface_destroy(output->shell_surface); // xdg_surface/toplevel destroy
wl_surface_destroy(output->surface); wl_surface_destroy(output->surface);
free(output); free(output);
} }
@ -162,16 +163,27 @@ static struct wlr_output_impl output_impl = {
.move_cursor = wlr_wl_output_move_cursor .move_cursor = wlr_wl_output_move_cursor
}; };
void handle_ping(void *data, struct wl_shell_surface *ssurface, uint32_t serial) { static void xdg_surface_handle_configure(void *data, struct zxdg_surface_v6 *xdg_surface,
uint32_t serial) {
struct wlr_wl_backend_output *output = data; struct wlr_wl_backend_output *output = data;
assert(output && output->shell_surface == ssurface); assert(output && output->xdg_surface == xdg_surface);
wl_shell_surface_pong(ssurface, serial);
zxdg_surface_v6_ack_configure(xdg_surface, serial);
// nothing else?
} }
void handle_configure(void *data, struct wl_shell_surface *wl_shell_surface, static struct zxdg_surface_v6_listener xdg_surface_listener = {
uint32_t edges, int32_t width, int32_t height){ .configure = xdg_surface_handle_configure,
};
static void xdg_toplevel_handle_configure(void *data, struct zxdg_toplevel_v6 *xdg_toplevel,
int32_t width, int32_t height, struct wl_array *states) {
struct wlr_wl_backend_output *output = data; struct wlr_wl_backend_output *output = data;
assert(output && output->shell_surface == wl_shell_surface); assert(output && output->xdg_toplevel == xdg_toplevel);
// loop over states for maximized etc?
wl_egl_window_resize(output->egl_window, width, height, 0, 0); wl_egl_window_resize(output->egl_window, width, height, 0, 0);
output->wlr_output.width = width; output->wlr_output.width = width;
output->wlr_output.height = height; output->wlr_output.height = height;
@ -179,14 +191,16 @@ void handle_configure(void *data, struct wl_shell_surface *wl_shell_surface,
wl_signal_emit(&output->wlr_output.events.resolution, output); wl_signal_emit(&output->wlr_output.events.resolution, output);
} }
void handle_popup_done(void *data, struct wl_shell_surface *wl_shell_surface) { static void xdg_toplevel_handle_close(void *data, struct zxdg_toplevel_v6 *xdg_toplevel) {
wlr_log(L_ERROR, "Unexpected wl_shell_surface.popup_done event"); struct wlr_wl_backend_output *output = data;
assert(output && output->xdg_toplevel == xdg_toplevel);
wl_display_terminate(output->backend->local_display);
} }
static struct wl_shell_surface_listener shell_surface_listener = { static struct zxdg_toplevel_v6_listener xdg_toplevel_listener = {
.ping = handle_ping, .configure = xdg_toplevel_handle_configure,
.configure = handle_configure, .close = xdg_toplevel_handle_close,
.popup_done = handle_popup_done
}; };
struct wlr_output *wlr_wl_output_create(struct wlr_backend *_backend) { struct wlr_output *wlr_wl_output_create(struct wlr_backend *_backend) {
@ -218,14 +232,17 @@ struct wlr_output *wlr_wl_output_create(struct wlr_backend *_backend) {
// TODO: error handling // TODO: error handling
output->surface = wl_compositor_create_surface(backend->compositor); output->surface = wl_compositor_create_surface(backend->compositor);
output->shell_surface = output->xdg_surface =
wl_shell_get_shell_surface(backend->shell, output->surface); zxdg_shell_v6_get_xdg_surface(backend->shell, output->surface);
output->xdg_toplevel =
zxdg_surface_v6_get_toplevel(output->xdg_surface);
wl_shell_surface_set_class(output->shell_surface, "sway"); // class? app_id?
wl_shell_surface_set_title(output->shell_surface, "sway-wl"); zxdg_toplevel_v6_set_title(output->xdg_toplevel, "sway-wl");
wl_shell_surface_add_listener(output->shell_surface, zxdg_surface_v6_add_listener(output->xdg_surface,
&shell_surface_listener, output); &xdg_surface_listener, output);
wl_shell_surface_set_toplevel(output->shell_surface); zxdg_toplevel_v6_add_listener(output->xdg_toplevel,
&xdg_toplevel_listener, output);
output->egl_window = wl_egl_window_create(output->surface, output->egl_window = wl_egl_window_create(output->surface,
wlr_output->width, wlr_output->height); wlr_output->width, wlr_output->height);

17
backend/wayland/registry.c
View File

@ -4,6 +4,18 @@
#include <wayland-client.h> #include <wayland-client.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "backend/wayland.h" #include "backend/wayland.h"
#include "xdg-shell-unstable-v6-client-protocol.h"
static void xdg_shell_handle_ping(void *data, struct zxdg_shell_v6 *shell,
uint32_t serial) {
zxdg_shell_v6_pong(shell, serial);
}
static const struct zxdg_shell_v6_listener xdg_shell_listener = {
xdg_shell_handle_ping,
};
static void registry_global(void *data, struct wl_registry *registry, static void registry_global(void *data, struct wl_registry *registry,
uint32_t name, const char *interface, uint32_t version) { uint32_t name, const char *interface, uint32_t version) {
@ -13,9 +25,10 @@ static void registry_global(void *data, struct wl_registry *registry,
if (strcmp(interface, wl_compositor_interface.name) == 0) { if (strcmp(interface, wl_compositor_interface.name) == 0) {
backend->compositor = wl_registry_bind(registry, name, backend->compositor = wl_registry_bind(registry, name,
&wl_compositor_interface, version); &wl_compositor_interface, version);
} else if (strcmp(interface, wl_shell_interface.name) == 0) { } else if (strcmp(interface, zxdg_shell_v6_interface.name) == 0) {
backend->shell = wl_registry_bind(registry, name, backend->shell = wl_registry_bind(registry, name,
&wl_shell_interface, version); &zxdg_shell_v6_interface, version);
zxdg_shell_v6_add_listener(backend->shell, &xdg_shell_listener, NULL);
} else if (strcmp(interface, wl_shm_interface.name) == 0) { } else if (strcmp(interface, wl_shm_interface.name) == 0) {
backend->shm = wl_registry_bind(registry, name, backend->shm = wl_registry_bind(registry, name,
&wl_shm_interface, version); &wl_shm_interface, version);

5
include/backend/wayland.h
View File

@ -24,7 +24,7 @@ struct wlr_wl_backend {
struct wl_event_source *remote_display_src; struct wl_event_source *remote_display_src;
struct wl_registry *registry; struct wl_registry *registry;
struct wl_compositor *compositor; struct wl_compositor *compositor;
struct wl_shell *shell; struct zxdg_shell_v6 *shell;
struct wl_shm *shm; struct wl_shm *shm;
struct wl_seat *seat; struct wl_seat *seat;
struct wl_pointer *pointer; struct wl_pointer *pointer;
@ -36,7 +36,8 @@ struct wlr_wl_backend_output {
struct wlr_wl_backend *backend; struct wlr_wl_backend *backend;
struct wl_surface *surface; struct wl_surface *surface;
struct wl_shell_surface *shell_surface; struct zxdg_surface_v6 *xdg_surface;
struct zxdg_toplevel_v6 *xdg_toplevel;
struct wl_egl_window *egl_window; struct wl_egl_window *egl_window;
struct wl_callback *frame_callback; struct wl_callback *frame_callback;

13
protocol/meson.build
View File

@ -10,10 +10,18 @@ wayland_scanner_code = generator(wayland_scanner,
output: '@BASENAME@-protocol.c', output: '@BASENAME@-protocol.c',
arguments: ['code', '@INPUT@', '@OUTPUT@']) arguments: ['code', '@INPUT@', '@OUTPUT@'])
wayland_scanner_client = generator(wayland_scanner,
output: '@BASENAME@-client-protocol.h',
arguments: ['client-header', '@INPUT@', '@OUTPUT@'])
protocols = [ protocols = [
[ wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml' ] [ wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml' ]
] ]
client_protocols = [
[ wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml' ]
]
wl_protos_src = [] wl_protos_src = []
wl_protos_headers = [] wl_protos_headers = []
@ -23,6 +31,11 @@ foreach p : protocols
wl_protos_headers += wayland_scanner_server.process(xml) wl_protos_headers += wayland_scanner_server.process(xml)
endforeach endforeach
foreach p : client_protocols
xml = join_paths(p)
wl_protos_headers += wayland_scanner_client.process(xml)
endforeach
lib_wl_protos = static_library('wl_protos', wl_protos_src + wl_protos_headers) lib_wl_protos = static_library('wl_protos', wl_protos_src + wl_protos_headers)
wlr_protos = declare_dependency( wlr_protos = declare_dependency(
link_with: lib_wl_protos, link_with: lib_wl_protos,