diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d8baefb --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +cmake-* diff --git a/kilo.c b/kilo.c index bac1d09..1e7400b 100644 --- a/kilo.c +++ b/kilo.c @@ -15,6 +15,7 @@ /*** data ***/ struct editorConfig { + int cx, cy; int screenrows; int screencols; struct termios orig_termios; @@ -22,7 +23,7 @@ struct editorConfig { struct editorConfig E; /*** terminal ***/ -void die(const char *s){ +void die(const char *s) { write(STDOUT_FILENO, "\x1b[2J", 4); write(STDOUT_FILENO, "\x1b[H", 3); @@ -31,13 +32,13 @@ void die(const char *s){ } void disableRawMode() { - if(tcsetattr(STDIN_FILENO, TCSAFLUSH, &E.orig_termios) == -1){ + if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &E.orig_termios) == -1) { die("tcsetattr"); } } void enableRawMode() { - if(tcgetattr(STDIN_FILENO, &E.orig_termios) == -1) die("tcgetattr"); + if (tcgetattr(STDIN_FILENO, &E.orig_termios) == -1) die("tcgetattr"); atexit(disableRawMode); @@ -54,7 +55,7 @@ void enableRawMode() { char editorReadKey() { int nread; 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"); } return c; @@ -65,21 +66,21 @@ int getCursorPosition(int *rows, int *cols) { unsigned int i = 0; 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 (buf[i] == 'R') break; i++; } buf[i] = '\0'; //assign null to final byte - if(buf[0] != '\x1b' || buf[1] != '[') return -1; - if(sscanf(&buf[2], "%d;%d", rows, cols) != 2) return -1; + if (buf[0] != '\x1b' || buf[1] != '[') return -1; + if (sscanf(&buf[2], "%d;%d", rows, cols) != 2) return -1; return 0; } int getWindowSize(int *rows, int *cols) { struct winsize ws; 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); } else { *cols = ws.ws_col; @@ -87,12 +88,14 @@ int getWindowSize(int *rows, int *cols) { return 0; } } + /*** append buffer ***/ struct abuf { char *b; int len; }; #define ABUF_INIT {NULL, 0} + void abAppend(struct abuf *ab, const char *s, int 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->len += len; } + void abFree(struct abuf *ab) { free(ab->b); } @@ -109,33 +113,34 @@ void abFree(struct abuf *ab) { /*** output ***/ void editorDrawRows(struct abuf *ab) { int y; - for (y = 0; y < E.screenrows; y++){ + for (y = 0; y < E.screenrows; y++) { if (y == E.screenrows / 3) { char welcome[80]; int welcomelen = snprintf(welcome, sizeof welcome, "Kilo Editor -- version %s", KILO_VERSION); - int padding = (E.screencols - welcomelen) /2; - if(padding) { + int padding = (E.screencols - welcomelen) / 2; + if (padding) { abAppend(ab, "~", 1); padding--; } - while(padding--) abAppend(ab, " ", 1); + while (padding--) abAppend(ab, " ", 1); if (welcomelen > E.screencols) welcomelen = E.screencols; abAppend(ab, welcome, welcomelen); } else { abAppend(ab, "~", 1); } abAppend(ab, "\x1b[K", 3); - if (y