mirror of
https://gittea.dev/nova/th.git
synced 2025-10-21 10:20:15 -04:00
Compare commits
2 Commits
3fa16fd8b2
...
fa544204ba
Author | SHA1 | Date | |
---|---|---|---|
![]() |
fa544204ba | ||
![]() |
61023ce42e |
1
config.h
1
config.h
@@ -48,6 +48,7 @@ static const binding key_binding[] = {
|
||||
{ "e", update, NULL, "rerun all backend" }, /* executes the entire backend and redrawing of the screen */
|
||||
{ "B", enter_shell, "$SHELL", "enter $SHELL shell" },
|
||||
{ "/", search, NULL, "search" },
|
||||
{ ":", jmp_file_index, NULL, "jump to file on input number" },
|
||||
{ "l", search_next, NULL, "search next" },
|
||||
{ "L", search_previous, NULL, "search previous" },
|
||||
|
||||
|
19
dir.c
19
dir.c
@@ -54,7 +54,7 @@ unsigned long get_dir_size(char *path){
|
||||
}
|
||||
|
||||
void get_dir_content(char *path, unsigned long *dir_file_count, file *dir_content){
|
||||
struct dirent **entry;
|
||||
struct dirent **entry = NULL;
|
||||
if (file_modifiers & FILE_MODIFIERS_HIDDEN_FILES) { /* print hidden files */
|
||||
scandir(path, &entry, skip_dot, NULL);
|
||||
} else {
|
||||
@@ -147,7 +147,10 @@ void get_dir_content(char *path, unsigned long *dir_file_count, file *dir_conten
|
||||
for (i = 0; i < *dir_file_count; i++) {
|
||||
free(entry[i]);
|
||||
}
|
||||
free(entry);
|
||||
if (entry != NULL) {
|
||||
free(entry);
|
||||
} else {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -243,7 +246,7 @@ void print_dir(WINDOW *win, char print_info, unsigned long *dir_file_count, file
|
||||
* example input: aaaaaaaa.txt
|
||||
* example output: aaa~.txt
|
||||
* if no extension is found, the name will truncate */
|
||||
char *file_name;
|
||||
char *file_name = NULL;
|
||||
unsigned long printable_size = (offset_back - is_selected - offset_front);
|
||||
if (strlen(dir_content[i].file_name) > printable_size) {
|
||||
char *extension = strrchr(dir_content[i].file_name, '.');
|
||||
@@ -312,8 +315,14 @@ void print_dir(WINDOW *win, char print_info, unsigned long *dir_file_count, file
|
||||
} else {
|
||||
mvwaddnstr(win, i-offset_vertical, 0, file_name, line_width);
|
||||
}
|
||||
free(file_name);
|
||||
|
||||
if (file_name != NULL) {
|
||||
/* sometimes NULL remains, need to do deeper analysis soon */
|
||||
free(file_name);
|
||||
} else {
|
||||
printf("file_name remains NULL on %s, if this happens consistent on the same file, please inform me", dir_content[i].file_name);
|
||||
volatile static int debug_print_dir;
|
||||
debug_print_dir++;
|
||||
}
|
||||
if (dir_content[i].status & FILE_STATUS_SELECTED) {
|
||||
wattroff(win, COLOR_PAIR(8));
|
||||
} else {
|
||||
|
@@ -42,11 +42,10 @@ extern time_t *seed;
|
||||
char search_buffer[255];
|
||||
unsigned int timeout_time = 0;
|
||||
unsigned int input_pass;
|
||||
int parsed_input_number;
|
||||
unsigned long parsed_input_number;
|
||||
yank yank_files = { 0 };
|
||||
|
||||
int read_string(WINDOW *win, int y, int x, char *str);
|
||||
int strcmp_offset(char *in0, char *in1, char offset);
|
||||
extern void render_pass();
|
||||
extern int (*order_func)();
|
||||
|
||||
@@ -70,7 +69,7 @@ void user_interactions() {
|
||||
|
||||
ch = getch();
|
||||
if(ch != ERR) {
|
||||
timeout(1); /* blocking timeout of getch() */
|
||||
timeout(10); /* blocking timeout of getch() */
|
||||
input[input_pass] = ch;
|
||||
mvaddstr(terminal_height-1, (terminal_width/3)*2, input);
|
||||
input_pass++;
|
||||
@@ -83,6 +82,8 @@ void user_interactions() {
|
||||
}
|
||||
binding_pass = 0;
|
||||
status |= STATUS_UPDATE_SCREEN_0;
|
||||
} else {
|
||||
timeout(100);
|
||||
}
|
||||
|
||||
|
||||
@@ -119,7 +120,7 @@ void user_interactions() {
|
||||
}
|
||||
if (status & STATUS_INPUT_MATCH) {
|
||||
attron(A_UNDERLINE);
|
||||
mvaddstr(terminal_height-binding_matches-2, 0, "input\tcommand\t\t");
|
||||
mvwprintw(stdscr, terminal_height-binding_matches-2, 0, "input\tcommand\t\t");
|
||||
attroff(A_UNDERLINE);
|
||||
status &= ~STATUS_INPUT_MATCH;
|
||||
} else if (number_length != strlen(input)) {
|
||||
@@ -167,24 +168,11 @@ int read_string(WINDOW *win, int y, int x, char *str){
|
||||
}
|
||||
str[pass] = '\0';
|
||||
|
||||
timeout(10);
|
||||
timeout(100);
|
||||
curs_set(0);
|
||||
|
||||
return err;
|
||||
}
|
||||
int strcmp_offset(char *in0, char *in1, char offset){
|
||||
|
||||
int i = 0;
|
||||
while (in0[i] != '\0' && in1[i] != '\0') {
|
||||
if (in0[i+offset] != in1[i]) {
|
||||
return 1;
|
||||
}
|
||||
i++;
|
||||
in1++;
|
||||
}
|
||||
return 0;
|
||||
|
||||
}
|
||||
void quit_program(){
|
||||
status = STATUS_QUIT_PROGRAM;
|
||||
}
|
||||
@@ -198,7 +186,7 @@ void select_all(){
|
||||
pthread_mutex_unlock(&mutex_mid);
|
||||
pthread_mutex_unlock(&mutex_selection);
|
||||
}
|
||||
void move_down(int passes){
|
||||
void move_down(unsigned long passes){
|
||||
pthread_mutex_lock(&mutex_selection);
|
||||
if (passes == 0) {
|
||||
passes++;
|
||||
@@ -211,7 +199,7 @@ void move_down(int passes){
|
||||
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_0);
|
||||
pthread_mutex_unlock(&mutex_selection);
|
||||
}
|
||||
void move_up(int passes){
|
||||
void move_up(unsigned long passes){
|
||||
pthread_mutex_lock(&mutex_selection);
|
||||
if (passes == 0) {
|
||||
passes++;
|
||||
@@ -228,11 +216,11 @@ void move_up(int passes){
|
||||
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK);
|
||||
pthread_mutex_unlock(&mutex_selection);
|
||||
}
|
||||
void move_left(int passes){
|
||||
void move_left(unsigned long passes){
|
||||
if (passes == 0) {
|
||||
passes++;
|
||||
}
|
||||
int i;
|
||||
unsigned long i;
|
||||
for (i = 0; i < passes; i++) {
|
||||
if (chdir("..") != 0) {
|
||||
/* TODO(2025-07-09T00:30:05) fix */
|
||||
@@ -561,7 +549,7 @@ void makefile(){
|
||||
void update(){
|
||||
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK | STATUS_RELOAD_DIRECTORY | STATUS_UPDATE_SCREEN_RELOAD_FULL);
|
||||
}
|
||||
void enter_shell(int passes, int index){
|
||||
void enter_shell(unsigned long passes, int index){
|
||||
(void)passes;
|
||||
|
||||
#if SETTINGS_UEBERZUG_IMAGE_PREVIEW != 0
|
||||
@@ -574,14 +562,14 @@ void enter_shell(int passes, int index){
|
||||
initscr();
|
||||
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK | STATUS_RELOAD_DIRECTORY | STATUS_UPDATE_SCREEN_RELOAD_FULL);
|
||||
}
|
||||
void not_implemented(int passes, int index){
|
||||
void not_implemented(unsigned long passes, int index){
|
||||
(void)passes;
|
||||
|
||||
mvaddstr(terminal_height-1, 0, key_binding[index].comment);
|
||||
mvaddstr(terminal_height-1, strlen(key_binding[index].comment), "\t");
|
||||
mvaddstr(terminal_height-1, strlen(key_binding[index].comment) + strlen("\t"), "is not yet implemented");
|
||||
}
|
||||
void jump_to_dir(int passes, int index){
|
||||
void jump_to_dir(unsigned long passes, int index){
|
||||
(void)passes;
|
||||
|
||||
char *ch = (char*)key_binding[index].black_magic;
|
||||
@@ -638,7 +626,7 @@ void jump_to_dir(int passes, int index){
|
||||
}
|
||||
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK | STATUS_RELOAD_DIRECTORY);
|
||||
}
|
||||
void order_by(int passes, int index){
|
||||
void order_by(unsigned long passes, int index){
|
||||
(void)passes;
|
||||
|
||||
free(seed);
|
||||
@@ -649,7 +637,7 @@ void order_by(int passes, int index){
|
||||
order_func = key_binding[index].black_magic;
|
||||
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK | STATUS_RELOAD_DIRECTORY);
|
||||
}
|
||||
void cmd_on_selected(int passes, int index){
|
||||
void cmd_on_selected(unsigned long passes, int index){
|
||||
(void)passes;
|
||||
pthread_mutex_lock(&mutex_btm);
|
||||
|
||||
@@ -737,7 +725,7 @@ void cmd_on_selected(int passes, int index){
|
||||
}
|
||||
pthread_mutex_unlock(&mutex_btm);
|
||||
}
|
||||
void yank_text(int passes, int index){
|
||||
void yank_text(unsigned long passes, int index){
|
||||
(void)passes;
|
||||
char *cmd;
|
||||
if (strncmp((char*)key_binding[index].black_magic, "path", 4) == 0) {
|
||||
@@ -758,7 +746,7 @@ void yank_text(int passes, int index){
|
||||
}
|
||||
free(cmd);
|
||||
}
|
||||
void yank_file(int passes, int index){
|
||||
void yank_file(unsigned long passes, int index){
|
||||
(void)passes;
|
||||
|
||||
unsigned long i;
|
||||
@@ -936,3 +924,25 @@ void search_previous(){
|
||||
}
|
||||
}
|
||||
}
|
||||
void jmp_file_index(){
|
||||
char *index = malloc(255);
|
||||
memset(index, ' ', 255);
|
||||
index[254] = '\0';
|
||||
unsigned long local_height;
|
||||
local_height = getmaxy(win_b);
|
||||
read_string(win_b, local_height - 1, 0, index);
|
||||
|
||||
unsigned long new_index = 0;
|
||||
while((*index >= '0') && (*index <= '9')) {
|
||||
new_index = (new_index * 10) + (*index - '0');
|
||||
index++;
|
||||
}
|
||||
if (new_index > mid_file_count) {
|
||||
selected_file_current = mid_file_count;
|
||||
} else {
|
||||
selected_file_current = new_index;
|
||||
}
|
||||
|
||||
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_0);
|
||||
update_selected_file();
|
||||
}
|
||||
|
@@ -9,9 +9,9 @@ void quit_program();
|
||||
void toggle_selection();
|
||||
void select_all();
|
||||
void move_right();
|
||||
void move_up(int passes);
|
||||
void move_down(int passes);
|
||||
void move_left(int passes);
|
||||
void move_up(unsigned long passes);
|
||||
void move_down(unsigned long passes);
|
||||
void move_left(unsigned long passes);
|
||||
void jump_bottom();
|
||||
void jump_top();
|
||||
void toggle_hidden_files();
|
||||
@@ -21,14 +21,15 @@ void delete();
|
||||
void makedir();
|
||||
void makefile();
|
||||
void update();
|
||||
void enter_shell(int passes, int index);
|
||||
void not_implemented(int passes, int index);
|
||||
void jump_to_dir(int passes, int index);
|
||||
void order_by(int passes, int index);
|
||||
void cmd_on_selected(int passes, int index);
|
||||
void yank_text(int passes, int index);
|
||||
void yank_file(int passes, int index);
|
||||
void enter_shell(unsigned long passes, int index);
|
||||
void not_implemented(unsigned long passes, int index);
|
||||
void jump_to_dir(unsigned long passes, int index);
|
||||
void order_by(unsigned long passes, int index);
|
||||
void cmd_on_selected(unsigned long passes, int index);
|
||||
void yank_text(unsigned long passes, int index);
|
||||
void yank_file(unsigned long passes, int index);
|
||||
void paste();
|
||||
void search();
|
||||
void search_next();
|
||||
void search_previous();
|
||||
void jmp_file_index();
|
||||
|
11
threading.c
11
threading.c
@@ -247,7 +247,7 @@ void *thread_top(){
|
||||
pthread_exit(0);
|
||||
}
|
||||
void *thread_btm(){
|
||||
char *path = malloc(sizeof(char));
|
||||
char *path = NULL;
|
||||
char *ui_btm_right_block = malloc(sizeof(char));
|
||||
unsigned int ui_btm_right_block_size = 0;
|
||||
unsigned int buffer_width = 0;
|
||||
@@ -271,7 +271,14 @@ void *thread_btm(){
|
||||
pthread_mutex_unlock(&mutex_mid);
|
||||
|
||||
|
||||
free(path);
|
||||
if (path != NULL) {
|
||||
/* sometimes NULL remains, need to do deeper analysis soon */
|
||||
free(path);
|
||||
path = NULL;
|
||||
} else {
|
||||
volatile static int debug_thread_btm;
|
||||
debug_thread_btm++;
|
||||
}
|
||||
free(ui_btm_right_block);
|
||||
|
||||
path = getcwd(NULL, 0);
|
||||
|
Reference in New Issue
Block a user