xdg-popup: basic pointer grab
This commit is contained in:
parent
7b697fe841
commit
d3ebf99b0f
|
@ -2,11 +2,13 @@
|
||||||
#define WLR_TYPES_WLR_XDG_SHELL_V6_H
|
#define WLR_TYPES_WLR_XDG_SHELL_V6_H
|
||||||
|
|
||||||
#include <wlr/types/wlr_box.h>
|
#include <wlr/types/wlr_box.h>
|
||||||
|
#include <wlr/types/wlr_seat.h>
|
||||||
#include <wayland-server.h>
|
#include <wayland-server.h>
|
||||||
|
|
||||||
struct wlr_xdg_shell_v6 {
|
struct wlr_xdg_shell_v6 {
|
||||||
struct wl_global *wl_global;
|
struct wl_global *wl_global;
|
||||||
struct wl_list clients;
|
struct wl_list clients;
|
||||||
|
struct wl_list popup_grabs;
|
||||||
uint32_t ping_timeout;
|
uint32_t ping_timeout;
|
||||||
|
|
||||||
struct {
|
struct {
|
||||||
|
@ -36,6 +38,18 @@ struct wlr_xdg_popup_v6 {
|
||||||
struct wlr_xdg_surface_v6 *parent;
|
struct wlr_xdg_surface_v6 *parent;
|
||||||
struct wlr_seat *seat;
|
struct wlr_seat *seat;
|
||||||
struct wlr_box geometry;
|
struct wlr_box geometry;
|
||||||
|
|
||||||
|
struct wl_list grab_link; // wlr_xdg_popup_grab_v6::popups
|
||||||
|
};
|
||||||
|
|
||||||
|
// each seat gets a popup grab
|
||||||
|
struct wlr_xdg_popup_grab_v6 {
|
||||||
|
struct wl_client *client;
|
||||||
|
struct wlr_seat_pointer_grab pointer_grab;
|
||||||
|
struct wlr_seat *seat;
|
||||||
|
struct wl_list popups;
|
||||||
|
struct wl_list link; // wlr_xdg_shell_v6::popup_grabs
|
||||||
|
// TODO: seat_handle destroy will release the grab
|
||||||
};
|
};
|
||||||
|
|
||||||
enum wlr_xdg_surface_v6_role {
|
enum wlr_xdg_surface_v6_role {
|
||||||
|
|
|
@ -56,8 +56,10 @@ static void xdg_surface_destroy(struct wlr_xdg_surface_v6 *surface) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (surface->role == WLR_XDG_SURFACE_V6_ROLE_POPUP) {
|
if (surface->role == WLR_XDG_SURFACE_V6_ROLE_POPUP) {
|
||||||
|
// TODO: get the current grab and if it has no more popups, end the grab
|
||||||
wl_resource_set_user_data(surface->popup_state->resource, NULL);
|
wl_resource_set_user_data(surface->popup_state->resource, NULL);
|
||||||
wl_list_remove(&surface->popup_link);
|
wl_list_remove(&surface->popup_link);
|
||||||
|
wl_list_remove(&surface->popup_state->grab_link);
|
||||||
free(surface->popup_state);
|
free(surface->popup_state);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -203,10 +205,114 @@ static void xdg_shell_create_positioner(struct wl_client *wl_client,
|
||||||
positioner, xdg_positioner_destroy);
|
positioner, xdg_positioner_destroy);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void xdg_pointer_grab_end(struct wlr_seat_pointer_grab *grab) {
|
||||||
|
struct wlr_xdg_popup_grab_v6 *popup_grab = grab->data;
|
||||||
|
|
||||||
|
struct wlr_xdg_popup_v6 *popup, *tmp;
|
||||||
|
wl_list_for_each_safe(popup, tmp, &popup_grab->popups, grab_link) {
|
||||||
|
wl_list_remove(&popup->grab_link);
|
||||||
|
wl_list_init(&popup->grab_link);
|
||||||
|
zxdg_popup_v6_send_popup_done(popup->resource);
|
||||||
|
}
|
||||||
|
|
||||||
|
wlr_seat_pointer_end_grab(grab->seat);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void xdg_pointer_grab_enter(struct wlr_seat_pointer_grab *grab,
|
||||||
|
struct wlr_surface *surface, double sx, double sy) {
|
||||||
|
struct wlr_xdg_popup_grab_v6 *popup_grab = grab->data;
|
||||||
|
if (wl_resource_get_client(surface->resource) == popup_grab->client) {
|
||||||
|
wlr_seat_pointer_enter(grab->seat, surface, sx, sy);
|
||||||
|
} else {
|
||||||
|
wlr_seat_pointer_clear_focus(grab->seat);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void xdg_pointer_grab_motion(struct wlr_seat_pointer_grab *grab,
|
||||||
|
uint32_t time, double sx, double sy) {
|
||||||
|
wlr_seat_pointer_send_motion(grab->seat, time, sx, sy);
|
||||||
|
}
|
||||||
|
|
||||||
|
static uint32_t xdg_pointer_grab_button(struct wlr_seat_pointer_grab *grab,
|
||||||
|
uint32_t time, uint32_t button, uint32_t state) {
|
||||||
|
uint32_t serial =
|
||||||
|
wlr_seat_pointer_send_button(grab->seat, time, button, state);
|
||||||
|
if (serial) {
|
||||||
|
return serial;
|
||||||
|
} else {
|
||||||
|
xdg_pointer_grab_end(grab);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void xdg_pointer_grab_axis(struct wlr_seat_pointer_grab *grab,
|
||||||
|
uint32_t time, enum wlr_axis_orientation orientation, double value) {
|
||||||
|
wlr_seat_pointer_send_axis(grab->seat, time, orientation, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void xdg_pointer_grab_cancel(struct wlr_seat_pointer_grab *grab) {
|
||||||
|
xdg_pointer_grab_end(grab);
|
||||||
|
}
|
||||||
|
|
||||||
|
static const struct wlr_pointer_grab_interface xdg_pointer_grab_impl = {
|
||||||
|
.enter = xdg_pointer_grab_enter,
|
||||||
|
.motion = xdg_pointer_grab_motion,
|
||||||
|
.button = xdg_pointer_grab_button,
|
||||||
|
.cancel = xdg_pointer_grab_cancel,
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct wlr_xdg_popup_grab_v6 *xdg_shell_popup_grab_from_seat(
|
||||||
|
struct wlr_xdg_shell_v6 *shell, struct wlr_seat *seat) {
|
||||||
|
struct wlr_xdg_popup_grab_v6 *xdg_grab;
|
||||||
|
wl_list_for_each(xdg_grab, &shell->popup_grabs, link) {
|
||||||
|
if (xdg_grab->seat == seat) {
|
||||||
|
return xdg_grab;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
xdg_grab = calloc(1, sizeof(struct wlr_xdg_popup_grab_v6));
|
||||||
|
if (!xdg_grab) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
xdg_grab->pointer_grab.data = xdg_grab;
|
||||||
|
xdg_grab->pointer_grab.interface = &xdg_pointer_grab_impl;
|
||||||
|
// TODO: keyboard grab
|
||||||
|
|
||||||
|
wl_list_init(&xdg_grab->popups);
|
||||||
|
|
||||||
|
wl_list_insert(&shell->popup_grabs, &xdg_grab->link);
|
||||||
|
xdg_grab->seat = seat;
|
||||||
|
|
||||||
|
return xdg_grab;
|
||||||
|
}
|
||||||
|
|
||||||
static void xdg_popup_protocol_grab(struct wl_client *client,
|
static void xdg_popup_protocol_grab(struct wl_client *client,
|
||||||
struct wl_resource *resource, struct wl_resource *seat_resource,
|
struct wl_resource *resource, struct wl_resource *seat_resource,
|
||||||
uint32_t serial) {
|
uint32_t serial) {
|
||||||
wlr_log(L_DEBUG, "TODO: xdg popup grab");
|
struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource);
|
||||||
|
struct wlr_seat_handle *handle = wl_resource_get_user_data(seat_resource);
|
||||||
|
//bool parent_is_toplevel =
|
||||||
|
//surface->popup_state->parent->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL;
|
||||||
|
|
||||||
|
// TODO: handle make sure the grab is valid for the protocol
|
||||||
|
|
||||||
|
if (surface->popup_state->committed) {
|
||||||
|
wl_resource_post_error(surface->popup_state->resource,
|
||||||
|
ZXDG_POPUP_V6_ERROR_INVALID_GRAB,
|
||||||
|
"xdg_popup is already mapped");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct wlr_xdg_popup_grab_v6 *popup_grab =
|
||||||
|
xdg_shell_popup_grab_from_seat(surface->client->shell,
|
||||||
|
handle->wlr_seat);
|
||||||
|
|
||||||
|
popup_grab->client = surface->client->client;
|
||||||
|
|
||||||
|
wl_list_insert(&popup_grab->popups, &surface->popup_state->grab_link);
|
||||||
|
|
||||||
|
wlr_seat_pointer_start_grab(handle->wlr_seat, &popup_grab->pointer_grab);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct zxdg_popup_v6_interface zxdg_popup_v6_implementation = {
|
static const struct zxdg_popup_v6_interface zxdg_popup_v6_implementation = {
|
||||||
|
@ -318,6 +424,7 @@ static void xdg_surface_get_popup(struct wl_client *client,
|
||||||
surface->popup_state->parent = parent;
|
surface->popup_state->parent = parent;
|
||||||
surface->popup_state->geometry =
|
surface->popup_state->geometry =
|
||||||
xdg_positioner_get_geometry(positioner, surface, parent);
|
xdg_positioner_get_geometry(positioner, surface, parent);
|
||||||
|
wl_list_init(&surface->popup_state->grab_link);
|
||||||
wl_list_insert(&surface->popup_state->parent->popups,
|
wl_list_insert(&surface->popup_state->parent->popups,
|
||||||
&surface->popup_link);
|
&surface->popup_link);
|
||||||
|
|
||||||
|
@ -1037,6 +1144,7 @@ struct wlr_xdg_shell_v6 *wlr_xdg_shell_v6_create(struct wl_display *display) {
|
||||||
xdg_shell->ping_timeout = 10000;
|
xdg_shell->ping_timeout = 10000;
|
||||||
|
|
||||||
wl_list_init(&xdg_shell->clients);
|
wl_list_init(&xdg_shell->clients);
|
||||||
|
wl_list_init(&xdg_shell->popup_grabs);
|
||||||
|
|
||||||
struct wl_global *wl_global = wl_global_create(display,
|
struct wl_global *wl_global = wl_global_create(display,
|
||||||
&zxdg_shell_v6_interface, 1, xdg_shell, xdg_shell_bind);
|
&zxdg_shell_v6_interface, 1, xdg_shell, xdg_shell_bind);
|
||||||
|
|
Loading…
Reference in New Issue