Changeset 850fd32 in mainline for uspace/dist/src/c/demos/edit/edit.c

Timestamp:

2018-03-11T01:21:19Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

84239b1, f0e825d

Parents:

338d54a7

Message:

Fix mischievious semicolons.

File:

• uspace/dist/src/c/demos/edit/edit.c (modified) (12 diffs)

uspace/dist/src/c/demos/edit/edit.c

@@ -48 +48 @@
 #include <macros.h>
 #include <clipboard.h>
+#include <types/common.h>
 
 #include "sheet.h"
@@ -131 +132 @@
 static void pos_handle(pos_event_t *ev);
 
-static int file_save(char const *fname);
+static errno_t 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,
+static errno_t file_insert(char *fname);
+static errno_t file_save_range(char const *fname, spt_t const *spos,
     spt_t const *epos);
 static char *range_get_str(spt_t const *spos, spt_t const *epos);
@@ -577 +578 @@
 
 /** Save the document. */
-static int file_save(char const *fname)
+static errno_t file_save(char const *fname)
 {
         spt_t sp, ep;
@@ -654 +655 @@
 
                         /* Handle key press. */
-                        if (((kev->mods & KM_ALT) == 0) &&
-                             (kev->mods & KM_CTRL) != 0) {
-                                ;
-                        } else if ((kev->mods & (KM_CTRL | KM_ALT)) == 0) {
+                        if ((kev->mods & (KM_CTRL | KM_ALT)) == 0) {
                                 switch (kev->key) {
                                 case KC_ESCAPE:
@@ -696 +694 @@
  * of the caret.
  */
-static int file_insert(char *fname)
+static errno_t file_insert(char *fname)
 {
         FILE *f;
@@ -734 +732 @@
 
 /** Save a range of text into a file. */
-static int file_save_range(char const *fname, spt_t const *spos,
+static errno_t file_save_range(char const *fname, spt_t const *spos,
     spt_t const *epos)
 {
@@ -760 +758 @@
         } while (!spt_equal(&bep, epos));
 
-        if (fclose(f) != EOK)
+        if (fclose(f) < 0)
                 return EIO;
 
@@ -954 +952 @@
         coord_t coord;
         int last_row;
+        char *fname;
+        char *p;
+        char *text;
+        size_t n;
+        int pos;
+        size_t nextra;
+        size_t fnw;
 
         tag_get_pt(&pane.caret_pos, &caret_pt);
@@ -960 +965 @@
         sheet_get_num_rows(doc.sh, &last_row);
 
-        const char *fname = (doc.file_name != NULL) ? doc.file_name : "<unnamed>";
+        if (doc.file_name != NULL) {
+                /* Remove directory component */
+                p = str_rchr(doc.file_name, '/');
+                if (p != NULL)
+                        fname = str_dup(p + 1);
+                else
+                        fname = str_dup(doc.file_name);
+        } else {
+                fname = str_dup("<unnamed>");
+        }
+
+        if (fname == NULL)
+                return;
 
         console_set_pos(con, 0, scr_rows - 1);
         console_set_style(con, STYLE_INVERTED);
-        int n = printf(" %d, %d (%d): File '%s'. Ctrl-Q Quit  Ctrl-S Save  "
-            "Ctrl-E Save As", coord.row, coord.column, last_row, fname);
-
-        int pos = scr_columns - 1 - n;
+
+        /*
+         * Make sure the status fits on the screen. This loop should
+         * be executed at most twice.
+         */
+        while (true) {
+                int rc = asprintf(&text, " %d, %d (%d): File '%s'. Ctrl-Q Quit  Ctrl-S Save  "
+                    "Ctrl-E Save As", coord.row, coord.column, last_row, fname);
+                if (rc < 0) {
+                        n = 0;
+                        goto finish;
+                }
+
+                /* If it already fits, we're done */
+                n = str_width(text);
+                if (n <= scr_columns - 2)
+                        break;
+
+                /* Compute number of excess characters */
+                nextra = n - (scr_columns - 2);
+                /** With of the file name part */
+                fnw = str_width(fname);
+
+                /*
+                 * If reducing file name to two characters '..' won't help,
+                 * just give up and print a blank status.
+                 */
+                if (nextra > fnw - 2)
+                        goto finish;
+
+                /* Compute position where we overwrite with '..\0' */
+                if (fnw >= nextra + 2) {
+                        p = fname + str_lsize(fname, fnw - nextra - 2);
+                } else {
+                        p = fname;
+                }
+
+                /* Shorten the string */
+                p[0] = p[1] = '.';
+                p[2] = '\0';
+
+                /* Need to format the string once more. */
+                free(text);
+        }
+
+        printf("%s", text);
+        free(text);
+        free(fname);
+finish:
+        /* Fill the rest of the line */
+        pos = scr_columns - 1 - n;
         printf("%*s", pos, "");
         console_flush(con);
@@ -1216 +1280 @@
 
 /* Search operations */
-static int search_spt_producer(void *data, wchar_t *ret)
+static errno_t search_spt_producer(void *data, wchar_t *ret)
 {
         assert(data != NULL);
@@ -1225 +1289 @@
 }
 
-static int search_spt_reverse_producer(void *data, wchar_t *ret)
+static errno_t search_spt_reverse_producer(void *data, wchar_t *ret)
 {
         assert(data != NULL);
@@ -1234 +1298 @@
 }
 
-static int search_spt_mark(void *data, void **mark)
+static errno_t search_spt_mark(void *data, void **mark)
 {
         assert(data != NULL);