Restructuring, my biggest joy.

7 files changed, 1624 insertions, 1588 deletions

diff --git a/include/rofi.h b/include/rofi.h
index d6bab116..46b674bb 100644
--- a/include/rofi.h
+++ b/include/rofi.h
@@ -83,17 +83,6 @@ int show_error_message ( const char *msg, int markup );
     " * The version of rofi you are running\n\n"                       \
     " <i>https://github.com/DaveDavenport/rofi/</i>"
 #define ERROR_MSG_MARKUP    TRUE
-
-MenuReturn rofi_view_get_return_value ( const RofiViewState *state );
-unsigned int rofi_view_get_selected_line ( const RofiViewState *state );
-unsigned int rofi_view_get_next_position ( const RofiViewState *state );
-void rofi_view_itterrate ( RofiViewState *state, XEvent *event );
-unsigned int rofi_view_get_completed ( const RofiViewState *state );
-const char * rofi_view_get_user_input ( const RofiViewState *state );
-void rofi_view_free ( RofiViewState *state );
-void rofi_view_restart ( RofiViewState *state );
-void rofi_view_set_selected_line ( RofiViewState *state, unsigned int selected_line );
-void rofi_view_queue_redraw ( void );
-void rofi_view_set_active ( RofiViewState *state );
+int locate_switcher ( KeySym key, unsigned int modstate );
 /*@}*/
 #endif
diff --git a/include/view-internal.h b/include/view-internal.h
new file mode 100644
index 00000000..5c41fd14
--- /dev/null
+++ b/include/view-internal.h
@@ -0,0 +1,73 @@
+#ifndef ROFI_VIEW_INTERNAL_H
+#define ROFI_VIEW_INTERNAL_H
+#include "widget.h"
+#include "textbox.h"
+#include "scrollbar.h"
+
+/**
+ * @ingroup View
+ *
+ * @{
+ */
+// State of the menu.
+
+typedef struct RofiViewState
+{
+    Mode         *sw;
+    unsigned int menu_lines;
+    unsigned int max_elements;
+    unsigned int max_rows;
+    unsigned int columns;
+
+    // window width,height
+    unsigned int w, h;
+    int          x, y;
+    unsigned int element_width;
+    int          top_offset;
+
+    // Update/Refilter list.
+    int          update;
+    int          refilter;
+    int          rchanged;
+    int          cur_page;
+
+    // Entries
+    textbox      *text;
+    textbox      *prompt_tb;
+    textbox      *message_tb;
+    textbox      *case_indicator;
+    textbox      **boxes;
+    scrollbar    *scrollbar;
+    int          *distance;
+    unsigned int *line_map;
+
+    unsigned int num_lines;
+
+    // Selected element.
+    unsigned int selected;
+    unsigned int filtered_lines;
+    // Last offset in paginating.
+    unsigned int last_offset;
+
+    KeySym       prev_key;
+    Time         last_button_press;
+
+    int          quit;
+    int          skip_absorb;
+    // Return state
+    unsigned int selected_line;
+    MenuReturn   retv;
+    int          *lines_not_ascii;
+    int          line_height;
+    unsigned int border;
+    workarea     mon;
+
+    // Sidebar view
+    ssize_t      num_modi;
+    textbox      **modi;
+    // Handlers.
+    void ( *x11_event_loop )( struct RofiViewState *state, XEvent *ev );
+    void ( *finalize )( struct RofiViewState *state );
+}RofiViewState;
+/** @} */
+#endif
diff --git a/include/view.h b/include/view.h
index 8c7d02bc..8e94c77f 100644
--- a/include/view.h
+++ b/include/view.h
@@ -1,63 +1,13 @@
+#ifndef ROFI_VIEW_H
+#define ROFI_VIEW_H
 
-// State of the menu.
-
-typedef struct RofiViewState
-{
-    Mode         *sw;
-    unsigned int menu_lines;
-    unsigned int max_elements;
-    unsigned int max_rows;
-    unsigned int columns;
-
-    // window width,height
-    unsigned int w, h;
-    int          x, y;
-    unsigned int element_width;
-    int          top_offset;
-
-    // Update/Refilter list.
-    int          update;
-    int          refilter;
-    int          rchanged;
-    int          cur_page;
-
-    // Entries
-    textbox      *text;
-    textbox      *prompt_tb;
-    textbox      *message_tb;
-    textbox      *case_indicator;
-    textbox      **boxes;
-    scrollbar    *scrollbar;
-    int          *distance;
-    unsigned int *line_map;
-
-    unsigned int num_lines;
-
-    // Selected element.
-    unsigned int selected;
-    unsigned int filtered_lines;
-    // Last offset in paginating.
-    unsigned int last_offset;
-
-    KeySym       prev_key;
-    Time         last_button_press;
-
-    int          quit;
-    int          skip_absorb;
-    // Return state
-    unsigned int selected_line;
-    MenuReturn   retv;
-    int          *lines_not_ascii;
-    int          line_height;
-    unsigned int border;
-    workarea     mon;
-
-    ssize_t      num_modi;
-    textbox      **modi;
-    // Handlers.
-    void ( *x11_event_loop )( struct RofiViewState *state, XEvent *ev );
-    void ( *finalize )( struct RofiViewState *state );
-}RofiViewState;
+/**
+ * @defgroup View View
+ *
+ * The rofi Menu view.
+ *
+ * @{
+ */
 
 /**
  * @param state The Menu Handle
@@ -67,3 +17,24 @@ typedef struct RofiViewState
 void rofi_view_finalize ( RofiViewState *state );
 
 RofiViewState * rofi_view_state_create ( void );
+
+MenuReturn rofi_view_get_return_value ( const RofiViewState *state );
+unsigned int rofi_view_get_selected_line ( const RofiViewState *state );
+unsigned int rofi_view_get_next_position ( const RofiViewState *state );
+void rofi_view_itterrate ( RofiViewState *state, XEvent *event );
+unsigned int rofi_view_get_completed ( const RofiViewState *state );
+const char * rofi_view_get_user_input ( const RofiViewState *state );
+void rofi_view_free ( RofiViewState *state );
+void rofi_view_restart ( RofiViewState *state );
+void rofi_view_set_selected_line ( RofiViewState *state, unsigned int selected_line );
+void rofi_view_queue_redraw ( void );
+void rofi_view_set_active ( RofiViewState *state );
+
+void rofi_view_call_thread ( gpointer data, gpointer user_data );
+
+void menu_update ( RofiViewState *state );
+void menu_setup_fake_transparency ( Display *display, RofiViewState *state );
+
+void rofi_view_cleanup ( void );
+/** @} */
+#endif
diff --git a/source/dialogs/dmenu.c b/source/dialogs/dmenu.c
index c2f5f60f..2daeb5d4 100644
--- a/source/dialogs/dmenu.c
+++ b/source/dialogs/dmenu.c
@@ -40,7 +40,7 @@
 #include "dialogs/dmenu.h"
 #include "helper.h"
 #include "xrmoptions.h"
-
+#include "view.h"
 // We limit at 1000000 rows for now.
 #define DMENU_MAX_ROWS    1000000
 
diff --git a/source/rofi.c b/source/rofi.c
index af7bea76..45e6db5f 100644
--- a/source/rofi.c
+++ b/source/rofi.c
@@ -58,45 +58,26 @@
 #include "rofi.h"
 #include "helper.h"
 #include "textbox.h"
-#include "scrollbar.h"
 #include "x11-helper.h"
 #include "x11-event-source.h"
 #include "xrmoptions.h"
 #include "dialogs/dialogs.h"
 
-//ModeMode switcher_run ( char **input, Mode *sw );
-
-typedef enum _MainLoopEvent
-{
-    ML_XEVENT,
-    ML_TIMEOUT
-} MainLoopEvent;
-
-gboolean          daemon_mode          = FALSE;
+gboolean          daemon_mode = FALSE;
 // Pidfile.
-extern Atom       netatoms[NUM_NETATOMS];
-char              *pidfile             = NULL;
-const char        *cache_dir           = NULL;
-SnDisplay         *sndisplay           = NULL;
-SnLauncheeContext *sncontext           = NULL;
-Display           *display             = NULL;
-char              *display_str         = NULL;
-char              *config_path         = NULL;
-Window            main_window          = None;
-Colormap          map                  = None;
-unsigned int      normal_window_mode   = FALSE;
+char              *pidfile           = NULL;
+const char        *cache_dir         = NULL;
+SnDisplay         *sndisplay         = NULL;
+SnLauncheeContext *sncontext         = NULL;
+Display           *display           = NULL;
+char              *display_str       = NULL;
+char              *config_path       = NULL;
+unsigned int      normal_window_mode = FALSE;
 // Array of modi.
-Mode              **modi               = NULL;
-unsigned int      num_modi             = 0;
+Mode              **modi   = NULL;
+unsigned int      num_modi = 0;
 // Current selected switcher.
-unsigned int      curr_switcher        = 0;
-XVisualInfo       vinfo;
-
-cairo_surface_t   *surface             = NULL;
-cairo_surface_t   *fake_bg             = NULL;
-cairo_t           *draw                = NULL;
-XIM               xim;
-XIC               xic;
+unsigned int      curr_switcher = 0;
 
 GThreadPool       *tpool               = NULL;
 GMainLoop         *main_loop           = NULL;
@@ -106,23 +87,6 @@ RofiViewState     *current_active_menu = NULL;
 
 static void process_result ( RofiViewState *state );
 gboolean main_loop_x11_event_handler ( G_GNUC_UNUSED gpointer data );
-static char * get_matching_state ( void )
-{
-    if ( config.case_sensitive ) {
-        if ( config.levenshtein_sort ) {
-            return "±";
-        }
-        else {
-            return "-";
-        }
-    }
-    else{
-        if ( config.levenshtein_sort ) {
-            return "+";
-        }
-    }
-    return " ";
-}
 
 /**
  * @param name Name of the switcher to lookup.
@@ -141,334 +105,9 @@ static int switcher_get ( const char *name )
     return -1;
 }
 
-/**
- * Levenshtein Sorting.
- */
-
-static int lev_sort ( const void *p1, const void *p2, void *arg )
-{
-    const int *a         = p1;
-    const int *b         = p2;
-    int       *distances = arg;
-
-    return distances[*a] - distances[*b];
-}
-
 #include "view.h"
+#include "view-internal.h"
 
-static Window create_window ( Display *display )
-{
-    XSetWindowAttributes attr;
-    attr.colormap         = map;
-    attr.border_pixel     = 0;
-    attr.background_pixel = 0;
-
-    Window box = XCreateWindow ( display, DefaultRootWindow ( display ), 0, 0, 200, 100, 0, vinfo.depth, InputOutput,
-                                 vinfo.visual, CWColormap | CWBorderPixel | CWBackPixel, &attr );
-    XSelectInput (
-        display,
-        box,
-        KeyReleaseMask | KeyPressMask | ExposureMask | ButtonPressMask | StructureNotifyMask | FocusChangeMask |
-        Button1MotionMask );
-
-    surface = cairo_xlib_surface_create ( display, box, vinfo.visual, 200, 100 );
-    // Create a drawable.
-    draw = cairo_create ( surface );
-    cairo_set_operator ( draw, CAIRO_OPERATOR_SOURCE );
-
-    // Set up pango context.
-    cairo_font_options_t *fo = cairo_font_options_create ();
-    // Take font description from xlib surface
-    cairo_surface_get_font_options ( surface, fo );
-    PangoContext *p = pango_cairo_create_context ( draw );
-    // Set the font options from the xlib surface
-    pango_cairo_context_set_font_options ( p, fo );
-    // Setup dpi
-    if ( config.dpi > 0 ) {
-        PangoFontMap *font_map = pango_cairo_font_map_get_default ();
-        pango_cairo_font_map_set_resolution ( (PangoCairoFontMap *) font_map, (double) config.dpi );
-    }
-    // Setup font.
-    PangoFontDescription *pfd = pango_font_description_from_string ( config.menu_font );
-    pango_context_set_font_description ( p, pfd );
-    pango_font_description_free ( pfd );
-    // Tell textbox to use this context.
-    textbox_set_pango_context ( p );
-    // cleanup
-    g_object_unref ( p );
-    cairo_font_options_destroy ( fo );
-
-    // // make it an unmanaged window
-    if ( !normal_window_mode && !config.fullscreen ) {
-        window_set_atom_prop ( display, box, netatoms[_NET_WM_STATE], &netatoms[_NET_WM_STATE_ABOVE], 1 );
-        XSetWindowAttributes sattr = { .override_redirect = True };
-        XChangeWindowAttributes ( display, box, CWOverrideRedirect, &sattr );
-    }
-    else{
-        window_set_atom_prop ( display, box, netatoms[_NET_WM_WINDOW_TYPE], &netatoms[_NET_WM_WINDOW_TYPE_NORMAL], 1 );
-    }
-    if ( config.fullscreen ) {
-        Atom atoms[] = {
-            netatoms[_NET_WM_STATE_FULLSCREEN],
-            netatoms[_NET_WM_STATE_ABOVE]
-        };
-        window_set_atom_prop ( display, box, netatoms[_NET_WM_STATE], atoms, sizeof ( atoms ) / sizeof ( Atom ) );
-    }
-
-    xim = XOpenIM ( display, NULL, NULL, NULL );
-    xic = XCreateIC ( xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing, XNClientWindow,
-                      box, XNFocusWindow, box, NULL );
-
-    // Set the WM_NAME
-    XStoreName ( display, box, "rofi" );
-
-    x11_set_window_opacity ( display, box, config.window_opacity );
-    return box;
-}
-
-/**
- * @param state   the state of the View.
- * @param mon     the work area.
- *
- * Calculates the window poslition
- */
-static void calculate_window_position ( RofiViewState *state )
-{
-    // Default location is center.
-    state->y = state->mon.y + ( state->mon.h - state->h ) / 2;
-    state->x = state->mon.x + ( state->mon.w - state->w ) / 2;
-    // Determine window location
-    switch ( config.location )
-    {
-    case WL_NORTH_WEST:
-        state->x = state->mon.x;
-    case WL_NORTH:
-        state->y = state->mon.y;
-        break;
-    case WL_NORTH_EAST:
-        state->y = state->mon.y;
-    case WL_EAST:
-        state->x = state->mon.x + state->mon.w - state->w;
-        break;
-    case WL_EAST_SOUTH:
-        state->x = state->mon.x + state->mon.w - state->w;
-    case WL_SOUTH:
-        state->y = state->mon.y + state->mon.h - state->h;
-        break;
-    case WL_SOUTH_WEST:
-        state->y = state->mon.y + state->mon.h - state->h;
-    case WL_WEST:
-        state->x = state->mon.x;
-        break;
-    case WL_CENTER:
-    default:
-        break;
-    }
-    // Apply offset.
-    state->x += config.x_offset;
-    state->y += config.y_offset;
-}
-
-/**
- * @param state Internal state of the menu.
- *
- * Calculate the number of rows, columns and elements to display based on the
- * configuration and available data.
- */
-static void menu_calculate_rows_columns ( RofiViewState *state )
-{
-    state->columns      = config.menu_columns;
-    state->max_elements = MIN ( state->menu_lines * state->columns, state->num_lines );
-
-    // Calculate the number or rows. We do this by getting the num_lines rounded up to X columns
-    // (num elements is better name) then dividing by columns.
-    state->max_rows = MIN ( state->menu_lines, (unsigned int) ( ( state->num_lines + ( state->columns - state->num_lines %
-                                                                                       state->columns ) %
-                                                                  state->columns ) / ( state->columns ) ) );
-    // Always have at least one row.
-    state->max_rows = MAX ( 1, state->max_rows );
-
-    if ( config.fixed_num_lines == TRUE ) {
-        state->max_elements = state->menu_lines * state->columns;
-        state->max_rows     = state->menu_lines;
-        // If it would fit in one column, only use one column.
-        if ( state->num_lines < state->max_elements ) {
-            state->columns =
-                ( state->num_lines + ( state->max_rows - state->num_lines % state->max_rows ) % state->max_rows ) / state->max_rows;
-            state->max_elements = state->menu_lines * state->columns;
-        }
-        // Sanitize.
-        if ( state->columns == 0 ) {
-            state->columns = 1;
-        }
-    }
-}
-
-/**
- * @param state Internal state of the menu.
- * @param mon the dimensions of the monitor rofi is displayed on.
- *
- * Calculate the width of the window and the width of an element.
- */
-static void menu_calculate_window_and_element_width ( RofiViewState *state, workarea *mon )
-{
-    if ( config.menu_width < 0 ) {
-        double fw = textbox_get_estimated_char_width ( );
-        state->w  = -( fw * config.menu_width );
-        state->w += 2 * state->border + 4; // 4 = 2*SIDE_MARGIN
-    }
-    else{
-        // Calculate as float to stop silly, big rounding down errors.
-        state->w = config.menu_width < 101 ? ( mon->w / 100.0f ) * ( float ) config.menu_width : config.menu_width;
-    }
-
-    if ( state->columns > 0 ) {
-        state->element_width = state->w - ( 2 * ( state->border ) );
-        // Divide by the # columns
-        state->element_width = ( state->element_width - ( state->columns - 1 ) * config.line_margin ) / state->columns;
-    }
-}
-
-/**
- * Nav helper functions, to avoid duplicate code.
- */
-/**
- * @param state The current RofiViewState
- *
- * Move the selection one page down.
- * - No wrap around.
- * - Clip at top/bottom
- */
-inline static void menu_nav_page_next ( RofiViewState *state )
-{
-    // If no lines, do nothing.
-    if ( state->filtered_lines == 0 ) {
-        return;
-    }
-    state->selected += ( state->max_elements );
-    if ( state->selected >= state->filtered_lines ) {
-        state->selected = state->filtered_lines - 1;
-    }
-    state->update = TRUE;
-}
-/**
- * @param state The current RofiViewState
- *
- * Move the selection one page up.
- * - No wrap around.
- * - Clip at top/bottom
- */
-inline static void menu_nav_page_prev ( RofiViewState * state )
-{
-    if ( state->selected < state->max_elements ) {
-        state->selected = 0;
-    }
-    else{
-        state->selected -= ( state->max_elements );
-    }
-    state->update = TRUE;
-}
-/**
- * @param state The current RofiViewState
- *
- * Move the selection one column to the right.
- * - No wrap around.
- * - Do not move to top row when at start.
- */
-inline static void menu_nav_right ( RofiViewState *state )
-{
-    // If no lines, do nothing.
-    if ( state->filtered_lines == 0 ) {
-        return;
-    }
-    if ( ( state->selected + state->max_rows ) < state->filtered_lines ) {
-        state->selected += state->max_rows;
-        state->update    = TRUE;
-    }
-    else if ( state->selected < ( state->filtered_lines - 1 ) ) {
-        // We do not want to move to last item, UNLESS the last column is only
-        // partially filled, then we still want to move column and select last entry.
-        // First check the column we are currently in.
-        int col = state->selected / state->max_rows;
-        // Check total number of columns.
-        int ncol = state->filtered_lines / state->max_rows;
-        // If there is an extra column, move.
-        if ( col != ncol ) {
-            state->selected = state->filtered_lines - 1;
-            state->update   = TRUE;
-        }
-    }
-}
-/**
- * @param state The current RofiViewState
- *
- * Move the selection one column to the left.
- * - No wrap around.
- */
-inline static void menu_nav_left ( RofiViewState *state )
-{
-    if ( state->selected >= state->max_rows ) {
-        state->selected -= state->max_rows;
-        state->update    = TRUE;
-    }
-}
-/**
- * @param state The current RofiViewState
- *
- * Move the selection one row up.
- * - Wrap around.
- */
-inline static void menu_nav_up ( RofiViewState *state )
-{
-    // Wrap around.
-    if ( state->selected == 0 ) {
-        state->selected = state->filtered_lines;
-    }
-
-    if ( state->selected > 0 ) {
-        state->selected--;
-    }
-    state->update = TRUE;
-}
-/**
- * @param state The current RofiViewState
- *
- * Move the selection one row down.
- * - Wrap around.
- */
-inline static void menu_nav_down ( RofiViewState *state )
-{
-    // If no lines, do nothing.
-    if ( state->filtered_lines == 0 ) {
-        return;
-    }
-    state->selected = state->selected < state->filtered_lines - 1 ? MIN ( state->filtered_lines - 1, state->selected + 1 ) : 0;
-    state->update   = TRUE;
-}
-/**
- * @param state The current RofiViewState
- *
- * Move the selection to first row.
- */
-inline static void menu_nav_first ( RofiViewState * state )
-{
-    state->selected = 0;
-    state->update   = TRUE;
-}
-/**
- * @param state The current RofiViewState
- *
- * Move the selection to last row.
- */
-inline static void menu_nav_last ( RofiViewState * state )
-{
-    // If no lines, do nothing.
-    if ( state->filtered_lines == 0 ) {
-        return;
-    }
-    state->selected = state->filtered_lines - 1;
-    state->update   = TRUE;
-}
 /**
  * @param key the Key to match
  * @param modstate the modifier state to match
@@ -479,7 +118,7 @@ inline static void menu_nav_last ( RofiViewState * state )
  * specified by key and modstate. Returns -1 if none was found
  */
 extern unsigned int NumlockMask;
-static int locate_switcher ( KeySym key, unsigned int modstate )
+int locate_switcher ( KeySym key, unsigned int modstate )
 {
     // ignore annoying modifiers
     unsigned int modstate_filtered = modstate & ~( LockMask | NumlockMask );
@@ -492,1116 +131,6 @@ static int locate_switcher ( KeySym key, unsigned int modstate )
 }
 
 /**
- * Stores a screenshot of Rofi at that point in time.
- */
-static void menu_capture_screenshot ( void )
-{
-    const char *outp = g_getenv ( "ROFI_PNG_OUTPUT" );
-    if ( surface == NULL ) {
-        // Nothing to store.
-        fprintf ( stderr, "There is no rofi surface to store\n" );
-        return;
-    }
-    const char *xdg_pict_dir = g_get_user_special_dir ( G_USER_DIRECTORY_PICTURES );
-    if ( outp == NULL && xdg_pict_dir == NULL ) {
-        fprintf ( stderr, "XDG user picture directory or ROFI_PNG_OUTPUT is not set. Cannot store screenshot.\n" );
-        return;
-    }
-    // Get current time.
-    GDateTime *now = g_date_time_new_now_local ();
-    // Format filename.
-    char      *timestmp = g_date_time_format ( now, "rofi-%Y-%m-%d-%H%M" );
-    char      *filename = g_strdup_printf ( "%s.png", timestmp );
-    // Build full path
-    char      *fpath = NULL;
-    if ( outp == NULL ) {
-        int index = 0;
-        fpath = g_build_filename ( xdg_pict_dir, filename, NULL );
-        while ( g_file_test ( fpath, G_FILE_TEST_EXISTS ) && index < 99 ) {
-            g_free ( fpath );
-            g_free ( filename );
-            // Try the next index.
-            index++;
-            // Format filename.
-            filename = g_strdup_printf ( "%s-%d.png", timestmp, index );
-            // Build full path
-            fpath = g_build_filename ( xdg_pict_dir, filename, NULL );
-        }
-    }
-    else {
-        fpath = g_strdup ( outp );
-    }
-    fprintf ( stderr, color_green "Storing screenshot %s\n"color_reset, fpath );
-    cairo_status_t status = cairo_surface_write_to_png ( surface, fpath );
-    if ( status != CAIRO_STATUS_SUCCESS ) {
-        fprintf ( stderr, "Failed to produce screenshot '%s', got error: '%s'\n", filename,
-                  cairo_status_to_string ( status ) );
-    }
-    g_free ( fpath );
-    g_free ( filename );
-    g_free ( timestmp );
-    g_date_time_unref ( now );
-}
-
-/**
- * @param state Internal state of the menu.
- * @param key the Key being pressed.
- * @param modstate the modifier state.
- *
- * Keyboard navigation through the elements.
- */
-static int menu_keyboard_navigation ( RofiViewState *state, KeySym key, unsigned int modstate )
-{
-    // pressing one of the global key bindings closes the switcher. This allows fast closing of the
-    // menu if an item is not selected
-    if ( locate_switcher ( key, modstate ) != -1 || abe_test_action ( CANCEL, modstate, key ) ) {
-        state->retv = MENU_CANCEL;
-        state->quit = TRUE;
-        return 1;
-    }
-    // Up, Ctrl-p or Shift-Tab
-    else if ( abe_test_action ( ROW_UP, modstate, key ) ) {
-        menu_nav_up ( state );
-        return 1;
-    }
-    else if ( abe_test_action ( ROW_TAB, modstate, key ) ) {
-        if ( state->filtered_lines == 1 ) {
-            state->retv              = MENU_OK;
-            ( state->selected_line ) = state->line_map[state->selected];
-            state->quit              = 1;
-            return 1;
-        }
-
-        // Double tab!
-        if ( state->filtered_lines == 0 && key == state->prev_key ) {
-            state->retv              = MENU_NEXT;
-            ( state->selected_line ) = 0;
-            state->quit              = TRUE;
-        }
-        else{
-            menu_nav_down ( state );
-        }
-        return 1;
-    }
-    // Down, Ctrl-n
-    else if ( abe_test_action ( ROW_DOWN, modstate, key ) ) {
-        menu_nav_down ( state );
-        return 1;
-    }
-    else if ( abe_test_action ( ROW_LEFT, modstate, key ) ) {
-        menu_nav_left ( state );
-        return 1;
-    }
-    else if ( abe_test_action ( ROW_RIGHT, modstate, key ) ) {
-        menu_nav_right ( state );
-        return 1;
-    }
-    else if ( abe_test_action ( PAGE_PREV, modstate, key ) ) {
-        menu_nav_page_prev ( state );
-        return 1;
-    }
-    else if ( abe_test_action ( PAGE_NEXT, modstate, key ) ) {
-        menu_nav_page_next ( state );
-        return 1;
-    }
-    else if  ( abe_test_action ( ROW_FIRST, modstate, key ) ) {
-        menu_nav_first ( state );
-        return 1;
-    }
-    else if ( abe_test_action ( ROW_LAST, modstate, key ) ) {
-        menu_nav_last ( state );
-        return 1;
-    }
-    else if ( abe_test_action ( ROW_SELECT, modstate, key ) ) {
-        // If a valid item is selected, return that..
-        if ( state->selected < state->filtered_lines ) {
-            char *str = mode_get_completion ( state->sw, state->line_map[state->selected] );
-            textbox_text ( state->text, str );
-            g_free ( str );
-            textbox_cursor_end ( state->text );
-            state->update   = TRUE;
-            state->refilter = TRUE;
-        }
-        return 1;
-    }
-    state->prev_key = key;
-    return 0;
-}
-
-static void menu_mouse_navigation ( RofiViewState *state, XButtonEvent *xbe )
-{
-    // Scroll event
-    if ( xbe->button > 3 ) {
-        if ( xbe->button == 4 ) {
-            menu_nav_up ( state );
-        }
-        else if ( xbe->button == 5 ) {
-            menu_nav_down ( state );
-        }
-        else if ( xbe->button == 6 ) {
-            menu_nav_left ( state );
-        }
-        else if ( xbe->button == 7 ) {
-            menu_nav_right ( state );
-        }
-        return;
-    }
-    else {
-        if ( state->scrollbar && widget_intersect ( &( state->scrollbar->widget ), xbe->x, xbe->y ) ) {
-            state->selected = scrollbar_clicked ( state->scrollbar, xbe->y );
-            state->update   = TRUE;
-            return;
-        }
-        for ( unsigned int i = 0; config.sidebar_mode == TRUE && i < num_modi; i++ ) {
-            if ( widget_intersect ( &( state->modi[i]->widget ), xbe->x, xbe->y ) ) {
-                ( state->selected_line ) = 0;
-                state->retv              = MENU_QUICK_SWITCH | ( i & MENU_LOWER_MASK );
-                state->quit              = TRUE;
-                state->skip_absorb       = TRUE;
-                return;
-            }
-        }
-        for ( unsigned int i = 0; i < state->max_elements; i++ ) {
-            if ( widget_intersect ( &( state->boxes[i]->widget ), xbe->x, xbe->y ) ) {
-                // Only allow items that are visible to be selected.
-                if ( ( state->last_offset + i ) >= state->filtered_lines ) {
-                    break;
-                }
-                //
-                state->selected = state->last_offset + i;
-                state->update   = TRUE;
-                if ( ( xbe->time - state->last_button_press ) < 200 ) {
-                    state->retv              = MENU_OK;
-                    ( state->selected_line ) = state->line_map[state->selected];
-                    // Quit
-                    state->quit        = TRUE;
-                    state->skip_absorb = TRUE;
-                }
-                state->last_button_press = xbe->time;
-                break;
-            }
-        }
-    }
-}
-
-typedef struct _thread_state
-{
-    RofiViewState *state;
-    char          **tokens;
-    unsigned int  start;
-    unsigned int  stop;
-    unsigned int  count;
-    GCond         *cond;
-    GMutex        *mutex;
-    unsigned int  *acount;
-    void ( *callback )( struct _thread_state *t, gpointer data );
-}thread_state;
-
-static void filter_elements ( thread_state *t, G_GNUC_UNUSED gpointer user_data )
-{
-    // input changed
-    for ( unsigned int i = t->start; i < t->stop; i++ ) {
-        int match = mode_token_match ( t->state->sw, t->tokens,
-                                       t->state->lines_not_ascii[i],
-                                       config.case_sensitive,
-                                       i );
-        // If each token was matched, add it to list.
-        if ( match ) {
-            t->state->line_map[t->start + t->count] = i;
-            if ( config.levenshtein_sort ) {
-                // This is inefficient, need to fix it.
-                char * str = mode_get_completion ( t->state->sw, i );
-                t->state->distance[i] = levenshtein ( t->state->text->text, str );
-                g_free ( str );
-            }
-            t->count++;
-        }
-    }
-    g_mutex_lock ( t->mutex );
-    ( *( t->acount ) )--;
-    g_cond_signal ( t->cond );
-    g_mutex_unlock ( t->mutex );
-}
-static void check_is_ascii ( thread_state *t, G_GNUC_UNUSED gpointer user_data )
-{
-    for ( unsigned int i = t->start; i < t->stop; i++ ) {
-        t->state->lines_not_ascii[i] = mode_is_not_ascii ( t->state->sw, i );
-    }
-    g_mutex_lock ( t->mutex );
-    ( *( t->acount ) )--;
-    g_cond_signal ( t->cond );
-    g_mutex_unlock ( t->mutex );
-}
-/**
- * Small wrapper function to create easy workers.
- */
-static void call_thread ( gpointer data, gpointer user_data )
-{
-    thread_state *t = (thread_state *) data;
-    t->callback ( t, user_data );
-}
-
-static void menu_refilter ( RofiViewState *state )
-{
-    TICK_N ( "Filter start" );
-    if ( strlen ( state->text->text ) > 0 ) {
-        unsigned int j        = 0;
-        char         **tokens = tokenize ( state->text->text, config.case_sensitive );
-        /**
-         * On long lists it can be beneficial to parallelize.
-         * If number of threads is 1, no thread is spawn.
-         * If number of threads > 1 and there are enough (> 1000) items, spawn jobs for the thread pool.
-         * For large lists with 8 threads I see a factor three speedup of the whole function.
-         */
-        unsigned int nt = MAX ( 1, state->num_lines / 500 );
-        thread_state states[nt];
-        GCond        cond;
-        GMutex       mutex;
-        g_mutex_init ( &mutex );
-        g_cond_init ( &cond );
-        unsigned int count = nt;
-        unsigned int steps = ( state->num_lines + nt ) / nt;
-        for ( unsigned int i = 0; i < nt; i++ ) {
-            states[i].state    = state;
-            states[i].tokens   = tokens;
-            states[i].start    = i * steps;
-            states[i].stop     = MIN ( state->num_lines, ( i + 1 ) * steps );
-            states[i].count    = 0;
-            states[i].cond     = &cond;
-            states[i].mutex    = &mutex;
-            states[i].acount   = &count;
-            states[i].callback = filter_elements;
-            if ( i > 0 ) {
-                g_thread_pool_push ( tpool, &states[i], NULL );
-            }
-        }
-        // Run one in this thread.
-        filter_elements ( &states[0], NULL );
-        // No need to do this with only one thread.
-        if ( nt > 1 ) {
-            g_mutex_lock ( &mutex );
-            while ( count > 0 ) {
-                g_cond_wait ( &cond, &mutex );
-            }
-            g_mutex_unlock ( &mutex );
-        }
-        g_cond_clear ( &cond );
-        g_mutex_clear ( &mutex );
-        for ( unsigned int i = 0; i < nt; i++ ) {
-            if ( j != states[i].start ) {
-                memmove ( &( state->line_map[j] ), &( state->line_map[states[i].start] ), sizeof ( unsigned int ) * ( states[i].count ) );
-            }
-            j += states[i].count;
-        }
-        if ( config.levenshtein_sort ) {
-            g_qsort_with_data ( state->line_map, j, sizeof ( int ), lev_sort, state->distance );
-        }
-
-        // Cleanup + bookkeeping.
-        state->filtered_lines = j;
-        tokenize_free ( tokens );
-    }
-    else{
-        for ( unsigned int i = 0; i < state->num_lines; i++ ) {
-            state->line_map[i] = i;
-        }
-        state->filtered_lines = state->num_lines;
-    }
-    if ( state->filtered_lines > 0 ) {
-        state->selected = MIN ( state->selected, state->filtered_lines - 1 );
-    }
-    else {
-