Changes in uspace/lib/ui/src/entry.c [a106037:b987eb4] in mainline

File:

• uspace/lib/ui/src/entry.c (modified) (26 diffs)

uspace/lib/ui/src/entry.c

@@ -67 +67 @@
         ui_entry_cursor_width = 2,
         ui_entry_sel_hpad = 0,
-        ui_entry_sel_vpad = 2
+        ui_entry_sel_vpad = 2,
+        /** Additional amount to scroll to the left after revealing cursor */
+        ui_entry_left_scroll_margin = 30
 };
 
@@ -156 +158 @@
 {
         entry->halign = halign;
+        ui_entry_scroll_update(entry, true);
+        ui_entry_paint(entry);
 }
 
@@ -187 +191 @@
         entry->sel_start = entry->pos;
 
+        ui_entry_scroll_update(entry, false);
+        ui_entry_paint(entry);
+
         return EOK;
+}
+
+/** Get entry text.
+ *
+ * @return Pointer to entry text.
+ */
+const char *ui_entry_get_text(ui_entry_t *entry)
+{
+        return entry->text;
 }
 
@@ -298 +314 @@
 
         gfx_text_fmt_init(&fmt);
+        fmt.font = res->font;
         fmt.color = res->entry_fg_color;
         fmt.halign = gfx_halign_left;
@@ -313 +330 @@
         entry->text[off1] = '\0';
 
-        rc = gfx_puttext(res->font, &pos, &fmt, entry->text);
+        rc = gfx_puttext(&pos, &fmt, entry->text);
         if (rc != EOK) {
                 (void) gfx_set_clip_rect(res->gc, NULL);
@@ -319 +336 @@
         }
 
-        gfx_text_cont(res->font, &pos, &fmt, entry->text, &cpos, &cfmt);
+        gfx_text_cont(&pos, &fmt, entry->text, &cpos, &cfmt);
         entry->text[off1] = c;
 
@@ -327 +344 @@
                 c = entry->text[off2];
                 entry->text[off2] = '\0';
-                cfmt.color = res->entry_bg_color;
-
-                gfx_text_rect(res->font, &cpos, &cfmt, entry->text + off1, &sel);
+                cfmt.color = res->entry_sel_text_fg_color;
+
+                gfx_text_rect(&cpos, &cfmt, entry->text + off1, &sel);
                 sel.p0.x -= ui_entry_sel_hpad;
                 sel.p0.y -= ui_entry_sel_vpad;
@@ -335 +352 @@
                 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;
@@ -343 +360 @@
                         goto error;
 
-                rc = gfx_puttext(res->font, &cpos, &cfmt, entry->text + off1);
+                rc = gfx_puttext(&cpos, &cfmt, entry->text + off1);
                 if (rc != EOK) {
                         (void) gfx_set_clip_rect(res->gc, NULL);
@@ -349 +366 @@
                 }
 
-                gfx_text_cont(res->font, &cpos, &cfmt, entry->text + off1,
-                    &cpos, &cfmt);
+                gfx_text_cont(&cpos, &cfmt, entry->text + off1, &cpos, &cfmt);
 
                 entry->text[off2] = c;
@@ -358 +374 @@
         cfmt.color = res->entry_fg_color;
 
-        rc = gfx_puttext(res->font, &cpos, &cfmt, entry->text + off2);
+        rc = gfx_puttext(&cpos, &cfmt, entry->text + off2);
         if (rc != EOK) {
                 (void) gfx_set_clip_rect(res->gc, NULL);
@@ -405 +421 @@
 
         gfx_text_fmt_init(&fmt);
+        fmt.font = res->font;
         fmt.halign = gfx_halign_left;
         fmt.valign = gfx_valign_top;
 
-        return gfx_text_find_pos(res->font, &geom.text_pos, &fmt,
-            entry->text, fpos);
+        return gfx_text_find_pos(&geom.text_pos, &fmt, entry->text, fpos);
 }
 
@@ -452 +468 @@
         entry->pos = off1;
         entry->sel_start = off1;
+        ui_entry_scroll_update(entry, false);
         ui_entry_paint(entry);
 }
@@ -494 +511 @@
 
         entry->sel_start = entry->pos;
+        ui_entry_scroll_update(entry, false);
         ui_entry_paint(entry);
 
@@ -526 +544 @@
         entry->sel_start = off;
 
+        ui_entry_scroll_update(entry, false);
         ui_entry_paint(entry);
 }
@@ -551 +570 @@
             str_size(entry->text + off) + 1);
 
+        ui_entry_scroll_update(entry, false);
         ui_entry_paint(entry);
 }
@@ -644 +664 @@
                 break;
         }
-
         return ui_claimed;
 }
@@ -723 +742 @@
         if (!entry->active)
                 return ui_unclaimed;
-
-        if (event->type == KEY_PRESS && event->c >= ' ') {
-                off = 0;
-                rc = chr_encode(event->c, buf, &off, sizeof(buf));
-                if (rc == EOK) {
-                        buf[off] = '\0';
-                        (void) ui_entry_insert_str(entry, buf);
-                }
-        }
 
         /*
@@ -748 +758 @@
         if (event->type == KEY_RELEASE && event->key == KC_RSHIFT)
                 entry->rshift_held = false;
+
+        if (event->type == KEY_PRESS &&
+            (event->mods & (KM_CTRL | KM_ALT)) == 0 && event->c >= ' ') {
+                off = 0;
+                rc = chr_encode(event->c, buf, &off, sizeof(buf));
+                if (rc == EOK) {
+                        buf[off] = '\0';
+                        (void) ui_entry_insert_str(entry, buf);
+                }
+        }
 
         if (event->type == KEY_PRESS &&
@@ -875 +895 @@
         gfx_coord_t hpad;
         gfx_coord_t vpad;
-        gfx_coord_t width;
         ui_resource_t *res;
 
@@ -895 +914 @@
         }
 
-        width = gfx_text_width(res->font, entry->text);
+        geom->text_rect.p0.x = geom->interior_rect.p0.x + hpad;
+        geom->text_rect.p0.y = geom->interior_rect.p0.y + vpad;
+        geom->text_rect.p1.x = geom->interior_rect.p1.x - hpad;
+        geom->text_rect.p1.y = geom->interior_rect.p1.y - vpad;
+
+        geom->text_pos.x = geom->interior_rect.p0.x + hpad +
+            entry->scroll_pos;
+        geom->text_pos.y = geom->interior_rect.p0.y + vpad;
 
         switch (entry->halign) {
         case gfx_halign_left:
         case gfx_halign_justify:
-                geom->text_pos.x = geom->interior_rect.p0.x + hpad;
+                geom->anchor_x = geom->text_rect.p0.x;
                 break;
         case gfx_halign_center:
-                geom->text_pos.x = (geom->interior_rect.p0.x +
-                    geom->interior_rect.p1.x) / 2 - width / 2;
+                geom->anchor_x = (geom->text_rect.p0.x +
+                    geom->text_rect.p1.x) / 2;
                 break;
         case gfx_halign_right:
-                geom->text_pos.x = geom->interior_rect.p1.x - hpad - 1 - width;
-                break;
-        }
-
-        geom->text_pos.y = geom->interior_rect.p0.y + vpad;
+                geom->anchor_x = geom->text_rect.p1.x;
+                break;
+        }
 }
 
@@ -945 +969 @@
         if (!shift)
                 entry->sel_start = entry->pos;
+
+        ui_entry_scroll_update(entry, false);
         (void) ui_entry_paint(entry);
 }
@@ -959 +985 @@
         if (!shift)
                 entry->sel_start = entry->pos;
+
+        ui_entry_scroll_update(entry, false);
         (void) ui_entry_paint(entry);
 }
@@ -978 +1006 @@
         if (!shift)
                 entry->sel_start = entry->pos;
+
+        ui_entry_scroll_update(entry, false);
         (void) ui_entry_paint(entry);
 }
@@ -997 +1027 @@
         if (!shift)
                 entry->sel_start = entry->pos;
+
+        ui_entry_scroll_update(entry, false);
         (void) ui_entry_paint(entry);
 }
@@ -1021 +1053 @@
 }
 
+/** Update text entry scroll position.
+ *
+ * @param entry Text entry
+ * @param realign @c true iff we should left-align short text.
+ *                This should be only used when changing text alignment,
+ *                because left-aligned text entries should not realign
+ *                the text to the left side under normal circumstances.
+ */
+void ui_entry_scroll_update(ui_entry_t *entry, bool realign)
+{
+        ui_entry_geom_t geom;
+        gfx_coord_t x;
+        gfx_coord_t width;
+        gfx_coord2_t tpos;
+        gfx_coord2_t anchor;
+        gfx_text_fmt_t fmt;
+        ui_resource_t *res;
+
+        res = ui_window_get_res(entry->window);
+
+        ui_entry_get_geom(entry, &geom);
+
+        /* Compute position where cursor is currently displayed at */
+        x = geom.text_pos.x + ui_entry_lwidth(entry);
+
+        /* Is cursor off to the left? */
+        if (x < geom.text_rect.p0.x) {
+                /*
+                 * Scroll to make cursor visible and put some space between it
+                 * and the left edge of the text rectangle.
+                 */
+                entry->scroll_pos += geom.text_rect.p0.x - x +
+                    ui_entry_left_scroll_margin;
+
+                /*
+                 * We don't want to scroll further than what's needed
+                 * to reveal the beginning of the text.
+                 */
+                if (entry->scroll_pos > 0)
+                        entry->scroll_pos = 0;
+        }
+
+        /*
+         * Is cursor off to the right? Note that the width of the cursor
+         * is deliberately not taken into account (i.e. we only care
+         * about the left edge of the cursor).
+         */
+        if (x > geom.text_rect.p1.x)
+                entry->scroll_pos -= x - geom.text_rect.p1.x;
+
+        width = gfx_text_width(res->font, entry->text);
+
+        if (width < geom.text_rect.p1.x - geom.text_rect.p0.x &&
+            (realign || entry->halign != gfx_halign_left)) {
+                /* Text fits inside entry, so we need to align it */
+                anchor.x = geom.anchor_x;
+                anchor.y = 0;
+                gfx_text_fmt_init(&fmt);
+                fmt.font = res->font;
+                fmt.halign = entry->halign;
+                gfx_text_start_pos(&anchor, &fmt, entry->text, &tpos);
+                entry->scroll_pos = tpos.x - geom.text_rect.p0.x;
+        } else if (geom.text_pos.x + width < geom.text_rect.p1.x &&
+            entry->halign != gfx_halign_left) {
+                /* Text is long, unused space on the right */
+                entry->scroll_pos += geom.text_rect.p1.x -
+                    geom.text_pos.x - width;
+        }
+}
+
 /** @}
  */