mirror of
https://github.com/hyprwm/wlroots-hyprland.git
synced 2024-11-02 11:55:59 +01:00
refactor wlr_output_layout to use wlr_box
This commit is contained in:
parent
f8e4ba3f5f
commit
f25511ee3d
1 changed files with 36 additions and 41 deletions
|
@ -150,20 +150,13 @@ struct wlr_output_layout_output *wlr_output_layout_get(
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool output_contains_point( struct wlr_output_layout_output *l_output,
|
|
||||||
int x, int y, int width, int height) {
|
|
||||||
return x >= l_output->x && x <= l_output->x + width &&
|
|
||||||
y >= l_output->y && y <= l_output->y + height;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool wlr_output_layout_contains_point(struct wlr_output_layout *layout,
|
bool wlr_output_layout_contains_point(struct wlr_output_layout *layout,
|
||||||
struct wlr_output *reference, int x, int y) {
|
struct wlr_output *reference, int x, int y) {
|
||||||
if (reference) {
|
if (reference) {
|
||||||
struct wlr_output_layout_output *layout_output =
|
struct wlr_output_layout_output *l_output =
|
||||||
wlr_output_layout_get(layout, reference);
|
wlr_output_layout_get(layout, reference);
|
||||||
int width, height;
|
struct wlr_box *box = wlr_output_layout_output_get_box(l_output);
|
||||||
wlr_output_effective_resolution(layout_output->output, &width, &height);
|
return wlr_box_contains_point(box, x, y);
|
||||||
return output_contains_point(layout_output, x, y, width, height);
|
|
||||||
} else {
|
} else {
|
||||||
return !!wlr_output_layout_output_at(layout, x, y);
|
return !!wlr_output_layout_output_at(layout, x, y);
|
||||||
}
|
}
|
||||||
|
@ -173,17 +166,17 @@ bool wlr_output_layout_intersects(struct wlr_output_layout *layout,
|
||||||
struct wlr_output *reference, int x1, int y1, int x2, int y2) {
|
struct wlr_output *reference, int x1, int y1, int x2, int y2) {
|
||||||
struct wlr_output_layout_output *l_output =
|
struct wlr_output_layout_output *l_output =
|
||||||
wlr_output_layout_get(layout, reference);
|
wlr_output_layout_get(layout, reference);
|
||||||
|
|
||||||
if (!l_output) {
|
if (!l_output) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
int width, height;
|
|
||||||
wlr_output_effective_resolution(l_output->output, &width, &height);
|
|
||||||
|
|
||||||
// the output must contain one of the points
|
// the output box must contain one of the points
|
||||||
return output_contains_point(l_output, x1, y1, width, height) ||
|
struct wlr_box *box = wlr_output_layout_output_get_box(l_output);
|
||||||
output_contains_point(l_output, x2, y2, width, height) ||
|
return wlr_box_contains_point(box, x1, y1) ||
|
||||||
output_contains_point(l_output, x2, y1, width, height) ||
|
wlr_box_contains_point(box, x2, y2) ||
|
||||||
output_contains_point(l_output, y2, x1, width, height);
|
wlr_box_contains_point(box, x2, y1) ||
|
||||||
|
wlr_box_contains_point(box, y2, x1);
|
||||||
}
|
}
|
||||||
|
|
||||||
struct wlr_output *wlr_output_layout_output_at(struct wlr_output_layout *layout,
|
struct wlr_output *wlr_output_layout_output_at(struct wlr_output_layout *layout,
|
||||||
|
@ -191,11 +184,8 @@ struct wlr_output *wlr_output_layout_output_at(struct wlr_output_layout *layout,
|
||||||
struct wlr_output_layout_output *l_output;
|
struct wlr_output_layout_output *l_output;
|
||||||
wl_list_for_each(l_output, &layout->outputs, link) {
|
wl_list_for_each(l_output, &layout->outputs, link) {
|
||||||
if (l_output->output) {
|
if (l_output->output) {
|
||||||
int width, height;
|
struct wlr_box *box = wlr_output_layout_output_get_box(l_output);
|
||||||
wlr_output_effective_resolution(l_output->output, &width, &height);
|
if (wlr_box_contains_point(box, x, y)) {
|
||||||
bool has_x = x >= l_output->x && x <= l_output->x + width;
|
|
||||||
bool has_y = y >= l_output->y && y <= l_output->y + height;
|
|
||||||
if (has_x && has_y) {
|
|
||||||
return l_output->output;
|
return l_output->output;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -278,25 +268,30 @@ struct wlr_box *wlr_output_layout_get_box(
|
||||||
if (reference) {
|
if (reference) {
|
||||||
// output extents
|
// output extents
|
||||||
l_output = wlr_output_layout_get(layout, reference);
|
l_output = wlr_output_layout_get(layout, reference);
|
||||||
|
|
||||||
|
if (l_output) {
|
||||||
return wlr_output_layout_output_get_box(l_output);
|
return wlr_output_layout_output_get_box(l_output);
|
||||||
|
} else {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
// layout extents
|
// layout extents
|
||||||
int min_x = INT_MAX, min_y = INT_MAX;
|
int min_x = INT_MAX, min_y = INT_MAX;
|
||||||
int max_x = INT_MIN, max_y = INT_MIN;
|
int max_x = INT_MIN, max_y = INT_MIN;
|
||||||
wl_list_for_each(l_output, &layout->outputs, link) {
|
wl_list_for_each(l_output, &layout->outputs, link) {
|
||||||
int width, height;
|
struct wlr_box *box = wlr_output_layout_output_get_box(l_output);
|
||||||
wlr_output_effective_resolution(l_output->output, &width, &height);
|
|
||||||
if (l_output->x < min_x) {
|
if (box->x < min_x) {
|
||||||
min_x = l_output->x;
|
min_x = box->x;
|
||||||
}
|
}
|
||||||
if (l_output->y < min_y) {
|
if (box->y < min_y) {
|
||||||
min_y = l_output->y;
|
min_y = box->y;
|
||||||
}
|
}
|
||||||
if (l_output->x + width > max_x) {
|
if (box->x + box->width > max_x) {
|
||||||
max_x = l_output->x + width;
|
max_x = box->x + box->width;
|
||||||
}
|
}
|
||||||
if (l_output->y + height > max_y) {
|
if (box->y + box->height > max_y) {
|
||||||
max_y = l_output->y + height;
|
max_y = box->y + box->height;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue