PolytreeDE/rofi
1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2025-07-31 21:59:25 -04:00
Code Releases Activity

small cleanup

Browse source
This commit is contained in:
Qball Cow 2014-01-22 09:24:31 +01:00
parent 424cb90a18
commit 6bb615f1d1
4 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/simpleswitcher.h
View file

@ -12,11 +12,12 @@ typedef enum {
WINDOW_SWITCHER, WINDOW_SWITCHER,
RUN_DIALOG, RUN_DIALOG,
SSH_DIALOG, SSH_DIALOG,
MODE_EXIT NUM_DIALOGS,
MODE_EXIT,
NEXT_DIALOG
} SwitcherMode; } SwitcherMode;
typedef int ( *menu_match_cb )( char **tokens, const char *input, int index, void *data ); typedef int ( *menu_match_cb )( char **tokens, const char *input, int index, void *data );
int menu( char **lines, char **input, char *prompt, int menu( char **lines, char **input, char *prompt,
int selected, Time *time, int *shift, menu_match_cb mmc, void *mmc_data ); int selected, Time *time, int *shift, menu_match_cb mmc, void *mmc_data );

2
source/run-dialog.c
View file

@ -256,7 +256,7 @@ SwitcherMode run_switcher_dialog ( char **input )
int n = menu( cmd_list, input, "$ ", 0, NULL, &shift,token_match, NULL ); int n = menu( cmd_list, input, "$ ", 0, NULL, &shift,token_match, NULL );
if ( n == -2 ) { if ( n == -2 ) {
retv = SSH_DIALOG; retv = NEXT_DIALOG;
} else if ( n >=0 && cmd_list[n] != NULL ) { } else if ( n >=0 && cmd_list[n] != NULL ) {
exec_cmd( cmd_list[n], shift ); exec_cmd( cmd_list[n], shift );
} else if ( n == -3 && *input != NULL && *input[0] != '\0' ) { } else if ( n == -3 && *input != NULL && *input[0] != '\0' ) {

14
source/simpleswitcher.c
View file

@ -1097,7 +1097,7 @@ SwitcherMode run_switcher_window ( char **input )
int n = menu( list, input, "> ", 0, &time, NULL,window_match, ids ); int n = menu( list, input, "> ", 0, &time, NULL,window_match, ids );
if ( n == -2 ) { if ( n == -2 ) {
retv = RUN_DIALOG; retv = NEXT_DIALOG;
} else if ( n >= 0 && list[n] ) { } else if ( n >= 0 && list[n] ) {
#ifdef I3 #ifdef I3
@ -1142,12 +1142,18 @@ void run_switcher( int fmode, SwitcherMode mode )
char *input = NULL; char *input = NULL;
do { do {
SwitcherMode retv = MODE_EXIT;
if ( mode == WINDOW_SWITCHER ) { if ( mode == WINDOW_SWITCHER ) {
mode = run_switcher_window( &input ); retv = run_switcher_window( &input );
} else if ( mode == RUN_DIALOG ) { } else if ( mode == RUN_DIALOG ) {
mode = run_switcher_dialog( &input ); retv = run_switcher_dialog( &input );
} else if ( mode == SSH_DIALOG ) { } else if ( mode == SSH_DIALOG ) {
mode = ssh_switcher_dialog( &input ); retv = ssh_switcher_dialog( &input );
}
if(retv == NEXT_DIALOG) {
mode = (mode+1)%NUM_DIALOGS;
} else {
mode = retv;
} }
} while ( mode != MODE_EXIT ); } while ( mode != MODE_EXIT );

2
source/ssh-dialog.c
View file

@ -252,7 +252,7 @@ SwitcherMode ssh_switcher_dialog ( char **input )
int n = menu( cmd_list, input, "ssh ", 0, NULL, &shift,token_match, NULL ); int n = menu( cmd_list, input, "ssh ", 0, NULL, &shift,token_match, NULL );
if ( n == -2 ) { if ( n == -2 ) {
retv = WINDOW_SWITCHER; retv = NEXT_DIALOG;
} else if ( n >=0 && cmd_list[n] != NULL ) { } else if ( n >=0 && cmd_list[n] != NULL ) {
exec_ssh( cmd_list[n] ); exec_ssh( cmd_list[n] );
} else if ( n == -3 && *input != NULL && *input[0] != '\0' ) { } else if ( n == -3 && *input != NULL && *input[0] != '\0' ) {