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

Allow escape to quit in no-custom mode

This commit is contained in:
Dave Davenport 2015-07-23 18:19:20 +02:00
parent 4d0e04614a
commit fa5c36835d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/dialogs/dmenu.c
View File

@ -243,11 +243,12 @@ int dmenu_switcher_dialog ( char **input )
int mretv = menu ( list, length, input, dmenu_prompt,
token_match, NULL, &selected_line, config.levenshtein_sort, get_display_data, list, &next_pos, message );
// Special behavior.
// TODO clean this up!
if ( only_selected ) {
/**
* Select item mode.
*/
restart = ( find_arg ( "-only-match" ) >= 0 );
restart = 1;
if ( ( mretv & ( MENU_OK | MENU_QUICK_SWITCH ) ) && list[selected_line] != NULL ) {
dmenu_output_formatted_line ( format, list[selected_line], selected_line, *input );
retv = TRUE;
@ -255,6 +256,9 @@ int dmenu_switcher_dialog ( char **input )
retv = 10 + ( mretv & MENU_LOWER_MASK );
}
return retv;
} else if ( (mretv&MENU_CANCEL)== MENU_CANCEL) {
// In no custom mode we allow canceling.
restart = ( find_arg ( "-only-match" ) >= 0 );
}
selected_line = next_pos - 1;
continue;