merged in miext/rootless changes for XDarwin support
This commit is contained in:
parent
f350909d16
commit
5e7f7436a7
|
@ -2,4 +2,7 @@ SUBDIRS = damage shadow
|
||||||
if COMPOSITE
|
if COMPOSITE
|
||||||
SUBDIRS += cw
|
SUBDIRS += cw
|
||||||
endif
|
endif
|
||||||
|
if XQUARTZ
|
||||||
|
SUBDIRS += rootless
|
||||||
|
endif
|
||||||
DIST_SUBDIRS = damage shadow cw rootless
|
DIST_SUBDIRS = damage shadow cw rootless
|
||||||
|
|
|
@ -1,14 +1,13 @@
|
||||||
EXTRA_DIST = \
|
AM_CFLAGS = \
|
||||||
accel/rlAccel.c \
|
$(DIX_CFLAGS) \
|
||||||
accel/rlAccel.h \
|
$(XORG_CFLAGS)
|
||||||
accel/rlBlt.c \
|
|
||||||
accel/rlCopy.c \
|
INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support
|
||||||
accel/rlFill.c \
|
|
||||||
accel/rlFillRect.c \
|
SUBDIRS = safeAlpha accel
|
||||||
accel/rlFillSpans.c \
|
|
||||||
accel/rlGlyph.c \
|
noinst_LTLIBRARIES = librootless.la
|
||||||
accel/rlSolid.c \
|
librootless_la_SOURCES = \
|
||||||
README.txt \
|
|
||||||
rootlessCommon.c \
|
rootlessCommon.c \
|
||||||
rootlessCommon.h \
|
rootlessCommon.h \
|
||||||
rootlessConfig.h \
|
rootlessConfig.h \
|
||||||
|
@ -17,7 +16,7 @@ EXTRA_DIST = \
|
||||||
rootlessScreen.c \
|
rootlessScreen.c \
|
||||||
rootlessValTree.c \
|
rootlessValTree.c \
|
||||||
rootlessWindow.c \
|
rootlessWindow.c \
|
||||||
rootlessWindow.h \
|
rootlessWindow.h
|
||||||
safeAlpha/safeAlpha.h \
|
|
||||||
safeAlpha/safeAlphaPicture.c \
|
EXTRA_DIST = \
|
||||||
safeAlpha/safeAlphaWindow.c
|
README.txt
|
||||||
|
|
18
miext/rootless/accel/Makefile.am
Normal file
18
miext/rootless/accel/Makefile.am
Normal 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
|
|
@ -31,6 +31,7 @@
|
||||||
#include <dix-config.h>
|
#include <dix-config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include <stddef.h> /* For NULL */
|
||||||
#include "fb.h"
|
#include "fb.h"
|
||||||
#include "rootlessCommon.h"
|
#include "rootlessCommon.h"
|
||||||
#include "rlAccel.h"
|
#include "rlAccel.h"
|
||||||
|
|
|
@ -33,6 +33,9 @@
|
||||||
#include <dix-config.h>
|
#include <dix-config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include <stddef.h> /* For NULL */
|
||||||
|
#include <limits.h> /* For CHAR_BIT */
|
||||||
|
|
||||||
#include "rootlessCommon.h"
|
#include "rootlessCommon.h"
|
||||||
|
|
||||||
unsigned int rootless_CopyBytes_threshold = 0;
|
unsigned int rootless_CopyBytes_threshold = 0;
|
||||||
|
|
|
@ -33,6 +33,7 @@
|
||||||
#include <dix-config.h>
|
#include <dix-config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include <stddef.h> /* For NULL */
|
||||||
#include "mi.h"
|
#include "mi.h"
|
||||||
#include "scrnintstr.h"
|
#include "scrnintstr.h"
|
||||||
#include "gcstruct.h"
|
#include "gcstruct.h"
|
||||||
|
|
|
@ -93,6 +93,7 @@ Equipment Corporation.
|
||||||
#include <dix-config.h>
|
#include <dix-config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include <stddef.h> /* For NULL */
|
||||||
#include <X11/X.h>
|
#include <X11/X.h>
|
||||||
#include "scrnintstr.h"
|
#include "scrnintstr.h"
|
||||||
#include "validate.h"
|
#include "validate.h"
|
||||||
|
|
|
@ -33,6 +33,10 @@
|
||||||
#include <dix-config.h>
|
#include <dix-config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include <stddef.h> /* For NULL */
|
||||||
|
#include <limits.h> /* For CHAR_BIT */
|
||||||
|
#include <assert.h>
|
||||||
|
|
||||||
#include "rootlessCommon.h"
|
#include "rootlessCommon.h"
|
||||||
#include "rootlessWindow.h"
|
#include "rootlessWindow.h"
|
||||||
|
|
||||||
|
@ -325,8 +329,8 @@ RootlessEnsureFrame(WindowPtr pWin)
|
||||||
RootlessWindowRec *winRec;
|
RootlessWindowRec *winRec;
|
||||||
#ifdef SHAPE
|
#ifdef SHAPE
|
||||||
RegionRec shape;
|
RegionRec shape;
|
||||||
RegionPtr pShape = NULL;
|
|
||||||
#endif
|
#endif
|
||||||
|
RegionPtr pShape = NULL;
|
||||||
|
|
||||||
if (WINREC(pWin) != NULL)
|
if (WINREC(pWin) != NULL)
|
||||||
return WINREC(pWin);
|
return WINREC(pWin);
|
||||||
|
|
12
miext/rootless/safeAlpha/Makefile.am
Normal file
12
miext/rootless/safeAlpha/Makefile.am
Normal 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
|
|
@ -33,15 +33,19 @@
|
||||||
* Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
|
* Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef HAVE_DIX_CONFIG_H
|
||||||
|
#include <dix-config.h>
|
||||||
|
#endif
|
||||||
#ifdef RENDER
|
#ifdef RENDER
|
||||||
|
|
||||||
|
#include <stddef.h> /* For NULL */
|
||||||
#include "fb.h"
|
#include "fb.h"
|
||||||
#include "picturestr.h"
|
#include "picturestr.h"
|
||||||
#include "mipict.h"
|
#include "mipict.h"
|
||||||
#include "fbpict.h"
|
#include "fbpict.h"
|
||||||
#include "safeAlpha.h"
|
#include "safeAlpha.h"
|
||||||
#include "rootlessCommon.h"
|
#include "rootlessCommon.h"
|
||||||
|
|
||||||
# define mod(a,b) ((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-a) % (b))
|
# define mod(a,b) ((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-a) % (b))
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -32,6 +32,10 @@
|
||||||
* Copyright © 1998 Keith Packard
|
* Copyright © 1998 Keith Packard
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef HAVE_DIX_CONFIG_H
|
||||||
|
#include <dix-config.h>
|
||||||
|
#endif
|
||||||
#include "fb.h"
|
#include "fb.h"
|
||||||
#include "safeAlpha.h"
|
#include "safeAlpha.h"
|
||||||
#include "rootlessCommon.h"
|
#include "rootlessCommon.h"
|
||||||
|
|
|
@ -1871,7 +1871,7 @@ Fopen(char *file, char *type)
|
||||||
pidlist = cur;
|
pidlist = cur;
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
ErrorF("Popen: `%s', fp = %p\n", command, iop);
|
ErrorF("Fopen(%s), fp = %p\n", file, iop);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return iop;
|
return iop;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user