hadeed/kilo
Archived
1
Fork 0
Code Activity

Some refactors

Browse source
This commit is contained in:
Hadeed 2023-08-26 23:00:18 +05:00
parent 6664dd67e9
commit 9f365822af
1 changed files with 78 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

132
kilo.c
View file

@ -15,30 +15,31 @@
#define CTRL_KEY(key) ((key) & 0x1f) #define CTRL_KEY(key) ((key) & 0x1f)
#define MAX(a, b) (((a)>(b))?(a):(b)) #define MAX(a,b) (((a)>(b))?(a):(b))
#define MIN(a, b) (((a)<(b))?(a):(b)) #define MIN(a,b) (((a)<(b))?(a):(b))
/*****************************************************************************/ /*****************************************************************************/
struct screen_buf; struct render_buf;
struct input_buf; struct input_buf;
struct erow { struct EROW {
int size;
char *s; char *s;
int size;
}; };
struct { struct {
int cx, cy; int cx, cy;
int screenrows, screencols; int screenrows, screencols;
int row_off, col_off; int row_off, col_off;
bool running;
struct erow *rows; struct EROW *rows;
int n_rows; int n_rows;
struct termios orig_termios; struct render_buf *rb;
struct input_buf *ib; struct input_buf *ib;
bool running; struct termios orig_termios;
} E; } E;
enum KEYS { enum KEYS {
@ -62,14 +63,15 @@ void editor_init();
void editor_open(char *); void editor_open(char *);
void editor_append_row(const char *, int); void editor_append_row(const char *, int);
void editor_redraw_screen(); void editor_redraw_screen();
void editor_draw_rows(struct screen_buf *); void editor_draw_rows();
void editor_process_key(); void editor_process_key();
void editor_free(); void editor_free();
struct screen_buf *sb_init(); struct render_buf *rb_init();
void sb_append(struct screen_buf *, const char *, int); void rb_append(struct render_buf *, const char *, int);
void sb_write(struct screen_buf *); void rb_write(struct render_buf *);
void sb_free(struct screen_buf *); void rb_clear(struct render_buf *);
void rb_free(struct render_buf *);
struct input_buf *ib_init(int); struct input_buf *ib_init(int);
KEY ib_read(struct input_buf *); KEY ib_read(struct input_buf *);
@ -86,7 +88,6 @@ int term_get_cursor_pos(int *, int *);
int term_set_cursor_pos(int, int); int term_set_cursor_pos(int, int);
KEY term_read_key(); KEY term_read_key();
void die(const char *); void die(const char *);
/*****************************************************************************/ /*****************************************************************************/
@ -115,14 +116,15 @@ void editor_init() {
} }
if (term_enable_raw() == -1) die("term_enable_raw"); if (term_enable_raw() == -1) die("term_enable_raw");
if (term_get_win_size(&E.screenrows, &E.screencols) == -1)
die("term_get_win_size");
E.cx = E.cy = 0; E.cx = E.cy = 0;
if (term_get_win_size(&E.screenrows, &E.screencols) == -1) die("term_get_win_size");
E.row_off = E.col_off = 0; E.row_off = E.col_off = 0;
E.n_rows = 0; E.n_rows = 0;
E.running = true; E.running = true;
E.rb = rb_init();
E.ib = ib_init(128); E.ib = ib_init(128);
} }
@ -139,7 +141,6 @@ void editor_open(char *filename) {
linelen--; linelen--;
editor_append_row(line, linelen); editor_append_row(line, linelen);
} }
free(line); free(line);
@ -147,7 +148,7 @@ void editor_open(char *filename) {
} }
void editor_append_row(const char *s, int len) { void editor_append_row(const char *s, int len) {
E.rows = realloc(E.rows, sizeof(struct erow) * (E.n_rows + 1)); E.rows = realloc(E.rows, sizeof(struct EROW) * (E.n_rows + 1));
E.rows[E.n_rows].s = malloc(len); E.rows[E.n_rows].s = malloc(len);
memcpy(E.rows[E.n_rows].s, s, len); memcpy(E.rows[E.n_rows].s, s, len);
@ -158,39 +159,49 @@ void editor_append_row(const char *s, int len) {
void editor_redraw_screen() { void editor_redraw_screen() {
if (term_cursor_hidden(true) == -1) die("term_cursor_hidden"); if (term_cursor_hidden(true) == -1) die("term_cursor_hidden");
struct screen_buf *sb = sb_init(); editor_draw_rows(E.rb);
editor_draw_rows(sb); rb_write(E.rb);
sb_write(sb); rb_clear(E.rb);
sb_free(sb);
if (term_set_cursor_pos(E.cy - E.row_off + 1, E.cx + 1) == -1) die("term_set_cursor_pos"); int row_pos = E.cy - E.row_off + 1;
if (term_cursor_hidden(false) == -1) die("term_cursor_hidden"); int col_pos = E.cx - E.col_off + 1;
if (term_set_cursor_pos(row_pos, col_pos) == -1)
die("term_set_cursor_pos");
if (term_cursor_hidden(false) == -1)
die("term_cursor_hidden");
} }
void editor_draw_rows(struct screen_buf *sb) { void editor_draw_rows() {
term_set_cursor_pos(1, 1); term_set_cursor_pos(1, 1);
for (int y = 0; y < E.screenrows; y++) { for (int y = 0; y < E.screenrows; y++) {
if (y < E.screenrows && y+E.row_off < E.n_rows) { bool in_file = y < E.n_rows - E.row_off;
sb_append(sb, E.rows[y+E.row_off].s, MIN(E.rows[y+E.row_off].size, E.screencols)); bool no_file = E.n_rows == 0;
} else if (E.n_rows == 0 && y == E.screenrows / 2) {
if (in_file) {
struct EROW curr_row = E.rows[y + E.row_off];
int max_len = MAX(curr_row.size, E.screencols);
rb_append(E.rb, curr_row.s, max_len);
} else if (no_file && y == E.screenrows / 2) {
char welcome[64]; char welcome[64];
int len = snprintf(welcome, sizeof(welcome), "Welcome to kilo! -- v%s", KILO_VERSION); int len = snprintf(welcome, sizeof(welcome),
"Welcome to kilo! -- v%s", KILO_VERSION);
int padding = (E.screencols - len) / 2; int padding = (E.screencols - len) / 2;
if (padding--) for (int i = 0; i < padding; i++)
sb_append(sb, "~", 1); rb_append(E.rb, (i == 0 ? "~" : " "), 1);
while (padding-- > 0) sb_append(sb, " ", 1);
sb_append(sb, welcome, len); rb_append(E.rb, welcome, len);
} else sb_append(sb, "~", 1); } else rb_append(E.rb, "~", 1);
sb_append(sb, "\x1b[K", 3); // Clear rest of the line rb_append(E.rb, "\x1b[K", 3); // Delete line to right of cursor
if (y < E.screenrows - 1) sb_append(sb, "\r\n", 2); if (y < E.screenrows - 1)
rb_append(E.rb, "\r\n", 2);
} }
} }
void editor_process_key() { void editor_process_key() {
KEY c = ib_read(E.ib); KEY c = ib_read(E.ib);
@ -236,34 +247,47 @@ void editor_free() {
/*****************************************************************************/ /*****************************************************************************/
struct screen_buf { struct render_buf {
int size;
char *s; char *s;
int size;
int capacity;
}; };
struct screen_buf *sb_init() { struct render_buf *rb_init() {
struct screen_buf *sb = (struct screen_buf *) malloc(sizeof(struct screen_buf)); size_t buf_size = sizeof(struct render_buf);
struct render_buf *rb = (struct render_buf *) malloc(buf_size);
sb->s = NULL; rb->s = NULL;
sb->size = 0; rb->size = 0;
rb->capacity = 0;
return sb; return rb;
} }
void sb_append(struct screen_buf *sb, const char *s, int size) { void rb_append(struct render_buf *rb, const char *s, int size) {
sb->s = realloc(sb->s, sb->size + size); if (rb->size + size > rb->capacity) {
memcpy(sb->s + sb->size, s, size); rb->s = realloc(rb->s, rb->size + size);
rb->capacity = rb->size + size;
}
sb->size += size; memcpy(rb->s + rb->size, s, size);
rb->size += size;
} }
void sb_write(struct screen_buf *sb) { void rb_write(struct render_buf *rb) {
write(STDOUT_FILENO, sb->s, sb->size); write(STDOUT_FILENO, rb->s, rb->size);
} }
void sb_free(struct screen_buf *sb) { void rb_clear(struct render_buf *rb) {
free(sb->s); rb->capacity = rb->size;
free(sb); rb->s = realloc(rb->s, rb->capacity);
rb->size = 0;
}
void rb_free(struct render_buf *rb) {
free(rb->s);
free(rb);
} }