Changeset 8a99c7e in mainline

Timestamp:

2012-08-15T14:13:25Z (12 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

1499564

Parents:

a987832

Message:

Add basic support for absolute mouse/pointing devices.

Location:

uspace

Files:

• lib/c/include/ipc/input.h (modified) (1 diff)
• lib/c/include/ipc/mouseev.h (modified) (1 diff)
• srv/hid/console/console.c (modified) (2 diffs)
• srv/hid/input/generic/input.c (modified) (1 diff)
• srv/hid/input/include/mouse.h (modified) (1 diff)
• srv/hid/input/proto/mousedev.c (modified) (1 diff)

uspace/lib/c/include/ipc/input.h

@@ -46 +46 @@
         INPUT_EVENT_KEY = IPC_FIRST_USER_METHOD,
         INPUT_EVENT_MOVE,
+        INPUT_EVENT_ABS_MOVE,
         INPUT_EVENT_BUTTON
 } input_notif_t;

uspace/lib/c/include/ipc/mouseev.h

@@ -47 +47 @@
 typedef enum {
         MOUSEEV_MOVE_EVENT = IPC_FIRST_USER_METHOD,
+        MOUSEEV_ABS_MOVE_EVENT,
         MOUSEEV_BUTTON_EVENT
 } mouseev_notif_t;

uspace/srv/hid/console/console.c

@@ -383 +383 @@
         
         fb_pointer_update(fb_sess, mouse.x, mouse.y, true);
+}
+
+static void cons_mouse_abs_move(sysarg_t x, sysarg_t y,
+    sysarg_t max_x, sysarg_t max_y)
+{
+        if (max_x && max_y) {
+                mouse.x = limit(x * xres / max_x, 0, xres);
+                mouse.y = limit(y * yres / max_y, 0, yres);
+                
+                fb_pointer_update(fb_sess, mouse.x, mouse.y, true);
+        }
 }
 
@@ -503 +514 @@
                         async_answer_0(callid, EOK);
                         break;
+                case INPUT_EVENT_ABS_MOVE:
+                        cons_mouse_abs_move(IPC_GET_ARG1(call), IPC_GET_ARG2(call),
+                            IPC_GET_ARG3(call), IPC_GET_ARG4(call));
+                        async_answer_0(callid, EOK);
+                        break;
                 case INPUT_EVENT_BUTTON:
                         /* Got pointer button press/release event */

uspace/srv/hid/input/generic/input.c

@@ -189 +189 @@
         }
         async_exchange_end(exch);
+}
+
+/** Mouse pointer has moved in absolute mode. */
+void mouse_push_event_abs_move(mouse_dev_t *mdev, unsigned int x, unsigned int y,
+    unsigned int max_x, unsigned int max_y)
+{
+        if (max_x && max_y) {
+                async_exch_t *exch = async_exchange_begin(client_sess);
+                async_msg_4(exch, INPUT_EVENT_ABS_MOVE, x, y, max_x, max_y);
+                async_exchange_end(exch);
+        }
 }
 

uspace/srv/hid/input/include/mouse.h

@@ -63 +63 @@
 extern void mouse_push_data(mouse_dev_t *, sysarg_t);
 extern void mouse_push_event_move(mouse_dev_t *, int, int, int);
+extern void mouse_push_event_abs_move(mouse_dev_t *, unsigned int, unsigned int,
+    unsigned int, unsigned int);
 extern void mouse_push_event_button(mouse_dev_t *, int, int);
 

uspace/srv/hid/input/proto/mousedev.c

@@ -96 +96 @@
                         retval = EOK;
                         break;
+                case MOUSEEV_ABS_MOVE_EVENT:
+                        mouse_push_event_abs_move(mousedev->mouse_dev,
+                                IPC_GET_ARG1(call), IPC_GET_ARG2(call),
+                                IPC_GET_ARG3(call), IPC_GET_ARG4(call));
+                        retval = EOK;
+                        break;
                 case MOUSEEV_BUTTON_EVENT:
                         mouse_push_event_button(mousedev->mouse_dev,