qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge the 2 common header files; specific includes to be pulled out as

Browse Source 
separate commits.

ok oga@
This commit is contained in:
okan 2009-12-15 03:24:36 +00:00
parent f329c77f5e
commit 9dfa8ad14a
18 changed files with 43 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/cwm/calmwm.c
View File

@ -15,10 +15,9 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $Id: calmwm.c,v 1.48 2009/12/10 23:14:58 oga Exp $
* $Id: calmwm.c,v 1.49 2009/12/15 03:24:36 okan Exp $
*/
#include "headers.h"
#include "calmwm.h"
Display *X_Dpy;

29
app/cwm/calmwm.h
View File

@ -15,12 +15,39 @@
* 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.110 2009/12/14 16:39:01 oga Exp $
* $Id: calmwm.h,v 1.111 2009/12/15 03:24:36 okan Exp $
*/
#ifndef _CALMWM_H_
#define _CALMWM_H_
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/stat.h>
#include <sys/wait.h>
#include <assert.h>
#include <ctype.h>
#include <err.h>
#include <errno.h>
#include <dirent.h>
#include <getopt.h>
#include <signal.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <unistd.h>
#include <X11/Xatom.h>
#include <X11/Xft/Xft.h>
#include <X11/Xlib.h>
#include <X11/Xproto.h>
#include <X11/Xutil.h>
#include <X11/cursorfont.h>
#include <X11/extensions/Xinerama.h>
#include <X11/extensions/Xrandr.h>
#include <X11/keysym.h>
#define CALMWM_MAXNAMELEN 256
#undef MIN

3
app/cwm/client.c
View File

@ -15,10 +15,9 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $Id: client.c,v 1.69 2009/12/10 17:16:51 oga Exp $
* $Id: client.c,v 1.70 2009/12/15 03:24:36 okan Exp $
*/
#include "headers.h"
#include "calmwm.h"
static struct client_ctx *client_mrunext(struct client_ctx *);

3
app/cwm/conf.c
View File

@ -15,10 +15,9 @@
* 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.73 2009/12/11 17:51:42 oga Exp $
* $Id: conf.c,v 1.74 2009/12/15 03:24:36 okan Exp $
*/
#include "headers.h"
#include "calmwm.h"
#ifndef timespeccmp

1
app/cwm/font.c
View File

@ -16,7 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include "headers.h"
#include "calmwm.h"
void

3
app/cwm/group.c
View File

@ -16,10 +16,9 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $Id: group.c,v 1.39 2009/12/14 16:39:01 oga Exp $
* $Id: group.c,v 1.40 2009/12/15 03:24:36 okan Exp $
*/
#include "headers.h"
#include "calmwm.h"
static void group_add(struct group_ctx *, struct client_ctx *);

53
app/cwm/headers.h
View File

@ -1,53 +0,0 @@
/*
* calmwm - the calm window manager
*
* Copyright (c) 2004 Marius Aamodt Eriksen <marius@monkey.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $Id: headers.h,v 1.10 2009/04/12 23:51:10 okan Exp $
*/
#ifndef _CALMWM_HEADERS_H_
#define _CALMWM_HEADERS_H_
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/stat.h>
#include <sys/wait.h>
#include <assert.h>
#include <ctype.h>
#include <err.h>
#include <errno.h>
#include <dirent.h>
#include <getopt.h>
#include <signal.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <unistd.h>
#include <X11/Intrinsic.h>
#include <X11/Xatom.h>
#include <X11/Xft/Xft.h>
#include <X11/Xlib.h>
#include <X11/Xos.h>
#include <X11/Xproto.h>
#include <X11/Xutil.h>
#include <X11/cursorfont.h>
#include <X11/extensions/Xinerama.h>
#include <X11/extensions/Xrandr.h>
#include <X11/keysym.h>
#endif /* _CALMWM_HEADERS_H_ */

3
app/cwm/input.c
View File

@ -15,10 +15,9 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $Id: input.c,v 1.8 2009/06/20 00:55:42 okan Exp $
* $Id: input.c,v 1.9 2009/12/15 03:24:36 okan Exp $
*/
#include "headers.h"
#include "calmwm.h"
int

3
app/cwm/kbfunc.c
View File

@ -15,12 +15,11 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $Id: kbfunc.c,v 1.47 2009/12/10 17:16:51 oga Exp $
* $Id: kbfunc.c,v 1.48 2009/12/15 03:24:36 okan Exp $
*/
#include <paths.h>
#include "headers.h"
#include "calmwm.h"
#define KNOWN_HOSTS ".ssh/known_hosts"

1
app/cwm/menu.c
View File

@ -15,7 +15,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include "headers.h"
#include "calmwm.h"
#define PROMPT_SCHAR '»'

3
app/cwm/mousefunc.c
View File

@ -16,10 +16,9 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $Id: mousefunc.c,v 1.17 2009/12/10 17:16:51 oga Exp $
* $Id: mousefunc.c,v 1.18 2009/12/15 03:24:36 okan Exp $
*/
#include "headers.h"
#include "calmwm.h"
static int mousefunc_sweep_calc(struct client_ctx *, int, int, int, int);

3
app/cwm/parse.y
View File

@ -1,4 +1,4 @@
/* $OpenBSD: parse.y,v 1.22 2009/12/11 17:51:42 oga Exp $ */
/* $OpenBSD: parse.y,v 1.23 2009/12/15 03:24:36 okan Exp $ */
/*
* Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@ -29,7 +29,6 @@
#include <stdlib.h>
#include <string.h>
#include "headers.h"
#include "calmwm.h"
TAILQ_HEAD(files, file) files = TAILQ_HEAD_INITIALIZER(files);

3
app/cwm/screen.c
View File

@ -15,10 +15,9 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $Id: screen.c,v 1.23 2009/12/11 18:09:16 oga Exp $
* $Id: screen.c,v 1.24 2009/12/15 03:24:36 okan Exp $
*/
#include "headers.h"
#include "calmwm.h"
struct screen_ctx *

4
app/cwm/search.c
View File

@ -14,11 +14,11 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $Id: search.c,v 1.17 2009/06/26 12:45:12 oga Exp $
* $Id: search.c,v 1.18 2009/12/15 03:24:36 okan Exp $
*/
#include <fnmatch.h>
#include "headers.h"
#include "calmwm.h"
static int strsubmatch(char *, char *, int);

3
app/cwm/util.c
View File

@ -15,10 +15,9 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $Id: util.c,v 1.10 2008/07/11 14:21:28 okan Exp $
* $Id: util.c,v 1.11 2009/12/15 03:24:36 okan Exp $
*/
#include "headers.h"
#include "calmwm.h"
#define MAXARGLEN 20

3
app/cwm/xevents.c
View File

@ -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: xevents.c,v 1.47 2009/12/11 17:51:42 oga Exp $
* $Id: xevents.c,v 1.48 2009/12/15 03:24:36 okan Exp $
*/
/*
@ -24,7 +24,6 @@
* management of the xevent's.
*/
#include "headers.h"
#include "calmwm.h"
static void xev_handle_maprequest(XEvent *);

3
app/cwm/xmalloc.c
View File

@ -15,10 +15,9 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $Id: xmalloc.c,v 1.4 2008/07/11 14:21:28 okan Exp $
* $Id: xmalloc.c,v 1.5 2009/12/15 03:24:36 okan Exp $
*/
#include "headers.h"
#include "calmwm.h"
void *

3
app/cwm/xutil.c
View File

@ -15,10 +15,9 @@
* 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.27 2009/12/14 16:39:01 oga Exp $
* $Id: xutil.c,v 1.28 2009/12/15 03:24:36 okan Exp $
*/
#include "headers.h"
#include "calmwm.h"
static unsigned int ign_mods[] = { 0, LockMask, Mod2Mask, Mod2Mask | LockMask };