Index: uspace/lib/libc/include/io/color.h =================================================================== --- uspace/lib/libc/include/io/color.h (revision 98000fb4ea6015506f059c9b121e417ce991ecfd) +++ uspace/lib/libc/include/io/color.h (revision 98000fb4ea6015506f059c9b121e417ce991ecfd) @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2008 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_COLOR_H_ +#define LIBC_IO_COLOR_H_ + +enum console_color { + COLOR_BLACK = 0, + COLOR_BLUE = 1, + COLOR_GREEN = 2, + COLOR_CYAN = 3, + COLOR_RED = 4, + COLOR_MAGENTA = 5, + COLOR_YELLOW = 6, + COLOR_WHITE = 7, + + CATTR_BRIGHT = 8, + CATTR_BLINK = 8 +}; + +#endif + +/** @} + */ Index: uspace/lib/libc/include/io/console.h =================================================================== --- uspace/lib/libc/include/io/console.h (revision 98000fb4ea6015506f059c9b121e417ce991ecfd) +++ uspace/lib/libc/include/io/console.h (revision 98000fb4ea6015506f059c9b121e417ce991ecfd) @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2008 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_CONSOLE_H_ +#define LIBC_IO_CONSOLE_H_ + +#include +#include + +typedef enum { + KEY_PRESS, + KEY_RELEASE +} console_ev_type_t; + +/** Console event structure. */ +typedef struct { + /** Press or release event. */ + console_ev_type_t type; + + /** Keycode of the key that was pressed or released. */ + unsigned int key; + + /** Bitmask of modifiers held. */ + unsigned int mods; + + /** The character that was generated or '\0' for none. */ + wchar_t c; +} console_event_t; + +extern void console_clear(int phone); + +extern int console_get_size(int phone, ipcarg_t *rows, ipcarg_t *cols); +extern void console_goto(int phone, ipcarg_t row, ipcarg_t col); + +extern void console_set_style(int phone, int style); +extern void console_set_color(int phone, int fg_color, int bg_color, int flags); +extern void console_set_rgb_color(int phone, int fg_color, int bg_color); + +extern void console_cursor_visibility(int phone, bool show); +extern void console_kcon_enable(int phone); + +extern bool console_get_event(int phone, console_event_t *event); + +#endif + +/** @} + */ Index: uspace/lib/libc/include/io/io.h =================================================================== --- uspace/lib/libc/include/io/io.h (revision 0b6d70d1d6d61b0c0592aa844bd8054ebbc0e04f) +++ (revision ) @@ -1,50 +1,0 @@ -/* - * Copyright (c) 2006 Josef Cejka - * 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_H_ -#define LIBC_IO_H_ - -#include - -int putnchars(const char * buf, size_t count); -int putstr(const char * str); -int putchar(int c); -int getchar(void); - -#endif - -/** @} - */ - - Index: uspace/lib/libc/include/io/keycode.h =================================================================== --- uspace/lib/libc/include/io/keycode.h (revision 98000fb4ea6015506f059c9b121e417ce991ecfd) +++ uspace/lib/libc/include/io/keycode.h (revision 98000fb4ea6015506f059c9b121e417ce991ecfd) @@ -0,0 +1,220 @@ +/* + * Copyright (c) 2009 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_KEYCODE_H_ +#define LIBC_IO_KEYCODE_H_ + +/** Keycode definitions. + * + * A keycode identifies a key by its position on the keyboard, rather + * than by its label. For human readability, key positions are noted + * with the key label on a keyboard with US layout. This label has + * nothing to do with the character, that the key produces + * -- this is determined by the keymap. + * + * The keyboard model reflects a standard PC keyboard layout. + * Non-standard keyboards need to be mapped to this model in some + * logical way. Scancodes are mapped to keycodes with a scanmap. + * + * For easier mapping to the model and to emphasize the nature of keycodes, + * they really are organized here by position, rather than by label. + */ +enum keycode { + + /* Main block row 1 */ + + KC_BACKTICK = 1, + + KC_1, + KC_2, + KC_3, + KC_4, + KC_5, + KC_6, + KC_7, + KC_8, + KC_9, + KC_0, + + KC_MINUS, + KC_EQUALS, + KC_BACKSPACE, + + /* Main block row 2 */ + + KC_TAB, + + KC_Q, + KC_W, + KC_E, + KC_R, + KC_T, + KC_Y, + KC_U, + KC_I, + KC_O, + KC_P, + + KC_LBRACKET, + KC_RBRACKET, + + /* Main block row 3 */ + + KC_CAPS_LOCK, + + KC_A, + KC_S, + KC_D, + KC_F, + KC_G, + KC_H, + KC_J, + KC_K, + KC_L, + + KC_SEMICOLON, + KC_QUOTE, + KC_BACKSLASH, + + KC_ENTER, + + /* Main block row 4 */ + + KC_LSHIFT, + + KC_Z, + KC_X, + KC_C, + KC_V, + KC_B, + KC_N, + KC_M, + + KC_COMMA, + KC_PERIOD, + KC_SLASH, + + KC_RSHIFT, + + /* Main block row 5 */ + + KC_LCTRL, + KC_LALT, + KC_SPACE, + KC_RALT, + KC_RCTRL, + + /* Function keys block */ + + KC_ESCAPE, + + KC_F1, + KC_F2, + KC_F3, + KC_F4, + KC_F5, + KC_F6, + KC_F7, + KC_F8, + KC_F9, + KC_F10, + KC_F11, + KC_F12, + + KC_PRTSCR, + KC_SCROLL_LOCK, + KC_PAUSE, + + /* Cursor keys block */ + + KC_INSERT, + KC_HOME, + KC_PAGE_UP, + + KC_DELETE, + KC_END, + KC_PAGE_DOWN, + + KC_UP, + KC_LEFT, + KC_DOWN, + KC_RIGHT, + + /* Numeric block */ + + KC_NUM_LOCK, + KC_NSLASH, + KC_NTIMES, + KC_NMINUS, + + KC_NPLUS, + KC_NENTER, + + KC_N7, + KC_N8, + KC_N9, + + KC_N4, + KC_N5, + KC_N6, + + KC_N1, + KC_N2, + KC_N3, + + KC_N0, + KC_NPERIOD + +} keycode_t; + +enum keymod { + KM_LSHIFT = 0x001, + KM_RSHIFT = 0x002, + KM_LCTRL = 0x004, + KM_RCTRL = 0x008, + KM_LALT = 0x010, + KM_RALT = 0x020, + KM_CAPS_LOCK = 0x040, + KM_NUM_LOCK = 0x080, + KM_SCROLL_LOCK = 0x100, + + KM_SHIFT = KM_LSHIFT | KM_RSHIFT, + KM_CTRL = KM_LCTRL | KM_RCTRL, + KM_ALT = KM_LALT | KM_RALT +} keymod_t; + +#endif + +/** @} + */ Index: uspace/lib/libc/include/io/klog.h =================================================================== --- uspace/lib/libc/include/io/klog.h (revision 98000fb4ea6015506f059c9b121e417ce991ecfd) +++ uspace/lib/libc/include/io/klog.h (revision 98000fb4ea6015506f059c9b121e417ce991ecfd) @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2006 Jakub Vana + * 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_STREAM_H_ +#define LIBC_STREAM_H_ + +#include + +extern size_t klog_write(const void *buf, size_t size); +extern void klog_update(void); + +#endif + +/** @} + */ Index: uspace/lib/libc/include/io/printf_core.h =================================================================== --- uspace/lib/libc/include/io/printf_core.h (revision 0b6d70d1d6d61b0c0592aa844bd8054ebbc0e04f) +++ uspace/lib/libc/include/io/printf_core.h (revision 98000fb4ea6015506f059c9b121e417ce991ecfd) @@ -57,4 +57,2 @@ /** @} */ - - Index: uspace/lib/libc/include/io/stream.h =================================================================== --- uspace/lib/libc/include/io/stream.h (revision 0b6d70d1d6d61b0c0592aa844bd8054ebbc0e04f) +++ (revision ) @@ -1,49 +1,0 @@ -/* - * Copyright (c) 2006 Jakub Vana - * 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_STREAM_H_ -#define LIBC_STREAM_H_ - -#include - -#define EMFILE -17 - -extern ssize_t read_stdin(void *, size_t); -extern int klog_puts(const char *); -extern void klog_update(void); - -#endif - -/** @} - */ Index: uspace/lib/libc/include/io/style.h =================================================================== --- uspace/lib/libc/include/io/style.h (revision 98000fb4ea6015506f059c9b121e417ce991ecfd) +++ uspace/lib/libc/include/io/style.h (revision 98000fb4ea6015506f059c9b121e417ce991ecfd) @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2008 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_STYLE_H_ +#define LIBC_IO_STYLE_H_ + +enum console_style { + STYLE_NORMAL = 0, + STYLE_EMPHASIS = 1 +}; + +#endif + +/** @} + */