diff options
| -rw-r--r-- | src/actions.c | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/src/actions.c b/src/actions.c index fa09593..d278a75 100644 --- a/src/actions.c +++ b/src/actions.c @@ -99,8 +99,6 @@ struct set_var struct list_head node; }; -LIST_HEAD(set_vars); - struct user_command { char *name; @@ -116,12 +114,30 @@ struct user_command struct list_head node; }; -LIST_HEAD(user_commands); +typedef struct +{ + char *name; + char *alias; +} alias_t; + + + +static LIST_HEAD(user_commands); +static LIST_HEAD(rp_keymaps); +static LIST_HEAD(set_vars); + +static alias_t *alias_list; +static int alias_list_size; +static int alias_list_last; + +static const char invalid_negative_arg[] = "invalid negative argument"; -/* rp_keymaps is ratpoison's list of keymaps. */ -LIST_HEAD(rp_keymaps); +static cmdret* frestore (char *data, rp_screen *s); +static char* fdump (rp_screen *screen); +static int spawn(char *data, int raw, rp_frame *frame); + /* setter function prototypes */ static cmdret * set_resizeunit (struct cmdarg **args); static cmdret * set_wingravity (struct cmdarg **args); @@ -274,6 +290,8 @@ static cmdret *cmd_redo (int interactive, struct cmdarg **args); static cmdret *cmd_putsel (int interactive, struct cmdarg **args); static cmdret *cmd_getsel (int interactive, struct cmdarg **args); + + static void add_set_var (char *name, cmdret * (*fn)(struct cmdarg **), int nargs, ...) { @@ -602,22 +620,6 @@ init_user_commands(void) init_set_vars(); } -typedef struct -{ - char *name; - char *alias; -} alias_t; - -static alias_t *alias_list; -static int alias_list_size; -static int alias_list_last; -static const char *invalid_negative_arg = "invalid negative argument"; - -static cmdret* frestore (char *data, rp_screen *s); -static char* fdump (rp_screen *screen); -static int spawn(char *data, int raw, rp_frame *frame); - - /* Delete all entries in the redo list. */ static void clear_frame_redos (void) |