diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | buffer.c | 21 | ||||
| -rw-r--r-- | buffer.h | 14 | ||||
| -rw-r--r-- | editor.c | 16 | ||||
| -rw-r--r-- | editor.h | 6 | ||||
| -rw-r--r-- | textbuf.c | 32 | ||||
| -rw-r--r-- | textbuf.h | 22 | ||||
| -rw-r--r-- | window.c | 6 |
8 files changed, 69 insertions, 50 deletions
@@ -3,7 +3,6 @@ LFLAGS=-lSDL2 -lz OUT=glypher OBJS=main.o \ - buffer.o \ editor.o \ error.o \ file.o \ @@ -11,6 +10,7 @@ OBJS=main.o \ input.o \ line.o \ syntax.o \ + textbuf.o \ window.o DESTDIR=/usr/local diff --git a/buffer.c b/buffer.c deleted file mode 100644 index 596d5d2..0000000 --- a/buffer.c +++ /dev/null @@ -1,21 +0,0 @@ -#include "buffer.h" - -#include <stdlib.h> -#include <string.h> - -void ab_append(struct append_buffer* ab, const char* string, int length) -{ - char* new = realloc(ab->buffer, ab->length + length); - - if (new == NULL) - return; - - memcpy(&new[ab->length], string, length); - ab->buffer = new; - ab->length += length; -} - -void ab_free(struct append_buffer* ab) -{ - free(ab->buffer); -} diff --git a/buffer.h b/buffer.h deleted file mode 100644 index 7761f6c..0000000 --- a/buffer.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef _BUFFER_H -#define _BUFFER_H - -struct append_buffer { - char* buffer; - int length; -}; - -#define ABUF_INIT { NULL, 0 } - -void ab_append(struct append_buffer* ab, const char* string, int length); -void ab_free(struct append_buffer* ab); - -#endif @@ -260,7 +260,7 @@ void editor_update_screen_size(struct editor_state *editor) editor->screen_rows -= 2; } -void editor_draw_status_bar(struct editor_state* editor, struct append_buffer* buffer) +void editor_draw_status_bar(struct editor_state* editor, struct textbuf *buffer) { char status[80], right_status[80]; int length = snprintf(status, sizeof(status), "%.20s - %d lines %s", editor->filename ? editor->filename : "[New File]", editor->num_lines, editor->dirty ? "(modified)" : ""); @@ -269,24 +269,24 @@ void editor_draw_status_bar(struct editor_state* editor, struct append_buffer* b if (length > editor->screen_cols) length = editor->screen_cols; - ab_append(buffer, status, length); + textbuf_append(buffer, status, length); while (length < editor->screen_cols) { if (editor->screen_cols - length == right_length) { - ab_append(buffer, right_status, right_length); + textbuf_append(buffer, right_status, right_length); break; } else { - ab_append(buffer, " ", 1); + textbuf_append(buffer, " ", 1); length++; } } - ab_append(buffer, "\n", 1); + textbuf_append(buffer, "\n", 1); } -void editor_draw_message_bar(struct editor_state* editor, struct append_buffer* buffer) +void editor_draw_message_bar(struct editor_state* editor, struct textbuf *buffer) { if (editor->mode == EDITOR_MODE_INSERT) { - ab_append(buffer, "--INSERT--", 10); + textbuf_append(buffer, "--INSERT--", 10); return; } @@ -296,7 +296,7 @@ void editor_draw_message_bar(struct editor_state* editor, struct append_buffer* message_length = editor->screen_cols; if (message_length && time(NULL) - editor->status_message_time < 5) - ab_append(buffer, editor->status_message, message_length); + textbuf_append(buffer, editor->status_message, message_length); } void editor_destroy(struct editor_state *editor) @@ -3,7 +3,7 @@ #include <time.h> -#include "buffer.h" +#include "textbuf.h" #include "line.h" enum editor_mode { @@ -55,8 +55,8 @@ void editor_add_line_below(struct editor_state* editor); void editor_find(struct editor_state* editor); void editor_scroll(struct editor_state* editor); void editor_update_screen_size(struct editor_state *); -void editor_draw_status_bar(struct editor_state *editor, struct append_buffer *buffer); -void editor_draw_message_bar(struct editor_state *editor, struct append_buffer *buffer); +void editor_draw_status_bar(struct editor_state *editor, struct textbuf *buffer); +void editor_draw_message_bar(struct editor_state *editor, struct textbuf *buffer); void editor_destroy(struct editor_state *editor); diff --git a/textbuf.c b/textbuf.c new file mode 100644 index 0000000..e68ddbd --- /dev/null +++ b/textbuf.c @@ -0,0 +1,32 @@ +#include "textbuf.h" + +#include <stdlib.h> +#include <string.h> + +#include "error.h" + +struct textbuf textbuf_init() +{ + struct textbuf result; + result.buffer = NULL; + result.length = 0; + return result; +} + +void textbuf_append(struct textbuf *textbuf, const char *str, int len) +{ + char *new = realloc(textbuf->buffer, textbuf->length + len); + if (new == NULL) { + fatal_error("Failed to reallocate textbuf!"); + return; + } + + memcpy(&new[textbuf->length], str, len); + textbuf->buffer = new; + textbuf->length += len; +} + +void textbuf_free(struct textbuf *textbuf) +{ + free(textbuf->buffer); +} diff --git a/textbuf.h b/textbuf.h new file mode 100644 index 0000000..e5e0f03 --- /dev/null +++ b/textbuf.h @@ -0,0 +1,22 @@ +/* + * textbuf.h: A simple dynamic text buffer. + * + * This file provides the `textbuf` struct, which is a dynamically allocated + * buffer of text. + */ + +#ifndef _BUFFER_H +#define _BUFFER_H + +#include <stddef.h> + +struct textbuf { + char *buffer; + size_t length; +}; + +struct textbuf textbuf_init(); +void textbuf_append(struct textbuf *textbuf, const char *str, int len); +void textbuf_free(struct textbuf *textbuf); + +#endif @@ -3,7 +3,7 @@ #include <unistd.h> #include <SDL2/SDL.h> -#include "buffer.h" +#include "textbuf.h" #include "editor.h" #include "error.h" #include "font.h" @@ -145,7 +145,7 @@ static void draw_editor(struct editor_state *editor) } /* Draw the statusline containing file information */ - struct append_buffer statusbuf = ABUF_INIT; + struct textbuf statusbuf = textbuf_init(); editor_draw_status_bar(editor, &statusbuf); editor_draw_message_bar(editor, &statusbuf); @@ -154,7 +154,7 @@ static void draw_editor(struct editor_state *editor) SDL_SetTextureColorMod(font_texture, 0xff, 0xff, 0xff); draw_string(statusbuf.buffer, NULL, statusbuf.length, 0, line_y); - ab_free(&statusbuf); + textbuf_free(&statusbuf); } void window_redraw(struct editor_state *editor) |