Changes in uspace/srv/hid/input/input.c [06f10ac:4c6fd56] in mainline

File:

• uspace/srv/hid/input/input.c (modified) (10 diffs)

uspace/srv/hid/input/input.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2023 Jiri Svoboda
  * Copyright (c) 2006 Josef Cejka
- * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -253 +253 @@
                 if (client->active) {
                         async_exch_t *exch = async_exchange_begin(client->sess);
-                        async_msg_4(exch, INPUT_EVENT_KEY, ev.type, ev.key, ev.mods, ev.c);
+                        async_msg_5(exch, INPUT_EVENT_KEY, kdev->svc_id,
+                            ev.type, ev.key, ev.mods, ev.c);
                         async_exchange_end(exch);
                 }
@@ -267 +268 @@
 
                         if ((dx) || (dy))
-                                async_msg_2(exch, INPUT_EVENT_MOVE, dx, dy);
+                                async_msg_3(exch, INPUT_EVENT_MOVE,
+                                    mdev->svc_id, dx, dy);
 
                         if (dz) {
@@ -274 +276 @@
 
                                 for (unsigned int i = 0; i < 3; i++)
-                                        async_msg_4(exch, INPUT_EVENT_KEY, KEY_PRESS, code, 0, 0);
-
-                                async_msg_4(exch, INPUT_EVENT_KEY, KEY_RELEASE, code, 0, 0);
+                                        async_msg_5(exch, INPUT_EVENT_KEY,
+                                            0 /* XXX kbd_id */,
+                                            KEY_PRESS, code, 0, 0);
+
+                                async_msg_5(exch, INPUT_EVENT_KEY, KEY_RELEASE,
+                                    0 /* XXX kbd_id */, code, 0, 0);
                         }
 
@@ -292 +297 @@
                         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_msg_5(exch, INPUT_EVENT_ABS_MOVE,
+                                    mdev->svc_id, x, y, max_x, max_y);
                                 async_exchange_end(exch);
                         }
@@ -305 +311 @@
                 if (client->active) {
                         async_exch_t *exch = async_exchange_begin(client->sess);
-                        async_msg_2(exch, INPUT_EVENT_BUTTON, bnum, press);
+                        async_msg_3(exch, INPUT_EVENT_BUTTON, mdev->svc_id,
+                            bnum, press);
                         async_exchange_end(exch);
                 }
@@ -311 +318 @@
 }
 
-/** 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_2(exch, INPUT_EVENT_DCLICK, mdev->svc_id,
+                            bnum);
+                        async_exchange_end(exch);
+                }
+        }
+}
+
+/** Arbitrate client activation */
 static void client_arbitration(void)
 {
@@ -858 +878 @@
 {
         errno_t rc;
+        loc_srv_t *srv;
 
         if (argc < 2) {
@@ -881 +902 @@
         async_set_fallback_port_handler(client_connection, NULL);
 
-        rc = loc_server_register(NAME);
+        rc = loc_server_register(NAME, &srv);
         if (rc != EOK) {
                 printf("%s: Unable to register server\n", NAME);
@@ -888 +909 @@
 
         service_id_t service_id;
-        rc = loc_service_register(argv[1], &service_id);
+        rc = loc_service_register(srv, argv[1], &service_id);
         if (rc != EOK) {
                 printf("%s: Unable to register service %s\n", NAME, argv[1]);