Ticket #233: rtorrent-vi-bindings.patch

src/ui/download.cc

@@ -275 +275 @@
   (*m_bindings)[KEY_UP]   = sigc::mem_fun(this, &Download::receive_prev);
   (*m_bindings)[KEY_DOWN] = sigc::mem_fun(this, &Download::receive_next);
 
+  //Vi-style
+  (*m_bindings)['k']   = sigc::mem_fun(this, &Download::receive_prev);
+  (*m_bindings)['j'] = sigc::mem_fun(this, &Download::receive_next);
+
   // Key bindings for sub-ui's.
   m_uiArray[DISPLAY_PEER_LIST]->get_bindings()[KEY_RIGHT]   = sigc::bind(sigc::mem_fun(this, &Download::receive_change), DISPLAY_FILE_LIST);
   m_uiArray[DISPLAY_PEER_INFO]->get_bindings()[KEY_LEFT]    = sigc::bind(sigc::mem_fun(this, &Download::receive_change), DISPLAY_PEER_LIST);
@@ -282 +286 @@
   m_uiArray[DISPLAY_TRACKER_LIST]->get_bindings()[KEY_LEFT] = sigc::bind(sigc::mem_fun(this, &Download::receive_change), DISPLAY_PEER_LIST);
   m_uiArray[DISPLAY_CHUNKS_SEEN]->get_bindings()[KEY_LEFT]  = sigc::bind(sigc::mem_fun(this, &Download::receive_change), DISPLAY_PEER_LIST);
 
+  //Vi-style
+  m_uiArray[DISPLAY_PEER_LIST]->get_bindings()['l']   = sigc::bind(sigc::mem_fun(this, &Download::receive_change), DISPLAY_FILE_LIST);
+  m_uiArray[DISPLAY_PEER_INFO]->get_bindings()['h']    = sigc::bind(sigc::mem_fun(this, &Download::receive_change), DISPLAY_PEER_LIST);
+  m_uiArray[DISPLAY_FILE_LIST]->get_bindings()['h']    = sigc::bind(sigc::mem_fun(this, &Download::receive_change), DISPLAY_PEER_LIST);
+  m_uiArray[DISPLAY_TRACKER_LIST]->get_bindings()['h'] = sigc::bind(sigc::mem_fun(this, &Download::receive_change), DISPLAY_PEER_LIST);
+  m_uiArray[DISPLAY_CHUNKS_SEEN]->get_bindings()['h']  = sigc::bind(sigc::mem_fun(this, &Download::receive_change), DISPLAY_PEER_LIST);
+
   // Doesn't belong here.
   m_uiArray[DISPLAY_PEER_LIST]->get_bindings()['*'] = sigc::mem_fun(this, &Download::receive_snub_peer);
   m_uiArray[DISPLAY_PEER_INFO]->get_bindings()['*'] = sigc::mem_fun(this, &Download::receive_snub_peer);

src/ui/download_list.cc

@@ -240 +240 @@
 
   m_uiDownload->activate();
   m_uiDownload->get_bindings()[KEY_LEFT] = sigc::mem_fun(*this, &DownloadList::receive_exit_download);
+  
+  //Vi-style
+  m_uiDownload->get_bindings()['h'] = sigc::mem_fun(*this, &DownloadList::receive_exit_download);
 }
 
 void
@@ -422 +425 @@
   (*m_bindings)[KEY_UP]        = sigc::mem_fun(*this, &DownloadList::receive_prev);
   (*m_bindings)[KEY_DOWN]      = sigc::mem_fun(*this, &DownloadList::receive_next);
   (*m_bindings)[KEY_RIGHT]     = sigc::mem_fun(*this, &DownloadList::receive_view_download);
-  (*m_bindings)['l']           = sigc::bind(sigc::mem_fun(*this, &DownloadList::receive_change), DISPLAY_LOG);
+  (*m_bindings)['L']           = sigc::bind(sigc::mem_fun(*this, &DownloadList::receive_change), DISPLAY_LOG);
+  
+  //Vi-style
+  (*m_bindings)['k']        = sigc::mem_fun(*this, &DownloadList::receive_prev);
+  (*m_bindings)['j']      = sigc::mem_fun(*this, &DownloadList::receive_next);
+  (*m_bindings)['l']     = sigc::mem_fun(*this, &DownloadList::receive_view_download);
 
   (*m_bindings)['1']           = sigc::bind(sigc::mem_fun(*this, &DownloadList::receive_change_view), "main");
   (*m_bindings)['2']           = sigc::bind(sigc::mem_fun(*this, &DownloadList::receive_change_view), "name");

src/ui/element_file_list.cc

@@ -56 +56 @@
   m_bindings['*'] = sigc::mem_fun(*this, &ElementFileList::receive_change_all);
   m_bindings[KEY_DOWN] = sigc::mem_fun(*this, &ElementFileList::receive_next);
   m_bindings[KEY_UP] = sigc::mem_fun(*this, &ElementFileList::receive_prev);
+  
+  //Vi-style
+  m_bindings['j'] = sigc::mem_fun(*this, &ElementFileList::receive_next);
+  m_bindings['k'] = sigc::mem_fun(*this, &ElementFileList::receive_prev);
 }
 
 void

src/ui/element_tracker_list.cc

@@ -57 +57 @@
   m_bindings[KEY_UP]   = sigc::mem_fun(*this, &ElementTrackerList::receive_prev);
   m_bindings[' ']      = sigc::mem_fun(*this, &ElementTrackerList::receive_cycle_group);
   m_bindings['*']      = sigc::mem_fun(*this, &ElementTrackerList::receive_disable);
+
+  //Vi-style
+  m_bindings['j'] = sigc::mem_fun(*this, &ElementTrackerList::receive_next);
+  m_bindings['k']   = sigc::mem_fun(*this, &ElementTrackerList::receive_prev);
 }
 
 void