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

[Daniel Burrows]

Author: dburrows
Date: Mon Jun 27 21:44:17 2005
New Revision: 3488

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/vs_text_layout.cc
   branches/aptitude-0.3/aptitude/src/vscreen/vs_text_layout.h
Log:
Convert vs_text_layout::handle_char to vs_text_layout::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:44:17 2005
@@ -1,5 +1,10 @@
 2005-06-27  Daniel Burrows  <dburrows@debian.org>
 
+	* src/vscreen/vs_text_layout.cc, src/vscreen/vs_text_layout.h:
+
+	  Convert vs_text_layout::handle_char to
+	  vs_text_layout::handle_key.
+
 	* src/vscreen/vs_statuschoice.h:
 
 	  Convert vs_statuschoice::handle_char to

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_text_layout.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_text_layout.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_text_layout.cc	Mon Jun 27 21:44:17 2005
@@ -33,22 +33,22 @@
   bindings=new keybindings(&global_bindings);
 }
 
-bool vs_text_layout::handle_char(chtype ch)
+bool vs_text_layout::handle_key(const key &k)
 {
-  if(bindings->key_matches(ch, "Up"))
+  if(bindings->key_matches(k, "Up"))
     line_up();
-  else if(bindings->key_matches(ch, "Down"))
+  else if(bindings->key_matches(k, "Down"))
     line_down();
-  else if(bindings->key_matches(ch, "Begin"))
+  else if(bindings->key_matches(k, "Begin"))
     move_to_top();
-  else if(bindings->key_matches(ch, "End"))
+  else if(bindings->key_matches(k, "End"))
     move_to_bottom();
-  else if(bindings->key_matches(ch, "PrevPage"))
+  else if(bindings->key_matches(k, "PrevPage"))
     page_up();
-  else if(bindings->key_matches(ch, "NextPage"))
+  else if(bindings->key_matches(k, "NextPage"))
     page_down();
   else
-    return vscreen_widget::handle_char(ch);
+    return vscreen_widget::handle_key(k);
 
   return true;
 }

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_text_layout.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_text_layout.h	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_text_layout.h	Mon Jun 27 21:44:17 2005
@@ -41,7 +41,7 @@
   /** Handle the given keypress.  Returns \b true if the keystroke
    *  was "consumed" by this widget.
    */
-  bool handle_char(chtype ch);
+  bool handle_key(const key &k);
 
   /** Change the fragment being displayed in this layout widget. */
   void set_fragment(fragment *f);