Changeset 5c27e77 in mainline

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

Files:

• app/fontedit/fontedit.c (modified) (5 diffs)
• app/gfxdemo/gfxdemo.c (modified) (2 diffs)
• dist/data/font/helena.tpf (modified) ( previous)
• lib/gfxfont/include/types/gfx/text.h (modified) (3 diffs)
• lib/gfxfont/include/types/gfx/typeface.h (modified) (2 diffs)
• lib/gfxfont/private/tpf_file.h (modified) (2 diffs)
• lib/gfxfont/src/font.c (modified) (3 diffs)
• lib/gfxfont/src/text.c (modified) (4 diffs)

uspace/app/fontedit/fontedit.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -167 +167 @@
 }
 
+/** Adjust font underline Y0.
+ *
+ * @param fedit Font editor
+ */
+static void font_edit_adjust_underline_y0(font_edit_t *fedit,
+    gfx_coord_t change)
+{
+        gfx_font_metrics_t fmetrics;
+
+        gfx_font_get_metrics(fedit->font, &fmetrics);
+        fmetrics.underline_y0 += change;
+        (void) gfx_font_set_metrics(fedit->font, &fmetrics);
+
+        printf("New underline Y0: %d\n", fmetrics.underline_y0);
+        font_edit_paint(fedit);
+}
+
+/** Adjust font underline Y1.
+ *
+ * @param fedit Font editor
+ */
+static void font_edit_adjust_underline_y1(font_edit_t *fedit,
+    gfx_coord_t change)
+{
+        gfx_font_metrics_t fmetrics;
+
+        gfx_font_get_metrics(fedit->font, &fmetrics);
+        fmetrics.underline_y1 += change;
+        (void) gfx_font_set_metrics(fedit->font, &fmetrics);
+
+        printf("New underline Y1: %d\n", fmetrics.underline_y1);
+        font_edit_paint(fedit);
+}
+
 /** Handle font editor close event.
  *
@@ -314 +348 @@
                 font_edit_adjust_leading(fedit, +1);
                 break;
+        case KC_U:
+                font_edit_adjust_underline_y0(fedit, -1);
+                break;
+        case KC_I:
+                font_edit_adjust_underline_y0(fedit, +1);
+                break;
+        case KC_O:
+                font_edit_adjust_underline_y1(fedit, -1);
+                break;
+        case KC_P:
+                font_edit_adjust_underline_y1(fedit, +1);
+                break;
         case KC_X:
                 (void) gfx_glyph_bmp_clear(fedit->gbmp);
@@ -521 +567 @@
         gfx_color_t *color = NULL;
         gfx_rect_t rect;
+        gfx_rect_t rect2;
         gfx_rect_t grect;
         gfx_font_metrics_t fmetrics;
@@ -564 +611 @@
             fmetrics.leading, &rect);
         rect.p1.x += 100;
+
+        rc = gfx_fill_rect(fedit->gc, &rect);
+        if (rc != EOK)
+                goto error;
+
+        gfx_color_delete(color);
+
+        /* Display underline */
+
+        rc = gfx_color_new_rgb_i16(0x4000, 0x4000, 0, &color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_set_color(fedit->gc, color);
+        if (rc != EOK)
+                goto error;
+
+        font_edit_gpix_to_disp(fedit, 0, fmetrics.underline_y0, &rect);
+        font_edit_gpix_to_disp(fedit, 10, fmetrics.underline_y1, &rect2);
+        rect.p1 = rect2.p0;
 
         rc = gfx_fill_rect(fedit->gc, &rect);

uspace/app/gfxdemo/gfxdemo.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -776 +776 @@
 
                 fmt.color = color;
+                fmt.underline = !fmt.underline;
 
                 pos.x = w / 20;

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;
         }