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

merged fbuffer.c into fbuffer.h

Browse Source 
simpler code, less files, also added option to show/not show tab
markers
This commit is contained in:
Alessandro Mauri 2019-12-08 14:41:11 +01:00
parent 2d35c0b522
commit eb72d24b5b
5 changed files with 230 additions and 231 deletions

2
Sconstruct.py
View File

@ -5,4 +5,4 @@ env.Append(CCFLAGS=['-O3', '-Wall', '-Wextra', '-pedantic', '-Werror', '-Warray-
env.Append(LIBPATH = ['lib/']) env.Append(LIBPATH = ['lib/'])
env.Append(LIBS = ['ncursesw']) env.Append(LIBS = ['ncursesw'])
env.Program(target='ste', source=['src/ste.c', 'src/fbuffer.c']) env.Program(target='ste', source=['src/ste.c'])

5
src/config.h
View File

@ -1,9 +1,10 @@
#ifndef _CONFIG_H_ #ifndef _EDITOR_CONFIG_H_
#define _CONFIG_H_ #define _EDITOR_CONFIG_H_
#define TABSIZE 4 // Tab size as used in render #define TABSIZE 4 // Tab size as used in render
#define MAX_LINE 1024 // maximum line length on screen #define MAX_LINE 1024 // maximum line length on screen
#define PGK_DELTA 15 // Step of jump #define PGK_DELTA 15 // Step of jump
//#define RENDER_SHOW_TABS
#define KEY_JUMP_UP KEY_PPAGE #define KEY_JUMP_UP KEY_PPAGE
#define KEY_JUMP_DOWN KEY_NPAGE #define KEY_JUMP_DOWN KEY_NPAGE

222
src/fbuffer.c
View File

@ -1,222 +0,0 @@
#include "fbuffer.h"
#include "config.h"
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include <wchar.h>
void bufInit (FileBuffer *b)
{
b->rw = NULL;
b->rownum = 0;
}
/* Add a row to the file buffer */
void rowAddLast (FileBuffer *b, char *s, int len)
{
/* Extend the block of memory containing the lines */
Row *newr = realloc(b->rw, (b->rownum + 1) * sizeof(Row));
//if (newr == NULL) termDie("realloc in rowAddLast");
b->rw = newr;
/* Allocate memory for the line and copy it
* at the current row number */
b->rw[b->rownum].chars = malloc(len + 1);
//if (b->rw[b->rownum].chars == NULL) termDie("malloc in rowAddLast chars");
memcpy(b->rw[b->rownum].chars, s, len);
b->rw[b->rownum].chars[len] = '\0';
b->rw[b->rownum].size = len;
updateRender(&b->rw[b->rownum]);
b->rownum++;
}
void rowAddChar (Row *rw, char c, int pos)
{
/* Check if char is valid */
if (!c || (iscntrl(c) && c != '\t')) return;
/* extend the string */
rw->size++;
char *t = realloc(rw->chars, rw->size + 1);
//if (t == NULL) termDie("realloc in rowAddchar");
rw->chars = t;
/* make space for the new char */
memcpy(&rw->chars[pos + 1], &rw->chars[pos], (rw->size + 1) - (pos + 1));
/* add the new char */
rw->chars[pos] = c;
updateRender(rw);
}
int rowDeleteChar (Row *rw, int select, int pos) // WIP
{
/* Check if the character is valid */
if (rw->chars[pos - 1] == '\0' && pos) return 0;
if (!pos && !select) return 0;
if (rw->chars[pos] == '\0' && select) return 0;
//change pos based on the command
if (!select) pos--;
memcpy(&rw->chars[pos], &rw->chars[pos + 1], rw->size - pos);
char *s = realloc(rw->chars, rw->size);
if (s != NULL) rw->chars = s;
rw->size--;
updateRender(rw);
return 1;
}
void rowAddRow (FileBuffer *b, int pos, int cur) // WIP; TO DOCUMENT
{
/* MOVE THE ROWS AWAY */
/* add another line to the bottom containing the previous
* (last) line, effectively making new space */
rowAddLast(b, b->rw[b->rownum - 1].chars, b->rw[b->rownum - 1].size);
/* copy all other lines until the specified position to the next one */
for (int last = b->rownum - 1; last > pos; last--)
rowCpy(&b->rw[last], &b->rw[last - 1]);
/* SPLIT THE ROW AT POS AND STORE IT */
/* Get the row length at position after the cursor */
int len = b->rw[pos].size - cur;
/* create a dummy row as the new row souce */
Row nex = EROW;
/* allocate a buffer */
char *s = malloc(len + 1);
//if (s == NULL) termDie("malloc in rowAddRow s");
/* copy the contents of the pos row after the cursor into the buffer */
memcpy(s, &b->rw[pos].chars[cur], len);
s[len] = '\0';
/* update the dummy row */
nex.chars = s;
nex.size = strlen(s);
/* MAKE THE SPLIT INTO TWO LINES */
/* shrink the line at pos */
char *p = realloc(b->rw[pos].chars, cur + 1);
//if (p == NULL) termDie("realloc in rowAddRow");
b->rw[pos].chars = p;
/* and terminate it with null like a good boi */
b->rw[pos].chars[cur] = '\0';
/* update info and render */
b->rw[pos].size = cur;
updateRender(&b->rw[pos]);
/* copy the dummy to the new line and free */
rowCpy(&b->rw[pos + 1], &nex);
rowFree(&nex);
}
void rowFree (Row *rw) // WIP
{
/* Free both render and memory strings */
free(rw->render);
free(rw->chars);
/* clear sizes */
rw->size = 0;
rw->r_size = 0;
rw->utf = 0;
}
void rowCpy (Row *to, Row *from) // WIP
{
/* Free the destination row (without destroying it) */
rowFree(to);
/* Allocate space for the new string */
to->chars = (char*) malloc(strlen(from->chars) + 1);
//if (to->chars == NULL) termDie("malloc in rowCpy");
/* And update the size */
to->size = from->size;
/* Then copy the chars from the source row to the destination row */
memcpy(to->chars, from->chars, to->size);
to->chars[to->size] = '\0';
/* Then update the render */
updateRender(to);
}
void rowAppendString (Row *rw, char *s, int len)
{
/* reallocate the row to accomodate for the added string */
char *temp = realloc(rw->chars, rw->size + len + 1);
//if (temp == NULL) termDie("realloc in rowAppendString");
rw->chars = temp;
memcpy(&rw->chars[rw->size], s, len);
rw->size += len;
rw->chars[rw->size] = '\0';
updateRender(rw);
}
void rowDeleteRow (FileBuffer *b, int pos)
{
if (b->rownum == 1) return;
if (pos >= b->rownum) return;
if (pos < 0) return;
for (; pos < b->rownum - 1; pos++) {
rowCpy(&b->rw[pos], &b->rw[pos + 1]); // rowcpy already frees the row
}
b->rownum--;
rowFree(&b->rw[b->rownum]);
Row *temp = realloc(b->rw, sizeof(Row) * b->rownum);
//if (temp == NULL) termDie("realloc in rowDeleteRow");
b->rw = temp;
}
void updateRender (Row *rw)
{
/* count the special characters
* spaces, utf-8 continuation chars */
static int tabs, i, off/*, utf_width, utf_chars*/;
//static wchar_t wc_tmp;
//static char *mb_p;
tabs = 0;
//utf_width = 0;
//utf_chars = 0;
for (i = 0; i < rw->size; i++) {
if (rw->chars[i] == '\t') tabs++;
/*else if (isStart(rw->chars[i])) {
utf_chars++;
wc_tmp = 0;
mb_p = &rw->chars[i];
//int utf_len = mblen(mb_p, rw->size - i);
mbtowc(&wc_tmp, mb_p, rw->size - i);
utf_width += wcwidth(wc_tmp);
//utf_len += utf_chars;
} */
}
rw->render = NULL;
free(rw->render);
/* Render is long as size with the added tab spaces - 1
* (we already count for the \t as a char) */
rw->render = malloc(rw->size + tabs * (TABSIZE - 1) + 1);
//if (rw->render == NULL) termDie ("malloc in updateRender");
/* put all the characters (substituing all special chars)
* into the render buffer */
for (i = 0, off = 0; i < rw->size; i++) {
if (rw->chars[i] == '\t') {
for (int j = 0; j < TABSIZE; j++){
//if (!j) rw->render[off++] = '|';
//else rw->render[off++] = ' ';
rw->render[off++] = ' ';
}
} else {
rw->render[off++] = rw->chars[i];
}
}
rw->render[off] = '\0';
rw->r_size = off;
//rw->utf = utf_width - utf_chars;
}

225
src/fbuffer.h
View File

@ -43,4 +43,229 @@ int isUtf (int c);
int isCont (int c); int isCont (int c);
int isStart (int c); int isStart (int c);
#include "config.h"
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include <wchar.h>
void bufInit (FileBuffer *b)
{
b->rw = NULL;
b->rownum = 0;
}
/* Add a row to the file buffer */
void rowAddLast (FileBuffer *b, char *s, int len)
{
/* Extend the block of memory containing the lines */
Row *newr = realloc(b->rw, (b->rownum + 1) * sizeof(Row));
//if (newr == NULL) termDie("realloc in rowAddLast");
b->rw = newr;
/* Allocate memory for the line and copy it
* at the current row number */
b->rw[b->rownum].chars = malloc(len + 1);
//if (b->rw[b->rownum].chars == NULL) termDie("malloc in rowAddLast chars");
memcpy(b->rw[b->rownum].chars, s, len);
b->rw[b->rownum].chars[len] = '\0';
b->rw[b->rownum].size = len;
updateRender(&b->rw[b->rownum]);
b->rownum++;
}
void rowAddChar (Row *rw, char c, int pos)
{
/* Check if char is valid */
if (!c || (iscntrl(c) && c != '\t')) return;
/* extend the string */
rw->size++;
char *t = realloc(rw->chars, rw->size + 1);
//if (t == NULL) termDie("realloc in rowAddchar");
rw->chars = t;
/* make space for the new char */
memcpy(&rw->chars[pos + 1], &rw->chars[pos], (rw->size + 1) - (pos + 1));
/* add the new char */
rw->chars[pos] = c;
updateRender(rw);
}
int rowDeleteChar (Row *rw, int select, int pos) // WIP
{
/* Check if the character is valid */
if (rw->chars[pos - 1] == '\0' && pos) return 0;
if (!pos && !select) return 0;
if (rw->chars[pos] == '\0' && select) return 0;
//change pos based on the command
if (!select) pos--;
memcpy(&rw->chars[pos], &rw->chars[pos + 1], rw->size - pos);
char *s = realloc(rw->chars, rw->size);
if (s != NULL) rw->chars = s;
rw->size--;
updateRender(rw);
return 1;
}
void rowAddRow (FileBuffer *b, int pos, int cur) // WIP; TO DOCUMENT
{
/* MOVE THE ROWS AWAY */
/* add another line to the bottom containing the previous
* (last) line, effectively making new space */
rowAddLast(b, b->rw[b->rownum - 1].chars, b->rw[b->rownum - 1].size);
/* copy all other lines until the specified position to the next one */
for (int last = b->rownum - 1; last > pos; last--)
rowCpy(&b->rw[last], &b->rw[last - 1]);
/* SPLIT THE ROW AT POS AND STORE IT */
/* Get the row length at position after the cursor */
int len = b->rw[pos].size - cur;
/* create a dummy row as the new row souce */
Row nex = EROW;
/* allocate a buffer */
char *s = malloc(len + 1);
//if (s == NULL) termDie("malloc in rowAddRow s");
/* copy the contents of the pos row after the cursor into the buffer */
memcpy(s, &b->rw[pos].chars[cur], len);
s[len] = '\0';
/* update the dummy row */
nex.chars = s;
nex.size = strlen(s);
/* MAKE THE SPLIT INTO TWO LINES */
/* shrink the line at pos */
char *p = realloc(b->rw[pos].chars, cur + 1);
//if (p == NULL) termDie("realloc in rowAddRow");
b->rw[pos].chars = p;
/* and terminate it with null like a good boi */
b->rw[pos].chars[cur] = '\0';
/* update info and render */
b->rw[pos].size = cur;
updateRender(&b->rw[pos]);
/* copy the dummy to the new line and free */
rowCpy(&b->rw[pos + 1], &nex);
rowFree(&nex);
}
void rowFree (Row *rw) // WIP
{
/* Free both render and memory strings */
free(rw->render);
free(rw->chars);
/* clear sizes */
rw->size = 0;
rw->r_size = 0;
rw->utf = 0;
}
void rowCpy (Row *to, Row *from) // WIP
{
/* Free the destination row (without destroying it) */
rowFree(to);
/* Allocate space for the new string */
to->chars = (char*) malloc(strlen(from->chars) + 1);
//if (to->chars == NULL) termDie("malloc in rowCpy");
/* And update the size */
to->size = from->size;
/* Then copy the chars from the source row to the destination row */
memcpy(to->chars, from->chars, to->size);
to->chars[to->size] = '\0';
/* Then update the render */
updateRender(to);
}
void rowAppendString (Row *rw, char *s, int len)
{
/* reallocate the row to accomodate for the added string */
char *temp = realloc(rw->chars, rw->size + len + 1);
//if (temp == NULL) termDie("realloc in rowAppendString");
rw->chars = temp;
memcpy(&rw->chars[rw->size], s, len);
rw->size += len;
rw->chars[rw->size] = '\0';
updateRender(rw);
}
void rowDeleteRow (FileBuffer *b, int pos)
{
if (b->rownum == 1) return;
if (pos >= b->rownum) return;
if (pos < 0) return;
for (; pos < b->rownum - 1; pos++) {
rowCpy(&b->rw[pos], &b->rw[pos + 1]); // rowcpy already frees the row
}
b->rownum--;
rowFree(&b->rw[b->rownum]);
Row *temp = realloc(b->rw, sizeof(Row) * b->rownum);
//if (temp == NULL) termDie("realloc in rowDeleteRow");
b->rw = temp;
}
void updateRender (Row *rw)
{
/* count the special characters
* spaces, utf-8 continuation chars */
static int tabs, i, off/*, utf_width, utf_chars*/;
//static wchar_t wc_tmp;
//static char *mb_p;
tabs = 0;
//utf_width = 0;
//utf_chars = 0;
for (i = 0; i < rw->size; i++) {
if (rw->chars[i] == '\t') tabs++;
/*else if (isStart(rw->chars[i])) {
utf_chars++;
wc_tmp = 0;
mb_p = &rw->chars[i];
//int utf_len = mblen(mb_p, rw->size - i);
mbtowc(&wc_tmp, mb_p, rw->size - i);
utf_width += wcwidth(wc_tmp);
//utf_len += utf_chars;
} */
}
rw->render = NULL;
free(rw->render);
/* Render is long as size with the added tab spaces - 1
* (we already count for the \t as a char) */
rw->render = malloc(rw->size + tabs * (TABSIZE - 1) + 1);
//if (rw->render == NULL) termDie ("malloc in updateRender");
/* put all the characters (substituing all special chars)
* into the render buffer */
for (i = 0, off = 0; i < rw->size; i++) {
if (rw->chars[i] == '\t') {
for (int j = 0; j < TABSIZE; j++){
#ifdef RENDER_SHOW_TABS
if (!j) rw->render[off++] = '|';
else rw->render[off++] = ' ';
#else
rw->render[off++] = ' ';
#endif
}
} else {
rw->render[off++] = rw->chars[i];
}
}
rw->render[off] = '\0';
rw->r_size = off;
//rw->utf = utf_width - utf_chars;
}
#endif #endif

7
src/ste.c
View File

@ -62,11 +62,6 @@ struct term {
FileBuffer rows; FileBuffer rows;
const char *msg[] = {
"Find: ",
"Nigger"
};
/* Prototypes */ /* Prototypes */
/* draw operations */ /* draw operations */
static void drawBar (char *s); static void drawBar (char *s);
@ -125,8 +120,8 @@ int main (int argc, char *argv[])
snprintf(t.statusbar, STAT_SIZE, "%s %d lines %dx%d", argv[1], rows.rownum, t.dim.y, t.dim.x); snprintf(t.statusbar, STAT_SIZE, "%s %d lines %dx%d", argv[1], rows.rownum, t.dim.y, t.dim.x);
/* Main event loop */ /* Main event loop */
static int c;
while (1) { while (1) {
static int c;
updateInfo(); updateInfo();
/* Redraw the screen */ /* Redraw the screen */
drawScreen(); drawScreen();