Changeset 2cc1ec0 in mainline for uspace/lib/gui

Timestamp:

2014-08-27T21:23:01Z (11 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

a9763c6

Parents:

613d644

Message:

Refactor drawing of fonts into multiple layers.

This will need further work to split glyph resolution
process to separate functions in order to support ligatures,
addition of kerning support, separate text layout functions,
etc.

Location:

uspace/lib/gui

Files:

• button.c (modified) (5 diffs)
• button.h (modified) (1 diff)
• label.c (modified) (6 diffs)
• label.h (modified) (1 diff)
• terminal.c (modified) (1 diff)
• window.c (modified) (4 diffs)

uspace/lib/gui/button.c

@@ -38 +38 @@
 #include <drawctx.h>
 #include <surface.h>
+#include <font/embedded.h>
+#include <errno.h>
 #include "common.h"
 #include "window.h"
@@ -76 +78 @@
         sysarg_t cpt_width;
         sysarg_t cpt_height;
-        font_get_box(&btn->font, btn->caption, &cpt_width, &cpt_height);
+        font_get_box(btn->font, btn->caption, &cpt_width, &cpt_height);
         
         if ((widget->width >= cpt_width) && (widget->height >= cpt_height)) {
@@ -83 +85 @@
                 
                 drawctx_set_source(&drawctx, &btn->text);
-                drawctx_set_font(&drawctx, &btn->font);
+                drawctx_set_font(&drawctx, btn->font);
                 
                 if (btn->caption)
@@ -96 +98 @@
         widget_deinit(&btn->widget);
         free(btn->caption);
-        font_release(&btn->font);
+        font_release(btn->font);
 }
 
@@ -171 +173 @@
                 btn->caption = str_dup(caption);
         
-        font_init(&btn->font, FONT_DECODER_EMBEDDED, NULL, points);
+        int rc = embedded_font_create(&btn->font, points);
+        if (rc != EOK) {
+                free(btn->caption);
+                btn->caption = NULL;
+                return false;
+        }
         
         sysarg_t cpt_width;
         sysarg_t cpt_height;
-        font_get_box(&btn->font, btn->caption, &cpt_width, &cpt_height);
+        font_get_box(btn->font, btn->caption, &cpt_width, &cpt_height);
         btn->widget.width_min = cpt_width + 10;
         btn->widget.height_min = cpt_height + 10;

uspace/lib/gui/button.h

@@ -52 +52 @@
         source_t text;
         char *caption;
-        font_t font;
+        font_t *font;
         signal_t clicked;
 } button_t;

uspace/lib/gui/label.c

@@ -38 +38 @@
 #include <drawctx.h>
 #include <surface.h>
+#include <font/embedded.h>
+#include <errno.h>
 #include "window.h"
 #include "label.h"
@@ -58 +60 @@
         sysarg_t cpt_width;
         sysarg_t cpt_height;
-        font_get_box(&lbl->font, lbl->caption, &cpt_width, &cpt_height);
+        font_get_box(lbl->font, lbl->caption, &cpt_width, &cpt_height);
         
         if ((widget->width >= cpt_width) && (widget->height >= cpt_height)) {
@@ -65 +67 @@
                 
                 drawctx_set_source(&drawctx, &lbl->text);
-                drawctx_set_font(&drawctx, &lbl->font);
+                drawctx_set_font(&drawctx, lbl->font);
                 
                 if (lbl->caption)
@@ -84 +86 @@
                 sysarg_t cpt_width;
                 sysarg_t cpt_height;
-                font_get_box(&lbl->font, lbl->caption, &cpt_width, &cpt_height);
+                font_get_box(lbl->font, lbl->caption, &cpt_width, &cpt_height);
                 
                 lbl->widget.width_min = cpt_width + 4;
@@ -99 +101 @@
         widget_deinit(&lbl->widget);
         free(lbl->caption);
-        font_release(&lbl->font);
+        font_release(lbl->font);
 }
 
@@ -161 +163 @@
                 lbl->caption = str_dup(caption);
         
-        font_init(&lbl->font, FONT_DECODER_EMBEDDED, NULL, points);
+        int rc = embedded_font_create(&lbl->font, points);
+        if (rc != EOK) {
+                free(lbl->caption);
+                lbl->caption = NULL;
+                return false;
+        }
         
         sysarg_t cpt_width;
         sysarg_t cpt_height;
-        font_get_box(&lbl->font, lbl->caption, &cpt_width, &cpt_height);
+        font_get_box(lbl->font, lbl->caption, &cpt_width, &cpt_height);
         
         lbl->widget.width_min = cpt_width + 4;

uspace/lib/gui/label.h

@@ -51 +51 @@
         source_t text;
         char *caption;
-        font_t font;
+        font_t *font;
         slot_t rewrite;
 } label_t;

uspace/lib/gui/terminal.c

@@ -186 +186 @@
         //        for full UTF-32 coverage.
         
-        uint16_t glyph = fb_font_glyph(field->ch);
+        uint16_t glyph = fb_font_glyph(field->ch, NULL);
         
         for (unsigned int y = 0; y < FONT_SCANLINES; y++) {

uspace/lib/gui/window.c

@@ -55 +55 @@
 #include <drawctx.h>
 #include <surface.h>
+#include <font/embedded.h>
 
 #include "common.h"
@@ -160 +161 @@
         /* Window caption */
         
-        font_t font;
-        font_init(&font, FONT_DECODER_EMBEDDED, NULL, 16);
-        
-        drawctx_set_font(&drawctx, &font);
+        font_t *font;
+        int rc = embedded_font_create(&font, 16);
+        if (rc != EOK) {
+                window_yield(widget->window);
+                return;
+        }
+        
+        drawctx_set_font(&drawctx, font);
         source_set_color(&source, widget->window->is_focused ?
             color_caption_focus : color_caption_unfocus);
@@ -169 +174 @@
         sysarg_t cpt_width;
         sysarg_t cpt_height;
-        font_get_box(&font, widget->window->caption, &cpt_width, &cpt_height);
+        font_get_box(font, widget->window->caption, &cpt_width, &cpt_height);
         
         bool draw_title =
@@ -183 +188 @@
         }
         
-        font_release(&font);
+        font_release(font);
         window_yield(widget->window);
 }