Changeset 6df564c in mainline

Timestamp:

2021-09-19T18:02:14Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

68632b4

Parents:

80d4aea

Message:

Custom colors for selected text in text entry

In text mode, swapping 'background' and 'text' color does not work,
they are the same. Looks better in graphics mode, too.

Location:

uspace/lib/ui

Files:

• private/resource.h (modified) (1 diff)
• src/entry.c (modified) (2 diffs)
• src/resource.c (modified) (9 diffs)

uspace/lib/ui/private/resource.h

@@ -105 +105 @@
         /** Entry (text entry, checkbox, raido button) active background color */
         gfx_color_t *entry_act_bg_color;
+        /** Entry selected text foreground color */
+        gfx_color_t *entry_sel_text_fg_color;
+        /** Entry selected text background color */
+        gfx_color_t *entry_sel_text_bg_color;
 
         /** Expose callback or @c NULL */

uspace/lib/ui/src/entry.c

@@ -343 +343 @@
                 c = entry->text[off2];
                 entry->text[off2] = '\0';
-                cfmt.color = res->entry_bg_color;
+                cfmt.color = res->entry_sel_text_fg_color;
 
                 gfx_text_rect(res->font, &cpos, &cfmt, entry->text + off1, &sel);
@@ -351 +351 @@
                 sel.p1.y += ui_entry_sel_vpad;
 
-                rc = gfx_set_color(res->gc, res->entry_fg_color);
+                rc = gfx_set_color(res->gc, res->entry_sel_text_bg_color);
                 if (rc != EOK)
                         goto error;

uspace/lib/ui/src/resource.c

@@ -80 +80 @@
         gfx_color_t *entry_bg_color = NULL;
         gfx_color_t *entry_act_bg_color = NULL;
+        gfx_color_t *entry_sel_text_fg_color = NULL;
+        gfx_color_t *entry_sel_text_bg_color = NULL;
         errno_t rc;
 
@@ -183 +185 @@
 
         rc = gfx_color_new_rgb_i16(0xc8c8, 0xc8c8, 0xc8c8, &entry_act_bg_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_rgb_i16(0xffff, 0xffff, 0xffff,
+            &entry_sel_text_fg_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_rgb_i16(0, 0, 0xffff, &entry_sel_text_bg_color);
         if (rc != EOK)
                 goto error;
@@ -214 +225 @@
         resource->entry_bg_color = entry_bg_color;
         resource->entry_act_bg_color = entry_act_bg_color;
+        resource->entry_sel_text_fg_color = entry_sel_text_fg_color;
+        resource->entry_sel_text_bg_color = entry_sel_text_bg_color;
 
         *rresource = resource;
@@ -259 +272 @@
         if (entry_bg_color != NULL)
                 gfx_color_delete(entry_bg_color);
+        if (entry_sel_text_fg_color != NULL)
+                gfx_color_delete(entry_sel_text_fg_color);
+        if (entry_sel_text_bg_color != NULL)
+                gfx_color_delete(entry_sel_text_bg_color);
         if (entry_act_bg_color != NULL)
                 gfx_color_delete(entry_act_bg_color);
@@ -299 +316 @@
         gfx_color_t *entry_fg_color = NULL;
         gfx_color_t *entry_bg_color = NULL;
+        gfx_color_t *entry_sel_text_fg_color = NULL;
+        gfx_color_t *entry_sel_text_bg_color = NULL;
         gfx_color_t *entry_act_bg_color = NULL;
         errno_t rc;
@@ -388 +407 @@
 
         rc = gfx_color_new_ega(0x1b, &entry_bg_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_ega(0x20, &entry_sel_text_fg_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_ega(0x20, &entry_sel_text_bg_color);
         if (rc != EOK)
                 goto error;
@@ -423 +450 @@
         resource->entry_bg_color = entry_bg_color;
         resource->entry_act_bg_color = entry_act_bg_color;
+        resource->entry_sel_text_fg_color = entry_sel_text_fg_color;
+        resource->entry_sel_text_bg_color = entry_sel_text_bg_color;
 
         *rresource = resource;
@@ -470 +499 @@
         if (entry_act_bg_color != NULL)
                 gfx_color_delete(entry_act_bg_color);
+        if (entry_sel_text_fg_color != NULL)
+                gfx_color_delete(entry_sel_text_fg_color);
+        if (entry_sel_text_bg_color != NULL)
+                gfx_color_delete(entry_sel_text_bg_color);
 
         if (tface != NULL)
@@ -525 +558 @@
         gfx_color_delete(resource->entry_bg_color);
         gfx_color_delete(resource->entry_act_bg_color);
+        gfx_color_delete(resource->entry_sel_text_fg_color);
+        gfx_color_delete(resource->entry_sel_text_bg_color);
 
         gfx_font_close(resource->font);