system/weston
system/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston synced 2024-09-30 04:53:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Weston server decoration handle borderless windows resizing

Browse source 
Xwayland borderless window needs seperate handling

Signed-off-by: Peter van der Perk <info@petervanderperk.nl>
This commit is contained in:
Peter van der Perk 2023-02-07 22:00:35 +01:00
parent d633b3e252
commit 65a6db5c5f
1 changed files with 42 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
clients/window.c
View file

@ -1412,18 +1412,12 @@ window_destroy(struct window *window)
}
static struct widget *
widget_find_widget(struct widget *widget, int32_t x, int32_t y)
widget_find_widget(struct widget *widget, int32_t x, int32_t y, bool get_parent)
{
struct widget *child, *target;
int alloc_x, alloc_y, width, height;
double scale;
wl_list_for_each(child, &widget->child_list, link) {
target = widget_find_widget(child, x, y);
if (target)
return target;
}
alloc_x = widget->allocation.x;
alloc_y = widget->allocation.y;
width = widget->allocation.width;
@ -1440,6 +1434,15 @@ widget_find_widget(struct widget *widget, int32_t x, int32_t y)
height = widget->viewport_dest_height;
}
wl_list_for_each(child, &widget->child_list, link) {
target = widget_find_widget(child, x, y, get_parent);
if (target && get_parent) {
return widget;
} else if(target) {
return target;
}
}
if (alloc_x <= x && x < alloc_x + width &&
alloc_y <= y && y < alloc_y + height) {
return widget;
@ -1449,13 +1452,13 @@ widget_find_widget(struct widget *widget, int32_t x, int32_t y)
}
static struct widget *
window_find_widget(struct window *window, int32_t x, int32_t y)
window_find_widget(struct window *window, int32_t x, int32_t y, bool get_parent)
{
struct surface *surface;
struct widget *widget;
wl_list_for_each(surface, &window->subsurface_list, link) {
widget = widget_find_widget(surface->widget, x, y);
widget = widget_find_widget(surface->widget, x, y, get_parent);
if (widget)
return widget;
}
@ -2448,7 +2451,7 @@ input_ungrab(struct input *input)
input->grab = NULL;
if (input->pointer_focus) {
widget = window_find_widget(input->pointer_focus,
input->sx, input->sy);
input->sx, input->sy, false);
input_set_focus_widget(input, widget, input->sx, input->sy);
}
}
@ -2524,8 +2527,19 @@ pointer_handle_enter(void *data, struct wl_pointer *pointer,
input->sx = sx;
input->sy = sy;
widget = window_find_widget(window, sx, sy);
widget = window_find_widget(window, sx, sy, false);
input_set_focus_widget(input, widget, sx, sy);
widget = window_find_widget(window, sx, sy, true);
if (widget) {
if (widget->enter_handler) {
if(widget->enter_handler(input->focus_widget,
input, sx, sy,
widget->user_data) != CURSOR_LEFT_PTR) {
input_set_focus_widget(input, widget, sx, sy);
}
}
}
}
static void
@ -2545,7 +2559,7 @@ pointer_handle_motion(void *data, struct wl_pointer *pointer,
struct input *input = data;
struct window *window = input->pointer_focus;
struct widget *widget;
int cursor;
int cursor, parent_cursor;
float sx = wl_fixed_to_double(sx_w);
float sy = wl_fixed_to_double(sy_w);
@ -2567,7 +2581,7 @@ pointer_handle_motion(void *data, struct wl_pointer *pointer,
return;
if (!(input->grab && input->grab_button)) {
widget = window_find_widget(window, sx, sy);
widget = window_find_widget(window, sx, sy, false);
input_set_focus_widget(input, widget, sx, sy);
}
@ -2585,6 +2599,20 @@ pointer_handle_motion(void *data, struct wl_pointer *pointer,
} else
cursor = CURSOR_LEFT_PTR;
widget = window_find_widget(window, sx, sy, true);
if (widget) {
if (widget->motion_handler) {
parent_cursor = widget->motion_handler(input->focus_widget,
input, time, sx, sy,
widget->user_data);
if(parent_cursor != CURSOR_LEFT_PTR) {
input_set_focus_widget(input, widget, sx, sy);
cursor = parent_cursor;
}
}
}
input_set_pointer_image(input, cursor);
}
@ -3067,7 +3095,7 @@ touch_handle_down(void *data, struct wl_touch *wl_touch,
else
widget = window_find_widget(input->touch_focus,
wl_fixed_to_double(x_w),
wl_fixed_to_double(y_w));
wl_fixed_to_double(y_w), false);
if (widget) {
struct touch_point *tp = xmalloc(sizeof *tp);
if (tp) {