Merge branch 'master' into xdg-positioner
This commit is contained in:
commit
41e54ba632
|
@ -11,9 +11,14 @@
|
||||||
#include <wlr/backend/multi.h>
|
#include <wlr/backend/multi.h>
|
||||||
#include <wlr/backend/session.h>
|
#include <wlr/backend/session.h>
|
||||||
#include <wlr/backend/wayland.h>
|
#include <wlr/backend/wayland.h>
|
||||||
#include <wlr/backend/x11.h>
|
#include <wlr/config.h>
|
||||||
#include <wlr/util/log.h>
|
#include <wlr/util/log.h>
|
||||||
|
|
||||||
|
/* WLR_HAS_X11_BACKEND needs to be after wlr/config.h */
|
||||||
|
#ifdef WLR_HAS_X11_BACKEND
|
||||||
|
#include <wlr/backend/x11.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
void wlr_backend_init(struct wlr_backend *backend,
|
void wlr_backend_init(struct wlr_backend *backend,
|
||||||
const struct wlr_backend_impl *impl) {
|
const struct wlr_backend_impl *impl) {
|
||||||
assert(backend);
|
assert(backend);
|
||||||
|
@ -94,6 +99,7 @@ struct wlr_backend *wlr_backend_autocreate(struct wl_display *display) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef WLR_HAS_X11_BACKEND
|
||||||
const char *x11_display = getenv("DISPLAY");
|
const char *x11_display = getenv("DISPLAY");
|
||||||
if (x11_display) {
|
if (x11_display) {
|
||||||
struct wlr_backend *x11_backend =
|
struct wlr_backend *x11_backend =
|
||||||
|
@ -101,6 +107,7 @@ struct wlr_backend *wlr_backend_autocreate(struct wl_display *display) {
|
||||||
wlr_multi_backend_add(backend, x11_backend);
|
wlr_multi_backend_add(backend, x11_backend);
|
||||||
return backend;
|
return backend;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
// Attempt DRM+libinput
|
// Attempt DRM+libinput
|
||||||
struct wlr_session *session = wlr_session_create(display);
|
struct wlr_session *session = wlr_session_create(display);
|
||||||
|
|
|
@ -181,9 +181,6 @@ void wlr_drm_resources_free(struct wlr_drm_backend *drm) {
|
||||||
if (plane->cursor_bo) {
|
if (plane->cursor_bo) {
|
||||||
gbm_bo_destroy(plane->cursor_bo);
|
gbm_bo_destroy(plane->cursor_bo);
|
||||||
}
|
}
|
||||||
if (plane->wlr_tex) {
|
|
||||||
wlr_texture_destroy(plane->wlr_tex);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
free(drm->crtcs);
|
free(drm->crtcs);
|
||||||
|
@ -586,12 +583,6 @@ static bool wlr_drm_connector_set_cursor(struct wlr_output *output,
|
||||||
wlr_output_transform_invert(output->transform);
|
wlr_output_transform_invert(output->transform);
|
||||||
wlr_matrix_projection(plane->matrix, plane->surf.width,
|
wlr_matrix_projection(plane->matrix, plane->surf.width,
|
||||||
plane->surf.height, transform);
|
plane->surf.height, transform);
|
||||||
|
|
||||||
plane->wlr_tex =
|
|
||||||
wlr_render_texture_create(plane->surf.renderer->wlr_rend);
|
|
||||||
if (!plane->wlr_tex) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
struct wlr_box hotspot = { .x = hotspot_x, .y = hotspot_y };
|
struct wlr_box hotspot = { .x = hotspot_x, .y = hotspot_y };
|
||||||
|
@ -637,13 +628,18 @@ static bool wlr_drm_connector_set_cursor(struct wlr_output *output,
|
||||||
|
|
||||||
wlr_drm_surface_make_current(&plane->surf, NULL);
|
wlr_drm_surface_make_current(&plane->surf, NULL);
|
||||||
|
|
||||||
wlr_texture_upload_pixels(plane->wlr_tex, WL_SHM_FORMAT_ARGB8888,
|
|
||||||
stride, width, height, buf);
|
|
||||||
|
|
||||||
struct wlr_renderer *rend = plane->surf.renderer->wlr_rend;
|
struct wlr_renderer *rend = plane->surf.renderer->wlr_rend;
|
||||||
|
|
||||||
|
struct wlr_texture *texture = wlr_texture_from_pixels(rend,
|
||||||
|
WL_SHM_FORMAT_ARGB8888, stride, width, height, buf);
|
||||||
|
if (texture == NULL) {
|
||||||
|
wlr_log(L_ERROR, "Unable to create texture");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
wlr_renderer_begin(rend, plane->surf.width, plane->surf.height);
|
wlr_renderer_begin(rend, plane->surf.width, plane->surf.height);
|
||||||
wlr_renderer_clear(rend, (float[]){ 0.0, 0.0, 0.0, 0.0 });
|
wlr_renderer_clear(rend, (float[]){ 0.0, 0.0, 0.0, 0.0 });
|
||||||
wlr_render_texture(rend, plane->wlr_tex, plane->matrix, 0, 0, 1.0f);
|
wlr_render_texture(rend, texture, plane->matrix, 0, 0, 1.0f);
|
||||||
wlr_renderer_end(rend);
|
wlr_renderer_end(rend);
|
||||||
|
|
||||||
wlr_renderer_read_pixels(rend, WL_SHM_FORMAT_ARGB8888, bo_stride,
|
wlr_renderer_read_pixels(rend, WL_SHM_FORMAT_ARGB8888, bo_stride,
|
||||||
|
@ -651,6 +647,7 @@ static bool wlr_drm_connector_set_cursor(struct wlr_output *output,
|
||||||
|
|
||||||
wlr_drm_surface_swap_buffers(&plane->surf, NULL);
|
wlr_drm_surface_swap_buffers(&plane->surf, NULL);
|
||||||
|
|
||||||
|
wlr_texture_destroy(texture);
|
||||||
gbm_bo_unmap(plane->cursor_bo, bo_data);
|
gbm_bo_unmap(plane->cursor_bo, bo_data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,6 +14,10 @@
|
||||||
#include "backend/drm/drm.h"
|
#include "backend/drm/drm.h"
|
||||||
#include "glapi.h"
|
#include "glapi.h"
|
||||||
|
|
||||||
|
#ifndef DRM_FORMAT_MOD_LINEAR
|
||||||
|
#define DRM_FORMAT_MOD_LINEAR 0
|
||||||
|
#endif
|
||||||
|
|
||||||
bool wlr_drm_renderer_init(struct wlr_drm_backend *drm,
|
bool wlr_drm_renderer_init(struct wlr_drm_backend *drm,
|
||||||
struct wlr_drm_renderer *renderer) {
|
struct wlr_drm_renderer *renderer) {
|
||||||
renderer->gbm = gbm_create_device(drm->fd);
|
renderer->gbm = gbm_create_device(drm->fd);
|
||||||
|
@ -178,47 +182,33 @@ static void free_eglimage(struct gbm_bo *bo, void *data) {
|
||||||
static struct wlr_texture *get_tex_for_bo(struct wlr_drm_renderer *renderer,
|
static struct wlr_texture *get_tex_for_bo(struct wlr_drm_renderer *renderer,
|
||||||
struct gbm_bo *bo) {
|
struct gbm_bo *bo) {
|
||||||
struct tex *tex = gbm_bo_get_user_data(bo);
|
struct tex *tex = gbm_bo_get_user_data(bo);
|
||||||
if (tex) {
|
if (tex != NULL) {
|
||||||
return tex->tex;
|
return tex->tex;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: use wlr_texture_upload_dmabuf instead
|
tex = calloc(1, sizeof(struct tex));
|
||||||
|
if (tex == NULL) {
|
||||||
tex = malloc(sizeof(*tex));
|
|
||||||
if (!tex) {
|
|
||||||
wlr_log_errno(L_ERROR, "Allocation failed");
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
tex->egl = &renderer->egl;
|
struct wlr_dmabuf_buffer_attribs attribs = {
|
||||||
|
.n_planes = 1,
|
||||||
int dmabuf_fd = gbm_bo_get_fd(bo);
|
.width = gbm_bo_get_width(bo),
|
||||||
uint32_t width = gbm_bo_get_width(bo);
|
.height = gbm_bo_get_height(bo),
|
||||||
uint32_t height = gbm_bo_get_height(bo);
|
.format = gbm_bo_get_format(bo),
|
||||||
|
|
||||||
EGLint attribs[] = {
|
|
||||||
EGL_WIDTH, width,
|
|
||||||
EGL_HEIGHT, height,
|
|
||||||
EGL_LINUX_DRM_FOURCC_EXT, gbm_bo_get_format(bo),
|
|
||||||
EGL_DMA_BUF_PLANE0_FD_EXT, dmabuf_fd,
|
|
||||||
EGL_DMA_BUF_PLANE0_OFFSET_EXT, gbm_bo_get_offset(bo, 0),
|
|
||||||
EGL_DMA_BUF_PLANE0_PITCH_EXT, gbm_bo_get_stride_for_plane(bo, 0),
|
|
||||||
EGL_IMAGE_PRESERVED_KHR, EGL_FALSE,
|
|
||||||
EGL_NONE,
|
|
||||||
};
|
};
|
||||||
|
attribs.offset[0] = 0;
|
||||||
|
attribs.stride[0] = gbm_bo_get_stride_for_plane(bo, 0);
|
||||||
|
attribs.modifier[0] = DRM_FORMAT_MOD_LINEAR;
|
||||||
|
attribs.fd[0] = gbm_bo_get_fd(bo);
|
||||||
|
|
||||||
tex->img = eglCreateImageKHR(renderer->egl.display, EGL_NO_CONTEXT,
|
tex->tex = wlr_texture_from_dmabuf(renderer->wlr_rend, &attribs);
|
||||||
EGL_LINUX_DMA_BUF_EXT, NULL, attribs);
|
if (tex->tex == NULL) {
|
||||||
if (!tex->img) {
|
free(tex);
|
||||||
wlr_log(L_ERROR, "Failed to create EGL image");
|
return NULL;
|
||||||
abort();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tex->tex = wlr_render_texture_create(renderer->wlr_rend);
|
|
||||||
wlr_texture_upload_eglimage(tex->tex, tex->img, width, height);
|
|
||||||
|
|
||||||
gbm_bo_set_user_data(bo, tex, free_eglimage);
|
gbm_bo_set_user_data(bo, tex, free_eglimage);
|
||||||
|
|
||||||
return tex->tex;
|
return tex->tex;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,6 @@ backend_files = files(
|
||||||
'wayland/output.c',
|
'wayland/output.c',
|
||||||
'wayland/registry.c',
|
'wayland/registry.c',
|
||||||
'wayland/wl_seat.c',
|
'wayland/wl_seat.c',
|
||||||
'x11/backend.c',
|
|
||||||
)
|
)
|
||||||
|
|
||||||
backend_deps = [
|
backend_deps = [
|
||||||
|
@ -50,6 +49,10 @@ if conf_data.get('WLR_HAS_SYSTEMD', false)
|
||||||
backend_deps += systemd
|
backend_deps += systemd
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if conf_data.get('WLR_HAS_X11_BACKEND', false)
|
||||||
|
backend_files += files('x11/backend.c')
|
||||||
|
endif
|
||||||
|
|
||||||
if conf_data.get('WLR_HAS_ELOGIND', false)
|
if conf_data.get('WLR_HAS_ELOGIND', false)
|
||||||
backend_files += files('session/logind.c')
|
backend_files += files('session/logind.c')
|
||||||
backend_deps += elogind
|
backend_deps += elogind
|
||||||
|
|
|
@ -99,8 +99,6 @@ static bool wlr_wl_output_set_cursor(struct wlr_output *_output,
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
stride *= 4; // stride is given in pixels, we need it in bytes
|
|
||||||
|
|
||||||
if (!backend->shm || !backend->pointer) {
|
if (!backend->shm || !backend->pointer) {
|
||||||
wlr_log(L_INFO, "cannot set cursor, no shm or pointer");
|
wlr_log(L_INFO, "cannot set cursor, no shm or pointer");
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -326,9 +326,6 @@ static void wlr_x11_backend_destroy(struct wlr_backend *backend) {
|
||||||
wl_event_source_remove(x11->frame_timer);
|
wl_event_source_remove(x11->frame_timer);
|
||||||
wlr_egl_finish(&x11->egl);
|
wlr_egl_finish(&x11->egl);
|
||||||
|
|
||||||
if (x11->xcb_conn) {
|
|
||||||
xcb_disconnect(x11->xcb_conn);
|
|
||||||
}
|
|
||||||
if (x11->xlib_conn) {
|
if (x11->xlib_conn) {
|
||||||
XCloseDisplay(x11->xlib_conn);
|
XCloseDisplay(x11->xlib_conn);
|
||||||
}
|
}
|
||||||
|
@ -428,7 +425,6 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_display *display,
|
||||||
error_event:
|
error_event:
|
||||||
wl_event_source_remove(x11->event_source);
|
wl_event_source_remove(x11->event_source);
|
||||||
error_x11:
|
error_x11:
|
||||||
xcb_disconnect(x11->xcb_conn);
|
|
||||||
XCloseDisplay(x11->xlib_conn);
|
XCloseDisplay(x11->xlib_conn);
|
||||||
free(x11);
|
free(x11);
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
|
@ -0,0 +1,298 @@
|
||||||
|
#define _POSIX_C_SOURCE 199309L
|
||||||
|
#include <assert.h>
|
||||||
|
#include <GLES2/gl2.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <time.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;
|
||||||
|
struct zwlr_layer_surface_v1 *layer_surface;
|
||||||
|
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 = ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND;
|
||||||
|
static uint32_t anchor = 0;
|
||||||
|
static uint32_t width = 256, height = 256;
|
||||||
|
static int32_t margin_top = 0;
|
||||||
|
static double alpha = 1.0;
|
||||||
|
static bool run_display = true;
|
||||||
|
static bool animate = false;
|
||||||
|
static double frame = 0;
|
||||||
|
|
||||||
|
static struct {
|
||||||
|
struct timespec last_frame;
|
||||||
|
float color[3];
|
||||||
|
int dec;
|
||||||
|
} demo;
|
||||||
|
|
||||||
|
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);
|
||||||
|
|
||||||
|
struct timespec ts;
|
||||||
|
clock_gettime(CLOCK_MONOTONIC, &ts);
|
||||||
|
|
||||||
|
long ms = (ts.tv_sec - demo.last_frame.tv_sec) * 1000 +
|
||||||
|
(ts.tv_nsec - demo.last_frame.tv_nsec) / 1000000;
|
||||||
|
int inc = (demo.dec + 1) % 3;
|
||||||
|
|
||||||
|
demo.color[inc] += ms / 2000.0f;
|
||||||
|
demo.color[demo.dec] -= ms / 2000.0f;
|
||||||
|
|
||||||
|
if (demo.color[demo.dec] < 0.0f) {
|
||||||
|
demo.color[inc] = 1.0f;
|
||||||
|
demo.color[demo.dec] = 0.0f;
|
||||||
|
demo.dec = inc;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (animate) {
|
||||||
|
frame += ms / 50.0;
|
||||||
|
int32_t old_top = margin_top;
|
||||||
|
margin_top = -(20 - ((int)frame % 20));
|
||||||
|
if (old_top != margin_top) {
|
||||||
|
zwlr_layer_surface_v1_set_margin(layer_surface,
|
||||||
|
margin_top, 0, 0, 0);
|
||||||
|
wl_surface_commit(wl_surface);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
glViewport(0, 0, width, height);
|
||||||
|
glClearColor(demo.color[0], demo.color[1], demo.color[2], alpha);
|
||||||
|
glClear(GL_COLOR_BUFFER_BIT);
|
||||||
|
|
||||||
|
frame_callback = wl_surface_frame(wl_surface);
|
||||||
|
wl_callback_add_listener(frame_callback, &frame_listener, NULL);
|
||||||
|
|
||||||
|
eglSwapBuffers(egl.display, egl_surface);
|
||||||
|
|
||||||
|
demo.last_frame = ts;
|
||||||
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
if (egl_window) {
|
||||||
|
wl_egl_window_resize(egl_window, width, height, 0, 0);
|
||||||
|
}
|
||||||
|
zwlr_layer_surface_v1_ack_configure(surface, serial);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void layer_surface_closed(void *data,
|
||||||
|
struct zwlr_layer_surface_v1 *surface) {
|
||||||
|
eglDestroySurface(egl.display, egl_surface);
|
||||||
|
wl_egl_window_destroy(egl_window);
|
||||||
|
zwlr_layer_surface_v1_destroy(surface);
|
||||||
|
wl_surface_destroy(wl_surface);
|
||||||
|
run_display = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct zwlr_layer_surface_v1_listener layer_surface_listener = {
|
||||||
|
.configure = layer_surface_configure,
|
||||||
|
.closed = layer_surface_closed,
|
||||||
|
};
|
||||||
|
|
||||||
|
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_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";
|
||||||
|
int exclusive_zone = 0;
|
||||||
|
int32_t margin_right = 0, margin_bottom = 0, margin_left = 0;
|
||||||
|
bool found;
|
||||||
|
int c;
|
||||||
|
while ((c = getopt(argc, argv, "nw:h:o:l:a:x:m:t:")) != -1) {
|
||||||
|
switch (c) {
|
||||||
|
case 'o':
|
||||||
|
output = atoi(optarg);
|
||||||
|
break;
|
||||||
|
case 'w':
|
||||||
|
width = atoi(optarg);
|
||||||
|
break;
|
||||||
|
case 'h':
|
||||||
|
height = atoi(optarg);
|
||||||
|
break;
|
||||||
|
case 'x':
|
||||||
|
exclusive_zone = 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) == 0) {
|
||||||
|
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) == 0) {
|
||||||
|
anchor |= anchors[i].value;
|
||||||
|
found = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!found) {
|
||||||
|
fprintf(stderr, "invalid anchor %s\n", optarg);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case 't':
|
||||||
|
alpha = atof(optarg);
|
||||||
|
break;
|
||||||
|
case 'm': {
|
||||||
|
char *endptr = optarg;
|
||||||
|
margin_top = strtol(endptr, &endptr, 10);
|
||||||
|
assert(*endptr == ',');
|
||||||
|
margin_right = strtol(endptr + 1, &endptr, 10);
|
||||||
|
assert(*endptr == ',');
|
||||||
|
margin_bottom = strtol(endptr + 1, &endptr, 10);
|
||||||
|
assert(*endptr == ',');
|
||||||
|
margin_left = strtol(endptr + 1, &endptr, 10);
|
||||||
|
assert(!*endptr);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case 'n':
|
||||||
|
animate = true;
|
||||||
|
break;
|
||||||
|
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_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;
|
||||||
|
}
|
||||||
|
|
||||||
|
EGLint attribs[] = { EGL_ALPHA_SIZE, 8, EGL_NONE };
|
||||||
|
wlr_egl_init(&egl, EGL_PLATFORM_WAYLAND_EXT, display,
|
||||||
|
attribs, WL_SHM_FORMAT_ARGB8888);
|
||||||
|
|
||||||
|
wl_surface = wl_compositor_create_surface(compositor);
|
||||||
|
assert(wl_surface);
|
||||||
|
|
||||||
|
layer_surface = zwlr_layer_shell_v1_get_layer_surface(layer_shell,
|
||||||
|
wl_surface, wl_output, layer, namespace);
|
||||||
|
assert(layer_surface);
|
||||||
|
zwlr_layer_surface_v1_set_size(layer_surface, width, height);
|
||||||
|
zwlr_layer_surface_v1_set_anchor(layer_surface, anchor);
|
||||||
|
zwlr_layer_surface_v1_set_exclusive_zone(layer_surface, exclusive_zone);
|
||||||
|
zwlr_layer_surface_v1_set_margin(layer_surface,
|
||||||
|
margin_top, margin_right, margin_bottom, margin_left);
|
||||||
|
zwlr_layer_surface_v1_add_listener(layer_surface,
|
||||||
|
&layer_surface_listener, layer_surface);
|
||||||
|
// TODO: interactivity
|
||||||
|
wl_surface_commit(wl_surface);
|
||||||
|
wl_display_roundtrip(display);
|
||||||
|
|
||||||
|
egl_window = wl_egl_window_create(wl_surface, width, height);
|
||||||
|
assert(egl_window);
|
||||||
|
egl_surface = wlr_egl_create_surface(&egl, egl_window);
|
||||||
|
assert(egl_surface);
|
||||||
|
|
||||||
|
wl_display_roundtrip(display);
|
||||||
|
draw();
|
||||||
|
|
||||||
|
while (wl_display_dispatch(display) != -1 && run_display) {
|
||||||
|
// This space intentionally left blank
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
|
@ -48,3 +48,9 @@ executable(
|
||||||
dependencies: [wayland_client, wlr_protos, wlroots, threads],
|
dependencies: [wayland_client, wlr_protos, wlroots, threads],
|
||||||
link_with: lib_shared,
|
link_with: lib_shared,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
executable(
|
||||||
|
'layer-shell',
|
||||||
|
'layer-shell.c',
|
||||||
|
dependencies: [wayland_client, wlr_protos, wlroots]
|
||||||
|
)
|
||||||
|
|
|
@ -149,7 +149,7 @@ static void handle_input_add(struct compositor_state *state,
|
||||||
sample->compositor);
|
sample->compositor);
|
||||||
|
|
||||||
struct wlr_xcursor_image *image = sample->xcursor->images[0];
|
struct wlr_xcursor_image *image = sample->xcursor->images[0];
|
||||||
wlr_cursor_set_image(cursor->cursor, image->buffer, image->width,
|
wlr_cursor_set_image(cursor->cursor, image->buffer, image->width * 4,
|
||||||
image->width, image->height, image->hotspot_x, image->hotspot_y, 0);
|
image->width, image->height, image->hotspot_x, image->hotspot_y, 0);
|
||||||
|
|
||||||
wl_list_insert(&sample->cursors, &cursor->link);
|
wl_list_insert(&sample->cursors, &cursor->link);
|
||||||
|
|
|
@ -197,9 +197,9 @@ int main(int argc, char *argv[]) {
|
||||||
compositor_init(&compositor);
|
compositor_init(&compositor);
|
||||||
|
|
||||||
state.renderer = wlr_gles2_renderer_create(compositor.backend);
|
state.renderer = wlr_gles2_renderer_create(compositor.backend);
|
||||||
state.cat_texture = wlr_render_texture_create(state.renderer);
|
state.cat_texture = wlr_texture_from_pixels(state.renderer,
|
||||||
wlr_texture_upload_pixels(state.cat_texture, WL_SHM_FORMAT_ABGR8888,
|
WL_SHM_FORMAT_ABGR8888, cat_tex.width * 4, cat_tex.width, cat_tex.height,
|
||||||
cat_tex.width, cat_tex.width, cat_tex.height, cat_tex.pixel_data);
|
cat_tex.pixel_data);
|
||||||
|
|
||||||
if (!wlr_backend_start(compositor.backend)) {
|
if (!wlr_backend_start(compositor.backend)) {
|
||||||
wlr_log(L_ERROR, "Failed to start backend");
|
wlr_log(L_ERROR, "Failed to start backend");
|
||||||
|
|
|
@ -112,7 +112,7 @@ static void handle_output_add(struct output_state *ostate) {
|
||||||
sample->compositor);
|
sample->compositor);
|
||||||
|
|
||||||
struct wlr_xcursor_image *image = sample->xcursor->images[0];
|
struct wlr_xcursor_image *image = sample->xcursor->images[0];
|
||||||
wlr_cursor_set_image(sample->cursor, image->buffer, image->width,
|
wlr_cursor_set_image(sample->cursor, image->buffer, image->width * 4,
|
||||||
image->width, image->height, image->hotspot_x, image->hotspot_y, 0);
|
image->width, image->height, image->hotspot_x, image->hotspot_y, 0);
|
||||||
|
|
||||||
wlr_cursor_warp(sample->cursor, NULL, sample->cursor->x, sample->cursor->y);
|
wlr_cursor_warp(sample->cursor, NULL, sample->cursor->x, sample->cursor->y);
|
||||||
|
@ -324,7 +324,7 @@ int main(int argc, char *argv[]) {
|
||||||
}
|
}
|
||||||
|
|
||||||
struct wlr_xcursor_image *image = state.xcursor->images[0];
|
struct wlr_xcursor_image *image = state.xcursor->images[0];
|
||||||
wlr_cursor_set_image(state.cursor, image->buffer, image->width,
|
wlr_cursor_set_image(state.cursor, image->buffer, image->width * 4,
|
||||||
image->width, image->height, image->hotspot_x, image->hotspot_y, 0);
|
image->width, image->height, image->hotspot_x, image->hotspot_y, 0);
|
||||||
|
|
||||||
compositor_init(&compositor);
|
compositor_init(&compositor);
|
||||||
|
|
|
@ -142,13 +142,13 @@ int main(int argc, char *argv[]) {
|
||||||
wlr_log(L_ERROR, "Could not start compositor, OOM");
|
wlr_log(L_ERROR, "Could not start compositor, OOM");
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
state.cat_texture = wlr_render_texture_create(state.renderer);
|
state.cat_texture = wlr_texture_from_pixels(state.renderer,
|
||||||
|
WL_SHM_FORMAT_ABGR8888, cat_tex.width * 4, cat_tex.width, cat_tex.height,
|
||||||
|
cat_tex.pixel_data);
|
||||||
if (!state.cat_texture) {
|
if (!state.cat_texture) {
|
||||||
wlr_log(L_ERROR, "Could not start compositor, OOM");
|
wlr_log(L_ERROR, "Could not start compositor, OOM");
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
wlr_texture_upload_pixels(state.cat_texture, WL_SHM_FORMAT_ABGR8888,
|
|
||||||
cat_tex.width, cat_tex.width, cat_tex.height, cat_tex.pixel_data);
|
|
||||||
|
|
||||||
if (!wlr_backend_start(compositor.backend)) {
|
if (!wlr_backend_start(compositor.backend)) {
|
||||||
wlr_log(L_ERROR, "Failed to start backend");
|
wlr_log(L_ERROR, "Failed to start backend");
|
||||||
|
|
|
@ -49,7 +49,6 @@ static void handle_output_frame(struct output_state *output, struct timespec *ts
|
||||||
wlr_renderer_begin(sample->renderer, wlr_output->width, wlr_output->height);
|
wlr_renderer_begin(sample->renderer, wlr_output->width, wlr_output->height);
|
||||||
wlr_renderer_clear(sample->renderer, (float[]){0.25f, 0.25f, 0.25f, 1});
|
wlr_renderer_clear(sample->renderer, (float[]){0.25f, 0.25f, 0.25f, 1});
|
||||||
|
|
||||||
float matrix[9];
|
|
||||||
float distance = 0.8f * (1 - sample->distance);
|
float distance = 0.8f * (1 - sample->distance);
|
||||||
float tool_color[4] = { distance, distance, distance, 1 };
|
float tool_color[4] = { distance, distance, distance, 1 };
|
||||||
for (size_t i = 0; sample->button && i < 4; ++i) {
|
for (size_t i = 0; sample->button && i < 4; ++i) {
|
||||||
|
@ -61,12 +60,12 @@ static void handle_output_frame(struct output_state *output, struct timespec *ts
|
||||||
float pad_height = sample->height_mm * scale;
|
float pad_height = sample->height_mm * scale;
|
||||||
float left = width / 2.0f - pad_width / 2.0f;
|
float left = width / 2.0f - pad_width / 2.0f;
|
||||||
float top = height / 2.0f - pad_height / 2.0f;
|
float top = height / 2.0f - pad_height / 2.0f;
|
||||||
struct wlr_box box = {
|
const struct wlr_box box = {
|
||||||
.x = left, .y = top,
|
.x = left, .y = top,
|
||||||
.width = pad_width, .height = pad_height,
|
.width = pad_width, .height = pad_height,
|
||||||
};
|
};
|
||||||
wlr_matrix_project_box(matrix, &box, 0, 0, wlr_output->transform_matrix);
|
wlr_render_rect(sample->renderer, &box, sample->pad_color,
|
||||||
wlr_render_colored_quad(sample->renderer, sample->pad_color, matrix);
|
wlr_output->transform_matrix);
|
||||||
|
|
||||||
if (sample->proximity) {
|
if (sample->proximity) {
|
||||||
struct wlr_box box = {
|
struct wlr_box box = {
|
||||||
|
@ -75,16 +74,17 @@ static void handle_output_frame(struct output_state *output, struct timespec *ts
|
||||||
.width = 16 * (sample->pressure + 1),
|
.width = 16 * (sample->pressure + 1),
|
||||||
.height = 16 * (sample->pressure + 1),
|
.height = 16 * (sample->pressure + 1),
|
||||||
};
|
};
|
||||||
wlr_matrix_project_box(matrix, &box, 0, sample->ring,
|
float matrix[9];
|
||||||
wlr_output->transform_matrix);
|
wlr_matrix_project_box(matrix, &box, WL_OUTPUT_TRANSFORM_NORMAL,
|
||||||
wlr_render_colored_quad(sample->renderer, tool_color, matrix);
|
sample->ring, wlr_output->transform_matrix);
|
||||||
|
wlr_render_quad_with_matrix(sample->renderer, tool_color, matrix);
|
||||||
|
|
||||||
box.x += sample->x_tilt;
|
box.x += sample->x_tilt;
|
||||||
box.y += sample->y_tilt;
|
box.y += sample->y_tilt;
|
||||||
box.width /= 2;
|
box.width /= 2;
|
||||||
box.height /= 2;
|
box.height /= 2;
|
||||||
wlr_matrix_project_box(matrix, &box, 0, 0,
|
wlr_render_rect(sample->renderer, &box, tool_color,
|
||||||
wlr_output->transform_matrix);
|
wlr_output->transform_matrix);
|
||||||
wlr_render_colored_quad(sample->renderer, tool_color, matrix);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
wlr_renderer_end(sample->renderer);
|
wlr_renderer_end(sample->renderer);
|
||||||
|
|
|
@ -45,10 +45,13 @@ static void handle_output_frame(struct output_state *output, struct timespec *ts
|
||||||
wlr_renderer_begin(sample->renderer, wlr_output->width, wlr_output->height);
|
wlr_renderer_begin(sample->renderer, wlr_output->width, wlr_output->height);
|
||||||
wlr_renderer_clear(sample->renderer, (float[]){0.25f, 0.25f, 0.25f, 1});
|
wlr_renderer_clear(sample->renderer, (float[]){0.25f, 0.25f, 0.25f, 1});
|
||||||
|
|
||||||
|
int tex_width, tex_height;
|
||||||
|
wlr_texture_get_size(sample->cat_texture, &tex_width, &tex_height);
|
||||||
|
|
||||||
struct touch_point *p;
|
struct touch_point *p;
|
||||||
wl_list_for_each(p, &sample->touch_points, link) {
|
wl_list_for_each(p, &sample->touch_points, link) {
|
||||||
int x = (int)(p->x * width) - sample->cat_texture->width / 2;
|
int x = (int)(p->x * width) - tex_width / 2;
|
||||||
int y = (int)(p->y * height) - sample->cat_texture->height / 2;
|
int y = (int)(p->y * height) - tex_height / 2;
|
||||||
wlr_render_texture(sample->renderer, sample->cat_texture,
|
wlr_render_texture(sample->renderer, sample->cat_texture,
|
||||||
wlr_output->transform_matrix, x, y, 1.0f);
|
wlr_output->transform_matrix, x, y, 1.0f);
|
||||||
}
|
}
|
||||||
|
@ -110,13 +113,13 @@ int main(int argc, char *argv[]) {
|
||||||
wlr_log(L_ERROR, "Could not start compositor, OOM");
|
wlr_log(L_ERROR, "Could not start compositor, OOM");
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
state.cat_texture = wlr_render_texture_create(state.renderer);
|
state.cat_texture = wlr_texture_from_pixels(state.renderer,
|
||||||
|
WL_SHM_FORMAT_ARGB8888, cat_tex.width * 4, cat_tex.width, cat_tex.height,
|
||||||
|
cat_tex.pixel_data);
|
||||||
if (!state.cat_texture) {
|
if (!state.cat_texture) {
|
||||||
wlr_log(L_ERROR, "Could not start compositor, OOM");
|
wlr_log(L_ERROR, "Could not start compositor, OOM");
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
wlr_texture_upload_pixels(state.cat_texture, WL_SHM_FORMAT_ARGB8888,
|
|
||||||
cat_tex.width, cat_tex.width, cat_tex.height, cat_tex.pixel_data);
|
|
||||||
|
|
||||||
if (!wlr_backend_start(compositor.backend)) {
|
if (!wlr_backend_start(compositor.backend)) {
|
||||||
wlr_log(L_ERROR, "Failed to start backend");
|
wlr_log(L_ERROR, "Failed to start backend");
|
||||||
|
|
|
@ -27,7 +27,6 @@ struct wlr_drm_plane {
|
||||||
|
|
||||||
// Only used by cursor
|
// Only used by cursor
|
||||||
float matrix[9];
|
float matrix[9];
|
||||||
struct wlr_texture *wlr_tex;
|
|
||||||
struct gbm_bo *cursor_bo;
|
struct gbm_bo *cursor_bo;
|
||||||
bool cursor_enabled;
|
bool cursor_enabled;
|
||||||
int32_t cursor_hotspot_x, cursor_hotspot_y;
|
int32_t cursor_hotspot_x, cursor_hotspot_y;
|
||||||
|
|
|
@ -28,6 +28,7 @@ struct wlr_gles2_renderer {
|
||||||
struct wlr_renderer wlr_renderer;
|
struct wlr_renderer wlr_renderer;
|
||||||
|
|
||||||
struct wlr_egl *egl;
|
struct wlr_egl *egl;
|
||||||
|
const char *exts_str;
|
||||||
|
|
||||||
struct {
|
struct {
|
||||||
GLuint quad;
|
GLuint quad;
|
||||||
|
@ -38,21 +39,49 @@ struct wlr_gles2_renderer {
|
||||||
} shaders;
|
} shaders;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
enum wlr_gles2_texture_type {
|
||||||
|
WLR_GLES2_TEXTURE_GLTEX,
|
||||||
|
WLR_GLES2_TEXTURE_WL_DRM_GL,
|
||||||
|
WLR_GLES2_TEXTURE_WL_DRM_EXT,
|
||||||
|
WLR_GLES2_TEXTURE_DMABUF,
|
||||||
|
};
|
||||||
|
|
||||||
struct wlr_gles2_texture {
|
struct wlr_gles2_texture {
|
||||||
struct wlr_texture wlr_texture;
|
struct wlr_texture wlr_texture;
|
||||||
|
|
||||||
struct wlr_egl *egl;
|
struct wlr_gles2_renderer *renderer;
|
||||||
GLuint tex_id;
|
enum wlr_gles2_texture_type type;
|
||||||
const struct gles2_pixel_format *pixel_format;
|
int width, height;
|
||||||
|
bool has_alpha;
|
||||||
|
bool inverted_y;
|
||||||
|
|
||||||
|
// Not set if WLR_GLES2_TEXTURE_GLTEX
|
||||||
EGLImageKHR image;
|
EGLImageKHR image;
|
||||||
GLenum target;
|
GLuint image_tex;
|
||||||
|
|
||||||
|
union {
|
||||||
|
GLuint gl_tex;
|
||||||
|
struct wl_resource *wl_drm;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
const struct gles2_pixel_format *gles2_format_from_wl(enum wl_shm_format fmt);
|
const struct gles2_pixel_format *gles2_format_from_wl(enum wl_shm_format fmt);
|
||||||
const enum wl_shm_format *gles2_formats(size_t *len);
|
const enum wl_shm_format *gles2_formats(size_t *len);
|
||||||
|
|
||||||
struct wlr_texture *gles2_texture_create();
|
struct wlr_gles2_renderer *gles2_get_renderer(
|
||||||
struct wlr_gles2_texture *gles2_get_texture(struct wlr_texture *wlr_texture);
|
struct wlr_renderer *wlr_renderer);
|
||||||
|
struct wlr_gles2_renderer *gles2_get_renderer_in_context(
|
||||||
|
struct wlr_renderer *wlr_renderer);
|
||||||
|
|
||||||
|
struct wlr_gles2_texture *gles2_get_texture_in_context(
|
||||||
|
struct wlr_texture *wlr_texture);
|
||||||
|
struct wlr_texture *gles2_texture_from_pixels(struct wlr_renderer *wlr_renderer,
|
||||||
|
enum wl_shm_format wl_fmt, uint32_t stride, uint32_t width, uint32_t height,
|
||||||
|
const void *data);
|
||||||
|
struct wlr_texture *gles2_texture_from_wl_drm(struct wlr_renderer *wlr_renderer,
|
||||||
|
struct wl_resource *data);
|
||||||
|
struct wlr_texture *gles2_texture_from_dmabuf(struct wlr_renderer *wlr_renderer,
|
||||||
|
struct wlr_dmabuf_buffer_attribs *attribs);
|
||||||
|
|
||||||
void gles2_push_marker(const char *file, const char *func);
|
void gles2_push_marker(const char *file, const char *func);
|
||||||
void gles2_pop_marker(void);
|
void gles2_pop_marker(void);
|
||||||
|
|
|
@ -66,8 +66,10 @@ struct roots_config {
|
||||||
struct wl_list bindings;
|
struct wl_list bindings;
|
||||||
struct wl_list keyboards;
|
struct wl_list keyboards;
|
||||||
struct wl_list cursors;
|
struct wl_list cursors;
|
||||||
|
|
||||||
char *config_path;
|
char *config_path;
|
||||||
char *startup_cmd;
|
char *startup_cmd;
|
||||||
|
bool debug_damage_tracking;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
#include <wlr/types/wlr_compositor.h>
|
#include <wlr/types/wlr_compositor.h>
|
||||||
#include <wlr/types/wlr_gamma_control.h>
|
#include <wlr/types/wlr_gamma_control.h>
|
||||||
#include <wlr/types/wlr_idle.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_linux_dmabuf.h>
|
||||||
#include <wlr/types/wlr_list.h>
|
#include <wlr/types/wlr_list.h>
|
||||||
#include <wlr/types/wlr_output_layout.h>
|
#include <wlr/types/wlr_output_layout.h>
|
||||||
|
@ -48,12 +49,14 @@ struct roots_desktop {
|
||||||
struct wlr_idle *idle;
|
struct wlr_idle *idle;
|
||||||
struct wlr_idle_inhibit_manager_v1 *idle_inhibit;
|
struct wlr_idle_inhibit_manager_v1 *idle_inhibit;
|
||||||
struct wlr_linux_dmabuf *linux_dmabuf;
|
struct wlr_linux_dmabuf *linux_dmabuf;
|
||||||
|
struct wlr_layer_shell *layer_shell;
|
||||||
|
|
||||||
struct wl_listener new_output;
|
struct wl_listener new_output;
|
||||||
struct wl_listener layout_change;
|
struct wl_listener layout_change;
|
||||||
struct wl_listener xdg_shell_v6_surface;
|
struct wl_listener xdg_shell_v6_surface;
|
||||||
struct wl_listener xdg_shell_surface;
|
struct wl_listener xdg_shell_surface;
|
||||||
struct wl_listener wl_shell_surface;
|
struct wl_listener wl_shell_surface;
|
||||||
|
struct wl_listener layer_shell_surface;
|
||||||
struct wl_listener decoration_new;
|
struct wl_listener decoration_new;
|
||||||
|
|
||||||
#ifdef WLR_HAS_XWAYLAND
|
#ifdef WLR_HAS_XWAYLAND
|
||||||
|
@ -83,10 +86,12 @@ void view_update_size(struct roots_view *view, uint32_t width, uint32_t height);
|
||||||
void view_initial_focus(struct roots_view *view);
|
void view_initial_focus(struct roots_view *view);
|
||||||
void view_map(struct roots_view *view, struct wlr_surface *surface);
|
void view_map(struct roots_view *view, struct wlr_surface *surface);
|
||||||
void view_unmap(struct roots_view *view);
|
void view_unmap(struct roots_view *view);
|
||||||
|
void view_arrange_maximized(struct roots_view *view);
|
||||||
|
|
||||||
void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data);
|
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_xdg_shell_surface(struct wl_listener *listener, void *data);
|
||||||
void handle_wl_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);
|
void handle_xwayland_surface(struct wl_listener *listener, void *data);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -0,0 +1,25 @@
|
||||||
|
#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;
|
||||||
|
struct wl_listener output_destroy;
|
||||||
|
struct wl_listener output_mode;
|
||||||
|
struct wl_listener output_transform;
|
||||||
|
|
||||||
|
bool configured;
|
||||||
|
struct wlr_box geo;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
|
@ -4,6 +4,7 @@
|
||||||
#include <pixman.h>
|
#include <pixman.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include <wayland-server.h>
|
#include <wayland-server.h>
|
||||||
|
#include <wlr/types/wlr_box.h>
|
||||||
#include <wlr/types/wlr_output_damage.h>
|
#include <wlr/types/wlr_output_damage.h>
|
||||||
|
|
||||||
struct roots_desktop;
|
struct roots_desktop;
|
||||||
|
@ -14,10 +15,13 @@ struct roots_output {
|
||||||
struct wl_list link; // roots_desktop:outputs
|
struct wl_list link; // roots_desktop:outputs
|
||||||
|
|
||||||
struct roots_view *fullscreen_view;
|
struct roots_view *fullscreen_view;
|
||||||
|
struct wl_list layers[4]; // layer_surface::link
|
||||||
|
|
||||||
struct timespec last_frame;
|
struct timespec last_frame;
|
||||||
struct wlr_output_damage *damage;
|
struct wlr_output_damage *damage;
|
||||||
|
|
||||||
|
struct wlr_box usable_area;
|
||||||
|
|
||||||
struct wl_listener destroy;
|
struct wl_listener destroy;
|
||||||
struct wl_listener damage_frame;
|
struct wl_listener damage_frame;
|
||||||
struct wl_listener damage_destroy;
|
struct wl_listener damage_destroy;
|
||||||
|
@ -35,5 +39,9 @@ void output_damage_from_view(struct roots_output *output,
|
||||||
struct roots_view *view);
|
struct roots_view *view);
|
||||||
void output_damage_whole_drag_icon(struct roots_output *output,
|
void output_damage_whole_drag_icon(struct roots_output *output,
|
||||||
struct roots_drag_icon *icon);
|
struct roots_drag_icon *icon);
|
||||||
|
void output_damage_from_local_surface(struct roots_output *output,
|
||||||
|
struct wlr_surface *surface, double ox, double oy, float rotation);
|
||||||
|
void output_damage_whole_local_surface(struct roots_output *output,
|
||||||
|
struct wlr_surface *surface, double ox, double oy, float rotation);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
#ifndef ROOTSTON_VIEW_H
|
#ifndef ROOTSTON_VIEW_H
|
||||||
#define ROOTSTON_VIEW_H
|
#define ROOTSTON_VIEW_H
|
||||||
|
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <wlr/config.h>
|
#include <wlr/config.h>
|
||||||
#include <wlr/types/wlr_box.h>
|
#include <wlr/types/wlr_box.h>
|
||||||
|
@ -177,6 +176,8 @@ struct roots_xdg_popup_v6 {
|
||||||
struct roots_view_child view_child;
|
struct roots_view_child view_child;
|
||||||
struct wlr_xdg_popup_v6 *wlr_popup;
|
struct wlr_xdg_popup_v6 *wlr_popup;
|
||||||
struct wl_listener destroy;
|
struct wl_listener destroy;
|
||||||
|
struct wl_listener map;
|
||||||
|
struct wl_listener unmap;
|
||||||
struct wl_listener new_popup;
|
struct wl_listener new_popup;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -184,6 +185,8 @@ struct roots_xdg_popup {
|
||||||
struct roots_view_child view_child;
|
struct roots_view_child view_child;
|
||||||
struct wlr_xdg_popup *wlr_popup;
|
struct wlr_xdg_popup *wlr_popup;
|
||||||
struct wl_listener destroy;
|
struct wl_listener destroy;
|
||||||
|
struct wl_listener map;
|
||||||
|
struct wl_listener unmap;
|
||||||
struct wl_listener new_popup;
|
struct wl_listener new_popup;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -13,14 +13,14 @@ struct wlr_egl {
|
||||||
EGLConfig config;
|
EGLConfig config;
|
||||||
EGLContext context;
|
EGLContext context;
|
||||||
|
|
||||||
const char *egl_exts_str;
|
const char *exts_str;
|
||||||
const char *gl_exts_str;
|
|
||||||
|
|
||||||
struct {
|
struct {
|
||||||
bool buffer_age;
|
bool buffer_age;
|
||||||
bool swap_buffers_with_damage;
|
bool swap_buffers_with_damage;
|
||||||
bool dmabuf_import;
|
bool dmabuf_import;
|
||||||
bool dmabuf_import_modifiers;
|
bool dmabuf_import_modifiers;
|
||||||
|
bool bind_wayland_display;
|
||||||
} egl_exts;
|
} egl_exts;
|
||||||
|
|
||||||
struct wl_display *wl_display;
|
struct wl_display *wl_display;
|
||||||
|
@ -46,37 +46,25 @@ void wlr_egl_finish(struct wlr_egl *egl);
|
||||||
*/
|
*/
|
||||||
bool wlr_egl_bind_display(struct wlr_egl *egl, struct wl_display *local_display);
|
bool wlr_egl_bind_display(struct wlr_egl *egl, struct wl_display *local_display);
|
||||||
|
|
||||||
/**
|
|
||||||
* Refer to the eglQueryWaylandBufferWL extension function.
|
|
||||||
*/
|
|
||||||
bool wlr_egl_query_buffer(struct wlr_egl *egl, struct wl_resource *buf,
|
|
||||||
EGLint attrib, EGLint *value);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns a surface for the given native window
|
* Returns a surface for the given native window
|
||||||
* The window must match the remote display the wlr_egl was created with.
|
* The window must match the remote display the wlr_egl was created with.
|
||||||
*/
|
*/
|
||||||
EGLSurface wlr_egl_create_surface(struct wlr_egl *egl, void *window);
|
EGLSurface wlr_egl_create_surface(struct wlr_egl *egl, void *window);
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates an egl image from the given client buffer and attributes.
|
|
||||||
*/
|
|
||||||
EGLImageKHR wlr_egl_create_image(struct wlr_egl *egl,
|
|
||||||
EGLenum target, EGLClientBuffer buffer, const EGLint *attribs);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates an egl image from the given dmabuf attributes. Check usability
|
* Creates an egl image from the given dmabuf attributes. Check usability
|
||||||
* of the dmabuf with wlr_egl_check_import_dmabuf once first.
|
* of the dmabuf with wlr_egl_check_import_dmabuf once first.
|
||||||
*/
|
*/
|
||||||
EGLImageKHR wlr_egl_create_image_from_dmabuf(struct wlr_egl *egl,
|
EGLImageKHR wlr_egl_create_image_from_dmabuf(struct wlr_egl *egl,
|
||||||
struct wlr_dmabuf_buffer_attribs *attributes);
|
struct wlr_dmabuf_buffer_attribs *attributes);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Try to import the given dmabuf. On success return true false otherwise.
|
* Try to import the given dmabuf. On success return true false otherwise.
|
||||||
* If this succeeds the dmabuf can be used for rendering on a texture
|
* If this succeeds the dmabuf can be used for rendering on a texture
|
||||||
*/
|
*/
|
||||||
bool wlr_egl_check_import_dmabuf(struct wlr_egl *egl,
|
bool wlr_egl_check_import_dmabuf(struct wlr_egl *egl,
|
||||||
struct wlr_dmabuf_buffer *dmabuf);
|
struct wlr_dmabuf_buffer *dmabuf);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the available dmabuf formats
|
* Get the available dmabuf formats
|
||||||
|
|
|
@ -23,55 +23,48 @@ struct wlr_renderer_impl {
|
||||||
void (*end)(struct wlr_renderer *renderer);
|
void (*end)(struct wlr_renderer *renderer);
|
||||||
void (*clear)(struct wlr_renderer *renderer, const float color[static 4]);
|
void (*clear)(struct wlr_renderer *renderer, const float color[static 4]);
|
||||||
void (*scissor)(struct wlr_renderer *renderer, struct wlr_box *box);
|
void (*scissor)(struct wlr_renderer *renderer, struct wlr_box *box);
|
||||||
struct wlr_texture *(*texture_create)(struct wlr_renderer *renderer);
|
|
||||||
bool (*render_texture_with_matrix)(struct wlr_renderer *renderer,
|
bool (*render_texture_with_matrix)(struct wlr_renderer *renderer,
|
||||||
struct wlr_texture *texture, const float matrix[static 9],
|
struct wlr_texture *texture, const float matrix[static 9],
|
||||||
float alpha);
|
float alpha);
|
||||||
void (*render_quad)(struct wlr_renderer *renderer,
|
void (*render_quad_with_matrix)(struct wlr_renderer *renderer,
|
||||||
const float color[static 4], const float matrix[static 9]);
|
const float color[static 4], const float matrix[static 9]);
|
||||||
void (*render_ellipse)(struct wlr_renderer *renderer,
|
void (*render_ellipse_with_matrix)(struct wlr_renderer *renderer,
|
||||||
const float color[static 4], const float matrix[static 9]);
|
const float color[static 4], const float matrix[static 9]);
|
||||||
const enum wl_shm_format *(*formats)(
|
const enum wl_shm_format *(*formats)(
|
||||||
struct wlr_renderer *renderer, size_t *len);
|
struct wlr_renderer *renderer, size_t *len);
|
||||||
bool (*buffer_is_drm)(struct wlr_renderer *renderer,
|
bool (*resource_is_wl_drm_buffer)(struct wlr_renderer *renderer,
|
||||||
struct wl_resource *buffer);
|
struct wl_resource *resource);
|
||||||
|
void (*wl_drm_buffer_get_size)(struct wlr_renderer *renderer,
|
||||||
|
struct wl_resource *buffer, int *width, int *height);
|
||||||
bool (*read_pixels)(struct wlr_renderer *renderer, enum wl_shm_format fmt,
|
bool (*read_pixels)(struct wlr_renderer *renderer, enum wl_shm_format fmt,
|
||||||
uint32_t stride, uint32_t width, uint32_t height,
|
uint32_t stride, uint32_t width, uint32_t height,
|
||||||
uint32_t src_x, uint32_t src_y, uint32_t dst_x, uint32_t dst_y,
|
uint32_t src_x, uint32_t src_y, uint32_t dst_x, uint32_t dst_y,
|
||||||
void *data);
|
void *data);
|
||||||
bool (*format_supported)(struct wlr_renderer *renderer,
|
bool (*format_supported)(struct wlr_renderer *renderer,
|
||||||
enum wl_shm_format fmt);
|
enum wl_shm_format fmt);
|
||||||
|
struct wlr_texture *(*texture_from_pixels)(struct wlr_renderer *renderer,
|
||||||
|
enum wl_shm_format fmt, uint32_t stride, uint32_t width,
|
||||||
|
uint32_t height, const void *data);
|
||||||
|
struct wlr_texture *(*texture_from_wl_drm)(struct wlr_renderer *renderer,
|
||||||
|
struct wl_resource *data);
|
||||||
|
struct wlr_texture *(*texture_from_dmabuf)(struct wlr_renderer *renderer,
|
||||||
|
struct wlr_dmabuf_buffer_attribs *attribs);
|
||||||
void (*destroy)(struct wlr_renderer *renderer);
|
void (*destroy)(struct wlr_renderer *renderer);
|
||||||
};
|
};
|
||||||
|
|
||||||
void wlr_renderer_init(struct wlr_renderer *renderer,
|
void wlr_renderer_init(struct wlr_renderer *renderer,
|
||||||
const struct wlr_renderer_impl *impl);
|
const struct wlr_renderer_impl *impl);
|
||||||
|
|
||||||
struct wlr_texture_impl {
|
struct wlr_texture_impl {
|
||||||
bool (*upload_pixels)(struct wlr_texture *texture,
|
void (*get_size)(struct wlr_texture *texture, int *width, int *height);
|
||||||
enum wl_shm_format format, int stride, int width, int height,
|
bool (*write_pixels)(struct wlr_texture *texture,
|
||||||
const unsigned char *pixels);
|
enum wl_shm_format wl_fmt, uint32_t stride, uint32_t width,
|
||||||
bool (*update_pixels)(struct wlr_texture *texture,
|
uint32_t height, uint32_t src_x, uint32_t src_y, uint32_t dst_x,
|
||||||
enum wl_shm_format format, int stride, int x, int y,
|
uint32_t dst_y, const void *data);
|
||||||
int width, int height, const unsigned char *pixels);
|
|
||||||
bool (*upload_shm)(struct wlr_texture *texture, uint32_t format,
|
|
||||||
struct wl_shm_buffer *shm);
|
|
||||||
bool (*update_shm)(struct wlr_texture *texture, uint32_t format,
|
|
||||||
int x, int y, int width, int height, struct wl_shm_buffer *shm);
|
|
||||||
bool (*upload_drm)(struct wlr_texture *texture,
|
|
||||||
struct wl_resource *drm_buf);
|
|
||||||
bool (*upload_eglimage)(struct wlr_texture *texture, EGLImageKHR image,
|
|
||||||
uint32_t width, uint32_t height);
|
|
||||||
bool (*upload_dmabuf)(struct wlr_texture *texture,
|
|
||||||
struct wl_resource *dmabuf_resource);
|
|
||||||
void (*get_buffer_size)(struct wlr_texture *texture,
|
|
||||||
struct wl_resource *resource, int *width, int *height);
|
|
||||||
void (*destroy)(struct wlr_texture *texture);
|
void (*destroy)(struct wlr_texture *texture);
|
||||||
};
|
};
|
||||||
|
|
||||||
void wlr_texture_init(struct wlr_texture *texture,
|
void wlr_texture_init(struct wlr_texture *texture,
|
||||||
const struct wlr_texture_impl *impl);
|
const struct wlr_texture_impl *impl);
|
||||||
void wlr_texture_get_buffer_size(struct wlr_texture *texture,
|
|
||||||
struct wl_resource *resource, int *width, int *height);
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
#ifndef WLR_RENDER_WLR_RENDERER_H
|
#ifndef WLR_RENDER_WLR_RENDERER_H
|
||||||
#define WLR_RENDER_WLR_RENDERER_H
|
#define WLR_RENDER_WLR_RENDERER_H
|
||||||
|
|
||||||
#include <EGL/egl.h>
|
|
||||||
#include <EGL/eglext.h>
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <wayland-server-protocol.h>
|
#include <wayland-server-protocol.h>
|
||||||
#include <wlr/render/wlr_texture.h>
|
#include <wlr/render/wlr_texture.h>
|
||||||
|
@ -21,10 +19,6 @@ void wlr_renderer_clear(struct wlr_renderer *r, const float color[static 4]);
|
||||||
* box.
|
* box.
|
||||||
*/
|
*/
|
||||||
void wlr_renderer_scissor(struct wlr_renderer *r, struct wlr_box *box);
|
void wlr_renderer_scissor(struct wlr_renderer *r, struct wlr_box *box);
|
||||||
/**
|
|
||||||
* Requests a texture handle from this renderer.
|
|
||||||
*/
|
|
||||||
struct wlr_texture *wlr_render_texture_create(struct wlr_renderer *r);
|
|
||||||
/**
|
/**
|
||||||
* Renders the requested texture.
|
* Renders the requested texture.
|
||||||
*/
|
*/
|
||||||
|
@ -36,14 +30,24 @@ bool wlr_render_texture(struct wlr_renderer *r, struct wlr_texture *texture,
|
||||||
bool wlr_render_texture_with_matrix(struct wlr_renderer *r,
|
bool wlr_render_texture_with_matrix(struct wlr_renderer *r,
|
||||||
struct wlr_texture *texture, const float matrix[static 9], float alpha);
|
struct wlr_texture *texture, const float matrix[static 9], float alpha);
|
||||||
/**
|
/**
|
||||||
* Renders a solid quad in the specified color.
|
* Renders a solid rectangle in the specified color.
|
||||||
*/
|
*/
|
||||||
void wlr_render_colored_quad(struct wlr_renderer *r,
|
void wlr_render_rect(struct wlr_renderer *r, const struct wlr_box *box,
|
||||||
|
const float color[static 4], const float projection[static 9]);
|
||||||
|
/**
|
||||||
|
* Renders a solid quadrangle in the specified color with the specified matrix.
|
||||||
|
*/
|
||||||
|
void wlr_render_quad_with_matrix(struct wlr_renderer *r,
|
||||||
const float color[static 4], const float matrix[static 9]);
|
const float color[static 4], const float matrix[static 9]);
|
||||||
/**
|
/**
|
||||||
* Renders a solid ellipse in the specified color.
|
* Renders a solid ellipse in the specified color.
|
||||||
*/
|
*/
|
||||||
void wlr_render_colored_ellipse(struct wlr_renderer *r,
|
void wlr_render_ellipse(struct wlr_renderer *r, const struct wlr_box *box,
|
||||||
|
const float color[static 4], const float projection[static 9]);
|
||||||
|
/**
|
||||||
|
* Renders a solid ellipse in the specified color with the specified matrix.
|
||||||
|
*/
|
||||||
|
void wlr_render_ellipse_with_matrix(struct wlr_renderer *r,
|
||||||
const float color[static 4], const float matrix[static 9]);
|
const float color[static 4], const float matrix[static 9]);
|
||||||
/**
|
/**
|
||||||
* Returns a list of pixel formats supported by this renderer.
|
* Returns a list of pixel formats supported by this renderer.
|
||||||
|
@ -51,10 +55,15 @@ void wlr_render_colored_ellipse(struct wlr_renderer *r,
|
||||||
const enum wl_shm_format *wlr_renderer_get_formats(struct wlr_renderer *r,
|
const enum wl_shm_format *wlr_renderer_get_formats(struct wlr_renderer *r,
|
||||||
size_t *len);
|
size_t *len);
|
||||||
/**
|
/**
|
||||||
* Returns true if this wl_buffer is a DRM buffer.
|
* Returns true if this wl_buffer is a wl_drm buffer.
|
||||||
*/
|
*/
|
||||||
bool wlr_renderer_buffer_is_drm(struct wlr_renderer *renderer,
|
bool wlr_renderer_resource_is_wl_drm_buffer(struct wlr_renderer *renderer,
|
||||||
struct wl_resource *buffer);
|
struct wl_resource *buffer);
|
||||||
|
/**
|
||||||
|
* Gets the width and height of a wl_drm buffer.
|
||||||
|
*/
|
||||||
|
void wlr_renderer_wl_drm_buffer_get_size(struct wlr_renderer *renderer,
|
||||||
|
struct wl_resource *buffer, int *width, int *height);
|
||||||
/**
|
/**
|
||||||
* Reads out of pixels of the currently bound surface into data. `stride` is in
|
* Reads out of pixels of the currently bound surface into data. `stride` is in
|
||||||
* bytes.
|
* bytes.
|
||||||
|
|
|
@ -5,62 +5,49 @@
|
||||||
#include <EGL/eglext.h>
|
#include <EGL/eglext.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <wayland-server-protocol.h>
|
#include <wayland-server-protocol.h>
|
||||||
|
#include <wlr/types/wlr_linux_dmabuf.h>
|
||||||
|
|
||||||
|
struct wlr_renderer;
|
||||||
struct wlr_texture_impl;
|
struct wlr_texture_impl;
|
||||||
|
|
||||||
struct wlr_texture {
|
struct wlr_texture {
|
||||||
const struct wlr_texture_impl *impl;
|
const struct wlr_texture_impl *impl;
|
||||||
|
|
||||||
bool valid;
|
|
||||||
uint32_t format;
|
|
||||||
int width, height;
|
|
||||||
bool inverted_y;
|
|
||||||
struct wl_signal destroy_signal;
|
|
||||||
struct wl_resource *resource;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Copies pixels to this texture. The buffer is not accessed after this function
|
* Create a new texture from raw pixel data. `stride` is in bytes. The returned
|
||||||
* returns.
|
* texture is mutable.
|
||||||
*/
|
*/
|
||||||
bool wlr_texture_upload_pixels(struct wlr_texture *tex,
|
struct wlr_texture *wlr_texture_from_pixels(struct wlr_renderer *renderer,
|
||||||
enum wl_shm_format format, int stride, int width, int height,
|
enum wl_shm_format wl_fmt, uint32_t stride, uint32_t width, uint32_t height,
|
||||||
const unsigned char *pixels);
|
const void *data);
|
||||||
/**
|
|
||||||
* Copies pixels to this texture. The buffer is not accessed after this function
|
|
||||||
* returns. Under some circumstances, this function may re-upload the entire
|
|
||||||
* buffer - therefore, the entire buffer must be valid.
|
|
||||||
*/
|
|
||||||
bool wlr_texture_update_pixels(struct wlr_texture *surf,
|
|
||||||
enum wl_shm_format format, int stride, int x, int y,
|
|
||||||
int width, int height, const unsigned char *pixels);
|
|
||||||
/**
|
|
||||||
* Copies pixels from a wl_shm_buffer into this texture. The buffer is not
|
|
||||||
* accessed after this function returns.
|
|
||||||
*/
|
|
||||||
bool wlr_texture_upload_shm(struct wlr_texture *tex, uint32_t format,
|
|
||||||
struct wl_shm_buffer *shm);
|
|
||||||
/**
|
|
||||||
* Attaches the contents from the given wl_drm wl_buffer resource onto the
|
|
||||||
* texture. The wl_resource is not used after this call.
|
|
||||||
* Will fail (return false) if the given resource is no drm buffer.
|
|
||||||
*/
|
|
||||||
bool wlr_texture_upload_drm(struct wlr_texture *tex,
|
|
||||||
struct wl_resource *drm_buffer);
|
|
||||||
|
|
||||||
bool wlr_texture_upload_eglimage(struct wlr_texture *tex,
|
|
||||||
EGLImageKHR image, uint32_t width, uint32_t height);
|
|
||||||
|
|
||||||
bool wlr_texture_upload_dmabuf(struct wlr_texture *tex,
|
|
||||||
struct wl_resource *dmabuf_resource);
|
|
||||||
/**
|
/**
|
||||||
* Copies a rectangle of pixels from a wl_shm_buffer onto the texture. The
|
* Create a new texture from a wayland DRM resource. The returned texture is
|
||||||
* buffer is not accessed after this function returns. Under some circumstances,
|
* immutable.
|
||||||
* this function may re-upload the entire buffer - therefore, the entire buffer
|
|
||||||
* must be valid.
|
|
||||||
*/
|
*/
|
||||||
bool wlr_texture_update_shm(struct wlr_texture *surf, uint32_t format,
|
struct wlr_texture *wlr_texture_from_wl_drm(struct wlr_renderer *renderer,
|
||||||
int x, int y, int width, int height, struct wl_shm_buffer *shm);
|
struct wl_resource *data);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new texture from a DMA-BUF. The returned texture is immutable.
|
||||||
|
*/
|
||||||
|
struct wlr_texture *wlr_texture_from_dmabuf(struct wlr_renderer *renderer,
|
||||||
|
struct wlr_dmabuf_buffer_attribs *attribs);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the texture width and height.
|
||||||
|
*/
|
||||||
|
void wlr_texture_get_size(struct wlr_texture *texture, int *width, int *height);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Update a texture with raw pixels. The texture must be mutable.
|
||||||
|
*/
|
||||||
|
bool wlr_texture_write_pixels(struct wlr_texture *texture,
|
||||||
|
enum wl_shm_format wl_fmt, uint32_t stride, uint32_t width, uint32_t height,
|
||||||
|
uint32_t src_x, uint32_t src_y, uint32_t dst_x, uint32_t dst_y,
|
||||||
|
const void *data);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Destroys this wlr_texture.
|
* Destroys this wlr_texture.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -27,7 +27,7 @@ void wlr_box_transform(const struct wlr_box *box,
|
||||||
struct wlr_box *dest);
|
struct wlr_box *dest);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates the smallest box that contains a rotated box.
|
* Creates the smallest box that contains the box rotated about its center.
|
||||||
*/
|
*/
|
||||||
void wlr_box_rotated_bounds(const struct wlr_box *box, float rotation,
|
void wlr_box_rotated_bounds(const struct wlr_box *box, float rotation,
|
||||||
struct wlr_box *dest);
|
struct wlr_box *dest);
|
||||||
|
|
|
@ -7,12 +7,37 @@
|
||||||
#include <wlr/types/wlr_output_layout.h>
|
#include <wlr/types/wlr_output_layout.h>
|
||||||
#include <wlr/types/wlr_output.h>
|
#include <wlr/types/wlr_output.h>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* wlr_cursor implements the behavior of the "cursor", that is, the image on the
|
||||||
|
* screen typically moved about with a mouse or so. It provides tracking for
|
||||||
|
* this in global coordinates, and integrates with wlr_output,
|
||||||
|
* wlr_output_layout, and wlr_input_device. You can use it to abstract multiple
|
||||||
|
* input devices over a single cursor, constrain cursor movement to the usable
|
||||||
|
* area of a wlr_output_layout and communicate position updates to the hardware
|
||||||
|
* cursor, constrain specific input devices to specific outputs or regions of
|
||||||
|
* the screen, and so on.
|
||||||
|
*/
|
||||||
|
|
||||||
struct wlr_cursor_state;
|
struct wlr_cursor_state;
|
||||||
|
|
||||||
struct wlr_cursor {
|
struct wlr_cursor {
|
||||||
struct wlr_cursor_state *state;
|
struct wlr_cursor_state *state;
|
||||||
double x, y;
|
double x, y;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The interpretation of these signals is the responsibility of the
|
||||||
|
* compositor, but some helpers are provided for your benefit. If you
|
||||||
|
* receive a relative motion event, for example, you may want to call
|
||||||
|
* wlr_cursor_move. If you receive an absolute event, call
|
||||||
|
* wlr_cursor_warp_absolute. If you pass an input device into these
|
||||||
|
* functions, it will apply the region/output constraints associated with
|
||||||
|
* that device to the resulting cursor motion. If an output layout is
|
||||||
|
* attached, these functions will constrain the resulting cursor motion to
|
||||||
|
* within the usable space of the output layout.
|
||||||
|
*
|
||||||
|
* Re-broadcasting these signals to, for example, a wlr_seat, is also your
|
||||||
|
* responsibility.
|
||||||
|
*/
|
||||||
struct {
|
struct {
|
||||||
struct wl_signal motion;
|
struct wl_signal motion;
|
||||||
struct wl_signal motion_absolute;
|
struct wl_signal motion_absolute;
|
||||||
|
|
|
@ -0,0 +1,100 @@
|
||||||
|
#ifndef WLR_TYPES_WLR_LAYER_SHELL_H
|
||||||
|
#define WLR_TYPES_WLR_LAYER_SHELL_H
|
||||||
|
#include <stdbool.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <wayland-server.h>
|
||||||
|
#include <wlr/types/wlr_box.h>
|
||||||
|
#include <wlr/types/wlr_surface.h>
|
||||||
|
#include "wlr-layer-shell-unstable-v1-protocol.h"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* wlr_layer_shell allows clients to arrange themselves in "layers" on the
|
||||||
|
* desktop in accordance with the wlr-layer-shell protocol. When a client is
|
||||||
|
* added, the new_surface signal will be raised and passed a reference to our
|
||||||
|
* wlr_layer_surface. At this time, the client will have configured the surface
|
||||||
|
* as it desires, including information like desired anchors and margins. The
|
||||||
|
* compositor should use this information to decide how to arrange the layer
|
||||||
|
* on-screen, then determine the dimensions of the layer and call
|
||||||
|
* wlr_layer_surface_configure. The client will then attach a buffer and commit
|
||||||
|
* the surface, at which point the wlr_layer_surface map signal is raised and
|
||||||
|
* the compositor should begin rendering the surface.
|
||||||
|
*/
|
||||||
|
struct wlr_layer_shell {
|
||||||
|
struct wl_global *wl_global;
|
||||||
|
struct wl_list client_resources; // wl_resource
|
||||||
|
|
||||||
|
struct wl_listener display_destroy;
|
||||||
|
|
||||||
|
struct {
|
||||||
|
struct wl_signal new_surface;
|
||||||
|
} events;
|
||||||
|
|
||||||
|
void *data;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct wlr_layer_surface_state {
|
||||||
|
uint32_t anchor;
|
||||||
|
int32_t exclusive_zone;
|
||||||
|
struct {
|
||||||
|
uint32_t top, right, bottom, left;
|
||||||
|
} margin;
|
||||||
|
bool keyboard_interactive;
|
||||||
|
uint32_t desired_width, desired_height;
|
||||||
|
uint32_t actual_width, actual_height;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct wlr_layer_surface_configure {
|
||||||
|
struct wl_list link; // wlr_layer_surface::configure_list
|
||||||
|
uint32_t serial;
|
||||||
|
struct wlr_layer_surface_state state;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct wlr_layer_surface {
|
||||||
|
struct wlr_surface *surface;
|
||||||
|
struct wlr_output *output;
|
||||||
|
struct wl_resource *resource;
|
||||||
|
struct wlr_layer_shell *shell;
|
||||||
|
|
||||||
|
const char *namespace;
|
||||||
|
enum zwlr_layer_shell_v1_layer layer;
|
||||||
|
|
||||||
|
bool added, configured, mapped, closed;
|
||||||
|
uint32_t configure_serial;
|
||||||
|
struct wl_event_source *configure_idle;
|
||||||
|
uint32_t configure_next_serial;
|
||||||
|
struct wl_list configure_list;
|
||||||
|
|
||||||
|
struct wlr_layer_surface_configure *acked_configure;
|
||||||
|
|
||||||
|
struct wlr_layer_surface_state client_pending;
|
||||||
|
struct wlr_layer_surface_state server_pending;
|
||||||
|
struct wlr_layer_surface_state current;
|
||||||
|
|
||||||
|
struct wl_listener surface_destroy_listener;
|
||||||
|
|
||||||
|
struct {
|
||||||
|
struct wl_signal destroy;
|
||||||
|
struct wl_signal map;
|
||||||
|
struct wl_signal unmap;
|
||||||
|
} events;
|
||||||
|
|
||||||
|
void *data;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct wlr_layer_shell *wlr_layer_shell_create(struct wl_display *display);
|
||||||
|
void wlr_layer_shell_destroy(struct wlr_layer_shell *layer_shell);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Notifies the layer surface to configure itself with this width/height. The
|
||||||
|
* layer_surface will signal its map event when the surface is ready to assume
|
||||||
|
* this size.
|
||||||
|
*/
|
||||||
|
void wlr_layer_surface_configure(struct wlr_layer_surface *surface,
|
||||||
|
uint32_t width, uint32_t height);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Unmaps this layer surface and notifies the client that it has been closed.
|
||||||
|
*/
|
||||||
|
void wlr_layer_surface_close(struct wlr_layer_surface *surface);
|
||||||
|
|
||||||
|
#endif
|
|
@ -11,6 +11,12 @@
|
||||||
#define DRM_FORMAT_MOD_INVALID ((1ULL<<56) - 1)
|
#define DRM_FORMAT_MOD_INVALID ((1ULL<<56) - 1)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
enum {
|
||||||
|
WLR_DMABUF_BUFFER_ATTRIBS_FLAGS_Y_INVERT = 1,
|
||||||
|
WLR_DMABUF_BUFFER_ATTRIBS_FLAGS_INTERLACED = 2,
|
||||||
|
WLR_DMABUF_BUFFER_ATTRIBS_FLAGS_BOTTOM_FIRST = 4,
|
||||||
|
};
|
||||||
|
|
||||||
struct wlr_dmabuf_buffer_attribs {
|
struct wlr_dmabuf_buffer_attribs {
|
||||||
/* set via params_add */
|
/* set via params_add */
|
||||||
int n_planes;
|
int n_planes;
|
||||||
|
@ -22,7 +28,7 @@ struct wlr_dmabuf_buffer_attribs {
|
||||||
int32_t width;
|
int32_t width;
|
||||||
int32_t height;
|
int32_t height;
|
||||||
uint32_t format;
|
uint32_t format;
|
||||||
uint32_t flags; /* enum zlinux_buffer_params_flags */
|
uint32_t flags;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct wlr_dmabuf_buffer {
|
struct wlr_dmabuf_buffer {
|
||||||
|
@ -52,11 +58,6 @@ struct wlr_dmabuf_buffer *wlr_dmabuf_buffer_from_buffer_resource(
|
||||||
struct wlr_dmabuf_buffer *wlr_dmabuf_buffer_from_params_resource(
|
struct wlr_dmabuf_buffer *wlr_dmabuf_buffer_from_params_resource(
|
||||||
struct wl_resource *params_resource);
|
struct wl_resource *params_resource);
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns true if the given dmabuf has y-axis inverted, false otherwise
|
|
||||||
*/
|
|
||||||
bool wlr_dmabuf_buffer_has_inverted_y(struct wlr_dmabuf_buffer *dmabuf);
|
|
||||||
|
|
||||||
/* the protocol interface */
|
/* the protocol interface */
|
||||||
struct wlr_linux_dmabuf {
|
struct wlr_linux_dmabuf {
|
||||||
struct wl_global *wl_global;
|
struct wl_global *wl_global;
|
||||||
|
|
|
@ -40,6 +40,9 @@ struct wlr_xdg_popup {
|
||||||
bool committed;
|
bool committed;
|
||||||
struct wlr_xdg_surface *parent;
|
struct wlr_xdg_surface *parent;
|
||||||
struct wlr_seat *seat;
|
struct wlr_seat *seat;
|
||||||
|
|
||||||
|
// Position of the popup relative to the upper left corner of the window
|
||||||
|
// geometry of the parent surface
|
||||||
struct wlr_box geometry;
|
struct wlr_box geometry;
|
||||||
|
|
||||||
struct wl_list grab_link; // wlr_xdg_popup_grab::popups
|
struct wl_list grab_link; // wlr_xdg_popup_grab::popups
|
||||||
|
@ -74,9 +77,22 @@ struct wlr_xdg_toplevel {
|
||||||
struct wlr_xdg_surface *base;
|
struct wlr_xdg_surface *base;
|
||||||
struct wlr_xdg_surface *parent;
|
struct wlr_xdg_surface *parent;
|
||||||
bool added;
|
bool added;
|
||||||
struct wlr_xdg_toplevel_state next; // client protocol requests
|
|
||||||
struct wlr_xdg_toplevel_state pending; // user configure requests
|
struct wlr_xdg_toplevel_state client_pending;
|
||||||
|
struct wlr_xdg_toplevel_state server_pending;
|
||||||
struct wlr_xdg_toplevel_state current;
|
struct wlr_xdg_toplevel_state current;
|
||||||
|
|
||||||
|
char *title;
|
||||||
|
char *app_id;
|
||||||
|
|
||||||
|
struct {
|
||||||
|
struct wl_signal request_maximize;
|
||||||
|
struct wl_signal request_fullscreen;
|
||||||
|
struct wl_signal request_minimize;
|
||||||
|
struct wl_signal request_move;
|
||||||
|
struct wl_signal request_resize;
|
||||||
|
struct wl_signal request_show_window_menu;
|
||||||
|
} events;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct wlr_xdg_surface_configure {
|
struct wlr_xdg_surface_configure {
|
||||||
|
@ -106,9 +122,6 @@ struct wlr_xdg_surface {
|
||||||
uint32_t configure_next_serial;
|
uint32_t configure_next_serial;
|
||||||
struct wl_list configure_list;
|
struct wl_list configure_list;
|
||||||
|
|
||||||
char *title;
|
|
||||||
char *app_id;
|
|
||||||
|
|
||||||
bool has_next_geometry;
|
bool has_next_geometry;
|
||||||
struct wlr_box next_geometry;
|
struct wlr_box next_geometry;
|
||||||
struct wlr_box geometry;
|
struct wlr_box geometry;
|
||||||
|
@ -121,13 +134,6 @@ struct wlr_xdg_surface {
|
||||||
struct wl_signal new_popup;
|
struct wl_signal new_popup;
|
||||||
struct wl_signal map;
|
struct wl_signal map;
|
||||||
struct wl_signal unmap;
|
struct wl_signal unmap;
|
||||||
|
|
||||||
struct wl_signal request_maximize;
|
|
||||||
struct wl_signal request_fullscreen;
|
|
||||||
struct wl_signal request_minimize;
|
|
||||||
struct wl_signal request_move;
|
|
||||||
struct wl_signal request_resize;
|
|
||||||
struct wl_signal request_show_window_menu;
|
|
||||||
} events;
|
} events;
|
||||||
|
|
||||||
void *data;
|
void *data;
|
||||||
|
@ -204,9 +210,9 @@ uint32_t wlr_xdg_toplevel_set_resizing(struct wlr_xdg_surface *surface,
|
||||||
bool resizing);
|
bool resizing);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Request that this toplevel surface closes.
|
* Request that this xdg surface closes.
|
||||||
*/
|
*/
|
||||||
void wlr_xdg_toplevel_send_close(struct wlr_xdg_surface *surface);
|
void wlr_xdg_surface_send_close(struct wlr_xdg_surface *surface);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Compute the popup position in surface-local coordinates.
|
* Compute the popup position in surface-local coordinates.
|
||||||
|
|
|
@ -111,6 +111,9 @@ struct wlr_xdg_popup_v6 {
|
||||||
bool committed;
|
bool committed;
|
||||||
struct wlr_xdg_surface_v6 *parent;
|
struct wlr_xdg_surface_v6 *parent;
|
||||||
struct wlr_seat *seat;
|
struct wlr_seat *seat;
|
||||||
|
|
||||||
|
// Position of the popup relative to the upper left corner of the window
|
||||||
|
// geometry of the parent surface
|
||||||
struct wlr_box geometry;
|
struct wlr_box geometry;
|
||||||
|
|
||||||
struct wlr_xdg_positioner_v6_attributes positioner;
|
struct wlr_xdg_positioner_v6_attributes positioner;
|
||||||
|
@ -147,9 +150,22 @@ struct wlr_xdg_toplevel_v6 {
|
||||||
struct wlr_xdg_surface_v6 *base;
|
struct wlr_xdg_surface_v6 *base;
|
||||||
struct wlr_xdg_surface_v6 *parent;
|
struct wlr_xdg_surface_v6 *parent;
|
||||||
bool added;
|
bool added;
|
||||||
struct wlr_xdg_toplevel_v6_state next; // client protocol requests
|
|
||||||
struct wlr_xdg_toplevel_v6_state pending; // user configure requests
|
struct wlr_xdg_toplevel_v6_state client_pending;
|
||||||
|
struct wlr_xdg_toplevel_v6_state server_pending;
|
||||||
struct wlr_xdg_toplevel_v6_state current;
|
struct wlr_xdg_toplevel_v6_state current;
|
||||||
|
|
||||||
|
char *title;
|
||||||
|
char *app_id;
|
||||||
|
|
||||||
|
struct {
|
||||||
|
struct wl_signal request_maximize;
|
||||||
|
struct wl_signal request_fullscreen;
|
||||||
|
struct wl_signal request_minimize;
|
||||||
|
struct wl_signal request_move;
|
||||||
|
struct wl_signal request_resize;
|
||||||
|
struct wl_signal request_show_window_menu;
|
||||||
|
} events;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct wlr_xdg_surface_v6_configure {
|
struct wlr_xdg_surface_v6_configure {
|
||||||
|
@ -179,9 +195,6 @@ struct wlr_xdg_surface_v6 {
|
||||||
uint32_t configure_next_serial;
|
uint32_t configure_next_serial;
|
||||||
struct wl_list configure_list;
|
struct wl_list configure_list;
|
||||||
|
|
||||||
char *title;
|
|
||||||
char *app_id;
|
|
||||||
|
|
||||||
bool has_next_geometry;
|
bool has_next_geometry;
|
||||||
struct wlr_box next_geometry;
|
struct wlr_box next_geometry;
|
||||||
struct wlr_box geometry;
|
struct wlr_box geometry;
|
||||||
|
@ -194,13 +207,6 @@ struct wlr_xdg_surface_v6 {
|
||||||
struct wl_signal new_popup;
|
struct wl_signal new_popup;
|
||||||
struct wl_signal map;
|
struct wl_signal map;
|
||||||
struct wl_signal unmap;
|
struct wl_signal unmap;
|
||||||
|
|
||||||
struct wl_signal request_maximize;
|
|
||||||
struct wl_signal request_fullscreen;
|
|
||||||
struct wl_signal request_minimize;
|
|
||||||
struct wl_signal request_move;
|
|
||||||
struct wl_signal request_resize;
|
|
||||||
struct wl_signal request_show_window_menu;
|
|
||||||
} events;
|
} events;
|
||||||
|
|
||||||
void *data;
|
void *data;
|
||||||
|
@ -277,9 +283,9 @@ uint32_t wlr_xdg_toplevel_v6_set_resizing(struct wlr_xdg_surface_v6 *surface,
|
||||||
bool resizing);
|
bool resizing);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Request that this toplevel surface closes.
|
* Request that this xdg surface closes.
|
||||||
*/
|
*/
|
||||||
void wlr_xdg_toplevel_v6_send_close(struct wlr_xdg_surface_v6 *surface);
|
void wlr_xdg_surface_v6_send_close(struct wlr_xdg_surface_v6 *surface);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Compute the popup position in surface-local coordinates.
|
* Compute the popup position in surface-local coordinates.
|
||||||
|
|
|
@ -26,4 +26,11 @@ void wlr_region_transform(pixman_region32_t *dst, pixman_region32_t *src,
|
||||||
void wlr_region_expand(pixman_region32_t *dst, pixman_region32_t *src,
|
void wlr_region_expand(pixman_region32_t *dst, pixman_region32_t *src,
|
||||||
int distance);
|
int distance);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Builds the smallest possible region that contains the region rotated about
|
||||||
|
* the point (ox, oy).
|
||||||
|
*/
|
||||||
|
void wlr_region_rotated_bounds(pixman_region32_t *dst, pixman_region32_t *src,
|
||||||
|
float rotation, int ox, int oy);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
#define XWAYLAND_XWM_H
|
#define XWAYLAND_XWM_H
|
||||||
|
|
||||||
#include <wayland-server-core.h>
|
#include <wayland-server-core.h>
|
||||||
|
#include <wlr/config.h>
|
||||||
#include <wlr/xwayland.h>
|
#include <wlr/xwayland.h>
|
||||||
#include <xcb/render.h>
|
#include <xcb/render.h>
|
||||||
|
|
||||||
|
|
64
meson.build
64
meson.build
|
@ -58,14 +58,6 @@ libinput = dependency('libinput', version: '>=1.7.0')
|
||||||
xkbcommon = dependency('xkbcommon')
|
xkbcommon = dependency('xkbcommon')
|
||||||
udev = dependency('libudev')
|
udev = dependency('libudev')
|
||||||
pixman = dependency('pixman-1')
|
pixman = dependency('pixman-1')
|
||||||
xcb = dependency('xcb')
|
|
||||||
xcb_composite = dependency('xcb-composite')
|
|
||||||
xcb_xfixes = dependency('xcb-xfixes')
|
|
||||||
xcb_image = dependency('xcb-image')
|
|
||||||
xcb_render = dependency('xcb-render')
|
|
||||||
xcb_icccm = dependency('xcb-icccm', required: false)
|
|
||||||
xcb_errors = dependency('xcb-errors', required: get_option('enable_xcb_errors') == 'true')
|
|
||||||
x11_xcb = dependency('x11-xcb')
|
|
||||||
libcap = dependency('libcap', required: get_option('enable_libcap') == 'true')
|
libcap = dependency('libcap', required: get_option('enable_libcap') == 'true')
|
||||||
systemd = dependency('libsystemd', required: get_option('enable_systemd') == 'true')
|
systemd = dependency('libsystemd', required: get_option('enable_systemd') == 'true')
|
||||||
elogind = dependency('libelogind', required: get_option('enable_elogind') == 'true')
|
elogind = dependency('libelogind', required: get_option('enable_elogind') == 'true')
|
||||||
|
@ -75,14 +67,6 @@ exclude_headers = []
|
||||||
wlr_parts = []
|
wlr_parts = []
|
||||||
wlr_deps = []
|
wlr_deps = []
|
||||||
|
|
||||||
if xcb_icccm.found()
|
|
||||||
conf_data.set('WLR_HAS_XCB_ICCCM', true)
|
|
||||||
endif
|
|
||||||
|
|
||||||
if xcb_errors.found() and get_option('enable_xcb_errors') != 'false'
|
|
||||||
conf_data.set('WLR_HAS_XCB_ERRORS', true)
|
|
||||||
endif
|
|
||||||
|
|
||||||
if libcap.found() and get_option('enable_libcap') != 'false'
|
if libcap.found() and get_option('enable_libcap') != 'false'
|
||||||
conf_data.set('WLR_HAS_LIBCAP', true)
|
conf_data.set('WLR_HAS_LIBCAP', true)
|
||||||
wlr_deps += libcap
|
wlr_deps += libcap
|
||||||
|
@ -97,6 +81,38 @@ if elogind.found() and get_option('enable_elogind') != 'false'
|
||||||
conf_data.set('WLR_HAS_ELOGIND', true)
|
conf_data.set('WLR_HAS_ELOGIND', true)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if get_option('enable_x11_backend') or get_option('enable_xwayland')
|
||||||
|
xcb = dependency('xcb')
|
||||||
|
xcb_composite = dependency('xcb-composite')
|
||||||
|
xcb_xfixes = dependency('xcb-xfixes')
|
||||||
|
xcb_image = dependency('xcb-image')
|
||||||
|
xcb_render = dependency('xcb-render')
|
||||||
|
x11_xcb = dependency('x11-xcb')
|
||||||
|
|
||||||
|
xcb_icccm = dependency('xcb-icccm', required: false)
|
||||||
|
xcb_errors = dependency('xcb-errors', required: get_option('enable_xcb_errors') == 'true')
|
||||||
|
|
||||||
|
if xcb_icccm.found()
|
||||||
|
conf_data.set('WLR_HAS_XCB_ICCCM', true)
|
||||||
|
endif
|
||||||
|
|
||||||
|
if xcb_errors.found() and get_option('enable_xcb_errors') != 'false'
|
||||||
|
conf_data.set('WLR_HAS_XCB_ERRORS', true)
|
||||||
|
endif
|
||||||
|
|
||||||
|
wlr_deps += [
|
||||||
|
xcb,
|
||||||
|
xcb_composite,
|
||||||
|
x11_xcb,
|
||||||
|
]
|
||||||
|
else
|
||||||
|
add_project_arguments('-DMESA_EGL_NO_X11_HEADERS', language: 'c')
|
||||||
|
endif
|
||||||
|
|
||||||
|
if get_option('enable_x11_backend')
|
||||||
|
conf_data.set('WLR_HAS_X11_BACKEND', true)
|
||||||
|
endif
|
||||||
|
|
||||||
if get_option('enable_xwayland')
|
if get_option('enable_xwayland')
|
||||||
subdir('xwayland')
|
subdir('xwayland')
|
||||||
wlr_parts += [lib_wlr_xwayland]
|
wlr_parts += [lib_wlr_xwayland]
|
||||||
|
@ -138,9 +154,6 @@ wlr_deps += [
|
||||||
xkbcommon,
|
xkbcommon,
|
||||||
udev,
|
udev,
|
||||||
pixman,
|
pixman,
|
||||||
xcb,
|
|
||||||
xcb_composite,
|
|
||||||
x11_xcb,
|
|
||||||
math,
|
math,
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -168,12 +181,13 @@ summary = [
|
||||||
'----------------',
|
'----------------',
|
||||||
'wlroots @0@'.format(meson.project_version()),
|
'wlroots @0@'.format(meson.project_version()),
|
||||||
'',
|
'',
|
||||||
' libcap: @0@'.format(conf_data.get('WLR_HAS_LIBCAP', false)),
|
' libcap: @0@'.format(conf_data.get('WLR_HAS_LIBCAP', false)),
|
||||||
' systemd: @0@'.format(conf_data.get('WLR_HAS_SYSTEMD', false)),
|
' systemd: @0@'.format(conf_data.get('WLR_HAS_SYSTEMD', false)),
|
||||||
' elogind: @0@'.format(conf_data.get('WLR_HAS_ELOGIND', false)),
|
' elogind: @0@'.format(conf_data.get('WLR_HAS_ELOGIND', false)),
|
||||||
' xwayland: @0@'.format(conf_data.get('WLR_HAS_XWAYLAND', false)),
|
' xwayland: @0@'.format(conf_data.get('WLR_HAS_XWAYLAND', false)),
|
||||||
' xcb-icccm: @0@'.format(conf_data.get('WLR_HAS_XCB_ICCCM', false)),
|
' x11_backend: @0@'.format(conf_data.get('WLR_HAS_X11_BACKEND', false)),
|
||||||
' xcb-errors: @0@'.format(conf_data.get('WLR_HAS_XCB_ERRORS', false)),
|
' xcb-icccm: @0@'.format(conf_data.get('WLR_HAS_XCB_ICCCM', false)),
|
||||||
|
' xcb-errors: @0@'.format(conf_data.get('WLR_HAS_XCB_ERRORS', false)),
|
||||||
'----------------',
|
'----------------',
|
||||||
''
|
''
|
||||||
]
|
]
|
||||||
|
|
|
@ -3,3 +3,4 @@ option('enable_systemd', type: 'combo', choices: ['auto', 'true', 'false'], valu
|
||||||
option('enable_elogind', type: 'combo', choices: ['auto', 'true', 'false'], value: 'auto', description: 'Enable support for logind')
|
option('enable_elogind', type: 'combo', choices: ['auto', 'true', 'false'], value: 'auto', description: 'Enable support for logind')
|
||||||
option('enable_xcb_errors', type: 'combo', choices: ['auto', 'true', 'false'], value: 'auto', description: 'Use xcb-errors util library')
|
option('enable_xcb_errors', type: 'combo', choices: ['auto', 'true', 'false'], value: 'auto', description: 'Use xcb-errors util library')
|
||||||
option('enable_xwayland', type: 'boolean', value: true, description: 'Enable support X11 applications')
|
option('enable_xwayland', type: 'boolean', value: true, description: 'Enable support X11 applications')
|
||||||
|
option('enable_x11_backend', type: 'boolean', value: true, description: 'Enable X11 backend')
|
||||||
|
|
|
@ -30,6 +30,7 @@ protocols = [
|
||||||
'idle.xml',
|
'idle.xml',
|
||||||
'screenshooter.xml',
|
'screenshooter.xml',
|
||||||
'server-decoration.xml',
|
'server-decoration.xml',
|
||||||
|
'wlr-layer-shell-unstable-v1.xml',
|
||||||
]
|
]
|
||||||
|
|
||||||
client_protocols = [
|
client_protocols = [
|
||||||
|
@ -38,6 +39,7 @@ client_protocols = [
|
||||||
[wl_protocol_dir, 'unstable/idle-inhibit/idle-inhibit-unstable-v1.xml'],
|
[wl_protocol_dir, 'unstable/idle-inhibit/idle-inhibit-unstable-v1.xml'],
|
||||||
'idle.xml',
|
'idle.xml',
|
||||||
'screenshooter.xml',
|
'screenshooter.xml',
|
||||||
|
'wlr-layer-shell-unstable-v1.xml',
|
||||||
]
|
]
|
||||||
|
|
||||||
wl_protos_src = []
|
wl_protos_src = []
|
||||||
|
|
|
@ -0,0 +1,281 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<protocol name="wlr_layer_shell_unstable_v1">
|
||||||
|
<copyright>
|
||||||
|
Copyright © 2017 Drew DeVault
|
||||||
|
|
||||||
|
Permission to use, copy, modify, distribute, and sell this
|
||||||
|
software and its documentation for any purpose is hereby granted
|
||||||
|
without fee, provided that the above copyright notice appear in
|
||||||
|
all copies and that both that copyright notice and this permission
|
||||||
|
notice appear in supporting documentation, and that the name of
|
||||||
|
the copyright holders not be used in advertising or publicity
|
||||||
|
pertaining to distribution of the software without specific,
|
||||||
|
written prior permission. The copyright holders make no
|
||||||
|
representations about the suitability of this software for any
|
||||||
|
purpose. It is provided "as is" without express or implied
|
||||||
|
warranty.
|
||||||
|
|
||||||
|
THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
|
||||||
|
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
|
||||||
|
FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
||||||
|
SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||||
|
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
|
||||||
|
AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
|
||||||
|
ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
|
||||||
|
THIS SOFTWARE.
|
||||||
|
</copyright>
|
||||||
|
|
||||||
|
<interface name="zwlr_layer_shell_v1" version="1">
|
||||||
|
<description summary="create surfaces that are layers of the desktop">
|
||||||
|
Clients can use this interface to assign the surface_layer role to
|
||||||
|
wl_surfaces. Such surfaces are assigned to a "layer" of the output and
|
||||||
|
rendered with a defined z-depth respective to each other. They may also be
|
||||||
|
anchored to the edges and corners of a screen and specify input handling
|
||||||
|
semantics. This interface should be suitable for the implementation of
|
||||||
|
many desktop shell components, and a broad number of other applications
|
||||||
|
that interact with the desktop.
|
||||||
|
</description>
|
||||||
|
|
||||||
|
<request name="get_layer_surface">
|
||||||
|
<description summary="create a layer_surface from a surface">
|
||||||
|
Create a layer surface for an existing surface. This assigns the role of
|
||||||
|
layer_surface, or raises a protocol error if another role is already
|
||||||
|
assigned.
|
||||||
|
|
||||||
|
Creating a layer surface from a wl_surface which has a buffer attached
|
||||||
|
or committed is a client error, and any attempts by a client to attach
|
||||||
|
or manipulate a buffer prior to the first layer_surface.configure call
|
||||||
|
must also be treated as errors.
|
||||||
|
|
||||||
|
Clients can specify a namespace that defines the purpose of the layer
|
||||||
|
surface.
|
||||||
|
</description>
|
||||||
|
<arg name="id" type="new_id" interface="zwlr_layer_surface_v1"/>
|
||||||
|
<arg name="surface" type="object" interface="wl_surface"/>
|
||||||
|
<arg name="output" type="object" interface="wl_output"/>
|
||||||
|
<arg name="layer" type="uint" enum="layer" summary="layer to add this surface to"/>
|
||||||
|
<arg name="namespace" type="string" summary="namespace for the layer surface"/>
|
||||||
|
</request>
|
||||||
|
|
||||||
|
<enum name="error">
|
||||||
|
<entry name="role" value="0" summary="wl_surface has another role"/>
|
||||||
|
<entry name="invalid_layer" value="1" summary="layer value is invalid"/>
|
||||||
|
<entry name="already_constructed" value="2" summary="wl_surface has a buffer attached or committed"/>
|
||||||
|
</enum>
|
||||||
|
|
||||||
|
<enum name="layer">
|
||||||
|
<description summary="available layers for surfaces">
|
||||||
|
These values indicate which layers a surface can be rendered in. They
|
||||||
|
are ordered by z depth, bottom-most first. Traditional shell surfaces
|
||||||
|
will typically be rendered between the bottom and top layers.
|
||||||
|
Fullscreen shell surfaces are typically rendered at the top layer.
|
||||||
|
Multiple surfaces can share a single layer, and ordering within a
|
||||||
|
single layer is undefined.
|
||||||
|
</description>
|
||||||
|
|
||||||
|
<entry name="background" value="0"/>
|
||||||
|
<entry name="bottom" value="1"/>
|
||||||
|
<entry name="top" value="2"/>
|
||||||
|
<entry name="overlay" value="3"/>
|
||||||
|
</enum>
|
||||||
|
</interface>
|
||||||
|
|
||||||
|
<interface name="zwlr_layer_surface_v1" version="1">
|
||||||
|
<description summary="layer metadata interface">
|
||||||
|
An interface that may be implemented by a wl_surface, for surfaces that
|
||||||
|
are designed to be rendered as a layer of a stacked desktop-like
|
||||||
|
environment.
|
||||||
|
|
||||||
|
Layer surface state (size, anchor, exclusive zone, margin, interactivity)
|
||||||
|
is double-buffered, and will be applied at the time wl_surface.commit of
|
||||||
|
the corresponding wl_surface is called.
|
||||||
|
</description>
|
||||||
|
|
||||||
|
<request name="set_size">
|
||||||
|
<description summary="sets the size of the surface">
|
||||||
|
Sets the size of the surface in surface-local coordinates. The
|
||||||
|
compositor will display the surface centered with respect to its
|
||||||
|
anchors.
|
||||||
|
|
||||||
|
If you pass 0 for either value, the compositor will assign it and
|
||||||
|
inform you of the assignment in the configure event. You must set your
|
||||||
|
anchor to opposite edges in the dimensions you omit; not doing so is a
|
||||||
|
protocol error. Both values are 0 by default.
|
||||||
|
|
||||||
|
Size is double-buffered, see wl_surface.commit.
|
||||||
|
</description>
|
||||||
|
<arg name="width" type="uint"/>
|
||||||
|
<arg name="height" type="uint"/>
|
||||||
|
</request>
|
||||||
|
|
||||||
|
<request name="set_anchor">
|
||||||
|
<description summary="configures the anchor point of the surface">
|
||||||
|
Requests that the compositor anchor the surface to the specified edges
|
||||||
|
and corners. If two orthoginal edges are specified (e.g. 'top' and
|
||||||
|
'left'), then the anchor point will be the intersection of the edges
|
||||||
|
(e.g. the top left corner of the output); otherwise the anchor point
|
||||||
|
will be centered on that edge, or in the center if none is specified.
|
||||||
|
|
||||||
|
Anchor is double-buffered, see wl_surface.commit.
|
||||||
|
</description>
|
||||||
|
<arg name="anchor" type="uint" enum="anchor"/>
|
||||||
|
</request>
|
||||||
|
|
||||||
|
<request name="set_exclusive_zone">
|
||||||
|
<description summary="configures the exclusive geometry of this surface">
|
||||||
|
Requests that the compositor avoids occluding an area of the surface
|
||||||
|
with other surfaces. The compositor's use of this information is
|
||||||
|
implementation-dependent - do not assume that this region will not
|
||||||
|
actually be occluded.
|
||||||
|
|
||||||
|
A positive value is only meaningful if the surface is anchored to an
|
||||||
|
edge, rather than a corner. The zone is the number of surface-local
|
||||||
|
coordinates from the edge that are considered exclusive.
|
||||||
|
|
||||||
|
Surfaces that do not wish to have an exclusive zone may instead specify
|
||||||
|
how they should interact with surfaces that do. If set to zero, the
|
||||||
|
surface indicates that it would like to be moved to avoid occluding
|
||||||
|
surfaces with a positive excluzive zone. If set to -1, the surface
|
||||||
|
indicates that it would not like to be moved to accomodate for other
|
||||||
|
surfaces, and the compositor should extend it all the way to the edges
|
||||||
|
it is anchored to.
|
||||||
|
|
||||||
|
For example, a panel might set its exclusive zone to 10, so that
|
||||||
|
maximized shell surfaces are not shown on top of it. A notification
|
||||||
|
might set its exclusive zone to 0, so that it is moved to avoid
|
||||||
|
occluding the panel, but shell surfaces are shown underneath it. A
|
||||||
|
wallpaper or lock screen might set their exclusive zone to -1, so that
|
||||||
|
they stretch below or over the panel.
|
||||||
|
|
||||||
|
The default value is 0.
|
||||||
|
|
||||||
|
Exclusive zone is double-buffered, see wl_surface.commit.
|
||||||
|
</description>
|
||||||
|
<arg name="zone" type="int"/>
|
||||||
|
</request>
|
||||||
|
|
||||||
|
<request name="set_margin">
|
||||||
|
<description summary="sets a margin from the anchor point">
|
||||||
|
Requests that the surface be placed some distance away from the anchor
|
||||||
|
point on the output, in surface-local coordinates. Setting this value
|
||||||
|
for edges you are not anchored to has no effect.
|
||||||
|
|
||||||
|
The exclusive zone includes the margin.
|
||||||
|
|
||||||
|
Margin is double-buffered, see wl_surface.commit.
|
||||||
|
</description>
|
||||||
|
<arg name="top" type="int"/>
|
||||||
|
<arg name="right" type="int"/>
|
||||||
|
<arg name="bottom" type="int"/>
|
||||||
|
<arg name="left" type="int"/>
|
||||||
|
</request>
|
||||||
|
|
||||||
|
<request name="set_keyboard_interactivity">
|
||||||
|
<description summary="requests keyboard events">
|
||||||
|
Set to 1 to request that the seat send keyboard events to this layer
|
||||||
|
surface. For layers below the shell surface layer, the seat will use
|
||||||
|
normal focus semantics. For layers above the shell surface layers, the
|
||||||
|
seat will always give exclusive keyboard focus to the top-most layer
|
||||||
|
which has keyboard interactivity set to true.
|
||||||
|
|
||||||
|
Layer surfaces receive pointer, touch, and tablet events normally. If
|
||||||
|
you do not want to receive them, set the input region on your surface
|
||||||
|
to an empty region.
|
||||||
|
|
||||||
|
Events is double-buffered, see wl_surface.commit.
|
||||||
|
</description>
|
||||||
|
<arg name="keyboard_interactivity" type="uint"/>
|
||||||
|
</request>
|
||||||
|
|
||||||
|
<request name="get_popup">
|
||||||
|
<description summary="assign this layer_surface as an xdg_popup parent">
|
||||||
|
This assigns an xdg_popup's parent to this layer_surface. This popup
|
||||||
|
should have been created via xdg_surface::get_popup with the parent set
|
||||||
|
to NULL, and this request must be invoked before committing the popup's
|
||||||
|
initial state.
|
||||||
|
|
||||||
|
See the documentation of xdg_popup for more details about what an
|
||||||
|
xdg_popup is and how it is used.
|
||||||
|
</description>
|
||||||
|
<arg name="popup" type="object" interface="xdg_popup"/>
|
||||||
|
</request>
|
||||||
|
|
||||||
|
<request name="ack_configure">
|
||||||
|
<description summary="ack a configure event">
|
||||||
|
When a configure event is received, if a client commits the
|
||||||
|
surface in response to the configure event, then the client
|
||||||
|
must make an ack_configure request sometime before the commit
|
||||||
|
request, passing along the serial of the configure event.
|
||||||
|
|
||||||
|
If the client receives multiple configure events before it
|
||||||
|
can respond to one, it only has to ack the last configure event.
|
||||||
|
|
||||||
|
A client is not required to commit immediately after sending
|
||||||
|
an ack_configure request - it may even ack_configure several times
|
||||||
|
before its next surface commit.
|
||||||
|
|
||||||
|
A client may send multiple ack_configure requests before committing, but
|
||||||
|
only the last request sent before a commit indicates which configure
|
||||||
|
event the client really is responding to.
|
||||||
|
</description>
|
||||||
|
<arg name="serial" type="uint" summary="the serial from the configure event"/>
|
||||||
|
</request>
|
||||||
|
|
||||||
|
<request name="destroy" type="destructor">
|
||||||
|
<description summary="destroy the layer_surface">
|
||||||
|
This request destroys the layer surface.
|
||||||
|
</description>
|
||||||
|
</request>
|
||||||
|
|
||||||
|
<event name="configure">
|
||||||
|
<description summary="suggest a surface change">
|
||||||
|
The configure event asks the client to resize its surface.
|
||||||
|
|
||||||
|
Clients should arrange their surface for the new states, and then send
|
||||||
|
an ack_configure request with the serial sent in this configure event at
|
||||||
|
some point before committing the new surface.
|
||||||
|
|
||||||
|
The client is free to dismiss all but the last configure event it
|
||||||
|
received.
|
||||||
|
|
||||||
|
The width and height arguments specify the size of the window in
|
||||||
|
surface-local coordinates.
|
||||||
|
|
||||||
|
The size is a hint, in the sense that the client is free to ignore it if
|
||||||
|
it doesn't resize, pick a smaller size (to satisfy aspect ratio or
|
||||||
|
resize in steps of NxM pixels). If the client picks a smaller size and
|
||||||
|
is anchored to two opposite anchors (e.g. 'top' and 'bottom'), the
|
||||||
|
surface will be centered on this axis.
|
||||||
|
|
||||||
|
If the width or height arguments are zero, it means the client should
|
||||||
|
decide its own window dimension.
|
||||||
|
</description>
|
||||||
|
<arg name="serial" type="uint"/>
|
||||||
|
<arg name="width" type="uint"/>
|
||||||
|
<arg name="height" type="uint"/>
|
||||||
|
</event>
|
||||||
|
|
||||||
|
<event name="closed">
|
||||||
|
<description summary="surface should be closed">
|
||||||
|
The closed event is sent by the compositor when the surface will no
|
||||||
|
longer be shown. The output may have been destroyed or the user may
|
||||||
|
have asked for it to be removed. Further changes to the surface will be
|
||||||
|
ignored. The client should destroy the resource after receiving this
|
||||||
|
event, and create a new surface if they so choose.
|
||||||
|
</description>
|
||||||
|
</event>
|
||||||
|
|
||||||
|
<enum name="error">
|
||||||
|
<entry name="invalid_surface_state" value="0" summary="provided surface state is invalid"/>
|
||||||
|
<entry name="invalid_size" value="1" summary="size is invalid"/>
|
||||||
|
<entry name="invalid_anchor" value="2" summary="anchor bitfield is invalid"/>
|
||||||
|
</enum>
|
||||||
|
|
||||||
|
<enum name="anchor" bitfield="true">
|
||||||
|
<entry name="top" value="1" summary="the top edge of the anchor rectangle"/>
|
||||||
|
<entry name="bottom" value="2" summary="the bottom edge of the anchor rectangle"/>
|
||||||
|
<entry name="left" value="4" summary="the left edge of the anchor rectangle"/>
|
||||||
|
<entry name="right" value="8" summary="the right edge of the anchor rectangle"/>
|
||||||
|
</enum>
|
||||||
|
</interface>
|
||||||
|
</protocol>
|
132
render/egl.c
132
render/egl.c
|
@ -2,7 +2,6 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <EGL/egl.h>
|
#include <EGL/egl.h>
|
||||||
#include <EGL/eglext.h>
|
#include <EGL/eglext.h>
|
||||||
#include <GLES2/gl2.h>
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <wlr/render/egl.h>
|
#include <wlr/render/egl.h>
|
||||||
#include <wlr/util/log.h>
|
#include <wlr/util/log.h>
|
||||||
|
@ -96,7 +95,7 @@ static void print_dmabuf_formats(struct wlr_egl *egl) {
|
||||||
for (int i = 0; i < num; i++) {
|
for (int i = 0; i < num; i++) {
|
||||||
snprintf(&str_formats[i*5], (num - i) * 5 + 1, "%.4s ", (char*)&formats[i]);
|
snprintf(&str_formats[i*5], (num - i) * 5 + 1, "%.4s ", (char*)&formats[i]);
|
||||||
}
|
}
|
||||||
wlr_log(L_INFO, "Supported dmabuf buffer formats: %s", str_formats);
|
wlr_log(L_DEBUG, "Supported dmabuf buffer formats: %s", str_formats);
|
||||||
free(formats);
|
free(formats);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -155,33 +154,31 @@ bool wlr_egl_init(struct wlr_egl *egl, EGLenum platform, void *remote_display,
|
||||||
}
|
}
|
||||||
|
|
||||||
eglMakeCurrent(egl->display, EGL_NO_SURFACE, EGL_NO_SURFACE, egl->context);
|
eglMakeCurrent(egl->display, EGL_NO_SURFACE, EGL_NO_SURFACE, egl->context);
|
||||||
egl->egl_exts_str = eglQueryString(egl->display, EGL_EXTENSIONS);
|
egl->exts_str = eglQueryString(egl->display, EGL_EXTENSIONS);
|
||||||
egl->gl_exts_str = (const char*) glGetString(GL_EXTENSIONS);
|
|
||||||
|
|
||||||
wlr_log(L_INFO, "Using EGL %d.%d", (int)major, (int)minor);
|
wlr_log(L_INFO, "Using EGL %d.%d", (int)major, (int)minor);
|
||||||
wlr_log(L_INFO, "Supported EGL extensions: %s", egl->egl_exts_str);
|
wlr_log(L_INFO, "Supported EGL extensions: %s", egl->exts_str);
|
||||||
wlr_log(L_INFO, "EGL vendor: %s", eglQueryString(egl->display, EGL_VENDOR));
|
wlr_log(L_INFO, "EGL vendor: %s", eglQueryString(egl->display, EGL_VENDOR));
|
||||||
wlr_log(L_INFO, "Using %s", glGetString(GL_VERSION));
|
|
||||||
wlr_log(L_INFO, "GL vendor: %s", glGetString(GL_VENDOR));
|
|
||||||
wlr_log(L_INFO, "Supported OpenGL ES extensions: %s", egl->gl_exts_str);
|
|
||||||
|
|
||||||
if (!check_egl_ext(egl->egl_exts_str, "EGL_WL_bind_wayland_display") ||
|
if (!check_egl_ext(egl->exts_str, "EGL_KHR_image_base")) {
|
||||||
!check_egl_ext(egl->egl_exts_str, "EGL_KHR_image_base")) {
|
|
||||||
wlr_log(L_ERROR, "Required egl extensions not supported");
|
wlr_log(L_ERROR, "Required egl extensions not supported");
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
|
||||||
egl->egl_exts.buffer_age =
|
egl->egl_exts.buffer_age =
|
||||||
check_egl_ext(egl->egl_exts_str, "EGL_EXT_buffer_age");
|
check_egl_ext(egl->exts_str, "EGL_EXT_buffer_age");
|
||||||
egl->egl_exts.swap_buffers_with_damage =
|
egl->egl_exts.swap_buffers_with_damage =
|
||||||
check_egl_ext(egl->egl_exts_str, "EGL_EXT_swap_buffers_with_damage") ||
|
check_egl_ext(egl->exts_str, "EGL_EXT_swap_buffers_with_damage") ||
|
||||||
check_egl_ext(egl->egl_exts_str, "EGL_KHR_swap_buffers_with_damage");
|
check_egl_ext(egl->exts_str, "EGL_KHR_swap_buffers_with_damage");
|
||||||
|
|
||||||
egl->egl_exts.dmabuf_import =
|
egl->egl_exts.dmabuf_import =
|
||||||
check_egl_ext(egl->egl_exts_str, "EGL_EXT_image_dma_buf_import");
|
check_egl_ext(egl->exts_str, "EGL_EXT_image_dma_buf_import");
|
||||||
egl->egl_exts.dmabuf_import_modifiers =
|
egl->egl_exts.dmabuf_import_modifiers =
|
||||||
check_egl_ext(egl->egl_exts_str, "EGL_EXT_image_dma_buf_import_modifiers")
|
check_egl_ext(egl->exts_str, "EGL_EXT_image_dma_buf_import_modifiers")
|
||||||
&& eglQueryDmaBufFormatsEXT && eglQueryDmaBufModifiersEXT;
|
&& eglQueryDmaBufFormatsEXT && eglQueryDmaBufModifiersEXT;
|
||||||
|
|
||||||
|
egl->egl_exts.bind_wayland_display =
|
||||||
|
check_egl_ext(egl->exts_str, "EGL_WL_bind_wayland_display");
|
||||||
print_dmabuf_formats(egl);
|
print_dmabuf_formats(egl);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
@ -223,24 +220,6 @@ bool wlr_egl_bind_display(struct wlr_egl *egl, struct wl_display *local_display)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wlr_egl_query_buffer(struct wlr_egl *egl, struct wl_resource *buf,
|
|
||||||
int attrib, int *value) {
|
|
||||||
if (!eglQueryWaylandBufferWL) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return eglQueryWaylandBufferWL(egl->display, buf, attrib, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
EGLImage wlr_egl_create_image(struct wlr_egl *egl, EGLenum target,
|
|
||||||
EGLClientBuffer buffer, const EGLint *attribs) {
|
|
||||||
if (!eglCreateImageKHR) {
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
return eglCreateImageKHR(egl->display, egl->context, target,
|
|
||||||
buffer, attribs);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool wlr_egl_destroy_image(struct wlr_egl *egl, EGLImage image) {
|
bool wlr_egl_destroy_image(struct wlr_egl *egl, EGLImage image) {
|
||||||
if (!eglDestroyImageKHR) {
|
if (!eglDestroyImageKHR) {
|
||||||
return false;
|
return false;
|
||||||
|
@ -325,15 +304,6 @@ bool wlr_egl_swap_buffers(struct wlr_egl *egl, EGLSurface surface,
|
||||||
|
|
||||||
EGLImage wlr_egl_create_image_from_dmabuf(struct wlr_egl *egl,
|
EGLImage wlr_egl_create_image_from_dmabuf(struct wlr_egl *egl,
|
||||||
struct wlr_dmabuf_buffer_attribs *attributes) {
|
struct wlr_dmabuf_buffer_attribs *attributes) {
|
||||||
int atti = 0;
|
|
||||||
EGLint attribs[20];
|
|
||||||
attribs[atti++] = EGL_WIDTH;
|
|
||||||
attribs[atti++] = attributes->width;
|
|
||||||
attribs[atti++] = EGL_HEIGHT;
|
|
||||||
attribs[atti++] = attributes->height;
|
|
||||||
attribs[atti++] = EGL_LINUX_DRM_FOURCC_EXT;
|
|
||||||
attribs[atti++] = attributes->format;
|
|
||||||
|
|
||||||
bool has_modifier = false;
|
bool has_modifier = false;
|
||||||
if (attributes->modifier[0] != DRM_FORMAT_MOD_INVALID) {
|
if (attributes->modifier[0] != DRM_FORMAT_MOD_INVALID) {
|
||||||
if (!egl->egl_exts.dmabuf_import_modifiers) {
|
if (!egl->egl_exts.dmabuf_import_modifiers) {
|
||||||
|
@ -342,25 +312,66 @@ EGLImage wlr_egl_create_image_from_dmabuf(struct wlr_egl *egl,
|
||||||
has_modifier = true;
|
has_modifier = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* TODO: YUV planes have up four planes but we only support a
|
unsigned int atti = 0;
|
||||||
single EGLImage for now */
|
EGLint attribs[50];
|
||||||
if (attributes->n_planes > 1) {
|
attribs[atti++] = EGL_WIDTH;
|
||||||
return NULL;
|
attribs[atti++] = attributes->width;
|
||||||
}
|
attribs[atti++] = EGL_HEIGHT;
|
||||||
|
attribs[atti++] = attributes->height;
|
||||||
|
attribs[atti++] = EGL_LINUX_DRM_FOURCC_EXT;
|
||||||
|
attribs[atti++] = attributes->format;
|
||||||
|
|
||||||
attribs[atti++] = EGL_DMA_BUF_PLANE0_FD_EXT;
|
struct {
|
||||||
attribs[atti++] = attributes->fd[0];
|
EGLint fd;
|
||||||
attribs[atti++] = EGL_DMA_BUF_PLANE0_OFFSET_EXT;
|
EGLint offset;
|
||||||
attribs[atti++] = attributes->offset[0];
|
EGLint pitch;
|
||||||
attribs[atti++] = EGL_DMA_BUF_PLANE0_PITCH_EXT;
|
EGLint mod_lo;
|
||||||
attribs[atti++] = attributes->stride[0];
|
EGLint mod_hi;
|
||||||
if (has_modifier) {
|
} attr_names[WLR_LINUX_DMABUF_MAX_PLANES] = {
|
||||||
attribs[atti++] = EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT;
|
{
|
||||||
attribs[atti++] = attributes->modifier[0] & 0xFFFFFFFF;
|
EGL_DMA_BUF_PLANE0_FD_EXT,
|
||||||
attribs[atti++] = EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT;
|
EGL_DMA_BUF_PLANE0_OFFSET_EXT,
|
||||||
attribs[atti++] = attributes->modifier[0] >> 32;
|
EGL_DMA_BUF_PLANE0_PITCH_EXT,
|
||||||
|
EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT,
|
||||||
|
EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT
|
||||||
|
}, {
|
||||||
|
EGL_DMA_BUF_PLANE1_FD_EXT,
|
||||||
|
EGL_DMA_BUF_PLANE1_OFFSET_EXT,
|
||||||
|
EGL_DMA_BUF_PLANE1_PITCH_EXT,
|
||||||
|
EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT,
|
||||||
|
EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT
|
||||||
|
}, {
|
||||||
|
EGL_DMA_BUF_PLANE2_FD_EXT,
|
||||||
|
EGL_DMA_BUF_PLANE2_OFFSET_EXT,
|
||||||
|
EGL_DMA_BUF_PLANE2_PITCH_EXT,
|
||||||
|
EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT,
|
||||||
|
EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT
|
||||||
|
}, {
|
||||||
|
EGL_DMA_BUF_PLANE3_FD_EXT,
|
||||||
|
EGL_DMA_BUF_PLANE3_OFFSET_EXT,
|
||||||
|
EGL_DMA_BUF_PLANE3_PITCH_EXT,
|
||||||
|
EGL_DMA_BUF_PLANE3_MODIFIER_LO_EXT,
|
||||||
|
EGL_DMA_BUF_PLANE3_MODIFIER_HI_EXT
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
for (int i=0; i < attributes->n_planes; i++) {
|
||||||
|
attribs[atti++] = attr_names[i].fd;
|
||||||
|
attribs[atti++] = attributes->fd[i];
|
||||||
|
attribs[atti++] = attr_names[i].offset;
|
||||||
|
attribs[atti++] = attributes->offset[i];
|
||||||
|
attribs[atti++] = attr_names[i].pitch;
|
||||||
|
attribs[atti++] = attributes->stride[i];
|
||||||
|
if (has_modifier) {
|
||||||
|
attribs[atti++] = attr_names[i].mod_lo;
|
||||||
|
attribs[atti++] = attributes->modifier[i] & 0xFFFFFFFF;
|
||||||
|
attribs[atti++] = attr_names[i].mod_hi;
|
||||||
|
attribs[atti++] = attributes->modifier[i] >> 32;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
attribs[atti++] = EGL_NONE;
|
attribs[atti++] = EGL_NONE;
|
||||||
|
assert(atti < sizeof(attribs)/sizeof(attribs[0]));
|
||||||
|
|
||||||
return eglCreateImageKHR(egl->display, EGL_NO_CONTEXT,
|
return eglCreateImageKHR(egl->display, EGL_NO_CONTEXT,
|
||||||
EGL_LINUX_DMA_BUF_EXT, NULL, attribs);
|
EGL_LINUX_DMA_BUF_EXT, NULL, attribs);
|
||||||
}
|
}
|
||||||
|
@ -371,7 +382,8 @@ EGLImage wlr_egl_create_image_from_dmabuf(struct wlr_egl *egl,
|
||||||
bool wlr_egl_check_import_dmabuf(struct wlr_egl *egl,
|
bool wlr_egl_check_import_dmabuf(struct wlr_egl *egl,
|
||||||
struct wlr_dmabuf_buffer *dmabuf) {
|
struct wlr_dmabuf_buffer *dmabuf) {
|
||||||
switch (dmabuf->attributes.format & ~DRM_FORMAT_BIG_ENDIAN) {
|
switch (dmabuf->attributes.format & ~DRM_FORMAT_BIG_ENDIAN) {
|
||||||
/* YUV based formats not yet supported */
|
/* TODO: YUV based formats not yet supported, require multiple
|
||||||
|
* wlr_create_image_from_dmabuf */
|
||||||
case WL_SHM_FORMAT_YUYV:
|
case WL_SHM_FORMAT_YUYV:
|
||||||
case WL_SHM_FORMAT_YVYU:
|
case WL_SHM_FORMAT_YVYU:
|
||||||
case WL_SHM_FORMAT_UYVY:
|
case WL_SHM_FORMAT_UYVY:
|
||||||
|
@ -398,7 +410,7 @@ int wlr_egl_get_dmabuf_formats(struct wlr_egl *egl,
|
||||||
int **formats) {
|
int **formats) {
|
||||||
if (!egl->egl_exts.dmabuf_import ||
|
if (!egl->egl_exts.dmabuf_import ||
|
||||||
!egl->egl_exts.dmabuf_import_modifiers) {
|
!egl->egl_exts.dmabuf_import_modifiers) {
|
||||||
wlr_log(L_ERROR, "dmabuf extension not present");
|
wlr_log(L_DEBUG, "dmabuf extension not present");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -12,23 +12,27 @@
|
||||||
#include <wlr/render/wlr_renderer.h>
|
#include <wlr/render/wlr_renderer.h>
|
||||||
#include <wlr/types/wlr_matrix.h>
|
#include <wlr/types/wlr_matrix.h>
|
||||||
#include <wlr/util/log.h>
|
#include <wlr/util/log.h>
|
||||||
#include "render/gles2.h"
|
|
||||||
#include "glapi.h"
|
#include "glapi.h"
|
||||||
|
#include "render/gles2.h"
|
||||||
|
|
||||||
static const struct wlr_renderer_impl renderer_impl;
|
static const struct wlr_renderer_impl renderer_impl;
|
||||||
|
|
||||||
static struct wlr_gles2_renderer *gles2_get_renderer(
|
struct wlr_gles2_renderer *gles2_get_renderer(
|
||||||
struct wlr_renderer *wlr_renderer) {
|
struct wlr_renderer *wlr_renderer) {
|
||||||
assert(wlr_renderer->impl == &renderer_impl);
|
assert(wlr_renderer->impl == &renderer_impl);
|
||||||
struct wlr_gles2_renderer *renderer =
|
return (struct wlr_gles2_renderer *)wlr_renderer;
|
||||||
(struct wlr_gles2_renderer *)wlr_renderer;
|
}
|
||||||
|
|
||||||
|
struct wlr_gles2_renderer *gles2_get_renderer_in_context(
|
||||||
|
struct wlr_renderer *wlr_renderer) {
|
||||||
|
struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer);
|
||||||
assert(eglGetCurrentContext() == renderer->egl->context);
|
assert(eglGetCurrentContext() == renderer->egl->context);
|
||||||
return renderer;
|
return renderer;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void gles2_begin(struct wlr_renderer *wlr_renderer, uint32_t width,
|
static void gles2_begin(struct wlr_renderer *wlr_renderer, uint32_t width,
|
||||||
uint32_t height) {
|
uint32_t height) {
|
||||||
gles2_get_renderer(wlr_renderer);
|
gles2_get_renderer_in_context(wlr_renderer);
|
||||||
|
|
||||||
GLES2_DEBUG_PUSH;
|
GLES2_DEBUG_PUSH;
|
||||||
|
|
||||||
|
@ -45,13 +49,13 @@ static void gles2_begin(struct wlr_renderer *wlr_renderer, uint32_t width,
|
||||||
}
|
}
|
||||||
|
|
||||||
static void gles2_end(struct wlr_renderer *wlr_renderer) {
|
static void gles2_end(struct wlr_renderer *wlr_renderer) {
|
||||||
gles2_get_renderer(wlr_renderer);
|
gles2_get_renderer_in_context(wlr_renderer);
|
||||||
// no-op
|
// no-op
|
||||||
}
|
}
|
||||||
|
|
||||||
static void gles2_clear(struct wlr_renderer *wlr_renderer,
|
static void gles2_clear(struct wlr_renderer *wlr_renderer,
|
||||||
const float color[static 4]) {
|
const float color[static 4]) {
|
||||||
gles2_get_renderer(wlr_renderer);
|
gles2_get_renderer_in_context(wlr_renderer);
|
||||||
|
|
||||||
GLES2_DEBUG_PUSH;
|
GLES2_DEBUG_PUSH;
|
||||||
glClearColor(color[0], color[1], color[2], color[3]);
|
glClearColor(color[0], color[1], color[2], color[3]);
|
||||||
|
@ -61,7 +65,7 @@ static void gles2_clear(struct wlr_renderer *wlr_renderer,
|
||||||
|
|
||||||
static void gles2_scissor(struct wlr_renderer *wlr_renderer,
|
static void gles2_scissor(struct wlr_renderer *wlr_renderer,
|
||||||
struct wlr_box *box) {
|
struct wlr_box *box) {
|
||||||
gles2_get_renderer(wlr_renderer);
|
gles2_get_renderer_in_context(wlr_renderer);
|
||||||
|
|
||||||
GLES2_DEBUG_PUSH;
|
GLES2_DEBUG_PUSH;
|
||||||
if (box != NULL) {
|
if (box != NULL) {
|
||||||
|
@ -73,14 +77,6 @@ static void gles2_scissor(struct wlr_renderer *wlr_renderer,
|
||||||
GLES2_DEBUG_POP;
|
GLES2_DEBUG_POP;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct wlr_texture *gles2_renderer_texture_create(
|
|
||||||
struct wlr_renderer *wlr_renderer) {
|
|
||||||
assert(wlr_renderer->impl == &renderer_impl);
|
|
||||||
struct wlr_gles2_renderer *renderer =
|
|
||||||
(struct wlr_gles2_renderer *)wlr_renderer;
|
|
||||||
return gles2_texture_create(renderer->egl);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void draw_quad() {
|
static void draw_quad() {
|
||||||
GLfloat verts[] = {
|
GLfloat verts[] = {
|
||||||
1, 0, // top right
|
1, 0, // top right
|
||||||
|
@ -107,21 +103,28 @@ static void draw_quad() {
|
||||||
glDisableVertexAttribArray(1);
|
glDisableVertexAttribArray(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool gles2_render_texture_with_matrix(
|
static bool gles2_render_texture_with_matrix(struct wlr_renderer *wlr_renderer,
|
||||||
struct wlr_renderer *wlr_renderer, struct wlr_texture *wlr_texture,
|
struct wlr_texture *wlr_texture, const float matrix[static 9],
|
||||||
const float matrix[static 9], float alpha) {
|
float alpha) {
|
||||||
struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer);
|
struct wlr_gles2_renderer *renderer =
|
||||||
struct wlr_gles2_texture *texture = gles2_get_texture(wlr_texture);
|
gles2_get_renderer_in_context(wlr_renderer);
|
||||||
if (!wlr_texture->valid) {
|
struct wlr_gles2_texture *texture =
|
||||||
wlr_log(L_ERROR, "attempt to render invalid texture");
|
gles2_get_texture_in_context(wlr_texture);
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
GLuint prog = renderer->shaders.tex_rgba;
|
GLuint prog;
|
||||||
if (texture->target == GL_TEXTURE_EXTERNAL_OES) {
|
GLenum target;
|
||||||
|
switch (texture->type) {
|
||||||
|
case WLR_GLES2_TEXTURE_GLTEX:
|
||||||
|
case WLR_GLES2_TEXTURE_WL_DRM_GL:
|
||||||
|
prog = texture->has_alpha ? renderer->shaders.tex_rgba :
|
||||||
|
renderer->shaders.tex_rgbx;
|
||||||
|
target = GL_TEXTURE_2D;
|
||||||
|
break;
|
||||||
|
case WLR_GLES2_TEXTURE_WL_DRM_EXT:
|
||||||
|
case WLR_GLES2_TEXTURE_DMABUF:
|
||||||
prog = renderer->shaders.tex_ext;
|
prog = renderer->shaders.tex_ext;
|
||||||
} else if (!texture->pixel_format->has_alpha) {
|
target = GL_TEXTURE_EXTERNAL_OES;
|
||||||
prog = renderer->shaders.tex_rgbx;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
// OpenGL ES 2 requires the glUniformMatrix3fv transpose parameter to be set
|
// OpenGL ES 2 requires the glUniformMatrix3fv transpose parameter to be set
|
||||||
|
@ -130,23 +133,32 @@ static bool gles2_render_texture_with_matrix(
|
||||||
wlr_matrix_transpose(transposition, matrix);
|
wlr_matrix_transpose(transposition, matrix);
|
||||||
|
|
||||||
GLES2_DEBUG_PUSH;
|
GLES2_DEBUG_PUSH;
|
||||||
glBindTexture(texture->target, texture->tex_id);
|
|
||||||
glTexParameteri(texture->target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
|
GLuint tex_id = texture->type == WLR_GLES2_TEXTURE_GLTEX ?
|
||||||
glTexParameteri(texture->target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
texture->gl_tex : texture->image_tex;
|
||||||
|
glActiveTexture(GL_TEXTURE0);
|
||||||
|
glBindTexture(target, tex_id);
|
||||||
|
|
||||||
|
glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
|
||||||
|
glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
||||||
|
|
||||||
glUseProgram(prog);
|
glUseProgram(prog);
|
||||||
|
|
||||||
glUniformMatrix3fv(0, 1, GL_FALSE, transposition);
|
glUniformMatrix3fv(0, 1, GL_FALSE, transposition);
|
||||||
glUniform1i(1, wlr_texture->inverted_y);
|
glUniform1i(1, texture->inverted_y);
|
||||||
glUniform1f(3, alpha);
|
glUniform1f(3, alpha);
|
||||||
|
|
||||||
draw_quad();
|
draw_quad();
|
||||||
|
|
||||||
GLES2_DEBUG_POP;
|
GLES2_DEBUG_POP;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void gles2_render_quad(struct wlr_renderer *wlr_renderer,
|
static void gles2_render_quad_with_matrix(struct wlr_renderer *wlr_renderer,
|
||||||
const float color[static 4], const float matrix[static 9]) {
|
const float color[static 4], const float matrix[static 9]) {
|
||||||
struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer);
|
struct wlr_gles2_renderer *renderer =
|
||||||
|
gles2_get_renderer_in_context(wlr_renderer);
|
||||||
|
|
||||||
// OpenGL ES 2 requires the glUniformMatrix3fv transpose parameter to be set
|
// OpenGL ES 2 requires the glUniformMatrix3fv transpose parameter to be set
|
||||||
// to GL_FALSE
|
// to GL_FALSE
|
||||||
|
@ -161,9 +173,10 @@ static void gles2_render_quad(struct wlr_renderer *wlr_renderer,
|
||||||
GLES2_DEBUG_POP;
|
GLES2_DEBUG_POP;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void gles2_render_ellipse(struct wlr_renderer *wlr_renderer,
|
static void gles2_render_ellipse_with_matrix(struct wlr_renderer *wlr_renderer,
|
||||||
const float color[static 4], const float matrix[static 9]) {
|
const float color[static 4], const float matrix[static 9]) {
|
||||||
struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer);
|
struct wlr_gles2_renderer *renderer =
|
||||||
|
gles2_get_renderer_in_context(wlr_renderer);
|
||||||
|
|
||||||
// OpenGL ES 2 requires the glUniformMatrix3fv transpose parameter to be set
|
// OpenGL ES 2 requires the glUniformMatrix3fv transpose parameter to be set
|
||||||
// to GL_FALSE
|
// to GL_FALSE
|
||||||
|
@ -183,20 +196,38 @@ static const enum wl_shm_format *gles2_renderer_formats(
|
||||||
return gles2_formats(len);
|
return gles2_formats(len);
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool gles2_buffer_is_drm(struct wlr_renderer *wlr_renderer,
|
static bool gles2_resource_is_wl_drm_buffer(struct wlr_renderer *wlr_renderer,
|
||||||
struct wl_resource *buffer) {
|
struct wl_resource *resource) {
|
||||||
struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer);
|
struct wlr_gles2_renderer *renderer =
|
||||||
|
gles2_get_renderer_in_context(wlr_renderer);
|
||||||
|
|
||||||
EGLint format;
|
if (!eglQueryWaylandBufferWL) {
|
||||||
return wlr_egl_query_buffer(renderer->egl, buffer, EGL_TEXTURE_FORMAT,
|
return false;
|
||||||
&format);
|
}
|
||||||
|
|
||||||
|
EGLint fmt;
|
||||||
|
return eglQueryWaylandBufferWL(renderer->egl->display, resource,
|
||||||
|
EGL_TEXTURE_FORMAT, &fmt);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void gles2_wl_drm_buffer_get_size(struct wlr_renderer *wlr_renderer,
|
||||||
|
struct wl_resource *buffer, int *width, int *height) {
|
||||||
|
struct wlr_gles2_renderer *renderer =
|
||||||
|
gles2_get_renderer_in_context(wlr_renderer);
|
||||||
|
|
||||||
|
if (!eglQueryWaylandBufferWL) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
eglQueryWaylandBufferWL(renderer->egl->display, buffer, EGL_WIDTH, width);
|
||||||
|
eglQueryWaylandBufferWL(renderer->egl->display, buffer, EGL_HEIGHT, height);
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool gles2_read_pixels(struct wlr_renderer *wlr_renderer,
|
static bool gles2_read_pixels(struct wlr_renderer *wlr_renderer,
|
||||||
enum wl_shm_format wl_fmt, uint32_t stride, uint32_t width,
|
enum wl_shm_format wl_fmt, uint32_t stride, uint32_t width,
|
||||||
uint32_t height, uint32_t src_x, uint32_t src_y, uint32_t dst_x,
|
uint32_t height, uint32_t src_x, uint32_t src_y, uint32_t dst_x,
|
||||||
uint32_t dst_y, void *data) {
|
uint32_t dst_y, void *data) {
|
||||||
gles2_get_renderer(wlr_renderer);
|
gles2_get_renderer_in_context(wlr_renderer);
|
||||||
|
|
||||||
const struct gles2_pixel_format *fmt = gles2_format_from_wl(wl_fmt);
|
const struct gles2_pixel_format *fmt = gles2_format_from_wl(wl_fmt);
|
||||||
if (fmt == NULL) {
|
if (fmt == NULL) {
|
||||||
|
@ -254,14 +285,17 @@ static const struct wlr_renderer_impl renderer_impl = {
|
||||||
.end = gles2_end,
|
.end = gles2_end,
|
||||||
.clear = gles2_clear,
|
.clear = gles2_clear,
|
||||||
.scissor = gles2_scissor,
|
.scissor = gles2_scissor,
|
||||||
.texture_create = gles2_renderer_texture_create,
|
|
||||||
.render_texture_with_matrix = gles2_render_texture_with_matrix,
|
.render_texture_with_matrix = gles2_render_texture_with_matrix,
|
||||||
.render_quad = gles2_render_quad,
|
.render_quad_with_matrix = gles2_render_quad_with_matrix,
|
||||||
.render_ellipse = gles2_render_ellipse,
|
.render_ellipse_with_matrix = gles2_render_ellipse_with_matrix,
|
||||||
.formats = gles2_renderer_formats,
|
.formats = gles2_renderer_formats,
|
||||||
.buffer_is_drm = gles2_buffer_is_drm,
|
.resource_is_wl_drm_buffer = gles2_resource_is_wl_drm_buffer,
|
||||||
|
.wl_drm_buffer_get_size = gles2_wl_drm_buffer_get_size,
|
||||||
.read_pixels = gles2_read_pixels,
|
.read_pixels = gles2_read_pixels,
|
||||||
.format_supported = gles2_format_supported,
|
.format_supported = gles2_format_supported,
|
||||||
|
.texture_from_pixels = gles2_texture_from_pixels,
|
||||||
|
.texture_from_wl_drm = gles2_texture_from_wl_drm,
|
||||||
|
.texture_from_dmabuf = gles2_texture_from_dmabuf,
|
||||||
};
|
};
|
||||||
|
|
||||||
void gles2_push_marker(const char *file, const char *func) {
|
void gles2_push_marker(const char *file, const char *func) {
|
||||||
|
@ -377,6 +411,11 @@ struct wlr_renderer *wlr_gles2_renderer_create(struct wlr_backend *backend) {
|
||||||
renderer->egl = wlr_backend_get_egl(backend);
|
renderer->egl = wlr_backend_get_egl(backend);
|
||||||
wlr_egl_make_current(renderer->egl, EGL_NO_SURFACE, NULL);
|
wlr_egl_make_current(renderer->egl, EGL_NO_SURFACE, NULL);
|
||||||
|
|
||||||
|
renderer->exts_str = (const char*) glGetString(GL_EXTENSIONS);
|
||||||
|
wlr_log(L_INFO, "Using %s", glGetString(GL_VERSION));
|
||||||
|
wlr_log(L_INFO, "GL vendor: %s", glGetString(GL_VENDOR));
|
||||||
|
wlr_log(L_INFO, "Supported GLES2 extensions: %s", renderer->exts_str);
|
||||||
|
|
||||||
if (glDebugMessageCallbackKHR && glDebugMessageControlKHR) {
|
if (glDebugMessageCallbackKHR && glDebugMessageControlKHR) {
|
||||||
glEnable(GL_DEBUG_OUTPUT_KHR);
|
glEnable(GL_DEBUG_OUTPUT_KHR);
|
||||||
glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS_KHR);
|
glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS_KHR);
|
||||||
|
|
|
@ -10,360 +10,262 @@
|
||||||
#include <wlr/render/interface.h>
|
#include <wlr/render/interface.h>
|
||||||
#include <wlr/types/wlr_matrix.h>
|
#include <wlr/types/wlr_matrix.h>
|
||||||
#include <wlr/util/log.h>
|
#include <wlr/util/log.h>
|
||||||
|
#include "glapi.h"
|
||||||
#include "render/gles2.h"
|
#include "render/gles2.h"
|
||||||
#include "util/signal.h"
|
#include "util/signal.h"
|
||||||
|
|
||||||
static struct gles2_pixel_format external_pixel_format = {
|
|
||||||
.wl_format = 0,
|
|
||||||
.depth = 0,
|
|
||||||
.bpp = 0,
|
|
||||||
.gl_format = 0,
|
|
||||||
.gl_type = 0,
|
|
||||||
};
|
|
||||||
|
|
||||||
static void gles2_texture_ensure(struct wlr_gles2_texture *texture,
|
|
||||||
GLenum target) {
|
|
||||||
if (texture->tex_id) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
texture->target = target;
|
|
||||||
glGenTextures(1, &texture->tex_id);
|
|
||||||
glBindTexture(target, texture->tex_id);
|
|
||||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
|
|
||||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
|
|
||||||
}
|
|
||||||
|
|
||||||
static const struct wlr_texture_impl texture_impl;
|
static const struct wlr_texture_impl texture_impl;
|
||||||
|
|
||||||
struct wlr_gles2_texture *gles2_get_texture(struct wlr_texture *wlr_texture) {
|
static struct wlr_gles2_texture *gles2_get_texture(
|
||||||
|
struct wlr_texture *wlr_texture) {
|
||||||
assert(wlr_texture->impl == &texture_impl);
|
assert(wlr_texture->impl == &texture_impl);
|
||||||
return (struct wlr_gles2_texture *)wlr_texture;
|
return (struct wlr_gles2_texture *)wlr_texture;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool gles2_texture_upload_pixels(struct wlr_texture *wlr_texture,
|
struct wlr_gles2_texture *gles2_get_texture_in_context(
|
||||||
enum wl_shm_format format, int stride, int width, int height,
|
struct wlr_texture *wlr_texture) {
|
||||||
const unsigned char *pixels) {
|
|
||||||
struct wlr_gles2_texture *texture = gles2_get_texture(wlr_texture);
|
struct wlr_gles2_texture *texture = gles2_get_texture(wlr_texture);
|
||||||
|
assert(eglGetCurrentContext() == texture->renderer->egl->context);
|
||||||
const struct gles2_pixel_format *fmt = gles2_format_from_wl(format);
|
return texture;
|
||||||
if (!fmt || !fmt->gl_format) {
|
|
||||||
wlr_log(L_ERROR, "No supported pixel format for this texture");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
texture->wlr_texture.width = width;
|
|
||||||
texture->wlr_texture.height = height;
|
|
||||||
texture->wlr_texture.format = format;
|
|
||||||
texture->pixel_format = fmt;
|
|
||||||
|
|
||||||
GLES2_DEBUG_PUSH;
|
|
||||||
gles2_texture_ensure(texture, GL_TEXTURE_2D);
|
|
||||||
glBindTexture(GL_TEXTURE_2D, texture->tex_id);
|
|
||||||
glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, stride);
|
|
||||||
glTexImage2D(GL_TEXTURE_2D, 0, fmt->gl_format, width, height, 0,
|
|
||||||
fmt->gl_format, fmt->gl_type, pixels);
|
|
||||||
GLES2_DEBUG_POP;
|
|
||||||
|
|
||||||
texture->wlr_texture.valid = true;
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool gles2_texture_update_pixels(struct wlr_texture *wlr_texture,
|
static void gles2_texture_get_size(struct wlr_texture *wlr_texture, int *width,
|
||||||
enum wl_shm_format format, int stride, int x, int y,
|
int *height) {
|
||||||
int width, int height, const unsigned char *pixels) {
|
|
||||||
struct wlr_gles2_texture *texture = gles2_get_texture(wlr_texture);
|
struct wlr_gles2_texture *texture = gles2_get_texture(wlr_texture);
|
||||||
|
*width = texture->width;
|
||||||
|
*height = texture->height;
|
||||||
|
}
|
||||||
|
|
||||||
// TODO: Test if the unpack subimage extension is supported and adjust the
|
static bool gles2_texture_write_pixels(struct wlr_texture *wlr_texture,
|
||||||
// upload strategy if not
|
enum wl_shm_format wl_fmt, uint32_t stride, uint32_t width,
|
||||||
if (!texture->wlr_texture.valid
|
uint32_t height, uint32_t src_x, uint32_t src_y, uint32_t dst_x,
|
||||||
|| texture->wlr_texture.format != format
|
uint32_t dst_y, const void *data) {
|
||||||
/* || unpack not supported */) {
|
struct wlr_gles2_texture *texture =
|
||||||
return gles2_texture_upload_pixels(&texture->wlr_texture, format,
|
gles2_get_texture_in_context(wlr_texture);
|
||||||
stride, width, height, pixels);
|
|
||||||
|
if (texture->type != WLR_GLES2_TEXTURE_GLTEX) {
|
||||||
|
wlr_log(L_ERROR, "Cannot write pixels to immutable texture");
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
const struct gles2_pixel_format *fmt = texture->pixel_format;
|
|
||||||
|
const struct gles2_pixel_format *fmt = gles2_format_from_wl(wl_fmt);
|
||||||
|
if (fmt == NULL) {
|
||||||
|
wlr_log(L_ERROR, "Unsupported pixel format %"PRIu32, wl_fmt);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: what if the unpack subimage extension isn't supported?
|
||||||
GLES2_DEBUG_PUSH;
|
GLES2_DEBUG_PUSH;
|
||||||
glBindTexture(GL_TEXTURE_2D, texture->tex_id);
|
|
||||||
glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, stride);
|
glBindTexture(GL_TEXTURE_2D, texture->gl_tex);
|
||||||
glPixelStorei(GL_UNPACK_SKIP_PIXELS_EXT, x);
|
|
||||||
glPixelStorei(GL_UNPACK_SKIP_ROWS_EXT, y);
|
glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, stride / (fmt->bpp / 8));
|
||||||
glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, width, height, fmt->gl_format,
|
glPixelStorei(GL_UNPACK_SKIP_PIXELS_EXT, src_x);
|
||||||
fmt->gl_type, pixels);
|
glPixelStorei(GL_UNPACK_SKIP_ROWS_EXT, src_y);
|
||||||
|
|
||||||
|
glTexSubImage2D(GL_TEXTURE_2D, 0, dst_x, dst_y, width, height,
|
||||||
|
fmt->gl_format, fmt->gl_type, data);
|
||||||
|
|
||||||
|
glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, 0);
|
||||||
glPixelStorei(GL_UNPACK_SKIP_PIXELS_EXT, 0);
|
glPixelStorei(GL_UNPACK_SKIP_PIXELS_EXT, 0);
|
||||||
glPixelStorei(GL_UNPACK_SKIP_ROWS_EXT, 0);
|
glPixelStorei(GL_UNPACK_SKIP_ROWS_EXT, 0);
|
||||||
|
|
||||||
GLES2_DEBUG_POP;
|
GLES2_DEBUG_POP;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool gles2_texture_upload_shm(struct wlr_texture *wlr_texture,
|
|
||||||
uint32_t format, struct wl_shm_buffer *buffer) {
|
|
||||||
struct wlr_gles2_texture *texture = gles2_get_texture(wlr_texture);
|
|
||||||
|
|
||||||
const struct gles2_pixel_format *fmt = gles2_format_from_wl(format);
|
|
||||||
if (!fmt || !fmt->gl_format) {
|
|
||||||
wlr_log(L_ERROR, "Unsupported pixel format %"PRIu32" for this texture",
|
|
||||||
format);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
wl_shm_buffer_begin_access(buffer);
|
|
||||||
uint8_t *pixels = wl_shm_buffer_get_data(buffer);
|
|
||||||
int width = wl_shm_buffer_get_width(buffer);
|
|
||||||
int height = wl_shm_buffer_get_height(buffer);
|
|
||||||
int pitch = wl_shm_buffer_get_stride(buffer) / (fmt->bpp / 8);
|
|
||||||
texture->wlr_texture.width = width;
|
|
||||||
texture->wlr_texture.height = height;
|
|
||||||
texture->wlr_texture.format = format;
|
|
||||||
texture->pixel_format = fmt;
|
|
||||||
|
|
||||||
GLES2_DEBUG_PUSH;
|
|
||||||
gles2_texture_ensure(texture, GL_TEXTURE_2D);
|
|
||||||
glBindTexture(GL_TEXTURE_2D, texture->tex_id);
|
|
||||||
glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, pitch);
|
|
||||||
glPixelStorei(GL_UNPACK_SKIP_PIXELS_EXT, 0);
|
|
||||||
glPixelStorei(GL_UNPACK_SKIP_ROWS_EXT, 0);
|
|
||||||
glTexImage2D(GL_TEXTURE_2D, 0, fmt->gl_format, width, height, 0,
|
|
||||||
fmt->gl_format, fmt->gl_type, pixels);
|
|
||||||
GLES2_DEBUG_POP;
|
|
||||||
|
|
||||||
texture->wlr_texture.valid = true;
|
|
||||||
wl_shm_buffer_end_access(buffer);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool gles2_texture_update_shm(struct wlr_texture *wlr_texture,
|
|
||||||
uint32_t format, int x, int y, int width, int height,
|
|
||||||
struct wl_shm_buffer *buffer) {
|
|
||||||
struct wlr_gles2_texture *texture = gles2_get_texture(wlr_texture);
|
|
||||||
|
|
||||||
// TODO: Test if the unpack subimage extension is supported and adjust the
|
|
||||||
// upload strategy if not
|
|
||||||
assert(texture);
|
|
||||||
if (!texture->wlr_texture.valid
|
|
||||||
|| texture->wlr_texture.format != format
|
|
||||||
/* || unpack not supported */) {
|
|
||||||
return gles2_texture_upload_shm(&texture->wlr_texture, format, buffer);
|
|
||||||
}
|
|
||||||
const struct gles2_pixel_format *fmt = texture->pixel_format;
|
|
||||||
wl_shm_buffer_begin_access(buffer);
|
|
||||||
uint8_t *pixels = wl_shm_buffer_get_data(buffer);
|
|
||||||
int pitch = wl_shm_buffer_get_stride(buffer) / (fmt->bpp / 8);
|
|
||||||
|
|
||||||
GLES2_DEBUG_PUSH;
|
|
||||||
glBindTexture(GL_TEXTURE_2D, texture->tex_id);
|
|
||||||
glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, pitch);
|
|
||||||
glPixelStorei(GL_UNPACK_SKIP_PIXELS_EXT, x);
|
|
||||||
glPixelStorei(GL_UNPACK_SKIP_ROWS_EXT, y);
|
|
||||||
glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, width, height,
|
|
||||||
fmt->gl_format, fmt->gl_type, pixels);
|
|
||||||
glPixelStorei(GL_UNPACK_SKIP_PIXELS_EXT, 0);
|
|
||||||
glPixelStorei(GL_UNPACK_SKIP_ROWS_EXT, 0);
|
|
||||||
GLES2_DEBUG_POP;
|
|
||||||
|
|
||||||
wl_shm_buffer_end_access(buffer);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool gles2_texture_upload_drm(struct wlr_texture *wlr_texture,
|
|
||||||
struct wl_resource *buf) {
|
|
||||||
struct wlr_gles2_texture *tex = gles2_get_texture(wlr_texture);
|
|
||||||
if (!glEGLImageTargetTexture2DOES) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
EGLint format;
|
|
||||||
if (!wlr_egl_query_buffer(tex->egl, buf, EGL_TEXTURE_FORMAT, &format)) {
|
|
||||||
wlr_log(L_INFO, "upload_drm called with no drm buffer");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
wlr_egl_query_buffer(tex->egl, buf, EGL_WIDTH,
|
|
||||||
(EGLint*)&tex->wlr_texture.width);
|
|
||||||
wlr_egl_query_buffer(tex->egl, buf, EGL_HEIGHT,
|
|
||||||
(EGLint*)&tex->wlr_texture.height);
|
|
||||||
|
|
||||||
EGLint inverted_y;
|
|
||||||
if (wlr_egl_query_buffer(tex->egl, buf, EGL_WAYLAND_Y_INVERTED_WL,
|
|
||||||
&inverted_y)) {
|
|
||||||
tex->wlr_texture.inverted_y = !!inverted_y;
|
|
||||||
}
|
|
||||||
|
|
||||||
GLenum target;
|
|
||||||
const struct gles2_pixel_format *pf;
|
|
||||||
switch (format) {
|
|
||||||
case EGL_TEXTURE_RGB:
|
|
||||||
case EGL_TEXTURE_RGBA:
|
|
||||||
target = GL_TEXTURE_2D;
|
|
||||||
pf = gles2_format_from_wl(WL_SHM_FORMAT_ARGB8888);
|
|
||||||
break;
|
|
||||||
case EGL_TEXTURE_EXTERNAL_WL:
|
|
||||||
target = GL_TEXTURE_EXTERNAL_OES;
|
|
||||||
pf = &external_pixel_format;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
wlr_log(L_ERROR, "invalid/unsupported egl buffer format");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
GLES2_DEBUG_PUSH;
|
|
||||||
gles2_texture_ensure(tex, target);
|
|
||||||
glBindTexture(GL_TEXTURE_2D, tex->tex_id);
|
|
||||||
GLES2_DEBUG_POP;
|
|
||||||
|
|
||||||
EGLint attribs[] = { EGL_WAYLAND_PLANE_WL, 0, EGL_NONE };
|
|
||||||
|
|
||||||
if (tex->image) {
|
|
||||||
wlr_egl_destroy_image(tex->egl, tex->image);
|
|
||||||
}
|
|
||||||
|
|
||||||
tex->image = wlr_egl_create_image(tex->egl, EGL_WAYLAND_BUFFER_WL,
|
|
||||||
(EGLClientBuffer*) buf, attribs);
|
|
||||||
if (!tex->image) {
|
|
||||||
wlr_log(L_ERROR, "failed to create EGL image");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
GLES2_DEBUG_PUSH;
|
|
||||||
glActiveTexture(GL_TEXTURE0);
|
|
||||||
glBindTexture(target, tex->tex_id);
|
|
||||||
glEGLImageTargetTexture2DOES(target, tex->image);
|
|
||||||
GLES2_DEBUG_POP;
|
|
||||||
tex->wlr_texture.valid = true;
|
|
||||||
tex->pixel_format = pf;
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool gles2_texture_upload_eglimage(struct wlr_texture *wlr_texture,
|
|
||||||
EGLImageKHR image, uint32_t width, uint32_t height) {
|
|
||||||
struct wlr_gles2_texture *tex = gles2_get_texture(wlr_texture);
|
|
||||||
|
|
||||||
tex->image = image;
|
|
||||||
tex->pixel_format = &external_pixel_format;
|
|
||||||
tex->wlr_texture.valid = true;
|
|
||||||
tex->wlr_texture.width = width;
|
|
||||||
tex->wlr_texture.height = height;
|
|
||||||
|
|
||||||
GLES2_DEBUG_PUSH;
|
|
||||||
gles2_texture_ensure(tex, GL_TEXTURE_2D);
|
|
||||||
glActiveTexture(GL_TEXTURE0);
|
|
||||||
glBindTexture(GL_TEXTURE_EXTERNAL_OES, tex->tex_id);
|
|
||||||
glEGLImageTargetTexture2DOES(GL_TEXTURE_EXTERNAL_OES, tex->image);
|
|
||||||
GLES2_DEBUG_POP;
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool gles2_texture_upload_dmabuf(struct wlr_texture *wlr_texture,
|
|
||||||
struct wl_resource *dmabuf_resource) {
|
|
||||||
struct wlr_gles2_texture *tex = gles2_get_texture(wlr_texture);
|
|
||||||
struct wlr_dmabuf_buffer *dmabuf =
|
|
||||||
wlr_dmabuf_buffer_from_buffer_resource(dmabuf_resource);
|
|
||||||
|
|
||||||
if (!tex->egl->egl_exts.dmabuf_import) {
|
|
||||||
wlr_log(L_ERROR, "Want dmabuf but extension not present");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
tex->wlr_texture.width = dmabuf->attributes.width;
|
|
||||||
tex->wlr_texture.height = dmabuf->attributes.height;
|
|
||||||
|
|
||||||
if (tex->image) {
|
|
||||||
wlr_egl_destroy_image(tex->egl, tex->image);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (wlr_dmabuf_buffer_has_inverted_y(dmabuf)) {
|
|
||||||
wlr_texture->inverted_y = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
GLenum target = GL_TEXTURE_2D;
|
|
||||||
const struct gles2_pixel_format *pf =
|
|
||||||
gles2_format_from_wl(WL_SHM_FORMAT_ARGB8888);
|
|
||||||
GLES2_DEBUG_PUSH;
|
|
||||||
gles2_texture_ensure(tex, target);
|
|
||||||
glBindTexture(target, tex->tex_id);
|
|
||||||
tex->image = wlr_egl_create_image_from_dmabuf(tex->egl, &dmabuf->attributes);
|
|
||||||
glActiveTexture(GL_TEXTURE0);
|
|
||||||
glEGLImageTargetTexture2DOES(target, tex->image);
|
|
||||||
GLES2_DEBUG_POP;
|
|
||||||
tex->pixel_format = pf;
|
|
||||||
tex->wlr_texture.valid = true;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool gles2_texture_get_dmabuf_size(struct wlr_texture *texture, struct
|
|
||||||
wl_resource *resource, int *width, int *height) {
|
|
||||||
if (!wlr_dmabuf_resource_is_buffer(resource)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
struct wlr_dmabuf_buffer *dmabuf =
|
|
||||||
wlr_dmabuf_buffer_from_buffer_resource(resource);
|
|
||||||
*width = dmabuf->attributes.width;
|
|
||||||
*height = dmabuf->attributes.height;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void gles2_texture_get_buffer_size(struct wlr_texture *texture,
|
|
||||||
struct wl_resource *resource, int *width, int *height) {
|
|
||||||
struct wl_shm_buffer *buffer = wl_shm_buffer_get(resource);
|
|
||||||
if (!buffer) {
|
|
||||||
struct wlr_gles2_texture *tex = (struct wlr_gles2_texture *)texture;
|
|
||||||
if (!glEGLImageTargetTexture2DOES) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!wlr_egl_query_buffer(tex->egl, resource, EGL_WIDTH,
|
|
||||||
(EGLint*)width)) {
|
|
||||||
if (!gles2_texture_get_dmabuf_size(texture, resource, width,
|
|
||||||
height)) {
|
|
||||||
wlr_log(L_ERROR, "could not get size of the buffer");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
wlr_egl_query_buffer(tex->egl, resource, EGL_HEIGHT, (EGLint*)height);
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
*width = wl_shm_buffer_get_width(buffer);
|
|
||||||
*height = wl_shm_buffer_get_height(buffer);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void gles2_texture_destroy(struct wlr_texture *wlr_texture) {
|
static void gles2_texture_destroy(struct wlr_texture *wlr_texture) {
|
||||||
|
if (wlr_texture == NULL) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
struct wlr_gles2_texture *texture = gles2_get_texture(wlr_texture);
|
struct wlr_gles2_texture *texture = gles2_get_texture(wlr_texture);
|
||||||
|
|
||||||
wlr_signal_emit_safe(&texture->wlr_texture.destroy_signal,
|
wlr_egl_make_current(texture->renderer->egl, EGL_NO_SURFACE, NULL);
|
||||||
&texture->wlr_texture);
|
|
||||||
if (texture->tex_id) {
|
GLES2_DEBUG_PUSH;
|
||||||
GLES2_DEBUG_PUSH;
|
|
||||||
glDeleteTextures(1, &texture->tex_id);
|
if (texture->image_tex) {
|
||||||
GLES2_DEBUG_POP;
|
glDeleteTextures(1, &texture->image_tex);
|
||||||
|
}
|
||||||
|
if (texture->image) {
|
||||||
|
assert(eglDestroyImageKHR);
|
||||||
|
eglDestroyImageKHR(texture->renderer->egl->display, texture->image);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (texture->image) {
|
if (texture->type == WLR_GLES2_TEXTURE_GLTEX) {
|
||||||
wlr_egl_destroy_image(texture->egl, texture->image);
|
glDeleteTextures(1, &texture->gl_tex);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
GLES2_DEBUG_POP;
|
||||||
|
|
||||||
free(texture);
|
free(texture);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct wlr_texture_impl texture_impl = {
|
static const struct wlr_texture_impl texture_impl = {
|
||||||
.upload_pixels = gles2_texture_upload_pixels,
|
.get_size = gles2_texture_get_size,
|
||||||
.update_pixels = gles2_texture_update_pixels,
|
.write_pixels = gles2_texture_write_pixels,
|
||||||
.upload_shm = gles2_texture_upload_shm,
|
|
||||||
.update_shm = gles2_texture_update_shm,
|
|
||||||
.upload_drm = gles2_texture_upload_drm,
|
|
||||||
.upload_dmabuf = gles2_texture_upload_dmabuf,
|
|
||||||
.upload_eglimage = gles2_texture_upload_eglimage,
|
|
||||||
.get_buffer_size = gles2_texture_get_buffer_size,
|
|
||||||
.destroy = gles2_texture_destroy,
|
.destroy = gles2_texture_destroy,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct wlr_texture *gles2_texture_create(struct wlr_egl *egl) {
|
struct wlr_texture *gles2_texture_from_pixels(struct wlr_renderer *wlr_renderer,
|
||||||
struct wlr_gles2_texture *texture;
|
enum wl_shm_format wl_fmt, uint32_t stride, uint32_t width,
|
||||||
if (!(texture = calloc(1, sizeof(struct wlr_gles2_texture)))) {
|
uint32_t height, const void *data) {
|
||||||
|
struct wlr_gles2_renderer *renderer =
|
||||||
|
gles2_get_renderer_in_context(wlr_renderer);
|
||||||
|
|
||||||
|
const struct gles2_pixel_format *fmt = gles2_format_from_wl(wl_fmt);
|
||||||
|
if (fmt == NULL) {
|
||||||
|
wlr_log(L_ERROR, "Unsupported pixel format %"PRIu32, wl_fmt);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct wlr_gles2_texture *texture =
|
||||||
|
calloc(1, sizeof(struct wlr_gles2_texture));
|
||||||
|
if (texture == NULL) {
|
||||||
|
wlr_log(L_ERROR, "Allocation failed");
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
wlr_texture_init(&texture->wlr_texture, &texture_impl);
|
wlr_texture_init(&texture->wlr_texture, &texture_impl);
|
||||||
texture->egl = egl;
|
texture->renderer = renderer;
|
||||||
return &texture->wlr_texture;
|
texture->width = width;
|
||||||
|
texture->height = height;
|
||||||
|
texture->type = WLR_GLES2_TEXTURE_GLTEX;
|
||||||
|
texture->has_alpha = fmt->has_alpha;
|
||||||
|
|
||||||
|
GLES2_DEBUG_PUSH;
|
||||||
|
|
||||||
|
glGenTextures(1, &texture->gl_tex);
|
||||||
|
glBindTexture(GL_TEXTURE_2D, texture->gl_tex);
|
||||||
|
|
||||||
|
glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, stride / (fmt->bpp / 8));
|
||||||
|
glTexImage2D(GL_TEXTURE_2D, 0, fmt->gl_format, width, height, 0,
|
||||||
|
fmt->gl_format, fmt->gl_type, data);
|
||||||
|
glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, 0);
|
||||||
|
|
||||||
|
GLES2_DEBUG_POP;
|
||||||
|
return (struct wlr_texture *)texture;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct wlr_texture *gles2_texture_from_wl_drm(struct wlr_renderer *wlr_renderer,
|
||||||
|
struct wl_resource *data) {
|
||||||
|
struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer);
|
||||||
|
|
||||||
|
if (!eglQueryWaylandBufferWL || !eglCreateImageKHR ||
|
||||||
|
!glEGLImageTargetTexture2DOES) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
EGLint fmt;
|
||||||
|
if (!eglQueryWaylandBufferWL(renderer->egl->display, data,
|
||||||
|
EGL_TEXTURE_FORMAT, &fmt)) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
EGLint width, height;
|
||||||
|
eglQueryWaylandBufferWL(renderer->egl->display, data, EGL_WIDTH, &width);
|
||||||
|
eglQueryWaylandBufferWL(renderer->egl->display, data, EGL_HEIGHT, &height);
|
||||||
|
|
||||||
|
EGLint inverted_y;
|
||||||
|
if (!eglQueryWaylandBufferWL(renderer->egl->display, data,
|
||||||
|
EGL_WAYLAND_Y_INVERTED_WL, &inverted_y)) {
|
||||||
|
inverted_y = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct wlr_gles2_texture *texture =
|
||||||
|
calloc(1, sizeof(struct wlr_gles2_texture));
|
||||||
|
if (texture == NULL) {
|
||||||
|
wlr_log(L_ERROR, "Allocation failed");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
wlr_texture_init(&texture->wlr_texture, &texture_impl);
|
||||||
|
texture->renderer = renderer;
|
||||||
|
texture->width = width;
|
||||||
|
texture->height = height;
|
||||||
|
texture->wl_drm = data;
|
||||||
|
texture->inverted_y = !!inverted_y;
|
||||||
|
|
||||||
|
GLenum target;
|
||||||
|
switch (fmt) {
|
||||||
|
case EGL_TEXTURE_RGB:
|
||||||
|
case EGL_TEXTURE_RGBA:
|
||||||
|
target = GL_TEXTURE_2D;
|
||||||
|
texture->type = WLR_GLES2_TEXTURE_WL_DRM_GL;
|
||||||
|
texture->has_alpha = fmt == EGL_TEXTURE_RGBA;
|
||||||
|
break;
|
||||||
|
case EGL_TEXTURE_EXTERNAL_WL:
|
||||||
|
target = GL_TEXTURE_EXTERNAL_OES;
|
||||||
|
texture->type = WLR_GLES2_TEXTURE_WL_DRM_EXT;
|
||||||
|
texture->has_alpha = true;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
wlr_log(L_ERROR, "Invalid or unsupported EGL buffer format");
|
||||||
|
free(texture);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
EGLint attribs[] = {
|
||||||
|
EGL_WAYLAND_PLANE_WL, 0,
|
||||||
|
EGL_NONE,
|
||||||
|
};
|
||||||
|
texture->image = eglCreateImageKHR(renderer->egl->display,
|
||||||
|
renderer->egl->context, EGL_WAYLAND_BUFFER_WL, data, attribs);
|
||||||
|
if (texture->image == NULL) {
|
||||||
|
free(texture);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
GLES2_DEBUG_PUSH;
|
||||||
|
|
||||||
|
glGenTextures(1, &texture->image_tex);
|
||||||
|
glBindTexture(target, texture->image_tex);
|
||||||
|
glEGLImageTargetTexture2DOES(target, texture->image);
|
||||||
|
|
||||||
|
GLES2_DEBUG_POP;
|
||||||
|
return (struct wlr_texture *)texture;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct wlr_texture *gles2_texture_from_dmabuf(struct wlr_renderer *wlr_renderer,
|
||||||
|
struct wlr_dmabuf_buffer_attribs *attribs) {
|
||||||
|
struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer);
|
||||||
|
|
||||||
|
if (!glEGLImageTargetTexture2DOES) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!renderer->egl->egl_exts.dmabuf_import) {
|
||||||
|
wlr_log(L_ERROR, "Cannot create DMA-BUF texture: EGL extension "
|
||||||
|
"unavailable");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct wlr_gles2_texture *texture =
|
||||||
|
calloc(1, sizeof(struct wlr_gles2_texture));
|
||||||
|
if (texture == NULL) {
|
||||||
|
wlr_log(L_ERROR, "Allocation failed");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
wlr_texture_init(&texture->wlr_texture, &texture_impl);
|
||||||
|
texture->renderer = renderer;
|
||||||
|
texture->width = attribs->width;
|
||||||
|
texture->height = attribs->height;
|
||||||
|
texture->type = WLR_GLES2_TEXTURE_DMABUF;
|
||||||
|
texture->has_alpha = true;
|
||||||
|
texture->inverted_y =
|
||||||
|
(attribs->flags & WLR_DMABUF_BUFFER_ATTRIBS_FLAGS_Y_INVERT) != 0;
|
||||||
|
|
||||||
|
texture->image = wlr_egl_create_image_from_dmabuf(renderer->egl, attribs);
|
||||||
|
if (texture->image == NULL) {
|
||||||
|
free(texture);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
GLES2_DEBUG_PUSH;
|
||||||
|
|
||||||
|
glGenTextures(1, &texture->image_tex);
|
||||||
|
glBindTexture(GL_TEXTURE_EXTERNAL_OES, texture->image_tex);
|
||||||
|
glEGLImageTargetTexture2DOES(GL_TEXTURE_EXTERNAL_OES, texture->image);
|
||||||
|
|
||||||
|
GLES2_DEBUG_POP;
|
||||||
|
return (struct wlr_texture *)texture;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
#include <assert.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <wlr/render/interface.h>
|
#include <wlr/render/interface.h>
|
||||||
|
@ -6,6 +7,15 @@
|
||||||
|
|
||||||
void wlr_renderer_init(struct wlr_renderer *renderer,
|
void wlr_renderer_init(struct wlr_renderer *renderer,
|
||||||
const struct wlr_renderer_impl *impl) {
|
const struct wlr_renderer_impl *impl) {
|
||||||
|
assert(impl->begin);
|
||||||
|
assert(impl->clear);
|
||||||
|
assert(impl->scissor);
|
||||||
|
assert(impl->render_texture_with_matrix);
|
||||||
|
assert(impl->render_quad_with_matrix);
|
||||||
|
assert(impl->render_ellipse_with_matrix);
|
||||||
|
assert(impl->formats);
|
||||||
|
assert(impl->format_supported);
|
||||||
|
assert(impl->texture_from_pixels);
|
||||||
renderer->impl = impl;
|
renderer->impl = impl;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -22,7 +32,9 @@ void wlr_renderer_begin(struct wlr_renderer *r, int width, int height) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void wlr_renderer_end(struct wlr_renderer *r) {
|
void wlr_renderer_end(struct wlr_renderer *r) {
|
||||||
r->impl->end(r);
|
if (r->impl->end) {
|
||||||
|
r->impl->end(r);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void wlr_renderer_clear(struct wlr_renderer *r, const float color[static 4]) {
|
void wlr_renderer_clear(struct wlr_renderer *r, const float color[static 4]) {
|
||||||
|
@ -33,19 +45,16 @@ void wlr_renderer_scissor(struct wlr_renderer *r, struct wlr_box *box) {
|
||||||
r->impl->scissor(r, box);
|
r->impl->scissor(r, box);
|
||||||
}
|
}
|
||||||
|
|
||||||
struct wlr_texture *wlr_render_texture_create(struct wlr_renderer *r) {
|
|
||||||
return r->impl->texture_create(r);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool wlr_render_texture(struct wlr_renderer *r, struct wlr_texture *texture,
|
bool wlr_render_texture(struct wlr_renderer *r, struct wlr_texture *texture,
|
||||||
const float projection[static 9], int x, int y, float alpha) {
|
const float projection[static 9], int x, int y, float alpha) {
|
||||||
float mat[9];
|
struct wlr_box box = { .x = x, .y = y };
|
||||||
wlr_matrix_identity(mat);
|
wlr_texture_get_size(texture, &box.width, &box.height);
|
||||||
wlr_matrix_translate(mat, x, y);
|
|
||||||
wlr_matrix_scale(mat, texture->width, texture->height);
|
|
||||||
wlr_matrix_multiply(mat, projection, mat);
|
|
||||||
|
|
||||||
return wlr_render_texture_with_matrix(r, texture, mat, alpha);
|
float matrix[9];
|
||||||
|
wlr_matrix_project_box(matrix, &box, WL_OUTPUT_TRANSFORM_NORMAL, 0,
|
||||||
|
projection);
|
||||||
|
|
||||||
|
return wlr_render_texture_with_matrix(r, texture, matrix, alpha);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wlr_render_texture_with_matrix(struct wlr_renderer *r,
|
bool wlr_render_texture_with_matrix(struct wlr_renderer *r,
|
||||||
|
@ -54,14 +63,32 @@ bool wlr_render_texture_with_matrix(struct wlr_renderer *r,
|
||||||
return r->impl->render_texture_with_matrix(r, texture, matrix, alpha);
|
return r->impl->render_texture_with_matrix(r, texture, matrix, alpha);
|
||||||
}
|
}
|
||||||
|
|
||||||
void wlr_render_colored_quad(struct wlr_renderer *r,
|
void wlr_render_rect(struct wlr_renderer *r, const struct wlr_box *box,
|
||||||
const float color[static 4], const float matrix[static 9]) {
|
const float color[static 4], const float projection[static 9]) {
|
||||||
r->impl->render_quad(r, color, matrix);
|
float matrix[9];
|
||||||
|
wlr_matrix_project_box(matrix, box, WL_OUTPUT_TRANSFORM_NORMAL, 0,
|
||||||
|
projection);
|
||||||
|
|
||||||
|
wlr_render_quad_with_matrix(r, color, matrix);
|
||||||
}
|
}
|
||||||
|
|
||||||
void wlr_render_colored_ellipse(struct wlr_renderer *r,
|
void wlr_render_quad_with_matrix(struct wlr_renderer *r,
|
||||||
const float color[static 4], const float matrix[static 9]) {
|
const float color[static 4], const float matrix[static 9]) {
|
||||||
r->impl->render_ellipse(r, color, matrix);
|
r->impl->render_quad_with_matrix(r, color, matrix);
|
||||||
|
}
|
||||||
|
|
||||||
|
void wlr_render_ellipse(struct wlr_renderer *r, const struct wlr_box *box,
|
||||||
|
const float color[static 4], const float projection[static 9]) {
|
||||||
|
float matrix[9];
|
||||||
|
wlr_matrix_project_box(matrix, box, WL_OUTPUT_TRANSFORM_NORMAL, 0,
|
||||||
|
projection);
|
||||||
|
|
||||||
|
wlr_render_ellipse_with_matrix(r, color, matrix);
|
||||||
|
}
|
||||||
|
|
||||||
|
void wlr_render_ellipse_with_matrix(struct wlr_renderer *r,
|
||||||
|
const float color[static 4], const float matrix[static 9]) {
|
||||||
|
r->impl->render_ellipse_with_matrix(r, color, matrix);
|
||||||
}
|
}
|
||||||
|
|
||||||
const enum wl_shm_format *wlr_renderer_get_formats(
|
const enum wl_shm_format *wlr_renderer_get_formats(
|
||||||
|
@ -69,15 +96,29 @@ const enum wl_shm_format *wlr_renderer_get_formats(
|
||||||
return r->impl->formats(r, len);
|
return r->impl->formats(r, len);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wlr_renderer_buffer_is_drm(struct wlr_renderer *r,
|
bool wlr_renderer_resource_is_wl_drm_buffer(struct wlr_renderer *r,
|
||||||
struct wl_resource *buffer) {
|
struct wl_resource *resource) {
|
||||||
return r->impl->buffer_is_drm(r, buffer);
|
if (!r->impl->resource_is_wl_drm_buffer) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return r->impl->resource_is_wl_drm_buffer(r, resource);
|
||||||
|
}
|
||||||
|
|
||||||
|
void wlr_renderer_wl_drm_buffer_get_size(struct wlr_renderer *r,
|
||||||
|
struct wl_resource *buffer, int *width, int *height) {
|
||||||
|
if (!r->impl->wl_drm_buffer_get_size) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
return r->impl->wl_drm_buffer_get_size(r, buffer, width, height);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wlr_renderer_read_pixels(struct wlr_renderer *r, enum wl_shm_format fmt,
|
bool wlr_renderer_read_pixels(struct wlr_renderer *r, enum wl_shm_format fmt,
|
||||||
uint32_t stride, uint32_t width, uint32_t height,
|
uint32_t stride, uint32_t width, uint32_t height,
|
||||||
uint32_t src_x, uint32_t src_y, uint32_t dst_x, uint32_t dst_y,
|
uint32_t src_x, uint32_t src_y, uint32_t dst_x, uint32_t dst_y,
|
||||||
void *data) {
|
void *data) {
|
||||||
|
if (!r->impl->read_pixels) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
return r->impl->read_pixels(r, fmt, stride, width, height, src_x, src_y,
|
return r->impl->read_pixels(r, fmt, stride, width, height, src_x, src_y,
|
||||||
dst_x, dst_y, data);
|
dst_x, dst_y, data);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
#include <assert.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <wlr/render/interface.h>
|
#include <wlr/render/interface.h>
|
||||||
|
@ -5,8 +6,9 @@
|
||||||
|
|
||||||
void wlr_texture_init(struct wlr_texture *texture,
|
void wlr_texture_init(struct wlr_texture *texture,
|
||||||
const struct wlr_texture_impl *impl) {
|
const struct wlr_texture_impl *impl) {
|
||||||
|
assert(impl->get_size);
|
||||||
|
assert(impl->write_pixels);
|
||||||
texture->impl = impl;
|
texture->impl = impl;
|
||||||
wl_signal_init(&texture->destroy_signal);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void wlr_texture_destroy(struct wlr_texture *texture) {
|
void wlr_texture_destroy(struct wlr_texture *texture) {
|
||||||
|
@ -17,45 +19,38 @@ void wlr_texture_destroy(struct wlr_texture *texture) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wlr_texture_upload_pixels(struct wlr_texture *texture, uint32_t format,
|
struct wlr_texture *wlr_texture_from_pixels(struct wlr_renderer *renderer,
|
||||||
int stride, int width, int height, const unsigned char *pixels) {
|
enum wl_shm_format wl_fmt, uint32_t stride, uint32_t width,
|
||||||
return texture->impl->upload_pixels(texture, format, stride,
|
uint32_t height, const void *data) {
|
||||||
width, height, pixels);
|
return renderer->impl->texture_from_pixels(renderer, wl_fmt, stride, width,
|
||||||
|
height, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wlr_texture_update_pixels(struct wlr_texture *texture,
|
struct wlr_texture *wlr_texture_from_wl_drm(struct wlr_renderer *renderer,
|
||||||
enum wl_shm_format format, int stride, int x, int y,
|
struct wl_resource *data) {
|
||||||
int width, int height, const unsigned char *pixels) {
|
if (!renderer->impl->texture_from_wl_drm) {
|
||||||
return texture->impl->update_pixels(texture, format, stride, x, y,
|
return NULL;
|
||||||
width, height, pixels);
|
}
|
||||||
|
return renderer->impl->texture_from_wl_drm(renderer, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wlr_texture_upload_shm(struct wlr_texture *texture, uint32_t format,
|
struct wlr_texture *wlr_texture_from_dmabuf(struct wlr_renderer *renderer,
|
||||||
struct wl_shm_buffer *shm) {
|
struct wlr_dmabuf_buffer_attribs *attribs) {
|
||||||
return texture->impl->upload_shm(texture, format, shm);
|
if (!renderer->impl->texture_from_dmabuf) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
return renderer->impl->texture_from_dmabuf(renderer, attribs);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wlr_texture_update_shm(struct wlr_texture *texture, uint32_t format,
|
void wlr_texture_get_size(struct wlr_texture *texture, int *width,
|
||||||
int x, int y, int width, int height, struct wl_shm_buffer *shm) {
|
int *height) {
|
||||||
return texture->impl->update_shm(texture, format, x, y, width, height, shm);
|
return texture->impl->get_size(texture, width, height);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wlr_texture_upload_drm(struct wlr_texture *texture,
|
bool wlr_texture_write_pixels(struct wlr_texture *texture,
|
||||||
struct wl_resource *drm_buffer) {
|
enum wl_shm_format wl_fmt, uint32_t stride, uint32_t width,
|
||||||
return texture->impl->upload_drm(texture, drm_buffer);
|
uint32_t height, uint32_t src_x, uint32_t src_y, uint32_t dst_x,
|
||||||
}
|
uint32_t dst_y, const void *data) {
|
||||||
|
return texture->impl->write_pixels(texture, wl_fmt, stride, width, height,
|
||||||
bool wlr_texture_upload_eglimage(struct wlr_texture *texture,
|
src_x, src_y, dst_x, dst_y, data);
|
||||||
EGLImageKHR image, uint32_t width, uint32_t height) {
|
|
||||||
return texture->impl->upload_eglimage(texture, image, width, height);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool wlr_texture_upload_dmabuf(struct wlr_texture *texture,
|
|
||||||
struct wl_resource *dmabuf_resource) {
|
|
||||||
return texture->impl->upload_dmabuf(texture, dmabuf_resource);
|
|
||||||
}
|
|
||||||
|
|
||||||
void wlr_texture_get_buffer_size(struct wlr_texture *texture, struct wl_resource
|
|
||||||
*resource, int *width, int *height) {
|
|
||||||
texture->impl->get_buffer_size(texture, resource, width, height);
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,7 +25,9 @@ static void usage(const char *name, int ret) {
|
||||||
" (default: rootston.ini).\n"
|
" (default: rootston.ini).\n"
|
||||||
" See `rootston.ini.example` for config\n"
|
" See `rootston.ini.example` for config\n"
|
||||||
" file documentation.\n"
|
" file documentation.\n"
|
||||||
" -E <COMMAND> Command that will be ran at startup.\n" , name);
|
" -E <COMMAND> Command that will be ran at startup.\n"
|
||||||
|
" -D Enable damage tracking debugging.\n",
|
||||||
|
name);
|
||||||
|
|
||||||
exit(ret);
|
exit(ret);
|
||||||
}
|
}
|
||||||
|
@ -394,7 +396,7 @@ struct roots_config *roots_config_create_from_args(int argc, char *argv[]) {
|
||||||
wl_list_init(&config->bindings);
|
wl_list_init(&config->bindings);
|
||||||
|
|
||||||
int c;
|
int c;
|
||||||
while ((c = getopt(argc, argv, "C:E:h")) != -1) {
|
while ((c = getopt(argc, argv, "C:E:hD")) != -1) {
|
||||||
switch (c) {
|
switch (c) {
|
||||||
case 'C':
|
case 'C':
|
||||||
config->config_path = strdup(optarg);
|
config->config_path = strdup(optarg);
|
||||||
|
@ -402,6 +404,9 @@ struct roots_config *roots_config_create_from_args(int argc, char *argv[]) {
|
||||||
case 'E':
|
case 'E':
|
||||||
config->startup_cmd = strdup(optarg);
|
config->startup_cmd = strdup(optarg);
|
||||||
break;
|
break;
|
||||||
|
case 'D':
|
||||||
|
config->debug_damage_tracking = true;
|
||||||
|
break;
|
||||||
case 'h':
|
case 'h':
|
||||||
case '?':
|
case '?':
|
||||||
usage(argv[0], c != 'h');
|
usage(argv[0], c != 'h');
|
||||||
|
|
|
@ -9,9 +9,10 @@
|
||||||
#include <wlr/types/wlr_cursor.h>
|
#include <wlr/types/wlr_cursor.h>
|
||||||
#include <wlr/types/wlr_gamma_control.h>
|
#include <wlr/types/wlr_gamma_control.h>
|
||||||
#include <wlr/types/wlr_idle.h>
|
#include <wlr/types/wlr_idle.h>
|
||||||
|
#include <wlr/types/wlr_idle_inhibit_v1.h>
|
||||||
|
#include <wlr/types/wlr_layer_shell.h>
|
||||||
#include <wlr/types/wlr_linux_dmabuf.h>
|
#include <wlr/types/wlr_linux_dmabuf.h>
|
||||||
#include <wlr/types/wlr_output_layout.h>
|
#include <wlr/types/wlr_output_layout.h>
|
||||||
#include <wlr/types/wlr_idle_inhibit_v1.h>
|
|
||||||
#include <wlr/types/wlr_primary_selection.h>
|
#include <wlr/types/wlr_primary_selection.h>
|
||||||
#include <wlr/types/wlr_server_decoration.h>
|
#include <wlr/types/wlr_server_decoration.h>
|
||||||
#include <wlr/types/wlr_wl_shell.h>
|
#include <wlr/types/wlr_wl_shell.h>
|
||||||
|
@ -187,6 +188,25 @@ static struct wlr_output *view_get_output(struct roots_view *view) {
|
||||||
output_y);
|
output_y);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void view_arrange_maximized(struct roots_view *view) {
|
||||||
|
struct wlr_box view_box;
|
||||||
|
view_get_box(view, &view_box);
|
||||||
|
|
||||||
|
struct wlr_output *output = view_get_output(view);
|
||||||
|
struct roots_output *roots_output = output->data;
|
||||||
|
struct wlr_box *output_box =
|
||||||
|
wlr_output_layout_get_box(view->desktop->layout, output);
|
||||||
|
struct wlr_box usable_area;
|
||||||
|
memcpy(&usable_area, &roots_output->usable_area,
|
||||||
|
sizeof(struct wlr_box));
|
||||||
|
usable_area.x += output_box->x;
|
||||||
|
usable_area.y += output_box->y;
|
||||||
|
|
||||||
|
view_move_resize(view, usable_area.x, usable_area.y,
|
||||||
|
usable_area.width, usable_area.height);
|
||||||
|
view_rotate(view, 0);
|
||||||
|
}
|
||||||
|
|
||||||
void view_maximize(struct roots_view *view, bool maximized) {
|
void view_maximize(struct roots_view *view, bool maximized) {
|
||||||
if (view->maximized == maximized) {
|
if (view->maximized == maximized) {
|
||||||
return;
|
return;
|
||||||
|
@ -197,23 +217,14 @@ void view_maximize(struct roots_view *view, bool maximized) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!view->maximized && maximized) {
|
if (!view->maximized && maximized) {
|
||||||
struct wlr_box view_box;
|
|
||||||
view_get_box(view, &view_box);
|
|
||||||
|
|
||||||
view->maximized = true;
|
view->maximized = true;
|
||||||
view->saved.x = view->x;
|
view->saved.x = view->x;
|
||||||
view->saved.y = view->y;
|
view->saved.y = view->y;
|
||||||
view->saved.rotation = view->rotation;
|
view->saved.rotation = view->rotation;
|
||||||
view->saved.width = view_box.width;
|
view->saved.width = view->width;
|
||||||
view->saved.height = view_box.height;
|
view->saved.height = view->height;
|
||||||
|
|
||||||
struct wlr_output *output = view_get_output(view);
|
view_arrange_maximized(view);
|
||||||
struct wlr_box *output_box =
|
|
||||||
wlr_output_layout_get_box(view->desktop->layout, output);
|
|
||||||
|
|
||||||
view_move_resize(view, output_box->x, output_box->y, output_box->width,
|
|
||||||
output_box->height);
|
|
||||||
view_rotate(view, 0);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (view->maximized && !maximized) {
|
if (view->maximized && !maximized) {
|
||||||
|
@ -714,6 +725,11 @@ struct roots_desktop *desktop_create(struct roots_server *server,
|
||||||
&desktop->wl_shell_surface);
|
&desktop->wl_shell_surface);
|
||||||
desktop->wl_shell_surface.notify = handle_wl_shell_surface;
|
desktop->wl_shell_surface.notify = handle_wl_shell_surface;
|
||||||
|
|
||||||
|
desktop->layer_shell = wlr_layer_shell_create(server->wl_display);
|
||||||
|
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
|
#ifdef WLR_HAS_XWAYLAND
|
||||||
const char *cursor_theme = NULL;
|
const char *cursor_theme = NULL;
|
||||||
const char *cursor_default = ROOTS_XCURSOR_DEFAULT;
|
const char *cursor_default = ROOTS_XCURSOR_DEFAULT;
|
||||||
|
|
|
@ -2,10 +2,13 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <wayland-server.h>
|
#include <wayland-server.h>
|
||||||
#include <wlr/backend/libinput.h>
|
#include <wlr/backend/libinput.h>
|
||||||
|
#include <wlr/config.h>
|
||||||
#include <wlr/types/wlr_cursor.h>
|
#include <wlr/types/wlr_cursor.h>
|
||||||
#include <wlr/util/log.h>
|
#include <wlr/util/log.h>
|
||||||
#include <wlr/xcursor.h>
|
#include <wlr/xcursor.h>
|
||||||
|
#ifdef WLR_HAS_XWAYLAND
|
||||||
#include <wlr/xwayland.h>
|
#include <wlr/xwayland.h>
|
||||||
|
#endif
|
||||||
#include "rootston/config.h"
|
#include "rootston/config.h"
|
||||||
#include "rootston/input.h"
|
#include "rootston/input.h"
|
||||||
#include "rootston/keyboard.h"
|
#include "rootston/keyboard.h"
|
||||||
|
|
|
@ -0,0 +1,339 @@
|
||||||
|
#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/output.h"
|
||||||
|
#include "rootston/server.h"
|
||||||
|
|
||||||
|
static void apply_exclusive(struct wlr_box *usable_area,
|
||||||
|
uint32_t anchor, int32_t exclusive,
|
||||||
|
int32_t margin_top, int32_t margin_right,
|
||||||
|
int32_t margin_bottom, int32_t margin_left) {
|
||||||
|
if (exclusive <= 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
struct {
|
||||||
|
uint32_t anchors;
|
||||||
|
int *positive_axis;
|
||||||
|
int *negative_axis;
|
||||||
|
int margin;
|
||||||
|
} edges[] = {
|
||||||
|
{
|
||||||
|
.anchors =
|
||||||
|
ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
|
||||||
|
ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT |
|
||||||
|
ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP,
|
||||||
|
.positive_axis = &usable_area->y,
|
||||||
|
.negative_axis = &usable_area->height,
|
||||||
|
.margin = margin_top,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.anchors =
|
||||||
|
ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
|
||||||
|
ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT |
|
||||||
|
ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM,
|
||||||
|
.positive_axis = NULL,
|
||||||
|
.negative_axis = &usable_area->height,
|
||||||
|
.margin = margin_bottom,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.anchors =
|
||||||
|
ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
|
||||||
|
ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP |
|
||||||
|
ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM,
|
||||||
|
.positive_axis = &usable_area->x,
|
||||||
|
.negative_axis = &usable_area->width,
|
||||||
|
.margin = margin_left,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.anchors =
|
||||||
|
ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT |
|
||||||
|
ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP |
|
||||||
|
ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM,
|
||||||
|
.positive_axis = NULL,
|
||||||
|
.negative_axis = &usable_area->width,
|
||||||
|
.margin = margin_right,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
for (size_t i = 0; i < sizeof(edges) / sizeof(edges[0]); ++i) {
|
||||||
|
if ((anchor & edges[i].anchors) == edges[i].anchors) {
|
||||||
|
if (edges[i].positive_axis) {
|
||||||
|
*edges[i].positive_axis += exclusive + edges[i].margin;
|
||||||
|
}
|
||||||
|
if (edges[i].negative_axis) {
|
||||||
|
*edges[i].negative_axis -= exclusive + edges[i].margin;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void arrange_layer(struct wlr_output *output, struct wl_list *list,
|
||||||
|
struct wlr_box *usable_area, bool exclusive) {
|
||||||
|
struct roots_layer_surface *roots_surface;
|
||||||
|
struct wlr_box full_area = { 0 };
|
||||||
|
wlr_output_effective_resolution(output,
|
||||||
|
&full_area.width, &full_area.height);
|
||||||
|
wl_list_for_each(roots_surface, list, link) {
|
||||||
|
struct wlr_layer_surface *layer = roots_surface->layer_surface;
|
||||||
|
struct wlr_layer_surface_state *state = &layer->current;
|
||||||
|
if (exclusive != (state->exclusive_zone >0)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
struct wlr_box bounds;
|
||||||
|
if (state->exclusive_zone == -1) {
|
||||||
|
bounds = full_area;
|
||||||
|
} else {
|
||||||
|
bounds = *usable_area;
|
||||||
|
}
|
||||||
|
struct wlr_box box = {
|
||||||
|
.width = state->desired_width,
|
||||||
|
.height = state->desired_height
|
||||||
|
};
|
||||||
|
// Horizontal axis
|
||||||
|
const uint32_t both_horiz = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT
|
||||||
|
| ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
|
||||||
|
if ((state->anchor & both_horiz) && box.width == 0) {
|
||||||
|
box.x = bounds.x;
|
||||||
|
box.width = bounds.width;
|
||||||
|
} else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT)) {
|
||||||
|
box.x = bounds.x;
|
||||||
|
} else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT)) {
|
||||||
|
box.x = bounds.x + (bounds.width - box.width);
|
||||||
|
} else {
|
||||||
|
box.x = bounds.x + ((bounds.width / 2) - (box.width / 2));
|
||||||
|
}
|
||||||
|
// Vertical axis
|
||||||
|
const uint32_t both_vert = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP
|
||||||
|
| ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
|
||||||
|
if ((state->anchor & both_vert) && box.height == 0) {
|
||||||
|
box.y = bounds.y;
|
||||||
|
box.height = bounds.height;
|
||||||
|
} else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP)) {
|
||||||
|
box.y = bounds.y;
|
||||||
|
} else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM)) {
|
||||||
|
box.y = bounds.y + (bounds.height - box.height);
|
||||||
|
} else {
|
||||||
|
box.y = bounds.y + ((bounds.height / 2) - (box.height / 2));
|
||||||
|
}
|
||||||
|
// Margin
|
||||||
|
if ((state->anchor & both_horiz) == both_horiz) {
|
||||||
|
box.x += state->margin.left;
|
||||||
|
box.width -= state->margin.left + state->margin.right;
|
||||||
|
} else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT)) {
|
||||||
|
box.x += state->margin.left;
|
||||||
|
} else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT)) {
|
||||||
|
box.x -= state->margin.right;
|
||||||
|
}
|
||||||
|
if ((state->anchor & both_vert) == both_vert) {
|
||||||
|
box.y += state->margin.top;
|
||||||
|
box.height -= state->margin.top + state->margin.bottom;
|
||||||
|
} else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP)) {
|
||||||
|
box.y += state->margin.top;
|
||||||
|
} else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM)) {
|
||||||
|
box.y -= state->margin.bottom;
|
||||||
|
}
|
||||||
|
if (box.width < 0 || box.height < 0) {
|
||||||
|
// TODO: Bubble up a protocol error?
|
||||||
|
wlr_layer_surface_close(layer);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
// Apply
|
||||||
|
roots_surface->geo = box;
|
||||||
|
apply_exclusive(usable_area, state->anchor, state->exclusive_zone,
|
||||||
|
state->margin.top, state->margin.right,
|
||||||
|
state->margin.bottom, state->margin.left);
|
||||||
|
wlr_layer_surface_configure(layer, box.width, box.height);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void arrange_layers(struct wlr_output *_output) {
|
||||||
|
struct roots_output *output = _output->data;
|
||||||
|
|
||||||
|
struct wlr_box usable_area = { 0 };
|
||||||
|
wlr_output_effective_resolution(output->wlr_output,
|
||||||
|
&usable_area.width, &usable_area.height);
|
||||||
|
|
||||||
|
// Arrange exclusive surfaces from top->bottom
|
||||||
|
arrange_layer(output->wlr_output,
|
||||||
|
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY],
|
||||||
|
&usable_area, true);
|
||||||
|
arrange_layer(output->wlr_output,
|
||||||
|
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP],
|
||||||
|
&usable_area, true);
|
||||||
|
arrange_layer(output->wlr_output,
|
||||||
|
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM],
|
||||||
|
&usable_area, true);
|
||||||
|
arrange_layer(output->wlr_output,
|
||||||
|
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND],
|
||||||
|
&usable_area, true);
|
||||||
|
memcpy(&output->usable_area, &usable_area, sizeof(struct wlr_box));
|
||||||
|
|
||||||
|
struct roots_view *view;
|
||||||
|
wl_list_for_each(view, &output->desktop->views, link) {
|
||||||
|
if (view->maximized) {
|
||||||
|
view_arrange_maximized(view);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Arrange non-exlusive surfaces from top->bottom
|
||||||
|
usable_area.x = usable_area.y = 0;
|
||||||
|
wlr_output_effective_resolution(output->wlr_output,
|
||||||
|
&usable_area.width, &usable_area.height);
|
||||||
|
arrange_layer(output->wlr_output,
|
||||||
|
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY],
|
||||||
|
&usable_area, false);
|
||||||
|
arrange_layer(output->wlr_output,
|
||||||
|
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP],
|
||||||
|
&usable_area, false);
|
||||||
|
arrange_layer(output->wlr_output,
|
||||||
|
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM],
|
||||||
|
&usable_area, false);
|
||||||
|
arrange_layer(output->wlr_output,
|
||||||
|
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND],
|
||||||
|
&usable_area, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void handle_output_destroy(struct wl_listener *listener, void *data) {
|
||||||
|
struct roots_layer_surface *layer =
|
||||||
|
wl_container_of(listener, layer, output_destroy);
|
||||||
|
layer->layer_surface->output = NULL;
|
||||||
|
wl_list_remove(&layer->output_destroy.link);
|
||||||
|
wl_list_remove(&layer->output_mode.link);
|
||||||
|
wlr_layer_surface_close(layer->layer_surface);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void handle_output_mode(struct wl_listener *listener, void *data) {
|
||||||
|
arrange_layers((struct wlr_output *)data);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void handle_output_transform(struct wl_listener *listener, void *data) {
|
||||||
|
arrange_layers((struct wlr_output *)data);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void handle_surface_commit(struct wl_listener *listener, void *data) {
|
||||||
|
struct roots_layer_surface *layer =
|
||||||
|
wl_container_of(listener, layer, surface_commit);
|
||||||
|
struct wlr_layer_surface *layer_surface = layer->layer_surface;
|
||||||
|
struct wlr_output *wlr_output = layer_surface->output;
|
||||||
|
if (wlr_output != NULL) {
|
||||||
|
struct roots_output *output = wlr_output->data;
|
||||||
|
struct wlr_box old_geo = layer->geo;
|
||||||
|
arrange_layers(wlr_output);
|
||||||
|
if (memcmp(&old_geo, &layer->geo, sizeof(struct wlr_box)) != 0) {
|
||||||
|
output_damage_whole_local_surface(output, layer_surface->surface,
|
||||||
|
old_geo.x, old_geo.y, 0);
|
||||||
|
output_damage_whole_local_surface(output, layer_surface->surface,
|
||||||
|
layer->geo.x, layer->geo.y, 0);
|
||||||
|
} else {
|
||||||
|
output_damage_from_local_surface(output, layer_surface->surface,
|
||||||
|
layer->geo.x, layer->geo.y, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void unmap(struct wlr_layer_surface *layer_surface) {
|
||||||
|
struct roots_layer_surface *layer = layer_surface->data;
|
||||||
|
struct wlr_output *wlr_output = layer_surface->output;
|
||||||
|
if (wlr_output != NULL) {
|
||||||
|
struct roots_output *output = wlr_output->data;
|
||||||
|
wlr_output_damage_add_box(output->damage, &layer->geo);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void handle_destroy(struct wl_listener *listener, void *data) {
|
||||||
|
struct roots_layer_surface *layer = wl_container_of(
|
||||||
|
listener, layer, destroy);
|
||||||
|
if (layer->layer_surface->mapped) {
|
||||||
|
unmap(layer->layer_surface);
|
||||||
|
}
|
||||||
|
wl_list_remove(&layer->link);
|
||||||
|
wl_list_remove(&layer->destroy.link);
|
||||||
|
wl_list_remove(&layer->map.link);
|
||||||
|
wl_list_remove(&layer->unmap.link);
|
||||||
|
wl_list_remove(&layer->surface_commit.link);
|
||||||
|
wl_list_remove(&layer->output_destroy.link);
|
||||||
|
wl_list_remove(&layer->output_mode.link);
|
||||||
|
wl_list_remove(&layer->output_transform.link);
|
||||||
|
arrange_layers(layer->layer_surface->output);
|
||||||
|
free(layer);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void handle_map(struct wl_listener *listener, void *data) {
|
||||||
|
struct wlr_layer_surface *layer_surface = data;
|
||||||
|
struct roots_layer_surface *layer = layer_surface->data;
|
||||||
|
struct wlr_output *wlr_output = layer_surface->output;
|
||||||
|
struct roots_output *output = wlr_output->data;
|
||||||
|
wlr_output_damage_add_box(output->damage, &layer->geo);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void handle_unmap(struct wl_listener *listener, void *data) {
|
||||||
|
struct roots_layer_surface *layer = wl_container_of(
|
||||||
|
listener, layer, unmap);
|
||||||
|
unmap(layer->layer_surface);
|
||||||
|
}
|
||||||
|
|
||||||
|
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 anchor %d "
|
||||||
|
"size %dx%d margin %d,%d,%d,%d",
|
||||||
|
layer_surface->namespace, layer_surface->layer, layer_surface->layer,
|
||||||
|
layer_surface->client_pending.desired_width,
|
||||||
|
layer_surface->client_pending.desired_height,
|
||||||
|
layer_surface->client_pending.margin.top,
|
||||||
|
layer_surface->client_pending.margin.right,
|
||||||
|
layer_surface->client_pending.margin.bottom,
|
||||||
|
layer_surface->client_pending.margin.left);
|
||||||
|
|
||||||
|
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->output_destroy.notify = handle_output_destroy;
|
||||||
|
wl_signal_add(&layer_surface->output->events.destroy,
|
||||||
|
&roots_surface->output_destroy);
|
||||||
|
|
||||||
|
roots_surface->output_mode.notify = handle_output_mode;
|
||||||
|
wl_signal_add(&layer_surface->output->events.mode,
|
||||||
|
&roots_surface->output_mode);
|
||||||
|
|
||||||
|
roots_surface->output_transform.notify = handle_output_transform;
|
||||||
|
wl_signal_add(&layer_surface->output->events.transform,
|
||||||
|
&roots_surface->output_transform);
|
||||||
|
|
||||||
|
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);
|
||||||
|
// TODO: Listen for subsurfaces
|
||||||
|
|
||||||
|
roots_surface->layer_surface = layer_surface;
|
||||||
|
layer_surface->data = roots_surface;
|
||||||
|
|
||||||
|
struct roots_output *output = layer_surface->output->data;
|
||||||
|
wl_list_insert(&output->layers[layer_surface->layer], &roots_surface->link);
|
||||||
|
|
||||||
|
// Temporarily set the layer's current state to client_pending
|
||||||
|
// So that we can easily arrange it
|
||||||
|
struct wlr_layer_surface_state old_state = layer_surface->current;
|
||||||
|
layer_surface->current = layer_surface->client_pending;
|
||||||
|
|
||||||
|
arrange_layers(output->wlr_output);
|
||||||
|
|
||||||
|
layer_surface->current = old_state;
|
||||||
|
}
|
|
@ -5,6 +5,7 @@ sources = [
|
||||||
'ini.c',
|
'ini.c',
|
||||||
'input.c',
|
'input.c',
|
||||||
'keyboard.c',
|
'keyboard.c',
|
||||||
|
'layer_shell.c',
|
||||||
'main.c',
|
'main.c',
|
||||||
'output.c',
|
'output.c',
|
||||||
'seat.c',
|
'seat.c',
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
#include <wlr/config.h>
|
||||||
#include <wlr/types/wlr_matrix.h>
|
#include <wlr/types/wlr_matrix.h>
|
||||||
#include <wlr/types/wlr_compositor.h>
|
#include <wlr/types/wlr_compositor.h>
|
||||||
#include <wlr/types/wlr_output_layout.h>
|
#include <wlr/types/wlr_output_layout.h>
|
||||||
|
@ -12,6 +13,7 @@
|
||||||
#include <wlr/util/log.h>
|
#include <wlr/util/log.h>
|
||||||
#include <wlr/util/region.h>
|
#include <wlr/util/region.h>
|
||||||
#include "rootston/config.h"
|
#include "rootston/config.h"
|
||||||
|
#include "rootston/layers.h"
|
||||||
#include "rootston/output.h"
|
#include "rootston/output.h"
|
||||||
#include "rootston/server.h"
|
#include "rootston/server.h"
|
||||||
|
|
||||||
|
@ -363,7 +365,7 @@ static void render_decorations(struct roots_view *view,
|
||||||
pixman_region32_rectangles(&damage, &nrects);
|
pixman_region32_rectangles(&damage, &nrects);
|
||||||
for (int i = 0; i < nrects; ++i) {
|
for (int i = 0; i < nrects; ++i) {
|
||||||
scissor_output(output, &rects[i]);
|
scissor_output(output, &rects[i]);
|
||||||
wlr_render_colored_quad(renderer, color, matrix);
|
wlr_render_quad_with_matrix(renderer, color, matrix);
|
||||||
}
|
}
|
||||||
|
|
||||||
damage_finish:
|
damage_finish:
|
||||||
|
@ -416,6 +418,33 @@ static void surface_send_frame_done(struct wlr_surface *surface, double lx,
|
||||||
wlr_surface_send_frame_done(surface, when);
|
wlr_surface_send_frame_done(surface, when);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void render_layer(
|
||||||
|
struct roots_output *output,
|
||||||
|
const struct wlr_box *output_layout_box,
|
||||||
|
struct render_data *data,
|
||||||
|
struct wl_list *layer) {
|
||||||
|
struct roots_layer_surface *roots_surface;
|
||||||
|
wl_list_for_each(roots_surface, layer, link) {
|
||||||
|
struct wlr_layer_surface *layer = roots_surface->layer_surface;
|
||||||
|
render_surface(layer->surface,
|
||||||
|
roots_surface->geo.x + output_layout_box->x,
|
||||||
|
roots_surface->geo.y + output_layout_box->y,
|
||||||
|
0, data);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void layers_send_done(
|
||||||
|
struct roots_output *output, struct timespec *when) {
|
||||||
|
size_t len = sizeof(output->layers) / sizeof(output->layers[0]);
|
||||||
|
for (size_t i = 0; i < len; ++i) {
|
||||||
|
struct roots_layer_surface *roots_surface;
|
||||||
|
wl_list_for_each(roots_surface, &output->layers[i], link) {
|
||||||
|
struct wlr_layer_surface *layer = roots_surface->layer_surface;
|
||||||
|
wlr_surface_send_frame_done(layer->surface, when);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static void render_output(struct roots_output *output) {
|
static void render_output(struct roots_output *output) {
|
||||||
struct wlr_output *wlr_output = output->wlr_output;
|
struct wlr_output *wlr_output = output->wlr_output;
|
||||||
struct roots_desktop *desktop = output->desktop;
|
struct roots_desktop *desktop = output->desktop;
|
||||||
|
@ -432,14 +461,15 @@ static void render_output(struct roots_output *output) {
|
||||||
|
|
||||||
float clear_color[] = {0.25f, 0.25f, 0.25f, 1.0f};
|
float clear_color[] = {0.25f, 0.25f, 0.25f, 1.0f};
|
||||||
|
|
||||||
|
const struct wlr_box *output_box =
|
||||||
|
wlr_output_layout_get_box(desktop->layout, wlr_output);
|
||||||
|
|
||||||
// Check if we can delegate the fullscreen surface to the output
|
// Check if we can delegate the fullscreen surface to the output
|
||||||
if (output->fullscreen_view != NULL &&
|
if (output->fullscreen_view != NULL &&
|
||||||
output->fullscreen_view->wlr_surface != NULL) {
|
output->fullscreen_view->wlr_surface != NULL) {
|
||||||
struct roots_view *view = output->fullscreen_view;
|
struct roots_view *view = output->fullscreen_view;
|
||||||
|
|
||||||
// Make sure the view is centered on screen
|
// Make sure the view is centered on screen
|
||||||
const struct wlr_box *output_box =
|
|
||||||
wlr_output_layout_get_box(desktop->layout, wlr_output);
|
|
||||||
struct wlr_box view_box;
|
struct wlr_box view_box;
|
||||||
view_get_box(view, &view_box);
|
view_get_box(view, &view_box);
|
||||||
double view_x = (double)(output_box->width - view_box.width) / 2 +
|
double view_x = (double)(output_box->width - view_box.width) / 2 +
|
||||||
|
@ -486,6 +516,10 @@ static void render_output(struct roots_output *output) {
|
||||||
goto renderer_end;
|
goto renderer_end;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (server->config->debug_damage_tracking) {
|
||||||
|
wlr_renderer_clear(renderer, (float[]){1, 1, 0, 0});
|
||||||
|
}
|
||||||
|
|
||||||
int nrects;
|
int nrects;
|
||||||
pixman_box32_t *rects = pixman_region32_rectangles(&damage, &nrects);
|
pixman_box32_t *rects = pixman_region32_rectangles(&damage, &nrects);
|
||||||
for (int i = 0; i < nrects; ++i) {
|
for (int i = 0; i < nrects; ++i) {
|
||||||
|
@ -493,6 +527,11 @@ static void render_output(struct roots_output *output) {
|
||||||
wlr_renderer_clear(renderer, clear_color);
|
wlr_renderer_clear(renderer, clear_color);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
render_layer(output, output_box, &data,
|
||||||
|
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND]);
|
||||||
|
render_layer(output, output_box, &data,
|
||||||
|
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM]);
|
||||||
|
|
||||||
// If a view is fullscreen on this output, render it
|
// If a view is fullscreen on this output, render it
|
||||||
if (output->fullscreen_view != NULL) {
|
if (output->fullscreen_view != NULL) {
|
||||||
struct roots_view *view = output->fullscreen_view;
|
struct roots_view *view = output->fullscreen_view;
|
||||||
|
@ -515,20 +554,24 @@ static void render_output(struct roots_output *output) {
|
||||||
render_surface, &data);
|
render_surface, &data);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
} else {
|
||||||
goto renderer_end;
|
// Render all views
|
||||||
}
|
struct roots_view *view;
|
||||||
|
wl_list_for_each_reverse(view, &desktop->views, link) {
|
||||||
// Render all views
|
render_view(view, &data);
|
||||||
struct roots_view *view;
|
}
|
||||||
wl_list_for_each_reverse(view, &desktop->views, link) {
|
// Render top layer above shell views
|
||||||
render_view(view, &data);
|
render_layer(output, output_box, &data,
|
||||||
|
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP]);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Render drag icons
|
// Render drag icons
|
||||||
data.alpha = 1.0;
|
data.alpha = 1.0;
|
||||||
drag_icons_for_each_surface(server->input, render_surface, &data);
|
drag_icons_for_each_surface(server->input, render_surface, &data);
|
||||||
|
|
||||||
|
render_layer(output, output_box, &data,
|
||||||
|
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY]);
|
||||||
|
|
||||||
renderer_end:
|
renderer_end:
|
||||||
wlr_renderer_scissor(renderer, NULL);
|
wlr_renderer_scissor(renderer, NULL);
|
||||||
wlr_renderer_end(renderer);
|
wlr_renderer_end(renderer);
|
||||||
|
@ -565,6 +608,7 @@ damage_finish:
|
||||||
drag_icons_for_each_surface(server->input, surface_send_frame_done,
|
drag_icons_for_each_surface(server->input, surface_send_frame_done,
|
||||||
&data);
|
&data);
|
||||||
}
|
}
|
||||||
|
layers_send_done(output, data.when);
|
||||||
}
|
}
|
||||||
|
|
||||||
void output_damage_whole(struct roots_output *output) {
|
void output_damage_whole(struct roots_output *output) {
|
||||||
|
@ -621,6 +665,15 @@ static void damage_whole_surface(struct wlr_surface *surface,
|
||||||
wlr_output_damage_add_box(output->damage, &box);
|
wlr_output_damage_add_box(output->damage, &box);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void output_damage_whole_local_surface(struct roots_output *output,
|
||||||
|
struct wlr_surface *surface, double ox, double oy, float rotation) {
|
||||||
|
struct wlr_output_layout_output *layout = wlr_output_layout_get(
|
||||||
|
output->desktop->layout, output->wlr_output);
|
||||||
|
damage_whole_surface(surface, ox + layout->x, oy + layout->y,
|
||||||
|
rotation, output);
|
||||||
|
// TODO: subsurfaces
|
||||||
|
}
|
||||||
|
|
||||||
static void damage_whole_decoration(struct roots_view *view,
|
static void damage_whole_decoration(struct roots_view *view,
|
||||||
struct roots_output *output) {
|
struct roots_output *output) {
|
||||||
if (!view->decorated || view->wlr_surface == NULL) {
|
if (!view->decorated || view->wlr_surface == NULL) {
|
||||||
|
@ -667,32 +720,32 @@ static void damage_from_surface(struct wlr_surface *surface,
|
||||||
surface_intersect_output(surface, output->desktop->layout,
|
surface_intersect_output(surface, output->desktop->layout,
|
||||||
wlr_output, lx, ly, rotation, &box);
|
wlr_output, lx, ly, rotation, &box);
|
||||||
|
|
||||||
if (rotation == 0) {
|
int center_x = box.x + box.width/2;
|
||||||
pixman_region32_t damage;
|
int center_y = box.y + box.height/2;
|
||||||
pixman_region32_init(&damage);
|
|
||||||
pixman_region32_copy(&damage, &surface->current->surface_damage);
|
pixman_region32_t damage;
|
||||||
wlr_region_scale(&damage, &damage, wlr_output->scale);
|
pixman_region32_init(&damage);
|
||||||
if (ceil(wlr_output->scale) > surface->current->scale) {
|
pixman_region32_copy(&damage, &surface->current->surface_damage);
|
||||||
// When scaling up a surface, it'll become blurry so we need to
|
wlr_region_scale(&damage, &damage, wlr_output->scale);
|
||||||
// expand the damage region
|
if (ceil(wlr_output->scale) > surface->current->scale) {
|
||||||
wlr_region_expand(&damage, &damage,
|
// When scaling up a surface, it'll become blurry so we need to
|
||||||
ceil(wlr_output->scale) - surface->current->scale);
|
// expand the damage region
|
||||||
}
|
wlr_region_expand(&damage, &damage,
|
||||||
pixman_region32_translate(&damage, box.x, box.y);
|
ceil(wlr_output->scale) - surface->current->scale);
|
||||||
wlr_output_damage_add(output->damage, &damage);
|
|
||||||
pixman_region32_fini(&damage);
|
|
||||||
} else {
|
|
||||||
pixman_box32_t *extents =
|
|
||||||
pixman_region32_extents(&surface->current->surface_damage);
|
|
||||||
struct wlr_box damage_box = {
|
|
||||||
.x = box.x + extents->x1 * wlr_output->scale,
|
|
||||||
.y = box.y + extents->y1 * wlr_output->scale,
|
|
||||||
.width = (extents->x2 - extents->x1) * wlr_output->scale,
|
|
||||||
.height = (extents->y2 - extents->y1) * wlr_output->scale,
|
|
||||||
};
|
|
||||||
wlr_box_rotated_bounds(&damage_box, rotation, &damage_box);
|
|
||||||
wlr_output_damage_add_box(output->damage, &damage_box);
|
|
||||||
}
|
}
|
||||||
|
pixman_region32_translate(&damage, box.x, box.y);
|
||||||
|
wlr_region_rotated_bounds(&damage, &damage, rotation, center_x, center_y);
|
||||||
|
wlr_output_damage_add(output->damage, &damage);
|
||||||
|
pixman_region32_fini(&damage);
|
||||||
|
}
|
||||||
|
|
||||||
|
void output_damage_from_local_surface(struct roots_output *output,
|
||||||
|
struct wlr_surface *surface, double ox, double oy, float rotation) {
|
||||||
|
struct wlr_output_layout_output *layout = wlr_output_layout_get(
|
||||||
|
output->desktop->layout, output->wlr_output);
|
||||||
|
damage_from_surface(surface, ox + layout->x, oy + layout->y,
|
||||||
|
rotation, output);
|
||||||
|
// TODO: Subsurfaces
|
||||||
}
|
}
|
||||||
|
|
||||||
void output_damage_from_view(struct roots_output *output,
|
void output_damage_from_view(struct roots_output *output,
|
||||||
|
@ -785,6 +838,7 @@ void handle_new_output(struct wl_listener *listener, void *data) {
|
||||||
clock_gettime(CLOCK_MONOTONIC, &output->last_frame);
|
clock_gettime(CLOCK_MONOTONIC, &output->last_frame);
|
||||||
output->desktop = desktop;
|
output->desktop = desktop;
|
||||||
output->wlr_output = wlr_output;
|
output->wlr_output = wlr_output;
|
||||||
|
wlr_output->data = output;
|
||||||
wl_list_insert(&desktop->outputs, &output->link);
|
wl_list_insert(&desktop->outputs, &output->link);
|
||||||
|
|
||||||
output->damage = wlr_output_damage_create(wlr_output);
|
output->damage = wlr_output_damage_create(wlr_output);
|
||||||
|
@ -796,6 +850,11 @@ void handle_new_output(struct wl_listener *listener, void *data) {
|
||||||
output->damage_destroy.notify = output_damage_handle_destroy;
|
output->damage_destroy.notify = output_damage_handle_destroy;
|
||||||
wl_signal_add(&output->damage->events.destroy, &output->damage_destroy);
|
wl_signal_add(&output->damage->events.destroy, &output->damage_destroy);
|
||||||
|
|
||||||
|
size_t len = sizeof(output->layers) / sizeof(output->layers[0]);
|
||||||
|
for (size_t i = 0; i < len; ++i) {
|
||||||
|
wl_list_init(&output->layers[i]);
|
||||||
|
}
|
||||||
|
|
||||||
struct roots_output_config *output_config =
|
struct roots_output_config *output_config =
|
||||||
roots_config_get_output(config, wlr_output);
|
roots_config_get_output(config, wlr_output);
|
||||||
if (output_config) {
|
if (output_config) {
|
||||||
|
|
|
@ -723,6 +723,33 @@ void roots_seat_set_focus(struct roots_seat *seat, struct roots_view *view) {
|
||||||
wl_list_insert(&seat->input->server->desktop->views, &view->link);
|
wl_list_insert(&seat->input->server->desktop->views, &view->link);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
bool unfullscreen = true;
|
||||||
|
|
||||||
|
#ifdef WLR_HAS_XWAYLAND
|
||||||
|
if (view && view->type == ROOTS_XWAYLAND_VIEW &&
|
||||||
|
view->xwayland_surface->override_redirect) {
|
||||||
|
unfullscreen = false;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if (view && unfullscreen) {
|
||||||
|
struct roots_desktop *desktop = view->desktop;
|
||||||
|
struct roots_output *output;
|
||||||
|
struct wlr_box box;
|
||||||
|
view_get_box(view, &box);
|
||||||
|
wl_list_for_each(output, &desktop->outputs, link) {
|
||||||
|
if (output->fullscreen_view &&
|
||||||
|
output->fullscreen_view != view &&
|
||||||
|
wlr_output_layout_intersects(
|
||||||
|
desktop->layout,
|
||||||
|
output->wlr_output, &box)) {
|
||||||
|
view_set_fullscreen(output->fullscreen_view,
|
||||||
|
false, NULL);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
struct roots_view *prev_focus = roots_seat_get_focus(seat);
|
struct roots_view *prev_focus = roots_seat_get_focus(seat);
|
||||||
if (view == prev_focus) {
|
if (view == prev_focus) {
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -28,6 +28,16 @@ static void popup_handle_destroy(struct wl_listener *listener, void *data) {
|
||||||
popup_destroy((struct roots_view_child *)popup);
|
popup_destroy((struct roots_view_child *)popup);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void popup_handle_map(struct wl_listener *listener, void *data) {
|
||||||
|
struct roots_xdg_popup *popup = wl_container_of(listener, popup, map);
|
||||||
|
view_damage_whole(popup->view_child.view);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void popup_handle_unmap(struct wl_listener *listener, void *data) {
|
||||||
|
struct roots_xdg_popup *popup = wl_container_of(listener, popup, unmap);
|
||||||
|
view_damage_whole(popup->view_child.view);
|
||||||
|
}
|
||||||
|
|
||||||
static struct roots_xdg_popup *popup_create(struct roots_view *view,
|
static struct roots_xdg_popup *popup_create(struct roots_view *view,
|
||||||
struct wlr_xdg_popup *wlr_popup);
|
struct wlr_xdg_popup *wlr_popup);
|
||||||
|
|
||||||
|
@ -50,6 +60,10 @@ static struct roots_xdg_popup *popup_create(struct roots_view *view,
|
||||||
view_child_init(&popup->view_child, view, wlr_popup->base->surface);
|
view_child_init(&popup->view_child, view, wlr_popup->base->surface);
|
||||||
popup->destroy.notify = popup_handle_destroy;
|
popup->destroy.notify = popup_handle_destroy;
|
||||||
wl_signal_add(&wlr_popup->base->events.destroy, &popup->destroy);
|
wl_signal_add(&wlr_popup->base->events.destroy, &popup->destroy);
|
||||||
|
popup->map.notify = popup_handle_map;
|
||||||
|
wl_signal_add(&wlr_popup->base->events.map, &popup->map);
|
||||||
|
popup->unmap.notify = popup_handle_unmap;
|
||||||
|
wl_signal_add(&wlr_popup->base->events.unmap, &popup->unmap);
|
||||||
popup->new_popup.notify = popup_handle_new_popup;
|
popup->new_popup.notify = popup_handle_new_popup;
|
||||||
wl_signal_add(&wlr_popup->base->events.new_popup, &popup->new_popup);
|
wl_signal_add(&wlr_popup->base->events.new_popup, &popup->new_popup);
|
||||||
return popup;
|
return popup;
|
||||||
|
@ -177,9 +191,11 @@ static void set_fullscreen(struct roots_view *view, bool fullscreen) {
|
||||||
static void close(struct roots_view *view) {
|
static void close(struct roots_view *view) {
|
||||||
assert(view->type == ROOTS_XDG_SHELL_VIEW);
|
assert(view->type == ROOTS_XDG_SHELL_VIEW);
|
||||||
struct wlr_xdg_surface *surface = view->xdg_surface;
|
struct wlr_xdg_surface *surface = view->xdg_surface;
|
||||||
if (surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL) {
|
struct wlr_xdg_popup *popup = NULL;
|
||||||
wlr_xdg_toplevel_send_close(surface);
|
wl_list_for_each(popup, &surface->popups, link) {
|
||||||
|
wlr_xdg_surface_send_close(popup->base);
|
||||||
}
|
}
|
||||||
|
wlr_xdg_surface_send_close(surface);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void destroy(struct roots_view *view) {
|
static void destroy(struct roots_view *view) {
|
||||||
|
@ -236,7 +252,7 @@ static void handle_request_maximize(struct wl_listener *listener, void *data) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
view_maximize(view, surface->toplevel->next.maximized);
|
view_maximize(view, surface->toplevel->client_pending.maximized);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void handle_request_fullscreen(struct wl_listener *listener,
|
static void handle_request_fullscreen(struct wl_listener *listener,
|
||||||
|
@ -337,7 +353,7 @@ void handle_xdg_shell_surface(struct wl_listener *listener, void *data) {
|
||||||
wl_container_of(listener, desktop, xdg_shell_surface);
|
wl_container_of(listener, desktop, xdg_shell_surface);
|
||||||
|
|
||||||
wlr_log(L_DEBUG, "new xdg toplevel: title=%s, app_id=%s",
|
wlr_log(L_DEBUG, "new xdg toplevel: title=%s, app_id=%s",
|
||||||
surface->title, surface->app_id);
|
surface->toplevel->title, surface->toplevel->app_id);
|
||||||
wlr_xdg_surface_ping(surface);
|
wlr_xdg_surface_ping(surface);
|
||||||
|
|
||||||
struct roots_xdg_surface *roots_surface =
|
struct roots_xdg_surface *roots_surface =
|
||||||
|
@ -355,15 +371,16 @@ void handle_xdg_shell_surface(struct wl_listener *listener, void *data) {
|
||||||
roots_surface->unmap.notify = handle_unmap;
|
roots_surface->unmap.notify = handle_unmap;
|
||||||
wl_signal_add(&surface->events.unmap, &roots_surface->unmap);
|
wl_signal_add(&surface->events.unmap, &roots_surface->unmap);
|
||||||
roots_surface->request_move.notify = handle_request_move;
|
roots_surface->request_move.notify = handle_request_move;
|
||||||
wl_signal_add(&surface->events.request_move, &roots_surface->request_move);
|
wl_signal_add(&surface->toplevel->events.request_move,
|
||||||
|
&roots_surface->request_move);
|
||||||
roots_surface->request_resize.notify = handle_request_resize;
|
roots_surface->request_resize.notify = handle_request_resize;
|
||||||
wl_signal_add(&surface->events.request_resize,
|
wl_signal_add(&surface->toplevel->events.request_resize,
|
||||||
&roots_surface->request_resize);
|
&roots_surface->request_resize);
|
||||||
roots_surface->request_maximize.notify = handle_request_maximize;
|
roots_surface->request_maximize.notify = handle_request_maximize;
|
||||||
wl_signal_add(&surface->events.request_maximize,
|
wl_signal_add(&surface->toplevel->events.request_maximize,
|
||||||
&roots_surface->request_maximize);
|
&roots_surface->request_maximize);
|
||||||
roots_surface->request_fullscreen.notify = handle_request_fullscreen;
|
roots_surface->request_fullscreen.notify = handle_request_fullscreen;
|
||||||
wl_signal_add(&surface->events.request_fullscreen,
|
wl_signal_add(&surface->toplevel->events.request_fullscreen,
|
||||||
&roots_surface->request_fullscreen);
|
&roots_surface->request_fullscreen);
|
||||||
roots_surface->new_popup.notify = handle_new_popup;
|
roots_surface->new_popup.notify = handle_new_popup;
|
||||||
wl_signal_add(&surface->events.new_popup, &roots_surface->new_popup);
|
wl_signal_add(&surface->events.new_popup, &roots_surface->new_popup);
|
||||||
|
@ -386,10 +403,10 @@ void handle_xdg_shell_surface(struct wl_listener *listener, void *data) {
|
||||||
view->destroy = destroy;
|
view->destroy = destroy;
|
||||||
roots_surface->view = view;
|
roots_surface->view = view;
|
||||||
|
|
||||||
if (surface->toplevel->next.maximized) {
|
if (surface->toplevel->client_pending.maximized) {
|
||||||
view_maximize(view, true);
|
view_maximize(view, true);
|
||||||
}
|
}
|
||||||
if (surface->toplevel->next.fullscreen) {
|
if (surface->toplevel->client_pending.fullscreen) {
|
||||||
view_set_fullscreen(view, true, NULL);
|
view_set_fullscreen(view, true, NULL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,6 +28,18 @@ static void popup_handle_destroy(struct wl_listener *listener, void *data) {
|
||||||
popup_destroy((struct roots_view_child *)popup);
|
popup_destroy((struct roots_view_child *)popup);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void popup_handle_map(struct wl_listener *listener, void *data) {
|
||||||
|
struct roots_xdg_popup_v6 *popup =
|
||||||
|
wl_container_of(listener, popup, map);
|
||||||
|
view_damage_whole(popup->view_child.view);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void popup_handle_unmap(struct wl_listener *listener, void *data) {
|
||||||
|
struct roots_xdg_popup_v6 *popup =
|
||||||
|
wl_container_of(listener, popup, unmap);
|
||||||
|
view_damage_whole(popup->view_child.view);
|
||||||
|
}
|
||||||
|
|
||||||
static struct roots_xdg_popup_v6 *popup_create(struct roots_view *view,
|
static struct roots_xdg_popup_v6 *popup_create(struct roots_view *view,
|
||||||
struct wlr_xdg_popup_v6 *wlr_popup);
|
struct wlr_xdg_popup_v6 *wlr_popup);
|
||||||
|
|
||||||
|
@ -230,6 +242,10 @@ static struct roots_xdg_popup_v6 *popup_create(struct roots_view *view,
|
||||||
view_child_init(&popup->view_child, view, wlr_popup->base->surface);
|
view_child_init(&popup->view_child, view, wlr_popup->base->surface);
|
||||||
popup->destroy.notify = popup_handle_destroy;
|
popup->destroy.notify = popup_handle_destroy;
|
||||||
wl_signal_add(&wlr_popup->base->events.destroy, &popup->destroy);
|
wl_signal_add(&wlr_popup->base->events.destroy, &popup->destroy);
|
||||||
|
popup->map.notify = popup_handle_map;
|
||||||
|
wl_signal_add(&wlr_popup->base->events.map, &popup->map);
|
||||||
|
popup->unmap.notify = popup_handle_unmap;
|
||||||
|
wl_signal_add(&wlr_popup->base->events.unmap, &popup->unmap);
|
||||||
popup->new_popup.notify = popup_handle_new_popup;
|
popup->new_popup.notify = popup_handle_new_popup;
|
||||||
wl_signal_add(&wlr_popup->base->events.new_popup, &popup->new_popup);
|
wl_signal_add(&wlr_popup->base->events.new_popup, &popup->new_popup);
|
||||||
|
|
||||||
|
@ -360,9 +376,11 @@ static void set_fullscreen(struct roots_view *view, bool fullscreen) {
|
||||||
static void close(struct roots_view *view) {
|
static void close(struct roots_view *view) {
|
||||||
assert(view->type == ROOTS_XDG_SHELL_V6_VIEW);
|
assert(view->type == ROOTS_XDG_SHELL_V6_VIEW);
|
||||||
struct wlr_xdg_surface_v6 *surface = view->xdg_surface_v6;
|
struct wlr_xdg_surface_v6 *surface = view->xdg_surface_v6;
|
||||||
if (surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) {
|
struct wlr_xdg_popup_v6 *popup = NULL;
|
||||||
wlr_xdg_toplevel_v6_send_close(surface);
|
wl_list_for_each(popup, &surface->popups, link) {
|
||||||
|
wlr_xdg_surface_v6_send_close(popup->base);
|
||||||
}
|
}
|
||||||
|
wlr_xdg_surface_v6_send_close(surface);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void destroy(struct roots_view *view) {
|
static void destroy(struct roots_view *view) {
|
||||||
|
@ -419,7 +437,7 @@ static void handle_request_maximize(struct wl_listener *listener, void *data) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
view_maximize(view, surface->toplevel->next.maximized);
|
view_maximize(view, surface->toplevel->client_pending.maximized);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void handle_request_fullscreen(struct wl_listener *listener,
|
static void handle_request_fullscreen(struct wl_listener *listener,
|
||||||
|
@ -520,7 +538,7 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
|
||||||
wl_container_of(listener, desktop, xdg_shell_v6_surface);
|
wl_container_of(listener, desktop, xdg_shell_v6_surface);
|
||||||
|
|
||||||
wlr_log(L_DEBUG, "new xdg toplevel: title=%s, app_id=%s",
|
wlr_log(L_DEBUG, "new xdg toplevel: title=%s, app_id=%s",
|
||||||
surface->title, surface->app_id);
|
surface->toplevel->title, surface->toplevel->app_id);
|
||||||
wlr_xdg_surface_v6_ping(surface);
|
wlr_xdg_surface_v6_ping(surface);
|
||||||
|
|
||||||
struct roots_xdg_surface_v6 *roots_surface =
|
struct roots_xdg_surface_v6 *roots_surface =
|
||||||
|
@ -538,15 +556,16 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
|
||||||
roots_surface->unmap.notify = handle_unmap;
|
roots_surface->unmap.notify = handle_unmap;
|
||||||
wl_signal_add(&surface->events.unmap, &roots_surface->unmap);
|
wl_signal_add(&surface->events.unmap, &roots_surface->unmap);
|
||||||
roots_surface->request_move.notify = handle_request_move;
|
roots_surface->request_move.notify = handle_request_move;
|
||||||
wl_signal_add(&surface->events.request_move, &roots_surface->request_move);
|
wl_signal_add(&surface->toplevel->events.request_move,
|
||||||
|
&roots_surface->request_move);
|
||||||
roots_surface->request_resize.notify = handle_request_resize;
|
roots_surface->request_resize.notify = handle_request_resize;
|
||||||
wl_signal_add(&surface->events.request_resize,
|
wl_signal_add(&surface->toplevel->events.request_resize,
|
||||||
&roots_surface->request_resize);
|
&roots_surface->request_resize);
|
||||||
roots_surface->request_maximize.notify = handle_request_maximize;
|
roots_surface->request_maximize.notify = handle_request_maximize;
|
||||||
wl_signal_add(&surface->events.request_maximize,
|
wl_signal_add(&surface->toplevel->events.request_maximize,
|
||||||
&roots_surface->request_maximize);
|
&roots_surface->request_maximize);
|
||||||
roots_surface->request_fullscreen.notify = handle_request_fullscreen;
|
roots_surface->request_fullscreen.notify = handle_request_fullscreen;
|
||||||
wl_signal_add(&surface->events.request_fullscreen,
|
wl_signal_add(&surface->toplevel->events.request_fullscreen,
|
||||||
&roots_surface->request_fullscreen);
|
&roots_surface->request_fullscreen);
|
||||||
roots_surface->new_popup.notify = handle_new_popup;
|
roots_surface->new_popup.notify = handle_new_popup;
|
||||||
wl_signal_add(&surface->events.new_popup, &roots_surface->new_popup);
|
wl_signal_add(&surface->events.new_popup, &roots_surface->new_popup);
|
||||||
|
@ -569,10 +588,10 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
|
||||||
view->destroy = destroy;
|
view->destroy = destroy;
|
||||||
roots_surface->view = view;
|
roots_surface->view = view;
|
||||||
|
|
||||||
if (surface->toplevel->next.maximized) {
|
if (surface->toplevel->client_pending.maximized) {
|
||||||
view_maximize(view, true);
|
view_maximize(view, true);
|
||||||
}
|
}
|
||||||
if (surface->toplevel->next.fullscreen) {
|
if (surface->toplevel->client_pending.fullscreen) {
|
||||||
view_set_fullscreen(view, true, NULL);
|
view_set_fullscreen(view, true, NULL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,8 +8,10 @@ lib_wlr_types = static_library(
|
||||||
'wlr_gamma_control.c',
|
'wlr_gamma_control.c',
|
||||||
'wlr_idle_inhibit_v1.c',
|
'wlr_idle_inhibit_v1.c',
|
||||||
'wlr_idle.c',
|
'wlr_idle.c',
|
||||||
|
'wlr_idle_inhibit_v1.c',
|
||||||
'wlr_input_device.c',
|
'wlr_input_device.c',
|
||||||
'wlr_keyboard.c',
|
'wlr_keyboard.c',
|
||||||
|
'wlr_layer_shell.c',
|
||||||
'wlr_linux_dmabuf.c',
|
'wlr_linux_dmabuf.c',
|
||||||
'wlr_list.c',
|
'wlr_list.c',
|
||||||
'wlr_matrix.c',
|
'wlr_matrix.c',
|
||||||
|
|
|
@ -0,0 +1,415 @@
|
||||||
|
#define _POSIX_C_SOURCE 200809L
|
||||||
|
#include <assert.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <wayland-server.h>
|
||||||
|
#include <wlr/types/wlr_layer_shell.h>
|
||||||
|
#include <wlr/types/wlr_output.h>
|
||||||
|
#include <wlr/types/wlr_surface.h>
|
||||||
|
#include <wlr/util/log.h>
|
||||||
|
#include "util/signal.h"
|
||||||
|
#include "wlr-layer-shell-unstable-v1-protocol.h"
|
||||||
|
|
||||||
|
static const char *zwlr_layer_surface_role = "zwlr_layer_surface";
|
||||||
|
|
||||||
|
static void resource_handle_destroy(struct wl_client *client,
|
||||||
|
struct wl_resource *resource) {
|
||||||
|
wl_resource_destroy(resource);
|
||||||
|
}
|
||||||
|
|
||||||
|
static const struct zwlr_layer_shell_v1_interface layer_shell_implementation;
|
||||||
|
static const struct zwlr_layer_surface_v1_interface layer_surface_implementation;
|
||||||
|
|
||||||
|
static struct wlr_layer_shell *layer_shell_from_resource(
|
||||||
|
struct wl_resource *resource) {
|
||||||
|
assert(wl_resource_instance_of(resource, &zwlr_layer_shell_v1_interface,
|
||||||
|
&layer_shell_implementation));
|
||||||
|
return wl_resource_get_user_data(resource);
|
||||||
|
}
|
||||||
|
|
||||||
|
static struct wlr_layer_surface *layer_surface_from_resource(
|
||||||
|
struct wl_resource *resource) {
|
||||||
|
assert(wl_resource_instance_of(resource, &zwlr_layer_surface_v1_interface,
|
||||||
|
&layer_surface_implementation));
|
||||||
|
return wl_resource_get_user_data(resource);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void layer_surface_configure_destroy(
|
||||||
|
struct wlr_layer_surface_configure *configure) {
|
||||||
|
if (configure == NULL) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
wl_list_remove(&configure->link);
|
||||||
|
free(configure);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void layer_surface_handle_ack_configure(struct wl_client *client,
|
||||||
|
struct wl_resource *resource, uint32_t serial) {
|
||||||
|
struct wlr_layer_surface *surface = layer_surface_from_resource(resource);
|
||||||
|
|
||||||
|
bool found = false;
|
||||||
|
struct wlr_layer_surface_configure *configure, *tmp;
|
||||||
|
wl_list_for_each_safe(configure, tmp, &surface->configure_list, link) {
|
||||||
|
if (configure->serial < serial) {
|
||||||
|
layer_surface_configure_destroy(configure);
|
||||||
|
} else if (configure->serial == serial) {
|
||||||
|
found = true;
|
||||||
|
break;
|
||||||
|
} else {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!found) {
|
||||||
|
wl_resource_post_error(resource,
|
||||||
|
ZWLR_LAYER_SURFACE_V1_ERROR_INVALID_SURFACE_STATE,
|
||||||
|
"wrong configure serial: %u", serial);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (surface->acked_configure) {
|
||||||
|
layer_surface_configure_destroy(surface->acked_configure);
|
||||||
|
}
|
||||||
|
surface->acked_configure = configure;
|
||||||
|
wl_list_remove(&configure->link);
|
||||||
|
wl_list_init(&configure->link);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void layer_surface_handle_set_size(struct wl_client *client,
|
||||||
|
struct wl_resource *resource, uint32_t width, uint32_t height) {
|
||||||
|
struct wlr_layer_surface *surface = layer_surface_from_resource(resource);
|
||||||
|
surface->client_pending.desired_width = width;
|
||||||
|
surface->client_pending.desired_height = height;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void layer_surface_handle_set_anchor(struct wl_client *client,
|
||||||
|
struct wl_resource *resource, uint32_t anchor) {
|
||||||
|
const uint32_t max_anchor =
|
||||||
|
ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP |
|
||||||
|
ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM |
|
||||||
|
ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
|
||||||
|
ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
|
||||||
|
if (anchor > max_anchor) {
|
||||||
|
wl_resource_post_error(resource,
|
||||||
|
ZWLR_LAYER_SURFACE_V1_ERROR_INVALID_ANCHOR,
|
||||||
|
"invalid anchor %d", anchor);
|
||||||
|
}
|
||||||
|
struct wlr_layer_surface *surface = layer_surface_from_resource(resource);
|
||||||
|
surface->client_pending.anchor = anchor;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void layer_surface_handle_set_exclusive_zone(struct wl_client *client,
|
||||||
|
struct wl_resource *resource, int32_t zone) {
|
||||||
|
struct wlr_layer_surface *surface = layer_surface_from_resource(resource);
|
||||||
|
surface->client_pending.exclusive_zone = zone;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void layer_surface_handle_set_margin(
|
||||||
|
struct wl_client *client, struct wl_resource *resource,
|
||||||
|
int32_t top, int32_t right, int32_t bottom, int32_t left) {
|
||||||
|
struct wlr_layer_surface *surface = layer_surface_from_resource(resource);
|
||||||
|
surface->client_pending.margin.top = top;
|
||||||
|
surface->client_pending.margin.right = right;
|
||||||
|
surface->client_pending.margin.bottom = bottom;
|
||||||
|
surface->client_pending.margin.left = left;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void layer_surface_handle_set_keyboard_interactivity(
|
||||||
|
struct wl_client *client, struct wl_resource *resource,
|
||||||
|
uint32_t interactive) {
|
||||||
|
struct wlr_layer_surface *surface = layer_surface_from_resource(resource);
|
||||||
|
surface->client_pending.keyboard_interactive = !!interactive;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void layer_surface_handle_get_popup(struct wl_client *client,
|
||||||
|
struct wl_resource *resource, struct wl_resource *popup) {
|
||||||
|
// TODO
|
||||||
|
}
|
||||||
|
|
||||||
|
static const struct zwlr_layer_surface_v1_interface layer_surface_implementation = {
|
||||||
|
.destroy = resource_handle_destroy,
|
||||||
|
.ack_configure = layer_surface_handle_ack_configure,
|
||||||
|
.set_size = layer_surface_handle_set_size,
|
||||||
|
.set_anchor = layer_surface_handle_set_anchor,
|
||||||
|
.set_exclusive_zone = layer_surface_handle_set_exclusive_zone,
|
||||||
|
.set_margin = layer_surface_handle_set_margin,
|
||||||
|
.set_keyboard_interactivity = layer_surface_handle_set_keyboard_interactivity,
|
||||||
|
.get_popup = layer_surface_handle_get_popup,
|
||||||
|
};
|
||||||
|
|
||||||
|
static void layer_surface_unmap(struct wlr_layer_surface *surface) {
|
||||||
|
// TODO: probably need to ungrab before this event
|
||||||
|
wlr_signal_emit_safe(&surface->events.unmap, surface);
|
||||||
|
|
||||||
|
struct wlr_layer_surface_configure *configure, *tmp;
|
||||||
|
wl_list_for_each_safe(configure, tmp, &surface->configure_list, link) {
|
||||||
|
layer_surface_configure_destroy(configure);
|
||||||
|
}
|
||||||
|
|
||||||
|
surface->configured = surface->mapped = false;
|
||||||
|
surface->configure_serial = 0;
|
||||||
|
if (surface->configure_idle) {
|
||||||
|
wl_event_source_remove(surface->configure_idle);
|
||||||
|
surface->configure_idle = NULL;
|
||||||
|
}
|
||||||
|
surface->configure_next_serial = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void layer_surface_destroy(struct wlr_layer_surface *surface) {
|
||||||
|
layer_surface_unmap(surface);
|
||||||
|
wlr_signal_emit_safe(&surface->events.destroy, surface);
|
||||||
|
wl_resource_set_user_data(surface->resource, NULL);
|
||||||
|
wl_list_remove(&surface->surface_destroy_listener.link);
|
||||||
|
wlr_surface_set_role_committed(surface->surface, NULL, NULL);
|
||||||
|
free(surface);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void layer_surface_resource_destroy(struct wl_resource *resource) {
|
||||||
|
struct wlr_layer_surface *surface =
|
||||||
|
layer_surface_from_resource(resource);
|
||||||
|
if (surface != NULL) {
|
||||||
|
layer_surface_destroy(surface);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool wlr_layer_surface_state_changed(struct wlr_layer_surface *surface) {
|
||||||
|
struct wlr_layer_surface_state *state;
|
||||||
|
if (wl_list_empty(&surface->configure_list)) {
|
||||||
|
if (surface->acked_configure) {
|
||||||
|
state = &surface->acked_configure->state;
|
||||||
|
} else if (!surface->configured) {
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
state = &surface->current;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
struct wlr_layer_surface_configure *configure =
|
||||||
|
wl_container_of(surface->configure_list.prev, configure, link);
|
||||||
|
state = &configure->state;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool changed = state->actual_width != surface->server_pending.actual_width
|
||||||
|
|| state->actual_height != surface->server_pending.actual_height;
|
||||||
|
return changed;
|
||||||
|
}
|
||||||
|
|
||||||
|
void wlr_layer_surface_configure(struct wlr_layer_surface *surface,
|
||||||
|
uint32_t width, uint32_t height) {
|
||||||
|
surface->server_pending.actual_width = width;
|
||||||
|
surface->server_pending.actual_height = height;
|
||||||
|
if (wlr_layer_surface_state_changed(surface)) {
|
||||||
|
struct wl_display *display =
|
||||||
|
wl_client_get_display(wl_resource_get_client(surface->resource));
|
||||||
|
struct wlr_layer_surface_configure *configure =
|
||||||
|
calloc(1, sizeof(struct wlr_layer_surface_configure));
|
||||||
|
if (configure == NULL) {
|
||||||
|
wl_client_post_no_memory(wl_resource_get_client(surface->resource));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
surface->configure_next_serial = wl_display_next_serial(display);
|
||||||
|
wl_list_insert(surface->configure_list.prev, &configure->link);
|
||||||
|
configure->state.actual_width = width;
|
||||||
|
configure->state.actual_height = height;
|
||||||
|
configure->serial = surface->configure_next_serial;
|
||||||
|
zwlr_layer_surface_v1_send_configure(surface->resource,
|
||||||
|
configure->serial, configure->state.actual_width,
|
||||||
|
configure->state.actual_height);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void wlr_layer_surface_close(struct wlr_layer_surface *surface) {
|
||||||
|
if (surface->closed) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
surface->closed = true;
|
||||||
|
layer_surface_unmap(surface);
|
||||||
|
zwlr_layer_surface_v1_send_closed(surface->resource);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void handle_wlr_surface_committed(struct wlr_surface *wlr_surface,
|
||||||
|
void *role_data) {
|
||||||
|
struct wlr_layer_surface *surface = role_data;
|
||||||
|
|
||||||
|
if (surface->closed) {
|
||||||
|
// Ignore commits after the compositor has closed it
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (surface->acked_configure) {
|
||||||
|
struct wlr_layer_surface_configure *configure =
|
||||||
|
surface->acked_configure;
|
||||||
|
surface->configured = true;
|
||||||
|
surface->configure_serial = configure->serial;
|
||||||
|
surface->current.actual_width = configure->state.actual_width;
|
||||||
|
surface->current.actual_height = configure->state.actual_height;
|
||||||
|
layer_surface_configure_destroy(configure);
|
||||||
|
surface->acked_configure = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (wlr_surface_has_buffer(surface->surface) && !surface->configured) {
|
||||||
|
wl_resource_post_error(surface->resource,
|
||||||
|
ZWLR_LAYER_SHELL_V1_ERROR_ALREADY_CONSTRUCTED,
|
||||||
|
"layer_surface has never been configured");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
surface->current.anchor = surface->client_pending.anchor;
|
||||||
|
surface->current.exclusive_zone = surface->client_pending.exclusive_zone;
|
||||||
|
surface->current.margin = surface->client_pending.margin;
|
||||||
|
surface->current.keyboard_interactive =
|
||||||
|
surface->client_pending.keyboard_interactive;
|
||||||
|
surface->current.desired_width = surface->client_pending.desired_width;
|
||||||
|
surface->current.desired_height = surface->client_pending.desired_height;
|
||||||
|
|
||||||
|
if (!surface->added) {
|
||||||
|
surface->added = true;
|
||||||
|
wlr_signal_emit_safe(&surface->shell->events.new_surface,
|
||||||
|
surface);
|
||||||
|
}
|
||||||
|
if (surface->configured && wlr_surface_has_buffer(surface->surface) &&
|
||||||
|
!surface->mapped) {
|
||||||
|
surface->mapped = true;
|
||||||
|
wlr_signal_emit_safe(&surface->events.map, surface);
|
||||||
|
}
|
||||||
|
if (surface->configured && !wlr_surface_has_buffer(surface->surface) &&
|
||||||
|
surface->mapped) {
|
||||||
|
layer_surface_unmap(surface);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void handle_wlr_surface_destroyed(struct wl_listener *listener,
|
||||||
|
void *data) {
|
||||||
|
struct wlr_layer_surface *layer_surface =
|
||||||
|
wl_container_of(listener, layer_surface, surface_destroy_listener);
|
||||||
|
layer_surface_destroy(layer_surface);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void layer_shell_handle_get_layer_surface(struct wl_client *wl_client,
|
||||||
|
struct wl_resource *client_resource, uint32_t id,
|
||||||
|
struct wl_resource *surface_resource,
|
||||||
|
struct wl_resource *output_resource,
|
||||||
|
uint32_t layer, const char *namespace) {
|
||||||
|
struct wlr_layer_shell *shell =
|
||||||
|
layer_shell_from_resource(client_resource);
|
||||||
|
struct wlr_surface *wlr_surface =
|
||||||
|
wlr_surface_from_resource(surface_resource);
|
||||||
|
|
||||||
|
if (wlr_surface_set_role(wlr_surface, zwlr_layer_surface_role,
|
||||||
|
client_resource, ZWLR_LAYER_SHELL_V1_ERROR_ROLE)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct wlr_layer_surface *surface =
|
||||||
|
calloc(1, sizeof(struct wlr_layer_surface));
|
||||||
|
if (surface == NULL) {
|
||||||
|
wl_client_post_no_memory(wl_client);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
surface->shell = shell;
|
||||||
|
surface->surface = wlr_surface;
|
||||||
|
surface->output = wlr_output_from_resource(output_resource);
|
||||||
|
surface->resource = wl_resource_create(wl_client,
|
||||||
|
&zwlr_layer_surface_v1_interface,
|
||||||
|
wl_resource_get_version(client_resource),
|
||||||
|
id);
|
||||||
|
surface->namespace = strdup(namespace);
|
||||||
|
surface->layer = layer;
|
||||||
|
if (surface->resource == NULL || surface->namespace == NULL) {
|
||||||
|
free(surface);
|
||||||
|
wl_client_post_no_memory(wl_client);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (layer > ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY) {
|
||||||
|
wl_resource_post_error(surface->resource,
|
||||||
|
ZWLR_LAYER_SHELL_V1_ERROR_INVALID_LAYER,
|
||||||
|
"Invalid layer %d", layer);
|
||||||
|
free(surface);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
wl_list_init(&surface->configure_list);
|
||||||
|
|
||||||
|
wl_signal_init(&surface->events.destroy);
|
||||||
|
wl_signal_add(&surface->surface->events.destroy,
|
||||||
|
&surface->surface_destroy_listener);
|
||||||
|
surface->surface_destroy_listener.notify = handle_wlr_surface_destroyed;
|
||||||
|
wl_signal_init(&surface->events.map);
|
||||||
|
wl_signal_init(&surface->events.unmap);
|
||||||
|
|
||||||
|
wlr_surface_set_role_committed(surface->surface,
|
||||||
|
handle_wlr_surface_committed, surface);
|
||||||
|
|
||||||
|
wlr_log(L_DEBUG, "new layer_surface %p (res %p)",
|
||||||
|
surface, surface->resource);
|
||||||
|
wl_resource_set_implementation(surface->resource,
|
||||||
|
&layer_surface_implementation, surface, layer_surface_resource_destroy);
|
||||||
|
}
|
||||||
|
|
||||||
|
static const struct zwlr_layer_shell_v1_interface layer_shell_implementation = {
|
||||||
|
.get_layer_surface = layer_shell_handle_get_layer_surface,
|
||||||
|
};
|
||||||
|
|
||||||
|
static void client_handle_destroy(struct wl_resource *resource) {
|
||||||
|
wl_list_remove(wl_resource_get_link(resource));
|
||||||
|
}
|
||||||
|
|
||||||
|
static void layer_shell_bind(struct wl_client *wl_client, void *data,
|
||||||
|
uint32_t version, uint32_t id) {
|
||||||
|
struct wlr_layer_shell *layer_shell = data;
|
||||||
|
assert(wl_client && layer_shell);
|
||||||
|
|
||||||
|
struct wl_resource *resource = wl_resource_create(
|
||||||
|
wl_client, &zwlr_layer_shell_v1_interface, version, id);
|
||||||
|
if (resource == NULL) {
|
||||||
|
wl_client_post_no_memory(wl_client);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
wl_resource_set_implementation(resource,
|
||||||
|
&layer_shell_implementation, layer_shell, client_handle_destroy);
|
||||||
|
wl_list_insert(&layer_shell->client_resources,
|
||||||
|
wl_resource_get_link(resource));
|
||||||
|
}
|
||||||
|
|
||||||
|
static void handle_display_destroy(struct wl_listener *listener, void *data) {
|
||||||
|
struct wlr_layer_shell *layer_shell =
|
||||||
|
wl_container_of(listener, layer_shell, display_destroy);
|
||||||
|
wlr_layer_shell_destroy(layer_shell);
|
||||||
|
}
|
||||||
|
|
||||||
|
struct wlr_layer_shell *wlr_layer_shell_create(struct wl_display *display) {
|
||||||
|
struct wlr_layer_shell *layer_shell =
|
||||||
|
calloc(1, sizeof(struct wlr_layer_shell));
|
||||||
|
if (!layer_shell) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
wl_list_init(&layer_shell->client_resources);
|
||||||
|
|
||||||
|
struct wl_global *wl_global = wl_global_create(display,
|
||||||
|
&zwlr_layer_shell_v1_interface, 1, layer_shell, layer_shell_bind);
|
||||||
|
if (!wl_global) {
|
||||||
|
free(layer_shell);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
layer_shell->wl_global = wl_global;
|
||||||
|
|
||||||
|
wl_signal_init(&layer_shell->events.new_surface);
|
||||||
|
|
||||||
|
layer_shell->display_destroy.notify = handle_display_destroy;
|
||||||
|
wl_display_add_destroy_listener(display, &layer_shell->display_destroy);
|
||||||
|
|
||||||
|
return layer_shell;
|
||||||
|
}
|
||||||
|
|
||||||
|
void wlr_layer_shell_destroy(struct wlr_layer_shell *layer_shell) {
|
||||||
|
if (!layer_shell) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
struct wl_resource *client, *tmp;
|
||||||
|
wl_resource_for_each_safe(client, tmp, &layer_shell->client_resources) {
|
||||||
|
wl_resource_destroy(client);
|
||||||
|
}
|
||||||
|
wl_list_remove(&layer_shell->display_destroy.link);
|
||||||
|
wl_global_destroy(layer_shell->wl_global);
|
||||||
|
free(layer_shell);
|
||||||
|
}
|
|
@ -19,11 +19,6 @@ static const struct wl_buffer_interface wl_buffer_impl = {
|
||||||
wl_buffer_destroy,
|
wl_buffer_destroy,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool wlr_dmabuf_buffer_has_inverted_y(struct wlr_dmabuf_buffer *dmabuf) {
|
|
||||||
return dmabuf->attributes.flags
|
|
||||||
& ZWP_LINUX_BUFFER_PARAMS_V1_FLAGS_Y_INVERT;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool wlr_dmabuf_resource_is_buffer(struct wl_resource *buffer_resource) {
|
bool wlr_dmabuf_resource_is_buffer(struct wl_resource *buffer_resource) {
|
||||||
if (!wl_resource_instance_of(buffer_resource, &wl_buffer_interface,
|
if (!wl_resource_instance_of(buffer_resource, &wl_buffer_interface,
|
||||||
&wl_buffer_impl)) {
|
&wl_buffer_impl)) {
|
||||||
|
@ -139,19 +134,18 @@ static void params_create_common(struct wl_client *client,
|
||||||
goto err_out;
|
goto err_out;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* TODO: support more planes */
|
|
||||||
if (buffer->attributes.n_planes != 1) {
|
|
||||||
wl_resource_post_error(params_resource,
|
|
||||||
ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_INCOMPLETE,
|
|
||||||
"only single plane buffers supported not %d",
|
|
||||||
buffer->attributes.n_planes);
|
|
||||||
goto err_out;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (buffer->attributes.fd[0] == -1) {
|
if (buffer->attributes.fd[0] == -1) {
|
||||||
wl_resource_post_error(params_resource,
|
wl_resource_post_error(params_resource,
|
||||||
ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_INCOMPLETE,
|
ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_INCOMPLETE,
|
||||||
"no dmabuf has been added for plane");
|
"no dmabuf has been added for plane 0");
|
||||||
|
goto err_out;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((buffer->attributes.fd[3] >= 0 || buffer->attributes.fd[2] >= 0) &&
|
||||||
|
(buffer->attributes.fd[2] == -1 || buffer->attributes.fd[1] == -1)) {
|
||||||
|
wl_resource_post_error (params_resource,
|
||||||
|
ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_INCOMPLETE,
|
||||||
|
"gap in dmabuf planes");
|
||||||
goto err_out;
|
goto err_out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -167,43 +161,48 @@ static void params_create_common(struct wl_client *client,
|
||||||
goto err_out;
|
goto err_out;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((uint64_t)buffer->attributes.offset[0] + buffer->attributes.stride[0] > UINT32_MAX) {
|
for (int i = 0; i < buffer->attributes.n_planes; i++) {
|
||||||
wl_resource_post_error(params_resource,
|
if ((uint64_t)buffer->attributes.offset[i]
|
||||||
ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_OUT_OF_BOUNDS,
|
+ buffer->attributes.stride[i] > UINT32_MAX) {
|
||||||
"size overflow for plane");
|
|
||||||
goto err_out;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((uint64_t)buffer->attributes.offset[0] +
|
|
||||||
(uint64_t)buffer->attributes.stride[0] * height > UINT32_MAX) {
|
|
||||||
wl_resource_post_error(params_resource,
|
|
||||||
ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_OUT_OF_BOUNDS,
|
|
||||||
"size overflow for plane");
|
|
||||||
goto err_out;
|
|
||||||
}
|
|
||||||
|
|
||||||
off_t size = lseek(buffer->attributes.fd[0], 0, SEEK_END);
|
|
||||||
if (size != -1) { /* Skip checks if kernel does no support seek on buffer */
|
|
||||||
if (buffer->attributes.offset[0] >= size) {
|
|
||||||
wl_resource_post_error(params_resource,
|
wl_resource_post_error(params_resource,
|
||||||
ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_OUT_OF_BOUNDS,
|
ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_OUT_OF_BOUNDS,
|
||||||
"invalid offset %i for plane",
|
"size overflow for plane %d", i);
|
||||||
buffer->attributes.offset[0]);
|
|
||||||
goto err_out;
|
goto err_out;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (buffer->attributes.offset[0] + buffer->attributes.stride[0] > size) {
|
if ((uint64_t)buffer->attributes.offset[i]
|
||||||
|
+ (uint64_t)buffer->attributes.stride[i] * height > UINT32_MAX) {
|
||||||
wl_resource_post_error(params_resource,
|
wl_resource_post_error(params_resource,
|
||||||
ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_OUT_OF_BOUNDS,
|
ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_OUT_OF_BOUNDS,
|
||||||
"invalid stride %i for plane",
|
"size overflow for plane %d", i);
|
||||||
buffer->attributes.stride[0]);
|
|
||||||
goto err_out;
|
goto err_out;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (buffer->attributes.offset[0] + buffer->attributes.stride[0] * height > size) {
|
off_t size = lseek(buffer->attributes.fd[i], 0, SEEK_END);
|
||||||
|
if (size == -1) { /* Skip checks if kernel does no support seek on buffer */
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (buffer->attributes.offset[i] >= size) {
|
||||||
wl_resource_post_error(params_resource,
|
wl_resource_post_error(params_resource,
|
||||||
ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_OUT_OF_BOUNDS,
|
ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_OUT_OF_BOUNDS,
|
||||||
"invalid buffer stride or height for plane");
|
"invalid offset %i for plane %d",
|
||||||
|
buffer->attributes.offset[i], i);
|
||||||
|
goto err_out;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (buffer->attributes.offset[i] + buffer->attributes.stride[i] > size) {
|
||||||
|
wl_resource_post_error(params_resource,
|
||||||
|
ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_OUT_OF_BOUNDS,
|
||||||
|
"invalid stride %i for plane %d",
|
||||||
|
buffer->attributes.stride[i], i);
|
||||||
|
goto err_out;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (i == 0 && /* planes > 0 might be subsampled according to fourcc format */
|
||||||
|
buffer->attributes.offset[i] + buffer->attributes.stride[i] * height > size) {
|
||||||
|
wl_resource_post_error(params_resource,
|
||||||
|
ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_OUT_OF_BOUNDS,
|
||||||
|
"invalid buffer stride or height for plane %d", i);
|
||||||
goto err_out;
|
goto err_out;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -731,15 +731,11 @@ bool wlr_output_cursor_set_image(struct wlr_output_cursor *cursor,
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cursor->texture == NULL) {
|
wlr_texture_destroy(cursor->texture);
|
||||||
cursor->texture = wlr_render_texture_create(renderer);
|
|
||||||
if (cursor->texture == NULL) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return wlr_texture_upload_pixels(cursor->texture, WL_SHM_FORMAT_ARGB8888,
|
cursor->texture = wlr_texture_from_pixels(renderer, WL_SHM_FORMAT_ARGB8888,
|
||||||
stride, width, height, pixels);
|
stride, width, height, pixels);
|
||||||
|
return cursor->texture != NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void output_cursor_commit(struct wlr_output_cursor *cursor) {
|
static void output_cursor_commit(struct wlr_output_cursor *cursor) {
|
||||||
|
@ -901,9 +897,7 @@ void wlr_output_cursor_destroy(struct wlr_output_cursor *cursor) {
|
||||||
}
|
}
|
||||||
cursor->output->hardware_cursor = NULL;
|
cursor->output->hardware_cursor = NULL;
|
||||||
}
|
}
|
||||||
if (cursor->texture != NULL) {
|
wlr_texture_destroy(cursor->texture);
|
||||||
wlr_texture_destroy(cursor->texture);
|
|
||||||
}
|
|
||||||
wl_list_remove(&cursor->link);
|
wl_list_remove(&cursor->link);
|
||||||
free(cursor);
|
free(cursor);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1257,8 +1257,9 @@ bool wlr_seat_touch_has_grab(struct wlr_seat *seat) {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wlr_seat_validate_grab_serial(struct wlr_seat *seat, uint32_t serial) {
|
bool wlr_seat_validate_grab_serial(struct wlr_seat *seat, uint32_t serial) {
|
||||||
return serial == seat->pointer_state.grab_serial ||
|
return true;
|
||||||
serial == seat->touch_state.grab_serial;
|
//return serial == seat->pointer_state.grab_serial ||
|
||||||
|
// serial == seat->touch_state.grab_serial;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct wlr_seat_client *wlr_seat_client_from_resource(
|
struct wlr_seat_client *wlr_seat_client_from_resource(
|
||||||
|
|
|
@ -155,8 +155,24 @@ static bool wlr_surface_update_size(struct wlr_surface *surface,
|
||||||
int scale = state->scale;
|
int scale = state->scale;
|
||||||
enum wl_output_transform transform = state->transform;
|
enum wl_output_transform transform = state->transform;
|
||||||
|
|
||||||
wlr_texture_get_buffer_size(surface->texture, state->buffer,
|
struct wl_shm_buffer *buf = wl_shm_buffer_get(state->buffer);
|
||||||
&state->buffer_width, &state->buffer_height);
|
if (buf != NULL) {
|
||||||
|
state->buffer_width = wl_shm_buffer_get_width(buf);
|
||||||
|
state->buffer_height = wl_shm_buffer_get_height(buf);
|
||||||
|
} else if (wlr_renderer_resource_is_wl_drm_buffer(surface->renderer,
|
||||||
|
state->buffer)) {
|
||||||
|
wlr_renderer_wl_drm_buffer_get_size(surface->renderer, state->buffer,
|
||||||
|
&state->buffer_width, &state->buffer_height);
|
||||||
|
} else if (wlr_dmabuf_resource_is_buffer(state->buffer)) {
|
||||||
|
struct wlr_dmabuf_buffer *dmabuf =
|
||||||
|
wlr_dmabuf_buffer_from_buffer_resource(state->buffer);
|
||||||
|
state->buffer_width = dmabuf->attributes.width;
|
||||||
|
state->buffer_height = dmabuf->attributes.height;
|
||||||
|
} else {
|
||||||
|
wlr_log(L_ERROR, "Unknown buffer handle attached");
|
||||||
|
state->buffer_width = 0;
|
||||||
|
state->buffer_height = 0;
|
||||||
|
}
|
||||||
|
|
||||||
int width = state->buffer_width / scale;
|
int width = state->buffer_width / scale;
|
||||||
int height = state->buffer_height / scale;
|
int height = state->buffer_height / scale;
|
||||||
|
@ -316,52 +332,65 @@ static void wlr_surface_damage_subsurfaces(struct wlr_subsurface *subsurface) {
|
||||||
|
|
||||||
static void wlr_surface_apply_damage(struct wlr_surface *surface,
|
static void wlr_surface_apply_damage(struct wlr_surface *surface,
|
||||||
bool reupload_buffer) {
|
bool reupload_buffer) {
|
||||||
if (!surface->current->buffer) {
|
struct wl_resource *resource = surface->current->buffer;
|
||||||
|
if (resource == NULL) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
struct wl_shm_buffer *buffer = wl_shm_buffer_get(surface->current->buffer);
|
|
||||||
if (!buffer) {
|
struct wl_shm_buffer *buf = wl_shm_buffer_get(resource);
|
||||||
if (wlr_renderer_buffer_is_drm(surface->renderer,
|
if (buf != NULL) {
|
||||||
surface->current->buffer)) {
|
wl_shm_buffer_begin_access(buf);
|
||||||
wlr_texture_upload_drm(surface->texture, surface->current->buffer);
|
|
||||||
goto release;
|
enum wl_shm_format fmt = wl_shm_buffer_get_format(buf);
|
||||||
} else if (wlr_dmabuf_resource_is_buffer(
|
int32_t stride = wl_shm_buffer_get_stride(buf);
|
||||||
surface->current->buffer)) {
|
int32_t width = wl_shm_buffer_get_width(buf);
|
||||||
wlr_texture_upload_dmabuf(surface->texture, surface->current->buffer);
|
int32_t height = wl_shm_buffer_get_height(buf);
|
||||||
goto release;
|
void *data = wl_shm_buffer_get_data(buf);
|
||||||
|
|
||||||
|
if (surface->texture == NULL || reupload_buffer) {
|
||||||
|
wlr_texture_destroy(surface->texture);
|
||||||
|
surface->texture = wlr_texture_from_pixels(surface->renderer, fmt,
|
||||||
|
stride, width, height, data);
|
||||||
} else {
|
} else {
|
||||||
wlr_log(L_INFO, "Unknown buffer handle attached");
|
pixman_region32_t damage;
|
||||||
return;
|
pixman_region32_init(&damage);
|
||||||
}
|
pixman_region32_copy(&damage, &surface->current->buffer_damage);
|
||||||
}
|
pixman_region32_intersect_rect(&damage, &damage, 0, 0,
|
||||||
|
surface->current->buffer_width,
|
||||||
|
surface->current->buffer_height);
|
||||||
|
|
||||||
uint32_t format = wl_shm_buffer_get_format(buffer);
|
int n;
|
||||||
if (reupload_buffer) {
|
pixman_box32_t *rects = pixman_region32_rectangles(&damage, &n);
|
||||||
wlr_texture_upload_shm(surface->texture, format, buffer);
|
for (int i = 0; i < n; ++i) {
|
||||||
} else {
|
pixman_box32_t *r = &rects[i];
|
||||||
pixman_region32_t damage;
|
if (!wlr_texture_write_pixels(surface->texture, fmt, stride,
|
||||||
pixman_region32_init(&damage);
|
r->x2 - r->x1, r->y2 - r->y1, r->x1, r->y1,
|
||||||
pixman_region32_copy(&damage, &surface->current->buffer_damage);
|
r->x1, r->y1, data)) {
|
||||||
pixman_region32_intersect_rect(&damage, &damage, 0, 0,
|
break;
|
||||||
surface->current->buffer_width, surface->current->buffer_height);
|
}
|
||||||
|
|
||||||
int n;
|
|
||||||
pixman_box32_t *rects = pixman_region32_rectangles(&damage, &n);
|
|
||||||
for (int i = 0; i < n; ++i) {
|
|
||||||
pixman_box32_t rect = rects[i];
|
|
||||||
if (!wlr_texture_update_shm(surface->texture, format,
|
|
||||||
rect.x1, rect.y1,
|
|
||||||
rect.x2 - rect.x1,
|
|
||||||
rect.y2 - rect.y1,
|
|
||||||
buffer)) {
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pixman_region32_fini(&damage);
|
||||||
}
|
}
|
||||||
|
|
||||||
pixman_region32_fini(&damage);
|
wl_shm_buffer_end_access(buf);
|
||||||
|
} else if (!surface->texture || reupload_buffer) {
|
||||||
|
wlr_texture_destroy(surface->texture);
|
||||||
|
|
||||||
|
if (wlr_renderer_resource_is_wl_drm_buffer(surface->renderer, resource)) {
|
||||||
|
surface->texture =
|
||||||
|
wlr_texture_from_wl_drm(surface->renderer, resource);
|
||||||
|
} else if (wlr_dmabuf_resource_is_buffer(resource)) {
|
||||||
|
struct wlr_dmabuf_buffer *dmabuf =
|
||||||
|
wlr_dmabuf_buffer_from_buffer_resource(resource);
|
||||||
|
surface->texture =
|
||||||
|
wlr_texture_from_dmabuf(surface->renderer, &dmabuf->attributes);
|
||||||
|
} else {
|
||||||
|
surface->texture = NULL;
|
||||||
|
wlr_log(L_ERROR, "Unknown buffer handle attached");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
release:
|
|
||||||
wlr_surface_state_release_buffer(surface->current);
|
wlr_surface_state_release_buffer(surface->current);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -376,7 +405,8 @@ static void wlr_surface_commit_pending(struct wlr_surface *surface) {
|
||||||
wlr_surface_move_state(surface, surface->pending, surface->current);
|
wlr_surface_move_state(surface, surface->pending, surface->current);
|
||||||
|
|
||||||
if (null_buffer_commit) {
|
if (null_buffer_commit) {
|
||||||
surface->texture->valid = false;
|
wlr_texture_destroy(surface->texture);
|
||||||
|
surface->texture = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool reupload_buffer = oldw != surface->current->buffer_width ||
|
bool reupload_buffer = oldw != surface->current->buffer_width ||
|
||||||
|
@ -612,7 +642,6 @@ struct wlr_surface *wlr_surface_create(struct wl_resource *res,
|
||||||
}
|
}
|
||||||
wlr_log(L_DEBUG, "New wlr_surface %p (res %p)", surface, res);
|
wlr_log(L_DEBUG, "New wlr_surface %p (res %p)", surface, res);
|
||||||
surface->renderer = renderer;
|
surface->renderer = renderer;
|
||||||
surface->texture = wlr_render_texture_create(renderer);
|
|
||||||
surface->resource = res;
|
surface->resource = res;
|
||||||
|
|
||||||
surface->current = wlr_surface_state_create();
|
surface->current = wlr_surface_state_create();
|
||||||
|
@ -629,7 +658,7 @@ struct wlr_surface *wlr_surface_create(struct wl_resource *res,
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wlr_surface_has_buffer(struct wlr_surface *surface) {
|
bool wlr_surface_has_buffer(struct wlr_surface *surface) {
|
||||||
return surface->texture && surface->texture->valid;
|
return surface->texture != NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
int wlr_surface_set_role(struct wlr_surface *surface, const char *role,
|
int wlr_surface_set_role(struct wlr_surface *surface, const char *role,
|
||||||
|
|
|
@ -77,7 +77,7 @@ void wlr_xcursor_manager_set_cursor_image(struct wlr_xcursor_manager *manager,
|
||||||
}
|
}
|
||||||
|
|
||||||
struct wlr_xcursor_image *image = xcursor->images[0];
|
struct wlr_xcursor_image *image = xcursor->images[0];
|
||||||
wlr_cursor_set_image(cursor, image->buffer, image->width,
|
wlr_cursor_set_image(cursor, image->buffer, image->width * 4,
|
||||||
image->width, image->height, image->hotspot_x, image->hotspot_y,
|
image->width, image->height, image->hotspot_x, image->hotspot_y,
|
||||||
theme->scale);
|
theme->scale);
|
||||||
}
|
}
|
||||||
|
|
|
@ -194,18 +194,19 @@ static void xdg_surface_unmap(struct wlr_xdg_surface *surface) {
|
||||||
assert(surface->role != WLR_XDG_SURFACE_ROLE_NONE);
|
assert(surface->role != WLR_XDG_SURFACE_ROLE_NONE);
|
||||||
|
|
||||||
// TODO: probably need to ungrab before this event
|
// TODO: probably need to ungrab before this event
|
||||||
wlr_signal_emit_safe(&surface->events.unmap, surface);
|
if (surface->mapped) {
|
||||||
|
wlr_signal_emit_safe(&surface->events.unmap, surface);
|
||||||
if (surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL) {
|
|
||||||
wl_resource_set_user_data(surface->toplevel->resource, NULL);
|
|
||||||
free(surface->toplevel);
|
|
||||||
surface->toplevel = NULL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (surface->role == WLR_XDG_SURFACE_ROLE_POPUP) {
|
switch (surface->role) {
|
||||||
wl_resource_set_user_data(surface->popup->resource, NULL);
|
case WLR_XDG_SURFACE_ROLE_TOPLEVEL:
|
||||||
|
free(surface->toplevel->title);
|
||||||
if (surface->popup->seat) {
|
surface->toplevel->title = NULL;
|
||||||
|
free(surface->toplevel->app_id);
|
||||||
|
surface->toplevel->app_id = NULL;
|
||||||
|
break;
|
||||||
|
case WLR_XDG_SURFACE_ROLE_POPUP:
|
||||||
|
if (surface->popup->seat != NULL) {
|
||||||
struct wlr_xdg_popup_grab *grab =
|
struct wlr_xdg_popup_grab *grab =
|
||||||
xdg_shell_popup_grab_from_seat(surface->client->shell,
|
xdg_shell_popup_grab_from_seat(surface->client->shell,
|
||||||
surface->popup->seat);
|
surface->popup->seat);
|
||||||
|
@ -220,11 +221,12 @@ static void xdg_surface_unmap(struct wlr_xdg_surface *surface) {
|
||||||
wlr_seat_keyboard_end_grab(grab->seat);
|
wlr_seat_keyboard_end_grab(grab->seat);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
wl_list_remove(&surface->popup->link);
|
surface->popup->seat = NULL;
|
||||||
free(surface->popup);
|
}
|
||||||
surface->popup = NULL;
|
break;
|
||||||
|
case WLR_XDG_SURFACE_ROLE_NONE:
|
||||||
|
assert(false && "not reached");
|
||||||
}
|
}
|
||||||
|
|
||||||
struct wlr_xdg_surface_configure *configure, *tmp;
|
struct wlr_xdg_surface_configure *configure, *tmp;
|
||||||
|
@ -232,13 +234,7 @@ static void xdg_surface_unmap(struct wlr_xdg_surface *surface) {
|
||||||
xdg_surface_configure_destroy(configure);
|
xdg_surface_configure_destroy(configure);
|
||||||
}
|
}
|
||||||
|
|
||||||
surface->role = WLR_XDG_SURFACE_ROLE_NONE;
|
surface->configured = surface->mapped = false;
|
||||||
free(surface->title);
|
|
||||||
surface->title = NULL;
|
|
||||||
free(surface->app_id);
|
|
||||||
surface->app_id = NULL;
|
|
||||||
|
|
||||||
surface->added = surface->configured = surface->mapped = false;
|
|
||||||
surface->configure_serial = 0;
|
surface->configure_serial = 0;
|
||||||
if (surface->configure_idle) {
|
if (surface->configure_idle) {
|
||||||
wl_event_source_remove(surface->configure_idle);
|
wl_event_source_remove(surface->configure_idle);
|
||||||
|
@ -251,6 +247,29 @@ static void xdg_surface_unmap(struct wlr_xdg_surface *surface) {
|
||||||
memset(&surface->next_geometry, 0, sizeof(struct wlr_box));
|
memset(&surface->next_geometry, 0, sizeof(struct wlr_box));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void xdg_toplevel_destroy(struct wlr_xdg_surface *surface) {
|
||||||
|
assert(surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL);
|
||||||
|
xdg_surface_unmap(surface);
|
||||||
|
|
||||||
|
wl_resource_set_user_data(surface->toplevel->resource, NULL);
|
||||||
|
free(surface->toplevel);
|
||||||
|
surface->toplevel = NULL;
|
||||||
|
|
||||||
|
surface->role = WLR_XDG_SURFACE_ROLE_NONE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void xdg_popup_destroy(struct wlr_xdg_surface *surface) {
|
||||||
|
assert(surface->role == WLR_XDG_SURFACE_ROLE_POPUP);
|
||||||
|
xdg_surface_unmap(surface);
|
||||||
|
|
||||||
|
wl_resource_set_user_data(surface->popup->resource, NULL);
|
||||||
|
wl_list_remove(&surface->popup->link);
|
||||||
|
free(surface->popup);
|
||||||
|
surface->popup = NULL;
|
||||||
|
|
||||||
|
surface->role = WLR_XDG_SURFACE_ROLE_NONE;
|
||||||
|
}
|
||||||
|
|
||||||
static void xdg_surface_destroy(struct wlr_xdg_surface *surface) {
|
static void xdg_surface_destroy(struct wlr_xdg_surface *surface) {
|
||||||
if (surface->role != WLR_XDG_SURFACE_ROLE_NONE) {
|
if (surface->role != WLR_XDG_SURFACE_ROLE_NONE) {
|
||||||
xdg_surface_unmap(surface);
|
xdg_surface_unmap(surface);
|
||||||
|
@ -258,6 +277,18 @@ static void xdg_surface_destroy(struct wlr_xdg_surface *surface) {
|
||||||
|
|
||||||
wlr_signal_emit_safe(&surface->events.destroy, surface);
|
wlr_signal_emit_safe(&surface->events.destroy, surface);
|
||||||
|
|
||||||
|
switch (surface->role) {
|
||||||
|
case WLR_XDG_SURFACE_ROLE_TOPLEVEL:
|
||||||
|
xdg_toplevel_destroy(surface);
|
||||||
|
break;
|
||||||
|
case WLR_XDG_SURFACE_ROLE_POPUP:
|
||||||
|
xdg_popup_destroy(surface);
|
||||||
|
break;
|
||||||
|
case WLR_XDG_SURFACE_ROLE_NONE:
|
||||||
|
// This space is intentionally left blank
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
wl_resource_set_user_data(surface->resource, NULL);
|
wl_resource_set_user_data(surface->resource, NULL);
|
||||||
wl_list_remove(&surface->link);
|
wl_list_remove(&surface->link);
|
||||||
wl_list_remove(&surface->surface_destroy_listener.link);
|
wl_list_remove(&surface->surface_destroy_listener.link);
|
||||||
|
@ -572,7 +603,7 @@ static void xdg_popup_resource_destroy(struct wl_resource *resource) {
|
||||||
struct wlr_xdg_surface *surface =
|
struct wlr_xdg_surface *surface =
|
||||||
xdg_surface_from_xdg_popup_resource(resource);
|
xdg_surface_from_xdg_popup_resource(resource);
|
||||||
if (surface != NULL) {
|
if (surface != NULL) {
|
||||||
xdg_surface_unmap(surface);
|
xdg_popup_destroy(surface);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -671,8 +702,8 @@ static void xdg_toplevel_handle_set_title(struct wl_client *client,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
free(surface->title);
|
free(surface->toplevel->title);
|
||||||
surface->title = tmp;
|
surface->toplevel->title = tmp;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void xdg_toplevel_handle_set_app_id(struct wl_client *client,
|
static void xdg_toplevel_handle_set_app_id(struct wl_client *client,
|
||||||
|
@ -686,8 +717,8 @@ static void xdg_toplevel_handle_set_app_id(struct wl_client *client,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
free(surface->app_id);
|
free(surface->toplevel->app_id);
|
||||||
surface->app_id = tmp;
|
surface->toplevel->app_id = tmp;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void xdg_toplevel_handle_show_window_menu(struct wl_client *client,
|
static void xdg_toplevel_handle_show_window_menu(struct wl_client *client,
|
||||||
|
@ -718,7 +749,7 @@ static void xdg_toplevel_handle_show_window_menu(struct wl_client *client,
|
||||||
.y = y,
|
.y = y,
|
||||||
};
|
};
|
||||||
|
|
||||||
wlr_signal_emit_safe(&surface->events.request_show_window_menu, &event);
|
wlr_signal_emit_safe(&surface->toplevel->events.request_show_window_menu, &event);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void xdg_toplevel_handle_move(struct wl_client *client,
|
static void xdg_toplevel_handle_move(struct wl_client *client,
|
||||||
|
@ -747,7 +778,7 @@ static void xdg_toplevel_handle_move(struct wl_client *client,
|
||||||
.serial = serial,
|
.serial = serial,
|
||||||
};
|
};
|
||||||
|
|
||||||
wlr_signal_emit_safe(&surface->events.request_move, &event);
|
wlr_signal_emit_safe(&surface->toplevel->events.request_move, &event);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void xdg_toplevel_handle_resize(struct wl_client *client,
|
static void xdg_toplevel_handle_resize(struct wl_client *client,
|
||||||
|
@ -777,39 +808,39 @@ static void xdg_toplevel_handle_resize(struct wl_client *client,
|
||||||
.edges = edges,
|
.edges = edges,
|
||||||
};
|
};
|
||||||
|
|
||||||
wlr_signal_emit_safe(&surface->events.request_resize, &event);
|
wlr_signal_emit_safe(&surface->toplevel->events.request_resize, &event);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void xdg_toplevel_handle_set_max_size(struct wl_client *client,
|
static void xdg_toplevel_handle_set_max_size(struct wl_client *client,
|
||||||
struct wl_resource *resource, int32_t width, int32_t height) {
|
struct wl_resource *resource, int32_t width, int32_t height) {
|
||||||
struct wlr_xdg_surface *surface =
|
struct wlr_xdg_surface *surface =
|
||||||
xdg_surface_from_xdg_toplevel_resource(resource);
|
xdg_surface_from_xdg_toplevel_resource(resource);
|
||||||
surface->toplevel->next.max_width = width;
|
surface->toplevel->client_pending.max_width = width;
|
||||||
surface->toplevel->next.max_height = height;
|
surface->toplevel->client_pending.max_height = height;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void xdg_toplevel_handle_set_min_size(struct wl_client *client,
|
static void xdg_toplevel_handle_set_min_size(struct wl_client *client,
|
||||||
struct wl_resource *resource, int32_t width, int32_t height) {
|
struct wl_resource *resource, int32_t width, int32_t height) {
|
||||||
struct wlr_xdg_surface *surface =
|
struct wlr_xdg_surface *surface =
|
||||||
xdg_surface_from_xdg_toplevel_resource(resource);
|
xdg_surface_from_xdg_toplevel_resource(resource);
|
||||||
surface->toplevel->next.min_width = width;
|
surface->toplevel->client_pending.min_width = width;
|
||||||
surface->toplevel->next.min_height = height;
|
surface->toplevel->client_pending.min_height = height;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void xdg_toplevel_handle_set_maximized(struct wl_client *client,
|
static void xdg_toplevel_handle_set_maximized(struct wl_client *client,
|
||||||
struct wl_resource *resource) {
|
struct wl_resource *resource) {
|
||||||
struct wlr_xdg_surface *surface =
|
struct wlr_xdg_surface *surface =
|
||||||
xdg_surface_from_xdg_toplevel_resource(resource);
|
xdg_surface_from_xdg_toplevel_resource(resource);
|
||||||
surface->toplevel->next.maximized = true;
|
surface->toplevel->client_pending.maximized = true;
|
||||||
wlr_signal_emit_safe(&surface->events.request_maximize, surface);
|
wlr_signal_emit_safe(&surface->toplevel->events.request_maximize, surface);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void xdg_toplevel_handle_unset_maximized(struct wl_client *client,
|
static void xdg_toplevel_handle_unset_maximized(struct wl_client *client,
|
||||||
struct wl_resource *resource) {
|
struct wl_resource *resource) {
|
||||||
struct wlr_xdg_surface *surface =
|
struct wlr_xdg_surface *surface =
|
||||||
xdg_surface_from_xdg_toplevel_resource(resource);
|
xdg_surface_from_xdg_toplevel_resource(resource);
|
||||||
surface->toplevel->next.maximized = false;
|
surface->toplevel->client_pending.maximized = false;
|
||||||
wlr_signal_emit_safe(&surface->events.request_maximize, surface);
|
wlr_signal_emit_safe(&surface->toplevel->events.request_maximize, surface);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void xdg_toplevel_handle_set_fullscreen(struct wl_client *client,
|
static void xdg_toplevel_handle_set_fullscreen(struct wl_client *client,
|
||||||
|
@ -822,7 +853,7 @@ static void xdg_toplevel_handle_set_fullscreen(struct wl_client *client,
|
||||||
output = wlr_output_from_resource(output_resource);
|
output = wlr_output_from_resource(output_resource);
|
||||||
}
|
}
|
||||||
|
|
||||||
surface->toplevel->next.fullscreen = true;
|
surface->toplevel->client_pending.fullscreen = true;
|
||||||
|
|
||||||
struct wlr_xdg_toplevel_set_fullscreen_event event = {
|
struct wlr_xdg_toplevel_set_fullscreen_event event = {
|
||||||
.surface = surface,
|
.surface = surface,
|
||||||
|
@ -830,7 +861,7 @@ static void xdg_toplevel_handle_set_fullscreen(struct wl_client *client,
|
||||||
.output = output,
|
.output = output,
|
||||||
};
|
};
|
||||||
|
|
||||||
wlr_signal_emit_safe(&surface->events.request_fullscreen, &event);
|
wlr_signal_emit_safe(&surface->toplevel->events.request_fullscreen, &event);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void xdg_toplevel_handle_unset_fullscreen(struct wl_client *client,
|
static void xdg_toplevel_handle_unset_fullscreen(struct wl_client *client,
|
||||||
|
@ -838,7 +869,7 @@ static void xdg_toplevel_handle_unset_fullscreen(struct wl_client *client,
|
||||||
struct wlr_xdg_surface *surface =
|
struct wlr_xdg_surface *surface =
|
||||||
xdg_surface_from_xdg_toplevel_resource(resource);
|
xdg_surface_from_xdg_toplevel_resource(resource);
|
||||||
|
|
||||||
surface->toplevel->next.fullscreen = false;
|
surface->toplevel->client_pending.fullscreen = false;
|
||||||
|
|
||||||
struct wlr_xdg_toplevel_set_fullscreen_event event = {
|
struct wlr_xdg_toplevel_set_fullscreen_event event = {
|
||||||
.surface = surface,
|
.surface = surface,
|
||||||
|
@ -846,14 +877,14 @@ static void xdg_toplevel_handle_unset_fullscreen(struct wl_client *client,
|
||||||
.output = NULL,
|
.output = NULL,
|
||||||
};
|
};
|
||||||
|
|
||||||
wlr_signal_emit_safe(&surface->events.request_fullscreen, &event);
|
wlr_signal_emit_safe(&surface->toplevel->events.request_fullscreen, &event);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void xdg_toplevel_handle_set_minimized(struct wl_client *client,
|
static void xdg_toplevel_handle_set_minimized(struct wl_client *client,
|
||||||
struct wl_resource *resource) {
|
struct wl_resource *resource) {
|
||||||
struct wlr_xdg_surface *surface =
|
struct wlr_xdg_surface *surface =
|
||||||
xdg_surface_from_xdg_toplevel_resource(resource);
|
xdg_surface_from_xdg_toplevel_resource(resource);
|
||||||
wlr_signal_emit_safe(&surface->events.request_minimize, surface);
|
wlr_signal_emit_safe(&surface->toplevel->events.request_minimize, surface);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct xdg_toplevel_interface xdg_toplevel_implementation = {
|
static const struct xdg_toplevel_interface xdg_toplevel_implementation = {
|
||||||
|
@ -885,7 +916,7 @@ static void xdg_toplevel_resource_destroy(struct wl_resource *resource) {
|
||||||
struct wlr_xdg_surface *surface =
|
struct wlr_xdg_surface *surface =
|
||||||
xdg_surface_from_xdg_toplevel_resource(resource);
|
xdg_surface_from_xdg_toplevel_resource(resource);
|
||||||
if (surface != NULL) {
|
if (surface != NULL) {
|
||||||
xdg_surface_unmap(surface);
|
xdg_toplevel_destroy(surface);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -903,6 +934,12 @@ static void xdg_surface_handle_get_toplevel(struct wl_client *client,
|
||||||
wl_resource_post_no_memory(resource);
|
wl_resource_post_no_memory(resource);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
wl_signal_init(&surface->toplevel->events.request_maximize);
|
||||||
|
wl_signal_init(&surface->toplevel->events.request_fullscreen);
|
||||||
|
wl_signal_init(&surface->toplevel->events.request_minimize);
|
||||||
|
wl_signal_init(&surface->toplevel->events.request_move);
|
||||||
|
wl_signal_init(&surface->toplevel->events.request_resize);
|
||||||
|
wl_signal_init(&surface->toplevel->events.request_show_window_menu);
|
||||||
|
|
||||||
surface->role = WLR_XDG_SURFACE_ROLE_TOPLEVEL;
|
surface->role = WLR_XDG_SURFACE_ROLE_TOPLEVEL;
|
||||||
surface->toplevel->base = surface;
|
surface->toplevel->base = surface;
|
||||||
|
@ -1050,25 +1087,25 @@ static bool wlr_xdg_surface_toplevel_state_compare(
|
||||||
configured.height = configure->toplevel_state->height;
|
configured.height = configure->toplevel_state->height;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (state->pending.activated != configured.state.activated) {
|
if (state->server_pending.activated != configured.state.activated) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (state->pending.fullscreen != configured.state.fullscreen) {
|
if (state->server_pending.fullscreen != configured.state.fullscreen) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (state->pending.maximized != configured.state.maximized) {
|
if (state->server_pending.maximized != configured.state.maximized) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (state->pending.resizing != configured.state.resizing) {
|
if (state->server_pending.resizing != configured.state.resizing) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (state->pending.width == configured.width &&
|
if (state->server_pending.width == configured.width &&
|
||||||
state->pending.height == configured.height) {
|
state->server_pending.height == configured.height) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (state->pending.width == 0 && state->pending.height == 0) {
|
if (state->server_pending.width == 0 && state->server_pending.height == 0) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1086,12 +1123,12 @@ static void wlr_xdg_toplevel_send_configure(
|
||||||
wl_resource_post_no_memory(surface->toplevel->resource);
|
wl_resource_post_no_memory(surface->toplevel->resource);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
*configure->toplevel_state = surface->toplevel->pending;
|
*configure->toplevel_state = surface->toplevel->server_pending;
|
||||||
|
|
||||||
uint32_t *s;
|
uint32_t *s;
|
||||||
struct wl_array states;
|
struct wl_array states;
|
||||||
wl_array_init(&states);
|
wl_array_init(&states);
|
||||||
if (surface->toplevel->pending.maximized) {
|
if (surface->toplevel->server_pending.maximized) {
|
||||||
s = wl_array_add(&states, sizeof(uint32_t));
|
s = wl_array_add(&states, sizeof(uint32_t));
|
||||||
if (!s) {
|
if (!s) {
|
||||||
wlr_log(L_ERROR, "Could not allocate state for maximized xdg_toplevel");
|
wlr_log(L_ERROR, "Could not allocate state for maximized xdg_toplevel");
|
||||||
|
@ -1099,7 +1136,7 @@ static void wlr_xdg_toplevel_send_configure(
|
||||||
}
|
}
|
||||||
*s = XDG_TOPLEVEL_STATE_MAXIMIZED;
|
*s = XDG_TOPLEVEL_STATE_MAXIMIZED;
|
||||||
}
|
}
|
||||||
if (surface->toplevel->pending.fullscreen) {
|
if (surface->toplevel->server_pending.fullscreen) {
|
||||||
s = wl_array_add(&states, sizeof(uint32_t));
|
s = wl_array_add(&states, sizeof(uint32_t));
|
||||||
if (!s) {
|
if (!s) {
|
||||||
wlr_log(L_ERROR, "Could not allocate state for fullscreen xdg_toplevel");
|
wlr_log(L_ERROR, "Could not allocate state for fullscreen xdg_toplevel");
|
||||||
|
@ -1107,7 +1144,7 @@ static void wlr_xdg_toplevel_send_configure(
|
||||||
}
|
}
|
||||||
*s = XDG_TOPLEVEL_STATE_FULLSCREEN;
|
*s = XDG_TOPLEVEL_STATE_FULLSCREEN;
|
||||||
}
|
}
|
||||||
if (surface->toplevel->pending.resizing) {
|
if (surface->toplevel->server_pending.resizing) {
|
||||||
s = wl_array_add(&states, sizeof(uint32_t));
|
s = wl_array_add(&states, sizeof(uint32_t));
|
||||||
if (!s) {
|
if (!s) {
|
||||||
wlr_log(L_ERROR, "Could not allocate state for resizing xdg_toplevel");
|
wlr_log(L_ERROR, "Could not allocate state for resizing xdg_toplevel");
|
||||||
|
@ -1115,7 +1152,7 @@ static void wlr_xdg_toplevel_send_configure(
|
||||||
}
|
}
|
||||||
*s = XDG_TOPLEVEL_STATE_RESIZING;
|
*s = XDG_TOPLEVEL_STATE_RESIZING;
|
||||||
}
|
}
|
||||||
if (surface->toplevel->pending.activated) {
|
if (surface->toplevel->server_pending.activated) {
|
||||||
s = wl_array_add(&states, sizeof(uint32_t));
|
s = wl_array_add(&states, sizeof(uint32_t));
|
||||||
if (!s) {
|
if (!s) {
|
||||||
wlr_log(L_ERROR, "Could not allocate state for activated xdg_toplevel");
|
wlr_log(L_ERROR, "Could not allocate state for activated xdg_toplevel");
|
||||||
|
@ -1124,8 +1161,8 @@ static void wlr_xdg_toplevel_send_configure(
|
||||||
*s = XDG_TOPLEVEL_STATE_ACTIVATED;
|
*s = XDG_TOPLEVEL_STATE_ACTIVATED;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t width = surface->toplevel->pending.width;
|
uint32_t width = surface->toplevel->server_pending.width;
|
||||||
uint32_t height = surface->toplevel->pending.height;
|
uint32_t height = surface->toplevel->server_pending.height;
|
||||||
xdg_toplevel_send_configure(surface->toplevel->resource, width, height,
|
xdg_toplevel_send_configure(surface->toplevel->resource, width, height,
|
||||||
&states);
|
&states);
|
||||||
|
|
||||||
|
@ -1233,13 +1270,13 @@ static void wlr_xdg_surface_toplevel_committed(
|
||||||
|
|
||||||
// update state that doesn't need compositor approval
|
// update state that doesn't need compositor approval
|
||||||
surface->toplevel->current.max_width =
|
surface->toplevel->current.max_width =
|
||||||
surface->toplevel->next.max_width;
|
surface->toplevel->client_pending.max_width;
|
||||||
surface->toplevel->current.min_width =
|
surface->toplevel->current.min_width =
|
||||||
surface->toplevel->next.min_width;
|
surface->toplevel->client_pending.min_width;
|
||||||
surface->toplevel->current.max_height =
|
surface->toplevel->current.max_height =
|
||||||
surface->toplevel->next.max_height;
|
surface->toplevel->client_pending.max_height;
|
||||||
surface->toplevel->current.min_height =
|
surface->toplevel->current.min_height =
|
||||||
surface->toplevel->next.min_height;
|
surface->toplevel->client_pending.min_height;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void wlr_xdg_surface_popup_committed(
|
static void wlr_xdg_surface_popup_committed(
|
||||||
|
@ -1347,12 +1384,6 @@ static void xdg_shell_handle_get_xdg_surface(struct wl_client *wl_client,
|
||||||
wl_list_init(&surface->configure_list);
|
wl_list_init(&surface->configure_list);
|
||||||
wl_list_init(&surface->popups);
|
wl_list_init(&surface->popups);
|
||||||
|
|
||||||
wl_signal_init(&surface->events.request_maximize);
|
|
||||||
wl_signal_init(&surface->events.request_fullscreen);
|
|
||||||
wl_signal_init(&surface->events.request_minimize);
|
|
||||||
wl_signal_init(&surface->events.request_move);
|
|
||||||
wl_signal_init(&surface->events.request_resize);
|
|
||||||
wl_signal_init(&surface->events.request_show_window_menu);
|
|
||||||
wl_signal_init(&surface->events.destroy);
|
wl_signal_init(&surface->events.destroy);
|
||||||
wl_signal_init(&surface->events.ping_timeout);
|
wl_signal_init(&surface->events.ping_timeout);
|
||||||
wl_signal_init(&surface->events.new_popup);
|
wl_signal_init(&surface->events.new_popup);
|
||||||
|
@ -1530,8 +1561,8 @@ void wlr_xdg_surface_ping(struct wlr_xdg_surface *surface) {
|
||||||
uint32_t wlr_xdg_toplevel_set_size(struct wlr_xdg_surface *surface,
|
uint32_t wlr_xdg_toplevel_set_size(struct wlr_xdg_surface *surface,
|
||||||
uint32_t width, uint32_t height) {
|
uint32_t width, uint32_t height) {
|
||||||
assert(surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL);
|
assert(surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL);
|
||||||
surface->toplevel->pending.width = width;
|
surface->toplevel->server_pending.width = width;
|
||||||
surface->toplevel->pending.height = height;
|
surface->toplevel->server_pending.height = height;
|
||||||
|
|
||||||
return wlr_xdg_surface_schedule_configure(surface);
|
return wlr_xdg_surface_schedule_configure(surface);
|
||||||
}
|
}
|
||||||
|
@ -1539,7 +1570,7 @@ uint32_t wlr_xdg_toplevel_set_size(struct wlr_xdg_surface *surface,
|
||||||
uint32_t wlr_xdg_toplevel_set_activated(struct wlr_xdg_surface *surface,
|
uint32_t wlr_xdg_toplevel_set_activated(struct wlr_xdg_surface *surface,
|
||||||
bool activated) {
|
bool activated) {
|
||||||
assert(surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL);
|
assert(surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL);
|
||||||
surface->toplevel->pending.activated = activated;
|
surface->toplevel->server_pending.activated = activated;
|
||||||
|
|
||||||
return wlr_xdg_surface_schedule_configure(surface);
|
return wlr_xdg_surface_schedule_configure(surface);
|
||||||
}
|
}
|
||||||
|
@ -1547,7 +1578,7 @@ uint32_t wlr_xdg_toplevel_set_activated(struct wlr_xdg_surface *surface,
|
||||||
uint32_t wlr_xdg_toplevel_set_maximized(struct wlr_xdg_surface *surface,
|
uint32_t wlr_xdg_toplevel_set_maximized(struct wlr_xdg_surface *surface,
|
||||||
bool maximized) {
|
bool maximized) {
|
||||||
assert(surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL);
|
assert(surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL);
|
||||||
surface->toplevel->pending.maximized = maximized;
|
surface->toplevel->server_pending.maximized = maximized;
|
||||||
|
|
||||||
return wlr_xdg_surface_schedule_configure(surface);
|
return wlr_xdg_surface_schedule_configure(surface);
|
||||||
}
|
}
|
||||||
|
@ -1555,7 +1586,7 @@ uint32_t wlr_xdg_toplevel_set_maximized(struct wlr_xdg_surface *surface,
|
||||||
uint32_t wlr_xdg_toplevel_set_fullscreen(struct wlr_xdg_surface *surface,
|
uint32_t wlr_xdg_toplevel_set_fullscreen(struct wlr_xdg_surface *surface,
|
||||||
bool fullscreen) {
|
bool fullscreen) {
|
||||||
assert(surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL);
|
assert(surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL);
|
||||||
surface->toplevel->pending.fullscreen = fullscreen;
|
surface->toplevel->server_pending.fullscreen = fullscreen;
|
||||||
|
|
||||||
return wlr_xdg_surface_schedule_configure(surface);
|
return wlr_xdg_surface_schedule_configure(surface);
|
||||||
}
|
}
|
||||||
|
@ -1563,14 +1594,27 @@ uint32_t wlr_xdg_toplevel_set_fullscreen(struct wlr_xdg_surface *surface,
|
||||||
uint32_t wlr_xdg_toplevel_set_resizing(struct wlr_xdg_surface *surface,
|
uint32_t wlr_xdg_toplevel_set_resizing(struct wlr_xdg_surface *surface,
|
||||||
bool resizing) {
|
bool resizing) {
|
||||||
assert(surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL);
|
assert(surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL);
|
||||||
surface->toplevel->pending.resizing = resizing;
|
surface->toplevel->server_pending.resizing = resizing;
|
||||||
|
|
||||||
return wlr_xdg_surface_schedule_configure(surface);
|
return wlr_xdg_surface_schedule_configure(surface);
|
||||||
}
|
}
|
||||||
|
|
||||||
void wlr_xdg_toplevel_send_close(struct wlr_xdg_surface *surface) {
|
void wlr_xdg_surface_send_close(struct wlr_xdg_surface *surface) {
|
||||||
assert(surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL);
|
switch (surface->role) {
|
||||||
xdg_toplevel_send_close(surface->toplevel->resource);
|
case WLR_XDG_SURFACE_ROLE_NONE:
|
||||||
|
assert(0 && "not reached");
|
||||||
|
break;
|
||||||
|
case WLR_XDG_SURFACE_ROLE_TOPLEVEL:
|
||||||
|
if (surface->toplevel) {
|
||||||
|
xdg_toplevel_send_close(surface->toplevel->resource);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case WLR_XDG_SURFACE_ROLE_POPUP:
|
||||||
|
if (surface->popup) {
|
||||||
|
xdg_popup_send_popup_done(surface->popup->resource);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void wlr_xdg_surface_popup_get_position(struct wlr_xdg_surface *surface,
|
void wlr_xdg_surface_popup_get_position(struct wlr_xdg_surface *surface,
|
||||||
|
|
|
@ -181,18 +181,19 @@ static void xdg_surface_unmap(struct wlr_xdg_surface_v6 *surface) {
|
||||||
assert(surface->role != WLR_XDG_SURFACE_V6_ROLE_NONE);
|
assert(surface->role != WLR_XDG_SURFACE_V6_ROLE_NONE);
|
||||||
|
|
||||||
// TODO: probably need to ungrab before this event
|
// TODO: probably need to ungrab before this event
|
||||||
wlr_signal_emit_safe(&surface->events.unmap, surface);
|
if (surface->mapped) {
|
||||||
|
wlr_signal_emit_safe(&surface->events.unmap, surface);
|
||||||
if (surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) {
|
|
||||||
wl_resource_set_user_data(surface->toplevel->resource, NULL);
|
|
||||||
free(surface->toplevel);
|
|
||||||
surface->toplevel = NULL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (surface->role == WLR_XDG_SURFACE_V6_ROLE_POPUP) {
|
switch (surface->role) {
|
||||||
wl_resource_set_user_data(surface->popup->resource, NULL);
|
case WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL:
|
||||||
|
free(surface->toplevel->title);
|
||||||
if (surface->popup->seat) {
|
surface->toplevel->title = NULL;
|
||||||
|
free(surface->toplevel->app_id);
|
||||||
|
surface->toplevel->app_id = NULL;
|
||||||
|
break;
|
||||||
|
case WLR_XDG_SURFACE_V6_ROLE_POPUP:
|
||||||
|
if (surface->popup->seat != NULL) {
|
||||||
struct wlr_xdg_popup_grab_v6 *grab =
|
struct wlr_xdg_popup_grab_v6 *grab =
|
||||||
xdg_shell_popup_grab_from_seat(surface->client->shell,
|
xdg_shell_popup_grab_from_seat(surface->client->shell,
|
||||||
surface->popup->seat);
|
surface->popup->seat);
|
||||||
|
@ -207,11 +208,12 @@ static void xdg_surface_unmap(struct wlr_xdg_surface_v6 *surface) {
|
||||||
wlr_seat_keyboard_end_grab(grab->seat);
|
wlr_seat_keyboard_end_grab(grab->seat);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
wl_list_remove(&surface->popup->link);
|
surface->popup->seat = NULL;
|
||||||
free(surface->popup);
|
}
|
||||||
surface->popup = NULL;
|
break;
|
||||||
|
case WLR_XDG_SURFACE_V6_ROLE_NONE:
|
||||||
|
assert(false && "not reached");
|
||||||
}
|
}
|
||||||
|
|
||||||
struct wlr_xdg_surface_v6_configure *configure, *tmp;
|
struct wlr_xdg_surface_v6_configure *configure, *tmp;
|
||||||
|
@ -219,13 +221,7 @@ static void xdg_surface_unmap(struct wlr_xdg_surface_v6 *surface) {
|
||||||
xdg_surface_configure_destroy(configure);
|
xdg_surface_configure_destroy(configure);
|
||||||
}
|
}
|
||||||
|
|
||||||
surface->role = WLR_XDG_SURFACE_V6_ROLE_NONE;
|
surface->configured = surface->mapped = false;
|
||||||
free(surface->title);
|
|
||||||
surface->title = NULL;
|
|
||||||
free(surface->app_id);
|
|
||||||
surface->app_id = NULL;
|
|
||||||
|
|
||||||
surface->added = surface->configured = surface->mapped = false;
|
|
||||||
surface->configure_serial = 0;
|
surface->configure_serial = 0;
|
||||||
if (surface->configure_idle) {
|
if (surface->configure_idle) {
|
||||||
wl_event_source_remove(surface->configure_idle);
|
wl_event_source_remove(surface->configure_idle);
|
||||||
|
@ -238,6 +234,29 @@ static void xdg_surface_unmap(struct wlr_xdg_surface_v6 *surface) {
|
||||||
memset(&surface->next_geometry, 0, sizeof(struct wlr_box));
|
memset(&surface->next_geometry, 0, sizeof(struct wlr_box));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void xdg_toplevel_destroy(struct wlr_xdg_surface_v6 *surface) {
|
||||||
|
assert(surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL);
|
||||||
|
xdg_surface_unmap(surface);
|
||||||
|
|
||||||
|
wl_resource_set_user_data(surface->toplevel->resource, NULL);
|
||||||
|
free(surface->toplevel);
|
||||||
|
surface->toplevel = NULL;
|
||||||
|
|
||||||
|
surface->role = WLR_XDG_SURFACE_V6_ROLE_NONE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void xdg_popup_destroy(struct wlr_xdg_surface_v6 *surface) {
|
||||||
|
assert(surface->role == WLR_XDG_SURFACE_V6_ROLE_POPUP);
|
||||||
|
xdg_surface_unmap(surface);
|
||||||
|
|
||||||
|
wl_resource_set_user_data(surface->popup->resource, NULL);
|
||||||
|
wl_list_remove(&surface->popup->link);
|
||||||
|
free(surface->popup);
|
||||||
|
surface->popup = NULL;
|
||||||
|
|
||||||
|
surface->role = WLR_XDG_SURFACE_V6_ROLE_NONE;
|
||||||
|
}
|
||||||
|
|
||||||
static void xdg_surface_destroy(struct wlr_xdg_surface_v6 *surface) {
|
static void xdg_surface_destroy(struct wlr_xdg_surface_v6 *surface) {
|
||||||
if (surface->role != WLR_XDG_SURFACE_V6_ROLE_NONE) {
|
if (surface->role != WLR_XDG_SURFACE_V6_ROLE_NONE) {
|
||||||
xdg_surface_unmap(surface);
|
xdg_surface_unmap(surface);
|
||||||
|
@ -245,6 +264,18 @@ static void xdg_surface_destroy(struct wlr_xdg_surface_v6 *surface) {
|
||||||
|
|
||||||
wlr_signal_emit_safe(&surface->events.destroy, surface);
|
wlr_signal_emit_safe(&surface->events.destroy, surface);
|
||||||
|
|
||||||
|
switch (surface->role) {
|
||||||
|
case WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL:
|
||||||
|
xdg_toplevel_destroy(surface);
|
||||||
|
break;
|
||||||
|
case WLR_XDG_SURFACE_V6_ROLE_POPUP:
|
||||||
|
xdg_popup_destroy(surface);
|
||||||
|
break;
|
||||||
|
case WLR_XDG_SURFACE_V6_ROLE_NONE:
|
||||||
|
// This space is intentionally left blank
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
wl_resource_set_user_data(surface->resource, NULL);
|
wl_resource_set_user_data(surface->resource, NULL);
|
||||||
wl_list_remove(&surface->link);
|
wl_list_remove(&surface->link);
|
||||||
wl_list_remove(&surface->surface_destroy_listener.link);
|
wl_list_remove(&surface->surface_destroy_listener.link);
|
||||||
|
@ -532,7 +563,7 @@ static void xdg_popup_resource_destroy(struct wl_resource *resource) {
|
||||||
struct wlr_xdg_surface_v6 *surface =
|
struct wlr_xdg_surface_v6 *surface =
|
||||||
xdg_surface_from_xdg_popup_resource(resource);
|
xdg_surface_from_xdg_popup_resource(resource);
|
||||||
if (surface != NULL) {
|
if (surface != NULL) {
|
||||||
xdg_surface_unmap(surface);
|
xdg_popup_destroy(surface);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -634,8 +665,8 @@ static void xdg_toplevel_handle_set_title(struct wl_client *client,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
free(surface->title);
|
free(surface->toplevel->title);
|
||||||
surface->title = tmp;
|
surface->toplevel->title = tmp;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void xdg_toplevel_handle_set_app_id(struct wl_client *client,
|
static void xdg_toplevel_handle_set_app_id(struct wl_client *client,
|
||||||
|
@ -648,8 +679,8 @@ static void xdg_toplevel_handle_set_app_id(struct wl_client *client,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
free(surface->app_id);
|
free(surface->toplevel->app_id);
|
||||||
surface->app_id = tmp;
|
surface->toplevel->app_id = tmp;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void xdg_toplevel_handle_show_window_menu(struct wl_client *client,
|
static void xdg_toplevel_handle_show_window_menu(struct wl_client *client,
|
||||||
|
@ -680,7 +711,8 @@ static void xdg_toplevel_handle_show_window_menu(struct wl_client *client,
|
||||||
.y = y,
|
.y = y,
|
||||||
};
|
};
|
||||||
|
|
||||||
wlr_signal_emit_safe(&surface->events.request_show_window_menu, &event);
|
wlr_signal_emit_safe(&surface->toplevel->events.request_show_window_menu,
|
||||||
|
&event);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void xdg_toplevel_handle_move(struct wl_client *client,
|
static void xdg_toplevel_handle_move(struct wl_client *client,
|
||||||
|
@ -709,7 +741,7 @@ static void xdg_toplevel_handle_move(struct wl_client *client,
|
||||||
.serial = serial,
|
.serial = serial,
|
||||||
};
|
};
|
||||||
|
|
||||||
wlr_signal_emit_safe(&surface->events.request_move, &event);
|
wlr_signal_emit_safe(&surface->toplevel->events.request_move, &event);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void xdg_toplevel_handle_resize(struct wl_client *client,
|
static void xdg_toplevel_handle_resize(struct wl_client *client,
|
||||||
|
@ -739,39 +771,39 @@ static void xdg_toplevel_handle_resize(struct wl_client *client,
|
||||||
.edges = edges,
|
.edges = edges,
|
||||||
};
|
};
|
||||||
|
|
||||||
wlr_signal_emit_safe(&surface->events.request_resize, &event);
|
wlr_signal_emit_safe(&surface->toplevel->events.request_resize, &event);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void xdg_toplevel_handle_set_max_size(struct wl_client *client,
|
static void xdg_toplevel_handle_set_max_size(struct wl_client *client,
|
||||||
struct wl_resource *resource, int32_t width, int32_t height) {
|
struct wl_resource *resource, int32_t width, int32_t height) {
|
||||||
struct wlr_xdg_surface_v6 *surface =
|
struct wlr_xdg_surface_v6 *surface =
|
||||||
xdg_surface_from_xdg_toplevel_resource(resource);
|
xdg_surface_from_xdg_toplevel_resource(resource);
|
||||||
surface->toplevel->next.max_width = width;
|
surface->toplevel->client_pending.max_width = width;
|
||||||
surface->toplevel->next.max_height = height;
|
surface->toplevel->client_pending.max_height = height;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void xdg_toplevel_handle_set_min_size(struct wl_client *client,
|
static void xdg_toplevel_handle_set_min_size(struct wl_client *client,
|
||||||
struct wl_resource *resource, int32_t width, int32_t height) {
|
struct wl_resource *resource, int32_t width, int32_t height) {
|
||||||
struct wlr_xdg_surface_v6 *surface =
|
struct wlr_xdg_surface_v6 *surface =
|
||||||
xdg_surface_from_xdg_toplevel_resource(resource);
|
xdg_surface_from_xdg_toplevel_resource(resource);
|
||||||
surface->toplevel->next.min_width = width;
|
surface->toplevel->client_pending.min_width = width;
|
||||||
surface->toplevel->next.min_height = height;
|
surface->toplevel->client_pending.min_height = height;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void xdg_toplevel_handle_set_maximized(struct wl_client *client,
|
static void xdg_toplevel_handle_set_maximized(struct wl_client *client,
|
||||||
struct wl_resource *resource) {
|
struct wl_resource *resource) {
|
||||||
struct wlr_xdg_surface_v6 *surface =
|
struct wlr_xdg_surface_v6 *surface =
|
||||||
xdg_surface_from_xdg_toplevel_resource(resource);
|
xdg_surface_from_xdg_toplevel_resource(resource);
|
||||||
surface->toplevel->next.maximized = true;
|
surface->toplevel->client_pending.maximized = true;
|
||||||
wlr_signal_emit_safe(&surface->events.request_maximize, surface);
|
wlr_signal_emit_safe(&surface->toplevel->events.request_maximize, surface);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void xdg_toplevel_handle_unset_maximized(struct wl_client *client,
|
static void xdg_toplevel_handle_unset_maximized(struct wl_client *client,
|
||||||
struct wl_resource *resource) {
|
struct wl_resource *resource) {
|
||||||
struct wlr_xdg_surface_v6 *surface =
|
struct wlr_xdg_surface_v6 *surface =
|
||||||
xdg_surface_from_xdg_toplevel_resource(resource);
|
xdg_surface_from_xdg_toplevel_resource(resource);
|
||||||
surface->toplevel->next.maximized = false;
|
surface->toplevel->client_pending.maximized = false;
|
||||||
wlr_signal_emit_safe(&surface->events.request_maximize, surface);
|
wlr_signal_emit_safe(&surface->toplevel->events.request_maximize, surface);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void xdg_toplevel_handle_set_fullscreen(struct wl_client *client,
|
static void xdg_toplevel_handle_set_fullscreen(struct wl_client *client,
|
||||||
|
@ -784,7 +816,7 @@ static void xdg_toplevel_handle_set_fullscreen(struct wl_client *client,
|
||||||
output = wlr_output_from_resource(output_resource);
|
output = wlr_output_from_resource(output_resource);
|
||||||
}
|
}
|
||||||
|
|
||||||
surface->toplevel->next.fullscreen = true;
|
surface->toplevel->client_pending.fullscreen = true;
|
||||||
|
|
||||||
struct wlr_xdg_toplevel_v6_set_fullscreen_event event = {
|
struct wlr_xdg_toplevel_v6_set_fullscreen_event event = {
|
||||||
.surface = surface,
|
.surface = surface,
|
||||||
|
@ -792,7 +824,7 @@ static void xdg_toplevel_handle_set_fullscreen(struct wl_client *client,
|
||||||
.output = output,
|
.output = output,
|
||||||
};
|
};
|
||||||
|
|
||||||
wlr_signal_emit_safe(&surface->events.request_fullscreen, &event);
|
wlr_signal_emit_safe(&surface->toplevel->events.request_fullscreen, &event);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void xdg_toplevel_handle_unset_fullscreen(struct wl_client *client,
|
static void xdg_toplevel_handle_unset_fullscreen(struct wl_client *client,
|
||||||
|
@ -800,7 +832,7 @@ static void xdg_toplevel_handle_unset_fullscreen(struct wl_client *client,
|
||||||
struct wlr_xdg_surface_v6 *surface =
|
struct wlr_xdg_surface_v6 *surface =
|
||||||
xdg_surface_from_xdg_toplevel_resource(resource);
|
xdg_surface_from_xdg_toplevel_resource(resource);
|
||||||
|
|
||||||
surface->toplevel->next.fullscreen = false;
|
surface->toplevel->client_pending.fullscreen = false;
|
||||||
|
|
||||||
struct wlr_xdg_toplevel_v6_set_fullscreen_event event = {
|
struct wlr_xdg_toplevel_v6_set_fullscreen_event event = {
|
||||||
.surface = surface,
|
.surface = surface,
|
||||||
|
@ -808,14 +840,14 @@ static void xdg_toplevel_handle_unset_fullscreen(struct wl_client *client,
|
||||||
.output = NULL,
|
.output = NULL,
|
||||||
};
|
};
|
||||||
|
|
||||||
wlr_signal_emit_safe(&surface->events.request_fullscreen, &event);
|
wlr_signal_emit_safe(&surface->toplevel->events.request_fullscreen, &event);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void xdg_toplevel_handle_set_minimized(struct wl_client *client,
|
static void xdg_toplevel_handle_set_minimized(struct wl_client *client,
|
||||||
struct wl_resource *resource) {
|
struct wl_resource *resource) {
|
||||||
struct wlr_xdg_surface_v6 *surface =
|
struct wlr_xdg_surface_v6 *surface =
|
||||||
xdg_surface_from_xdg_toplevel_resource(resource);
|
xdg_surface_from_xdg_toplevel_resource(resource);
|
||||||
wlr_signal_emit_safe(&surface->events.request_minimize, surface);
|
wlr_signal_emit_safe(&surface->toplevel->events.request_minimize, surface);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct zxdg_toplevel_v6_interface
|
static const struct zxdg_toplevel_v6_interface
|
||||||
|
@ -847,7 +879,7 @@ static void xdg_toplevel_resource_destroy(struct wl_resource *resource) {
|
||||||
struct wlr_xdg_surface_v6 *surface =
|
struct wlr_xdg_surface_v6 *surface =
|
||||||
xdg_surface_from_xdg_toplevel_resource(resource);
|
xdg_surface_from_xdg_toplevel_resource(resource);
|
||||||
if (surface != NULL) {
|
if (surface != NULL) {
|
||||||
xdg_surface_unmap(surface);
|
xdg_toplevel_destroy(surface);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -865,6 +897,12 @@ static void xdg_surface_handle_get_toplevel(struct wl_client *client,
|
||||||
wl_resource_post_no_memory(resource);
|
wl_resource_post_no_memory(resource);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
wl_signal_init(&surface->toplevel->events.request_maximize);
|
||||||
|
wl_signal_init(&surface->toplevel->events.request_fullscreen);
|
||||||
|
wl_signal_init(&surface->toplevel->events.request_minimize);
|
||||||
|
wl_signal_init(&surface->toplevel->events.request_move);
|
||||||
|
wl_signal_init(&surface->toplevel->events.request_resize);
|
||||||
|
wl_signal_init(&surface->toplevel->events.request_show_window_menu);
|
||||||
|
|
||||||
surface->role = WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL;
|
surface->role = WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL;
|
||||||
surface->toplevel->base = surface;
|
surface->toplevel->base = surface;
|
||||||
|
@ -1012,25 +1050,25 @@ static bool wlr_xdg_surface_v6_toplevel_state_compare(
|
||||||
configured.height = configure->toplevel_state->height;
|
configured.height = configure->toplevel_state->height;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (state->pending.activated != configured.state.activated) {
|
if (state->server_pending.activated != configured.state.activated) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (state->pending.fullscreen != configured.state.fullscreen) {
|
if (state->server_pending.fullscreen != configured.state.fullscreen) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (state->pending.maximized != configured.state.maximized) {
|
if (state->server_pending.maximized != configured.state.maximized) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (state->pending.resizing != configured.state.resizing) {
|
if (state->server_pending.resizing != configured.state.resizing) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (state->pending.width == configured.width &&
|
if (state->server_pending.width == configured.width &&
|
||||||
state->pending.height == configured.height) {
|
state->server_pending.height == configured.height) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (state->pending.width == 0 && state->pending.height == 0) {
|
if (state->server_pending.width == 0 && state->server_pending.height == 0) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1048,12 +1086,12 @@ static void wlr_xdg_toplevel_v6_send_configure(
|
||||||
wl_resource_post_no_memory(surface->toplevel->resource);
|
wl_resource_post_no_memory(surface->toplevel->resource);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
*configure->toplevel_state = surface->toplevel->pending;
|
*configure->toplevel_state = surface->toplevel->server_pending;
|
||||||
|
|
||||||
uint32_t *s;
|
uint32_t *s;
|
||||||
struct wl_array states;
|
struct wl_array states;
|
||||||
wl_array_init(&states);
|
wl_array_init(&states);
|
||||||
if (surface->toplevel->pending.maximized) {
|
if (surface->toplevel->server_pending.maximized) {
|
||||||
s = wl_array_add(&states, sizeof(uint32_t));
|
s = wl_array_add(&states, sizeof(uint32_t));
|
||||||
if (!s) {
|
if (!s) {
|
||||||
wlr_log(L_ERROR, "Could not allocate state for maximized xdg_toplevel");
|
wlr_log(L_ERROR, "Could not allocate state for maximized xdg_toplevel");
|
||||||
|
@ -1061,7 +1099,7 @@ static void wlr_xdg_toplevel_v6_send_configure(
|
||||||
}
|
}
|
||||||
*s = ZXDG_TOPLEVEL_V6_STATE_MAXIMIZED;
|
*s = ZXDG_TOPLEVEL_V6_STATE_MAXIMIZED;
|
||||||
}
|
}
|
||||||
if (surface->toplevel->pending.fullscreen) {
|
if (surface->toplevel->server_pending.fullscreen) {
|
||||||
s = wl_array_add(&states, sizeof(uint32_t));
|
s = wl_array_add(&states, sizeof(uint32_t));
|
||||||
if (!s) {
|
if (!s) {
|
||||||
wlr_log(L_ERROR, "Could not allocate state for fullscreen xdg_toplevel");
|
wlr_log(L_ERROR, "Could not allocate state for fullscreen xdg_toplevel");
|
||||||
|
@ -1069,7 +1107,7 @@ static void wlr_xdg_toplevel_v6_send_configure(
|
||||||
}
|
}
|
||||||
*s = ZXDG_TOPLEVEL_V6_STATE_FULLSCREEN;
|
*s = ZXDG_TOPLEVEL_V6_STATE_FULLSCREEN;
|
||||||
}
|
}
|
||||||
if (surface->toplevel->pending.resizing) {
|
if (surface->toplevel->server_pending.resizing) {
|
||||||
s = wl_array_add(&states, sizeof(uint32_t));
|
s = wl_array_add(&states, sizeof(uint32_t));
|
||||||
if (!s) {
|
if (!s) {
|
||||||
wlr_log(L_ERROR, "Could not allocate state for resizing xdg_toplevel");
|
wlr_log(L_ERROR, "Could not allocate state for resizing xdg_toplevel");
|
||||||
|
@ -1077,7 +1115,7 @@ static void wlr_xdg_toplevel_v6_send_configure(
|
||||||
}
|
}
|
||||||
*s = ZXDG_TOPLEVEL_V6_STATE_RESIZING;
|
*s = ZXDG_TOPLEVEL_V6_STATE_RESIZING;
|
||||||
}
|
}
|
||||||
if (surface->toplevel->pending.activated) {
|
if (surface->toplevel->server_pending.activated) {
|
||||||
s = wl_array_add(&states, sizeof(uint32_t));
|
s = wl_array_add(&states, sizeof(uint32_t));
|
||||||
if (!s) {
|
if (!s) {
|
||||||
wlr_log(L_ERROR, "Could not allocate state for activated xdg_toplevel");
|
wlr_log(L_ERROR, "Could not allocate state for activated xdg_toplevel");
|
||||||
|
@ -1086,8 +1124,8 @@ static void wlr_xdg_toplevel_v6_send_configure(
|
||||||
*s = ZXDG_TOPLEVEL_V6_STATE_ACTIVATED;
|
*s = ZXDG_TOPLEVEL_V6_STATE_ACTIVATED;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t width = surface->toplevel->pending.width;
|
uint32_t width = surface->toplevel->server_pending.width;
|
||||||
uint32_t height = surface->toplevel->pending.height;
|
uint32_t height = surface->toplevel->server_pending.height;
|
||||||
zxdg_toplevel_v6_send_configure(surface->toplevel->resource, width,
|
zxdg_toplevel_v6_send_configure(surface->toplevel->resource, width,
|
||||||
height, &states);
|
height, &states);
|
||||||
|
|
||||||
|
@ -1195,13 +1233,13 @@ static void wlr_xdg_surface_v6_toplevel_committed(
|
||||||
|
|
||||||
// update state that doesn't need compositor approval
|
// update state that doesn't need compositor approval
|
||||||
surface->toplevel->current.max_width =
|
surface->toplevel->current.max_width =
|
||||||
surface->toplevel->next.max_width;
|
surface->toplevel->client_pending.max_width;
|
||||||
surface->toplevel->current.min_width =
|
surface->toplevel->current.min_width =
|
||||||
surface->toplevel->next.min_width;
|
surface->toplevel->client_pending.min_width;
|
||||||
surface->toplevel->current.max_height =
|
surface->toplevel->current.max_height =
|
||||||
surface->toplevel->next.max_height;
|
surface->toplevel->client_pending.max_height;
|
||||||
surface->toplevel->current.min_height =
|
surface->toplevel->current.min_height =
|
||||||
surface->toplevel->next.min_height;
|
surface->toplevel->client_pending.min_height;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void wlr_xdg_surface_v6_popup_committed(
|
static void wlr_xdg_surface_v6_popup_committed(
|
||||||
|
@ -1309,12 +1347,6 @@ static void xdg_shell_handle_get_xdg_surface(struct wl_client *wl_client,
|
||||||
wl_list_init(&surface->configure_list);
|
wl_list_init(&surface->configure_list);
|
||||||
wl_list_init(&surface->popups);
|
wl_list_init(&surface->popups);
|
||||||
|
|
||||||
wl_signal_init(&surface->events.request_maximize);
|
|
||||||
wl_signal_init(&surface->events.request_fullscreen);
|
|
||||||
wl_signal_init(&surface->events.request_minimize);
|
|
||||||
wl_signal_init(&surface->events.request_move);
|
|
||||||
wl_signal_init(&surface->events.request_resize);
|
|
||||||
wl_signal_init(&surface->events.request_show_window_menu);
|
|
||||||
wl_signal_init(&surface->events.destroy);
|
wl_signal_init(&surface->events.destroy);
|
||||||
wl_signal_init(&surface->events.ping_timeout);
|
wl_signal_init(&surface->events.ping_timeout);
|
||||||
wl_signal_init(&surface->events.new_popup);
|
wl_signal_init(&surface->events.new_popup);
|
||||||
|
@ -1492,8 +1524,8 @@ void wlr_xdg_surface_v6_ping(struct wlr_xdg_surface_v6 *surface) {
|
||||||
uint32_t wlr_xdg_toplevel_v6_set_size(struct wlr_xdg_surface_v6 *surface,
|
uint32_t wlr_xdg_toplevel_v6_set_size(struct wlr_xdg_surface_v6 *surface,
|
||||||
uint32_t width, uint32_t height) {
|
uint32_t width, uint32_t height) {
|
||||||
assert(surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL);
|
assert(surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL);
|
||||||
surface->toplevel->pending.width = width;
|
surface->toplevel->server_pending.width = width;
|
||||||
surface->toplevel->pending.height = height;
|
surface->toplevel->server_pending.height = height;
|
||||||
|
|
||||||
return wlr_xdg_surface_v6_schedule_configure(surface);
|
return wlr_xdg_surface_v6_schedule_configure(surface);
|
||||||
}
|
}
|
||||||
|
@ -1501,7 +1533,7 @@ uint32_t wlr_xdg_toplevel_v6_set_size(struct wlr_xdg_surface_v6 *surface,
|
||||||
uint32_t wlr_xdg_toplevel_v6_set_activated(struct wlr_xdg_surface_v6 *surface,
|
uint32_t wlr_xdg_toplevel_v6_set_activated(struct wlr_xdg_surface_v6 *surface,
|
||||||
bool activated) {
|
bool activated) {
|
||||||
assert(surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL);
|
assert(surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL);
|
||||||
surface->toplevel->pending.activated = activated;
|
surface->toplevel->server_pending.activated = activated;
|
||||||
|
|
||||||
return wlr_xdg_surface_v6_schedule_configure(surface);
|
return wlr_xdg_surface_v6_schedule_configure(surface);
|
||||||
}
|
}
|
||||||
|
@ -1509,7 +1541,7 @@ uint32_t wlr_xdg_toplevel_v6_set_activated(struct wlr_xdg_surface_v6 *surface,
|
||||||
uint32_t wlr_xdg_toplevel_v6_set_maximized(struct wlr_xdg_surface_v6 *surface,
|
uint32_t wlr_xdg_toplevel_v6_set_maximized(struct wlr_xdg_surface_v6 *surface,
|
||||||
bool maximized) {
|
bool maximized) {
|
||||||
assert(surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL);
|
assert(surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL);
|
||||||
surface->toplevel->pending.maximized = maximized;
|
surface->toplevel->server_pending.maximized = maximized;
|
||||||
|
|
||||||
return wlr_xdg_surface_v6_schedule_configure(surface);
|
return wlr_xdg_surface_v6_schedule_configure(surface);
|
||||||
}
|
}
|
||||||
|
@ -1517,7 +1549,7 @@ uint32_t wlr_xdg_toplevel_v6_set_maximized(struct wlr_xdg_surface_v6 *surface,
|
||||||
uint32_t wlr_xdg_toplevel_v6_set_fullscreen(struct wlr_xdg_surface_v6 *surface,
|
uint32_t wlr_xdg_toplevel_v6_set_fullscreen(struct wlr_xdg_surface_v6 *surface,
|
||||||
bool fullscreen) {
|
bool fullscreen) {
|
||||||
assert(surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL);
|
assert(surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL);
|
||||||
surface->toplevel->pending.fullscreen = fullscreen;
|
surface->toplevel->server_pending.fullscreen = fullscreen;
|
||||||
|
|
||||||
return wlr_xdg_surface_v6_schedule_configure(surface);
|
return wlr_xdg_surface_v6_schedule_configure(surface);
|
||||||
}
|
}
|
||||||
|
@ -1525,14 +1557,27 @@ uint32_t wlr_xdg_toplevel_v6_set_fullscreen(struct wlr_xdg_surface_v6 *surface,
|
||||||
uint32_t wlr_xdg_toplevel_v6_set_resizing(struct wlr_xdg_surface_v6 *surface,
|
uint32_t wlr_xdg_toplevel_v6_set_resizing(struct wlr_xdg_surface_v6 *surface,
|
||||||
bool resizing) {
|
bool resizing) {
|
||||||
assert(surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL);
|
assert(surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL);
|
||||||
surface->toplevel->pending.resizing = resizing;
|
surface->toplevel->server_pending.resizing = resizing;
|
||||||
|
|
||||||
return wlr_xdg_surface_v6_schedule_configure(surface);
|
return wlr_xdg_surface_v6_schedule_configure(surface);
|
||||||
}
|
}
|
||||||
|
|
||||||
void wlr_xdg_toplevel_v6_send_close(struct wlr_xdg_surface_v6 *surface) {
|
void wlr_xdg_surface_v6_send_close(struct wlr_xdg_surface_v6 *surface) {
|
||||||
assert(surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL);
|
switch (surface->role) {
|
||||||
zxdg_toplevel_v6_send_close(surface->toplevel->resource);
|
case WLR_XDG_SURFACE_V6_ROLE_NONE:
|
||||||
|
assert(0 && "not reached");
|
||||||
|
break;
|
||||||
|
case WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL:
|
||||||
|
if (surface->toplevel) {
|
||||||
|
zxdg_toplevel_v6_send_close(surface->toplevel->resource);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case WLR_XDG_SURFACE_V6_ROLE_POPUP:
|
||||||
|
if (surface->popup) {
|
||||||
|
zxdg_popup_v6_send_popup_done(surface->popup->resource);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void wlr_xdg_surface_v6_popup_get_position(struct wlr_xdg_surface_v6 *surface,
|
void wlr_xdg_surface_v6_popup_get_position(struct wlr_xdg_surface_v6 *surface,
|
||||||
|
|
|
@ -128,3 +128,52 @@ void wlr_region_expand(pixman_region32_t *dst, pixman_region32_t *src,
|
||||||
pixman_region32_init_rects(dst, dst_rects, nrects);
|
pixman_region32_init_rects(dst, dst_rects, nrects);
|
||||||
free(dst_rects);
|
free(dst_rects);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void wlr_region_rotated_bounds(pixman_region32_t *dst, pixman_region32_t *src,
|
||||||
|
float rotation, int ox, int oy) {
|
||||||
|
if (rotation == 0) {
|
||||||
|
pixman_region32_copy(dst, src);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
int nrects;
|
||||||
|
pixman_box32_t *src_rects = pixman_region32_rectangles(src, &nrects);
|
||||||
|
|
||||||
|
pixman_box32_t *dst_rects = malloc(nrects * sizeof(pixman_box32_t));
|
||||||
|
if (dst_rects == NULL) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int i = 0; i < nrects; ++i) {
|
||||||
|
double x1 = src_rects[i].x1 - ox;
|
||||||
|
double y1 = src_rects[i].y1 - oy;
|
||||||
|
double x2 = src_rects[i].x2 - ox;
|
||||||
|
double y2 = src_rects[i].y2 - oy;
|
||||||
|
|
||||||
|
double rx1 = x1 * cos(rotation) - y1 * sin(rotation);
|
||||||
|
double ry1 = x1 * sin(rotation) + y1 * cos(rotation);
|
||||||
|
|
||||||
|
double rx2 = x2 * cos(rotation) - y1 * sin(rotation);
|
||||||
|
double ry2 = x2 * sin(rotation) + y1 * cos(rotation);
|
||||||
|
|
||||||
|
double rx3 = x2 * cos(rotation) - y2 * sin(rotation);
|
||||||
|
double ry3 = x2 * sin(rotation) + y2 * cos(rotation);
|
||||||
|
|
||||||
|
double rx4 = x1 * cos(rotation) - y2 * sin(rotation);
|
||||||
|
double ry4 = x1 * sin(rotation) + y2 * cos(rotation);
|
||||||
|
|
||||||
|
x1 = fmin(fmin(rx1, rx2), fmin(rx3, rx4));
|
||||||
|
y1 = fmin(fmin(ry1, ry2), fmin(ry3, ry4));
|
||||||
|
x2 = fmax(fmax(rx1, rx2), fmax(rx3, rx4));
|
||||||
|
y2 = fmax(fmax(ry1, ry2), fmax(ry3, ry4));
|
||||||
|
|
||||||
|
dst_rects[i].x1 = floor(ox + x1);
|
||||||
|
dst_rects[i].x2 = ceil(ox + x2);
|
||||||
|
dst_rects[i].y1 = floor(oy + y1);
|
||||||
|
dst_rects[i].y2 = ceil(oy + y2);
|
||||||
|
}
|
||||||
|
|
||||||
|
pixman_region32_fini(dst);
|
||||||
|
pixman_region32_init_rects(dst, dst_rects, nrects);
|
||||||
|
free(dst_rects);
|
||||||
|
}
|
||||||
|
|
|
@ -47,7 +47,21 @@ static int xwm_selection_flush_source_data(struct wlr_xwm_selection *selection)
|
||||||
return length;
|
return length;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int xwm_read_data_source(int fd, uint32_t mask, void *data) {
|
static void xwm_data_source_remove_property_source(
|
||||||
|
struct wlr_xwm_selection *selection) {
|
||||||
|
if (selection->property_source) {
|
||||||
|
wl_event_source_remove(selection->property_source);
|
||||||
|
}
|
||||||
|
selection->property_source = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void xwm_data_source_close_source_fd(
|
||||||
|
struct wlr_xwm_selection *selection) {
|
||||||
|
close(selection->source_fd);
|
||||||
|
selection->source_fd = -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int xwm_data_source_read(int fd, uint32_t mask, void *data) {
|
||||||
struct wlr_xwm_selection *selection = data;
|
struct wlr_xwm_selection *selection = data;
|
||||||
struct wlr_xwm *xwm = selection->xwm;
|
struct wlr_xwm *xwm = selection->xwm;
|
||||||
|
|
||||||
|
@ -72,13 +86,13 @@ static int xwm_read_data_source(int fd, uint32_t mask, void *data) {
|
||||||
}
|
}
|
||||||
|
|
||||||
wlr_log(L_DEBUG, "read %d (available %d, mask 0x%x) bytes: \"%.*s\"",
|
wlr_log(L_DEBUG, "read %d (available %d, mask 0x%x) bytes: \"%.*s\"",
|
||||||
len, available, mask, len, (char *) p);
|
len, available, mask, len, (char *) p);
|
||||||
|
|
||||||
selection->source_data.size = current + len;
|
selection->source_data.size = current + len;
|
||||||
if (selection->source_data.size >= incr_chunk_size) {
|
if (selection->source_data.size >= incr_chunk_size) {
|
||||||
if (!selection->incr) {
|
if (!selection->incr) {
|
||||||
wlr_log(L_DEBUG, "got %zu bytes, starting incr",
|
wlr_log(L_DEBUG, "got %zu bytes, starting incr",
|
||||||
selection->source_data.size);
|
selection->source_data.size);
|
||||||
selection->incr = 1;
|
selection->incr = 1;
|
||||||
xcb_change_property(xwm->xcb_conn,
|
xcb_change_property(xwm->xcb_conn,
|
||||||
XCB_PROP_MODE_REPLACE,
|
XCB_PROP_MODE_REPLACE,
|
||||||
|
@ -89,20 +103,17 @@ static int xwm_read_data_source(int fd, uint32_t mask, void *data) {
|
||||||
1, &incr_chunk_size);
|
1, &incr_chunk_size);
|
||||||
selection->property_set = true;
|
selection->property_set = true;
|
||||||
selection->flush_property_on_delete = 1;
|
selection->flush_property_on_delete = 1;
|
||||||
wl_event_source_remove(selection->property_source);
|
xwm_data_source_remove_property_source(selection);
|
||||||
selection->property_source = NULL;
|
|
||||||
xwm_selection_send_notify(selection, selection->request.property);
|
xwm_selection_send_notify(selection, selection->request.property);
|
||||||
} else if (selection->property_set) {
|
} else if (selection->property_set) {
|
||||||
wlr_log(L_DEBUG, "got %zu bytes, waiting for "
|
wlr_log(L_DEBUG, "got %zu bytes, waiting for property delete",
|
||||||
"property delete", selection->source_data.size);
|
selection->source_data.size);
|
||||||
|
|
||||||
selection->flush_property_on_delete = 1;
|
selection->flush_property_on_delete = 1;
|
||||||
wl_event_source_remove(selection->property_source);
|
xwm_data_source_remove_property_source(selection);
|
||||||
selection->property_source = NULL;
|
|
||||||
} else {
|
} else {
|
||||||
wlr_log(L_DEBUG, "got %zu bytes, "
|
wlr_log(L_DEBUG, "got %zu bytes, property deleted, setting new "
|
||||||
"property deleted, setting new property",
|
"property", selection->source_data.size);
|
||||||
selection->source_data.size);
|
|
||||||
xwm_selection_flush_source_data(selection);
|
xwm_selection_flush_source_data(selection);
|
||||||
}
|
}
|
||||||
} else if (len == 0 && !selection->incr) {
|
} else if (len == 0 && !selection->incr) {
|
||||||
|
@ -111,9 +122,8 @@ static int xwm_read_data_source(int fd, uint32_t mask, void *data) {
|
||||||
xwm_selection_flush_source_data(selection);
|
xwm_selection_flush_source_data(selection);
|
||||||
xwm_selection_send_notify(selection, selection->request.property);
|
xwm_selection_send_notify(selection, selection->request.property);
|
||||||
xcb_flush(xwm->xcb_conn);
|
xcb_flush(xwm->xcb_conn);
|
||||||
wl_event_source_remove(selection->property_source);
|
xwm_data_source_remove_property_source(selection);
|
||||||
selection->property_source = NULL;
|
xwm_data_source_close_source_fd(selection);
|
||||||
close(fd);
|
|
||||||
wl_array_release(&selection->source_data);
|
wl_array_release(&selection->source_data);
|
||||||
selection->request.requestor = XCB_NONE;
|
selection->request.requestor = XCB_NONE;
|
||||||
} else if (len == 0 && selection->incr) {
|
} else if (len == 0 && selection->incr) {
|
||||||
|
@ -121,20 +131,16 @@ static int xwm_read_data_source(int fd, uint32_t mask, void *data) {
|
||||||
|
|
||||||
selection->flush_property_on_delete = 1;
|
selection->flush_property_on_delete = 1;
|
||||||
if (selection->property_set) {
|
if (selection->property_set) {
|
||||||
wlr_log(L_DEBUG, "got %zu bytes, waiting for "
|
wlr_log(L_DEBUG, "got %zu bytes, waiting for property delete",
|
||||||
"property delete", selection->source_data.size);
|
selection->source_data.size);
|
||||||
} else {
|
} else {
|
||||||
wlr_log(L_DEBUG, "got %zu bytes, "
|
wlr_log(L_DEBUG, "got %zu bytes, property deleted, setting new "
|
||||||
"property deleted, setting new property",
|
"property", selection->source_data.size);
|
||||||
selection->source_data.size);
|
|
||||||
xwm_selection_flush_source_data(selection);
|
xwm_selection_flush_source_data(selection);
|
||||||
}
|
}
|
||||||
xcb_flush(xwm->xcb_conn);
|
xcb_flush(xwm->xcb_conn);
|
||||||
wl_event_source_remove(selection->property_source);
|
xwm_data_source_remove_property_source(selection);
|
||||||
selection->property_source = NULL;
|
xwm_data_source_close_source_fd(selection);
|
||||||
close(selection->source_fd);
|
|
||||||
selection->source_fd = -1;
|
|
||||||
close(fd);
|
|
||||||
} else {
|
} else {
|
||||||
wlr_log(L_DEBUG, "nothing happened, buffered the bytes");
|
wlr_log(L_DEBUG, "nothing happened, buffered the bytes");
|
||||||
}
|
}
|
||||||
|
@ -143,9 +149,8 @@ static int xwm_read_data_source(int fd, uint32_t mask, void *data) {
|
||||||
|
|
||||||
error_out:
|
error_out:
|
||||||
xwm_selection_send_notify(selection, XCB_ATOM_NONE);
|
xwm_selection_send_notify(selection, XCB_ATOM_NONE);
|
||||||
wl_event_source_remove(selection->property_source);
|
xwm_data_source_remove_property_source(selection);
|
||||||
selection->property_source = NULL;
|
xwm_data_source_close_source_fd(selection);
|
||||||
close(fd);
|
|
||||||
wl_array_release(&selection->source_data);
|
wl_array_release(&selection->source_data);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -191,9 +196,7 @@ static void xwm_selection_send_data(struct wlr_xwm_selection *selection,
|
||||||
struct wl_event_loop *loop =
|
struct wl_event_loop *loop =
|
||||||
wl_display_get_event_loop(selection->xwm->xwayland->wl_display);
|
wl_display_get_event_loop(selection->xwm->xwayland->wl_display);
|
||||||
selection->property_source = wl_event_loop_add_fd(loop,
|
selection->property_source = wl_event_loop_add_fd(loop,
|
||||||
selection->source_fd,
|
selection->source_fd, WL_EVENT_READABLE, xwm_data_source_read,
|
||||||
WL_EVENT_READABLE,
|
|
||||||
xwm_read_data_source,
|
|
||||||
selection);
|
selection);
|
||||||
|
|
||||||
xwm_selection_source_send(selection, mime_type, p[1]);
|
xwm_selection_source_send(selection, mime_type, p[1]);
|
||||||
|
@ -371,7 +374,13 @@ static void xwm_handle_selection_request(struct wlr_xwm *xwm,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static int writable_callback(int fd, uint32_t mask, void *data) {
|
static void xwm_data_source_destroy_property_reply(
|
||||||
|
struct wlr_xwm_selection *selection) {
|
||||||
|
free(selection->property_reply);
|
||||||
|
selection->property_reply = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int xwm_data_source_write(int fd, uint32_t mask, void *data) {
|
||||||
struct wlr_xwm_selection *selection = data;
|
struct wlr_xwm_selection *selection = data;
|
||||||
struct wlr_xwm *xwm = selection->xwm;
|
struct wlr_xwm *xwm = selection->xwm;
|
||||||
|
|
||||||
|
@ -381,13 +390,9 @@ static int writable_callback(int fd, uint32_t mask, void *data) {
|
||||||
|
|
||||||
int len = write(fd, property + selection->property_start, remainder);
|
int len = write(fd, property + selection->property_start, remainder);
|
||||||
if (len == -1) {
|
if (len == -1) {
|
||||||
free(selection->property_reply);
|
xwm_data_source_destroy_property_reply(selection);
|
||||||
selection->property_reply = NULL;
|
xwm_data_source_remove_property_source(selection);
|
||||||
if (selection->property_source) {
|
xwm_data_source_close_source_fd(selection);
|
||||||
wl_event_source_remove(selection->property_source);
|
|
||||||
}
|
|
||||||
selection->property_source = NULL;
|
|
||||||
close(fd);
|
|
||||||
wlr_log(L_ERROR, "write error to target fd: %m");
|
wlr_log(L_ERROR, "write error to target fd: %m");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
@ -398,12 +403,8 @@ static int writable_callback(int fd, uint32_t mask, void *data) {
|
||||||
|
|
||||||
selection->property_start += len;
|
selection->property_start += len;
|
||||||
if (len == remainder) {
|
if (len == remainder) {
|
||||||
free(selection->property_reply);
|
xwm_data_source_destroy_property_reply(selection);
|
||||||
selection->property_reply = NULL;
|
xwm_data_source_remove_property_source(selection);
|
||||||
if (selection->property_source) {
|
|
||||||
wl_event_source_remove(selection->property_source);
|
|
||||||
}
|
|
||||||
selection->property_source = NULL;
|
|
||||||
|
|
||||||
if (selection->incr) {
|
if (selection->incr) {
|
||||||
xcb_delete_property(xwm->xcb_conn,
|
xcb_delete_property(xwm->xcb_conn,
|
||||||
|
@ -411,7 +412,7 @@ static int writable_callback(int fd, uint32_t mask, void *data) {
|
||||||
xwm->atoms[WL_SELECTION]);
|
xwm->atoms[WL_SELECTION]);
|
||||||
} else {
|
} else {
|
||||||
wlr_log(L_DEBUG, "transfer complete");
|
wlr_log(L_DEBUG, "transfer complete");
|
||||||
close(fd);
|
xwm_data_source_close_source_fd(selection);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -422,13 +423,13 @@ static void xwm_write_property(struct wlr_xwm_selection *selection,
|
||||||
xcb_get_property_reply_t *reply) {
|
xcb_get_property_reply_t *reply) {
|
||||||
selection->property_start = 0;
|
selection->property_start = 0;
|
||||||
selection->property_reply = reply;
|
selection->property_reply = reply;
|
||||||
writable_callback(selection->source_fd, WL_EVENT_WRITABLE, selection);
|
xwm_data_source_write(selection->source_fd, WL_EVENT_WRITABLE, selection);
|
||||||
|
|
||||||
if (selection->property_reply) {
|
if (selection->property_reply) {
|
||||||
struct wl_event_loop *loop =
|
struct wl_event_loop *loop =
|
||||||
wl_display_get_event_loop(selection->xwm->xwayland->wl_display);
|
wl_display_get_event_loop(selection->xwm->xwayland->wl_display);
|
||||||
selection->property_source = wl_event_loop_add_fd(loop,
|
selection->property_source = wl_event_loop_add_fd(loop,
|
||||||
selection->source_fd, WL_EVENT_WRITABLE, writable_callback,
|
selection->source_fd, WL_EVENT_WRITABLE, xwm_data_source_write,
|
||||||
selection);
|
selection);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue