hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-22 12:55:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

compositor: add wlr_surface_role.no_object

Browse source 
This commit allows to make a role as not represented by an object,
which fixes calling role commit handlers for roles like cursor
surfaces.

Fixes: 099b9de752
This commit is contained in:
Kirill Primak 2023-06-07 09:34:19 +03:00 committed by Simon Ser
parent 2d9659d765
commit 753f3cc4fa
5 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/wlr/types/wlr_compositor.h
View file

@ -73,8 +73,16 @@ struct wlr_surface_state {
struct wlr_surface_role { struct wlr_surface_role {
const char *name; const char *name;
/**
* If true, the role isn't represented by any object.
* For example, this applies to cursor surfaces.
*/
bool no_object;
/** /**
* Called when a new surface state is committed. May be NULL. * Called when a new surface state is committed. May be NULL.
*
* If the role is represented by an object, this is only called if
* such object exists.
*/ */
void (*commit)(struct wlr_surface *surface); void (*commit)(struct wlr_surface *surface);
/** /**
@ -224,6 +232,10 @@ typedef void (*wlr_surface_iterator_func_t)(struct wlr_surface *surface,
/** /**
* Set the lifetime role for this surface. Returns true on success or false if * Set the lifetime role for this surface. Returns true on success or false if
* the role cannot be set. * the role cannot be set.
*
* If the role is represented by an object, role_data must be non-NULL.
* Alternatively, if the role isn't represented by any object, role_data must
* be NULL.
*/ */
bool wlr_surface_set_role(struct wlr_surface *surface, bool wlr_surface_set_role(struct wlr_surface *surface,
const struct wlr_surface_role *role, void *role_data, const struct wlr_surface_role *role, void *role_data,

1
types/data_device/wlr_drag.c
View file

@ -365,6 +365,7 @@ static void drag_icon_surface_role_commit(struct wlr_surface *surface) {
const struct wlr_surface_role drag_icon_surface_role = { const struct wlr_surface_role drag_icon_surface_role = {
.name = "wl_data_device-icon", .name = "wl_data_device-icon",
.no_object = true,
.commit = drag_icon_surface_role_commit, .commit = drag_icon_surface_role_commit,
}; };

1
types/seat/wlr_seat_pointer.c
View file

@ -79,6 +79,7 @@ static void pointer_cursor_surface_handle_commit(struct wlr_surface *surface) {
static const struct wlr_surface_role pointer_cursor_surface_role = { static const struct wlr_surface_role pointer_cursor_surface_role = {
.name = "wl_pointer-cursor", .name = "wl_pointer-cursor",
.no_object = true,
.commit = pointer_cursor_surface_handle_commit, .commit = pointer_cursor_surface_handle_commit,
}; };

1
types/tablet_v2/wlr_tablet_v2_tool.c
View file

@ -25,6 +25,7 @@ static void tablet_tool_cursor_surface_handle_commit(struct wlr_surface *surface
static const struct wlr_surface_role tablet_tool_cursor_surface_role = { static const struct wlr_surface_role tablet_tool_cursor_surface_role = {
.name = "wp_tablet_tool-cursor", .name = "wp_tablet_tool-cursor",
.no_object = true,
.commit = tablet_tool_cursor_surface_handle_commit, .commit = tablet_tool_cursor_surface_handle_commit,
}; };

4
types/wlr_compositor.c
View file

@ -491,7 +491,8 @@ static void surface_commit_state(struct wlr_surface *surface,
surface->pending.seq++; surface->pending.seq++;
} }
if (surface->role_data != NULL && surface->role->commit != NULL) { if (surface->role != NULL && surface->role->commit != NULL &&
(surface->role_data != NULL || surface->role->no_object)) {
surface->role->commit(surface); surface->role->commit(surface);
} }
@ -768,6 +769,7 @@ bool wlr_surface_set_role(struct wlr_surface *surface,
const struct wlr_surface_role *role, void *role_data, const struct wlr_surface_role *role, void *role_data,
struct wl_resource *error_resource, uint32_t error_code) { struct wl_resource *error_resource, uint32_t error_code) {
assert(role != NULL); assert(role != NULL);
assert((role_data == NULL) == role->no_object);
if (surface->role != NULL && surface->role != role) { if (surface->role != NULL && surface->role != role) {
if (error_resource != NULL) { if (error_resource != NULL) {