diff options
author | oga | 2008-01-16 11:39:20 +0000 |
---|---|---|
committer | oga | 2008-01-16 11:39:20 +0000 |
commit | 475e835196e065d2010dc146b3ca01598b554893 (patch) | |
tree | f2ef0da87afd85a3a3bd26c4cf3e13647a69a05c /conf.c | |
parent | 923c9f8936be6a656e3f9b6607c69a820b411330 (diff) | |
download | cwm-475e835196e065d2010dc146b3ca01598b554893.tar.gz |
huge amount of cleanup and dead code removal.
full description of changes:
-remove fontlist, and all associated structures/calls, it's not needed.
this also removes any doubt about leftover 9wm code (the list was
borrowed from it). Since cwm now uses Xft for everything, the legacy
font handling is just not needed.
-add /* FALLTHROUGH */ comments into grab_{label,menu}. I actually
didn't intend grab_menu to be a fallthrough, but it actually works quite
well there, so remove the extra rectangle drawing. I love it when that
happens.
-remove a couple of unused prototypes that were obviously missed
before.
-remove a bunch of commented out or if 0ed out code. It doesn't look to
be coming back anytime soon.
-several functions returned an int, but this was never checked. most of
them only failed if they failed to grab the pointer (thus the internal
state didn't change), so just make them void and return early if this is
the case.
-remove several unused functions and some useless variables.
knocks something like 200bytes off the stripped binary size for me.
ok marc@, tested by several others.
Diffstat (limited to '')
-rw-r--r-- | conf.c | 32 |
1 files changed, 1 insertions, 31 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: conf.c,v 1.19 2008/01/11 16:06:44 oga Exp $ + * $Id: conf.c,v 1.20 2008/01/16 11:39:20 oga Exp $ */ #include "headers.h" @@ -327,19 +327,6 @@ conf_get_int(struct client_ctx *cc, enum conftype ctype) return (val); } -char * -conf_get_str(struct client_ctx *cc, enum conftype ctype) -{ - switch (ctype) { - case CONF_NOTIFIER: - return xstrdup("./notifier.py"); /* XXX */ - break; - default: - break; - } - return NULL; -} - void conf_client(struct client_ctx *cc) { @@ -410,23 +397,6 @@ struct { }; void -conf_bindkey(struct conf *c, void (*arg_callback)(struct client_ctx *, void *), - int arg_keysym, int arg_modmask, int arg_flags, void * arg_arg) -{ - struct keybinding *kb; - - XMALLOC(kb, struct keybinding); - - kb->modmask = arg_modmask; - kb->keysym = arg_keysym; - kb->keycode = 0; - kb->flags = arg_flags; - kb->callback = arg_callback; - kb->argument = arg_arg; - TAILQ_INSERT_TAIL(&c->keybindingq, kb, entry); -} - -void conf_parsekeys(struct conf *c, char *filename) { DIR *dir; |