Changeset 1f83244 in mainline for console/console.c

Timestamp:

2006-06-16T20:00:29Z (18 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

b34fab6

Parents:

d552ab9

Message:

Added console switching using mouse.

File:

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

console/console.c

@@ -229 +229 @@
                 curs_visibility(0);
 
+                async_serialize_start();
                 if (kernel_pixmap == -1) { 
                         /* store/restore unsupported */
@@ -238 +239 @@
                         kernel_pixmap = -1;
                 }
+                async_serialize_end();
 
                 __SYSCALL0(SYS_DEBUG_ENABLE_CONSOLE);
@@ -243 +245 @@
         } 
         
+        async_serialize_start();
+
         if (console_pixmap != -1) {
                 kernel_pixmap = switch_screens(console_pixmap);
@@ -281 +285 @@
         curs_goto(conn->screenbuffer.position_y, conn->screenbuffer.position_x);
         curs_visibility(conn->screenbuffer.is_cursor_visible);
+
+        async_serialize_end();
 }
 
@@ -291 +297 @@
         int c;
         connection_t *conn;
+        int newcon;
         
         /* Ignore parameters, the connection is alread opened */
@@ -299 +306 @@
                         /* TODO: Handle hangup */
                         return;
+                case KBD_MS_LEFT:
+                        newcon = gcons_mouse_btn(IPC_GET_ARG1(call));
+                        if (newcon != -1)
+                                change_console(newcon);
+                        break;
                 case KBD_MS_MOVE:
                         gcons_mouse_move(IPC_GET_ARG1(call), IPC_GET_ARG2(call));
@@ -312 +324 @@
 //                      if ((c >= KBD_KEY_F1) && (c < KBD_KEY_F1 + CONSOLE_COUNT)) {
                         if ((c >= 0x101) && (c < 0x101 + CONSOLE_COUNT)) {
-                                async_serialize_start();
                                 if (c == 0x112)
                                         change_console(KERNEL_CONSOLE);
                                 else
                                         change_console(c - 0x101);
-                                async_serialize_end();
                                 break;
                         }