nova/th
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simplification of thread_top

Browse Source
This commit is contained in:
nova
2026-05-14 23:50:21 +02:00
parent f5d0c8bc85
commit 1aa66c82fb
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
threading.c
View File

@@ -214,7 +214,6 @@ void *thread_rgt(){
pthread_mutex_unlock(&mutex_mid); pthread_mutex_unlock(&mutex_mid);
werase(win_r);
if (rgt_dir.current_file->permissions & S_IRUSR) { if (rgt_dir.current_file->permissions & S_IRUSR) {
if (rgt_dir.current_file->file_type &= FILE_TYPE_DIR) { if (rgt_dir.current_file->file_type &= FILE_TYPE_DIR) {
#if SETTINGS_UEBERZUG_IMAGE_PREVIEW != 0 #if SETTINGS_UEBERZUG_IMAGE_PREVIEW != 0
@@ -231,6 +230,7 @@ void *thread_rgt(){
rgt_dir.current_file = NULL; rgt_dir.current_file = NULL;
} }
pthread_mutex_lock(&mutex_render); pthread_mutex_lock(&mutex_render);
werase(win_r);
print_dir(win_r, 0, &rgt_dir); print_dir(win_r, 0, &rgt_dir);
wnoutrefresh(win_r); wnoutrefresh(win_r);
pthread_mutex_unlock(&mutex_render); pthread_mutex_unlock(&mutex_render);
@@ -241,6 +241,7 @@ void *thread_rgt(){
rgt_buffer = preview_file(rgt_dir.current_file); rgt_buffer = preview_file(rgt_dir.current_file);
rgt_dir.current_file->file_type |= FILE_TYPE_OPEN_FILE; rgt_dir.current_file->file_type |= FILE_TYPE_OPEN_FILE;
pthread_mutex_lock(&mutex_render); pthread_mutex_lock(&mutex_render);
werase(win_r);
if (rgt_dir.current_file->file_type == FILE_TYPE_OPEN_FILE) { if (rgt_dir.current_file->file_type == FILE_TYPE_OPEN_FILE) {
mvwaddnstr(win_r, 0, 0, rgt_buffer, (terminal_width/2) * terminal_width); mvwaddnstr(win_r, 0, 0, rgt_buffer, (terminal_width/2) * terminal_width);
} else if ((rgt_dir.current_file->permissions & S_IRUSR) == 0) { } else if ((rgt_dir.current_file->permissions & S_IRUSR) == 0) {
@@ -281,27 +282,27 @@ void *thread_top(){
pthread_mutex_unlock(&mutex_top); pthread_mutex_unlock(&mutex_top);
continue; continue;
} }
top_buffer = malloc(strlen(global_path)+1);
memcpy(top_buffer, global_path, strlen(global_path)+1); pthread_mutex_lock(&mutex_mid);
top_buffer = malloc(strlen(global_path)+1 + strlen(mid_dir.current_file->file_name)+1);
memcpy(top_buffer, global_path, strlen(global_path));
memcpy(top_buffer + strlen(global_path) + 1, mid_dir.current_file->file_name, strlen(mid_dir.current_file->file_name)+1);
pthread_mutex_unlock(&mutex_mid);
top_buffer[strlen(global_path)] = '/';
top_width = strlen(top_buffer); top_width = strlen(top_buffer);
/* rendering */ /* rendering */
pthread_mutex_lock(&mutex_mid);
pthread_mutex_lock(&mutex_render); pthread_mutex_lock(&mutex_render);
werase(win_t); werase(win_t);
if (*top_buffer != ' ') { /*printing ' ' (standard initialized value, see threading_init) makes valgrind throw a fuss*/
wattron(win_t, COLOR_PAIR(COLOR_PATH)); wattron(win_t, COLOR_PAIR(COLOR_PATH));
mvwaddstr(win_t, 0, 0, top_buffer); mvwaddnstr(win_t, 0, 0, top_buffer, strlen(global_path)+1);
mvwaddch(win_t, 0, strlen(top_buffer), '/');
wattroff(win_t, COLOR_PAIR(COLOR_PATH)); wattroff(win_t, COLOR_PAIR(COLOR_PATH));
if (mid_dir.file_count != 0 && !(mid_dir.current_file == NULL)) { mvwaddstr(win_t, 0, strlen(global_path)+1, top_buffer+strlen(global_path)+1);
mvwaddstr(win_t, 0, strlen(top_buffer)+1, mid_dir.current_file->file_name);
}
}
wnoutrefresh(win_t); wnoutrefresh(win_t);
pthread_mutex_unlock(&mutex_render); pthread_mutex_unlock(&mutex_render);
pthread_mutex_unlock(&mutex_mid);
pthread_mutex_unlock(&mutex_top); pthread_mutex_unlock(&mutex_top);