aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-02-04 15:22:20 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-02-04 15:30:00 +0100
commitff6126f44005388bbb2fc2fc2946891162abb3c0 (patch)
treeec496321189831bf0b62fb8f3613d878c3e89976 /nx-X11/programs/Xserver
parent1cd73ccb79a89428eb1723b711cb08cf9bc39068 (diff)
downloadnx-libs-ff6126f44005388bbb2fc2fc2946891162abb3c0.tar.gz
nx-libs-ff6126f44005388bbb2fc2fc2946891162abb3c0.tar.bz2
nx-libs-ff6126f44005388bbb2fc2fc2946891162abb3c0.zip
Xserver/randr: Regression fix introduced by c2b1f48. Re-introduce RegisterResourceName() calls after each CreateNewResourceType() call.
Fixes ArcticaProject/nx-libs#309.
Diffstat (limited to 'nx-X11/programs/Xserver')
-rw-r--r--nx-X11/programs/Xserver/randr/randr.c10
-rw-r--r--nx-X11/programs/Xserver/randr/rrcrtc.c4
-rw-r--r--nx-X11/programs/Xserver/randr/rrmode.c3
-rw-r--r--nx-X11/programs/Xserver/randr/rroutput.c4
-rw-r--r--nx-X11/programs/Xserver/randr/rrprovider.c4
5 files changed, 25 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/randr/randr.c b/nx-X11/programs/Xserver/randr/randr.c
index b29c3c888..e991af340 100644
--- a/nx-X11/programs/Xserver/randr/randr.c
+++ b/nx-X11/programs/Xserver/randr/randr.c
@@ -461,6 +461,11 @@ RRExtensionInit(void)
);
if (!RRClientType)
return;
+
+#ifdef NXAGENT_SERVER
+ RegisterResourceName(RRClientType, "RandRClient");
+#endif
+
RREventType = CreateNewResourceType(RRFreeEvents
#ifndef NXAGENT_SERVER
, "RandREvent"
@@ -468,6 +473,11 @@ RRExtensionInit(void)
);
if (!RREventType)
return;
+
+#ifdef NXAGENT_SERVER
+ RegisterResourceName(RREventType, "RandREvent");
+#endif
+
extEntry = AddExtension(RANDR_NAME, RRNumberEvents, RRNumberErrors,
ProcRRDispatch, SProcRRDispatch,
NULL, StandardMinorOpcode);
diff --git a/nx-X11/programs/Xserver/randr/rrcrtc.c b/nx-X11/programs/Xserver/randr/rrcrtc.c
index 5ba66d5a6..59a3f446a 100644
--- a/nx-X11/programs/Xserver/randr/rrcrtc.c
+++ b/nx-X11/programs/Xserver/randr/rrcrtc.c
@@ -972,6 +972,10 @@ RRCrtcInit(void)
if (!RRCrtcType)
return FALSE;
+#ifdef NXAGENT_SERVER
+ RegisterResourceName(RRCrtcType, "CRTC");
+#endif
+
return TRUE;
}
diff --git a/nx-X11/programs/Xserver/randr/rrmode.c b/nx-X11/programs/Xserver/randr/rrmode.c
index a2bbec7d9..8f8d2d0aa 100644
--- a/nx-X11/programs/Xserver/randr/rrmode.c
+++ b/nx-X11/programs/Xserver/randr/rrmode.c
@@ -326,6 +326,9 @@ RRModeInit(void)
if (!RRModeType)
return FALSE;
+#ifdef NXAGENT_SERVER
+ RegisterResourceName(RRModeType, "MODE");
+#endif
return TRUE;
}
diff --git a/nx-X11/programs/Xserver/randr/rroutput.c b/nx-X11/programs/Xserver/randr/rroutput.c
index 07fda36b5..e5f69e010 100644
--- a/nx-X11/programs/Xserver/randr/rroutput.c
+++ b/nx-X11/programs/Xserver/randr/rroutput.c
@@ -429,6 +429,10 @@ RROutputInit(void)
if (!RROutputType)
return FALSE;
+#ifdef NXAGENT_SERVER
+ RegisterResourceName(RROutputType, "OUTPUT");
+#endif
+
return TRUE;
}
diff --git a/nx-X11/programs/Xserver/randr/rrprovider.c b/nx-X11/programs/Xserver/randr/rrprovider.c
index fe99fa04d..ed2b1baca 100644
--- a/nx-X11/programs/Xserver/randr/rrprovider.c
+++ b/nx-X11/programs/Xserver/randr/rrprovider.c
@@ -440,6 +440,10 @@ RRProviderInit(void)
if (!RRProviderType)
return FALSE;
+#ifdef NXAGENT_SERVER
+ RegisterResourceName(RRProviderType, "Provider");
+#endif
+
return TRUE;
}