Changeset 424cd43 in mainline for uspace/srv/console/screenbuffer.c

Timestamp:

2009-06-03T18:39:12Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

8dc12ac

Parents:

b0a91acb

Message:

console server rewrite: use VFS_READ/VFS_WRITE for generic I/O, register separate virtual consoles using device mapper

File:

• uspace/srv/console/screenbuffer.c (modified) (10 diffs)

uspace/srv/console/screenbuffer.c

@@ -34 +34 @@
 
 #include <screenbuffer.h>
-#include <console/style.h>
+#include <io/style.h>
 #include <malloc.h>
 #include <unistd.h>
@@ -67 +67 @@
  *
  */
-screenbuffer_t *screenbuffer_init(screenbuffer_t *scr, int size_x, int size_y) 
+screenbuffer_t *screenbuffer_init(screenbuffer_t *scr, size_t size_x, size_t size_y)
 {
         scr->buffer = (keyfield_t *) malloc(sizeof(keyfield_t) * size_x * size_y);
@@ -91 +91 @@
 void screenbuffer_clear(screenbuffer_t *scr)
 {
-        unsigned int i;
+        size_t i;
         
         for (i = 0; i < (scr->size_x * scr->size_y); i++) {
@@ -99 +99 @@
         
         scr->top_line = 0;
+        scr->position_x = 0;
         scr->position_y = 0;
-        scr->position_x = 0;
 }
 
@@ -109 +109 @@
  *
  */
-void screenbuffer_clear_line(screenbuffer_t *scr, unsigned int line)
+void screenbuffer_clear_line(screenbuffer_t *scr, size_t line)
 {
-        unsigned int i;
+        size_t x;
         
-        for (i = 0; i < scr->size_x; i++) {
-                scr->buffer[i + line * scr->size_x].character = ' ';
-                scr->buffer[i + line * scr->size_x].attrs = scr->attrs;
+        for (x = 0; x < scr->size_x; x++) {
+                scr->buffer[x + line * scr->size_x].character = ' ';
+                scr->buffer[x + line * scr->size_x].attrs = scr->attrs;
         }
 }
@@ -125 +125 @@
  *
  */
-void screenbuffer_copy_buffer(screenbuffer_t *scr, keyfield_t *dest) 
+void screenbuffer_copy_buffer(screenbuffer_t *scr, keyfield_t *dest)
 {
-        unsigned int i;
+        size_t i;
         
-        for (i = 0; i < scr->size_x * scr->size_y; i++)
+        for (i = 0; i < (scr->size_x * scr->size_y); i++)
                 dest[i] = scr->buffer[i];
 }
@@ -140 +140 @@
  *
  */
-void screenbuffer_goto(screenbuffer_t *scr, unsigned int x, unsigned int y)
+void screenbuffer_goto(screenbuffer_t *scr, size_t x, size_t y)
 {
         scr->position_x = x % scr->size_x;
@@ -153 +153 @@
  *
  */
-void screenbuffer_set_style(screenbuffer_t *scr, int style)
+void screenbuffer_set_style(screenbuffer_t *scr, uint8_t style)
 {
         scr->attrs.t = at_style;
@@ -166 +166 @@
  *
  */
-void screenbuffer_set_color(screenbuffer_t *scr, unsigned int fg_color, unsigned int bg_color, unsigned int 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 +181 @@
  *
  */
-void screenbuffer_set_rgb_color(screenbuffer_t *scr, unsigned int fg_color, unsigned int bg_color)
+void screenbuffer_set_rgb_color(screenbuffer_t *scr, uint32_t fg_color, uint32_t bg_color)
 {
         scr->attrs.t = at_rgb;