From a24af6e64caea6d5566d5bb2118ee483a8bc26d1 Mon Sep 17 00:00:00 2001 From: Quentin Glidic Date: Tue, 30 May 2017 13:22:52 +0200 Subject: mode/keys: Display all bindings Signed-off-by: Quentin Glidic --- source/xrmoptions.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'source') diff --git a/source/xrmoptions.c b/source/xrmoptions.c index a0ac4fba..ef0c7dfe 100644 --- a/source/xrmoptions.c +++ b/source/xrmoptions.c @@ -637,27 +637,27 @@ static char * config_parser_return_display_help_entry ( XrmOption *option, size_ { case xrm_Number: return g_markup_printf_escaped ( " (%u) %s", - ll, option->name + 3, *( option->value.num ), option->comment ); + ll, option->name, *( option->value.num ), option->comment ); case xrm_SNumber: return g_markup_printf_escaped ( " (%d) %s", - ll, option->name + 3, *( option->value.snum ), option->comment ); + ll, option->name, *( option->value.snum ), option->comment ); case xrm_String: return g_markup_printf_escaped ( "%-*s (%s) %s", - ll, option->name + 3, + ll, option->name, ( *( option->value.str ) != NULL ) ? *( option->value.str ) : "null", option->comment ); case xrm_Boolean: return g_markup_printf_escaped ( "%-*s (%s) %s", - ll, option->name + 3, ( *( option->value.num ) == TRUE ) ? "true" : "false", option->comment ); + ll, option->name, ( *( option->value.num ) == TRUE ) ? "true" : "false", option->comment ); case xrm_Char: if ( *( option->value.charc ) > 32 && *( option->value.charc ) < 127 ) { return g_markup_printf_escaped ( "%-*s (%c) %s", - ll, option->name + 3, *( option->value.charc ), option->comment ); + ll, option->name, *( option->value.charc ), option->comment ); } else { return g_markup_printf_escaped ( " (\\x%02X) %s", - ll, option->name + 3, *( option->value.charc ), option->comment ); + ll, option->name, *( option->value.charc ), option->comment ); } default: break; @@ -691,7 +691,7 @@ char ** config_parser_return_display_help ( unsigned int *length ) continue; } } - if ( strncmp ( xrmOptions[i].name, "kb", 2 ) != 0 ) { + if ( strncmp ( xrmOptions[i].name, "kb", 2 ) != 0 && strncmp ( xrmOptions[i].name, "ml", 2 ) != 0 && strncmp ( xrmOptions[i].name, "me", 2 ) != 0 ) { continue; } @@ -701,7 +701,7 @@ char ** config_parser_return_display_help ( unsigned int *length ) ( *length )++; } for ( unsigned int i = 0; i < num_extra_options; i++ ) { - if ( strncmp ( extra_options[i].name, "kb", 2 ) != 0 ) { + if ( strncmp ( extra_options[i].name, "kb", 2 ) != 0 && strncmp ( extra_options[i].name, "ml", 2 ) != 0 && strncmp ( extra_options[i].name, "me", 2 ) != 0 ) { continue; } retv = g_realloc ( retv, ( ( *length ) + 2 ) * sizeof ( char* ) ); -- cgit v1.2.3