Changeset 6301a24f in mainline for uspace/lib/gfx

Timestamp:

2020-06-05T20:20:06Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8aef01c

Parents:

d70e7b7b

Message:

Window previews need to be drawn as part of ds_display_paint

Location:

uspace/lib/gfx

Files:

• include/gfx/coord.h (modified) (1 diff)
• src/coord.c (modified) (4 diffs)
• test/coord.c (modified) (3 diffs)

uspace/lib/gfx/include/gfx/coord.h

@@ -54 +54 @@
 extern void gfx_rect_dims(gfx_rect_t *, gfx_coord2_t *);
 extern bool gfx_rect_is_empty(gfx_rect_t *);
+extern bool gfx_rect_is_incident(gfx_rect_t *, gfx_rect_t *);
 extern bool gfx_pix_inside_rect(gfx_coord2_t *, gfx_rect_t *);
 

uspace/lib/gfx/src/coord.c

@@ -37 +37 @@
 #include <macros.h>
 #include <stdbool.h>
+#include <stddef.h>
 
 /** Add two vectors.
@@ -192 +193 @@
  * If the two rectangles do not intersect, the result will be an empty
  * rectangle (check with gfx_rect_is_empty()). The resulting rectangle
- * is always sorted.
+ * is always sorted. If @a clip is NULL, no clipping is performed.
  *
  * @param rect Source rectangle
- * @param clip Clipping rectangle
+ * @param clip Clipping rectangle or @c NULL
  * @param dest Place to store clipped rectangle
  */
@@ -201 +202 @@
 {
         gfx_rect_t srect, sclip;
+
+        if (clip == NULL) {
+                *dest = *rect;
+                return;
+        }
 
         gfx_rect_points_sort(rect, &srect);
@@ -235 +241 @@
 }
 
+/** Determine if two rectangles share any pixels
+ *
+ * @param a First rectangle
+ * @param b Second rectangle
+ * @return @c true iff rectangles share any pixels
+ */
+bool gfx_rect_is_incident(gfx_rect_t *a, gfx_rect_t *b)
+{
+        gfx_rect_t r;
+
+        gfx_rect_clip(a, b, &r);
+        return !gfx_rect_is_empty(&r);
+}
+
 /** Get rectangle dimensions.
  *

uspace/lib/gfx/test/coord.c

@@ -560 +560 @@
 }
 
+/** Clip rectangle with no clipping rectangle */
+PCUT_TEST(rect_clip_rect_noclip)
+{
+        gfx_rect_t rect;
+        gfx_rect_t dest;
+
+        rect.p0.x = 1;
+        rect.p0.y = 2;
+        rect.p1.x = 3;
+        rect.p1.y = 4;
+
+        gfx_rect_clip(&rect, NULL, &dest);
+        PCUT_ASSERT_INT_EQUALS(rect.p0.x, dest.p0.x);
+        PCUT_ASSERT_INT_EQUALS(rect.p0.y, dest.p0.y);
+        PCUT_ASSERT_INT_EQUALS(rect.p1.x, dest.p1.x);
+        PCUT_ASSERT_INT_EQUALS(rect.p1.y, dest.p1.y);
+}
+
 /** Sort span points that are already sorted should produde indentical points */
 PCUT_TEST(rect_points_sort_sorted)
@@ -638 +656 @@
 }
 
-/** gfx_rect_is_empty for staright non-empty rectangle returns false */
+/** gfx_rect_is_empty for straight non-empty rectangle returns false */
 PCUT_TEST(rect_is_empty_neg)
 {
@@ -662 +680 @@
 }
 
+/** gfx_rect_is_incident for neighboring rectangles returns false */
+PCUT_TEST(rect_is_incident_neighbor)
+{
+        gfx_rect_t a;
+        gfx_rect_t b;
+
+        a.p0.x = 1;
+        a.p0.y = 2;
+        a.p1.x = 3;
+        a.p1.y = 4;
+
+        b.p0.x = 3;
+        b.p0.y = 2;
+        b.p1.x = 5;
+        b.p1.y = 6;
+
+        PCUT_ASSERT_FALSE(gfx_rect_is_incident(&a, &b));
+}
+
+/** gfx_rect_is_incident for a inside b returns true */
+PCUT_TEST(rect_is_incident_a_inside_b)
+{
+        gfx_rect_t a;
+        gfx_rect_t b;
+
+        a.p0.x = 2;
+        a.p0.y = 3;
+        a.p1.x = 4;
+        a.p1.y = 5;
+
+        b.p0.x = 1;
+        b.p0.y = 2;
+        b.p1.x = 5;
+        b.p1.y = 6;
+
+        PCUT_ASSERT_TRUE(gfx_rect_is_incident(&a, &b));
+}
+
+/** gfx_rect_is_incident for b inside a returns true */
+PCUT_TEST(rect_is_incident_b_inside_a)
+{
+        gfx_rect_t a;
+        gfx_rect_t b;
+
+        a.p0.x = 1;
+        a.p0.y = 2;
+        a.p1.x = 5;
+        a.p1.y = 6;
+
+        b.p0.x = 2;
+        b.p0.y = 3;
+        b.p1.x = 4;
+        b.p1.y = 5;
+
+        PCUT_ASSERT_TRUE(gfx_rect_is_incident(&a, &b));
+}
+
+/** gfx_rect_is_incident for a and b sharing corner returns true */
+PCUT_TEST(rect_is_incident_corner)
+{
+        gfx_rect_t a;
+        gfx_rect_t b;
+
+        a.p0.x = 1;
+        a.p0.y = 2;
+        a.p1.x = 3;
+        a.p1.y = 4;
+
+        b.p0.x = 2;
+        b.p0.y = 3;
+        b.p1.x = 4;
+        b.p1.y = 5;
+
+        PCUT_ASSERT_TRUE(gfx_rect_is_incident(&a, &b));
+}
+
+/** gfx_rect_is_incident for a == b returns true */
+PCUT_TEST(rect_is_incident_same)
+{
+        gfx_rect_t a;
+        gfx_rect_t b;
+
+        a.p0.x = 1;
+        a.p0.y = 2;
+        a.p1.x = 3;
+        a.p1.y = 4;
+
+        b.p0.x = 1;
+        b.p0.y = 2;
+        b.p1.x = 3;
+        b.p1.y = 4;
+
+        PCUT_ASSERT_TRUE(gfx_rect_is_incident(&a, &b));
+}
+
 /** gfx_pix_inside_rect for  */
 PCUT_TEST(pix_inside_rect)