mirror of
https://github.com/hyprwm/wlroots-hyprland.git
synced 2024-11-26 14:45:58 +01:00
unified xdg-surface close
This commit is contained in:
parent
7cc042f54c
commit
f53575e3a3
6 changed files with 44 additions and 14 deletions
|
@ -204,9 +204,9 @@ uint32_t wlr_xdg_toplevel_set_resizing(struct wlr_xdg_surface *surface,
|
|||
bool resizing);
|
||||
|
||||
/**
|
||||
* Request that this toplevel surface closes.
|
||||
* Request that this xdg surface closes.
|
||||
*/
|
||||
void wlr_xdg_toplevel_send_close(struct wlr_xdg_surface *surface);
|
||||
void wlr_xdg_surface_send_close(struct wlr_xdg_surface *surface);
|
||||
|
||||
/**
|
||||
* Compute the popup position in surface-local coordinates.
|
||||
|
|
|
@ -204,9 +204,9 @@ uint32_t wlr_xdg_toplevel_v6_set_resizing(struct wlr_xdg_surface_v6 *surface,
|
|||
bool resizing);
|
||||
|
||||
/**
|
||||
* Request that this toplevel surface closes.
|
||||
* Request that this xdg surface closes.
|
||||
*/
|
||||
void wlr_xdg_toplevel_v6_send_close(struct wlr_xdg_surface_v6 *surface);
|
||||
void wlr_xdg_surface_v6_send_close(struct wlr_xdg_surface_v6 *surface);
|
||||
|
||||
/**
|
||||
* Compute the popup position in surface-local coordinates.
|
||||
|
|
|
@ -177,9 +177,11 @@ static void set_fullscreen(struct roots_view *view, bool fullscreen) {
|
|||
static void close(struct roots_view *view) {
|
||||
assert(view->type == ROOTS_XDG_SHELL_VIEW);
|
||||
struct wlr_xdg_surface *surface = view->xdg_surface;
|
||||
if (surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL) {
|
||||
wlr_xdg_toplevel_send_close(surface);
|
||||
struct wlr_xdg_popup *popup = NULL;
|
||||
wl_list_for_each(popup, &surface->popups, link) {
|
||||
wlr_xdg_surface_send_close(popup->base);
|
||||
}
|
||||
wlr_xdg_surface_send_close(surface);
|
||||
}
|
||||
|
||||
static void destroy(struct roots_view *view) {
|
||||
|
|
|
@ -177,9 +177,11 @@ static void set_fullscreen(struct roots_view *view, bool fullscreen) {
|
|||
static void close(struct roots_view *view) {
|
||||
assert(view->type == ROOTS_XDG_SHELL_V6_VIEW);
|
||||
struct wlr_xdg_surface_v6 *surface = view->xdg_surface_v6;
|
||||
if (surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) {
|
||||
wlr_xdg_toplevel_v6_send_close(surface);
|
||||
struct wlr_xdg_popup_v6 *popup = NULL;
|
||||
wl_list_for_each(popup, &surface->popups, link) {
|
||||
wlr_xdg_surface_v6_send_close(popup->base);
|
||||
}
|
||||
wlr_xdg_surface_v6_send_close(surface);
|
||||
}
|
||||
|
||||
static void destroy(struct roots_view *view) {
|
||||
|
|
|
@ -1568,9 +1568,22 @@ uint32_t wlr_xdg_toplevel_set_resizing(struct wlr_xdg_surface *surface,
|
|||
return wlr_xdg_surface_schedule_configure(surface);
|
||||
}
|
||||
|
||||
void wlr_xdg_toplevel_send_close(struct wlr_xdg_surface *surface) {
|
||||
assert(surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL);
|
||||
xdg_toplevel_send_close(surface->toplevel->resource);
|
||||
void wlr_xdg_surface_send_close(struct wlr_xdg_surface *surface) {
|
||||
switch (surface->role) {
|
||||
case WLR_XDG_SURFACE_ROLE_NONE:
|
||||
assert(0 && "not reached");
|
||||
break;
|
||||
case WLR_XDG_SURFACE_ROLE_TOPLEVEL:
|
||||
if (surface->toplevel) {
|
||||
xdg_toplevel_send_close(surface->toplevel->resource);
|
||||
}
|
||||
break;
|
||||
case WLR_XDG_SURFACE_ROLE_POPUP:
|
||||
if (surface->popup) {
|
||||
xdg_popup_send_popup_done(surface->popup->resource);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void wlr_xdg_surface_popup_get_position(struct wlr_xdg_surface *surface,
|
||||
|
|
|
@ -1537,9 +1537,22 @@ uint32_t wlr_xdg_toplevel_v6_set_resizing(struct wlr_xdg_surface_v6 *surface,
|
|||
return wlr_xdg_surface_v6_schedule_configure(surface);
|
||||
}
|
||||
|
||||
void wlr_xdg_toplevel_v6_send_close(struct wlr_xdg_surface_v6 *surface) {
|
||||
assert(surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL);
|
||||
zxdg_toplevel_v6_send_close(surface->toplevel->resource);
|
||||
void wlr_xdg_surface_v6_send_close(struct wlr_xdg_surface_v6 *surface) {
|
||||
switch (surface->role) {
|
||||
case WLR_XDG_SURFACE_V6_ROLE_NONE:
|
||||
assert(0 && "not reached");
|
||||
break;
|
||||
case WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL:
|
||||
if (surface->toplevel) {
|
||||
zxdg_toplevel_v6_send_close(surface->toplevel->resource);
|
||||
}
|
||||
break;
|
||||
case WLR_XDG_SURFACE_V6_ROLE_POPUP:
|
||||
if (surface->popup) {
|
||||
zxdg_popup_v6_send_popup_done(surface->popup->resource);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void wlr_xdg_surface_v6_popup_get_position(struct wlr_xdg_surface_v6 *surface,
|
||||
|
|
Loading…
Reference in a new issue