xquartz: Fold quartzCommon.h into quartz.h
Everything declared in it comes from quartz.c, so match reality. Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
This commit is contained in:
parent
4b4500c48f
commit
f51b97b0de
|
@ -45,7 +45,6 @@ EXTRA_DIST = \
|
||||||
darwinEvents.h \
|
darwinEvents.h \
|
||||||
keysym2ucs.h \
|
keysym2ucs.h \
|
||||||
quartz.h \
|
quartz.h \
|
||||||
quartzCommon.h \
|
|
||||||
quartzKeyboard.h \
|
quartzKeyboard.h \
|
||||||
quartzRandR.h \
|
quartzRandR.h \
|
||||||
sanitizedCarbon.h \
|
sanitizedCarbon.h \
|
||||||
|
|
|
@ -31,6 +31,8 @@
|
||||||
#ifndef X11APPLICATION_H
|
#ifndef X11APPLICATION_H
|
||||||
#define X11APPLICATION_H 1
|
#define X11APPLICATION_H 1
|
||||||
|
|
||||||
|
#include <X11/Xdefs.h>
|
||||||
|
|
||||||
#if __OBJC__
|
#if __OBJC__
|
||||||
|
|
||||||
#import "X11Controller.h"
|
#import "X11Controller.h"
|
||||||
|
|
|
@ -34,8 +34,6 @@
|
||||||
#include <dix-config.h>
|
#include <dix-config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "quartzCommon.h"
|
|
||||||
|
|
||||||
#import "X11Application.h"
|
#import "X11Application.h"
|
||||||
|
|
||||||
#include "darwin.h"
|
#include "darwin.h"
|
||||||
|
|
|
@ -34,8 +34,6 @@
|
||||||
#include <dix-config.h>
|
#include <dix-config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "quartzCommon.h"
|
|
||||||
|
|
||||||
#import "X11Controller.h"
|
#import "X11Controller.h"
|
||||||
#import "X11Application.h"
|
#import "X11Application.h"
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
#include <dix-config.h>
|
#include <dix-config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "quartzCommon.h"
|
#include "quartz.h"
|
||||||
|
|
||||||
#include "misc.h"
|
#include "misc.h"
|
||||||
#include "dixstruct.h"
|
#include "dixstruct.h"
|
||||||
|
|
|
@ -35,7 +35,6 @@
|
||||||
#include <dix-config.h>
|
#include <dix-config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "quartzCommon.h"
|
|
||||||
#include "quartzRandR.h"
|
#include "quartzRandR.h"
|
||||||
#include "inputstr.h"
|
#include "inputstr.h"
|
||||||
#include "quartz.h"
|
#include "quartz.h"
|
||||||
|
|
|
@ -34,6 +34,9 @@
|
||||||
#ifndef _QUARTZ_H
|
#ifndef _QUARTZ_H
|
||||||
#define _QUARTZ_H
|
#define _QUARTZ_H
|
||||||
|
|
||||||
|
#include <X11/Xdefs.h>
|
||||||
|
#include "privates.h"
|
||||||
|
|
||||||
#include "screenint.h"
|
#include "screenint.h"
|
||||||
#include "window.h"
|
#include "window.h"
|
||||||
#include "pixmap.h"
|
#include "pixmap.h"
|
||||||
|
@ -127,6 +130,14 @@ extern Bool XQuartzOptionSendsAlt; /* Alt or Mode_switch? */
|
||||||
|
|
||||||
extern int32_t XQuartzShieldingWindowLevel; /* CGShieldingWindowLevel() or 0 */
|
extern int32_t XQuartzShieldingWindowLevel; /* CGShieldingWindowLevel() or 0 */
|
||||||
|
|
||||||
|
// Other shared data
|
||||||
|
extern DevPrivateKeyRec quartzScreenKeyRec;
|
||||||
|
#define quartzScreenKey (&quartzScreenKeyRec)
|
||||||
|
extern int aquaMenuBarHeight;
|
||||||
|
|
||||||
|
// Name of GLX bundle for native OpenGL
|
||||||
|
extern const char *quartzOpenGLBundle;
|
||||||
|
|
||||||
Bool
|
Bool
|
||||||
QuartzAddScreen(int index, ScreenPtr pScreen);
|
QuartzAddScreen(int index, ScreenPtr pScreen);
|
||||||
Bool
|
Bool
|
||||||
|
|
|
@ -1,49 +0,0 @@
|
||||||
/*
|
|
||||||
* quartzCommon.h
|
|
||||||
*
|
|
||||||
* Common definitions used internally by all Quartz modes
|
|
||||||
*
|
|
||||||
* This file should be included before any X11 or IOKit headers
|
|
||||||
* so that it can avoid symbol conflicts.
|
|
||||||
*
|
|
||||||
* Copyright (c) 2001-2004 Torrey T. Lyons and Greg Parker.
|
|
||||||
* All Rights Reserved.
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
||||||
* copy of this software and associated documentation files (the "Software"),
|
|
||||||
* to deal in the Software without restriction, including without limitation
|
|
||||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
||||||
* and/or sell copies of the Software, and to permit persons to whom the
|
|
||||||
* Software is furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
||||||
* THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
||||||
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
||||||
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
||||||
* DEALINGS IN THE SOFTWARE.
|
|
||||||
*
|
|
||||||
* Except as contained in this notice, the name(s) of the above copyright
|
|
||||||
* holders shall not be used in advertising or otherwise to promote the sale,
|
|
||||||
* use or other dealings in this Software without prior written authorization.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _QUARTZCOMMON_H
|
|
||||||
#define _QUARTZCOMMON_H
|
|
||||||
|
|
||||||
#include <X11/Xdefs.h>
|
|
||||||
#include "privates.h"
|
|
||||||
|
|
||||||
// Other shared data
|
|
||||||
extern DevPrivateKeyRec quartzScreenKeyRec;
|
|
||||||
#define quartzScreenKey (&quartzScreenKeyRec)
|
|
||||||
extern int aquaMenuBarHeight;
|
|
||||||
|
|
||||||
// Name of GLX bundle for native OpenGL
|
|
||||||
extern const char *quartzOpenGLBundle;
|
|
||||||
|
|
||||||
#endif /* _QUARTZCOMMON_H */
|
|
|
@ -35,7 +35,6 @@
|
||||||
#include <dix-config.h>
|
#include <dix-config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "quartzCommon.h"
|
|
||||||
#include "quartzRandR.h"
|
#include "quartzRandR.h"
|
||||||
#include "quartz.h"
|
#include "quartz.h"
|
||||||
#include "darwin.h"
|
#include "darwin.h"
|
||||||
|
|
|
@ -36,7 +36,6 @@
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <CoreFoundation/CoreFoundation.h>
|
#include <CoreFoundation/CoreFoundation.h>
|
||||||
#include "quartzCommon.h"
|
|
||||||
#include "X11Controller.h"
|
#include "X11Controller.h"
|
||||||
#include "darwin.h"
|
#include "darwin.h"
|
||||||
#include "darwinEvents.h"
|
#include "darwinEvents.h"
|
||||||
|
|
|
@ -33,7 +33,6 @@
|
||||||
#include <dix-config.h>
|
#include <dix-config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "quartzCommon.h"
|
|
||||||
#include "inputstr.h"
|
#include "inputstr.h"
|
||||||
#include "quartz.h"
|
#include "quartz.h"
|
||||||
#include "quartzRandR.h"
|
#include "quartzRandR.h"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user