hyprwm
/
wlroots-hyprland
mirror of https://github.com/hyprwm/wlroots-hyprland.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xdg-popup: use current/pending state pattern

This commit is contained in:
Kirill Primak 2022-04-13 20:22:14 +03:00 committed by Simon Ser
parent 4a968576e4
commit 6f1fce9cb4
5 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,6 +70,12 @@ struct wlr_xdg_positioner {
struct wlr_xdg_positioner_rules rules; struct wlr_xdg_positioner_rules rules;
}; };
struct wlr_xdg_popup_state {
// Position of the popup relative to the upper left corner of
// the window geometry of the parent surface
struct wlr_box geometry;
};
struct wlr_xdg_popup_configure { struct wlr_xdg_popup_configure {
struct wlr_box geometry; struct wlr_box geometry;
struct wlr_xdg_positioner_rules rules; struct wlr_xdg_positioner_rules rules;
@ -86,9 +92,7 @@ struct wlr_xdg_popup {
struct wlr_xdg_popup_configure scheduled; struct wlr_xdg_popup_configure scheduled;
// Position of the popup relative to the upper left corner of the window struct wlr_xdg_popup_state current, pending;
// geometry of the parent surface
struct wlr_box geometry;
struct wl_list grab_link; // wlr_xdg_popup_grab.popups struct wl_list grab_link; // wlr_xdg_popup_grab.popups
}; };

2
types/scene/xdg_shell.c
View File

@ -60,7 +60,7 @@ static void scene_xdg_surface_update_position(
if (xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP) { if (xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP) {
struct wlr_xdg_popup *popup = xdg_surface->popup; struct wlr_xdg_popup *popup = xdg_surface->popup;
wlr_scene_node_set_position(&scene_xdg_surface->tree->node, wlr_scene_node_set_position(&scene_xdg_surface->tree->node,
popup->geometry.x, popup->geometry.y); popup->current.geometry.x, popup->current.geometry.y);
} }
} }

32
types/wlr_layer_shell_v1.c
View File

@ -552,16 +552,15 @@ void wlr_layer_surface_v1_for_each_surface(struct wlr_layer_surface_v1 *surface,
void wlr_layer_surface_v1_for_each_popup_surface(struct wlr_layer_surface_v1 *surface, void wlr_layer_surface_v1_for_each_popup_surface(struct wlr_layer_surface_v1 *surface,
wlr_surface_iterator_func_t iterator, void *user_data){ wlr_surface_iterator_func_t iterator, void *user_data){
struct wlr_xdg_popup *popup_state; struct wlr_xdg_popup *popup;
wl_list_for_each(popup_state, &surface->popups, link) { wl_list_for_each(popup, &surface->popups, link) {
struct wlr_xdg_surface *popup = popup_state->base; if (!popup->base->configured || !popup->base->mapped) {
if (!popup->configured || !popup->mapped) {
continue; continue;
} }
double popup_sx, popup_sy; double popup_sx, popup_sy;
popup_sx = popup->popup->geometry.x - popup->current.geometry.x; popup_sx = popup->current.geometry.x - popup->base->current.geometry.x;
popup_sy = popup->popup->geometry.y - popup->current.geometry.y; popup_sy = popup->current.geometry.y - popup->base->current.geometry.y;
struct layer_surface_iterator_data data = { struct layer_surface_iterator_data data = {
.user_iterator = iterator, .user_iterator = iterator,
@ -569,7 +568,8 @@ void wlr_layer_surface_v1_for_each_popup_surface(struct wlr_layer_surface_v1 *su
.x = popup_sx, .y = popup_sy, .x = popup_sx, .y = popup_sy,
}; };
wlr_xdg_surface_for_each_surface(popup, layer_surface_iterator, &data); wlr_xdg_surface_for_each_surface(popup->base,
layer_surface_iterator, &data);
} }
} }
@ -587,20 +587,18 @@ struct wlr_surface *wlr_layer_surface_v1_surface_at(
struct wlr_surface *wlr_layer_surface_v1_popup_surface_at( struct wlr_surface *wlr_layer_surface_v1_popup_surface_at(
struct wlr_layer_surface_v1 *surface, double sx, double sy, struct wlr_layer_surface_v1 *surface, double sx, double sy,
double *sub_x, double *sub_y) { double *sub_x, double *sub_y) {
struct wlr_xdg_popup *popup_state; struct wlr_xdg_popup *popup;
wl_list_for_each(popup_state, &surface->popups, link) { wl_list_for_each(popup, &surface->popups, link) {
struct wlr_xdg_surface *popup = popup_state->base; if (!popup->base->mapped) {
if (!popup->mapped) {
continue; continue;
} }
double popup_sx = popup_state->geometry.x - popup->current.geometry.x; double popup_sx, popup_sy;
double popup_sy = popup_state->geometry.y - popup->current.geometry.y; popup_sx = popup->current.geometry.x - popup->base->current.geometry.x;
popup_sy = popup->current.geometry.y - popup->base->current.geometry.y;
struct wlr_surface *sub = wlr_xdg_surface_surface_at(popup, struct wlr_surface *sub = wlr_xdg_surface_surface_at(
sx - popup_sx, popup->base, sx - popup_sx, sy - popup_sy, sub_x, sub_y);
sy - popup_sy,
sub_x, sub_y);
if (sub != NULL) { if (sub != NULL) {
return sub; return sub;
} }

9
types/xdg_shell/wlr_xdg_popup.c
View File

@ -7,7 +7,7 @@
void handle_xdg_popup_ack_configure( void handle_xdg_popup_ack_configure(
struct wlr_xdg_popup *popup, struct wlr_xdg_popup *popup,
struct wlr_xdg_popup_configure *configure) { struct wlr_xdg_popup_configure *configure) {
popup->geometry = configure->geometry; popup->pending.geometry = configure->geometry;
} }
struct wlr_xdg_popup_configure *send_xdg_popup_configure( struct wlr_xdg_popup_configure *send_xdg_popup_configure(
@ -238,7 +238,10 @@ void handle_xdg_popup_committed(struct wlr_xdg_popup *popup) {
if (!popup->committed) { if (!popup->committed) {
wlr_xdg_surface_schedule_configure(popup->base); wlr_xdg_surface_schedule_configure(popup->base);
popup->committed = true; popup->committed = true;
return;
} }
popup->current = popup->pending;
} }
static const struct xdg_popup_interface xdg_popup_implementation; static const struct xdg_popup_interface xdg_popup_implementation;
@ -440,8 +443,8 @@ void wlr_xdg_popup_get_toplevel_coords(struct wlr_xdg_popup *popup,
wlr_xdg_surface_from_wlr_surface(parent); wlr_xdg_surface_from_wlr_surface(parent);
if (xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP) { if (xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP) {
popup_sx += xdg_surface->popup->geometry.x; popup_sx += xdg_surface->popup->current.geometry.x;
popup_sy += xdg_surface->popup->geometry.y; popup_sy += xdg_surface->popup->current.geometry.y;
parent = xdg_surface->popup->parent; parent = xdg_surface->popup->parent;
} else { } else {
popup_sx += xdg_surface->current.geometry.x; popup_sx += xdg_surface->current.geometry.x;

4
types/xdg_shell/wlr_xdg_surface.c
View File

@ -464,9 +464,9 @@ void wlr_xdg_popup_get_position(struct wlr_xdg_popup *popup,
wlr_xdg_surface_from_wlr_surface(popup->parent); wlr_xdg_surface_from_wlr_surface(popup->parent);
struct wlr_box parent_geo; struct wlr_box parent_geo;
wlr_xdg_surface_get_geometry(parent, &parent_geo); wlr_xdg_surface_get_geometry(parent, &parent_geo);
*popup_sx = parent_geo.x + popup->geometry.x - *popup_sx = parent_geo.x + popup->current.geometry.x -
popup->base->current.geometry.x; popup->base->current.geometry.x;
*popup_sy = parent_geo.y + popup->geometry.y - *popup_sy = parent_geo.y + popup->current.geometry.y -
popup->base->current.geometry.y; popup->base->current.geometry.y;
} }