diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-03-01 15:19:26 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-03-01 15:19:26 +0100 |
| commit | f42d36fb73e096113a948a04279b752689f157bc (patch) | |
| tree | 1abbd59d6f4824d32ff86f532bff79cae734a339 /nx-X11/programs/Xserver | |
| parent | 5e68c1283c297fb428a9347517ea02576bd55546 (diff) | |
| parent | bdc212b846b4196135a9468699aa40eef57a5d07 (diff) | |
| download | nx-libs-f42d36fb73e096113a948a04279b752689f157bc.tar.gz nx-libs-f42d36fb73e096113a948a04279b752689f157bc.tar.bz2 nx-libs-f42d36fb73e096113a948a04279b752689f157bc.zip | |
Merge branch 'sunweaver-pr/randr-regression-fix-re-adding-RegisterResourceName-calls' into 3.6.x
Attributes GH PR #311: https://github.com/ArcticaProject/nx-libs/pull/311
Diffstat (limited to 'nx-X11/programs/Xserver')
| -rw-r--r-- | nx-X11/programs/Xserver/randr/randr.c | 10 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/randr/rrcrtc.c | 4 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/randr/rrmode.c | 3 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/randr/rroutput.c | 4 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/randr/rrprovider.c | 4 |
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 9f8277a55..876ebea42 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 9e31a423b..c4da7d534 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 a56d1ca1a..0ac9474c6 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; } |