Changeset 49d072e in mainline for fb/fb.c

Timestamp:

2006-06-02T10:54:45Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

bf9afa07

Parents:

838c48e

Message:

Added blinking cursor.

File:

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

fb/fb.c

@@ -77 +77 @@
         /* Auto-cursor position */
         int cursor_active, cur_col, cur_row;
+        int cursor_shown;
 } viewport_t;
 
@@ -396 +397 @@
 }
 
+static void cursor_hide(int vp)
+{
+        viewport_t *vport = &viewports[vp];
+
+        if (vport->cursor_active && vport->cursor_shown) {
+                invert_char(vp, vport->cur_row, vport->cur_col);
+                vport->cursor_shown = 0;
+        }
+}
+
+static void cursor_print(int vp)
+{
+        viewport_t *vport = &viewports[vp];
+
+        /* Do not check for cursor_shown */
+        if (vport->cursor_active) {
+                invert_char(vp, vport->cur_row, vport->cur_col);
+                vport->cursor_shown = 1;
+        }
+}
+
+static void cursor_blink(int vp)
+{
+        viewport_t *vport = &viewports[vp];
+
+        if (vport->cursor_shown)
+                cursor_hide(vp);
+        else
+                cursor_print(vp);
+}
+
 /** Draw character at given position relative to viewport 
  * 
@@ -407 +439 @@
         viewport_t *vport = &viewports[vp];
 
-        if (vport->cursor_active && (vport->cur_col != col || vport->cur_row != row))
+        /* Optimize - do not hide cursor if we are going to overwrite it */
+        if (vport->cursor_active && vport->cursor_shown && 
+            (vport->cur_col != col || vport->cur_row != row))
                 invert_char(vp, vport->cur_row, vport->cur_col);
         
@@ -422 +456 @@
                         vport->cur_row--;
         }
-        if (vport->cursor_active)
-                invert_char(vp, vport->cur_row, vport->cur_col);
+        cursor_print(vp);
 }
 
@@ -449 +482 @@
 
         while (1) {
-                callid = async_get_call(&call);
+                callid = async_get_call_timeout(&call,250000);
+                if (!callid) {
+                        cursor_blink(vp);
+                        continue;
+                }
                 switch (IPC_GET_METHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
@@ -472 +509 @@
                 case FB_CLEAR:
                         clear_port(vp);
-                        if (vport->cursor_active)
-                                invert_char(vp, vport->cur_row, vport->cur_col);
+                        cursor_print(vp);
                         retval = 0;
                         break;
@@ -484 +520 @@
                         }
                         retval = 0;
-                        if (viewports[vp].cursor_active) {
-                                invert_char(vp, vport->cur_row, vport->cur_col);
-                                invert_char(vp, row, col);
-                        }
+                        cursor_hide(vp);
                         vport->cur_col = col;
                         vport->cur_row = row;
+                        cursor_print(vp);
                         break;
                 case FB_CURSOR_VISIBILITY:
-                        i = IPC_GET_ARG1(call);
+                        cursor_hide(vp);
+                        vport->cursor_active = IPC_GET_ARG1(call);
+                        cursor_print(vp);
                         retval = 0;
-                        if ((i && vport->cursor_active) || (!i && !vport->cursor_active))
-                                break;
-
-                        vport->cursor_active = i;
-                        invert_char(vp, vport->cur_row, vport->cur_col);
                         break;
                 case FB_GET_CSIZE:
@@ -509 +540 @@
                                 break;
                         }
-                        if (vport->cursor_active)
-                                invert_char(vp, vport->cur_row, vport->cur_col);
+                        cursor_hide(vp);
                         scroll_port(vp, i);
-                        if (vport->cursor_active)
-                                invert_char(vp, vport->cur_row, vport->cur_col);
+                        cursor_print(vp);
                         retval = 0;
                         break;
@@ -526 +555 @@
                                 break;
                         }
+                        cursor_hide(vp);
                         vp = i;
                         vport = &viewports[vp];
+                        cursor_print(vp);
                         retval = 0;
                         break;