SvarDOSSvarDOS Packages

BlueGreycalmElegant

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /sved/trunk/sved.c/ @ 1316

  → /sved/trunk/sved.c @ 1315

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 1316 → Rev 1315

/sved/trunk/sved.c
56,8 → 56,6
struct file {
struct line far *cursor;
unsigned short xoffset;
unsigned char cursorposx;
unsigned char cursorposy;
char lfonly; /* set if line endings are LF (CR/LF otherwise) */
};
171,10 → 169,9
}
static void ui_refresh(const struct file *db, unsigned char screenw, unsigned char screenh, unsigned char uidirtyfrom, unsigned char uidirtyto) {
static void ui_refresh(const struct file *db, unsigned char screenw, unsigned char screenh, unsigned char uidirtyfrom, unsigned char uidirtyto, unsigned char y) {
unsigned char len;
const struct line far *l;
unsigned char y = db->cursorposy;
#ifdef DBG_REFRESH
static char m = 'a';
209,34 → 206,34
}
static void check_cursor_not_after_eol(struct file *db, unsigned char *uidirtyfrom, unsigned char *uidirtyto) {
if (db->xoffset + db->cursorposx <= db->cursor->len) return;
static void check_cursor_not_after_eol(struct file *db, unsigned char *cursorpos, unsigned char *uidirtyfrom, unsigned char *uidirtyto) {
if (db->xoffset + *cursorpos <= db->cursor->len) return;
if (db->cursor->len < db->xoffset) {
db->cursorposx = 0;
*cursorpos = 0;
db->xoffset = db->cursor->len;
*uidirtyfrom = 0;
*uidirtyto = 0xff;
} else {
db->cursorposx = db->cursor->len - db->xoffset;
*cursorpos = db->cursor->len - db->xoffset;
}
}
static void cursor_up(struct file *db, unsigned char *uidirtyfrom, unsigned char *uidirtyto) {
static void cursor_up(struct file *db, unsigned char *cursorposy, unsigned char *uidirtyfrom, unsigned char *uidirtyto) {
if (db->cursor->prev != NULL) {
db->cursor = db->cursor->prev;
if (db->cursorposy == 0) {
if (*cursorposy == 0) {
*uidirtyfrom = 0;
*uidirtyto = 0xff;
} else {
db->cursorposy -= 1;
*cursorposy -= 1;
}
}
}
static void cursor_eol(struct file *db, unsigned char screenw, unsigned char *uidirtyfrom, unsigned char *uidirtyto) {
static void cursor_eol(struct file *db, unsigned char *cursorposx, unsigned char screenw, unsigned char *uidirtyfrom, unsigned char *uidirtyto) {
/* adjust xoffset to make sure eol is visible on screen */
if (db->xoffset > db->cursor->len) {
db->xoffset = db->cursor->len - 1;
249,15 → 246,15
*uidirtyfrom = 0;
*uidirtyto = 0xff;
}
db->cursorposx = db->cursor->len - db->xoffset;
*cursorposx = db->cursor->len - db->xoffset;
}
static void cursor_down(struct file *db, unsigned char screenh, unsigned char *uidirtyfrom, unsigned char *uidirtyto) {
static void cursor_down(struct file *db, unsigned char *cursorposy, unsigned char screenh, unsigned char *uidirtyfrom, unsigned char *uidirtyto) {
if (db->cursor->next != NULL) {
db->cursor = db->cursor->next;
if (db->cursorposy < screenh - 2) {
db->cursorposy += 1;
if (*cursorposy < screenh - 2) {
*cursorposy += 1;
} else {
*uidirtyfrom = 0;
*uidirtyto = 0xff;
266,22 → 263,22
}
static void cursor_left(struct file *db, unsigned char screenw, unsigned char *uidirtyfrom, unsigned char *uidirtyto) {
if (db->cursorposx > 0) {
db->cursorposx -= 1;
static void cursor_left(struct file *db, unsigned char *cursorposx, unsigned char *cursorposy, unsigned char screenw, unsigned char *uidirtyfrom, unsigned char *uidirtyto) {
if (*cursorposx > 0) {
*cursorposx -= 1;
} else if (db->xoffset > 0) {
db->xoffset -= 1;
*uidirtyfrom = 0;
*uidirtyto = 0xff;
} else if (db->cursor->prev != NULL) { /* jump to end of line above */
cursor_up(db, uidirtyfrom, uidirtyto);
cursor_eol(db, screenw, uidirtyfrom, uidirtyto);
cursor_up(db, cursorposy, uidirtyfrom, uidirtyto);
cursor_eol(db, cursorposx, screenw, uidirtyfrom, uidirtyto);
}
}
static void cursor_home(struct file *db, unsigned char *uidirtyfrom, unsigned char *uidirtyto) {
db->cursorposx = 0;
static void cursor_home(struct file *db, unsigned char *cursorposx, unsigned char *uidirtyfrom, unsigned char *uidirtyto) {
*cursorposx = 0;
if (db->xoffset != 0) {
db->xoffset = 0;
*uidirtyfrom = 0;
290,10 → 287,10
}
static void cursor_right(struct file *db, unsigned char screenw, unsigned char screenh, unsigned char *uidirtyfrom, unsigned char *uidirtyto) {
if (db->cursor->len > db->xoffset + db->cursorposx) {
if (db->cursorposx < screenw - 2) {
db->cursorposx += 1;
static void cursor_right(struct file *db, unsigned char *cursorposx, unsigned char *cursorposy, unsigned char screenw, unsigned char screenh, unsigned char *uidirtyfrom, unsigned char *uidirtyto) {
if (db->cursor->len > db->xoffset + *cursorposx) {
if (*cursorposx < screenw - 2) {
*cursorposx += 1;
} else {
db->xoffset += 1;
*uidirtyfrom = 0;
300,18 → 297,18
*uidirtyto = 0xff;
}
} else {
cursor_down(db, screenh, uidirtyfrom, uidirtyto);
cursor_home(db, uidirtyfrom, uidirtyto);
cursor_down(db, cursorposy, screenh, uidirtyfrom, uidirtyto);
cursor_home(db, cursorposx, uidirtyfrom, uidirtyto);
}
}
static void del(struct file *db, unsigned char *uidirtyfrom, unsigned char *uidirtyto) {
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);
static void del(struct file *db, unsigned char cursorposx, unsigned char cursorposy, unsigned char *uidirtyfrom, unsigned char *uidirtyto) {
if (cursorposx + db->xoffset < db->cursor->len) {
_fmemmove(db->cursor->payload + cursorposx + db->xoffset, db->cursor->payload + cursorposx + db->xoffset + 1, db->cursor->len - cursorposx - db->xoffset);
db->cursor->len -= 1; /* do this AFTER memmove so the copy includes the nul terminator */
*uidirtyfrom = db->cursorposy;
*uidirtyto = db->cursorposy;
*uidirtyfrom = cursorposy;
*uidirtyto = cursorposy;
} 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) {
326,19 → 323,19
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);
*uidirtyfrom = db->cursorposy;
*uidirtyfrom = cursorposy;
*uidirtyto = 0xff;
}
}
static void bkspc(struct file *db, unsigned char screenw, unsigned char *uidirtyfrom, unsigned char *uidirtyto) {
static void bkspc(struct file *db, unsigned char *cursorposx, unsigned char *cursorposy, unsigned char screenw, unsigned char *uidirtyfrom, unsigned char *uidirtyto) {
/* backspace is basically "left + del", not applicable only if cursor is on 1st byte of the file */
if ((db->cursorposx == 0) && (db->xoffset == 0) && (db->cursor->prev == NULL)) return;
if ((*cursorposx == 0) && (db->xoffset == 0) && (db->cursor->prev == NULL)) return;
cursor_left(db, screenw, uidirtyfrom, uidirtyto);
del(db, uidirtyfrom, uidirtyto);
cursor_left(db, cursorposx, cursorposy, screenw, uidirtyfrom, uidirtyto);
del(db, *cursorposx, *cursorposy, uidirtyfrom, uidirtyto);
}
460,6 → 457,7
const char *fname;
struct file db;
unsigned char screenw = 0, screenh = 0;
unsigned char cursorposx = 0, cursorposy = 0;
unsigned char uidirtyfrom = 0, uidirtyto = 0xff; /* make sure to redraw entire UI at first run */
bzero(&db, sizeof(db));
490,11 → 488,11
for (;;) {
int k;
check_cursor_not_after_eol(&db, &uidirtyfrom, &uidirtyto);
mdr_cout_locate(db.cursorposy, db.cursorposx);
check_cursor_not_after_eol(&db, &cursorposx, &uidirtyfrom, &uidirtyto);
mdr_cout_locate(cursorposy, cursorposx);
if (uidirtyfrom != 0xff) {
ui_refresh(&db, screenw, screenh, uidirtyfrom, uidirtyto);
ui_refresh(&db, screenw, screenh, uidirtyfrom, uidirtyto, cursorposy);
uidirtyfrom = 0xff;
}
501,16 → 499,16
k = keyb_getkey();
if (k == 0x150) { /* down */
cursor_down(&db, screenh, &uidirtyfrom, &uidirtyto);
cursor_down(&db, &cursorposy, screenh, &uidirtyfrom, &uidirtyto);
} else if (k == 0x148) { /* up */
cursor_up(&db, &uidirtyfrom, &uidirtyto);
cursor_up(&db, &cursorposy, &uidirtyfrom, &uidirtyto);
} else if (k == 0x14D) { /* right */
cursor_right(&db, screenw, screenh, &uidirtyfrom, &uidirtyto);
cursor_right(&db, &cursorposx, &cursorposy, screenw, screenh, &uidirtyfrom, &uidirtyto);
} else if (k == 0x14B) { /* left */
cursor_left(&db, screenw, &uidirtyfrom, &uidirtyto);
cursor_left(&db, &cursorposx, &cursorposy, screenw, &uidirtyfrom, &uidirtyto);
} else if (k == 0x149) { /* pgup */
// TODO
519,10 → 517,10
// TODO
} else if (k == 0x147) { /* home */
cursor_home(&db, &uidirtyfrom, &uidirtyto);
cursor_home(&db, &cursorposx, &uidirtyfrom, &uidirtyto);
} else if (k == 0x14F) { /* end */
cursor_eol(&db, screenw, &uidirtyfrom, &uidirtyto);
cursor_eol(&db, &cursorposx, screenw, &uidirtyfrom, &uidirtyto);
} else if (k == 0x1B) { /* ESC */
break;
529,15 → 527,15
} else if (k == 0x0D) { /* ENTER */
/* add a new line */
if (line_add(&db, db.cursor->payload + db.xoffset + db.cursorposx) == 0) {
if (line_add(&db, db.cursor->payload + db.xoffset + cursorposx) == 0) {
/* trim the line above */
db.cursor->prev->len = db.xoffset + db.cursorposx;
db.cursor->prev->len = db.xoffset + cursorposx;
db.cursor->prev->payload[db.cursor->prev->len] = 0;
/* move cursor to the (new) line below */
db.cursorposx = 0;
if (db.cursorposy < screenh - 2) {
uidirtyfrom = db.cursorposy;
db.cursorposy++;
cursorposx = 0;
if (cursorposy < screenh - 2) {
uidirtyfrom = cursorposy;
cursorposy++;
} else {
uidirtyfrom = 0;
}
547,25 → 545,25
}
} else if (k == 0x153) { /* DEL */
del(&db, &uidirtyfrom, &uidirtyto);
del(&db, cursorposx, cursorposy, &uidirtyfrom, &uidirtyto);
} else if (k == 0x008) { /* BKSPC */
bkspc(&db, screenw, &uidirtyfrom, &uidirtyto);
bkspc(&db, &cursorposx, &cursorposy, screenw, &uidirtyfrom, &uidirtyto);
} else if ((k >= 0x20) && (k <= 0xff)) { /* "normal" character */
struct line far *n;
n = _frealloc(db.cursor, sizeof(struct line) + db.cursor->len);
if (n != NULL) {
unsigned short off = db.xoffset + db.cursorposx;
unsigned short off = db.xoffset + cursorposx;
if (n->prev) n->prev->next = n;
if (n->next) n->next->prev = n;
db.cursor = n;
_fmemmove(db.cursor->payload + off + 1, db.cursor->payload + off, db.cursor->len - off + 1);
db.cursor->len += 1;
uidirtyfrom = db.cursorposy;
uidirtyto = db.cursorposy;
uidirtyfrom = cursorposy;
uidirtyto = cursorposy;
db.cursor->payload[off] = k;
cursor_right(&db, screenw, screenh, &uidirtyfrom, &uidirtyto);
cursor_right(&db, &cursorposx, &cursorposy, screenw, screenh, &uidirtyfrom, &uidirtyto);
}
} else if (k == 0x13b) { /* F1 */