merged in miext/rootless changes for XDarwin support

This commit is contained in:
Ben Byer 2007-02-16 04:12:26 -08:00
parent f350909d16
commit 5e7f7436a7
12 changed files with 68 additions and 18 deletions

View File

@ -2,4 +2,7 @@ SUBDIRS = damage shadow
if COMPOSITE
SUBDIRS += cw
endif
if XQUARTZ
SUBDIRS += rootless
endif
DIST_SUBDIRS = damage shadow cw rootless

View File

@ -1,14 +1,13 @@
EXTRA_DIST = \
accel/rlAccel.c \
accel/rlAccel.h \
accel/rlBlt.c \
accel/rlCopy.c \
accel/rlFill.c \
accel/rlFillRect.c \
accel/rlFillSpans.c \
accel/rlGlyph.c \
accel/rlSolid.c \
README.txt \
AM_CFLAGS = \
$(DIX_CFLAGS) \
$(XORG_CFLAGS)
INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support
SUBDIRS = safeAlpha accel
noinst_LTLIBRARIES = librootless.la
librootless_la_SOURCES = \
rootlessCommon.c \
rootlessCommon.h \
rootlessConfig.h \
@ -17,7 +16,7 @@ EXTRA_DIST = \
rootlessScreen.c \
rootlessValTree.c \
rootlessWindow.c \
rootlessWindow.h \
safeAlpha/safeAlpha.h \
safeAlpha/safeAlphaPicture.c \
safeAlpha/safeAlphaWindow.c
rootlessWindow.h
EXTRA_DIST = \
README.txt

View File

@ -0,0 +1,18 @@
AM_CFLAGS = \
$(DIX_CFLAGS) \
$(XORG_CFLAGS)
INCLUDES = -I$(srcdir)/.. -I$(top_srcdir)/hw/xfree86/os-support
noinst_LTLIBRARIES = librlAccel.la
librlAccel_la_SOURCES = rlAccel.c \
rlBlt.c \
rlCopy.c \
rlFill.c \
rlFillRect.c \
rlFillSpans.c \
rlGlyph.c \
rlSolid.c
EXTRA_DIST = rlAccel.h

View File

@ -31,6 +31,7 @@
#include <dix-config.h>
#endif
#include <stddef.h> /* For NULL */
#include "fb.h"
#include "rootlessCommon.h"
#include "rlAccel.h"

View File

@ -33,6 +33,9 @@
#include <dix-config.h>
#endif
#include <stddef.h> /* For NULL */
#include <limits.h> /* For CHAR_BIT */
#include "rootlessCommon.h"
unsigned int rootless_CopyBytes_threshold = 0;

View File

@ -33,6 +33,7 @@
#include <dix-config.h>
#endif
#include <stddef.h> /* For NULL */
#include "mi.h"
#include "scrnintstr.h"
#include "gcstruct.h"

View File

@ -93,6 +93,7 @@ Equipment Corporation.
#include <dix-config.h>
#endif
#include <stddef.h> /* For NULL */
#include <X11/X.h>
#include "scrnintstr.h"
#include "validate.h"

View File

@ -33,6 +33,10 @@
#include <dix-config.h>
#endif
#include <stddef.h> /* For NULL */
#include <limits.h> /* For CHAR_BIT */
#include <assert.h>
#include "rootlessCommon.h"
#include "rootlessWindow.h"
@ -325,8 +329,8 @@ RootlessEnsureFrame(WindowPtr pWin)
RootlessWindowRec *winRec;
#ifdef SHAPE
RegionRec shape;
RegionPtr pShape = NULL;
#endif
RegionPtr pShape = NULL;
if (WINREC(pWin) != NULL)
return WINREC(pWin);

View File

@ -0,0 +1,12 @@
AM_CFLAGS = \
$(DIX_CFLAGS) \
$(XORG_CFLAGS)
INCLUDES = -I$(srcdir)/.. -I$(top_srcdir)/hw/xfree86/os-support
noinst_LTLIBRARIES = libsafeAlpha.la
libsafeAlpha_la_SOURCES = safeAlphaPicture.c \
safeAlphaWindow.c
EXTRA_DIST = safeAlpha.h

View File

@ -33,15 +33,19 @@
* Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
*/
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#ifdef RENDER
#include <stddef.h> /* For NULL */
#include "fb.h"
#include "picturestr.h"
#include "mipict.h"
#include "fbpict.h"
#include "safeAlpha.h"
#include "rootlessCommon.h"
# define mod(a,b) ((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-a) % (b))

View File

@ -32,6 +32,10 @@
* Copyright © 1998 Keith Packard
*/
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#include "fb.h"
#include "safeAlpha.h"
#include "rootlessCommon.h"

View File

@ -1871,7 +1871,7 @@ Fopen(char *file, char *type)
pidlist = cur;
#ifdef DEBUG
ErrorF("Popen: `%s', fp = %p\n", command, iop);
ErrorF("Fopen(%s), fp = %p\n", file, iop);
#endif
return iop;