diff options
| author | sabetts <sabetts> | 2003-09-02 17:33:58 +0000 |
|---|---|---|
| committer | sabetts <sabetts> | 2003-09-02 17:33:58 +0000 |
| commit | 2a16e44fccc006966c0e282ce0ba4a808e15e776 (patch) | |
| tree | 9f8017f42396d028466851c76f6eb72a7cc305b9 /src/actions.h | |
| parent | 8122f90155b54a948bc062d496de373f891a43f6 (diff) | |
| download | ratpoison-2a16e44fccc006966c0e282ce0ba4a808e15e776.zip | |
* src/main.c (show_welcome_message): search the root keymap for
the help binding.
(clean_up): call free_keymaps and not free_keybindings.
* src/events.c (handle_key): call cmd_readkey to hand actually
reading a key from the keyboard.
* src/data.h (typedef rp_keymap): new typedef
(struct rp_keymap): new struct
* src/conf.h (ROOT_KEYMAP): new define
* src/actions.h (cmd_readkey): new prototype
(cmd_newkmap): likewise
(cmd_delkmap): likewise
(cmd_definekey): likewise
(find_keymap): likewise
(keymap_free): likewise
(free_keymaps): likewise
* src/actions.c (rp_keymaps): new global. remove globals
key_actions, key_actions_last, and key_actions_table_size.
(user_commands): remove bind and unbind. New commands readkey,
newkmap, delkmap, and definekey.
(find_keybinding_by_action): take a rp_keymap argument and operate
on it. All callers updated.
(find_keybinding): likewise
(find_command_by_keydesc): likewise
(resolve_command_from_keydesc): likewise
(add_keybinding): likewise
(remove_keybinding): likewise
(cmd_definekey): new function
(cmd_newkmap): likewise
(cmd_delkmap): likewise
(keymap_new): likewise
(keymap_free): likewise
(find_keymap): likewise
(free_keymaps): likewise
(cmd_bind): remove function. Prototype removed.
(cmd_unbind): likewise
(initialize_default_keybindings): add aliases for unbind and bind.
(ungrab_rat): moved from events.c
(grab_rat): likewise
Diffstat (limited to 'src/actions.h')
| -rw-r--r-- | src/actions.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/actions.h b/src/actions.h index 98a50d3..2063cc6 100644 --- a/src/actions.h +++ b/src/actions.h @@ -136,11 +136,18 @@ char *cmd_verbexec (int interactive, char *data); char *cmd_version (int interactive, char *data); char *cmd_warp(int interactive, char *data); char *cmd_windows (int interactive, char *data); +char *cmd_readkey (int interactive, char *data); +char *cmd_newkmap (int interactive, char *data); +char *cmd_delkmap (int interactive, char *data); +char *cmd_definekey (int interactive, char *data); +rp_keymap *find_keymap (char *name); void initialize_default_keybindings (void); -void free_keybindings (); +void keymap_free (rp_keymap *map); void free_aliases (); -rp_action* find_keybinding (KeySym keysym, int state); -rp_action* find_keybinding_by_action (char *action); +void free_keymaps (); +rp_action* find_keybinding (KeySym keysym, int state, rp_keymap *map); +rp_action* find_keybinding_by_action (char *action, rp_keymap *map); + #endif /* ! _RATPOISON_ACTIONS_H */ |