Changeset 60ebe63 in mainline for uspace/srv/hid/input/input.c

Timestamp:

2022-11-08T21:20:23Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7bcd15f

Parents:

3a6d44b7

Message:

Store positioning device ID in position events

File:

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

uspace/srv/hid/input/input.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * Copyright (c) 2006 Josef Cejka
  * 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);
                 }
@@ -317 +324 @@
                 if (client->active) {
                         async_exch_t *exch = async_exchange_begin(client->sess);
-                        async_msg_1(exch, INPUT_EVENT_DCLICK, bnum);
+                        async_msg_2(exch, INPUT_EVENT_DCLICK, mdev->svc_id,
+                            bnum);
                         async_exchange_end(exch);
                 }