e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Header file tweaks and cosmetics. 

Primarily, don't include Xlib.h from other headers than xtypes.h.
This commit is contained in:
Kim Woelders 2013-12-28 13:07:33 +01:00
parent 8afc7eca2e
commit 9fc7dc7f5e
16 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/E.h
View File

@ -31,9 +31,6 @@
#include "lang.h"
#include "sounds.h"
#include "util.h"
#include <X11/X.h>
#include "xtypes.h"
#include <stdio.h>

4
src/aclass.h
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2008 Kim Woelders
* Copyright (C) 2004-2013 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -24,8 +24,8 @@
#ifndef _ACLASS_H
#define _ACLASS_H
#include <X11/Xlib.h>
#include "etypes.h"
#include "xtypes.h"
/* aclass.c */
int AclassConfigLoad(FILE * fs);

2
src/borders.h
View File

@ -24,10 +24,10 @@
#ifndef _BORDERS_H_
#define _BORDERS_H_
#include <X11/Xlib.h>
#include "eimage.h"
#include "etypes.h"
#include "list.h"
#include "xtypes.h"
typedef struct {
int min, max;

2
src/buttons.h
View File

@ -24,9 +24,9 @@
#ifndef _BUTTONS_H_
#define _BUTTONS_H_
#include <X11/Xlib.h>
#include "eobj.h"
#include "etypes.h"
#include "xtypes.h"
typedef void (ButtonCbFunc) (void *prm, XEvent * ev, ActionClass * ac);

3
src/container.h
View File

@ -24,9 +24,10 @@
#ifndef _CONTAINER_H_
#define _CONTAINER_H_
#include <X11/Xlib.h>
#include "eimage.h"
#include "etypes.h"
#include "list.h"
#include "xtypes.h"
typedef struct _container Container;

3
src/eimage.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2004-2009 Kim Woelders
* Copyright (C) 2004-2013 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -23,7 +23,6 @@
#ifndef _EIMAGE_H_
#define _EIMAGE_H_
#include <X11/X.h>
#include "xtypes.h"
typedef void EImage;

2
src/events.c
View File

@ -206,7 +206,7 @@ EInputQueryVersion(Display * dpy,
return XIQueryVersion(dpy, major_version_return, minor_version_return);
}
#include "X11/extensions/XInput.h"
#include <X11/extensions/XInput.h>
static void
ExtInitInput(int available)

2
src/events.h
View File

@ -23,7 +23,7 @@
#ifndef _EVENTS_H_
#define _EVENTS_H_
#include <X11/Xlib.h>
#include "xtypes.h"
/* Re-mapped X-events */
#define EX_EVENT_CREATE_GONE 64

5
src/focus.h
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2010 Kim Woelders
* Copyright (C) 2004-2013 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -24,7 +24,8 @@
#ifndef _FOCUS_H_
#define _FOCUS_H_
#include <X11/Xlib.h>
#include "etypes.h"
#include "xtypes.h"
/* focus.c */
#define FOCUS_NOP 0

4
src/grabs.c
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2012 Kim Woelders
* Copyright (C) 2004-2013 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -26,7 +26,7 @@
#include "grabs.h"
#include "xwin.h"
#if USE_XI2
#include "X11/extensions/XInput2.h"
#include <X11/extensions/XInput2.h>
#define DEV_PTR Mode.events.xi2_ptr
#define DEV_KBD Mode.events.xi2_kbd
#endif

1
src/hints.h
View File

@ -24,7 +24,6 @@
#ifndef _HINTS_H_
#define _HINTS_H_
#include <X11/Xlib.h>
#include "etypes.h"
#include "xprop.h"
#include "xwin.h"

5
src/hiwin.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2008 Kim Woelders
* Copyright (C) 2005-2013 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -23,7 +23,8 @@
#ifndef _HIWIN_H_
#define _HIWIN_H_
#include <X11/Xlib.h>
#include "etypes.h"
#include "xtypes.h"
typedef struct _hiwin Hiwin;

2
src/x.c
View File

@ -38,7 +38,7 @@
#include "eglx.h"
#endif
#if USE_XI2
#include "X11/extensions/XInput2.h"
#include <X11/extensions/XInput2.h>
#endif
#define DEBUG_XWIN 0

2
src/xprop.h
View File

@ -85,7 +85,7 @@ void ex_window_prop_string_set(EX_Window win, EX_Atom atom,
char *ex_window_prop_string_get(EX_Window win, EX_Atom atom);
/* Misc. */
#include "X11/Xatom.h"
#include <X11/Xatom.h>
extern EX_Atom atoms_icccm[];
#define EX_ATOM_UTF8_STRING atoms_icccm[8]

4
src/xtypes.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2008 Kim Woelders
* Copyright (C) 2008-2013 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -23,6 +23,8 @@
#ifndef _XTYPES_H_
#define _XTYPES_H_
#include <X11/Xlib.h>
typedef struct _xwin *Win;
#endif /* _XTYPES_H_ */

3
src/xwin.h
View File

@ -24,7 +24,6 @@
#ifndef _XWIN_H_
#define _XWIN_H_
#include <X11/Xlib.h>
#include "util.h"
#include "xtypes.h"
@ -343,7 +342,7 @@ Pixmap EWindowGetPixmap(const Win win);
#endif /* USE_COMPOSITE */
#if USE_XI2
#include "X11/extensions/XInput2.h"
#include <X11/extensions/XInput2.h>
typedef struct {
XIEventMask em;