Compare commits

...

15 Commits

Author SHA1 Message Date
nova
673c7e5414 bounds checking and changes to the pthread signals 2026-05-10 19:45:55 +02:00
nova
93c70aa07a adjustments as a result of asynic rendering 2026-05-10 19:45:04 +02:00
nova
edcf093269 improved main loop sequence for the async rendering 2026-05-10 19:44:17 +02:00
nova
557e0eb416 small change 2026-05-10 19:13:16 +02:00
nova
3c0f26efee attempted multithreadded rendering 2026-05-10 19:12:39 +02:00
nova
491c00b9d4 improvements to the threading 2026-05-10 18:28:54 +02:00
nova
955d8f439b reimplementations of some functions 2026-05-08 22:02:51 +02:00
nova
d9d1ed115d improvements to the rendering 2026-05-06 22:27:24 +02:00
nova
41293c6afd improvements to the rendering 2026-05-06 22:21:33 +02:00
nova
1a85a2d810 fix of out of bounds memory access in 2 places 2026-05-05 20:07:56 +02:00
nova
e5625ada08 start of a major rewrite 2026-05-05 19:41:45 +02:00
nova
b639ad3998 chonfig adjustment 2026-05-01 22:18:08 +02:00
nova
1711926003 string escaping 2026-05-01 22:17:33 +02:00
nova
6372dbba69 improvements to sort_random 2026-04-04 21:58:43 +02:00
nova
acb7db1617 bg no longer as string, now also only on hovered 2026-03-28 15:32:53 +01:00
16 changed files with 656 additions and 1054 deletions

View File

@@ -80,27 +80,54 @@ char* smartstrcasestr(const char *haystack, const char *needle){
return ret; return ret;
} }
char* parse_cmd_char(const char *cmd, const char *path){
char *index = strstr(cmd, SETTINGS_COMMAND_REPLACE_STR);
char *out;
if (index) { char* parse_cmd(const char *cmd, file *f){
out = malloc(strlen(cmd) + 1 + strlen(path) + 1); const char *offset = strstr(cmd, SETTINGS_COMMAND_REPLACE_STR);
char *o = out;
memcpy(out, cmd, index - cmd); int count = 0;
o += index-cmd; char *out;
*o = '\"'; char *pos;
o++; unsigned long i = 0;
memcpy(o, path, strlen(path)); while(f->file_name[i]) {
o += strlen(path); if (f->file_name[i] == '\'') {
*o = '\"'; count++;
memcpy(o+1, index + 1, strlen(index+1)); }
*(o+strlen(index+1)+1) = '\0'; i++;
return out; }
out = malloc(strlen(cmd) + 1 + (strlen(f->file_name)+(count*3)) + 3);
pos = out;
if (offset) {
memcpy(pos, cmd, offset - cmd);
pos += offset - cmd + 1;
} else { } else {
concat(out, cmd, " ./\"", 0); memcpy(pos, cmd, strlen(cmd));
concat(out, out, path, 1); pos += strlen(cmd) + 1;
concat(out, out, "\"", 1); }
pos[-1] = ' ';
pos[0] = '\'';
pos++;
i = 0;
while(f->file_name[i]) {
if (f->file_name[i] == '\'') {
*pos++ = '\'';
*pos++ = '\\';
*pos++ = '\'';
}
*pos = f->file_name[i];
pos++;
i++;
}
*pos = '\'';
if (offset) {
pos[1]= ' ';
memcpy(pos + 1, offset+1, strlen(offset+1));
pos[strlen(offset+1)] = '\0';
} else {
pos[1] = '\0';
} }
return out; return out;

View File

@@ -7,5 +7,5 @@
/*char* concat(const char *s1, const char *s2);*/ /*char* concat(const char *s1, const char *s2);*/
char* smartstrcasestr(const char *haystack, const char *needle); char* smartstrcasestr(const char *haystack, const char *needle);
char* parse_cmd_char(const char *cmd, const char *path); char* parse_cmd(const char *cmd, file *f);

View File

@@ -9,9 +9,6 @@
unsigned int color_count; unsigned int color_count;
color *colors; color *colors;
extern file *rgt_content;
extern unsigned long rgt_file_count;
extern unsigned int settings; extern unsigned int settings;
extern unsigned int status; extern unsigned int status;

View File

@@ -2,8 +2,8 @@
#define SETTINGS_UEBERZUG_IMAGE_PREVIEW 1 /* 0 is disabled, 1 is enabled, 2 is with caching; depends on ueberzug */ #define SETTINGS_UEBERZUG_IMAGE_PREVIEW 1 /* 0 is disabled, 1 is enabled, 2 is with caching; depends on ueberzug */
#define SETTINGS_RELOAD_DIR_DELTA 10 /* 0 is disabled, time in seconds between automatic refresh of dir contents */ #define SETTINGS_RELOAD_DIR_DELTA 10 /* 0 is disabled, time in seconds between automatic refresh of dir contents */
#define SETTINGS_CURSES_TIMEOUT 100 /* read: inopts(3NCURSES), blocking time between user inputs */ #define SETTINGS_CURSES_TIMEOUT 100 /* read: inopts(3NCURSES), blocking time between user inputs */
#define SETTINGS_COMMAND_REPLACE_STR "%" /* if a command in any cmd inside this fle contains this string, it will be replaced with the hovered/selected file name #define SETTINGS_COMMAND_REPLACE_STR "^" /* if a command in any cmd inside this fle contains this string, it will be replaced with the hovered/selected file name
* as of right now, this character cannot be escaped; i.e ``command\% --arg`` will parse into ``command\path_of_hovered_file --arg``*/ * as of right now, this character cannot be escaped; i.e ``command\^ --arg`` will parse into ``command\path_of_hovered_file --arg``*/
/* {{{ */ /* {{{ */
#ifndef CONFIG_GUARD #ifndef CONFIG_GUARD
@@ -22,10 +22,10 @@ static const mimetype mimetype_default_cmd[] = {
* gives us "image/gif", thusly if we want to open gif in mpv rather than feh, * gives us "image/gif", thusly if we want to open gif in mpv rather than feh,
* we need to define "gif" before "image" */ * we need to define "gif" before "image" */
{ "text", "$EDITOR" }, { "text", "$EDITOR" },
{ "avif", "nohup mpv % >/dev/null 2>&1 &" }, { "avif", "nohup mpv ^ >/dev/null 2>&1 &" },
{ "gif", "nohup mpv --loop-file=\"inf\" % >/dev/null 2>&1 &" }, { "gif", "nohup mpv --loop-file=\"inf\" ^ >/dev/null 2>&1 &" },
{ "image", "feh % >/dev/null 2>&1 &" }, { "image", "feh ^ >/dev/null 2>&1 &" },
{ "video", "nohup mpv % >/dev/null 2>&1 &" }, { "video", "nohup mpv ^ >/dev/null 2>&1 &" },
{ "audio", "mpv" }, { "audio", "mpv" },
{ "pdf", "zathura" }, { "pdf", "zathura" },
}; };
@@ -34,8 +34,8 @@ static const extension file_extension_default_cmd[] = {
* similar to mimetype_default_cmd, however it searches for exact string matches * similar to mimetype_default_cmd, however it searches for exact string matches
* and is checked before mimetype_default_cmd */ * and is checked before mimetype_default_cmd */
{ ".exe", "wine"}, { ".exe", "wine"},
{ ".cbz", "mcomix % &"}, { ".cbz", "mcomix ^ &"},
{ ".cbr", "mcomix % &"}, { ".cbr", "mcomix ^ &"},
{ ".json", "$EDITOR"}, { ".json", "$EDITOR"},
{ ".csv", "$EDITOR"}, { ".csv", "$EDITOR"},
{ ".blend", "blender-bin-5.0.0"}, /* version number in bin in main repo? yea idc */ { ".blend", "blender-bin-5.0.0"}, /* version number in bin in main repo? yea idc */

View File

@@ -3,13 +3,15 @@
#define STATUS_QUIT_PROGRAM 1 #define STATUS_QUIT_PROGRAM 1
#define STATUS_RUN_BACKEND 2 #define STATUS_RUN_BACKEND 2
#define STATUS_RELOAD_DIRECTORY 4 #define STATUS_RELOAD_DIRECTORY 4
#define STATUS_UPDATE_SCREEN_MASK 24 /* 11000 */ #define STATUS_UPDATE_SCREEN_GENERIC 8
#define STATUS_UPDATE_SCREEN_0 8
#define STATUS_UPDATE_SCREEN_RESIZE 16 #define STATUS_UPDATE_SCREEN_RESIZE 16
#define STATUS_UPDATE_SCREEN_RELOAD_FULL 32 #define STATUS_UPDATE_SCREEN_CLEAR 32
#define STATUS_USER_ROOT 64 #define STATUS_UPDATE_SCREEN_DIR_CHANGE 64
#define STATUS_INPUT_MATCH 128 #define STATUS_UPDATE_SCREEN_MASK (STATUS_UPDATE_SCREEN_GENERIC | STATUS_UPDATE_SCREEN_RESIZE | STATUS_UPDATE_SCREEN_CLEAR | STATUS_UPDATE_SCREEN_DIR_CHANGE)
#define STATUS_DELTA_TIME 256 #define STATUS_USER_ROOT 128
#define STATUS_INPUT_MATCH 256
#define STATUS_DELTA_TIME 512
#define STATUS_MOVE_RIGHT_MATCH 1024
#define SETTINGS_HAS_COLOR 1 #define SETTINGS_HAS_COLOR 1
@@ -70,6 +72,11 @@ typedef struct File {
unsigned long file_size; /*if its a file, its in bytes, if its a dir, its the count of files within that dir */ unsigned long file_size; /*if its a file, its in bytes, if its a dir, its the count of files within that dir */
char *file_name; char *file_name;
} file; } file;
typedef struct Dir {
file *current_file;
file *file_list;
unsigned long file_count;
} dir;
typedef struct Color { typedef struct Color {
char *file_extension; char *file_extension;
short color_pair; short color_pair;

137
dir.c
View File

@@ -12,8 +12,7 @@
#include "config.h" #include "config.h"
extern file *mid_content; extern dir mid_dir;
extern unsigned long mid_file_count;
extern unsigned int settings; extern unsigned int settings;
extern unsigned int file_modifiers; extern unsigned int file_modifiers;
extern unsigned int color_count; extern unsigned int color_count;
@@ -48,85 +47,87 @@ unsigned long get_dir_size(char *path){
} }
void get_dir_content(char *path, unsigned long *dir_file_count, file *dir_content){ void get_dir_content(char *path, dir *dir){
struct dirent **entry = NULL; struct dirent **entry = NULL;
if (file_modifiers & FILE_MODIFIERS_HIDDEN_FILES) { /* print hidden files */ if (file_modifiers & FILE_MODIFIERS_HIDDEN_FILES) { /* print hidden files */
scandir(path, &entry, skip_dot, NULL); scandir(path, &entry, skip_dot, NULL);
} else { } else {
scandir(path, &entry, skip_hidden_files, NULL); scandir(path, &entry, skip_hidden_files, NULL);
} }
char *full_path = NULL;
unsigned long i = 0; unsigned long i = 0;
for (i = 0; i < *dir_file_count; i++ ) { for (i = 0; i < dir->file_count; i++ ) {
dir->file_list[i].file_name = NULL;
if (entry[i]->d_name[0] == '.' && !(file_modifiers & FILE_MODIFIERS_HIDDEN_FILES)) { if (entry[i]->d_name[0] == '.' && !(file_modifiers & FILE_MODIFIERS_HIDDEN_FILES)) {
} else { } else {
dir_content[i].file_name = malloc(strlen(entry[i]->d_name)+1); dir->file_list[i].file_name = malloc(strlen(entry[i]->d_name)+1);
memcpy(dir_content[i].file_name, entry[i]->d_name, strlen(entry[i]->d_name) + 1); memcpy(dir->file_list[i].file_name, entry[i]->d_name, strlen(entry[i]->d_name) + 1);
dir->file_list[i].status = 0;
struct stat *file; struct stat *file;
file = malloc(sizeof(struct stat)); file = malloc(sizeof(struct stat));
/* using the full path allows using the same function for all windows */ /* using the full path allows using the same function for all windows */
char *full_path = malloc(strlen(path) + strlen(entry[i]->d_name) + 1 + sizeof("/")); full_path = malloc(strlen(path) + strlen(entry[i]->d_name) + 1 + sizeof("/"));
memcpy(full_path, path, strlen(path)); memcpy(full_path, path, strlen(path));
memcpy(full_path + strlen(path) + sizeof("/") - 1, entry[i]->d_name, strlen(entry[i]->d_name) + 1); memcpy(full_path + strlen(path) + sizeof("/") - 1, entry[i]->d_name, strlen(entry[i]->d_name) + 1);
full_path[strlen(path)] = '/'; full_path[strlen(path)] = '/';
lstat(full_path, file); lstat(full_path, file);
dir_content[i].file_size = file->st_size; dir->file_list[i].file_size = file->st_size;
dir_content[i].permissions = file->st_mode; dir->file_list[i].permissions = file->st_mode;
if (S_ISLNK(file->st_mode)) { if (S_ISLNK(file->st_mode)) {
stat(full_path, file); stat(full_path, file);
if (S_ISDIR(file->st_mode)) { if (S_ISDIR(file->st_mode)) {
dir_content[i].file_type = FILE_TYPE_DIR | FILE_TYPE_SYMLINK; dir->file_list[i].file_type = FILE_TYPE_DIR | FILE_TYPE_SYMLINK;
dir_content[i].color_pair = COLOR_SYMLINK; dir->file_list[i].color_pair = COLOR_SYMLINK;
dir_content[i].file_size = get_dir_size(full_path); dir->file_list[i].file_size = get_dir_size(full_path);
} else { } else {
dir_content[i].file_type = FILE_TYPE_REGULAR | FILE_TYPE_SYMLINK; dir->file_list[i].file_type = FILE_TYPE_REGULAR | FILE_TYPE_SYMLINK;
dir_content[i].color_pair = COLOR_SYMLINK; dir->file_list[i].color_pair = COLOR_SYMLINK;
} }
} else if (S_ISDIR(file->st_mode)) { } else if (S_ISDIR(file->st_mode)) {
dir_content[i].file_type = FILE_TYPE_DIR; dir->file_list[i].file_type = FILE_TYPE_DIR;
dir_content[i].color_pair = COLOR_DIR; dir->file_list[i].color_pair = COLOR_DIR;
dir_content[i].file_size = get_dir_size(full_path); dir->file_list[i].file_size = get_dir_size(full_path);
} else if (file->st_mode & S_IXUSR) { } else if (file->st_mode & S_IXUSR) {
dir_content[i].file_type = FILE_TYPE_EXEC; dir->file_list[i].file_type = FILE_TYPE_EXEC;
dir_content[i].color_pair = COLOR_EXEC; dir->file_list[i].color_pair = COLOR_EXEC;
} else if (S_ISREG(file->st_mode)) { } else if (S_ISREG(file->st_mode)) {
dir_content[i].file_type = FILE_TYPE_REGULAR; dir->file_list[i].file_type = FILE_TYPE_REGULAR;
dir_content[i].color_pair = COLOR_REGULAR; dir->file_list[i].color_pair = COLOR_REGULAR;
unsigned long j = 0; unsigned long j = 0;
char *extension = strrchr(entry[i]->d_name, '.'); char *extension = strrchr(entry[i]->d_name, '.');
if (extension) { if (extension) {
for (j = 0; j < color_count; j++) { for (j = 0; j < color_count; j++) {
if (!strcmp(colors[j].file_extension, extension)) { if (!strcmp(colors[j].file_extension, extension)) {
dir_content[i].color_pair = colors[j].color_pair; dir->file_list[i].color_pair = colors[j].color_pair;
} }
} }
} }
} else if (S_ISBLK(file->st_mode)) { } else if (S_ISBLK(file->st_mode)) {
dir_content[i].file_type = FILE_TYPE_BLOCK; dir->file_list[i].file_type = FILE_TYPE_BLOCK;
dir_content[i].color_pair = COLOR_BLOCK; dir->file_list[i].color_pair = COLOR_BLOCK;
} else if (S_ISCHR(file->st_mode)) { } else if (S_ISCHR(file->st_mode)) {
dir_content[i].file_type = COLOR_CHARDEV; dir->file_list[i].file_type = COLOR_CHARDEV;
} else if (S_ISFIFO(file->st_mode)) { } else if (S_ISFIFO(file->st_mode)) {
dir_content[i].file_type = FILE_TYPE_FIFO; dir->file_list[i].file_type = FILE_TYPE_FIFO;
dir_content[i].color_pair = COLOR_FIFO; dir->file_list[i].color_pair = COLOR_FIFO;
} else if (S_ISSOCK(file->st_mode)) { } else if (S_ISSOCK(file->st_mode)) {
dir_content[i].file_type = FILE_TYPE_SOCK; dir->file_list[i].file_type = FILE_TYPE_SOCK;
dir_content[i].color_pair = COLOR_SOCK; dir->file_list[i].color_pair = COLOR_SOCK;
} else { } else {
dir_content[i].file_type = COLOR_REGULAR; dir->file_list[i].file_type = COLOR_REGULAR;
dir_content[i].color_pair = COLOR_REGULAR; dir->file_list[i].color_pair = COLOR_REGULAR;
unsigned long j = 0; unsigned long j = 0;
char *extension = strrchr(entry[i]->d_name, '.'); char *extension = strrchr(entry[i]->d_name, '.');
if (extension) { if (extension) {
for (j = 0; j < color_count; j++) { for (j = 0; j < color_count; j++) {
if (!strcmp(colors[j].file_extension, extension)) { if (!strcmp(colors[j].file_extension, extension)) {
dir_content[i].color_pair = colors[j].color_pair; dir->file_list[i].color_pair = colors[j].color_pair;
} }
} }
} else { } else {
@@ -138,20 +139,16 @@ void get_dir_content(char *path, unsigned long *dir_file_count, file *dir_conten
} }
} }
qsort(dir_content, *dir_file_count, sizeof(file), order_func); qsort(dir->file_list, dir->file_count, sizeof(file), order_func);
free(entry); free(entry);
} }
void print_dir(WINDOW *win, char print_info, unsigned long *dir_file_count, file *dir_content){ void print_dir(WINDOW *win, char print_info, dir *dir){
/* i am not proud of this function */ /* i am not proud of this function */
unsigned long line_width = getmaxx(win); unsigned long line_width = getmaxx(win);
char *bg = malloc(line_width+1);
memset(bg, ' ', line_width);
bg[line_width] = '\0';
unsigned long i = 0; unsigned long i = 0;
float file_size; float file_size;
float printed_size = 0; float printed_size = 0;
@@ -165,22 +162,23 @@ void print_dir(WINDOW *win, char print_info, unsigned long *dir_file_count, file
#else #else
long offset_front = 2; long offset_front = 2;
#endif #endif
unsigned long selected_file_current = dir->current_file - dir->file_list;
long offset_index = 2; /* only used for the index of the file itself */ long offset_index = 2; /* only used for the index of the file itself */
if (print_info) { if (print_info) {
if (*dir_file_count > 9) { if (dir->file_count > 9) {
#if SETTINGS_LINE_NUMBERS != 0 #if SETTINGS_LINE_NUMBERS != 0
unsigned long dir_file_count_ = *dir_file_count; unsigned long dir_file_count_ = dir->file_count;
while(dir_file_count_ > 9) { while(dir_file_count_ > 9) {
offset_front++; offset_front++;
dir_file_count_ /= 10; dir_file_count_ /= 10;
} }
#endif #endif
} }
if (selected_file_current > (terminal_height/3)*2 && *dir_file_count > terminal_height - 2) { if (selected_file_current > (terminal_height/3)*2 && dir->file_count > terminal_height - 2) {
if (selected_file_current + (terminal_height/3) >= *dir_file_count) { if (selected_file_current + (terminal_height/3) >= dir->file_count) {
offset_vertical = *dir_file_count - terminal_height+2; offset_vertical = dir->file_count - terminal_height+2;
} else { } else {
offset_vertical = selected_file_current - (terminal_height/3)*2; offset_vertical = selected_file_current - (terminal_height/3)*2;
} }
@@ -188,12 +186,12 @@ void print_dir(WINDOW *win, char print_info, unsigned long *dir_file_count, file
} else { } else {
offset_front = 0; offset_front = 0;
} }
for (i = offset_vertical; i < *dir_file_count && i < (terminal_height + offset_vertical); i++) { for (i = offset_vertical; i < dir->file_count && i < (terminal_height + offset_vertical); i++) {
if (print_info) { if (print_info) {
file_size = dir_content[i].file_size; file_size = dir->file_list[i].file_size;
char size_index = -1; char size_index = -1;
do { do {
@@ -203,8 +201,8 @@ void print_dir(WINDOW *win, char print_info, unsigned long *dir_file_count, file
} while (file_size > 1 && size_index < size_unit_count); } while (file_size > 1 && size_index < size_unit_count);
size_char = size_unit[(unsigned)size_index]; size_char = size_unit[(unsigned)size_index];
if (dir_content[i].file_type &= FILE_TYPE_DIR) { if (dir->file_list[i].file_type &= FILE_TYPE_DIR) {
offset_back = line_width - (snprintf(NULL,0,"%ld", dir_content[i].file_size) + 1); offset_back = line_width - (snprintf(NULL,0,"%ld", dir->file_list[i].file_size) + 1);
} else if (size_char =='B') { } else if (size_char =='B') {
offset_back = line_width - (snprintf(NULL,0,"%0.0lf %c", printed_size, size_char) + 1); offset_back = line_width - (snprintf(NULL,0,"%0.0lf %c", printed_size, size_char) + 1);
} else { } else {
@@ -214,24 +212,29 @@ void print_dir(WINDOW *win, char print_info, unsigned long *dir_file_count, file
offset_back = line_width; offset_back = line_width;
} }
if (dir_content[i].status & FILE_STATUS_SELECTED) { if (dir->file_list[i].status & FILE_STATUS_SELECTED) {
is_selected = 1; is_selected = 1;
} else { } else {
is_selected = 0; is_selected = 0;
} }
if (dir_content[i].status & FILE_STATUS_SELECTED) { if (dir->file_list[i].status & FILE_STATUS_SELECTED) {
wattron(win, COLOR_PAIR(8)); wattron(win, COLOR_PAIR(8));
} else { } else {
wattron(win, COLOR_PAIR(dir_content[i].color_pair)); wattron(win, COLOR_PAIR(dir->file_list[i].color_pair));
} }
if (dir_content[i].status & FILE_STATUS_HOVER) { if (&dir->file_list[i] == dir->current_file) {
wattron(win, A_REVERSE); wattron(win, A_REVERSE);
unsigned long bg = 0;
for (bg = 0; bg < line_width; bg++) {
mvwaddch(win, i-offset_vertical, bg, ' ');
}
} else { } else {
wattroff(win, A_REVERSE); wattroff(win, A_REVERSE);
} }
mvwaddstr(win, i-offset_vertical, 0, bg);
if(print_info) { if(print_info) {
#if SETTINGS_LINE_NUMBERS == 2 #if SETTINGS_LINE_NUMBERS == 2
long i_ = (selected_file_current) - i; long i_ = (selected_file_current) - i;
@@ -264,39 +267,38 @@ void print_dir(WINDOW *win, char print_info, unsigned long *dir_file_count, file
#endif #endif
if (dir_content[i].file_type &= FILE_TYPE_DIR) { if (dir->file_list[i].file_type &= FILE_TYPE_DIR) {
mvwprintw(win, i-offset_vertical, offset_back, "%ld", dir_content[i].file_size); mvwprintw(win, i-offset_vertical, offset_back, "%ld", dir->file_list[i].file_size);
}else if (size_char =='B') { }else if (size_char =='B') {
mvwprintw(win, i-offset_vertical, offset_back, "%0.0lf %c", printed_size, size_char); mvwprintw(win, i-offset_vertical, offset_back, "%0.0lf %c", printed_size, size_char);
} else { } else {
mvwprintw(win, i-offset_vertical, offset_back, "%0.2lf %c", printed_size, size_char); mvwprintw(win, i-offset_vertical, offset_back, "%0.2lf %c", printed_size, size_char);
} }
} }
char *extension = strrchr(dir_content[i].file_name, '.'); char *extension = strrchr(dir->file_list[i].file_name, '.');
size_t printable_size = offset_back-offset_front-is_selected-2; unsigned long printable_size = offset_back-offset_front-is_selected-2;
mvwaddnstr(win, i-offset_vertical, offset_front+is_selected, dir_content[i].file_name, printable_size); mvwaddnstr(win, i-offset_vertical, offset_front+is_selected, dir->file_list[i].file_name, printable_size);
if (extension && printable_size <= strlen(dir_content[i].file_name)) { if (extension && printable_size <= strlen(dir->file_list[i].file_name)) {
mvwaddnstr(win, i-offset_vertical, offset_back-strlen(extension)-1, extension, strlen(extension)); mvwaddnstr(win, i-offset_vertical, offset_back-strlen(extension)-1, extension, strlen(extension));
mvwaddnstr(win, i-offset_vertical, offset_back-strlen(extension)-2, "~", 1); mvwaddnstr(win, i-offset_vertical, offset_back-strlen(extension)-2, "~", 1);
} }
if (dir_content[i].status & FILE_STATUS_SELECTED) { if (dir->file_list[i].status & FILE_STATUS_SELECTED) {
wattroff(win, COLOR_PAIR(8)); wattroff(win, COLOR_PAIR(8));
} else { } else {
wattroff(win, COLOR_PAIR(dir_content[i].color_pair)); wattroff(win, COLOR_PAIR(dir->file_list[i].color_pair));
} }
/*free(file_name);*/
} }
free(bg);
} }
char update_selected_file(){ char update_selected_file(){
char ret = -1; /* -1 on empty or inaccessible file, 0 on unchanged file, 1 on changed file */ char ret = -1; /* -1 on empty or inaccessible file, 0 on unchanged file, 1 on changed file */
/*
if (selected_file_current >= mid_file_count) { if (selected_file_current >= mid_file_count) {
selected_file_current = mid_file_count-1; selected_file_current = mid_file_count-1;
} }
@@ -306,18 +308,22 @@ char update_selected_file(){
} else { } else {
ret = 0; ret = 0;
} }
mid_content[selected_file_current].status |= FILE_STATUS_HOVER; mid_dir.current_dir.status |= FILE_STATUS_HOVER;
selected_file_last = selected_file_current; selected_file_last = selected_file_current;
*/
return ret; return ret;
} }
void dir_set_selected_file_current(unsigned long selected_file_current){ void dir_set_selected_file_current(unsigned long selected_file_current){
/*
if (mid_content->file_name) { if (mid_content->file_name) {
current_dir->selected_file_current = selected_file_current; current_dir->selected_file_current = selected_file_current;
} }
*/
} }
unsigned long dir_get_selected_file_current(){ unsigned long dir_get_selected_file_current(){
/*
current_dir = visited_dirs; current_dir = visited_dirs;
if (mid_content->file_name[0] == '\0') { if (mid_content->file_name[0] == '\0') {
return 0; return 0;
@@ -340,6 +346,7 @@ unsigned long dir_get_selected_file_current(){
free(path); free(path);
return current_dir->selected_file_current; return current_dir->selected_file_current;
} }
*/
} }
void dir_init(){ void dir_init(){
visited_dirs = malloc(sizeof(linked_dir)); visited_dirs = malloc(sizeof(linked_dir));
@@ -351,6 +358,7 @@ void dir_init(){
} }
void recursive_delete(file current_file){ void recursive_delete(file current_file){
/*
if (S_ISLNK(current_file.permissions)) { if (S_ISLNK(current_file.permissions)) {
remove(current_file.file_name); remove(current_file.file_name);
} else if (current_file.file_type & FILE_TYPE_DIR ) { } else if (current_file.file_type & FILE_TYPE_DIR ) {
@@ -380,4 +388,5 @@ void recursive_delete(file current_file){
} else { } else {
remove(current_file.file_name); remove(current_file.file_name);
} }
*/
} }

4
dir.h
View File

@@ -4,8 +4,8 @@
#endif #endif
unsigned long get_dir_size(char *path); unsigned long get_dir_size(char *path);
void get_dir_content(char *path, unsigned long *dir_file_count, file *dir_content); void get_dir_content(char *path, dir *dir);
void print_dir(WINDOW *win, char print_info, unsigned long *dir_file_count, file *dir_content); void print_dir(WINDOW *win, char print_info, dir *dir);
char update_selected_file(); char update_selected_file();
void dir_set_selected_file_current(unsigned long selected_file_current); void dir_set_selected_file_current(unsigned long selected_file_current);
unsigned long dir_get_selected_file_current(); unsigned long dir_get_selected_file_current();

View File

@@ -13,26 +13,19 @@ extern unsigned int terminal_height;
extern unsigned int terminal_width; extern unsigned int terminal_width;
char previewd; char previewd;
char* text(char *path, unsigned long *file_size); char* text(file *f);
void images_print(char *file_name); void images_print(char *file_name);
void images_clear(); void images_clear();
char* generic(char *path); char* generic(file *f);
char* get_mimetype(char *path){ char* get_mimetype(file *f){
static char *cmd_str = "file --mime-type -b ./\""; static const char *cmd_str = "file --mime-type -b";
unsigned long cmd_len = strlen(cmd_str); char *cmd = parse_cmd(cmd_str, f);
unsigned int path_len = strlen(path);
char *cmd = malloc((cmd_len + path_len) + 2);
memset(cmd, ' ', cmd_len + path_len);
memcpy(cmd, cmd_str, cmd_len);
memcpy(cmd + cmd_len, path, path_len);
cmd[cmd_len + path_len] = '\"';
cmd[cmd_len + path_len + 1] = '\0';
FILE *cmd_open = popen(cmd, "r"); FILE *cmd_open = popen(cmd, "r");
char *line = NULL; char *line = NULL;
size_t size = 0; size_t size = 0;
free(cmd); free(cmd);
if (getline(&line, &size, cmd_open) != -1){ if (getline(&line, &size, cmd_open) != -1){
pclose(cmd_open); pclose(cmd_open);
@@ -42,57 +35,59 @@ char* get_mimetype(char *path){
return "unknown"; return "unknown";
} }
} }
char* preview_file(char *file_name, unsigned long file_size){ char* preview_file(file *f){
/* this calls "file" on path */ /* this calls "file" on path */
char *file_buffer; char *file_buffer;
char *mime = get_mimetype(f);
char *mime = get_mimetype(file_name);
#if SETTINGS_UEBERZUG_IMAGE_PREVIEW != 0 #if SETTINGS_UEBERZUG_IMAGE_PREVIEW != 0
images_clear(); images_clear();
#endif #endif
if (strstr(mime, "text")) { if (strstr(mime, "text")) {
file_buffer = text(file_name, &file_size); file_buffer = text(f);
#if SETTINGS_UEBERZUG_IMAGE_PREVIEW != 0 #if SETTINGS_UEBERZUG_IMAGE_PREVIEW != 0
} else if (strstr(mime, "image")) { } else if (strstr(mime, "image")) {
file_buffer = generic(file_name); file_buffer = generic(f);
images_print(file_name); images_print(f->file_name);
previewd = 1; previewd = 1;
#endif #endif
} else { } else {
file_buffer = generic(file_name); file_buffer = generic(f);
} }
free(mime); free(mime);
return file_buffer; return file_buffer;
} }
char* text(char *path, unsigned long *file_size){ char* text(file *f){
unsigned long size = (terminal_width/2) * terminal_height; unsigned long size = (terminal_width/2) * terminal_height;
if (size > *file_size) { if (size > f->file_size) {
size = *file_size; size = f->file_size;
} }
char *file_buffer = malloc(size + 1); char *file_buffer = malloc(size + 1);
FILE *fp = fopen(path, "r"); FILE *fp = fopen(f->file_name, "r");
if (fread(file_buffer, size, 1, fp) != 0) { if (fread(file_buffer, size, 1, fp) != 0) {
fclose(fp);
file_buffer[size] = '\0'; file_buffer[size] = '\0';
return file_buffer; return file_buffer;
} else { } else {
fclose(fp);
return "failed reading file"; return "failed reading file";
} }
} }
char* generic(char *path){ char* generic(file *f){
char *cmd; static const char *cmd_str = "file";
concat(cmd, "file ./\"", path, 0); char *cmd = parse_cmd(cmd_str, f);
concat(cmd, cmd, "\"", 1);
FILE *cmd_open = popen(cmd, "r"); FILE *cmd_open = popen(cmd, "r");
char *line = NULL; char *line = NULL;
size_t size = 0; size_t size = 0;
free(cmd);
if (getline(&line, &size, cmd_open) != -1) { if (getline(&line, &size, cmd_open) != -1) {
pclose(cmd_open); pclose(cmd_open);
return line; return line;

View File

@@ -4,8 +4,8 @@
#include "config.h" #include "config.h"
#endif #endif
char* preview_file(char *file_name, unsigned long file_size); char* preview_file(file *f);
char* get_mimetype(char *path); char* get_mimetype(file *f);
void images_clear(); void images_clear();
void ueberzug_init(); void ueberzug_init();
#if SETTINGS_UEBERZUG_IMAGE_PREVIEW != 0 #if SETTINGS_UEBERZUG_IMAGE_PREVIEW != 0

View File

@@ -21,9 +21,8 @@ extern pthread_mutex_t mutex_rgt;
extern pthread_mutex_t mutex_mid; extern pthread_mutex_t mutex_mid;
extern pthread_mutex_t mutex_btm; extern pthread_mutex_t mutex_btm;
extern pthread_cond_t cond_rgt; extern pthread_cond_t cond_rgt;
extern file *mid_content; extern pthread_cond_t cond_mid;
extern file *lft_content; extern dir mid_dir;
extern file *rgt_content;
extern unsigned int terminal_height; extern unsigned int terminal_height;
extern unsigned int terminal_width; extern unsigned int terminal_width;
@@ -32,13 +31,12 @@ extern WINDOW *win_b;
extern char *rgt_buffer; extern char *rgt_buffer;
extern char *btm_buffer; extern char *btm_buffer;
extern unsigned long mid_file_count;
extern unsigned int status; extern unsigned int status;
extern char *start_path; extern char *start_path;
extern char *input; extern char *input;
extern time_t *seed; extern time_t seed;
char search_buffer[INPUT_BUFFER_SIZE]; char search_buffer[INPUT_BUFFER_SIZE];
unsigned int input_pass; unsigned int input_pass;
@@ -46,16 +44,17 @@ unsigned long parsed_input_number;
yank yank_files = { 0 }; yank yank_files = { 0 };
extern void render_pass(); extern void render_pass();
extern void window_btm(WINDOW *win, char force_render);
extern int (*order_func)(); extern int (*order_func)();
#define TODO noraw(); \
endwin();\
curs_set(1);\
echo();\
printf("TODO: %s at %d in %s \n", __func__, __LINE__, __FILE__);\
exit(1);
void FAIL(char *function, char *str){ void FAIL(char *function, char *str){
noraw();
endwin();
curs_set(1);
echo();
printf("ERROR in function %s: %s", function, str); printf("ERROR in function %s: %s", function, str);
} }
void user_interactions() { void user_interactions() {
@@ -74,7 +73,6 @@ void user_interactions() {
memset(input, 0, INPUT_BUFFER_SIZE); memset(input, 0, INPUT_BUFFER_SIZE);
input_pass = 0; input_pass = 0;
} }
status |= STATUS_UPDATE_SCREEN_0;
} }
@@ -87,6 +85,9 @@ void user_interactions() {
input++; input++;
number_length++; number_length++;
} }
if (parsed_input_number == 0) {
parsed_input_number = 1;
}
input -= number_length; input -= number_length;
char cmp_len = strlen(input); char cmp_len = strlen(input);
@@ -96,8 +97,10 @@ void user_interactions() {
for (i = 0; i < binding_count; i++) { for (i = 0; i < binding_count; i++) {
if (strncmp(input + number_length, key_binding[i].key, cmp_len) == 0) { if (strncmp(input + number_length, key_binding[i].key, cmp_len) == 0) {
if (strcmp(input + number_length, key_binding[i].key) == 0) { if (strcmp(input + number_length, key_binding[i].key) == 0) {
pthread_mutex_lock(&mutex_mid);
func_ptr = key_binding[i].func; func_ptr = key_binding[i].func;
func_ptr(parsed_input_number, i); func_ptr(parsed_input_number, i);
pthread_mutex_unlock(&mutex_mid);
timeout(SETTINGS_CURSES_TIMEOUT); /* blocking timeout of getch() */ timeout(SETTINGS_CURSES_TIMEOUT); /* blocking timeout of getch() */
} else { } else {
@@ -137,9 +140,9 @@ int read_string(WINDOW *win, int y, int x, char *str){
err = 0; err = 0;
break; break;
} else if (ch == '\t') { /* tab */ } else if (ch == '\t') { /* tab */
memcpy(str + pass, mid_content[selected_file_current].file_name, strlen(mid_content[selected_file_current].file_name)); memcpy(str + pass, mid_dir.current_file->file_name, strlen(mid_dir.current_file->file_name));
mvwaddstr(win, y, x +pass, mid_content[selected_file_current].file_name); mvwaddstr(win, y, x +pass, mid_dir.current_file->file_name);
pass += strlen(mid_content[selected_file_current].file_name); pass += strlen(mid_dir.current_file->file_name);
} else if (ch == 127) { /* backspace */ } else if (ch == 127) { /* backspace */
if (pass > 0) { if (pass > 0) {
pass--; pass--;
@@ -163,386 +166,119 @@ int read_string(WINDOW *win, int y, int x, char *str){
void quit_program(){ void quit_program(){
status = STATUS_QUIT_PROGRAM; status = STATUS_QUIT_PROGRAM;
} }
void update(){
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK | STATUS_RELOAD_DIRECTORY );
}
void select_all(){ void select_all(){
pthread_mutex_lock(&mutex_selection); TODO;
pthread_mutex_lock(&mutex_mid);
unsigned long i;
for(i = 0; i < mid_file_count; i++) {
mid_content[i].status ^= FILE_STATUS_SELECTED;
}
pthread_mutex_unlock(&mutex_mid);
pthread_mutex_unlock(&mutex_selection);
} }
void move_down(unsigned long passes){ void move_down(unsigned long passes){
pthread_mutex_lock(&mutex_selection);
if (passes == 0) {
passes++;
}
selected_file_current += passes;
update_selected_file(); /*bounds checking happens within thread_mid*/
current_dir->selected_file_current = selected_file_current; mid_dir.current_file += passes;
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_0); status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_GENERIC);
pthread_mutex_unlock(&mutex_selection);
} }
void move_up(unsigned long passes){ void move_up(unsigned long passes){
pthread_mutex_lock(&mutex_selection);
if (passes == 0) {
passes++;
}
unsigned long tmp = selected_file_current;
selected_file_current -= passes;
if (tmp < selected_file_current) {
selected_file_current = 0;
}
update_selected_file(); /*bounds checking happens within thread_mid*/
current_dir->selected_file_current = selected_file_current; mid_dir.current_file -= passes;
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_GENERIC);
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_0);
pthread_mutex_unlock(&mutex_selection);
} }
void move_left(unsigned long passes){ void move_left(unsigned long passes){
if (passes == 0) {
passes++;
}
unsigned long i; unsigned long i;
for (i = 0; i < passes; i++) { for (i = 0; i < passes; i++) {
if (chdir("..") != 0) { if (chdir("..") != 0) {
/* TODO(2025-07-09T00:30:05) fix */ /* TODO(2025-07-09T00:30:05) fix */
FAIL("move_left", "unhandled error of chdir"); FAIL("move_left", "unhandled error of chdir");
} else {
selected_file_current = dir_get_selected_file_current();
} }
} }
update_selected_file(); status |= (STATUS_RUN_BACKEND | STATUS_RELOAD_DIRECTORY | STATUS_UPDATE_SCREEN_GENERIC | STATUS_UPDATE_SCREEN_DIR_CHANGE);
current_dir->selected_file_current = selected_file_current;
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_RELOAD_FULL | STATUS_RELOAD_DIRECTORY);
} }
void move_right(){ void move_right(){
if (mid_content->file_name[0] == '\0') {
return; if (mid_dir.current_file->file_type & FILE_TYPE_DIR) {
} if (chdir(mid_dir.current_file->file_name) != 0) {
if ((mid_content[selected_file_current].file_type & FILE_TYPE_DIR) == FILE_TYPE_DIR) { /* TODO(2026-05-05T20:12:14) fix */
if (chdir(mid_content[selected_file_current].file_name) != 0) {
FAIL("move_right", "unhandled error of chdir"); FAIL("move_right", "unhandled error of chdir");
} else {
selected_file_current = dir_get_selected_file_current();
} }
} else if (mid_dir.current_file->file_type & FILE_TYPE_EXEC) {
} else { } else {
unsigned long i = 0; char *mime = get_mimetype(mid_dir.current_file);
char match = 0; char *extension = mid_dir.current_file->file_name;
char *mime = get_mimetype(mid_content[selected_file_current].file_name);
char *extension = strrchr(mid_content[selected_file_current].file_name, '.');
if (extension != NULL) {
for (i = 0; i < file_extension_default_count; i++) {
if (strstr(extension, file_extension_default_cmd[i].file_extension)) {
char *cmd; char *cmd;
concat(cmd, file_extension_default_cmd[i].command, " ./\'", 0); while (extension <= mid_dir.current_file->file_name + strlen(mid_dir.current_file->file_name)) {
concat(cmd, cmd, mid_content[selected_file_current].file_name, 1); if (*extension == '.') {
concat(cmd, cmd, "\'", 1); break;
if (system(cmd) == -1) {
/*do nothing*/
} }
curs_set(1); /*for some reason, 1 here turns it invisible once again */ extension++;
match = 1; }
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_RELOAD_FULL | STATUS_RELOAD_DIRECTORY);
long i;
if (extension <= mid_dir.current_file->file_name + strlen(mid_dir.current_file->file_name)) {
for (i = 0; i < file_extension_default_count; i++) {
if (strcmp(extension, file_extension_default_cmd[i].file_extension) == 0) {
cmd = parse_cmd(file_extension_default_cmd[i].command, mid_dir.current_file);
if (system(cmd)) {
}
status |= STATUS_MOVE_RIGHT_MATCH;
update();
break; break;
} }
} }
} }
if (match == 0) { if (!(status & STATUS_MOVE_RIGHT_MATCH)) {
for (i = 0; i < mimetype_default_count; i++) { for (i = 0; i < mimetype_default_count; i++) {
if (strstr(mime, mimetype_default_cmd[i].mimetype)) { if (strstr(mimetype_default_cmd[i].mimetype, mime) == 0) {
cmd = parse_cmd(mimetype_default_cmd[i].command, mid_dir.current_file);
char *cmd = parse_cmd_char(mimetype_default_cmd[i].command, mid_content[selected_file_current].file_name); if (system(cmd)) {
if (system(cmd) == -1) {
/*do nothing*/
} }
curs_set(1); /*for some reason, 1 here turns it invisible once again */ update();
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_RELOAD_FULL | STATUS_RELOAD_DIRECTORY);
break; break;
} }
} }
} }
status &= ~STATUS_MOVE_RIGHT_MATCH;
free(cmd);
free(mime); free(mime);
} }
update_selected_file(); status |= (STATUS_RUN_BACKEND | STATUS_RELOAD_DIRECTORY | STATUS_UPDATE_SCREEN_GENERIC | STATUS_UPDATE_SCREEN_DIR_CHANGE);
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_RELOAD_FULL | STATUS_RELOAD_DIRECTORY);
} }
void toggle_hidden_files(){ void toggle_hidden_files(){
file_modifiers ^= FILE_MODIFIERS_HIDDEN_FILES; file_modifiers ^= FILE_MODIFIERS_HIDDEN_FILES;
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_RELOAD_FULL | STATUS_RELOAD_DIRECTORY); status |= (STATUS_RUN_BACKEND | STATUS_RELOAD_DIRECTORY);
} }
void toggle_selection(){ void toggle_selection(){
pthread_mutex_lock(&mutex_selection); TODO;
pthread_mutex_lock(&mutex_mid);
mid_content[selected_file_current].status ^= FILE_STATUS_SELECTED;
status |= (STATUS_UPDATE_SCREEN_MASK);
pthread_mutex_unlock(&mutex_mid);
pthread_mutex_unlock(&mutex_selection);
move_down(1);
} }
void jump_bottom(){ void jump_bottom(){
pthread_mutex_lock(&mutex_selection); mid_dir.current_file = mid_dir.file_list + mid_dir.file_count - 1;
selected_file_current = 0 - 1; status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_GENERIC);
update_selected_file();
current_dir->selected_file_current = selected_file_current;
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_0);
pthread_mutex_unlock(&mutex_selection);
} }
void jump_top(){ void jump_top(){
pthread_mutex_lock(&mutex_selection); mid_dir.current_file = mid_dir.file_list;
selected_file_current = 0; status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_GENERIC);
update_selected_file();
current_dir->selected_file_current = selected_file_current;
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK);
pthread_mutex_unlock(&mutex_selection);
} }
void open_with(){ void open_with(){
pthread_mutex_lock(&mutex_btm); TODO;
char *btm_buffer_tmp = btm_buffer;
werase(win_b);
mvwin(win_b, terminal_height-6, 0);
wresize(win_b, BTM_WINDOW_HEIGHT_ON_STR_INTERACTION, terminal_width/3); /*the div3 just looks cool*/
concat(btm_buffer, ui_open_with_text_0, " \'", 0);
concat(btm_buffer, btm_buffer, mid_content[selected_file_current].file_name, 1);
concat(btm_buffer, btm_buffer, "\' ", 1);
concat(btm_buffer, btm_buffer, ui_open_with_text_1, 1);
window_btm(win_b, 1);
char *str = malloc(INPUT_BUFFER_SIZE);
memset(str, ' ', INPUT_BUFFER_SIZE);
str[INPUT_BUFFER_SIZE-1] = '\0';
int err = read_string(win_b, BTM_WINDOW_HEIGHT_ON_STR_INTERACTION - 1, 0 , str);
if (err == 0) {
char *cmd;
concat(cmd, str, " ./\'", 0);
concat(cmd, cmd, mid_content[selected_file_current].file_name, 1);
concat(cmd, cmd, "\'", 1);
#if SETTINGS_UEBERZUG_IMAGE_PREVIEW != 0
images_clear();
#endif
endwin();
if (system(cmd) == -1) {
FAIL("open_with", "creating subcommand failed unhandled");
}
initscr();
}
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK | STATUS_RELOAD_DIRECTORY | STATUS_UPDATE_SCREEN_RELOAD_FULL);
free(btm_buffer);
btm_buffer = btm_buffer_tmp;
pthread_mutex_unlock(&mutex_btm);
free(str);
} }
void rename_hovered(){ void rename_hovered(){
pthread_mutex_lock(&mutex_btm); TODO;
char *btm_buffer_tmp = btm_buffer;
werase(win_b);
mvwin(win_b, terminal_height-6, 0);
wresize(win_b, BTM_WINDOW_HEIGHT_ON_STR_INTERACTION, terminal_width/3); /*the div3 just looks cool*/
concat(btm_buffer, ui_rename_text_0, " \'", 0);
concat(btm_buffer, btm_buffer, mid_content[selected_file_current].file_name, 1);
concat(btm_buffer, btm_buffer, "\' ", 1);
concat(btm_buffer, btm_buffer, ui_rename_text_1, 1);
window_btm(win_b, 1);
char *str = malloc(INPUT_BUFFER_SIZE);
memset(str, ' ', INPUT_BUFFER_SIZE);
str[INPUT_BUFFER_SIZE-1] = '\0';
int err = read_string(win_b, BTM_WINDOW_HEIGHT_ON_STR_INTERACTION - 1, 0, str);
if (!err) {
char *cmd;
concat(cmd, "mv ./\'", mid_content[selected_file_current].file_name, 0);
concat(cmd, cmd, "\' ./\'", 1);
concat(cmd, cmd, str, 1);
concat(cmd, cmd, "\'", 1);
if (system(cmd) == -1) {
FAIL("rename_hovered", "mv or creating subcommand failed");
};
btm_buffer = cmd;
}
free(str);
free(btm_buffer);
btm_buffer = btm_buffer_tmp;
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK | STATUS_RELOAD_DIRECTORY | STATUS_UPDATE_SCREEN_RELOAD_FULL);
pthread_mutex_unlock(&mutex_btm);
} }
void delete(){ void delete(){
pthread_mutex_lock(&mutex_btm); TODO;
char *btm_buffer_tmp = btm_buffer;
unsigned int i = 0;
unsigned int hits = 0;
char *file_str = "";
for (i = 0; i < mid_file_count; i++) {
if (mid_content[i].status & FILE_STATUS_SELECTED) {
concat(file_str, file_str, "\'", 0);
concat(file_str, file_str, mid_content[i].file_name, 1);
concat(file_str, file_str, "\' ", 1);
hits++;
}
}
werase(win_b);
mvwin(win_b, terminal_height-6, 0);
wresize(win_b, BTM_WINDOW_HEIGHT_ON_STR_INTERACTION, terminal_width);
btm_buffer = malloc(BTM_WINDOW_HEIGHT_ON_STR_INTERACTION * terminal_width);
memset(btm_buffer, ' ', BTM_WINDOW_HEIGHT_ON_STR_INTERACTION * terminal_width);
memcpy(btm_buffer, ui_delete_text ,strlen(ui_delete_text));
/*this horrendous check tries to copy everything until the last line, while keeping said last line unwritten*/
/*lets hope im never gonna need to format something like this ever again*/
memcpy(btm_buffer + strlen(ui_delete_text)+1, file_str,
(strlen(file_str) > ((BTM_WINDOW_HEIGHT_ON_STR_INTERACTION * terminal_width) - terminal_width) ?
((BTM_WINDOW_HEIGHT_ON_STR_INTERACTION * terminal_width) - terminal_width) :
strlen(file_str)));
memcpy(btm_buffer + (BTM_WINDOW_HEIGHT_ON_STR_INTERACTION * terminal_width - terminal_width) , "(y/N)", strlen("(y/N)"));
btm_buffer[BTM_WINDOW_HEIGHT_ON_STR_INTERACTION * terminal_width-1] = '\0';
window_btm(win_b, 1);
timeout(-1); /* negative numbers block until enter is pressed */
char ch = wgetch(win_b);
if (ch == 'y' || ch == 'Y') {
if (hits) {
for (i = 0; i < mid_file_count; i++) {
if (mid_content[i].status & FILE_STATUS_SELECTED) {
recursive_delete(mid_content[i]);
}
}
} else {
if (mid_content[selected_file_current].file_type & FILE_TYPE_DIR) {
recursive_delete(mid_content[selected_file_current]);
}
remove(mid_content[selected_file_current].file_name);
}
}
free(btm_buffer);
btm_buffer = btm_buffer_tmp;
if (hits) {
free(file_str);
}
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK | STATUS_RELOAD_DIRECTORY | STATUS_UPDATE_SCREEN_RELOAD_FULL);
pthread_mutex_unlock(&mutex_btm);
} }
void makedir(){ void makedir(){
pthread_mutex_lock(&mutex_btm); TODO;
char *btm_buffer_tmp = btm_buffer;
werase(win_b);
mvwin(win_b, terminal_height-6, 0);
wresize(win_b, BTM_WINDOW_HEIGHT_ON_STR_INTERACTION, terminal_width/3); /*the div3 just looks cool*/
btm_buffer = "create dir: ";
window_btm(win_b, 1);
char *str = malloc(INPUT_BUFFER_SIZE);
memset(str, ' ', INPUT_BUFFER_SIZE);
str[INPUT_BUFFER_SIZE-1] = '\0';
int err = read_string(win_b, BTM_WINDOW_HEIGHT_ON_STR_INTERACTION - 1, 0, str);
if (!err) {
concat(btm_buffer, btm_buffer, str, 0);
mode_t mask = umask(0);
mkdir(str, 0755); /*magic number from default permissions as created by mkdir*/
umask(mask);
}
free(str);
free(btm_buffer);
btm_buffer = btm_buffer_tmp;
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK | STATUS_RELOAD_DIRECTORY | STATUS_UPDATE_SCREEN_RELOAD_FULL);
pthread_mutex_unlock(&mutex_btm);
} }
void makefile(){ void makefile(){
pthread_mutex_lock(&mutex_btm); TODO;
char *btm_buffer_tmp = btm_buffer;
werase(win_b);
mvwin(win_b, terminal_height-6, 0);
wresize(win_b, BTM_WINDOW_HEIGHT_ON_STR_INTERACTION, terminal_width/3); /*the div3 just looks cool*/
btm_buffer = "create file: ";
window_btm(win_b, 1);
char *str = malloc(INPUT_BUFFER_SIZE);
memset(str, ' ', INPUT_BUFFER_SIZE);
str[INPUT_BUFFER_SIZE-1] = '\0';
int err = read_string(win_b, BTM_WINDOW_HEIGHT_ON_STR_INTERACTION - 1, 0, str);
if (!err) {
concat(btm_buffer, btm_buffer, str, 0);
FILE *fp;
fp = fopen(str, "w");
fclose(fp);
}
free(str);
free(btm_buffer);
btm_buffer = btm_buffer_tmp;
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK | STATUS_RELOAD_DIRECTORY | STATUS_UPDATE_SCREEN_RELOAD_FULL);
pthread_mutex_unlock(&mutex_btm);
}
void update(){
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK | STATUS_RELOAD_DIRECTORY | STATUS_UPDATE_SCREEN_RELOAD_FULL);
} }
void enter_shell(unsigned long passes, int index){ void enter_shell(unsigned long passes, int index){
(void)passes; TODO;
#if SETTINGS_UEBERZUG_IMAGE_PREVIEW != 0
images_clear();
#endif
endwin();
if (system(key_binding[index].black_magic) != 0) {
/*do nothing*/
}
initscr();
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK | STATUS_RELOAD_DIRECTORY | STATUS_UPDATE_SCREEN_RELOAD_FULL);
} }
void not_implemented(unsigned long passes, int index){ void not_implemented(unsigned long passes, int index){
(void)passes; (void)passes;
@@ -550,381 +286,40 @@ void not_implemented(unsigned long passes, int index){
mvaddstr(terminal_height-1, 0, key_binding[index].comment); 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), "\t");
mvaddstr(terminal_height-1, strlen(key_binding[index].comment) + strlen("\t"), "is not yet implemented"); mvaddstr(terminal_height-1, strlen(key_binding[index].comment) + strlen("\t"), "is not yet implemented");
TODO;
} }
void jump_to_dir(unsigned long passes, int index){ void jump_to_dir(unsigned long passes, int index){
(void)passes; TODO;
char *ch = (char*)key_binding[index].black_magic;
char slash = 0;
unsigned int env_len = 0;
while (*ch != '\0') {
if (*ch == '/') {
slash = 1;
break;
}
env_len++;
ch++;
}
char *env_str = NULL;
char *env_parsed = NULL;
char *path = NULL;
ch = (char*)key_binding[index].black_magic;
if (*ch == '/') {
path = malloc(strlen((char*)key_binding[index].black_magic));
memcpy(path, (char*)key_binding[index].black_magic, strlen((char*)key_binding[index].black_magic)+1);
} else if (slash) {
env_str = malloc(env_len * sizeof(char));
memcpy(env_str, (char*)key_binding[index].black_magic +1, env_len);
env_str[env_len-1] = '\0';
env_parsed = getenv(env_str);
if (env_parsed) {
concat(path, env_parsed, (char*)key_binding[index].black_magic + env_len, 0);
} else {
path = malloc(strlen((char*)key_binding[index].black_magic));
memcpy(path, (char*)key_binding[index].black_magic, strlen((char*)key_binding[index].black_magic)+1);
}
} else {
env_parsed = getenv((char*)key_binding[index].black_magic +1);
if (env_parsed) {
path = malloc(strlen(env_parsed)+1);
memcpy(path, env_parsed, strlen(env_parsed)+1);
} else {
path = malloc(strlen((char*)key_binding[index].black_magic));
memcpy(path, (char*)key_binding[index].black_magic, strlen((char*)key_binding[index].black_magic)+1);
}
}
if (chdir(path) != 0) {
FAIL("jump_to_dir", "jumping to black_magic in config.h failed");
} else {
selected_file_current = dir_get_selected_file_current();
}
/*env_parsed shall not be modified (read: free'd) - the man page*/
if (env_str) {
free(env_str);
}
if(path) {
free(path);
}
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK | STATUS_RELOAD_DIRECTORY);
} }
void order_by(unsigned long passes, int index){ void order_by(unsigned long passes, int index){
(void)passes; (void)passes;
free(seed); seed = time(NULL);
seed = NULL;
seed = malloc(sizeof(time_t));
*seed = time(NULL);
order_func = key_binding[index].black_magic; order_func = key_binding[index].black_magic;
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK | STATUS_RELOAD_DIRECTORY); status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_GENERIC | STATUS_RELOAD_DIRECTORY);
} }
void cmd_on_selected(unsigned long passes, int index){ void cmd_on_selected(unsigned long passes, int index){
(void)passes; TODO;
pthread_mutex_lock(&mutex_btm);
char *btm_buffer_tmp = btm_buffer;
btm_buffer = "";
unsigned int i = 0;
unsigned int hits = 0;
char *file_str = "";
for (i = 0; i < mid_file_count; i++) {
if (mid_content[i].status & FILE_STATUS_SELECTED) {
concat(file_str, file_str, "\'", 0);
concat(file_str, file_str, mid_content[i].file_name, 1);
concat(file_str, file_str, "\' ", 1);
hits++;
}
}
if (hits) {
concat(btm_buffer, key_binding[index].black_magic, file_str, 2);
} else {
concat(btm_buffer, key_binding[index].black_magic, "\'", 0);
concat(btm_buffer, btm_buffer, mid_content[selected_file_current].file_name, 1);
concat(btm_buffer, btm_buffer, "\'", 1);
}
concat(btm_buffer, btm_buffer, "?", 1);
concat(btm_buffer, btm_buffer, "\n\n", 1);
concat(btm_buffer, btm_buffer, "(y/N)", 1);
werase(win_b);
mvwin(win_b, terminal_height-6, 0);
wresize(win_b, BTM_WINDOW_HEIGHT_ON_STR_INTERACTION, terminal_width/3); /*the div3 just looks cool*/
window_btm(win_b, 1);
timeout(-1); /* negative numbers block until enter is pressed */
/* TODO(2025-07-06T07:22:49) fix fixed buffer size */
char ch = wgetch(win_b);
if (ch == 'y' || ch == 'Y') {
/* the second loop is used to add "./", wich is not being printed" */
char *cmd = malloc(sizeof(char));
/* TODO(2025-07-06T07:23:05) IMPORTANT: this really fucks up when the file has a quotation mark in its name */
endwin();
if (hits) {
for (i = 0; i < mid_file_count; i++) {
if (mid_content[i].status & FILE_STATUS_SELECTED) {
free(cmd);
concat(cmd, (char*)key_binding[index].black_magic, " \'", 0);
concat(cmd, cmd, mid_content[i].file_name, 1);
concat(cmd, cmd, "\'", 1);
if (system(cmd) != 0) {
/*do nothing*/
}
}
}
} else {
free(cmd);
concat(cmd, (char*)key_binding[index].black_magic, " \'", 0);
concat(cmd, cmd, mid_content[selected_file_current].file_name, 1);
concat(cmd, cmd, "\'", 1);
if (system(cmd) != 0) {
/*do nothing*/
}
mvaddstr(10,10, cmd);
}
/*system(cmd);*/
free(cmd);
initscr();
}
free(btm_buffer);
btm_buffer = btm_buffer_tmp;
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK | STATUS_RELOAD_DIRECTORY | STATUS_UPDATE_SCREEN_RELOAD_FULL);
pthread_mutex_unlock(&mutex_btm);
} }
void yank_text(unsigned long passes, int index){ void yank_text(unsigned long passes, int index){
(void)passes; TODO;
char *cmd;
if (strncmp((char*)key_binding[index].black_magic, "path", 4) == 0) {
char *path=getcwd(NULL, 0);
concat(cmd, "echo \'", path, 0);
concat(cmd, cmd, "/", 1);
concat(cmd, cmd, mid_content[selected_file_current].file_name, 1);
concat(cmd, cmd, "\' | ", 1);
concat(cmd, cmd, clipboard_cmd, 1);
free(path);
} else {
concat(cmd, "echo \'", mid_content[selected_file_current].file_name, 0);
concat(cmd, cmd, "\' | ", 1);
concat(cmd, cmd, clipboard_cmd, 1);
}
if (system(cmd) == -1) {
/*do nothing*/
}
free(cmd);
} }
void yank_file(unsigned long passes, int index){ void yank_file(unsigned long passes, int index){
(void)passes; TODO;
unsigned long i;
if (yank_files.status & YANK_IS_USED) {
for (i = 0; i < yank_files.count; i++) {
free(yank_files.list[i]);
}
free(yank_files.list);
free(yank_files.path);
yank_files.count = 0;
yank_files.status = 0;
}
yank_files.path=getcwd(NULL, 0);
yank_files.count = 0;
for (i = 0; i < mid_file_count; i++) {
if (mid_content[i].status & FILE_STATUS_SELECTED) {
yank_files.count++;
}
}
if (yank_files.count == 0) {
yank_files.count = 1;
yank_files.list = (char**)malloc(yank_files.count * sizeof(char*));
*yank_files.list = malloc(strlen(mid_content[selected_file_current].file_name)+1);
memcpy(*yank_files.list, mid_content[selected_file_current].file_name, strlen(mid_content[selected_file_current].file_name)+1);
} else {
yank_files.list = malloc(yank_files.count * sizeof(char*));
for (i = 0; i < mid_file_count; i++) {
if (mid_content[i].status & FILE_STATUS_SELECTED) {
*yank_files.list = malloc(strlen(mid_content[i].file_name)+1);
memcpy(*yank_files.list, mid_content[i].file_name, strlen(mid_content[i].file_name)+1);
yank_files.list += 1;
}
}
yank_files.list -= yank_files.count;
}
yank_files.status |= YANK_IS_USED;
if (strncmp((char*)key_binding[index].black_magic, "cut", 3) == 0) {
yank_files.status |= YANK_CUT;
yank_files.status &= ~YANK_COPY;
} else {
yank_files.status |= YANK_COPY;
yank_files.status &= ~YANK_CUT;
}
} }
void paste(){ void paste(){
unsigned long i; TODO;
for (i = 0; i < yank_files.count; i++) {
char *cmd;
if (yank_files.status & YANK_COPY) {
concat(cmd, "false | cp -ri \'", yank_files.path, 0);
} else {
concat(cmd, "mv \'", yank_files.path, 0);
}
concat(cmd, cmd, "/", 1);
concat(cmd, cmd, *yank_files.list, 1);
concat(cmd, cmd, "\' ./", 1);
concat(cmd, cmd, " 2>&1", 1);
char *line = malloc(INPUT_BUFFER_SIZE);
FILE *cmd_open;
while (1) {
cmd_open = popen(cmd, "r");
if (fgets(line, INPUT_BUFFER_SIZE, cmd_open) == 0) {
break;
}
if (strstr(line, "are the same file")) {
cmd[strlen(cmd)-strlen(" 2>&1")] = '\0';
concat(cmd, cmd, "_", 1);
concat(cmd, cmd, " 2>&1", 1);
} else if ((strstr(line, "overwrite"))) {
cmd[strlen(cmd)-strlen(" 2>&1")] = '\0';
concat(cmd, cmd, "_", 1);
concat(cmd, cmd, " 2>&1", 1);
} else if ((strstr(line, "No such file or directory"))) {
pclose(cmd_open);
break;
} else if ((strstr(line, "into itself"))) {
pclose(cmd_open);
break;
}
if (pclose(cmd_open) == 0) {
break;
}
}
free(cmd);
yank_files.list++;
}
yank_files.list -= yank_files.count;
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK | STATUS_RELOAD_DIRECTORY | STATUS_UPDATE_SCREEN_RELOAD_FULL);
} }
void search(){ void search(){
pthread_mutex_lock(&mutex_btm); TODO;
unsigned long local_height;
local_height = getmaxy(win_b);
memset(search_buffer, '\0', INPUT_BUFFER_SIZE);
window_btm(win_b, 1);
curs_set(1);
timeout(-1); /* negative numbers block until enter is pressed */
unsigned int pass = 0;
char ch;
wmove(win_b, local_height-1, 1);
while(1) {
/*ch = mvwgetch(win, y, x + pass);*/
werase(win_b);
mvwaddch(win_b, local_height-1, 0, '/');
mvwaddstr(win_b, local_height-1, 1, search_buffer);
ch = wgetch(win_b);
if (ch == '\n') {
break;
} else if (ch == '\t') { /* tab */
memcpy(search_buffer, mid_content[selected_file_current].file_name, strlen(mid_content[selected_file_current].file_name));
mvwaddstr(win_b, local_height-1, pass, mid_content[selected_file_current].file_name);
pass = strlen(mid_content[selected_file_current].file_name);
} else if (ch == 127) { /* backspace */
mvwdelch(win_b, local_height-1, 1);
wdelch(win_b);
if (pass != 0) {
search_buffer[pass-1] = '\0';
pass--;
}
} else if (ch == 27) { /* esc key */
break;
} else {
search_buffer[pass] = ch;
pass++;
unsigned long i;
for (i = 0; i < mid_file_count; i++) {
if (smartstrcasestr(mid_content[i].file_name, search_buffer)) {
selected_file_current = i;
if (update_selected_file()) {
pthread_cond_signal(&cond_rgt);
}
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_0);
break;
}
render_pass();
}
}
}
search_buffer[pass] = '\0';
curs_set(0);
current_dir->selected_file_current = selected_file_current;
update_selected_file();
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_0);
pthread_mutex_unlock(&mutex_btm);
} }
void search_next(){ void search_next(){
unsigned long i; TODO;
for (i = selected_file_current+1; i < mid_file_count; i++) {
if (smartstrcasestr(mid_content[i].file_name, search_buffer)) {
selected_file_current = i;
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_0);
update_selected_file();
render_pass();
break;
}
}
} }
void search_previous(){ void search_previous(){
unsigned long i; TODO;
for (i = selected_file_current-1;; i--) {
if(i > selected_file_current) {
break;
}
if (smartstrcasestr(mid_content[i].file_name, search_buffer)) {
selected_file_current = i;
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_0);
update_selected_file();
render_pass();
break;
}
}
} }
void jmp_file_index(){ void jmp_file_index(){
char *index = malloc(INPUT_BUFFER_SIZE); TODO;
memset(index, ' ', INPUT_BUFFER_SIZE);
index[INPUT_BUFFER_SIZE-1] = '\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();
} }

97
main.c
View File

@@ -23,7 +23,7 @@ unsigned int file_modifiers;
unsigned int status = (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK | STATUS_RELOAD_DIRECTORY); unsigned int status = (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK | STATUS_RELOAD_DIRECTORY);
char *start_path; char *start_path;
char *global_path; char *global_path;
time_t *seed; time_t seed;
WINDOW *win_t; WINDOW *win_t;
WINDOW *win_b; WINDOW *win_b;
@@ -31,6 +31,12 @@ WINDOW *win_l;
WINDOW *win_m; WINDOW *win_m;
WINDOW *win_r; WINDOW *win_r;
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;
char *input; /*used in user_interactions*/ char *input; /*used in user_interactions*/
char *terminal_width_empty_line; /* used in user_interactions */ char *terminal_width_empty_line; /* used in user_interactions */
@@ -77,7 +83,6 @@ int main(){
pthread_cond_signal(&cond_top); pthread_cond_signal(&cond_top);
pthread_cond_signal(&cond_mid); pthread_cond_signal(&cond_mid);
pthread_cond_signal(&cond_lft); pthread_cond_signal(&cond_lft);
user_interactions();
render_pass(); render_pass();
timeout(SETTINGS_CURSES_TIMEOUT); timeout(SETTINGS_CURSES_TIMEOUT);
@@ -85,24 +90,23 @@ int main(){
while(!(status & STATUS_QUIT_PROGRAM)){ while(!(status & STATUS_QUIT_PROGRAM)){
getmaxyx(stdscr, terminal_height, terminal_width); getmaxyx(stdscr, terminal_height, terminal_width);
user_interactions();
if (status & STATUS_RUN_BACKEND) {
free(global_path);
global_path = getcwd(NULL, 0);
pthread_cond_signal(&cond_mid);
pthread_cond_signal(&cond_lft);
status &= ~(STATUS_RUN_BACKEND);
} else {
status &= ~(STATUS_RELOAD_DIRECTORY | STATUS_DELTA_TIME);
}
if (!(terminal_height == temp_heigth) || !(terminal_width == temp_width)) { if (!(terminal_height == temp_heigth) || !(terminal_width == temp_width)) {
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_RESIZE); status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_RESIZE);
temp_width = terminal_width; temp_width = terminal_width;
temp_heigth = terminal_height; temp_heigth = terminal_height;
} }
if (status & STATUS_RUN_BACKEND) {
free(global_path);
global_path = getcwd(NULL, 0);
pthread_cond_signal(&cond_top);
pthread_cond_signal(&cond_mid);
pthread_cond_signal(&cond_lft);
status &= ~(STATUS_RUN_BACKEND);
status |= STATUS_UPDATE_SCREEN_0;
} else {
status &= ~(STATUS_RELOAD_DIRECTORY | STATUS_DELTA_TIME);
}
user_interactions();
render_pass(); render_pass();
#if SETTINGS_RELOAD_DIR_DELTA != 0 #if SETTINGS_RELOAD_DIR_DELTA != 0
@@ -135,11 +139,10 @@ int main(){
void render_pass(){ void render_pass(){
if (status & STATUS_UPDATE_SCREEN_RESIZE) { if (status & STATUS_UPDATE_SCREEN_CLEAR) {
if (status & STATUS_UPDATE_SCREEN_RELOAD_FULL) {
clear(); clear();
status &= ~STATUS_UPDATE_SCREEN_RELOAD_FULL;
} }
if (status & STATUS_UPDATE_SCREEN_RESIZE) {
wresize(win_t, 1, terminal_width); wresize(win_t, 1, terminal_width);
wresize(win_l, terminal_height-2, terminal_width/8); wresize(win_l, terminal_height-2, terminal_width/8);
@@ -154,22 +157,49 @@ void render_pass(){
mvwin(win_r, 1, ((terminal_width/2))); mvwin(win_r, 1, ((terminal_width/2)));
mvwin(win_b, terminal_height-1, 0); mvwin(win_b, terminal_height-1, 0);
status |= STATUS_UPDATE_SCREEN_0;
} }
if (status & STATUS_UPDATE_SCREEN_MASK) { if (status & STATUS_UPDATE_SCREEN_MASK) {
status &= ~(STATUS_UPDATE_SCREEN_MASK); if (pthread_mutex_trylock(&mutex_top) == 0) {
window_top(win_t); wnoutrefresh(win_t);
window_lft(win_l); pthread_mutex_unlock(&mutex_top);
window_mid(win_m); } else {
window_rgt(win_r); mvwaddstr(win_t, terminal_height/2, terminal_width/4, "LOADING");
window_btm(win_b, 0); status |= STATUS_UPDATE_SCREEN_GENERIC;
wrefresh(win_t); }
wrefresh(win_l); if (pthread_mutex_trylock(&mutex_rgt) == 0) {
wrefresh(win_m); wnoutrefresh(win_r);
wrefresh(win_r); pthread_mutex_unlock(&mutex_rgt);
wrefresh(win_b); } else {
mvwaddstr(win_r, terminal_height/2, terminal_width/4, "LOADING");
status |= STATUS_UPDATE_SCREEN_GENERIC;
}
if (pthread_mutex_lock(&mutex_mid) == 0) {
wnoutrefresh(win_m);
pthread_mutex_unlock(&mutex_mid);
} else {
mvwaddstr(win_m, terminal_height/2, terminal_width/4, "LOADING");
status |= STATUS_UPDATE_SCREEN_GENERIC;
}
if (pthread_mutex_trylock(&mutex_lft) == 0) {
wnoutrefresh(win_l);
pthread_mutex_unlock(&mutex_lft);
} else {
mvwaddstr(win_l, terminal_height/2, terminal_width/4, "LOADING");
status |= STATUS_UPDATE_SCREEN_GENERIC;
}
if (pthread_mutex_trylock(&mutex_btm) == 0) {
wnoutrefresh(win_b);
pthread_mutex_unlock(&mutex_btm);
} else {
mvwaddstr(win_b, terminal_height/2, terminal_width/4, "LOADING");
status |= STATUS_UPDATE_SCREEN_GENERIC;
}
doupdate();
status &= ~(STATUS_UPDATE_SCREEN_MASK - STATUS_UPDATE_SCREEN_DIR_CHANGE);
}
if (status & STATUS_UPDATE_SCREEN_DIR_CHANGE) {
status &= ~STATUS_UPDATE_SCREEN_DIR_CHANGE;
status |= STATUS_UPDATE_SCREEN_GENERIC;
} }
} }
/*this function exists for things done at startup (initialization, reading config, etc)*/ /*this function exists for things done at startup (initialization, reading config, etc)*/
@@ -205,7 +235,6 @@ void init() {
setenv("START_PATH", start_path, 0); setenv("START_PATH", start_path, 0);
free(start_path); free(start_path);
seed = malloc(sizeof(time_t)); seed = time(NULL);
*seed = time(NULL);
} }

View File

@@ -7,7 +7,7 @@
#include "defines.h" #include "defines.h"
extern time_t *seed; extern time_t seed;
int skip_hidden_files(const struct dirent *entry){ int skip_hidden_files(const struct dirent *entry){
@@ -117,15 +117,22 @@ int sort_random(const void *file0, const void *file1){
if (!(((file*)file0)->file_type & FILE_TYPE_DIR) && (((file*)file1)->file_type & FILE_TYPE_DIR)) { if (!(((file*)file0)->file_type & FILE_TYPE_DIR) && (((file*)file1)->file_type & FILE_TYPE_DIR)) {
return 1; return 1;
} }
time_t num = ((time_t)&sort_random)^((time_t)sort_natural); /* seed is the only value that actually changes whenever this funcion is called.
int i = 1; * seed only updates when the order_by binding is executed.
for (; i < 6; i++) { * this means that the random output only changes on the command of the user, and not SETTINGS_RELOAD_DIR_DELTA, this is intentional.
num += *seed; * well the other stuff like file sizes and file count in a dir may also change, but this needs user intervention too.
num ^= num << ((((time_t)&seed)%6)+i); * that is unless the user decides to sort random in /var/log or something, which begs the question: why would you do that?
num ^= num >> ((((time_t)&num)%9)+i); */
time_t num = (((time_t)&sort_random) + (time_t)seed) ^ (((file*)file0)->file_size + ((file*)file1)->file_size);
int i;
for (i = 1; i < (((time_t)&getpid)%3); i++) {
num ^= num << ((((time_t)&file0)%27)+i);
num ^= num >> ((((time_t)&file1)%18)+i);
num ^= ((time_t)&getpid) ^ (((time_t)&getpid) >> ((time_t)getpid())%10);
} }
return ((num%3) - 1); return (((num & (3 << seed%16)) >> seed%16) - 1);
/*return ((num%3) - 1);*/
} }
int sort_type(const void *file0, const void *file1){ int sort_type(const void *file0, const void *file1){

119
string.h Normal file
View File

@@ -0,0 +1,119 @@
#include <curses.h>
#ifndef BACKEND_GUARD
#define BACKEND_GUARD
#include "defines.h"
#define SETTINGS_COMMAND_REPLACE_STR "%"
typedef struct String {
char *data;
size_t size;
} string;
#define s(str) { \
return (string) { \
.data = str; \
.size = strlen(str); \
} \
}
#define concat(out, s1, s2, _free) { \
concat## _free(out, s1, s2); \
}
#define concat0(out, s1, s2) \
char *result = malloc(strlen(s1) + strlen(s2) + 1); \
memcpy(result, s1, strlen(s1)); \
memcpy(result + strlen(s1), s2, strlen(s2) + 1); \
out = result;
#define concat1(out, s1, s2) \
char *result = malloc(strlen(s1) + strlen(s2) + 1); \
memcpy(result, s1, strlen(s1)); \
memcpy(result + strlen(s1), s2, strlen(s2) + 1); \
free(s1); \
out = result;
#define concat2(out, s1, s2) \
char *result = malloc(strlen(s1) + strlen(s2) + 1); \
memcpy(result, s1, strlen(s1)); \
memcpy(result + strlen(s1), s2, strlen(s2) + 1); \
free(s2); \
out = result;
#define concat3(out, s1, s2) \
char *result = malloc(strlen(s1) + strlen(s2) + 1); \
memcpy(result, s1, strlen(s1)); \
memcpy(result + strlen(s1), s2, strlen(s2) + 1); \
free(s1); \
free(s2); \
out = result;
/*
int s_strcmp(const char *s0, char string *s1) {
size_t size = s1->size - s0->size;
if (size) {
return size;
}
size = s0.size;
while (*s0->data == *s0->data && size) {
s0->data += 1;
s1->data += 1;
size--;
}
return size;
}
*/
char* smartstrcasestr(const char *haystack, const char *needle){
char smart = 0;
char *ret;
char passes = 0;
while (*needle) {
if (*needle >= 'A' && *needle <= 'Z') {
smart = 1;
break;
}
passes++;
needle++;
}
needle -= passes;
if (smart == 0) {
char *needle_case = malloc(strlen(needle)+1);
memcpy(needle_case, needle, strlen(needle)+1);
passes = 0;
while (*needle_case) {
*needle_case = *needle_case | ' ';
needle_case++;
passes++;
}
needle_case -= passes;
char *haystack_case = malloc(strlen(haystack)+1);
memcpy(haystack_case, haystack, strlen(haystack)+1);
passes = 0;
while (*haystack_case) {
*haystack_case = *haystack_case | ' ';
haystack_case++;
passes++;
}
haystack_case -= passes;
ret = strstr(haystack_case, needle_case);
free(needle_case);
free(haystack_case);
} else {
ret = strstr(haystack, needle);
}
return ret;
}
#endif
/*char* concat(const char *s1, const char *s2);*/
char* smartstrcasestr(const char *haystack, const char *needle);

View File

@@ -4,7 +4,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <time.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/statvfs.h> #include <sys/statvfs.h>
@@ -27,24 +26,24 @@ pthread_cond_t cond_top;
pthread_cond_t cond_btm; pthread_cond_t cond_btm;
file *rgt_content; dir rgt_dir;
file *mid_content; dir mid_dir;
file *lft_content; dir lft_dir;
char *rgt_buffer; /* used for file previews, unlike rgt_content, which is used for directory previews */ char *rgt_buffer; /* used for file previews, unlike rgt_content, which is used for directory previews */
char *btm_buffer; char *btm_buffer;
char *top_buffer; /* current path */ char *top_buffer; /* current path */
extern WINDOW *win_t;
extern WINDOW *win_b;
extern WINDOW *win_l;
extern WINDOW *win_m;
extern WINDOW *win_r;
unsigned long rgt_file_count = 0;
unsigned long mid_file_count = 0;
unsigned long lft_file_count;
unsigned long top_width; unsigned long top_width;
volatile unsigned long selected_file_current = 0;
volatile unsigned long selected_file_last = 0;
extern unsigned int terminal_width; extern unsigned int terminal_width;
extern unsigned int status; extern unsigned int status;
extern char *global_path; extern char *global_path;
@@ -53,55 +52,73 @@ unsigned int btm_status;
void *thread_mid(){ void *thread_mid(){
dir tmp;
tmp.current_file = NULL;
tmp.file_list = NULL;
tmp.file_count = 0;
while(!(status & STATUS_QUIT_PROGRAM)){ while(!(status & STATUS_QUIT_PROGRAM)){
pthread_mutex_lock(&mutex_mid); pthread_mutex_lock(&mutex_mid);
pthread_cond_wait(&cond_mid, &mutex_mid); pthread_cond_wait(&cond_mid, &mutex_mid);
unsigned int local_status = status; unsigned int local_status = status;
if (global_path == NULL) { if (global_path == NULL) {
mid_content = malloc(sizeof(file)); mid_dir.current_file = NULL;
mid_content->file_name = "cannot open directory"; mid_dir.file_count = 0;
mid_file_count = 1;
pthread_mutex_unlock(&mutex_mid);
continue; continue;
} }
char *path = malloc(strlen(global_path)+1); char *path = malloc(strlen(global_path)+1);
memcpy(path, global_path, strlen(global_path)+1); memcpy(path, global_path, strlen(global_path)+1);
if (local_status & STATUS_RELOAD_DIRECTORY) { if (local_status & STATUS_RELOAD_DIRECTORY) {
unsigned long i = 0; long index = mid_dir.current_file - mid_dir.file_list;
for (i = 0; i < mid_file_count; i++) {
free(mid_content[i].file_name); tmp = mid_dir;
mid_dir.file_count = get_dir_size(path);
mid_dir.file_list = malloc(mid_dir.file_count * sizeof(file));
if (mid_dir.file_count) { /* fails if dir empty */
get_dir_content(path, &mid_dir);
mid_dir.current_file = &mid_dir.file_list[index];
} else { /* the hovered dir is empty */
mid_dir.current_file = NULL;
} }
free(mid_content); }
mid_file_count = get_dir_size(path);
if (mid_file_count != 0) { if (mid_dir.current_file > mid_dir.file_list + mid_dir.file_count - 1) {
mid_content = malloc(mid_file_count * sizeof(file)); mid_dir.current_file = mid_dir.file_list + mid_dir.file_count - 1;
memset(mid_content, '\0', mid_file_count * sizeof(file)); }
get_dir_content(path, &mid_file_count, mid_content); if (mid_dir.current_file < mid_dir.file_list) {
mid_dir.current_file = mid_dir.file_list;
}
/* rendering */
werase(win_m);
if (mid_dir.file_count == 0) {
mvwaddstr(win_m, 0, 0, "empty");
} else { } else {
selected_file_current = 0; print_dir(win_m, 1, &mid_dir);
mid_content = malloc(sizeof(file));
mid_content->file_type = 0;
mid_content->file_size = 0;
mid_content->permissions = 0;
mid_content->color_pair = 0;
mid_content->file_name = malloc(sizeof(char));
mid_content->file_name[0] = '\0';
mid_file_count = 0;
}
update_selected_file();
} }
pthread_cond_signal(&cond_rgt);
pthread_cond_signal(&cond_top);
pthread_cond_signal(&cond_btm);
pthread_mutex_unlock(&mutex_mid);
btm_status = local_status; btm_status = local_status;
pthread_cond_signal(&cond_rgt);
pthread_cond_signal(&cond_btm);
free(path);
pthread_mutex_unlock(&mutex_mid); long i;
for (i = 0; i < tmp.file_count; i++) {
free(tmp.file_list[i].file_name);
}
free(tmp.file_list);
tmp.current_file = NULL;
tmp.file_list = NULL;
tmp.file_count = 0;
} }
pthread_exit(0); pthread_exit(0);
} }
@@ -113,9 +130,8 @@ void *thread_lft(){
unsigned int local_status = status; unsigned int local_status = status;
if (global_path == NULL) { if (global_path == NULL) {
lft_content = malloc(sizeof(file)); lft_dir.current_file = NULL;
lft_content[0].file_name = "cannot open directory"; lft_dir.file_count = 0;
lft_file_count = 1;
pthread_mutex_unlock(&mutex_lft); pthread_mutex_unlock(&mutex_lft);
continue; continue;
} }
@@ -128,16 +144,29 @@ void *thread_lft(){
path[0] = '/'; path[0] = '/';
if (local_status & STATUS_RELOAD_DIRECTORY) { if (local_status & STATUS_RELOAD_DIRECTORY) {
lft_file_count = get_dir_size(path); unsigned long i = 0;
free(lft_content); for (i = 0; i < lft_dir.file_count; i++) {
lft_content = malloc(lft_file_count * sizeof(file)); free(lft_dir.file_list[i].file_name);
memset(lft_content, '\0', lft_file_count * sizeof(file)); }
get_dir_content(path, &lft_file_count, lft_content); free(lft_dir.file_list);
lft_dir.file_count = get_dir_size(path);
if (lft_dir.file_count != 0) {
lft_dir.file_list = malloc(lft_dir.file_count * sizeof(file));
get_dir_content(path, &lft_dir);
} else {
lft_dir.current_file = NULL;
lft_dir.file_count = 0;
}
} }
} else { } else {
lft_file_count = 0; lft_dir.file_count = 0;
} }
/* rendering */
werase(win_l);
print_dir(win_l, 0, &lft_dir);
pthread_mutex_unlock(&mutex_lft);
free(path); free(path);
pthread_mutex_unlock(&mutex_lft); pthread_mutex_unlock(&mutex_lft);
@@ -148,83 +177,80 @@ void *thread_lft(){
} }
void *thread_rgt(){ void *thread_rgt(){
file file_current; dir tmp;
tmp.current_file = NULL;
tmp.file_list = NULL;
tmp.file_count = 0;
while(!(status & STATUS_QUIT_PROGRAM)){ while(!(status & STATUS_QUIT_PROGRAM)){
pthread_mutex_lock(&mutex_rgt); pthread_mutex_lock(&mutex_rgt);
pthread_cond_wait(&cond_rgt, &mutex_rgt); pthread_cond_wait(&cond_rgt, &mutex_rgt);
pthread_mutex_lock(&mutex_mid); pthread_mutex_lock(&mutex_mid);
char *path = mid_content[selected_file_current].file_name;
memcpy(&file_current, &mid_content[selected_file_current], sizeof(file)); char *file_name = malloc(strlen(mid_dir.current_file->file_name)+1);
file_name = memcpy(file_name, mid_dir.current_file->file_name, strlen(mid_dir.current_file->file_name)+1);
rgt_dir.file_list = malloc(sizeof(file));
memcpy(rgt_dir.file_list, mid_dir.current_file, sizeof(file));
rgt_dir.file_list->file_name = file_name;
rgt_dir.current_file = rgt_dir.file_list;
rgt_dir.file_count = 1;
pthread_mutex_unlock(&mutex_mid); pthread_mutex_unlock(&mutex_mid);
if (file_current.permissions & S_IRUSR) { if (rgt_dir.current_file->permissions & S_IRUSR) {
if (file_current.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
images_clear(); images_clear();
#endif #endif
unsigned long i = 0; tmp = rgt_dir;
for (i = 0; i < rgt_file_count; i++) {
if (rgt_content[i].file_name) {
free(rgt_content[i].file_name);
}
}
free(rgt_content);
rgt_file_count = get_dir_size(path); rgt_dir.file_count = get_dir_size(rgt_dir.current_file->file_name);
if (rgt_file_count) { /* fails if dir empty */ rgt_dir.file_list = malloc(rgt_dir.file_count * sizeof(file));
rgt_content = malloc(rgt_file_count * sizeof(file)); if (rgt_dir.file_count) { /* fails if dir empty */
memset(rgt_content, '\0', rgt_file_count * sizeof(file)); get_dir_content(tmp.current_file->file_name, &rgt_dir);
get_dir_content(path, &rgt_file_count, rgt_content);
rgt_content[0].status &= ~FILE_STATUS_FILE_OPEN;
free(rgt_buffer);
rgt_buffer = malloc(sizeof(char));
rgt_buffer[0] = '\0';
} else { /* the hovered dir is empty */ } else { /* the hovered dir is empty */
rgt_content = malloc(sizeof(file)); rgt_dir.current_file = NULL;
rgt_content->file_type = 0;
rgt_content->permissions = mid_content[selected_file_current].permissions;
} }
} else if ((status & STATUS_DELTA_TIME) != STATUS_DELTA_TIME && mid_file_count > 0) {
unsigned long i = 0; } else if ((status & STATUS_DELTA_TIME) != STATUS_DELTA_TIME && mid_dir.file_count > 0) {
for (i = 0; i < rgt_file_count; i++) {
if (rgt_content[i].file_name) {
free(rgt_content[i].file_name);
}
}
free(rgt_content);
rgt_file_count = 0;
rgt_content = malloc(sizeof(file));
free(rgt_buffer); free(rgt_buffer);
rgt_content->file_type = FILE_TYPE_OPEN_FILE; rgt_buffer = preview_file(rgt_dir.current_file);
rgt_content->status = FILE_STATUS_HOVER; rgt_dir.current_file->file_type |= FILE_TYPE_OPEN_FILE;
rgt_buffer = preview_file(path, file_current.file_size);
} }
}
/* rendering */
werase(win_r);
if (!rgt_dir.current_file) {
mvwaddstr(win_r, 0, 0, "not accessible");
}else if (rgt_dir.current_file->file_type == FILE_TYPE_OPEN_FILE) {
mvwaddnstr(win_r, 0, 0, rgt_buffer, (terminal_width/2) * terminal_width);
} else if ((rgt_dir.current_file->permissions & S_IRUSR) == 0) {
mvwaddstr(win_r, 0, 0, "not accessible");
} else { } else {
unsigned long i = 0; print_dir(win_r, 0, &rgt_dir);
for (i = 0; i < rgt_file_count; i++) {
if (rgt_content[i].file_name) {
free(rgt_content[i].file_name);
} }
}
free(rgt_content);
rgt_file_count = 0;
rgt_content = malloc(sizeof(file));
free(rgt_buffer);
rgt_buffer = malloc(sizeof(char));
rgt_buffer[0] = '\0';
}
/*
free(path);
*/
pthread_mutex_unlock(&mutex_rgt); pthread_mutex_unlock(&mutex_rgt);
long i;
for (i = 0; i < tmp.file_count; i++) {
free(tmp.file_list[i].file_name);
}
free(tmp.file_list);
tmp.current_file = NULL;
tmp.file_list = NULL;
tmp.file_count = 0;
} }
pthread_exit(0); pthread_exit(0);
} }
@@ -246,7 +272,20 @@ void *thread_top(){
top_buffer = malloc(strlen(global_path)+1); top_buffer = malloc(strlen(global_path)+1);
memcpy(top_buffer, global_path, strlen(global_path)+1); memcpy(top_buffer, global_path, strlen(global_path)+1);
top_width = strlen(top_buffer); top_width = strlen(top_buffer);
/*printing of mid_content[selected_file_current].file_name is done directly in window.c window_top()*/
/* rendering */
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));
mvwaddstr(win_t, 0, 0, top_buffer);
mvwaddch(win_t, 0, strlen(top_buffer), '/');
wattroff(win_t, COLOR_PAIR(COLOR_PATH));
if (mid_dir.file_count != 0 && !(mid_dir.current_file == NULL)) {
mvwaddstr(win_t, 0, strlen(top_buffer)+1, mid_dir.current_file->file_name);
}
}
pthread_mutex_unlock(&mutex_top); pthread_mutex_unlock(&mutex_top);
} }
@@ -269,9 +308,9 @@ void *thread_btm(){
pthread_mutex_lock(&mutex_mid); pthread_mutex_lock(&mutex_mid);
unsigned long i; unsigned long i;
float total_dir_size = 0; float total_dir_size = 0;
for(i = 0; i < mid_file_count; i++) { for(i = 0; i < mid_dir.file_count; i++) {
if ((mid_content[i].file_type & (FILE_TYPE_DIR)) != FILE_TYPE_DIR) { if ((mid_dir.file_list[i].file_type & (FILE_TYPE_DIR)) != FILE_TYPE_DIR) {
total_dir_size += mid_content[i].file_size; total_dir_size += mid_dir.file_list[i].file_size;
} }
} }
pthread_mutex_unlock(&mutex_mid); pthread_mutex_unlock(&mutex_mid);
@@ -345,29 +384,36 @@ void *thread_btm(){
memcpy(btm_buffer + buffer_width - ui_btm_right_block_size, ui_btm_right_block, ui_btm_right_block_size); memcpy(btm_buffer + buffer_width - ui_btm_right_block_size, ui_btm_right_block, ui_btm_right_block_size);
btm_buffer[0] = (S_ISLNK(mid_content[selected_file_current].permissions)) ? 'l': btm_buffer[0] = (S_ISLNK(mid_dir.current_file->permissions)) ? 'l':
(S_ISDIR(mid_content[selected_file_current].permissions) ? 'd': '-'); (S_ISDIR(mid_dir.current_file->permissions) ? 'd': '-');
btm_buffer[1] = (mid_content[selected_file_current].permissions & S_IRUSR) ? 'r' : '-'; btm_buffer[1] = (mid_dir.current_file->permissions & S_IRUSR) ? 'r' : '-';
btm_buffer[2] = (mid_content[selected_file_current].permissions & S_IWUSR) ? 'w' : '-'; btm_buffer[2] = (mid_dir.current_file->permissions & S_IWUSR) ? 'w' : '-';
btm_buffer[3] = (mid_content[selected_file_current].permissions & S_IXUSR) ? 'x' : '-'; btm_buffer[3] = (mid_dir.current_file->permissions & S_IXUSR) ? 'x' : '-';
btm_buffer[4] = (mid_content[selected_file_current].permissions & S_IRGRP) ? 'r' : '-'; btm_buffer[4] = (mid_dir.current_file->permissions & S_IRGRP) ? 'r' : '-';
btm_buffer[5] = (mid_content[selected_file_current].permissions & S_IWGRP) ? 'w' : '-'; btm_buffer[5] = (mid_dir.current_file->permissions & S_IWGRP) ? 'w' : '-';
btm_buffer[6] = (mid_content[selected_file_current].permissions & S_IXGRP) ? 'x' : '-'; btm_buffer[6] = (mid_dir.current_file->permissions & S_IXGRP) ? 'x' : '-';
btm_buffer[7] = (mid_content[selected_file_current].permissions & S_IROTH) ? 'r' : '-'; btm_buffer[7] = (mid_dir.current_file->permissions & S_IROTH) ? 'r' : '-';
btm_buffer[8] = (mid_content[selected_file_current].permissions & S_IWOTH) ? 'w' : '-'; btm_buffer[8] = (mid_dir.current_file->permissions & S_IWOTH) ? 'w' : '-';
btm_buffer[9] = (mid_content[selected_file_current].permissions & S_IXOTH) ? 'x' : '-'; btm_buffer[9] = (mid_dir.current_file->permissions & S_IXOTH) ? 'x' : '-';
/* rendering */
werase(win_b);
if (*top_buffer != ' ') { /*printing ' ' (standard initialized value, see threading_init) makes valgrind throw a fuss*/
mvwprintw(win_b, 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 */
pthread_mutex_unlock(&mutex_btm); pthread_mutex_unlock(&mutex_btm);
} }
pthread_exit(0); pthread_exit(0);
} }
void threading_init(){ void threading_init(){
rgt_content = malloc(sizeof(file));
mid_content = malloc(sizeof(file));
lft_content = malloc(sizeof(file));
top_buffer = malloc(sizeof(char)); top_buffer = malloc(sizeof(char));
rgt_buffer = malloc(sizeof(char)); rgt_buffer = malloc(sizeof(char));
@@ -376,35 +422,21 @@ void threading_init(){
memset(rgt_buffer, '\0', sizeof(char)); memset(rgt_buffer, '\0', sizeof(char));
memset(btm_buffer, '\0', sizeof(char)); memset(btm_buffer, '\0', sizeof(char));
mid_content->file_type = 0;
mid_content->file_size = 0;
mid_content->file_name = "";
rgt_content->file_type = 0; pthread_mutex_init(&mutex_top, NULL);
rgt_content->file_size = 0; pthread_mutex_init(&mutex_mid, NULL);
rgt_content->file_name = ""; pthread_mutex_init(&mutex_lft, NULL);
pthread_mutex_init(&mutex_btm, NULL);
pthread_mutex_init(&mutex_rgt, NULL);
pthread_mutex_init(&mutex_selection, NULL);
pthread_cond_init(&cond_rgt, NULL);
pthread_cond_init(&cond_lft, NULL);
pthread_cond_init(&cond_mid, NULL);
pthread_cond_init(&cond_top, NULL);
pthread_cond_init(&cond_btm, NULL);
volatile char vol; /* needed to make sure higher optimization steps dont move these around */
vol = pthread_mutex_init(&mutex_top, NULL);
vol = pthread_mutex_init(&mutex_mid, NULL);
vol = pthread_mutex_init(&mutex_lft, NULL);
vol = pthread_mutex_init(&mutex_btm, NULL);
vol = pthread_mutex_init(&mutex_rgt, NULL);
vol = pthread_mutex_init(&mutex_selection, NULL);
vol = pthread_cond_init(&cond_rgt, NULL);
vol = pthread_cond_init(&cond_lft, NULL);
vol = pthread_cond_init(&cond_mid, NULL);
vol = pthread_cond_init(&cond_top, NULL);
vol = pthread_cond_init(&cond_btm, NULL);
vol;
selected_file_current = 0;
selected_file_last = 0;
} }
void threading_free(){ void threading_free(){
free(rgt_content);
free(mid_content);
free(lft_content);
free(top_buffer); free(top_buffer);
pthread_mutex_destroy(&mutex_top); pthread_mutex_destroy(&mutex_top);

View File

@@ -14,17 +14,14 @@ extern unsigned int timeout_time;
extern unsigned int color_count; extern unsigned int color_count;
extern color *colors; extern color *colors;
extern file *mid_content; extern dir rgt_dir;
extern file *lft_content; extern dir mid_dir;
extern file *rgt_content; extern dir lft_dir;
extern char *top_buffer; extern char *top_buffer;
extern char *rgt_buffer; extern char *rgt_buffer;
extern char *btm_buffer; extern char *btm_buffer;
extern unsigned long lft_file_count;
extern unsigned long mid_file_count;
extern unsigned long rgt_file_count;
extern unsigned long top_width; extern unsigned long top_width;
extern pthread_mutex_t mutex_top; extern pthread_mutex_t mutex_top;
@@ -34,7 +31,6 @@ extern pthread_mutex_t mutex_mid;
extern pthread_mutex_t mutex_rgt; extern pthread_mutex_t mutex_rgt;
void window_top(WINDOW *win){ void window_top(WINDOW *win){
werase(win);
if (pthread_mutex_trylock(&mutex_top) == 0) { if (pthread_mutex_trylock(&mutex_top) == 0) {
if (*top_buffer != ' ') { /*printing ' ' (standard initialized value, see threading_init) makes valgrind throw a fuss*/ if (*top_buffer != ' ') { /*printing ' ' (standard initialized value, see threading_init) makes valgrind throw a fuss*/
@@ -42,18 +38,17 @@ void window_top(WINDOW *win){
mvwaddstr(win, 0, 0, top_buffer); mvwaddstr(win, 0, 0, top_buffer);
mvwaddch(win, 0, strlen(top_buffer), '/'); mvwaddch(win, 0, strlen(top_buffer), '/');
wattroff(win, COLOR_PAIR(COLOR_PATH)); wattroff(win, COLOR_PAIR(COLOR_PATH));
if (mid_file_count != 0) { if (mid_dir.file_count != 0) {
mvwaddstr(win, 0, strlen(top_buffer)+1, mid_content[selected_file_current].file_name); mvwaddstr(win, 0, strlen(top_buffer)+1, mid_dir.current_file->file_name);
} }
} }
pthread_mutex_unlock(&mutex_top); pthread_mutex_unlock(&mutex_top);
} else { } else {
mvwaddstr(win, 0, terminal_width/2, "LOADING"); mvwaddstr(win, 0, terminal_width/2, "LOADING");
status |= STATUS_UPDATE_SCREEN_0; status |= STATUS_UPDATE_SCREEN_GENERIC;
} }
} }
void window_btm(WINDOW *win, char force_render){ void window_btm(WINDOW *win){
werase(win);
if (pthread_mutex_trylock(&mutex_btm) == 0) { if (pthread_mutex_trylock(&mutex_btm) == 0) {
if (*top_buffer != ' ') { /*printing ' ' (standard initialized value, see threading_init) makes valgrind throw a fuss*/ if (*top_buffer != ' ') { /*printing ' ' (standard initialized value, see threading_init) makes valgrind throw a fuss*/
@@ -62,62 +57,52 @@ void window_btm(WINDOW *win, char force_render){
pthread_mutex_unlock(&mutex_btm); pthread_mutex_unlock(&mutex_btm);
/*the printing of the input char is done in user_interactions*/ /*the printing of the input char is done in user_interactions*/
/*the printing of all possible inputs are done in user_interactions */ /*the printing of all possible inputs are done in user_interactions */
} else if (force_render) {
/*force_render is used in stuff like open_with, search, and other functions that take over win_b,
* while needing to avoid possible conflicts like thread_btm itself*/
mvwprintw(win, 0, 0, "%s", btm_buffer);
} else { } else {
mvwaddstr(win, 0, terminal_width/2, "LOADING"); mvwaddstr(win, 0, terminal_width/2, "LOADING");
status |= STATUS_UPDATE_SCREEN_0; status |= STATUS_UPDATE_SCREEN_GENERIC;
} }
} }
void window_lft(WINDOW *win){ void window_lft(WINDOW *win){
werase(win);
if (pthread_mutex_trylock(&mutex_lft) == 0) { if (pthread_mutex_trylock(&mutex_lft) == 0) {
print_dir(win, 0, &lft_file_count, lft_content); print_dir(win, 0, &lft_dir);
pthread_mutex_unlock(&mutex_lft); pthread_mutex_unlock(&mutex_lft);
} else { } else {
mvwaddstr(win, terminal_height/2, terminal_width/8, "LOADING"); mvwaddstr(win, terminal_height/2, terminal_width/8, "LOADING");
status |= STATUS_UPDATE_SCREEN_0; status |= STATUS_UPDATE_SCREEN_GENERIC;
} }
} }
void window_mid(WINDOW *win){ void window_mid(WINDOW *win){
werase(win);
if (pthread_mutex_trylock(&mutex_mid) == 0) { if (pthread_mutex_trylock(&mutex_mid) == 0) {
if (mid_file_count == 0) { if (mid_dir.file_count == 0) {
mvwaddstr(win, 0, 0, "empty"); mvwaddstr(win, 0, 0, "empty");
} else { } else {
print_dir(win, 1, &mid_file_count, mid_content); print_dir(win, 1, &mid_dir);
} }
pthread_mutex_unlock(&mutex_mid); pthread_mutex_unlock(&mutex_mid);
} else { } else {
mvwaddstr(win, terminal_height/2, terminal_width/4, "LOADING"); mvwaddstr(win, terminal_height/2, terminal_width/4, "LOADING");
status |= STATUS_UPDATE_SCREEN_0; status |= STATUS_UPDATE_SCREEN_GENERIC;
} }
} }
void window_rgt(WINDOW *win){ void window_rgt(WINDOW *win){
werase(win);
if (pthread_mutex_trylock(&mutex_rgt) == 0) { if (pthread_mutex_trylock(&mutex_rgt) == 0) {
if (rgt_file_count == 0) { if (!rgt_dir.current_file) {
if (rgt_content[0].file_type == FILE_TYPE_OPEN_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); mvwaddnstr(win, 0, 0, rgt_buffer, (terminal_width/2) * terminal_width);
} else if (rgt_content->permissions & S_IRUSR) { } else if ((rgt_dir.current_file->permissions & S_IRUSR) == 0) {
mvwaddstr(win, 0, 0, "not accessible"); mvwaddstr(win, 0, 0, "not accessible");
} else { } else {
mvwaddstr(win, 0, 0, "empty"); print_dir(win, 0, &rgt_dir);
} }
} else {
print_dir(win, 0, &rgt_file_count, rgt_content);
}
pthread_mutex_unlock(&mutex_rgt); pthread_mutex_unlock(&mutex_rgt);
} else { } else {
mvwaddstr(win, terminal_height/2, terminal_width/4, "LOADING"); mvwaddstr(win, terminal_height/2, terminal_width/4, "LOADING");
status |= STATUS_UPDATE_SCREEN_0; status |= STATUS_UPDATE_SCREEN_GENERIC;
} }
} }

View File

@@ -1,7 +1,7 @@
#include "window.c" #include "window.c"
void window_top(WINDOW *win); void window_top(WINDOW *win);
void window_btm(WINDOW *win, char force_render); void window_btm(WINDOW *win);
void window_lft(WINDOW *win); void window_lft(WINDOW *win);
void window_mid(WINDOW *win); void window_mid(WINDOW *win);
void window_rgt(WINDOW *win); void window_rgt(WINDOW *win);