Merge remote-tracking branch 'origin/master' into highlight_match

3 files changed, 174 insertions, 10 deletions

diff --git a/source/dialogs/drun.c b/source/dialogs/drun.c
index fcab4f0e..f0ffd551 100644
--- a/source/dialogs/drun.c
+++ b/source/dialogs/drun.c
@@ -220,7 +220,7 @@ static void get_apps_dir ( DRunModePrivateData *pd, const char *bp )
     }
 }
 /**
- * @param cmd The command to remove from history
+ * @param entry The command entry to remove from history
  *
  * Remove command from history.
  */
diff --git a/source/dialogs/help-keys.c b/source/dialogs/help-keys.c
new file mode 100644
index 00000000..dc0955e6
--- /dev/null
+++ b/source/dialogs/help-keys.c
@@ -0,0 +1,134 @@
+/**
+ * rofi
+ *
+ * MIT/X11 License
+ * Copyright 2013-2016 Qball Cow <qball@gmpclient.org>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+#include <config.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <unistd.h>
+#include <limits.h>
+#include <signal.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include <strings.h>
+#include <string.h>
+#include <errno.h>
+
+#include "rofi.h"
+#include "settings.h"
+#include "helper.h"
+#include "xrmoptions.h"
+#include "dialogs/help-keys.h"
+#include "textbox.h"
+
+typedef struct
+{
+    char         **messages;
+    unsigned int messages_length;
+} KeysHelpModePrivateData;
+
+static void get_apps ( KeysHelpModePrivateData *pd )
+{
+    pd->messages = config_parser_return_display_help ( &( pd->messages_length ) );
+}
+
+static int help_keys_mode_init ( Mode *sw )
+{
+    if ( mode_get_private_data ( sw ) == NULL ) {
+        KeysHelpModePrivateData *pd = g_malloc0 ( sizeof ( *pd ) );
+        mode_set_private_data ( sw, (void *) pd );
+        get_apps ( pd );
+    }
+    return TRUE;
+}
+
+static ModeMode help_keys_mode_result ( G_GNUC_UNUSED Mode *sw,
+                                        int mretv,
+                                        G_GNUC_UNUSED char **input,
+                                        G_GNUC_UNUSED unsigned int selected_line )
+{
+    ModeMode retv = MODE_EXIT;
+
+    if ( mretv & MENU_NEXT ) {
+        retv = NEXT_DIALOG;
+    }
+    else if ( mretv & MENU_PREVIOUS ) {
+        retv = PREVIOUS_DIALOG;
+    }
+    else if ( mretv & MENU_QUICK_SWITCH ) {
+        retv = ( mretv & MENU_LOWER_MASK );
+    }
+    return retv;
+}
+static void help_keys_mode_destroy ( Mode *sw )
+{
+    KeysHelpModePrivateData *rmpd = (KeysHelpModePrivateData *) mode_get_private_data ( sw );
+    if ( rmpd != NULL ) {
+        g_strfreev ( rmpd->messages );
+        g_free ( rmpd );
+        mode_set_private_data ( sw, NULL );
+    }
+}
+
+static char *_get_display_value ( const Mode *sw, unsigned int selected_line, int *state, int get_entry )
+{
+    KeysHelpModePrivateData *pd = (KeysHelpModePrivateData *) mode_get_private_data ( sw );
+    *state |= MARKUP;
+    if ( !get_entry ) {
+        return NULL;
+    }
+    return g_strdup ( pd->messages[selected_line] );
+}
+static int help_keys_token_match ( const Mode *data,
+                                   GRegex **tokens,
+                                   unsigned int index
+                                   )
+{
+    KeysHelpModePrivateData *rmpd = (KeysHelpModePrivateData *) mode_get_private_data ( data );
+    return token_match ( tokens, rmpd->messages[index] );
+}
+
+static unsigned int help_keys_mode_get_num_entries ( const Mode *sw )
+{
+    const KeysHelpModePrivateData *pd = (const KeysHelpModePrivateData *) mode_get_private_data ( sw );
+    return pd->messages_length;
+}
+
+#include "mode-private.h"
+Mode help_keys_mode =
+{
+    .name               = "keys",
+    .cfg_name_key       = "display-keys",
+    ._init              = help_keys_mode_init,
+    ._get_num_entries   = help_keys_mode_get_num_entries,
+    ._result            = help_keys_mode_result,
+    ._destroy           = help_keys_mode_destroy,
+    ._token_match       = help_keys_token_match,
+    ._get_completion    = NULL,
+    ._get_display_value = _get_display_value,
+    .private_data       = NULL,
+    .free               = NULL
+};
diff --git a/source/dialogs/window.c b/source/dialogs/window.c
index 56ff8d01..d56e76f0 100644
--- a/source/dialogs/window.c
+++ b/source/dialogs/window.c
@@ -367,6 +367,22 @@ static unsigned int window_mode_get_num_entries ( const Mode *sw )
     const ModeModePrivateData *pd = (const ModeModePrivateData *) mode_get_private_data ( sw );
     return pd->cmd_list_length;
 }
+/**
+ * Small helper function to find the right entry in the ewmh reply.
+ * Is there a call for this?
+ */
+static const char * _window_name_list_entry  ( const char *str, uint32_t length, int entry )
+{
+    uint32_t offset = 0;
+    int      index  = 0;
+    while ( index < entry && offset < length ) {
+        if ( str[offset] == 0 ) {
+            index++;
+        }
+        offset++;
+    }
+    return &str[offset];
+}
 static void _window_mode_load_data ( Mode *sw, unsigned int cd )
 {
     ModeModePrivateData *pd = (ModeModePrivateData *) mode_get_private_data ( sw );
@@ -455,6 +471,12 @@ static void _window_mode_load_data ( Mode *sw, unsigned int cd )
         }
         pd->cmd_list = g_malloc0_n ( ( pd->ids->len + 1 ), sizeof ( char* ) );
 
+        c = xcb_ewmh_get_desktop_names ( &xcb->ewmh, xcb->screen_nbr );
+        xcb_ewmh_get_utf8_strings_reply_t names;
+        int                               has_names = FALSE;
+        if ( xcb_ewmh_get_desktop_names_reply ( &xcb->ewmh, c, &names, NULL ) ) {
+            has_names = TRUE;
+        }
         // build the actual list
         for ( i = 0; i < ( pd->ids->len ); i++ ) {
             xcb_window_t w = pd->ids->array[i];
@@ -462,11 +484,8 @@ static void _window_mode_load_data ( Mode *sw, unsigned int cd )
 
             if ( ( c = window_client ( w ) ) ) {
                 // final line format
-                char   desktop[5];
-                desktop[0] = 0;
-                size_t len =
-                    ( ( c->title != NULL ) ? strlen ( c->title ) : 0 ) + ( c->class ? strlen ( c->class ) : 0 ) + classfield + 50;
-                char   *line = g_malloc ( len );
+                char *desktop = NULL;
+                char *line    = NULL;
                 if ( !pd->config_i3_mode ) {
                     uint32_t                  wmdesktop = 0;
                     // find client's desktop.
@@ -492,18 +511,29 @@ static void _window_mode_load_data ( Mode *sw, unsigned int cd )
                     free ( r );
 
                     if ( wmdesktop < 0xFFFFFFFF ) {
-                        snprintf ( desktop, 5, "%u", (uint32_t) wmdesktop );
+                        if ( has_names ) {
+                            desktop = g_strdup_printf ( "%s", _window_name_list_entry ( names.strings, names.strings_len, wmdesktop ) );
+                        }
+                        else {
+                            desktop = g_strdup_printf ( "%u", (uint32_t) wmdesktop );
+                        }
+                    }
+                    else {
+                        desktop = g_strdup ( "" );
                     }
 
-                    snprintf ( line, len, pattern, desktop, c->class ? c->class : "", c->title ? c->title : "" );
+                    line = g_strdup_printf ( pattern, desktop, c->class ? c->class : "", c->title ? c->title : "" );
                 }
                 else{
-                    snprintf ( line, len, pattern, c->class ? c->class : "", c->title ? c->title : "" );
+                    line = g_strdup_printf ( pattern, c->class ? c->class : "", c->title ? c->title : "" );
                 }
-
+                g_free ( desktop );
                 pd->cmd_list[pd->cmd_list_length++] = line;
             }
         }
+        if ( has_names ) {
+            xcb_ewmh_get_utf8_strings_reply_wipe ( &names );
+        }
     }
 }
 static int window_mode_init ( Mode *sw )