mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-14 08:22:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'github/fork/Geo25rey/cursor_is_attached' into 'master'

Browse source 
wlr_cursor: add wlr_cursor_is_input_device_attached to wlr_cursor

See merge request wlroots/wlroots!2403
This commit is contained in:
Geoffrey Casper 2026-01-15 06:44:57 +00:00
commit 7836e0d069
2 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
include/wlr/types/wlr_cursor.h
View file

@ -166,6 +166,13 @@ void wlr_cursor_set_xcursor(struct wlr_cursor *cur,
void wlr_cursor_set_surface(struct wlr_cursor *cur, struct wlr_surface *surface, void wlr_cursor_set_surface(struct wlr_cursor *cur, struct wlr_surface *surface,
int32_t hotspot_x, int32_t hotspot_y); int32_t hotspot_x, int32_t hotspot_y);
/**
* Returns true when the input device, dev, is attached to the cursor, cur,
* by the wlr_cursor_attach_input_device function.
*/
bool wlr_cursor_is_input_device_attached(struct wlr_cursor *cur,
struct wlr_input_device *dev);
/** /**
* Attaches this input device to this cursor. The input device must be one of: * Attaches this input device to this cursor. The input device must be one of:
* *

21
types/wlr_cursor.c
View file

@ -1088,6 +1088,20 @@ static struct wlr_cursor_device *cursor_device_create(
return c_device; return c_device;
} }
bool wlr_cursor_is_input_device_attached(struct wlr_cursor *cur,
struct wlr_input_device *dev) {
if (!cur || !dev) {
return false;
}
struct wlr_cursor_device *_dev;
wl_list_for_each(_dev, &cur->state->devices, link) {
if (_dev->device == dev) {
return true;
}
}
return false;
}
void wlr_cursor_attach_input_device(struct wlr_cursor *cur, void wlr_cursor_attach_input_device(struct wlr_cursor *cur,
struct wlr_input_device *dev) { struct wlr_input_device *dev) {
switch (dev->type) { switch (dev->type) {
@ -1102,11 +1116,8 @@ void wlr_cursor_attach_input_device(struct wlr_cursor *cur,
} }
// make sure it is not already attached // make sure it is not already attached
struct wlr_cursor_device *_dev; if (wlr_cursor_is_input_device_attached(cur, dev)) {
wl_list_for_each(_dev, &cur->state->devices, link) { return;
if (_dev->device == dev) {
return;
}
} }
cursor_device_create(cur, dev); cursor_device_create(cur, dev);