Changeset d3109ff in mainline for uspace/srv/hid/remcons/user.c

Timestamp:

2024-09-24T17:59:36Z (6 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

6a753a9c

Parents:

3fcea34

Message:

Cursor and color control in remote console + RGB

Move vt100 module from output server into separate vt library
Add cursor and color control to remcons using libvt
Add RGB color control to serial console and remote console

File:

• uspace/srv/hid/remcons/user.c (modified) (11 diffs)

uspace/srv/hid/remcons/user.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2012 Vojtech Horky
  * All rights reserved.
@@ -37 +38 @@
 #include <adt/prodcons.h>
 #include <errno.h>
+#include <mem.h>
 #include <str_error.h>
 #include <loc.h>
@@ -48 +50 @@
 #include <inttypes.h>
 #include <assert.h>
+#include "remcons.h"
 #include "user.h"
 #include "telnet.h"
@@ -90 +93 @@
 
         user->cursor_x = 0;
+        user->cursor_y = 0;
 
         return user;
@@ -182 +186 @@
 }
 
+static errno_t telnet_user_fill_recv_buf(telnet_user_t *user)
+{
+        errno_t rc;
+        size_t recv_length;
+
+        rc = tcp_conn_recv_wait(user->conn, user->socket_buffer,
+            BUFFER_SIZE, &recv_length);
+        if (rc != EOK)
+                return rc;
+
+        if (recv_length == 0) {
+                user->socket_closed = true;
+                user->srvs.aborted = true;
+                return ENOENT;
+        }
+
+        user->socket_buffer_len = recv_length;
+        user->socket_buffer_pos = 0;
+
+        return EOK;
+}
+
 /** Receive next byte from a socket (use buffering.
  * We need to return the value via extra argument because the read byte
@@ -188 +214 @@
 static errno_t telnet_user_recv_next_byte_no_lock(telnet_user_t *user, char *byte)
 {
+        errno_t rc;
+
         /* No more buffered data? */
         if (user->socket_buffer_len <= user->socket_buffer_pos) {
-                errno_t rc;
-                size_t recv_length;
-
-                rc = tcp_conn_recv_wait(user->conn, user->socket_buffer,
-                    BUFFER_SIZE, &recv_length);
+                rc = telnet_user_fill_recv_buf(user);
                 if (rc != EOK)
                         return rc;
-
-                if (recv_length == 0) {
-                        user->socket_closed = true;
-                        user->srvs.aborted = true;
-                        return ENOENT;
-                }
-
-                user->socket_buffer_len = recv_length;
-                user->socket_buffer_pos = 0;
         }
 
         *byte = user->socket_buffer[user->socket_buffer_pos++];
-
+        return EOK;
+}
+
+errno_t telnet_user_recv(telnet_user_t *user, void *data, size_t size,
+    size_t *nread)
+{
+        errno_t rc;
+        size_t nb;
+
+        /* No more buffered data? */
+        if (user->socket_buffer_len <= user->socket_buffer_pos) {
+                rc = telnet_user_fill_recv_buf(user);
+                if (rc != EOK)
+                        return rc;
+        }
+
+        nb = user->socket_buffer_len - user->socket_buffer_pos;
+        memcpy(data, user->socket_buffer + user->socket_buffer_pos, nb);
+        user->socket_buffer_pos += nb;
+        *nread = nb;
         return EOK;
 }
@@ -283 +317 @@
                 /* Skip zeros, bail-out on error. */
                 while (next_byte == 0) {
+                        fibril_mutex_unlock(&user->guard);
+
                         errno_t rc = telnet_user_recv_next_byte_no_lock(user, &next_byte);
-                        if (rc != EOK) {
-                                fibril_mutex_unlock(&user->guard);
+                        if (rc != EOK)
                                 return rc;
-                        }
+
                         uint8_t byte = (uint8_t) next_byte;
+                        fibril_mutex_lock(&user->guard);
 
                         /* Skip telnet commands. */
@@ -339 +375 @@
  * @param size Size of @p data buffer in bytes.
  */
-static errno_t telnet_user_send_data_no_lock(telnet_user_t *user, uint8_t *data, size_t size)
+static errno_t telnet_user_send_data_no_lock(telnet_user_t *user,
+    const char *data, size_t size)
 {
         uint8_t *converted = malloc(3 * size + 1);
@@ -351 +388 @@
                         converted[converted_size++] = 10;
                         user->cursor_x = 0;
+                        if (user->cursor_y < user->rows - 1)
+                                ++user->cursor_y;
                 } else {
                         converted[converted_size++] = data[i];
@@ -373 +412 @@
  * @param size Size of @p data buffer in bytes.
  */
-errno_t telnet_user_send_data(telnet_user_t *user, uint8_t *data, size_t size)
+errno_t telnet_user_send_data(telnet_user_t *user, const char *data,
+    size_t size)
 {
         fibril_mutex_lock(&user->guard);
@@ -395 +435 @@
         fibril_mutex_lock(&user->guard);
         if (user->cursor_x - 1 == new_x) {
-                uint8_t data = '\b';
+                char data = '\b';
                 /* Ignore errors. */
                 telnet_user_send_data_no_lock(user, &data, 1);