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

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

Browse source
This commit is contained in:
IoIxD 2026-09-21 11:36:08 -07:00
commit b1a2d4d549
1 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/backend/wayland/interfaces.c
View file

@ -17,9 +17,9 @@
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 void setup_zwp_clipboard(MwLL self, struct wl_seat* wl_seat);
static void destroy_clipboard(MwLL self, struct wl_seat* wl_seat); static void destroy_clipboard(MwLL self, struct wl_seat* wl_seat);
static void destroy_zwp_clipboard(MwLL self, struct wl_seat* wl_seat); static void destroy_zwp_clipboard(MwLL self, struct wl_seat* wl_seat);
static bool hit_detect(MwLL child, MwLL* _topmost_parent, MwPoint* _point, MwPoint* _relative_mouse_pos, MwPoint* _absolute_pos); static MwBool hit_detect(MwLL child, MwLL* _topmost_parent, MwPoint* _point, MwPoint* _relative_mouse_pos, MwPoint* _absolute_pos);
/* Recursively dispatch a key event to a widget and its children */ /* Recursively dispatch a key event to a widget and its children */
static void recursive_dispatch_key(MwLL handle, int* k) { static void recursive_dispatch_key(MwLL handle, int* k) {
@ -398,7 +398,6 @@ static void wl_data_source_listener_target(void* data,
(void)data; (void)data;
(void)wl_data_source; (void)wl_data_source;
(void)mime_type; (void)mime_type;
printf("test\n");
}; };
static void wl_data_source_listener_send(void* data, static void wl_data_source_listener_send(void* data,
struct wl_data_source* wl_data_source, struct wl_data_source* wl_data_source,
@ -591,6 +590,10 @@ static void pointer_enter(void* data, struct wl_pointer* wl_pointer, MwU32 seria
if(self->wayland.backbuffer.surface == surface) { if(self->wayland.backbuffer.surface == surface) {
curSurface = surface; curSurface = surface;
} }
self->wayland.cur_mouse_pos.x = wl_fixed_to_int(surface_x);
self->wayland.cur_mouse_pos.y = wl_fixed_to_int(surface_y);
WAYLAND_EVENT_OP_END(self); WAYLAND_EVENT_OP_END(self);
}; };
@ -780,7 +783,7 @@ static void recursive_dispatch_mouse_up(MwLL handle, MwMouse* p) {
} }
}; };
static bool hit_detect(MwLL child, MwLL* _topmost_parent, MwPoint* _point, MwPoint* _relative_mouse_pos, MwPoint* _absolute_pos) { static MwBool hit_detect(MwLL child, MwLL* _topmost_parent, MwPoint* _point, MwPoint* _relative_mouse_pos, MwPoint* _absolute_pos) {
MwLL topmost_parent = child; MwLL topmost_parent = child;
MwPoint point; MwPoint point;
MwPoint relative_mouse_pos; MwPoint relative_mouse_pos;
@ -791,8 +794,15 @@ static bool hit_detect(MwLL child, MwLL* _topmost_parent, MwPoint* _point, MwPoi
while(topmost_parent->wayland.parent) { while(topmost_parent->wayland.parent) {
topmost_parent = topmost_parent->wayland.parent; topmost_parent = topmost_parent->wayland.parent;
if(topmost_parent) { if(topmost_parent) {
absolute_pos.x += topmost_parent->wayland.x; /* if the topmost parent is a popup then its x/y is irrelevant to us.
absolute_pos.y += topmost_parent->wayland.y; * it's gonna be the position of the popup itself, and we want our
* position to be relative to the popup itself. */
if(topmost_parent->wayland.type != MwLL_WAYLAND_POPUP) {
if(topmost_parent->wayland.x > 0)
absolute_pos.x += topmost_parent->wayland.x;
if(topmost_parent->wayland.y > 0)
absolute_pos.y += topmost_parent->wayland.y;
}
} }
} }