Changes in uspace/srv/hid/display/seat.c [554a5f1:0d00e53] in mainline

File:

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

uspace/srv/hid/display/seat.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2019 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -38 +38 @@
 #include <gfx/color.h>
 #include <gfx/render.h>
+#include <sif.h>
+#include <stdio.h>
 #include <stdlib.h>
+#include <str.h>
 #include "client.h"
 #include "cursor.h"
 #include "display.h"
+#include "idevcfg.h"
 #include "seat.h"
 #include "window.h"
@@ -51 +55 @@
  *
  * @param display Parent display
+ * @param name Seat name
  * @param rseat Place to store pointer to new seat.
  * @return EOK on success, ENOMEM if out of memory
  */
-errno_t ds_seat_create(ds_display_t *display, ds_seat_t **rseat)
+errno_t ds_seat_create(ds_display_t *display, const char *name,
+    ds_seat_t **rseat)
 {
         ds_seat_t *seat;
+        ds_seat_t *s0;
+
+        s0 = ds_display_first_seat(display);
+        while (s0 != NULL) {
+                if (str_cmp(s0->name, name) == 0)
+                        return EEXIST;
+                s0 = ds_display_next_seat(s0);
+        }
 
         seat = calloc(1, sizeof(ds_seat_t));
@@ -62 +76 @@
                 return ENOMEM;
 
+        seat->name = str_dup(name);
+        if (seat->name == NULL) {
+                free(seat);
+                return ENOMEM;
+        }
+
+        list_initialize(&seat->idevcfgs);
+
         ds_display_add_seat(display, seat);
         seat->pntpos.x = 0;
@@ -68 +90 @@
         seat->client_cursor = display->cursor[dcurs_arrow];
         seat->wm_cursor = NULL;
+        seat->focus = ds_display_first_window(display);
 
         *rseat = seat;
@@ -79 +102 @@
 void ds_seat_destroy(ds_seat_t *seat)
 {
+        ds_idevcfg_t *idevcfg;
+
+        /* Remove all input device configuration entries pointing to this seat */
+        idevcfg = ds_seat_first_idevcfg(seat);
+        while (idevcfg != NULL) {
+                ds_idevcfg_destroy(idevcfg);
+                idevcfg = ds_seat_first_idevcfg(seat);
+        }
+
+        /* Remove this seat's focus */
+        if (seat->focus != NULL)
+                ds_window_post_unfocus_event(seat->focus);
+
         ds_display_remove_seat(seat);
+
+        free(seat->name);
         free(seat);
 }
 
+/** Load seat from SIF node.
+ *
+ * @param display Display
+ * @param snode Seat node from which to load the seat
+ * @param rseat Place to store pointer to the newly loaded seat
+ *
+ * @return EOK on success or an error code
+ */
+errno_t ds_seat_load(ds_display_t *display, sif_node_t *snode,
+    ds_seat_t **rseat)
+{
+        const char *sid;
+        const char *name;
+        char *endptr;
+        unsigned long id;
+        errno_t rc;
+
+        sid = sif_node_get_attr(snode, "id");
+        if (sid == NULL)
+                return EIO;
+
+        name = sif_node_get_attr(snode, "name");
+        if (name == NULL)
+                return EIO;
+
+        id = strtoul(sid, &endptr, 10);
+        if (*endptr != '\0')
+                return EIO;
+
+        rc = ds_seat_create(display, name, rseat);
+        if (rc != EOK)
+                return EIO;
+
+        (*rseat)->id = id;
+        return EOK;
+}
+
+/** Save seat to SIF node.
+ *
+ * @param seat Seat
+ * @param snode Seat node into which the seat should be saved
+ *
+ * @return EOK on success or an error code
+ */
+errno_t ds_seat_save(ds_seat_t *seat, sif_node_t *snode)
+{
+        char *sid;
+        errno_t rc;
+        int rv;
+
+        rv = asprintf(&sid, "%lu", (unsigned long)seat->id);
+        if (rv < 0) {
+                rc = ENOMEM;
+                return rc;
+        }
+
+        rc = sif_node_set_attr(snode, "id", sid);
+        if (rc != EOK) {
+                free(sid);
+                return rc;
+        }
+
+        free(sid);
+
+        rc = sif_node_set_attr(snode, "name", seat->name);
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+}
+
 /** Set seat focus to a window.
  *
@@ -90 +199 @@
 void ds_seat_set_focus(ds_seat_t *seat, ds_window_t *wnd)
 {
+        errno_t rc;
+
         if (wnd == seat->focus) {
                 /* Focus is not changing */
@@ -95 +206 @@
         }
 
+        if (wnd != NULL) {
+                rc = ds_window_unminimize(wnd);
+                if (rc != EOK)
+                        return;
+        }
+
         if (seat->focus != NULL)
                 ds_window_post_unfocus_event(seat->focus);
@@ -104 +221 @@
                 ds_window_bring_to_top(wnd);
         }
-}
-
-/** Evacuate focus from window.
- *
- * If seat's focus is @a wnd, it will be set to a different window.
+
+        /* When focus changes, popup window should be closed */
+        ds_seat_set_popup(seat, NULL);
+}
+
+/** Set seat popup window.
+ *
+ * @param seat Seat
+ * @param wnd Popup window
+ */
+void ds_seat_set_popup(ds_seat_t *seat, ds_window_t *wnd)
+{
+        if (wnd == seat->popup)
+                return;
+
+        if (seat->popup != NULL) {
+                /* Window is no longer the popup window, send close request */
+                ds_client_post_close_event(seat->popup->client,
+                    seat->popup);
+        }
+
+        seat->popup = wnd;
+}
+
+/** Evacuate seat references to window.
+ *
+ * If seat's focus is @a wnd, it will be set to NULL.
+ * If seat's popup window is @a wnd, it will be set to NULL.
+ *
+ * @param seat Seat
+ * @param wnd Window to evacuate references from
+ */
+void ds_seat_evac_wnd_refs(ds_seat_t *seat, ds_window_t *wnd)
+{
+        if (seat->focus == wnd)
+                ds_seat_set_focus(seat, NULL);
+
+        if (seat->popup == wnd)
+                ds_seat_set_popup(seat, NULL);
+}
+
+/** Unfocus window.
+ *
+ * If seat's focus is @a wnd, it will be set to a different window
+ * that is not minimized, preferably not a system window.
+ *
+ * @param seat Seat
+ * @param wnd Window to remove focus from
+ */
+void ds_seat_unfocus_wnd(ds_seat_t *seat, ds_window_t *wnd)
+{
+        ds_window_t *nwnd;
+
+        if (seat->focus != wnd)
+                return;
+
+        /* Find alternate window that is neither system nor minimized */
+        nwnd = ds_window_find_prev(wnd, ~(wndf_minimized | wndf_system));
+
+        if (nwnd == NULL) {
+                /* Find alternate window that is not minimized */
+                nwnd = ds_window_find_prev(wnd, ~wndf_minimized);
+        }
+
+        ds_seat_set_focus(seat, nwnd);
+}
+
+/** Switch focus to another window.
  *
  * @param seat Seat
  * @param wnd Window to evacuate focus from
  */
-void ds_seat_evac_focus(ds_seat_t *seat, ds_window_t *wnd)
+void ds_seat_switch_focus(ds_seat_t *seat)
 {
         ds_window_t *nwnd;
 
-        if (seat->focus == wnd) {
-                nwnd = ds_display_next_window(wnd);
-                if (nwnd == NULL)
-                        nwnd = ds_display_first_window(wnd->display);
-                if (nwnd == wnd)
-                        nwnd = NULL;
-
+        if (seat->focus != NULL) {
+                /* Find alternate window that is not a system window */
+                nwnd = ds_window_find_next(seat->focus, ~wndf_system);
+        } else {
+                /* Currently no focus. Focus topmost window. */
+                nwnd = ds_display_first_window(seat->display);
+        }
+
+        /* Only switch focus if there is another window */
+        if (nwnd != NULL)
                 ds_seat_set_focus(seat, nwnd);
-        }
 }
 
@@ -143 +325 @@
         if (event->type == KEY_PRESS && alt_or_shift && event->key == KC_TAB) {
                 /* On Alt-Tab or Shift-Tab, switch focus to next window */
-                ds_seat_evac_focus(seat, seat->focus);
+                ds_seat_switch_focus(seat);
                 return EOK;
         }
 
-        dwindow = seat->focus;
+        dwindow = seat->popup;
+        if (dwindow == NULL)
+                dwindow = seat->focus;
+
         if (dwindow == NULL)
                 return EOK;
@@ -307 +492 @@
         /* Focus window on button press */
         if (event->type == PTD_PRESS && event->btn_num == 1) {
-                if (wnd != NULL) {
+                if (wnd != NULL && (wnd->flags & wndf_popup) == 0 &&
+                    (wnd->flags & wndf_nofocus) == 0) {
                         ds_seat_set_focus(seat, wnd);
                 }
         }
 
-        if (event->type == PTD_PRESS || event->type == PTD_RELEASE) {
-                pevent.pos_id = 0;
-                pevent.type = (event->type == PTD_PRESS) ?
-                    POS_PRESS : POS_RELEASE;
+        if (event->type == PTD_PRESS || event->type == PTD_RELEASE ||
+            event->type == PTD_DCLICK) {
+                pevent.pos_id = event->pos_id;
+                switch (event->type) {
+                case PTD_PRESS:
+                        pevent.type = POS_PRESS;
+                        break;
+                case PTD_RELEASE:
+                        pevent.type = POS_RELEASE;
+                        break;
+                case PTD_DCLICK:
+                        pevent.type = POS_DCLICK;
+                        break;
+                default:
+                        assert(false);
+                }
+
                 pevent.btn_num = event->btn_num;
                 pevent.hpos = seat->pntpos.x;
@@ -332 +531 @@
                 seat->pntpos = npos;
 
-                pevent.pos_id = 0;
+                pevent.pos_id = event->pos_id;
                 pevent.type = POS_UPDATE;
                 pevent.btn_num = 0;
@@ -360 +559 @@
                 seat->pntpos = npos;
 
-                pevent.pos_id = 0;
+                pevent.pos_id = event->pos_id;
                 pevent.type = POS_UPDATE;
                 pevent.btn_num = 0;
@@ -385 +584 @@
 errno_t ds_seat_post_pos_event(ds_seat_t *seat, pos_event_t *event)
 {
-        ds_window_t *wnd;
+        ds_window_t *pwindow;
+        ds_window_t *cwindow;
         errno_t rc;
 
-        wnd = ds_display_window_by_pos(seat->display, &seat->pntpos);
-
-        if (seat->focus != wnd) {
-                rc = ds_window_post_pos_event(seat->focus, event);
-                if (rc != EOK)
-                        return rc;
-
-                /* Only deliver release events to the focused window */
-                if (event->type == POS_RELEASE)
-                        return EOK;
-        }
-
-        if (wnd != NULL) {
+        /* Window under pointer */
+        pwindow = ds_display_window_by_pos(seat->display, &seat->pntpos);
+
+        /* Current window: popup or focused */
+        cwindow = seat->popup;
+        if (cwindow == NULL)
+                cwindow = seat->focus;
+
+        /*
+         * Deliver move and release event to current window if different
+         * from pwindow
+         */
+        if (event->type != POS_PRESS && cwindow != NULL &&
+            cwindow != pwindow) {
+                rc = ds_window_post_pos_event(cwindow, event);
+                if (rc != EOK)
+                        return rc;
+        }
+
+        if (pwindow != NULL) {
                 /* Moving over a window */
-                ds_seat_set_client_cursor(seat, wnd->cursor);
-
-                rc = ds_window_post_pos_event(wnd, event);
+                ds_seat_set_client_cursor(seat, pwindow->cursor);
+
+                rc = ds_window_post_pos_event(pwindow, event);
                 if (rc != EOK)
                         return rc;
         } else {
                 /* Not over a window */
-                ds_seat_set_client_cursor(seat, seat->display->cursor[dcurs_arrow]);
+                ds_seat_set_client_cursor(seat,
+                    seat->display->cursor[dcurs_arrow]);
+        }
+
+        /* Click outside popup window */
+        if (event->type == POS_PRESS && pwindow != seat->popup) {
+                /* Close popup window */
+                ds_seat_set_popup(seat, NULL);
         }
 
@@ -428 +642 @@
 }
 
+/** Add input device configuration entry to seat.
+ *
+ * @param seat Seat
+ * @param idevcfg Input device configuration
+ */
+void ds_seat_add_idevcfg(ds_seat_t *seat, ds_idevcfg_t *idevcfg)
+{
+        assert(idevcfg->seat == NULL);
+        assert(!link_used(&idevcfg->lseatidcfgs));
+
+        idevcfg->seat = seat;
+        list_append(&idevcfg->lseatidcfgs, &seat->idevcfgs);
+}
+
+/** Remove input device configuration entry from seat.
+ *
+ * @param idevcfg Input device configuration entry
+ */
+void ds_seat_remove_idevcfg(ds_idevcfg_t *idevcfg)
+{
+        list_remove(&idevcfg->lseatidcfgs);
+        idevcfg->seat = NULL;
+}
+
+/** Get first input device configuration entry in seat.
+ *
+ * @param disp Display
+ * @return First input device configuration entry or @c NULL if there is none
+ */
+ds_idevcfg_t *ds_seat_first_idevcfg(ds_seat_t *seat)
+{
+        link_t *link = list_first(&seat->idevcfgs);
+
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, ds_idevcfg_t, lseatidcfgs);
+}
+
+/** Get next input device configuration entry in seat.
+ *
+ * @param idevcfg Current input device configuration entry
+ * @return Next input device configuration entry or @c NULL if there is none
+ */
+ds_idevcfg_t *ds_seat_next_idevcfg(ds_idevcfg_t *idevcfg)
+{
+        link_t *link = list_next(&idevcfg->lseatidcfgs, &idevcfg->seat->idevcfgs);
+
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, ds_idevcfg_t, lseatidcfgs);
+}
+
 /** @}
  */