Changeset 60ebe63 in mainline for uspace/lib/c/generic/io/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/lib/c/generic/io/input.c (modified) (8 diffs)

uspace/lib/c/generic/io/input.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -106 +106 @@
 static void input_ev_key(input_t *input, ipc_call_t *call)
 {
+        unsigned kbd_id;
         kbd_event_type_t type;
         keycode_t key;
@@ -112 +113 @@
         errno_t rc;
 
-        type = ipc_get_arg1(call);
-        key = ipc_get_arg2(call);
-        mods = ipc_get_arg3(call);
-        c = ipc_get_arg4(call);
-
-        rc = input->ev_ops->key(input, type, key, mods, c);
+        kbd_id = ipc_get_arg1(call);
+        type = ipc_get_arg2(call);
+        key = ipc_get_arg3(call);
+        mods = ipc_get_arg4(call);
+        c = ipc_get_arg5(call);
+
+        rc = input->ev_ops->key(input, kbd_id, type, key, mods, c);
         async_answer_0(call, rc);
 }
@@ -123 +125 @@
 static void input_ev_move(input_t *input, ipc_call_t *call)
 {
+        unsigned pos_id;
         int dx;
         int dy;
         errno_t rc;
 
-        dx = ipc_get_arg1(call);
-        dy = ipc_get_arg2(call);
-
-        rc = input->ev_ops->move(input, dx, dy);
+        pos_id = ipc_get_arg1(call);
+        dx = ipc_get_arg2(call);
+        dy = ipc_get_arg3(call);
+
+        rc = input->ev_ops->move(input, pos_id, dx, dy);
         async_answer_0(call, rc);
 }
@@ -136 +140 @@
 static void input_ev_abs_move(input_t *input, ipc_call_t *call)
 {
+        unsigned pos_id;
         unsigned x;
         unsigned y;
@@ -142 +147 @@
         errno_t rc;
 
-        x = ipc_get_arg1(call);
-        y = ipc_get_arg2(call);
-        max_x = ipc_get_arg3(call);
-        max_y = ipc_get_arg4(call);
-
-        rc = input->ev_ops->abs_move(input, x, y, max_x, max_y);
+        pos_id = ipc_get_arg1(call);
+        x = ipc_get_arg2(call);
+        y = ipc_get_arg3(call);
+        max_x = ipc_get_arg4(call);
+        max_y = ipc_get_arg5(call);
+
+        rc = input->ev_ops->abs_move(input, pos_id, x, y, max_x, max_y);
         async_answer_0(call, rc);
 }
@@ -153 +159 @@
 static void input_ev_button(input_t *input, ipc_call_t *call)
 {
+        unsigned pos_id;
         int bnum;
         int press;
         errno_t rc;
 
-        bnum = ipc_get_arg1(call);
-        press = ipc_get_arg2(call);
-
-        rc = input->ev_ops->button(input, bnum, press);
+        pos_id = ipc_get_arg1(call);
+        bnum = ipc_get_arg2(call);
+        press = ipc_get_arg3(call);
+
+        rc = input->ev_ops->button(input, pos_id, bnum, press);
         async_answer_0(call, rc);
 }
@@ -166 +174 @@
 static void input_ev_dclick(input_t *input, ipc_call_t *call)
 {
+        unsigned pos_id;
         int bnum;
         errno_t rc;
 
-        bnum = ipc_get_arg1(call);
-
-        rc = input->ev_ops->dclick(input, bnum);
+        pos_id = ipc_get_arg1(call);
+        bnum = ipc_get_arg2(call);
+
+        rc = input->ev_ops->dclick(input, pos_id, bnum);
         async_answer_0(call, rc);
 }