Changeset 41811af in mainline for uspace/lib/c/include/io/console.h

Timestamp:

2011-06-10T10:14:26Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

ab547063

Parents:

9536e6e (diff), 390d80d (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 mainline

File:

• uspace/lib/c/include/io/console.h (modified) (3 diffs)

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

@@ -36 +36 @@
 #define LIBC_IO_CONSOLE_H_
 
+#include <sys/time.h>
+#include <async.h>
 #include <bool.h>
-
-typedef enum {
-        KEY_PRESS,
-        KEY_RELEASE
-} console_ev_type_t;
+#include <stdio.h>
 
 typedef enum {
@@ -50 +48 @@
 } console_caps_t;
 
+/** Console control structure. */
+typedef struct {
+        /** Console input file */
+        FILE *input;
+        
+        /** Console output file */
+        FILE *output;
+        
+        /** Console input session */
+        async_sess_t *input_sess;
+        
+        /** Console output session */
+        async_sess_t *output_sess;
+        
+        /** Input request call with timeout */
+        ipc_call_t input_call;
+        
+        /** Input response with timeout */
+        aid_t input_aid;
+} console_ctrl_t;
+
+typedef enum {
+        KEY_PRESS,
+        KEY_RELEASE
+} kbd_event_type_t;
+
 /** Console event structure. */
 typedef struct {
         /** Press or release event. */
-        console_ev_type_t type;
+        kbd_event_type_t type;
         
         /** Keycode of the key that was pressed or released. */
@@ -63 +87 @@
         /** The character that was generated or '\0' for none. */
         wchar_t c;
-} console_event_t;
+} kbd_event_t;
 
-extern void console_clear(int phone);
+extern console_ctrl_t *console_init(FILE *, FILE *);
+extern void console_done(console_ctrl_t *);
+extern bool console_kcon(void);
 
-extern int console_get_size(int phone, sysarg_t *cols, sysarg_t *rows);
-extern int console_get_pos(int phone, sysarg_t *col, sysarg_t *row);
-extern void console_set_pos(int phone, sysarg_t col, sysarg_t row);
+extern void console_flush(console_ctrl_t *);
+extern void console_clear(console_ctrl_t *);
 
-extern void console_set_style(int phone, uint8_t style);
-extern void console_set_color(int phone, uint8_t fg_color, uint8_t bg_color,
-    uint8_t flags);
-extern void console_set_rgb_color(int phone, uint32_t fg_color, uint32_t bg_color);
+extern int console_get_size(console_ctrl_t *, sysarg_t *, sysarg_t *);
+extern int console_get_pos(console_ctrl_t *, sysarg_t *, sysarg_t *);
+extern void console_set_pos(console_ctrl_t *, sysarg_t, sysarg_t);
 
-extern void console_cursor_visibility(int phone, bool show);
-extern int console_get_color_cap(int phone, sysarg_t *ccap);
-extern void console_kcon_enable(int phone);
+extern void console_set_style(console_ctrl_t *, uint8_t);
+extern void console_set_color(console_ctrl_t *, uint8_t, uint8_t, uint8_t);
+extern void console_set_rgb_color(console_ctrl_t *, uint32_t, uint32_t);
 
-extern bool console_get_event(int phone, console_event_t *event);
+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 *,
+    suseconds_t *);
 
 #endif