Changeset 8a9a41e in mainline for uspace/srv/hid/console/console.c

Timestamp:

2021-10-24T08:28:43Z (2 years ago)

Author:

GitHub <noreply@…>

Children:

f628215

Parents:

2ce943a (diff), cd981f2a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Erik Kučák <35500848+Riko196@…> (2021-10-24 08:28:43)

git-committer:

GitHub <noreply@…> (2021-10-24 08:28:43)

Message:

Merge branch 'HelenOS:master' into master

File:

• uspace/srv/hid/console/console.c (modified) (18 diffs)

uspace/srv/hid/console/console.c

@@ -63 +63 @@
 typedef struct {
         atomic_flag refcnt;      /**< Connection reference count */
-        prodcons_t input_pc;  /**< Incoming keyboard events */
+        prodcons_t input_pc;  /**< Incoming console events */
 
         /**
@@ -99 +99 @@
 static sysarg_t cols;
 static sysarg_t rows;
+
+/** Mouse pointer X coordinate */
+static int pointer_x;
+/** Mouse pointer Y coordinate */
+static int pointer_y;
+/** Character under mouse cursor */
+static charfield_t pointer_bg;
+
+static int mouse_scale_x = 4;
+static int mouse_scale_y = 8;
 
 /** Array of data for virtual consoles */
@@ -166 +176 @@
 };
 
+static void pointer_draw(void);
+static void pointer_undraw(void);
+
 static console_t *srv_to_console(con_srv_t *srv)
 {
@@ -231 +244 @@
 
         fibril_mutex_lock(&switch_mtx);
+        pointer_undraw();
 
         if (cons == active_console) {
@@ -239 +253 @@
         active_console = cons;
 
+        pointer_draw();
         fibril_mutex_unlock(&switch_mtx);
 
         cons_damage(cons);
+}
+
+/** Draw mouse pointer. */
+static void pointer_draw(void)
+{
+        charfield_t *ch;
+        int col, row;
+
+        /* Downscale coordinates to text resolution */
+        col = pointer_x / mouse_scale_x;
+        row = pointer_y / mouse_scale_y;
+
+        /* Make sure they are in range */
+        if (col < 0 || row < 0 || col >= (int)cols || row >= (int)rows)
+                return;
+
+        ch = chargrid_charfield_at(active_console->frontbuf, col, row);
+
+        /*
+         * Store background attributes for undrawing the pointer.
+         * This is necessary as styles cannot be inverted with
+         * round trip (unlike RGB or INDEX)
+         */
+        pointer_bg = *ch;
+
+        /* In general the color should be a one's complement of the background */
+        if (ch->attrs.type == CHAR_ATTR_INDEX) {
+                ch->attrs.val.index.bgcolor ^= 0xf;
+                ch->attrs.val.index.fgcolor ^= 0xf;
+        } else if (ch->attrs.type == CHAR_ATTR_RGB) {
+                ch->attrs.val.rgb.fgcolor ^= 0xffffff;
+                ch->attrs.val.rgb.bgcolor ^= 0xffffff;
+        } else if (ch->attrs.type == CHAR_ATTR_STYLE) {
+                /* Don't have a proper inverse for each style */
+                if (ch->attrs.val.style == STYLE_INVERTED)
+                        ch->attrs.val.style = STYLE_NORMAL;
+                else
+                        ch->attrs.val.style = STYLE_INVERTED;
+        }
+
+        /* Make sure the cell gets updated */
+        ch->flags |= CHAR_FLAG_DIRTY;
+}
+
+/** Undraw mouse pointer. */
+static void pointer_undraw(void)
+{
+        charfield_t *ch;
+        int col, row;
+
+        col = pointer_x / mouse_scale_x;
+        row = pointer_y / mouse_scale_y;
+        if (col < 0 || row < 0 || col >= (int)cols || row >= (int)rows)
+                return;
+
+        ch = chargrid_charfield_at(active_console->frontbuf, col, row);
+        *ch = pointer_bg;
+        ch->flags |= CHAR_FLAG_DIRTY;
+}
+
+/** Queue console event.
+ *
+ * @param cons Console
+ * @param ev Console event
+ */
+static void console_queue_cons_event(console_t *cons, cons_event_t *ev)
+{
+        /* Got key press/release event */
+        cons_event_t *event =
+            (cons_event_t *) malloc(sizeof(cons_event_t));
+        if (event == NULL)
+                return;
+
+        *event = *ev;
+        link_initialize(&event->link);
+
+        prodcons_produce(&cons->input_pc, &event->link);
 }
 
@@ -264 +356 @@
     keymod_t mods, char32_t c)
 {
+        cons_event_t event;
+
         if ((key >= KC_F1) && (key <= KC_F1 + CONSOLE_COUNT) &&
             ((mods & KM_CTRL) == 0)) {
@@ -269 +363 @@
         } else {
                 /* Got key press/release event */
-                kbd_event_t *event =
-                    (kbd_event_t *) malloc(sizeof(kbd_event_t));
-                if (event == NULL) {
-                        return ENOMEM;
-                }
-
-                link_initialize(&event->link);
-                event->type = type;
-                event->key = key;
-                event->mods = mods;
-                event->c = c;
-
-                prodcons_produce(&active_console->input_pc,
-                    &event->link);
-        }
-
-        return EOK;
+                event.type = CEV_KEY;
+
+                event.ev.key.type = type;
+                event.ev.key.key = key;
+                event.ev.key.mods = mods;
+                event.ev.key.c = c;
+
+                console_queue_cons_event(active_console, &event);
+        }
+
+        return EOK;
+}
+
+/** Update pointer position.
+ *
+ * @param new_x New X coordinate (in pixels)
+ * @param new_y New Y coordinate (in pixels)
+ */
+static void pointer_update(int new_x, int new_y)
+{
+        bool upd_pointer;
+
+        /* Make sure coordinates are in range */
+
+        if (new_x < 0)
+                new_x = 0;
+        if (new_x >= (int)cols * mouse_scale_x)
+                new_x = cols * mouse_scale_x - 1;
+        if (new_y < 0)
+                new_y = 0;
+        if (new_y >= (int)rows * mouse_scale_y)
+                new_y = rows * mouse_scale_y - 1;
+
+        /* Determine if pointer moved to a different character cell */
+        upd_pointer = (new_x / mouse_scale_x != pointer_x / mouse_scale_x) ||
+            (new_y / mouse_scale_y != pointer_y / mouse_scale_y);
+
+        if (upd_pointer)
+                pointer_undraw();
+
+        /* Store new pointer position */
+        pointer_x = new_x;
+        pointer_y = new_y;
+
+        if (upd_pointer) {
+                pointer_draw();
+                cons_update(active_console);
+        }
 }
 
 static errno_t input_ev_move(input_t *input, int dx, int dy)
 {
+        pointer_update(pointer_x + dx, pointer_y + dy);
         return EOK;
 }
@@ -296 +422 @@
     unsigned max_x, unsigned max_y)
 {
+        pointer_update(mouse_scale_x * cols * x / max_x, mouse_scale_y * rows * y / max_y);
         return EOK;
 }
@@ -301 +428 @@
 static errno_t input_ev_button(input_t *input, int bnum, int bpress)
 {
+        cons_event_t event;
+
+        event.type = CEV_POS;
+        event.ev.pos.type = bpress ? POS_PRESS : POS_RELEASE;
+        event.ev.pos.btn_num = bnum;
+        event.ev.pos.hpos = pointer_x / mouse_scale_x;
+        event.ev.pos.vpos = pointer_y / mouse_scale_y;
+
+        console_queue_cons_event(active_console, &event);
         return EOK;
 }
@@ -310 +446 @@
 
         fibril_mutex_lock(&cons->mtx);
+        pointer_undraw();
 
         switch (ch) {
@@ -327 +464 @@
         }
 
+        pointer_draw();
         fibril_mutex_unlock(&cons->mtx);
 
@@ -336 +474 @@
 {
         fibril_mutex_lock(&cons->mtx);
+        pointer_undraw();
         chargrid_set_cursor_visibility(cons->frontbuf, visible);
+        pointer_draw();
         fibril_mutex_unlock(&cons->mtx);
 
@@ -379 +519 @@
                 if (pos < size) {
                         link_t *link = prodcons_consume(&cons->input_pc);
-                        kbd_event_t *event = list_get_instance(link, kbd_event_t, link);
+                        cons_event_t *event = list_get_instance(link,
+                            cons_event_t, link);
 
                         /* Accept key presses of printable chars only. */
-                        if ((event->type == KEY_PRESS) && (event->c != 0)) {
-                                char32_t tmp[2] = { event->c, 0 };
+                        if (event->type == CEV_KEY && event->ev.key.type == KEY_PRESS &&
+                            (event->ev.key.c != 0)) {
+                                char32_t tmp[2] = { event->ev.key.c, 0 };
                                 wstr_to_str(cons->char_remains, UTF8_CHAR_BUFFER_SIZE, tmp);
                                 cons->char_remains_len = str_size(cons->char_remains);
@@ -420 +562 @@
 
         fibril_mutex_lock(&cons->mtx);
+        pointer_undraw();
         chargrid_clear(cons->frontbuf);
+        pointer_draw();
         fibril_mutex_unlock(&cons->mtx);
 
@@ -431 +575 @@
 
         fibril_mutex_lock(&cons->mtx);
+        pointer_undraw();
         chargrid_set_cursor(cons->frontbuf, col, row);
+        pointer_draw();
         fibril_mutex_unlock(&cons->mtx);
 
@@ -511 +657 @@
         console_t *cons = srv_to_console(srv);
         link_t *link = prodcons_consume(&cons->input_pc);
-        kbd_event_t *kevent = list_get_instance(link, kbd_event_t, link);
-
-        event->type = CEV_KEY;
-        event->ev.key = *kevent;
-
-        free(kevent);
+        cons_event_t *cevent = list_get_instance(link, cons_event_t, link);
+
+        *event = *cevent;
+        free(cevent);
         return EOK;
 }
@@ -621 +765 @@
         /* Update front buffer from user buffer */
 
+        pointer_undraw();
+
         for (row = r0; row < r1; row++) {
                 for (col = c0; col < c1; col++) {
@@ -628 +774 @@
         }
 
+        pointer_draw();
         fibril_mutex_unlock(&cons->mtx);