blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor wlr_output_layout_closest_point

This commit is contained in:
Tony Crisci 2017-08-29 12:32:17 -04:00
parent 9b65d0b3f0
commit b6031d1065
3 changed files with 24 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/wlr/types/wlr_output_layout.h
View File

@ -53,11 +53,10 @@ 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);
/** /**
* Get the closest boundary point of this layout from the given point from the * Get the closest point on this layout from the given point from the reference
* reference output. If reference is NULL, gets the closest boundary point from * output. If reference is NULL, gets the closest point from the entire layout.
* the entire layout.
*/ */
void wlr_output_layout_closest_boundary(struct wlr_output_layout *layout, void wlr_output_layout_closest_point(struct wlr_output_layout *layout,
struct wlr_output *reference, double x, double y, double *dest_x, struct wlr_output *reference, double x, double y, double *dest_x,
double *dest_y); double *dest_y);

10
types/wlr_cursor.c
View File

@ -230,11 +230,11 @@ void wlr_cursor_move(struct wlr_cursor *cur, struct wlr_input_device *dev,
} }
} else { } else {
if (!wlr_output_layout_contains_point(cur->state->layout, NULL, x, y)) { if (!wlr_output_layout_contains_point(cur->state->layout, NULL, x, y)) {
double boundary_x, boundary_y; double layout_x, layout_y;
wlr_output_layout_closest_boundary(cur->state->layout, NULL, x, y, wlr_output_layout_closest_point(cur->state->layout, NULL, x, y,
&boundary_x, &boundary_y); &layout_x, &layout_y);
x = boundary_x; x = layout_x;
y = boundary_y; y = layout_y;
} }
} }

49
types/wlr_output_layout.c
View File

@ -3,6 +3,7 @@
#include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_output_layout.h>
#include <wlr/types/wlr_box.h> #include <wlr/types/wlr_box.h>
#include <limits.h> #include <limits.h>
#include <float.h>
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
@ -157,47 +158,33 @@ void wlr_output_layout_output_coords(struct wlr_output_layout *layout,
} }
} }
static double get_distance(double x1, double y1, double x2, double y2) { static struct wlr_box *wlr_output_layout_output_get_box(
double distance; struct wlr_output_layout_output *l_output) {
distance = sqrt((x1 - x2) * (x1 - x2) + (y1 - y2) * (y1 - y2)); l_output->state->_box->x = l_output->x;
return distance; l_output->state->_box->y = l_output->y;
wlr_output_effective_resolution(l_output->output,
&l_output->state->_box->width, &l_output->state->_box->height);
return l_output->state->_box;
} }
void wlr_output_layout_closest_boundary(struct wlr_output_layout *layout, void wlr_output_layout_closest_point(struct wlr_output_layout *layout,
struct wlr_output *reference, double x, double y, double *dest_x, struct wlr_output *reference, double x, double y, double *dest_x,
double *dest_y) { double *dest_y) {
double min_x = INT_MAX, min_y = INT_MAX, min_distance = INT_MAX; double min_x = DBL_MAX, min_y = DBL_MAX, min_distance = DBL_MAX;
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 (reference != NULL && reference != l_output->output) { if (reference != NULL && reference != l_output->output) {
continue; continue;
} }
int width, height;
double output_x, output_y, output_distance; double output_x, output_y, output_distance;
wlr_output_effective_resolution(l_output->output, &width, &height); struct wlr_box *box = wlr_output_layout_output_get_box(l_output);
wlr_box_closest_point(box, x, y, &output_x, &output_y);
// find the closest x point // calculate squared distance suitable for comparison
// TODO use wlr_box_closest_boundary output_distance =
if (x < l_output->x) { (x - output_x) * (x - output_x) + (y - output_y) * (y - output_y);
output_x = l_output->x;
} else if (x > l_output->x + width) {
output_x = l_output->x + width;
} else {
output_x = x;
}
// find closest y point
if (y < l_output->y) {
output_y = l_output->y;
} else if (y > l_output->y + height) {
output_y = l_output->y + height;
} else {
output_y = y;
}
// calculate distance
output_distance = get_distance(output_x, output_y, x, y);
if (output_distance < min_distance) { if (output_distance < min_distance) {
min_x = output_x; min_x = output_x;
min_y = output_y; min_y = output_y;
@ -215,11 +202,7 @@ 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);
l_output->state->_box->x = l_output->x; return wlr_output_layout_output_get_box(l_output);
l_output->state->_box->y = l_output->y;
wlr_output_effective_resolution(reference,
&l_output->state->_box->width, &l_output->state->_box->height);
return l_output->state->_box;
} else { } else {
// layout extents // layout extents
int min_x = INT_MAX, min_y = INT_MAX; int min_x = INT_MAX, min_y = INT_MAX;