Changeset 88d828e in mainline

Timestamp:

2022-11-09T16:44:28Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

68704ab

Parents:

a6492460

git-author:

Jiri Svoboda <jiri@…> (2022-11-09 16:41:51)

git-committer:

Jiri Svoboda <jiri@…> (2022-11-09 16:44:28)

Message:

Keyboard events need device ID too + some DS multiseat work

Location:

uspace

Files:

• lib/c/include/io/kbd_event.h (modified) (3 diffs)
• srv/hid/display/display.c (modified) (4 diffs)
• srv/hid/display/display.h (modified) (2 diffs)
• srv/hid/display/input.c (modified) (1 diff)
• srv/hid/display/test/display.c (modified) (1 diff)
• srv/hid/display/types/display/idev.h (added)
• srv/hid/display/window.c (modified) (3 diffs)
• srv/hid/display/wmops.c (modified) (1 diff)

uspace/lib/c/include/io/kbd_event.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -39 +39 @@
 #include <inttypes.h>
 #include <io/keycode.h>
+#include <types/common.h>
 
 typedef enum {
@@ -49 +50 @@
         /** List handle */
         link_t link;
+
+        /** Keyboard device ID */
+        sysarg_t kbd_id;
 
         /** Press or release event. */

uspace/srv/hid/display/display.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -445 +445 @@
         ds_seat_t *seat;
 
-        // TODO Determine which seat the event belongs to
-        seat = ds_display_first_seat(display);
+        /* Determine which seat the event belongs to */
+        seat = ds_display_seat_by_idev(display, event->kbd_id);
         if (seat == NULL)
                 return EOK;
@@ -462 +462 @@
         ds_seat_t *seat;
 
-        // TODO Determine which seat the event belongs to
-        seat = ds_display_first_seat(display);
+        /* Determine which seat the event belongs to */
+        seat = ds_display_seat_by_idev(display, event->pos_id);
         if (seat == NULL)
                 return EOK;
@@ -522 +522 @@
 
         return list_get_instance(link, ds_seat_t, lseats);
+}
+
+/** Get seat which owns the specified input device.
+ *
+ * @param disp Display
+ * @param idev_id Input device ID
+ * @return Seat which owns device with ID @a idev_id or @c NULL if not found
+ */
+ds_seat_t *ds_display_seat_by_idev(ds_display_t *disp, ds_idev_id_t idev_id)
+{
+        // TODO Multi-seat
+        (void) idev_id;
+
+        return ds_display_first_seat(disp);
 }
 

uspace/srv/hid/display/display.h

@@ -46 +46 @@
 #include "types/display/ddev.h"
 #include "types/display/display.h"
+#include "types/display/idev.h"
 #include "types/display/ptd_event.h"
 #include "types/display/seat.h"
@@ -79 +80 @@
 extern ds_seat_t *ds_display_first_seat(ds_display_t *);
 extern ds_seat_t *ds_display_next_seat(ds_seat_t *);
+extern ds_seat_t *ds_display_seat_by_idev(ds_display_t *, ds_idev_id_t);
 extern errno_t ds_display_add_ddev(ds_display_t *, ds_ddev_t *);
 extern void ds_display_remove_ddev(ds_ddev_t *);

uspace/srv/hid/display/input.c

@@ -80 +80 @@
         errno_t rc;
 
-        (void)kbd_id;
-
+        event.kbd_id = kbd_id;
         event.type = type;
         event.key = key;

uspace/srv/hid/display/test/display.c

@@ -317 +317 @@
 }
 
+/** ds_display_seat_by_idev() returns the correct seat. */
+PCUT_TEST(display_seat_by_idev)
+{
+        // XXX TODO
+}
+
 /** Test ds_display_post_kbd_event() delivers event to client callback.
  */

uspace/srv/hid/display/window.c

@@ -142 +142 @@
         }
 
+        // TODO Multi-seat: which seat should own the new window?
         seat = ds_display_first_seat(client->display);
 
@@ -505 +506 @@
         wnd->preview_rect = wnd->rect;
 
-        // XXX Need client to tell us which seat started the resize!
+        // TODO Multi-seat: need client to tell us which seat started the resize!
         seat = ds_display_first_seat(wnd->display);
         ctype = display_cursor_from_wrsz(rsztype);
@@ -536 +537 @@
         ds_client_post_resize_event(wnd->client, wnd, &nrect);
 
-        // XXX Need to know which seat started the resize!
+        // TODO Multi-seat: Need to know which seat started the resize!
         seat = ds_display_first_seat(wnd->display);
         ds_seat_set_wm_cursor(seat, NULL);

uspace/srv/hid/display/wmops.c

@@ -171 +171 @@
         }
 
-        // TODO Multi-seat
-        (void) dev_id;
-        seat = ds_display_first_seat(wnd->display);
+        /* Determine which seat's focus should be changed */
+        seat = ds_display_seat_by_idev(wnd->display, dev_id);
+        if (seat == NULL) {
+                ds_display_unlock(wmclient->display);
+                return ENOENT;
+        }
 
         /* Switch focus */