XQuartz: Moved some rootless-specific cruft into xpr

(cherry picked from commit 31625cc03b58317120c2ac7877e227e2322e1de8)
This commit is contained in:
Jeremy Huddleston 2008-04-17 15:49:13 -07:00
commit 652479dba3
5 changed files with 13 additions and 32 deletions

View file

@ -11,6 +11,7 @@ Xquartz_SOURCES = \
dri.c \
xprAppleWM.c \
xprCursor.c \
xprEvent.c \
xprFrame.c \
xprScreen.c \
x-hash.c \
@ -71,4 +72,5 @@ EXTRA_DIST = \
x-hash.h \
x-hook.h \
x-list.h \
xpr.h
xpr.h \
xprEvent.h

View file

@ -30,6 +30,7 @@
#define XPR_H
#include "screenint.h"
#include <Xplugin.h>
Bool QuartzModeBundleInit(void);
@ -37,6 +38,7 @@ void AppleDRIExtensionInit(void);
void xprAppleWMInit(void);
Bool xprInit(ScreenPtr pScreen);
Bool xprIsX11Window(void *nsWindow, int windowNumber);
WindowPtr xprGetXWindow(xp_window_id wid);
void xprHideWindows(Bool hide);

View file

@ -35,6 +35,7 @@
#include "inputstr.h"
#include "quartz.h"
#include "xpr.h"
#include "xprEvent.h"
#include "pseudoramiX.h"
#include "darwin.h"
#include "rootless.h"
@ -44,9 +45,6 @@
#include "applewmExt.h"
#include "micmap.h"
// From xprFrame.c
WindowPtr xprGetXWindow(xp_window_id wid);
#ifdef DAMAGE
# include "damage.h"
#endif