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

Update previous commit with manpage fix window switcher.

This commit is contained in:
QC 2014-11-29 16:35:43 +01:00
parent 2e28802309
commit 6805d93f68
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/rofi-manpage.markdown
View File

@ -370,6 +370,7 @@ Rofi supports the following keybindings:
* `Page Down`: Go to the next page * `Page Down`: Go to the next page
* `Ctrl-Page Up`: Go to the previous column * `Ctrl-Page Up`: Go to the previous column
* `Ctrl-Page Down`: Go to the next column * `Ctrl-Page Down`: Go to the next column
* `Ctrl-Enter`: Use entered text as command (in ssh/run dialog)
* `?`: Switch to the next modi. The list can be customized with the `-switchers` argument. * `?`: Switch to the next modi. The list can be customized with the `-switchers` argument.
* `ctrl-/`: Switch to the previous modi. The list can be customized with the `-switchers` argument. * `ctrl-/`: Switch to the previous modi. The list can be customized with the `-switchers` argument.
* `Ctrl-space`: Set selected item as input text. * `Ctrl-space`: Set selected item as input text.

14
doc/rofi.1
View File

@ -478,6 +478,8 @@ Rofi supports the following keybindings:
.IP \(bu 2 .IP \(bu 2
\fB\fCCtrl\-Page Down\fR: Go to the next column \fB\fCCtrl\-Page Down\fR: Go to the next column
.IP \(bu 2 .IP \(bu 2
\fB\fCCtrl\-Enter\fR: Use entered text as command (in ssh/run dialog)
.IP \(bu 2
\fB\fC?\fR: Switch to the next modi. The list can be customized with the \fB\fC\-switchers\fR argument. \fB\fC?\fR: Switch to the next modi. The list can be customized with the \fB\fC\-switchers\fR argument.
.IP \(bu 2 .IP \(bu 2
\fB\fCctrl\-/\fR: Switch to the previous modi. The list can be customized with the \fB\fC\-switchers\fR argument. \fB\fCctrl\-/\fR: Switch to the previous modi. The list can be customized with the \fB\fC\-switchers\fR argument.
@ -496,14 +498,18 @@ Try using a mono\-space font.
.SH WEBSITE .SH WEBSITE
.PP .PP
\fBrofi\fP website can be found at here \fBrofi\fP website can be found at here
\[la]https://davedavenport.github.io/rofi/\[ra] .UR https://davedavenport.github.io/rofi/
.UE
.PP .PP
\fBrofi\fP bugtracker can be found here \fBrofi\fP bugtracker can be found here
\[la]https://github.com/DaveDavenport/rofi/issues\[ra] .UR https://github.com/DaveDavenport/rofi/issues
.UE
.SH AUTHOR .SH AUTHOR
.PP .PP
Qball Cow Qball Cow
\[la]qball@gmpclient.org\[ra] .MT qball@gmpclient.org
.ME
.PP .PP
Original code based on work by: Sean Pringle Original code based on work by: Sean Pringle
\[la]sean.pringle@gmail.com\[ra] .MT sean.pringle@gmail.com
.ME

18
source/rofi.c
View File

@ -1650,17 +1650,13 @@ MenuReturn menu ( char **lines, unsigned int num_lines, char **input, char *prom
} }
// If a valid item is selected, return that.. // If a valid item is selected, return that..
if ( rc != -2 if ( state.selected < state.filtered_lines && state.filtered[state.selected] != NULL ) {
&& state.selected < state.filtered_lines && state.filtered[state.selected] != NULL ) {
state.retv = MENU_OK;
*( state.selected_line ) = state.line_map[state.selected]; *( state.selected_line ) = state.line_map[state.selected];
} if ( strlen( state.text->text ) > 0 && rc == -2 ) {
// Either: state.retv = MENU_CUSTOM_INPUT;
// Ctrl+Enter was used to force using custom input (-2) } else {
// or state.retv = MENU_OK;
// No item selected, but user entered something }
else if ( strlen ( state.text->text ) > 0 ) {
state.retv = MENU_CUSTOM_INPUT;
} }
// Nothing entered and nothing selected. // Nothing entered and nothing selected.
else{ else{
@ -1899,7 +1895,7 @@ SwitcherMode run_switcher_window ( char **input, G_GNUC_UNUSED void *data )
else if ( mretv == MENU_QUICK_SWITCH ) { else if ( mretv == MENU_QUICK_SWITCH ) {
retv = selected_line; retv = selected_line;
} }
else if ( mretv == MENU_OK && list[selected_line] ) { else if ( ( mretv == MENU_OK || mretv == MENU_CUSTOM_INPUT ) && list[selected_line] ) {
#ifdef HAVE_I3_IPC_H #ifdef HAVE_I3_IPC_H
if ( config_i3_mode ) { if ( config_i3_mode ) {