Pause before rolling over at first/last elements

src/core/view.cc

@@ -201,20 +201,41 @@ View::set_not_visible(Download* download) {
 }
 
 void
-View::next_focus(int i) {
+View::next_focus(unsigned int i) {
   if (empty())
     return;
 
-  m_focus = (m_focus + i) % (size() + 1);
+  // If at the boundary, roll over
+  if (m_focus == size() - 1) {
+    m_focus = size();
+  } else {
+    // Move forward, stop at the boundary
+    if (m_focus == size())
+      m_focus = i - 1;
+    else
+      m_focus += i;
+    if (m_focus > size() - 1)
+      m_focus = size() - 1;
+  }
+
   emit_changed();
 }
 
 void
-View::prev_focus(int i) {
+View::prev_focus(unsigned int i) {
   if (empty())
     return;
 
-  m_focus = (m_focus - i + size() + 1) % (size() + 1);
+  // If at the boundary, roll over
+  if (m_focus == size()) {
+    m_focus = size() - 1;
+  } else {
+    // Move backward, stop at the boundary
+    m_focus -= i;
+    if (m_focus < 0 || m_focus > size())
+      m_focus = size();
+  }
+
   emit_changed();
 }
 

src/core/view.h

@@ -78,8 +78,8 @@ class View : private std::vector<Download*> {
   void set_visible(Download* download);
   void set_not_visible(Download* download);
 
-  void next_focus(int i);
-  void prev_focus(int i);
+  void next_focus(unsigned int i);
+  void prev_focus(unsigned int i);
 
   void next_focus() { next_focus(1); }
   void prev_focus() { prev_focus(1); }

src/ui/element_download_list.cc

@@ -61,7 +61,7 @@ ElementDownloadList::ElementDownloadList() :
   m_bindings[KEY_DOWN] = m_bindings['N' - '@'] = std::bind(&ElementDownloadList::receive_next, this);
 
   m_bindings[KEY_PPAGE] = m_bindings['K' - '@'] = [this] { receive_prev_page(); };
-  m_bindings[KEY_NPAGE] = m_bindings['J' - '@'] = [this] { receive_next_page(); };
+  m_bindings[KEY_NPAGE] = m_bindings['H' - '@'] = [this] { receive_next_page(); };
 
   m_bindings[KEY_HOME] = m_bindings['A' - '@'] = [this] { receive_home(); };
   m_bindings[KEY_END] = m_bindings['E' - '@'] = [this] { receive_end(); };