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

* Converted some internal sigc++ calls to lightweight function

Browse Source 
wrappers.

* Some client code cleanup.


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@576 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
rakshasa
2005-10-04 11:06:06 +00:00
parent 33b7217627
commit 65573ec1ee
18 changed files with 120 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/Makefile.am
-2
View File
@@ -1,8 +1,6 @@
noinst_LIBRARIES = libsub_ui.a
libsub_ui_a_SOURCES = \
control.cc \
control.h \
download.cc \
download.h \
download_list.cc \
src/ui/control.cc
-101
View File
@@ -1,101 +0,0 @@
// rTorrent - BitTorrent client
// Copyright (C) 2005, Jari Sundell
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// In addition, as a special exception, the copyright holders give
// permission to link the code of portions of this program with the
// OpenSSL library under certain conditions as described in each
// individual source file, and distribute linked combinations
// including the two.
//
// You must obey the GNU General Public License in all respects for
// all of the code used other than OpenSSL. If you modify file(s)
// with this exception, you may extend this exception to your version
// of the file(s), but you are not obligated to do so. If you do not
// wish to do so, delete this exception statement from your version.
// If you delete this exception statement from all source files in the
// program, then also delete it here.
//
// Contact: Jari Sundell <jaris@ifi.uio.no>
//
// Skomakerveien 33
// 3185 Skoppum, NORWAY
#include "config.h"
#include <unistd.h>
#include "display/canvas.h"
#include "display/window.h"
#include "control.h"
namespace ui {
Control::Control() :
m_shutdownReceived(false) {
m_inputStdin = new input::InputEvent(STDIN_FILENO);
m_inputStdin->slot_pressed(sigc::mem_fun(m_input, &input::Manager::pressed));
}
Control::~Control() {
delete m_inputStdin;
}
void
Control::initialize() {
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));
m_core.get_poll_manager()->signal_interrupted().connect(sigc::ptr_fun(display::Canvas::do_update));
m_core.initialize_second();
m_ui.init(this);
m_inputStdin->insert(m_core.get_poll_manager()->get_torrent_poll());
}
void
Control::cleanup() {
m_inputStdin->remove(m_core.get_poll_manager()->get_torrent_poll());
m_ui.cleanup();
m_core.cleanup();
display::Canvas::erase_std();
display::Canvas::refresh_std();
display::Canvas::do_update();
display::Canvas::cleanup();
}
// I think it should be safe to initiate the shutdown from anywhere,
// but if it isn't, use a delay task.
void
Control::receive_shutdown() {
if (!m_shutdownReceived) {
torrent::listen_close();
m_core.shutdown(false);
m_shutdownReceived = true;
} else {
m_core.shutdown(true);
}
}
}
src/ui/control.h
-85
View File
@@ -1,85 +0,0 @@
// rTorrent - BitTorrent client
// Copyright (C) 2005, Jari Sundell
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// In addition, as a special exception, the copyright holders give
// permission to link the code of portions of this program with the
// OpenSSL library under certain conditions as described in each
// individual source file, and distribute linked combinations
// including the two.
//
// You must obey the GNU General Public License in all respects for
// all of the code used other than OpenSSL. If you modify file(s)
// with this exception, you may extend this exception to your version
// of the file(s), but you are not obligated to do so. If you do not
// wish to do so, delete this exception statement from your version.
// If you delete this exception statement from all source files in the
// program, then also delete it here.
//
// Contact: Jari Sundell <jaris@ifi.uio.no>
//
// Skomakerveien 33
// 3185 Skoppum, NORWAY
#ifndef RTORRENT_UI_CONTROL_H
#define RTORRENT_UI_CONTROL_H
#include <torrent/torrent.h>
#include "core/manager.h"
#include "display/manager.h"
#include "input/manager.h"
#include "input/input_event.h"
#include "root.h"
namespace ui {
class Control {
public:
Control();
~Control();
bool is_shutdown_completed() { return m_shutdownReceived && torrent::is_inactive(); }
bool is_shutdown_received() { return m_shutdownReceived; }
Root& get_ui() { return m_ui; }
core::Manager& get_core() { return m_core; }
display::Manager& get_display() { return m_display; }
input::Manager& get_input() { return m_input; }
input::InputEvent* get_input_stdin() { return m_inputStdin; }
void initialize();
void cleanup();
void receive_shutdown();
private:
Control(const Control&);
void operator = (const Control&);
bool m_shutdownReceived;
Root m_ui;
core::Manager m_core;
display::Manager m_display;
input::Manager m_input;
input::InputEvent* m_inputStdin;
};
}
#endif
src/ui/download.h
+2 -1
View File
@@ -43,6 +43,8 @@
#include "utils/list_focus.h"
class Control;
namespace display {
class WindowTitle;
class WindowStatusbar;
@@ -55,7 +57,6 @@ namespace core {
namespace ui {
class Control;
class ElementBase;
class Download {
src/ui/download_list.h
+2 -1
View File
@@ -43,6 +43,8 @@
#include "utils/task.h"
#include "utils/list_focus.h"
class Control;
namespace input {
class Bindings;
}
@@ -58,7 +60,6 @@ namespace display {
namespace ui {
class Control;
class Download;
class ElementBase;
src/ui/element_download_list.h
+2 -2
View File
@@ -42,14 +42,14 @@
#include "element_base.h"
class Control;
namespace display {
class WindowDownloadList;
}
namespace ui {
class Control;
class ElementDownloadList : public ElementBase {
public:
typedef display::WindowDownloadList WDownloadList;
src/ui/element_file_list.h
+2 -2
View File
@@ -41,14 +41,14 @@
#include "element_base.h"
class Control;
namespace display {
class WindowFileList;
}
namespace ui {
class Control;
class ElementFileList : public ElementBase {
public:
typedef torrent::Entry::Priority Priority;
src/ui/element_log_complete.h
+2 -2
View File
@@ -41,14 +41,14 @@
#include "element_base.h"
class Control;
namespace display {
class WindowLogComplete;
}
namespace ui {
class Control;
class ElementLogComplete : public ElementBase {
public:
typedef display::WindowLogComplete WLogComplete;
src/ui/element_peer_info.h
+2 -2
View File
@@ -41,14 +41,14 @@
#include "element_base.h"
class Control;
namespace display {
class WindowPeerInfo;
}
namespace ui {
class Control;
class ElementPeerInfo : public ElementBase {
public:
typedef display::WindowPeerInfo WPeerInfo;
src/ui/element_peer_list.h
+2 -2
View File
@@ -41,14 +41,14 @@
#include "element_base.h"
class Control;
namespace display {
class WindowPeerList;
}
namespace ui {
class Control;
class ElementPeerList : public ElementBase {
public:
typedef display::WindowPeerList WPeerList;
src/ui/element_string_list.h
+2 -2
View File
@@ -46,10 +46,10 @@
#include "display/window_string_list.h"
namespace ui {
class Control;
namespace ui {
class ElementStringList : public ElementBase {
public:
typedef display::WindowStringList WStringList;
src/ui/element_tracker_list.h
+2 -2
View File
@@ -41,14 +41,14 @@
#include "element_base.h"
class Control;
namespace display {
class WindowTrackerList;
}
namespace ui {
class Control;
class ElementTrackerList : public ElementBase {
public:
typedef display::WindowTrackerList WTrackerList;
src/ui/root.h
+2 -1
View File
@@ -39,6 +39,8 @@
#include "input/bindings.h"
class Control;
namespace display {
class WindowStatusbar;
}
@@ -46,7 +48,6 @@ namespace display {
namespace ui {
class DownloadList;
class Control;
class Root {
public: