fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-10-07 06:39:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

* ChunkSelector selected from outside the priority ranges due to

Browse Source 
~(char)0 giving an inverted integer rather than char.

* Fixed a segfault due to too small screen size, snprintf returns the
number of bytes that could have been written rather than how much
actually was.


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@626 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
rakshasa
2006-01-24 20:05:36 +00:00
parent 825985b8ef
commit 305e3bdf2b
15 changed files with 263 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/display/window_statusbar.cc
+42 -31
View File
@@ -41,6 +41,7 @@
#include "control.h"
#include "canvas.h"
#include "utils.h"
#include "window_statusbar.h"
namespace display {
@@ -58,42 +59,52 @@ WindowStatusbar::redraw() {
m_canvas->erase();
// TODO: Make a buffer with size = get_width?
int pos = 0;
char buf[128];
char buffer[m_canvas->get_width() + 1];
char* position;
char* last = buffer + m_canvas->get_width();
if (torrent::up_throttle() == 0)
pos = snprintf(buf, 128, "off/");
else
pos = snprintf(buf, 128, "%3i/", torrent::up_throttle() / 1024);
// if (torrent::up_throttle() == 0)
// position = std::max(snprintf(buffer, 128, "off/"), 0);
// else
// position = std::max(snprintf(buffer, 128, "%3i/", torrent::up_throttle() / 1024), 0);
if (torrent::down_throttle() == 0)
pos = snprintf(buf + pos, 128 - pos, "off");
else
pos = snprintf(buf + pos, 128 - pos, "%-3i", torrent::down_throttle() / 1024);
// if (torrent::down_throttle() == 0)
// pos = snprintf(buf + pos, 128 - pos, "off");
// else
// pos = snprintf(buf + pos, 128 - pos, "%-3i", torrent::down_throttle() / 1024);
m_canvas->print(0, 0, "Throttle U/D: %s Rate: %5.1f / %5.1f KB Listen: %s:%i%s",
buf,
(double)torrent::up_rate()->rate() / 1024.0,
(double)torrent::down_rate()->rate() / 1024.0,
!torrent::local_address().empty() ? torrent::local_address().c_str() : "<default>",
(int)torrent::listen_port(),
!torrent::bind_address().empty() ? (" Bind: " + torrent::bind_address()).c_str() : "");
// m_canvas->print(0, 0, "Throttle U/D: %s Rate: %5.1f / %5.1f KB Listen: %s:%i%s",
// buf,
// (double)torrent::up_rate()->rate() / 1024.0,
// (double)torrent::down_rate()->rate() / 1024.0,
// !torrent::local_address().empty() ? torrent::local_address().c_str() : "<default>",
// (int)torrent::listen_port(),
// !torrent::bind_address().empty() ? (" Bind: " + torrent::bind_address()).c_str() : "");
#ifndef USE_EXTRA_DEBUG
pos = snprintf(buf, 128, "[U %i/%i][S %i/%i/%i][F %i/%i]",
#else
pos = snprintf(buf, 128, "%i [U %i/%i][S %i/%i/%i][F %i/%i]",
(int)(m_control->tick() - m_lastTick),
#endif
torrent::currently_unchoked(),
torrent::max_unchoked(),
torrent::total_handshakes(),
torrent::open_sockets(),
torrent::max_open_sockets(),
torrent::open_files(),
torrent::max_open_files());
// #ifndef USE_EXTRA_DEBUG
// pos = snprintf(buf, 128, "[U %i/%i][S %i/%i/%i][F %i/%i]",
// #else
// pos = snprintf(buf, 128, "%i [U %i/%i][S %i/%i/%i][F %i/%i]",
// (int)(m_control->tick() - m_lastTick),
// #endif
// torrent::currently_unchoked(),
// torrent::max_unchoked(),
// torrent::total_handshakes(),
// torrent::open_sockets(),
// torrent::max_open_sockets(),
// torrent::open_files(),
// torrent::max_open_files());
position = print_status_info(buffer, last);
m_canvas->print(0, 0, "%s", buffer);
last = last - (position - buffer);
if (last > buffer) {
position = print_status_extra(buffer, last, m_control);
m_canvas->print(m_canvas->get_width() - (position - buffer), 0, "%s", buffer);
}
m_canvas->print(m_canvas->get_width() - pos, 0, "%s", buf);
m_lastTick = m_control->tick();
}