From df7b98ac7f87808673c079fc698770ea047bdd2d Mon Sep 17 00:00:00 2001 From: Dave Davenport Date: Mon, 23 Feb 2015 08:39:29 +0100 Subject: [PATCH] Add 'modi' alias for 'switchers' and update manpage. --- doc/rofi-manpage.markdown | 15 ++++++++------- doc/rofi.1 | 15 ++++++++------- source/xrmoptions.c | 1 + 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/doc/rofi-manpage.markdown b/doc/rofi-manpage.markdown index a748d911..45a907fa 100644 --- a/doc/rofi-manpage.markdown +++ b/doc/rofi-manpage.markdown @@ -32,7 +32,7 @@ rofi - A window switcher, run dialog and dmenu replacement [ -levenshtein-sort ] [ -case-sensitive ] [ -show *mode* ] -[ -switcher *mode1,mode2* ] +[ -modi *mode1,mode2* ] [ -eh *element height* ] [ -lazy-filter-limit *limit* ] [ -e *message*] @@ -89,12 +89,13 @@ daemon listening to specific key-combinations. This function deprecates -rnow,-snow and -now `-switchers` *mode1,mode1* +`-modi` *mode1,mode1* Give a comma separated list of modes to enable, in what order. - For example to only show the run and ssh dialog (in that order): + For example to only show the run and ssh launcher (in that order): - rofi -switchers "run,ssh" -show run + rofi -modi "run,ssh" -show run Custom modes can be added using the internal 'script' mode. Each mode has two parameters: @@ -102,7 +103,7 @@ daemon listening to specific key-combinations. So to have a mode 'Workspaces' using the `i3_switch_workspace.sh` script type: - rofi -switchers "window,run,ssh,Workspaces:i3_switch_workspaces.sh" -show Workspaces + rofi -modi "window,run,ssh,Workspaces:i3_switch_workspaces.sh" -show Workspaces `-case-sensitive` @@ -372,7 +373,7 @@ daemon listening to specific key-combinations. ## PATTERN -To launch commands (e.g. when using the ssh dialog) the user can enter the used commandline, +To launch commands (e.g. when using the ssh launcher) the user can enter the used commandline, the following keys can be used that will be replaced at runtime: * `{host}`: The host to connect to. @@ -436,8 +437,8 @@ Rofi supports the following keybindings: * `Page Down`: Go to the next page * `Ctrl-Page Up`: Go to the previous column * `Ctrl-Page Down`: Go to the next column -* `Ctrl-Enter`: Use entered text as command (in ssh/run dialog) -* `Shift-Enter`: Launch the application in a terminal (in run dialog) +* `Ctrl-Enter`: Use entered text as command (in ssh/run modi) +* `Shift-Enter`: Launch the application in a terminal (in run mode) * `Shift-Enter`: Return the selected entry and move to the next item while keeping Rofi open. (in dmenu) * `Shift-Right`: Switch to the next modi. The list can be customized with the `-switchers` argument. * `Shift-Left`: Switch to the previous modi. The list can be customized with the `-switchers` argument. diff --git a/doc/rofi.1 b/doc/rofi.1 index 4295d3df..acb516b5 100644 --- a/doc/rofi.1 +++ b/doc/rofi.1 @@ -30,7 +30,7 @@ rofi \- A window switcher, run dialog and dmenu replacement [ \-levenshtein\-sort ] [ \-case\-sensitive ] [ \-show \fImode\fP ] -[ \-switcher \fImode1,mode2\fP ] +[ \-modi \fImode1,mode2\fP ] [ \-eh \fIelement height\fP ] [ \-lazy\-filter\-limit \fIlimit\fP ] [ \-e \fImessage\fP] @@ -88,14 +88,15 @@ For example to show the run\-dialog: This function deprecates \-rnow,\-snow and \-now .PP \fB\fC\-switchers\fR \fImode1,mode1\fP +\fB\fC\-modi\fR \fImode1,mode1\fP .IP Give a comma separated list of modes to enable, in what order. .IP -For example to only show the run and ssh dialog (in that order): +For example to only show the run and ssh launcher (in that order): .PP .RS .nf - rofi \-switchers "run,ssh" \-show run + rofi \-modi "run,ssh" \-show run .fi .RE .IP @@ -111,7 +112,7 @@ So to have a mode 'Workspaces' using the \fB\fCi3_switch_workspace.sh\fR script .PP .RS .nf - rofi \-switchers "window,run,ssh,Workspaces:i3_switch_workspaces.sh" \-show Workspaces + rofi \-modi "window,run,ssh,Workspaces:i3_switch_workspaces.sh" \-show Workspaces .fi .RE .PP @@ -456,7 +457,7 @@ simultaneous. This is useful when running rofi from a keybinding daemon. Dump the current active configuration in xresources format to the command\-line. .SH PATTERN .PP -To launch commands (e.g. when using the ssh dialog) the user can enter the used commandline, +To launch commands (e.g. when using the ssh launcher) the user can enter the used commandline, the following keys can be used that will be replaced at runtime: .RS .IP \(bu 2 @@ -549,9 +550,9 @@ Rofi supports the following keybindings: .IP \(bu 2 \fB\fCCtrl\-Page Down\fR: Go to the next column .IP \(bu 2 -\fB\fCCtrl\-Enter\fR: Use entered text as command (in ssh/run dialog) +\fB\fCCtrl\-Enter\fR: Use entered text as command (in ssh/run modi) .IP \(bu 2 -\fB\fCShift\-Enter\fR: Launch the application in a terminal (in run dialog) +\fB\fCShift\-Enter\fR: Launch the application in a terminal (in run mode) .IP \(bu 2 \fB\fCShift\-Enter\fR: Return the selected entry and move to the next item while keeping Rofi open. (in dmenu) .IP \(bu 2 diff --git a/source/xrmoptions.c b/source/xrmoptions.c index 16bde5a8..829e1b86 100644 --- a/source/xrmoptions.c +++ b/source/xrmoptions.c @@ -54,6 +54,7 @@ typedef struct */ static XrmOption xrmOptions[] = { { xrm_String, "switchers", { .str = &config.switchers }, NULL }, + { xrm_String, "modi", { .str = &config.switchers }, NULL }, { xrm_Number, "opacity", { .num = &config.window_opacity }, NULL }, { xrm_SNumber, "width", { .snum = &config.menu_width }, NULL },