andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add RRInit function to create resource types for RR objects.

Browse Source 
To allow RandR objects to be created before the screen object exists,
the resource types must be registered with the resource database.
A driver wishing to create RandR objects must call RRInit before doing so.

Also, fix a segfault when setting Output data before it is associated with a
screen.
This commit is contained in:
Keith Packard 2006-11-08 23:17:55 -08:00
parent ec77a95a02
commit 0dee48b8af
3 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
randr/randr.c
View File

@ -39,8 +39,7 @@
#endif
#define RR_VALIDATE
int RRGeneration;
int RRNScreens;
static int RRNScreens;
#define wrap(priv,real,mem,func) {\
priv->mem = real->mem; \
@ -198,10 +197,10 @@ SRRNotifyEvent (xEvent *from,
}
}
Bool RRScreenInit(ScreenPtr pScreen)
{
rrScrPrivPtr pScrPriv;
static int RRGeneration;
Bool RRInit (void)
{
if (RRGeneration != serverGeneration)
{
if (!RRModeInit ())
@ -210,9 +209,25 @@ Bool RRScreenInit(ScreenPtr pScreen)
return FALSE;
if (!RROutputInit ())
return FALSE;
RRGeneration = serverGeneration;
}
return TRUE;
}
static int RRScreenGeneration;
Bool RRScreenInit(ScreenPtr pScreen)
{
rrScrPrivPtr pScrPriv;
if (!RRInit ())
return FALSE;
if (RRScreenGeneration != serverGeneration)
{
if ((rrPrivIndex = AllocateScreenPrivateIndex()) < 0)
return FALSE;
RRGeneration = serverGeneration;
RRScreenGeneration = serverGeneration;
}
pScrPriv = (rrScrPrivPtr) xalloc (sizeof (rrScrPrivRec));

2
randr/randrstr.h
View File

@ -384,6 +384,8 @@ RRTellChanged (ScreenPtr pScreen);
Bool
RRGetInfo (ScreenPtr pScreen);
Bool RRInit (void);
Bool RRScreenInit(ScreenPtr pScreen);
RROutputPtr

30
randr/rroutput.c
View File

@ -31,10 +31,13 @@ void
RROutputChanged (RROutputPtr output)
{
ScreenPtr pScreen = output->pScreen;
rrScrPriv (pScreen);
output->changed = TRUE;
pScrPriv->changed = TRUE;
if (pScreen)
{
rrScrPriv (pScreen);
pScrPriv->changed = TRUE;
}
}
/*
@ -335,17 +338,21 @@ RROutputDestroyResource (pointer value, XID pid)
{
RROutputPtr output = (RROutputPtr) value;
ScreenPtr pScreen = output->pScreen;
rrScrPriv(pScreen);
int i;
for (i = 0; i < pScrPriv->numOutputs; i++)
if (pScreen)
{
if (pScrPriv->outputs[i] == output)
rrScrPriv(pScreen);
int i;
for (i = 0; i < pScrPriv->numOutputs; i++)
{
memmove (pScrPriv->outputs + i, pScrPriv->outputs + i + 1,
(pScrPriv->numOutputs - (i - 1)) * sizeof (RROutputPtr));
--pScrPriv->numOutputs;
break;
if (pScrPriv->outputs[i] == output)
{
memmove (pScrPriv->outputs + i, pScrPriv->outputs + i + 1,
(pScrPriv->numOutputs - (i - 1)) * sizeof (RROutputPtr));
--pScrPriv->numOutputs;
break;
}
}
}
if (output->modes)
@ -481,4 +488,3 @@ ProcRRGetOutputInfo (ClientPtr client)
return client->noClientException;
}