Changeset 9c7dc8e in mainline for uspace/lib/ui/src/resource.c

Timestamp:

2021-03-01T10:50:25Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

cd74fa8

Parents:

77ffa01

git-author:

Jiri Svoboda <jiri@…> (2021-02-28 10:50:05)

git-committer:

Jiri Svoboda <jiri@…> (2021-03-01 10:50:25)

Message:

Print text as text in textmode UI. Make calculator smaller in text mode.

File:

• uspace/lib/ui/src/resource.c (modified) (3 diffs)

uspace/lib/ui/src/resource.c

@@ -50 +50 @@
  *
  * @param gc Graphic context
+ * @param textmode @c true if running in text mode
  * @param rresource Place to store pointer to new UI resource
  * @return EOK on success, ENOMEM if out of memory
  */
-errno_t ui_resource_create(gfx_context_t *gc, ui_resource_t **rresource)
+errno_t ui_resource_create(gfx_context_t *gc, bool textmode,
+    ui_resource_t **rresource)
 {
         ui_resource_t *resource;
@@ -83 +85 @@
                 return ENOMEM;
 
-        rc = gfx_typeface_open(gc, ui_typeface_path, &tface);
-        if (rc != EOK)
-                goto error;
-
-        finfo = gfx_typeface_first_font(tface);
-        if (finfo == NULL) {
-                rc = EIO;
-                goto error;
+        if (textmode) {
+                /* Create dummy font for text mode */
+                rc = gfx_typeface_create(gc, &tface);
+                if (rc != EOK)
+                        goto error;
+
+                rc = gfx_font_create_textmode(tface, &font);
+                if (rc != EOK)
+                        goto error;
+        } else {
+                rc = gfx_typeface_open(gc, ui_typeface_path, &tface);
+                if (rc != EOK)
+                        goto error;
+
+                finfo = gfx_typeface_first_font(tface);
+                if (finfo == NULL) {
+                        rc = EIO;
+                        goto error;
+                }
+
+                rc = gfx_font_open(finfo, &font);
+                if (rc != EOK)
+                        goto error;
         }
-
-        rc = gfx_font_open(finfo, &font);
-        if (rc != EOK)
-                goto error;
 
         rc = gfx_color_new_rgb_i16(0, 0, 0, &btn_frame_color);
@@ -177 +190 @@
         resource->tface = tface;
         resource->font = font;
+        resource->textmode = textmode;
 
         resource->btn_frame_color = btn_frame_color;