minor changes
This commit is contained in:
@@ -50,11 +50,6 @@ unsigned long get_dir_size(char *path){
|
|||||||
|
|
||||||
void get_dir_content(char *path, dir *dir){
|
void get_dir_content(char *path, dir *dir){
|
||||||
|
|
||||||
if (dir->file_count == 0) {
|
|
||||||
return;
|
|
||||||
dir = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
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);
|
||||||
@@ -175,16 +170,16 @@ void print_dir(WINDOW *win, char print_info, dir *dir){
|
|||||||
|
|
||||||
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 SETTINGS_LINE_NUMBERS != 0
|
||||||
if (dir->file_count > 9) {
|
if (dir->file_count > 9) {
|
||||||
|
|
||||||
#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;
|
||||||
@@ -198,7 +193,6 @@ void print_dir(WINDOW *win, char print_info, dir *dir){
|
|||||||
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->file_list[i].file_size;
|
file_size = dir->file_list[i].file_size;
|
||||||
char size_index = -1;
|
char size_index = -1;
|
||||||
@@ -212,7 +206,7 @@ void print_dir(WINDOW *win, char print_info, dir *dir){
|
|||||||
|
|
||||||
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);
|
offset_back = line_width - (snprintf(NULL,0,"%ld", dir->file_list[i].file_size) + 1);
|
||||||
} else if (size_char =='B') {
|
} else if (size_char == size_unit[0]) {
|
||||||
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 {
|
||||||
offset_back = line_width - (snprintf(NULL,0,"%0.2lf %c", printed_size, size_char) + 1);
|
offset_back = line_width - (snprintf(NULL,0,"%0.2lf %c", printed_size, size_char) + 1);
|
||||||
@@ -237,13 +231,8 @@ void print_dir(WINDOW *win, char print_info, dir *dir){
|
|||||||
for (bg = 0; bg < line_width; bg++) {
|
for (bg = 0; bg < line_width; bg++) {
|
||||||
mvwaddch(win, i-offset_vertical, bg, ' ');
|
mvwaddch(win, i-offset_vertical, bg, ' ');
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
|
||||||
wattroff(win, A_REVERSE);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
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;
|
||||||
@@ -278,7 +267,7 @@ void print_dir(WINDOW *win, char print_info, dir *dir){
|
|||||||
|
|
||||||
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);
|
mvwprintw(win, i-offset_vertical, offset_back, "%ld", dir->file_list[i].file_size);
|
||||||
}else if (size_char =='B') {
|
}else if (size_char == size_unit[0]) {
|
||||||
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);
|
||||||
@@ -295,11 +284,16 @@ void print_dir(WINDOW *win, char print_info, dir *dir){
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if (&dir->file_list[i] == dir->current_file) {
|
||||||
|
wattroff(win, A_REVERSE);
|
||||||
|
}
|
||||||
|
/*
|
||||||
if (dir->file_list[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->file_list[i].color_pair));
|
wattroff(win, COLOR_PAIR(dir->file_list[i].color_pair));
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -331,7 +325,7 @@ void dir_changed(){
|
|||||||
}
|
}
|
||||||
void change_dir(char *new_path){
|
void change_dir(char *new_path){
|
||||||
|
|
||||||
char *old_path = getcwd(NULL, 0);
|
const char *old_path = global_path;
|
||||||
current_linked_dir = list_beginning;
|
current_linked_dir = list_beginning;
|
||||||
while (current_linked_dir->next != NULL) {
|
while (current_linked_dir->next != NULL) {
|
||||||
if(strcmp(current_linked_dir->path, old_path) == 0) {
|
if(strcmp(current_linked_dir->path, old_path) == 0) {
|
||||||
@@ -344,7 +338,12 @@ void change_dir(char *new_path){
|
|||||||
current_linked_dir->index = mid_dir.current_file - mid_dir.file_list;
|
current_linked_dir->index = mid_dir.current_file - mid_dir.file_list;
|
||||||
}
|
}
|
||||||
|
|
||||||
chdir(new_path);
|
if (chdir(new_path) != 0) {
|
||||||
|
/* i have made the decission that this is a case that i do not want to handle
|
||||||
|
* god may help me if this ever fails, cuz damn thatll be hard to debug
|
||||||
|
* especially in like 2 years when i even forgot about this possibility */
|
||||||
|
return;
|
||||||
|
}
|
||||||
char *new_path_real = getcwd(NULL, 0);
|
char *new_path_real = getcwd(NULL, 0);
|
||||||
|
|
||||||
current_linked_dir = list_beginning;
|
current_linked_dir = list_beginning;
|
||||||
@@ -367,7 +366,6 @@ void change_dir(char *new_path){
|
|||||||
}
|
}
|
||||||
mid_dir.current_file = &mid_dir.file_list[current_linked_dir->index];
|
mid_dir.current_file = &mid_dir.file_list[current_linked_dir->index];
|
||||||
|
|
||||||
free(old_path);
|
|
||||||
free(new_path_real);
|
free(new_path_real);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user