Changeset 1f83244 in mainline

Timestamp:

2006-06-16T20:00:29Z (19 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.

Location:

console

Files:

• console.c (modified) (7 diffs)
• gcons.c (modified) (1 diff)
• gcons.h (modified) (1 diff)

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;
                         }

console/gcons.c

@@ -241 +241 @@
 }
 
+int mouse_x, mouse_y;
+int btn_pressed, btn_x, btn_y;
+
+/** Handle mouse move
+ *
+ * @param dx Delta X of mouse move
+ * @param dy Delta Y of mouse move
+ */
 void gcons_mouse_move(int dx, int dy)
 {
-        static int x = 0;
-        static int y = 0;
-
-        x = limit(x+dx, 0, xres);
-        y = limit(y+dy, 0, yres);
-
-        async_msg_2(fbphone, FB_POINTER_MOVE, x, y);
+        mouse_x = limit(mouse_x+dx, 0, xres);
+        mouse_y = limit(mouse_y+dy, 0, yres);
+
+        async_msg_2(fbphone, FB_POINTER_MOVE, mouse_x, mouse_y);
+}
+
+static int gcons_find_conbut(int x, int y)
+{
+        int status_start = STATUS_START + (xres-800) / 2;;
+
+        if (y < STATUS_TOP || y >= STATUS_TOP+STATUS_HEIGHT)
+                return -1;
+        
+        if (x < status_start)
+                return -1;
+        
+        if (x >= status_start + (STATUS_WIDTH+STATUS_SPACE)*CONSOLE_COUNT)
+                return -1;
+        if (((x - status_start) % (STATUS_WIDTH+STATUS_SPACE)) >= STATUS_WIDTH)
+                return -1;
+        
+        return (x-status_start) / (STATUS_WIDTH+STATUS_SPACE);
+}
+
+/** Handle mouse click
+ *
+ * @param state New state (1-pressed, 0-depressed)
+ */
+int gcons_mouse_btn(int state)
+{
+        int conbut;
+
+        if (state) {
+                conbut = gcons_find_conbut(mouse_x, mouse_y);
+                if (conbut != -1) {
+                        btn_pressed = 1;
+                        btn_x = mouse_x;
+                        btn_y = mouse_y;
+                }
+                return -1;
+        } 
+        if (!state && !btn_pressed)
+                return -1;
+        btn_pressed = 0;
+
+        conbut = gcons_find_conbut(mouse_x, mouse_y);
+        if (conbut == gcons_find_conbut(btn_x, btn_y))
+                return conbut;
+        return -1;
 }
 

console/gcons.h

@@ -43 +43 @@
 void gcons_notify_disconnect(int consnum);
 void gcons_mouse_move(int dx, int dy);
+int gcons_mouse_btn(int state);
 
 #endif