Changeset cf32dbd in mainline

Timestamp:

2019-11-29T19:38:25Z (5 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

Location:

uspace/srv/hid/display

Files:

• client.c (modified) (2 diffs)
• client.h (modified) (1 diff)
• display.c (modified) (6 diffs)
• display.h (modified) (2 diffs)
• dsops.c (modified) (3 diffs)
• main.c (modified) (4 diffs)
• meson.build (modified) (2 diffs)
• seat.c (added)
• seat.h (added)
• test/display.c (modified) (4 diffs)
• types/display/display.h (modified) (1 diff)
• types/display/seat.h (added)
• window.h (modified) (1 diff)

uspace/srv/hid/display/client.c

@@ -39 +39 @@
 #include "client.h"
 #include "display.h"
+#include "seat.h"
 #include "window.h"
 
@@ -112 +113 @@
 void ds_client_remove_window(ds_window_t *wnd)
 {
+        ds_seat_t *seat;
+
+        /* Make sure window is no longer focused in any seat */
+        seat = ds_display_first_seat(wnd->client->display);
+        while (seat != NULL) {
+                ds_seat_evac_focus(seat, wnd);
+                seat = ds_display_next_seat(seat);
+        }
+
         list_remove(&wnd->lwindows);
         wnd->client = NULL;

uspace/srv/hid/display/client.h

@@ -37 +37 @@
 #define CLIENT_H
 
+#include <errno.h>
+#include <io/kbd_event.h>
 #include "types/display/client.h"
 #include "types/display/display.h"

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);
 }
 

uspace/srv/hid/display/display.h

@@ -42 +42 @@
 #include "types/display/client.h"
 #include "types/display/display.h"
+#include "types/display/seat.h"
 
 extern errno_t ds_display_create(gfx_context_t *, ds_display_t **);
@@ -51 +52 @@
 extern ds_window_t *ds_display_find_window(ds_display_t *, ds_wnd_id_t);
 extern errno_t ds_display_post_kbd_event(ds_display_t *, kbd_event_t *);
+extern void ds_display_add_seat(ds_display_t *, ds_seat_t *);
+extern void ds_display_remove_seat(ds_seat_t *);
+extern ds_seat_t *ds_display_first_seat(ds_display_t *);
+extern ds_seat_t *ds_display_next_seat(ds_seat_t *);
 
 #endif

uspace/srv/hid/display/dsops.c

@@ -38 +38 @@
 #include <io/log.h>
 #include "client.h"
+#include "display.h"
+#include "dsops.h"
+#include "seat.h"
 #include "window.h"
-#include "dsops.h"
 
 static errno_t disp_window_create(void *, sysarg_t *);
@@ -55 +57 @@
         errno_t rc;
         ds_client_t *client = (ds_client_t *) arg;
+        ds_seat_t *seat;
         ds_window_t *wnd;
 
@@ -69 +72 @@
         wnd->dpos.x = ((wnd->id - 1) & 1) * 400;
         wnd->dpos.y = ((wnd->id - 1) & 2) / 2 * 300;
+
+        /*
+         * XXX This should be performed by window manager. It needs to determine
+         * whether the new window should get focus and which seat should
+         * focus on it.
+         */
+        seat = ds_display_first_seat(client->display);
+        ds_seat_set_focus(seat, wnd);
 
         *rwnd_id = wnd->id;

uspace/srv/hid/display/main.c

@@ -50 +50 @@
 #include "main.h"
 #include "output.h"
+#include "seat.h"
 #include "window.h"
 
@@ -78 +79 @@
 {
         ds_display_t *disp = NULL;
+        ds_seat_t *seat = NULL;
         gfx_context_t *gc = NULL;
         errno_t rc;
@@ -84 +86 @@
 
         rc = ds_display_create(NULL, &disp);
+        if (rc != EOK)
+                goto error;
+
+        rc = ds_seat_create(disp, &seat);
         if (rc != EOK)
                 goto error;
@@ -121 +127 @@
         if (gc != NULL)
                 gfx_context_delete(gc);
+        if (seat != NULL)
+                ds_seat_destroy(seat);
         if (disp != NULL)
                 ds_display_destroy(disp);

uspace/srv/hid/display/meson.build

@@ -35 +35 @@
         'main.c',
         'output.c',
+        'seat.c',
         'window.c',
 )
@@ -41 +42 @@
         'client.c',
         'display.c',
+        'seat.c',
         'window.c',
         'test/client.c',

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

@@ -34 +34 @@
 #include "../client.h"
 #include "../display.h"
+#include "../seat.h"
 #include "../window.h"
 
@@ -130 +131 @@
 }
 
+/** Basic seat operation. */
+PCUT_TEST(display_seat)
+{
+        ds_display_t *disp;
+        ds_seat_t *seat;
+        ds_seat_t *s0, *s1;
+        errno_t rc;
+
+        rc = ds_display_create(NULL, &disp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_seat_create(disp, &seat);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        s0 = ds_display_first_seat(disp);
+        PCUT_ASSERT_EQUALS(s0, seat);
+
+        s1 = ds_display_next_seat(s0);
+        PCUT_ASSERT_NULL(s1);
+
+        ds_seat_destroy(seat);
+        ds_display_destroy(disp);
+}
+
 /** Test ds_display_post_kbd_event(). */
 PCUT_TEST(display_post_kbd_event)
 {
         ds_display_t *disp;
+        ds_seat_t *seat;
         ds_client_t *client;
         ds_window_t *wnd;
@@ -141 +167 @@
 
         rc = ds_display_create(NULL, &disp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_seat_create(disp, &seat);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -162 +191 @@
         ds_window_destroy(wnd);
         ds_client_destroy(client);
+        ds_seat_destroy(seat);
         ds_display_destroy(disp);
 }

uspace/srv/hid/display/types/display/display.h

@@ -59 +59 @@
         /** Input service */
         input_t *input;
+
+        /** Seats (of ds_seat_t) */
+        list_t seats;
 } ds_display_t;
 

uspace/srv/hid/display/window.h

@@ -37 +37 @@
 #define WINDOW_H
 
-#include <display/event.h>
 #include <errno.h>
 #include <types/gfx/context.h>