mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-28 05:41:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor screen move

Browse source
This commit is contained in:
Arun Prakash Jana 2019-10-19 09:01:23 +05:30
parent 864273dd9b
commit 95e9151c90
No known key found for this signature in database
GPG key ID: A75979F35C080412
2 changed files with 54 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
README.md
View file

@ -209,11 +209,10 @@ The list below is from the **dev branch**. Press <kbd>?</kbd> in `nnn` to see th
FILES FILES
^O Open with... n Create new/link ^O Open with... n Create new/link
D File detail ^R F2 Rename/duplicate D File detail ^R F2 Rename/duplicate
⎵ ^J Select entry r Batch rename ⎵ ^J/a Select entry/all r Batch rename
m ^K Sel range, clear M List selection m ^K Sel range, clear M List selection
a Select all K Edit selection P Copy selection K Edit selection
P Copy selection w Copy selection as V Move selection w Copy/move sel as
V Move selection W Move selection as
X Del selection ^X Del entry X Del selection ^X Del entry
f Create archive T Mount archive f Create archive T Mount archive
^F Extract archive F List archive ^F Extract archive F List archive

95
src/nnn.c
View file

@ -3637,6 +3637,48 @@ static void move_cursor(int target, int ignore_scrolloff)
curscroll = MAX(curscroll, MAX(cur - (onscreen - 1), 0)); curscroll = MAX(curscroll, MAX(cur - (onscreen - 1), 0));
} }
static void handle_screen_move(enum action sel)
{
int onscreen;
switch (sel) {
case SEL_NEXT:
if (ndents)
move_cursor((cur + 1) % ndents, 0);
break;
case SEL_PREV:
if (ndents)
move_cursor((cur + ndents - 1) % ndents, 0);
break;
case SEL_PGDN:
onscreen = xlines - 4;
move_cursor(curscroll + (onscreen - 1), 1);
curscroll += onscreen - 1;
break;
case SEL_CTRL_D:
onscreen = xlines - 4;
move_cursor(curscroll + (onscreen - 1), 1);
curscroll += onscreen >> 1;
break;
case SEL_PGUP: // fallthrough
onscreen = xlines - 4;
move_cursor(curscroll, 1);
curscroll -= onscreen - 1;
break;
case SEL_CTRL_U:
onscreen = xlines - 4;
move_cursor(curscroll, 1);
curscroll -= onscreen >> 1;
break;
case SEL_HOME:
move_cursor(0, 1);
break;
default: /* case SEL_END: */
move_cursor(ndents - 1, 1);
break;
}
}
static void redraw(char *path) static void redraw(char *path)
{ {
xlines = LINES; xlines = LINES;
@ -3803,7 +3845,7 @@ static void browse(char *ipath, const char *session)
char rundir[PATH_MAX] __attribute__ ((aligned)); char rundir[PATH_MAX] __attribute__ ((aligned));
char runfile[NAME_MAX + 1] __attribute__ ((aligned)); char runfile[NAME_MAX + 1] __attribute__ ((aligned));
uchar opener_flags = (cfg.cliopener ? F_CLI : (F_NOTRACE | F_NOWAIT)); uchar opener_flags = (cfg.cliopener ? F_CLI : (F_NOTRACE | F_NOWAIT));
int r = -1, fd, presel, selstartid = 0, selendid = 0, onscreen; int r = -1, fd, presel, selstartid = 0, selendid = 0;
ino_t inode = 0; ino_t inode = 0;
enum action sel; enum action sel;
bool dir_changed = FALSE, rangesel = FALSE; bool dir_changed = FALSE, rangesel = FALSE;
@ -4089,50 +4131,15 @@ nochange:
printwait("unsupported file", &presel); printwait("unsupported file", &presel);
goto nochange; goto nochange;
} }
case SEL_NEXT: // fallthorugh case SEL_NEXT: // fallthrough
case SEL_PREV: // fallthorugh case SEL_PREV: // fallthrough
case SEL_PGDN: // fallthorugh case SEL_PGDN: // fallthrough
case SEL_CTRL_D: // fallthorugh case SEL_CTRL_D: // fallthrough
case SEL_PGUP: // fallthorugh case SEL_PGUP: // fallthrough
case SEL_CTRL_U: // fallthorugh case SEL_CTRL_U: // fallthrough
case SEL_HOME: // fallthorugh case SEL_HOME: // fallthrough
case SEL_END: case SEL_END:
switch (sel) { handle_screen_move(sel);
case SEL_NEXT:
if (ndents)
move_cursor((cur + 1) % ndents, 0);
break;
case SEL_PREV:
if (ndents)
move_cursor((cur + ndents - 1) % ndents, 0);
break;
case SEL_PGDN:
onscreen = xlines - 4;
move_cursor(curscroll + (onscreen - 1), 1);
curscroll += onscreen - 1;
break;
case SEL_CTRL_D:
onscreen = xlines - 4;
move_cursor(curscroll + (onscreen - 1), 1);
curscroll += onscreen >> 1;
break;
case SEL_PGUP: // fallthrough
onscreen = xlines - 4;
move_cursor(curscroll, 1);
curscroll -= onscreen - 1;
break;
case SEL_CTRL_U:
onscreen = xlines - 4;
move_cursor(curscroll, 1);
curscroll -= onscreen >> 1;
break;
case SEL_HOME:
move_cursor(0, 1);
break;
default: /* case SEL_END: */
move_cursor(ndents - 1, 1);
break;
}
break; break;
case SEL_CDHOME: // fallthrough case SEL_CDHOME: // fallthrough
case SEL_CDBEGIN: // fallthrough case SEL_CDBEGIN: // fallthrough