Compare commits
24 Commits
a5483335c5
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5a31f452ea | ||
|
|
daf43daa00 | ||
|
|
cf03a230b6 | ||
|
|
87bfdd1b86 | ||
|
|
20fee198ae | ||
|
|
632904fd89 | ||
|
|
dd5307b411 | ||
|
|
41933eb6d0 | ||
|
|
0a45d1e3e8 | ||
|
|
d33ac88de2 | ||
|
|
e42d55e66a | ||
|
|
f6380ddeda | ||
|
|
905f6e8588 | ||
|
|
095cf7b357 | ||
|
|
9f7ed73885 | ||
|
|
41af25e0b1 | ||
|
|
f807fe56b5 | ||
|
|
adb10b6d5d | ||
|
|
c692a1a992 | ||
|
|
8c80a6e3da | ||
|
|
1aa66c82fb | ||
|
|
f5d0c8bc85 | ||
|
|
9e8bd3c022 | ||
|
|
f40cc91cce |
47
backend.c
47
backend.c
@@ -100,13 +100,13 @@ char* parse_cmd(const char *cmd, file *f){
|
||||
pos = out;
|
||||
if (offset) {
|
||||
memcpy(pos, cmd, offset - cmd);
|
||||
pos += offset - cmd + 1;
|
||||
pos += offset - cmd;
|
||||
} else {
|
||||
memcpy(pos, cmd, strlen(cmd));
|
||||
pos += strlen(cmd) + 1;
|
||||
}
|
||||
pos[-1] = ' ';
|
||||
pos[0] = '\'';
|
||||
}
|
||||
*pos = '\'';
|
||||
pos++;
|
||||
|
||||
i = 0;
|
||||
@@ -124,12 +124,47 @@ char* parse_cmd(const char *cmd, file *f){
|
||||
|
||||
if (offset) {
|
||||
pos[1]= ' ';
|
||||
memcpy(pos + 1, offset+1, strlen(offset+1));
|
||||
pos[strlen(offset+1)] = '\0';
|
||||
memcpy(pos + 1, offset+1, strlen(offset)+1);
|
||||
pos[strlen(offset)+1] = '\0';
|
||||
} else {
|
||||
pos[1] = '\0';
|
||||
}
|
||||
|
||||
return out;
|
||||
|
||||
}
|
||||
char* parse_path(char *path){
|
||||
int count = 0;
|
||||
char *out;
|
||||
char *pos;
|
||||
unsigned long i = 0;
|
||||
while(path[i]) {
|
||||
if (path[i] == '\'') {
|
||||
count++;
|
||||
}
|
||||
i++;
|
||||
}
|
||||
|
||||
out = malloc((strlen(path)+(count*3)) + 4);
|
||||
|
||||
pos = out;
|
||||
pos++;
|
||||
|
||||
out[0] = '\'';
|
||||
|
||||
i = 0;
|
||||
while(path[i]) {
|
||||
if (path[i] == '\'') {
|
||||
*pos++ = '\'';
|
||||
*pos++ = '\\';
|
||||
*pos++ = '\'';
|
||||
}
|
||||
*pos = path[i];
|
||||
pos++;
|
||||
i++;
|
||||
}
|
||||
pos[0] = '\'';
|
||||
pos[1]= ' ';
|
||||
pos[2] = '\0';
|
||||
|
||||
return out;
|
||||
}
|
||||
|
||||
3
colors.c
3
colors.c
@@ -102,8 +102,7 @@ void colors_init() {
|
||||
while (getline(&line, &size, dircolors) != -1) {
|
||||
fg = 7;
|
||||
bg = 0;
|
||||
if (line[0] == '.') {
|
||||
extension = strtok(line, " ");
|
||||
if (line[0] == '.' && (extension = strtok(line, " ")) != NULL) {
|
||||
colors[i].file_extension = malloc(strlen(extension)+1);
|
||||
memcpy(colors[i].file_extension, extension, strlen(extension)+1);
|
||||
|
||||
|
||||
46
config.h
46
config.h
@@ -4,6 +4,7 @@
|
||||
#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
|
||||
* as of right now, this character cannot be escaped; i.e ``command\^ --arg`` will parse into ``command\path_of_hovered_file --arg``*/
|
||||
#define SETTINGS_COMMAND_FORK '@' /* commands starting with this character will be forked into a new non blokcing detached process */
|
||||
|
||||
/* {{{ */
|
||||
#ifndef CONFIG_GUARD
|
||||
@@ -13,6 +14,11 @@
|
||||
#include "interactions.h"
|
||||
/* }}} */
|
||||
|
||||
static const char clipboard_cmd[] = "echo ^ | xsel -ib --trim"; /*used in yank_text*/
|
||||
static const char rename_cmd[] = "mv"; /* as used in rename_hovered, makedir and makefile */
|
||||
static const char makefile_cmd[] = "touch"; /*as of now both only do ``rename_cmd new_name``*/
|
||||
static const char makedir_cmd[] = "mkdir";
|
||||
|
||||
static const mimetype mimetype_default_cmd[] = {
|
||||
/* mimetype shell command
|
||||
* ^ substring of "file --mime-type -b ./hovered"
|
||||
@@ -22,20 +28,20 @@ static const mimetype mimetype_default_cmd[] = {
|
||||
* gives us "image/gif", thusly if we want to open gif in mpv rather than feh,
|
||||
* we need to define "gif" before "image" */
|
||||
{ "text", "$EDITOR" },
|
||||
{ "avif", "nohup mpv ^ >/dev/null 2>&1 &" },
|
||||
{ "gif", "nohup mpv --loop-file=\"inf\" ^ >/dev/null 2>&1 &" },
|
||||
{ "image", "feh ^ >/dev/null 2>&1 &" },
|
||||
{ "video", "nohup mpv ^ >/dev/null 2>&1 &" },
|
||||
{ "avif", "@ mpv" },
|
||||
{ "gif", "@ mpv --loop-file=\"inf\"" },
|
||||
{ "image", "@ feh" },
|
||||
{ "video", "@ mpv" },
|
||||
{ "audio", "mpv" },
|
||||
{ "pdf", "zathura" },
|
||||
{ "pdf", "@ zathura" },
|
||||
};
|
||||
static const extension file_extension_default_cmd[] = {
|
||||
/* extension shell command
|
||||
* similar to mimetype_default_cmd, however it searches for exact string matches
|
||||
* and is checked before mimetype_default_cmd */
|
||||
{ ".exe", "wine"},
|
||||
{ ".cbz", "mcomix ^ &"},
|
||||
{ ".cbr", "mcomix ^ &"},
|
||||
{ ".cbz", "@ mcomix"},
|
||||
{ ".cbr", "@ mcomix"},
|
||||
{ ".json", "$EDITOR"},
|
||||
{ ".csv", "$EDITOR"},
|
||||
{ ".blend", "blender-bin-5.0.0"}, /* version number in bin in main repo? yea idc */
|
||||
@@ -62,12 +68,12 @@ static const binding key_binding[] = {
|
||||
{ "n", move_up, NULL, "move up" },
|
||||
{ "s", move_right, NULL, "move right" }, /* if a dir is hovered, cd into it, if a file is selected, see mimetype_default_cmd */
|
||||
|
||||
{ "\n", open_with, NULL, "open \"open with\" dialog" }, /* opens the hovered file with an arbitrary command */
|
||||
{ "\n", open_with, NULL, "open \"open with\" dialog" }, /* execute shell cmd on file, accounts for SETTINGS_COMMAND_FORK */
|
||||
{ "r", rename_hovered, NULL, "rename hovered file" }, /* renames currently hovered file/directory */
|
||||
{ "dD", delete, NULL, "delete file" }, /* deletes currently hovered OR selected file/directory
|
||||
* this means that it does not delete the hovered files if files are already selected */
|
||||
{ "yn", yank_text, "name", "yank filename of hovered file" },
|
||||
{ "yp", yank_text, "path", "yank path of hovered file" },
|
||||
{ "yn", yank_file_name, NULL, "yank filename of hovered file" },
|
||||
{ "yp", yank_file_path, NULL, "yank path of hovered file" },
|
||||
{ "yy", yank_file, "copy", "copy/yank file/directory" },
|
||||
{ "dd", yank_file, "cut", "cut file/directory" },
|
||||
{ "pp", paste, NULL, "paste" },
|
||||
@@ -113,13 +119,12 @@ static const binding key_binding[] = {
|
||||
|
||||
static const char size_unit[] = { 'B', 'K', 'M', 'G', 'T', 'P' }; /* this defines the maximum size unit, deleting everything except B results in all sizes being displayed in byte */
|
||||
|
||||
static const char clipboard_cmd[] = "xsel -ib --trim"; /* assembles the following shell cmd: echo "hovered_file" | clipboard_cmd */
|
||||
static const char ui_btm_text_storage_left[] = "total free";
|
||||
static const char ui_btm_current_dir_size[] = "sum of dir,";
|
||||
static const char ui_open_with_text_0[] = "open"; /*ui_open_with_text_0 \"selected_file\" ui_open_with_text_1*/
|
||||
static const char ui_open_with_text_1[] = "with:";
|
||||
static const char ui_rename_text_0[] = "rename"; /*ui_rename_text_0 \"selected_file\" ui_rename_text_1*/
|
||||
static const char ui_rename_text_1[] = "to:";
|
||||
static const char ui_open_with_text[] = "open "SETTINGS_COMMAND_REPLACE_STR" with:";
|
||||
static const char ui_rename_text[] = "rename "SETTINGS_COMMAND_REPLACE_STR" to:";
|
||||
static const char ui_makefile_text[] = "makedir:";
|
||||
static const char ui_makedir_text[] = "makefile:";
|
||||
static const char ui_delete_text[] = "delete:";
|
||||
|
||||
/* {{{ */
|
||||
@@ -129,6 +134,9 @@ static const unsigned long file_extension_default_count = sizeof(file_extension_
|
||||
static const char size_unit_count = (sizeof(size_unit) / sizeof(size_unit[0])) - 1;
|
||||
#else
|
||||
static const char clipboard_cmd[];
|
||||
static const char rename_cmd[];
|
||||
static const char makefile_cmd[];
|
||||
static const char makedir_cmd[];
|
||||
static const mimetype mimetype_default_cmd[];
|
||||
static const extension file_extension_default_cmd[];
|
||||
static const binding key_binding[];
|
||||
@@ -137,10 +145,10 @@ static const unsigned long mimetype_default_count;
|
||||
static const unsigned long file_extension_default_count;
|
||||
static const char size_unit[];
|
||||
static const char size_unit_count;
|
||||
static const char ui_open_with_text_0[];
|
||||
static const char ui_open_with_text_1[];
|
||||
static const char ui_rename_text_0[];
|
||||
static const char ui_rename_text_1[];
|
||||
static const char ui_open_with_text[];
|
||||
static const char ui_makedir_text[];
|
||||
static const char ui_makefile_text[];
|
||||
static const char ui_rename_text[];
|
||||
static const char ui_delete_text[];
|
||||
#endif
|
||||
/* }}} */
|
||||
|
||||
@@ -108,7 +108,7 @@ typedef struct Yank {
|
||||
} yank;
|
||||
typedef struct Linked_dir {
|
||||
char *path;
|
||||
unsigned long selected_file_current;
|
||||
unsigned long index;
|
||||
struct Linked_dir *next;
|
||||
} linked_dir;
|
||||
|
||||
|
||||
97
dir.c
97
dir.c
@@ -17,25 +17,25 @@ extern unsigned int settings;
|
||||
extern unsigned int file_modifiers;
|
||||
extern unsigned int color_count;
|
||||
extern unsigned int terminal_height;
|
||||
extern volatile unsigned long selected_file_current;
|
||||
extern volatile unsigned long selected_file_last;
|
||||
extern char *global_path;
|
||||
extern color *colors;
|
||||
int (*order_func)() = sort_natural;
|
||||
linked_dir *visited_dirs;
|
||||
linked_dir *current_dir;
|
||||
linked_dir *list_beginning;
|
||||
linked_dir *current_linked_dir;
|
||||
|
||||
|
||||
unsigned long get_dir_size(char *path){
|
||||
DIR *dir = opendir(path);
|
||||
unsigned long entry_count = 0;
|
||||
struct dirent *entry;
|
||||
if (dir && file_modifiers & FILE_MODIFIERS_HIDDEN_FILES) {
|
||||
if (dir) {
|
||||
if (file_modifiers & FILE_MODIFIERS_HIDDEN_FILES) {
|
||||
while ((entry=readdir(dir))) {
|
||||
entry_count++;
|
||||
}
|
||||
/* removes files "." and ".." */
|
||||
entry_count -= 2;
|
||||
} else if (dir) {
|
||||
} else {
|
||||
while ((entry=readdir(dir))) {
|
||||
if (entry->d_name[0] != '.') {
|
||||
entry_count++;
|
||||
@@ -43,6 +43,7 @@ unsigned long get_dir_size(char *path){
|
||||
}
|
||||
}
|
||||
closedir(dir);
|
||||
}
|
||||
return entry_count;
|
||||
|
||||
}
|
||||
@@ -54,6 +55,8 @@ void get_dir_content(char *path, dir *dir){
|
||||
} else {
|
||||
scandir(path, &entry, skip_hidden_files, NULL);
|
||||
}
|
||||
|
||||
|
||||
char *full_path = NULL;
|
||||
unsigned long i = 0;
|
||||
for (i = 0; i < dir->file_count; i++ ) {
|
||||
@@ -201,7 +204,7 @@ void print_dir(WINDOW *win, char print_info, dir *dir){
|
||||
} while (file_size > 1 && size_index < size_unit_count);
|
||||
size_char = size_unit[(unsigned)size_index];
|
||||
|
||||
if (dir->file_list[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->file_list[i].file_size) + 1);
|
||||
} else if (size_char =='B') {
|
||||
offset_back = line_width - (snprintf(NULL,0,"%0.0lf %c", printed_size, size_char) + 1);
|
||||
@@ -267,7 +270,7 @@ void print_dir(WINDOW *win, char print_info, dir *dir){
|
||||
#endif
|
||||
|
||||
|
||||
if (dir->file_list[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->file_list[i].file_size);
|
||||
}else if (size_char =='B') {
|
||||
mvwprintw(win, i-offset_vertical, offset_back, "%0.0lf %c", printed_size, size_char);
|
||||
@@ -294,13 +297,81 @@ void print_dir(WINDOW *win, char print_info, dir *dir){
|
||||
|
||||
}
|
||||
}
|
||||
void dir_changed(){
|
||||
|
||||
char *path = getcwd(NULL, 0);
|
||||
current_linked_dir = list_beginning;
|
||||
while (current_linked_dir->next != NULL) {
|
||||
if(strcmp(current_linked_dir->path, path) == 0) {
|
||||
break;
|
||||
} else {
|
||||
current_linked_dir = current_linked_dir->next;
|
||||
}
|
||||
}
|
||||
if(strcmp(current_linked_dir->path, path) == 0) {
|
||||
mid_dir.current_file = &mid_dir.file_list[current_linked_dir->index];
|
||||
} else {
|
||||
/**/
|
||||
|
||||
current_linked_dir->next = malloc(sizeof(linked_dir));
|
||||
current_linked_dir->next->path = malloc(strlen(global_path)+1);
|
||||
memcpy(current_linked_dir->next->path, global_path, strlen(global_path)+1);
|
||||
current_linked_dir->next->next = NULL;
|
||||
current_linked_dir->next->index = 0;
|
||||
|
||||
mid_dir.current_file = mid_dir.file_list;
|
||||
}
|
||||
|
||||
}
|
||||
void change_dir(char *new_path){
|
||||
|
||||
char *old_path = getcwd(NULL, 0);
|
||||
current_linked_dir = list_beginning;
|
||||
while (current_linked_dir->next != NULL) {
|
||||
if(strcmp(current_linked_dir->path, old_path) == 0) {
|
||||
break;
|
||||
} else {
|
||||
current_linked_dir = current_linked_dir->next;
|
||||
}
|
||||
}
|
||||
if(strcmp(current_linked_dir->path, old_path) == 0) {
|
||||
current_linked_dir->index = mid_dir.current_file - mid_dir.file_list;
|
||||
}
|
||||
|
||||
chdir(new_path);
|
||||
char *new_path_real = getcwd(NULL, 0);
|
||||
|
||||
current_linked_dir = list_beginning;
|
||||
while (current_linked_dir->next != NULL) {
|
||||
if(strcmp(current_linked_dir->path, new_path_real) == 0) {
|
||||
break;
|
||||
} else {
|
||||
current_linked_dir = current_linked_dir->next;
|
||||
}
|
||||
}
|
||||
if(strcmp(current_linked_dir->path, new_path_real) != 0) {
|
||||
current_linked_dir->next = malloc(sizeof(linked_dir));
|
||||
current_linked_dir = current_linked_dir->next;
|
||||
current_linked_dir->path = malloc(strlen(new_path_real)+1);
|
||||
memcpy(current_linked_dir->path, new_path_real, strlen(new_path_real)+1);
|
||||
current_linked_dir->next = NULL;
|
||||
current_linked_dir->index = 0;
|
||||
/*TODO(2026-05-25T22:49:30)
|
||||
*handle if new_path == "..", should this case be true, focus the index on which the old_path falls on*/
|
||||
}
|
||||
mid_dir.current_file = &mid_dir.file_list[current_linked_dir->index];
|
||||
|
||||
free(old_path);
|
||||
free(new_path_real);
|
||||
|
||||
}
|
||||
|
||||
void dir_init(){
|
||||
visited_dirs = malloc(sizeof(linked_dir));
|
||||
visited_dirs->path = getcwd(NULL, 0);
|
||||
visited_dirs->selected_file_current = 0;
|
||||
visited_dirs->next = NULL;
|
||||
current_dir = visited_dirs;
|
||||
list_beginning = malloc(sizeof(linked_dir));
|
||||
list_beginning->path = getcwd(NULL, 0);
|
||||
list_beginning->index = 0;
|
||||
list_beginning->next = NULL;
|
||||
current_linked_dir = list_beginning;
|
||||
|
||||
}
|
||||
|
||||
|
||||
288
interactions.c
288
interactions.c
@@ -12,28 +12,18 @@
|
||||
#include "dir.h"
|
||||
|
||||
|
||||
extern volatile unsigned long selected_file_current;
|
||||
extern volatile unsigned long selected_file_last;
|
||||
|
||||
extern unsigned int file_modifiers;
|
||||
extern pthread_mutex_t mutex_selection;
|
||||
extern pthread_mutex_t mutex_rgt;
|
||||
extern pthread_mutex_t mutex_mid;
|
||||
extern pthread_mutex_t mutex_btm;
|
||||
extern pthread_cond_t cond_rgt;
|
||||
extern pthread_cond_t cond_mid;
|
||||
extern pthread_mutex_t mutex_render;
|
||||
extern WINDOW *win_b;
|
||||
extern WINDOW *win_m;
|
||||
extern dir mid_dir;
|
||||
|
||||
extern unsigned int terminal_height;
|
||||
extern unsigned int terminal_width;
|
||||
|
||||
extern WINDOW *win_b;
|
||||
|
||||
extern char *rgt_buffer;
|
||||
extern char *btm_buffer;
|
||||
|
||||
extern unsigned int status;
|
||||
extern char *start_path;
|
||||
extern char *global_path;
|
||||
extern char *input;
|
||||
|
||||
extern time_t seed;
|
||||
@@ -43,9 +33,6 @@ unsigned int input_pass;
|
||||
unsigned long parsed_input_number;
|
||||
yank yank_files = { 0 };
|
||||
|
||||
extern void render_pass();
|
||||
extern int (*order_func)();
|
||||
|
||||
|
||||
#define TODO noraw(); \
|
||||
endwin();\
|
||||
@@ -141,18 +128,18 @@ int read_string(WINDOW *win, int y, int x, char *str){
|
||||
break;
|
||||
} else if (ch == '\t') { /* tab */
|
||||
memcpy(str + pass, mid_dir.current_file->file_name, strlen(mid_dir.current_file->file_name));
|
||||
mvwaddstr(win, y, x +pass, mid_dir.current_file->file_name);
|
||||
mvwaddstr(win, y, x + pass, mid_dir.current_file->file_name);
|
||||
pass += strlen(mid_dir.current_file->file_name);
|
||||
} else if (ch == 127) { /* backspace */
|
||||
if (pass > 0) {
|
||||
pass--;
|
||||
mvwdelch(win, y, pass);
|
||||
mvwdelch(win, y, x + pass);
|
||||
}
|
||||
} else if (ch == 27) { /* esc key */
|
||||
err = 1;
|
||||
break;
|
||||
} else {
|
||||
mvwaddch(win, y, x +pass, ch);
|
||||
mvwaddch(win, y, x + pass, ch);
|
||||
str[pass] = ch;
|
||||
pass++;
|
||||
}
|
||||
@@ -176,15 +163,6 @@ void select_all(){
|
||||
}
|
||||
status |= (STATUS_RUN_BACKEND);
|
||||
}
|
||||
void dir_changed(){
|
||||
unsigned long i;
|
||||
|
||||
for(i = 0; i < mid_dir.file_count; i++) {
|
||||
mid_dir.file_list[i].status = 0;
|
||||
}
|
||||
|
||||
status |= (STATUS_RUN_BACKEND | STATUS_RELOAD_DIRECTORY );
|
||||
}
|
||||
void move_down(unsigned long passes){
|
||||
|
||||
mid_dir.current_file += passes;
|
||||
@@ -206,11 +184,7 @@ void move_up(unsigned long passes){
|
||||
void move_left(unsigned long passes){
|
||||
unsigned long i;
|
||||
for (i = 0; i < passes; i++) {
|
||||
if (chdir("..") != 0) {
|
||||
/* TODO(2025-07-09T00:30:05) fix */
|
||||
FAIL("move_left", "unhandled error of chdir");
|
||||
}
|
||||
dir_changed();
|
||||
change_dir("..");
|
||||
}
|
||||
status |= (STATUS_RUN_BACKEND | STATUS_RELOAD_DIRECTORY);
|
||||
|
||||
@@ -218,12 +192,11 @@ void move_left(unsigned long passes){
|
||||
void move_right(){
|
||||
|
||||
if (mid_dir.current_file->file_type & FILE_TYPE_DIR) {
|
||||
if (chdir(mid_dir.current_file->file_name) != 0) {
|
||||
/* TODO(2026-05-05T20:12:14) fix */
|
||||
FAIL("move_right", "unhandled error of chdir");
|
||||
}
|
||||
dir_changed();
|
||||
change_dir(mid_dir.current_file->file_name);
|
||||
} else if (mid_dir.current_file->file_type & FILE_TYPE_EXEC) {
|
||||
char *cmd = parse_cmd("./"SETTINGS_COMMAND_REPLACE_STR,mid_dir.current_file);
|
||||
if (system(cmd)) {
|
||||
}
|
||||
} else {
|
||||
char *mime = get_mimetype(mid_dir.current_file);
|
||||
char *extension = mid_dir.current_file->file_name;
|
||||
@@ -239,9 +212,19 @@ void move_right(){
|
||||
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) {
|
||||
if (file_extension_default_cmd[i].command[0] == SETTINGS_COMMAND_FORK) {
|
||||
cmd = parse_cmd(file_extension_default_cmd[i].command + 1, mid_dir.current_file);
|
||||
pid_t pid = fork();
|
||||
if (pid == 0 && setsid()) {
|
||||
system(cmd);
|
||||
status = STATUS_QUIT_PROGRAM;
|
||||
exit(1);
|
||||
}
|
||||
} else {
|
||||
cmd = parse_cmd(file_extension_default_cmd[i].command, mid_dir.current_file);
|
||||
if (system(cmd)) {
|
||||
}
|
||||
}
|
||||
status |= STATUS_MOVE_RIGHT_MATCH;
|
||||
update();
|
||||
break;
|
||||
@@ -250,10 +233,21 @@ void move_right(){
|
||||
}
|
||||
if (!(status & STATUS_MOVE_RIGHT_MATCH)) {
|
||||
for (i = 0; i < mimetype_default_count; i++) {
|
||||
if (strstr(mimetype_default_cmd[i].mimetype, mime) == 0) {
|
||||
if (strstr(mime, mimetype_default_cmd[i].mimetype)) {
|
||||
if (mimetype_default_cmd[i].command[0] == SETTINGS_COMMAND_FORK) {
|
||||
cmd = parse_cmd(mimetype_default_cmd[i].command + 1, mid_dir.current_file);
|
||||
pid_t pid = fork();
|
||||
if (pid == 0 && setsid()) {
|
||||
system(cmd);
|
||||
status = STATUS_QUIT_PROGRAM;
|
||||
exit(1);
|
||||
}
|
||||
} else {
|
||||
cmd = parse_cmd(mimetype_default_cmd[i].command, mid_dir.current_file);
|
||||
if (system(cmd)) {
|
||||
}
|
||||
}
|
||||
status |= STATUS_MOVE_RIGHT_MATCH;
|
||||
update();
|
||||
break;
|
||||
}
|
||||
@@ -287,22 +281,81 @@ void jump_top(){
|
||||
status |= (STATUS_RUN_BACKEND);
|
||||
}
|
||||
void open_with(){
|
||||
TODO;
|
||||
wclear(win_b);
|
||||
char *cmd;
|
||||
char *str = malloc(INPUT_BUFFER_SIZE);
|
||||
char *parsed_ui_text = parse_cmd(ui_open_with_text, mid_dir.current_file);
|
||||
mvwprintw(win_b, 0, 0, parsed_ui_text);
|
||||
if (read_string(win_b, 0, strlen(parsed_ui_text)+1, str) == 0) {
|
||||
if (str[0] == SETTINGS_COMMAND_FORK) {
|
||||
cmd = parse_cmd(str+1, mid_dir.current_file);
|
||||
pid_t pid = fork();
|
||||
if (pid == 0 && setsid()) {
|
||||
system(cmd);
|
||||
status = STATUS_QUIT_PROGRAM;
|
||||
exit(1);
|
||||
}
|
||||
} else {
|
||||
cmd = parse_cmd(str, mid_dir.current_file);
|
||||
if (system(cmd)) {
|
||||
}
|
||||
}
|
||||
free(cmd);
|
||||
}
|
||||
free(parsed_ui_text);
|
||||
free(str);
|
||||
status |= (STATUS_RUN_BACKEND | STATUS_RELOAD_DIRECTORY | STATUS_UPDATE_SCREEN_CLEAR);
|
||||
|
||||
}
|
||||
void rename_hovered(){
|
||||
TODO;
|
||||
wclear(win_b);
|
||||
file tmp;
|
||||
tmp.file_name = malloc(INPUT_BUFFER_SIZE);
|
||||
char *parsed_ui_text = parse_cmd(ui_rename_text, mid_dir.current_file);
|
||||
mvwprintw(win_b, 0, 0, parsed_ui_text);
|
||||
if (read_string(win_b, 0, strlen(parsed_ui_text)+1, tmp.file_name) == 0) {
|
||||
char *cmd0 = parse_cmd(rename_cmd, mid_dir.current_file);
|
||||
char *cmd1 = parse_cmd(cmd0, &tmp);
|
||||
system(cmd1);
|
||||
free(cmd0);
|
||||
free(cmd1);
|
||||
}
|
||||
free(parsed_ui_text);
|
||||
free(tmp.file_name);
|
||||
status |= (STATUS_RUN_BACKEND | STATUS_RELOAD_DIRECTORY);
|
||||
|
||||
}
|
||||
void delete(){
|
||||
TODO;
|
||||
}
|
||||
void makedir(){
|
||||
TODO;
|
||||
wclear(win_b);
|
||||
file tmp;
|
||||
tmp.file_name = malloc(INPUT_BUFFER_SIZE);
|
||||
mvwprintw(win_b, 0, 0, ui_makedir_text);
|
||||
if (read_string(win_b, 0, strlen(ui_makedir_text)+1, tmp.file_name) == 0) {
|
||||
char *cmd = parse_cmd(makedir_cmd, &tmp);
|
||||
system(cmd);
|
||||
free(cmd);
|
||||
}
|
||||
free(tmp.file_name);
|
||||
status |= (STATUS_RUN_BACKEND | STATUS_RELOAD_DIRECTORY);
|
||||
}
|
||||
void makefile(){
|
||||
TODO;
|
||||
wclear(win_b);
|
||||
file tmp;
|
||||
tmp.file_name = malloc(INPUT_BUFFER_SIZE);
|
||||
mvwprintw(win_b, 0, 0, ui_makefile_text);
|
||||
if (read_string(win_b, 0, strlen(ui_makefile_text)+1, tmp.file_name) == 0) {
|
||||
char *cmd = parse_cmd(makefile_cmd, &tmp);
|
||||
system(cmd);
|
||||
free(cmd);
|
||||
}
|
||||
free(tmp.file_name);
|
||||
status |= (STATUS_RUN_BACKEND | STATUS_RELOAD_DIRECTORY);
|
||||
}
|
||||
void enter_shell(unsigned long passes, int index){
|
||||
(void*)passes; /*remove compiler warning*/
|
||||
(void)passes; /*remove compiler warning*/
|
||||
|
||||
endwin();\
|
||||
echo();\
|
||||
@@ -325,7 +378,33 @@ void not_implemented(unsigned long passes, int index){
|
||||
TODO;
|
||||
}
|
||||
void jump_to_dir(unsigned long passes, int index){
|
||||
TODO;
|
||||
(void)passes;
|
||||
|
||||
unsigned long len;
|
||||
char *c = strchr(key_binding[index].black_magic, '/');
|
||||
if (c) {
|
||||
len = c - (char*)key_binding[index].black_magic;
|
||||
} else {
|
||||
len = strlen(key_binding[index].black_magic);
|
||||
}
|
||||
|
||||
char *to_env = malloc(len + 1);
|
||||
memcpy(to_env, key_binding[index].black_magic, len);
|
||||
to_env[len] = '\0';
|
||||
char *env = getenv(to_env + 1); /*+1 to remove the '$' prefix, freeing env always segfaults*/
|
||||
|
||||
if (env) {
|
||||
char *path = malloc(strlen(key_binding[index].black_magic) + strlen(env) + 1);
|
||||
memcpy(path, env, strlen(env));
|
||||
memcpy(path + strlen(env), key_binding[index].black_magic + len, strlen(key_binding[index].black_magic)+1);
|
||||
change_dir(path);
|
||||
free(path);
|
||||
} else {
|
||||
change_dir(key_binding[index].black_magic);
|
||||
}
|
||||
free(to_env);
|
||||
|
||||
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK | STATUS_RELOAD_DIRECTORY );
|
||||
}
|
||||
void order_by(unsigned long passes, int index){
|
||||
(void)passes;
|
||||
@@ -336,10 +415,34 @@ void order_by(unsigned long passes, int index){
|
||||
status |= (STATUS_RUN_BACKEND | STATUS_RELOAD_DIRECTORY);
|
||||
}
|
||||
void cmd_on_selected(unsigned long passes, int index){
|
||||
TODO;
|
||||
(void)passes;
|
||||
|
||||
char *cmd = parse_cmd(key_binding[index].black_magic, mid_dir.current_file);
|
||||
system(cmd);
|
||||
free(cmd);
|
||||
|
||||
status |= (STATUS_RUN_BACKEND | STATUS_RELOAD_DIRECTORY | STATUS_UPDATE_SCREEN_CLEAR);
|
||||
}
|
||||
void yank_text(unsigned long passes, int index){
|
||||
TODO;
|
||||
void yank_file_name(){
|
||||
char *cmd = parse_cmd(clipboard_cmd, mid_dir.current_file);
|
||||
system(cmd);
|
||||
free(cmd);
|
||||
status |= (STATUS_RUN_BACKEND);
|
||||
}
|
||||
void yank_file_path(){
|
||||
file *tmp = malloc(sizeof(file));
|
||||
tmp->file_name = malloc(strlen(global_path)+1+strlen(mid_dir.current_file->file_name)+1);
|
||||
memcpy(tmp->file_name, global_path, strlen(global_path));
|
||||
memcpy(tmp->file_name+strlen(global_path)+1, mid_dir.current_file->file_name, strlen(mid_dir.current_file->file_name)+1);
|
||||
tmp->file_name[strlen(global_path)] = '/'; /*no +1 is needed*/
|
||||
char *cmd = parse_cmd(clipboard_cmd, tmp);
|
||||
system(cmd);
|
||||
free(cmd);
|
||||
free(tmp->file_name);
|
||||
free(tmp);
|
||||
status |= (STATUS_RUN_BACKEND);
|
||||
|
||||
|
||||
}
|
||||
void yank_file(unsigned long passes, int index){
|
||||
TODO;
|
||||
@@ -348,13 +451,94 @@ void paste(){
|
||||
TODO;
|
||||
}
|
||||
void search(){
|
||||
TODO;
|
||||
echo();
|
||||
unsigned long i;
|
||||
for (i = 0; i < terminal_width -1; i++) {
|
||||
mvwaddch(win_b, 0, i, ' ');
|
||||
}
|
||||
mvwaddch(win_b, 0, 0, '/');
|
||||
memset(search_buffer, 0, INPUT_BUFFER_SIZE);
|
||||
|
||||
curs_set(1);
|
||||
echo();
|
||||
|
||||
timeout(-1); /* negative numbers block until enter is pressed */
|
||||
|
||||
unsigned int pass = 0;
|
||||
char ch;
|
||||
char err = 0;
|
||||
|
||||
wmove(win_b, 0, 1);
|
||||
while(1) {
|
||||
ch = wgetch(win_b);
|
||||
if (ch == '\n') {
|
||||
err = 0;
|
||||
break;
|
||||
} else if (ch == '\t') { /* tab */
|
||||
memcpy(search_buffer + pass, mid_dir.current_file->file_name, strlen(mid_dir.current_file->file_name));
|
||||
mvwaddstr(win_b, 0, pass+1, mid_dir.current_file->file_name);
|
||||
pass += strlen(mid_dir.current_file->file_name);
|
||||
} else if (ch == 127) { /* backspace */
|
||||
if (pass > 0) {
|
||||
pass--;
|
||||
mvwdelch(win_b, 0, pass+1);
|
||||
}
|
||||
} else if (ch == 27) { /* esc key */
|
||||
err = 1;
|
||||
break;
|
||||
}
|
||||
if (ch) {
|
||||
mvwaddch(win_b, 0, pass+1, ch);
|
||||
search_buffer[pass] = ch;
|
||||
pass++;
|
||||
|
||||
unsigned long index = (mid_dir.current_file - mid_dir.file_list);
|
||||
unsigned long x = getmaxx(win_b);
|
||||
for (; &mid_dir.file_list[index] < mid_dir.file_list + mid_dir.file_count; index++) {
|
||||
if (smartstrcasestr(mid_dir.file_list[index].file_name, search_buffer)) {
|
||||
mid_dir.current_file = &mid_dir.file_list[index];
|
||||
|
||||
/* re-render current dir */
|
||||
pthread_mutex_lock(&mutex_render);
|
||||
|
||||
werase(win_m);
|
||||
print_dir(win_m, 1, &mid_dir);
|
||||
|
||||
wnoutrefresh(win_m);
|
||||
pthread_mutex_unlock(&mutex_render);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
search_buffer[pass] = '\0';
|
||||
|
||||
noecho();
|
||||
curs_set(0);
|
||||
|
||||
status |= (STATUS_RUN_BACKEND);
|
||||
|
||||
}
|
||||
void search_next(){
|
||||
TODO;
|
||||
long index = (mid_dir.current_file - mid_dir.file_list) + 1;
|
||||
for (; &mid_dir.file_list[index] < mid_dir.file_list + mid_dir.file_count; index++) {
|
||||
if (smartstrcasestr(mid_dir.file_list[index].file_name, search_buffer)) {
|
||||
mid_dir.current_file = &mid_dir.file_list[index];
|
||||
break;
|
||||
}
|
||||
}
|
||||
status |= (STATUS_RUN_BACKEND);
|
||||
}
|
||||
void search_previous(){
|
||||
TODO;
|
||||
long index = (mid_dir.current_file - mid_dir.file_list) - 1;
|
||||
for (; &mid_dir.file_list[index] >= mid_dir.file_list; index--) {
|
||||
if (smartstrcasestr(mid_dir.file_list[index].file_name, search_buffer)) {
|
||||
mid_dir.current_file = &mid_dir.file_list[index];
|
||||
break;
|
||||
}
|
||||
}
|
||||
status |= (STATUS_RUN_BACKEND);
|
||||
}
|
||||
void jmp_file_index(){
|
||||
TODO;
|
||||
|
||||
@@ -26,7 +26,8 @@ void not_implemented(unsigned long passes, int index);
|
||||
void jump_to_dir(unsigned long passes, int index);
|
||||
void order_by(unsigned long passes, int index);
|
||||
void cmd_on_selected(unsigned long passes, int index);
|
||||
void yank_text(unsigned long passes, int index);
|
||||
void yank_file_name();
|
||||
void yank_file_path();
|
||||
void yank_file(unsigned long passes, int index);
|
||||
void paste();
|
||||
void search();
|
||||
|
||||
17
main.c
17
main.c
@@ -19,9 +19,8 @@ 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;
|
||||
unsigned int status = (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK | STATUS_RELOAD_DIRECTORY);
|
||||
char *start_path;
|
||||
unsigned int file_modifiers = 0;
|
||||
unsigned int status = (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK | STATUS_RELOAD_DIRECTORY) & ~STATUS_UPDATE_SCREEN_RESIZE;
|
||||
char *global_path;
|
||||
time_t seed;
|
||||
|
||||
@@ -36,10 +35,8 @@ extern pthread_mutex_t mutex_btm;
|
||||
extern pthread_mutex_t mutex_lft;
|
||||
extern pthread_mutex_t mutex_mid;
|
||||
extern pthread_mutex_t mutex_rgt;
|
||||
extern volatile char render_queue[5];
|
||||
|
||||
char *input; /*used in user_interactions*/
|
||||
char *terminal_width_empty_line; /* used in user_interactions */
|
||||
|
||||
void render_pass();
|
||||
void init();
|
||||
@@ -66,7 +63,6 @@ int main(){
|
||||
pthread_t thread_m;
|
||||
pthread_t thread_r;
|
||||
|
||||
terminal_width_empty_line = malloc(terminal_width);
|
||||
#if SETTINGS_RELOAD_DIR_DELTA != 0
|
||||
time_t t;
|
||||
time_t dt;
|
||||
@@ -79,18 +75,12 @@ int main(){
|
||||
pthread_create(&thread_r, NULL, thread_rgt, &status); /*child_content slash win_r*/
|
||||
pthread_create(&thread_b, NULL, thread_btm, &status); /*bottom bar*/
|
||||
|
||||
|
||||
/* running through all once manually in order to get an as fast as possible first render on the screen */
|
||||
pthread_cond_signal(&cond_mid);
|
||||
pthread_cond_signal(&cond_lft);
|
||||
render_pass();
|
||||
timeout(SETTINGS_CURSES_TIMEOUT);
|
||||
|
||||
|
||||
while(!(status & STATUS_QUIT_PROGRAM)){
|
||||
getmaxyx(stdscr, terminal_height, terminal_width);
|
||||
|
||||
user_interactions();
|
||||
if (status & STATUS_RUN_BACKEND) {
|
||||
free(global_path);
|
||||
global_path = getcwd(NULL, 0);
|
||||
@@ -107,6 +97,7 @@ int main(){
|
||||
temp_width = terminal_width;
|
||||
temp_heigth = terminal_height;
|
||||
}
|
||||
user_interactions();
|
||||
render_pass();
|
||||
|
||||
#if SETTINGS_RELOAD_DIR_DELTA != 0
|
||||
@@ -122,7 +113,6 @@ int main(){
|
||||
ueberzug_close();
|
||||
#endif
|
||||
threading_free();
|
||||
free(start_path);
|
||||
|
||||
delwin(win_l);
|
||||
delwin(win_m);
|
||||
@@ -180,7 +170,6 @@ void init() {
|
||||
/*file_modifiers = (FILE_MODIFIERS_HIDDEN_FILES | FILE_MODIFIERS_SORT_BITMASK);*/
|
||||
input = malloc(INPUT_BUFFER_SIZE); /* size of input buffer, out of bounds access will not be accounted for */
|
||||
memset(input, 0, INPUT_BUFFER_SIZE);
|
||||
status = (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK | STATUS_RELOAD_DIRECTORY);
|
||||
if (getuid() == 0) {
|
||||
status |= STATUS_USER_ROOT;
|
||||
}
|
||||
|
||||
32
threading.c
32
threading.c
@@ -65,6 +65,7 @@ void *thread_mid(){
|
||||
if (global_path == NULL) {
|
||||
mid_dir.current_file = NULL;
|
||||
mid_dir.file_count = 0;
|
||||
pthread_mutex_unlock(&mutex_mid);
|
||||
continue;
|
||||
}
|
||||
char *path = malloc(strlen(global_path)+1);
|
||||
@@ -214,9 +215,10 @@ void *thread_rgt(){
|
||||
|
||||
pthread_mutex_unlock(&mutex_mid);
|
||||
|
||||
werase(win_r);
|
||||
|
||||
|
||||
if (rgt_dir.current_file->permissions & S_IRUSR) {
|
||||
if (rgt_dir.current_file->file_type &= FILE_TYPE_DIR) {
|
||||
if (rgt_dir.current_file->file_type & FILE_TYPE_DIR) {
|
||||
#if SETTINGS_UEBERZUG_IMAGE_PREVIEW != 0
|
||||
images_clear();
|
||||
#endif
|
||||
@@ -231,6 +233,7 @@ void *thread_rgt(){
|
||||
rgt_dir.current_file = NULL;
|
||||
}
|
||||
pthread_mutex_lock(&mutex_render);
|
||||
werase(win_r);
|
||||
print_dir(win_r, 0, &rgt_dir);
|
||||
wnoutrefresh(win_r);
|
||||
pthread_mutex_unlock(&mutex_render);
|
||||
@@ -241,7 +244,8 @@ void *thread_rgt(){
|
||||
rgt_buffer = preview_file(rgt_dir.current_file);
|
||||
rgt_dir.current_file->file_type |= FILE_TYPE_OPEN_FILE;
|
||||
pthread_mutex_lock(&mutex_render);
|
||||
if (rgt_dir.current_file->file_type == FILE_TYPE_OPEN_FILE) {
|
||||
werase(win_r);
|
||||
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");
|
||||
@@ -281,27 +285,27 @@ void *thread_top(){
|
||||
pthread_mutex_unlock(&mutex_top);
|
||||
continue;
|
||||
}
|
||||
top_buffer = malloc(strlen(global_path)+1);
|
||||
memcpy(top_buffer, global_path, strlen(global_path)+1);
|
||||
|
||||
pthread_mutex_lock(&mutex_mid);
|
||||
|
||||
top_buffer = malloc(strlen(global_path)+1 + strlen(mid_dir.current_file->file_name)+1);
|
||||
memcpy(top_buffer, global_path, strlen(global_path));
|
||||
memcpy(top_buffer + strlen(global_path) + 1, mid_dir.current_file->file_name, strlen(mid_dir.current_file->file_name)+1);
|
||||
|
||||
pthread_mutex_unlock(&mutex_mid);
|
||||
top_buffer[strlen(global_path)] = '/';
|
||||
top_width = strlen(top_buffer);
|
||||
|
||||
|
||||
/* rendering */
|
||||
pthread_mutex_lock(&mutex_mid);
|
||||
pthread_mutex_lock(&mutex_render);
|
||||
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), '/');
|
||||
mvwaddnstr(win_t, 0, 0, top_buffer, strlen(global_path)+1);
|
||||
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);
|
||||
}
|
||||
}
|
||||
mvwaddstr(win_t, 0, strlen(global_path)+1, top_buffer+strlen(global_path)+1);
|
||||
wnoutrefresh(win_t);
|
||||
pthread_mutex_unlock(&mutex_render);
|
||||
pthread_mutex_unlock(&mutex_mid);
|
||||
|
||||
|
||||
pthread_mutex_unlock(&mutex_top);
|
||||
|
||||
Reference in New Issue
Block a user