Changeset 03145ee in mainline

Timestamp:

2020-11-10T09:00:48Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d942ca4

Parents:

0d71fd6

git-author:

Jiri Svoboda <jiri@…> (2020-11-09 20:00:37)

git-committer:

Jiri Svoboda <jiri@…> (2020-11-10 09:00:48)

Message:

Add UI text entry (read-only)

We use the read-only text entry to display calculator output.

Location:

uspace

Files:

• app/calculator/calculator.c (modified) (5 diffs)
• lib/ui/include/types/ui/entry.h (added)
• lib/ui/include/ui/entry.h (added)
• lib/ui/meson.build (modified) (2 diffs)
• lib/ui/private/entry.h (added)
• lib/ui/private/resource.h (modified) (1 diff)
• lib/ui/src/entry.c (added)
• lib/ui/src/resource.c (modified) (5 diffs)
• lib/ui/test/entry.c (added)
• lib/ui/test/main.c (modified) (1 diff)

uspace/app/calculator/calculator.c

@@ -42 +42 @@
 #include <stdlib.h>
 #include <str.h>
-#include <ui/label.h>
+#include <ui/entry.h>
 #include <ui/fixed.h>
 #include <ui/pbutton.h>
@@ -133 +133 @@
 
 static char *expr = NULL;
-static ui_label_t *display;
+static ui_entry_t *display;
 
 static bool is_digit(char c)
@@ -350 +350 @@
 {
         if (expr != NULL)
-                (void) ui_label_set_text(display, (void *) expr);
+                (void) ui_entry_set_text(display, (void *) expr);
         else
-                (void) ui_label_set_text(display, (void *) NULL_DISPLAY);
-
-        ui_label_paint(display);
+                (void) ui_entry_set_text(display, (void *) NULL_DISPLAY);
+
+        ui_entry_paint(display);
 }
 
@@ -366 +366 @@
         switch (error_type) {
         case ERROR_SYNTAX:
-                (void) ui_label_set_text(display,
+                (void) ui_entry_set_text(display,
                     (void *) SYNTAX_ERROR_DISPLAY);
                 break;
         case ERROR_NUMERIC:
-                (void) ui_label_set_text(display,
+                (void) ui_entry_set_text(display,
                     (void *) NUMERIC_ERROR_DISPLAY);
                 break;
         default:
-                (void) ui_label_set_text(display,
+                (void) ui_entry_set_text(display,
                     (void *) UNKNOWN_ERROR_DISPLAY);
                 break;
         }
 
-        ui_label_paint(display);
+        ui_entry_paint(display);
 }
 
@@ -618 +618 @@
         }
 
-        rc = ui_label_create(ui_res, NULL_DISPLAY, &display);
+        rc = ui_entry_create(ui_res, NULL_DISPLAY, &display);
         if (rc != EOK) {
-                printf("Error creating label.\n");
+                printf("Error creating text lentry.\n");
                 return rc;
         }
 
         rect.p0.x = 15;
-        rect.p0.y = 50;
+        rect.p0.y = 45;
         rect.p1.x = 235;
         rect.p1.y = 70;
-        ui_label_set_rect(display, &rect);
-        ui_label_set_halign(display, gfx_halign_right);
-
-        rc = ui_fixed_add(fixed, ui_label_ctl(display));
+        ui_entry_set_rect(display, &rect);
+        ui_entry_set_halign(display, gfx_halign_right);
+
+        rc = ui_fixed_add(fixed, ui_entry_ctl(display));
         if (rc != EOK) {
                 printf("Error adding control to layout.\n");

uspace/lib/ui/meson.build

@@ -31 +31 @@
         'src/control.c',
         'src/dummygc.c',
+        'src/entry.c',
         'src/fixed.c',
         'src/image.c',
@@ -44 +45 @@
 test_src = files(
         'test/control.c',
+        'test/entry.c',
         'test/fixed.c',
         'test/image.c',

uspace/lib/ui/private/resource.h

@@ -87 +87 @@
         /** Inactive titlebar text color */
         gfx_color_t *tbar_inact_text_color;
+
+        /** Entry (text entry, checkbox, radio button) foreground color */
+        gfx_color_t *entry_fg_color;
+        /** Entry (text entry, checkbox, raido button) background color */
+        gfx_color_t *entry_bg_color;
 };
 

uspace/lib/ui/src/resource.c

@@ -74 +74 @@
         gfx_color_t *tbar_act_text_color = NULL;
         gfx_color_t *tbar_inact_text_color = NULL;
+        gfx_color_t *entry_fg_color = NULL;
+        gfx_color_t *entry_bg_color = NULL;
         errno_t rc;
 
@@ -156 +158 @@
         rc = gfx_color_new_rgb_i16(0x5858, 0x5858, 0x5858,
             &tbar_inact_text_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_rgb_i16(0, 0, 0, &entry_fg_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_rgb_i16(0xffff, 0xffff, 0xffff, &entry_bg_color);
         if (rc != EOK)
                 goto error;
@@ -180 +190 @@
         resource->tbar_inact_bg_color = tbar_inact_bg_color;
         resource->tbar_inact_text_color = tbar_inact_text_color;
+
+        resource->entry_fg_color = entry_fg_color;
+        resource->entry_bg_color = entry_bg_color;
 
         *rresource = resource;
@@ -217 +230 @@
                 gfx_color_delete(tbar_inact_text_color);
 
+        if (entry_fg_color != NULL)
+                gfx_color_delete(entry_fg_color);
+        if (entry_bg_color != NULL)
+                gfx_color_delete(entry_bg_color);
+
         if (tface != NULL)
                 gfx_typeface_destroy(tface);
@@ -250 +268 @@
         gfx_color_delete(resource->tbar_inact_text_color);
 
+        gfx_color_delete(resource->entry_fg_color);
+        gfx_color_delete(resource->entry_bg_color);
+
         gfx_font_close(resource->font);
         gfx_typeface_destroy(resource->tface);

uspace/lib/ui/test/main.c

@@ -32 +32 @@
 
 PCUT_IMPORT(control);
+PCUT_IMPORT(entry);
 PCUT_IMPORT(fixed);
 PCUT_IMPORT(image);