[Aptitude-svn-commit] r3493 - in branches/aptitude-0.3/aptitude: . src/vscreen

[Daniel Burrows]

Author: dburrows
Date: Mon Jun 27 21:56:35 2005
New Revision: 3493

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/testvscreen.cc
Log:
Update testvscreen to incorporate the necessary changes for the new keybindings stuff.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Mon Jun 27 21:56:35 2005
@@ -10,6 +10,10 @@
 
 2005-06-27  Daniel Burrows  <dburrows@debian.org>
 
+	* src/vscreen/testvscreen.cc:
+
+	  Update the testvscreen code for the new keybindings magic.
+
 	* src/vscreen/vs_subtree.h src/vscreen/vs_tree.cc src/vscreen/vs_treeitem.h:
 
 	  Convert various dispatch_char routines to dispatch_key. (DANGER:

Modified: branches/aptitude-0.3/aptitude/src/vscreen/testvscreen.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/testvscreen.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/testvscreen.cc	Mon Jun 27 21:56:35 2005
@@ -57,9 +57,9 @@
 
   bool focus_me() {return true;}
 
-  bool handle_char(chtype ch)
+  bool handle_key(const key &k)
   {
-    set_text(readable_keyname(ch));
+    set_text(readable_keyname(k));
     return true;
   }
 };
@@ -365,10 +365,10 @@
 {
   vscreen_init();
 
-  global_bindings.set("CycleScreen", KEY_F(6));
-  global_bindings.set("CycleScreenBack", KEY_F(7));
-  global_bindings.set("ToggleCellVisible", KEY_F(5));
-  global_bindings.set("ToggleHier", 'h');
+  global_bindings.set("CycleScreen", key(KEY_F(6), true));
+  global_bindings.set("CycleScreenBack", key(KEY_F(7), true));
+  global_bindings.set("ToggleCellVisible", key(KEY_F(5), true));
+  global_bindings.set("ToggleHier", key(L'h', false));
 
   vs_menubar *menubar=new vs_menubar();