Merge pull request #632 from acrisci/output-layout-adjacent

add wlr_output_layout_adjacent_output
This commit is contained in:
Drew DeVault 2018-02-19 18:00:32 -05:00 committed by GitHub
commit 09cfa39392
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 64 additions and 0 deletions

View file

@ -96,4 +96,19 @@ void wlr_output_layout_add_auto(struct wlr_output_layout *layout,
struct wlr_output *wlr_output_layout_get_center_output( struct wlr_output *wlr_output_layout_get_center_output(
struct wlr_output_layout *layout); struct wlr_output_layout *layout);
enum wlr_direction {
WLR_DIRECTION_UP = 0,
WLR_DIRECTION_DOWN = 1,
WLR_DIRECTION_LEFT = 2,
WLR_DIRECTION_RIGHT = 4,
};
/**
* Get the closest adjacent output to the reference output from the reference
* point in the given direction.
*/
struct wlr_output *wlr_output_layout_adjacent_output(
struct wlr_output_layout *layout, enum wlr_direction direction,
struct wlr_output *reference, double ref_x, double ref_y);
#endif #endif

View file

@ -436,3 +436,52 @@ struct wlr_output *wlr_output_layout_get_center_output(
return wlr_output_layout_output_at(layout, dest_x, dest_y); return wlr_output_layout_output_at(layout, dest_x, dest_y);
} }
struct wlr_output *wlr_output_layout_adjacent_output(
struct wlr_output_layout *layout, enum wlr_direction direction,
struct wlr_output *reference, double ref_x, double ref_y) {
assert(reference);
struct wlr_box *ref_box = wlr_output_layout_get_box(layout, reference);
double min_distance = DBL_MAX;
struct wlr_output *closest_output = NULL;
struct wlr_output_layout_output *l_output;
wl_list_for_each(l_output, &layout->outputs, link) {
if (reference != NULL && reference == l_output->output) {
continue;
}
struct wlr_box *box = wlr_output_layout_output_get_box(l_output);
bool match = false;
// test to make sure this output is in the given direction
if (direction & WLR_DIRECTION_LEFT) {
match = box->x + box->width <= ref_box->x || match;
}
if (direction & WLR_DIRECTION_RIGHT) {
match = box->x >= ref_box->x + ref_box->width || match;
}
if (direction & WLR_DIRECTION_UP) {
match = box->y + box->height <= ref_box->y || match;
}
if (direction & WLR_DIRECTION_DOWN) {
match = box->y >= ref_box->y + ref_box->height || match;
}
if (!match) {
continue;
}
// calculate distance from the given reference point
double x, y;
wlr_output_layout_closest_point(layout, l_output->output,
ref_x, ref_y, &x, &y);
double distance =
(x - ref_x) * (x - ref_x) + (y - ref_y) * (y - ref_y);
if (distance < min_distance) {
min_distance = distance;
closest_output = l_output->output;
}
}
return closest_output;
}