Changeset 0d00e53 in mainline

Timestamp:

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

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

9a07ee3, a450088

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

Files:

• app/hello/hello.h (modified) (2 diffs)
• app/meson.build (modified) (1 diff)
• app/shutdown-dlg/doc/doxygroups.h (added)
• app/shutdown-dlg/meson.build (added)
• app/shutdown-dlg/shutdown-dlg.c (added)
• app/shutdown-dlg/shutdown-dlg.h (added)
• app/shutdown/shutdown.c (modified) (2 diffs)
• lib/display/include/types/display/wndparams.h (modified) (2 diffs)
• lib/ui/include/types/ui/window.h (modified) (2 diffs)
• lib/ui/src/window.c (modified) (2 diffs)
• srv/hid/display/seat.c (modified) (1 diff)
• srv/hid/display/window.c (modified) (2 diffs)

uspace/app/hello/hello.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -37 +37 @@
 #define HELLO_H
 
-#include <display.h>
 #include <ui/fixed.h>
 #include <ui/label.h>

uspace/app/meson.build

@@ -78 +78 @@
         'sbi',
         'shutdown',
+        'shutdown-dlg',
         'sportdmp',
         'stats',

uspace/app/shutdown/shutdown.c

@@ -105 +105 @@
         }
 
-        rc = nchoice_set_prompt(nchoice, "Select action");
+        rc = nchoice_set_prompt(nchoice, "Do you want to shut the system down? "
+            "Select action:");
         if (rc != EOK) {
                 printf(NAME ": Out of memory.\n");
@@ -194 +195 @@
 
         fibril_mutex_lock(&shutdown.lock);
-        printf("System is shutting down...\n");
+        printf("The system is shutting down...\n");
         while (!shutdown.stopped)
                 fibril_condvar_wait(&shutdown.cv, &shutdown.lock);

uspace/lib/display/include/types/display/wndparams.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -42 +42 @@
         /** Popup window (capture events, no focus) */
         wndf_popup = 0x1,
+        /** Window does not receive focus */
+        wndf_nofocus = 0x2,
         /** Topmost window */
-        wndf_topmost = 0x2,
+        wndf_topmost = 0x4,
         /** Set specific initial window position */
-        wndf_setpos = 0x4,
+        wndf_setpos = 0x8,
         /** Window is minimized */
-        wndf_minimized = 0x8,
+        wndf_minimized = 0x10,
         /** Window is maximized */
-        wndf_maximized = 0x10,
+        wndf_maximized = 0x20,
         /** Special system window */
-        wndf_system = 0x20,
+        wndf_system = 0x40,
         /** Maximized windows should avoid this window */
-        wndf_avoid = 0x40
+        wndf_avoid = 0x80
 } display_wnd_flags_t;
 

uspace/lib/ui/include/types/ui/window.h

@@ -58 +58 @@
         /** Place window to the bottom-right corner of the screen */
         ui_wnd_place_bottom_right,
+        /** Place window to the center of the screen */
+        ui_wnd_place_center,
         /** Place window accross the entire screen */
         ui_wnd_place_full_screen,
@@ -68 +70 @@
         /** Popup window */
         ui_wndf_popup = 0x1,
+        /** Window does not receive focus */
+        ui_wndf_nofocus = 0x2,
         /** Topmost window */
-        ui_wndf_topmost = 0x2,
+        ui_wndf_topmost = 0x4,
         /** Special system window */
-        ui_wndf_system = 0x4,
+        ui_wndf_system = 0x8,
         /** Maximized windows should avoid this window */
-        ui_wndf_avoid = 0x8
+        ui_wndf_avoid = 0x10
 } ui_wnd_flags_t;
 

uspace/lib/ui/src/window.c

@@ -189 +189 @@
         switch (params->placement) {
         case ui_wnd_place_default:
-                assert(ui_is_fullscreen(window->ui));
+        case ui_wnd_place_center:
+                assert(params->placement != ui_wnd_place_default ||
+                    ui_is_fullscreen(window->ui));
                 /* Center window */
                 gfx_rect_dims(&params->rect, &dims);
@@ -357 +359 @@
         if ((params->flags & ui_wndf_popup) != 0)
                 dparams.flags |= wndf_popup;
+        if ((params->flags & ui_wndf_nofocus) != 0)
+                dparams.flags |= wndf_nofocus;
         if ((params->flags & ui_wndf_topmost) != 0)
                 dparams.flags |= wndf_topmost;

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? */