Skip to content

Commit 99cf805

Browse files
committed
some playing around - DO NOT INCLUDE THIS
1 parent 85cf09e commit 99cf805

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

nx-X11/programs/Xserver/hw/nxagent/Extensions.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ void nxagentInitRandRExtension(ScreenPtr pScreen)
124124
fprintf(stderr, "Warning: Failed to initialize the RandR extension.\n");
125125
}
126126

127-
127+
/*RRGetInfo(pScreen, FALSE);*/
128+
/*RRScanOldConfig(pScreen, RR_Rotate_0);*/
128129
/* FIXME: do we need this at all with the new rand/xinerama stuff? */
129130
nxagentRandRInitSizes(pScreen);
130131

@@ -251,6 +252,12 @@ nxagentRandRCrtcSet (ScreenPtr pScreen,
251252
int numOutputs,
252253
RROutputPtr *outputs)
253254
{
255+
if (crtc->gammaSize == 0) {
256+
CARD16 gamma = 0;
257+
RRCrtcGammaSetSize(crtc, 1);
258+
RRCrtcGammaSet(crtc, &gamma, &gamma, &gamma);
259+
RRCrtcGammaNotify(crtc);
260+
}
254261
return RRCrtcNotify(crtc, mode, x, y, rotation, NULL, numOutputs, outputs);
255262
}
256263
#endif
@@ -355,7 +362,6 @@ static int nxagentRandRInitSizes(ScreenPtr pScreen)
355362
}
356363

357364
RRSetCurrentConfig(pScreen, RR_Rotate_0, 60, pSize);
358-
359365
/* RRScreenSetSizeRange(pScreen, w[1], h[1], MAXSHORT, MAXSHORT);*/
360366
return 1;
361367
}

nx-X11/programs/Xserver/hw/nxagent/Screen.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4113,6 +4113,10 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
41134113
/* calculate the size in mm based on the current dpi. If
41144114
nxagent is run with a different dpi than the real X server
41154115
the result will look wrong but it is mathematically correct. */
4116+
/* RRRegisterSize(pScreen, bbx2-bbx1, bby2-bby1,
4117+
((bbx2-bbx1) * 254 + monitorResolution * 5) / (monitorResolution * 10),
4118+
((bby2-bby1) * 254 + monitorResolution * 5) / (monitorResolution * 10));*/
4119+
41164120
RROutputSetPhysicalSize(pScrPriv->outputs[i],
41174121
(new_w * 254 + monitorResolution * 5) / (monitorResolution * 10),
41184122
(new_h * 254 + monitorResolution * 5) / (monitorResolution * 10));

0 commit comments

Comments
 (0)