From 10e3526237344a4677bef9f475e4ab05ad117d84 Mon Sep 17 00:00:00 2001 From: Dave Davenport Date: Tue, 31 May 2016 07:59:40 +0200 Subject: [PATCH] Fix description, -switchers does not exist. --- README.md | 8 +-- doc/test_xr.txt | 148 ++++++++++++++++++++++++------------------------ source/keyb.c | 102 ++++++++++++++++----------------- 3 files changed, 129 insertions(+), 129 deletions(-) diff --git a/README.md b/README.md index 5be6ae00..85c889dd 100644 --- a/README.md +++ b/README.md @@ -147,10 +147,10 @@ Type `Shift-Right` to switch from Window list mode to Run mode and back. |`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. | -|`Ctrl-Tab` | Switch to the next modi. The list can be customized with the -switchers argument. | -|`Ctrl-Shift-Tab` | 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 -modi option. | +|`Shift-Left` | Switch to the previous modi. The list can be customized with the -modi option. | +|`Ctrl-Tab` | Switch to the next modi. The list can be customized with the -modi option. | +|`Ctrl-Shift-Tab` | Switch to the previous modi. The list can be customized with the -modi option. | |`Ctrl-space` | Set selected item as input text. | |`Shift-Del` | Delete entry from history. | |`grave` | Toggle case sensitivity. | diff --git a/doc/test_xr.txt b/doc/test_xr.txt index f581592f..be9a2914 100644 --- a/doc/test_xr.txt +++ b/doc/test_xr.txt @@ -98,108 +98,108 @@ rofi.scroll-method: 0 rofi.fake-background: screenshot ! Pidfile location rofi.pid: /tmp/1000-runtime-dir/rofi.pid -! Keybinding paste primary clipboard +! Paste primary selection rofi.kb-primary-paste: Control+Shift+v,Shift+Insert -! Keybinding paste secondary clipboard +! Paste clipboard rofi.kb-secondary-paste: Control+v,Insert -! Keybinding clear input line +! Clear input line rofi.kb-clear-line: Control+u -! Keybinding move cursor to front +! Beginning of line rofi.kb-move-front: Control+a -! Keybinding move cursor to end +! End of line rofi.kb-move-end: Control+e -! Keybinding move word back +! Move back one word rofi.kb-move-word-back: Alt+b -! Keybinding +! Move forward one word rofi.kb-move-word-forward: Alt+f -! Keybinding +! Move back one char rofi.kb-move-char-back: Left,Control+b -! Keybinding +! Move forward one char rofi.kb-move-char-forward: Right,Control+f -! Keybinding +! Delete previous word rofi.kb-remove-word-back: Control+Alt+h -! Keybinding +! Delete next word rofi.kb-remove-word-forward: Control+Alt+d -! Keybinding +! Delete next char rofi.kb-remove-char-forward: Delete,Control+d -! Keybinding +! Delete previous char rofi.kb-remove-char-back: BackSpace,Control+h -! Keybinding +! Accept entry rofi.kb-accept-entry: Control+j,Control+m,Return,KP_Enter -! Keybinding +! Use entered text as command (in ssh/run modi) rofi.kb-accept-custom: Control+Return,Shift+Return -! Keybinding -rofi.kb-mode-next: Shift+Right,Control+Tab -! Keybinding -rofi.kb-mode-previous: Shift+Left,Control+Shift+Tab -! Keybinding -rofi.kb-toggle-case-sensitivity: grave,dead_grave -! Keybinding +! Delete entry from history rofi.kb-delete-entry: Shift+Delete -! Keybinding +! Switch to the next mode. +rofi.kb-mode-next: Shift+Right,Control+Tab +! Switch to the previous mode. +rofi.kb-mode-previous: Shift+Left,Control+Shift+Tab +! Go to the previous column rofi.kb-row-left: Control+Page_Up -! Keybinding +! Go to the next column rofi.kb-row-right: Control+Page_Down -! Keybinding +! Select previous entry rofi.kb-row-up: Up,Control+p,Shift+Tab -! Keybinding +! Select next entry rofi.kb-row-down: Down,Control+n -! Keybinding +! Tab rofi.kb-row-tab: Tab -! Keybinding +! Go to the previous page rofi.kb-page-prev: Page_Up -! Keybinding +! Go to the next page rofi.kb-page-next: Page_Down -! Keybinding +! Go to the first entry rofi.kb-row-first: Home,KP_Home -! Keybinding +! Go to the last entry rofi.kb-row-last: End,KP_End -! Keybinding +! Set selected item as input text rofi.kb-row-select: Control+space -! Keybinding -rofi.kb-cancel: Escape,Control+bracketleft -! Keybinding -rofi.kb-custom-1: Alt+1 -! Keybinding -rofi.kb-custom-2: Alt+2 -! Keybinding -rofi.kb-custom-3: Alt+3 -! Keybinding -rofi.kb-custom-4: Alt+4 -! Keybinding -rofi.kb-custom-5: Alt+5 -! Keybinding -rofi.kb-custom-6: Alt+6 -! Keybinding -rofi.kb-custom-7: Alt+7 -! Keybinding -rofi.kb-custom-8: Alt+8 -! Keybinding -rofi.kb-custom-9: Alt+9 -! Keybinding -rofi.kb-custom-10: Alt+0 -! Keybinding -rofi.kb-custom-11: Alt+Shift+1 -! Keybinding -rofi.kb-custom-12: Alt+Shift+2 -! Keybinding -rofi.kb-custom-13: Alt+Shift+3 -! Keybinding -rofi.kb-custom-14: Alt+Shift+4 -! Keybinding -rofi.kb-custom-15: Alt+Shift+5 -! Keybinding -rofi.kb-custom-16: Alt+Shift+6 -! Keybinding -rofi.kb-custom-18: Alt+Shift+8 -! Keybinding -rofi.kb-custom-17: Alt+Shift+7 -! Keybinding -rofi.kb-custom-19: Alt+Shift+9 -! Keybinding +! Take a screenshot of the rofi window rofi.kb-screenshot: Alt+Shift+S -! Keybinding +! Toggle case sensitivity +rofi.kb-toggle-case-sensitivity: grave,dead_grave +! Toggle sort rofi.kb-toggle-sort: Alt+grave +! Quit rofi +rofi.kb-cancel: Escape,Control+bracketleft +! Custom keybinding 1 +rofi.kb-custom-1: Alt+1 +! Custom keybinding 2 +rofi.kb-custom-2: Alt+2 +! Custom keybinding 3 +rofi.kb-custom-3: Alt+3 +! Custom keybinding 4 +rofi.kb-custom-4: Alt+4 +! Custom Keybinding 5 +rofi.kb-custom-5: Alt+5 +! Custom keybinding 6 +rofi.kb-custom-6: Alt+6 +! Custom Keybinding 7 +rofi.kb-custom-7: Alt+7 +! Custom keybinding 8 +rofi.kb-custom-8: Alt+8 +! Custom keybinding 9 +rofi.kb-custom-9: Alt+9 +! Custom keybinding 10 +rofi.kb-custom-10: Alt+0 +! Custom keybinding 11 +rofi.kb-custom-11: Alt+Shift+1 +! Custom keybinding 12 +rofi.kb-custom-12: Alt+Shift+2 +! Csutom keybinding 13 +rofi.kb-custom-13: Alt+Shift+3 +! Custom keybinding 14 +rofi.kb-custom-14: Alt+Shift+4 +! Custom keybinding 15 +rofi.kb-custom-15: Alt+Shift+5 +! Custom keybinding 16 +rofi.kb-custom-16: Alt+Shift+6 +! Custom keybinding 17 +rofi.kb-custom-17: Alt+Shift+7 +! Custom keybinding 18 +rofi.kb-custom-18: Alt+Shift+8 +! Custom Keybinding 19 +rofi.kb-custom-19: Alt+Shift+9 ! The display name of this browser rofi.display-ssh:  ! The display name of this browser diff --git a/source/keyb.c b/source/keyb.c index 79bb587b..662d3b03 100644 --- a/source/keyb.c +++ b/source/keyb.c @@ -34,57 +34,57 @@ ActionBindingEntry abe[NUM_ABE]; */ DefaultBinding bindings[NUM_ABE] = { - { .id = PASTE_PRIMARY, .name = "kb-primary-paste", .keybinding = "Control+Shift+v,Shift+Insert", .comment = "Paste primary selection" }, - { .id = PASTE_SECONDARY, .name = "kb-secondary-paste", .keybinding = "Control+v,Insert", .comment = "Paste clipboard" }, - { .id = CLEAR_LINE, .name = "kb-clear-line", .keybinding = "Control+u", .comment = "Clear input line" }, - { .id = MOVE_FRONT, .name = "kb-move-front", .keybinding = "Control+a", .comment = "Beginning of line" }, - { .id = MOVE_END, .name = "kb-move-end", .keybinding = "Control+e", .comment = "End of line" }, - { .id = MOVE_WORD_BACK, .name = "kb-move-word-back", .keybinding = "Alt+b", .comment = "Move back one word" }, - { .id = MOVE_WORD_FORWARD, .name = "kb-move-word-forward", .keybinding = "Alt+f", .comment = "Move forward one word" }, - { .id = MOVE_CHAR_BACK, .name = "kb-move-char-back", .keybinding = "Left,Control+b", .comment = "Move back one char" }, - { .id = MOVE_CHAR_FORWARD, .name = "kb-move-char-forward", .keybinding = "Right,Control+f", .comment = "Move forward one char" }, - { .id = REMOVE_WORD_BACK, .name = "kb-remove-word-back", .keybinding = "Control+Alt+h", .comment = "Delete previous word" }, - { .id = REMOVE_WORD_FORWARD, .name = "kb-remove-word-forward", .keybinding = "Control+Alt+d", .comment = "Delete next word" }, - { .id = REMOVE_CHAR_FORWARD, .name = "kb-remove-char-forward", .keybinding = "Delete,Control+d", .comment = "Delete next char" }, - { .id = REMOVE_CHAR_BACK, .name = "kb-remove-char-back", .keybinding = "BackSpace,Control+h", .comment = "Delete previous char" }, - { .id = ACCEPT_ENTRY, .name = "kb-accept-entry", .keybinding = "Control+j,Control+m,Return,KP_Enter", .comment = "Accept entry" }, - { .id = ACCEPT_CUSTOM, .name = "kb-accept-custom", .keybinding = "Control+Return,Shift+Return", .comment = "Use entered text as command (in ssh/run modi)" }, - { .id = DELETE_ENTRY, .name = "kb-delete-entry", .keybinding = "Shift+Delete", .comment = "Delete entry from history" }, - { .id = MODE_NEXT, .name = "kb-mode-next", .keybinding = "Shift+Right,Control+Tab", .comment = "Switch to the next modi. Add/remove modis with -switchers" }, - { .id = MODE_PREVIOUS, .name = "kb-mode-previous", .keybinding = "Shift+Left,Control+Shift+Tab", .comment = "Switch to the previous modi. Add/remove modis with -switchers" }, - { .id = ROW_LEFT, .name = "kb-row-left", .keybinding = "Control+Page_Up", .comment = "Go to the previous column" }, - { .id = ROW_RIGHT, .name = "kb-row-right", .keybinding = "Control+Page_Down", .comment = "Go to the next column" }, - { .id = ROW_UP, .name = "kb-row-up", .keybinding = "Up,Control+p,Shift+Tab,Shift+ISO_Left_Tab", .comment = "Select previous entry" }, - { .id = ROW_DOWN, .name = "kb-row-down", .keybinding = "Down,Control+n,Tab", .comment = "Select next entry" }, - { .id = ROW_TAB, .name = "kb-row-tab", .keybinding = "Tab", .comment = "Tab" }, - { .id = PAGE_PREV, .name = "kb-page-prev", .keybinding = "Page_Up", .comment = "Go to the previous page" }, - { .id = PAGE_NEXT, .name = "kb-page-next", .keybinding = "Page_Down", .comment = "Go to the next page" }, - { .id = ROW_FIRST, .name = "kb-row-first", .keybinding = "Home,KP_Home", .comment = "Go to the first entry" }, - { .id = ROW_LAST, .name = "kb-row-last", .keybinding = "End,KP_End", .comment = "Go to the last entry" }, - { .id = ROW_SELECT, .name = "kb-row-select", .keybinding = "Control+space", .comment = "Set selected item as input text" }, - { .id = SCREENSHOT, .name = "kb-screenshot", .keybinding = "Alt+Shift+S", .comment = "Take a screenshot of the rofi window" }, - { .id = TOGGLE_CASE_SENSITIVITY, .name = "kb-toggle-case-sensitivity", .keybinding = "grave,dead_grave", .comment = "Toggle case sensitivity" }, - { .id = TOGGLE_SORT, .name = "kb-toggle-sort", .keybinding = "Alt+grave", .comment = "Toggle sort" }, - { .id = CANCEL, .name = "kb-cancel", .keybinding = "Escape,Control+bracketleft", .comment = "Quit rofi" }, - { .id = CUSTOM_1, .name = "kb-custom-1", .keybinding = "Alt+1", .comment = "Custom keybinding 1" }, - { .id = CUSTOM_2, .name = "kb-custom-2", .keybinding = "Alt+2", .comment = "Custom keybinding 2" }, - { .id = CUSTOM_3, .name = "kb-custom-3", .keybinding = "Alt+3", .comment = "Custom keybinding 3" }, - { .id = CUSTOM_4, .name = "kb-custom-4", .keybinding = "Alt+4", .comment = "Custom keybinding 4" }, - { .id = CUSTOM_5, .name = "kb-custom-5", .keybinding = "Alt+5", .comment = "Custom Keybinding 5" }, - { .id = CUSTOM_6, .name = "kb-custom-6", .keybinding = "Alt+6", .comment = "Custom keybinding 6" }, - { .id = CUSTOM_7, .name = "kb-custom-7", .keybinding = "Alt+7", .comment = "Custom Keybinding 7" }, - { .id = CUSTOM_8, .name = "kb-custom-8", .keybinding = "Alt+8", .comment = "Custom keybinding 8" }, - { .id = CUSTOM_9, .name = "kb-custom-9", .keybinding = "Alt+9", .comment = "Custom keybinding 9" }, - { .id = CUSTOM_10, .name = "kb-custom-10", .keybinding = "Alt+0", .comment = "Custom keybinding 10" }, - { .id = CUSTOM_11, .name = "kb-custom-11", .keybinding = "Alt+Shift+1", .comment = "Custom keybinding 11" }, - { .id = CUSTOM_12, .name = "kb-custom-12", .keybinding = "Alt+Shift+2", .comment = "Custom keybinding 12" }, - { .id = CUSTOM_13, .name = "kb-custom-13", .keybinding = "Alt+Shift+3", .comment = "Csutom keybinding 13" }, - { .id = CUSTOM_14, .name = "kb-custom-14", .keybinding = "Alt+Shift+4", .comment = "Custom keybinding 14" }, - { .id = CUSTOM_15, .name = "kb-custom-15", .keybinding = "Alt+Shift+5", .comment = "Custom keybinding 15" }, - { .id = CUSTOM_16, .name = "kb-custom-16", .keybinding = "Alt+Shift+6", .comment = "Custom keybinding 16" }, - { .id = CUSTOM_17, .name = "kb-custom-17", .keybinding = "Alt+Shift+7", .comment = "Custom keybinding 17" }, - { .id = CUSTOM_18, .name = "kb-custom-18", .keybinding = "Alt+Shift+8", .comment = "Custom keybinding 18" }, - { .id = CUSTOM_19, .name = "kb-custom-19", .keybinding = "Alt+Shift+9", .comment = "Custom Keybinding 19" }, + { .id = PASTE_PRIMARY, .name = "kb-primary-paste", .keybinding = "Control+Shift+v,Shift+Insert", .comment = "Paste primary selection" }, + { .id = PASTE_SECONDARY, .name = "kb-secondary-paste", .keybinding = "Control+v,Insert", .comment = "Paste clipboard" }, + { .id = CLEAR_LINE, .name = "kb-clear-line", .keybinding = "Control+u", .comment = "Clear input line" }, + { .id = MOVE_FRONT, .name = "kb-move-front", .keybinding = "Control+a", .comment = "Beginning of line" }, + { .id = MOVE_END, .name = "kb-move-end", .keybinding = "Control+e", .comment = "End of line" }, + { .id = MOVE_WORD_BACK, .name = "kb-move-word-back", .keybinding = "Alt+b", .comment = "Move back one word" }, + { .id = MOVE_WORD_FORWARD, .name = "kb-move-word-forward", .keybinding = "Alt+f", .comment = "Move forward one word" }, + { .id = MOVE_CHAR_BACK, .name = "kb-move-char-back", .keybinding = "Left,Control+b", .comment = "Move back one char" }, + { .id = MOVE_CHAR_FORWARD, .name = "kb-move-char-forward", .keybinding = "Right,Control+f", .comment = "Move forward one char" }, + { .id = REMOVE_WORD_BACK, .name = "kb-remove-word-back", .keybinding = "Control+Alt+h", .comment = "Delete previous word" }, + { .id = REMOVE_WORD_FORWARD, .name = "kb-remove-word-forward", .keybinding = "Control+Alt+d", .comment = "Delete next word" }, + { .id = REMOVE_CHAR_FORWARD, .name = "kb-remove-char-forward", .keybinding = "Delete,Control+d", .comment = "Delete next char" }, + { .id = REMOVE_CHAR_BACK, .name = "kb-remove-char-back", .keybinding = "BackSpace,Control+h", .comment = "Delete previous char" }, + { .id = ACCEPT_ENTRY, .name = "kb-accept-entry", .keybinding = "Control+j,Control+m,Return,KP_Enter", .comment = "Accept entry" }, + { .id = ACCEPT_CUSTOM, .name = "kb-accept-custom", .keybinding = "Control+Return,Shift+Return", .comment = "Use entered text as command (in ssh/run modi)" }, + { .id = DELETE_ENTRY, .name = "kb-delete-entry", .keybinding = "Shift+Delete", .comment = "Delete entry from history" }, + { .id = MODE_NEXT, .name = "kb-mode-next", .keybinding = "Shift+Right,Control+Tab", .comment = "Switch to the next mode." }, + { .id = MODE_PREVIOUS, .name = "kb-mode-previous", .keybinding = "Shift+Left,Control+Shift+Tab", .comment = "Switch to the previous mode." }, + { .id = ROW_LEFT, .name = "kb-row-left", .keybinding = "Control+Page_Up", .comment = "Go to the previous column" }, + { .id = ROW_RIGHT, .name = "kb-row-right", .keybinding = "Control+Page_Down", .comment = "Go to the next column" }, + { .id = ROW_UP, .name = "kb-row-up", .keybinding = "Up,Control+p,Shift+Tab,Shift+ISO_Left_Tab", .comment = "Select previous entry" }, + { .id = ROW_DOWN, .name = "kb-row-down", .keybinding = "Down,Control+n,Tab", .comment = "Select next entry" }, + { .id = ROW_TAB, .name = "kb-row-tab", .keybinding = "Tab", .comment = "Tab" }, + { .id = PAGE_PREV, .name = "kb-page-prev", .keybinding = "Page_Up", .comment = "Go to the previous page" }, + { .id = PAGE_NEXT, .name = "kb-page-next", .keybinding = "Page_Down", .comment = "Go to the next page" }, + { .id = ROW_FIRST, .name = "kb-row-first", .keybinding = "Home,KP_Home", .comment = "Go to the first entry" }, + { .id = ROW_LAST, .name = "kb-row-last", .keybinding = "End,KP_End", .comment = "Go to the last entry" }, + { .id = ROW_SELECT, .name = "kb-row-select", .keybinding = "Control+space", .comment = "Set selected item as input text" }, + { .id = SCREENSHOT, .name = "kb-screenshot", .keybinding = "Alt+Shift+S", .comment = "Take a screenshot of the rofi window" }, + { .id = TOGGLE_CASE_SENSITIVITY, .name = "kb-toggle-case-sensitivity", .keybinding = "grave,dead_grave", .comment = "Toggle case sensitivity" }, + { .id = TOGGLE_SORT, .name = "kb-toggle-sort", .keybinding = "Alt+grave", .comment = "Toggle sort" }, + { .id = CANCEL, .name = "kb-cancel", .keybinding = "Escape,Control+bracketleft", .comment = "Quit rofi" }, + { .id = CUSTOM_1, .name = "kb-custom-1", .keybinding = "Alt+1", .comment = "Custom keybinding 1" }, + { .id = CUSTOM_2, .name = "kb-custom-2", .keybinding = "Alt+2", .comment = "Custom keybinding 2" }, + { .id = CUSTOM_3, .name = "kb-custom-3", .keybinding = "Alt+3", .comment = "Custom keybinding 3" }, + { .id = CUSTOM_4, .name = "kb-custom-4", .keybinding = "Alt+4", .comment = "Custom keybinding 4" }, + { .id = CUSTOM_5, .name = "kb-custom-5", .keybinding = "Alt+5", .comment = "Custom Keybinding 5" }, + { .id = CUSTOM_6, .name = "kb-custom-6", .keybinding = "Alt+6", .comment = "Custom keybinding 6" }, + { .id = CUSTOM_7, .name = "kb-custom-7", .keybinding = "Alt+7", .comment = "Custom Keybinding 7" }, + { .id = CUSTOM_8, .name = "kb-custom-8", .keybinding = "Alt+8", .comment = "Custom keybinding 8" }, + { .id = CUSTOM_9, .name = "kb-custom-9", .keybinding = "Alt+9", .comment = "Custom keybinding 9" }, + { .id = CUSTOM_10, .name = "kb-custom-10", .keybinding = "Alt+0", .comment = "Custom keybinding 10" }, + { .id = CUSTOM_11, .name = "kb-custom-11", .keybinding = "Alt+Shift+1", .comment = "Custom keybinding 11" }, + { .id = CUSTOM_12, .name = "kb-custom-12", .keybinding = "Alt+Shift+2", .comment = "Custom keybinding 12" }, + { .id = CUSTOM_13, .name = "kb-custom-13", .keybinding = "Alt+Shift+3", .comment = "Csutom keybinding 13" }, + { .id = CUSTOM_14, .name = "kb-custom-14", .keybinding = "Alt+Shift+4", .comment = "Custom keybinding 14" }, + { .id = CUSTOM_15, .name = "kb-custom-15", .keybinding = "Alt+Shift+5", .comment = "Custom keybinding 15" }, + { .id = CUSTOM_16, .name = "kb-custom-16", .keybinding = "Alt+Shift+6", .comment = "Custom keybinding 16" }, + { .id = CUSTOM_17, .name = "kb-custom-17", .keybinding = "Alt+Shift+7", .comment = "Custom keybinding 17" }, + { .id = CUSTOM_18, .name = "kb-custom-18", .keybinding = "Alt+Shift+8", .comment = "Custom keybinding 18" }, + { .id = CUSTOM_19, .name = "kb-custom-19", .keybinding = "Alt+Shift+9", .comment = "Custom Keybinding 19" }, }; void setup_abe ( void )