Changeset a8b2b5b in mainline

Timestamp:

2006-06-04T18:45:35Z (19 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

ec9623d

Parents:

d32af35

Message:

Support for console show/hide cursor.
Tetris without cursor.

Files:

• console/console.c (modified) (5 diffs)
• console/console.h (modified) (1 diff)
• console/screenbuffer.c (modified) (1 diff)
• console/screenbuffer.h (modified) (1 diff)
• tetris/screen.c (modified) (1 diff)

console/console.c

@@ -248 +248 @@
                 /* This call can preempt, but we are already at the end */
                 sync_send_2(fb_info.phone, FB_DRAW_TEXT_DATA, 0, 0, NULL, NULL);                
-                curs_visibility(1);
+                curs_visibility(conn->screenbuffer.is_cursor_visible);
         } else {
-                curs_visibility(0);
                 clrscr();
                 
@@ -260 +259 @@
                         }
                 
-                curs_visibility(1);
+                curs_visibility(conn->screenbuffer.is_cursor_visible);
         }
 }
@@ -381 +380 @@
                                 set_style_col(arg1, arg2);
                                 
+                        break;
+                case CONSOLE_CURSOR_VISIBILITY:
+                        arg1 = IPC_GET_ARG1(call);
+                        connections[consnum].screenbuffer.is_cursor_visible = arg1;
+                        if (consnum == active_console)
+                                curs_visibility(arg1);
                         break;
                 case CONSOLE_GETCHAR:
@@ -394 +399 @@
                                 continue;
                         };
-                        keybuffer_pop(&(connections[consnum].keybuffer), (char *)&arg1);
+                        keybuffer_pop(&(connections[consnum].keybuffer), (int *)&arg1);
                         
                         break;
@@ -465 +470 @@
         async_new_connection(phonehash, 0, NULL, keyboard_events);
         
-        sync_send_2(fb_info.phone, FB_CURSOR_GOTO, 0, 0, NULL, NULL); 
-        nsend_call(fb_info.phone, FB_CURSOR_VISIBILITY, 1); 
+        curs_goto(0,0);
+        curs_visibility(connections[active_console].screenbuffer.is_cursor_visible);
 
         /* Register at NS */

console/console.h

@@ -41 +41 @@
 #define CONSOLE_FLUSH           1031
 #define CONSOLE_SET_STYLE       1032
+#define CONSOLE_CURSOR_VISIBILITY       1033
 
 #endif

console/screenbuffer.c

@@ -61 +61 @@
         scr->style.fg_color = DEFAULT_FOREGROUND;
         scr->style.bg_color = DEFAULT_BACKGROUND;
+        scr->is_cursor_visible = 1;
         
         screenbuffer_clear(scr);

console/screenbuffer.h

@@ -53 +53 @@
         style_t style;                          /**< Current style */
         unsigned int top_line;                  /**< Points to buffer[][] line that will be printed at screen as the first line */
+        unsigned char is_cursor_visible;        /**< Cursor state - default is visible */
 } screenbuffer_t;
 

tetris/screen.c

@@ -114 +114 @@
 {
         con_phone = get_fd_phone(1);
+        send_call(con_phone, CONSOLE_CURSOR_VISIBILITY, 0);
         resume_normal();
         scr_clear();