- Made SHIFT + {Left, Right} work even with findbar focused.

4 files changed, 32 insertions, 8 deletions

diff --git a/src/findbar.cc b/src/findbar.cc
index 606fe7af..144818e3 100644
--- a/src/findbar.cc
+++ b/src/findbar.cc
@@ -34,12 +34,19 @@ int MyInput::handle(int e)
    _MSG("findbar MyInput::handle()\n");
    int ret = 1, k = event_key();
    unsigned modifier = event_state() & (SHIFT | CTRL | ALT | META);
-   if (modifier == 0) {
-      if (e == KEY && k == EscapeKey) {
-         _MSG("findbar MyInput: caught EscapeKey\n");
-         ret = 0;
+
+   if (e == KEY) {
+      if (k == LeftKey || k == RightKey) {
+         if (modifier == SHIFT) {
+            a_UIcmd_send_event_to_tabs_by_wid(e, this);
+            return 1;
+         }
+      } else if (k == EscapeKey && modifier == 0) {
+         // Avoid clearing the text with Esc, just hide the findbar.
+         return 0;
       }
    }
+
    if (ret)
       ret = Input::handle(e);
    return ret;
diff --git a/src/ui.cc b/src/ui.cc
index 0aa33a4c..378fa335 100644
--- a/src/ui.cc
+++ b/src/ui.cc
@@ -119,8 +119,11 @@ int CustInput::handle(int e)
          } else if (k == 'o' || k == 'r' || k == HomeKey || k == EndKey)
             return 0;
       } else if (modifier == SHIFT) {
-         if (k == LeftKey || k == RightKey)
-            return 0;
+         if (k == LeftKey || k == RightKey) {
+            _MSG(" CustInput::handle > SHIFT+RightKey\n");
+            a_UIcmd_send_event_to_tabs_by_wid(e, this);
+            return 1;
+         }
       }
    }
    _MSG("\n");
diff --git a/src/uicmd.cc b/src/uicmd.cc
index 0a7304dd..4be76e4d 100644
--- a/src/uicmd.cc
+++ b/src/uicmd.cc
@@ -70,10 +70,9 @@ public:
                int i = value();
                if (k == LeftKey) {i = i ? i-1 : children()-1;}
                else {i++; if (i >= children()) i = 0;}
-               if (value(i)) do_callback();
+               selected_child(child(i));
                return 1;
             }
-            return 0;
          }
       }
       return TabGroup::handle(e);
@@ -137,6 +136,20 @@ BrowserWindow *a_UIcmd_get_bw_by_widget(void *v_wid)
 }
 
 /*
+ * FLTK regards SHIFT + {LeftKey, Right} as navigation keys.
+ * Special handling is required to override it. Here we route
+ * these events directly to the recipient.
+ * TODO: focus is not remembered correctly.
+ */
+void a_UIcmd_send_event_to_tabs_by_wid(int e, void *v_wid)
+{
+   BrowserWindow *bw = a_UIcmd_get_bw_by_widget(v_wid);
+   UI *ui = (UI*)bw->ui;
+   if (ui->tabs())
+      ui->tabs()->handle(e);
+}
+
+/*
  * Create a new UI and its associated BrowserWindow data structure.
  * Use style from v_ui. If non-NULL it must be of type UI*.
  */
diff --git a/src/uicmd.hh b/src/uicmd.hh
index 77931d6f..469bcae4 100644
--- a/src/uicmd.hh
+++ b/src/uicmd.hh
@@ -10,6 +10,7 @@ extern "C" {
 
 BrowserWindow *a_UIcmd_browser_window_new(int ww, int wh, const void *v_bw);
 BrowserWindow *a_UIcmd_get_bw_by_widget(void *v_wid);
+void a_UIcmd_send_event_to_tabs_by_wid(int e, void *v_wid);
 void a_UIcmd_open_urlstr(void *vbw, const char *urlstr);
 void a_UIcmd_open_url(BrowserWindow *bw, const DilloUrl *url);
 void a_UIcmd_open_url_nw(BrowserWindow *bw, const DilloUrl *url);