From daf4334697145f771c5085fb183e64dc65a967bd Mon Sep 17 00:00:00 2001 From: Niklas Haas Date: Wed, 29 Apr 2015 13:51:56 +0200 Subject: x11: query ICC profile based on center of window Right now, the default behavior is to pick the numerically lowest screen ID that overlaps the window in any way - but this means that mpv will decide to pick an ICC profile in a pretty arbitrary way even if the window only overlaps another screen by a single pixel. The new behavior is to query it based on the center of the window instead. --- common/common.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'common/common.c') diff --git a/common/common.c b/common/common.c index 15be4d1b0a..d3dcb6171f 100644 --- a/common/common.c +++ b/common/common.c @@ -95,6 +95,12 @@ void mp_rect_union(struct mp_rect *rc, const struct mp_rect *rc2) rc->y1 = FFMAX(rc->y1, rc2->y1); } +// Returns whether or not a point is contained by rc +bool mp_rect_contains(struct mp_rect *rc, int x, int y) +{ + return rc->x0 <= x && x < rc->x1 && rc->y0 <= y && y < rc->y1; +} + // Set rc to the intersection of rc and src. // Return false if the result is empty. bool mp_rect_intersection(struct mp_rect *rc, const struct mp_rect *rc2) -- cgit v1.2.3