improve searchkeys in dselect

diff --git a/ChangeLog b/ChangeLog
index 8787fd50f27d066c69cb8302e41d520f7f98151c..9de300f310dac13fa3bdcc3c0b5fa8274b3a1e07 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov 19 15:04:10 CET 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * `n' is also searchagain in dselect now
+  * Do searchagain if an empty searchstring is entered
+
 Thu Nov 18 10:27:35 EST 1999 Ben Collins <bcollins@debian.org>
 
   * utils/start-stop-daemon.c: Added ability for user.group arg to

diff --git a/dselect/basecmds.cc b/dselect/basecmds.cc
index 3b4a4b1740109b3b21e06d7dee36bdee5acea35a..e9e0e3aa21e3403a8b616540c0e1e2b83eb9f7c9 100644 (file)
--- a/dselect/basecmds.cc
+++ b/dselect/basecmds.cc
@@ -95,11 +95,13 @@ void baselist::kd_searchagain() {
 }
 
 void baselist::kd_search() {
+  char newsearchstring[50]
+  strcpy(newsearchstring,searchstring);
   werase(querywin);
   mvwaddstr(querywin,0,0, _("Search for ? "));
   echo(); /* fixme: ncurses documentation or implementation */
   /* fixme: make / RET do `search again' and / DEL to abort */
-  if (wgetnstr(querywin,searchstring,sizeof(searchstring)-1) == ERR)
+  if (wgetnstr(querywin,newsearchstring,sizeof(newsearchstring)-1) == ERR)
     searchstring[0]= 0;
   raise(SIGWINCH); /* fixme: ncurses and xterm arrow keys */
   noecho(); /* fixme: ncurses */
@@ -107,7 +109,11 @@ void baselist::kd_search() {
   else if (info_height) { touchwin(infopad); refreshinfo(); }
   else if (thisstate_height) redrawthisstate();
   else { touchwin(listpad); refreshlist(); }
-  if (searchstring[0]) dosearch();
+  if (newsearchstring[0]) {
+    strcpy(searchstring,newsearchstring);
+       dosearch()
+  } else
+    kd_searchagain();
 }
 
 void baselist::displayhelp(const struct helpmenuentry *helpmenu, int key) {

diff --git a/dselect/methkeys.cc b/dselect/methkeys.cc
index 58b10df203313da8d8ba48b63d9e5a4a3d4734c7..52649eb82159a6045d0133ab9785c382f165605e 100644 (file)
--- a/dselect/methkeys.cc
+++ b/dselect/methkeys.cc
@@ -104,6 +104,7 @@ const keybindings::orgbinding methodlist_korgbindings[]= {
   { KEY_HELP,       "help"             },
   { KEY_F(1),       "help"             },
   { '/',            "search"           },
+  { 'n',            "searchagain"      },
   { '\\',           "searchagain"      },
   { C('l'),         "redraw"           },