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

Timestamp:

2012-01-12T11:03:17Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

03e0a244

Parents:

c17c4e28

Message:

remcons: handle backspace

The handling is a bit hackish because the server pretends that it remembers
X cursor position and sends BS manually when they differ (with the new one)
by minus one.

File:

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

uspace/srv/hid/remcons/user.c

@@ -100 +100 @@
         fibril_mutex_unlock(&users_guard);
 
+        user->cursor_x = 0;
+
         return user;
 }
@@ -245 +247 @@
 }
 
+/** Process telnet command (currently only print to screen).
+ *
+ * @param user Telnet user structure.
+ * @param option_code Command option code.
+ * @param cmd Telnet command.
+ */
 static void process_telnet_command(telnet_user_t *user,
     telnet_cmd_t option_code, telnet_cmd_t cmd)
@@ -257 +265 @@
 }
 
+/** Get next keyboard event.
+ *
+ * @param user Telnet user.
+ * @param event Where to store the keyboard event.
+ * @return Error code.
+ */
 int telnet_user_get_next_keyboard_event(telnet_user_t *user, kbd_event_t *event)
 {
@@ -318 +332 @@
 }
 
+/** Send data (convert them first) to the socket, no locking.
+ *
+ * @param user Telnet user.
+ * @param data Data buffer (not zero terminated).
+ * @param size Size of @p data buffer in bytes.
+ */
+static int telnet_user_send_data_no_lock(telnet_user_t *user, uint8_t *data, size_t size)
+{
+        uint8_t *converted = malloc(3 * size + 1);
+        assert(converted);
+        int converted_size = 0;
+
+        /* Convert new-lines. */
+        for (size_t i = 0; i < size; i++) {
+                if (data[i] == 10) {
+                        converted[converted_size++] = 13;
+                        converted[converted_size++] = 10;
+                        user->cursor_x = 0;
+                } else {
+                        converted[converted_size++] = data[i];
+                        if (data[i] == '\b') {
+                                user->cursor_x--;
+                        } else {
+                                user->cursor_x++;
+                        }
+                }
+        }
+
+
+        int rc = send(user->socket, converted, converted_size, 0);
+        free(converted);
+
+        return rc;
+}
+
+/** Send data (convert them first) to the socket.
+ *
+ * @param user Telnet user.
+ * @param data Data buffer (not zero terminated).
+ * @param size Size of @p data buffer in bytes.
+ */
+int telnet_user_send_data(telnet_user_t *user, uint8_t *data, size_t size)
+{
+        fibril_mutex_lock(&user->guard);
+
+        int rc = telnet_user_send_data_no_lock(user, data, size);
+
+        fibril_mutex_unlock(&user->guard);
+
+        return rc;
+}
+
+/** Update cursor X position.
+ *
+ * This call may result in sending control commands over socket.
+ *
+ * @param user Telnet user.
+ * @param new_x New cursor location.
+ */
+void telnet_user_update_cursor_x(telnet_user_t *user, int new_x)
+{
+        fibril_mutex_lock(&user->guard);
+        if (user->cursor_x - 1 == new_x) {
+                uint8_t data = '\b';
+                /* Ignore errors. */
+                telnet_user_send_data_no_lock(user, &data, 1);
+        }
+        user->cursor_x = new_x;
+        fibril_mutex_unlock(&user->guard);
+
+}
+
 /**
  * @}