Changeset d63623f in mainline for uspace/lib/ui

Timestamp:

2021-07-16T17:45:12Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4afb6c9

Parents:

61bf9dd9

Message:

Seeking in entry text using mouse

Location:

uspace/lib/ui

Files:

• include/ui/paint.h (modified) (1 diff)
• private/entry.h (modified) (1 diff)
• src/entry.c (modified) (7 diffs)
• src/paint.c (modified) (3 diffs)
• test/paint.c (modified) (4 diffs)

uspace/lib/ui/include/ui/paint.h

@@ -45 +45 @@
 extern errno_t ui_paint_bevel(gfx_context_t *, gfx_rect_t *, gfx_color_t *,
     gfx_color_t *, gfx_coord_t, gfx_rect_t *);
+extern void ui_paint_get_bevel_inside(gfx_context_t *, gfx_rect_t *,
+    gfx_coord_t, gfx_rect_t *);
 extern errno_t ui_paint_inset_frame(ui_resource_t *, gfx_rect_t *,
+    gfx_rect_t *);
+extern void ui_paint_get_inset_frame_inside(ui_resource_t *, gfx_rect_t *,
     gfx_rect_t *);
 extern errno_t ui_paint_outset_frame(ui_resource_t *, gfx_rect_t *,

uspace/lib/ui/private/entry.h

@@ -66 +66 @@
 };
 
+/** Text entry geometry.
+ *
+ * Computed geometry of text entry elements.
+ */
+typedef struct {
+        /** Interior rectangle */
+        gfx_rect_t interior_rect;
+        /** Text anchor position */
+        gfx_coord2_t text_pos;
+} ui_entry_geom_t;
+
 extern errno_t ui_entry_insert_str(ui_entry_t *, const char *);
 extern ui_evclaim_t ui_entry_key_press_unmod(ui_entry_t *, kbd_event_t *);
+extern void ui_entry_get_geom(ui_entry_t *, ui_entry_geom_t *);
+extern size_t ui_entry_find_pos(ui_entry_t *, gfx_coord2_t *);
 extern void ui_entry_activate(ui_entry_t *);
 extern void ui_entry_deactivate(ui_entry_t *);

uspace/lib/ui/src/entry.c

@@ -256 +256 @@
 {
         ui_resource_t *res;
+        ui_entry_geom_t geom;
         gfx_text_fmt_t fmt;
         gfx_coord2_t pos;
-        gfx_coord_t hpad;
-        gfx_coord_t vpad;
-        gfx_coord_t width;
         gfx_rect_t inside;
         errno_t rc;
@@ -266 +264 @@
         res = ui_window_get_res(entry->window);
 
-        if (res->textmode) {
-                hpad = ui_entry_hpad_text;
-                vpad = ui_entry_vpad_text;
-        } else {
-                hpad = ui_entry_hpad;
-                vpad = ui_entry_vpad;
-        }
+        ui_entry_get_geom(entry, &geom);
 
         if (res->textmode == false) {
@@ -293 +285 @@
                 goto error;
 
-        width = gfx_text_width(res->font, entry->text);
-
-        switch (entry->halign) {
-        case gfx_halign_left:
-        case gfx_halign_justify:
-                pos.x = inside.p0.x + hpad;
-                break;
-        case gfx_halign_center:
-                pos.x = (inside.p0.x + inside.p1.x) / 2 - width / 2;
-                break;
-        case gfx_halign_right:
-                pos.x = inside.p1.x - hpad - 1 - width;
-                break;
-        }
-
-        pos.y = inside.p0.y + vpad;
+        pos = geom.text_pos;
 
         gfx_text_fmt_init(&fmt);
@@ -347 +324 @@
 error:
         return rc;
+}
+
+/** Find position in text entry.
+ *
+ * @param entry Text entry
+ * @param fpos Position for which we need to find text offset
+ * @return Corresponding byte offset in entry text
+ */
+size_t ui_entry_find_pos(ui_entry_t *entry, gfx_coord2_t *fpos)
+{
+        ui_resource_t *res;
+        ui_entry_geom_t geom;
+        gfx_text_fmt_t fmt;
+
+        res = ui_window_get_res(entry->window);
+
+        ui_entry_get_geom(entry, &geom);
+
+        gfx_text_fmt_init(&fmt);
+        fmt.halign = gfx_halign_left;
+        fmt.valign = gfx_valign_top;
+
+        return gfx_text_find_pos(res->font, &geom.text_pos, &fmt,
+            entry->text, fpos);
 }
 
@@ -567 +568 @@
 
                 if (gfx_pix_inside_rect(&pos, &entry->rect)) {
-                        ui_entry_activate(entry);
+                        entry->pos = ui_entry_find_pos(entry, &pos);
+                        if (entry->active)
+                                ui_entry_paint(entry);
+                        else
+                                ui_entry_activate(entry);
 
                         return ui_claimed;
@@ -604 +609 @@
 }
 
+/** Get text entry geometry.
+ *
+ * @param entry Text entry
+ * @param geom Structure to fill in with computed geometry
+ */
+void ui_entry_get_geom(ui_entry_t *entry, ui_entry_geom_t *geom)
+{
+        gfx_coord_t hpad;
+        gfx_coord_t vpad;
+        gfx_coord_t width;
+        ui_resource_t *res;
+
+        res = ui_window_get_res(entry->window);
+
+        if (res->textmode) {
+                hpad = ui_entry_hpad_text;
+                vpad = ui_entry_vpad_text;
+        } else {
+                hpad = ui_entry_hpad;
+                vpad = ui_entry_vpad;
+        }
+
+        if (res->textmode == false) {
+                ui_paint_get_inset_frame_inside(res, &entry->rect,
+                    &geom->interior_rect);
+        } else {
+                geom->interior_rect = entry->rect;
+        }
+
+        width = gfx_text_width(res->font, entry->text);
+
+        switch (entry->halign) {
+        case gfx_halign_left:
+        case gfx_halign_justify:
+                geom->text_pos.x = geom->interior_rect.p0.x + hpad;
+                break;
+        case gfx_halign_center:
+                geom->text_pos.x = (geom->interior_rect.p0.x +
+                    geom->interior_rect.p1.x) / 2 - width / 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;
+}
+
 /** Activate text entry.
  *
@@ -618 +671 @@
 
         entry->active = true;
-        entry->pos = str_size(entry->text);
         (void) ui_entry_paint(entry);
 

uspace/lib/ui/src/paint.c

@@ -49 +49 @@
  * @param thickness Bevel thickness in pixels
  * @param inside Place to store rectangle of the interior or @c NULL
- * @reutrn EOK on success or an error code
+ * @return EOK on success or an error code
  */
 errno_t ui_paint_bevel(gfx_context_t *gc, gfx_rect_t *rect,
@@ -107 +107 @@
         }
 
-        if (inside != NULL) {
-                inside->p0.x = rect->p0.x + thickness;
-                inside->p0.y = rect->p0.y + thickness;
-                inside->p1.x = rect->p1.x - thickness;
-                inside->p1.y = rect->p1.y - thickness;
-        }
+        if (inside != NULL)
+                ui_paint_get_bevel_inside(gc, rect, thickness, inside);
 
         return EOK;
 error:
         return rc;
+}
+
+/** Get bevel interior rectangle.
+ *
+ * Get the bevel interior rectangle without painting it.
+ *
+ * @param gc Graphic context
+ * @param rect Rectangle to paint into
+ * @param thickness Bevel thickness in pixels
+ * @param inside Place to store rectangle of the interior
+ */
+void ui_paint_get_bevel_inside(gfx_context_t *gc, gfx_rect_t *rect,
+    gfx_coord_t thickness, gfx_rect_t *inside)
+{
+        inside->p0.x = rect->p0.x + thickness;
+        inside->p0.y = rect->p0.y + thickness;
+        inside->p1.x = rect->p1.x - thickness;
+        inside->p1.y = rect->p1.y - thickness;
 }
 
@@ -147 +161 @@
 error:
         return rc;
+}
+
+/** Get inset frame interior rectangle.
+ *
+ * This allows one to get the interior rectangle without actually painting
+ * the inset frame.
+ *
+ * @param resource UI resource
+ * @param rect Rectangle to paint onto
+ * @param inside Place to store inside rectangle or @c NULL
+ */
+void ui_paint_get_inset_frame_inside(ui_resource_t *resource, gfx_rect_t *rect,
+    gfx_rect_t *inside)
+{
+        ui_paint_get_bevel_inside(resource->gc, rect, 2, inside);
 }
 

uspace/lib/ui/test/paint.c

@@ -96 +96 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
+        rect.p0.x = 10;
+        rect.p0.y = 20;
+        rect.p1.x = 30;
+        rect.p1.y = 40;
+
         /* Paint bevel with NULL 'inside' output parameter */
         rc = ui_paint_bevel(gc, &rect, color1, color2, 2, NULL);
@@ -110 +115 @@
 }
 
+/** Get bevel inside */
+PCUT_TEST(get_bevel_inside)
+{
+        errno_t rc;
+        gfx_context_t *gc = NULL;
+        test_gc_t tgc;
+        gfx_rect_t rect;
+        gfx_rect_t inside;
+
+        memset(&tgc, 0, sizeof(tgc));
+        rc = gfx_context_new(&ops, &tgc, &gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rect.p0.x = 10;
+        rect.p0.y = 20;
+        rect.p1.x = 30;
+        rect.p1.y = 40;
+
+        ui_paint_get_bevel_inside(gc, &rect, 2, &inside);
+        PCUT_ASSERT_INT_EQUALS(12, inside.p0.x);
+        PCUT_ASSERT_INT_EQUALS(22, inside.p0.y);
+        PCUT_ASSERT_INT_EQUALS(28, inside.p1.x);
+        PCUT_ASSERT_INT_EQUALS(38, inside.p1.y);
+
+        rc = gfx_context_delete(gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
 /** Paint inset frame */
 PCUT_TEST(inset_frame)
@@ -128 +161 @@
         PCUT_ASSERT_NOT_NULL(resource);
 
+        rect.p0.x = 10;
+        rect.p0.y = 20;
+        rect.p1.x = 30;
+        rect.p1.y = 40;
+
         /* Paint inset frame with NULL 'inside' output parameter */
         rc = ui_paint_inset_frame(resource, &rect, NULL);
@@ -135 +173 @@
         rc = ui_paint_inset_frame(resource, &rect, &inside);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ui_resource_destroy(resource);
+        rc = gfx_context_delete(gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
+/** Get inset frame inside */
+PCUT_TEST(get_inset_frame_inside)
+{
+        errno_t rc;
+        gfx_context_t *gc = NULL;
+        ui_resource_t *resource = NULL;
+        test_gc_t tgc;
+        gfx_rect_t rect;
+        gfx_rect_t inside;
+
+        memset(&tgc, 0, sizeof(tgc));
+        rc = gfx_context_new(&ops, &tgc, &gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ui_resource_create(gc, false, &resource);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(resource);
+
+        rect.p0.x = 10;
+        rect.p0.y = 20;
+        rect.p1.x = 30;
+        rect.p1.y = 40;
+
+        ui_paint_get_inset_frame_inside(resource, &rect, &inside);
+        PCUT_ASSERT_INT_EQUALS(12, inside.p0.x);
+        PCUT_ASSERT_INT_EQUALS(22, inside.p0.y);
+        PCUT_ASSERT_INT_EQUALS(28, inside.p1.x);
+        PCUT_ASSERT_INT_EQUALS(38, inside.p1.y);
 
         ui_resource_destroy(resource);