* Add includes of headers for select.

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


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@533 e378c898-3ddf-0310-93e7-cc216c733640

src/display/canvas.cc

@@ -40,6 +40,8 @@
 
 namespace display {
 
+bool Canvas::m_isInitialized = false;
+
 void
 Canvas::resize(int x, int y, int w, int h) {
   wresize(m_window, h, w);
@@ -47,7 +49,12 @@ Canvas::resize(int x, int y, int w, int h) {
 }
 
 void
-Canvas::init() {
+Canvas::initialize() {
+  if (m_isInitialized)
+    return;
+  
+  m_isInitialized = true;
+
   initscr();
   raw();
   noecho();
@@ -58,6 +65,11 @@ Canvas::init() {
 
 void
 Canvas::cleanup() {
+  if (!m_isInitialized)
+    return;
+  
+  m_isInitialized = false;
+
   noraw();
   endwin();
 }