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

[Daniel Burrows]

Author: dburrows
Date: Mon Jun 27 21:39:16 2005
New Revision: 3485

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/vs_pager.cc
   branches/aptitude-0.3/aptitude/src/vscreen/vs_pager.h
Log:
Convert vs_pager::handle_char to vs_pager::handle_key.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Mon Jun 27 21:39:16 2005
@@ -1,8 +1,12 @@
 2005-06-27  Daniel Burrows  <dburrows@debian.org>
 
+	* src/vscreen/vs_pager.cc, src/vscreen/vs_pager.h:
+
+	  Convert vs_pager::handle_char to vs_pager::handle_key.
+
 	* src/vscreen/vs_menubar.cc, src/vscreen/vs_menubar.h:
 
-	  Convert vs_menubar::dispatch_key to vs_menubar::handle_key.
+	  Convert vs_menubar::handle_char to vs_menubar::handle_key.
 
 	* src/vscreen/vs_menu.cc, src/vscreen/vs_menu.h:
 

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_pager.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_pager.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_pager.cc	Mon Jun 27 21:39:16 2005
@@ -207,26 +207,26 @@
   beep();
 }
 
-bool vs_pager::handle_char(chtype ch)
+bool vs_pager::handle_key(const key &k)
 {
-  if(bindings->key_matches(ch, "Up"))
+  if(bindings->key_matches(k, "Up"))
     scroll_up(1);
-  else if(bindings->key_matches(ch, "Down"))
+  else if(bindings->key_matches(k, "Down"))
     scroll_down(1);
-  else if(bindings->key_matches(ch, "Left"))
+  else if(bindings->key_matches(k, "Left"))
     scroll_left(1);
-  else if(bindings->key_matches(ch, "Right"))
+  else if(bindings->key_matches(k, "Right"))
     scroll_right(1);
-  else if(bindings->key_matches(ch, "PrevPage"))
+  else if(bindings->key_matches(k, "PrevPage"))
     scroll_up(getmaxy());
-  else if(bindings->key_matches(ch, "NextPage"))
+  else if(bindings->key_matches(k, "NextPage"))
     scroll_down(getmaxy());
-  else if(bindings->key_matches(ch, "Begin"))
+  else if(bindings->key_matches(k, "Begin"))
     scroll_top();
-  else if(bindings->key_matches(ch, "End"))
+  else if(bindings->key_matches(k, "End"))
     scroll_bottom();
   else
-    return vscreen_widget::handle_char(ch);
+    return vscreen_widget::handle_key(k);
 
   return true;
 }

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_pager.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_pager.h	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_pager.h	Mon Jun 27 21:39:16 2005
@@ -117,7 +117,7 @@
 
   // vscreen overrides:
 
-  virtual bool handle_char(chtype ch);
+  virtual bool handle_key(const key &k);
   virtual bool focus_me() {return true;}
   virtual void paint(const style &st);