nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-21 22:52:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

util/box: always treat NULL boxes as empty

Browse Source
This commit is contained in:
Kirill Primak 2023-05-23 21:08:22 +03:00
parent 5d67bbde86
commit 5f4a35290d
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/wlr/util/box.h
View File

@ -40,6 +40,11 @@ struct wlr_fbox {
double width, height; double width, height;
}; };
/**
* Functions below accept NULL where a box is expected, which is treated
* the same as an empty box.
*/
/** /**
* Finds the closest point within the box bounds. * Finds the closest point within the box bounds.
* *

12
util/box.c
View File

@ -8,7 +8,7 @@
void wlr_box_closest_point(const struct wlr_box *box, double x, double y, void wlr_box_closest_point(const struct wlr_box *box, double x, double y,
double *dest_x, double *dest_y) { double *dest_x, double *dest_y) {
// if box is empty, then it contains no points, so no closest point either // if box is empty, then it contains no points, so no closest point either
if (box->width <= 0 || box->height <= 0) { if (wlr_box_empty(box)) {
*dest_x = NAN; *dest_x = NAN;
*dest_y = NAN; *dest_y = NAN;
return; return;
@ -71,6 +71,11 @@ bool wlr_box_contains_point(const struct wlr_box *box, double x, double y) {
void wlr_box_transform(struct wlr_box *dest, const struct wlr_box *box, void wlr_box_transform(struct wlr_box *dest, const struct wlr_box *box,
enum wl_output_transform transform, int width, int height) { enum wl_output_transform transform, int width, int height) {
if (wlr_box_empty(box)) {
*dest = (struct wlr_box){0};
return;
}
struct wlr_box src = *box; struct wlr_box src = *box;
if (transform % 2 == 0) { if (transform % 2 == 0) {
@ -123,6 +128,11 @@ bool wlr_fbox_empty(const struct wlr_fbox *box) {
void wlr_fbox_transform(struct wlr_fbox *dest, const struct wlr_fbox *box, void wlr_fbox_transform(struct wlr_fbox *dest, const struct wlr_fbox *box,
enum wl_output_transform transform, double width, double height) { enum wl_output_transform transform, double width, double height) {
if (wlr_fbox_empty(box)) {
*dest = (struct wlr_fbox){0};
return;
}
struct wlr_fbox src = *box; struct wlr_fbox src = *box;
if (transform % 2 == 0) { if (transform % 2 == 0) {