Index: uspace/srv/hid/console/Makefile =================================================================== --- uspace/srv/hid/console/Makefile (revision 9f1362d4e7eaaca0f48042dc579d07341d14e38a) +++ uspace/srv/hid/console/Makefile (revision 883fedc17e531dbc742cf77dc44e3bff56c53dce) @@ -33,5 +33,4 @@ GENERIC_SOURCES = \ console.c \ - screenbuffer.c \ keybuffer.c \ gcons.c Index: uspace/srv/hid/console/console.c =================================================================== --- uspace/srv/hid/console/console.c (revision 9f1362d4e7eaaca0f48042dc579d07341d14e38a) +++ uspace/srv/hid/console/console.c (revision 883fedc17e531dbc742cf77dc44e3bff56c53dce) @@ -54,9 +54,11 @@ #include #include +#include +#include #include "console.h" #include "gcons.h" #include "keybuffer.h" -#include "screenbuffer.h" + #define NAME "console" @@ -827,5 +829,5 @@ async_serialize_start(); gcons_redraw_console(); - set_rgb_color(DEFAULT_FOREGROUND, DEFAULT_BACKGROUND); + set_style(STYLE_NORMAL); screen_clear(); curs_goto(0, 0); Index: uspace/srv/hid/console/screenbuffer.c =================================================================== --- uspace/srv/hid/console/screenbuffer.c (revision 9f1362d4e7eaaca0f48042dc579d07341d14e38a) +++ (revision ) @@ -1,194 +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 console - * @{ - */ -/** @file - */ - -#include -#include -#include -#include "screenbuffer.h" - -/** Store one character to screenbuffer. - * - * Its position is determined by scr->position_x - * and scr->position_y. - * - * @param scr Screenbuffer - * @param c Stored character - * - */ -void screenbuffer_putchar(screenbuffer_t *scr, wchar_t ch) -{ - keyfield_t *field = - get_field_at(scr, scr->position_x, scr->position_y); - - field->character = ch; - field->attrs = scr->attrs; -} - -/** Initilize screenbuffer. - * - * Allocate space for screen content in accordance to given size. - * - * @param scr Initialized screenbuffer - * @param size_x Width in characters - * @param size_y Height in characters - * - * @return Pointer to screenbuffer (same as scr parameter) or NULL - * - */ -screenbuffer_t *screenbuffer_init(screenbuffer_t *scr, ipcarg_t size_x, - ipcarg_t size_y) -{ - scr->buffer = (keyfield_t *) malloc(sizeof(keyfield_t) * size_x * size_y); - if (!scr->buffer) - return NULL; - - scr->size_x = size_x; - scr->size_y = size_y; - scr->attrs.t = at_style; - scr->attrs.a.s.style = STYLE_NORMAL; - scr->is_cursor_visible = 1; - - screenbuffer_clear(scr); - - return scr; -} - -/** Clear screenbuffer. - * - * @param scr Screenbuffer - * - */ -void screenbuffer_clear(screenbuffer_t *scr) -{ - size_t i; - - for (i = 0; i < (scr->size_x * scr->size_y); i++) { - scr->buffer[i].character = ' '; - scr->buffer[i].attrs = scr->attrs; - } - - scr->top_line = 0; - scr->position_x = 0; - scr->position_y = 0; -} - -/** Clear one buffer line. - * - * @param scr - * @param line One buffer line (not a screen line!) - * - */ -void screenbuffer_clear_line(screenbuffer_t *scr, ipcarg_t line) -{ - ipcarg_t x; - - for (x = 0; x < scr->size_x; x++) { - scr->buffer[x + line * scr->size_x].character = ' '; - scr->buffer[x + line * scr->size_x].attrs = scr->attrs; - } -} - -/** Copy content buffer from screenbuffer to given memory. - * - * @param scr Source screenbuffer - * @param dest Destination - * - */ -void screenbuffer_copy_buffer(screenbuffer_t *scr, keyfield_t *dest) -{ - size_t i; - - for (i = 0; i < (scr->size_x * scr->size_y); i++) - dest[i] = scr->buffer[i]; -} - -/** Set new cursor position in screenbuffer. - * - * @param scr - * @param x - * @param y - * - */ -void screenbuffer_goto(screenbuffer_t *scr, ipcarg_t x, ipcarg_t y) -{ - scr->position_x = x % scr->size_x; - scr->position_y = y % scr->size_y; -} - -/** Set new style. - * - * @param scr - * @param fg_color - * @param bg_color - * - */ -void screenbuffer_set_style(screenbuffer_t *scr, uint8_t style) -{ - scr->attrs.t = at_style; - scr->attrs.a.s.style = style; -} - -/** Set new color. - * - * @param scr - * @param fg_color - * @param bg_color - * - */ -void screenbuffer_set_color(screenbuffer_t *scr, uint8_t fg_color, - uint8_t bg_color, uint8_t flags) -{ - scr->attrs.t = at_idx; - scr->attrs.a.i.fg_color = fg_color; - scr->attrs.a.i.bg_color = bg_color; - scr->attrs.a.i.flags = flags; -} - -/** Set new RGB color. - * - * @param scr - * @param fg_color - * @param bg_color - * - */ -void screenbuffer_set_rgb_color(screenbuffer_t *scr, uint32_t fg_color, - uint32_t bg_color) -{ - scr->attrs.t = at_rgb; - scr->attrs.a.r.fg_color = fg_color; - scr->attrs.a.r.bg_color = bg_color; -} - -/** @} - */ Index: uspace/srv/hid/console/screenbuffer.h =================================================================== --- uspace/srv/hid/console/screenbuffer.h (revision 9f1362d4e7eaaca0f48042dc579d07341d14e38a) +++ (revision ) @@ -1,157 +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 console - * @{ - */ -/** @file - */ - -#ifndef SCREENBUFFER_H__ -#define SCREENBUFFER_H__ - -#include -#include -#include -#include - -#define DEFAULT_FOREGROUND 0x000000 /**< default console foreground color */ -#define DEFAULT_BACKGROUND 0xf0f0f0 /**< default console background color */ - -typedef struct { - uint8_t style; -} attr_style_t; - -typedef struct { - uint8_t fg_color; - uint8_t bg_color; - uint8_t flags; -} attr_idx_t; - -typedef struct { - uint32_t bg_color; /**< background color */ - uint32_t fg_color; /**< foreground color */ -} attr_rgb_t; - -typedef struct { - enum { - at_style, - at_idx, - at_rgb - } t; - union { - attr_style_t s; - attr_idx_t i; - attr_rgb_t r; - } a; -} attrs_t; - -/** One field on screen. It contain one character and its attributes. */ -typedef struct { - wchar_t character; /**< Character itself */ - attrs_t attrs; /**< Character attributes */ -} keyfield_t; - -/** Structure for buffering state of one virtual console. - */ -typedef struct { - keyfield_t *buffer; /**< Screen content - characters and - their attributes (used as a circular buffer) */ - ipcarg_t size_x; /**< Number of columns */ - ipcarg_t size_y; /**< Number of rows */ - - /** Coordinates of last printed character for determining cursor position */ - ipcarg_t position_x; - ipcarg_t position_y; - - attrs_t attrs; /**< Current attributes. */ - size_t top_line; /**< Points to buffer[][] line that will - be printed at screen as the first line */ - bool is_cursor_visible; /**< Cursor state - default is visible */ -} screenbuffer_t; - -/** Returns keyfield for position on screen - * - * Screenbuffer->buffer is cyclic buffer so we - * must couted in index of the topmost line. - * - * @param scr Screenbuffer - * @param x Position on screen - * @param y Position on screen - * - * @return Keyfield structure with character and its attributes on x, y - * - */ -static inline keyfield_t *get_field_at(screenbuffer_t *scr, ipcarg_t x, ipcarg_t y) -{ - return scr->buffer + x + ((y + scr->top_line) % scr->size_y) * scr->size_x; -} - -/** Compares two sets of attributes. - * - * @param s1 First style - * @param s2 Second style - * - * @return Nonzero on equality - * - */ -static inline int attrs_same(attrs_t a1, attrs_t a2) -{ - if (a1.t != a2.t) - return 0; - - switch (a1.t) { - case at_style: - return (a1.a.s.style == a2.a.s.style); - case at_idx: - return (a1.a.i.fg_color == a2.a.i.fg_color) - && (a1.a.i.bg_color == a2.a.i.bg_color) - && (a1.a.i.flags == a2.a.i.flags); - case at_rgb: - return (a1.a.r.fg_color == a2.a.r.fg_color) - && (a1.a.r.bg_color == a2.a.r.bg_color); - } - - return 0; -} - -extern void screenbuffer_putchar(screenbuffer_t *, wchar_t); -extern screenbuffer_t *screenbuffer_init(screenbuffer_t *, ipcarg_t, ipcarg_t); - -extern void screenbuffer_clear(screenbuffer_t *); -extern void screenbuffer_clear_line(screenbuffer_t *, ipcarg_t); -extern void screenbuffer_copy_buffer(screenbuffer_t *, keyfield_t *); -extern void screenbuffer_goto(screenbuffer_t *, ipcarg_t, ipcarg_t); -extern void screenbuffer_set_style(screenbuffer_t *, uint8_t); -extern void screenbuffer_set_color(screenbuffer_t *, uint8_t, uint8_t, uint8_t); -extern void screenbuffer_set_rgb_color(screenbuffer_t *, uint32_t, uint32_t); - -#endif - -/** @} - */