mirror of
https://gitlab.freedesktop.org/wlroots/wlroots.git
synced 2024-10-30 07:30:46 +00:00
6d197eef94
Limiting the position to (x + width - 1, y + height - 1) created a 1px
"dead zone" at monitor edges, noticeable with high-resolution mice with
motion deltas of <1px.
See: https://github.com/swaywm/sway/issues/8110
Using (x + width - 1/65536, y + height - 1/65536) instead should make
the "dead zone" small enough to be unobservable, while the value 1/65536
is still large enough to avoid rounding to zero (due to loss of
significant digits) in simple floating-point calculations.
This does expose a client-side bug in Qt layer-shell applications,
noticeable in right/bottom panels which do not accept positions beyond
(x + width - 1, x + height - 1) as valid - thus driving the cursor
to the bottom/right of the screen to click on the panel does not work.
I don't have a good workaround for this, and probably it needs to be
fixed in Qt itself.
Fixes: 3fc66d4525
("util: fix non-linear behavior of wlr_box_closest_point()")
223 lines
5.3 KiB
C
223 lines
5.3 KiB
C
#include <math.h>
|
|
#include <stdbool.h>
|
|
#include <stdlib.h>
|
|
#include <wlr/util/box.h>
|
|
#include <wlr/util/log.h>
|
|
|
|
void wlr_box_closest_point(const struct wlr_box *box, double x, double y,
|
|
double *dest_x, double *dest_y) {
|
|
// if box is empty, then it contains no points, so no closest point either
|
|
if (wlr_box_empty(box)) {
|
|
*dest_x = NAN;
|
|
*dest_y = NAN;
|
|
return;
|
|
}
|
|
|
|
// Note: the width and height of the box are exclusive; that is,
|
|
// for a 100x100 box at (0,0), the point (99.9,99.9) is inside it
|
|
// while the point (100,100) is outside it.
|
|
//
|
|
// In order to be consistent with e.g. wlr_box_contains_point(),
|
|
// this function returns a point inside the bottom and right edges
|
|
// of the box by at least 1/65536 of a unit (pixel). 1/65536 is
|
|
// small enough to avoid a "dead zone" with high-resolution mice
|
|
// but large enough to avoid rounding to zero (due to loss of
|
|
// significant digits) in simple floating-point calculations.
|
|
|
|
// find the closest x point
|
|
if (x < box->x) {
|
|
*dest_x = box->x;
|
|
} else if (x > box->x + box->width - 1/65536.0) {
|
|
*dest_x = box->x + box->width - 1/65536.0;
|
|
} else {
|
|
*dest_x = x;
|
|
}
|
|
|
|
// find closest y point
|
|
if (y < box->y) {
|
|
*dest_y = box->y;
|
|
} else if (y > box->y + box->height - 1/65536.0) {
|
|
*dest_y = box->y + box->height - 1/65536.0;
|
|
} else {
|
|
*dest_y = y;
|
|
}
|
|
}
|
|
|
|
bool wlr_box_empty(const struct wlr_box *box) {
|
|
return box == NULL || box->width <= 0 || box->height <= 0;
|
|
}
|
|
|
|
bool wlr_box_intersection(struct wlr_box *dest, const struct wlr_box *box_a,
|
|
const struct wlr_box *box_b) {
|
|
bool a_empty = wlr_box_empty(box_a);
|
|
bool b_empty = wlr_box_empty(box_b);
|
|
|
|
if (a_empty || b_empty) {
|
|
*dest = (struct wlr_box){0};
|
|
return false;
|
|
}
|
|
|
|
int x1 = fmax(box_a->x, box_b->x);
|
|
int y1 = fmax(box_a->y, box_b->y);
|
|
int x2 = fmin(box_a->x + box_a->width, box_b->x + box_b->width);
|
|
int y2 = fmin(box_a->y + box_a->height, box_b->y + box_b->height);
|
|
|
|
dest->x = x1;
|
|
dest->y = y1;
|
|
dest->width = x2 - x1;
|
|
dest->height = y2 - y1;
|
|
|
|
return !wlr_box_empty(dest);
|
|
}
|
|
|
|
bool wlr_box_contains_point(const struct wlr_box *box, double x, double y) {
|
|
if (wlr_box_empty(box)) {
|
|
return false;
|
|
} else {
|
|
return x >= box->x && x < box->x + box->width &&
|
|
y >= box->y && y < box->y + box->height;
|
|
}
|
|
}
|
|
|
|
void wlr_box_transform(struct wlr_box *dest, const struct wlr_box *box,
|
|
enum wl_output_transform transform, int width, int height) {
|
|
struct wlr_box src = {0};
|
|
if (box != NULL) {
|
|
src = *box;
|
|
}
|
|
|
|
if (transform % 2 == 0) {
|
|
dest->width = src.width;
|
|
dest->height = src.height;
|
|
} else {
|
|
dest->width = src.height;
|
|
dest->height = src.width;
|
|
}
|
|
|
|
switch (transform) {
|
|
case WL_OUTPUT_TRANSFORM_NORMAL:
|
|
dest->x = src.x;
|
|
dest->y = src.y;
|
|
break;
|
|
case WL_OUTPUT_TRANSFORM_90:
|
|
dest->x = height - src.y - src.height;
|
|
dest->y = src.x;
|
|
break;
|
|
case WL_OUTPUT_TRANSFORM_180:
|
|
dest->x = width - src.x - src.width;
|
|
dest->y = height - src.y - src.height;
|
|
break;
|
|
case WL_OUTPUT_TRANSFORM_270:
|
|
dest->x = src.y;
|
|
dest->y = width - src.x - src.width;
|
|
break;
|
|
case WL_OUTPUT_TRANSFORM_FLIPPED:
|
|
dest->x = width - src.x - src.width;
|
|
dest->y = src.y;
|
|
break;
|
|
case WL_OUTPUT_TRANSFORM_FLIPPED_90:
|
|
dest->x = src.y;
|
|
dest->y = src.x;
|
|
break;
|
|
case WL_OUTPUT_TRANSFORM_FLIPPED_180:
|
|
dest->x = src.x;
|
|
dest->y = height - src.y - src.height;
|
|
break;
|
|
case WL_OUTPUT_TRANSFORM_FLIPPED_270:
|
|
dest->x = height - src.y - src.height;
|
|
dest->y = width - src.x - src.width;
|
|
break;
|
|
}
|
|
}
|
|
|
|
bool wlr_fbox_empty(const struct wlr_fbox *box) {
|
|
return box == NULL || box->width <= 0 || box->height <= 0;
|
|
}
|
|
|
|
void wlr_fbox_transform(struct wlr_fbox *dest, const struct wlr_fbox *box,
|
|
enum wl_output_transform transform, double width, double height) {
|
|
struct wlr_fbox src = {0};
|
|
if (box != NULL) {
|
|
src = *box;
|
|
}
|
|
|
|
if (transform % 2 == 0) {
|
|
dest->width = src.width;
|
|
dest->height = src.height;
|
|
} else {
|
|
dest->width = src.height;
|
|
dest->height = src.width;
|
|
}
|
|
|
|
switch (transform) {
|
|
case WL_OUTPUT_TRANSFORM_NORMAL:
|
|
dest->x = src.x;
|
|
dest->y = src.y;
|
|
break;
|
|
case WL_OUTPUT_TRANSFORM_90:
|
|
dest->x = height - src.y - src.height;
|
|
dest->y = src.x;
|
|
break;
|
|
case WL_OUTPUT_TRANSFORM_180:
|
|
dest->x = width - src.x - src.width;
|
|
dest->y = height - src.y - src.height;
|
|
break;
|
|
case WL_OUTPUT_TRANSFORM_270:
|
|
dest->x = src.y;
|
|
dest->y = width - src.x - src.width;
|
|
break;
|
|
case WL_OUTPUT_TRANSFORM_FLIPPED:
|
|
dest->x = width - src.x - src.width;
|
|
dest->y = src.y;
|
|
break;
|
|
case WL_OUTPUT_TRANSFORM_FLIPPED_90:
|
|
dest->x = src.y;
|
|
dest->y = src.x;
|
|
break;
|
|
case WL_OUTPUT_TRANSFORM_FLIPPED_180:
|
|
dest->x = src.x;
|
|
dest->y = height - src.y - src.height;
|
|
break;
|
|
case WL_OUTPUT_TRANSFORM_FLIPPED_270:
|
|
dest->x = height - src.y - src.height;
|
|
dest->y = width - src.x - src.width;
|
|
break;
|
|
}
|
|
}
|
|
|
|
#ifdef WLR_USE_UNSTABLE
|
|
|
|
bool wlr_box_equal(const struct wlr_box *a, const struct wlr_box *b) {
|
|
if (wlr_box_empty(a)) {
|
|
a = NULL;
|
|
}
|
|
if (wlr_box_empty(b)) {
|
|
b = NULL;
|
|
}
|
|
|
|
if (a == NULL || b == NULL) {
|
|
return a == b;
|
|
}
|
|
|
|
return a->x == b->x && a->y == b->y &&
|
|
a->width == b->width && a->height == b->height;
|
|
}
|
|
|
|
bool wlr_fbox_equal(const struct wlr_fbox *a, const struct wlr_fbox *b) {
|
|
if (wlr_fbox_empty(a)) {
|
|
a = NULL;
|
|
}
|
|
if (wlr_fbox_empty(b)) {
|
|
b = NULL;
|
|
}
|
|
|
|
if (a == NULL || b == NULL) {
|
|
return a == b;
|
|
}
|
|
|
|
return a->x == b->x && a->y == b->y &&
|
|
a->width == b->width && a->height == b->height;
|
|
}
|
|
|
|
#endif
|