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

File:

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

uspace/srv/hid/display/seat.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2023 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>
@@ -121 +119 @@
 }
 
-/** 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.
  *
@@ -492 +419 @@
         /* Focus window on button press */
         if (event->type == PTD_PRESS && event->btn_num == 1) {
-                if (wnd != NULL && (wnd->flags & wndf_popup) == 0 &&
-                    (wnd->flags & wndf_nofocus) == 0) {
+                if (wnd != NULL && (wnd->flags & wndf_popup) == 0) {
                         ds_seat_set_focus(seat, wnd);
                 }
@@ -584 +510 @@
 errno_t ds_seat_post_pos_event(ds_seat_t *seat, pos_event_t *event)
 {
-        ds_window_t *pwindow;
-        ds_window_t *cwindow;
+        ds_window_t *wnd;
         errno_t rc;
 
-        /* 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) {
+        wnd = ds_display_window_by_pos(seat->display, &seat->pntpos);
+
+        /* Deliver event to popup window. */
+        if (seat->popup != NULL && event->type != POS_PRESS) {
+                rc = ds_window_post_pos_event(seat->popup, event);
+                if (rc != EOK)
+                        return rc;
+        }
+
+        if (seat->focus != wnd && seat->focus != NULL) {
+                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) {
                 /* Moving over a window */
-                ds_seat_set_client_cursor(seat, pwindow->cursor);
-
-                rc = ds_window_post_pos_event(pwindow, event);
-                if (rc != EOK)
-                        return rc;
+                ds_seat_set_client_cursor(seat, wnd->cursor);
+
+                /*
+                 * Only deliver event if we didn't already deliver it
+                 * to the same window above.
+                 */
+                if (wnd != seat->popup || event->type == POS_PRESS) {
+                        rc = ds_window_post_pos_event(wnd, 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) {
+        if (event->type == POS_PRESS && wnd != seat->popup) {
                 /* Close popup window */
                 ds_seat_set_popup(seat, NULL);