PreacherDHM/Tart
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Found that termous was not bing reset

Browse Source
This commit is contained in:
Preacherdhm
2025-05-31 23:02:26 +00:00
parent b6a50cf942
commit 8cef088b61
4 changed files with 102 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/tart.c
View File

@@ -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) { tart_byte tart_draw_window(struct tart_window * window, char* rend_buffer) {
int offset = 0; int offset = 0;
int i = 0; int i = 0;
int bufferWidth = 0;
for (int b = 0;b < 0xFF; b++) { for (int b = 0;b < 0xFF; b++) {
if(window->buffers[b].cell_count == 0) if(window->buffers[b].cell_count == 0)
continue; continue;
bufferWidth = window->buffers[b].size.x;
for (int y = 0; y < window->buffers[b].size.y; y++) { for (int y = 0; y < window->buffers[b].size.y; y++) {
for (int x = 0; x < window->buffers[b].size.x; x++) { for (int x = 0; x < window->buffers[b].size.x; x++) {
// add data to window c buffer. // add data to window c buffer.
struct tart_cell cell = window->buffers[b].cells[(y*window->buffers[b].size.x) + x]; struct tart_cell cell = window->buffers[b].cells[(y*window->buffers[b].size.x) + x];
char pre[TART_CELL_DATA_SIZE]; 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); 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++) { for(int preIdx = 0; preIdx < size; preIdx++) {
window->data[(y*window->buffers[b].size.x) + x + offset] = pre[preIdx]; window->data[(y * bufferWidth) + x + offset] = pre[preIdx];
offset++; 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++; offset++;

9
source/term.c
View File

@@ -101,17 +101,19 @@ void init_termios(int args) {
current.c_lflag &= ~ICANON; current.c_lflag &= ~ICANON;
if(args == 0x01) { if(args == 0x01) {
//current.c_lflag |= ECHO; //current.c_lflag ^ ECHO;
} else { } else {
//current.c_lflag &= ~ECHO; //current.c_lflag &= ~ECHO;
current.c_lflag ^= ECHO;
//current.c_lflag |= ECHO;
} }
tcsetattr(0,0, &current); tcsetattr(0,0, &current);
} }
void reset_termios(void) { void reset_termios(void) {
//current.c_lflag &= ~ECHO;
tcsetattr(0, 0, &old); tcsetattr(0, TCSANOW, &old);
} }
char term_getch() { char term_getch() {
@@ -144,6 +146,7 @@ void* input_threaded_func(void* vargp) {
int term_threaded_input_stop() { int term_threaded_input_stop() {
pthread_cancel(input_thread); pthread_cancel(input_thread);
reset_termios();
return 1; return 1;
} }

36
testing/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
project(TartTest) project(TartTest)
add_subdirectory(externals) #add_subdirectory(externals)
set( CMAKE_CXX_STANDARD 11) set( CMAKE_CXX_STANDARD 11)
set( CMAKE_CXX_STANDARD_REQUIRED ON) set( CMAKE_CXX_STANDARD_REQUIRED ON)
set( SOURCES set( SOURCES
@@ -8,21 +8,21 @@ set( SOURCES
test_term.cpp test_term.cpp
) )
set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/tests) #set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/tests)
#
add_executable(${PROJECT_NAME} ${SOURCES} ) #add_executable(${PROJECT_NAME} ${SOURCES} )
target_link_libraries(${PROJECT_NAME} TartLib PickleLib) #target_link_libraries(${PROJECT_NAME} TartLib PickleLib)
#
if(CMAKE_SYSTEM_NAME STREQUAL "Linux") #if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
add_test(${PROJECT_NAME} "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/testing") # add_test(${PROJECT_NAME} "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/testing")
endif() #endif()
if(CMAKE_SYSTEM_NAME STREQUAL "Windows") #if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
add_test(${PROJECT_NAME} "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/testing.exe") # add_test(${PROJECT_NAME} "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/testing.exe")
endif() #endif()
#
project(InputTartTest) #project(InputTartTest)
set( CMAKE_CXX_STANDARD 11) #set( CMAKE_CXX_STANDARD 11)
set( CMAKE_CXX_STANDARD_REQUIRED ON) #set( CMAKE_CXX_STANDARD_REQUIRED ON)
add_executable(${PROJECT_NAME} input.cpp ) #add_executable(${PROJECT_NAME} input.cpp )
target_link_libraries(${PROJECT_NAME} TartLib PickleLib) #target_link_libraries(${PROJECT_NAME} TartLib PickleLib)
add_subdirectory(render_test) add_subdirectory(render_test)

112
testing/render_test/main.cpp
View File

@@ -2,56 +2,80 @@
#include <memory.h> #include <memory.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <iostream>
//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[]) { int main (int argc, char *argv[]) {
struct tart_window window = tart_create_window(); int n;
struct tart_buffer mainbuff = tart_create_buffer(109, {40,20},{20,20}); int counter = 0;
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_disable_cursor();
term_threaded_input_init(); term_threaded_input_init();
for(;;) { bbuf = term_tinputb();
// printf("\033[H"); while(bbuf[0] != 'q') {
// struct tart_buffer* buf = tart_get_buffer(&window, 0);
// tart_draw_csprite_position(buf, sprite, {3,18}); std::cout << counter++ << '[';
// tart_draw_csprite_position(buf, sprite, p); for (int i = 0; i < 8; i++) {
// //tart_draw_window(&window, t); std::cout << bbuf[i] << ',';
// 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; std::cout << "] \r";
} }
term_disable_cursor(); std::cout << '\n';
term_enable_cursor();
//term_getche();
term_threaded_input_stop(); term_threaded_input_stop();
term_enable_cursor();
exit(0);
return 0; return 0;
} }