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

[Daniel Burrows]

Author: dburrows
Date: Sat Jun  4 18:03:51 2005
New Revision: 3311

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/TODO
   branches/aptitude-0.3/aptitude/src/vscreen/vs_layout_item.cc
   branches/aptitude-0.3/aptitude/src/vscreen/vs_layout_item.h
Log:
Update vs_layout_item for the new display protocol.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Jun  4 18:03:51 2005
@@ -1,5 +1,9 @@
 2005-06-04  Daniel Burrows  <dburrows@debian.org>
 
+	* src/vscreen/vs_layout_item.cc, src/vscreen/vs_layout_item.h:
+
+	Handle the new display protocol.
+
 	* src/vscreen/vs_subtree.h:
 
 	Update a few minor things in vs_subtree (particularly

Modified: branches/aptitude-0.3/aptitude/TODO
==============================================================================
--- branches/aptitude-0.3/aptitude/TODO	(original)
+++ branches/aptitude-0.3/aptitude/TODO	Sat Jun  4 18:03:51 2005
@@ -7,6 +7,8 @@
     * add a parallel function to fragment::layout that just does
       size calculations (to avoid the overhead of generating and
       throwing away lots of strings)
+    * review vs_layout_item: can it be done better/more efficiently
+      now?
 
    - Add a screen to "audit" Recommendations (so the
 user can quickly find out which ones are unsatisfied)

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_layout_item.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_layout_item.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_layout_item.cc	Sat Jun  4 18:03:51 2005
@@ -77,13 +77,15 @@
   delete f;
 }
 
-chstring vs_layout_item::get_line(vs_tree *win, size_t n, int basex)
+chstring vs_layout_item::get_line(vs_tree *win, size_t n, int basex,
+				  const style &st)
 {
   if(win->getmaxx()!=lastw)
     {
-      // Indent it MANUALLY for now.
+      // Indent it MANUALLY for now. (why?)
       lines=f->layout(win->getmaxx()-basex,
-		      win->getmaxx()-basex);
+		      win->getmaxx()-basex,
+		      st);
       for(child_list::iterator i=children.begin(); i!=children.end(); ++i)
 	delete *i;
       children.clear();
@@ -98,20 +100,21 @@
     return lines[n];
 }
 
-void vs_layout_item::vs_layout_line::paint(vs_tree *win, int y, bool hierarchical)
+void vs_layout_item::vs_layout_line::paint(vs_tree *win, int y, bool hierarchical, const style &st)
 {
   int basex=hierarchical?2*get_depth():0;
 
-  chstring s=parent.get_line(win, n, basex);
+  chstring s=parent.get_line(win, n, basex, st);
 
   win->mvaddnstr(y, 0, chstring(basex, ' ')+s, basex+s.size());
 }
 
-void vs_layout_item::paint(vs_tree *win, int y, bool hierarchical)
+void vs_layout_item::paint(vs_tree *win, int y, bool hierarchical,
+			   const style &st)
 {
   int basex=hierarchical?2*get_depth():0;
 
-  chstring s=get_line(win, 0, basex);
+  chstring s=get_line(win, 0, basex, st);
 
   win->mvaddnstr(y, 0, chstring(basex, ' ')+s, basex+s.size());
 }

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_layout_item.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_layout_item.h	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_layout_item.h	Sat Jun  4 18:03:51 2005
@@ -32,7 +32,8 @@
   public:
     vs_layout_line(int _n, vs_layout_item &_parent);
 
-    void paint(vs_tree *win, int y, bool hierarchical);
+    void paint(vs_tree *win, int y, bool hierarchical,
+	       const style &st);
 
     const char *tag() const;
     const char *label() const;
@@ -62,7 +63,8 @@
   const char *tag() const;
   const char *label() const;
 
-  void paint(vs_tree *win, int y, bool hierarchical);
+  void paint(vs_tree *win, int y, bool hierarchical,
+	     const style &st);
 
   int get_normal_attr();
 
@@ -70,7 +72,8 @@
   levelref *end();
   bool has_visible_children();
 
-  chstring get_line(vs_tree *win, size_t n, int basex);
+  chstring get_line(vs_tree *win, size_t n, int basex,
+		    const style &st);
 
   ~vs_layout_item();
 };