Changes in uspace/srv/hid/display/client.c [195b7b3:46a47c0] in mainline

File:

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

uspace/srv/hid/display/client.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2019 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -115 +115 @@
         seat = ds_display_first_seat(wnd->display);
         while (seat != NULL) {
-                ds_seat_evac_focus(seat, wnd);
+                ds_seat_evac_wnd_refs(seat, wnd);
                 seat = ds_display_next_seat(seat);
         }
+
+        /* Make sure no event in the queue is referencing the window */
+        ds_client_purge_window_events(wnd->client, wnd);
 
         list_remove(&wnd->lcwindows);
@@ -178 +181 @@
  * @param ewindow Place to store pointer to window receiving the event
  * @param event Place to store event
- * @return Graphic context
+ * @return EOK on success, ENOENT if event queue is empty
  */
 errno_t ds_client_get_event(ds_client_t *client, ds_window_t **ewindow,
@@ -199 +202 @@
 }
 
+/** Purge events from client event queue referring to a window.
+ *
+ * @param client Client
+ * @param window Window
+ */
+void ds_client_purge_window_events(ds_client_t *client,
+    ds_window_t *window)
+{
+        link_t *cur;
+        link_t *next;
+        ds_window_ev_t *wevent;
+
+        cur = list_first(&client->events);
+        while (cur != NULL) {
+                next = list_next(cur, &client->events);
+                wevent = list_get_instance(cur, ds_window_ev_t, levents);
+
+                if (wevent->window == window)
+                        list_remove(cur);
+
+                cur = next;
+        }
+}
+
 /** Post close event to the client's message queue.
  *
@@ -230 +257 @@
  * @param client Client
  * @param ewindow Window that the message is targetted to
- *
- * @return EOK on success or an error code
- */
-errno_t ds_client_post_focus_event(ds_client_t *client, ds_window_t *ewindow)
+ * @param event Focus event data
+ *
+ * @return EOK on success or an error code
+ */
+errno_t ds_client_post_focus_event(ds_client_t *client, ds_window_t *ewindow,
+    display_wnd_focus_ev_t *event)
 {
         ds_window_ev_t *wevent;
@@ -243 +272 @@
         wevent->window = ewindow;
         wevent->event.etype = wev_focus;
+        wevent->event.ev.focus = *event;
         list_append(&wevent->levents, &client->events);
 
@@ -346 +376 @@
  * @param client Client
  * @param ewindow Window that the message is targetted to
- *
- * @return EOK on success or an error code
- */
-errno_t ds_client_post_unfocus_event(ds_client_t *client, ds_window_t *ewindow)
+ * @param event Unfocus event data
+ *
+ * @return EOK on success or an error code
+ */
+errno_t ds_client_post_unfocus_event(ds_client_t *client, ds_window_t *ewindow,
+    display_wnd_unfocus_ev_t *event)
 {
         ds_window_ev_t *wevent;
@@ -359 +391 @@
         wevent->window = ewindow;
         wevent->event.etype = wev_unfocus;
+        wevent->event.ev.unfocus = *event;
         list_append(&wevent->levents, &client->events);