diff options
Diffstat (limited to 'xxxterm.c')
| -rw-r--r-- | xxxterm.c | 162 |
1 files changed, 83 insertions, 79 deletions
diff --git a/xxxterm.c b/xxxterm.c index 4e1bd51..587eb53 100644 --- a/xxxterm.c +++ b/xxxterm.c @@ -4015,6 +4015,10 @@ restart(struct tab *t, struct karg *args) return (0); } +#define CTRL GDK_CONTROL_MASK +#define MOD1 GDK_MOD1_MASK +#define SHFT GDK_SHIFT_MASK + /* inherent to GTK not all keys will be caught at all times */ /* XXX sort key bindings */ struct key_bindings { @@ -4024,94 +4028,94 @@ struct key_bindings { int (*func)(struct tab *, struct karg *); struct karg arg; } keys[] = { - { GDK_MOD1_MASK, 0, GDK_d, xtp_page_dl, {0} }, - { GDK_MOD1_MASK, 0, GDK_h, xtp_page_hl, {0} }, - { GDK_CONTROL_MASK, 0, GDK_p, print_page, {0}}, - { 0, 0, GDK_slash, command, {.i = '/'} }, - { GDK_SHIFT_MASK, 0, GDK_question, command, {.i = '?'} }, - { GDK_SHIFT_MASK, 0, GDK_colon, command, {.i = ':'} }, - { GDK_CONTROL_MASK, 0, GDK_q, quit, {0} }, - { GDK_MOD1_MASK, 0, GDK_q, restart, {0} }, - { GDK_CONTROL_MASK, 0, GDK_j, toggle_js, {.i = XT_WL_TOGGLE | XT_WL_FQDN} }, - { GDK_MOD1_MASK, 0, GDK_c, toggle_cwl, {.i = XT_WL_TOGGLE | XT_WL_FQDN} }, - { GDK_CONTROL_MASK, 0, GDK_s, toggle_src, {0} }, - { 0, 0, GDK_y, yank_uri, {0} }, - { 0, 0, GDK_p, paste_uri, {.i = XT_PASTE_CURRENT_TAB} }, - { GDK_SHIFT_MASK, 0, GDK_P, paste_uri, {.i = XT_PASTE_NEW_TAB} }, + { MOD1, 0, GDK_d, xtp_page_dl, {0} }, + { MOD1, 0, GDK_h, xtp_page_hl, {0} }, + { CTRL, 0, GDK_p, print_page, {0}}, + { 0, 0, GDK_slash, command, {.i = '/'} }, + { SHFT, 0, GDK_question, command, {.i = '?'} }, + { SHFT, 0, GDK_colon, command, {.i = ':'} }, + { CTRL, 0, GDK_q, quit, {0} }, + { MOD1, 0, GDK_q, restart, {0} }, + { CTRL, 0, GDK_j, toggle_js, {.i = XT_WL_TOGGLE | XT_WL_FQDN} }, + { MOD1, 0, GDK_c, toggle_cwl, {.i = XT_WL_TOGGLE | XT_WL_FQDN} }, + { CTRL, 0, GDK_s, toggle_src, {0} }, + { 0, 0, GDK_y, yank_uri, {0} }, + { 0, 0, GDK_p, paste_uri, {.i = XT_PASTE_CURRENT_TAB} }, + { SHFT, 0, GDK_P, paste_uri, {.i = XT_PASTE_NEW_TAB} }, /* search */ - { 0, 0, GDK_n, search, {.i = XT_SEARCH_NEXT} }, - { GDK_SHIFT_MASK, 0, GDK_N, search, {.i = XT_SEARCH_PREV} }, + { 0, 0, GDK_n, search, {.i = XT_SEARCH_NEXT} }, + { SHFT, 0, GDK_N, search, {.i = XT_SEARCH_PREV} }, /* focus */ - { 0, 0, GDK_F6, focus, {.i = XT_FOCUS_URI} }, - { 0, 0, GDK_F7, focus, {.i = XT_FOCUS_SEARCH} }, + { 0, 0, GDK_F6, focus, {.i = XT_FOCUS_URI} }, + { 0, 0, GDK_F7, focus, {.i = XT_FOCUS_SEARCH} }, /* command aliases (handy when -S flag is used) */ - { 0, 0, GDK_F9, command, {.i = XT_CMD_OPEN} }, - { 0, 0, GDK_F10, command, {.i = XT_CMD_OPEN_CURRENT} }, - { 0, 0, GDK_F11, command, {.i = XT_CMD_TABNEW} }, - { 0, 0, GDK_F12, command, {.i = XT_CMD_TABNEW_CURRENT} }, + { 0, 0, GDK_F9, command, {.i = XT_CMD_OPEN} }, + { 0, 0, GDK_F10, command, {.i = XT_CMD_OPEN_CURRENT} }, + { 0, 0, GDK_F11, command, {.i = XT_CMD_TABNEW} }, + { 0, 0, GDK_F12, command, {.i = XT_CMD_TABNEW_CURRENT} }, /* hinting */ - { 0, 0, GDK_f, hint, {.i = 0} }, + { 0, 0, GDK_f, hint, {.i = 0} }, /* navigation */ - { 0, 0, GDK_BackSpace, navaction, {.i = XT_NAV_BACK} }, - { GDK_MOD1_MASK, 0, GDK_Left, navaction, {.i = XT_NAV_BACK} }, - { GDK_SHIFT_MASK, 0, GDK_BackSpace, navaction, {.i = XT_NAV_FORWARD} }, - { GDK_MOD1_MASK, 0, GDK_Right, navaction, {.i = XT_NAV_FORWARD} }, - { 0, 0, GDK_F5, navaction, {.i = XT_NAV_RELOAD} }, - { GDK_CONTROL_MASK, 0, GDK_r, navaction, {.i = XT_NAV_RELOAD} }, - { GDK_CONTROL_MASK|GDK_SHIFT_MASK, 0, GDK_R, navaction, {.i = XT_NAV_RELOAD_CACHE} }, - { GDK_CONTROL_MASK, 0, GDK_l, navaction, {.i = XT_NAV_RELOAD} }, - { GDK_MOD1_MASK, 1, GDK_f, xtp_page_fl, {0} }, + { 0, 0, GDK_BackSpace, navaction, {.i = XT_NAV_BACK} }, + { MOD1, 0, GDK_Left, navaction, {.i = XT_NAV_BACK} }, + { SHFT, 0, GDK_BackSpace, navaction, {.i = XT_NAV_FORWARD} }, + { MOD1, 0, GDK_Right, navaction, {.i = XT_NAV_FORWARD} }, + { 0, 0, GDK_F5, navaction, {.i = XT_NAV_RELOAD} }, + { CTRL, 0, GDK_r, navaction, {.i = XT_NAV_RELOAD} }, + { CTRL|SHFT, 0, GDK_R, navaction, {.i = XT_NAV_RELOAD_CACHE} }, + { CTRL, 0, GDK_l, navaction, {.i = XT_NAV_RELOAD} }, + { MOD1, 1, GDK_f, xtp_page_fl, {0} }, /* vertical movement */ - { 0, 0, GDK_j, move, {.i = XT_MOVE_DOWN} }, - { 0, 0, GDK_Down, move, {.i = XT_MOVE_DOWN} }, - { 0, 0, GDK_Up, move, {.i = XT_MOVE_UP} }, - { 0, 0, GDK_k, move, {.i = XT_MOVE_UP} }, - { GDK_SHIFT_MASK, 0, GDK_G, move, {.i = XT_MOVE_BOTTOM} }, - { 0, 0, GDK_End, move, {.i = XT_MOVE_BOTTOM} }, - { 0, 0, GDK_Home, move, {.i = XT_MOVE_TOP} }, - { 0, 0, GDK_g, move, {.i = XT_MOVE_TOP} }, /* XXX make this work */ - { 0, 0, GDK_space, move, {.i = XT_MOVE_PAGEDOWN} }, - { GDK_CONTROL_MASK, 0, GDK_f, move, {.i = XT_MOVE_PAGEDOWN} }, - { GDK_CONTROL_MASK, 0, GDK_d, move, {.i = XT_MOVE_HALFDOWN} }, - { 0, 0, GDK_Page_Down, move, {.i = XT_MOVE_PAGEDOWN} }, - { 0, 0, GDK_Page_Up, move, {.i = XT_MOVE_PAGEUP} }, - { GDK_CONTROL_MASK, 0, GDK_b, move, {.i = XT_MOVE_PAGEUP} }, - { GDK_CONTROL_MASK, 0, GDK_u, move, {.i = XT_MOVE_HALFUP} }, + { 0, 0, GDK_j, move, {.i = XT_MOVE_DOWN} }, + { 0, 0, GDK_Down, move, {.i = XT_MOVE_DOWN} }, + { 0, 0, GDK_Up, move, {.i = XT_MOVE_UP} }, + { 0, 0, GDK_k, move, {.i = XT_MOVE_UP} }, + { SHFT, 0, GDK_G, move, {.i = XT_MOVE_BOTTOM} }, + { 0, 0, GDK_End, move, {.i = XT_MOVE_BOTTOM} }, + { 0, 0, GDK_Home, move, {.i = XT_MOVE_TOP} }, + { 0, 0, GDK_g, move, {.i = XT_MOVE_TOP} }, /* XXX make this work */ + { 0, 0, GDK_space, move, {.i = XT_MOVE_PAGEDOWN} }, + { CTRL, 0, GDK_f, move, {.i = XT_MOVE_PAGEDOWN} }, + { CTRL, 0, GDK_d, move, {.i = XT_MOVE_HALFDOWN} }, + { 0, 0, GDK_Page_Down, move, {.i = XT_MOVE_PAGEDOWN} }, + { 0, 0, GDK_Page_Up, move, {.i = XT_MOVE_PAGEUP} }, + { CTRL, 0, GDK_b, move, {.i = XT_MOVE_PAGEUP} }, + { CTRL, 0, GDK_u, move, {.i = XT_MOVE_HALFUP} }, /* horizontal movement */ - { 0, 0, GDK_l, move, {.i = XT_MOVE_RIGHT} }, - { 0, 0, GDK_Right, move, {.i = XT_MOVE_RIGHT} }, - { 0, 0, GDK_Left, move, {.i = XT_MOVE_LEFT} }, - { 0, 0, GDK_h, move, {.i = XT_MOVE_LEFT} }, - { GDK_SHIFT_MASK, 0, GDK_dollar, move, {.i = XT_MOVE_FARRIGHT} }, - { 0, 0, GDK_0, move, {.i = XT_MOVE_FARLEFT} }, + { 0, 0, GDK_l, move, {.i = XT_MOVE_RIGHT} }, + { 0, 0, GDK_Right, move, {.i = XT_MOVE_RIGHT} }, + { 0, 0, GDK_Left, move, {.i = XT_MOVE_LEFT} }, + { 0, 0, GDK_h, move, {.i = XT_MOVE_LEFT} }, + { SHFT, 0, GDK_dollar, move, {.i = XT_MOVE_FARRIGHT} }, + { 0, 0, GDK_0, move, {.i = XT_MOVE_FARLEFT} }, /* tabs */ - { GDK_CONTROL_MASK, 0, GDK_t, tabaction, {.i = XT_TAB_NEW} }, - { GDK_CONTROL_MASK, 1, GDK_w, tabaction, {.i = XT_TAB_DELETE} }, - { GDK_SHIFT_MASK, 0, GDK_U, tabaction, {.i = XT_TAB_UNDO_CLOSE} }, - { GDK_CONTROL_MASK, 0, GDK_1, movetab, {.i = 1} }, - { GDK_CONTROL_MASK, 0, GDK_2, movetab, {.i = 2} }, - { GDK_CONTROL_MASK, 0, GDK_3, movetab, {.i = 3} }, - { GDK_CONTROL_MASK, 0, GDK_4, movetab, {.i = 4} }, - { GDK_CONTROL_MASK, 0, GDK_5, movetab, {.i = 5} }, - { GDK_CONTROL_MASK, 0, GDK_6, movetab, {.i = 6} }, - { GDK_CONTROL_MASK, 0, GDK_7, movetab, {.i = 7} }, - { GDK_CONTROL_MASK, 0, GDK_8, movetab, {.i = 8} }, - { GDK_CONTROL_MASK, 0, GDK_9, movetab, {.i = 9} }, - { GDK_CONTROL_MASK, 0, GDK_0, movetab, {.i = 10} }, - { GDK_CONTROL_MASK|GDK_SHIFT_MASK, 0, GDK_less, movetab, {.i = XT_TAB_FIRST} }, - { GDK_CONTROL_MASK|GDK_SHIFT_MASK, 0, GDK_greater, movetab, {.i = XT_TAB_LAST} }, - { GDK_CONTROL_MASK, 0, GDK_Left, movetab, {.i = XT_TAB_PREV} }, - { GDK_CONTROL_MASK, 0, GDK_Right, movetab, {.i = XT_TAB_NEXT} }, - { GDK_CONTROL_MASK, 0, GDK_minus, resizetab, {.i = -1} }, - { GDK_CONTROL_MASK|GDK_SHIFT_MASK, 0, GDK_plus, resizetab, {.i = 1} }, - { GDK_CONTROL_MASK, 0, GDK_equal, resizetab, {.i = 1} }, + { CTRL, 0, GDK_t, tabaction, {.i = XT_TAB_NEW} }, + { CTRL, 1, GDK_w, tabaction, {.i = XT_TAB_DELETE} }, + { SHFT, 0, GDK_U, tabaction, {.i = XT_TAB_UNDO_CLOSE} }, + { CTRL, 0, GDK_1, movetab, {.i = 1} }, + { CTRL, 0, GDK_2, movetab, {.i = 2} }, + { CTRL, 0, GDK_3, movetab, {.i = 3} }, + { CTRL, 0, GDK_4, movetab, {.i = 4} }, + { CTRL, 0, GDK_5, movetab, {.i = 5} }, + { CTRL, 0, GDK_6, movetab, {.i = 6} }, + { CTRL, 0, GDK_7, movetab, {.i = 7} }, + { CTRL, 0, GDK_8, movetab, {.i = 8} }, + { CTRL, 0, GDK_9, movetab, {.i = 9} }, + { CTRL, 0, GDK_0, movetab, {.i = 10} }, + { CTRL|SHFT, 0, GDK_less, movetab, {.i = XT_TAB_FIRST} }, + { CTRL|SHFT, 0, GDK_greater, movetab, {.i = XT_TAB_LAST} }, + { CTRL, 0, GDK_Left, movetab, {.i = XT_TAB_PREV} }, + { CTRL, 0, GDK_Right, movetab, {.i = XT_TAB_NEXT} }, + { CTRL, 0, GDK_minus, resizetab, {.i = -1} }, + { CTRL|SHFT, 0, GDK_plus, resizetab, {.i = 1} }, + { CTRL, 0, GDK_equal, resizetab, {.i = 1} }, }; struct cmd { @@ -4137,12 +4141,12 @@ struct cmd { { "cookie", 2, cookie_cmd, {0} }, { "cert", 1, cert_cmd, {0} }, { "ca", 0, ca_cmd, {0} }, - { "dl" , 0, xtp_page_dl, {0} }, - { "h" , 0, xtp_page_hl, {0} }, - { "hist" , 0, xtp_page_hl, {0} }, - { "history" , 0, xtp_page_hl, {0} }, - { "home" , 0, go_home, {0} }, - { "restart" , 0, restart, {0} }, + { "dl", 0, xtp_page_dl, {0} }, + { "h", 0, xtp_page_hl, {0} }, + { "hist", 0, xtp_page_hl, {0} }, + { "history", 0, xtp_page_hl, {0} }, + { "home", 0, go_home, {0} }, + { "restart", 0, restart, {0} }, { "urlhide", 0, urlaction, {.i = XT_URL_HIDE} }, { "urlh", 0, urlaction, {.i = XT_URL_HIDE} }, { "urlshow", 0, urlaction, {.i = XT_URL_SHOW} }, |