mirrors/looking-glass
2
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-12-22 22:01:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[common] rects: cosmetics

Browse source
This commit is contained in:
Geoffrey McRae 2021-10-24 21:26:14 +11:00
parent bc7cbf1173
commit f69b869282
1 changed files with 56 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
common/src/rects.c
View file

@ -38,6 +38,26 @@ struct Edge
int delta; int delta;
}; };
inline static bool rectIntersects(const FrameDamageRect * r1,
const FrameDamageRect * r2)
{
return !(
r1->x > r2->x + r2->width ||
r2->x > r1->x + r1->width ||
r1->y > r2->y + r2->height ||
r2->y > r1->y + r1->height);
}
inline static bool rectContains(const FrameDamageRect * r1,
const FrameDamageRect * r2)
{
return !(
r2->x < r1->x ||
r2->x + r2->width > r1->x + r1->width ||
r2->y < r1->y ||
r2->y + r2->height > r1->y + r1->height);
}
static int cornerCompare(const void * a_, const void * b_) static int cornerCompare(const void * a_, const void * b_)
{ {
const struct Corner * a = a_; const struct Corner * a = a_;
@ -201,15 +221,6 @@ void rectsFramebufferToBuffer(FrameDamageRect * rects, int count,
framebuffer_get_buffer(frame), srcStride, &data, fbRowStart, NULL); framebuffer_get_buffer(frame), srcStride, &data, fbRowStart, NULL);
} }
inline static bool rectIntersects(const FrameDamageRect * r1, const FrameDamageRect * r2)
{
return !(
r1->x > r2->x + r2->width ||
r2->x > r1->x + r1->width ||
r1->y > r2->y + r2->height ||
r2->y > r1->y + r1->height);
}
int rectsMergeOverlapping(FrameDamageRect * rects, int count) int rectsMergeOverlapping(FrameDamageRect * rects, int count)
{ {
if (count == 0) if (count == 0)
@ -224,19 +235,28 @@ int rectsMergeOverlapping(FrameDamageRect * rects, int count)
{ {
changed = false; changed = false;
for (int i = 0; i < count; ++i) for (int i = 0; i < count; ++i)
if (!removed[i]) {
for (int j = i + 1; j < count; ++j) if (removed[i])
if (!removed[j] && rectIntersects(rects + i, rects + j)) continue;
{
uint32_t x2 = max(rects[i].x + rects[i].width, rects[j].x + rects[j].width); for (int j = i + 1; j < count; ++j)
uint32_t y2 = max(rects[i].y + rects[i].height, rects[j].y + rects[j].height); {
rects[i].x = min(rects[i].x, rects[j].x); if (removed[j] || !rectIntersects(rects + i, rects + j))
rects[i].y = min(rects[i].y, rects[j].y); continue;
rects[i].width = x2 - rects[i].x;
rects[i].height = y2 - rects[i].y; rects[i].x = min(rects[i].x, rects[j].x);
removed[j] = true; rects[i].y = min(rects[i].y, rects[j].y);
changed = true;
} rects[i].width = max(rects[i].x + rects[i].width,
rects[j].x + rects[j].width) - rects[i].x;
rects[i].height = max(rects[i].y + rects[i].height,
rects[j].y + rects[j].height) - rects[i].y;
removed[j] = true;
changed = true;
}
}
} }
while (changed); while (changed);
@ -244,15 +264,8 @@ int rectsMergeOverlapping(FrameDamageRect * rects, int count)
for (int i = 0; i < count; ++i) for (int i = 0; i < count; ++i)
if (!removed[i]) if (!removed[i])
rects[o++] = rects[i]; rects[o++] = rects[i];
return o;
}
inline static bool rectContains(const FrameDamageRect * r1, const FrameDamageRect * r2) return o;
{
return r1->x <= r2->x &&
r1->y <= r2->y &&
r1->x + r1->width >= r2->x + r2->width &&
r1->y + r1->height >= r2->y + r2->height;
} }
int rectsRejectContained(FrameDamageRect * rects, int count) int rectsRejectContained(FrameDamageRect * rects, int count)
@ -261,14 +274,23 @@ int rectsRejectContained(FrameDamageRect * rects, int count)
memset(removed, 0, sizeof(removed)); memset(removed, 0, sizeof(removed));
for (int i = 0; i < count; ++i) for (int i = 0; i < count; ++i)
if (!removed[i]) {
for (int j = 0; j < count; ++j) if (removed[i])
if (!removed[j] && j != i && rectContains(rects + i, rects + j)) continue;
removed[j] = true;
for (int j = 0; j < count; ++j)
{
if (j == i || removed[j])
continue;
removed[j] = rectContains(rects + i, rects + j);
}
}
int o = 0; int o = 0;
for (int i = 0; i < count; ++i) for (int i = 0; i < count; ++i)
if (!removed[i]) if (!removed[i])
rects[o++] = rects[i]; rects[o++] = rects[i];
return o; return o;
} }