Changeset 9eb8d12 in mainline for uspace/lib/gfxfont

Timestamp:

2021-07-19T22:35:19Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c9722c1

Parents:

ead72f2

Message:

Entry text selection (using keyboard)

Text can be selected with movement keys while holding down Shift.
Selection can be deleted by pressing Backspace, Delete or typing
in replacement text.

Location:

uspace/lib/gfxfont

Files:

• include/gfx/text.h (modified) (1 diff)
• src/text.c (modified) (2 diffs)
• test/text.c (modified) (1 diff)

uspace/lib/gfxfont/include/gfx/text.h

@@ -50 +50 @@
 extern size_t gfx_text_find_pos(gfx_font_t *, gfx_coord2_t *, gfx_text_fmt_t *,
     const char *, gfx_coord2_t *);
+extern void gfx_text_cont(gfx_font_t *, gfx_coord2_t *, gfx_text_fmt_t *,
+    const char *, gfx_coord2_t *, gfx_text_fmt_t *);
+extern void gfx_text_rect(gfx_font_t *, gfx_coord2_t *, gfx_text_fmt_t *,
+    const char *, gfx_rect_t *);
 
 #endif

uspace/lib/gfxfont/src/text.c

@@ -174 +174 @@
  * @param str String
  * @param spos Place to store starting position
- * @return EOK on success or an error code
  */
 void gfx_text_start_pos(gfx_font_t *font, gfx_coord2_t *pos,
@@ -333 +332 @@
 }
 
+/** Get text continuation parameters.
+ *
+ * Return the anchor position and format needed to continue printing
+ * text after the specified string. It is allowed for the sources
+ * (@a pos, @a fmt) and destinations (@a cpos, @a cfmt) to point
+ * to the same objects, respectively.
+ *
+ * @param font Font
+ * @param pos Anchor position
+ * @param fmt Text formatting
+ * @param str String
+ * @param cpos Place to store anchor position for continuation
+ * @param cfmt Place to store format for continuation
+ */
+void gfx_text_cont(gfx_font_t *font, gfx_coord2_t *pos,
+    gfx_text_fmt_t *fmt, const char *str, gfx_coord2_t *cpos,
+    gfx_text_fmt_t *cfmt)
+{
+        gfx_coord2_t spos;
+        gfx_text_fmt_t tfmt;
+
+        /* Continuation should start where the current string ends */
+        gfx_text_start_pos(font, pos, fmt, str, &spos);
+        cpos->x = spos.x + gfx_text_width(font, str);
+        cpos->y = spos.y;
+
+        /*
+         * Formatting is the same, except the text should be aligned
+         * so that it starts at the anchor point.
+         */
+        tfmt = *fmt;
+        tfmt.halign = gfx_halign_left;
+        tfmt.valign = gfx_valign_baseline;
+
+        *cfmt = tfmt;
+}
+
+/** Get text bounding rectangle.
+ *
+ * @param font Font
+ * @param pos Anchor position
+ * @param fmt Text formatting
+ * @param str String
+ * @param rect Place to store bounding rectangle
+ */
+void gfx_text_rect(gfx_font_t *font, gfx_coord2_t *pos,
+    gfx_text_fmt_t *fmt, const char *str, gfx_rect_t *rect)
+{
+        gfx_coord2_t spos;
+
+        gfx_text_start_pos(font, pos, fmt, str, &spos);
+
+        rect->p0.x = spos.x;
+        rect->p0.y = spos.y - font->metrics.ascent;
+        rect->p1.x = spos.x + gfx_text_width(font, str);
+        rect->p1.y = spos.y + font->metrics.descent + 1;
+}
+
 /** @}
  */

uspace/lib/gfxfont/test/text.c

@@ -356 +356 @@
 }
 
+/** gfx_text_cont() produces correct continuation parameters */
+PCUT_TEST(text_cont)
+{
+        gfx_typeface_t *tface;
+        gfx_font_t *font;
+        gfx_context_t *gc;
+        gfx_color_t *color;
+        test_gc_t tgc;
+        gfx_text_fmt_t fmt;
+        gfx_coord2_t anchor;
+        gfx_coord2_t cpos;
+        gfx_text_fmt_t cfmt;
+        errno_t rc;
+
+        rc = gfx_context_new(&test_ops, (void *)&tgc, &gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = gfx_typeface_create(gc, &tface);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = gfx_font_create_textmode(tface, &font);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = gfx_color_new_rgb_i16(0, 0, 0, &color);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        anchor.x = 10;
+        anchor.y = 20;
+        gfx_text_fmt_init(&fmt);
+        fmt.color = color;
+
+        gfx_text_cont(font, &anchor, &fmt, "Abc", &cpos, &cfmt);
+
+        PCUT_ASSERT_INT_EQUALS(13, cpos.x);
+        PCUT_ASSERT_INT_EQUALS(20, cpos.y);
+        PCUT_ASSERT_EQUALS(fmt.color, cfmt.color);
+        PCUT_ASSERT_EQUALS(gfx_halign_left, cfmt.halign);
+        PCUT_ASSERT_EQUALS(gfx_valign_baseline, cfmt.valign);
+
+        gfx_font_close(font);
+        gfx_typeface_destroy(tface);
+        gfx_color_delete(color);
+
+        rc = gfx_context_delete(gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
+/** gfx_text_rect() computes bounding rectangle */
+PCUT_TEST(text_rect)
+{
+        gfx_typeface_t *tface;
+        gfx_font_t *font;
+        gfx_context_t *gc;
+        gfx_color_t *color;
+        test_gc_t tgc;
+        gfx_text_fmt_t fmt;
+        gfx_coord2_t anchor;
+        gfx_rect_t rect;
+        errno_t rc;
+
+        rc = gfx_context_new(&test_ops, (void *)&tgc, &gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = gfx_typeface_create(gc, &tface);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = gfx_font_create_textmode(tface, &font);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = gfx_color_new_rgb_i16(0, 0, 0, &color);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        anchor.x = 10;
+        anchor.y = 20;
+        gfx_text_fmt_init(&fmt);
+        fmt.color = color;
+
+        gfx_text_rect(font, &anchor, &fmt, "Abc", &rect);
+
+        PCUT_ASSERT_INT_EQUALS(10, rect.p0.x);
+        PCUT_ASSERT_INT_EQUALS(20, rect.p0.y);
+        PCUT_ASSERT_INT_EQUALS(13, rect.p1.x);
+        PCUT_ASSERT_INT_EQUALS(21, rect.p1.y);
+
+        gfx_font_close(font);
+        gfx_typeface_destroy(tface);
+        gfx_color_delete(color);
+
+        rc = gfx_context_delete(gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
 static errno_t testgc_set_clip_rect(void *arg, gfx_rect_t *rect)
 {