hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-16 00:19:55 +00:00
Code Issues Projects Releases Wiki Activity

Limit pointer to valid crtc areas. Add event swapping. Fix change tracking.

Browse source 
Add function to keep pointer within valid crtc areas.
Finish event delivery and swapping code.
Separate configuration from layout changes to send correct events.
This commit is contained in:
Keith Packard 2006-10-13 17:34:53 -07:00
commit 054f8cd267
9 changed files with 415 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

53
randr/rrcrtc.c
View file

@ -25,6 +25,24 @@
RESTYPE RRCrtcType;
/*
* Notify the CRTC of some change
*/
void
RRCrtcChanged (RRCrtcPtr crtc, Bool layoutChanged)
{
ScreenPtr pScreen = crtc->pScreen;
rrScrPriv(pScreen);
crtc->changed = TRUE;
pScrPriv->changed = TRUE;
/*
* Send ConfigureNotify on any layout change
*/
if (layoutChanged)
pScrPriv->layoutChanged = TRUE;
}
/*
* Create a CRTC
*/
@ -60,7 +78,7 @@ RRCrtcCreate (ScreenPtr pScreen,
crtc->numOutputs = 0;
crtc->gammaSize = 0;
crtc->gammaRed = crtc->gammaBlue = crtc->gammaGreen = NULL;
crtc->changed = TRUE;
crtc->changed = FALSE;
crtc->devPrivate = devPrivate;
if (!AddResource (crtc->id, RRCrtcType, (pointer) crtc))
@ -68,7 +86,8 @@ RRCrtcCreate (ScreenPtr pScreen,
pScrPriv->crtcs = crtcs;
pScrPriv->crtcs[pScrPriv->numCrtcs++] = crtc;
pScrPriv->changed = TRUE;
RRCrtcChanged (crtc, TRUE);
return crtc;
}
@ -85,8 +104,6 @@ RRCrtcNotify (RRCrtcPtr crtc,
int numOutputs,
RROutputPtr *outputs)
{
ScreenPtr pScreen = crtc->pScreen;
rrScrPriv(pScreen);
int i, j;
/*
@ -100,8 +117,8 @@ RRCrtcNotify (RRCrtcPtr crtc,
break;
if (j == crtc->numOutputs)
{
outputs[i]->changed = TRUE;
crtc->changed = TRUE;
RROutputChanged (outputs[i]);
RRCrtcChanged (crtc, FALSE);
}
}
/*
@ -115,8 +132,8 @@ RRCrtcNotify (RRCrtcPtr crtc,
break;
if (i == numOutputs)
{
crtc->outputs[j]->changed = TRUE;
crtc->changed = TRUE;
RROutputChanged (crtc->outputs[j]);
RRCrtcChanged (crtc, FALSE);
}
}
/*
@ -158,31 +175,22 @@ RRCrtcNotify (RRCrtcPtr crtc,
RRModeDestroy (crtc->mode);
crtc->mode = mode;
mode->refcnt++;
crtc->changed = TRUE;
RRCrtcChanged (crtc, TRUE);
}
if (x != crtc->x)
{
crtc->x = x;
crtc->changed = TRUE;
RRCrtcChanged (crtc, TRUE);
}
if (y != crtc->y)
{
crtc->y = y;
crtc->changed = TRUE;
RRCrtcChanged (crtc, TRUE);
}
if (rotation != crtc->rotation)
{
crtc->rotation = rotation;
crtc->changed = TRUE;
}
/*
* Send events if anything changed
*/
if (crtc->changed)
{
if (!pScrPriv->changed)
RRSendConfigNotify (pScreen);
pScrPriv->changed = TRUE;
RRCrtcChanged (crtc, TRUE);
}
return TRUE;
}
@ -272,10 +280,11 @@ RRCrtcSet (RRCrtcPtr crtc,
* Old 1.0 interface tied screen size to mode size
*/
if (ret)
RRScreenSizeNotify (pScreen);
RRCrtcNotify (crtc, mode, x, y, rotation,
return ret;
}
#endif
RRTellChanged (pScreen);
return FALSE;
}