aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.build.yml1
-rw-r--r--.travis.yml1
-rw-r--r--backend/wayland/wl_seat.c2
-rw-r--r--include/rootston/view.h8
-rw-r--r--include/wlr/types/wlr_output.h2
-rw-r--r--include/wlr/xwayland.h6
-rw-r--r--meson.build2
-rw-r--r--rootston/cursor.c23
-rw-r--r--rootston/desktop.c31
-rw-r--r--rootston/input.c9
-rw-r--r--rootston/wl_shell.c2
-rw-r--r--rootston/xdg_shell_v6.c75
-rw-r--r--rootston/xwayland.c50
-rw-r--r--types/wlr_compositor.c23
-rw-r--r--types/wlr_data_device.c16
-rw-r--r--types/wlr_gamma_control.c9
-rw-r--r--types/wlr_output.c42
-rw-r--r--types/wlr_screenshooter.c50
-rw-r--r--types/wlr_seat.c23
-rw-r--r--types/wlr_server_decoration.c8
-rw-r--r--types/wlr_surface.c15
-rw-r--r--types/wlr_wl_shell.c29
-rw-r--r--types/wlr_xdg_shell_v6.c36
-rw-r--r--xwayland/meson.build2
-rw-r--r--xwayland/xwayland.c40
-rw-r--r--xwayland/xwm.c86
-rw-r--r--xwayland/xwm.h9
27 files changed, 467 insertions, 133 deletions
diff --git a/.build.yml b/.build.yml
index 60412f0e..7ba5559c 100644
--- a/.build.yml
+++ b/.build.yml
@@ -6,6 +6,7 @@ packages:
- mesa
- libinput
- libxkbcommon
+ - xcb-util-image
- libcap
- pixman
- clang
diff --git a/.travis.yml b/.travis.yml
index 52d6eae4..f6bbd7f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,7 @@ arch:
- libinput
- pixman
- libxkbcommon
+ - xcb-util-image
- libcap
script:
- "meson build"
diff --git a/backend/wayland/wl_seat.c b/backend/wayland/wl_seat.c
index deed215e..a2da8df5 100644
--- a/backend/wayland/wl_seat.c
+++ b/backend/wayland/wl_seat.c
@@ -90,7 +90,7 @@ static void pointer_handle_axis(void *data, struct wl_pointer *wl_pointer,
struct wlr_event_pointer_axis wlr_event;
wlr_event.device = dev;
- wlr_event.delta = value;
+ wlr_event.delta = wl_fixed_to_double(value);
wlr_event.orientation = axis;
wlr_event.time_msec = time;
wlr_event.source = wlr_wl_pointer->axis_source;
diff --git a/include/rootston/view.h b/include/rootston/view.h
index 993ff654..0913b42e 100644
--- a/include/rootston/view.h
+++ b/include/rootston/view.h
@@ -73,15 +73,19 @@ struct roots_view {
// elsewhere
void (*get_size)(struct roots_view *view, struct wlr_box *box);
void (*activate)(struct roots_view *view, bool active);
+ void (*move)(struct roots_view *view, double x, double y);
void (*resize)(struct roots_view *view, uint32_t width, uint32_t height);
- void (*set_position)(struct roots_view *view, double x, double y);
+ void (*move_resize)(struct roots_view *view, double x, double y,
+ uint32_t width, uint32_t height);
void (*close)(struct roots_view *view);
};
void view_get_size(struct roots_view *view, struct wlr_box *box);
void view_activate(struct roots_view *view, bool active);
+void view_move(struct roots_view *view, double x, double y);
void view_resize(struct roots_view *view, uint32_t width, uint32_t height);
-void view_set_position(struct roots_view *view, double x, double y);
+void view_move_resize(struct roots_view *view, double x, double y,
+ uint32_t width, uint32_t height);
void view_close(struct roots_view *view);
bool view_center(struct roots_view *view);
void view_setup(struct roots_view *view);
diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h
index b5523100..e6323f9c 100644
--- a/include/wlr/types/wlr_output.h
+++ b/include/wlr/types/wlr_output.h
@@ -15,10 +15,12 @@ struct wlr_output_mode {
struct wlr_output_cursor {
struct wlr_output *output;
int32_t x, y;
+ bool enabled;
uint32_t width, height;
int32_t hotspot_x, hotspot_y;
struct wl_list link;
+ // only when using a software cursor without a surface
struct wlr_renderer *renderer;
struct wlr_texture *texture;
diff --git a/include/wlr/xwayland.h b/include/wlr/xwayland.h
index 2d968133..bea97394 100644
--- a/include/wlr/xwayland.h
+++ b/include/wlr/xwayland.h
@@ -12,6 +12,7 @@
#endif
struct wlr_xwm;
+struct wlr_xwayland_cursor;
struct wlr_xwayland {
pid_t pid;
@@ -25,6 +26,7 @@ struct wlr_xwayland {
struct wl_event_source *sigusr1_source;
struct wl_listener destroy_listener;
struct wlr_xwm *xwm;
+ struct wlr_xwayland_cursor *cursor;
struct {
struct wl_signal new_surface;
@@ -148,6 +150,10 @@ struct wlr_xwayland *wlr_xwayland_create(struct wl_display *wl_display,
void wlr_xwayland_destroy(struct wlr_xwayland *wlr_xwayland);
+void wlr_xwayland_set_cursor(struct wlr_xwayland *wlr_xwayland,
+ uint8_t *pixels, uint32_t stride, uint32_t width, uint32_t height,
+ int32_t hotspot_x, int32_t hotspot_y);
+
void wlr_xwayland_surface_activate(struct wlr_xwayland *wlr_xwayland,
struct wlr_xwayland_surface *surface, bool activated);
diff --git a/meson.build b/meson.build
index 74bb6dcd..642dc38d 100644
--- a/meson.build
+++ b/meson.build
@@ -52,6 +52,8 @@ 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)
x11_xcb = dependency('x11-xcb')
libcap = dependency('libcap', required: false)
diff --git a/rootston/cursor.c b/rootston/cursor.c
index 31001a9f..b153e8c8 100644
--- a/rootston/cursor.c
+++ b/rootston/cursor.c
@@ -117,8 +117,8 @@ void cursor_update_position(struct roots_input *input, uint32_t time) {
if (input->active_view) {
double dx = input->cursor->x - input->offs_x;
double dy = input->cursor->y - input->offs_y;
- view_set_position(input->active_view,
- input->view_x + dx, input->view_y + dy);
+ view_move(input->active_view, input->view_x + dx,
+ input->view_y + dy);
}
break;
case ROOTS_CURSOR_RESIZE:
@@ -132,15 +132,19 @@ void cursor_update_position(struct roots_input *input, uint32_t time) {
if (input->resize_edges & ROOTS_CURSOR_RESIZE_EDGE_TOP) {
active_y = input->view_y + dy;
height -= dy;
- }
- if (input->resize_edges & ROOTS_CURSOR_RESIZE_EDGE_BOTTOM) {
+ if (height < 0) {
+ active_y += height;
+ }
+ } else if (input->resize_edges & ROOTS_CURSOR_RESIZE_EDGE_BOTTOM) {
height += dy;
}
if (input->resize_edges & ROOTS_CURSOR_RESIZE_EDGE_LEFT) {
active_x = input->view_x + dx;
width -= dx;
- }
- if (input->resize_edges & ROOTS_CURSOR_RESIZE_EDGE_RIGHT) {
+ if (width < 0) {
+ active_x += width;
+ }
+ } else if (input->resize_edges & ROOTS_CURSOR_RESIZE_EDGE_RIGHT) {
width += dx;
}
@@ -151,12 +155,13 @@ void cursor_update_position(struct roots_input *input, uint32_t time) {
height = 0;
}
- // TODO we might need one configure event for this
if (active_x != input->active_view->x ||
active_y != input->active_view->y) {
- view_set_position(input->active_view, active_x, active_y);
+ view_move_resize(input->active_view, active_x, active_y,
+ width, height);
+ } else {
+ view_resize(input->active_view, width, height);
}
- view_resize(input->active_view, width, height);
}
break;
case ROOTS_CURSOR_ROTATE:
diff --git a/rootston/desktop.c b/rootston/desktop.c
index f93d1df8..29f78ac7 100644
--- a/rootston/desktop.c
+++ b/rootston/desktop.c
@@ -45,9 +45,15 @@ void view_get_size(struct roots_view *view, struct wlr_box *box) {
box->height = view->wlr_surface->current->height;
}
-void view_set_position(struct roots_view *view, double x, double y) {
- if (view->set_position) {
- view->set_position(view, x, y);
+void view_activate(struct roots_view *view, bool activate) {
+ if (view->activate) {
+ view->activate(view, activate);
+ }
+}
+
+void view_move(struct roots_view *view, double x, double y) {
+ if (view->move) {
+ view->move(view, x, y);
return;
}
@@ -55,18 +61,23 @@ void view_set_position(struct roots_view *view, double x, double y) {
view->y = y;
}
-void view_activate(struct roots_view *view, bool activate) {
- if (view->activate) {
- view->activate(view, activate);
- }
-}
-
void view_resize(struct roots_view *view, uint32_t width, uint32_t height) {
if (view->resize) {
view->resize(view, width, height);
}
}
+void view_move_resize(struct roots_view *view, double x, double y,
+ uint32_t width, uint32_t height) {
+ if (view->move_resize) {
+ view->move_resize(view, x, y, width, height);
+ return;
+ }
+
+ view_move(view, x, y);
+ view_resize(view, width, height);
+}
+
void view_close(struct roots_view *view) {
if (view->close) {
view->close(view);
@@ -101,7 +112,7 @@ bool view_center(struct roots_view *view) {
double view_x = (double)(width - size.width) / 2 + l_output->x;
double view_y = (double)(height - size.height) / 2 + l_output->y;
- view_set_position(view, view_x, view_y);
+ view_move(view, view_x, view_y);
return true;
}
diff --git a/rootston/input.c b/rootston/input.c
index 8109d2b6..5d367a5e 100644
--- a/rootston/input.c
+++ b/rootston/input.c
@@ -4,6 +4,7 @@
#include <wlr/types/wlr_cursor.h>
#include <wlr/util/log.h>
#include <wlr/xcursor.h>
+#include <wlr/xwayland.h>
#include "rootston/server.h"
#include "rootston/config.h"
#include "rootston/input.h"
@@ -96,6 +97,14 @@ struct roots_input *input_create(struct roots_server *server,
return NULL;
}
+ if (server->desktop->xwayland != NULL) {
+ struct wlr_xcursor_image *xcursor_image = xcursor->images[0];
+ wlr_xwayland_set_cursor(server->desktop->xwayland,
+ xcursor_image->buffer, xcursor_image->width, xcursor_image->width,
+ xcursor_image->height, xcursor_image->hotspot_x,
+ xcursor_image->hotspot_y);
+ }
+
input->wl_seat = wlr_seat_create(server->wl_display, "seat0");
if (input->wl_seat == NULL) {
wlr_log(L_ERROR, "Cannot create seat");
diff --git a/rootston/wl_shell.c b/rootston/wl_shell.c
index e5366672..e38eb697 100644
--- a/rootston/wl_shell.c
+++ b/rootston/wl_shell.c
@@ -120,7 +120,7 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
surface->parent);
if (i != -1) {
struct roots_view *parent = desktop->views->items[i];
- view_set_position(view,
+ view_move(view,
parent->x + surface->transient_state->x,
parent->y + surface->transient_state->y);
}
diff --git a/rootston/xdg_shell_v6.c b/rootston/xdg_shell_v6.c
index 704ccb1e..ca33c582 100644
--- a/rootston/xdg_shell_v6.c
+++ b/rootston/xdg_shell_v6.c
@@ -25,27 +25,63 @@ static void activate(struct roots_view *view, bool active) {
}
}
+static void apply_size_constraints(struct wlr_xdg_surface_v6 *surf,
+ uint32_t width, uint32_t height, uint32_t *dest_width,
+ uint32_t *dest_height) {
+ *dest_width = width;
+ *dest_height = height;
+
+ struct wlr_xdg_toplevel_v6_state *state =
+ &surf->toplevel_state->current;
+ if (width < state->min_width) {
+ *dest_width = state->min_width;
+ } else if (state->max_width > 0 &&
+ width > state->max_width) {
+ *dest_width = state->max_width;
+ }
+ if (height < state->min_height) {
+ *dest_height = state->min_height;
+ } else if (state->max_height > 0 &&
+ height > state->max_height) {
+ *dest_height = state->max_height;
+ }
+}
+
static void resize(struct roots_view *view, uint32_t width, uint32_t height) {
assert(view->type == ROOTS_XDG_SHELL_V6_VIEW);
struct wlr_xdg_surface_v6 *surf = view->xdg_surface_v6;
- if (surf->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) {
- struct wlr_xdg_toplevel_v6_state *state =
- &surf->toplevel_state->current;
- if (width < state->min_width) {
- width = state->min_width;
- } else if (state->max_width > 0 &&
- width > state->max_width) {
- width = state->max_width;
- }
- if (height < state->min_height) {
- height = state->min_height;
- } else if (state->max_height > 0 &&
- height > state->max_height) {
- height = state->max_height;
- }
-
- wlr_xdg_toplevel_v6_set_size(surf, width, height);
+ if (surf->role != WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) {
+ return;
+ }
+
+ uint32_t contrained_width, contrained_height;
+ apply_size_constraints(surf, width, height, &contrained_width,
+ &contrained_height);
+
+ wlr_xdg_toplevel_v6_set_size(surf, contrained_width, contrained_height);
+}
+
+static void move_resize(struct roots_view *view, double x, double y,
+ uint32_t width, uint32_t height) {
+ assert(view->type == ROOTS_XDG_SHELL_V6_VIEW);
+ struct wlr_xdg_surface_v6 *surf = view->xdg_surface_v6;
+ if (surf->role != WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) {
+ return;
}
+
+ uint32_t contrained_width, contrained_height;
+ apply_size_constraints(surf, width, height, &contrained_width,
+ &contrained_height);
+
+ x = x + width - contrained_width;
+ y = y + height - contrained_height;
+
+ // TODO: we should wait for an ack_configure event before updating the
+ // position
+ view->x = x;
+ view->y = y;
+
+ wlr_xdg_toplevel_v6_set_size(surf, contrained_width, contrained_height);
}
static void close(struct roots_view *view) {
@@ -130,6 +166,10 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
&roots_surface->request_resize);
struct roots_view *view = calloc(1, sizeof(struct roots_view));
+ if (!view) {
+ free(roots_surface);
+ return;
+ }
view->type = ROOTS_XDG_SHELL_V6_VIEW;
view->xdg_surface_v6 = surface;
view->roots_xdg_surface_v6 = roots_surface;
@@ -137,6 +177,7 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
view->get_size = get_size;
view->activate = activate;
view->resize = resize;
+ view->move_resize = move_resize;
view->close = close;
view->desktop = desktop;
roots_surface->view = view;
diff --git a/rootston/xwayland.c b/rootston/xwayland.c
index 2d7fe946..e3fc1c84 100644
--- a/rootston/xwayland.c
+++ b/rootston/xwayland.c
@@ -15,38 +15,69 @@ static void activate(struct roots_view *view, bool active) {
wlr_xwayland_surface_activate(xwayland, view->xwayland_surface, active);
}
-static void resize(struct roots_view *view, uint32_t width, uint32_t height) {
+static void move(struct roots_view *view, double x, double y) {
assert(view->type == ROOTS_XWAYLAND_VIEW);
struct wlr_xwayland_surface *xwayland_surface = view->xwayland_surface;
+ view->x = x;
+ view->y = y;
+ wlr_xwayland_surface_configure(view->desktop->xwayland, xwayland_surface,
+ x, y, xwayland_surface->width, xwayland_surface->height);
+}
+
+static void apply_size_constraints(
+ struct wlr_xwayland_surface *xwayland_surface, uint32_t width,
+ uint32_t height, uint32_t *dest_width, uint32_t *dest_height) {
+ *dest_width = width;
+ *dest_height = height;
struct wlr_xwayland_surface_size_hints *size_hints =
xwayland_surface->size_hints;
if (size_hints != NULL) {
if (width < (uint32_t)size_hints->min_width) {
- width = size_hints->min_width;
+ *dest_width = size_hints->min_width;
} else if (size_hints->max_width > 0 &&
width > (uint32_t)size_hints->max_width) {
- width = size_hints->max_width;
+ *dest_width = size_hints->max_width;
}
if (height < (uint32_t)size_hints->min_height) {
- height = size_hints->min_height;
+ *dest_height = size_hints->min_height;
} else if (size_hints->max_height > 0 &&
height > (uint32_t)size_hints->max_height) {
- height = size_hints->max_height;
+ *dest_height = size_hints->max_height;
}
}
+}
+
+static void resize(struct roots_view *view, uint32_t width, uint32_t height) {
+ assert(view->type == ROOTS_XWAYLAND_VIEW);
+ struct wlr_xwayland_surface *xwayland_surface = view->xwayland_surface;
+
+ uint32_t contrained_width, contrained_height;
+ apply_size_constraints(xwayland_surface, width, height, &contrained_width,
+ &contrained_height);
wlr_xwayland_surface_configure(view->desktop->xwayland, xwayland_surface,
- xwayland_surface->x, xwayland_surface->y, width, height);
+ xwayland_surface->x, xwayland_surface->y, contrained_width,
+ contrained_height);
}
-static void set_position(struct roots_view *view, double x, double y) {
+static void move_resize(struct roots_view *view, double x, double y,
+ uint32_t width, uint32_t height) {
assert(view->type == ROOTS_XWAYLAND_VIEW);
struct wlr_xwayland_surface *xwayland_surface = view->xwayland_surface;
+
+ uint32_t contrained_width, contrained_height;
+ apply_size_constraints(xwayland_surface, width, height, &contrained_width,
+ &contrained_height);
+
+ x = x + width - contrained_width;
+ y = y + height - contrained_height;
+
view->x = x;
view->y = y;
+
wlr_xwayland_surface_configure(view->desktop->xwayland, xwayland_surface,
- x, y, xwayland_surface->width, xwayland_surface->height);
+ x, y, contrained_width, contrained_height);
}
static void close(struct roots_view *view) {
@@ -204,7 +235,8 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
view->desktop = desktop;
view->activate = activate;
view->resize = resize;
- view->set_position = set_position;
+ view->move = move;
+ view->move_resize = move_resize;
view->close = close;
roots_surface->view = view;
wlr_list_add(desktop->views, view);
diff --git a/types/wlr_compositor.c b/types/wlr_compositor.c
index cbb7f138..986b7e60 100644
--- a/types/wlr_compositor.c
+++ b/types/wlr_compositor.c
@@ -13,10 +13,21 @@ static void destroy_surface_listener(struct wl_listener *listener, void *data) {
static void wl_compositor_create_surface(struct wl_client *client,
struct wl_resource *resource, uint32_t id) {
struct wlr_compositor *compositor = wl_resource_get_user_data(resource);
+
struct wl_resource *surface_resource = wl_resource_create(client,
- &wl_surface_interface, wl_resource_get_version(resource), id);
+ &wl_surface_interface, wl_resource_get_version(resource), id);
+ if (surface_resource == NULL) {
+ wl_resource_post_no_memory(resource);
+ return;
+ }
+
struct wlr_surface *surface = wlr_surface_create(surface_resource,
- compositor->renderer);
+ compositor->renderer);
+ if (surface == NULL) {
+ wl_resource_destroy(surface_resource);
+ wl_resource_post_no_memory(resource);
+ return;
+ }
surface->compositor_data = compositor;
surface->compositor_listener.notify = &destroy_surface_listener;
wl_resource_add_destroy_listener(surface_resource,
@@ -49,13 +60,17 @@ static void wl_compositor_destroy(struct wl_resource *resource) {
}
}
-static void wl_compositor_bind(struct wl_client *wl_client, void *_compositor,
+static void wl_compositor_bind(struct wl_client *wl_client, void *data,
uint32_t version, uint32_t id) {
- struct wlr_compositor *compositor = _compositor;
+ struct wlr_compositor *compositor = data;
assert(wl_client && compositor);
struct wl_resource *wl_resource =
wl_resource_create(wl_client, &wl_compositor_interface, version, id);
+ if (wl_resource == NULL) {
+ wl_client_post_no_memory(wl_client);
+ return;
+ }
wl_resource_set_implementation(wl_resource, &wl_compositor_impl,
compositor, wl_compositor_destroy);
wl_list_insert(&compositor->wl_resources,
diff --git a/types/wlr_data_device.c b/types/wlr_data_device.c
index 5800c0f3..ee83260e 100644
--- a/types/wlr_data_device.c
+++ b/types/wlr_data_device.c
@@ -233,6 +233,9 @@ static struct wlr_data_offer *wlr_data_source_send_offer(
struct wlr_data_source *source,
struct wl_resource *target) {
struct wlr_data_offer *offer = calloc(1, sizeof(struct wlr_data_offer));
+ if (offer == NULL) {
+ return NULL;
+ }
offer->resource =
wl_resource_create(wl_resource_get_client(target),
@@ -781,18 +784,16 @@ data_device_manager_impl = {
static void data_device_manager_bind(struct wl_client *client,
void *data, uint32_t version, uint32_t id) {
- struct wl_resource *resource;
-
- resource = wl_resource_create(client,
- &wl_data_device_manager_interface,
- version, id);
+ struct wl_resource *resource = wl_resource_create(client,
+ &wl_data_device_manager_interface,
+ version, id);
if (resource == NULL) {
wl_client_post_no_memory(client);
return;
}
- wl_resource_set_implementation(resource,
- &data_device_manager_impl, NULL, NULL);
+ wl_resource_set_implementation(resource, &data_device_manager_impl,
+ NULL, NULL);
}
struct wlr_data_device_manager *wlr_data_device_manager_create(
@@ -807,7 +808,6 @@ struct wlr_data_device_manager *wlr_data_device_manager_create(
manager->global =
wl_global_create(display, &wl_data_device_manager_interface,
3, NULL, data_device_manager_bind);
-
if (!manager->global) {
wlr_log(L_ERROR, "could not create data device manager wl global");
free(manager);
diff --git a/types/wlr_gamma_control.c b/types/wlr_gamma_control.c
index e765c2a5..355e56a2 100644
--- a/types/wlr_gamma_control.c
+++ b/types/wlr_gamma_control.c
@@ -83,8 +83,8 @@ static void gamma_control_manager_get_gamma_control(struct wl_client *client,
gamma_control->resource = wl_resource_create(client,
&gamma_control_interface, version, id);
if (gamma_control->resource == NULL) {
- wl_client_post_no_memory(client);
free(gamma_control);
+ wl_client_post_no_memory(client);
return;
}
wlr_log(L_DEBUG, "new gamma_control %p (res %p)", gamma_control,
@@ -109,10 +109,9 @@ static struct gamma_control_manager_interface gamma_control_manager_impl = {
.get_gamma_control = gamma_control_manager_get_gamma_control,
};
-static void gamma_control_manager_bind(struct wl_client *client,
- void *_gamma_control_manager, uint32_t version, uint32_t id) {
- struct wlr_gamma_control_manager *gamma_control_manager =
- _gamma_control_manager;
+static void gamma_control_manager_bind(struct wl_client *client, void *data,
+ uint32_t version, uint32_t id) {
+ struct wlr_gamma_control_manager *gamma_control_manager = data;
assert(client && gamma_control_manager);
struct wl_resource *resource = wl_resource_create(client,
diff --git a/types/wlr_output.c b/types/wlr_output.c
index 85e3d05e..5456d064 100644
--- a/types/wlr_output.c
+++ b/types/wlr_output.c
@@ -91,13 +91,17 @@ static struct wl_output_interface wl_output_impl = {
.release = wl_output_release
};
-static void wl_output_bind(struct wl_client *wl_client, void *_wlr_output,
+static void wl_output_bind(struct wl_client *wl_client, void *data,
uint32_t version, uint32_t id) {
- struct wlr_output *wlr_output = _wlr_output;
+ struct wlr_output *wlr_output = data;
assert(wl_client && wlr_output);
struct wl_resource *wl_resource = wl_resource_create(wl_client,
&wl_output_interface, version, id);
+ if (wl_resource == NULL) {
+ wl_client_post_no_memory(wl_client);
+ return;
+ }
wl_resource_set_implementation(wl_resource, &wl_output_impl, wlr_output,
wl_output_destroy);
wl_list_insert(&wlr_output->wl_resources,
@@ -253,10 +257,6 @@ static void output_cursor_render(struct wlr_output_cursor *cursor) {
struct wlr_texture *texture = cursor->texture;
struct wlr_renderer *renderer = cursor->renderer;
if (cursor->surface != NULL) {
- // Some clients commit a cursor surface with a NULL buffer to hide it.
- if (!wlr_surface_has_buffer(cursor->surface)) {
- return;
- }
texture = cursor->surface->texture;
renderer = cursor->surface->renderer;
}
@@ -283,10 +283,16 @@ static void output_cursor_render(struct wlr_output_cursor *cursor) {
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ int x = cursor->x - cursor->hotspot_x;
+ int y = cursor->y - cursor->hotspot_y;
+ if (cursor->surface != NULL) {
+ x += cursor->surface->current->sx;
+ y += cursor->surface->current->sy;
+ }
+
float matrix[16];
- wlr_texture_get_matrix(texture, &matrix,
- &cursor->output->transform_matrix, cursor->x - cursor->hotspot_x,
- cursor->y - cursor->hotspot_y);
+ wlr_texture_get_matrix(texture, &matrix, &cursor->output->transform_matrix,
+ x, y);
wlr_render_with_matrix(renderer, texture, &matrix);
}
@@ -295,7 +301,7 @@ void wlr_output_swap_buffers(struct wlr_output *output) {
struct wlr_output_cursor *cursor;
wl_list_for_each(cursor, &output->cursors, link) {
- if (output->hardware_cursor == cursor) {
+ if (!cursor->enabled || output->hardware_cursor == cursor) {
continue;
}
output_cursor_render(cursor);
@@ -353,6 +359,11 @@ bool wlr_output_cursor_set_image(struct wlr_output_cursor *cursor,
wlr_log(L_INFO, "Falling back to software cursor");
cursor->output->needs_swap = true;
+ cursor->enabled = pixels != NULL;
+ if (!cursor->enabled) {
+ return true;
+ }
+
if (cursor->renderer == NULL) {
cursor->renderer = wlr_gles2_renderer_create(cursor->output->backend);
if (cursor->renderer == NULL) {
@@ -372,6 +383,8 @@ bool wlr_output_cursor_set_image(struct wlr_output_cursor *cursor,
}
static void output_cursor_commit(struct wlr_output_cursor *cursor) {
+ // Some clients commit a cursor surface with a NULL buffer to hide it.
+ cursor->enabled = wlr_surface_has_buffer(cursor->surface);
cursor->width = cursor->surface->current->width;
cursor->height = cursor->surface->current->height;
@@ -418,10 +431,6 @@ void wlr_output_cursor_set_surface(struct wlr_output_cursor *cursor,
return;
}
- if (surface) {
- cursor->width = surface->current->width;
- cursor->height = surface->current->height;
- }
cursor->hotspot_x = hotspot_x;
cursor->hotspot_y = hotspot_y;
@@ -454,6 +463,10 @@ void wlr_output_cursor_set_surface(struct wlr_output_cursor *cursor,
wl_signal_add(&surface->events.destroy, &cursor->surface_destroy);
output_cursor_commit(cursor);
} else {
+ cursor->enabled = false;
+ cursor->width = 0;
+ cursor->height = 0;
+
// TODO: if hardware cursor, disable cursor
}
}
@@ -463,6 +476,7 @@ bool wlr_output_cursor_move(struct wlr_output_cursor *cursor, int x, int y) {
cursor->y = y;
if (cursor->output->hardware_cursor != cursor) {
+ cursor->output->needs_swap = true;
return true;
}
diff --git a/types/wlr_screenshooter.c b/types/wlr_screenshooter.c
index c6def691..a78c7ad7 100644
--- a/types/wlr_screenshooter.c
+++ b/types/wlr_screenshooter.c
@@ -51,16 +51,17 @@ static void output_frame_notify(struct wl_listener *listener, void *_data) {
}
static void screenshooter_shoot(struct wl_client *client,
- struct wl_resource *_screenshooter, uint32_t id,
- struct wl_resource *_output, struct wl_resource *_buffer) {
+ struct wl_resource *screenshooter_resource, uint32_t id,
+ struct wl_resource *output_resource,
+ struct wl_resource *buffer_resource) {
struct wlr_screenshooter *screenshooter =
- wl_resource_get_user_data(_screenshooter);
- struct wlr_output *output = wl_resource_get_user_data(_output);
- if (!wl_shm_buffer_get(_buffer)) {
+ wl_resource_get_user_data(screenshooter_resource);
+ struct wlr_output *output = wl_resource_get_user_data(output_resource);
+ if (!wl_shm_buffer_get(buffer_resource)) {
wlr_log(L_ERROR, "Invalid buffer: not a shared memory buffer");
return;
}
- struct wl_shm_buffer *shm_buffer = wl_shm_buffer_get(_buffer);
+ struct wl_shm_buffer *shm_buffer = wl_shm_buffer_get(buffer_resource);
int32_t width = wl_shm_buffer_get_width(shm_buffer);
int32_t height = wl_shm_buffer_get_height(shm_buffer);
int32_t stride = wl_shm_buffer_get_stride(shm_buffer);
@@ -84,23 +85,31 @@ static void screenshooter_shoot(struct wl_client *client,
struct wlr_screenshot *screenshot =
calloc(1, sizeof(struct wlr_screenshot));
if (!screenshot) {
- wl_client_post_no_memory(client);
+ wl_resource_post_no_memory(screenshooter_resource);
return;
}
- screenshot->output_resource = _output;
+ screenshot->output_resource = output_resource;
screenshot->output = output;
screenshot->screenshooter = screenshooter;
screenshot->resource = wl_resource_create(client,
- &orbital_screenshot_interface, wl_resource_get_version(_screenshooter),
- id);
- wlr_log(L_DEBUG, "new screenshot %p (res %p)", screenshot,
- screenshot->resource);
+ &orbital_screenshot_interface,
+ wl_resource_get_version(screenshooter_resource), id);
+ if (screenshot->resource == NULL) {
+ free(screenshot);
+ wl_resource_post_no_memory(screenshooter_resource);
+ return;
+ }
wl_resource_set_implementation(screenshot->resource, NULL, screenshot,
NULL);
+ wlr_log(L_DEBUG, "new screenshot %p (res %p)", screenshot,
+ screenshot->resource);
+
struct screenshot_state *state = calloc(1, sizeof(struct screenshot_state));
if (!state) {
- wl_client_post_no_memory(client);
+ wl_resource_destroy(screenshot->resource);
+ free(screenshot);
+ wl_resource_post_no_memory(screenshooter_resource);
return;
}
state->width = width;
@@ -117,13 +126,17 @@ static struct orbital_screenshooter_interface screenshooter_impl = {
.shoot = screenshooter_shoot,
};
-static void screenshooter_bind(struct wl_client *wl_client,
- void *_screenshooter, uint32_t version, uint32_t id) {
- struct wlr_screenshooter *screenshooter = _screenshooter;
+static void screenshooter_bind(struct wl_client *wl_client, void *data,
+ uint32_t version, uint32_t id) {
+ struct wlr_screenshooter *screenshooter = data;
assert(wl_client && screenshooter);
struct wl_resource *wl_resource = wl_resource_create(wl_client,
&orbital_screenshooter_interface, version, id);
+ if (wl_resource == NULL) {
+ wl_client_post_no_memory(wl_client);
+ return;
+ }
wl_resource_set_implementation(wl_resource, &screenshooter_impl,
screenshooter, NULL);
}
@@ -137,13 +150,12 @@ struct wlr_screenshooter *wlr_screenshooter_create(struct wl_display *display,
}
screenshooter->renderer = renderer;
- struct wl_global *wl_global = wl_global_create(display,
+ screenshooter->wl_global = wl_global_create(display,
&orbital_screenshooter_interface, 1, screenshooter, screenshooter_bind);
- if (!wl_global) {
+ if (screenshooter->wl_global == NULL) {
free(screenshooter);
return NULL;
}
- screenshooter->wl_global = wl_global;
return screenshooter;
}
diff --git a/types/wlr_seat.c b/types/wlr_seat.c
index bdea96ac..76b34d31 100644
--- a/types/wlr_seat.c
+++ b/types/wlr_seat.c
@@ -65,9 +65,9 @@ static void wl_pointer_destroy(struct wl_resource *resource) {
}
static void wl_seat_get_pointer(struct wl_client *client,
- struct wl_resource *pointer_resource, uint32_t id) {
+ struct wl_resource *seat_resource, uint32_t id) {
struct wlr_seat_client *seat_client =
- wl_resource_get_user_data(pointer_resource);
+ wl_resource_get_user_data(seat_resource);
if (!(seat_client->seat->capabilities & WL_SEAT_CAPABILITY_POINTER)) {
return;
}
@@ -78,7 +78,11 @@ static void wl_seat_get_pointer(struct wl_client *client,
wl_resource_destroy(seat_client->pointer);
}
seat_client->pointer = wl_resource_create(client, &wl_pointer_interface,
- wl_resource_get_version(pointer_resource), id);
+ wl_resource_get_version(seat_resource), id);
+ if (seat_client->pointer == NULL) {
+ wl_resource_post_no_memory(seat_resource);
+ return;
+ }
wl_resource_set_implementation(seat_client->pointer, &wl_pointer_impl,
seat_client, &wl_pointer_destroy);
}
@@ -126,6 +130,10 @@ static void wl_seat_get_keyboard(struct wl_client *client,
}
seat_client->keyboard = wl_resource_create(client, &wl_keyboard_interface,
wl_resource_get_version(seat_resource), id);
+ if (seat_client->keyboard == NULL) {
+ wl_resource_post_no_memory(seat_resource);
+ return;
+ }
wl_resource_set_implementation(seat_client->keyboard, &wl_keyboard_impl,
seat_client, &wl_keyboard_destroy);
@@ -162,6 +170,10 @@ static void wl_seat_get_touch(struct wl_client *client,
}
seat_client->touch = wl_resource_create(client, &wl_touch_interface,
wl_resource_get_version(seat_resource), id);
+ if (seat_client->touch == NULL) {
+ wl_resource_post_no_memory(seat_resource);
+ return;
+ }
wl_resource_set_implementation(seat_client->touch, &wl_touch_impl,
seat_client, &wl_touch_destroy);
}
@@ -213,6 +225,11 @@ static void wl_seat_bind(struct wl_client *client, void *_wlr_seat,
}
seat_client->wl_resource =
wl_resource_create(client, &wl_seat_interface, version, id);
+ if (seat_client->wl_resource == NULL) {
+ free(seat_client);
+ wl_client_post_no_memory(client);
+ return;
+ }
seat_client->client = client;
seat_client->seat = wlr_seat;
wl_resource_set_implementation(seat_client->wl_resource, &wl_seat_impl,
diff --git a/types/wlr_server_decoration.c b/types/wlr_server_decoration.c
index 0664edfb..60cc6369 100644
--- a/types/wlr_server_decoration.c
+++ b/types/wlr_server_decoration.c
@@ -73,8 +73,8 @@ static void server_decoration_manager_handle_create(struct wl_client *client,
decoration->resource = wl_resource_create(client,
&org_kde_kwin_server_decoration_interface, version, id);
if (decoration->resource == NULL) {
- wl_client_post_no_memory(client);
free(decoration);
+ wl_client_post_no_memory(client);
return;
}
wl_resource_set_implementation(decoration->resource,
@@ -120,9 +120,9 @@ void server_decoration_manager_destroy_resource(struct wl_resource *resource) {
wl_list_remove(wl_resource_get_link(resource));
}
-static void server_decoration_manager_bind(struct wl_client *client,
- void *_manager, uint32_t version, uint32_t id) {
- struct wlr_server_decoration_manager *manager = _manager;
+static void server_decoration_manager_bind(struct wl_client *client, void *data,
+ uint32_t version, uint32_t id) {
+ struct wlr_server_decoration_manager *manager = data;
assert(client && manager);
struct wl_resource *resource = wl_resource_create(client,
diff --git a/types/wlr_surface.c b/types/wlr_surface.c
index 2a8c4d04..48971849 100644
--- a/types/wlr_surface.c
+++ b/types/wlr_surface.c
@@ -819,14 +819,21 @@ static void subsurface_handle_parent_destroy(struct wl_listener *listener,
void wlr_surface_make_subsurface(struct wlr_surface *surface,
struct wlr_surface *parent, uint32_t id) {
+ struct wl_client *client = wl_resource_get_client(surface->resource);
assert(surface->subsurface == NULL);
struct wlr_subsurface *subsurface =
calloc(1, sizeof(struct wlr_subsurface));
if (!subsurface) {
+ wl_client_post_no_memory(client);
return;
}
subsurface->cached = wlr_surface_state_create();
+ if (subsurface->cached == NULL) {
+ free(subsurface);
+ wl_client_post_no_memory(client);
+ return;
+ }
subsurface->synchronized = true;
subsurface->surface = surface;
@@ -840,10 +847,14 @@ void wlr_surface_make_subsurface(struct wlr_surface *surface,
wl_list_insert(&parent->subsurface_pending_list,
&subsurface->parent_pending_link);
- struct wl_client *client = wl_resource_get_client(surface->resource);
-
subsurface->resource =
wl_resource_create(client, &wl_subsurface_interface, 1, id);
+ if (subsurface->resource == NULL) {
+ wlr_surface_state_destroy(subsurface->cached);
+ free(subsurface);
+ wl_client_post_no_memory(client);
+ return;
+ }
wl_resource_set_implementation(subsurface->resource,
&subsurface_implementation, subsurface,
diff --git a/types/wlr_wl_shell.c b/types/wlr_wl_shell.c
index dd1f10b2..fe61075e 100644
--- a/types/wlr_wl_shell.c
+++ b/types/wlr_wl_shell.c
@@ -506,19 +506,19 @@ static int shell_surface_ping_timeout(void *user_data) {
}
static void shell_protocol_get_shell_surface(struct wl_client *client,
- struct wl_resource *resource, uint32_t id,
+ struct wl_resource *shell_resource, uint32_t id,
struct wl_resource *surface_resource) {
struct wlr_surface *surface = wl_resource_get_user_data(surface_resource);
if (wlr_surface_set_role(surface, wlr_wl_shell_surface_role,
- resource, WL_SHELL_ERROR_ROLE)) {
+ shell_resource, WL_SHELL_ERROR_ROLE)) {
return;
}
- struct wlr_wl_shell *wl_shell = wl_resource_get_user_data(resource);
+ struct wlr_wl_shell *wl_shell = wl_resource_get_user_data(shell_resource);
struct wlr_wl_shell_surface *wl_surface =
calloc(1, sizeof(struct wlr_wl_shell_surface));
if (wl_surface == NULL) {
- wl_client_post_no_memory(client);
+ wl_resource_post_no_memory(shell_resource);
return;
}
wl_list_init(&wl_surface->grab_link);
@@ -530,13 +530,20 @@ static void shell_protocol_get_shell_surface(struct wl_client *client,
wl_surface->surface = surface;
wl_surface->resource = wl_resource_create(client,
- &wl_shell_surface_interface, wl_resource_get_version(resource), id);
- wlr_log(L_DEBUG, "new wl_shell %p (res %p)", wl_surface,
- wl_surface->resource);
+ &wl_shell_surface_interface, wl_resource_get_version(shell_resource),
+ id);
+ if (wl_surface->resource == NULL) {
+ free(wl_surface);
+ wl_resource_post_no_memory(shell_resource);
+ return;
+ }
wl_resource_set_implementation(wl_surface->resource,
&shell_surface_impl, wl_surface,
shell_surface_resource_destroy);
+ wlr_log(L_DEBUG, "new wl_shell %p (res %p)", wl_surface,
+ wl_surface->resource);
+
wl_signal_init(&wl_surface->events.destroy);
wl_signal_init(&wl_surface->events.ping_timeout);
wl_signal_init(&wl_surface->events.request_move);
@@ -574,13 +581,17 @@ static void shell_destroy(struct wl_resource *resource) {
wl_list_remove(wl_resource_get_link(resource));
}
-static void shell_bind(struct wl_client *wl_client, void *_wl_shell,
+static void shell_bind(struct wl_client *wl_client, void *data,
uint32_t version, uint32_t id) {
- struct wlr_wl_shell *wl_shell = _wl_shell;
+ struct wlr_wl_shell *wl_shell = data;
assert(wl_client && wl_shell);
struct wl_resource *wl_resource = wl_resource_create(wl_client,
&wl_shell_interface, version, id);
+ if (wl_resource == NULL) {
+ wl_client_post_no_memory(wl_client);
+ return;
+ }
wl_resource_set_implementation(wl_resource, &shell_impl, wl_shell,
shell_destroy);
wl_list_insert(&wl_shell->wl_resources, wl_resource_get_link(wl_resource));
diff --git a/types/wlr_xdg_shell_v6.c b/types/wlr_xdg_shell_v6.c
index af551b10..fc45bc17 100644
--- a/types/wlr_xdg_shell_v6.c
+++ b/types/wlr_xdg_shell_v6.c
@@ -343,8 +343,8 @@ static void xdg_shell_create_positioner(struct wl_client *wl_client,
wl_resource_get_version(resource),
id);
if (positioner->resource == NULL) {
- wl_client_post_no_memory(wl_client);
free(positioner);
+ wl_client_post_no_memory(wl_client);
return;
}
@@ -480,13 +480,13 @@ static void xdg_surface_get_popup(struct wl_client *client,
}
if (wlr_surface_set_role(surface->surface, wlr_desktop_xdg_popup_role,
- resource, ZXDG_SHELL_V6_ERROR_ROLE)) {
+ resource, ZXDG_SHELL_V6_ERROR_ROLE)) {
return;
}
surface->popup_state = calloc(1, sizeof(struct wlr_xdg_popup_v6));
if (!surface->popup_state) {
- wl_client_post_no_memory(client);
+ wl_resource_post_no_memory(resource);
return;
}
@@ -495,6 +495,7 @@ static void xdg_surface_get_popup(struct wl_client *client,
wl_resource_get_version(resource), id);
if (surface->popup_state->resource == NULL) {
free(surface->popup_state);
+ wl_resource_post_no_memory(resource);
return;
}
@@ -735,7 +736,7 @@ static void xdg_surface_get_toplevel(struct wl_client *client,
surface->toplevel_state = calloc(1, sizeof(struct wlr_xdg_toplevel_v6));
if (surface->toplevel_state == NULL) {
- wl_client_post_no_memory(client);
+ wl_resource_post_no_memory(resource);
return;
}
@@ -744,6 +745,11 @@ static void xdg_surface_get_toplevel(struct wl_client *client,
struct wl_resource *toplevel_resource = wl_resource_create(client,
&zxdg_toplevel_v6_interface, wl_resource_get_version(resource), id);
+ if (toplevel_resource == NULL) {
+ free(surface->toplevel_state);
+ wl_resource_post_no_memory(resource);
+ return;
+ }
surface->toplevel_state->resource = toplevel_resource;
@@ -1118,9 +1124,20 @@ static void xdg_shell_get_xdg_surface(struct wl_client *wl_client,
surface->resource = wl_resource_create(wl_client,
&zxdg_surface_v6_interface, wl_resource_get_version(client_resource),
id);
+ if (surface->resource == NULL) {
+ free(surface->next_geometry);
+ free(surface->geometry);
+ free(surface);
+ wl_client_post_no_memory(wl_client);
+ return;
+ }
if (wlr_surface_has_buffer(surface->surface)) {
- wl_resource_post_error(surface->resource,
+ wl_resource_destroy(surface->resource);
+ free(surface->next_geometry);
+ free(surface->geometry);
+ free(surface);
+ wl_resource_post_error(surface_resource,
ZXDG_SURFACE_V6_ERROR_UNCONFIGURED_BUFFER,
"xdg_surface must not have a buffer at creation");
return;
@@ -1199,9 +1216,9 @@ static int wlr_xdg_client_v6_ping_timeout(void *user_data) {
return 1;
}
-static void xdg_shell_bind(struct wl_client *wl_client, void *_xdg_shell,
+static void xdg_shell_bind(struct wl_client *wl_client, void *data,
uint32_t version, uint32_t id) {
- struct wlr_xdg_shell_v6 *xdg_shell = _xdg_shell;
+ struct wlr_xdg_shell_v6 *xdg_shell = data;
assert(wl_client && xdg_shell);
struct wlr_xdg_client_v6 *client =
@@ -1215,6 +1232,11 @@ static void xdg_shell_bind(struct wl_client *wl_client, void *_xdg_shell,
client->resource =
wl_resource_create(wl_client, &zxdg_shell_v6_interface, version, id);
+ if (client->resource == NULL) {
+ free(client);
+ wl_client_post_no_memory(wl_client);
+ return;
+ }
client->client = wl_client;
client->shell = xdg_shell;
diff --git a/xwayland/meson.build b/xwayland/meson.build
index a05ae584..e92e042c 100644
--- a/xwayland/meson.build
+++ b/xwayland/meson.build
@@ -11,6 +11,8 @@ lib_wlr_xwayland = static_library(
xcb,
xcb_composite,
xcb_xfixes,
+ xcb_image,
+ xcb_render,
xcb_icccm,
pixman,
],
diff --git a/xwayland/xwayland.c b/xwayland/xwayland.c
index 81bac2ce..0452f04c 100644
--- a/xwayland/xwayland.c
+++ b/xwayland/xwayland.c
@@ -29,6 +29,15 @@ static inline int clearenv(void) {
}
#endif
+struct wlr_xwayland_cursor {
+ uint8_t *pixels;
+ uint32_t stride;
+ uint32_t width;
+ uint32_t height;
+ int32_t hotspot_x;
+ int32_t hotspot_y;
+};
+
static void safe_close(int fd) {
if (fd >= 0) {
close(fd);
@@ -190,6 +199,14 @@ static int xserver_handle_ready(int signal_number, void *data) {
wl_event_source_remove(wlr_xwayland->sigusr1_source);
wlr_xwayland->sigusr1_source = NULL;
+ if (wlr_xwayland->cursor != NULL) {
+ struct wlr_xwayland_cursor *cur = wlr_xwayland->cursor;
+ xwm_set_cursor(wlr_xwayland->xwm, cur->pixels, cur->stride, cur->width,
+ cur->height, cur->hotspot_x, cur->hotspot_y);
+ free(cur);
+ wlr_xwayland->cursor = NULL;
+ }
+
char display_name[16];
snprintf(display_name, sizeof(display_name), ":%d", wlr_xwayland->display);
setenv("DISPLAY", display_name, true);
@@ -298,3 +315,26 @@ struct wlr_xwayland *wlr_xwayland_create(struct wl_display *wl_display,
free(wlr_xwayland);
return NULL;
}
+
+void wlr_xwayland_set_cursor(struct wlr_xwayland *wlr_xwayland,
+ uint8_t *pixels, uint32_t stride, uint32_t width, uint32_t height,
+ int32_t hotspot_x, int32_t hotspot_y) {
+ if (wlr_xwayland->xwm != NULL) {
+ xwm_set_cursor(wlr_xwayland->xwm, pixels, stride, width, height,
+ hotspot_x, hotspot_y);
+ return;
+ }
+
+ free(wlr_xwayland->cursor);
+
+ wlr_xwayland->cursor = calloc(1, sizeof(struct wlr_xwayland_cursor));
+ if (wlr_xwayland->cursor == NULL) {
+ return;
+ }
+ wlr_xwayland->cursor->pixels = pixels;
+ wlr_xwayland->cursor->stride = stride;
+ wlr_xwayland->cursor->width = width;
+ wlr_xwayland->cursor->height = height;
+ wlr_xwayland->cursor->hotspot_x = hotspot_x;
+ wlr_xwayland->cursor->hotspot_y = hotspot_y;
+}
diff --git a/xwayland/xwm.c b/xwayland/xwm.c
index 4930d45c..f011587e 100644
--- a/xwayland/xwm.c
+++ b/xwayland/xwm.c
@@ -5,9 +5,12 @@
#include <unistd.h>
#include <xcb/composite.h>
#include <xcb/xfixes.h>
+#include <xcb/xcb_image.h>
+#include <xcb/render.h>
#include "wlr/util/log.h"
#include "wlr/types/wlr_surface.h"
#include "wlr/xwayland.h"
+#include "wlr/xcursor.h"
#include "xwm.h"
#ifdef HAS_XCB_ICCCM
@@ -1035,6 +1038,9 @@ void xwm_destroy(struct wlr_xwm *xwm) {
if (!xwm) {
return;
}
+ if (xwm->cursor) {
+ xcb_free_cursor(xwm->xcb_conn, xwm->cursor);
+ }
if (xwm->event_source) {
wl_event_source_remove(xwm->event_source);
}
@@ -1097,7 +1103,6 @@ static void xwm_get_resources(struct wlr_xwm *xwm) {
xfixes_reply->major_version, xfixes_reply->minor_version);
free(xfixes_reply);
-
}
static void xwm_create_wm_window(struct wlr_xwm *xwm) {
@@ -1170,7 +1175,7 @@ static void xwm_get_visual_and_colormap(struct wlr_xwm *xwm) {
}
if (visualtype == NULL) {
- wlr_log(L_DEBUG, "no 32 bit visualtype\n");
+ wlr_log(L_DEBUG, "No 32 bit visualtype\n");
return;
}
@@ -1183,6 +1188,71 @@ static void xwm_get_visual_and_colormap(struct wlr_xwm *xwm) {
xwm->visual_id);
}
+static void xwm_get_render_format(struct wlr_xwm *xwm) {
+ xcb_render_query_pict_formats_cookie_t cookie =
+ xcb_render_query_pict_formats(xwm->xcb_conn);
+ xcb_render_query_pict_formats_reply_t *reply =
+ xcb_render_query_pict_formats_reply(xwm->xcb_conn, cookie, NULL);
+ xcb_render_pictforminfo_iterator_t iter =
+ xcb_render_query_pict_formats_formats_iterator(reply);
+ xcb_render_pictforminfo_t *format = NULL;
+ while (iter.rem > 0) {
+ if (iter.data->depth == 32) {
+ format = iter.data;
+ break;
+ }
+
+ xcb_render_pictforminfo_next(&iter);
+ }
+
+ if (format == NULL) {
+ wlr_log(L_DEBUG, "No 32 bit render format");
+ return;
+ }
+
+ xwm->render_format_id = format->id;
+}
+
+void xwm_set_cursor(struct wlr_xwm *xwm, const uint8_t *pixels, uint32_t stride,
+ uint32_t width, uint32_t height, int32_t hotspot_x, int32_t hotspot_y) {
+ if (!xwm->render_format_id) {
+ wlr_log(L_ERROR, "Cannot set xwm cursor: no render format available");
+ return;
+ }
+ if (xwm->cursor) {
+ xcb_free_cursor(xwm->xcb_conn, xwm->cursor);
+ }
+
+ stride *= 4;
+ int depth = 32;
+
+ xcb_pixmap_t pix = xcb_generate_id(xwm->xcb_conn);
+ xcb_create_pixmap(xwm->xcb_conn, depth, pix, xwm->screen->root, width,
+ height);
+
+ xcb_render_picture_t pic = xcb_generate_id(xwm->xcb_conn);
+ xcb_render_create_picture(xwm->xcb_conn, pic, pix, xwm->render_format_id,
+ 0, 0);
+
+ xcb_gcontext_t gc = xcb_generate_id(xwm->xcb_conn);
+ xcb_create_gc(xwm->xcb_conn, gc, pix, 0, NULL);
+
+ xcb_put_image(xwm->xcb_conn, XCB_IMAGE_FORMAT_Z_PIXMAP, pix, gc,
+ width, height, 0, 0, 0, depth, stride * height * sizeof(uint8_t),
+ pixels);
+ xcb_free_gc(xwm->xcb_conn, gc);
+
+ xwm->cursor = xcb_generate_id(xwm->xcb_conn);
+ xcb_render_create_cursor(xwm->xcb_conn, xwm->cursor, pic, hotspot_x,
+ hotspot_y);
+ xcb_free_pixmap(xwm->xcb_conn, pix);
+
+ uint32_t values[] = {xwm->cursor};
+ xcb_change_window_attributes(xwm->xcb_conn, xwm->screen->root,
+ XCB_CW_CURSOR, values);
+ xcb_flush(xwm->xcb_conn);
+}
+
struct wlr_xwm *xwm_create(struct wlr_xwayland *wlr_xwayland) {
struct wlr_xwm *xwm = calloc(1, sizeof(struct wlr_xwm));
if (xwm == NULL) {
@@ -1219,16 +1289,16 @@ struct wlr_xwm *xwm_create(struct wlr_xwayland *wlr_xwayland) {
xwm_get_resources(xwm);
xwm_get_visual_and_colormap(xwm);
+ xwm_get_render_format(xwm);
- uint32_t values[1];
- values[0] =
+ uint32_t values[] = {
XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY |
- XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT |
- XCB_EVENT_MASK_PROPERTY_CHANGE;
-
+ XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT |
+ XCB_EVENT_MASK_PROPERTY_CHANGE,
+ };
xcb_change_window_attributes(xwm->xcb_conn,
xwm->screen->root,
- XCB_CW_EVENT_MASK /* | XCB_CW_CURSOR */,
+ XCB_CW_EVENT_MASK,
values);
xcb_composite_redirect_subwindows(xwm->xcb_conn,
diff --git a/xwayland/xwm.h b/xwayland/xwm.h
index 7d30d278..547cd5eb 100644
--- a/xwayland/xwm.h
+++ b/xwayland/xwm.h
@@ -1,5 +1,7 @@
#ifndef XWAYLAND_INTERNALS_H
#define XWAYLAND_INTERNALS_H
+
+#include <xcb/render.h>
#include <wayland-server-core.h>
#include <wlr/xwayland.h>
@@ -49,6 +51,8 @@ struct wlr_xwm {
xcb_window_t window;
xcb_visualid_t visual_id;
xcb_colormap_t colormap;
+ xcb_render_pictformat_t render_format_id;
+ xcb_cursor_t cursor;
struct wlr_xwayland_surface *focus_surface;
@@ -60,8 +64,11 @@ struct wlr_xwm {
struct wl_listener compositor_surface_create;
};
+struct wlr_xwm *xwm_create(struct wlr_xwayland *wlr_xwayland);
+
void xwm_destroy(struct wlr_xwm *xwm);
-struct wlr_xwm *xwm_create(struct wlr_xwayland *wlr_xwayland);
+void xwm_set_cursor(struct wlr_xwm *xwm, const uint8_t *pixels, uint32_t stride,
+ uint32_t width, uint32_t height, int32_t hotspot_x, int32_t hotspot_y);
#endif
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-14 04:47:10 +0000