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

fix weston
All checks were successful
pyrite-dev/milsko/pipeline/head This commit looks good
Details

Browse source
This commit is contained in:
IoI_xD 2026-04-23 12:31:53 -07:00
commit cb375fbcbf
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/backend/wayland.c
View file

@ -56,11 +56,10 @@ static void undestroy(MwLL self) {
if(is_destroyed(self)) { \ if(is_destroyed(self)) { \
printf("[WARNING] Operation on invalid widget at line %d\n", __LINE__); \ printf("[WARNING] Operation on invalid widget at line %d\n", __LINE__); \
return; \ return; \
} \ }
pthread_mutex_lock(&self->wayland.eventsMutex);
/* Footer for WAYLAND_EVENT_OP_START */ /* Footer for WAYLAND_EVENT_OP_START */
#define WAYLAND_EVENT_OP_END(self) pthread_mutex_unlock(&self->wayland.eventsMutex); #define WAYLAND_EVENT_OP_END(self)
/* Setup the framebuffer with the saved width/height */ /* Setup the framebuffer with the saved width/height */
static void framebuffer_setup(struct _MwLLWayland* wayland); static void framebuffer_setup(struct _MwLLWayland* wayland);
@ -485,6 +484,7 @@ static void pointer_enter(void* data, struct wl_pointer* wl_pointer, MwU32 seria
curSurface = surface; curSurface = surface;
self->wayland.pointer_serial = serial; self->wayland.pointer_serial = serial;
wl_pointer_set_cursor(self->wayland.pointer, self->wayland.pointer_serial, self->wayland.cursor.surface, 0, 0);
WAYLAND_EVENT_OP_END(self); WAYLAND_EVENT_OP_END(self);
}; };
@ -1257,6 +1257,7 @@ static void wl_shm_interface_destroy(struct _MwLLWayland* wayland, wayland_proto
static void update_buffer(MwLL self, struct _MwLLWaylandShmBuffer* buffer) { static void update_buffer(MwLL self, struct _MwLLWaylandShmBuffer* buffer) {
memcpy(buffer->buf, buffer->buf_back, buffer->buf_size); memcpy(buffer->buf, buffer->buf_back, buffer->buf_size);
// Yes this is needed every time, it's how we fix weston. // Yes this is needed every time, it's how we fix weston.
if(self->wayland.configured)
wl_surface_attach(buffer->surface, buffer->shm_buffer, 0, 0); wl_surface_attach(buffer->surface, buffer->shm_buffer, 0, 0);
wl_surface_commit(buffer->surface); wl_surface_commit(buffer->surface);
} }
@ -1950,9 +1951,6 @@ static void MwLLDestroyImpl(MwLL handle) {
wl_flush(handle); wl_flush(handle);
handle->wayland.cancelEvent = MwTRUE; handle->wayland.cancelEvent = MwTRUE;
while(pthread_mutex_trylock(&handle->wayland.eventsMutex)) {
printf("h\n");
};
MwLLDestroyCommon(handle); MwLLDestroyCommon(handle);
@ -2499,6 +2497,10 @@ static void MwLLSetCursorImpl(MwLL handle, MwCursor* image, MwCursor* mask) {
WIDGET_CHECK(handle); WIDGET_CHECK(handle);
if(handle->wayland.parent) {
return;
}
if(handle->wayland.cursor.setup) { if(handle->wayland.cursor.setup) {
buffer_destroy(&handle->wayland.cursor); buffer_destroy(&handle->wayland.cursor);
wl_surface_destroy(handle->wayland.cursor.surface); wl_surface_destroy(handle->wayland.cursor.surface);