rtorrent-pyro/kb_vi_akston.patch

   1 diff --git a/src/ui/download_list.cc b/src/ui/download_list.cc
   2 index e72bff6..04b8625 100644
   3 --- a/src/ui/download_list.cc
   4 +++ b/src/ui/download_list.cc
   5 @@ -346,13 +346,13 @@ DownloadList::setup_keys() {
   6    m_bindings['\x0F']        = sigc::bind(sigc::mem_fun(*this, &DownloadList::receive_view_input), INPUT_CHANGE_DIRECTORY);
   7    m_bindings['X' - '@']     = sigc::bind(sigc::mem_fun(*this, &DownloadList::receive_view_input), INPUT_COMMAND);
   8
   9 -  m_uiArray[DISPLAY_LOG]->bindings()[KEY_LEFT] =
  10 +  m_uiArray[DISPLAY_LOG]->bindings()['h'] =
  11      m_uiArray[DISPLAY_LOG]->bindings()['B' - '@'] =
  12      m_uiArray[DISPLAY_LOG]->bindings()[' '] = sigc::bind(sigc::mem_fun(*this, &DownloadList::activate_display), DISPLAY_DOWNLOAD_LIST);
  13
  14 -  m_uiArray[DISPLAY_DOWNLOAD_LIST]->bindings()[KEY_RIGHT] =
  15 +  m_uiArray[DISPLAY_DOWNLOAD_LIST]->bindings()['l'] =
  16      m_uiArray[DISPLAY_DOWNLOAD_LIST]->bindings()['F' - '@'] = sigc::bind(sigc::mem_fun(*this, &DownloadList::activate_display), DISPLAY_DOWNLOAD);
  17 -  m_uiArray[DISPLAY_DOWNLOAD_LIST]->bindings()['l']       = sigc::bind(sigc::mem_fun(*this, &DownloadList::activate_display), DISPLAY_LOG);
  18 +  m_uiArray[DISPLAY_DOWNLOAD_LIST]->bindings()['L']       = sigc::bind(sigc::mem_fun(*this, &DownloadList::activate_display), DISPLAY_LOG);
  19  }
  20
  21  }
  22 diff --git a/src/ui/element_chunks_seen.cc b/src/ui/element_chunks_seen.cc
  23 index 8ee1dd9..d2636db 100644
  24 --- a/src/ui/element_chunks_seen.cc
  25 +++ b/src/ui/element_chunks_seen.cc
  26 @@ -52,10 +52,10 @@ ElementChunksSeen::ElementChunksSeen(core::Download* d) :
  27    m_window(NULL),
  28    m_focus(0) {
  29
  30 -  m_bindings[KEY_LEFT] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator());
  31 +  m_bindings['h'] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator());
  32
  33 -  m_bindings[KEY_DOWN]  = m_bindings['N' - '@'] = sigc::mem_fun(*this, &ElementChunksSeen::receive_next);
  34 -  m_bindings[KEY_UP]    = m_bindings['P' - '@'] = sigc::mem_fun(*this, &ElementChunksSeen::receive_prev);
  35 +  m_bindings['j']  = m_bindings['N' - '@'] = sigc::mem_fun(*this, &ElementChunksSeen::receive_next);
  36 +  m_bindings['k']    = m_bindings['P' - '@'] = sigc::mem_fun(*this, &ElementChunksSeen::receive_prev);
  37    m_bindings[KEY_NPAGE] = sigc::mem_fun(*this, &ElementChunksSeen::receive_pagenext);
  38    m_bindings[KEY_PPAGE] = sigc::mem_fun(*this, &ElementChunksSeen::receive_pageprev);
  39  }
  40 diff --git a/src/ui/element_download_list.cc b/src/ui/element_download_list.cc
  41 index 1dc9ece..0c789f1 100644
  42 --- a/src/ui/element_download_list.cc
  43 +++ b/src/ui/element_download_list.cc
  44 @@ -95,8 +95,8 @@ ElementDownloadList::ElementDownloadList() :
  45    m_bindings['8']           = sigc::bind(sigc::mem_fun(*this, &ElementDownloadList::receive_change_view), "seeding");
  46    m_bindings['9']           = sigc::bind(sigc::mem_fun(*this, &ElementDownloadList::receive_change_view), "active");
  47
  48 -  m_bindings[KEY_UP]   = m_bindings['P' - '@'] = sigc::mem_fun(*this, &ElementDownloadList::receive_prev);
  49 -  m_bindings[KEY_DOWN] = m_bindings['N' - '@'] = sigc::mem_fun(*this, &ElementDownloadList::receive_next);
  50 +  m_bindings['k']   = m_bindings['P' - '@'] = sigc::mem_fun(*this, &ElementDownloadList::receive_prev);
  51 +  m_bindings['j'] = m_bindings['N' - '@'] = sigc::mem_fun(*this, &ElementDownloadList::receive_next);
  52  }
  53
  54  void
  55 diff --git a/src/ui/element_file_list.cc b/src/ui/element_file_list.cc
  56 index 75ecec0..f23ef23 100644
  57 --- a/src/ui/element_file_list.cc
  58 +++ b/src/ui/element_file_list.cc
  59 @@ -64,8 +64,8 @@ ElementFileList::ElementFileList(core::Download* d) :
  60    m_selected(iterator(d->download()->file_list()->begin())),
  61    m_collapsed(false) {
  62
  63 -  m_bindings[KEY_LEFT] = m_bindings['B' - '@']  = sigc::mem_fun(&m_slotExit, &slot_type::operator());
  64 -  m_bindings[KEY_RIGHT] = m_bindings['F' - '@'] = sigc::mem_fun(*this, &ElementFileList::receive_select);
  65 +  m_bindings['h'] = m_bindings['B' - '@']  = sigc::mem_fun(&m_slotExit, &slot_type::operator());
  66 +  m_bindings['l'] = m_bindings['F' - '@'] = sigc::mem_fun(*this, &ElementFileList::receive_select);
  67
  68    m_bindings[' '] = sigc::mem_fun(*this, &ElementFileList::receive_priority);
  69    m_bindings['*'] = sigc::mem_fun(*this, &ElementFileList::receive_change_all);
  70 @@ -73,8 +73,8 @@ ElementFileList::ElementFileList(core::Download* d) :
  71    m_bindings[KEY_NPAGE] = sigc::mem_fun(*this, &ElementFileList::receive_pagenext);
  72    m_bindings[KEY_PPAGE] = sigc::mem_fun(*this, &ElementFileList::receive_pageprev);
  73
  74 -  m_bindings[KEY_DOWN] = m_bindings['N' - '@'] = sigc::mem_fun(*this, &ElementFileList::receive_next);
  75 -  m_bindings[KEY_UP]   = m_bindings['P' - '@'] = sigc::mem_fun(*this, &ElementFileList::receive_prev);
  76 +  m_bindings['j'] = m_bindings['N' - '@'] = sigc::mem_fun(*this, &ElementFileList::receive_next);
  77 +  m_bindings['k']   = m_bindings['P' - '@'] = sigc::mem_fun(*this, &ElementFileList::receive_prev);
  78  }
  79
  80  inline ElementText*
  81 diff --git a/src/ui/element_menu.cc b/src/ui/element_menu.cc
  82 index 04130f3..41779eb 100644
  83 --- a/src/ui/element_menu.cc
  84 +++ b/src/ui/element_menu.cc
  85 @@ -72,11 +72,11 @@ ElementMenu::ElementMenu() :
  86    m_entry(entry_invalid) {
  87
  88    // Move bindings into a function that defines default bindings.
  89 -  m_bindings[KEY_LEFT] = m_bindings['B' - '@']  = sigc::mem_fun(&m_slotExit, &slot_type::operator());
  90 -  m_bindings[KEY_RIGHT] = m_bindings['F' - '@'] = sigc::mem_fun(this, &ElementMenu::entry_select);
  91 +  m_bindings['h'] = m_bindings['B' - '@']  = sigc::mem_fun(&m_slotExit, &slot_type::operator());
  92 +  m_bindings['l'] = m_bindings['F' - '@'] = sigc::mem_fun(this, &ElementMenu::entry_select);
  93
  94 -  m_bindings[KEY_UP]   = m_bindings['P' - '@'] = sigc::mem_fun(this, &ElementMenu::entry_prev);
  95 -  m_bindings[KEY_DOWN] = m_bindings['N' - '@'] = sigc::mem_fun(this, &ElementMenu::entry_next);
  96 +  m_bindings['k']   = m_bindings['P' - '@'] = sigc::mem_fun(this, &ElementMenu::entry_prev);
  97 +  m_bindings['j'] = m_bindings['N' - '@'] = sigc::mem_fun(this, &ElementMenu::entry_next);
  98  }
  99
 100  ElementMenu::~ElementMenu() {
 101 diff --git a/src/ui/element_peer_list.cc b/src/ui/element_peer_list.cc
 102 index da08e15..f5fb5bb 100644
 103 --- a/src/ui/element_peer_list.cc
 104 +++ b/src/ui/element_peer_list.cc
 105 @@ -73,14 +73,14 @@ ElementPeerList::ElementPeerList(core::Download* d) :
 106
 107    m_elementInfo->slot_exit(sigc::bind(sigc::mem_fun(this, &ElementPeerList::activate_display), DISPLAY_LIST));
 108
 109 -  m_bindings['k']       = sigc::mem_fun(this, &ElementPeerList::receive_disconnect_peer);
 110 +  m_bindings['K']       = sigc::mem_fun(this, &ElementPeerList::receive_disconnect_peer);
 111    m_bindings['*']       = sigc::mem_fun(this, &ElementPeerList::receive_snub_peer);
 112    m_bindings['B']       = sigc::mem_fun(this, &ElementPeerList::receive_ban_peer);
 113 -  m_bindings[KEY_LEFT] = m_bindings['B' - '@']  = sigc::mem_fun(&m_slotExit, &slot_type::operator());
 114 -  m_bindings[KEY_RIGHT] = m_bindings['F' - '@'] = sigc::bind(sigc::mem_fun(this, &ElementPeerList::activate_display), DISPLAY_INFO);
 115 +  m_bindings['h'] = m_bindings['B' - '@']  = sigc::mem_fun(&m_slotExit, &slot_type::operator());
 116 +  m_bindings['l'] = m_bindings['F' - '@'] = sigc::bind(sigc::mem_fun(this, &ElementPeerList::activate_display), DISPLAY_INFO);
 117
 118 -  m_bindings[KEY_UP]   = m_bindings['P' - '@'] = sigc::mem_fun(this, &ElementPeerList::receive_prev);
 119 -  m_bindings[KEY_DOWN] = m_bindings['N' - '@'] = sigc::mem_fun(this, &ElementPeerList::receive_next);
 120 +  m_bindings['k']   = m_bindings['P' - '@'] = sigc::mem_fun(this, &ElementPeerList::receive_prev);
 121 +  m_bindings['j'] = m_bindings['N' - '@'] = sigc::mem_fun(this, &ElementPeerList::receive_next);
 122  }
 123
 124  ElementPeerList::~ElementPeerList() {
 125 diff --git a/src/ui/element_text.cc b/src/ui/element_text.cc
 126 index a7496f2..a564a81 100644
 127 --- a/src/ui/element_text.cc
 128 +++ b/src/ui/element_text.cc
 129 @@ -54,7 +54,7 @@ ElementText::ElementText(rpc::target_type target) :
 130    m_columnWidth(0) {
 131
 132    // Move bindings into a function that defines default bindings.
 133 -  m_bindings[KEY_LEFT] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator());
 134 +  m_bindings['h'] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator());
 135
 136  //   m_bindings[KEY_UP]    = sigc::mem_fun(this, &ElementText::entry_prev);
 137  //   m_bindings[KEY_DOWN]  = sigc::mem_fun(this, &ElementText::entry_next);
 138 diff --git a/src/ui/element_tracker_list.cc b/src/ui/element_tracker_list.cc
 139 index 7d81b89..8a51e80 100644
 140 --- a/src/ui/element_tracker_list.cc
 141 +++ b/src/ui/element_tracker_list.cc
 142 @@ -54,13 +54,13 @@ ElementTrackerList::ElementTrackerList(core::Download* d) :
 143    m_window(NULL),
 144    m_focus(0) {
 145
 146 -  m_bindings[KEY_LEFT] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator());
 147 +  m_bindings['h'] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator());
 148
 149    m_bindings[' ']      = sigc::mem_fun(*this, &ElementTrackerList::receive_cycle_group);
 150    m_bindings['*']      = sigc::mem_fun(*this, &ElementTrackerList::receive_disable);
 151
 152 -  m_bindings[KEY_DOWN] = m_bindings['N' - '@'] = sigc::mem_fun(*this, &ElementTrackerList::receive_next);
 153 -  m_bindings[KEY_UP]   = m_bindings['P' - '@'] = sigc::mem_fun(*this, &ElementTrackerList::receive_prev);
 154 +  m_bindings['j'] = m_bindings['N' - '@'] = sigc::mem_fun(*this, &ElementTrackerList::receive_next);
 155 +  m_bindings['k']   = m_bindings['P' - '@'] = sigc::mem_fun(*this, &ElementTrackerList::receive_prev);
 156  }
 157
 158  void
 159 diff --git a/src/ui/element_transfer_list.cc b/src/ui/element_transfer_list.cc
 160 index 50eaec6..83ae26d 100644
 161 --- a/src/ui/element_transfer_list.cc
 162 +++ b/src/ui/element_transfer_list.cc
 163 @@ -52,10 +52,10 @@ ElementTransferList::ElementTransferList(core::Download* d) :
 164    m_window(NULL),
 165    m_focus(0) {
 166
 167 -  m_bindings[KEY_LEFT] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator());
 168 +  m_bindings['h'] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator());
 169
 170 -  m_bindings[KEY_DOWN]  = sigc::mem_fun(*this, &ElementTransferList::receive_next);
 171 -  m_bindings[KEY_UP]    = sigc::mem_fun(*this, &ElementTransferList::receive_prev);
 172 +  m_bindings['j']  = sigc::mem_fun(*this, &ElementTransferList::receive_next);
 173 +  m_bindings['k']    = sigc::mem_fun(*this, &ElementTransferList::receive_prev);
 174    m_bindings[KEY_NPAGE] = sigc::mem_fun(*this, &ElementTransferList::receive_pagenext);
 175    m_bindings[KEY_PPAGE] = sigc::mem_fun(*this, &ElementTransferList::receive_pageprev);
 176  }