Changeset bb14312 in mainline

Timestamp:

2021-06-26T16:40:28Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1215db9

Parents:

69511176

Message:

Use hardware cursor in text mode

We extend GC with cursor control operations. This will also allow to
control the HW cursor when running display server in text mode in
the future (provided that we implement the missing bits in the rest
of the stack, i.e. in IPC GC and in the display server).

Location:

uspace/lib

Files:

• congfx/src/console.c (modified) (3 diffs)
• gfx/include/gfx/cursor.h (added)
• gfx/include/types/gfx/ops/context.h (modified) (2 diffs)
• gfx/meson.build (modified) (3 diffs)
• gfx/src/cursor.c (added)
• gfx/test/cursor.c (added)
• gfx/test/main.c (modified) (2 diffs)
• ui/private/entry.h (modified) (1 diff)
• ui/src/entry.c (modified) (7 diffs)
• ui/src/ui.c (modified) (2 diffs)
• ui/test/entry.c (modified) (1 diff)

uspace/lib/congfx/src/console.c

@@ -57 +57 @@
 static errno_t console_gc_bitmap_render(void *, gfx_rect_t *, gfx_coord2_t *);
 static errno_t console_gc_bitmap_get_alloc(void *, gfx_bitmap_alloc_t *);
+static errno_t console_gc_cursor_get_pos(void *, gfx_coord2_t *);
+static errno_t console_gc_cursor_set_pos(void *, gfx_coord2_t *);
+static errno_t console_gc_cursor_set_visible(void *, bool);
 
 gfx_context_ops_t console_gc_ops = {
@@ -66 +69 @@
         .bitmap_destroy = console_gc_bitmap_destroy,
         .bitmap_render = console_gc_bitmap_render,
-        .bitmap_get_alloc = console_gc_bitmap_get_alloc
+        .bitmap_get_alloc = console_gc_bitmap_get_alloc,
+        .cursor_get_pos = console_gc_cursor_get_pos,
+        .cursor_set_pos = console_gc_cursor_set_pos,
+        .cursor_set_visible = console_gc_cursor_set_visible
 };
 
@@ -435 +441 @@
 }
 
+/** Get cursor position on console GC.
+ *
+ * @param arg Console GC
+ * @param pos Place to store position
+ *
+ * @return EOK on success or an error code
+ */
+static errno_t console_gc_cursor_get_pos(void *arg, gfx_coord2_t *pos)
+{
+        console_gc_t *cgc = (console_gc_t *) arg;
+        sysarg_t col;
+        sysarg_t row;
+        errno_t rc;
+
+        rc = console_get_pos(cgc->con, &col, &row);
+        if (rc != EOK)
+                return rc;
+
+        pos->x = col;
+        pos->y = row;
+        return EOK;
+}
+
+/** Set cursor position on console GC.
+ *
+ * @param arg Console GC
+ * @param pos New cursor position
+ *
+ * @return EOK on success or an error code
+ */
+static errno_t console_gc_cursor_set_pos(void *arg, gfx_coord2_t *pos)
+{
+        console_gc_t *cgc = (console_gc_t *) arg;
+
+        console_set_pos(cgc->con, pos->x, pos->y);
+        return EOK;
+}
+
+/** Set cursor visibility on console GC.
+ *
+ * @param arg Console GC
+ * @param visible @c true iff cursor should be made visible
+ *
+ * @return EOK on success or an error code
+ */
+static errno_t console_gc_cursor_set_visible(void *arg, bool visible)
+{
+        console_gc_t *cgc = (console_gc_t *) arg;
+
+        console_cursor_visibility(cgc->con, visible);
+        return EOK;
+}
+
 /** @}
  */

uspace/lib/gfx/include/types/gfx/ops/context.h

@@ -44 +44 @@
 #include <types/gfx/coord.h>
 #include <types/gfx/context.h>
+#include <stdbool.h>
 
 /** Graphics context ops */
@@ -64 +65 @@
         /** Get bitmap allocation info */
         errno_t (*bitmap_get_alloc)(void *, gfx_bitmap_alloc_t *);
+        /** Get hardware cursor position */
+        errno_t (*cursor_get_pos)(void *, gfx_coord2_t *);
+        /** Set hardware cursor position */
+        errno_t (*cursor_set_pos)(void *, gfx_coord2_t *);
+        /** Set hardware cursor visibility */
+        errno_t (*cursor_set_visible)(void *, bool);
 } gfx_context_ops_t;
 

uspace/lib/gfx/meson.build

@@ -1 +1 @@
 #
-# Copyright (c) 2019 Jiri Svoboda
+# Copyright (c) 2021 Jiri Svoboda
 # All rights reserved.
 #
@@ -32 +32 @@
         'src/coord.c',
         'src/context.c',
+        'src/cursor.c',
         'src/render.c'
 )
@@ -39 +40 @@
         'test/color.c',
         'test/coord.c',
+        'test/cursor.c',
         'test/main.c',
         'test/render.c',

uspace/lib/gfx/test/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2017 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -34 +34 @@
 PCUT_IMPORT(color);
 PCUT_IMPORT(coord);
+PCUT_IMPORT(cursor);
 PCUT_IMPORT(render);
 

uspace/lib/ui/private/entry.h

@@ -67 +67 @@
 extern void ui_entry_backspace(ui_entry_t *);
 extern ui_evclaim_t ui_entry_key_press_unmod(ui_entry_t *, kbd_event_t *);
+extern void ui_entry_activate(ui_entry_t *);
+extern void ui_entry_deactivate(ui_entry_t *);
 
 #endif

uspace/lib/ui/src/entry.c

@@ -39 +39 @@
 #include <errno.h>
 #include <gfx/context.h>
+#include <gfx/cursor.h>
 #include <gfx/render.h>
 #include <gfx/text.h>
@@ -62 +63 @@
         ui_entry_vpad_text = 0,
         ui_entry_cursor_overshoot = 1,
-        ui_entry_cursor_width = 2,
-        ui_entry_cursor_width_text = 1
+        ui_entry_cursor_width = 2
 };
 
@@ -107 +107 @@
         entry->halign = gfx_halign_left;
         *rentry = entry;
+
         return EOK;
 }
@@ -194 +195 @@
         gfx_rect_t rect;
         gfx_font_metrics_t metrics;
-        gfx_coord_t w;
         errno_t rc;
 
         res = ui_window_get_res(entry->window);
 
+        if (res->textmode) {
+                rc = gfx_cursor_set_pos(res->gc, pos);
+                return rc;
+        }
+
         gfx_font_get_metrics(res->font, &metrics);
-
-        w = res->textmode ? ui_entry_cursor_width_text :
-            ui_entry_cursor_width;
 
         rect.p0.x = pos->x;
         rect.p0.y = pos->y - ui_entry_cursor_overshoot;
-        rect.p1.x = pos->x + w;
+        rect.p1.x = pos->x + ui_entry_cursor_width;
         rect.p1.y = pos->y + metrics.ascent + metrics.descent + 1 +
             ui_entry_cursor_overshoot;
@@ -399 +401 @@
                 ui_entry_backspace(entry);
 
-        if (event->key == KC_ESCAPE) {
-                entry->active = false;
-                (void) ui_entry_paint(entry);
-        }
+        if (event->key == KC_ESCAPE)
+                ui_entry_deactivate(entry);
 
         return ui_claimed;
@@ -475 +475 @@
 
                 if (gfx_pix_inside_rect(&pos, &entry->rect)) {
-                        if (!entry->active) {
-                                entry->active = true;
-                                (void) ui_entry_paint(entry);
-                        }
+                        ui_entry_activate(entry);
 
                         return ui_claimed;
                 } else {
-                        if (entry->active) {
-                                entry->active = false;
-                                (void) ui_entry_paint(entry);
-                        }
+                        ui_entry_deactivate(entry);
                 }
         }
@@ -518 +512 @@
 }
 
+/** Activate text entry.
+ *
+ * @param entry Text entry
+ */
+void ui_entry_activate(ui_entry_t *entry)
+{
+        ui_resource_t *res;
+
+        res = ui_window_get_res(entry->window);
+
+        if (entry->active)
+                return;
+
+        entry->active = true;
+        (void) ui_entry_paint(entry);
+
+        if (res->textmode)
+                gfx_cursor_set_visible(res->gc, true);
+}
+
+/** Deactivate text entry.
+ *
+ * @param entry Text entry
+ */
+void ui_entry_deactivate(ui_entry_t *entry)
+{
+        ui_resource_t *res;
+
+        res = ui_window_get_res(entry->window);
+
+        if (!entry->active)
+                return;
+
+        entry->active = false;
+        (void) ui_entry_paint(entry);
+
+        if (res->textmode)
+                gfx_cursor_set_visible(res->gc, false);
+}
+
 /** @}
  */

uspace/lib/ui/src/ui.c

@@ -128 +128 @@
                         return EIO;
 
+                console_cursor_visibility(console, false);
+
                 /* ws == ui_ws_console */
                 rc = ui_create_cons(console, &ui);
@@ -203 +205 @@
                 if (ui->cgc != NULL)
                         console_gc_delete(ui->cgc);
-                if (ui->console != NULL)
+                if (ui->console != NULL) {
+                        console_cursor_visibility(ui->console, true);
                         console_done(ui->console);
+                }
                 if (ui->display != NULL)
                         display_close(ui->display);

uspace/lib/ui/test/entry.c

@@ -270 +270 @@
 }
 
+/** ui_entry_activate() / ui_entry_deactivate() */
+PCUT_TEST(activate_deactivate)
+{
+        errno_t rc;
+        ui_t *ui = NULL;
+        ui_window_t *window = NULL;
+        ui_wnd_params_t params;
+        ui_entry_t *entry;
+
+        rc = ui_create_disp(NULL, &ui);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ui_wnd_params_init(&params);
+        params.caption = "Hello";
+
+        rc = ui_window_create(ui, &params, &window);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(window);
+
+        rc = ui_entry_create(window, "ABC", &entry);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        PCUT_ASSERT_FALSE(entry->active);
+
+        ui_entry_activate(entry);
+        PCUT_ASSERT_TRUE(entry->active);
+
+        ui_entry_deactivate(entry);
+        PCUT_ASSERT_FALSE(entry->active);
+
+        ui_entry_destroy(entry);
+        ui_window_destroy(window);
+        ui_destroy(ui);
+}
+
 PCUT_EXPORT(entry);