Changeset 9f1362d4 in mainline for uspace/srv/hid/console/screenbuffer.h

Timestamp:

2010-04-19T19:58:18Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

369a5f8

Parents:

caad59a

Message:

console output improvements

• define new generic styles (STYLE_INVERTED for inverted print and STYLE_SELECTION for selections), use them primarily instead of specifying colors or RGBs
• use console_set_style(fphone(stdout), STYLE_NORMAL) as the correct mean for reseting console settings (instead of specifying conrete hardcoded colors)
• rename console_goto() to console_set_pos() (consistency with console_get_pos())
• use semantically correct unsigned types for console sizes and cursor positions (instead of signed types)
• use unsigned types for sizes and positions in libclui
• top: nicer screen redrawing (do not use console_clear() which causes flickering, but repaint the screen properly — not entirely finished yet)
• initialize mouse pointer coordinates (so the mouse cursor does not behave erratic after boot, unfortunatelly this does not solve ticket #223)

File:

• uspace/srv/hid/console/screenbuffer.h (modified) (4 diffs)

uspace/srv/hid/console/screenbuffer.h

@@ -38 +38 @@
 #include <stdint.h>
 #include <sys/types.h>
+#include <ipc/ipc.h>
 #include <bool.h>
 
-#define DEFAULT_FOREGROUND  0x0       /**< default console foreground color */
+#define DEFAULT_FOREGROUND  0x000000  /**< default console foreground color */
 #define DEFAULT_BACKGROUND  0xf0f0f0  /**< default console background color */
 
@@ -82 +83 @@
         keyfield_t *buffer;      /**< Screen content - characters and
                                       their attributes (used as a circular buffer) */
-        size_t size_x;           /**< Number of columns  */
-        size_t size_y;           /**< Number of rows */
+        ipcarg_t size_x;         /**< Number of columns  */
+        ipcarg_t size_y;         /**< Number of rows */
         
         /** Coordinates of last printed character for determining cursor position */
-        size_t position_x;
-        size_t position_y;
+        ipcarg_t position_x;
+        ipcarg_t position_y;
         
         attrs_t attrs;           /**< Current attributes. */
@@ -107 +108 @@
  *
  */
-static inline keyfield_t *get_field_at(screenbuffer_t *scr, size_t x, size_t 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;
@@ -140 +141 @@
 }
 
+extern void screenbuffer_putchar(screenbuffer_t *, wchar_t);
+extern screenbuffer_t *screenbuffer_init(screenbuffer_t *, ipcarg_t, ipcarg_t);
 
-void screenbuffer_putchar(screenbuffer_t *scr, wchar_t c);
-screenbuffer_t *screenbuffer_init(screenbuffer_t *scr, size_t size_x, size_t size_y);
-
-void screenbuffer_clear(screenbuffer_t *scr);
-void screenbuffer_clear_line(screenbuffer_t *scr, size_t line);
-void screenbuffer_copy_buffer(screenbuffer_t *scr, keyfield_t *dest);
-void screenbuffer_goto(screenbuffer_t *scr, size_t x, size_t y);
-void screenbuffer_set_style(screenbuffer_t *scr, uint8_t style);
-void screenbuffer_set_color(screenbuffer_t *scr, uint8_t fg_color,
-    uint8_t bg_color, uint8_t attr);
-void screenbuffer_set_rgb_color(screenbuffer_t *scr, uint32_t fg_color,
-    uint32_t bg_color);
+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