Header file tweaks and cosmetics.
Primarily, don't include Xlib.h from other headers than xtypes.h.
This commit is contained in:
parent
8afc7eca2e
commit
9fc7dc7f5e
3
src/E.h
3
src/E.h
|
@ -31,9 +31,6 @@
|
|||
#include "lang.h"
|
||||
#include "sounds.h"
|
||||
#include "util.h"
|
||||
|
||||
#include <X11/X.h>
|
||||
|
||||
#include "xtypes.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -24,7 +24,6 @@
|
|||
#ifndef _HINTS_H_
|
||||
#define _HINTS_H_
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
#include "etypes.h"
|
||||
#include "xprop.h"
|
||||
#include "xwin.h"
|
||||
|
|
|
@ -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
2
src/x.c
|
@ -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
|
||||
|
|
|
@ -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]
|
||||
|
|
|
@ -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_ */
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue