panoramiX: convert 0->panoramiXNumScreens loops to macro (v3)
This just uses the FOR_NSCREENS macro instead. v2: remove some of the 1->x loops. v3: drop the 1->0 loop, will rework later. Signed-off-by: Dave Airlie <airlied@redhat.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
This commit is contained in:
parent
5a94934487
commit
0bccfcc97b
|
@ -393,7 +393,7 @@ static void XineramaInitData(ScreenPtr pScreen)
|
|||
int i, w, h;
|
||||
|
||||
RegionNull(&PanoramiXScreenRegion);
|
||||
for (i = 0; i < PanoramiXNumScreens; i++) {
|
||||
FOR_NSCREENS(i) {
|
||||
BoxRec TheBox;
|
||||
RegionRec ScreenRegion;
|
||||
|
||||
|
@ -478,7 +478,7 @@ void PanoramiXExtensionInit(int argc, char *argv[])
|
|||
* run in non-PanoramiXeen mode.
|
||||
*/
|
||||
|
||||
for (i = 0; i < PanoramiXNumScreens; i++) {
|
||||
FOR_NSCREENS(i) {
|
||||
pScreen = screenInfo.screens[i];
|
||||
pScreenPriv = malloc(sizeof(PanoramiXScreenRec));
|
||||
dixSetPrivate(&pScreen->devPrivates, PanoramiXScreenKey,
|
||||
|
@ -836,7 +836,7 @@ PanoramiXConsolidate(void)
|
|||
saver = malloc(sizeof(PanoramiXRes));
|
||||
saver->type = XRT_WINDOW;
|
||||
|
||||
for (i = 0; i < PanoramiXNumScreens; i++) {
|
||||
FOR_NSCREENS(i) {
|
||||
ScreenPtr pScreen = screenInfo.screens[i];
|
||||
root->info[i].id = pScreen->root->drawable.id;
|
||||
root->u.win.class = InputOutput;
|
||||
|
@ -1074,7 +1074,7 @@ ProcXineramaQueryScreens(ClientPtr client)
|
|||
xXineramaScreenInfo scratch;
|
||||
int i;
|
||||
|
||||
for(i = 0; i < PanoramiXNumScreens; i++) {
|
||||
FOR_NSCREENS(i) {
|
||||
scratch.x_org = screenInfo.screens[i]->x;
|
||||
scratch.y_org = screenInfo.screens[i]->y;
|
||||
scratch.width = screenInfo.screens[i]->width;
|
||||
|
@ -1179,7 +1179,7 @@ XineramaGetImageData(
|
|||
|
||||
depth = (format == XYPixmap) ? 1 : pDraw->depth;
|
||||
|
||||
for(i = 0; i < PanoramiXNumScreens; i++) {
|
||||
FOR_NSCREENS(i) {
|
||||
BoxRec TheBox;
|
||||
ScreenPtr pScreen;
|
||||
pDraw = pDrawables[i];
|
||||
|
|
|
@ -2186,7 +2186,7 @@ PanoramiXCopyColormapAndFree(ClientPtr client)
|
|||
newCmap->type = XRT_COLORMAP;
|
||||
panoramix_setup_ids(newCmap, client, stuff->mid);
|
||||
|
||||
FOR_NSCREENS_BACKWARD(j){
|
||||
FOR_NSCREENS_BACKWARD(j) {
|
||||
stuff->srcCmap = cmap->info[j].id;
|
||||
stuff->mid = newCmap->info[j].id;
|
||||
result = (* SavedProcVector[X_CopyColormapAndFree])(client);
|
||||
|
|
|
@ -1927,7 +1927,7 @@ void XineramifyXv(void)
|
|||
if(!port)
|
||||
break;
|
||||
|
||||
for(k = 0; k < PanoramiXNumScreens; k++) {
|
||||
FOR_NSCREENS(k) {
|
||||
if(MatchingAdaptors[k] && (MatchingAdaptors[k]->nPorts > j))
|
||||
port->info[k].id = MatchingAdaptors[k]->base_id + j;
|
||||
else
|
||||
|
|
|
@ -558,7 +558,7 @@ XineramaSetWindowPntrs(DeviceIntPtr pDev, WindowPtr pWin)
|
|||
|
||||
if(pWin == screenInfo.screens[0]->root) {
|
||||
int i;
|
||||
for (i = 0; i < PanoramiXNumScreens; i++)
|
||||
FOR_NSCREENS(i)
|
||||
pSprite->windows[i] = screenInfo.screens[i]->root;
|
||||
} else {
|
||||
PanoramiXRes *win;
|
||||
|
@ -569,7 +569,7 @@ XineramaSetWindowPntrs(DeviceIntPtr pDev, WindowPtr pWin)
|
|||
if (rc != Success)
|
||||
return FALSE;
|
||||
|
||||
for(i = 0; i < PanoramiXNumScreens; i++) {
|
||||
FOR_NSCREENS(i) {
|
||||
rc = dixLookupWindow(pSprite->windows + i, win->info[i].id,
|
||||
serverClient, DixReadAccess);
|
||||
if (rc != Success) /* window is being unmapped */
|
||||
|
|
|
@ -3067,7 +3067,7 @@ SendVisibilityNotify(WindowPtr pWin)
|
|||
|
||||
switch(visibility) {
|
||||
case VisibilityUnobscured:
|
||||
for(i = 0; i < PanoramiXNumScreens; i++) {
|
||||
FOR_NSCREENS(i) {
|
||||
if(i == Scrnum) continue;
|
||||
|
||||
rc = dixLookupWindow(&pWin2, win->info[i].id, serverClient,
|
||||
|
@ -3089,7 +3089,7 @@ SendVisibilityNotify(WindowPtr pWin)
|
|||
}
|
||||
break;
|
||||
case VisibilityFullyObscured:
|
||||
for(i = 0; i < PanoramiXNumScreens; i++) {
|
||||
FOR_NSCREENS(i) {
|
||||
if(i == Scrnum) continue;
|
||||
|
||||
rc = dixLookupWindow(&pWin2, win->info[i].id, serverClient,
|
||||
|
|
|
@ -46,6 +46,7 @@
|
|||
extern int connBlockScreenStart;
|
||||
|
||||
#ifdef PANORAMIX
|
||||
#include "panoramiXsrv.h"
|
||||
extern int PanoramiXPixWidth;
|
||||
extern int PanoramiXPixHeight;
|
||||
extern int PanoramiXNumScreens;
|
||||
|
@ -137,7 +138,7 @@ void dmxConnectionBlockCallback(void)
|
|||
}
|
||||
dmxLog(dmxInfo, "%d screens configured with Xinerama (%d %d)\n",
|
||||
PanoramiXNumScreens, PanoramiXPixWidth, PanoramiXPixHeight);
|
||||
for (i = 0; i < PanoramiXNumScreens; i++) found[i] = FALSE;
|
||||
FOR_NSCREENS(i) found[i] = FALSE;
|
||||
} else {
|
||||
#endif
|
||||
/* This never happens because we're
|
||||
|
@ -177,7 +178,7 @@ void dmxConnectionBlockCallback(void)
|
|||
#ifdef PANORAMIX
|
||||
if (!noPanoramiXExtension) {
|
||||
int k;
|
||||
for (k = 0; k < PanoramiXNumScreens; k++) {
|
||||
FOR_NSCREENS(k) {
|
||||
DMXScreenInfo *dmxScreen = &dmxScreens[k];
|
||||
|
||||
if (dmxScreen->beDisplay) {
|
||||
|
@ -203,7 +204,7 @@ void dmxConnectionBlockCallback(void)
|
|||
#ifdef PANORAMIX
|
||||
if (!noPanoramiXExtension) {
|
||||
Bool fatal = FALSE;
|
||||
for (i = 0; i < PanoramiXNumScreens; i++) {
|
||||
FOR_NSCREENS(i) {
|
||||
fatal |= !found[i];
|
||||
if (!found[i]) {
|
||||
dmxLog(dmxError,
|
||||
|
|
|
@ -703,7 +703,7 @@ static void dmxBERestorePixmapImage(pointer value, XID id, RESTYPE type,
|
|||
RT_PIXMAP, NullClient, DixUnknownAccess);
|
||||
if (pPix != pDst) return; /* Not a match.... Next! */
|
||||
|
||||
for (i = 0; i < PanoramiXNumScreens; i++) {
|
||||
FOR_NSCREENS(i) {
|
||||
PixmapPtr pSrc;
|
||||
dmxPixPrivPtr pSrcPriv = NULL;
|
||||
|
||||
|
@ -1372,7 +1372,7 @@ static void dmxBEFindPixmapImage(pointer value, XID id, RESTYPE type,
|
|||
RT_PIXMAP, NullClient, DixUnknownAccess);
|
||||
if (pPix != pDst) return; /* Not a match.... Next! */
|
||||
|
||||
for (i = 0; i < PanoramiXNumScreens; i++) {
|
||||
FOR_NSCREENS(i) {
|
||||
PixmapPtr pSrc;
|
||||
dmxPixPrivPtr pSrcPriv = NULL;
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user