ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: trim or improve some comments, and rewrap two lines

master
Benno Schulenberg 2016-05-11 10:00:09 +02:00
parent 2503503a2a
commit b7f1136342
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/browser.c
View File

@ -141,27 +141,25 @@ char *do_browser(char *path, DIR *dir)
if (kbinput == KEY_MOUSE) { if (kbinput == KEY_MOUSE) {
int mouse_x, mouse_y; int mouse_x, mouse_y;
/* We can click on the edit window to select a /* We can click on the edit window to select a filename. */
* filename. */
if (get_mouseinput(&mouse_x, &mouse_y, TRUE) == 0 && if (get_mouseinput(&mouse_x, &mouse_y, TRUE) == 0 &&
wmouse_trafo(edit, &mouse_y, &mouse_x, FALSE)) { wmouse_trafo(edit, &mouse_y, &mouse_x, FALSE)) {
/* longest is the width of each column. There /* longest is the width of each column. There
* are two spaces between each column. */ * are two spaces between each column. */
selected = (fileline / editwinrows) * selected = (fileline / editwinrows) * (editwinrows * width) +
(editwinrows * width) + (mouse_y * (mouse_y * width) + (mouse_x / (longest + 2));
width) + (mouse_x / (longest + 2));
/* If they clicked beyond the end of a row, /* If they clicked beyond the end of a row,
* select the last filename in that row. */ * select the last filename in that row. */
if (mouse_x > width * (longest + 2)) if (mouse_x > width * (longest + 2))
selected--; selected--;
/* If we're off the screen, select the last filename. */ /* If we're beyond the list, select the last filename. */
if (selected > filelist_len - 1) if (selected > filelist_len - 1)
selected = filelist_len - 1; selected = filelist_len - 1;
/* If we selected the same filename as last time, /* If we selected the same filename as last time, fake a
* put back the Enter key so that it's read in. */ * press of the Enter key so that the file is read in. */
if (old_selected == selected) if (old_selected == selected)
unget_kbinput(sc_seq_or(do_enter, 0), FALSE, FALSE); unget_kbinput(sc_seq_or(do_enter, 0), FALSE, FALSE);
} }
@ -202,7 +200,7 @@ char *do_browser(char *path, DIR *dir)
} else if (func == do_last_file) { } else if (func == do_last_file) {
selected = filelist_len - 1; selected = filelist_len - 1;
} else if (func == goto_dir_void) { } else if (func == goto_dir_void) {
/* Go to a specific directory. */ /* Ask for the directory to go to. */
i = do_prompt(TRUE, i = do_prompt(TRUE,
#ifndef DISABLE_TABCOMP #ifndef DISABLE_TABCOMP
FALSE, FALSE,
@ -248,8 +246,7 @@ char *do_browser(char *path, DIR *dir)
dir = opendir(new_path); dir = opendir(new_path);
if (dir == NULL) { if (dir == NULL) {
/* We can't open this directory for some reason. /* We can't open this directory for some reason. */
* Complain. */
statusbar(_("Error reading %s: %s"), answer, statusbar(_("Error reading %s: %s"), answer,
strerror(errno)); strerror(errno));
beep(); beep();