aboutsummaryrefslogtreecommitdiff
path: root/doc/nx-X11_vs_XOrg69_patches/dixfonts.c.NX.patch
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-02-26 08:14:28 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-02-26 08:14:28 +0100
commitabd6cf1bdd661f126af2a721cb3f467f3a6db9f7 (patch)
treeaa109d560c5c340aa537c1e59b866be5acd62205 /doc/nx-X11_vs_XOrg69_patches/dixfonts.c.NX.patch
parent2eb85d140fdd582e6bf7086f0bbba08fa58c836c (diff)
downloadnx-libs-abd6cf1bdd661f126af2a721cb3f467f3a6db9f7.tar.gz
nx-libs-abd6cf1bdd661f126af2a721cb3f467f3a6db9f7.tar.bz2
nx-libs-abd6cf1bdd661f126af2a721cb3f467f3a6db9f7.zip
rename original NX patches, so that we can see the patched file's name in the patch file name.
Diffstat (limited to 'doc/nx-X11_vs_XOrg69_patches/dixfonts.c.NX.patch')
-rw-r--r--doc/nx-X11_vs_XOrg69_patches/dixfonts.c.NX.patch86
1 files changed, 0 insertions, 86 deletions
diff --git a/doc/nx-X11_vs_XOrg69_patches/dixfonts.c.NX.patch b/doc/nx-X11_vs_XOrg69_patches/dixfonts.c.NX.patch
deleted file mode 100644
index 1f0cbd4fd..000000000
--- a/doc/nx-X11_vs_XOrg69_patches/dixfonts.c.NX.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- ./nx-X11/programs/Xserver/dix/dixfonts.c.X.original 2015-02-13 14:03:44.704442298 +0100
-+++ ./nx-X11/programs/Xserver/dix/dixfonts.c 2015-02-13 14:03:44.704442298 +0100
-@@ -72,6 +72,63 @@
- #include <stdio.h>
- #endif
-
-+#ifdef NX_TRANS_SOCKET
-+
-+char _NXFontPath[1024];
-+
-+/*
-+ * Override the default font path and make
-+ * it configurable at run time, based on
-+ * the NX_FONT environment.
-+ */
-+
-+static const char *_NXGetFontPath(const char *path)
-+{
-+ const char *fontEnv;
-+
-+ /*
-+ * Check the environment only once.
-+ */
-+
-+ if (*_NXFontPath != '\0')
-+ {
-+ return _NXFontPath;
-+ }
-+
-+ fontEnv = getenv("NX_FONT");
-+
-+ if (fontEnv != NULL && *fontEnv != '\0')
-+ {
-+ if (strlen(fontEnv) + 1 > 1024)
-+ {
-+#ifdef NX_TRANS_TEST
-+ fprintf(stderr, "_NXGetFontPath: WARNING! Maximum length of font path exceeded.\n");
-+#endif
-+ goto _NXGetFontPathError;
-+ }
-+
-+ strcpy(_NXFontPath, fontEnv);
-+
-+#ifdef NX_TRANS_TEST
-+ fprintf(stderr, "_NXGetFontPath: Using NX font path [%s].\n", _NXFontPath);
-+#endif
-+
-+ return _NXFontPath;
-+ }
-+
-+_NXGetFontPathError:
-+
-+ strcpy(_NXFontPath, path);
-+
-+#ifdef NX_TRANS_TEST
-+ fprintf(stderr, "_NXGetFontPath: Using default font path [%s].\n", _NXFontPath);
-+#endif
-+
-+ return _NXFontPath;
-+}
-+
-+#endif
-+
- #ifdef PANORAMIX
- #include "panoramiX.h"
- #endif
-@@ -1817,11 +1874,19 @@
- bad;
-
- /* get enough for string, plus values -- use up commas */
-+#ifdef NX_TRANS_SOCKET
-+ len = strlen(_NXGetFontPath(path)) + 1;
-+#else
- len = strlen(path) + 1;
-+#endif
- nump = cp = newpath = (unsigned char *) ALLOCATE_LOCAL(len);
- if (!newpath)
- return BadAlloc;
-+#ifdef NX_TRANS_SOCKET
-+ pp = (unsigned char *) _NXGetFontPath(path);
-+#else
- pp = (unsigned char *) path;
-+#endif
- cp++;
- while (*pp) {
- if (*pp == ',') {