Index: uspace/lib/c/include/io/console.h =================================================================== --- uspace/lib/c/include/io/console.h (revision 568693b4ffd7507137fd1b683b8d1b74cc66e410) +++ uspace/lib/c/include/io/console.h (revision 74fec95157755e9eb38e0effb7f2c4cdabcfd4cb) @@ -37,4 +37,5 @@ #include +#include #include #include @@ -70,27 +71,4 @@ } console_ctrl_t; -typedef enum { - KEY_PRESS, - KEY_RELEASE -} kbd_event_type_t; - -/** Console event structure. */ -typedef struct { - /** List handle */ - link_t link; - - /** Press or release event. */ - kbd_event_type_t type; - - /** Keycode of the key that was pressed or released. */ - keycode_t key; - - /** Bitmask of modifiers held. */ - keymod_t mods; - - /** The character that was generated or '\0' for none. */ - wchar_t c; -} kbd_event_t; - extern console_ctrl_t *console_init(FILE *, FILE *); extern void console_done(console_ctrl_t *); Index: uspace/lib/c/include/io/input.h =================================================================== --- uspace/lib/c/include/io/input.h (revision 74fec95157755e9eb38e0effb7f2c4cdabcfd4cb) +++ uspace/lib/c/include/io/input.h (revision 74fec95157755e9eb38e0effb7f2c4cdabcfd4cb) @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2012 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_IO_INPUT_H_ +#define LIBC_IO_INPUT_H_ + +#include +#include +#include + +struct input_ev_ops; + +typedef struct { + async_sess_t *sess; + struct input_ev_ops *ev_ops; + void *user; +} input_t; + +typedef struct input_ev_ops { + int (*key)(input_t *, kbd_event_type_t, keycode_t, keymod_t, wchar_t); + int (*move)(input_t *, int, int); + int (*abs_move)(input_t *, unsigned, unsigned, unsigned, unsigned); + int (*button)(input_t *, int, int); +} input_ev_ops_t; + +extern int input_open(async_sess_t *, input_ev_ops_t *, void *, input_t **); +extern void input_close(input_t *); +extern int input_yield(input_t *); +extern int input_reclaim(input_t *); + +#endif + +/** @} + */ Index: uspace/lib/c/include/io/kbd_event.h =================================================================== --- uspace/lib/c/include/io/kbd_event.h (revision 74fec95157755e9eb38e0effb7f2c4cdabcfd4cb) +++ uspace/lib/c/include/io/kbd_event.h (revision 74fec95157755e9eb38e0effb7f2c4cdabcfd4cb) @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2012 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_IO_KBD_EVENT_H_ +#define LIBC_IO_KBD_EVENT_H_ + +#include +#include + +typedef enum { + KEY_PRESS, + KEY_RELEASE +} kbd_event_type_t; + +/** Console event structure. */ +typedef struct { + /** List handle */ + link_t link; + + /** Press or release event. */ + kbd_event_type_t type; + + /** Keycode of the key that was pressed or released. */ + keycode_t key; + + /** Bitmask of modifiers held. */ + keymod_t mods; + + /** The character that was generated or '\0' for none. */ + wchar_t c; +} kbd_event_t; + +#endif + +/** @} + */