Changeset 1041 for trunk/rtorrent/src/display/window_tracker_list.cc

Timestamp:

03/13/08 10:28:17 (4 years ago)

Author:

rakshasa

Message:

* Fixed minor bugs in the display of tracker groups. Patch by Josef
Drexler.

* Cleanup of the CommandMap? class.

Files:

• trunk/rtorrent/src/display/window_tracker_list.cc (modified) (4 diffs)

trunk/rtorrent/src/display/window_tracker_list.cc

@@ -61 +61 @@
   m_canvas->erase();
 
-  int pos = 0;
+  unsigned int pos = 0;
   torrent::TrackerList* tl = m_download->tracker_list();
 
@@ -72 +72 @@
   typedef std::pair<unsigned int, unsigned int> Range;
 
-  unsigned int group = 0;
-  Range range = rak::advance_bidirectional<unsigned int>(0, *m_focus, tl->size(), (m_canvas->height() + 1) / 2);
+  Range range = rak::advance_bidirectional<unsigned int>(0, *m_focus, tl->size(), (m_canvas->height() - 1) / 2);
+  unsigned int group = tl->at(range.first)->group();
 
   while (range.first != range.second) {
@@ -89 +89 @@
                     tracker->url().c_str());
 
-    m_canvas->print(4, pos++, "Id: %s Focus: %s Enabled: %s Open: %s S/L: %u/%u",
-                    rak::copy_escape_html(tracker->tracker_id()).c_str(),
-                    range.first == tl->focus_index() ? "yes" : " no",
-                    tracker->is_usable() ? "yes" : tracker->is_enabled() ? "off" : " no",
-                    tracker->is_busy() ? "yes" : " no",
-                    tracker->scrape_complete(),
-                    tracker->scrape_incomplete());
+    if (pos < m_canvas->height())
+      m_canvas->print(4, pos++, "Id: %s Focus: %s Enabled: %s Open: %s S/L: %u/%u",
+                      rak::copy_escape_html(tracker->tracker_id()).c_str(),
+                      range.first == tl->focus_index() ? "yes" : " no",
+                      tracker->is_usable() ? "yes" : tracker->is_enabled() ? "off" : " no",
+                      tracker->is_busy() ? "yes" : " no",
+                      tracker->scrape_complete(),
+                      tracker->scrape_incomplete());
 
 //     m_canvas->print(4, pos++, "Id: %s Focus: %s Enabled: %s Open: %s Timer: %u/%u",
@@ -111 +112 @@
 
     range.first++;
+
+    // If we're at the end of the range, check if we can
+    // show one more line for the following tracker.
+    if (range.first == range.second && pos < m_canvas->height() && range.first < tl->size())
+      range.second++;
   }
 }