aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/dix
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/dix')
-rw-r--r--xorg-server/dix/colormap.c4
-rw-r--r--xorg-server/dix/dixfonts.c13
-rw-r--r--xorg-server/dix/main.c1
-rw-r--r--xorg-server/dix/makefile8
4 files changed, 17 insertions, 9 deletions
diff --git a/xorg-server/dix/colormap.c b/xorg-server/dix/colormap.c
index 8b1bad8a3..f54615111 100644
--- a/xorg-server/dix/colormap.c
+++ b/xorg-server/dix/colormap.c
@@ -66,6 +66,10 @@ SOFTWARE.
#include "privates.h"
#include "xace.h"
+#ifdef _MSC_VER
+#define UpdateColors thisUpdateColors
+#endif
+
extern XID clientErrorValue;
static Pixel FindBestPixel(
diff --git a/xorg-server/dix/dixfonts.c b/xorg-server/dix/dixfonts.c
index e9a3f3963..8ed494c09 100644
--- a/xorg-server/dix/dixfonts.c
+++ b/xorg-server/dix/dixfonts.c
@@ -127,6 +127,7 @@ SetDefaultFont(char *defaultfontname)
int err;
FontPtr pf;
XID fid;
+ static FontPtr last_pf;
fid = FakeClientID(0);
err = OpenFont(serverClient, fid, FontLoadAll | FontOpenSync,
@@ -134,9 +135,10 @@ SetDefaultFont(char *defaultfontname)
if (err != Success)
return FALSE;
pf = (FontPtr) LookupIDByType(fid, RT_FONT);
- if (pf == (FontPtr) NULL)
+ if (pf != (FontPtr) NULL) last_pf = pf;
+ if (last_pf == (FontPtr) NULL)
return FALSE;
- defaultFont = pf;
+ defaultFont = last_pf;
return TRUE;
}
@@ -1902,22 +1904,15 @@ InitFonts (void)
{
patternCache = MakeFontPatternCache();
-#ifndef BUILTIN_FONTS
if (screenInfo.numScreens > screenInfo.numVideoScreens) {
PrinterFontRegisterFpeFunctions();
FontFileCheckRegisterFpeFunctions();
check_fs_register_fpe_functions();
} else
-#endif
{
-#ifdef BUILTIN_FONTS
BuiltinRegisterFpeFunctions();
-#else
FontFileRegisterFpeFunctions();
-#endif
-#ifndef NOFONTSERVERACCESS
fs_register_fpe_functions();
-#endif
}
}
diff --git a/xorg-server/dix/main.c b/xorg-server/dix/main.c
index 6d9dd3332..fa1a934a3 100644
--- a/xorg-server/dix/main.c
+++ b/xorg-server/dix/main.c
@@ -248,6 +248,7 @@ main(int argc, char *argv[], char *envp[])
char *xauthfile;
HWEventQueueType alwaysCheckForInput[2];
+ ptw32_processInitialize();
display = "0";
InitGlobals();
diff --git a/xorg-server/dix/makefile b/xorg-server/dix/makefile
new file mode 100644
index 000000000..24afd2b94
--- /dev/null
+++ b/xorg-server/dix/makefile
@@ -0,0 +1,8 @@
+DEFINES += FONTDEBUG
+
+CSRCS=atom.c colormap.c cursor.c deprecated.c devices.c dispatch.c dix.c dixfonts.c dixutils.c events.c extension.c ffs.c gc.c \
+getevents.c globals.c glyphcurs.c grabs.c initatoms.c main.c pixmap.c privates.c property.c registry.c resource.c selection.c \
+strcasecmp.c strcasestr.c swaprep.c swapreq.c tables.c window.c xpstubs.c
+
+LIBRARY=libdix
+