itycodes
/
wlseeds
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xdg-popup: fix functions' main argument type

Browse Source 
With this commit, `wlr_xdg_popup_*()` functions now expect
a `wlr_xdg_popup` instead of a `wlr_xdg_surface`.
master
Kirill Primak 3 years ago
parent affe0d8713
commit 41412cadbe
5 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File

2
include/types/wlr_xdg_shell.h
Unescape View File

@ -30,7 +30,7 @@ struct wlr_xdg_positioner_resource *get_xdg_positioner_from_resource(
void create_xdg_popup(struct wlr_xdg_surface *xdg_surface, void create_xdg_popup(struct wlr_xdg_surface *xdg_surface,
struct wlr_xdg_surface *parent, struct wlr_xdg_surface *parent,
struct wlr_xdg_positioner_resource *positioner, uint32_t id); struct wlr_xdg_positioner_resource *positioner, uint32_t id);
void handle_xdg_surface_popup_committed(struct wlr_xdg_surface *surface); void handle_xdg_popup_committed(struct wlr_xdg_popup *popup);
struct wlr_xdg_popup_grab *get_xdg_shell_popup_grab_from_seat( struct wlr_xdg_popup_grab *get_xdg_shell_popup_grab_from_seat(
struct wlr_xdg_shell *shell, struct wlr_seat *seat); struct wlr_xdg_shell *shell, struct wlr_seat *seat);

10
include/wlr/types/wlr_xdg_shell.h
Unescape View File

@ -265,7 +265,13 @@ struct wlr_xdg_shell *wlr_xdg_shell_create(struct wl_display *display);
*/ */
struct wlr_xdg_surface *wlr_xdg_surface_from_resource( struct wlr_xdg_surface *wlr_xdg_surface_from_resource(
struct wl_resource *resource); struct wl_resource *resource);
struct wlr_xdg_surface *wlr_xdg_surface_from_popup_resource(
/** Get the corresponding wlr_xdg_popup from a resource.
*
* Aborts if the resource doesn't have the correct type. Returns NULL if the
* resource is inert.
*/
struct wlr_xdg_popup *wlr_xdg_popup_from_resource(
struct wl_resource *resource); struct wl_resource *resource);
/** Get the corresponding wlr_xdg_toplevel from a resource. /** Get the corresponding wlr_xdg_toplevel from a resource.
@ -339,7 +345,7 @@ void wlr_xdg_toplevel_set_parent(struct wlr_xdg_toplevel *toplevel,
/** /**
* Request that this xdg popup closes. * Request that this xdg popup closes.
**/ **/
void wlr_xdg_popup_destroy(struct wlr_xdg_surface *surface); void wlr_xdg_popup_destroy(struct wlr_xdg_popup *popup);
/** /**
* Get the position for this popup in the surface parent's coordinate system. * Get the position for this popup in the surface parent's coordinate system.

8
types/wlr_layer_shell_v1.c
Unescape View File

@ -211,14 +211,12 @@ static void layer_surface_handle_get_popup(struct wl_client *client,
struct wl_resource *popup_resource) { struct wl_resource *popup_resource) {
struct wlr_layer_surface_v1 *parent = struct wlr_layer_surface_v1 *parent =
layer_surface_from_resource(layer_resource); layer_surface_from_resource(layer_resource);
struct wlr_xdg_surface *popup_surface = struct wlr_xdg_popup *popup =
wlr_xdg_surface_from_popup_resource(popup_resource); wlr_xdg_popup_from_resource(popup_resource);
if (!parent) { if (!parent) {
return; return;
} }
assert(popup_surface->role == WLR_XDG_SURFACE_ROLE_POPUP);
struct wlr_xdg_popup *popup = popup_surface->popup;
popup->parent = parent->surface; popup->parent = parent->surface;
wl_list_insert(&parent->popups, &popup->link); wl_list_insert(&parent->popups, &popup->link);
wlr_signal_emit_safe(&parent->events.new_popup, popup); wlr_signal_emit_safe(&parent->events.new_popup, popup);
@ -265,7 +263,7 @@ static void layer_surface_unmap(struct wlr_layer_surface_v1 *surface) {
struct wlr_xdg_popup *popup, *popup_tmp; struct wlr_xdg_popup *popup, *popup_tmp;
wl_list_for_each_safe(popup, popup_tmp, &surface->popups, link) { wl_list_for_each_safe(popup, popup_tmp, &surface->popups, link) {
wlr_xdg_popup_destroy(popup->base); wlr_xdg_popup_destroy(popup);
} }
struct wlr_layer_surface_v1_configure *configure, *tmp; struct wlr_layer_surface_v1_configure *configure, *tmp;

75
types/xdg_shell/wlr_xdg_popup.c
Unescape View File

@ -196,25 +196,23 @@ struct wlr_xdg_popup_grab *get_xdg_shell_popup_grab_from_seat(
return xdg_grab; return xdg_grab;
} }
void handle_xdg_surface_popup_committed(struct wlr_xdg_surface *surface) { void handle_xdg_popup_committed(struct wlr_xdg_popup *popup) {
assert(surface->role == WLR_XDG_SURFACE_ROLE_POPUP); if (!popup->parent) {
wl_resource_post_error(popup->base->resource,
if (!surface->popup->parent) {
wl_resource_post_error(surface->resource,
XDG_SURFACE_ERROR_NOT_CONSTRUCTED, XDG_SURFACE_ERROR_NOT_CONSTRUCTED,
"xdg_popup has no parent"); "xdg_popup has no parent");
return; return;
} }
if (!surface->popup->committed) { if (!popup->committed) {
wlr_xdg_surface_schedule_configure(surface); wlr_xdg_surface_schedule_configure(popup->base);
surface->popup->committed = true; popup->committed = true;
} }
} }
static const struct xdg_popup_interface xdg_popup_implementation; static const struct xdg_popup_interface xdg_popup_implementation;
struct wlr_xdg_surface *wlr_xdg_surface_from_popup_resource( struct wlr_xdg_popup *wlr_xdg_popup_from_resource(
struct wl_resource *resource) { struct wl_resource *resource) {
assert(wl_resource_instance_of(resource, &xdg_popup_interface, assert(wl_resource_instance_of(resource, &xdg_popup_interface,
&xdg_popup_implementation)); &xdg_popup_implementation));
@ -224,35 +222,35 @@ struct wlr_xdg_surface *wlr_xdg_surface_from_popup_resource(
static void xdg_popup_handle_grab(struct wl_client *client, static void xdg_popup_handle_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) {
struct wlr_xdg_surface *surface = struct wlr_xdg_popup *popup =
wlr_xdg_surface_from_popup_resource(resource); wlr_xdg_popup_from_resource(resource);
struct wlr_seat_client *seat_client = if (!popup) {
wlr_seat_client_from_resource(seat_resource);
if (!surface) {
return; return;
} }
if (surface->popup->committed) { struct wlr_seat_client *seat_client =
wl_resource_post_error(surface->popup->resource, wlr_seat_client_from_resource(seat_resource);
if (popup->committed) {
wl_resource_post_error(popup->resource,
XDG_POPUP_ERROR_INVALID_GRAB, XDG_POPUP_ERROR_INVALID_GRAB,
"xdg_popup is already mapped"); "xdg_popup is already mapped");
return; return;
} }
struct wlr_xdg_popup_grab *popup_grab = get_xdg_shell_popup_grab_from_seat( struct wlr_xdg_popup_grab *popup_grab = get_xdg_shell_popup_grab_from_seat(
surface->client->shell, seat_client->seat); popup->base->client->shell, seat_client->seat);
if (!wl_list_empty(&surface->popups)) { if (!wl_list_empty(&popup->base->popups)) {
wl_resource_post_error(surface->client->resource, wl_resource_post_error(popup->base->client->resource,
XDG_WM_BASE_ERROR_NOT_THE_TOPMOST_POPUP, XDG_WM_BASE_ERROR_NOT_THE_TOPMOST_POPUP,
"xdg_popup was not created on the topmost popup"); "xdg_popup was not created on the topmost popup");
return; return;
} }
popup_grab->client = surface->client->client; popup_grab->client = popup->base->client->client;
surface->popup->seat = seat_client->seat; popup->seat = seat_client->seat;
wl_list_insert(&popup_grab->popups, &surface->popup->grab_link); wl_list_insert(&popup_grab->popups, &popup->grab_link);
wlr_seat_pointer_start_grab(seat_client->seat, wlr_seat_pointer_start_grab(seat_client->seat,
&popup_grab->pointer_grab); &popup_grab->pointer_grab);
@ -264,11 +262,11 @@ static void xdg_popup_handle_grab(struct wl_client *client,
static void xdg_popup_handle_destroy(struct wl_client *client, static void xdg_popup_handle_destroy(struct wl_client *client,
struct wl_resource *resource) { struct wl_resource *resource) {
struct wlr_xdg_surface *surface = struct wlr_xdg_popup *popup =
wlr_xdg_surface_from_popup_resource(resource); wlr_xdg_popup_from_resource(resource);
if (surface && !wl_list_empty(&surface->popups)) { if (popup && !wl_list_empty(&popup->base->popups)) {
wl_resource_post_error(surface->client->resource, wl_resource_post_error(popup->base->client->resource,
XDG_WM_BASE_ERROR_NOT_THE_TOPMOST_POPUP, XDG_WM_BASE_ERROR_NOT_THE_TOPMOST_POPUP,
"xdg_popup was destroyed while it was not the topmost popup"); "xdg_popup was destroyed while it was not the topmost popup");
return; return;
@ -283,12 +281,12 @@ static const struct xdg_popup_interface xdg_popup_implementation = {
}; };
static void xdg_popup_handle_resource_destroy(struct wl_resource *resource) { static void xdg_popup_handle_resource_destroy(struct wl_resource *resource) {
struct wlr_xdg_surface *xdg_surface = struct wlr_xdg_popup *popup =
wlr_xdg_surface_from_popup_resource(resource); wlr_xdg_popup_from_resource(resource);
if (xdg_surface == NULL) { if (popup == NULL) {
return; return;
} }
wlr_xdg_popup_destroy(xdg_surface); wlr_xdg_popup_destroy(popup);
} }
const struct wlr_surface_role xdg_popup_surface_role = { const struct wlr_surface_role xdg_popup_surface_role = {
@ -337,7 +335,7 @@ void create_xdg_popup(struct wlr_xdg_surface *xdg_surface,
return; return;
} }
wl_resource_set_implementation(xdg_surface->popup->resource, wl_resource_set_implementation(xdg_surface->popup->resource,
&xdg_popup_implementation, xdg_surface, &xdg_popup_implementation, xdg_surface->popup,
xdg_popup_handle_resource_destroy); xdg_popup_handle_resource_destroy);
xdg_surface->role = WLR_XDG_SURFACE_ROLE_POPUP; xdg_surface->role = WLR_XDG_SURFACE_ROLE_POPUP;
@ -357,6 +355,21 @@ void create_xdg_popup(struct wlr_xdg_surface *xdg_surface,
} }
} }
void wlr_xdg_popup_destroy(struct wlr_xdg_popup *popup) {
if (popup == NULL) {
return;
}
struct wlr_xdg_popup *child, *child_tmp;
wl_list_for_each_safe(child, child_tmp, &popup->base->popups, link) {
wlr_xdg_popup_destroy(child);
}
xdg_popup_send_popup_done(popup->resource);
wl_resource_set_user_data(popup->resource, NULL);
reset_xdg_surface(popup->base);
}
void wlr_xdg_popup_get_anchor_point(struct wlr_xdg_popup *popup, void wlr_xdg_popup_get_anchor_point(struct wlr_xdg_popup *popup,
int *root_sx, int *root_sy) { int *root_sx, int *root_sy) {
struct wlr_box rect = popup->positioner.anchor_rect; struct wlr_box rect = popup->positioner.anchor_rect;

21
types/xdg_shell/wlr_xdg_surface.c
Unescape View File

@ -32,7 +32,7 @@ void unmap_xdg_surface(struct wlr_xdg_surface *surface) {
struct wlr_xdg_popup *popup, *popup_tmp; struct wlr_xdg_popup *popup, *popup_tmp;
wl_list_for_each_safe(popup, popup_tmp, &surface->popups, link) { wl_list_for_each_safe(popup, popup_tmp, &surface->popups, link) {
wlr_xdg_popup_destroy(popup->base); wlr_xdg_popup_destroy(popup);
} }
// TODO: probably need to ungrab before this event // TODO: probably need to ungrab before this event
@ -324,7 +324,7 @@ void xdg_surface_role_commit(struct wlr_surface *wlr_surface) {
handle_xdg_toplevel_committed(surface->toplevel); handle_xdg_toplevel_committed(surface->toplevel);
break; break;
case WLR_XDG_SURFACE_ROLE_POPUP: case WLR_XDG_SURFACE_ROLE_POPUP:
handle_xdg_surface_popup_committed(surface); handle_xdg_popup_committed(surface->popup);
break; break;
} }
@ -495,23 +495,6 @@ void wlr_xdg_surface_ping(struct wlr_xdg_surface *surface) {
surface->client->ping_serial); surface->client->ping_serial);
} }
void wlr_xdg_popup_destroy(struct wlr_xdg_surface *surface) {
if (surface == NULL) {
return;
}
assert(surface->popup);
assert(surface->role == WLR_XDG_SURFACE_ROLE_POPUP);
struct wlr_xdg_popup *popup, *popup_tmp;
wl_list_for_each_safe(popup, popup_tmp, &surface->popups, link) {
wlr_xdg_popup_destroy(popup->base);
}
xdg_popup_send_popup_done(surface->popup->resource);
wl_resource_set_user_data(surface->popup->resource, NULL);
reset_xdg_surface(surface);
}
void wlr_xdg_popup_get_position(struct wlr_xdg_popup *popup, void wlr_xdg_popup_get_position(struct wlr_xdg_popup *popup,
double *popup_sx, double *popup_sy) { double *popup_sx, double *popup_sy) {
struct wlr_xdg_surface *parent = struct wlr_xdg_surface *parent =

Write Preview
Loading…
Cancel
Save