Changes in uspace/app/shutdown-dlg/shutdown-dlg.c [97116a2:0d00e53] in mainline

File:

• uspace/app/shutdown-dlg/shutdown-dlg.c (modified) (13 diffs)

uspace/app/shutdown-dlg/shutdown-dlg.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -41 +41 @@
 #include <ui/fixed.h>
 #include <ui/label.h>
-#include <ui/msgdialog.h>
 #include <ui/resource.h>
 #include <ui/ui.h>
@@ -49 +48 @@
 static void wnd_close(ui_window_t *, void *);
 static errno_t bg_wnd_paint(ui_window_t *, void *);
-static void shutdown_progress_destroy(shutdown_progress_t *);
-static errno_t shutdown_confirm_msg_create(shutdown_dlg_t *);
-static errno_t shutdown_failed_msg_create(shutdown_dlg_t *);
-static errno_t shutdown_start(shutdown_dlg_t *);
 
 static ui_window_cb_t bg_window_cb = {
@@ -69 +64 @@
         .shutdown_complete = sd_shutdown_complete,
         .shutdown_failed = sd_shutdown_failed
-};
-
-static void shutdown_confirm_msg_button(ui_msg_dialog_t *, void *, unsigned);
-static void shutdown_confirm_msg_close(ui_msg_dialog_t *, void *);
-
-static ui_msg_dialog_cb_t shutdown_confirm_msg_cb = {
-        .button = shutdown_confirm_msg_button,
-        .close = shutdown_confirm_msg_close
-};
-
-static void shutdown_failed_msg_button(ui_msg_dialog_t *, void *, unsigned);
-static void shutdown_failed_msg_close(ui_msg_dialog_t *, void *);
-
-static ui_msg_dialog_cb_t shutdown_failed_msg_cb = {
-        .button = shutdown_failed_msg_button,
-        .close = shutdown_failed_msg_close
 };
 
@@ -111 +90 @@
 
         ui_lock(sddlg->ui);
-        shutdown_progress_destroy(sddlg->progress);
-        sddlg->progress = NULL;
-        ui_window_destroy(sddlg->bgwindow);
-        sddlg->bgwindow = NULL;
-        (void)shutdown_failed_msg_create(sddlg);
+        (void)ui_label_set_text(sddlg->progress->label, "Shutdown failed.");
+        (void)ui_window_paint(sddlg->progress->window);
         ui_unlock(sddlg->ui);
 }
@@ -159 +135 @@
 
         return EOK;
-}
-
-/** Create shutdown confirmation dialog.
- *
- * @param sddlg Shutdown dialog
- * @return EOK on success or an error code
- */
-static errno_t shutdown_confirm_msg_create(shutdown_dlg_t *sddlg)
-{
-        ui_msg_dialog_params_t params;
-        ui_msg_dialog_t *dialog;
-        errno_t rc;
-
-        ui_msg_dialog_params_init(&params);
-        params.caption = "Shutdown";
-        params.text = "Do you want to shut the system down?";
-        params.choice = umdc_ok_cancel;
-        params.flags |= umdf_topmost | umdf_center;
-
-        rc = ui_msg_dialog_create(sddlg->ui, &params, &dialog);
-        if (rc != EOK)
-                return rc;
-
-        ui_msg_dialog_set_cb(dialog, &shutdown_confirm_msg_cb, sddlg);
-
-        return EOK;
-}
-
-/** Create 'shutdown failed' message dialog.
- *
- * @param sddlg Shutdown dialog
- * @return EOK on success or an error code
- */
-static errno_t shutdown_failed_msg_create(shutdown_dlg_t *sddlg)
-{
-        ui_msg_dialog_params_t params;
-        ui_msg_dialog_t *dialog;
-        errno_t rc;
-
-        ui_msg_dialog_params_init(&params);
-        params.caption = "Shutdown failed";
-        params.text = "The system failed to shut down properly.";
-
-        rc = ui_msg_dialog_create(sddlg->ui, &params, &dialog);
-        if (rc != EOK)
-                return rc;
-
-        ui_msg_dialog_set_cb(dialog, &shutdown_failed_msg_cb, sddlg);
-
-        return EOK;
-}
-
-/** Shutdown confirm message dialog button press.
- *
- * @param dialog Message dialog
- * @param arg Argument (ui_demo_t *)
- * @param bnum Button number
- */
-static void shutdown_confirm_msg_button(ui_msg_dialog_t *dialog,
-    void *arg, unsigned bnum)
-{
-        shutdown_dlg_t *sddlg = (shutdown_dlg_t *) arg;
-
-        ui_msg_dialog_destroy(dialog);
-
-        if (bnum == 0)
-                shutdown_start(sddlg);
-        else
-                ui_quit(sddlg->ui);
-}
-
-/** Shutdown confirm message dialog close request.
- *
- * @param dialog Message dialog
- * @param arg Argument (ui_demo_t *)
- */
-static void shutdown_confirm_msg_close(ui_msg_dialog_t *dialog, void *arg)
-{
-        shutdown_dlg_t *sddlg = (shutdown_dlg_t *) arg;
-
-        ui_msg_dialog_destroy(dialog);
-        ui_quit(sddlg->ui);
-}
-
-/** Shutdown faield message dialog button press.
- *
- * @param dialog Message dialog
- * @param arg Argument (ui_demo_t *)
- * @param bnum Button number
- */
-static void shutdown_failed_msg_button(ui_msg_dialog_t *dialog,
-    void *arg, unsigned bnum)
-{
-        shutdown_dlg_t *sddlg = (shutdown_dlg_t *) arg;
-
-        ui_msg_dialog_destroy(dialog);
-        ui_quit(sddlg->ui);
-}
-
-/** Shutdown failed message dialog close request.
- *
- * @param dialog Message dialog
- * @param arg Argument (ui_demo_t *)
- */
-static void shutdown_failed_msg_close(ui_msg_dialog_t *dialog, void *arg)
-{
-        shutdown_dlg_t *sddlg = (shutdown_dlg_t *) arg;
-
-        ui_msg_dialog_destroy(dialog);
-        ui_quit(sddlg->ui);
 }
 
@@ -296 +162 @@
                 params.rect.p0.x = 0;
                 params.rect.p0.y = 0;
-                params.rect.p1.x = 64;
+                params.rect.p1.x = 24;
                 params.rect.p1.y = 5;
         } else {
@@ -379 +245 @@
 static void shutdown_progress_destroy(shutdown_progress_t *progress)
 {
-        if (progress == NULL)
-                return;
-
         ui_window_destroy(progress->window);
         free(progress);
 }
 
-static errno_t shutdown_start(shutdown_dlg_t *sddlg)
-{
-        errno_t rc;
-
-        rc = shutdown_progress_create(sddlg, &sddlg->progress);
-        if (rc != EOK)
-                return rc;
-
-        rc = system_open(SYSTEM_DEFAULT, &sd_system_cb, sddlg, &sddlg->system);
-        if (rc != EOK) {
-                printf("Failed opening system control service.\n");
-                goto error;
-        }
-
-        rc = system_shutdown(sddlg->system);
-        if (rc != EOK) {
-                printf("Failed requesting system shutdown.\n");
-                goto error;
-        }
-
-        return EOK;
-error:
-        return rc;
-}
-
 /** Run shutdown dialog on display. */
 static errno_t shutdown_dlg(const char *display_spec)
 {
         ui_t *ui = NULL;
+        ui_wnd_params_t params;
+        ui_window_t *window = NULL;
         shutdown_dlg_t sddlg;
-        ui_wnd_params_t params;
         errno_t rc;
 
@@ -426 +265 @@
                 goto error;
         }
-
-        sddlg.ui = ui;
 
         ui_wnd_params_init(&params);
@@ -434 +271 @@
         params.placement = ui_wnd_place_full_screen;
         params.flags |= ui_wndf_topmost | ui_wndf_nofocus;
-        /*
-         * params.rect.p0.x = 0;
-         * params.rect.p0.y = 0;
-         * params.rect.p1.x = 1;
-         * params.rect.p1.y = 1;
-         */
-
-        rc = ui_window_create(sddlg.ui, &params, &sddlg.bgwindow);
+        if (ui_is_textmode(ui)) {
+                params.rect.p0.x = 0;
+                params.rect.p0.y = 0;
+                params.rect.p1.x = 24;
+                params.rect.p1.y = 5;
+        } else {
+                params.rect.p0.x = 0;
+                params.rect.p0.y = 0;
+                params.rect.p1.x = 300;
+                params.rect.p1.y = 60;
+        }
+
+        sddlg.ui = ui;
+
+        rc = ui_window_create(ui, &params, &window);
         if (rc != EOK) {
                 printf("Error creating window.\n");
@@ -447 +291 @@
         }
 
-        ui_window_set_cb(sddlg.bgwindow, &bg_window_cb, (void *)&sddlg);
-
-        if (ui_is_textmode(sddlg.ui)) {
-                rc = gfx_color_new_ega(0x17, &sddlg.bg_color);
-                if (rc != EOK) {
-                        printf("Error allocating color.\n");
-                        goto error;
-                }
-        } else {
-                rc = gfx_color_new_rgb_i16(0x8000, 0xc800, 0xffff, &sddlg.bg_color);
-                if (rc != EOK) {
-                        printf("Error allocating color.\n");
-                        goto error;
-                }
-        }
-
-        rc = ui_window_paint(sddlg.bgwindow);
+        ui_window_set_cb(window, &bg_window_cb, (void *) &sddlg);
+        sddlg.bgwindow = window;
+
+        rc = gfx_color_new_rgb_i16(0x8000, 0xc800, 0xffff, &sddlg.bg_color);
+        if (rc != EOK) {
+                printf("Error allocating color.\n");
+                goto error;
+        }
+
+        rc = ui_window_paint(window);
         if (rc != EOK) {
                 printf("Error painting window.\n");
@@ -469 +306 @@
         }
 
-        (void)shutdown_confirm_msg_create(&sddlg);
+        rc = shutdown_progress_create(&sddlg, &sddlg.progress);
+        if (rc != EOK)
+                return rc;
+
+        rc = system_open(SYSTEM_DEFAULT, &sd_system_cb, &sddlg, &sddlg.system);
+        if (rc != EOK) {
+                printf("Failed opening system control service.\n");
+                goto error;
+        }
+
+        rc = system_shutdown(sddlg.system);
+        if (rc != EOK) {
+                printf("Failed requesting system shutdown.\n");
+                goto error;
+        }
 
         ui_run(ui);
 
         shutdown_progress_destroy(sddlg.progress);
-        if (sddlg.bgwindow != NULL)
-                ui_window_destroy(sddlg.bgwindow);
-        if (sddlg.system != NULL)
-                system_close(sddlg.system);
+        ui_window_destroy(window);
+        system_close(sddlg.system);
         gfx_color_delete(sddlg.bg_color);
         ui_destroy(ui);
@@ -487 +336 @@
         if (sddlg.bg_color != NULL)
                 gfx_color_delete(sddlg.bg_color);
-        if (sddlg.bgwindow != NULL)
-                ui_window_destroy(sddlg.bgwindow);
+        if (window != NULL)
+                ui_window_destroy(window);
         if (ui != NULL)
                 ui_destroy(ui);