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

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/generic/io/screenbuffer.c (moved) (moved from uspace/srv/console/screenbuffer.c ) (6 diffs)

uspace/lib/c/generic/io/screenbuffer.c

@@ -33 +33 @@
  */
 
-#include <screenbuffer.h>
 #include <io/style.h>
+#include <io/screenbuffer.h>
 #include <malloc.h>
 #include <unistd.h>
@@ -67 +67 @@
  *
  */
-screenbuffer_t *screenbuffer_init(screenbuffer_t *scr, size_t size_x, size_t size_y)
+screenbuffer_t *screenbuffer_init(screenbuffer_t *scr, sysarg_t size_x,
+    sysarg_t size_y)
 {
         scr->buffer = (keyfield_t *) malloc(sizeof(keyfield_t) * size_x * size_y);
@@ -109 +110 @@
  *
  */
-void screenbuffer_clear_line(screenbuffer_t *scr, size_t line)
+void screenbuffer_clear_line(screenbuffer_t *scr, sysarg_t line)
 {
-        size_t x;
+        sysarg_t x;
         
         for (x = 0; x < scr->size_x; x++) {
@@ -140 +141 @@
  *
  */
-void screenbuffer_goto(screenbuffer_t *scr, size_t x, size_t y)
+void screenbuffer_goto(screenbuffer_t *scr, sysarg_t x, sysarg_t y)
 {
         scr->position_x = x % scr->size_x;
@@ -166 +167 @@
  *
  */
-void screenbuffer_set_color(screenbuffer_t *scr, uint8_t fg_color, uint8_t bg_color, uint8_t flags)
+void screenbuffer_set_color(screenbuffer_t *scr, uint8_t fg_color,
+    uint8_t bg_color, uint8_t flags)
 {
         scr->attrs.t = at_idx;
@@ -181 +183 @@
  *
  */
-void screenbuffer_set_rgb_color(screenbuffer_t *scr, uint32_t fg_color, uint32_t bg_color)
+void screenbuffer_set_rgb_color(screenbuffer_t *scr, uint32_t fg_color,
+    uint32_t bg_color)
 {
         scr->attrs.t = at_rgb;