Changeset 5c27e77 in mainline for uspace/lib

Timestamp:

2022-03-06T22:37:06Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4583015

Parents:

af259da

Message:

Text underlining support

Location:

uspace/lib/gfxfont

Files:

• include/types/gfx/text.h (modified) (3 diffs)
• include/types/gfx/typeface.h (modified) (2 diffs)
• private/tpf_file.h (modified) (2 diffs)
• src/font.c (modified) (3 diffs)
• src/text.c (modified) (4 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -37 +37 @@
 #define _TYPES_GFX_TEXT_H
 
+#include <stdbool.h>
 #include <types/gfx/coord.h>
 #include <types/gfx/color.h>
@@ -74 +75 @@
         /** Vertical alignment */
         gfx_valign_t valign;
+        /** Underline */
+        bool underline;
 } gfx_text_fmt_t;
 

uspace/lib/gfxfont/include/types/gfx/typeface.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -50 +50 @@
         /** Leading */
         gfx_coord_t leading;
+        /** Underline start Y coordinate (inclusive) */
+        gfx_coord_t underline_y0;
+        /** Underline end Y coordinate (exclusive) */
+        gfx_coord_t underline_y1;
 } gfx_font_metrics_t;
 

uspace/lib/gfxfont/private/tpf_file.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -76 +76 @@
         uint16_t descent;
         uint16_t leading;
+        int16_t underline_y0;
+        int16_t underline_y1;
 } tpf_font_metrics_t;
 

uspace/lib/gfxfont/src/font.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -546 +546 @@
         metrics->descent = uint16_t_le2host(tmetrics.descent);
         metrics->leading = uint16_t_le2host(tmetrics.leading);
+        metrics->underline_y0 = uint16_t_le2host(tmetrics.underline_y0);
+        metrics->underline_y1 = uint16_t_le2host(tmetrics.underline_y1);
         return EOK;
 }
@@ -565 +567 @@
         tmetrics.descent = host2uint16_t_le(metrics->descent);
         tmetrics.leading = host2uint16_t_le(metrics->leading);
+        tmetrics.underline_y0 = host2uint16_t_le(metrics->underline_y0);
+        tmetrics.underline_y1 = host2uint16_t_le(metrics->underline_y1);
 
         rc = riff_wchunk_start(riffw, CKID_fmtr, &mtrck);

uspace/lib/gfxfont/src/text.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -229 +229 @@
 {
         gfx_glyph_metrics_t gmetrics;
+        gfx_font_metrics_t fmetrics;
         size_t stradv;
         const char *cp;
         gfx_glyph_t *glyph;
         gfx_coord2_t cpos;
+        gfx_coord2_t spos;
+        gfx_rect_t rect;
         errno_t rc;
 
-        gfx_text_start_pos(font, pos, fmt, str, &cpos);
+        gfx_text_start_pos(font, pos, fmt, str, &spos);
 
         /* Text mode */
         if ((font->finfo->props.flags & gff_text_mode) != 0)
-                return gfx_puttext_textmode(font, &cpos, fmt->color, str);
+                return gfx_puttext_textmode(font, &spos, fmt->color, str);
 
         rc = gfx_set_color(font->typeface->gc, fmt->color);
@@ -245 +248 @@
                 return rc;
 
+        cpos = spos;
         cp = str;
         while (*cp != '\0') {
@@ -261 +265 @@
                 cp += stradv;
                 cpos.x += gmetrics.advance;
+        }
+
+        /* Text underlining */
+        if (fmt->underline) {
+                gfx_font_get_metrics(font, &fmetrics);
+
+                rect.p0.x = spos.x;
+                rect.p0.y = spos.y + fmetrics.underline_y0;
+                rect.p1.x = cpos.x;
+                rect.p1.y = spos.y + fmetrics.underline_y1;
+
+                rc = gfx_fill_rect(font->typeface->gc, &rect);
+                if (rc != EOK)
+                        return rc;
         }