aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Screen.c
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-07-31 23:18:41 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-09-29 17:10:05 +0200
commita91e34a8a2ae3b19726f5ecca256b34464af8d40 (patch)
tree3e1504fc0f35ee798a3a093b39ca9393ed5936ef /nx-X11/programs/Xserver/hw/nxagent/Screen.c
parent3b94b9c64f40f5c10196da33725ccf04ed63bfba (diff)
downloadnx-libs-a91e34a8a2ae3b19726f5ecca256b34464af8d40.tar.gz
nx-libs-a91e34a8a2ae3b19726f5ecca256b34464af8d40.tar.bz2
nx-libs-a91e34a8a2ae3b19726f5ecca256b34464af8d40.zip
Imakefile: make NXAGENT_RANDR_MODE_PREFIX configurable via macro
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Screen.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Screen.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index 3b1d5f450..0fae9b704 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -210,6 +210,10 @@ RegionRec nxagentShadowUpdateRegion;
#define NXAGENT_DEFAULT_DPI 96
#define NXAGENT_AUTO_DPI -1
+#ifndef NXAGENT_RANDR_MODE_PREFIX
+#define NXAGENT_RANDR_MODE_PREFIX nx_
+#endif
+
extern Bool nxagentAutoDPI;
/*
@@ -4220,15 +4224,11 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
memset(&modeInfo, '\0', sizeof(modeInfo));
-#ifdef NXAGENT_RANDR_MODE_PREFIX
/* avoid collisions with pre-existing default modes by using a
separate namespace. If we'd simply use XxY we could not
distinguish between pre-existing modes which should stay
and our own modes that should be removed after use. */
- sprintf(name, "nx_%dx%d", new_w, new_h);
-#else
- sprintf(name, "%dx%d", new_w, new_h);
-#endif
+ sprintf(name, "%s%dx%d", QUOTE(NXAGENT_RANDR_MODE_PREFIX), new_w, new_h);
modeInfo.width = new_w;
modeInfo.height = new_h;