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; }