PolytreeDE/rofi
1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2024-11-11 13:50:48 -05:00
Code Releases Activity

Small cleanup

Browse source
This commit is contained in:
QC 2015-05-09 14:17:27 +02:00
parent 89d2190f8e
commit 4d3b9e414d
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
source/dialogs/dmenu.c
View file

@ -171,6 +171,9 @@ int dmenu_switcher_dialog ( char **input )
token_match, NULL, &selected_line, config.levenshtein_sort, get_display_data, list, &next_pos ); token_match, NULL, &selected_line, config.levenshtein_sort, get_display_data, list, &next_pos );
// Special behavior. // Special behavior.
if ( only_selected ) { if ( only_selected ) {
/**
* Select item mode.
*/
restart = TRUE; restart = TRUE;
if ( ( mretv & ( MENU_OK | MENU_QUICK_SWITCH ) ) && list[selected_line] != NULL ) { if ( ( mretv & ( MENU_OK | MENU_QUICK_SWITCH ) ) && list[selected_line] != NULL ) {
if ( number_mode ) { if ( number_mode ) {
@ -192,7 +195,7 @@ int dmenu_switcher_dialog ( char **input )
} }
// We normally do not want to restart the loop. // We normally do not want to restart the loop.
restart = FALSE; restart = FALSE;
if ( ( mretv & MENU_OK ) && list[selected_line] != NULL ) { if ( ( mretv & ( MENU_OK | MENU_CUSTOM_INPUT ) ) && list[selected_line] != NULL ) {
if ( number_mode ) { if ( number_mode ) {
fprintf ( stdout, "%d", selected_line ); fprintf ( stdout, "%d", selected_line );
} }
@ -207,19 +210,9 @@ int dmenu_switcher_dialog ( char **input )
selected_line = MIN ( next_pos, length - 1 ); selected_line = MIN ( next_pos, length - 1 );
} }
retv = TRUE; retv = TRUE;
if ( ( mretv & MENU_QUICK_SWITCH ) ) {
retv = 10 + ( mretv & MENU_LOWER_MASK );
} }
else if ( ( mretv & MENU_CUSTOM_INPUT ) && *input != NULL && *input[0] != '\0' ) {
if ( !number_mode ) {
fputs ( *input, stdout );
fputc ( '\n', stdout );
fflush ( stdout );
}
if ( ( mretv & MENU_SHIFT ) ) {
restart = TRUE;
// Move to next line.
selected_line = MIN ( next_pos, length - 1 );
}
retv = TRUE;
} }
else if ( ( mretv & MENU_QUICK_SWITCH ) ) { else if ( ( mretv & MENU_QUICK_SWITCH ) ) {
if ( number_mode ) { if ( number_mode ) {