Changeset 0d00e53 in mainline for uspace/srv/hid

Timestamp:

2024-11-07T10:38:29Z (11 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

9a07ee3, 9e7e1dc

Parents:

ad9e225

git-author:

Jiri Svoboda <jiri@…> (2024-10-06 18:37:25)

git-committer:

Jiri Svoboda <jiri@…> (2024-11-07 10:38:29)

Message:

Shut down dialog

Location:

uspace/srv/hid/display

Files:

• seat.c (modified) (1 diff)
• window.c (modified) (2 diffs)

uspace/srv/hid/display/seat.c

@@ -492 +492 @@
         /* Focus window on button press */
         if (event->type == PTD_PRESS && event->btn_num == 1) {
-                if (wnd != NULL && (wnd->flags & wndf_popup) == 0) {
+                if (wnd != NULL && (wnd->flags & wndf_popup) == 0 &&
+                    (wnd->flags & wndf_nofocus) == 0) {
                         ds_seat_set_focus(seat, wnd);
                 }

uspace/srv/hid/display/window.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -153 +153 @@
 
         /* Is this a popup window? */
-        if ((params->flags & wndf_popup) != 0)
+        if ((params->flags & wndf_popup) != 0) {
                 ds_seat_set_popup(seat, wnd);
-        else
-                ds_seat_set_focus(seat, wnd);
+        } else {
+                if ((params->flags & wndf_nofocus) == 0)
+                        ds_seat_set_focus(seat, wnd);
+        }
 
         /* Is this window a panel? */