Changeset 369a5f8 in mainline for uspace/lib/c/include/io/screenbuffer.h

Timestamp:

2010-04-20T15:01:43Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

9efff92

Parents:

9f1362d4

Message:

add STYLE_SELECTED and STYLE_INVERTED into serial output driver
move screenbuffer.{c|h} into libc, make it slightly more generic
collateral changes

File:

• uspace/lib/c/include/io/screenbuffer.h (moved) (moved from uspace/srv/hid/console/screenbuffer.h ) (5 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>
@@ -41 +41 @@
 #include <bool.h>
 
-#define DEFAULT_FOREGROUND  0x000000  /**< 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 {
@@ -59 +62 @@
 } 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;
 
@@ -121 +122 @@
  *
  */
-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) {
@@ -138 +139 @@
         }
         
-        return 0;
+        return false;
 }