gitignore, reformat

This commit is contained in:
Tyrel Souza 2021-10-20 23:14:49 -04:00
parent 5332dd8809
commit d9d2fc4a36
2 changed files with 26 additions and 17 deletions

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
cmake-*

42
kilo.c
View File

@ -15,6 +15,7 @@
/*** data ***/ /*** data ***/
struct editorConfig { struct editorConfig {
int cx, cy;
int screenrows; int screenrows;
int screencols; int screencols;
struct termios orig_termios; struct termios orig_termios;
@ -22,7 +23,7 @@ struct editorConfig {
struct editorConfig E; struct editorConfig E;
/*** terminal ***/ /*** terminal ***/
void die(const char *s){ void die(const char *s) {
write(STDOUT_FILENO, "\x1b[2J", 4); write(STDOUT_FILENO, "\x1b[2J", 4);
write(STDOUT_FILENO, "\x1b[H", 3); write(STDOUT_FILENO, "\x1b[H", 3);
@ -31,13 +32,13 @@ void die(const char *s){
} }
void disableRawMode() { void disableRawMode() {
if(tcsetattr(STDIN_FILENO, TCSAFLUSH, &E.orig_termios) == -1){ if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &E.orig_termios) == -1) {
die("tcsetattr"); die("tcsetattr");
} }
} }
void enableRawMode() { void enableRawMode() {
if(tcgetattr(STDIN_FILENO, &E.orig_termios) == -1) die("tcgetattr"); if (tcgetattr(STDIN_FILENO, &E.orig_termios) == -1) die("tcgetattr");
atexit(disableRawMode); atexit(disableRawMode);
@ -54,7 +55,7 @@ void enableRawMode() {
char editorReadKey() { char editorReadKey() {
int nread; int nread;
char c; char c;
while ((nread = read(STDIN_FILENO, &c, 1)) != 1){ while ((nread = read(STDIN_FILENO, &c, 1)) != 1) {
if (nread == -1 && errno != EAGAIN) die("read"); if (nread == -1 && errno != EAGAIN) die("read");
} }
return c; return c;
@ -65,21 +66,21 @@ int getCursorPosition(int *rows, int *cols) {
unsigned int i = 0; unsigned int i = 0;
if (write(STDOUT_FILENO, "\x1b[6n", 4) != 4) return -1; if (write(STDOUT_FILENO, "\x1b[6n", 4) != 4) return -1;
while(i < sizeof(buf) -1) { while (i < sizeof(buf) - 1) {
if (read(STDIN_FILENO, &buf[i], 1) != 1) break; if (read(STDIN_FILENO, &buf[i], 1) != 1) break;
if (buf[i] == 'R') break; if (buf[i] == 'R') break;
i++; i++;
} }
buf[i] = '\0'; //assign null to final byte buf[i] = '\0'; //assign null to final byte
if(buf[0] != '\x1b' || buf[1] != '[') return -1; if (buf[0] != '\x1b' || buf[1] != '[') return -1;
if(sscanf(&buf[2], "%d;%d", rows, cols) != 2) return -1; if (sscanf(&buf[2], "%d;%d", rows, cols) != 2) return -1;
return 0; return 0;
} }
int getWindowSize(int *rows, int *cols) { int getWindowSize(int *rows, int *cols) {
struct winsize ws; struct winsize ws;
if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) == -1 || ws.ws_col == 0) { if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) == -1 || ws.ws_col == 0) {
if (write(STDOUT_FILENO, "\x1b[999C\x1b[999B",12) != 12) return -1; if (write(STDOUT_FILENO, "\x1b[999C\x1b[999B", 12) != 12) return -1;
return getCursorPosition(rows, cols); return getCursorPosition(rows, cols);
} else { } else {
*cols = ws.ws_col; *cols = ws.ws_col;
@ -87,12 +88,14 @@ int getWindowSize(int *rows, int *cols) {
return 0; return 0;
} }
} }
/*** append buffer ***/ /*** append buffer ***/
struct abuf { struct abuf {
char *b; char *b;
int len; int len;
}; };
#define ABUF_INIT {NULL, 0} #define ABUF_INIT {NULL, 0}
void abAppend(struct abuf *ab, const char *s, int len) { void abAppend(struct abuf *ab, const char *s, int len) {
char *new = realloc(ab->b, ab->len + len); char *new = realloc(ab->b, ab->len + len);
@ -101,6 +104,7 @@ void abAppend(struct abuf *ab, const char *s, int len) {
ab->b = new; ab->b = new;
ab->len += len; ab->len += len;
} }
void abFree(struct abuf *ab) { void abFree(struct abuf *ab) {
free(ab->b); free(ab->b);
} }
@ -109,33 +113,34 @@ void abFree(struct abuf *ab) {
/*** output ***/ /*** output ***/
void editorDrawRows(struct abuf *ab) { void editorDrawRows(struct abuf *ab) {
int y; int y;
for (y = 0; y < E.screenrows; y++){ for (y = 0; y < E.screenrows; y++) {
if (y == E.screenrows / 3) { if (y == E.screenrows / 3) {
char welcome[80]; char welcome[80];
int welcomelen = snprintf(welcome, sizeof welcome, "Kilo Editor -- version %s", KILO_VERSION); int welcomelen = snprintf(welcome, sizeof welcome, "Kilo Editor -- version %s", KILO_VERSION);
int padding = (E.screencols - welcomelen) /2; int padding = (E.screencols - welcomelen) / 2;
if(padding) { if (padding) {
abAppend(ab, "~", 1); abAppend(ab, "~", 1);
padding--; padding--;
} }
while(padding--) abAppend(ab, " ", 1); while (padding--) abAppend(ab, " ", 1);
if (welcomelen > E.screencols) welcomelen = E.screencols; if (welcomelen > E.screencols) welcomelen = E.screencols;
abAppend(ab, welcome, welcomelen); abAppend(ab, welcome, welcomelen);
} else { } else {
abAppend(ab, "~", 1); abAppend(ab, "~", 1);
} }
abAppend(ab, "\x1b[K", 3); abAppend(ab, "\x1b[K", 3);
if (y<E.screenrows -1) { if (y < E.screenrows - 1) {
abAppend(ab, "\r\n", 2); abAppend(ab, "\r\n", 2);
} }
} }
} }
void editorRefreshScreen() { void editorRefreshScreen() {
struct abuf ab = ABUF_INIT; struct abuf ab = ABUF_INIT;
abAppend(&ab, "\x1b[?25l", 6); abAppend(&ab, "\x1b[?25l", 6);
abAppend(&ab, "\x1b[H",3); // Cursor Position home abAppend(&ab, "\x1b[H", 3); // Cursor Position home
editorDrawRows(&ab); editorDrawRows(&ab);
abAppend(&ab, "\x1b[H",3); // Cursor Position home abAppend(&ab, "\x1b[H", 3); // Cursor Position home
abAppend(&ab, "\x1b[?25h", 6); abAppend(&ab, "\x1b[?25h", 6);
write(STDOUT_FILENO, ab.b, ab.len); write(STDOUT_FILENO, ab.b, ab.len);
@ -157,13 +162,16 @@ void editorProcessKeypress() {
/*** init ***/ /*** init ***/
void initEditor() { void initEditor() {
if (getWindowSize(&E.screenrows, &E.screencols) == -1) die("getWindowSize"); E.cx = 0;
E.cy = 0;
if (getWindowSize(&E.screenrows, &E.screencols) == -1) die("getWindowSize");
} }
int main() { int main() {
enableRawMode(); enableRawMode();
initEditor(); initEditor();
while(1) { while (1) {
editorRefreshScreen(); editorRefreshScreen();
editorProcessKeypress(); editorProcessKeypress();
} }