Changeset afcf704 in mainline for uspace/lib/gfx

Timestamp:

2020-06-14T22:23:34Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c45d8696

Parents:

28f8f6f2

Message:

Allow GUI direct access to window buffer

Location:

uspace/lib/gfx

Files:

• include/gfx/coord.h (modified) (1 diff)
• include/types/gfx/bitmap.h (modified) (1 diff)
• src/coord.c (modified) (1 diff)
• test/coord.c (modified) (1 diff)

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

@@ -55 +55 @@
 extern bool gfx_rect_is_empty(gfx_rect_t *);
 extern bool gfx_rect_is_incident(gfx_rect_t *, gfx_rect_t *);
+extern bool gfx_rect_is_inside(gfx_rect_t *, gfx_rect_t *);
 extern bool gfx_pix_inside_rect(gfx_coord2_t *, gfx_rect_t *);
 

uspace/lib/gfx/include/types/gfx/bitmap.h

@@ -48 +48 @@
 typedef enum {
         /** Enable color key */
-        bmpf_color_key = 0x1
+        bmpf_color_key = 0x1,
+        /** Directly map GC output into this bitmap */
+        bmpf_direct_output = 0x2
 } gfx_bitmap_flags_t;
 

uspace/lib/gfx/src/coord.c

@@ -255 +255 @@
 }
 
+/** Return true if rectangle @a a is contained in rectangle @a b.
+ *
+ * @param a Inside rectangle
+ * @param b Outside rectangle
+ * @return @c true iff @a a is (non-strictly) inside @a b
+ */
+bool gfx_rect_is_inside(gfx_rect_t *a, gfx_rect_t *b)
+{
+        gfx_rect_t sa;
+        gfx_rect_t sb;
+
+        gfx_rect_points_sort(a, &sa);
+        gfx_rect_points_sort(b, &sb);
+
+        if (sa.p0.x < sb.p0.x || sa.p0.y < sb.p0.y)
+                return false;
+
+        if (sa.p1.x > sb.p1.x || sa.p1.y > sb.p1.y)
+                return false;
+
+        return true;
+}
+
 /** Get rectangle dimensions.
  *

uspace/lib/gfx/test/coord.c

@@ -775 +775 @@
 }
 
+/** gfx_rect_is_inside is true for rectangle strictly inside */
+PCUT_TEST(rect_is_inside_strict)
+{
+        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_inside(&a, &b));
+}
+
+/** gfx_rect_is_inside is true for two equal rectangles */
+PCUT_TEST(rect_is_inside_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_inside(&a, &b));
+}
+
+/** gfx_rect_is_inside is false for @c a.p0 outside */
+PCUT_TEST(rect_is_inside_p0_outside)
+{
+        gfx_rect_t a;
+        gfx_rect_t b;
+
+        a.p0.x = 0;
+        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_FALSE(gfx_rect_is_inside(&a, &b));
+
+        a.p0.x = 1;
+        a.p0.y = 1;
+        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_FALSE(gfx_rect_is_inside(&a, &b));
+}
+
+/** gfx_rect_is_inside is false for @c a.p1 outside */
+PCUT_TEST(rect_is_inside_p1_outside)
+{
+        gfx_rect_t a;
+        gfx_rect_t b;
+
+        a.p0.x = 1;
+        a.p0.y = 2;
+        a.p1.x = 4;
+        a.p1.y = 4;
+
+        b.p0.x = 1;
+        b.p0.y = 2;
+        b.p1.x = 3;
+        b.p1.y = 4;
+
+        PCUT_ASSERT_FALSE(gfx_rect_is_inside(&a, &b));
+
+        a.p0.x = 1;
+        a.p0.y = 2;
+        a.p1.x = 3;
+        a.p1.y = 5;
+
+        b.p0.x = 1;
+        b.p0.y = 2;
+        b.p1.x = 3;
+        b.p1.y = 4;
+
+        PCUT_ASSERT_FALSE(gfx_rect_is_inside(&a, &b));
+}
+
 /** gfx_pix_inside_rect for  */
 PCUT_TEST(pix_inside_rect)