Changeset 0d1d0ea in mainline for uspace/lib/ui/src

Timestamp:

2022-03-31T14:37:31Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d68239a1

Parents:

7ca7215

git-author:

Jiri Svoboda <jiri@…> (2022-03-30 17:37:11)

git-committer:

Jiri Svoboda <jiri@…> (2022-03-31 14:37:31)

Message:

Routine to fill rectangle with character

Use it to simplify scrollbar rendering.

Location:

uspace/lib/ui/src

Files:

• paint.c (modified) (1 diff)
• scrollbar.c (modified) (4 diffs)

uspace/lib/ui/src/paint.c

@@ -555 +555 @@
 }
 
+/** Fill rectangle with text character.
+ *
+ * @param resource UI resource
+ * @param rect Rectangle
+ * @param color Color
+ * @param gchar Character to fill with
+ * @return EOK on success or an error code
+ */
+errno_t ui_paint_text_rect(ui_resource_t *resource, gfx_rect_t *rect,
+    gfx_color_t *color, const char *gchar)
+{
+        gfx_coord2_t pos;
+        gfx_text_fmt_t fmt;
+        gfx_rect_t srect;
+        gfx_coord_t w, i;
+        char *buf;
+        size_t gcharsz;
+        errno_t rc;
+
+        gfx_rect_points_sort(rect, &srect);
+
+        gfx_text_fmt_init(&fmt);
+        fmt.font = resource->font;
+        fmt.color = color;
+        fmt.halign = gfx_halign_left;
+        fmt.valign = gfx_valign_top;
+
+        w = srect.p1.x - srect.p0.x;
+        if (w == 0)
+                return EOK;
+
+        gcharsz = str_size(gchar);
+
+        buf = malloc(w * gcharsz + 1);
+        if (buf == NULL)
+                return ENOMEM;
+
+        for (i = 0; i < w; i++)
+                str_cpy(buf + i * gcharsz, (w - i) * gcharsz + 1, gchar);
+        buf[w * gcharsz] = '\0';
+
+        pos.x = srect.p0.x;
+        for (pos.y = srect.p0.y; pos.y < srect.p1.y; pos.y++) {
+                rc = gfx_puttext(&pos, &fmt, buf);
+                if (rc != EOK)
+                        goto error;
+        }
+
+        free(buf);
+        return EOK;
+error:
+        free(buf);
+        return rc;
+}
+
 /** Initialize UI text formatting structure.
  *

uspace/lib/ui/src/scrollbar.c

@@ -526 +526 @@
 }
 
-/** Paint horizontal scrollbar in text mode.
+/** Paint scrollbar in text mode.
  *
  * @param scrollbar Scrollbar
  * @return EOK on success or an error code
  */
-errno_t ui_scrollbar_paint_text_horiz(ui_scrollbar_t *scrollbar)
+errno_t ui_scrollbar_paint_text(ui_scrollbar_t *scrollbar)
 {
         ui_resource_t *resource;
-        gfx_coord2_t pos;
-        gfx_text_fmt_t fmt;
-        gfx_coord_t w, i;
-        char *buf;
-        const char *gchar;
-        size_t gcharsz;
+        ui_scrollbar_geom_t geom;
         errno_t rc;
 
         resource = ui_window_get_res(scrollbar->window);
+        ui_scrollbar_get_geom(scrollbar, &geom);
 
         /* Paint scrollbar through */
 
-        pos = scrollbar->rect.p0;
-        pos.x += ui_scrollbar_btn_len_text;
-
-        gfx_text_fmt_init(&fmt);
-        fmt.font = resource->font;
-        fmt.color = resource->sbar_through_color;
-        fmt.halign = gfx_halign_left;
-        fmt.valign = gfx_valign_top;
-
-        w = scrollbar->rect.p1.x - scrollbar->rect.p0.x -
-            2 * ui_scrollbar_btn_len_text;
-        assert(w >= 0);
-        if (w < 0)
-                return EINVAL;
-
-        gchar = "\u2592";
-        gcharsz = str_size(gchar);
-
-        buf = malloc(w * gcharsz + 1);
-        if (buf == NULL)
-                return ENOMEM;
-
-        for (i = 0; i < w; i++)
-                str_cpy(buf + i * gcharsz, (w - i) * gcharsz + 1, gchar);
-        buf[w * gcharsz] = '\0';
-
-        rc = gfx_puttext(&pos, &fmt, buf);
-        free(buf);
+        rc = ui_paint_text_rect(resource, &geom.through_rect,
+            resource->sbar_through_color, "\u2592");
         if (rc != EOK)
                 goto error;
@@ -579 +549 @@
         /* Paint scrollbar thumb */
 
-        pos.x += scrollbar->pos;
-
-        gchar = "\u25a0";
-        gcharsz = str_size(gchar);
-        w = scrollbar->thumb_len;
-
-        buf = malloc(w * gcharsz + 1);
-        if (buf == NULL)
-                return ENOMEM;
-
-        for (i = 0; i < w; i++)
-                str_cpy(buf + i * gcharsz, (w - i) * gcharsz + 1, gchar);
-        buf[w * gcharsz] = '\0';
-
-        rc = gfx_puttext(&pos, &fmt, buf);
-        free(buf);
-        if (rc != EOK)
-                goto error;
+        rc = ui_paint_text_rect(resource, &geom.thumb_rect,
+            resource->sbar_through_color, "\u25a0");
+        if (rc != EOK)
+                goto error;
+
+        /* Paint buttons */
 
         rc = ui_pbutton_paint(scrollbar->up_btn);
@@ -615 +573 @@
 }
 
-/** Paint vertical scrollbar in text mode.
+/** Paint scrollbar.
  *
  * @param scrollbar Scrollbar
  * @return EOK on success or an error code
  */
-errno_t ui_scrollbar_paint_text_vert(ui_scrollbar_t *scrollbar)
-{
-        ui_resource_t *resource;
-        ui_scrollbar_geom_t geom;
-        gfx_coord2_t pos;
-        gfx_text_fmt_t fmt;
-        errno_t rc;
-
-        resource = ui_window_get_res(scrollbar->window);
-        ui_scrollbar_get_geom(scrollbar, &geom);
-
-        /* Paint scrollbar through */
-
-        gfx_text_fmt_init(&fmt);
-        fmt.font = resource->font;
-        fmt.color = resource->sbar_through_color;
-        fmt.halign = gfx_halign_left;
-        fmt.valign = gfx_valign_top;
-
-        pos.x = scrollbar->rect.p0.x;
-        for (pos.y = geom.through_rect.p0.y; pos.y < geom.through_rect.p1.y;
-            pos.y++) {
-                rc = gfx_puttext(&pos, &fmt, "\u2592");
-                if (rc != EOK)
-                        goto error;
-        }
-
-        /* Paint scrollbar thumb */
-
-        pos.x = geom.thumb_rect.p0.x;
-        for (pos.y = geom.thumb_rect.p0.y; pos.y < geom.thumb_rect.p1.y;
-            pos.y++) {
-                rc = gfx_puttext(&pos, &fmt, "\u25a0");
-                if (rc != EOK)
-                        goto error;
-        }
-
-        rc = ui_pbutton_paint(scrollbar->up_btn);
-        if (rc != EOK)
-                goto error;
-
-        rc = ui_pbutton_paint(scrollbar->down_btn);
-        if (rc != EOK)
-                goto error;
-
-        rc = gfx_update(resource->gc);
-        if (rc != EOK)
-                goto error;
-
-        return EOK;
-error:
-        return rc;
-}
-
-/** Paint scrollbar.
- *
- * @param scrollbar Scrollbar
- * @return EOK on success or an error code
- */
 errno_t ui_scrollbar_paint(ui_scrollbar_t *scrollbar)
 {
@@ -684 +583 @@
 
         if (resource->textmode) {
-                if (scrollbar->dir == ui_sbd_horiz)
-                        return ui_scrollbar_paint_text_horiz(scrollbar);
-                else
-                        return ui_scrollbar_paint_text_vert(scrollbar);
+                return ui_scrollbar_paint_text(scrollbar);
         } else {
                 return ui_scrollbar_paint_gfx(scrollbar);