alema/ste
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

solved bug f75a58f

Browse Source
This commit is contained in:
ElectricAlchemist 2019-10-30 23:11:28 +01:00
parent 70acc3bd6b
commit a7af9d8581
4 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -1 +1,5 @@
ste ste
dbg
hello
ste.c.*
*.bak

9
Makefile
View File

@ -1,8 +1,15 @@
CC=gcc CC=gcc
CFLAGS=-Wall -Wextra -pedantic -Werror CFLAGS=-Wall -Wextra -pedantic -Werror -Warray-bounds
OFLAGS=-O3 OFLAGS=-O3
LFLAGS=-lncursesw LFLAGS=-lncursesw
#-ltcmalloc #-ltcmalloc
DFLAGS=-g -O0 -v -da -Q
ste: ste.c ste: ste.c
$(CC) $(CFLAGS) $(OFLAGS) $(LFLAGS) -o ste $^ $(CC) $(CFLAGS) $(OFLAGS) $(LFLAGS) -o ste $^
dbg: ste.c
$(CC) $(CFLAGS) $(DFLAGS) $(LFLAGS) -o dbg $^
clean:
rm ste ste.c.* dbg

BIN
ste
View File

Binary file not shown.

18
ste.c
View File

@ -18,8 +18,8 @@ struct term {
struct { struct {
int x; int x;
int y; int y;
int off_x; unsigned int off_x;
int off_y; unsigned int off_y;
int r_x; int r_x;
int r_y; int r_y;
int xx; int xx;
@ -42,7 +42,7 @@ struct term {
typedef struct row { typedef struct row {
int size; int size;
char *chars; char *chars;
int r_size; unsigned int r_size;
char *render; char *render;
int delta; int delta;
} row; } row;
@ -249,12 +249,12 @@ void drawScreen ()
/* Draw all the appropriate lines (following cursor) to the screen */ /* Draw all the appropriate lines (following cursor) to the screen */
void drawLines (void) void drawLines (void)
{ {
static int line = 0, ln, i; static int ln, i;
/* move to the beginning of the screen */ /* move to the beginning of the screen */
//lnMove(0, 0); //lnMove(0, 0);
for (i = 0; i < t.dim.y; i++) { for (i = 0, ln = 0; i < t.dim.y; i++) {
if (i >= rows.rownum) break; if (i >= rows.rownum - 1) break;
ln = i + t.cur.off_y; ln = i + t.cur.off_y;
/* Draw the line number */ /* Draw the line number */
@ -272,7 +272,7 @@ void drawLines (void)
//attroff(COLOR_PAIR(2)); //attroff(COLOR_PAIR(2));
lnMove(++line, 0); lnMove(i + 1, 0);
} }
lnMove(t.cur.y, t.cur.x); lnMove(t.cur.y, t.cur.x);
} }
@ -576,7 +576,7 @@ void rowAddRow (int pos) // WIP; TO DOCUMENT
char *s = NULL; char *s = NULL;
// Move away other lines // Move away other lines
//copy old last line to new space //copy old last line to new space
rowAddLast(rows.rw[rows.rownum].chars, rows.rw[rows.rownum].size); rowAddLast(rows.rw[rows.rownum - 1].chars, rows.rw[rows.rownum - 1].size);
for (int last = rows.rownum - 1; last > pos; last--) { for (int last = rows.rownum - 1; last > pos; last--) {
rowCpy(&rows.rw[last], &rows.rw[last - 1]); rowCpy(&rows.rw[last], &rows.rw[last - 1]);
@ -635,7 +635,7 @@ void updateInfo (void)
{ {
getmaxyx(stdscr, t.dim.y, t.dim.x); getmaxyx(stdscr, t.dim.y, t.dim.x);
t.dim.y -= 1; t.dim.y -= 1;
t.pad = decimalSize(rows.rownum); t.pad = decimalSize(rows.rownum - 1);
t.dim.x -= t.pad + 1; t.dim.x -= t.pad + 1;
} }