Changes in uspace/app/edit/edit.c [00413c5c:b67c7d64] in mainline

File:

• uspace/app/edit/edit.c (modified) (10 diffs)

uspace/app/edit/edit.c

@@ -36 +36 @@
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <sys/types.h>
 #include <vfs/vfs.h>
@@ -101 +102 @@
 #define ED_INFTY 65536
 
+/** Maximum filename length that can be entered. */
+#define INFNAME_MAX_LEN 128
+
 static void key_handle_unmod(console_event_t const *ev);
 static void key_handle_ctrl(console_event_t const *ev);
 static int file_save(char const *fname);
+static void file_save_as(void);
 static int file_insert(char *fname);
 static int file_save_range(char const *fname, spt_t const *spos,
     spt_t const *epos);
+static char *filename_prompt(char const *prompt, char const *init_value);
 static void pane_text_display(void);
 static void pane_row_display(void);
@@ -150 +156 @@
 
         if (argc == 2) {
-                doc.file_name = argv[1];
+                doc.file_name = str_dup(argv[1]);
         } else if (argc > 1) {
                 printf("Invalid arguments.\n");
                 return -2;
         } else {
-                doc.file_name = "/edit.txt";
+                doc.file_name = NULL;
         }
 
         new_file = false;
 
-        if (file_insert(doc.file_name) != EOK)
+        if (doc.file_name == NULL || file_insert(doc.file_name) != EOK)
                 new_file = true;
 
@@ -170 +176 @@
         pane_text_display();
         pane_status_display();
-        if (new_file)
-                status_display("File not found. Created empty file.");
+        if (new_file && doc.file_name != NULL)
+                status_display("File not found. Starting empty file.");
         pane_caret_display();
 
@@ -266 +272 @@
                 break;
         case KC_S:
-                (void) file_save(doc.file_name);
+                if (doc.file_name != NULL)
+                        file_save(doc.file_name);
+                else
+                        file_save_as();
+                break;
+        case KC_E:
+                file_save_as();
                 break;
         default:
@@ -272 +284 @@
         }
 }
-
 
 /** Save the document. */
@@ -285 +296 @@
 
         rc = file_save_range(fname, &sp, &ep);
-        status_display("File saved.");
+
+        switch (rc) {
+        case EINVAL:
+                status_display("Error opening file!");
+                break;
+        case EIO:
+                status_display("Error writing data!");
+                break;
+        default:
+                status_display("File saved.");
+                break;
+        }
 
         return rc;
+}
+
+/** Change document name and save. */
+static void file_save_as(void)
+{
+        char *old_fname, *fname;
+        int rc;
+
+        old_fname = (doc.file_name != NULL) ? doc.file_name : "";
+        fname = filename_prompt("Save As", old_fname);
+        if (fname == NULL) {
+                status_display("Save cancelled.");
+                return;
+        }
+
+        rc = file_save(fname);
+        if (rc != EOK)
+                return;
+
+        if (doc.file_name != NULL)
+                free(doc.file_name);
+        doc.file_name = fname;
+}
+
+/** Ask for a file name. */
+static char *filename_prompt(char const *prompt, char const *init_value)
+{
+        console_event_t ev;
+        char *str;
+        wchar_t buffer[INFNAME_MAX_LEN + 1];
+        int max_len;
+        int nc;
+        bool done;
+
+        asprintf(&str, "%s: %s", prompt, init_value);
+        status_display(str);
+        console_goto(con, 1 + str_length(str), scr_rows - 1);
+        free(str);
+
+        console_set_color(con, COLOR_WHITE, COLOR_BLACK, 0);
+
+        max_len = min(INFNAME_MAX_LEN, scr_columns - 4 - str_length(prompt));
+        str_to_wstr(buffer, max_len + 1, init_value);
+        nc = wstr_length(buffer);
+        done = false;
+
+        while (!done) {
+                console_get_event(con, &ev);
+
+                if (ev.type == KEY_PRESS) {
+                        /* Handle key press. */
+                        if (((ev.mods & KM_ALT) == 0) &&
+                             (ev.mods & KM_CTRL) != 0) {
+                                ;
+                        } else if ((ev.mods & (KM_CTRL | KM_ALT)) == 0) {
+                                switch (ev.key) {
+                                case KC_ESCAPE:
+                                        return NULL;
+                                case KC_BACKSPACE:
+                                        if (nc > 0) {
+                                                putchar('\b');
+                                                fflush(stdout);
+                                                --nc;
+                                        }
+                                        break;
+                                case KC_ENTER:
+                                        done = true;
+                                        break;
+                                default:
+                                        if (ev.c >= 32 && nc < max_len) {
+                                                putchar(ev.c);
+                                                fflush(stdout);
+                                                buffer[nc++] = ev.c;
+                                        }
+                                        break;
+                                }
+                        }
+                }
+        }
+
+        buffer[nc] = '\0';
+        str = wstr_to_astr(buffer);
+
+        console_set_color(con, COLOR_BLACK, COLOR_WHITE, 0);
+
+        return str;
 }
 
@@ -359 +467 @@
         } while (!spt_equal(&bep, epos));
 
-        fclose(f);
+        if (fclose(f) != EOK)
+                return EIO;
 
         return EOK;
@@ -473 +582 @@
         spt_t caret_pt;
         coord_t coord;
+        char *fname;
         int n;
 
@@ -478 +588 @@
         spt_get_coord(&caret_pt, &coord);
 
+        fname = (doc.file_name != NULL) ? doc.file_name : "<unnamed>";
+
         console_goto(con, 0, scr_rows - 1);
         console_set_color(con, COLOR_WHITE, COLOR_BLACK, 0);
-        n = printf(" %d, %d: File '%s'. Ctrl-S Save  Ctrl-Q Quit",
-            coord.row, coord.column, doc.file_name);
+        n = printf(" %d, %d: File '%s'. Ctrl-Q Quit  Ctrl-S Save  "
+            "Ctrl-E Save As", coord.row, coord.column, fname);
         printf("%*s", scr_columns - 1 - n, "");
         fflush(stdout);