diff options
| author | simon <simon> | 2008-03-23 15:09:21 +0000 |
|---|---|---|
| committer | simon <simon> | 2008-03-23 15:09:21 +0000 |
| commit | c3aa344e7836f4214f6cff6e2fa7c0297e7da16e (patch) | |
| tree | 2c07ad69a106a4c5f33744f0001e97d731969e21 /kbfunc.c | |
| parent | 38ff7a904ede4e6412e5d89844e62b60e2c90fdb (diff) | |
| download | cwm-c3aa344e7836f4214f6cff6e2fa7c0297e7da16e.tar.gz cwm-c3aa344e7836f4214f6cff6e2fa7c0297e7da16e.tar.xz cwm-c3aa344e7836f4214f6cff6e2fa7c0297e7da16e.zip | |
Replace the symlink configuration scheme with a simple yacc parser as
found in other places of the tree. Remove sticky and font commandline options and add another one for alternative config locations. Split off cwmrc(5) from cwm(1), nuke #ifdef __OpenBSD__ while there. tested by various kind people, feedback from oga@ and okan@ - thanks! ok oga@, jasper@, okan@
Diffstat (limited to 'kbfunc.c')
| -rw-r--r-- | kbfunc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kbfunc.c b/kbfunc.c index b71c8fd..8192cae 100644 --- a/kbfunc.c +++ b/kbfunc.c @@ -204,7 +204,7 @@ kbfunc_menu_search(struct client_ctx *scratch, void *arg) TAILQ_INIT(&menuq); - conf_cmd_refresh(&Conf); + conf_reload(&Conf); TAILQ_FOREACH(cmd, &Conf.cmdq, entry) { XCALLOC(mi, struct menu); strlcpy(mi->text, cmd->label, sizeof(mi->text)); @@ -249,14 +249,14 @@ kbfunc_cmdexec(struct client_ctx *cc, void *arg) void kbfunc_term(struct client_ctx *cc, void *arg) { - conf_cmd_refresh(&Conf); + conf_reload(&Conf); u_spawn(Conf.termpath); } void kbfunc_lock(struct client_ctx *cc, void *arg) { - conf_cmd_refresh(&Conf); + conf_reload(&Conf); u_spawn(Conf.lockpath); } @@ -423,7 +423,7 @@ kbfunc_ssh(struct client_ctx *scratch, void *arg) if ((mi = search_start(&menuq, search_match_exec, NULL, "ssh", 1)) != NULL) { - conf_cmd_refresh(&Conf); + conf_reload(&Conf); l = snprintf(cmd, sizeof(cmd), "%s -e ssh %s", Conf.termpath, mi->text); if (l != -1 && l < sizeof(cmd)) |