Changeset ed267bc in mainline for uspace/srv

Timestamp:

2013-04-15T06:30:48Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

077bc931

Parents:

166a1f57 (diff), c80be58 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge console mouse event support.

Location:

uspace/srv/hid

Files:

• console/console.c (modified) (3 diffs)
• remcons/remcons.c (modified) (3 diffs)

uspace/srv/hid/console/console.c

@@ -129 +129 @@
 static void cons_set_rgb_color(con_srv_t *, pixel_t, pixel_t);
 static void cons_set_cursor_visibility(con_srv_t *, bool);
-static int cons_get_event(con_srv_t *, kbd_event_t *);
+static int cons_get_event(con_srv_t *, cons_event_t *);
 
 static con_ops_t con_ops = {
@@ -490 +490 @@
 }
 
-static int cons_get_event(con_srv_t *srv, kbd_event_t *event)
+static int cons_get_event(con_srv_t *srv, cons_event_t *event)
 {
         console_t *cons = srv_to_console(srv);
@@ -496 +496 @@
         kbd_event_t *kevent = list_get_instance(link, kbd_event_t, link);
         
-        *event = *kevent;
+        event->type = CEV_KEY;
+        event->ev.key = *kevent;
         free(kevent);
         return EOK;

uspace/srv/hid/remcons/remcons.c

@@ -80 +80 @@
 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 +185 @@
 }
 
-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 +197 @@
                 return EOK;
         }
+
+        event->type = CEV_KEY;
+        event->ev.key = kevent;
 
         return EOK;