hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-09 15:05:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

cleanup xdg-positioner rootston code

Browse source
This commit is contained in:
Tony Crisci 2018-03-28 11:42:01 -04:00
parent 41e54ba632
commit 738f5e3344
1 changed files with 65 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

167
rootston/xdg_shell_v6.c
View file

@ -65,8 +65,8 @@ static void popup_get_coords(struct wlr_xdg_popup_v6 *popup,
*sy = popup_sy + parent->geometry.y; *sy = popup_sy + parent->geometry.y;
} }
static void popup_is_constrained(struct roots_xdg_popup_v6 *popup, static void popup_constraint_offset(struct roots_xdg_popup_v6 *popup,
bool *x_constrained, bool *y_constrained) { int *offset_x, int *offset_y) {
struct roots_view *view = popup->view_child.view; struct roots_view *view = popup->view_child.view;
struct wlr_output_layout *layout = view->desktop->layout; struct wlr_output_layout *layout = view->desktop->layout;
struct wlr_xdg_popup_v6 *wlr_popup = popup->wlr_popup; struct wlr_xdg_popup_v6 *wlr_popup = popup->wlr_popup;
@ -94,134 +94,103 @@ static void popup_is_constrained(struct roots_xdg_popup_v6 *popup,
assert(output); assert(output);
struct wlr_box *output_box = wlr_output_layout_get_box(layout, output); struct wlr_box *output_box = wlr_output_layout_get_box(layout, output);
*x_constrained = popup_lx <= output_box->x || bool x_constrained = popup_lx <= output_box->x ||
popup_lx + popup_width >= output_box->x + output_box->width; popup_lx + popup_width >= output_box->x + output_box->width;
*y_constrained = popup_ly <= output_box->y || bool y_constrained = popup_ly <= output_box->y ||
popup_ly + popup_height >= output_box->y + output_box->height; popup_ly + popup_height >= output_box->y + output_box->height;
}
static void popup_unconstrain_flip(struct roots_xdg_popup_v6 *popup) { *offset_x = *offset_y = 0;
bool x_constrained, y_constrained;
popup_is_constrained(popup, &x_constrained, &y_constrained);
if (!x_constrained && !y_constrained) { double popup_ox = popup_lx - output_box->x;
return; double popup_oy = popup_ly - output_box->y;
}
if (x_constrained) { if (x_constrained) {
*offset_x = popup_width - (output_box->width - popup_ox);
}
if (y_constrained) {
*offset_y = popup_height - (output_box->height - popup_oy);
}
}
static bool popup_unconstrain_flip(struct roots_xdg_popup_v6 *popup) {
int offset_x, offset_y;
popup_constraint_offset(popup, &offset_y, &offset_y);
if (!offset_x && !offset_y) {
return true;
}
if (offset_x) {
wlr_positioner_v6_invert_x(&popup->wlr_popup->positioner); wlr_positioner_v6_invert_x(&popup->wlr_popup->positioner);
} }
if (y_constrained) { if (offset_y) {
wlr_positioner_v6_invert_y(&popup->wlr_popup->positioner); wlr_positioner_v6_invert_y(&popup->wlr_popup->positioner);
} }
popup->wlr_popup->geometry = popup->wlr_popup->geometry =
wlr_xdg_positioner_v6_get_geometry(&popup->wlr_popup->positioner); wlr_xdg_positioner_v6_get_geometry(&popup->wlr_popup->positioner);
popup_is_constrained(popup, &x_constrained, &y_constrained); popup_constraint_offset(popup, &offset_x, &offset_y);
if (!x_constrained && !y_constrained) { if (!offset_x && !offset_y) {
return; // no longer constrained
return true;
} }
if (x_constrained) { // revert the positioner back if it didn't fix it and go to the next part
if (offset_x) {
wlr_positioner_v6_invert_x(&popup->wlr_popup->positioner); wlr_positioner_v6_invert_x(&popup->wlr_popup->positioner);
} }
if (y_constrained) { if (offset_y) {
wlr_positioner_v6_invert_y(&popup->wlr_popup->positioner); wlr_positioner_v6_invert_y(&popup->wlr_popup->positioner);
} }
popup->wlr_popup->geometry = popup->wlr_popup->geometry =
wlr_xdg_positioner_v6_get_geometry(&popup->wlr_popup->positioner); wlr_xdg_positioner_v6_get_geometry(&popup->wlr_popup->positioner);
return false;
} }
static void popup_unconstrain_slide(struct roots_xdg_popup_v6 *popup) { static bool popup_unconstrain_slide(struct roots_xdg_popup_v6 *popup) {
struct roots_view *view = popup->view_child.view; int offset_x, offset_y;
struct wlr_output_layout *layout = view->desktop->layout; popup_constraint_offset(popup, &offset_x, &offset_y);
struct wlr_xdg_popup_v6 *wlr_popup = popup->wlr_popup;
int popup_width = wlr_popup->geometry.width;
int popup_height = wlr_popup->geometry.height;
int anchor_lx, anchor_ly; if (!offset_x && !offset_y) {
wlr_xdg_popup_v6_get_anchor_point(wlr_popup, &anchor_lx, &anchor_ly); return true;
double popup_lx, popup_ly;
popup_get_coords(wlr_popup, &popup_lx, &popup_ly);
popup_lx += view->x;
popup_ly += view->y;
anchor_lx += popup_lx;
anchor_ly += popup_ly;
double dest_x = 0, dest_y = 0;
wlr_output_layout_closest_point(layout, NULL, anchor_lx, anchor_ly,
&dest_x, &dest_y);
struct wlr_output *output =
wlr_output_layout_output_at(layout, dest_x, dest_y);
// XXX: handle empty output layout
assert(output);
struct wlr_box *output_box = wlr_output_layout_get_box(layout, output);
bool x_constrained = popup_lx <= output_box->x ||
popup_lx + popup_width >= output_box->x + output_box->width;
bool y_constrained = popup_ly <= output_box->y ||
popup_ly + popup_height >= output_box->y + output_box->height;
double popup_ox = popup_lx - output_box->x,
popup_oy = popup_ly - output_box->y;
if (x_constrained) {
wlr_popup->geometry.x -= popup_width - (output_box->width - popup_ox);
}
if (y_constrained) {
wlr_popup->geometry.y -= popup_height - (output_box->height - popup_oy);
}
} }
static void popup_unconstrain_resize(struct roots_xdg_popup_v6 *popup) { if (offset_x) {
struct roots_view *view = popup->view_child.view; popup->wlr_popup->geometry.x -= offset_x;
struct wlr_output_layout *layout = view->desktop->layout;
struct wlr_xdg_popup_v6 *wlr_popup = popup->wlr_popup;
int popup_width = wlr_popup->geometry.width;
int popup_height = wlr_popup->geometry.height;
int anchor_lx, anchor_ly;
wlr_xdg_popup_v6_get_anchor_point(wlr_popup, &anchor_lx, &anchor_ly);
double popup_lx, popup_ly;
popup_get_coords(wlr_popup, &popup_lx, &popup_ly);
popup_lx += view->x;
popup_ly += view->y;
anchor_lx += popup_lx;
anchor_ly += popup_ly;
double dest_x = 0, dest_y = 0;
wlr_output_layout_closest_point(layout, NULL, anchor_lx, anchor_ly,
&dest_x, &dest_y);
struct wlr_output *output =
wlr_output_layout_output_at(layout, dest_x, dest_y);
// XXX: handle empty output layout
assert(output);
struct wlr_box *output_box = wlr_output_layout_get_box(layout, output);
bool x_constrained = popup_lx <= output_box->x ||
popup_lx + popup_width >= output_box->x + output_box->width;
bool y_constrained = popup_ly <= output_box->y ||
popup_ly + popup_height >= output_box->y + output_box->height;
double popup_ox = popup_lx - output_box->x, popup_oy = popup_ly - output_box->y;
if (x_constrained) {
wlr_popup->geometry.width = output_box->x + output_box->width - popup_ox;
} }
if (y_constrained) { if (offset_y) {
wlr_popup->geometry.height = output_box->y + output_box->height - popup_oy; popup->wlr_popup->geometry.y -= abs(offset_y);
} }
popup_constraint_offset(popup, &offset_y, &offset_y);
return !offset_x && !offset_y;
}
static bool popup_unconstrain_resize(struct roots_xdg_popup_v6 *popup) {
int offset_x, offset_y;
popup_constraint_offset(popup, &offset_x, &offset_y);
if (!offset_x && !offset_y) {
return true;
}
if (offset_x) {
popup->wlr_popup->geometry.width -= offset_x;
}
if (offset_y) {
popup->wlr_popup->geometry.height -= offset_y;
}
popup_constraint_offset(popup, &offset_y, &offset_y);
return !offset_x && !offset_y;
} }
static void popup_unconstrain(struct roots_xdg_popup_v6 *popup) { static void popup_unconstrain(struct roots_xdg_popup_v6 *popup) {