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

Implement messages to the user

This commit is contained in:
Přemysl Eric Janouch 2018-11-02 15:05:04 +01:00
parent 4de89faf7e
commit 314ba114a1
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sdn.cpp
View File

@ -461,6 +461,9 @@ static struct {
bool gravity; ///< Entries are shoved to the bottom bool gravity; ///< Entries are shoved to the bottom
int max_widths[entry::COLUMNS]; ///< Column widths int max_widths[entry::COLUMNS]; ///< Column widths
wstring message; ///< Message for the user
int message_ttl; ///< Time to live for the message
string chosen; ///< Chosen item for the command line string chosen; ///< Chosen item for the command line
bool chosen_full; ///< Use the full path bool chosen_full; ///< Use the full path
@ -667,13 +670,16 @@ fun update () {
hline (' ', COLS - print (bar, COLS)); hline (' ', COLS - print (bar, COLS));
attrset (g.attrs[g.AT_INPUT]); attrset (g.attrs[g.AT_INPUT]);
curs_set (0);
if (g.editor) { if (g.editor) {
move (LINES - 1, 0); move (LINES - 1, 0);
auto p = apply_attrs (wstring (g.editor) + L": ", 0); auto p = apply_attrs (wstring (g.editor) + L": ", 0);
move (LINES - 1, print (p + apply_attrs (g.editor_line, 0), COLS - 1)); move (LINES - 1, print (p + apply_attrs (g.editor_line, 0), COLS - 1));
curs_set (1); curs_set (1);
} else } else if (!g.message.empty ()) {
curs_set (0); move (LINES - 1, 0);
print (apply_attrs (g.message, 0), COLS);
}
refresh (); refresh ();
} }
@ -718,7 +724,11 @@ fun reload () {
(IN_ALL_EVENTS | IN_ONLYDIR | IN_EXCL_UNLINK) & ~(IN_ACCESS | IN_OPEN)); (IN_ALL_EVENTS | IN_ONLYDIR | IN_EXCL_UNLINK) & ~(IN_ACCESS | IN_OPEN));
} }
// TODO: we should be able to signal failures to the user fun show_message (const string &message, int ttl = 30) {
g.message = to_wide (message);
g.message_ttl = ttl;
}
fun run_pager (FILE *contents) { fun run_pager (FILE *contents) {
// We don't really need to set O_CLOEXEC, so we're not going to // We don't really need to set O_CLOEXEC, so we're not going to
rewind (contents); rewind (contents);
@ -821,6 +831,7 @@ fun pop_levels () {
fun change_dir (const string &path) { fun change_dir (const string &path) {
if (chdir (path.c_str ())) { if (chdir (path.c_str ())) {
show_message (strerror (errno));
beep (); beep ();
return; return;
} }
@ -1293,8 +1304,13 @@ int main (int argc, char *argv[]) {
} }
wint_t c; wint_t c;
while (!read_key (c) || handle (c)) while (!read_key (c) || handle (c)) {
inotify_check (); inotify_check ();
if (g.message_ttl && !--g.message_ttl) {
g.message.clear ();
update ();
}
}
endwin (); endwin ();
save_config (); save_config ();