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

[Daniel Burrows]

Author: dburrows
Date: Mon Jun  6 17:47:03 2005
New Revision: 3314

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/vs_multiplex.cc
   branches/aptitude-0.3/aptitude/src/vscreen/vs_multiplex.h
Log:
Update the multiplexer

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Mon Jun  6 17:47:03 2005
@@ -1,5 +1,9 @@
 2005-06-06  Daniel Burrows  <dburrows@debian.org>
 
+	* src/vscreen/vs_multiplex.cc, src/vscreen/vs_multiplex.h:
+
+	Update the multiplexer for the new display protocol.
+
 	* src/vscreen/vs_menubar.cc, src/vscreen/vs_menubar.h:
 
 	Update the menubar for the new display protocol.

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_multiplex.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_multiplex.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_multiplex.cc	Mon Jun  6 17:47:03 2005
@@ -106,7 +106,7 @@
     }
 }
 
-void vs_multiplex::paint()
+void vs_multiplex::paint(const style &st)
 {
   if(tabs_visible())
     {
@@ -122,17 +122,17 @@
       int remaining_w=getmaxx();
       move(0, 0);
 
+      const style tab_style=get_style("MultiplexTab");
+      const style tabhighlighted_style=get_style("MultiplexTabHighlighted");
+
       for(list<child_info>::iterator i=children.begin();
 	  i!=children.end(); ++i)
 	if(i->w->get_visible()) // draw one
 	  {
-	    int attr;
 	    if(i == visible_child)
-	      attr=get_color("MultiplexTabHighlighted");
+	      apply_style(tabhighlighted_style);
 	    else
-	      attr=get_color("MultiplexTab");
-
-	    attrset(attr);
+	      apply_style(tab_style);
 
 	    unsigned int thisw=remaining_w/visible_children;
 	    --visible_children;
@@ -165,7 +165,7 @@
     }
 
   if(visible_child!=children.end())
-    visible_child->w->display();
+    visible_child->w->display(st);
 }
 
 void vs_multiplex::dispatch_mouse(short id, int x, int y, int z,

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_multiplex.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_multiplex.h	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_multiplex.h	Mon Jun  6 17:47:03 2005
@@ -94,7 +94,7 @@
   // Returns the number of widgets in the multiplexer.
   unsigned int num_visible();
 
-  virtual void paint();
+  virtual void paint(const style &st);
   void dispatch_mouse(short id, int x, int y, int z, mmask_t bstate);
 
   void show_all();