Changeset ed267bc in mainline for uspace/lib/c/include

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/lib/c/include/io

Files:

• con_srv.h (modified) (2 diffs)
• cons_event.h (added)
• console.h (modified) (2 diffs)

uspace/lib/c/include/io/con_srv.h

@@ -41 +41 @@
 #include <io/color.h>
 #include <io/concaps.h>
-#include <io/kbd_event.h>
+#include <io/cons_event.h>
 #include <io/pixel.h>
 #include <io/style.h>
@@ -82 +82 @@
         void (*set_rgb_color)(con_srv_t *, pixel_t, pixel_t);
         void (*set_cursor_visibility)(con_srv_t *, bool);
-        int (*get_event)(con_srv_t *, kbd_event_t *);
+        int (*get_event)(con_srv_t *, cons_event_t *);
 } con_ops_t;
 

uspace/lib/c/include/io/console.h

@@ -39 +39 @@
 #include <io/concaps.h>
 #include <io/kbd_event.h>
+#include <io/cons_event.h>
 #include <io/keycode.h>
 #include <async.h>
@@ -82 +83 @@
 extern void console_cursor_visibility(console_ctrl_t *, bool);
 extern int console_get_color_cap(console_ctrl_t *, sysarg_t *);
-extern bool console_get_kbd_event(console_ctrl_t *, kbd_event_t *);
-extern bool console_get_kbd_event_timeout(console_ctrl_t *, kbd_event_t *,
+extern bool console_get_event(console_ctrl_t *, cons_event_t *);
+extern bool console_get_event_timeout(console_ctrl_t *, cons_event_t *,
     suseconds_t *);