Changeset 9c7dc8e in mainline for uspace/lib/ui/src

Timestamp:

2021-03-01T10:50:25Z (4 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.

Location:

uspace/lib/ui/src

Files:

• entry.c (modified) (5 diffs)
• resource.c (modified) (3 diffs)
• ui.c (modified) (1 diff)
• window.c (modified) (2 diffs)

uspace/lib/ui/src/entry.c

@@ -46 +46 @@
 #include <ui/paint.h>
 #include <ui/entry.h>
+#include <ui/ui.h>
 #include "../private/entry.h"
 #include "../private/resource.h"
@@ -55 +56 @@
 enum {
         ui_entry_hpad = 4,
-        ui_entry_vpad = 4
+        ui_entry_vpad = 4,
+        ui_entry_hpad_text = 1,
+        ui_entry_vpad_text = 0
 };
 
@@ -173 +176 @@
         gfx_text_fmt_t fmt;
         gfx_coord2_t pos;
+        gfx_coord_t hpad;
+        gfx_coord_t vpad;
         gfx_rect_t inside;
         errno_t rc;
+
+        if (entry->res->textmode) {
+                hpad = ui_entry_hpad_text;
+                vpad = ui_entry_vpad_text;
+        } else {
+                hpad = ui_entry_hpad;
+                vpad = ui_entry_vpad;
+        }
 
         /* Paint inset frame */
@@ -195 +208 @@
         case gfx_halign_left:
         case gfx_halign_justify:
-                pos.x = inside.p0.x + ui_entry_hpad;
+                pos.x = inside.p0.x + hpad;
                 break;
         case gfx_halign_center:
@@ -201 +214 @@
                 break;
         case gfx_halign_right:
-                pos.x = inside.p1.x - ui_entry_hpad;
+                pos.x = inside.p1.x - hpad;
                 break;
         }
 
-        pos.y = inside.p0.y + ui_entry_vpad;
+        pos.y = inside.p0.y + vpad;
 
         gfx_text_fmt_init(&fmt);

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;

uspace/lib/ui/src/ui.c

@@ -254 +254 @@
 }
 
+/** Determine if we are running in text mode.
+ *
+ * @param ui User interface
+ * @return @c true iff we are running in text mode
+ */
+bool ui_is_textmode(ui_t *ui)
+{
+        /*
+         * XXX Currently console is always text and display is always
+         * graphics, but this need not always be true.
+         */
+        return (ui->console != NULL);
+}
+
 /** @}
  */

uspace/lib/ui/src/window.c

@@ -47 +47 @@
 #include <ui/control.h>
 #include <ui/resource.h>
+#include <ui/ui.h>
 #include <ui/wdecor.h>
 #include <ui/window.h>
@@ -255 +256 @@
         window->gc = gc;
 #endif
-        rc = ui_resource_create(window->gc, &res);
+        rc = ui_resource_create(window->gc, ui_is_textmode(ui), &res);
         if (rc != EOK)
                 goto error;