diff options
| -rw-r--r-- | calmwm.h | 16 | ||||
| -rw-r--r-- | conf.c | 46 | ||||
| -rw-r--r-- | parse.y | 3 |
3 files changed, 13 insertions, 52 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: calmwm.h,v 1.40 2008/05/18 19:38:18 oga Exp $ + * $Id: calmwm.h,v 1.41 2008/05/18 19:43:50 oga Exp $ */ #ifndef _CALMWM_H_ @@ -32,10 +32,6 @@ #define CONFFILE ".cwmrc" -enum conftype { - CONF_BWIDTH, CONF_IGNORE, -}; - #define ChildMask (SubstructureRedirectMask|SubstructureNotifyMask) #define ButtonMask (ButtonPressMask|ButtonReleaseMask) #define MouseMask (ButtonMask|PointerMotionMask) @@ -215,12 +211,9 @@ TAILQ_HEAD(xevent_q, xevent); * Match a window. */ #define CONF_MAX_WINTITLE 256 -#define CONF_IGNORECASE 0x01 struct winmatch { TAILQ_ENTRY(winmatch) entry; - - char title[CONF_MAX_WINTITLE]; - int opts; + char title[CONF_MAX_WINTITLE]; }; TAILQ_HEAD(winmatch_q, winmatch); @@ -422,16 +415,11 @@ struct screen_ctx *screen_current(void); void screen_updatestackingorder(void); void conf_setup(struct conf *, const char *); -int conf_get_int(struct client_ctx *, enum conftype); void conf_client(struct client_ctx *); -void conf_bindkey(struct conf *, - void (*)(struct client_ctx *, void *), - int, int, int, void *); void conf_bindname(struct conf *, char *, char *); void conf_unbind(struct conf *, struct keybinding *); int conf_changed(char *); void conf_reload(struct conf *); -char *conf_get_str(struct client_ctx *, enum conftype); void kbfunc_client_lower(struct client_ctx *, void *); void kbfunc_client_raise(struct client_ctx *, void *); @@ -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: conf.c,v 1.29 2008/05/15 22:18:00 oga Exp $ + * $Id: conf.c,v 1.30 2008/05/18 19:43:50 oga Exp $ */ #include "headers.h" @@ -174,53 +174,27 @@ conf_setup(struct conf *c, const char *conffile) (void)parse_config(c->conf_path, c); } -int -conf_get_int(struct client_ctx *cc, enum conftype ctype) +void +conf_client(struct client_ctx *cc) { - int val = -1, ignore = 0; - char *wname; - struct winmatch *wm; - - wname = cc->name; + struct winmatch *wm; + char *wname = cc->name; + int ignore = 0; /* Can wname be NULL? */ - if (wname != NULL) { TAILQ_FOREACH(wm, &Conf.ignoreq, entry) { - int (*cmpfun)(const char *, const char *, size_t) = - wm->opts & CONF_IGNORECASE ? strncasecmp : strncmp; - if ((*cmpfun)(wm->title, wname, strlen(wm->title)) == 0) { + if (strncasecmp(wm->title, wname, strlen(wm->title)) + == 0) { ignore = 1; break; } } - } else ignore = 1; - switch (ctype) { - case CONF_BWIDTH: - /* - * XXX this will be a list, specified in the - * configuration file. - */ - val = ignore ? 0 : 3; - break; - case CONF_IGNORE: - val = ignore; - break; - default: - break; - } - - return (val); -} - -void -conf_client(struct client_ctx *cc) -{ - cc->bwidth = conf_get_int(cc, CONF_BWIDTH); - cc->flags |= conf_get_int(cc, CONF_IGNORE) ? CLIENT_IGNORE : 0; + cc->bwidth = ignore ? 0 : 3; + cc->flags |= ignore ? CLIENT_IGNORE : 0; } struct { @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.7 2008/05/18 19:34:09 oga Exp $ */ +/* $OpenBSD: parse.y,v 1.8 2008/05/18 19:43:50 oga Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -152,7 +152,6 @@ main : FONTNAME STRING { XCALLOC(wm, struct winmatch); strlcpy(wm->title, $2, sizeof(wm->title)); - wm->opts |= CONF_IGNORECASE; TAILQ_INSERT_TAIL(&conf->ignoreq, wm, entry); free($2); |