Changeset cf32dbd in mainline for uspace/srv/hid/display/display.c

Timestamp:

2019-11-29T19:38:25Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

fd777a2

Parents:

38e5f36c

Message:

Introduce window focus, housed in a seat object

File:

• uspace/srv/hid/display/display.c (modified) (6 diffs)

uspace/srv/hid/display/display.c

@@ -39 +39 @@
 #include <stdlib.h>
 #include "client.h"
+#include "seat.h"
 #include "window.h"
 #include "display.h"
@@ -59 +60 @@
         disp->gc = gc;
         disp->next_wnd_id = 1;
+        list_initialize(&disp->seats);
         *rdisp = disp;
         return EOK;
@@ -70 +72 @@
 {
         assert(list_empty(&disp->clients));
+        assert(list_empty(&disp->seats));
         free(disp);
 }
@@ -76 +79 @@
  *
  * @param disp Display
- * @param client client
+ * @param client Client
  */
 void ds_display_add_client(ds_display_t *disp, ds_client_t *client)
@@ -89 +92 @@
 /** Remove client from display.
  *
- * @param client client
+ * @param client Client
  */
 void ds_display_remove_client(ds_client_t *client)
@@ -160 +163 @@
 }
 
+/** Post keyboard event to a display.
+ *
+ * The event is routed to the correct window by first determining the
+ * seat the keyboard device belongs to and then the event is sent to the
+ * window focused by that seat.
+ *
+ * @param display Display
+ * @param event Event
+ */
 errno_t ds_display_post_kbd_event(ds_display_t *display, kbd_event_t *event)
 {
-        ds_client_t *client;
-        ds_window_t *wnd;
-
-        // XXX Correctly determine destination window
-
-        client = ds_display_first_client(display);
-        if (client == NULL)
+        ds_seat_t *seat;
+
+        // TODO Determine which seat the event belongs to
+        seat = ds_display_first_seat(display);
+        if (seat == NULL)
                 return EOK;
 
-        wnd = ds_client_first_window(client);
-        if (wnd == NULL)
-                return EOK;
-
-        return ds_client_post_kbd_event(client, wnd, event);
+        return ds_seat_post_kbd_event(seat, event);
+}
+
+/** Add seat to display.
+ *
+ * @param disp Display
+ * @param seat Seat
+ */
+void ds_display_add_seat(ds_display_t *disp, ds_seat_t *seat)
+{
+        assert(seat->display == NULL);
+        assert(!link_used(&seat->lseats));
+
+        seat->display = disp;
+        list_append(&seat->lseats, &disp->seats);
+}
+
+/** Remove seat from display.
+ *
+ * @param seat Seat
+ */
+void ds_display_remove_seat(ds_seat_t *seat)
+{
+        list_remove(&seat->lseats);
+        seat->display = NULL;
+}
+
+/** Get first seat in display.
+ *
+ * @param disp Display
+ * @return First seat or @c NULL if there is none
+ */
+ds_seat_t *ds_display_first_seat(ds_display_t *disp)
+{
+        link_t *link = list_first(&disp->seats);
+
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, ds_seat_t, lseats);
+}
+
+/** Get next seat in display.
+ *
+ * @param seat Current seat
+ * @return Next seat or @c NULL if there is none
+ */
+ds_seat_t *ds_display_next_seat(ds_seat_t *seat)
+{
+        link_t *link = list_next(&seat->lseats, &seat->display->seats);
+
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, ds_seat_t, lseats);
 }