aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xfixes
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-12-20 21:08:15 +0000
committermarha <marha@users.sourceforge.net>2009-12-20 21:08:15 +0000
commitd8432fdd4f13e9f9d1d44f5482faeb56562661a9 (patch)
tree10b8d598d3c821cdb25569d4bd750b7ad8cae269 /xorg-server/xfixes
parentd34fc70fab4607f70184206a592397c97c3e478e (diff)
downloadvcxsrv-d8432fdd4f13e9f9d1d44f5482faeb56562661a9.tar.gz
vcxsrv-d8432fdd4f13e9f9d1d44f5482faeb56562661a9.tar.bz2
vcxsrv-d8432fdd4f13e9f9d1d44f5482faeb56562661a9.zip
Switched to xorg-server-1.7.99.2
Diffstat (limited to 'xorg-server/xfixes')
-rw-r--r--xorg-server/xfixes/Makefile.in14
-rw-r--r--xorg-server/xfixes/cursor.c11
-rw-r--r--xorg-server/xfixes/region.c5
-rw-r--r--xorg-server/xfixes/select.c6
4 files changed, 27 insertions, 9 deletions
diff --git a/xorg-server/xfixes/Makefile.in b/xorg-server/xfixes/Makefile.in
index 7fc598330..154bc66fe 100644
--- a/xorg-server/xfixes/Makefile.in
+++ b/xorg-server/xfixes/Makefile.in
@@ -160,6 +160,7 @@ DGA_LIBS = @DGA_LIBS@
DIX_CFLAGS = @DIX_CFLAGS@
DIX_LIB = @DIX_LIB@
DLLTOOL = @DLLTOOL@
+DLOPEN_LIBS = @DLOPEN_LIBS@
DMXEXAMPLES_DEP_CFLAGS = @DMXEXAMPLES_DEP_CFLAGS@
DMXEXAMPLES_DEP_LIBS = @DMXEXAMPLES_DEP_LIBS@
DMXMODULES_CFLAGS = @DMXMODULES_CFLAGS@
@@ -190,6 +191,13 @@ EXEEXT = @EXEEXT@
FGREP = @FGREP@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+FONT100DPIDIR = @FONT100DPIDIR@
+FONT75DPIDIR = @FONT75DPIDIR@
+FONTMISCDIR = @FONTMISCDIR@
+FONTOTFDIR = @FONTOTFDIR@
+FONTROOTDIR = @FONTROOTDIR@
+FONTTTFDIR = @FONTTTFDIR@
+FONTTYPE1DIR = @FONTTYPE1DIR@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@
@@ -200,6 +208,7 @@ GREP = @GREP@
HAL_CFLAGS = @HAL_CFLAGS@
HAL_LIBS = @HAL_LIBS@
INSTALL = @INSTALL@
+INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -249,6 +258,8 @@ OBJCFLAGS = @OBJCFLAGS@
OBJCLINK = @OBJCLINK@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+OPENSSL_LIBS = @OPENSSL_LIBS@
OS_LIB = @OS_LIB@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@ -273,6 +284,8 @@ RAWCPPFLAGS = @RAWCPPFLAGS@
SED = @SED@
SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@
SET_MAKE = @SET_MAKE@
+SHA1_CFLAGS = @SHA1_CFLAGS@
+SHA1_LIBS = @SHA1_LIBS@
SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
@@ -363,7 +376,6 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
-distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
driverdir = @driverdir@
dvidir = @dvidir@
diff --git a/xorg-server/xfixes/cursor.c b/xorg-server/xfixes/cursor.c
index 60d422296..1471a58d1 100644
--- a/xorg-server/xfixes/cursor.c
+++ b/xorg-server/xfixes/cursor.c
@@ -1084,9 +1084,12 @@ XFixesCursorInit (void)
cs->pCursorHideCounts = NULL;
SetCursorScreen (pScreen, cs);
}
- CursorClientType = CreateNewResourceType(CursorFreeClient);
- CursorHideCountType = CreateNewResourceType(CursorFreeHideCount);
- CursorWindowType = CreateNewResourceType(CursorFreeWindow);
+ CursorClientType = CreateNewResourceType(CursorFreeClient,
+ "XFixesCursorClient");
+ CursorHideCountType = CreateNewResourceType(CursorFreeHideCount,
+ "XFixesCursorHideCount");
+ CursorWindowType = CreateNewResourceType(CursorFreeWindow,
+ "XFixesCursorWindow");
if (pInvisibleCursor == NULL) {
pInvisibleCursor = createInvisibleCursor();
@@ -1095,6 +1098,6 @@ XFixesCursorInit (void)
}
}
- return CursorClientType && CursorWindowType;
+ return CursorClientType && CursorHideCountType && CursorWindowType;
}
diff --git a/xorg-server/xfixes/region.c b/xorg-server/xfixes/region.c
index 966eda051..1b4accb3e 100644
--- a/xorg-server/xfixes/region.c
+++ b/xorg-server/xfixes/region.c
@@ -63,8 +63,9 @@ XFixesRegionCopy (RegionPtr pRegion)
Bool
XFixesRegionInit (void)
{
- RegionResType = CreateNewResourceType(RegionResFree);
- return TRUE;
+ RegionResType = CreateNewResourceType(RegionResFree, "XFixesRegion");
+
+ return (RegionResType != 0);
}
int
diff --git a/xorg-server/xfixes/select.c b/xorg-server/xfixes/select.c
index a5811bdc0..5ba7896cb 100644
--- a/xorg-server/xfixes/select.c
+++ b/xorg-server/xfixes/select.c
@@ -284,7 +284,9 @@ SelectionFreeWindow (pointer data, XID id)
Bool
XFixesSelectionInit (void)
{
- SelectionClientType = CreateNewResourceType(SelectionFreeClient);
- SelectionWindowType = CreateNewResourceType(SelectionFreeWindow);
+ SelectionClientType = CreateNewResourceType(SelectionFreeClient,
+ "XFixesSelectionClient");
+ SelectionWindowType = CreateNewResourceType(SelectionFreeWindow,
+ "XFixesSelectionWindow");
return SelectionClientType && SelectionWindowType;
}