* 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/core/poll_manager_epoll.cc

@@ -38,6 +38,8 @@
 
 #include <cstring>
 #include <stdexcept>
+#include <unistd.h>
+#include <sys/time.h>
 #include <torrent/poll_epoll.h>
 #include <torrent/torrent.h>
 

src/core/poll_manager_select.cc

@@ -38,6 +38,8 @@
 
 #include <cstring>
 #include <stdexcept>
+#include <unistd.h>
+#include <sys/time.h>
 #include <torrent/poll_select.h>
 #include <torrent/torrent.h>
 

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();
 }

src/display/canvas.h

@@ -106,7 +106,7 @@ public:
   void                set_attr(int x, int y, int n, int attr, int color)      { mvwchgat(m_window, y, x, n, attr, color, NULL); }
 
   // Initialize stdscr.
-  static void init();
+  static void         initialize();
   static void         cleanup();
 
   static int          get_screen_width()                                      { int x, y; getmaxyx(stdscr, y, x); return x; }
@@ -118,6 +118,8 @@ private:
   Canvas(const Canvas&);
   void operator = (const Canvas&);
 
+  static bool         m_isInitialized;
+
   WINDOW*             m_window;
 };
 

src/ui/control.cc

@@ -58,7 +58,7 @@ Control::~Control() {
 
 void
 Control::initialize() {
-  display::Canvas::init();
+  display::Canvas::initialize();
   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));