[Aptitude-devel] r3144 - in branches/aptitude-0.3/aptitude: . src/vscreen/config

[Daniel Burrows]

Author: dburrows
Date: Wed Apr 27 12:49:47 2005
New Revision: 3144

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/config/keybindings.cc
   branches/aptitude-0.3/aptitude/src/vscreen/config/keybindings.h
Log:
Also make a global readable_keyname.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Wed Apr 27 12:49:47 2005
@@ -1,5 +1,9 @@
 2005-04-27  Daniel Burrows  <dburrows@debian.org>
 
+	* src/vscreen/config/keybindings.cc, src/vscreen/keybindings.h:
+
+	  Make a global readable_keyname as well.
+
 	* src/vscreen/config/keybindings.cc, src/vscreen/config/keybindings.h:
 
 	  Oops, properly declare the new keyname function.

Modified: branches/aptitude-0.3/aptitude/src/vscreen/config/keybindings.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/config/keybindings.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/config/keybindings.cc	Wed Apr 27 12:49:47 2005
@@ -386,6 +386,14 @@
     }
 }
 
+string readable_keyname(chtype ch)
+{
+  if(ch == ',')
+    return ",";
+  else
+    return keyname(ch);
+}
+
 // Doesn't return all available bindings as that gets way too long.
 string keybindings::keyname(const string &tag)
 {
@@ -402,12 +410,7 @@
   hash_map<string, keybinding>::iterator found=keymap.find(tag);
 
   if(found != keymap.end())
-    {
-      if(found->second.front() == ',')
-	return ",";
-      else
-	return ::keyname(found->second.front());
-    }
+    return ::readable_keyname(found->second.front());
   else
     return "";
 }

Modified: branches/aptitude-0.3/aptitude/src/vscreen/config/keybindings.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/config/keybindings.h	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/config/keybindings.h	Wed Apr 27 12:49:47 2005
@@ -100,6 +100,11 @@
 std::string keyname(chtype ch);
 // Returns a string identifying the given keystroke.
 
+/** \return a human-readable string identifying the given keystroke
+ *   (as opposed to 'keyname', which is a strict reverse mapping).
+ */
+std::string readable_keyname(chtype ch);
+
 extern keybindings global_bindings;
 // For now, this is where the global bindings are stored (I might want to move
 // it in the future, hmmm..)