Changeset 8edec53 in mainline for uspace/srv/hid/input/proto/mousedev.c

Timestamp:

2021-10-25T17:51:10Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

91ece11b

Parents:

805a149

Message:

Support double-click

Needed to open Navigator entries using the mouse.

File:

• uspace/srv/hid/input/proto/mousedev.c (modified) (6 diffs)

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

@@ -1 +1 @@
 /*
+ * Copyright (c) 2021 Jiri Svoboda
  * Copyright (c) 2011 Martin Decky
  * All rights reserved.
@@ -43 +44 @@
 #include <loc.h>
 #include <stdlib.h>
+#include <time.h>
 #include "../mouse.h"
 #include "../mouse_port.h"
@@ -48 +50 @@
 #include "../input.h"
 
+enum {
+        /** Default double-click speed in milliseconds */
+        dclick_delay_ms = 500
+};
+
 /** Mousedev softstate */
 typedef struct {
         /** Link to generic mouse device */
         mouse_dev_t *mouse_dev;
+        /** Button number of last button pressed (or -1 if none) */
+        int press_bnum;
+        /** Time at which button was last pressed */
+        struct timespec press_time;
 } mousedev_t;
 
@@ -61 +72 @@
 
         mousedev->mouse_dev = mdev;
+        mousedev->press_bnum = -1;
 
         return mousedev;
@@ -68 +80 @@
 {
         free(mousedev);
+}
+
+static void mousedev_press(mousedev_t *mousedev, int bnum)
+{
+        struct timespec now;
+        nsec_t ms_delay;
+
+        getuptime(&now);
+
+        /* Same button was pressed previously */
+        if (mousedev->press_bnum == bnum) {
+                /* Compute milliseconds since previous press */
+                ms_delay = ts_sub_diff(&now, &mousedev->press_time) / 1000000;
+
+                if (ms_delay <= dclick_delay_ms) {
+                        mouse_push_event_dclick(mousedev->mouse_dev, bnum);
+                        mousedev->press_bnum = -1;
+                        return;
+                }
+        }
+
+        /* Record which button was last pressed and at what time */
+        mousedev->press_bnum = bnum;
+        mousedev->press_time = now;
 }
 
@@ -103 +139 @@
                         mouse_push_event_button(mousedev->mouse_dev,
                             ipc_get_arg1(&call), ipc_get_arg2(&call));
+                        if (ipc_get_arg2(&call) != 0)
+                                mousedev_press(mousedev, ipc_get_arg1(&call));
                         retval = EOK;
                         break;