diff options
author | Owain Ainsworth <oga@cvs.openbsd.org> | 2008-01-16 11:39:21 +0000 |
---|---|---|
committer | Owain Ainsworth <oga@cvs.openbsd.org> | 2008-01-16 11:39:21 +0000 |
commit | 64235bdf319891cb1c808dfc5643d3a43e175964 (patch) | |
tree | 3027c252f1ecd5e4eaa277ca73d9f67cde1b337d /app/cwm/xutil.c | |
parent | 6173bfbec7ad3d75a2e626a2a1c9e75b432d0ae6 (diff) |
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 'app/cwm/xutil.c')
-rw-r--r-- | app/cwm/xutil.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/app/cwm/xutil.c b/app/cwm/xutil.c index b74b3f78c..59efd819d 100644 --- a/app/cwm/xutil.c +++ b/app/cwm/xutil.c @@ -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: xutil.c,v 1.3 2008/01/11 16:06:44 oga Exp $ + * $Id: xutil.c,v 1.4 2008/01/16 11:39:20 oga Exp $ */ #include "headers.h" @@ -84,16 +84,6 @@ xu_key_grab(Window win, int mask, int keysym) XGrabKey(X_Dpy, XKeysymToKeycode(X_Dpy, keysym), mask, win, True, GrabModeAsync, GrabModeAsync); -#if 0 - XGrabKey(X_Dpy, XKeysymToKeycode(X_Dpy, keysym), LockMask|mask, - win, True, GrabModeAsync, GrabModeAsync); -#endif -} - -void -xu_key_grab_keycode(Window win, int mask, int keycode) -{ - XGrabKey(X_Dpy, keycode, mask, win, True, GrabModeAsync, GrabModeAsync); } void @@ -144,17 +134,6 @@ xu_getstate(struct client_ctx *cc, int *state) return (0); } -char * -xu_getstrprop(struct client_ctx *cc, Atom atm) -{ - u_char *cp; - - if (xu_getprop(cc, atm, XA_STRING, 100L, &cp) <= 0) - return (NULL); - - return ((char *)cp); -} - void xu_setstate(struct client_ctx *cc, int state) { |