summary refs log tree commit diff
path: root/calmwm.h
diff options
context:
space:
mode:
authoroga <oga>2008-01-16 11:39:20 +0000
committeroga <oga>2008-01-16 11:39:20 +0000
commit7fb2664f92a087762ab58158ab5c4f7c442bcd1b (patch)
tree3a933e2d545f729de0a4340161f080c762693619 /calmwm.h
parent1eed217b1c54d32d3c9269be79c3cb298b4b2805 (diff)
downloadcwm-7fb2664f92a087762ab58158ab5c4f7c442bcd1b.tar.gz
cwm-7fb2664f92a087762ab58158ab5c4f7c442bcd1b.tar.xz
cwm-7fb2664f92a087762ab58158ab5c4f7c442bcd1b.zip
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 'calmwm.h')
-rw-r--r--calmwm.h11
1 files changed, 4 insertions, 7 deletions
diff --git a/calmwm.h b/calmwm.h
index dd9371c..e4f463d 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -311,8 +311,7 @@ int input_keycodetrans(KeyCode, u_int, enum ctltype *, char *, int);
 int   x_errorhandler(Display *, XErrorEvent *);
 void  x_setup(char *display_name);
 char *x_screenname(int);
-void  x_loop(void);
-int   x_setupscreen(struct screen_ctx *, u_int);
+void  x_setupscreen(struct screen_ctx *, u_int);
 
 struct client_ctx *client_find(Window);
 void               client_setup(void);
@@ -397,8 +396,8 @@ int dirent_isdir(char *);
 int dirent_islink(char *);
 int u_spawn(char *);
 
-int   grab_sweep(struct client_ctx *);
-int   grab_drag(struct client_ctx *);
+void  grab_sweep(struct client_ctx *);
+void  grab_drag(struct client_ctx *);
 void  grab_menuinit(struct screen_ctx *);
 void *grab_menu(XButtonEvent *, struct menu_q *);
 void  grab_label(struct client_ctx *);
@@ -472,8 +471,7 @@ void  search_match_exec(struct menu_q *, struct menu_q *, char *);
 void  search_rank_text(struct menu_q *, char *);
 
 void group_init(void);
-int  group_new(void);
-int  group_select(int);
+void group_select(int);
 void group_enter(void);
 void group_exit(int);
 void group_click(struct client_ctx *);
@@ -509,7 +507,6 @@ struct fontdesc *font_getx(struct screen_ctx *sc, const char *name);
 /* Externs */
 
 extern Display				*X_Dpy;
-extern XFontStruct			*X_Font;
 
 extern Cursor				 Cursor_move;
 extern Cursor				 Cursor_resize;