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

                      SCHEME_SCROLL = 0x70,
                      SCHEME_MSG    = 0x70,
                      SCHEME_ERR    = 0x70;
 static unsigned char screenw, screenh;
+static unsigned char glob_monomode, glob_tablessmode;
 static struct {
     unsigned char from;
     unsigned char to;
     unsigned char statusbar;
   if (uidirty.from > y) uidirty.from = y;
   if (uidirty.to < y+4) uidirty.to = y+4;
+}
-static unsigned char ui_confirm_if_unsaved(struct file *db) {
+static unsigned char ui_confirm_if_unsaved(const struct file *db) {
   unsigned char r = 0;
   if (db->modflag == 0) return(0);
   mdr_cout_cursor_hide();
+      }
       eolfound = 0;
+    }
     /* append 8 spaces if tab char found */
-    if ((consumedbytes < len) && (buffptr[consumedbytes] == '\t')) {
+    if ((consumedbytes < len) && (buffptr[consumedbytes] == '\t') && (glob_tablessmode == 0)) {
       consumedbytes++;
       if (line_append(db, "        ", 8) != 0) {
         goto IOERR;
+      }
+    }
     *tail = 0;
     tail++;
     /* look at the arg now */
     if (*arg == '/') {
+      if (arg[1] == 't') { /* /t = do not expand tabs */
+        glob_tablessmode = 1;
+      } else if (arg[1] == 'm') { /* /m = force mono mode */
+        glob_monomode = 1;
+      } else {  /* help screen */
-      const char far *self = mdr_dos_selfexe();
+        const char far *self = mdr_dos_selfexe();
-      unsigned short i;
+        unsigned short i;
-      if (self == NULL) self = "sved";
+        if (self == NULL) self = "sved";
-      for (i = 0; self[i] != 0; i++) {
+        for (i = 0; self[i] != 0; i++) {
-        if (self[i] == '\\') {
+          if (self[i] == '\\') {
-          self += i + 1;
+            self += i + 1;
-          i = 0;
+            i = 0;
+          }
+        }
+        mdr_coutraw_str(svarlang_str(1,3));
+        mdr_coutraw_str(" [");
+        mdr_coutraw_str(svarlang_str(1,4));
+        mdr_coutraw_puts(" " PVER "]");
+        mdr_coutraw_puts("Copyright (C) " PDATE " Mateusz Viste");
+        mdr_coutraw_crlf();
+        mdr_coutraw_str(svarlang_str(1,0)); /* usage: */
+        mdr_coutraw_char(' ');
+        while (*self != 0) {
+          mdr_coutraw_char(*self);
+          self++;
+        }
+        mdr_coutraw_char(' ');
+        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);
+      }
-      mdr_coutraw_str(svarlang_str(1,3));
-      mdr_coutraw_str(" [");
-      mdr_coutraw_str(svarlang_str(1,4));
-      mdr_coutraw_puts(" " PVER "]");
-      mdr_coutraw_puts("Copyright (C) " PDATE " Mateusz Viste");
-      mdr_coutraw_crlf();
-      mdr_coutraw_str(svarlang_str(1,0)); /* usage: */
-      mdr_coutraw_char(' ');
-      while (*self != 0) {
-        mdr_coutraw_char(*self);
-        self++;
+      continue;
-      }
-      mdr_coutraw_char(' ');
-      mdr_coutraw_puts(svarlang_str(1,1)); /* args syntax */
-      return(-1);
+    }
     /* looks to be a filename */
     if (count == 10) {
       mdr_coutraw_puts(svarlang_str(0,12));
+  }
   /* parse argv (and load files, if any passed on) */
   if (parseargv(dbarr) != 0) return;
-  if (mdr_cout_init(&screenw, &screenh)) {
+  if ((mdr_cout_init(&screenw, &screenh) != 0) && (glob_monomode == 0)) {
     /* load color scheme if mdr_cout_init returns a color flag */
     SCHEME_TEXT = 0x17;
     SCHEME_MENU = 0x70;
     SCHEME_MENU_CUR = 0x6f;
     SCHEME_MENU_SEL = 0x66;
     } else if ((k >= 0x20) && (k <= 0xff)) { /* "normal" character */
       char c = k;
       insert_in_line(db, &c, 1);
     } else if (k == 0x009) { /* TAB */
+      if (glob_tablessmode == 0) {
-      insert_in_line(db, "        ", 8);
+        insert_in_line(db, "        ", 8);
+      } else {
+        insert_in_line(db, "\t", 1);
+      }
     } else if ((k >= 0x13b) && (k <= 0x144)) { /* F1..F10 */
       curfile = k - 0x13b;
       db = select_slot(dbarr, curfile);
             cursor_up(db);
+          }
           line_free(clipboard->prev);
           uidirty.from = 0;
           uidirty.to = 0xff;
+          recompute_curline(db);
+        }
+      }
     } else if (k == 0x016) { /* CTRL+V */
       if (clipboard != NULL) {
           cursor_down(db);
+        }
+      }
       uidirty.from = 0;
       uidirty.to = 0xff;
+      recompute_curline(db);
 #ifdef DBG_UNHKEYS
     } else { /* UNHANDLED KEY - TODO IGNORE THIS IN PRODUCTION RELEASE */
       char buff[4];
       const char *HEX = "0123456789ABCDEF";

Subversion Repositories SvarDOS

(root)/sved/trunk/sved.c @ 1577 – Rev 1410 → 1412