Changeset 5d380b6 in mainline for uspace/srv

Timestamp:

2023-01-20T11:50:41Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b1f0a14

Parents:

6828a56

git-author:

Jiri Svoboda <jiri@…> (2023-01-20 19:50:21)

git-committer:

Jiri Svoboda <jiri@…> (2023-01-20 11:50:41)

Message:

Create menu windows in the correct seat

Add a mechanism to set the seat of a new display window, UI window,
UI popup - input device ID. This is set to the ID of the device which
activated the menu (mouse, keyboard). The display server determines
the correct seat from there.

This makes sure clicking outside closes the correct pop-up window.

Location:

uspace/srv/hid/display

Files:

• display.c (modified) (2 diffs)
• display.h (modified) (1 diff)
• window.c (modified) (4 diffs)

uspace/srv/hid/display/display.c

@@ -597 +597 @@
 }
 
+/** Get default seat in display.
+ *
+ * @param disp Display
+ * @return First seat or @c NULL if there is none
+ */
+ds_seat_t *ds_display_default_seat(ds_display_t *disp)
+{
+        /* XXX Probably not the best solution */
+        return ds_display_first_seat(disp);
+}
+
 /** Find seat by ID.
  *
@@ -640 +651 @@
 
         /* If none was found, return the default seat */
-        return ds_display_first_seat(disp);
+        return ds_display_default_seat(disp);
 }
 

uspace/srv/hid/display/display.h

@@ -85 +85 @@
 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_default_seat(ds_display_t *);
 extern ds_seat_t *ds_display_find_seat(ds_display_t *, ds_seat_id_t);
 extern ds_seat_t *ds_display_seat_by_idev(ds_display_t *, ds_idev_id_t);

uspace/srv/hid/display/window.c

@@ -88 +88 @@
         }
 
+        /* Caption */
         wnd->caption = str_dup(params->caption);
         if (wnd->caption == NULL) {
@@ -99 +100 @@
         gfx_bitmap_params_init(&bparams);
         bparams.rect = params->rect;
+
+        /* Allocate window bitmap */
 
         dgc = ds_display_get_gc(wnd->display);
@@ -142 +145 @@
         }
 
-        // TODO Multi-seat: which seat should own the new window?
-        seat = ds_display_first_seat(client->display);
-
+        /* Determine which seat should own the window */
+        if (params->idev_id != 0)
+                seat = ds_display_seat_by_idev(wnd->display, params->idev_id);
+        else
+                seat = ds_display_default_seat(wnd->display);
+
+        /* Is this a popup window? */
         if ((params->flags & wndf_popup) != 0)
                 ds_seat_set_popup(seat, wnd);
@@ -150 +157 @@
                 ds_seat_set_focus(seat, wnd);
 
+        /* Is this window a panel? */
         if ((params->flags & wndf_avoid) != 0)
                 ds_display_update_max_rect(wnd->display);