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

* Add includes of headers for select.

Browse Source 
* Make initialization and cleanup of display::Canvast safer.


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@533 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
rakshasa
2005-08-17 16:58:07 +00:00
parent 4eb18663f5
commit 7f2b66d601
5 changed files with 57 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/poll_manager_epoll.cc
+2
View File
@@ -38,6 +38,8 @@
#include <cstring> #include <cstring>
#include <stdexcept> #include <stdexcept>
#include <unistd.h>
#include <sys/time.h>
#include <torrent/poll_epoll.h> #include <torrent/poll_epoll.h>
#include <torrent/torrent.h> #include <torrent/torrent.h>
src/core/poll_manager_select.cc
+2
View File
@@ -38,6 +38,8 @@
#include <cstring> #include <cstring>
#include <stdexcept> #include <stdexcept>
#include <unistd.h>
#include <sys/time.h>
#include <torrent/poll_select.h> #include <torrent/poll_select.h>
#include <torrent/torrent.h> #include <torrent/torrent.h>
src/display/canvas.cc
+13 -1
View File
@@ -40,6 +40,8 @@
namespace display { namespace display {
bool Canvas::m_isInitialized = false;
void void
Canvas::resize(int x, int y, int w, int h) { Canvas::resize(int x, int y, int w, int h) {
wresize(m_window, h, w); wresize(m_window, h, w);
@@ -47,7 +49,12 @@ Canvas::resize(int x, int y, int w, int h) {
} }
void void
Canvas::init() { Canvas::initialize() {
if (m_isInitialized)
return;
m_isInitialized = true;
initscr(); initscr();
raw(); raw();
noecho(); noecho();
@@ -58,6 +65,11 @@ Canvas::init() {
void void
Canvas::cleanup() { Canvas::cleanup() {
if (!m_isInitialized)
return;
m_isInitialized = false;
noraw(); noraw();
endwin(); endwin();
} }
src/display/canvas.h
+39 -37
View File
@@ -48,77 +48,79 @@ public:
m_window(newwin(height, width, y, x)) {} m_window(newwin(height, width, y, x)) {}
~Canvas() { delwin(m_window); } ~Canvas() { delwin(m_window); }
void refresh() { wnoutrefresh(m_window); } void refresh() { wnoutrefresh(m_window); }
static void refresh_std() { wnoutrefresh(stdscr); } static void refresh_std() { wnoutrefresh(stdscr); }
void redraw() { redrawwin(m_window); } void redraw() { redrawwin(m_window); }
void resize(int w, int h) { wresize(m_window, h, w); } void resize(int w, int h) { wresize(m_window, h, w); }
void resize(int x, int y, int w, int h); void resize(int x, int y, int w, int h);
int get_x() { int x, y; getyx(m_window, y, x); return x; } int get_x() { int x, y; getyx(m_window, y, x); return x; }
int get_y() { int x, y; getyx(m_window, y, x); return y; } int get_y() { int x, y; getyx(m_window, y, x); return y; }
int get_width() { int x, y; getmaxyx(m_window, y, x); return x; } int get_width() { int x, y; getmaxyx(m_window, y, x); return x; }
int get_height() { int x, y; getmaxyx(m_window, y, x); return y; } int get_height() { int x, y; getmaxyx(m_window, y, x); return y; }
chtype get_background() { return getbkgd(m_window); } chtype get_background() { return getbkgd(m_window); }
void set_background(chtype c) { return wbkgdset(m_window, c); } void set_background(chtype c) { return wbkgdset(m_window, c); }
void erase() { werase(m_window); } void erase() { werase(m_window); }
static void erase_std() { werase(stdscr); } static void erase_std() { werase(stdscr); }
void print_border(chtype ls, chtype rs, void print_border(chtype ls, chtype rs,
chtype ts, chtype bs, chtype ts, chtype bs,
chtype tl, chtype tr, chtype tl, chtype tr,
chtype bl, chtype br) { wborder(m_window, ls, rs, ts, bs, tl, tr, bl, br); } chtype bl, chtype br) { wborder(m_window, ls, rs, ts, bs, tl, tr, bl, br); }
// The format string is non-const, but that will not be a problem // The format string is non-const, but that will not be a problem
// since the string shall always be a C string choosen at // since the string shall always be a C string choosen at
// compiletime. Might cause extra copying of the string? // compiletime. Might cause extra copying of the string?
void print(int x, int y, char* str) { mvwprintw(m_window, y, x, str); } void print(int x, int y, char* str) { mvwprintw(m_window, y, x, str); }
template <typename A1> template <typename A1>
void print(int x, int y, char* str, A1 a1) { mvwprintw(m_window, y, x, str, a1); } void print(int x, int y, char* str, A1 a1) { mvwprintw(m_window, y, x, str, a1); }
template <typename A1, typename A2> template <typename A1, typename A2>
void print(int x, int y, char* str, A1 a1, A2 a2) { mvwprintw(m_window, y, x, str, a1, a2); } void print(int x, int y, char* str, A1 a1, A2 a2) { mvwprintw(m_window, y, x, str, a1, a2); }
template <typename A1, typename A2, typename A3> template <typename A1, typename A2, typename A3>
void print(int x, int y, char* str, void print(int x, int y, char* str,
A1 a1, A2 a2, A3 a3) { mvwprintw(m_window, y, x, str, a1, a2, a3); } A1 a1, A2 a2, A3 a3) { mvwprintw(m_window, y, x, str, a1, a2, a3); }
template <typename A1, typename A2, typename A3, typename A4> template <typename A1, typename A2, typename A3, typename A4>
void print(int x, int y, char* str, void print(int x, int y, char* str,
A1 a1, A2 a2, A3 a3, A4 a4) { mvwprintw(m_window, y, x, str, a1, a2, a3, a4); } A1 a1, A2 a2, A3 a3, A4 a4) { mvwprintw(m_window, y, x, str, a1, a2, a3, a4); }
template <typename A1, typename A2, typename A3, typename A4, typename A5> template <typename A1, typename A2, typename A3, typename A4, typename A5>
void print(int x, int y, char* str, void print(int x, int y, char* str,
A1 a1, A2 a2, A3 a3, A4 a4, A5 a5) { mvwprintw(m_window, y, x, str, a1, a2, a3, a4, a5); } A1 a1, A2 a2, A3 a3, A4 a4, A5 a5) { mvwprintw(m_window, y, x, str, a1, a2, a3, a4, a5); }
template <typename A1, typename A2, typename A3, typename A4, typename A5, typename A6> template <typename A1, typename A2, typename A3, typename A4, typename A5, typename A6>
void print(int x, int y, char* str, void print(int x, int y, char* str,
A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6) { mvwprintw(m_window, y, x, str, a1, a2, a3, a4, a5, a6); } A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6) { mvwprintw(m_window, y, x, str, a1, a2, a3, a4, a5, a6); }
template <typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7> template <typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7>
void print(int x, int y, char* str, void print(int x, int y, char* str,
A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7) { mvwprintw(m_window, y, x, str, a1, a2, a3, a4, a5, a6, a7); } A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7) { mvwprintw(m_window, y, x, str, a1, a2, a3, a4, a5, a6, a7); }
void set_attr(int x, int y, int n, int attr, int color) { mvwchgat(m_window, y, x, n, attr, color, NULL); } void set_attr(int x, int y, int n, int attr, int color) { mvwchgat(m_window, y, x, n, attr, color, NULL); }
// Initialize stdscr. // Initialize stdscr.
static void init(); static void initialize();
static void cleanup(); static void cleanup();
static int get_screen_width() { int x, y; getmaxyx(stdscr, y, x); return x; } static int get_screen_width() { int x, y; getmaxyx(stdscr, y, x); return x; }
static int get_screen_height() { int x, y; getmaxyx(stdscr, y, x); return y; } static int get_screen_height() { int x, y; getmaxyx(stdscr, y, x); return y; }
static void do_update() { doupdate(); } static void do_update() { doupdate(); }
private: private:
Canvas(const Canvas&); Canvas(const Canvas&);
void operator = (const Canvas&); void operator = (const Canvas&);
WINDOW* m_window; static bool m_isInitialized;
WINDOW* m_window;
}; };
} }
src/ui/control.cc
+1 -1
View File
@@ -58,7 +58,7 @@ Control::~Control() {
void void
Control::initialize() { Control::initialize() {
display::Canvas::init(); display::Canvas::initialize();
display::Window::slot_adjust(sigc::mem_fun(m_display, &display::Manager::adjust_layout)); display::Window::slot_adjust(sigc::mem_fun(m_display, &display::Manager::adjust_layout));
m_core.get_poll_manager()->signal_interrupted().connect(sigc::mem_fun(*m_inputStdin, &input::InputEvent::event_read)); m_core.get_poll_manager()->signal_interrupted().connect(sigc::mem_fun(*m_inputStdin, &input::InputEvent::event_read));