Changeset 9805cde in mainline for uspace/srv/console/screenbuffer.h

Timestamp:

2009-01-01T13:31:23Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

7122bc7

Parents:

666773c

Message:

Console color support overhaul. Create C library console interface.

File:

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

uspace/srv/console/screenbuffer.h

@@ -42 +42 @@
 
 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 */
-} style_t;
+} 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 {
         char character;                 /**< Character itself */
-        style_t style;                  /**< Character`s attributes */
+        attrs_t attrs;                  /**< Character`s attributes */
 } keyfield_t;
 
@@ -55 +78 @@
  */
 typedef struct {
-        keyfield_t *buffer;                     /**< Screen content - characters and its style. Used as cyclyc buffer. */
+        keyfield_t *buffer;                     /**< Screen content - characters and their attributes. Used as a circular buffer. */
         unsigned int size_x, size_y;            /**< Number of columns and rows */
         unsigned int position_x, position_y;    /**< Coordinates of last printed character for determining cursor position */
-        style_t style;                          /**< Current style */
+        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 */
@@ -74 +97 @@
 }
 
-/** Compares two styles.
+/** Compares two sets of attributes.
  * @param s1 first style
  * @param s2 second style
  * @return nonzero on equality
  */
-static inline int style_same(style_t s1, style_t s2)
+static inline int attrs_same(attrs_t a1, attrs_t a2)
 {
-        return s1.fg_color == s2.fg_color && s1.bg_color == s2.bg_color;
+        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;
+        }
 }
 
@@ -92 +124 @@
 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, unsigned int fg_color, unsigned int bg_color);
+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);
 
 #endif