Changeset 424cd43 in mainline for uspace/srv/console/screenbuffer.h

Timestamp:

2009-06-03T18:39:12Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

8dc12ac

Parents:

b0a91acb

Message:

console server rewrite: use VFS_READ/VFS_WRITE for generic I/O, register separate virtual consoles using device mapper

File:

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

uspace/srv/console/screenbuffer.h

@@ -38 +38 @@
 #include <stdint.h>
 #include <sys/types.h>
+#include <bool.h>
 
-#define DEFAULT_FOREGROUND 0x0       /**< default console foreground color */
-#define DEFAULT_BACKGROUND 0xf0f0f0  /**< default console background color */
+#define DEFAULT_FOREGROUND  0x0       /**< default console foreground color */
+#define DEFAULT_BACKGROUND  0xf0f0f0  /**< default console background color */
 
 typedef struct {
@@ -73 +74 @@
 typedef struct {
         wchar_t character;  /**< Character itself */
-        attrs_t attrs;      /**< Character`s attributes */
+        attrs_t attrs;      /**< Character attributes */
 } keyfield_t;
 
@@ -79 +80 @@
  */
 typedef struct {
-        keyfield_t *buffer;               /**< Screen content - characters and
-                                               their attributes (used as a circular buffer) */
-        unsigned int size_x;              /**< Number of columns  */
-        unsigned int size_y;              /**< Number of rows */
+        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 */
         
         /** Coordinates of last printed character for determining cursor position */
-        unsigned int position_x;
-        unsigned int position_y;
+        size_t position_x;
+        size_t position_y;
         
-        attrs_t attrs;                    /**< Current attributes. */
-        unsigned int top_line;            /**< Points to buffer[][] line that will
-                                               be printed at screen as the first line */
-        unsigned char is_cursor_visible;  /**< Cursor state - default is visible */
+        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;
 
@@ -106 +107 @@
  *
  */
-static inline keyfield_t *get_field_at(screenbuffer_t *scr, unsigned int x, unsigned int y)
+static inline keyfield_t *get_field_at(screenbuffer_t *scr, size_t x, size_t y)
 {
         return scr->buffer + x + ((y + scr->top_line) % scr->size_y) * scr->size_x;
@@ -139 +140 @@
 
 void screenbuffer_putchar(screenbuffer_t *scr, wchar_t c);
-screenbuffer_t *screenbuffer_init(screenbuffer_t *scr, int size_x, int size_y);
+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, unsigned int line);
+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, unsigned int x, unsigned int y);
-void screenbuffer_set_style(screenbuffer_t *scr, int style);
-void screenbuffer_set_color(screenbuffer_t *scr, unsigned int fg_color,
-    unsigned int bg_color, unsigned int attr);
-void screenbuffer_set_rgb_color(screenbuffer_t *scr, unsigned int fg_color,
-    unsigned int bg_color);
+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);
 
 #endif