blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

wlr_xdg_popup: don't treat all surfaces of grabbing client as grabbing surfaces 

Fixes #897
This commit is contained in:
Sebastian Krzyszkowiak 2019-08-08 04:05:08 +02:00 committed by Drew DeVault
parent 78d96009e4
commit 52037d13f7
2 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
types/xdg_shell/wlr_xdg_popup.c
View File

@ -18,7 +18,16 @@ static void xdg_popup_grab_end(struct wlr_xdg_popup_grab *popup_grab) {
static void xdg_pointer_grab_enter(struct wlr_seat_pointer_grab *grab, static void xdg_pointer_grab_enter(struct wlr_seat_pointer_grab *grab,
struct wlr_surface *surface, double sx, double sy) { struct wlr_surface *surface, double sx, double sy) {
struct wlr_xdg_popup_grab *popup_grab = grab->data; struct wlr_xdg_popup_grab *popup_grab = grab->data;
if (wl_resource_get_client(surface->resource) == popup_grab->client) {
bool grabbing = false;
struct wlr_xdg_popup *popup;
wl_list_for_each(popup, &popup_grab->popups, grab_link) {
if (surface == popup->base->surface) {
grabbing = true;
}
}
if (grabbing) {
wlr_seat_pointer_enter(grab->seat, surface, sx, sy); wlr_seat_pointer_enter(grab->seat, surface, sx, sy);
} else { } else {
wlr_seat_pointer_clear_focus(grab->seat); wlr_seat_pointer_clear_focus(grab->seat);
@ -97,7 +106,15 @@ static uint32_t xdg_touch_grab_down(struct wlr_seat_touch_grab *grab,
uint32_t time, struct wlr_touch_point *point) { uint32_t time, struct wlr_touch_point *point) {
struct wlr_xdg_popup_grab *popup_grab = grab->data; struct wlr_xdg_popup_grab *popup_grab = grab->data;
if (wl_resource_get_client(point->surface->resource) != popup_grab->client) { bool grabbing = false;
struct wlr_xdg_popup *popup;
wl_list_for_each(popup, &popup_grab->popups, grab_link) {
if (point->surface == popup->base->surface) {
grabbing = true;
}
}
if (!grabbing) {
xdg_popup_grab_end(grab->data); xdg_popup_grab_end(grab->data);
return 0; return 0;
} }

21
types/xdg_shell_v6/wlr_xdg_popup_v6.c
View File

@ -28,7 +28,16 @@ static void xdg_popup_grab_end(struct wlr_xdg_popup_grab_v6 *popup_grab) {
static void xdg_pointer_grab_enter(struct wlr_seat_pointer_grab *grab, static void xdg_pointer_grab_enter(struct wlr_seat_pointer_grab *grab,
struct wlr_surface *surface, double sx, double sy) { struct wlr_surface *surface, double sx, double sy) {
struct wlr_xdg_popup_grab_v6 *popup_grab = grab->data; struct wlr_xdg_popup_grab_v6 *popup_grab = grab->data;
if (wl_resource_get_client(surface->resource) == popup_grab->client) {
bool grabbing = false;
struct wlr_xdg_popup_v6 *popup;
wl_list_for_each(popup, &popup_grab->popups, grab_link) {
if (surface == popup->base->surface) {
grabbing = true;
}
}
if (grabbing) {
wlr_seat_pointer_enter(grab->seat, surface, sx, sy); wlr_seat_pointer_enter(grab->seat, surface, sx, sy);
} else { } else {
wlr_seat_pointer_clear_focus(grab->seat); wlr_seat_pointer_clear_focus(grab->seat);
@ -107,7 +116,15 @@ static uint32_t xdg_touch_grab_down(struct wlr_seat_touch_grab *grab,
uint32_t time, struct wlr_touch_point *point) { uint32_t time, struct wlr_touch_point *point) {
struct wlr_xdg_popup_grab_v6 *popup_grab = grab->data; struct wlr_xdg_popup_grab_v6 *popup_grab = grab->data;
if (wl_resource_get_client(point->surface->resource) != popup_grab->client) { bool grabbing = false;
struct wlr_xdg_popup_v6 *popup;
wl_list_for_each(popup, &popup_grab->popups, grab_link) {
if (point->surface == popup->base->surface) {
grabbing = true;
}
}
if (!grabbing) {
xdg_popup_grab_end(grab->data); xdg_popup_grab_end(grab->data);
return 0; return 0;
} }