WebSVN – SvarDOS – Diff – /sved/trunk/sved.c

   unsigned short xoffset;
   unsigned char cursorposx;
   unsigned char cursorposy;
   unsigned short totlines;
   unsigned short curline;
-  char lfonly; /* set if line endings are LF (CR/LF otherwise) */
+  char lfonly;   /* set if line endings are LF (CR/LF otherwise) */
+  char modflag;  /* non-zero if file has been modified since last save */
   char fname[1]; /* dynamically sized */
 };
 /*****************************************************************************
 static void ui_basic(const struct file *db) {
   const char *s = svarlang_strid(0); /* HELP */
   unsigned char helpcol = screenw - (strlen(s) + 4);
-  /* fill status bar with background */
+  /* fill status bar with background (without modflag as it is refreshed by ui_refresh) */
-  mdr_cout_char_rep(screenh - 1, 0, ' ', scheme[COL_STATUSBAR1], screenw);
+  mdr_cout_char_rep(screenh - 1, 1, ' ', scheme[COL_STATUSBAR1], screenw - 1);
   /* filename */
+  {
-  if (db->fname[0] == 0) {
+    const char *fn = db->fname;
-    mdr_cout_str(screenh - 1, 0, svarlang_str(0, 1), scheme[COL_STATUSBAR1], screenw);
+    if (*fn == 0) fn = svarlang_str(0, 1);
-  } else {
-    mdr_cout_str(screenh - 1, 0, db->fname, scheme[COL_STATUSBAR1], screenw);
+    mdr_cout_str(screenh - 1, 1, fn, scheme[COL_STATUSBAR1], screenw);
+  }
   /* eol type */
-  if (db->lfonly) {
+  {
-    mdr_cout_str(screenh - 1, helpcol - 3, "LF", scheme[COL_STATUSBAR1], 5);
+    const char *eoltype = "CRLF";
-  } else {
+    if (db->lfonly) eoltype = "LF";
-    mdr_cout_str(screenh - 1, helpcol - 5, "CRLF", scheme[COL_STATUSBAR1], 5);
+    mdr_cout_str(screenh - 1, helpcol - 5, eoltype, scheme[COL_STATUSBAR1], 5);
+  }
   mdr_cout_str(screenh - 1, helpcol, " F1=", scheme[COL_STATUSBAR2], 40);
   mdr_cout_str(screenh - 1, helpcol + 4, s, scheme[COL_STATUSBAR2], 40);
+}
   x = (screenw - msglen - 4) >> 1;
   for (i = y+2; i >= y; i--) mdr_cout_char_rep(i, x, ' ', attr, msglen + 2);
   mdr_cout_str(y+1, x+1, msg, attr, msglen);
   if (uidirty.from > y) uidirty.from = y;
-  if (uidirty.to < y+2) uidirty.to = y+2;
+  if (uidirty.to < y+3) uidirty.to = y+3;
+}
 static void ui_help(void) {
 #define MAXLINLEN 35
     while ((y < screenh - 1) && (y < uidirty.to)) {
       mdr_cout_char_rep(y++, 0, ' ', scheme[COL_TXT], screenw - 1);
+    }
+  }
+  /* "file changed" flag */
+  {
+    char flg = ' ';
+    if (db->modflag) flg = '*';
+    mdr_cout_char(screenh - 1, 0, flg, scheme[COL_STATUSBAR1]);
+  }
   /* scroll bar */
   for (y = 0; y < (screenh - 1); y++) {
     mdr_cout_char(y, screenw - 1, SCROLL_CURSOR, scheme[COL_SCROLLBAR]);
+  }
   if (db->cursorposx + db->xoffset < db->cursor->len) {
     _fmemmove(db->cursor->payload + db->cursorposx + db->xoffset, db->cursor->payload + db->cursorposx + db->xoffset + 1, db->cursor->len - db->cursorposx - db->xoffset);
     db->cursor->len -= 1; /* do this AFTER memmove so the copy includes the nul terminator */
     uidirty.from = db->cursorposy;
     uidirty.to = db->cursorposy;
+    db->modflag = 1;
   } else if (db->cursor->next != NULL) { /* cursor is at end of line: merge current line with next one (if there is a next one) */
     struct line far *nextline = db->cursor->next;
     if (db->cursor->next->len > 0) {
       void far *newptr = _frealloc(db->cursor, sizeof(struct line) + db->cursor->len + db->cursor->next->len + 1);
       if (newptr != NULL) {
     if (db->cursor->prev != NULL) db->cursor->prev->next = db->cursor; /* in case realloc changed my pointer */
     _ffree(nextline);
     uidirty.from = db->cursorposy;
     uidirty.to = 0xff;
     db->totlines -= 1;
+    db->modflag = 1;
+  }
+}
 static void bkspc(struct file *db) {
     _dos_write(fd, eolbuf, eollen, &bytes);
     l = l->next;
+  }
   _dos_close(fd);
   return(0);
+}
 static void insert_in_line(struct file *db, const char *databuf, unsigned short len) {
   struct line far *n;
   n = _frealloc(db->cursor, sizeof(struct line) + db->cursor->len + len);
   if (n != NULL) {
     unsigned short off = db->xoffset + db->cursorposx;
+    db->modflag = 1;
     if (n->prev) n->prev->next = n;
     if (n->next) n->next->prev = n;
     db->cursor = n;
     _fmemmove(db->cursor->payload + off + len, db->cursor->payload + off, db->cursor->len - off + 1);
     db->cursor->len += len;
     } else if (k == 0x0D) { /* ENTER */
       unsigned short off = db->xoffset + db->cursorposx;
       /* add a new line */
       if (line_add(db, db->cursor->payload + off, db->cursor->len - off) == 0) {
+        db->modflag = 1;
         db->cursor = db->cursor->prev; /* back to original line */
         db->curline -= 1;
         /* trim the line above */
         db->cursor->len = off;
         /* move cursor to the (new) line below */
       uidirty.from = 0;
       uidirty.to = 0xff;
     } else if (k == 0x13f) { /* F5 */
       if (savefile(db) == 0) {
+        db->modflag = 0;
         ui_msg(svarlang_str(0, 2), scheme[COL_MSG]);
         mdr_bios_tickswait(11); /* 11 ticks is about 600 ms */
       } else {
         ui_msg(svarlang_str(0, 3), scheme[COL_ERR]);
         mdr_bios_tickswait(36); /* 2s */
+      }
     } else if (k == 0x144) { /* F10 */
+      db->modflag = 1;
       db->lfonly ^= 1;
       ui_basic(db);
     } else if (k == 0x174) { /* CTRL+ArrRight - jump to next word */
       /* if currently cursor is on a non-space, then fast-forward to nearest space or EOL */

Subversion Repositories SvarDOS

(root)/sved/trunk/sved.c @ 1559 – Rev 1328 → 1330