Feature: typeahead in menu matches text anywhere

This commit implements a tweak to the typeahead feature already existent in
fluxbox: If the user opens up a menu and starts typing, fluxbox tries to
detect matching menu items and makes them available for quick selection.
The typed pattern is now search also in the middle of the text.

I opted to strip down the code quite a bit and remove complexity by throwing
out FbTk::TypeAhead and FbTk::SearchResult because I do not see the need for a
general solution when the only use case for such a feature is in fluxbox'
menus. FbTk::ITypeAheadable shrunk down to 2 functions; the whole file might
be combined with the code that implements FbTk::Menu::TypeSearch.
FbTk::Menu::setIndex() and related code is also gone: the position of each
menu item is defined by it's position in the items container. This reduces the
mount of book keeping fluxbox has to do. Fewer moving parts is a good thing.

It's possible that users start to complaint because they expect their
typed pattern to match only at the beginning of the text OR that some
demand other tweaks. We will see.

This commit also fixes a regression introduced by 8387742c. The bug made
the menu vanish.

1 files changed, 22 insertions, 27 deletions

diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh
index 9716a89..39440a8 100644
--- a/src/FbTk/Menu.hh
+++ b/src/FbTk/Menu.hh
@@ -33,7 +33,6 @@
 #include "EventHandler.hh"
 #include "MenuTheme.hh"
 #include "Timer.hh"
-#include "TypeAhead.hh"
 
 namespace FbTk {
 
@@ -53,6 +52,7 @@ public:
 
     enum Alignment{ ALIGNDONTCARE = 1, ALIGNTOP, ALIGNBOTTOM };
     enum { RIGHT = 1, LEFT };
+    enum { UP = 1, DOWN = 0 };
 
     /**
        Bullet type
@@ -71,6 +71,7 @@ public:
     int insertSubmenu(const FbString &label, Menu *submenu, int pos= -1);
     int insertItem(MenuItem *item, int pos=-1);
     int remove(unsigned int item);
+    int removeItem(MenuItem* item);
     void removeAll();
     void setInternalMenu(bool val = true) { m_internal_menu = val; }
     void setAlignment(Alignment a) { m_alignment = a; }
@@ -180,24 +181,16 @@ private:
     void startHide();
     void stopHide();
 
-    FbTk::ThemeProxy<MenuTheme> &m_theme;
-    Menu *m_parent;
-    ImageControl &m_image_ctrl;
-
-    typedef std::vector<MenuItem *> Menuitems;
-    Menuitems m_items;
-    TypeAhead<Menuitems, MenuItem *> m_type_ahead;
-    Menuitems m_matches;
-
     void resetTypeAhead();
     void drawTypeAheadItems();
-    void drawLine(int index, int size);
-    void fixMenuItemIndices();
 
-    struct Rect {
-        int x, y;
-        unsigned int width, height;
-    } m_screen;
+
+    Menu *m_parent;
+
+    class TypeSearch;
+
+    std::vector<MenuItem *>   m_items;
+    std::auto_ptr<TypeSearch> m_search;
 
     struct State {
         bool moving;
@@ -206,14 +199,20 @@ private:
         bool torn; // torn from parent
     } m_state;
 
+    bool m_need_update;
     bool m_internal_menu; ///< whether we should destroy this menu or if it's managed somewhere else
+    int m_active_index; ///< current highlighted index
     int m_which_sub;
+    int m_x_move;
+    int m_y_move;
 
-    Alignment m_alignment;
+    struct Rect {
+        int x, y;
+        unsigned int width, height;
+    } m_screen;
 
     // the menu window
     FbTk::FbWindow m_window;
-    Pixmap m_hilite_pixmap;
 
     // the title
     struct Title {
@@ -231,24 +230,20 @@ private:
     } m_frame;
 
 
-    int m_x_move;
-    int m_y_move;
-
     // the menuitems are rendered in a grid with
     // 'm_columns' (a minimum of 'm_min_columns') and
     // a max of 'm_rows_per_column'
     int m_columns;
     int m_rows_per_column;
     int m_min_columns;
-
     unsigned int m_item_w;
 
-    int m_active_index; ///< current highlighted index
-
-    // the corners
-    std::auto_ptr<FbTk::Shape> m_shape;
+    FbTk::ThemeProxy<MenuTheme>& m_theme;
+    ImageControl& m_image_ctrl;
+    std::auto_ptr<FbTk::Shape> m_shape; // the corners
+    Pixmap      m_hilite_pixmap;
+    Alignment   m_alignment;
 
-    bool m_need_update;
     Timer m_submenu_timer;
     Timer m_hide_timer;