Changeset 8edec53 in mainline for uspace/srv

Timestamp:

2021-10-25T17:51:10Z (4 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.

Location:

uspace/srv/hid

Files:

• console/console.c (modified) (3 diffs)
• display/input.c (modified) (4 diffs)
• display/seat.c (modified) (1 diff)
• display/types/display/ptd_event.h (modified) (2 diffs)
• input/input.c (modified) (2 diffs)
• input/mouse.h (modified) (2 diffs)
• input/proto/mousedev.c (modified) (6 diffs)

uspace/srv/hid/console/console.c

@@ -124 +124 @@
 static errno_t input_ev_abs_move(input_t *, unsigned, unsigned, unsigned, unsigned);
 static errno_t input_ev_button(input_t *, int, int);
+static errno_t input_ev_dclick(input_t *, int);
 
 static input_ev_ops_t input_ev_ops = {
@@ -131 +132 @@
         .move = input_ev_move,
         .abs_move = input_ev_abs_move,
-        .button = input_ev_button
+        .button = input_ev_button,
+        .dclick = input_ev_dclick
 };
 
@@ -440 +442 @@
 }
 
+static errno_t input_ev_dclick(input_t *input, int bnum)
+{
+        cons_event_t event;
+
+        event.type = CEV_POS;
+        event.ev.pos.type = POS_DCLICK;
+        event.ev.pos.btn_num = bnum;
+        event.ev.pos.hpos = pointer_x / mouse_scale_x;
+        event.ev.pos.vpos = pointer_y / mouse_scale_y;
+
+        console_queue_cons_event(active_console, &event);
+        return EOK;
+}
+
 /** Process a character from the client (TTY emulation). */
 static void cons_write_char(console_t *cons, char32_t ch)

uspace/srv/hid/display/input.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2019 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -49 +49 @@
 static errno_t ds_input_ev_abs_move(input_t *, unsigned, unsigned, unsigned, unsigned);
 static errno_t ds_input_ev_button(input_t *, int, int);
+static errno_t ds_input_ev_dclick(input_t *, int);
 
 static input_ev_ops_t ds_input_ev_ops = {
@@ -56 +57 @@
         .move = ds_input_ev_move,
         .abs_move = ds_input_ev_abs_move,
-        .button = ds_input_ev_button
+        .button = ds_input_ev_button,
+        .dclick = ds_input_ev_dclick
 };
 
@@ -131 +133 @@
 
         event.type = bpress ? PTD_PRESS : PTD_RELEASE;
+        event.btn_num = bnum;
+        event.dmove.x = 0;
+        event.dmove.y = 0;
+
+        ds_display_lock(disp);
+        rc = ds_display_post_ptd_event(disp, &event);
+        ds_display_unlock(disp);
+        return rc;
+}
+
+static errno_t ds_input_ev_dclick(input_t *input, int bnum)
+{
+        ds_display_t *disp = (ds_display_t *) input->user;
+        ptd_event_t event;
+        errno_t rc;
+
+        event.type = PTD_DCLICK;
         event.btn_num = bnum;
         event.dmove.x = 0;

uspace/srv/hid/display/seat.c

@@ -362 +362 @@
         }
 
-        if (event->type == PTD_PRESS || event->type == PTD_RELEASE) {
+        if (event->type == PTD_PRESS || event->type == PTD_RELEASE ||
+            event->type == PTD_DCLICK) {
                 pevent.pos_id = 0;
-                pevent.type = (event->type == PTD_PRESS) ?
-                    POS_PRESS : POS_RELEASE;
+                switch (event->type) {
+                case PTD_PRESS:
+                        pevent.type = POS_PRESS;
+                        break;
+                case PTD_RELEASE:
+                        pevent.type = POS_RELEASE;
+                        break;
+                case PTD_DCLICK:
+                        pevent.type = POS_DCLICK;
+                        break;
+                default:
+                        assert(false);
+                }
+
                 pevent.btn_num = event->btn_num;
                 pevent.hpos = seat->pntpos.x;

uspace/srv/hid/display/types/display/ptd_event.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2019 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -42 +42 @@
         PTD_ABS_MOVE,
         PTD_PRESS,
-        PTD_RELEASE
+        PTD_RELEASE,
+        PTD_DCLICK
 } ptd_event_type_t;
 

uspace/srv/hid/input/input.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2021 Jiri Svoboda
  * Copyright (c) 2006 Josef Cejka
- * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -311 +311 @@
 }
 
-/** Arbitrate client actiovation */
+/** Mouse button has been double-clicked. */
+void mouse_push_event_dclick(mouse_dev_t *mdev, int bnum)
+{
+        list_foreach(clients, link, client_t, client) {
+                if (client->active) {
+                        async_exch_t *exch = async_exchange_begin(client->sess);
+                        async_msg_1(exch, INPUT_EVENT_DCLICK, bnum);
+                        async_exchange_end(exch);
+                }
+        }
+}
+
+/** Arbitrate client activation */
 static void client_arbitration(void)
 {

uspace/srv/hid/input/mouse.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -66 +66 @@
     unsigned int, unsigned int);
 extern void mouse_push_event_button(mouse_dev_t *, int, int);
+extern void mouse_push_event_dclick(mouse_dev_t *, int);
 
 #endif

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;