Changeset 04803bf in mainline for uspace/lib/c/include/io/screenbuffer.h

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes (needs fixes).

File:

• uspace/lib/c/include/io/screenbuffer.h (moved) (moved from uspace/srv/console/screenbuffer.h ) (7 diffs)

uspace/lib/c/include/io/screenbuffer.h

@@ -33 +33 @@
  */
 
-#ifndef SCREENBUFFER_H__
-#define SCREENBUFFER_H__
+#ifndef LIBC_SCREENBUFFER_H__
+#define LIBC_SCREENBUFFER_H__
 
 #include <stdint.h>
@@ -40 +40 @@
 #include <bool.h>
 
-#define DEFAULT_FOREGROUND  0x0       /**< default console foreground color */
-#define DEFAULT_BACKGROUND  0xf0f0f0  /**< default console background color */
+typedef enum {
+        at_style,
+        at_idx,
+        at_rgb
+} attr_type_t;
 
 typedef struct {
@@ -58 +61 @@
 } attr_rgb_t;
 
+typedef union {
+        attr_style_t s;
+        attr_idx_t i;
+        attr_rgb_t r;
+} attr_val_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;
+        attr_type_t t;
+        attr_val_t a;
 } attrs_t;
 
@@ -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 */
+        sysarg_t size_x;         /**< Number of columns  */
+        sysarg_t size_y;         /**< Number of rows */
         
         /** Coordinates of last printed character for determining cursor position */
-        size_t position_x;
-        size_t position_y;
+        sysarg_t position_x;
+        sysarg_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, sysarg_t x, sysarg_t y)
 {
         return scr->buffer + x + ((y + scr->top_line) % scr->size_y) * scr->size_x;
@@ -120 +121 @@
  *
  */
-static inline int attrs_same(attrs_t a1, attrs_t a2)
+static inline bool attrs_same(attrs_t a1, attrs_t a2)
 {
         if (a1.t != a2.t)
-                return 0;
+                return false;
         
         switch (a1.t) {
@@ -137 +138 @@
         }
         
-        return 0;
+        return false;
 }
 
+extern void screenbuffer_putchar(screenbuffer_t *, wchar_t);
+extern screenbuffer_t *screenbuffer_init(screenbuffer_t *, sysarg_t, sysarg_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 *, sysarg_t);
+extern void screenbuffer_copy_buffer(screenbuffer_t *, keyfield_t *);
+extern void screenbuffer_goto(screenbuffer_t *, sysarg_t, sysarg_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