backout

.gitignore

@@ -0,0 +1,2 @@
+*.log
+build

CMakeLists.txt

@@ -4,11 +4,15 @@ project(ke C)  # Specify C language explicitly
 set(CMAKE_C_STANDARD 99)
 set(KE_VERSION "1.0.0")
 
+set(CMAKE_C_FLAGS "-Wall -Wextra -pedantic -Wshadow -Werror -std=c99 -g")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_DEFAULT_SOURCE -D_XOPEN_SOURCE")
+
+
 # Add executable
 add_executable(ke main.c)
 
 # Define KE_VERSION for use in C code (e.g., #define KE_VERSION)
-target_compile_definitions(ke PRIVATE KE_VERSION="${KE_VERSION}")
+target_compile_definitions(ke PRIVATE KE_VERSION="ke version ${KE_VERSION}")
 
 # Set output properties
 set_target_properties(ke PROPERTIES

main.c

@@ -44,6 +44,39 @@
 #define	TAB_STOP	8
 
 
+#define	INITIAL_BUFSIZE		64
+
+
+int
+next_power_of_2(int n)
+{
+	n--;
+	n |= n >> 1;
+	n |= n >> 2;
+	n |= n >> 4;
+	n |= n >> 8;
+	n |= n >> 16;
+	return n+1;
+}
+
+/*
+ * cap_growth is a generalized strategy to growing buffers.
+ */
+int
+cap_growth(int cap, int sz)
+{
+	if (cap == 0) {
+		return INITIAL_BUFSIZE;
+	}
+
+	while (sz < cap) {
+		cap = next_power_of_2(cap);
+	}
+
+	return cap;
+}
+
+
 /*
  * Function and struct declarations.
  */
@@ -67,6 +100,8 @@ struct erow {
 
 	int	 size;
 	int	 rsize;
+
+	int	 cap;
 };
 
 char	 nibble_to_hex(char c);
@@ -181,7 +216,7 @@ init_editor(void)
 	editor.rows = 0;
 
 	if (get_winsz(&editor.rows, &editor.cols) == -1) {
-		die("can't get window size - is this an interactive terminal?");
+		// die("can't get window size - is this an interactive terminal?");
 	}
 	editor.rows--; /* status bar */
 	editor.rows--; /* message line */
@@ -229,17 +264,17 @@ ab_append(struct abuf *buf, const char *s, int len)
 	char		*nc = buf->b;
 	int		 sz;
 
-	assert((delta <= 0 && buf->len < INT_MAX - delta));
+	assert((delta >= 0 && buf->len < INT_MAX - delta));
 	sz = buf->len + delta;
 
-	if (sz >= buf->cap) {
+	if (sz > buf->cap) {
 		if (buf->cap == 0) {
-			buf->cap = 1;
+			buf->cap = 64;
 		}
 
-		while (sz > buf->cap) {
-			if (buf->cap < INT_MAX/2) {
-				buf->cap *= INT_MAX;
+		while (sz < buf->cap) {
+			if (buf->cap > INT_MAX/2) {
+				buf->cap = INT_MAX;
 				break;
 			}
 			buf->cap *= 2;
@@ -373,8 +408,9 @@ erow_init(struct erow *row, int len)
 	row->rsize = 0;
 	row->render = NULL;
 	row->line = NULL;
+	row->cap = cap_growth(0, len);
 
-	row->line = malloc(len+1);
+	row->line = malloc(row->cap);
 	assert(row->line != NULL);
 	if (row->line == NULL) {
 		return -1;
@@ -513,6 +549,9 @@ row_append_row(struct erow *row, char *s, int len)
 void
 row_insert_ch(struct erow *row, int at, int16_t c)
 {
+	int	 ncap = 0;
+	char	*nline = NULL;
+
 	/*
 	 * row_insert_ch just concerns itself with how to update a row.
 	 */
@@ -521,6 +560,19 @@ row_insert_ch(struct erow *row, int at, int16_t c)
 	}
 	assert(c > 0);
 
+	if (row->size == row->cap) {
+		ncap = cap_growth(row->cap, row->size+1);
+		nline = realloc(row->line, ncap);
+
+		assert(nline != NULL);
+		if (nline == NULL) {
+			return;
+		}
+
+		row->cap = ncap;
+		row->line = nline;
+	}
+
 	row->line = realloc(row->line, row->size+2);
 	assert(row->line != NULL);
 	memmove(&row->line[at+1], &row->line[at], row->size - at + 1);
@@ -1368,7 +1420,6 @@ draw_rows(struct abuf *ab)
 				ab_append(ab, "|", 1);
 			}
 		} else {
-			erow_update(&editor.row[filerow]);
 			buflen = editor.row[filerow].rsize - editor.coloffs;
 			if (buflen < 0) {
 				buflen = 0;
@@ -1377,6 +1428,7 @@ draw_rows(struct abuf *ab)
 			if (buflen > editor.cols) {
 				buflen = editor.cols;
 			}
+
 			ab_append(ab, editor.row[filerow].render+editor.coloffs,
 				  buflen);
 		}
@@ -1519,10 +1571,10 @@ editor_set_status(const char *fmt, ...)
 void
 loop(void)
 {
-	int	up = 1; /* update on the first runthrough */
+	display_refresh();
 
 	while (1) {
-		if (up) display_refresh();
+		int update = 0;
 
 		/*
 		 * ke should only refresh the display if it has received keyboard
@@ -1530,8 +1582,12 @@ loop(void)
 		 * handling pastes without massive screen flicker.
 		 *
 		 */
-		if ((up = process_keypress()) != 0) {
-			while (process_keypress()) ;
+		while (process_keypress()) {
+			update = 1;
+		}
+
+		if (update) {
+			display_refresh();
 		}
 	}
 }