Index: uspace/lib/c/generic/io/console.c =================================================================== --- uspace/lib/c/generic/io/console.c (revision bc4bf97d6619b5cf663971d8ca58cbc438e85c65) +++ uspace/lib/c/generic/io/console.c (revision 07b7c48db097d0b27a33d03332ecd39ea551a2b9) @@ -154,5 +154,5 @@ } -bool console_get_kbd_event(console_ctrl_t *ctrl, kbd_event_t *event) +bool console_get_event(console_ctrl_t *ctrl, cons_event_t *event) { if (ctrl->input_aid == 0) { @@ -171,8 +171,9 @@ } - event->type = type; - event->key = key; - event->mods = mods; - event->c = c; + event->type = CEV_KEY; + event->ev.key.type = type; + event->ev.key.key = key; + event->ev.key.mods = mods; + event->ev.key.c = c; } else { sysarg_t retval; @@ -186,8 +187,9 @@ } - event->type = IPC_GET_ARG1(ctrl->input_call); - event->key = IPC_GET_ARG2(ctrl->input_call); - event->mods = IPC_GET_ARG3(ctrl->input_call); - event->c = IPC_GET_ARG4(ctrl->input_call); + event->type = CEV_KEY; + event->ev.key.type = IPC_GET_ARG1(ctrl->input_call); + event->ev.key.key = IPC_GET_ARG2(ctrl->input_call); + event->ev.key.mods = IPC_GET_ARG3(ctrl->input_call); + event->ev.key.c = IPC_GET_ARG4(ctrl->input_call); } @@ -195,5 +197,5 @@ } -bool console_get_kbd_event_timeout(console_ctrl_t *ctrl, kbd_event_t *event, +bool console_get_event_timeout(console_ctrl_t *ctrl, cons_event_t *event, suseconds_t *timeout) { @@ -223,8 +225,9 @@ } - event->type = IPC_GET_ARG1(ctrl->input_call); - event->key = IPC_GET_ARG2(ctrl->input_call); - event->mods = IPC_GET_ARG3(ctrl->input_call); - event->c = IPC_GET_ARG4(ctrl->input_call); + event->type = CEV_KEY; + event->ev.key.type = IPC_GET_ARG1(ctrl->input_call); + event->ev.key.key = IPC_GET_ARG2(ctrl->input_call); + event->ev.key.mods = IPC_GET_ARG3(ctrl->input_call); + event->ev.key.c = IPC_GET_ARG4(ctrl->input_call); /* Update timeout */ Index: uspace/lib/c/include/io/cons_event.h =================================================================== --- uspace/lib/c/include/io/cons_event.h (revision 07b7c48db097d0b27a33d03332ecd39ea551a2b9) +++ uspace/lib/c/include/io/cons_event.h (revision 07b7c48db097d0b27a33d03332ecd39ea551a2b9) @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2013 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_CONS_EVENT_H_ +#define LIBC_IO_CONS_EVENT_H_ + +#include +#include +#include + +typedef enum { + /** Key event */ + CEV_KEY, + /** Position event */ + CEV_POS +} cons_event_type_t; + +/** Console event structure. */ +typedef struct { + /** List handle */ + link_t link; + + /** Event type */ + cons_event_type_t type; + + union { + kbd_event_t key; + pos_event_t pos; + } ev; +} cons_event_t; + +#endif + +/** @} + */ Index: uspace/lib/c/include/io/console.h =================================================================== --- uspace/lib/c/include/io/console.h (revision bc4bf97d6619b5cf663971d8ca58cbc438e85c65) +++ uspace/lib/c/include/io/console.h (revision 07b7c48db097d0b27a33d03332ecd39ea551a2b9) @@ -39,4 +39,5 @@ #include #include +#include #include #include @@ -82,6 +83,6 @@ 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 *); Index: uspace/lib/clui/tinput.c =================================================================== --- uspace/lib/clui/tinput.c (revision bc4bf97d6619b5cf663971d8ca58cbc438e85c65) +++ uspace/lib/clui/tinput.c (revision 07b7c48db097d0b27a33d03332ecd39ea551a2b9) @@ -816,30 +816,32 @@ console_flush(ti->console); - kbd_event_t ev; - if (!console_get_kbd_event(ti->console, &ev)) + cons_event_t ev; + if (!console_get_event(ti->console, &ev)) return EIO; - if (ev.type != KEY_PRESS) + if (ev.type != CEV_KEY || ev.ev.key.type != KEY_PRESS) continue; - if (((ev.mods & KM_CTRL) != 0) && - ((ev.mods & (KM_ALT | KM_SHIFT)) == 0)) - tinput_key_ctrl(ti, &ev); - - if (((ev.mods & KM_SHIFT) != 0) && - ((ev.mods & (KM_CTRL | KM_ALT)) == 0)) - tinput_key_shift(ti, &ev); - - if (((ev.mods & KM_CTRL) != 0) && - ((ev.mods & KM_SHIFT) != 0) && - ((ev.mods & KM_ALT) == 0)) - tinput_key_ctrl_shift(ti, &ev); - - if ((ev.mods & (KM_CTRL | KM_ALT | KM_SHIFT)) == 0) - tinput_key_unmod(ti, &ev); - - if (ev.c >= ' ') { + kbd_event_t *kev = &ev.ev.key; + + if (((kev->mods & KM_CTRL) != 0) && + ((kev->mods & (KM_ALT | KM_SHIFT)) == 0)) + tinput_key_ctrl(ti, kev); + + if (((kev->mods & KM_SHIFT) != 0) && + ((kev->mods & (KM_CTRL | KM_ALT)) == 0)) + tinput_key_shift(ti, kev); + + if (((kev->mods & KM_CTRL) != 0) && + ((kev->mods & KM_SHIFT) != 0) && + ((kev->mods & KM_ALT) == 0)) + tinput_key_ctrl_shift(ti, kev); + + if ((kev->mods & (KM_CTRL | KM_ALT | KM_SHIFT)) == 0) + tinput_key_unmod(ti, kev); + + if (kev->c >= ' ') { tinput_sel_delete(ti); - tinput_insert_char(ti, ev.c); + tinput_insert_char(ti, kev->c); } }