Changes in uspace/srv/hid/console/console.c [2f90b46:8a99c7e] in mainline

File:

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

uspace/srv/hid/console/console.c

@@ -76 +76 @@
 } console_state_t;
 
+#define UTF8_CHAR_BUFFER_SIZE (STR_BOUNDS(1) + 1)
+
 typedef struct {
         atomic_t refcnt;           /**< Connection reference count */
         prodcons_t input_pc;       /**< Incoming keyboard events */
+        char char_remains[UTF8_CHAR_BUFFER_SIZE]; /**< Not yet sent bytes of last char event. */
+        size_t char_remains_len;   /**< Number of not yet sent bytes. */
         
         fibril_mutex_t mtx;        /**< Lock protecting mutable fields */
@@ -379 +383 @@
         
         fb_pointer_update(fb_sess, mouse.x, mouse.y, true);
+}
+
+static void cons_mouse_abs_move(sysarg_t x, sysarg_t y,
+    sysarg_t max_x, sysarg_t max_y)
+{
+        if (max_x && max_y) {
+                mouse.x = limit(x * xres / max_x, 0, xres);
+                mouse.y = limit(y * yres / max_y, 0, yres);
+                
+                fb_pointer_update(fb_sess, mouse.x, mouse.y, true);
+        }
 }
 
@@ -499 +514 @@
                         async_answer_0(callid, EOK);
                         break;
+                case INPUT_EVENT_ABS_MOVE:
+                        cons_mouse_abs_move(IPC_GET_ARG1(call), IPC_GET_ARG2(call),
+                            IPC_GET_ARG3(call), IPC_GET_ARG4(call));
+                        async_answer_0(callid, EOK);
+                        break;
                 case INPUT_EVENT_BUTTON:
                         /* Got pointer button press/release event */
@@ -613 +633 @@
         
         size_t pos = 0;
+        
+        /*
+         * Read input from keyboard and copy it to the buffer.
+         * We need to handle situation when wchar is split by 2 following
+         * reads.
+         */
         while (pos < size) {
-                link_t *link = prodcons_consume(&cons->input_pc);
-                kbd_event_t *event = list_get_instance(link, kbd_event_t, link);
-                
-                if (event->type == KEY_PRESS) {
-                        buf[pos] = event->c;
+                /* Copy to the buffer remaining characters. */
+                while ((pos < size) && (cons->char_remains_len > 0)) {
+                        buf[pos] = cons->char_remains[0];
                         pos++;
-                }
-                
-                free(event);
+                        
+                        /* Unshift the array. */
+                        for (size_t i = 1; i < cons->char_remains_len; i++)
+                                cons->char_remains[i - 1] = cons->char_remains[i];
+                        
+                        cons->char_remains_len--;
+                }
+                
+                /* Still not enough? Then get another key from the queue. */
+                if (pos < size) {
+                        link_t *link = prodcons_consume(&cons->input_pc);
+                        kbd_event_t *event = list_get_instance(link, kbd_event_t, link);
+                        
+                        /* Accept key presses of printable chars only. */
+                        if ((event->type == KEY_PRESS) && (event->c != 0)) {
+                                wchar_t tmp[2] = { event->c, 0 };
+                                wstr_to_str(cons->char_remains, UTF8_CHAR_BUFFER_SIZE, tmp);
+                                cons->char_remains_len = str_size(cons->char_remains);
+                        }
+                        
+                        free(event);
+                }
         }
         
@@ -930 +973 @@
                 fibril_mutex_initialize(&consoles[i].mtx);
                 prodcons_initialize(&consoles[i].input_pc);
+                consoles[i].char_remains_len = 0;
                 
                 if (graphics_state == GRAPHICS_FULL) {