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

 /* preload the mono scheme (to be overloaded at runtime if color adapter present) */
 static unsigned char scheme[] = {0x07, 0x70, 0x70, 0x70, 0x70, 0xf0};
 static unsigned char screenw, screenh;
-//static union {
 static struct {
     unsigned char from;
     unsigned char to;
-//  };
-//  unsigned short fromto;
 } uidirty = {0, 0xff}; /* make sure to redraw entire UI at first run */
-//} uidirty = {0xff, 0};
 #define SCROLL_CURSOR 0xB1
 struct line {
   struct line far *prev;
   int fd;
   struct line far *cursor;
   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 fname[1]; /* dynamically sized */
 };
 /*****************************************************************************
  * functions                                                                 *
  *****************************************************************************/
-/* adds a new line at cursor position into file linked list and dvance cursor
+/* adds a new line at cursor position into file linked list and advance cursor
  * returns non-zero on error */
-static int line_add(struct file *db, const char far *line) {
+static int line_add(struct file *db, const char far *line, unsigned short slen) {
-  unsigned short slen;
   struct line far *l;
-  /* slen = strlen(line) (but for far pointer) */
-  for (slen = 0; line[slen] != 0; slen++);
-  /* trim out CR/LF line endings */
-  if ((slen >= 2) && (line[slen - 2] == '\r')) {
-    slen -= 2;
-  } else if ((slen >= 1) && (line[slen - 1] == '\n')) {
-    slen--;
-  }
-  l = _fcalloc(1, sizeof(struct line) + slen + 1);
+  l = _fcalloc(1, sizeof(struct line) + slen);
   if (l == NULL) return(-1);
   l->prev = db->cursor;
   if (db->cursor) {
     l->next = db->cursor->next;
+  }
   db->cursor = l;
   _fmemcpy(l->payload, line, slen);
   l->len = slen;
+  db->totlines += 1;
+  db->curline += 1;
   return(0);
+}
 /* append a nul-terminated string to line at cursor position */
 static void db_rewind(struct file *db) {
   if (db->cursor == NULL) return;
   while (db->cursor->prev) db->cursor = db->cursor->prev;
+  db->curline = 0;
+}
 static void load_colorscheme(void) {
   scheme[COL_TXT] = 0x17;
   scheme[COL_ERR] = 0x4f;
+}
 static void ui_basic(const struct file *db) {
-  unsigned char i;
   const char *s = svarlang_strid(0); /* HELP */
   unsigned char helpcol = screenw - (strlen(s) + 4);
   /* fill status bar with background */
   mdr_cout_char_rep(screenh - 1, 0, ' ', scheme[COL_STATUSBAR1], screenw);
     mdr_cout_str(screenh - 1, helpcol - 5, "CRLF", 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);
-  /* scroll bar */
-  for (i = 0; i < (screenh - 1); i++) {
-    mdr_cout_char(i, screenw - 1, SCROLL_CURSOR, scheme[COL_SCROLLBAR]);
-  }
+}
 static void ui_msg(const char *msg, unsigned char attr) {
   unsigned short x, y, msglen, i;
   if (l == NULL) {
     while ((y < screenh - 1) && (y < uidirty.to)) {
       mdr_cout_char_rep(y++, 0, ' ', scheme[COL_TXT], screenw - 1);
+    }
+  }
+  /* scroll bar */
+  for (y = 0; y < (screenh - 1); y++) {
+    mdr_cout_char(y, screenw - 1, SCROLL_CURSOR, scheme[COL_SCROLLBAR]);
+  }
+  /* scroll cursor */
+  if (db->totlines >= screenh) {
+    unsigned short topline = db->curline - db->cursorposy;
+    unsigned short col;
+    unsigned short totlines = db->totlines - screenh + 1;
+    if (db->totlines - screenh > screenh) {
+      col = topline / (totlines / (screenh - 1));
+    } else {
+      col = topline * (screenh - 1) / totlines;
+    }
+    if (col >= screenh - 1) col = screenh - 2;
+    mdr_cout_char(col, screenw - 1, ' ', scheme[COL_SCROLLBAR]);
+  }
+}
 static void check_cursor_not_after_eol(struct file *db) {
   if (db->xoffset + db->cursorposx <= db->cursor->len) return;
+}
 static void cursor_up(struct file *db) {
   if (db->cursor->prev != NULL) {
+    db->curline -= 1;
     db->cursor = db->cursor->prev;
     if (db->cursorposy == 0) {
       uidirty.from = 0;
       uidirty.to = 0xff;
     } else {
+}
 static void cursor_down(struct file *db) {
   if (db->cursor->next != NULL) {
+    db->curline += 1;
     db->cursor = db->cursor->next;
     if (db->cursorposy < screenh - 2) {
       db->cursorposy += 1;
     } else {
       uidirty.from = 0;
     db->cursor->next->prev = db->cursor;
     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;
+  }
+}
 static void bkspc(struct file *db) {
+  }
   db->lfonly = 1;
   /* start by adding an empty line */
-  if (line_add(db, "") != 0) {
+  if (line_add(db, NULL, 0) != 0) {
     /* TODO ERROR HANDLING */
+  }
   for (eolfound = 0;;) {
     unsigned short consumedbytes;
       break;
+    }
     /* add a new line if necessary */
     if (eolfound) {
-      if (line_add(db, "") != 0) {
+      if (line_add(db, NULL, 0) != 0) {
       /* TODO ERROR HANDLING */
         mdr_coutraw_puts("out of memory");
         free(db);
         db = NULL;
         break;
   SKIPLOADING:
   /* add an empty line at end if not present already, also rewind cursor to top of file */
   if (db != NULL) {
-    if ((db->cursor == NULL) || (db->cursor->len != 0)) line_add(db, "");
+    if ((db->cursor == NULL) || (db->cursor->len != 0)) line_add(db, NULL, 0);
     db_rewind(db);
+  }
   return(db);
+}
     if (uidirty.from != 0xff) {
       ui_refresh(db);
       uidirty.from = 0xff;
+    }
+#ifdef DBG_LINENUM
+      {
+        char ddd[10];
+        db->curline += 1;
+        ddd[0] = '0' + db->curline / 100;
+        ddd[1] = '0' + (db->curline % 100) / 10;
+        ddd[2] = '0' + (db->curline % 10);
+        db->curline -= 1;
+        ddd[3] = '/';
+        ddd[4] = '0' + db->totlines / 100;
+        ddd[5] = '0' + (db->totlines % 100) / 10;
+        ddd[6] = '0' + (db->totlines % 10);
+        ddd[7] = 0;
+        mdr_cout_str(screenh - 1, 40, ddd, scheme[COL_STATUSBAR1], sizeof(ddd));
+      }
+#endif
     k = keyb_getkey();
     if (k == 0x150) { /* down */
       cursor_down(db);
     } else if (k == 0x1B) { /* ESC */
       break;
     } else if (k == 0x0D) { /* ENTER */
+      unsigned short off = db->xoffset + db->cursorposx;
       /* add a new line */
-      if (line_add(db, db->cursor->payload + db->xoffset + db->cursorposx) == 0) {
+      if (line_add(db, db->cursor->payload + off, db->cursor->len - off) == 0) {
+        db->cursor = db->cursor->prev; /* back to original line */
+        db->curline -= 1;
         /* trim the line above */
-        db->cursor->prev->len = db->xoffset + db->cursorposx;
+        db->cursor->len = off;
-        db->cursor->prev->payload[db->cursor->prev->len] = 0;
         /* move cursor to the (new) line below */
-        db->cursorposx = 0;
-        if (db->cursorposy < screenh - 2) {
-          uidirty.from = db->cursorposy;
+        uidirty.from = db->cursorposy;
-          db->cursorposy++;
-        } else {
-          uidirty.from = 0;
-        }
         uidirty.to = 0xff;
+        cursor_down(db);
+        cursor_home(db);
       } else {
         /* ERROR: OUT OF MEMORY */
+      }
     } else if (k == 0x153) {  /* DEL */

Subversion Repositories SvarDOS

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