pyrite-dev/milsko
pyrite-dev/milsko
12
1
Fork 3
Code Issues 4 Pull requests Projects Releases 10 Packages Wiki Activity Actions

ensure even further that the clipboards are set up if the function is called before wl_seat)
All checks were successful
pyrite-dev/milsko/pipeline/head This commit looks good
Details

Browse source
This commit is contained in:
IoIxD 2026-04-26 13:44:11 -07:00
commit 837c28133a
2 changed files with 35 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/Mw/LowLevel/Wayland.h
View file

@ -398,7 +398,7 @@ typedef struct wl_clipboard_device_context {
} offer; } offer;
MwLL ll; MwLL ll;
struct wl_seat* seat; // struct wl_seat* seat;
} wl_clipboard_device_context_t; } wl_clipboard_device_context_t;
struct _MwLLWayland { struct _MwLLWayland {
@ -482,6 +482,7 @@ struct _MwLLWayland {
} clipboard_source; } clipboard_source;
char* clipboard_buffer; char* clipboard_buffer;
MwBool supports_zwp; MwBool supports_zwp;
MwBool zwp_setup;
uint32_t clipboard_serial; uint32_t clipboard_serial;
wl_clipboard_device_context_t** clipboard_devices_wl; wl_clipboard_device_context_t** clipboard_devices_wl;

47
src/backend/wayland.c
View file

@ -78,6 +78,8 @@ static void region_invalidate(MwLL handle);
static void update_buffer(MwLL self, struct _MwLLWaylandShmBuffer* buffer); static void update_buffer(MwLL self, struct _MwLLWaylandShmBuffer* buffer);
static void setup_clipboard(MwLL self, struct wl_seat* wl_seat); static void setup_clipboard(MwLL self, struct wl_seat* wl_seat);
static void setup_zwp_clipboard(MwLL self, struct wl_seat* wl_seat);
static int event_loop(MwLL handle);
/* Get the registered interface from r, or NULL if it doesn't currently have it. */ /* Get the registered interface from r, or NULL if it doesn't currently have it. */
#define WAYLAND_GET_INTERFACE(handle, inter) shget(handle.wl_protocol_map, inter##_interface.name) #define WAYLAND_GET_INTERFACE(handle, inter) shget(handle.wl_protocol_map, inter##_interface.name)
@ -433,6 +435,14 @@ static wayland_protocol_t* wl_data_device_manager_setup(MwU32 name, struct _MwLL
wl_data_source_add_listener(wayland->clipboard_source.wl, &wl_data_source_listener, wayland); wl_data_source_add_listener(wayland->clipboard_source.wl, &wl_data_source_listener, wayland);
while(!wayland->pointer_seat) {
if(wl_display_roundtrip(wayland->display) == -1) {
printf("roundtrip failed: %d\n", wl_display_get_error(wayland->display));
raise(SIGTRAP);
return NULL;
}
}
if(wayland->pointer_seat) { if(wayland->pointer_seat) {
setup_clipboard((MwLL)wayland, wayland->pointer_seat); setup_clipboard((MwLL)wayland, wayland->pointer_seat);
} }
@ -465,6 +475,18 @@ static wayland_protocol_t* zwp_primary_selection_device_manager_v1_setup(MwU32 n
wayland->supports_zwp = MwTRUE; wayland->supports_zwp = MwTRUE;
while(!wayland->pointer_seat) {
if(wl_display_roundtrip(wayland->display) == -1) {
printf("roundtrip failed: %d\n", wl_display_get_error(wayland->display));
raise(SIGTRAP);
return NULL;
}
}
if(wayland->pointer_seat) {
setup_zwp_clipboard((MwLL)wayland, wayland->pointer_seat);
}
return NULL; return NULL;
} }
@ -915,26 +937,22 @@ static void keyboard_modifiers(void* data,
WAYLAND_EVENT_OP_END(self); WAYLAND_EVENT_OP_END(self);
}; };
static void setup_clipboard(MwLL self, struct wl_seat* wl_seat) { static void setup_zwp_clipboard(MwLL self, struct wl_seat* wl_seat) {
wl_clipboard_device_context_t* device_ctx_zwp = NULL; wl_clipboard_device_context_t* device_ctx_zwp = NULL;
device_ctx_zwp = malloc(sizeof(wl_clipboard_device_context_t));
memset(device_ctx_zwp, 0, sizeof(wl_clipboard_device_context_t));
device_ctx_zwp->device.zwp = zwp_primary_selection_device_manager_v1_get_device(self->wayland.clipboard_manager.zwp, wl_seat);
device_ctx_zwp->ll = self;
zwp_primary_selection_device_v1_add_listener(device_ctx_zwp->device.zwp, &zwp_primary_selection_device_v1_listener, device_ctx_zwp);
arrpush(self->wayland.clipboard_devices_zwp, device_ctx_zwp);
}
static void setup_clipboard(MwLL self, struct wl_seat* wl_seat) {
wl_clipboard_device_context_t* device_ctx_wl = malloc(sizeof(wl_clipboard_device_context_t)); wl_clipboard_device_context_t* device_ctx_wl = malloc(sizeof(wl_clipboard_device_context_t));
memset(device_ctx_wl, 0, sizeof(wl_clipboard_device_context_t)); memset(device_ctx_wl, 0, sizeof(wl_clipboard_device_context_t));
if(self->wayland.supports_zwp) {
device_ctx_zwp = malloc(sizeof(wl_clipboard_device_context_t));
device_ctx_zwp->device.zwp = zwp_primary_selection_device_manager_v1_get_device(self->wayland.clipboard_manager.zwp, wl_seat);
device_ctx_zwp->ll = self;
device_ctx_zwp->seat = wl_seat;
}
device_ctx_wl->device.wl = wl_data_device_manager_get_data_device(self->wayland.clipboard_manager.wl, wl_seat); device_ctx_wl->device.wl = wl_data_device_manager_get_data_device(self->wayland.clipboard_manager.wl, wl_seat);
device_ctx_wl->ll = self; device_ctx_wl->ll = self;
device_ctx_wl->seat = wl_seat;
if(self->wayland.supports_zwp) {
zwp_primary_selection_device_v1_add_listener(device_ctx_zwp->device.zwp, &zwp_primary_selection_device_v1_listener, device_ctx_zwp);
arrpush(self->wayland.clipboard_devices_zwp, device_ctx_zwp);
}
wl_data_device_add_listener(device_ctx_wl->device.wl, &wl_data_device_listener, device_ctx_wl); wl_data_device_add_listener(device_ctx_wl->device.wl, &wl_data_device_listener, device_ctx_wl);
arrpush(self->wayland.clipboard_devices_wl, device_ctx_wl); arrpush(self->wayland.clipboard_devices_wl, device_ctx_wl);
}; };
@ -971,9 +989,6 @@ static void wl_seat_capabilities(void* data, struct wl_seat* wl_seat,
self->wayland.pointer = wl_seat_get_pointer(wl_seat); self->wayland.pointer = wl_seat_get_pointer(wl_seat);
wl_pointer_add_listener(self->wayland.pointer, &pointer_listener, data); wl_pointer_add_listener(self->wayland.pointer, &pointer_listener, data);
} }
if(self->wayland.clipboard_manager.wl != NULL) {
setup_clipboard(self, wl_seat);
}
WAYLAND_EVENT_OP_END(self); WAYLAND_EVENT_OP_END(self);
}; };