Merge remote-tracking branch 'upstream/master' into fast-ascii-filtering

Conflicts:
	source/dialogs/dmenu.c
	source/helper.c
	source/rofi.c

1 files changed, 43 insertions, 4 deletions

diff --git a/source/helper.c b/source/helper.c
index 69c8f975..542e0141 100644
--- a/source/helper.c
+++ b/source/helper.c
@@ -181,8 +181,21 @@ char **tokenize ( const char *input, int case_sensitive )
 
     char *saveptr = NULL, *token;
     char **retv   = NULL;
+    if ( !config.tokenize ) {
+        retv = g_malloc0 ( sizeof ( char* ) * 2 );
+        if ( config.glob ) {
+            token                   = g_strconcat ( input, "*", NULL );
+            retv[0]                 = token_collate_key ( token, case_sensitive );
+            g_free ( token ); token = NULL;
+        }
+        else{
+            retv[0] = token_collate_key ( input, case_sensitive );
+        }
+        return retv;
+    }
+
     // First entry is always full (modified) stringtext.
-    int  num_tokens = 0;
+    int num_tokens = 0;
 
     // Copy the string, 'strtok_r' modifies it.
     char *str = g_strdup ( input );
@@ -190,8 +203,15 @@ char **tokenize ( const char *input, int case_sensitive )
     // Iterate over tokens.
     // strtok should still be valid for utf8.
     for ( token = strtok_r ( str, " ", &saveptr ); token != NULL; token = strtok_r ( NULL, " ", &saveptr ) ) {
-        retv                 = g_realloc ( retv, sizeof ( char* ) * ( num_tokens + 2 ) );
-        retv[num_tokens]     = token_collate_key ( token, case_sensitive );
+        retv = g_realloc ( retv, sizeof ( char* ) * ( num_tokens + 2 ) );
+        if ( config.glob ) {
+            char *t = token_collate_key ( token, case_sensitive );
+            retv[num_tokens] = g_strconcat ( t, "*", NULL );
+            g_free ( t );
+        }
+        else {
+            retv[num_tokens] = token_collate_key ( token, case_sensitive );
+        }
         retv[num_tokens + 1] = NULL;
         num_tokens++;
     }
@@ -402,11 +422,30 @@ static int normal_token_match ( char **tokens, const char *input, int not_ascii,
 
     return match;
 }
+
+static int glob_token_match ( char **tokens, const char *input, int not_ascii, int case_sensitive )
+{
+    int  match  = 1;
+    char *compk = not_ascii ? token_collate_key ( input, case_sensitive ) : (char *) input;
+
+    // Do a tokenized match.
+    if ( tokens ) {
+        for ( int j = 0; match && tokens[j]; j++ ) {
+            match = g_pattern_match_simple (  tokens[j], compk );
+        }
+    }
+    if (not_ascii) g_free ( compk );
+    return match;
+}
+
 int token_match ( char **tokens, const char *input, int not_ascii, int case_sensitive,
                   __attribute__( ( unused ) ) unsigned int index,
                   __attribute__( ( unused ) ) Switcher *data )
 {
-    if ( config.fuzzy ) {
+    if ( config.glob ) {
+        return glob_token_match ( tokens, input, not_ascii, case_sensitive );
+    }
+    else if ( config.fuzzy ) {
         return fuzzy_token_match ( tokens, input, not_ascii, case_sensitive );
     }
     return normal_token_match ( tokens, input, not_ascii, case_sensitive );