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

Timestamp:

2009-01-01T13:31:23Z (15 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.c (modified) (6 diffs)

uspace/srv/console/screenbuffer.c

@@ -34 +34 @@
 
 #include <screenbuffer.h>
+#include <console/style.h>
 #include <malloc.h>
 #include <unistd.h>
@@ -50 +51 @@
 
         field->character = c;
-        field->style = scr->style;
+        field->attrs = scr->attrs;
 }
 
@@ -68 +69 @@
         scr->size_x = size_x;
         scr->size_y = size_y;
-        scr->style.fg_color = DEFAULT_FOREGROUND;
-        scr->style.bg_color = DEFAULT_BACKGROUND;
+        scr->attrs.t = at_style;
+        scr->attrs.a.s.style = STYLE_NORMAL;
         scr->is_cursor_visible = 1;
         
@@ -86 +87 @@
         for (i = 0; i < (scr->size_x * scr->size_y); i++) {
                 scr->buffer[i].character = ' ';
-                scr->buffer[i].style = scr->style;
+                scr->buffer[i].attrs = scr->attrs;
         }
 
@@ -104 +105 @@
         for (i = 0; i < scr->size_x; i++) {
                 scr->buffer[i + line * scr->size_x].character = ' ';
-                scr->buffer[i + line * scr->size_x].style = scr->style;
+                scr->buffer[i + line * scr->size_x].attrs = scr->attrs;
         }
 }
@@ -137 +138 @@
  * @param bg_color
  */
-void screenbuffer_set_style(screenbuffer_t *scr, unsigned int fg_color, unsigned int bg_color)
+void screenbuffer_set_style(screenbuffer_t *scr, int style)
 {
-        scr->style.fg_color = fg_color;
-        scr->style.bg_color = bg_color;
+        scr->attrs.t = at_style;
+        scr->attrs.a.s.style = style;
+}
+
+/** Set new color.
+ * @param scr
+ * @param fg_color
+ * @param bg_color
+ */
+void screenbuffer_set_color(screenbuffer_t *scr, unsigned int fg_color, unsigned int bg_color, unsigned int flags)
+{
+        scr->attrs.t = at_idx;
+        scr->attrs.a.i.fg_color = fg_color;
+        scr->attrs.a.i.bg_color = bg_color;
+        scr->attrs.a.i.flags = flags;
+}
+
+/** Set new RGB color.
+ * @param scr
+ * @param fg_color
+ * @param bg_color
+ */
+void screenbuffer_set_rgb_color(screenbuffer_t *scr, unsigned int fg_color, unsigned int bg_color)
+{
+        scr->attrs.t = at_rgb;
+        scr->attrs.a.r.fg_color = fg_color;
+        scr->attrs.a.r.bg_color = bg_color;
 }