fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-20 22:10:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

XQuartz: Use applewmproto 1.4 updated headers.

Browse source
This commit is contained in:
Jeremy Huddleston 2009-08-25 20:11:38 -07:00
parent 1755239330
commit 203df06c0e
8 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -1651,7 +1651,7 @@ if test "x$XQUARTZ" = xyes; then
CFLAGS="${CFLAGS} -DROOTLESS_WORKAROUND -DROOTLESS_SAFEALPHA -DNO_ALLOCA" CFLAGS="${CFLAGS} -DROOTLESS_WORKAROUND -DROOTLESS_SAFEALPHA -DNO_ALLOCA"
PKG_CHECK_MODULES(XPBPROXY, [applewmproto >= 1.3] [applewm >= 1.3] xfixes fixesproto x11) PKG_CHECK_MODULES(XPBPROXY, [applewmproto >= 1.4] [applewm >= 1.4] xfixes fixesproto x11)
if test "x$XQUARTZ_SPARKLE" = xyes ; then if test "x$XQUARTZ_SPARKLE" = xyes ; then
AC_DEFINE(XQUARTZ_SPARKLE,1,[Support application updating through sparkle.]) AC_DEFINE(XQUARTZ_SPARKLE,1,[Support application updating through sparkle.])

3
hw/xquartz/X11Application.m
View file

@ -41,8 +41,7 @@
#include "darwinEvents.h" #include "darwinEvents.h"
#include "quartzKeyboard.h" #include "quartzKeyboard.h"
#include "quartz.h" #include "quartz.h"
#define _APPLEWM_SERVER_ #include <X11/extensions/applewmconst.h>
#include "X11/extensions/applewm.h"
#include "micmap.h" #include "micmap.h"
#include "exglobals.h" #include "exglobals.h"

3
hw/xquartz/X11Controller.m
View file

@ -43,8 +43,7 @@
#include "darwin.h" #include "darwin.h"
#include "darwinEvents.h" #include "darwinEvents.h"
#include "quartz.h" #include "quartz.h"
#define _APPLEWM_SERVER_ #include <X11/extensions/applewmconst.h>
#include "X11/extensions/applewm.h"
#include "applewmExt.h" #include "applewmExt.h"
#include <stdio.h> #include <stdio.h>

2
hw/xquartz/applewm.c
View file

@ -49,7 +49,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include "darwin.h" #include "darwin.h"
#define _APPLEWM_SERVER_ #define _APPLEWM_SERVER_
#include "X11/extensions/applewmstr.h" #include <X11/extensions/applewmproto.h>
#include "applewmExt.h" #include "applewmExt.h"
#include "X11Application.h" #include "X11Application.h"

3
hw/xquartz/darwinEvents.c
View file

@ -68,9 +68,8 @@ in this Software without prior written authorization from The Open Group.
#define SCROLLWHEELLEFTFAKE 6 #define SCROLLWHEELLEFTFAKE 6
#define SCROLLWHEELRIGHTFAKE 7 #define SCROLLWHEELRIGHTFAKE 7
#define _APPLEWM_SERVER_ #include <X11/extensions/applewmconst.h>
#include "applewmExt.h" #include "applewmExt.h"
#include <X11/extensions/applewm.h>
/* FIXME: Abstract this better */ /* FIXME: Abstract this better */
void QuartzModeEQInit(void); void QuartzModeEQInit(void);

2
hw/xquartz/quartz.c
View file

@ -45,7 +45,7 @@
#include "X11Application.h" #include "X11Application.h"
#include <X11/extensions/applewm.h> #include <X11/extensions/applewmconst.h>
#include <X11/extensions/randr.h> #include <X11/extensions/randr.h>
// X headers // X headers

3
hw/xquartz/xpr/xpr.h
View file

@ -53,8 +53,7 @@ void QuartzResumeXCursor(ScreenPtr pScreen, int x, int y);
* See CGWindowLevel.h * See CGWindowLevel.h
*/ */
#define _APPLEWM_SERVER_ #include <X11/extensions/applewmconst.h>
#include <X11/extensions/applewm.h>
static const int normal_window_levels[AppleWMNumWindowLevels+1] = { static const int normal_window_levels[AppleWMNumWindowLevels+1] = {
0, 3, 4, 5, INT_MIN + 30, INT_MIN + 29, 0, 3, 4, 5, INT_MIN + 30, INT_MIN + 29,
}; };

3
hw/xquartz/xpr/xprAppleWM.c
View file

@ -33,8 +33,7 @@
#include "xpr.h" #include "xpr.h"
#define _APPLEWM_SERVER_ #include <X11/extensions/applewmproto.h>
#include <X11/extensions/applewmstr.h>
#include "applewmExt.h" #include "applewmExt.h"
#include "rootless.h" #include "rootless.h"