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

   /* if filename not overloaded then use the fname in db */
   if (saveas == NULL) saveas = db->fname;
   _asm {
-    push ax
     push cx
     push dx
     mov ah, 0x3C    /* create or truncate file */
     xor cx, cx      /* file attributes */
     DONE:
     mov fd, ax
     pop dx
     pop cx
-    pop ax
+  }
   if (errflag != 0) return(-1);
   l = db->cursor;
     uidirty.to = 0xff;
+  }
+}
-static void cursor_left(struct file *db) {
-  if (db->cursorposx > 0) {
-    db->cursorposx -= 1;
-  } else if (db->xoffset > 0) {
-    db->xoffset -= 1;
-    uidirty.from = 0;
-    uidirty.to = 0xff;
-  } else if (db->cursor->prev != NULL) { /* jump to end of line above */
-    cursor_up(db);
-    cursor_eol(db);
-  }
-}
 static void cursor_home(struct file *db) {
   db->cursorposx = 0;
   if (db->xoffset != 0) {
     db->xoffset = 0;
     uidirty.from = 0;
     cursor_home(db);
+  }
+}
+static void cursor_left(struct file *db) {
+  if (db->cursorposx > 0) {
+    db->cursorposx -= 1;
+  } else if (db->xoffset > 0) {
+    db->xoffset -= 1;
+    uidirty.from = 0;
+    uidirty.to = 0xff;
+  } else if (db->cursor->prev != NULL) { /* jump to end of line above */
+    cursor_up(db);
+    cursor_eol(db);
+  }
+}
 static void del(struct file *db) {
   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;
       } else {  /* help screen */
         mdr_coutraw_str(svarlang_str(1,3)); /* Sved, the SvarDOS editor */
         mdr_coutraw_str(" [");
         mdr_coutraw_str(svarlang_str(1,4)); /* ver */
-        mdr_coutraw_puts(" " PVER "]");
+        mdr_coutraw_str(" " PVER "]\r\n"
-        mdr_coutraw_puts("Copyright (C) " PDATE " Mateusz Viste");
+                         "Copyright (C) " PDATE " Mateusz Viste\n"
-        mdr_coutraw_crlf();
+                         "\r\n"
-        mdr_coutraw_str("sved [/m] [/t] ");
+                         "sved [/m] [/t] ");
         mdr_coutraw_puts(svarlang_str(1,1)); /* args syntax */
         mdr_coutraw_crlf();
         mdr_coutraw_puts(svarlang_str(1,10)); /* /m */
         mdr_coutraw_puts(svarlang_str(1,11)); /* /t */
         return(-1);
+    }
+  }
+}
-static struct file *select_slot(struct file *dbarr, unsigned short curfile) {
+static void new_slot_selected(const struct file *dbarr) {
   uidirty.from = 0;
   uidirty.to = 0xff;
   uidirty.statusbar = 1;
-  dbarr = &(dbarr[curfile]);
   /* force redraw now, because the main() routine might not if this is exit
    * time and we want to show the user which file has unsaved changes */
   ui_statusbar(dbarr);
   ui_refresh(dbarr);
-  return(dbarr);
+}
 /* main returns nothing, ie. sved always exits with a zero exit code
  * (this saves 20 bytes of executable footprint) */
           quitnow = 1;
+          {
             unsigned short curfile;
             for (curfile = 0; curfile < 10; curfile++) {
               if (dbarr[curfile].modflag == 0) continue; /* skip unmodified slots */
-              db = select_slot(dbarr, curfile);
+              db = dbarr + curfile;
+              new_slot_selected(db);
               if (ui_confirm_if_unsaved(db) != 0) {
                 quitnow = 0;
                 break;
+              }
+            }
       } else {
         insert_in_line(db, "\t", 1);
+      }
     } else if ((k >= 0x13b) && (k <= 0x144)) { /* F1..F10 */
-      db = select_slot(dbarr, k - 0x13b);
+      db = dbarr + (k - 0x13b);
+      new_slot_selected(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 */
       for (;;) {
         if (db->xoffset + db->cursorposx == db->cursor->len) break;

Subversion Repositories SvarDOS

(root)/sved/trunk/sved.c – Rev 1759 → 1760