diff options
| author | simon | 2008-03-23 15:09:21 +0000 |
|---|---|---|
| committer | simon | 2008-03-23 15:09:21 +0000 |
| commit | c4305125daf980f2946ab783a9e7b41f64db86a6 (patch) | |
| tree | e224a57c65a6cbea07dcd258114830e36a339b6f /kbfunc.c | |
| parent | d9fdf622d3c096c997dc709afe0be62e4599d500 (diff) | |
| download | cwm-c4305125daf980f2946ab783a9e7b41f64db86a6.tar.gz | |
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 '')
| -rw-r--r-- | kbfunc.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: kbfunc.c,v 1.15 2008/03/22 15:09:45 oga Exp $ + * $Id: kbfunc.c,v 1.16 2008/03/23 15:09:21 simon Exp $ */ #include <paths.h> @@ -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)) |