From fda5badeb6ddae96dcfc0338caecc4e57b427c3a Mon Sep 17 00:00:00 2001 From: Dave Davenport Date: Fri, 6 Feb 2015 08:45:21 +0100 Subject: [PATCH] Fix #125: Use shift-left/right for moving between switchers. --- doc/rofi-manpage.markdown | 4 ++-- doc/rofi.1 | 22 +++++++++------------- source/rofi.c | 4 ++-- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/doc/rofi-manpage.markdown b/doc/rofi-manpage.markdown index 19ae718d..25be8e6e 100644 --- a/doc/rofi-manpage.markdown +++ b/doc/rofi-manpage.markdown @@ -498,8 +498,8 @@ Rofi supports the following keybindings: * `Ctrl-Enter`: Use entered text as command (in ssh/run dialog) * `Shift-Enter`: Launch the application in a terminal (in run dialog) * `Shift-Enter`: Return the selected entry and move to the next item while keeping Rofi open. (in dmenu) -* `?`: 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. +* `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. * `Ctrl-space`: Set selected item as input text. * `Shift-Del`: Delete entry from history. * `grave`: Toggle case sensitivity. diff --git a/doc/rofi.1 b/doc/rofi.1 index a7346154..1d010ecd 100644 --- a/doc/rofi.1 +++ b/doc/rofi.1 @@ -252,7 +252,7 @@ menu. .PP .RS .nf - rofi \-fg "#005577" + rofi \-hlbg "#005577" .fi .RE .IP @@ -265,7 +265,7 @@ menu. .PP .RS .nf - rofi \-fg "#ffffff" + rofi \-hlfg "#ffffff" .fi .RE .IP @@ -346,7 +346,7 @@ If value is larger then 100, the size is set in pixels. e.g. to span a full hd m .PP .RS .nf - rofi \-width 1980 + rofi \-width 1920 .fi .RE .IP @@ -625,9 +625,9 @@ Rofi supports the following keybindings: .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 -\fB\fC?\fR: Switch to the next modi. The list can be customized with the \fB\fC\-switchers\fR argument. +\fB\fCShift\-Right\fR: Switch to the next modi. The list can be customized with the \fB\fC\-switchers\fR argument. .IP \(bu 2 -\fB\fCctrl\-/\fR: Switch to the previous modi. The list can be customized with the \fB\fC\-switchers\fR argument. +\fB\fCShift\-Left\fR: Switch to the previous modi. The list can be customized with the \fB\fC\-switchers\fR argument. .IP \(bu 2 \fB\fCCtrl\-space\fR: Set selected item as input text. .IP \(bu 2 @@ -655,18 +655,14 @@ Check quotes used on the commandline: e.g. used “ instead of ". .SH WEBSITE .PP \fBrofi\fP website can be found at here -.UR https://davedavenport.github.io/rofi/ -.UE +\[la]https://davedavenport.github.io/rofi/\[ra] .PP \fBrofi\fP bugtracker can be found here -.UR https://github.com/DaveDavenport/rofi/issues -.UE +\[la]https://github.com/DaveDavenport/rofi/issues\[ra] .SH AUTHOR .PP Qball Cow -.MT qball@gmpclient.org -.ME +\[la]qball@gmpclient.org\[ra] .PP Original code based on work by: Sean Pringle -.MT sean.pringle@gmail.com -.ME +\[la]sean.pringle@gmail.com\[ra] diff --git a/source/rofi.c b/source/rofi.c index bddfc849..8ff40629 100644 --- a/source/rofi.c +++ b/source/rofi.c @@ -1767,7 +1767,7 @@ MenuReturn menu ( char **lines, unsigned int num_lines, char **input, char *prom XA_PRIMARY : netatoms[CLIPBOARD], netatoms[UTF8_STRING], netatoms[UTF8_STRING], main_window, CurrentTime ); } - else if ( ( ( ev.xkey.state & ControlMask ) == ControlMask ) && key == XK_slash ) { + else if ( ( ( ev.xkey.state & ShiftMask ) == ShiftMask ) && key == XK_Left ) { state.retv = MENU_PREVIOUS; *( state.selected_line ) = 0; state.quit = TRUE; @@ -1775,7 +1775,7 @@ MenuReturn menu ( char **lines, unsigned int num_lines, char **input, char *prom } // Menu navigation. else if ( ( ( ev.xkey.state & ShiftMask ) == ShiftMask ) && - key == XK_slash ) { + key == XK_Right ) { state.retv = MENU_NEXT; *( state.selected_line ) = 0; state.quit = TRUE;