Changes in uspace/lib/ui/src/msgdialog.c [12dd36c:252d03c] in mainline

File:

• uspace/lib/ui/src/msgdialog.c (modified) (10 diffs)

uspace/lib/ui/src/msgdialog.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -47 +47 @@
 
 static void ui_msg_dialog_wnd_close(ui_window_t *, void *);
-static void ui_msg_dialog_wnd_kbd(ui_window_t *, void *, kbd_event_t *);
 
 ui_window_cb_t ui_msg_dialog_wnd_cb = {
-        .close = ui_msg_dialog_wnd_close,
-        .kbd = ui_msg_dialog_wnd_kbd
+        .close = ui_msg_dialog_wnd_close
 };
 
@@ -58 +56 @@
 ui_pbutton_cb_t ui_msg_dialog_btn_cb = {
         .clicked = ui_msg_dialog_btn_clicked
-};
-
-static const char *ui_msg_dialog_captions[][ui_msg_dialog_maxbtn + 1] = {
-        [umdc_ok] = { "OK", NULL },
-        [umdc_ok_cancel] = { "OK", "Cancel", NULL }
 };
 
@@ -93 +86 @@
         ui_fixed_t *fixed = NULL;
         ui_label_t *label = NULL;
-        ui_pbutton_t *btn[ui_msg_dialog_maxbtn];
-        const char **cp;
-        unsigned i, nb;
+        ui_pbutton_t *bok = NULL;
         gfx_rect_t rect;
-        gfx_coord_t bw, bpad, btnsw, bp0x;
         ui_resource_t *ui_res;
-
-        for (i = 0; i < ui_msg_dialog_maxbtn; i++)
-                btn[i] = NULL;
 
         dialog = calloc(1, sizeof(ui_msg_dialog_t));
@@ -116 +103 @@
                 wparams.rect.p0.x = 0;
                 wparams.rect.p0.y = 0;
-                wparams.rect.p1.x = 60;
+                wparams.rect.p1.x = 20;
                 wparams.rect.p1.y = 7;
         } else {
                 wparams.rect.p0.x = 0;
                 wparams.rect.p0.y = 0;
-                wparams.rect.p1.x = 400;
+                wparams.rect.p1.x = 200;
                 wparams.rect.p1.y = 110;
         }
@@ -145 +132 @@
                 rect.p0.x = 3;
                 rect.p0.y = 2;
-                rect.p1.x = 57;
+                rect.p1.x = 17;
                 rect.p1.y = 3;
         } else {
                 rect.p0.x = 10;
                 rect.p0.y = 35;
-                rect.p1.x = 390;
+                rect.p1.x = 190;
                 rect.p1.y = 50;
         }
@@ -163 +150 @@
         label = NULL;
 
-        i = 0;
-        assert(params->choice == umdc_ok || params->choice == umdc_ok_cancel);
-        cp = ui_msg_dialog_captions[params->choice];
-
-        while (*cp != NULL) {
-                rc = ui_pbutton_create(ui_res, *cp, &btn[i]);
-                if (rc != EOK)
-                        goto error;
-
-                ui_pbutton_set_cb(btn[i], &ui_msg_dialog_btn_cb, dialog);
-                ++cp;
-                ++i;
-        }
-
-        nb = i;
-
+        rc = ui_pbutton_create(ui_res, "OK", &bok);
+        if (rc != EOK)
+                goto error;
+
+        ui_pbutton_set_cb(bok, &ui_msg_dialog_btn_cb, dialog);
+
+        /* FIXME: Auto layout */
         if (ui_is_textmode(ui)) {
-                bw = 12;
-                bpad = 2;
+                rect.p0.x = 8;
+                rect.p0.y = 4;
+                rect.p1.x = 12;
+                rect.p1.y = 5;
         } else {
-                bw = 90;
-                bpad = 10;
-        }
-
-        btnsw = (nb - 1) * (bw + bpad) + bw;
-        bp0x = (wparams.rect.p0.x + wparams.rect.p1.x - btnsw) / 2;
-
-        for (i = 0; i < nb; i++) {
-                /* FIXME: Auto layout */
-                if (ui_is_textmode(ui)) {
-                        rect.p0.x = bp0x + i * (bw + bpad);
-                        rect.p0.y = 4;
-                        rect.p1.x = bp0x + bw + i * (bw + bpad);
-                        rect.p1.y = 5;
-                } else {
-                        rect.p0.x = bp0x + i * (bw + bpad);
-                        rect.p0.y = 60;
-                        rect.p1.x = bp0x + bw + i * (bw + bpad);
-                        rect.p1.y = 88;
-                }
-
-                ui_pbutton_set_rect(btn[i], &rect);
-
-                rc = ui_fixed_add(fixed, ui_pbutton_ctl(btn[i]));
-                if (rc != EOK)
-                        goto error;
-        }
-
-        ui_pbutton_set_default(btn[0], true);
-
-        for (i = 0; i < ui_msg_dialog_maxbtn; i++) {
-                dialog->btn[i] = btn[i];
-                btn[i] = NULL;
-        }
+                rect.p0.x = 55;
+                rect.p0.y = 60;
+                rect.p1.x = 145;
+                rect.p1.y = 88;
+        }
+
+        ui_pbutton_set_rect(bok, &rect);
+
+        ui_pbutton_set_default(bok, true);
+
+        rc = ui_fixed_add(fixed, ui_pbutton_ctl(bok));
+        if (rc != EOK)
+                goto error;
+
+        bok = NULL;
 
         ui_window_add(window, ui_fixed_ctl(fixed));
@@ -226 +187 @@
 
         dialog->window = window;
+        dialog->bok = bok;
         *rdialog = dialog;
         return EOK;
 error:
-        for (i = 0; i < ui_msg_dialog_maxbtn; i++) {
-                if (btn[i] != NULL)
-                        ui_pbutton_destroy(btn[i]);
-        }
         if (label != NULL)
                 ui_label_destroy(label);
@@ -283 +241 @@
 }
 
-/** Message dialog window keyboard event handler.
- *
- * @param window Window
- * @param arg Argument (ui_msg_dialog_t *)
- * @param event Keyboard event
- */
-static void ui_msg_dialog_wnd_kbd(ui_window_t *window, void *arg,
-    kbd_event_t *event)
-{
-        ui_msg_dialog_t *dialog = (ui_msg_dialog_t *) arg;
-        ui_evclaim_t claim;
-
-        claim = ui_window_def_kbd(window, event);
-        if (claim == ui_claimed)
-                return;
-
-        if (event->type == KEY_PRESS &&
-            (event->mods & (KM_CTRL | KM_SHIFT | KM_ALT)) == 0) {
-                if (event->key == KC_ENTER) {
-                        /* OK / default button */
-                        if (dialog->cb != NULL && dialog->cb->button != NULL) {
-                                dialog->cb->button(dialog, dialog->arg, 0);
-                                return;
-                        }
-                } else if (event->key == KC_ESCAPE) {
-                        /* Cancel */
-                        if (dialog->cb != NULL && dialog->cb->close != NULL) {
-                                dialog->cb->close(dialog, dialog->arg);
-                                return;
-                        }
-                }
-        }
-
-}
-
 /** Message dialog button click handler.
  *
@@ -326 +249 @@
 {
         ui_msg_dialog_t *dialog = (ui_msg_dialog_t *) arg;
-        unsigned i;
-
-        if (dialog->cb != NULL && dialog->cb->button != NULL) {
-                for (i = 0; i < ui_msg_dialog_maxbtn; i++) {
-                        if (dialog->btn[i] == pbutton)
-                                dialog->cb->button(dialog, dialog->arg, i);
-                }
-        }
+
+        if (dialog->cb != NULL && dialog->cb->button != NULL)
+                dialog->cb->button(dialog, dialog->arg, 0);
 }