summaryrefslogtreecommitdiff
path: root/app/cwm/calmwm.h
diff options
context:
space:
mode:
authorOwain Ainsworth <oga@cvs.openbsd.org>2008-01-16 11:39:21 +0000
committerOwain Ainsworth <oga@cvs.openbsd.org>2008-01-16 11:39:21 +0000
commit64235bdf319891cb1c808dfc5643d3a43e175964 (patch)
tree3027c252f1ecd5e4eaa277ca73d9f67cde1b337d /app/cwm/calmwm.h
parent6173bfbec7ad3d75a2e626a2a1c9e75b432d0ae6 (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/calmwm.h')
-rw-r--r--app/cwm/calmwm.h13
1 files changed, 5 insertions, 8 deletions
diff --git a/app/cwm/calmwm.h b/app/cwm/calmwm.h
index a212218f7..50e7c3329 100644
--- a/app/cwm/calmwm.h
+++ b/app/cwm/calmwm.h
@@ -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.18 2008/01/14 15:21:10 oga Exp $
+ * $Id: calmwm.h,v 1.19 2008/01/16 11:39:20 oga Exp $
*/
#ifndef _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;