amberisvibin/th
1
0
Fork 0
mirror of https://gittea.dev/nova/th.git synced 2025-10-21 18:30:15 -04:00
Code Issues Activity

removal of global file_current

Browse Source
This commit is contained in:
nova
2025-08-23 23:19:11 +02:00
parent a57869a7a1
commit e1c298ae50
3 changed files with 39 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
interactions.c
View File

@@ -20,7 +20,6 @@ extern pthread_mutex_t mutex_mid;
extern file *mid_content;
extern file *lft_content;
extern file *rgt_content;
extern volatile file *file_current;
extern unsigned int terminal_height;
extern unsigned int terminal_width;
@@ -144,9 +143,9 @@ int read_string(WINDOW *win, int y, int x, char *str){
err = 0;
break;
} else if (ch == '\t') { /* tab */
memcpy(str + pass, file_current->file_name, strlen(file_current->file_name));
mvwaddstr(win, y, x +pass, file_current->file_name);
pass += strlen(file_current->file_name);
memcpy(str + pass, mid_content[selected_file_current].file_name, strlen(mid_content[selected_file_current].file_name));
mvwaddstr(win, y, x +pass, mid_content[selected_file_current].file_name);
pass += strlen(mid_content[selected_file_current].file_name);
} else if (ch == 127) { /* backspace */
if (pass > 0) {
pass--;
@@ -188,7 +187,6 @@ void toggle_selection(){
pthread_mutex_lock(&mutex_selection);
pthread_mutex_lock(&mutex_mid);
mid_content[selected_file_current].status ^= FILE_STATUS_SELECTED;
file_current->status ^= FILE_STATUS_SELECTED;
status |= (STATUS_UPDATE_SCREEN_MASK);
pthread_mutex_unlock(&mutex_mid);
pthread_mutex_unlock(&mutex_selection);
@@ -239,8 +237,8 @@ void move_left(int passes){
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK | STATUS_RELOAD_DIRECTORY);
}
void move_right(){
if (file_current->file_type == FILE_TYPE_DIR || file_current->file_type == FILE_TYPE_SYMLINK) {
if (chdir(file_current->file_name) != 0) {
if (mid_content[selected_file_current].file_type == FILE_TYPE_DIR || mid_content[selected_file_current].file_type == FILE_TYPE_SYMLINK) {
if (chdir(mid_content[selected_file_current].file_name) != 0) {
FAIL("move_right", "unhandled error of chdir");
} else {
selected_file_current = dir_get_selected_file_current();
@@ -248,12 +246,12 @@ void move_right(){
} else {
unsigned long i = 0;
char match = 0;
char *mime = get_mimetype(file_current->file_name);
char *extension = strrchr(file_current->file_name, '.');
char *mime = get_mimetype(mid_content[selected_file_current].file_name);
char *extension = strrchr(mid_content[selected_file_current].file_name, '.');
for (i = 0; i < file_extension_default_count; i++) {
if (strstr(extension, file_extension_default_cmd[i].file_extension)) {
char *cmd = concat(file_extension_default_cmd[i].command, " ./\"");
cmd = concat(cmd, file_current->file_name);
cmd = concat(cmd, mid_content[selected_file_current].file_name);
cmd = concat(cmd, "\"");
@@ -271,7 +269,7 @@ void move_right(){
if (strstr(mime, mimetype_default_cmd[i].mimetype)) {
char *cmd = concat(mimetype_default_cmd[i].command, " ./\"");
cmd = concat(cmd, file_current->file_name);
cmd = concat(cmd, mid_content[selected_file_current].file_name);
cmd = concat(cmd, "\"");
btm_buffer = malloc(strlen(cmd));
@@ -315,7 +313,7 @@ void jump_top(){
}
void open_with(){
btm_buffer = concat("open \"", file_current->file_name);
btm_buffer = concat("open \"", mid_content[selected_file_current].file_name);
btm_buffer = concat(btm_buffer, "\" with:");
status |= STATUS_UPDATE_SCREEN_0;
@@ -336,7 +334,7 @@ void open_with(){
if (!err) {
char *cmd = concat(str, " ./\"");
cmd = concat(cmd, file_current->file_name);
cmd = concat(cmd, mid_content[selected_file_current].file_name);
cmd = concat(cmd, "\"");
if (system(cmd) == -1) {
@@ -355,7 +353,7 @@ void open_with(){
void rename_hovered(){
btm_buffer = concat("rename \"", file_current->file_name);
btm_buffer = concat("rename \"", mid_content[selected_file_current].file_name);
btm_buffer = concat(btm_buffer, "\" to:");
status |= STATUS_UPDATE_SCREEN_0;
@@ -375,7 +373,7 @@ void rename_hovered(){
if (!err) {
char *cmd = concat("mv ./\"", file_current->file_name);
char *cmd = concat("mv ./\"", mid_content[selected_file_current].file_name);
cmd = concat(cmd, "\" ./\"");
cmd = concat(cmd, str);
cmd = concat(cmd, "\"");
@@ -409,7 +407,7 @@ void delete(){
if (hits) {
btm_buffer = concat("delete:", file_str);
} else {
btm_buffer = concat("delete: \"", file_current->file_name);
btm_buffer = concat("delete: \"", mid_content[selected_file_current].file_name);
btm_buffer = concat(btm_buffer, "\"");
}
@@ -448,13 +446,13 @@ void delete(){
btm_buffer = concat("deleted: ", file_str);
} else {
free(btm_buffer);
error = remove(file_current->file_name);
error = remove(mid_content[selected_file_current].file_name);
if (error != 0) {
mvaddstr(terminal_height-2, 0, "could not delete: " );
mvaddstr(terminal_height-2, strlen("could not delete: "), mid_content[i].file_name);
btm_buffer = " ";
} else {
btm_buffer = concat("deleted: \"", file_current->file_name);
btm_buffer = concat("deleted: \"", mid_content[selected_file_current].file_name);
btm_buffer = concat(btm_buffer, "\"");
}
@@ -625,7 +623,7 @@ void cmd_on_selected(int passes, int index){
btm_buffer = concat(key_binding[index].black_magic, file_str);
} else {
btm_buffer = concat(key_binding[index].black_magic, "\"");
btm_buffer = concat(btm_buffer, file_current->file_name);
btm_buffer = concat(btm_buffer, mid_content[selected_file_current].file_name);
btm_buffer = concat(btm_buffer, "\"");
}
@@ -667,7 +665,7 @@ void cmd_on_selected(int passes, int index){
free(btm_buffer);
free(cmd);
cmd = concat((char*)key_binding[index].black_magic, " \"");
cmd = concat(cmd, file_current->file_name);
cmd = concat(cmd, mid_content[selected_file_current].file_name);
cmd = concat(cmd, "\"");
if (system(cmd) != 0) {
/*do nothing*/
@@ -787,9 +785,9 @@ void search(){
if (ch == '\n') {
break;
} else if (ch == '\t') { /* tab */
memcpy(search_buffer, file_current->file_name, strlen(file_current->file_name));
mvwaddstr(win_b, local_height-1, pass, file_current->file_name);
pass = strlen(file_current->file_name);
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);