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

Document '/' as separator and add to combi mode.

Browse source
This commit is contained in:
Dave Davenport 2017-03-31 15:27:13 +02:00
parent 738d7e2e0c
commit b4c9bad267
4 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/rofi-manpage.markdown
View file

@ -190,6 +190,9 @@ Example: Have a mode 'Workspaces' using the `i3_switch_workspaces.sh` script:
rofi -modi "window,run,ssh,Workspaces:i3_switch_workspaces.sh" -show Workspaces rofi -modi "window,run,ssh,Workspaces:i3_switch_workspaces.sh" -show Workspaces
Notes: The I3 Window manager does not like commas in the command when specifying an exec command.
For that case '/' can be used as an separator.
`-case-sensitive` `-case-sensitive`
Start in case sensitive mode. Start in case sensitive mode.
@ -463,6 +466,9 @@ To get one merge view, of window,run,ssh:
rofi -show combi -combi-modi "window,run,ssh" -modi combi rofi -show combi -combi-modi "window,run,ssh" -modi combi
Notes: The I3 Window manager does not like commas in the command when specifying an exec command.
For that case '/' can be used as an separator.
### History and Sorting ### History and Sorting
`-disable-history` `-disable-history`

2
doc/rofi-theme.5
View file

@ -1,5 +1,5 @@
.\" generated with Ronn/v0.7.3 .\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3
. .
.TH "ROFI\-THEME\-MANPAGE" "" "March 2017" "" "" .TH "ROFI\-THEME\-MANPAGE" "" "2017-03-20" "" ""

8
doc/rofi.1
View file

@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3 .\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3
. .
.TH "ROFI\-MANPAGE" "" "March 2017" "" "" .TH "ROFI\-MANPAGE" "" "2017-03-31" "" ""
. .
.SH "NAME" .SH "NAME"
\fBrofi\fR \- A window switcher, application launcher, ssh dialog and dmenu replacement \fBrofi\fR \- A window switcher, application launcher, ssh dialog and dmenu replacement
@ -268,6 +268,9 @@ rofi \-modi "window,run,ssh,Workspaces:i3_switch_workspaces\.sh" \-show Workspac
.IP "" 0 .IP "" 0
. .
.P .P
Notes: The I3 Window manager does not like commas in the command when specifying an exec command\. For that case \'/\' can be used as an separator\.
.
.P
\fB\-case\-sensitive\fR \fB\-case\-sensitive\fR
. .
.P .P
@ -708,6 +711,9 @@ rofi \-show combi \-combi\-modi "window,run,ssh" \-modi combi
. .
.IP "" 0 .IP "" 0
. .
.P
Notes: The I3 Window manager does not like commas in the command when specifying an exec command\. For that case \'/\' can be used as an separator\.
.
.SS "History and Sorting" .SS "History and Sorting"
\fB\-disable\-history\fR \fB\-no\-disable\-history\fR (re\-enable history) \fB\-disable\-history\fR \fB\-no\-disable\-history\fR (re\-enable history)
. .

2
source/dialogs/combi.c
View file

@ -63,7 +63,7 @@ static void combi_mode_parse_switchers ( Mode *sw )
char *savept = NULL; char *savept = NULL;
// Make a copy, as strtok will modify it. // Make a copy, as strtok will modify it.
char *switcher_str = g_strdup ( config.combi_modi ); char *switcher_str = g_strdup ( config.combi_modi );
const char * const sep = ","; const char * const sep = ",/";
// Split token on ','. This modifies switcher_str. // Split token on ','. This modifies switcher_str.
for ( char *token = strtok_r ( switcher_str, sep, &savept ); token != NULL; for ( char *token = strtok_r ( switcher_str, sep, &savept ); token != NULL;
token = strtok_r ( NULL, sep, &savept ) ) { token = strtok_r ( NULL, sep, &savept ) ) {