Changeset c1d2c9d in mainline for fb/fb.c

Timestamp:

2006-06-01T21:51:35Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

da0c91e7

Parents:

3993b3d

Message:

Added integration of console & fb.
Added ipc_call_async_3 call.

File:

• fb/fb.c (modified) (7 diffs)

fb/fb.c

@@ -269 +269 @@
 
 /** Invert character at given position */
-static void invert_char(int vp,unsigned int col, unsigned int row)
+static void invert_char(int vp,unsigned int row, unsigned int col)
 {
         unsigned int x;
@@ -334 +334 @@
         viewports[i].fgcolor = DEFAULT_FGCOLOR;
         
+        viewports[i].cur_col = 0;
+        viewports[i].cur_row = 0;
+        viewports[i].cursor_active = 0;
+
         viewports[i].initialized = 1;
 
@@ -416 +420 @@
 }
 
-static void draw_char(int vp, char c, unsigned int col, unsigned int row)
+static void draw_char(int vp, char c, unsigned int row, unsigned int col)
 {
         viewport_t *vport = &viewports[vp];
 
         if (vport->cursor_active && (vport->cur_col != col || vport->cur_row != row))
-                invert_char(vp, vport->cur_col,vport->cur_row);
-        
-        draw_glyph(vp, c, col, row);
-        
-        if (vport->cursor_active) {
-                vport->cur_col++;
-                if (vport->cur_col>= vport->cols) {
-                        vport->cur_col = 0;
-                        vport->cur_row++;
-                        if (vport->cur_row >= vport->rows)
-                                vport->cur_row--;
-                }
-                invert_char(vp, vport->cur_col,vport->cur_row);
+                invert_char(vp, vport->cur_row, vport->cur_col);
+        
+        draw_glyph(vp, c, row, col);
+
+        vport->cur_col = col;
+        vport->cur_row = row;
+
+        vport->cur_col++;
+        if (vport->cur_col>= vport->cols) {
+                vport->cur_col = 0;
+                vport->cur_row++;
+                if (vport->cur_row >= vport->rows)
+                        vport->cur_row--;
         }
+        if (vport->cursor_active)
+                invert_char(vp, vport->cur_row, vport->cur_col);
 }
 
@@ -481 +487 @@
                         clear_port(vp);
                         if (vport->cursor_active)
-                                invert_char(vp, vport->cur_col,vport->cur_row);
+                                invert_char(vp, vport->cur_row, vport->cur_col);
                         retval = 0;
                         break;
@@ -493 +499 @@
                         retval = 0;
                         if (viewports[vp].cursor_active) {
-                                invert_char(vp, vport->cur_col,vport->cur_row);
-                                invert_char(vp, col, row);
+                                invert_char(vp, vport->cur_row, vport->cur_col);
+                                invert_char(vp, row, col);
                         }
                         vport->cur_col = col;
@@ -506 +512 @@
 
                         vport->cursor_active = i;
-                        invert_char(vp, vport->cur_col,vport->cur_row);
+                        invert_char(vp, vport->cur_row, vport->cur_col);
                         break;
                 case FB_GET_CSIZE:
@@ -518 +524 @@
                         }
                         if (vport->cursor_active)
-                                invert_char(vp, vport->cur_col,vport->cur_row);
+                                invert_char(vp, vport->cur_row, vport->cur_col);
                         scroll_port(vp, i);
                         if (vport->cursor_active)
-                                invert_char(vp, vport->cur_col,vport->cur_row);
+                                invert_char(vp, vport->cur_row, vport->cur_col);
                         retval = 0;
                         break;