Add broken test client and rootston stubs
This commit is contained in:
parent
88eec637a4
commit
b31ce4220c
|
@ -0,0 +1,211 @@
|
|||
#define _POSIX_C_SOURCE 2
|
||||
#include <GLES2/gl2.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <wayland-client.h>
|
||||
#include <wayland-egl.h>
|
||||
#include <wlr/render/egl.h>
|
||||
#include <wlr/util/log.h>
|
||||
#include "wlr-layer-shell-unstable-v1-client-protocol.h"
|
||||
|
||||
static struct wl_compositor *compositor = NULL;
|
||||
static struct zwlr_layer_shell_v1 *layer_shell = NULL;
|
||||
static struct wl_output *wl_output = NULL;
|
||||
|
||||
struct wl_surface *wl_surface;
|
||||
struct wlr_egl egl;
|
||||
struct wl_egl_window *egl_window;
|
||||
struct wlr_egl_surface *egl_surface;
|
||||
struct wl_callback *frame_callback;
|
||||
|
||||
static uint32_t output = 0;
|
||||
static uint32_t layer = -1;
|
||||
static uint32_t anchor = 0;
|
||||
static uint32_t width = 256, height = 256;
|
||||
|
||||
static void draw(void);
|
||||
|
||||
static void surface_frame_callback(
|
||||
void *data, struct wl_callback *cb, uint32_t time) {
|
||||
wl_callback_destroy(cb);
|
||||
frame_callback = NULL;
|
||||
draw();
|
||||
}
|
||||
|
||||
static struct wl_callback_listener frame_listener = {
|
||||
.done = surface_frame_callback
|
||||
};
|
||||
|
||||
static void draw(void) {
|
||||
eglMakeCurrent(egl.display, egl_surface, egl_surface, egl.context);
|
||||
wlr_log(L_DEBUG, "Drawing frame");
|
||||
|
||||
float color[] = {1.0, 0.0, 0.0, 1.0};
|
||||
glViewport(0, 0, width, height);
|
||||
glClearColor(color[0], color[1], color[2], 1.0);
|
||||
glClear(GL_COLOR_BUFFER_BIT);
|
||||
|
||||
eglSwapBuffers(egl.display, egl_surface);
|
||||
|
||||
frame_callback = wl_surface_frame(wl_surface);
|
||||
wl_callback_add_listener(frame_callback, &frame_listener, NULL);
|
||||
}
|
||||
|
||||
static void layer_surface_configure(void *data,
|
||||
struct zwlr_layer_surface_v1 *surface,
|
||||
uint32_t serial, uint32_t w, uint32_t h) {
|
||||
width = w;
|
||||
height = h;
|
||||
zwlr_layer_surface_v1_ack_configure(surface, serial);
|
||||
}
|
||||
|
||||
struct zwlr_layer_surface_v1_listener layer_surface_listener = {
|
||||
.configure = layer_surface_configure,
|
||||
};
|
||||
|
||||
static void handle_global(void *data, struct wl_registry *registry,
|
||||
uint32_t name, const char *interface, uint32_t version) {
|
||||
if (strcmp(interface, "wl_compositor") == 0) {
|
||||
compositor = wl_registry_bind(registry, name,
|
||||
&wl_compositor_interface, 1);
|
||||
} else if (strcmp(interface, "wl_output") == 0) {
|
||||
if (output == 0) {
|
||||
wl_output = wl_registry_bind(registry, name,
|
||||
&wl_output_interface, 1);
|
||||
} else {
|
||||
output--;
|
||||
}
|
||||
} else if (strcmp(interface, zwlr_layer_shell_v1_interface.name) == 0) {
|
||||
layer_shell = wl_registry_bind(
|
||||
registry, name, &zwlr_layer_shell_v1_interface, 1);
|
||||
}
|
||||
}
|
||||
|
||||
static void handle_global_remove(void *data, struct wl_registry *registry,
|
||||
uint32_t name) {
|
||||
// who cares
|
||||
}
|
||||
|
||||
static const struct wl_registry_listener registry_listener = {
|
||||
.global = handle_global,
|
||||
.global_remove = handle_global_remove,
|
||||
};
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
wlr_log_init(L_DEBUG, NULL);
|
||||
char *namespace = "wlroots";
|
||||
bool found;
|
||||
int c;
|
||||
while ((c = getopt(argc, argv, "w:h:o:"))) {
|
||||
switch (c) {
|
||||
case 'o':
|
||||
output = atoi(optarg);
|
||||
break;
|
||||
case 'w':
|
||||
width = atoi(optarg);
|
||||
break;
|
||||
case 'h':
|
||||
height = atoi(optarg);
|
||||
break;
|
||||
case 'l': {
|
||||
struct {
|
||||
char *name;
|
||||
enum zwlr_layer_shell_v1_layer value;
|
||||
} layers[] = {
|
||||
{ "background", ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND },
|
||||
{ "bottom", ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM },
|
||||
{ "top", ZWLR_LAYER_SHELL_V1_LAYER_TOP },
|
||||
{ "overlay", ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY },
|
||||
};
|
||||
found = false;
|
||||
for (size_t i = 0; i < sizeof(layers) / sizeof(layers[0]); ++i) {
|
||||
if (strcmp(optarg, layers[i].name)) {
|
||||
layer = layers[i].value;
|
||||
found = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!found) {
|
||||
fprintf(stderr, "invalid layer %s\n", optarg);
|
||||
return 1;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 'a': {
|
||||
struct {
|
||||
char *name;
|
||||
uint32_t value;
|
||||
} anchors[] = {
|
||||
{ "top", ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP },
|
||||
{ "bottom", ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM },
|
||||
{ "left", ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT },
|
||||
{ "right", ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT },
|
||||
};
|
||||
found = false;
|
||||
for (size_t i = 0; i < sizeof(anchors) / sizeof(anchors[0]); ++i) {
|
||||
if (strcmp(optarg, anchors[i].name)) {
|
||||
anchor |= anchors[i].value;
|
||||
found = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!found) {
|
||||
fprintf(stderr, "invalid anchor %s\n", optarg);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
struct wl_display *display = wl_display_connect(NULL);
|
||||
if (display == NULL) {
|
||||
fprintf(stderr, "Failed to create display\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
struct wl_registry *registry = wl_display_get_registry(display);
|
||||
wl_registry_add_listener(registry, ®istry_listener, NULL);
|
||||
wl_display_dispatch(display);
|
||||
wl_display_roundtrip(display);
|
||||
|
||||
if (compositor == NULL) {
|
||||
fprintf(stderr, "wl-compositor not available\n");
|
||||
return 1;
|
||||
}
|
||||
if (layer_shell == NULL) {
|
||||
fprintf(stderr, "layer-shell not available\n");
|
||||
return 1;
|
||||
}
|
||||
if (wl_output == NULL) {
|
||||
fprintf(stderr, "wl_output not available\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
wlr_egl_init(&egl, EGL_PLATFORM_WAYLAND_EXT, display, NULL,
|
||||
WL_SHM_FORMAT_ARGB8888);
|
||||
|
||||
wl_surface = wl_compositor_create_surface(compositor);
|
||||
|
||||
struct zwlr_layer_surface_v1 *layer_surface =
|
||||
zwlr_layer_shell_v1_get_layer_surface(layer_shell,
|
||||
wl_surface, wl_output, layer, namespace);
|
||||
zwlr_layer_surface_v1_set_anchor(layer_surface, anchor);
|
||||
// TODO: margin, interactivity, exclusive zone
|
||||
|
||||
wl_surface_commit(wl_surface);
|
||||
|
||||
egl_window = wl_egl_window_create(wl_surface, width, height);
|
||||
egl_surface = wlr_egl_create_surface(&egl, egl_window);
|
||||
|
||||
wl_display_roundtrip(display);
|
||||
draw();
|
||||
|
||||
while (wl_display_dispatch(display) != -1) {
|
||||
// This space intentionally left blank
|
||||
}
|
||||
return 0;
|
||||
}
|
|
@ -48,3 +48,9 @@ executable(
|
|||
dependencies: [wayland_client, wlr_protos, wlroots, threads],
|
||||
link_with: lib_shared,
|
||||
)
|
||||
|
||||
executable(
|
||||
'layer-shell',
|
||||
'layer-shell.c',
|
||||
dependencies: [wayland_client, wlr_protos, wlroots]
|
||||
)
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
#include <wlr/types/wlr_compositor.h>
|
||||
#include <wlr/types/wlr_gamma_control.h>
|
||||
#include <wlr/types/wlr_idle.h>
|
||||
#include <wlr/types/wlr_layer_shell.h>
|
||||
#include <wlr/types/wlr_linux_dmabuf.h>
|
||||
#include <wlr/types/wlr_list.h>
|
||||
#include <wlr/types/wlr_output_layout.h>
|
||||
|
@ -28,6 +29,8 @@
|
|||
struct roots_desktop {
|
||||
struct wl_list views; // roots_view::link
|
||||
|
||||
struct wl_list layers[4]; // layer_surface::link
|
||||
|
||||
struct wl_list outputs; // roots_output::link
|
||||
struct timespec last_frame;
|
||||
|
||||
|
@ -55,6 +58,7 @@ struct roots_desktop {
|
|||
struct wl_listener xdg_shell_v6_surface;
|
||||
struct wl_listener xdg_shell_surface;
|
||||
struct wl_listener wl_shell_surface;
|
||||
struct wl_listener layer_shell_surface;
|
||||
struct wl_listener decoration_new;
|
||||
|
||||
#ifdef WLR_HAS_XWAYLAND
|
||||
|
@ -88,6 +92,7 @@ void view_unmap(struct roots_view *view);
|
|||
void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data);
|
||||
void handle_xdg_shell_surface(struct wl_listener *listener, void *data);
|
||||
void handle_wl_shell_surface(struct wl_listener *listener, void *data);
|
||||
void handle_layer_shell_surface(struct wl_listener *listener, void *data);
|
||||
void handle_xwayland_surface(struct wl_listener *listener, void *data);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -0,0 +1,19 @@
|
|||
#ifndef ROOTSTON_LAYERS_H
|
||||
#define ROOTSTON_LAYERS_H
|
||||
#include <stdbool.h>
|
||||
#include <wlr/config.h>
|
||||
#include <wlr/types/wlr_box.h>
|
||||
#include <wlr/types/wlr_surface.h>
|
||||
#include <wlr/types/wlr_layer_shell.h>
|
||||
|
||||
struct roots_layer_surface {
|
||||
struct wlr_layer_surface *layer_surface;
|
||||
struct wl_list link;
|
||||
|
||||
struct wl_listener destroy;
|
||||
struct wl_listener map;
|
||||
struct wl_listener unmap;
|
||||
struct wl_listener surface_commit;
|
||||
};
|
||||
|
||||
#endif
|
|
@ -1,6 +1,5 @@
|
|||
#ifndef ROOTSTON_VIEW_H
|
||||
#define ROOTSTON_VIEW_H
|
||||
|
||||
#include <stdbool.h>
|
||||
#include <wlr/config.h>
|
||||
#include <wlr/types/wlr_box.h>
|
||||
|
|
|
@ -39,6 +39,7 @@ client_protocols = [
|
|||
[wl_protocol_dir, 'unstable/idle-inhibit/idle-inhibit-unstable-v1.xml'],
|
||||
'idle.xml',
|
||||
'screenshooter.xml',
|
||||
'wlr-layer-shell-unstable-v1.xml',
|
||||
]
|
||||
|
||||
wl_protos_src = []
|
||||
|
|
|
@ -222,9 +222,8 @@
|
|||
</event>
|
||||
|
||||
<enum name="error">
|
||||
<entry name="invalid_input_device" value="0" summary="input device bitfield is invalid"/>
|
||||
<entry name="invalid_anchor" value="1" summary="anchor bitfield is invalid"/>
|
||||
<entry name="invalid_surface_state" value="2"
|
||||
<entry name="invalid_anchor" value="0" summary="anchor bitfield is invalid"/>
|
||||
<entry name="invalid_surface_state" value="1"
|
||||
summary="the client provided an invalid surface state"/>
|
||||
</enum>
|
||||
|
||||
|
|
|
@ -716,7 +716,9 @@ struct roots_desktop *desktop_create(struct roots_server *server,
|
|||
desktop->wl_shell_surface.notify = handle_wl_shell_surface;
|
||||
|
||||
desktop->layer_shell = wlr_layer_shell_create(server->wl_display);
|
||||
// TODO: Pick up new surfaces
|
||||
wl_signal_add(&desktop->layer_shell->events.new_surface,
|
||||
&desktop->layer_shell_surface);
|
||||
desktop->layer_shell_surface.notify = handle_layer_shell_surface;
|
||||
|
||||
#ifdef WLR_HAS_XWAYLAND
|
||||
const char *cursor_theme = NULL;
|
||||
|
|
|
@ -0,0 +1,54 @@
|
|||
#include <assert.h>
|
||||
#include <stdbool.h>
|
||||
#include <stdlib.h>
|
||||
#include <wayland-server.h>
|
||||
#include <wlr/types/wlr_box.h>
|
||||
#include <wlr/types/wlr_surface.h>
|
||||
#include <wlr/types/wlr_layer_shell.h>
|
||||
#include <wlr/util/log.h>
|
||||
#include "rootston/desktop.h"
|
||||
#include "rootston/layers.h"
|
||||
#include "rootston/server.h"
|
||||
|
||||
static void handle_destroy(struct wl_listener *listener, void *data) {
|
||||
// TODO
|
||||
}
|
||||
|
||||
static void handle_surface_commit(struct wl_listener *listener, void *data) {
|
||||
// TODO
|
||||
}
|
||||
|
||||
static void handle_map(struct wl_listener *listener, void *data) {
|
||||
// TODO
|
||||
}
|
||||
|
||||
static void handle_unmap(struct wl_listener *listener, void *data) {
|
||||
// TODO
|
||||
}
|
||||
|
||||
void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
|
||||
struct wlr_layer_surface *layer_surface = data;
|
||||
struct roots_desktop *desktop =
|
||||
wl_container_of(listener, desktop, layer_shell_surface);
|
||||
wlr_log(L_DEBUG, "new layer surface: namespace %s layer %d",
|
||||
layer_surface->namespace, layer_surface->layer);
|
||||
|
||||
struct roots_layer_surface *roots_surface =
|
||||
calloc(1, sizeof(struct roots_layer_surface));
|
||||
if (!roots_surface) {
|
||||
return;
|
||||
}
|
||||
roots_surface->surface_commit.notify = handle_surface_commit;
|
||||
wl_signal_add(&layer_surface->surface->events.commit,
|
||||
&roots_surface->surface_commit);
|
||||
roots_surface->destroy.notify = handle_destroy;
|
||||
wl_signal_add(&layer_surface->events.destroy, &roots_surface->destroy);
|
||||
roots_surface->map.notify = handle_map;
|
||||
wl_signal_add(&layer_surface->events.map, &roots_surface->map);
|
||||
roots_surface->unmap.notify = handle_unmap;
|
||||
wl_signal_add(&layer_surface->events.unmap, &roots_surface->unmap);
|
||||
|
||||
roots_surface->layer_surface = layer_surface;
|
||||
|
||||
wl_list_insert(&desktop->layers[layer_surface->layer], &roots_surface->link);
|
||||
}
|
|
@ -5,6 +5,7 @@ sources = [
|
|||
'ini.c',
|
||||
'input.c',
|
||||
'keyboard.c',
|
||||
'layer_shell.c',
|
||||
'main.c',
|
||||
'output.c',
|
||||
'seat.c',
|
||||
|
|
Loading…
Reference in New Issue