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

* Added support for dvorak keyboard layout. Patch by matled@gmx.net.

Browse Source 
* Moved TrackerManager::close() call to the DownloadWrapper dtor so
that tracker STOPPED request will be sent when closing a torrent.

* Fixed some portability issues with Solaris, but still some remain.


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@872 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
rakshasa
2007-03-23 00:00:15 +00:00
parent 59c6f97cb9
commit b009734d5c
4 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/rtorrent.1
+1 -1
View File
@@ -385,7 +385,7 @@ match for the download to be included.
\fBstopped\fR, \fBstarted\fR, \fBstopped\fR, \fBstarted\fR,
\fBcomplete\fR, \fBincomplete\fR, \fBcomplete\fR, \fBincomplete\fR,
.TP .TP
\fBkey_layout = \fIqwerty|azerty|qwertz\fB\fR \fBkey_layout = \fIqwerty|azerty|qwertz|dvorak\fB\fR
Change the key-bindings. Change the key-bindings.
.SH "FILE-SYSTEM SETTINGS" .SH "FILE-SYSTEM SETTINGS"
.PP .PP
doc/rtorrent.1.xml
+1 -1
View File
@@ -768,7 +768,7 @@ match for the download to be included.
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term>key_layout = <replaceable>qwerty|azerty|qwertz</replaceable></term> <term>key_layout = <replaceable>qwerty|azerty|qwertz|dvorak</replaceable></term>
<listitem><para> <listitem><para>
Change the key-bindings. Change the key-bindings.
rak/socket_address.h
+3 -4
View File
@@ -62,15 +62,14 @@ class socket_address_inet6;
class socket_address { class socket_address {
public: public:
static const sa_family_t af_local = AF_LOCAL;
static const sa_family_t af_inet = AF_INET; static const sa_family_t af_inet = AF_INET;
static const sa_family_t af_inet6 = AF_INET6; static const sa_family_t af_inet6 = AF_INET6;
static const sa_family_t af_unspec = AF_UNSPEC; static const sa_family_t af_unspec = AF_UNSPEC;
#ifdef AF_UNIX #ifdef AF_LOCAL
static const sa_family_t af_unix = AF_UNIX; static const sa_family_t af_local = AF_LOCAL;
#else #else
static const sa_family_t af_unix = AF_FILE; static const sa_family_t af_local = AF_UNIX;
#endif #endif
bool is_valid() const; bool is_valid() const;
src/ui/root.cc
+27 -8
View File
@@ -138,6 +138,12 @@ Root::setup_keys() {
m_bindings['A'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_down_throttle), 1); m_bindings['A'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_down_throttle), 1);
m_bindings['Y'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_down_throttle), -1); m_bindings['Y'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_down_throttle), -1);
} else if (strcasecmp(control->variable()->get_string("key_layout").c_str(), "dvorak") == 0) {
m_bindings['a'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_up_throttle), 1);
m_bindings[';'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_up_throttle), -1);
m_bindings['A'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_down_throttle), 1);
m_bindings[':'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_down_throttle), -1);
} else { } else {
m_bindings['a'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_up_throttle), 1); m_bindings['a'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_up_throttle), 1);
m_bindings['z'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_up_throttle), -1); m_bindings['z'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_up_throttle), -1);
@@ -145,15 +151,28 @@ Root::setup_keys() {
m_bindings['Z'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_down_throttle), -1); m_bindings['Z'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_down_throttle), -1);
} }
m_bindings['s'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_up_throttle), 5); if (strcasecmp(control->variable()->get_string("key_layout").c_str(), "dvorak") != 0) {
m_bindings['x'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_up_throttle), -5); m_bindings['s'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_up_throttle), 5);
m_bindings['S'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_down_throttle), 5); m_bindings['x'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_up_throttle), -5);
m_bindings['X'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_down_throttle), -5); m_bindings['S'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_down_throttle), 5);
m_bindings['X'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_down_throttle), -5);
m_bindings['d'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_up_throttle), 50); m_bindings['d'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_up_throttle), 50);
m_bindings['c'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_up_throttle), -50); m_bindings['c'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_up_throttle), -50);
m_bindings['D'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_down_throttle), 50); m_bindings['D'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_down_throttle), 50);
m_bindings['C'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_down_throttle), -50); m_bindings['C'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_down_throttle), -50);
} else {
m_bindings['o'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_up_throttle), 5);
m_bindings['q'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_up_throttle), -5);
m_bindings['O'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_down_throttle), 5);
m_bindings['Q'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_down_throttle), -5);
m_bindings['e'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_up_throttle), 50);
m_bindings['j'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_up_throttle), -50);
m_bindings['E'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_down_throttle), 50);
m_bindings['J'] = sigc::bind(sigc::mem_fun(*this, &Root::adjust_down_throttle), -50);
}
m_bindings['\x0C'] = sigc::mem_fun(m_control->display(), &display::Manager::force_redraw); // ^L m_bindings['\x0C'] = sigc::mem_fun(m_control->display(), &display::Manager::force_redraw); // ^L
m_bindings['\x11'] = sigc::mem_fun(m_control, &Control::receive_normal_shutdown); // ^Q m_bindings['\x11'] = sigc::mem_fun(m_control, &Control::receive_normal_shutdown); // ^Q