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

cleanup

Browse Source
This commit is contained in:
nova
2026-06-16 22:52:03 +02:00
parent eafb13d3e2
commit ef4e49e022
6 changed files with 6 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
colors.c
-2
View File
@@ -9,7 +9,6 @@
unsigned int color_count;
color *colors;
extern unsigned int settings;
extern unsigned int status;
void parse_colors(char *line, short *fg, short *bg){
@@ -31,7 +30,6 @@ void parse_colors(char *line, short *fg, short *bg){
void colors_init() {
if (has_colors()) {
settings |= SETTINGS_HAS_COLOR;
start_color();
color_count = 0;
defines.h
+2 -4
View File
@@ -3,10 +3,8 @@
#define STATUS_QUIT_PROGRAM 1
#define STATUS_RUN_BACKEND 2
#define STATUS_RELOAD_DIRECTORY 4
#define STATUS_UPDATE_ASYNC_REFRESH 8
#define STATUS_UPDATE_SCREEN_RESIZE 16
#define STATUS_UPDATE_SCREEN_CLEAR 32
#define STATUS_UPDATE_SCREEN_MASK (STATUS_UPDATE_ASYNC_REFRESH | STATUS_UPDATE_SCREEN_RESIZE | STATUS_UPDATE_SCREEN_CLEAR)
#define STATUS_UPDATE_SCREEN_RESIZE 8
#define STATUS_UPDATE_SCREEN_CLEAR 16
#define STATUS_USER_ROOT 128
#define STATUS_INPUT_MATCH 256
#define STATUS_DELTA_TIME 512
interactions.c
+2 -2
View File
@@ -155,7 +155,7 @@ void quit_program(){
status = STATUS_QUIT_PROGRAM;
}
void update(){
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK | STATUS_RELOAD_DIRECTORY );
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_CLEAR | STATUS_RELOAD_DIRECTORY );
}
void select_all(){
unsigned long i;
@@ -432,7 +432,7 @@ void jump_to_dir(unsigned long passes, int index){
}
free(to_env);
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK | STATUS_RELOAD_DIRECTORY );
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_CLEAR | STATUS_RELOAD_DIRECTORY );
}
void order_by(unsigned long passes, int index){
(void)passes;
main.c
+2 -5
View File
@@ -9,7 +9,6 @@
#include "defines.h"
#include "config.h"
#include "threading.h"
#include "window.c"
#include "colors.h"
#include "interactions.h"
@@ -18,9 +17,8 @@ unsigned int terminal_height;
unsigned int terminal_width;
unsigned int temp_heigth = 0; /*used for screen refresh*/
unsigned int temp_width = 0;
unsigned int settings;
unsigned int file_modifiers = 0;
unsigned int status = (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK | STATUS_RELOAD_DIRECTORY) & ~STATUS_UPDATE_SCREEN_RESIZE;
unsigned int status = (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_CLEAR | STATUS_UPDATE_SCREEN_RESIZE | STATUS_RELOAD_DIRECTORY) & ~STATUS_UPDATE_SCREEN_RESIZE;
char *global_path;
time_t seed;
@@ -149,9 +147,8 @@ void render_pass(){
mvwin(win_b, terminal_height-1, 0);
}
if (pthread_mutex_lock(&mutex_render) == 0 || status & STATUS_UPDATE_SCREEN_MASK) {
if (pthread_mutex_lock(&mutex_render) == 0) {
doupdate();
status &= ~STATUS_UPDATE_SCREEN_MASK;
pthread_mutex_unlock(&mutex_render);
}
}
window.c
-118
View File
@@ -1,118 +0,0 @@
#include <curses.h>
#include <pthread.h>
#include <unistd.h>
#include "defines.h"
#include "dir.h"
extern unsigned int terminal_height;
extern unsigned int terminal_width;
extern unsigned int status;
extern char *input;
extern unsigned int timeout_time;
extern unsigned int color_count;
extern color *colors;
extern dir rgt_dir;
extern dir mid_dir;
extern dir lft_dir;
extern char *top_buffer;
extern char *rgt_buffer;
extern char *btm_buffer;
extern unsigned long top_width;
extern pthread_mutex_t mutex_top;
extern pthread_mutex_t mutex_btm;
extern pthread_mutex_t mutex_lft;
extern pthread_mutex_t mutex_mid;
extern pthread_mutex_t mutex_rgt;
void window_top(WINDOW *win){
if (pthread_mutex_trylock(&mutex_top) == 0) {
if (*top_buffer != ' ') { /*printing ' ' (standard initialized value, see threading_init) makes valgrind throw a fuss*/
wattron(win, COLOR_PAIR(COLOR_PATH));
mvwaddstr(win, 0, 0, top_buffer);
mvwaddch(win, 0, strlen(top_buffer), '/');
wattroff(win, COLOR_PAIR(COLOR_PATH));
if (mid_dir.file_count != 0) {
mvwaddstr(win, 0, strlen(top_buffer)+1, mid_dir.current_file->file_name);
}
}
pthread_mutex_unlock(&mutex_top);
} else {
mvwaddstr(win, 0, terminal_width/2, "LOADING");
/*
status |= STATUS_UPDATE_SCREEN_GENERIC;
*/
}
}
void window_btm(WINDOW *win){
if (pthread_mutex_trylock(&mutex_btm) == 0) {
if (*top_buffer != ' ') { /*printing ' ' (standard initialized value, see threading_init) makes valgrind throw a fuss*/
mvwprintw(win, 0, 0, "%s", btm_buffer);
}
pthread_mutex_unlock(&mutex_btm);
/*the printing of the input char is done in user_interactions*/
/*the printing of all possible inputs are done in user_interactions */
} else {
mvwaddstr(win, 0, terminal_width/2, "LOADING");
/*
status |= STATUS_UPDATE_SCREEN_GENERIC;
*/
}
}
void window_lft(WINDOW *win){
if (pthread_mutex_trylock(&mutex_lft) == 0) {
print_dir(win, 0, &lft_dir);
pthread_mutex_unlock(&mutex_lft);
} else {
mvwaddstr(win, terminal_height/2, terminal_width/8, "LOADING");
/*
status |= STATUS_UPDATE_SCREEN_GENERIC;
*/
}
}
void window_mid(WINDOW *win){
if (pthread_mutex_trylock(&mutex_mid) == 0) {
if (mid_dir.file_count == 0) {
mvwaddstr(win, 0, 0, "empty");
} else {
print_dir(win, 1, &mid_dir);
}
pthread_mutex_unlock(&mutex_mid);
} else {
mvwaddstr(win, terminal_height/2, terminal_width/4, "LOADING");
/*
status |= STATUS_UPDATE_SCREEN_GENERIC;
*/
}
}
void window_rgt(WINDOW *win){
if (pthread_mutex_trylock(&mutex_rgt) == 0) {
if (!rgt_dir.current_file) {
mvwaddstr(win, 0, 0, "not accessible");
}else if (rgt_dir.current_file->file_type == FILE_TYPE_OPEN_FILE) {
mvwaddnstr(win, 0, 0, rgt_buffer, (terminal_width/2) * terminal_width);
} else if ((rgt_dir.current_file->permissions & S_IRUSR) == 0) {
mvwaddstr(win, 0, 0, "not accessible");
} else {
print_dir(win, 0, &rgt_dir);
}
pthread_mutex_unlock(&mutex_rgt);
} else {
mvwaddstr(win, terminal_height/2, terminal_width/4, "LOADING");
/*
status |= STATUS_UPDATE_SCREEN_GENERIC;
*/
}
}
window.h
-7
View File
@@ -1,7 +0,0 @@
#include "window.c"
void window_top(WINDOW *win);
void window_btm(WINDOW *win);
void window_lft(WINDOW *win);
void window_mid(WINDOW *win);
void window_rgt(WINDOW *win);