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

[Daniel Burrows]

Author: dburrows
Date: Mon Jun 27 21:47:24 2005
New Revision: 3489

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

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_table.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_table.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_table.cc	Mon Jun 27 21:47:24 2005
@@ -474,13 +474,13 @@
   return sorted_children.front();
 }
 
-bool vs_table::handle_char(chtype ch)
+bool vs_table::handle_key(const key &k)
 {
   if(focus!=children.end())
     {
-      if(focus->w->dispatch_char(ch))
+      if(focus->w->dispatch_key(k))
 	return true;
-      else if(bindings->key_matches(ch, "Cycle"))
+      else if(bindings->key_matches(k, "Cycle"))
 	{
 	  childlist::iterator oldfocus=focus;
 
@@ -508,7 +508,7 @@
 
 	  return focus!=oldfocus;
 	}
-      else if(bindings->key_matches(ch, "Left"))
+      else if(bindings->key_matches(k, "Left"))
 	{
 	  childlist::iterator oldfocus=focus;
 
@@ -526,7 +526,7 @@
 
 	  return focus!=oldfocus;
 	}
-      else if(bindings->key_matches(ch, "Right"))
+      else if(bindings->key_matches(k, "Right"))
 	{
 	  childlist::iterator oldfocus=focus;
 
@@ -544,7 +544,7 @@
 
 	  return focus!=oldfocus;
 	}
-      else if(bindings->key_matches(ch, "Up"))
+      else if(bindings->key_matches(k, "Up"))
 	{
 	  childlist::iterator oldfocus=focus;
 
@@ -562,7 +562,7 @@
 
 	  return focus!=oldfocus;
 	}
-      else if(bindings->key_matches(ch, "Down"))
+      else if(bindings->key_matches(k, "Down"))
 	{
 	  childlist::iterator oldfocus=focus;
 
@@ -581,10 +581,10 @@
 	  return focus!=oldfocus;
 	}
       else
-	return vs_passthrough::handle_char(ch);
+	return vs_passthrough::handle_key(k);
     }
   else
-    return vs_passthrough::handle_char(ch);
+    return vs_passthrough::handle_key(k);
 }
 
 class vs_table::nrow_lt

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_table.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_table.h	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_table.h	Mon Jun 27 21:47:24 2005
@@ -142,7 +142,7 @@
 				      int dy);
 
 protected:
-  bool handle_char(chtype ch);
+  bool handle_key(const key &k);
 public:
   vs_table();
   ~vs_table();