Index: uspace/lib/c/include/io/charfield.h =================================================================== --- uspace/lib/c/include/io/charfield.h (revision 6cef8d6a633ccd8d6545bfa8b87ae7113b8d30ed) +++ (revision ) @@ -1,107 +1,0 @@ -/* - * Copyright (c) 2006 Josef Cejka - * Copyright (c) 2011 Petr Koupy - * 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_CHARFIELD_H_ -#define _LIBC_IO_CHARFIELD_H_ - -#include -#include -#include -#include -#include - -typedef enum { - CHAR_FLAG_NONE = 0, - CHAR_FLAG_DIRTY = 1 -} char_flags_t; - -typedef enum { - CHAR_ATTR_STYLE, - CHAR_ATTR_INDEX, - CHAR_ATTR_RGB -} char_attr_type_t; - -typedef struct { - console_color_t bgcolor; - console_color_t fgcolor; - console_color_attr_t attr; -} char_attr_index_t; - -typedef struct { - pixel_t bgcolor; - pixel_t fgcolor; -} char_attr_rgb_t; - -typedef union { - console_style_t style; - char_attr_index_t index; - char_attr_rgb_t rgb; -} char_attr_val_t; - -typedef struct { - char_attr_type_t type; - char_attr_val_t val; -} char_attrs_t; - -typedef struct { - char32_t ch; - char_attrs_t attrs; - char_flags_t flags; -} charfield_t; - -static inline bool attrs_same(char_attrs_t a1, char_attrs_t a2) -{ - if (a1.type != a2.type) - return false; - - switch (a1.type) { - case CHAR_ATTR_STYLE: - return (a1.val.style == a2.val.style); - case CHAR_ATTR_INDEX: - return (a1.val.index.bgcolor == a2.val.index.bgcolor) && - (a1.val.index.fgcolor == a2.val.index.fgcolor) && - (a1.val.index.attr == a2.val.index.attr); - case CHAR_ATTR_RGB: - return (a1.val.rgb.bgcolor == a2.val.rgb.bgcolor) && - (a1.val.rgb.fgcolor == a2.val.rgb.fgcolor); - } - - return false; -} - -#endif - -/** @} - */ Index: uspace/lib/c/include/io/chargrid.h =================================================================== --- uspace/lib/c/include/io/chargrid.h (revision 6cef8d6a633ccd8d6545bfa8b87ae7113b8d30ed) +++ (revision ) @@ -1,103 +1,0 @@ -/* - * Copyright (c) 2011 Martin Decky - * 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_CHARGRID_H_ -#define _LIBC_IO_CHARGRID_H_ - -#include -#include -#include - -typedef enum { - CHARGRID_FLAG_NONE = 0, - CHARGRID_FLAG_SHARED = 1 -} chargrid_flag_t; - -typedef struct { - size_t size; /**< Structure size */ - chargrid_flag_t flags; /**< Screenbuffer flags */ - - sysarg_t cols; /**< Number of columns */ - sysarg_t rows; /**< Number of rows */ - - sysarg_t col; /**< Current column */ - sysarg_t row; /**< Current row */ - bool cursor_visible; /**< Cursor visibility */ - - char_attrs_t attrs; /**< Current attributes */ - - sysarg_t top_row; /**< The first row in the cyclic buffer */ - charfield_t data[]; /**< Screen contents (cyclic buffer) */ -} chargrid_t; - -static inline charfield_t *chargrid_charfield_at(chargrid_t *chargrid, - sysarg_t col, sysarg_t row) -{ - return chargrid->data + - ((row + chargrid->top_row) % chargrid->rows) * chargrid->cols + - col; -} - -extern chargrid_t *chargrid_create(sysarg_t, sysarg_t, - chargrid_flag_t); -extern void chargrid_destroy(chargrid_t *); - -extern bool chargrid_cursor_at(chargrid_t *, sysarg_t, sysarg_t); - -extern sysarg_t chargrid_get_top_row(chargrid_t *); - -extern sysarg_t chargrid_putuchar(chargrid_t *, char32_t, bool); -extern sysarg_t chargrid_newline(chargrid_t *); -extern sysarg_t chargrid_tabstop(chargrid_t *, sysarg_t); -extern sysarg_t chargrid_backspace(chargrid_t *); - -extern void chargrid_clear(chargrid_t *); -extern void chargrid_clear_row(chargrid_t *, sysarg_t); - -extern void chargrid_set_cursor(chargrid_t *, sysarg_t, sysarg_t); -extern void chargrid_set_cursor_visibility(chargrid_t *, bool); -extern bool chargrid_get_cursor_visibility(chargrid_t *); - -extern void chargrid_get_cursor(chargrid_t *, sysarg_t *, sysarg_t *); - -extern void chargrid_set_style(chargrid_t *, console_style_t); -extern void chargrid_set_color(chargrid_t *, console_color_t, - console_color_t, console_color_attr_t); -extern void chargrid_set_rgb_color(chargrid_t *, pixel_t, pixel_t); - -#endif - -/** @} - */ Index: uspace/lib/c/include/io/color.h =================================================================== --- uspace/lib/c/include/io/color.h (revision 6cef8d6a633ccd8d6545bfa8b87ae7113b8d30ed) +++ (revision ) @@ -1,58 +1,0 @@ -/* - * Copyright (c) 2023 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_ - -typedef enum { - COLOR_BLACK = 0, - COLOR_BLUE = 1, - COLOR_GREEN = 2, - COLOR_CYAN = 3, - COLOR_RED = 4, - COLOR_MAGENTA = 5, - COLOR_YELLOW = 6, - COLOR_WHITE = 7 -} console_color_t; - -typedef enum { - CATTR_NORMAL = 0, - CATTR_BRIGHT = 8, - CATTR_BLINK = 16 -} console_color_attr_t; - -#endif - -/** @} - */ Index: uspace/lib/c/include/io/concaps.h =================================================================== --- uspace/lib/c/include/io/concaps.h (revision 6cef8d6a633ccd8d6545bfa8b87ae7113b8d30ed) +++ (revision ) @@ -1,48 +1,0 @@ -/* - * Copyright (c) 2023 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_CONCAPS_H_ -#define _LIBC_IO_CONCAPS_H_ - -typedef enum { - CONSOLE_CAP_NONE = 0, - CONSOLE_CAP_STYLE = 1, - CONSOLE_CAP_INDEXED = 2, - CONSOLE_CAP_RGB = 4 -} console_caps_t; - -#endif - -/** @} - */