PolytreeDE
/
rofi
mirror of https://github.com/davatorium/rofi.git
1
0
Fork 0
Code Releases Activity

mode/keys: Display all bindings 

Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
This commit is contained in:
Quentin Glidic 2017-05-30 13:22:52 +02:00
parent 6d27a89b99
commit a24af6e64c
No known key found for this signature in database
GPG Key ID: AC203F96E2C34BB7
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/xrmoptions.c
View File

@ -637,27 +637,27 @@ static char * config_parser_return_display_help_entry ( XrmOption *option, size_
{
case xrm_Number:
return g_markup_printf_escaped ( "<b%-*s</b> (%u) <span style='italic' size='small'>%s</span>",
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 ( "<b%-*s</b> (%d) <span style='italic' size='small'>%s</span>",
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 ( "<b>%-*s</b> (%s) <span style='italic' size='small'>%s</span>",
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 ( "<b>%-*s</b> (%s) <span style='italic' size='small'>%s</span>",
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 ( "<b>%-*s</b> (%c) <span style='italic' size='small'>%s</span>",
ll, option->name + 3, *( option->value.charc ), option->comment );
ll, option->name, *( option->value.charc ), option->comment );
}
else {
return g_markup_printf_escaped ( "<b%-*s</b> (\\x%02X) <span style='italic' size='small'>%s</span>",
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* ) );

2
test/mode-test.c
View File

@ -113,7 +113,7 @@ END_TEST
START_TEST(test_mode_num_items)
{
unsigned int rows = mode_get_num_entries ( &help_keys_mode);
ck_assert_int_eq ( rows, 64);
ck_assert_int_eq ( rows, 71);
for ( unsigned int i =0; i < rows; i++ ){
int state = 0;
GList *list = NULL;