Index: uspace/app/nav/dlg/newfiledlg.c =================================================================== --- uspace/app/nav/dlg/newfiledlg.c (revision f9c4c43357bfb943298ed524857f234914ca8409) +++ uspace/app/nav/dlg/newfiledlg.c (revision f9c4c43357bfb943298ed524857f234914ca8409) @@ -0,0 +1,419 @@ +/* + * Copyright (c) 2025 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup nav + * @{ + */ +/** + * @file New File dialog + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "newfiledlg.h" + +static void new_file_dlg_wnd_close(ui_window_t *, void *); +static void new_file_dlg_wnd_kbd(ui_window_t *, void *, kbd_event_t *); + +ui_window_cb_t new_file_dlg_wnd_cb = { + .close = new_file_dlg_wnd_close, + .kbd = new_file_dlg_wnd_kbd +}; + +static void new_file_dlg_bok_clicked(ui_pbutton_t *, void *); +static void new_file_dlg_bcancel_clicked(ui_pbutton_t *, void *); + +ui_pbutton_cb_t new_file_dlg_bok_cb = { + .clicked = new_file_dlg_bok_clicked +}; + +ui_pbutton_cb_t new_file_dlg_bcancel_cb = { + .clicked = new_file_dlg_bcancel_clicked +}; + +/** Create New File dialog. + * + * @param ui User interface + * @param rdialog Place to store pointer to new dialog + * @return EOK on success or an error code + */ +errno_t new_file_dlg_create(ui_t *ui, new_file_dlg_t **rdialog) +{ + errno_t rc; + new_file_dlg_t *dialog; + ui_window_t *window = NULL; + ui_wnd_params_t wparams; + ui_fixed_t *fixed = NULL; + ui_label_t *label = NULL; + ui_entry_t *entry = NULL; + ui_pbutton_t *bok = NULL; + ui_pbutton_t *bcancel = NULL; + gfx_rect_t rect; + ui_resource_t *ui_res; + + dialog = calloc(1, sizeof(new_file_dlg_t)); + if (dialog == NULL) { + rc = ENOMEM; + goto error; + } + + ui_wnd_params_init(&wparams); + wparams.caption = "Create New File"; + + /* FIXME: Auto layout */ + if (ui_is_textmode(ui)) { + wparams.rect.p0.x = 0; + wparams.rect.p0.y = 0; + wparams.rect.p1.x = 40; + wparams.rect.p1.y = 11; + } else { + wparams.rect.p0.x = 0; + wparams.rect.p0.y = 0; + wparams.rect.p1.x = 300; + wparams.rect.p1.y = 135; + } + + rc = ui_window_create(ui, &wparams, &window); + if (rc != EOK) + goto error; + + ui_window_set_cb(window, &new_file_dlg_wnd_cb, dialog); + + ui_res = ui_window_get_res(window); + + rc = ui_fixed_create(&fixed); + if (rc != EOK) + goto error; + + rc = ui_label_create(ui_res, "File name:", &label); + if (rc != EOK) + goto error; + + /* FIXME: Auto layout */ + if (ui_is_textmode(ui)) { + rect.p0.x = 3; + rect.p0.y = 2; + rect.p1.x = 17; + rect.p1.y = 3; + } else { + rect.p0.x = 10; + rect.p0.y = 35; + rect.p1.x = 190; + rect.p1.y = 50; + } + + ui_label_set_rect(label, &rect); + + rc = ui_fixed_add(fixed, ui_label_ctl(label)); + if (rc != EOK) + goto error; + + label = NULL; + + rc = ui_entry_create(window, "noname00", &entry); + if (rc != EOK) + goto error; + + /* FIXME: Auto layout */ + if (ui_is_textmode(ui)) { + rect.p0.x = 3; + rect.p0.y = 3; + rect.p1.x = 37; + rect.p1.y = 4; + } else { + rect.p0.x = 10; + rect.p0.y = 55; + rect.p1.x = 290; + rect.p1.y = 80; + } + + ui_entry_set_rect(entry, &rect); + + rc = ui_fixed_add(fixed, ui_entry_ctl(entry)); + if (rc != EOK) + goto error; + + ui_entry_activate(entry); + + /* Select all */ + ui_entry_seek_start(entry, false); + ui_entry_seek_end(entry, true); + + dialog->ename = entry; + entry = NULL; + + rc = ui_label_create(ui_res, "Size:", &label); + if (rc != EOK) + goto error; + + /* FIXME: Auto layout */ + if (ui_is_textmode(ui)) { + rect.p0.x = 3; + rect.p0.y = 5; + rect.p1.x = 17; + rect.p1.y = 6; + } else { + rect.p0.x = 10; + rect.p0.y = 35; + rect.p1.x = 190; + rect.p1.y = 50; + } + + ui_label_set_rect(label, &rect); + + rc = ui_fixed_add(fixed, ui_label_ctl(label)); + if (rc != EOK) + goto error; + + rc = ui_entry_create(window, "0", &entry); + if (rc != EOK) + goto error; + + /* FIXME: Auto layout */ + if (ui_is_textmode(ui)) { + rect.p0.x = 3; + rect.p0.y = 6; + rect.p1.x = 37; + rect.p1.y = 7; + } else { + rect.p0.x = 10; + rect.p0.y = 80; + rect.p1.x = 290; + rect.p1.y = 100; + } + + ui_entry_set_rect(entry, &rect); + + rc = ui_fixed_add(fixed, ui_entry_ctl(entry)); + if (rc != EOK) + goto error; + + dialog->esize = entry; + entry = NULL; + + rc = ui_pbutton_create(ui_res, "OK", &bok); + if (rc != EOK) + goto error; + + ui_pbutton_set_cb(bok, &new_file_dlg_bok_cb, dialog); + + /* FIXME: Auto layout */ + if (ui_is_textmode(ui)) { + rect.p0.x = 10; + rect.p0.y = 8; + rect.p1.x = 20; + rect.p1.y = 9; + } else { + rect.p0.x = 55; + rect.p0.y = 90; + rect.p1.x = 145; + rect.p1.y = 118; + } + + 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; + + dialog->bok = bok; + bok = NULL; + + rc = ui_pbutton_create(ui_res, "Cancel", &bcancel); + if (rc != EOK) + goto error; + + ui_pbutton_set_cb(bcancel, &new_file_dlg_bcancel_cb, dialog); + + /* FIXME: Auto layout */ + if (ui_is_textmode(ui)) { + rect.p0.x = 22; + rect.p0.y = 8; + rect.p1.x = 32; + rect.p1.y = 9; + } else { + rect.p0.x = 155; + rect.p0.y = 90; + rect.p1.x = 245; + rect.p1.y = 118; + } + + ui_pbutton_set_rect(bcancel, &rect); + + rc = ui_fixed_add(fixed, ui_pbutton_ctl(bcancel)); + if (rc != EOK) + goto error; + + dialog->bcancel = bcancel; + bcancel = NULL; + + ui_window_add(window, ui_fixed_ctl(fixed)); + fixed = NULL; + + rc = ui_window_paint(window); + if (rc != EOK) + goto error; + + dialog->window = window; + *rdialog = dialog; + return EOK; +error: + if (entry != NULL) + ui_entry_destroy(entry); + if (bok != NULL) + ui_pbutton_destroy(bok); + if (bcancel != NULL) + ui_pbutton_destroy(bcancel); + if (label != NULL) + ui_label_destroy(label); + if (fixed != NULL) + ui_fixed_destroy(fixed); + if (window != NULL) + ui_window_destroy(window); + if (dialog != NULL) + free(dialog); + return rc; +} + +/** Destroy prompt dialog. + * + * @param dialog Prompt dialog or @c NULL + */ +void new_file_dlg_destroy(new_file_dlg_t *dialog) +{ + if (dialog == NULL) + return; + + ui_window_destroy(dialog->window); + free(dialog); +} + +/** Set mesage dialog callback. + * + * @param dialog Prompt dialog + * @param cb Prompt dialog callbacks + * @param arg Callback argument + */ +void new_file_dlg_set_cb(new_file_dlg_t *dialog, new_file_dlg_cb_t *cb, + void *arg) +{ + dialog->cb = cb; + dialog->arg = arg; +} + +/** Prompt dialog window close handler. + * + * @param window Window + * @param arg Argument (new_file_dlg_t *) + */ +static void new_file_dlg_wnd_close(ui_window_t *window, void *arg) +{ + new_file_dlg_t *dialog = (new_file_dlg_t *) arg; + + (void)window; + if (dialog->cb != NULL && dialog->cb->bcancel != NULL) { + dialog->cb->close(dialog, dialog->arg); + } +} + +/** Prompt dialog window keyboard event handler. + * + * @param window Window + * @param arg Argument (new_file_dlg_t *) + * @param event Keyboard event + */ +static void new_file_dlg_wnd_kbd(ui_window_t *window, void *arg, + kbd_event_t *event) +{ + new_file_dlg_t *dialog = (new_file_dlg_t *) arg; + const char *text; + + if (event->type == KEY_PRESS && + (event->mods & (KM_CTRL | KM_SHIFT | KM_ALT)) == 0) { + if (event->key == KC_ENTER) { + /* Confirm */ + if (dialog->cb != NULL && dialog->cb->bok != NULL) { + text = ui_entry_get_text(dialog->ename); + dialog->cb->bok(dialog, dialog->arg, text); + return; + } + } else if (event->key == KC_ESCAPE) { + /* Cancel */ + if (dialog->cb != NULL && dialog->cb->bcancel != NULL) { + dialog->cb->bcancel(dialog, dialog->arg); + return; + } + } + } + + ui_window_def_kbd(window, event); +} + +/** Prompt dialog OK button click handler. + * + * @param pbutton Push button + * @param arg Argument (new_file_dlg_t *) + */ +static void new_file_dlg_bok_clicked(ui_pbutton_t *pbutton, void *arg) +{ + new_file_dlg_t *dialog = (new_file_dlg_t *) arg; + const char *text; + + if (dialog->cb != NULL && dialog->cb->bok != NULL) { + text = ui_entry_get_text(dialog->ename); + dialog->cb->bok(dialog, dialog->arg, text); + } +} + +/** Prompt dialog cancel button click handler. + * + * @param pbutton Push button + * @param arg Argument (new_file_dlg_t *) + */ +static void new_file_dlg_bcancel_clicked(ui_pbutton_t *pbutton, void *arg) +{ + new_file_dlg_t *dialog = (new_file_dlg_t *) arg; + + (void)pbutton; + if (dialog->cb != NULL && dialog->cb->bcancel != NULL) { + dialog->cb->bcancel(dialog, dialog->arg); + } +} + +/** @} + */ Index: uspace/app/nav/dlg/newfiledlg.h =================================================================== --- uspace/app/nav/dlg/newfiledlg.h (revision f9c4c43357bfb943298ed524857f234914ca8409) +++ uspace/app/nav/dlg/newfiledlg.h (revision f9c4c43357bfb943298ed524857f234914ca8409) @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2025 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup nav + * @{ + */ +/** + * @file New File dialog + */ + +#ifndef DLG_NEWFILEDLG_H +#define DLG_NEWFILEDLG_H + +#include +#include +#include "../types/dlg/newfiledlg.h" + +extern errno_t new_file_dlg_create(ui_t *, new_file_dlg_t **); +extern void new_file_dlg_set_cb(new_file_dlg_t *, new_file_dlg_cb_t *, + void *); +extern void new_file_dlg_destroy(new_file_dlg_t *); + +#endif + +/** @} + */ Index: uspace/app/nav/menu.c =================================================================== --- uspace/app/nav/menu.c (revision 113fb4f7d41823fcc1ee75be3d89b3ccb0cb247e) +++ uspace/app/nav/menu.c (revision f9c4c43357bfb943298ed524857f234914ca8409) @@ -54,4 +54,5 @@ nav_menu_t *menu; ui_menu_t *mfile; + ui_menu_entry_t *mnew; ui_menu_entry_t *mopen; ui_menu_entry_t *medit; @@ -78,4 +79,10 @@ goto error; + rc = ui_menu_entry_create(mfile, "~N~ew File", "Ctrl-M", &mnew); + if (rc != EOK) + goto error; + + ui_menu_entry_set_cb(mnew, nav_menu_file_new_file, (void *) menu); + rc = ui_menu_entry_create(mfile, "~O~pen", "Enter", &mopen); if (rc != EOK) @@ -148,4 +155,17 @@ } +/** File / New File menu entry selected. + * + * @param mentry Menu entry + * @param arg Argument (navigator_t *) + */ +void nav_menu_file_new_file(ui_menu_entry_t *mentry, void *arg) +{ + nav_menu_t *menu = (nav_menu_t *)arg; + + if (menu->cb != NULL && menu->cb->file_new_file != NULL) + menu->cb->file_new_file(menu->cb_arg); +} + /** File / Open menu entry selected. * Index: uspace/app/nav/menu.h =================================================================== --- uspace/app/nav/menu.h (revision 113fb4f7d41823fcc1ee75be3d89b3ccb0cb247e) +++ uspace/app/nav/menu.h (revision f9c4c43357bfb943298ed524857f234914ca8409) @@ -46,4 +46,5 @@ extern void nav_menu_destroy(nav_menu_t *); extern ui_control_t *nav_menu_ctl(nav_menu_t *); +extern void nav_menu_file_new_file(ui_menu_entry_t *, void *); extern void nav_menu_file_open(ui_menu_entry_t *, void *); extern void nav_menu_file_edit(ui_menu_entry_t *, void *); Index: uspace/app/nav/meson.build =================================================================== --- uspace/app/nav/meson.build (revision 113fb4f7d41823fcc1ee75be3d89b3ccb0cb247e) +++ uspace/app/nav/meson.build (revision f9c4c43357bfb943298ed524857f234914ca8409) @@ -1,4 +1,4 @@ # -# Copyright (c) 2021 Jiri Svoboda +# Copyright (c) 2025 Jiri Svoboda # All rights reserved. # @@ -29,13 +29,17 @@ deps = [ 'ui' ] src = files( + 'dlg/newfiledlg.c', 'main.c', 'menu.c', 'nav.c', + 'newfile.c', 'panel.c', ) test_src = files( + 'dlg/newfiledlg.c', 'menu.c', 'nav.c', + 'newfile.c', 'panel.c', 'test/main.c', Index: uspace/app/nav/nav.c =================================================================== --- uspace/app/nav/nav.c (revision 113fb4f7d41823fcc1ee75be3d89b3ccb0cb247e) +++ uspace/app/nav/nav.c (revision f9c4c43357bfb943298ed524857f234914ca8409) @@ -46,4 +46,5 @@ #include #include "menu.h" +#include "newfile.h" #include "nav.h" #include "panel.h" @@ -59,4 +60,5 @@ }; +static void navigator_file_new_file(void *); static void navigator_file_open(void *); static void navigator_file_edit(void *); @@ -64,4 +66,5 @@ static nav_menu_cb_t navigator_menu_cb = { + .file_new_file = navigator_file_new_file, .file_open = navigator_file_open, .file_edit = navigator_file_edit, @@ -104,4 +107,7 @@ (event->mods & KM_CTRL) != 0) { switch (event->key) { + case KC_M: + navigator_new_file_dlg(navigator); + break; case KC_E: navigator_file_edit((void *)navigator); @@ -318,4 +324,48 @@ } +/** Refresh navigator panels. + * + * This needs to be called when the disk/directory contents might have + * changed. + * + * @param navigator Navigator + */ +void navigator_refresh_panels(navigator_t *navigator) +{ + errno_t rc; + unsigned i; + + /* First refresh inactive panel. */ + + for (i = 0; i < 2; i++) { + if (!panel_is_active(navigator->panel[i])) { + rc = panel_refresh(navigator->panel[i]); + if (rc != EOK) + return; + } + } + + /* + * Refresh active panel last so that working directory is left + * to that of the active panel. + */ + + for (i = 0; i < 2; i++) { + if (panel_is_active(navigator->panel[i])) { + rc = panel_refresh(navigator->panel[i]); + if (rc != EOK) + return; + } + } +} + +/** File / New File menu entry selected */ +static void navigator_file_new_file(void *arg) +{ + navigator_t *navigator = (navigator_t *)arg; + + navigator_new_file_dlg(navigator); +} + /** File / Open menu entry selected */ static void navigator_file_open(void *arg) Index: uspace/app/nav/nav.h =================================================================== --- uspace/app/nav/nav.h (revision 113fb4f7d41823fcc1ee75be3d89b3ccb0cb247e) +++ uspace/app/nav/nav.h (revision f9c4c43357bfb943298ed524857f234914ca8409) @@ -1,4 +1,4 @@ /* - * Copyright (c) 2021 Jiri Svoboda + * Copyright (c) 2025 Jiri Svoboda * All rights reserved. * @@ -46,4 +46,5 @@ extern panel_t *navigator_get_active_panel(navigator_t *); extern void navigator_switch_panel(navigator_t *); +extern void navigator_refresh_panels(navigator_t *); #endif Index: uspace/app/nav/newfile.c =================================================================== --- uspace/app/nav/newfile.c (revision f9c4c43357bfb943298ed524857f234914ca8409) +++ uspace/app/nav/newfile.c (revision f9c4c43357bfb943298ed524857f234914ca8409) @@ -0,0 +1,129 @@ +/* + * Copyright (c) 2025 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup nav + * @{ + */ +/** + * @file Navigator New File. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include "dlg/newfiledlg.h" +#include "menu.h" +#include "newfile.h" +#include "nav.h" + +static void new_file_bok(new_file_dlg_t *, void *, const char *); +static void new_file_bcancel(new_file_dlg_t *, void *); +static void new_file_close(new_file_dlg_t *, void *); + +static new_file_dlg_cb_t new_file_cb = { + .bok = new_file_bok, + .bcancel = new_file_bcancel, + .close = new_file_close +}; + +/** Open New File dialog. + * + * @param navigator Navigator + */ +void navigator_new_file_dlg(navigator_t *navigator) +{ + new_file_dlg_t *dlg; + + new_file_dlg_create(navigator->ui, &dlg); + new_file_dlg_set_cb(dlg, &new_file_cb, (void *)navigator); +} + +/** New file dialog confirmed. + * + * @param dlg New file dialog + * @param arg Argument (navigator_t *) + * @param fname New file name + */ +static void new_file_bok(new_file_dlg_t *dlg, void *arg, const char *fname) +{ + navigator_t *nav = (navigator_t *)arg; + ui_msg_dialog_t *dialog = NULL; + ui_msg_dialog_params_t params; + char *msg = NULL; + int rv; + FILE *f; + + new_file_dlg_destroy(dlg); + f = fopen(fname, "wx"); + if (f == NULL) { + rv = asprintf(&msg, "Error creating file (%s).", + str_error(errno)); + if (rv < 0) + return; + + ui_msg_dialog_params_init(¶ms); + params.caption = "Error"; + params.text = msg; + (void) ui_msg_dialog_create(nav->ui, ¶ms, &dialog); + free(msg); + return; + } + + fclose(f); + navigator_refresh_panels(nav); +} + +/** New file dialog cancelled. + * + * @param dlg New file dialog + * @param arg Argument (navigator_t *) + */ +static void new_file_bcancel(new_file_dlg_t *dlg, void *arg) +{ + (void)arg; + new_file_dlg_destroy(dlg); +} + +/** New file dialog closed. + * + * @param dlg New file dialog + * @param arg Argument (navigator_t *) + */ +static void new_file_close(new_file_dlg_t *dlg, void *arg) +{ + (void)arg; + new_file_dlg_destroy(dlg); +} + +/** @} + */ Index: uspace/app/nav/newfile.h =================================================================== --- uspace/app/nav/newfile.h (revision f9c4c43357bfb943298ed524857f234914ca8409) +++ uspace/app/nav/newfile.h (revision f9c4c43357bfb943298ed524857f234914ca8409) @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2025 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup nav + * @{ + */ +/** + * @file Navigator New File + */ + +#ifndef NEWFILE_H +#define NEWFILE_H + +#include "types/nav.h" + +extern void navigator_new_file_dlg(navigator_t *); + +#endif + +/** @} + */ Index: uspace/app/nav/panel.c =================================================================== --- uspace/app/nav/panel.c (revision 113fb4f7d41823fcc1ee75be3d89b3ccb0cb247e) +++ uspace/app/nav/panel.c (revision f9c4c43357bfb943298ed524857f234914ca8409) @@ -365,4 +365,20 @@ } +/** Refresh panel contents. + * + * @param panel Panel + * @return EOK on success or an error code + */ +errno_t panel_refresh(panel_t *panel) +{ + errno_t rc; + + rc = ui_file_list_refresh(panel->flist); + if (rc != EOK) + return rc; + + return panel_paint(panel); +} + /** Request panel activation. * Index: uspace/app/nav/panel.h =================================================================== --- uspace/app/nav/panel.h (revision 113fb4f7d41823fcc1ee75be3d89b3ccb0cb247e) +++ uspace/app/nav/panel.h (revision f9c4c43357bfb943298ed524857f234914ca8409) @@ -1,4 +1,4 @@ /* - * Copyright (c) 2022 Jiri Svoboda + * Copyright (c) 2025 Jiri Svoboda * All rights reserved. * @@ -58,4 +58,5 @@ extern void panel_deactivate(panel_t *); extern errno_t panel_read_dir(panel_t *, const char *); +extern errno_t panel_refresh(panel_t *); extern void panel_activate_req(panel_t *); Index: uspace/app/nav/types/dlg/newfiledlg.h =================================================================== --- uspace/app/nav/types/dlg/newfiledlg.h (revision f9c4c43357bfb943298ed524857f234914ca8409) +++ uspace/app/nav/types/dlg/newfiledlg.h (revision f9c4c43357bfb943298ed524857f234914ca8409) @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2025 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup nav + * @{ + */ +/** + * @file New File dialog + */ + +#ifndef TYPES_DLG_NEWFILEDLG_H +#define TYPES_DLG_NEWFILEDLG_H + +#include +#include +#include +#include + +/** New File dialog */ +typedef struct new_file_dlg { + /** Dialog window */ + ui_window_t *window; + /** File name text entry */ + ui_entry_t *ename; + /** File size text entry */ + ui_entry_t *esize; + /** OK button */ + ui_pbutton_t *bok; + /** Cancel button */ + ui_pbutton_t *bcancel; + /** New file dialog callbacks */ + struct new_file_dlg_cb *cb; + /** Callback argument */ + void *arg; +} new_file_dlg_t; + +/** Prompt dialog callback */ +typedef struct new_file_dlg_cb { + /** OK button was pressed */ + void (*bok)(new_file_dlg_t *, void *, const char *); + /** Cancel button was pressed */ + void (*bcancel)(new_file_dlg_t *, void *); + /** Window closure requested (e.g. via close button) */ + void (*close)(new_file_dlg_t *, void *); +} new_file_dlg_cb_t; + +#endif + +/** @} + */ Index: uspace/app/nav/types/menu.h =================================================================== --- uspace/app/nav/types/menu.h (revision 113fb4f7d41823fcc1ee75be3d89b3ccb0cb247e) +++ uspace/app/nav/types/menu.h (revision f9c4c43357bfb943298ed524857f234914ca8409) @@ -43,4 +43,6 @@ /** Navigator menu callbacks */ typedef struct nav_menu_cb { + /** File / New File */ + void (*file_new_file)(void *); /** File / Open */ void (*file_open)(void *); Index: uspace/lib/ui/include/types/ui/list.h =================================================================== --- uspace/lib/ui/include/types/ui/list.h (revision 113fb4f7d41823fcc1ee75be3d89b3ccb0cb247e) +++ uspace/lib/ui/include/types/ui/list.h (revision f9c4c43357bfb943298ed524857f234914ca8409) @@ -1,4 +1,4 @@ /* - * Copyright (c) 2023 Jiri Svoboda + * Copyright (c) 2025 Jiri Svoboda * All rights reserved. * @@ -38,4 +38,5 @@ #include +#include struct ui_list; @@ -67,4 +68,12 @@ } ui_list_cb_t; +/** Saved list position. */ +typedef struct { + /** Page index */ + size_t page_idx; + /** Cursor index */ + size_t cursor_idx; +} ui_list_pos_t; + #endif Index: uspace/lib/ui/include/ui/filelist.h =================================================================== --- uspace/lib/ui/include/ui/filelist.h (revision 113fb4f7d41823fcc1ee75be3d89b3ccb0cb247e) +++ uspace/lib/ui/include/ui/filelist.h (revision f9c4c43357bfb943298ed524857f234914ca8409) @@ -51,4 +51,5 @@ extern errno_t ui_file_list_read_dir(ui_file_list_t *, const char *); extern errno_t ui_file_list_activate(ui_file_list_t *); +extern errno_t ui_file_list_refresh(ui_file_list_t *); extern void ui_file_list_deactivate(ui_file_list_t *); extern errno_t ui_file_list_open(ui_file_list_t *, ui_file_list_entry_t *); Index: uspace/lib/ui/include/ui/list.h =================================================================== --- uspace/lib/ui/include/ui/list.h (revision 113fb4f7d41823fcc1ee75be3d89b3ccb0cb247e) +++ uspace/lib/ui/include/ui/list.h (revision f9c4c43357bfb943298ed524857f234914ca8409) @@ -1,4 +1,4 @@ /* - * Copyright (c) 2024 Jiri Svoboda + * Copyright (c) 2025 Jiri Svoboda * All rights reserved. * @@ -71,4 +71,6 @@ extern ui_list_entry_t *ui_list_prev(ui_list_entry_t *); extern bool ui_list_is_active(ui_list_t *); +extern void ui_list_save_pos(ui_list_t *, ui_list_pos_t *); +extern void ui_list_restore_pos(ui_list_t *, ui_list_pos_t *); #endif Index: uspace/lib/ui/src/filelist.c =================================================================== --- uspace/lib/ui/src/filelist.c (revision 113fb4f7d41823fcc1ee75be3d89b3ccb0cb247e) +++ uspace/lib/ui/src/filelist.c (revision f9c4c43357bfb943298ed524857f234914ca8409) @@ -349,4 +349,6 @@ goto error; } + + ui_file_list_clear_entries(flist); if (str_cmp(ndir, "/") != 0) { @@ -422,4 +424,22 @@ } +/** Re-read file list from directory. + * + * @param flist File list + * @return EOK on success or an error code + */ +errno_t ui_file_list_refresh(ui_file_list_t *flist) +{ + errno_t rc; + ui_list_pos_t pos; + + ui_list_save_pos(flist->list, &pos); + rc = ui_file_list_read_dir(flist, flist->dir); + if (rc != EOK) + return rc; + ui_list_restore_pos(flist->list, &pos); + return EOK; +} + /** Sort file list entries. * @@ -593,6 +613,4 @@ return ENOMEM; - ui_file_list_clear_entries(flist); - rc = ui_file_list_read_dir(flist, dirname); if (rc != EOK) { Index: uspace/lib/ui/src/list.c =================================================================== --- uspace/lib/ui/src/list.c (revision 113fb4f7d41823fcc1ee75be3d89b3ccb0cb247e) +++ uspace/lib/ui/src/list.c (revision f9c4c43357bfb943298ed524857f234914ca8409) @@ -1,4 +1,4 @@ /* - * Copyright (c) 2024 Jiri Svoboda + * Copyright (c) 2025 Jiri Svoboda * All rights reserved. * @@ -1652,4 +1652,60 @@ } +/** Save list position for later. + * + * The position will be valid even if the list is cleaned and re-populated + * (it just counts position from the top.) + * + * @param list UI list + * @param pos Place to store position + */ +void ui_list_save_pos(ui_list_t *list, ui_list_pos_t *pos) +{ + pos->page_idx = list->page_idx; + pos->cursor_idx = list->cursor_idx; +} + +/** Restore saved list position. + * + * The position will be valid even if the list is cleaned and re-populated + * (it just counts position from the top.) + * + * @param list UI list + * @param pos Saved list position + */ +void ui_list_restore_pos(ui_list_t *list, ui_list_pos_t *pos) +{ + size_t idx, i; + ui_list_entry_t *entry, *next; + + idx = 0; + entry = ui_list_first(list); + + for (i = 0; i < pos->cursor_idx; i++) { + next = ui_list_next(entry); + if (next != NULL) { + entry = next; + ++idx; + } + } + + list->cursor = entry; + list->cursor_idx = idx; + + idx = 0; + entry = ui_list_first(list); + + for (i = 0; i < pos->page_idx; i++) { + next = ui_list_next(entry); + if (next != NULL) { + entry = next; + ++idx; + } + } + + list->page = entry; + list->page_idx = idx; +} + /** @} */ Index: uspace/lib/ui/src/msgdialog.c =================================================================== --- uspace/lib/ui/src/msgdialog.c (revision 113fb4f7d41823fcc1ee75be3d89b3ccb0cb247e) +++ uspace/lib/ui/src/msgdialog.c (revision f9c4c43357bfb943298ed524857f234914ca8409) @@ -285,4 +285,6 @@ if (dialog->cb != NULL && dialog->cb->close != NULL) dialog->cb->close(dialog, dialog->arg); + else + ui_msg_dialog_destroy(dialog); } @@ -310,4 +312,6 @@ dialog->cb->button(dialog, dialog->arg, 0); return; + } else { + ui_msg_dialog_destroy(dialog); } } else if (event->key == KC_ESCAPE) { @@ -316,4 +320,6 @@ dialog->cb->close(dialog, dialog->arg); return; + } else { + ui_msg_dialog_destroy(dialog); } } @@ -337,4 +343,6 @@ dialog->cb->button(dialog, dialog->arg, i); } + } else { + ui_msg_dialog_destroy(dialog); } } Index: uspace/lib/ui/test/filelist.c =================================================================== --- uspace/lib/ui/test/filelist.c (revision 113fb4f7d41823fcc1ee75be3d89b3ccb0cb247e) +++ uspace/lib/ui/test/filelist.c (revision f9c4c43357bfb943298ed524857f234914ca8409) @@ -1,4 +1,4 @@ /* - * Copyright (c) 2023 Jiri Svoboda + * Copyright (c) 2025 Jiri Svoboda * All rights reserved. * @@ -665,4 +665,106 @@ } +/** ui_file_list_refresh() */ +PCUT_TEST(refresh) +{ + ui_t *ui; + ui_window_t *window; + ui_wnd_params_t params; + ui_file_list_t *flist; + ui_file_list_entry_t *entry; + char buf[L_tmpnam]; + char *fname; + char *p; + errno_t rc; + FILE *f; + int rv; + + /* Create name for temporary directory */ + p = tmpnam(buf); + PCUT_ASSERT_NOT_NULL(p); + + /* Create temporary directory */ + rc = vfs_link_path(p, KIND_DIRECTORY, NULL); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + rv = asprintf(&fname, "%s/%s", p, "a"); + PCUT_ASSERT_TRUE(rv >= 0); + + f = fopen(fname, "wb"); + PCUT_ASSERT_NOT_NULL(f); + + rv = fprintf(f, "X"); + PCUT_ASSERT_TRUE(rv >= 0); + + rv = fclose(f); + PCUT_ASSERT_INT_EQUALS(0, rv); + + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_wnd_params_init(¶ms); + params.caption = "Test"; + + rc = ui_window_create(ui, ¶ms, &window); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + rc = ui_file_list_create(window, true, &flist); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + rc = ui_file_list_read_dir(flist, p); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + PCUT_ASSERT_INT_EQUALS(2, ui_list_entries_cnt(flist->list)); + + entry = ui_file_list_first(flist); + PCUT_ASSERT_NOT_NULL(entry); + PCUT_ASSERT_STR_EQUALS("..", entry->name); + + entry = ui_file_list_next(entry); + PCUT_ASSERT_NOT_NULL(entry); + PCUT_ASSERT_STR_EQUALS("a", entry->name); + PCUT_ASSERT_INT_EQUALS(1, entry->size); + + rv = remove(fname); + PCUT_ASSERT_INT_EQUALS(0, rv); + free(fname); + + rv = asprintf(&fname, "%s/%s", p, "b"); + PCUT_ASSERT_TRUE(rv >= 0); + + f = fopen(fname, "wb"); + PCUT_ASSERT_NOT_NULL(f); + + rv = fprintf(f, "X"); + PCUT_ASSERT_TRUE(rv >= 0); + + rv = fclose(f); + PCUT_ASSERT_INT_EQUALS(0, rv); + + rc = ui_file_list_refresh(flist); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + entry = ui_file_list_first(flist); + PCUT_ASSERT_NOT_NULL(entry); + PCUT_ASSERT_STR_EQUALS("..", entry->name); + + entry = ui_file_list_next(entry); + PCUT_ASSERT_NOT_NULL(entry); + PCUT_ASSERT_STR_EQUALS("b", entry->name); + PCUT_ASSERT_INT_EQUALS(1, entry->size); + + rv = remove(fname); + PCUT_ASSERT_INT_EQUALS(0, rv); + free(fname); + + rv = remove(p); + PCUT_ASSERT_INT_EQUALS(0, rv); + + ui_file_list_destroy(flist); + + ui_window_destroy(window); + ui_destroy(ui); +} + /** ui_file_list_list_compare compares two file list entries */ PCUT_TEST(list_compare) Index: uspace/lib/ui/test/list.c =================================================================== --- uspace/lib/ui/test/list.c (revision 113fb4f7d41823fcc1ee75be3d89b3ccb0cb247e) +++ uspace/lib/ui/test/list.c (revision f9c4c43357bfb943298ed524857f234914ca8409) @@ -1,4 +1,4 @@ /* - * Copyright (c) 2024 Jiri Svoboda + * Copyright (c) 2025 Jiri Svoboda * All rights reserved. * @@ -3064,4 +3064,73 @@ } +/** ui_list_save_pos() / ui_list_restore_pos() saves/restores position */ +PCUT_TEST(save_pos_restore_pos) +{ + ui_t *ui; + ui_window_t *window; + ui_wnd_params_t params; + ui_list_t *list; + ui_list_entry_t *a, *b; + ui_list_entry_attr_t attr; + ui_list_pos_t pos; + test_resp_t resp; + errno_t rc; + + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_wnd_params_init(¶ms); + params.caption = "Test"; + + rc = ui_window_create(ui, ¶ms, &window); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + rc = ui_list_create(window, true, &list); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_list_set_cb(list, &test_cb, &resp); + + ui_list_entry_attr_init(&attr); + + attr.caption = "a"; + attr.arg = (void *)2; + rc = ui_list_entry_append(list, &attr, &a); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + attr.caption = "b"; + attr.arg = (void *)1; + rc = ui_list_entry_append(list, &attr, &b); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_list_set_cursor(list, b); + + ui_list_save_pos(list, &pos); + + /* Empty and re-build list. */ + + ui_list_entry_destroy(a); + ui_list_entry_destroy(b); + + ui_list_entry_attr_init(&attr); + + attr.caption = "a"; + attr.arg = (void *)2; + rc = ui_list_entry_append(list, &attr, &a); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + attr.caption = "b"; + attr.arg = (void *)1; + rc = ui_list_entry_append(list, &attr, &b); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_list_restore_pos(list, &pos); + + PCUT_ASSERT_STR_EQUALS("b", list->cursor->caption); + + ui_list_destroy(list); + ui_window_destroy(window); + ui_destroy(ui); +} + static void test_list_activate_req(ui_list_t *list, void *arg) {