Changeset 0cf3d5f in mainline for uspace/app/nav

Timestamp:

2025-10-10T08:45:43Z (3 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

c3db721

Parents:

cfd04c4

git-author:

Jiri Svoboda <jiri@…> (2025-10-09 18:45:33)

git-committer:

Jiri Svoboda <jiri@…> (2025-10-10 08:45:43)

Message:

Allow creating sparse files in Navigator and newfile.

Location:

uspace/app/nav

Files:

• dlg/newfiledlg.c (modified) (10 diffs)
• newfile.c (modified) (5 diffs)
• types/dlg/newfiledlg.h (modified) (3 diffs)
• types/newfile.h (modified) (2 diffs)

uspace/app/nav/dlg/newfiledlg.c

@@ -37 +37 @@
 #include <fmgt.h>
 #include <mem.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include <ui/entry.h>
@@ -81 +82 @@
         ui_label_t *label = NULL;
         ui_entry_t *entry = NULL;
+        ui_checkbox_t *checkbox = NULL;
         ui_pbutton_t *bok = NULL;
         ui_pbutton_t *bcancel = NULL;
@@ -101 +103 @@
                 wparams.rect.p0.y = 0;
                 wparams.rect.p1.x = 40;
-                wparams.rect.p1.y = 11;
+                wparams.rect.p1.y = 13;
         } else {
                 wparams.rect.p0.x = 0;
                 wparams.rect.p0.y = 0;
                 wparams.rect.p1.x = 300;
-                wparams.rect.p1.y = 135;
+                wparams.rect.p1.y = 155;
         }
 
@@ -234 +236 @@
         entry = NULL;
 
+        rc = ui_checkbox_create(ui_res, "Sparse", &checkbox);
+        if (rc != EOK)
+                goto error;
+
+        /* FIXME: Auto layout */
+        if (ui_is_textmode(ui)) {
+                rect.p0.x = 3;
+                rect.p0.y = 8;
+                rect.p1.x = 17;
+                rect.p1.y = 9;
+        } else {
+                rect.p0.x = 10;
+                rect.p0.y = 100;
+                rect.p1.x = 190;
+                rect.p1.y = 120;
+        }
+
+        ui_checkbox_set_rect(checkbox, &rect);
+
+        rc = ui_fixed_add(fixed, ui_checkbox_ctl(checkbox));
+        if (rc != EOK)
+                goto error;
+
+        dialog->sparse = checkbox;
+        checkbox = NULL;
+
         rc = ui_pbutton_create(ui_res, "OK", &bok);
         if (rc != EOK)
@@ -243 +271 @@
         if (ui_is_textmode(ui)) {
                 rect.p0.x = 10;
-                rect.p0.y = 8;
+                rect.p0.y = 10;
                 rect.p1.x = 20;
-                rect.p1.y = 9;
+                rect.p1.y = 11;
         } else {
                 rect.p0.x = 55;
-                rect.p0.y = 90;
+                rect.p0.y = 120;
                 rect.p1.x = 145;
-                rect.p1.y = 118;
+                rect.p1.y = 148;
         }
 
@@ -273 +301 @@
         if (ui_is_textmode(ui)) {
                 rect.p0.x = 22;
-                rect.p0.y = 8;
+                rect.p0.y = 10;
                 rect.p1.x = 32;
-                rect.p1.y = 9;
+                rect.p1.y = 11;
         } else {
                 rect.p0.x = 155;
-                rect.p0.y = 90;
+                rect.p0.y = 120;
                 rect.p1.x = 245;
-                rect.p1.y = 118;
+                rect.p1.y = 148;
         }
 
@@ -307 +335 @@
         if (entry != NULL)
                 ui_entry_destroy(entry);
+        if (checkbox != NULL)
+                ui_checkbox_destroy(checkbox);
         if (bok != NULL)
                 ui_pbutton_destroy(bok);
@@ -375 +405 @@
         const char *fname;
         const char *fsize;
+        bool sparse;
 
         if (event->type == KEY_PRESS &&
@@ -383 +414 @@
                                 fname = ui_entry_get_text(dialog->ename);
                                 fsize = ui_entry_get_text(dialog->esize);
+                                sparse =
+                                    ui_checkbox_get_checked(dialog->sparse);
                                 dialog->cb->bok(dialog, dialog->arg, fname,
-                                    fsize);
+                                    fsize, sparse);
                                 return;
                         }
@@ -409 +442 @@
         const char *fname;
         const char *fsize;
+        bool sparse;
 
         if (dialog->cb != NULL && dialog->cb->bok != NULL) {
                 fname = ui_entry_get_text(dialog->ename);
                 fsize = ui_entry_get_text(dialog->esize);
-                dialog->cb->bok(dialog, dialog->arg, fname, fsize);
+                sparse = ui_checkbox_get_checked(dialog->sparse);
+                dialog->cb->bok(dialog, dialog->arg, fname, fsize, sparse);
         }
 }

uspace/app/nav/newfile.c

@@ -44 +44 @@
 #include <ui/ui.h>
 #include <ui/window.h>
+#include <stdbool.h>
 #include <str.h>
 #include "dlg/newfiledlg.h"
@@ -52 +53 @@
 #include "types/newfile.h"
 
-static void new_file_bok(new_file_dlg_t *, void *, const char *, const char *);
+static void new_file_bok(new_file_dlg_t *, void *, const char *, const char *,
+    bool);
 static void new_file_bcancel(new_file_dlg_t *, void *);
 static void new_file_close(new_file_dlg_t *, void *);
@@ -104 +106 @@
         fmgt_set_init_update(fmgt, true);
 
-        rc = fmgt_new_file(fmgt, job->fname, job->nbytes);
+        rc = fmgt_new_file(fmgt, job->fname, job->nbytes,
+            job->sparse ? nf_sparse : nf_none);
         if (rc != EOK) {
                 rv = asprintf(&msg, "Error creating file (%s).",
@@ -137 +140 @@
  * @param fname New file name
  * @param fsize New file size
+ * @param sparse @c true to create a sparse file
  */
 static void new_file_bok(new_file_dlg_t *dlg, void *arg, const char *fname,
-    const char *fsize)
+    const char *fsize, bool sparse)
 {
         navigator_t *nav = (navigator_t *)arg;
@@ -175 +179 @@
         job->fname = fname;
         job->nbytes = nbytes;
+        job->sparse = sparse;
 
         progress_dlg_params_init(&pd_params);

uspace/app/nav/types/dlg/newfiledlg.h

@@ -38 +38 @@
 
 #include <errno.h>
+#include <ui/checkbox.h>
 #include <ui/entry.h>
 #include <ui/pbutton.h>
 #include <ui/window.h>
+#include <stdbool.h>
 
 /** New File dialog */
@@ -50 +52 @@
         /** File size text entry */
         ui_entry_t *esize;
+        /** Sparse checkbox */
+        ui_checkbox_t *sparse;
         /** OK button */
         ui_pbutton_t *bok;
@@ -63 +67 @@
 typedef struct new_file_dlg_cb {
         /** OK button was pressed */
-        void (*bok)(new_file_dlg_t *, void *, const char *, const char *);
+        void (*bok)(new_file_dlg_t *, void *, const char *, const char *, bool);
         /** Cancel button was pressed */
         void (*bcancel)(new_file_dlg_t *, void *);

uspace/app/nav/types/newfile.h

@@ -37 +37 @@
 #define TYPES_NEWFILE_H
 
+#include <stdbool.h>
 #include <stdint.h>
 
@@ -47 +48 @@
         /** New file size */
         uint64_t nbytes;
+        /** @c true to create a sparse file */
+        bool sparse;
 } navigator_new_file_job_t;