Changes in uspace/srv/hid/remcons/remcons.c [5d94b16c:1c635d6] in mainline

File:

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

uspace/srv/hid/remcons/remcons.c

@@ -40 +40 @@
 #include <str_error.h>
 #include <loc.h>
-#include <event.h>
 #include <io/keycode.h>
 #include <align.h>
@@ -80 +79 @@
 static int remcons_get_size(con_srv_t *, sysarg_t *, sysarg_t *);
 static int remcons_get_color_cap(con_srv_t *, console_caps_t *);
-static int remcons_get_event(con_srv_t *, kbd_event_t *);
+static int remcons_get_event(con_srv_t *, cons_event_t *);
 
 static con_ops_t con_ops = {
@@ -185 +184 @@
 }
 
-static int remcons_get_event(con_srv_t *srv, kbd_event_t *event)
-{
-        telnet_user_t *user = srv_to_user(srv);
+static int remcons_get_event(con_srv_t *srv, cons_event_t *event)
+{
+        telnet_user_t *user = srv_to_user(srv);
+        kbd_event_t kevent;
         int rc;
 
-        rc = telnet_user_get_next_keyboard_event(user, event);
+        rc = telnet_user_get_next_keyboard_event(user, &kevent);
         if (rc != EOK) {
                 /* XXX What? */
@@ -196 +196 @@
                 return EOK;
         }
+
+        event->type = CEV_KEY;
+        event->ev.key = kevent;
 
         return EOK;
@@ -221 +224 @@
 {
         telnet_user_t *user = arg;
-        int rc;
-
-        char term[LOC_NAME_MAXLEN];
-        snprintf(term, LOC_NAME_MAXLEN, "%s/%s", "/loc", user->service_name);
-
+        
         task_id_t task;
-        rc = task_spawnl(&task, APP_GETTERM, APP_GETTERM, "-w", term, APP_SHELL, NULL);
-        if (rc != EOK) {
-                telnet_user_error(user, "Spawning `%s -w %s %s' failed: %s.",
-                    APP_GETTERM, term, APP_SHELL, str_error(rc));
+        task_wait_t wait;
+        int rc = task_spawnl(&task, &wait, APP_GETTERM, APP_GETTERM, user->service_name,
+            "/loc", "--msg", "--", APP_SHELL, NULL);
+        if (rc != EOK) {
+                telnet_user_error(user, "Spawning `%s %s /loc --msg -- %s' "
+                    "failed: %s.", APP_GETTERM, user->service_name, APP_SHELL,
+                    str_error(rc));
                 fibril_mutex_lock(&user->guard);
                 user->task_finished = true;
@@ -245 +247 @@
         task_exit_t task_exit;
         int task_retval;
-        task_wait(task, &task_exit, &task_retval);
+        task_wait(&wait, &task_exit, &task_retval);
         telnet_user_log(user, "%s terminated %s, exit code %d.", APP_GETTERM,
             task_exit == TASK_EXIT_NORMAL ? "normally" : "unexpectedly",