diff options
| author | Quentin Glidic <sardemff7+git@sardemff7.net> | 2016-03-17 13:14:30 +0100 |
|---|---|---|
| committer | Quentin Glidic <sardemff7+git@sardemff7.net> | 2016-03-20 10:39:34 +0100 |
| commit | 20c9abf0a2ef3072453b92db71ad259fd008e27a (patch) | |
| tree | faa9a30fce30b4adaa0a9b4aa25f7c6d9dfb465e /source/dialogs | |
| parent | c7bc850bb8936944311e4a391ae2ade100e8948d (diff) | |
keybindings: Merge accept-custom and accept-entry-continue
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Diffstat (limited to 'source/dialogs')
| -rw-r--r-- | source/dialogs/dmenu.c | 4 | ||||
| -rw-r--r-- | source/dialogs/drun.c | 4 | ||||
| -rw-r--r-- | source/dialogs/run.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source/dialogs/dmenu.c b/source/dialogs/dmenu.c index 4f87bcc2..b36a581d 100644 --- a/source/dialogs/dmenu.c +++ b/source/dialogs/dmenu.c @@ -421,7 +421,7 @@ static void dmenu_finalize ( RofiViewState *state ) // Normal mode if ( ( mretv & MENU_OK ) && pd->selected_line != UINT32_MAX && cmd_list[pd->selected_line] != NULL ) { dmenu_output_formatted_line ( pd->format, cmd_list[pd->selected_line], pd->selected_line, input ); - if ( ( mretv & MENU_SHIFT ) ) { + if ( ( mretv & MENU_CUSTOM_ACTION ) ) { restart = TRUE; int seen = FALSE; if ( pd->selected_list != NULL ) { @@ -446,7 +446,7 @@ static void dmenu_finalize ( RofiViewState *state ) // Custom input else if ( ( mretv & ( MENU_CUSTOM_INPUT ) ) ) { dmenu_output_formatted_line ( pd->format, input, -1, input ); - if ( ( mretv & MENU_SHIFT ) ) { + if ( ( mretv & MENU_CUSTOM_ACTION ) ) { restart = TRUE; // Move to next line. pd->selected_line = MIN ( next_pos, cmd_list_length - 1 ); diff --git a/source/dialogs/drun.c b/source/dialogs/drun.c index 9a19c0b6..e5757bd9 100644 --- a/source/dialogs/drun.c +++ b/source/dialogs/drun.c @@ -302,7 +302,7 @@ static ModeMode drun_mode_result ( Mode *sw, int mretv, char **input, unsigned i DRunModePrivateData *rmpd = (DRunModePrivateData *) mode_get_private_data ( sw ); ModeMode retv = MODE_EXIT; - int shift = ( ( mretv & MENU_SHIFT ) == MENU_SHIFT ); + gboolean run_in_term = ( ( mretv & MENU_CUSTOM_ACTION ) == MENU_CUSTOM_ACTION ); if ( mretv & MENU_NEXT ) { retv = NEXT_DIALOG; @@ -317,7 +317,7 @@ static ModeMode drun_mode_result ( Mode *sw, int mretv, char **input, unsigned i exec_cmd_entry ( &( rmpd->entry_list[selected_line] ) ); } else if ( ( mretv & MENU_CUSTOM_INPUT ) && *input != NULL && *input[0] != '\0' ) { - exec_cmd ( *input, shift ); + exec_cmd ( *input, run_in_term ); } else if ( ( mretv & MENU_ENTRY_DELETE ) && selected_line < rmpd->cmd_list_length ) { if ( selected_line < rmpd->history_length ) { diff --git a/source/dialogs/run.c b/source/dialogs/run.c index f8efb5e4..4b452b09 100644 --- a/source/dialogs/run.c +++ b/source/dialogs/run.c @@ -380,7 +380,7 @@ static ModeMode run_mode_result ( Mode *sw, int mretv, char **input, unsigned in RunModePrivateData *rmpd = (RunModePrivateData *) sw->private_data; ModeMode retv = MODE_EXIT; - int shift = ( ( mretv & MENU_SHIFT ) == MENU_SHIFT ); + gboolean run_in_term = ( ( mretv & MENU_CUSTOM_ACTION ) == MENU_CUSTOM_ACTION ); if ( mretv & MENU_NEXT ) { retv = NEXT_DIALOG; @@ -392,10 +392,10 @@ static ModeMode run_mode_result ( Mode *sw, int mretv, char **input, unsigned in retv = ( mretv & MENU_LOWER_MASK ); } else if ( ( mretv & MENU_OK ) && rmpd->cmd_list[selected_line] != NULL ) { - exec_cmd ( rmpd->cmd_list[selected_line], shift ); + exec_cmd ( rmpd->cmd_list[selected_line], run_in_term ); } else if ( ( mretv & MENU_CUSTOM_INPUT ) && *input != NULL && *input[0] != '\0' ) { - exec_cmd ( *input, shift ); + exec_cmd ( *input, run_in_term ); } else if ( ( mretv & MENU_ENTRY_DELETE ) && rmpd->cmd_list[selected_line] ) { delete_entry ( rmpd->cmd_list[selected_line] ); |