mirror/ bemenu
1
0
Fork 0
mirror of https://github.com/Cloudef/bemenu synced 2024-06-01 04:16:21 +02:00
Code Issues

Make shift + tab the current tab behavior, and normal tab to cycle.

This commit is contained in:
Jari Vetoniemi 2014-11-02 04:08:40 +02:00
parent a3e628f1c9
commit ee3c41f162
5 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/bemenu.h
View File

@ -174,6 +174,7 @@ enum bm_key {
BM_KEY_LINE_DELETE_RIGHT,
BM_KEY_WORD_DELETE,
BM_KEY_TAB,
BM_KEY_SHIFT_TAB,
BM_KEY_ESCAPE,
BM_KEY_RETURN,
BM_KEY_SHIFT_RETURN,

22
lib/menu.c
View File

@ -485,21 +485,21 @@ bm_menu_poll_key(struct bm_menu *menu, uint32_t *out_unicode)
}
static void
menu_next(struct bm_menu *menu, uint32_t count)
menu_next(struct bm_menu *menu, uint32_t count, bool wrap)
{
if (menu->index < count - 1) {
menu->index++;
} else if (menu->wrap) {
} else if (wrap) {
menu->index = 0;
}
}
static void
menu_prev(struct bm_menu *menu, uint32_t count)
menu_prev(struct bm_menu *menu, uint32_t count, bool wrap)
{
if (menu->index > 0) {
menu->index--;
} else if (menu->wrap) {
} else if (wrap) {
menu->index = count - 1;
}
}
@ -526,7 +526,7 @@ bm_menu_run_with_key(struct bm_menu *menu, enum bm_key key, uint32_t unicode)
menu->cursor -= bm_utf8_rune_prev(menu->filter, menu->cursor);
menu->curses_cursor -= bm_utf8_rune_width(menu->filter + menu->cursor, oldCursor - menu->cursor);
} else if (menu->lines == 0) {
menu_prev(menu, count);
menu_prev(menu, count, menu->wrap);
}
break;
@ -536,7 +536,7 @@ bm_menu_run_with_key(struct bm_menu *menu, enum bm_key key, uint32_t unicode)
menu->cursor += bm_utf8_rune_next(menu->filter, menu->cursor);
menu->curses_cursor += bm_utf8_rune_width(menu->filter + oldCursor, menu->cursor - oldCursor);
} else if (menu->lines == 0) {
menu_next(menu, count);
menu_next(menu, count, menu->wrap);
}
break;
@ -550,11 +550,11 @@ bm_menu_run_with_key(struct bm_menu *menu, enum bm_key key, uint32_t unicode)
break;
case BM_KEY_UP:
menu_prev(menu, count);
menu_prev(menu, count, menu->wrap);
break;
case BM_KEY_DOWN:
menu_next(menu, count);
menu_next(menu, count, menu->wrap);
break;
case BM_KEY_PAGE_UP:
@ -630,6 +630,12 @@ bm_menu_run_with_key(struct bm_menu *menu, enum bm_key key, uint32_t unicode)
break;
case BM_KEY_TAB:
{
menu_next(menu, count, true);
}
break;
case BM_KEY_SHIFT_TAB:
{
const char *text;
struct bm_item *highlighted = bm_menu_get_highlighted_item(menu);

3
lib/renderers/curses/curses.c
View File

@ -297,6 +297,9 @@ poll_key(const struct bm_menu *menu, uint32_t *unicode)
case 9: /* Tab */
return BM_KEY_TAB;
case 353: /* S-Tab */
return BM_KEY_SHIFT_TAB;
case 18: /* C-r */
return BM_KEY_CONTROL_RETURN;

2
lib/renderers/wayland/registry.c
View File

@ -92,7 +92,7 @@ keyboard_handle_keymap(void *data, struct wl_keyboard *keyboard, uint32_t format
input->xkb.state = state;
for (uint32_t i = 0; i < MASK_LAST; ++i)
input->xkb.masks[i] = xkb_keymap_mod_get_index(input->xkb.keymap, BM_XKB_MASK_NAMES[i]);
input->xkb.masks[i] = 1 << xkb_keymap_mod_get_index(input->xkb.keymap, BM_XKB_MASK_NAMES[i]);
}
static void

5
lib/renderers/wayland/wayland.c
View File

@ -34,6 +34,9 @@ poll_key(const struct bm_menu *menu, unsigned int *unicode)
uint32_t mods = wayland->input.modifiers;
*unicode = xkb_state_key_get_utf32(wayland->input.xkb.state, wayland->input.code);
if (!*unicode && wayland->input.code == 23 && (mods & MOD_SHIFT))
return BM_KEY_SHIFT_TAB;
switch (wayland->input.sym) {
case XKB_KEY_Up:
return BM_KEY_UP;
@ -66,7 +69,7 @@ poll_key(const struct bm_menu *menu, unsigned int *unicode)
return (mods & MOD_SHIFT ? BM_KEY_LINE_DELETE_LEFT : BM_KEY_DELETE);
case XKB_KEY_Tab:
return BM_KEY_TAB;
return (mods & MOD_SHIFT ? BM_KEY_SHIFT_TAB : BM_KEY_TAB);
case XKB_KEY_Insert:
return BM_KEY_SHIFT_RETURN;