From 794a0e372c35e5136f6b37c23ee34d7dfb2f6835 Mon Sep 17 00:00:00 2001 From: PreacherDHM Date: Mon, 10 Feb 2025 22:55:43 -0800 Subject: [PATCH 01/10] rendering different colors worksgit add .! --- source/tart.c | 27 +++++++++++++++++++++------ testing/CMakeLists.txt | 1 + testing/render_test/CMakeLists.txt | 7 +++++++ testing/render_test/main.cpp | 20 ++++++++++++++++++++ 4 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 testing/render_test/CMakeLists.txt create mode 100644 testing/render_test/main.cpp diff --git a/source/tart.c b/source/tart.c index eaa7c0b..4096580 100644 --- a/source/tart.c +++ b/source/tart.c @@ -77,26 +77,41 @@ struct tart_cell tart_set_cell(struct tart_buffer* buffer, struct tart_cell cell } tart_byte tart_draw_window(struct tart_window * window, char* rend_buffer) { - int p = 0; + int offset = 0; int i = 0; + window->data = malloc((window->size.x * window->size.y * sizeof(char) * TART_CELL_DATA_SIZE)+ 100 ); for (int b = 0;b < 0xFF; b++) { - for (int y = 0; y < window->size.y; y++) { - for (int x = 0; x < window->size.x; x++) { - for (int p = 0; p < TART_CELL_DATA_SIZE;p++) { + if(window->buffers[b].cell_count == 0) + continue; + for (int y = 0; y < window->buffers[b].size.y; y++) { + for (int x = 0; x < window->buffers[b].size.x; x++) { // add data to window c buffer. + struct tart_cell cell = window->buffers[b].cells[(y*window->buffers[b].size.x) + x]; + char pre[16]; + int size = sprintf(pre, "\033[%d;%d;%dm%c\033[0;0m", (int)cell.style, cell.foreground, cell.background, cell.display); + for(int preIdx = 0; preIdx < size; preIdx++) { + window->data[(y*window->buffers[b].size.x) + x + offset] = pre[preIdx]; + offset++; - i++; } } + window->data[((y)*window->buffers[b].size.x) + offset + window->buffers[b].size.x] = '\n'; + offset++; + + // add cursor move command. i++; } } - printf(window->data); + fwrite(window->data, sizeof(char), (window->size.x * window->size.y * sizeof(char))+ 100 , stdout); + free(window->data); return TART_OK; }; tart_byte tart_add_cells_to_buffer(struct tart_buffer* buffer, struct tart_cell* cells) { + for(int i = 0; i < buffer->cell_count; i++) { + buffer->cells[i] = cells[i]; + } return TART_OK; } diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt index a310f3d..d38bd13 100644 --- a/testing/CMakeLists.txt +++ b/testing/CMakeLists.txt @@ -25,3 +25,4 @@ set( CMAKE_CXX_STANDARD 11) set( CMAKE_CXX_STANDARD_REQUIRED ON) add_executable(${PROJECT_NAME} input.cpp ) target_link_libraries(${PROJECT_NAME} TartLib PickleLib) +add_subdirectory(render_test) diff --git a/testing/render_test/CMakeLists.txt b/testing/render_test/CMakeLists.txt new file mode 100644 index 0000000..284f22d --- /dev/null +++ b/testing/render_test/CMakeLists.txt @@ -0,0 +1,7 @@ +set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/tests) +project(render_test) + +set( CMAKE_CXX_STANDARD 11) +set( CMAKE_CXX_STANDARD_REQUIRED ON) +add_executable(${PROJECT_NAME} main.cpp ) +target_link_libraries(${PROJECT_NAME} TartLib) diff --git a/testing/render_test/main.cpp b/testing/render_test/main.cpp new file mode 100644 index 0000000..0875d57 --- /dev/null +++ b/testing/render_test/main.cpp @@ -0,0 +1,20 @@ +#include + +int main (int argc, char *argv[]) { + struct tart_window window = tart_create_window(); + struct tart_buffer mainbuff = tart_create_buffer(109, {20,20},{20,20}); + struct tart_cell cells[20*20]; + for(int i = 1; i < 20*20; i += 2) { + cells[i] = tart_create_cell('^', TART_STYLE_BOLD, TART_COLOR_BLACK_FOREGROUND, TART_COLOR_WHITE_BACKGROUND); + } + for(int i = 0; i < + 20*20; i += 2) { + cells[i] = tart_create_cell('^', TART_STYLE_BOLD, TART_COLOR_WHITE_BACKGROUND, TART_COLOR_BLACK_BACKGROUND); + } + tart_add_cells_to_buffer(&mainbuff, cells); + + char* t; + tart_add_buffer(&window, mainbuff); + tart_draw_window(&window, t); + + return 0; +} From 73aa50446bd12e175f861f78d09b8c6a28443e13 Mon Sep 17 00:00:00 2001 From: PreacherDHM Date: Tue, 11 Feb 2025 11:15:18 -0800 Subject: [PATCH 02/10] fixed rendering for window and linux --- source/tart.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/source/tart.c b/source/tart.c index 4096580..f61d6e5 100644 --- a/source/tart.c +++ b/source/tart.c @@ -18,6 +18,10 @@ struct tart_window tart_create_window() { window.buffers[i] = tart_create_buffer(0, (struct tart_vec2){0,0},(struct tart_vec2){0,0}); } window.size = term_current_size(); + window.data = malloc((window.size.x * window.size.y * sizeof(char) * TART_CELL_DATA_SIZE)+ 100 ); + for(int g = 0; g < (window.size.x * window.size.y * sizeof(char) * TART_CELL_DATA_SIZE)+ 100; g++) { + window.data[g] = '\0'; + } return window; } @@ -79,7 +83,6 @@ struct tart_cell tart_set_cell(struct tart_buffer* buffer, struct tart_cell cell tart_byte tart_draw_window(struct tart_window * window, char* rend_buffer) { int offset = 0; int i = 0; - window->data = malloc((window->size.x * window->size.y * sizeof(char) * TART_CELL_DATA_SIZE)+ 100 ); for (int b = 0;b < 0xFF; b++) { if(window->buffers[b].cell_count == 0) continue; @@ -87,7 +90,7 @@ tart_byte tart_draw_window(struct tart_window * window, char* rend_buffer) { for (int x = 0; x < window->buffers[b].size.x; x++) { // add data to window c buffer. struct tart_cell cell = window->buffers[b].cells[(y*window->buffers[b].size.x) + x]; - char pre[16]; + char pre[20]; int size = sprintf(pre, "\033[%d;%d;%dm%c\033[0;0m", (int)cell.style, cell.foreground, cell.background, cell.display); for(int preIdx = 0; preIdx < size; preIdx++) { window->data[(y*window->buffers[b].size.x) + x + offset] = pre[preIdx]; @@ -104,7 +107,6 @@ tart_byte tart_draw_window(struct tart_window * window, char* rend_buffer) { } } fwrite(window->data, sizeof(char), (window->size.x * window->size.y * sizeof(char))+ 100 , stdout); - free(window->data); return TART_OK; }; From 2ad63d785f3f956a2e1bb758821aa64da2d6fb6d Mon Sep 17 00:00:00 2001 From: PreacherDHM Date: Tue, 11 Feb 2025 12:34:19 -0800 Subject: [PATCH 03/10] fixed the TART_CELL_DATA_SIZE and used malloc in the test --- includes/tart.h | 2 +- source/tart.c | 5 +++-- testing/render_test/main.cpp | 17 ++++++++++------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/includes/tart.h b/includes/tart.h index 16a31a8..11ed58c 100644 --- a/includes/tart.h +++ b/includes/tart.h @@ -25,7 +25,7 @@ extern "C" { #define TART_CELL_DATA_SIZE 16 // todo add number #else #define NULL_CELL (struct tart_cell){0,0,0,0} -#define TART_CELL_DATA_SIZE 16 +#define TART_CELL_DATA_SIZE 20 #endif #define TART_OK 0 diff --git a/source/tart.c b/source/tart.c index f61d6e5..c2533ae 100644 --- a/source/tart.c +++ b/source/tart.c @@ -22,6 +22,7 @@ struct tart_window tart_create_window() { for(int g = 0; g < (window.size.x * window.size.y * sizeof(char) * TART_CELL_DATA_SIZE)+ 100; g++) { window.data[g] = '\0'; } + window.data_count = (window.size.x * window.size.y * sizeof(char) * TART_CELL_DATA_SIZE)+ 100; return window; } @@ -90,7 +91,7 @@ tart_byte tart_draw_window(struct tart_window * window, char* rend_buffer) { for (int x = 0; x < window->buffers[b].size.x; x++) { // add data to window c buffer. struct tart_cell cell = window->buffers[b].cells[(y*window->buffers[b].size.x) + x]; - char pre[20]; + char pre[TART_CELL_DATA_SIZE]; int size = sprintf(pre, "\033[%d;%d;%dm%c\033[0;0m", (int)cell.style, cell.foreground, cell.background, cell.display); for(int preIdx = 0; preIdx < size; preIdx++) { window->data[(y*window->buffers[b].size.x) + x + offset] = pre[preIdx]; @@ -106,7 +107,7 @@ tart_byte tart_draw_window(struct tart_window * window, char* rend_buffer) { i++; } } - fwrite(window->data, sizeof(char), (window->size.x * window->size.y * sizeof(char))+ 100 , stdout); + fwrite(window->data, sizeof(char), window->data_count, stdout); return TART_OK; }; diff --git a/testing/render_test/main.cpp b/testing/render_test/main.cpp index 0875d57..420e6dc 100644 --- a/testing/render_test/main.cpp +++ b/testing/render_test/main.cpp @@ -1,18 +1,21 @@ #include +#include +#include +#include int main (int argc, char *argv[]) { struct tart_window window = tart_create_window(); - struct tart_buffer mainbuff = tart_create_buffer(109, {20,20},{20,20}); - struct tart_cell cells[20*20]; - for(int i = 1; i < 20*20; i += 2) { - cells[i] = tart_create_cell('^', TART_STYLE_BOLD, TART_COLOR_BLACK_FOREGROUND, TART_COLOR_WHITE_BACKGROUND); + struct tart_buffer mainbuff = tart_create_buffer(109, {100,50},{20,20}); + struct tart_cell* cells = (struct tart_cell*)malloc(mainbuff.cell_count * sizeof(struct tart_cell)); + for(int i = 1; i < mainbuff.cell_count; i += 2) { + cells[i] = tart_create_cell('^', TART_STYLE_BLINKING, TART_COLOR_BLACK_FOREGROUND, TART_COLOR_WHITE_BACKGROUND); } - for(int i = 0; i < + 20*20; i += 2) { - cells[i] = tart_create_cell('^', TART_STYLE_BOLD, TART_COLOR_WHITE_BACKGROUND, TART_COLOR_BLACK_BACKGROUND); + for(int i = 0; i < + mainbuff.cell_count; i += 2) { + cells[i] = tart_create_cell('^', TART_STYLE_BLINKING, TART_COLOR_RED_FOREGROUND, TART_COLOR_BLACK_BACKGROUND); } tart_add_cells_to_buffer(&mainbuff, cells); - char* t; + char t[1] = {'0'}; tart_add_buffer(&window, mainbuff); tart_draw_window(&window, t); From 82ea45a39ff09abb4416fd7238dd5ff815bf751e Mon Sep 17 00:00:00 2001 From: PreacherDHM Date: Fri, 14 Feb 2025 15:03:04 -0800 Subject: [PATCH 04/10] added cstring and csprite --- includes/tart.h | 30 ++++++++++++++++++ source/tart.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+) diff --git a/includes/tart.h b/includes/tart.h index 16a31a8..f4056fa 100644 --- a/includes/tart.h +++ b/includes/tart.h @@ -109,6 +109,18 @@ struct tart_cell { }; #endif +struct tart_cstring { + struct tart_cell* data; + long size; +}; + +struct tart_csprite { + struct tart_cell* data; + struct tart_vec2* position; + struct tart_vec2 bounds; + long size; +}; + /* Tart Buffer * * The Buffer is a contner that holds all of the cells for that buffer. @@ -158,6 +170,7 @@ tart_byte tart_add_buffer(struct tart_window*, struct tart_buffer); tart_byte tart_remove_buffer(struct tart_window*, tart_id); tart_byte tart_set_buffer(struct tart_window*, struct tart_buffer, tart_byte); + struct tart_buffer* tart_get_buffer(struct tart_window*, tart_byte); struct tart_cell* tart_get_cell(struct tart_buffer*, int); @@ -167,6 +180,23 @@ tart_byte tart_draw_window(struct tart_window*, char*); tart_byte tart_add_cells_to_buffer(struct tart_buffer*, struct tart_cell*); +// rendering +// Resering positionial cells. +struct tart_cstring tart_cstring(char* string, long, struct tart_cell type); +tart_byte tart_cstring_free(struct tart_cstring*); +struct tart_cstring tart_cstring_append(struct tart_cstring*, struct tart_cstring*); + +struct tart_csprite tart_csprite(struct tart_cell*, struct tart_vec2*, long); +tart_byte tart_csprite_free(struct tart_csprite*); + +tart_byte tart_draw_cell_position(struct tart_buffer*, struct tart_cell, struct tart_vec2); +tart_byte tart_draw_cstring_position(struct tart_buffer*, struct tart_cstring, struct tart_vec2); +tart_byte tart_draw_csprite_position(struct tart_buffer*, struct tart_csprite, struct tart_vec2); +/* + * tart_restore_buffer sets the buffer to NULL_CELL. + * */ +tart_byte tart_restore_buffer(struct tart_buffer*); + #ifdef __cplusplus } #endif diff --git a/source/tart.c b/source/tart.c index 4096580..ee7b54b 100644 --- a/source/tart.c +++ b/source/tart.c @@ -115,3 +115,84 @@ tart_byte tart_add_cells_to_buffer(struct tart_buffer* buffer, struct tart_cell* return TART_OK; } + + +struct tart_cstring tart_cstring(char *string, long size, struct tart_cell type){ + struct tart_cstring str = {0,size}; + str.data = malloc(size * sizeof(struct tart_cell)); + return str; +} + +tart_byte tart_cstring_free(struct tart_cstring* string) { + free(string->data); + string->size = 0; + return TART_OK; +} + +struct tart_cstring tart_cstring_append(struct tart_cstring* lhs, struct tart_cstring* rhs) { + struct tart_cstring ret = {0,0}; + ret.size = lhs->size + rhs->size; + ret.data = malloc(ret.size * sizeof(struct tart_cell)); + for(int i = 0; i < lhs->size; i++) { + ret.data[i] = lhs->data[i]; + } + for(int i = 0; i < rhs->size; i++) { + ret.data[lhs->size + i] = rhs->data[i]; + } + return ret; +} + +struct tart_csprite tart_csprite(struct tart_cell* cells, struct tart_vec2* positions, long size) { + + struct tart_csprite sprite = {0,0,0,size}; + sprite.data = cells; + sprite.position = positions; + for(int i = 0; i < size; i++) { + + if(positions[i].x > sprite.bounds.x) { + sprite.bounds.x = positions[i].x; + } + + if(positions[i].y > sprite.bounds.y) { + sprite.bounds.y = positions[i].y; + } + } + return sprite; +}; + +tart_byte tart_csprite_free(struct tart_csprite* sprite) { + sprite->bounds.x = 0; + sprite->bounds.y = 0; + sprite->size = 0; + free(sprite->data); + free(sprite->position); + return TART_OK; +} + +tart_byte tart_draw_cell_position(struct tart_buffer * buffer, struct tart_cell cell, struct tart_vec2 position) { + if(buffer->size.y >= position.y && buffer->size.x >= position.x) { + buffer->cells[(buffer->size.x * position.y) + position.x] = cell; + } + return TART_OK; +} + +tart_byte tart_draw_cstring_position(struct tart_buffer *buffer, struct tart_cstring string, struct tart_vec2 position) { + struct tart_vec2 pos = position; + for(int i = 0; i < string.size; i++) { + tart_draw_cell_position(buffer, string.data[i], pos); + pos.x++; + } + return TART_OK; +} + +tart_byte tart_draw_csprite_position(struct tart_buffer * buffer, struct tart_csprite sprite, struct tart_vec2 basePosition) { + for(int i = 0; i < sprite.size; i++) { + struct tart_vec2 position = {sprite.position[i].x + basePosition.x, sprite.position[i].y + basePosition.y}; + tart_draw_cell_position(buffer, sprite.data[i], position); + } + return TART_OK; +} + +tart_byte tart_restore_buffer(struct tart_buffer *buffer) { + return TART_OK; +} From 993330a3a44381dc825d71feb92fd3c8e5c20276 Mon Sep 17 00:00:00 2001 From: PreacherDHM Date: Fri, 14 Feb 2025 17:47:42 -0800 Subject: [PATCH 05/10] added some more tests to render test and csprite is working --- ; | 31 +++++++++++++++++++++++++++++++ includes/tart.h | 2 +- source/tart.c | 5 +++-- testing/render_test/main.cpp | 12 +++++++++++- 4 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 ; diff --git a/; b/; new file mode 100644 index 0000000..d3bd993 --- /dev/null +++ b/; @@ -0,0 +1,31 @@ +#include +#include +#include +#include + +int main (int argc, char *argv[]) { + struct tart_window window = tart_create_window(); + struct tart_buffer mainbuff = tart_create_buffer(109, {20,20},{20,20}); + struct tart_cell* cells = (struct tart_cell*)malloc(mainbuff.cell_count * sizeof(struct tart_cell)); + //for(int i = 1; i < mainbuff.cell_count; i += 2) { + // cells[i] = tart_create_cell('^', TART_STYLE_BLINKING, TART_COLOR_BLACK_FOREGROUND, TART_COLOR_WHITE_BACKGROUND); + //} + //for(int i = 0; i < + mainbuff.cell_count; i += 2) { + // cells[i] = tart_create_cell('^', TART_STYLE_BLINKING, TART_COLOR_RED_FOREGROUND, TART_COLOR_BLACK_BACKGROUND); + //} + tart_add_cells_to_buffer(&mainbuff, cells); + + struct tart_vec2 positions[4] = {{0,0},{0,1},{1,0},{1,1}}; + struct tart_cell cell = tart_create_cell('0', TART_STYLE_BLINKING, TART_COLOR_RED_FOREGROUND, TART_COLOR_GREEN_BACKGROUND); + struct tart_cell cellss[4] = {cell,cell,cell,cell}; + + struct tart_csprite sprite = tart_csprite(cellss,positions,4); + tart_draw_cell_position(&mainbuff, cell, {3,3}); + //tart_draw_csprite_position(&mainbuff, sprite, {2,2}); + + char t[1] = {'0'}; + tart_add_buffer(&window, mainbuff); + tart_draw_window(&window, t); + + return 0; +} diff --git a/includes/tart.h b/includes/tart.h index 65c8577..082d9c0 100644 --- a/includes/tart.h +++ b/includes/tart.h @@ -24,7 +24,7 @@ extern "C" { #define NULL_CELL (struct tart_cell){{0,0,0},{0,0,0},0,0,0} #define TART_CELL_DATA_SIZE 16 // todo add number #else -#define NULL_CELL (struct tart_cell){0,0,0,0} +#define NULL_CELL (struct tart_cell){0,0,0,' '} #define TART_CELL_DATA_SIZE 20 #endif #define TART_OK 0 diff --git a/source/tart.c b/source/tart.c index e54c4a7..aa06977 100644 --- a/source/tart.c +++ b/source/tart.c @@ -160,6 +160,7 @@ struct tart_csprite tart_csprite(struct tart_cell* cells, struct tart_vec2* posi sprite.bounds.y = positions[i].y; } } + sprite.size = size; return sprite; }; @@ -173,7 +174,7 @@ tart_byte tart_csprite_free(struct tart_csprite* sprite) { } tart_byte tart_draw_cell_position(struct tart_buffer * buffer, struct tart_cell cell, struct tart_vec2 position) { - if(buffer->size.y >= position.y && buffer->size.x >= position.x) { + if(buffer->size.x >= position.x && buffer->size.y >= position.y) { buffer->cells[(buffer->size.x * position.y) + position.x] = cell; } return TART_OK; @@ -190,7 +191,7 @@ tart_byte tart_draw_cstring_position(struct tart_buffer *buffer, struct tart_cst tart_byte tart_draw_csprite_position(struct tart_buffer * buffer, struct tart_csprite sprite, struct tart_vec2 basePosition) { for(int i = 0; i < sprite.size; i++) { - struct tart_vec2 position = {sprite.position[i].x + basePosition.x, sprite.position[i].y + basePosition.y}; + struct tart_vec2 position = {sprite.position[i].x + basePosition.x, sprite.position[i].y + basePosition.y}; tart_draw_cell_position(buffer, sprite.data[i], position); } return TART_OK; diff --git a/testing/render_test/main.cpp b/testing/render_test/main.cpp index 420e6dc..241d132 100644 --- a/testing/render_test/main.cpp +++ b/testing/render_test/main.cpp @@ -5,7 +5,7 @@ int main (int argc, char *argv[]) { struct tart_window window = tart_create_window(); - struct tart_buffer mainbuff = tart_create_buffer(109, {100,50},{20,20}); + struct tart_buffer mainbuff = tart_create_buffer(109, {20,20},{20,20}); struct tart_cell* cells = (struct tart_cell*)malloc(mainbuff.cell_count * sizeof(struct tart_cell)); for(int i = 1; i < mainbuff.cell_count; i += 2) { cells[i] = tart_create_cell('^', TART_STYLE_BLINKING, TART_COLOR_BLACK_FOREGROUND, TART_COLOR_WHITE_BACKGROUND); @@ -15,6 +15,16 @@ int main (int argc, char *argv[]) { } tart_add_cells_to_buffer(&mainbuff, cells); + struct tart_vec2 positions[4] = {{0,0},{0,1},{1,0},{3,2}}; + struct tart_cell cell = tart_create_cell('0', TART_STYLE_BLINKING, TART_COLOR_RED_FOREGROUND, TART_COLOR_GREEN_BACKGROUND); + struct tart_cell cellss[4] = {cell,cell,cell,cell}; + + struct tart_csprite sprite = tart_csprite(cellss,positions,4); + tart_draw_csprite_position(&mainbuff, sprite, {2,2}); + tart_draw_csprite_position(&mainbuff, sprite, {5,2}); + tart_draw_csprite_position(&mainbuff, sprite, {5,5}); + tart_draw_csprite_position(&mainbuff, sprite, {21,18}); + char t[1] = {'0'}; tart_add_buffer(&window, mainbuff); tart_draw_window(&window, t); From a77df22ffe0384602a207d6810e80f4ac60eeb6b Mon Sep 17 00:00:00 2001 From: PreacherDHM Date: Tue, 18 Feb 2025 15:28:17 -0800 Subject: [PATCH 06/10] cstring and csprite are working --- ; | 31 ----------------------------- includes/tart.h | 1 + source/tart.c | 13 +++++++++++- source/term.c | 4 ++-- testing/render_test/main.cpp | 38 +++++++++++++++++++++++++++++------- 5 files changed, 46 insertions(+), 41 deletions(-) delete mode 100644 ; diff --git a/; b/; deleted file mode 100644 index d3bd993..0000000 --- a/; +++ /dev/null @@ -1,31 +0,0 @@ -#include -#include -#include -#include - -int main (int argc, char *argv[]) { - struct tart_window window = tart_create_window(); - struct tart_buffer mainbuff = tart_create_buffer(109, {20,20},{20,20}); - struct tart_cell* cells = (struct tart_cell*)malloc(mainbuff.cell_count * sizeof(struct tart_cell)); - //for(int i = 1; i < mainbuff.cell_count; i += 2) { - // cells[i] = tart_create_cell('^', TART_STYLE_BLINKING, TART_COLOR_BLACK_FOREGROUND, TART_COLOR_WHITE_BACKGROUND); - //} - //for(int i = 0; i < + mainbuff.cell_count; i += 2) { - // cells[i] = tart_create_cell('^', TART_STYLE_BLINKING, TART_COLOR_RED_FOREGROUND, TART_COLOR_BLACK_BACKGROUND); - //} - tart_add_cells_to_buffer(&mainbuff, cells); - - struct tart_vec2 positions[4] = {{0,0},{0,1},{1,0},{1,1}}; - struct tart_cell cell = tart_create_cell('0', TART_STYLE_BLINKING, TART_COLOR_RED_FOREGROUND, TART_COLOR_GREEN_BACKGROUND); - struct tart_cell cellss[4] = {cell,cell,cell,cell}; - - struct tart_csprite sprite = tart_csprite(cellss,positions,4); - tart_draw_cell_position(&mainbuff, cell, {3,3}); - //tart_draw_csprite_position(&mainbuff, sprite, {2,2}); - - char t[1] = {'0'}; - tart_add_buffer(&window, mainbuff); - tart_draw_window(&window, t); - - return 0; -} diff --git a/includes/tart.h b/includes/tart.h index 082d9c0..49728dd 100644 --- a/includes/tart.h +++ b/includes/tart.h @@ -159,6 +159,7 @@ struct tart_window { struct tart_window tart_create_window(); struct tart_buffer tart_create_buffer(tart_id id, struct tart_vec2 size, struct tart_vec2 position); +tart_byte tart_restore_window(struct tart_window*); #ifdef TART_RGB_COLORS struct tart_cell tart_create_cell(char display, tart_byte style, struct tart_rgb foreground, struct tart_rgb background); diff --git a/source/tart.c b/source/tart.c index aa06977..9b42802 100644 --- a/source/tart.c +++ b/source/tart.c @@ -26,6 +26,13 @@ struct tart_window tart_create_window() { return window; } +tart_byte tart_restore_window(struct tart_window* window) { + for (int i = 0; i < window->data_count; i++) { + window->data[i] = '\0'; + } + return TART_OK; +} + struct tart_buffer tart_create_buffer(tart_id id, struct tart_vec2 size, struct tart_vec2 position) { unsigned int cell_count = size.x * size.y; @@ -37,6 +44,7 @@ struct tart_buffer tart_create_buffer(tart_id id, struct tart_vec2 size, struct unsigned int data_count = (size.x*size.y) * TART_CELL_DATA_SIZE; struct tart_buffer buf = {cell_count,0,id,size,position,cells}; // -NOTE- dose not set the layer + buf.cell_count = cell_count; return buf; } #ifdef TART_RGB_COLORS @@ -174,7 +182,7 @@ tart_byte tart_csprite_free(struct tart_csprite* sprite) { } tart_byte tart_draw_cell_position(struct tart_buffer * buffer, struct tart_cell cell, struct tart_vec2 position) { - if(buffer->size.x >= position.x && buffer->size.y >= position.y) { + if(buffer->size.x > position.x && buffer->size.y > position.y) { buffer->cells[(buffer->size.x * position.y) + position.x] = cell; } return TART_OK; @@ -198,5 +206,8 @@ tart_byte tart_draw_csprite_position(struct tart_buffer * buffer, struct tart_cs } tart_byte tart_restore_buffer(struct tart_buffer *buffer) { + for (int i = 0; i < buffer->cell_count; i++) { + buffer->cells[i] = NULL_CELL; + } return TART_OK; } diff --git a/source/term.c b/source/term.c index 3b000c9..c47fe0a 100644 --- a/source/term.c +++ b/source/term.c @@ -170,9 +170,9 @@ char term_tinput() { return __term_input_buffer__[0]; } void term_disable_cursor() { - fputs("\033[?25l", stdout); + printf("\033[?25l", stdout); } void term_enable_cursor() { - fputs("\033[?25h", stdout); + printf("\033[?25h", stdout); } diff --git a/testing/render_test/main.cpp b/testing/render_test/main.cpp index 241d132..31e4b98 100644 --- a/testing/render_test/main.cpp +++ b/testing/render_test/main.cpp @@ -5,7 +5,7 @@ int main (int argc, char *argv[]) { struct tart_window window = tart_create_window(); - struct tart_buffer mainbuff = tart_create_buffer(109, {20,20},{20,20}); + struct tart_buffer mainbuff = tart_create_buffer(109, {40,20},{20,20}); struct tart_cell* cells = (struct tart_cell*)malloc(mainbuff.cell_count * sizeof(struct tart_cell)); for(int i = 1; i < mainbuff.cell_count; i += 2) { cells[i] = tart_create_cell('^', TART_STYLE_BLINKING, TART_COLOR_BLACK_FOREGROUND, TART_COLOR_WHITE_BACKGROUND); @@ -15,7 +15,7 @@ int main (int argc, char *argv[]) { } tart_add_cells_to_buffer(&mainbuff, cells); - struct tart_vec2 positions[4] = {{0,0},{0,1},{1,0},{3,2}}; + struct tart_vec2 positions[4] = {{0,0},{0,1},{1,0},{1,1}}; struct tart_cell cell = tart_create_cell('0', TART_STYLE_BLINKING, TART_COLOR_RED_FOREGROUND, TART_COLOR_GREEN_BACKGROUND); struct tart_cell cellss[4] = {cell,cell,cell,cell}; @@ -23,11 +23,35 @@ int main (int argc, char *argv[]) { tart_draw_csprite_position(&mainbuff, sprite, {2,2}); tart_draw_csprite_position(&mainbuff, sprite, {5,2}); tart_draw_csprite_position(&mainbuff, sprite, {5,5}); - tart_draw_csprite_position(&mainbuff, sprite, {21,18}); - - char t[1] = {'0'}; - tart_add_buffer(&window, mainbuff); - tart_draw_window(&window, t); + tart_draw_csprite_position(&mainbuff, sprite, {39,18}); + float x = 0; + tart_byte layer = tart_add_buffer(&window, mainbuff); + char t[1] = {'0'}; + struct tart_vec2 p = {0,0}; + + term_disable_cursor(); + term_threaded_input_init(); + for(;;) { + // printf("\033[H"); + // struct tart_buffer* buf = tart_get_buffer(&window, 0); + // tart_draw_csprite_position(buf, sprite, {3,18}); + // tart_draw_csprite_position(buf, sprite, p); + // //tart_draw_window(&window, t); + // tart_restore_window(&window); + // tart_restore_buffer(buf); + // if(term_tinput() == 's') { + // x += 0.01; + // } + if(term_tinput() == 'q') { + term_threaded_input_stop(); + break; + } + // p.x = (int)x; + } + term_disable_cursor(); + term_enable_cursor(); + //term_getche(); + term_threaded_input_stop(); return 0; } From a942782e4721287f0469aee68ab3bd87c61d37fe Mon Sep 17 00:00:00 2001 From: PreacherDHM Date: Tue, 18 Feb 2025 23:03:07 -0800 Subject: [PATCH 07/10] added cstring mostly --- source/tart.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/tart.c b/source/tart.c index 9b42802..7b2037c 100644 --- a/source/tart.c +++ b/source/tart.c @@ -131,6 +131,10 @@ tart_byte tart_add_cells_to_buffer(struct tart_buffer* buffer, struct tart_cell* struct tart_cstring tart_cstring(char *string, long size, struct tart_cell type){ struct tart_cstring str = {0,size}; str.data = malloc(size * sizeof(struct tart_cell)); + for(int i = 0; i < size; i++) { + str.data[i] = type; + str.data[i].display = string[i]; + } return str; } From b6a50cf9425cffcbd97b922656aa422126d54c37 Mon Sep 17 00:00:00 2001 From: Preacherdhm Date: Sat, 31 May 2025 06:54:32 +0000 Subject: [PATCH 08/10] fixed threaded input --- source/term.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/source/term.c b/source/term.c index c47fe0a..a4aaadc 100644 --- a/source/term.c +++ b/source/term.c @@ -101,16 +101,17 @@ void init_termios(int args) { current.c_lflag &= ~ICANON; if(args == 0x01) { - current.c_lflag |= ECHO; + //current.c_lflag |= ECHO; } else { - current.c_lflag &= ~ECHO; + //current.c_lflag &= ~ECHO; } - tcsetattr(0,TCSAFLUSH, ¤t); + tcsetattr(0,0, ¤t); } void reset_termios(void) { - tcsetattr(0, TCSAFLUSH, &old); + //current.c_lflag &= ~ECHO; + tcsetattr(0, 0, &old); } char term_getch() { From 8cef088b613f1f1290e0696c0729c90a6dc1348a Mon Sep 17 00:00:00 2001 From: Preacherdhm Date: Sat, 31 May 2025 23:02:26 +0000 Subject: [PATCH 09/10] Found that termous was not bing reset --- source/tart.c | 18 +++--- source/term.c | 9 ++- testing/CMakeLists.txt | 36 +++++------ testing/render_test/main.cpp | 112 +++++++++++++++++++++-------------- 4 files changed, 102 insertions(+), 73 deletions(-) diff --git a/source/tart.c b/source/tart.c index 7b2037c..e71e9b5 100644 --- a/source/tart.c +++ b/source/tart.c @@ -92,22 +92,24 @@ struct tart_cell tart_set_cell(struct tart_buffer* buffer, struct tart_cell cell tart_byte tart_draw_window(struct tart_window * window, char* rend_buffer) { int offset = 0; int i = 0; + int bufferWidth = 0; for (int b = 0;b < 0xFF; b++) { if(window->buffers[b].cell_count == 0) continue; + bufferWidth = window->buffers[b].size.x; for (int y = 0; y < window->buffers[b].size.y; y++) { for (int x = 0; x < window->buffers[b].size.x; x++) { - // add data to window c buffer. - struct tart_cell cell = window->buffers[b].cells[(y*window->buffers[b].size.x) + x]; - char pre[TART_CELL_DATA_SIZE]; - int size = sprintf(pre, "\033[%d;%d;%dm%c\033[0;0m", (int)cell.style, cell.foreground, cell.background, cell.display); - for(int preIdx = 0; preIdx < size; preIdx++) { - window->data[(y*window->buffers[b].size.x) + x + offset] = pre[preIdx]; - offset++; + // add data to window c buffer. + struct tart_cell cell = window->buffers[b].cells[(y*window->buffers[b].size.x) + x]; + char pre[TART_CELL_DATA_SIZE]; + int size = sprintf(pre, "\033[%d;%d;%dm%c\033[0;0m", (int)cell.style, cell.foreground, cell.background, cell.display) - 1; + for(int preIdx = 0; preIdx < size; preIdx++) { + window->data[(y * bufferWidth) + x + offset] = pre[preIdx]; + offset++; } } - window->data[((y)*window->buffers[b].size.x) + offset + window->buffers[b].size.x] = '\n'; + //window->data[((y)*window->buffers[b].size.x) + offset + window->buffers[b].size.x] = '\n'; offset++; diff --git a/source/term.c b/source/term.c index a4aaadc..5c763cb 100644 --- a/source/term.c +++ b/source/term.c @@ -101,17 +101,19 @@ void init_termios(int args) { current.c_lflag &= ~ICANON; if(args == 0x01) { - //current.c_lflag |= ECHO; + //current.c_lflag ^ ECHO; } else { //current.c_lflag &= ~ECHO; + current.c_lflag ^= ECHO; + //current.c_lflag |= ECHO; } tcsetattr(0,0, ¤t); } void reset_termios(void) { - //current.c_lflag &= ~ECHO; - tcsetattr(0, 0, &old); + + tcsetattr(0, TCSANOW, &old); } char term_getch() { @@ -144,6 +146,7 @@ void* input_threaded_func(void* vargp) { int term_threaded_input_stop() { pthread_cancel(input_thread); + reset_termios(); return 1; } diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt index d38bd13..9f4994e 100644 --- a/testing/CMakeLists.txt +++ b/testing/CMakeLists.txt @@ -1,5 +1,5 @@ project(TartTest) -add_subdirectory(externals) +#add_subdirectory(externals) set( CMAKE_CXX_STANDARD 11) set( CMAKE_CXX_STANDARD_REQUIRED ON) set( SOURCES @@ -8,21 +8,21 @@ set( SOURCES test_term.cpp ) -set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/tests) - -add_executable(${PROJECT_NAME} ${SOURCES} ) -target_link_libraries(${PROJECT_NAME} TartLib PickleLib) - -if(CMAKE_SYSTEM_NAME STREQUAL "Linux") - add_test(${PROJECT_NAME} "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/testing") -endif() -if(CMAKE_SYSTEM_NAME STREQUAL "Windows") - add_test(${PROJECT_NAME} "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/testing.exe") -endif() - -project(InputTartTest) -set( CMAKE_CXX_STANDARD 11) -set( CMAKE_CXX_STANDARD_REQUIRED ON) -add_executable(${PROJECT_NAME} input.cpp ) -target_link_libraries(${PROJECT_NAME} TartLib PickleLib) +#set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/tests) +# +#add_executable(${PROJECT_NAME} ${SOURCES} ) +#target_link_libraries(${PROJECT_NAME} TartLib PickleLib) +# +#if(CMAKE_SYSTEM_NAME STREQUAL "Linux") +# add_test(${PROJECT_NAME} "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/testing") +#endif() +#if(CMAKE_SYSTEM_NAME STREQUAL "Windows") +# add_test(${PROJECT_NAME} "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/testing.exe") +#endif() +# +#project(InputTartTest) +#set( CMAKE_CXX_STANDARD 11) +#set( CMAKE_CXX_STANDARD_REQUIRED ON) +#add_executable(${PROJECT_NAME} input.cpp ) +#target_link_libraries(${PROJECT_NAME} TartLib PickleLib) add_subdirectory(render_test) diff --git a/testing/render_test/main.cpp b/testing/render_test/main.cpp index 31e4b98..db31e42 100644 --- a/testing/render_test/main.cpp +++ b/testing/render_test/main.cpp @@ -2,56 +2,80 @@ #include #include #include +#include + +//int main (int argc, char *argv[]) { +// struct tart_window window = tart_create_window(); +// struct tart_buffer mainbuff = tart_create_buffer(109, {40,20},{20,20}); +// struct tart_cell* cells = (struct tart_cell*)malloc(mainbuff.cell_count * sizeof(struct tart_cell)); +// for(int i = 1; i < mainbuff.cell_count; i += 2) { +// cells[i] = tart_create_cell('^', TART_STYLE_BLINKING, TART_COLOR_BLACK_FOREGROUND, TART_COLOR_WHITE_BACKGROUND); +// } +// for(int i = 0; i < + mainbuff.cell_count; i += 2) { +// cells[i] = tart_create_cell('^', TART_STYLE_BLINKING, TART_COLOR_RED_FOREGROUND, TART_COLOR_BLACK_BACKGROUND); +// } +// tart_add_cells_to_buffer(&mainbuff, cells); +// +// struct tart_vec2 positions[4] = {{0,0},{0,1},{1,0},{1,1}}; +// struct tart_cell cell = tart_create_cell('0', TART_STYLE_BLINKING, TART_COLOR_RED_FOREGROUND, TART_COLOR_GREEN_BACKGROUND); +// struct tart_cell cellss[4] = {cell,cell,cell,cell}; +// +// struct tart_csprite sprite = tart_csprite(cellss,positions,4); +// tart_draw_csprite_position(&mainbuff, sprite, {2,2}); +// tart_draw_csprite_position(&mainbuff, sprite, {5,2}); +// tart_draw_csprite_position(&mainbuff, sprite, {5,5}); +// tart_draw_csprite_position(&mainbuff, sprite, {39,18}); +// +// float x = 0; +// tart_byte layer = tart_add_buffer(&window, mainbuff); +// char t[1] = {'0'}; +// struct tart_vec2 p = {0,0}; +// +// term_disable_cursor(); +// term_threaded_input_init(); +// char* bbuf = term_tinputb(); +// for(;;) { +// printf("\033[H"); +// struct tart_buffer* buf = tart_get_buffer(&window, 0); +// tart_draw_csprite_position(buf, sprite, {3,18}); +// tart_draw_csprite_position(buf, sprite, p); +// tart_draw_window(&window, t); +// tart_restore_window(&window); +// tart_restore_buffer(buf); +// if(term_tinput() == 's') { +// x += 0.01; +// } +// if(term_tinput() == 'q') { +// break; +// } +// // p.x = (int)x; +// } +// term_threaded_input_stop(); +// term_enable_cursor(); +// exit(0); +// //term_getche(); +// //term_threaded_input_stop(); +// return 0; +//} +char* bbuf; int main (int argc, char *argv[]) { - struct tart_window window = tart_create_window(); - struct tart_buffer mainbuff = tart_create_buffer(109, {40,20},{20,20}); - struct tart_cell* cells = (struct tart_cell*)malloc(mainbuff.cell_count * sizeof(struct tart_cell)); - for(int i = 1; i < mainbuff.cell_count; i += 2) { - cells[i] = tart_create_cell('^', TART_STYLE_BLINKING, TART_COLOR_BLACK_FOREGROUND, TART_COLOR_WHITE_BACKGROUND); - } - for(int i = 0; i < + mainbuff.cell_count; i += 2) { - cells[i] = tart_create_cell('^', TART_STYLE_BLINKING, TART_COLOR_RED_FOREGROUND, TART_COLOR_BLACK_BACKGROUND); - } - tart_add_cells_to_buffer(&mainbuff, cells); - - struct tart_vec2 positions[4] = {{0,0},{0,1},{1,0},{1,1}}; - struct tart_cell cell = tart_create_cell('0', TART_STYLE_BLINKING, TART_COLOR_RED_FOREGROUND, TART_COLOR_GREEN_BACKGROUND); - struct tart_cell cellss[4] = {cell,cell,cell,cell}; - - struct tart_csprite sprite = tart_csprite(cellss,positions,4); - tart_draw_csprite_position(&mainbuff, sprite, {2,2}); - tart_draw_csprite_position(&mainbuff, sprite, {5,2}); - tart_draw_csprite_position(&mainbuff, sprite, {5,5}); - tart_draw_csprite_position(&mainbuff, sprite, {39,18}); - - float x = 0; - tart_byte layer = tart_add_buffer(&window, mainbuff); - char t[1] = {'0'}; - struct tart_vec2 p = {0,0}; - + int n; + int counter = 0; term_disable_cursor(); term_threaded_input_init(); - for(;;) { - // printf("\033[H"); - // struct tart_buffer* buf = tart_get_buffer(&window, 0); - // tart_draw_csprite_position(buf, sprite, {3,18}); - // tart_draw_csprite_position(buf, sprite, p); - // //tart_draw_window(&window, t); - // tart_restore_window(&window); - // tart_restore_buffer(buf); - // if(term_tinput() == 's') { - // x += 0.01; - // } - if(term_tinput() == 'q') { - term_threaded_input_stop(); - break; + bbuf = term_tinputb(); + while(bbuf[0] != 'q') { + + std::cout << counter++ << '['; + for (int i = 0; i < 8; i++) { + std::cout << bbuf[i] << ','; } - // p.x = (int)x; + std::cout << "] \r"; } - term_disable_cursor(); - term_enable_cursor(); - //term_getche(); + std::cout << '\n'; term_threaded_input_stop(); + term_enable_cursor(); + exit(0); return 0; } From b2839b4cd1e6098113e4fe7ef3fe152e051a0aa4 Mon Sep 17 00:00:00 2001 From: PreacherDHM Date: Fri, 6 Jun 2025 11:08:10 -0700 Subject: [PATCH 10/10] Did some formatting and added more docs to the tart.h file --- CMakeLists.txt | 2 +- includes/tart.h | 14 ++++++++++++++ source/tart.c | 40 +++++++++++++++++++++++++--------------- 3 files changed, 40 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b912b54..e86fa57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,5 +24,5 @@ enable_testing() add_subdirectory(externals) # PROJECT add_subdirectory(source) -add_subdirectory(testing) +#add_subdirectory(testing) diff --git a/includes/tart.h b/includes/tart.h index 49728dd..eb629c9 100644 --- a/includes/tart.h +++ b/includes/tart.h @@ -167,8 +167,22 @@ struct tart_cell tart_create_cell(char display, tart_byte style, struct tart_rgb struct tart_cell tart_create_cell(char display, tart_byte style, tart_byte foreground, tart_byte background); #endif +/* tart_add_buffer + * + * This adds a buffer to the window. + * + * tart_byte tart_add_buffer(struct tart_window*, struct struct tart_buffer*) + */ tart_byte tart_add_buffer(struct tart_window*, struct tart_buffer); +/* tart_remove_buffer + * + * This will remove the buffer using the *tart_id*. + */ tart_byte tart_remove_buffer(struct tart_window*, tart_id); +/* tart_set_buffer + * + * This will replace the the buffer at the index *(tart_byte)*. + */ tart_byte tart_set_buffer(struct tart_window*, struct tart_buffer, tart_byte); diff --git a/source/tart.c b/source/tart.c index 7b2037c..8639f99 100644 --- a/source/tart.c +++ b/source/tart.c @@ -15,14 +15,19 @@ struct tart_window tart_create_window() { struct tart_window window; window.buffer_count = 0; for(int i = 0; i < 0xFF; i++) { - window.buffers[i] = tart_create_buffer(0, (struct tart_vec2){0,0},(struct tart_vec2){0,0}); + window.buffers[i] = tart_create_buffer(0, (struct tart_vec2){0,0}, + (struct tart_vec2){0,0}); } window.size = term_current_size(); - window.data = malloc((window.size.x * window.size.y * sizeof(char) * TART_CELL_DATA_SIZE)+ 100 ); - for(int g = 0; g < (window.size.x * window.size.y * sizeof(char) * TART_CELL_DATA_SIZE)+ 100; g++) { + + int dataSize = (window.size.x * window.size.y * sizeof(char) * + TART_CELL_DATA_SIZE) + 100; + + window.data = malloc(dataSize); + for(int g = 0; g < dataSize; g++) { window.data[g] = '\0'; } - window.data_count = (window.size.x * window.size.y * sizeof(char) * TART_CELL_DATA_SIZE)+ 100; + window.data_count = dataSize; return window; } @@ -33,10 +38,11 @@ tart_byte tart_restore_window(struct tart_window* window) { return TART_OK; } -struct tart_buffer tart_create_buffer(tart_id id, struct tart_vec2 size, struct tart_vec2 position) { +struct tart_buffer tart_create_buffer(tart_id id, struct tart_vec2 size, + struct tart_vec2 position) { unsigned int cell_count = size.x * size.y; - struct tart_cell* cells = (struct tart_cell*)malloc((size.x * size.y) * sizeof(struct tart_cell)); + struct tart_cell* cells = (struct tart_cell*)malloc(cell_count * sizeof(struct tart_cell)); for (int i = 0;i < cell_count;i++) { cells[i] = NULL_CELL; @@ -59,7 +65,8 @@ struct tart_cell tart_create_cell(char display, tart_byte style, return (struct tart_cell){foreground,background,style,display}; } #endif -tart_byte tart_add_buffer(struct tart_window* window, struct tart_buffer buffer) { +tart_byte tart_add_buffer(struct tart_window* window, + struct tart_buffer buffer) { if(window->buffer_count <= 0xFF) { window->buffers[window->buffer_count] = buffer; window->buffer_count++; @@ -97,14 +104,17 @@ tart_byte tart_draw_window(struct tart_window * window, char* rend_buffer) { continue; for (int y = 0; y < window->buffers[b].size.y; y++) { for (int x = 0; x < window->buffers[b].size.x; x++) { - // add data to window c buffer. - struct tart_cell cell = window->buffers[b].cells[(y*window->buffers[b].size.x) + x]; - char pre[TART_CELL_DATA_SIZE]; - int size = sprintf(pre, "\033[%d;%d;%dm%c\033[0;0m", (int)cell.style, cell.foreground, cell.background, cell.display); - for(int preIdx = 0; preIdx < size; preIdx++) { - window->data[(y*window->buffers[b].size.x) + x + offset] = pre[preIdx]; - offset++; - + // add data to window c buffer. + struct tart_cell cell = window->buffers[b].cells[(y*window->buffers[b].size.x) + x]; + char pre[TART_CELL_DATA_SIZE]; + // puts cell drawing data in pre + int size = sprintf(pre, "\033[%d;%d;%dm%c\033[0;0m", + (int)cell.style, cell.foreground, + cell.background, cell.display); + for(int preIdx = 0; preIdx < size; preIdx++) { + window->data[(y*window->buffers[b].size.x) + x + offset] = pre[preIdx]; + offset++; + } } window->data[((y)*window->buffers[b].size.x) + offset + window->buffers[b].size.x] = '\n';