Changeset 178d6a3 in mainline for uspace/srv/hid/remcons/remcons.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/remcons.c (modified) (3 diffs)

uspace/srv/hid/remcons/remcons.c

@@ -112 +112 @@
                         break;
                 case CONSOLE_GET_POS:
-                        async_answer_2(callid, EOK, 0, 0);
+                        fibril_mutex_lock(&user->guard);
+                        async_answer_2(callid, EOK, user->cursor_x, 0);
+                        fibril_mutex_unlock(&user->guard);
                         break;
                 case CONSOLE_GET_EVENT: {
@@ -125 +127 @@
                         break;
                 }
-                case CONSOLE_GOTO:
-                        async_answer_0(callid, ENOTSUP);
-                        break;
+                case CONSOLE_GOTO: {
+                        int new_x = IPC_GET_ARG1(call);
+                        telnet_user_update_cursor_x(user, new_x);
+                        async_answer_0(callid, ENOTSUP);
+                        break;
+                }
                 case VFS_OUT_READ:
                         async_answer_0(callid, ENOTSUP);
                         break;
                 case VFS_OUT_WRITE: {
-                        char *buf;
-                        char *buf_converted;
+                        uint8_t *buf;
                         size_t size;
                         int rc = async_data_write_accept((void **)&buf, false, 0, 0, 0, &size);
@@ -141 +145 @@
                                 break;
                         }
-                        buf_converted = malloc(2 * size + 1);
-                        assert(buf_converted);
-                        int buf_converted_size = 0;
-                        /* Convert new-lines. */
-                        for (size_t i = 0; i < size; i++) {
-                                if (buf[i] == 10) {
-                                        buf_converted[buf_converted_size++] = 13;
-                                        buf_converted[buf_converted_size++] = 10;
-                                } else {
-                                        buf_converted[buf_converted_size++] = buf[i];
-                                }
-                        }
-                        /* Add terminating zero for printing purposes. */
-                        buf_converted[buf_converted_size] = 0;
-
-                        fibril_mutex_lock(&user->guard);
-                        rc = send(user->socket, buf_converted, buf_converted_size, 0);
-                        fibril_mutex_unlock(&user->guard);
+
+                        rc = telnet_user_send_data(user, buf, size);
                         free(buf);