mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

data-device: Split set_focus and clear_focus

Browse Source 
Removes the need to fabricate a fake coordinate pair when calling
weston_drag_set_focus to clear focus.

Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
This commit is contained in:
Derek Foreman 2022-10-27 11:08:39 -05:00
parent c754847d68
commit 160a4ba3ad
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libweston/data-device.c
View File

@ -496,6 +496,17 @@ destroy_drag_focus(struct wl_listener *listener, void *data)
drag->focus_resource = NULL;
}
static void
weston_drag_clear_focus(struct weston_drag *drag)
{
if (drag->focus_resource) {
wl_data_device_send_leave(drag->focus_resource);
wl_list_remove(&drag->focus_listener.link);
drag->focus_resource = NULL;
drag->focus = NULL;
}
}
static void
weston_drag_set_focus(struct weston_drag *drag,
struct weston_seat *seat,
@ -507,19 +518,16 @@ weston_drag_set_focus(struct weston_drag *drag,
struct weston_data_offer *offer;
uint32_t serial;
if (drag->focus && view && drag->focus->surface == view->surface) {
assert(view);
if (drag->focus && drag->focus->surface == view->surface) {
drag->focus = view;
return;
}
if (drag->focus_resource) {
wl_data_device_send_leave(drag->focus_resource);
wl_list_remove(&drag->focus_listener.link);
drag->focus_resource = NULL;
drag->focus = NULL;
}
weston_drag_clear_focus(drag);
if (!view || !view->surface->resource)
if (!view->surface->resource)
return;
if (!drag->data_source &&
@ -578,7 +586,10 @@ drag_grab_focus_internal(struct weston_drag *drag, struct weston_seat *seat,
if (drag->focus == view)
return;
weston_drag_set_focus(drag, seat, view, sx, sy);
if (view)
weston_drag_set_focus(drag, seat, view, sx, sy);
else
weston_drag_clear_focus(drag);
}
static void
@ -638,7 +649,7 @@ data_device_end_drag_grab(struct weston_drag *drag,
weston_view_destroy(drag->icon);
}
weston_drag_set_focus(drag, seat, NULL, 0, 0);
weston_drag_clear_focus(drag);
}
static void