Changeset e1f2079 in mainline for uspace/lib/gfx

Timestamp:

2020-02-14T19:54:40Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b0a94854

Parents:

b252e87

Message:

Get display resolution by querying display device

Location:

uspace/lib/gfx

Files:

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

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

@@ -42 +42 @@
 extern void gfx_coord2_add(gfx_coord2_t *, gfx_coord2_t *, gfx_coord2_t *);
 extern void gfx_coord2_subtract(gfx_coord2_t *, gfx_coord2_t *, gfx_coord2_t *);
+extern void gfx_coord2_clip(gfx_coord2_t *, gfx_rect_t *, gfx_coord2_t *);
 extern void gfx_span_points_sort(gfx_coord_t, gfx_coord_t, gfx_coord_t *,
     gfx_coord_t *);

uspace/lib/gfx/src/coord.c

@@ -62 +62 @@
 }
 
+void gfx_coord2_clip(gfx_coord2_t *a, gfx_rect_t *clip, gfx_coord2_t *d)
+{
+        gfx_rect_t sclip;
+        gfx_coord2_t t;
+
+        gfx_rect_points_sort(clip, &sclip);
+
+        t.x = min(a->x, clip->p1.x - 1);
+        t.y = min(a->y, clip->p1.y - 1);
+
+        d->x = max(clip->p0.x, t.x);
+        d->y = max(clip->p0.y, t.y);
+}
+
 /** Sort points of a span.
  *

uspace/lib/gfx/test/coord.c

@@ -68 +68 @@
 }
 
+/** gfx_coord2_clip with point to lower-left of clipping rectangle */
+PCUT_TEST(coord2_clip_ll)
+{
+        gfx_coord2_t p;
+        gfx_coord2_t cp;
+        gfx_rect_t rect;
+
+        p.x = 1;
+        p.y = 2;
+
+        rect.p0.x = 3;
+        rect.p0.y = 4;
+        rect.p1.x = 5;
+        rect.p1.y = 6;
+
+        gfx_coord2_clip(&p, &rect, &cp);
+
+        PCUT_ASSERT_INT_EQUALS(3, cp.x);
+        PCUT_ASSERT_INT_EQUALS(4, cp.y);
+}
+
+/** gfx_coord2_clip with point inside the clipping rectangle */
+PCUT_TEST(coord2_clip_mm)
+{
+        gfx_coord2_t p;
+        gfx_coord2_t cp;
+        gfx_rect_t rect;
+
+        p.x = 2;
+        p.y = 3;
+
+        rect.p0.x = 1;
+        rect.p0.y = 2;
+        rect.p1.x = 3;
+        rect.p1.y = 4;
+
+        gfx_coord2_clip(&p, &rect, &cp);
+
+        PCUT_ASSERT_INT_EQUALS(2, cp.x);
+        PCUT_ASSERT_INT_EQUALS(3, cp.y);
+}
+
+/** gfx_coord2_clip with point to upper-right of clipping rectangle */
+PCUT_TEST(coord2_clip_hh)
+{
+        gfx_coord2_t p;
+        gfx_coord2_t cp;
+        gfx_rect_t rect;
+
+        p.x = 5;
+        p.y = 6;
+
+        rect.p0.x = 1;
+        rect.p0.y = 2;
+        rect.p1.x = 3;
+        rect.p1.y = 4;
+
+        gfx_coord2_clip(&p, &rect, &cp);
+
+        PCUT_ASSERT_INT_EQUALS(2, cp.x);
+        PCUT_ASSERT_INT_EQUALS(3, cp.y);
+}
+
 /** gfx_rect_translate should translate rectangle */
 PCUT_TEST(rect_translate)