p
/
sdn
1
1
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Make the outer prompt look more normal 

There's a slight issue with the inverted cell representing
the cursor standing out a bit too much amongst the rest of
the characters.

The resulting experience is a lot more consistent, though.
This commit is contained in:
Přemysl Eric Janouch 2020-10-01 13:31:39 +02:00
parent b8c767354e
commit 5451eba2a3
Signed by: p
GPG Key ID: A0420B94F92B9493
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.adoc
View File

@ -131,7 +131,7 @@ cursor 231 202
bar 16 255 ul bar 16 255 ul
cwd bold cwd bold
input input
cmdline 102 cmdline 145
.... ....
Filename colours are taken from the `LS_COLORS` environment variable. Filename colours are taken from the `LS_COLORS` environment variable.

16
sdn.cpp
View File

@ -495,7 +495,7 @@ struct level {
}; };
static struct { static struct {
wstring cmdline; ///< Outer command line ncstring cmdline; ///< Outer command line
string cwd; ///< Current working directory string cwd; ///< Current working directory
string start_dir; ///< Starting directory string start_dir; ///< Starting directory
vector<entry> entries; ///< Current directory entries vector<entry> entries; ///< Current directory entries
@ -750,7 +750,7 @@ fun update () {
print (apply_attrs (g.message, 0), COLS); print (apply_attrs (g.message, 0), COLS);
} else if (!g.cmdline.empty ()) { } else if (!g.cmdline.empty ()) {
move (LINES - 1, 0); move (LINES - 1, 0);
print (apply_attrs (g.cmdline, g.attrs[g.AT_CMDLINE]), COLS); print (g.cmdline, COLS);
} }
refresh (); refresh ();
@ -1361,12 +1361,14 @@ fun load_cmdline (int argc, char *argv[]) {
if (argc < 3) if (argc < 3)
return; return;
wstring line = to_wide (argv[1]); int point = atoi (argv[2]); wstring line = to_wide (argv[1]); int cursor = atoi (argv[2]);
if (line.empty () || point < 0 || point > (int) line.length ()) if (line.empty () || cursor < 0 || cursor > (int) line.length ())
return; return;
std::replace_if (line.begin (), line.end (), iswspace, L' '); std::replace_if (begin (line), end (line), iswspace, L' ');
g.cmdline = line.substr (0, point) + L"◆" + line.substr (point); g.cmdline = apply_attrs (line += L' ', g.attrs[g.AT_CMDLINE]);
// It is tempting to touch the cchar_t directly, though let's rather not
g.cmdline[cursor] = cchar (g.attrs[g.AT_CMDLINE] ^ A_REVERSE, line[cursor]);
} }
fun decode_ansi_sgr (const vector<string> &v) -> chtype { fun decode_ansi_sgr (const vector<string> &v) -> chtype {
@ -1672,8 +1674,8 @@ int main (int argc, char *argv[]) {
return 1; return 1;
} }
load_cmdline (argc, argv);
load_colors (); load_colors ();
load_cmdline (argc, argv);
g.start_dir = g.cwd = initial_cwd (); g.start_dir = g.cwd = initial_cwd ();
reload (false); reload (false);
pop_levels (g.cwd); pop_levels (g.cwd);