read_string_loop

This commit is contained in:
nova
2026-07-20 00:16:35 +02:00
parent 25c912069a
commit f7589dbe2b
2 changed files with 66 additions and 64 deletions
+2
View File
@@ -129,6 +129,7 @@ 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:";
static const char ui_search_text[] = "/"; /*unlike the other ui, this one doesnt automatically add a space*/
/* {{{ */
static const unsigned long binding_count = sizeof(key_binding) / sizeof(binding);
@@ -156,6 +157,7 @@ static const char ui_delete_text[];
static const char copy_cmd[];
static const char cut_cmd[];
static const char del_cmd[];
static const char ui_search_text[];
#endif
/* }}} */
+64 -64
View File
@@ -119,43 +119,47 @@ void user_interactions() {
binding_matches = 0;
}
}
int read_string(WINDOW *win, int y, int x, char *str){
curs_set(1);
char read_string_loop(WINDOW *win, char *buffer, char *nullable_return_char, unsigned long *pass, unsigned long y, unsigned long x) {
char ch = wgetch(win_b);
timeout(-1); /* negative numbers block until enter is pressed */
unsigned int pass = 0;
char ch;
char err = 0;
wmove(win, y, x);
while(1) {
ch = wgetch(win);
if (ch == '\n') {
break;
} else if (ch == 27) { /* esc key */
err = 1;
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);
pass += strlen(mid_dir.current_file->file_name);
} else if (ch == 127) { /* backspace */
if (pass > 0) {
pass--;
mvwdelch(win, y, x + pass);
}
} else {
mvwaddch(win, y, x + pass, ch);
str[pass] = ch;
pass++;
}
if (nullable_return_char != NULL) {
*nullable_return_char = 0;
}
str[pass] = '\0';
if (ch == '\n' ) {
buffer[*pass] = 0;
return 1;
} else if ( ch == 27 /* esc key */) {
buffer[*pass] = 0;
return 2;
} else if (ch == '\t') { /* tab */
memcpy(buffer + *pass, mid_dir.current_file->file_name, strlen(mid_dir.current_file->file_name));
mvwaddstr(win_b, 0, x+ *pass, mid_dir.current_file->file_name);
*pass += strlen(mid_dir.current_file->file_name);
} else if (ch == 127) { /* backspace */
if (*pass > 0) {
unsigned long i = x;
while (i < terminal_width) {
mvwaddch(win, y, i, ' ');
i++;
}
*pass -= 1;
buffer[*pass] = 0;
mvwaddstr(win, y, x, buffer);
curs_set(0);
}
} else if (ch) {
if (nullable_return_char != NULL) {
*nullable_return_char = ch;
}
return err;
mvwaddch(win_b, 0, x + *pass, ch);
buffer[*pass] = ch;
*pass += 1;
}
return 0;
}
void quit_program(){
status = STATUS_QUIT_PROGRAM;
@@ -320,8 +324,13 @@ void open_with(){
char *str = malloc(INPUT_BUFFER_SIZE);
char *parsed_ui_text = parse_cmd(ui_open_with_text, mid_dir.current_file->file_name);
mvwprintw(win_b, 0, 0, parsed_ui_text);
unsigned long pass = 0;
char ret;
if (read_string(win_b, 0, strlen(parsed_ui_text)+1, str) == 0) {
while ((ret = read_string_loop(win_b, str, NULL, &pass, 0, strlen(parsed_ui_text)+1)) == 0) {
}
if (ret == 1) {
if (str[0] == SETTINGS_COMMAND_FORK) {
cmd = parse_cmd(str+1, mid_dir.current_file->file_name);
pid_t pid = fork();
@@ -336,6 +345,7 @@ void open_with(){
}
free(cmd);
}
free(parsed_ui_text);
free(str);
@@ -346,8 +356,12 @@ void rename_hovered(){
char *new_file_name = malloc(INPUT_BUFFER_SIZE);
char *parsed_ui_text = parse_cmd(ui_rename_text, mid_dir.current_file->file_name);
mvwprintw(win_b, 0, 0, parsed_ui_text);
unsigned long pass = 0;
char ret;
if (read_string(win_b, 0, strlen(parsed_ui_text)+1, new_file_name) == 0) {
while ((ret = read_string_loop(win_b, new_file_name, NULL, &pass, 0, strlen(parsed_ui_text)+1)) == 0) {
}
if (ret == 1) {
char *cmd0 = parse_cmd(rename_cmd, mid_dir.current_file->file_name);
char *cmd1 = parse_cmd(cmd0, new_file_name);
ignore_return(system(cmd1));
@@ -393,7 +407,11 @@ void makedir(){
wclear(win_b);
char *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, file_name) == 0) {
unsigned long pass = 0;
char ret;
while ((ret = read_string_loop(win_b, file_name, NULL, &pass, 0, strlen(ui_makedir_text)+1)) == 0) {
}
if (ret == 1) {
char *cmd = parse_cmd(makedir_cmd, file_name);
ignore_return(system(cmd));
free(cmd);
@@ -406,7 +424,11 @@ void makefile(){
wclear(win_b);
char *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, file_name) == 0) {
unsigned long pass = 0;
char ret;
while ((ret = read_string_loop(win_b, file_name, NULL, &pass, 0, strlen(ui_makefile_text)+1)) == 0) {
}
if (ret == 1) {
char *cmd = parse_cmd(makefile_cmd, file_name);
ignore_return(system(cmd));
free(cmd);
@@ -596,7 +618,7 @@ void search(){
for (i = 0; i < terminal_width -1; i++) {
mvwaddch(win_b, 0, i, ' ');
}
mvwaddch(win_b, 0, 0, '/');
mvwaddstr(win_b, 0, 0, ui_search_text);
memset(search_buffer, 0, INPUT_BUFFER_SIZE);
curs_set(1);
@@ -604,32 +626,11 @@ void search(){
timeout(-1); /* negative numbers block until enter is pressed */
unsigned int pass = 0;
unsigned long pass = 0;
char ch;
wmove(win_b, 0, 1);
while(1) {
ch = wgetch(win_b);
if (ch == '\n' || ch == 27 /* esc key */) {
/* unlike the other uses of a read string reimplementation,
* here we do not differentiate between accepting and cancle.
* this is intentional */
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);
}
}
while (read_string_loop(win_b, search_buffer, &ch, &pass, 0, strlen(ui_search_text)) == 0) {
if (ch) {
mvwaddch(win_b, 0, pass+1, ch);
search_buffer[pass] = ch;
pass++;
unsigned long index = 0;
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)) {
@@ -641,15 +642,14 @@ void search(){
werase(win_m);
print_dir(win_m, 1, &mid_dir);
wnoutrefresh(win_m);
wrefresh(win_m);
pthread_mutex_unlock(&mutex_render);
break;
}
}
}
}
search_buffer[pass] = '\0';
noecho();
curs_set(0);