8517f83331
- xserver-1.3.0-randrama-no-zero-screens.patch: For RANDR 1.2's fake Xinerama info, don't report Xinerama as being active if there are no RANDR 1.2 CRTCs active for that screen. (#234567) - xserver-1.3.0-arm-iopl.patch: Add __arm__ conditionals to many #ifdefs.
38 lines
818 B
Diff
38 lines
818 B
Diff
--- xorg-server-1.3.0.0/randr/rrxinerama.c.jx 2007-05-17 17:07:31.000000000 -0400
|
|
+++ xorg-server-1.3.0.0/randr/rrxinerama.c 2007-05-31 21:41:13.000000000 -0400
|
|
@@ -147,12 +147,6 @@
|
|
}
|
|
|
|
static Bool
|
|
-RRXineramaScreenActive (ScreenPtr pScreen)
|
|
-{
|
|
- return rrGetScrPriv(pScreen) != NULL;
|
|
-}
|
|
-
|
|
-static Bool
|
|
RRXineramaCrtcActive (RRCrtcPtr crtc)
|
|
{
|
|
return crtc->mode != NULL && crtc->numOutputs > 0;
|
|
@@ -164,7 +158,7 @@
|
|
int i, n;
|
|
|
|
n = 0;
|
|
- if (RRXineramaScreenActive (pScreen))
|
|
+ if (rrGetScrPriv (pScreen))
|
|
{
|
|
rrScrPriv(pScreen);
|
|
for (i = 0; i < pScrPriv->numCrtcs; i++)
|
|
@@ -174,6 +168,12 @@
|
|
return n;
|
|
}
|
|
|
|
+static Bool
|
|
+RRXineramaScreenActive (ScreenPtr pScreen)
|
|
+{
|
|
+ return RRXineramaScreenCount (pScreen) > 0;
|
|
+}
|
|
+
|
|
int
|
|
ProcRRXineramaGetScreenCount(ClientPtr client)
|
|
{
|