Skip to content

treewide: use helper dixGetScreenPtr() for retrieving ScreenPtr's #1215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

treewide: use helper dixGetScreenPtr() for retrieving ScreenPtr's #1215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Xext/panoramiX.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,7 +827,7 @@ PanoramiXConsolidate(void)
VisualID
PanoramiXTranslateVisualID(int screen, VisualID orig)
{
ScreenPtr pOtherScreen = screenInfo.screens[screen];
ScreenPtr pOtherScreen = dixGetScreenPtr(screen);
VisualPtr pVisual = NULL;
int i;

Expand Down Expand Up @@ -970,7 +970,7 @@ ProcPanoramiXGetScreenSize(ClientPtr client)
if (rc != Success)
return rc;

ScreenPtr pScreen = screenInfo.screens[stuff->screen];
ScreenPtr pScreen = dixGetScreenPtr(stuff->screen);

xPanoramiXGetScreenSizeReply reply = {
/* screen dimensions */
Expand Down
94 changes: 41 additions & 53 deletions Xext/vidmode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ from Kaleb S. KEITHLEY
#include "dix/dix_priv.h"
#include "dix/request_priv.h"
#include "dix/rpcbuf_priv.h"
#include "dix/screenint_priv.h"
#include "os/log_priv.h"
#include "os/osdep.h"

Expand Down Expand Up @@ -222,7 +223,6 @@ ProcVidModeGetModeLine(ClientPtr client)
if (client->swapped)
swaps(&stuff->screen);

ScreenPtr pScreen;
VidModePtr pVidMode;
DisplayModePtr mode;
int dotClock;
Expand All @@ -232,9 +232,10 @@ ProcVidModeGetModeLine(ClientPtr client)

ver = ClientMajorVersion(client);

if (stuff->screen >= screenInfo.numScreens)
ScreenPtr pScreen = dixGetScreenPtr(stuff->screen);
if (!pScreen)
return BadValue;
pScreen = screenInfo.screens[stuff->screen];

pVidMode = VidModeGetPtr(pScreen);
if (pVidMode == NULL)
return BadImplementation;
Expand Down Expand Up @@ -349,17 +350,17 @@ ProcVidModeGetAllModeLines(ClientPtr client)
if (client->swapped)
swaps(&stuff->screen);

ScreenPtr pScreen;
VidModePtr pVidMode;
DisplayModePtr mode;
int modecount, dotClock;
int ver;

DEBUG_P("XF86VidModeGetAllModelines");

if (stuff->screen >= screenInfo.numScreens)
ScreenPtr pScreen = dixGetScreenPtr(stuff->screen);
if (!pScreen)
return BadValue;
pScreen = screenInfo.screens[stuff->screen];

ver = ClientMajorVersion(client);
pVidMode = VidModeGetPtr(pScreen);
if (pVidMode == NULL)
Expand Down Expand Up @@ -508,7 +509,6 @@ ProcVidModeAddModeLine(ClientPtr client)

static int VidModeAddModeLine(ClientPtr client, xXF86VidModeAddModeLineReq* stuff)
{
ScreenPtr pScreen;
DisplayModePtr mode;
VidModePtr pVidMode;
int dotClock;
Expand All @@ -531,9 +531,9 @@ static int VidModeAddModeLine(ClientPtr client, xXF86VidModeAddModeLineReq* stuf
stuff->after_vsyncend, stuff->after_vtotal,
(unsigned long) stuff->after_flags);

if (stuff->screen >= screenInfo.numScreens)
ScreenPtr pScreen = dixGetScreenPtr(stuff->screen);
if (!pScreen)
return BadValue;
pScreen = screenInfo.screens[stuff->screen];

if (stuff->hsyncstart < stuff->hdisplay ||
stuff->hsyncend < stuff->hsyncstart ||
Expand Down Expand Up @@ -732,7 +732,6 @@ VidModeDeleteModeLine(ClientPtr client, xXF86VidModeDeleteModeLineReq* stuff)
int dotClock;
DisplayModePtr mode;
VidModePtr pVidMode;
ScreenPtr pScreen;

DebugF("DeleteModeLine - scrn: %d clock: %ld\n",
(int) stuff->screen, (unsigned long) stuff->dotclock);
Expand All @@ -743,9 +742,9 @@ VidModeDeleteModeLine(ClientPtr client, xXF86VidModeDeleteModeLineReq* stuff)
stuff->vdisplay, stuff->vsyncstart, stuff->vsyncend, stuff->vtotal,
(unsigned long) stuff->flags);

if (stuff->screen >= screenInfo.numScreens)
ScreenPtr pScreen = dixGetScreenPtr(stuff->screen);
if (!pScreen)
return BadValue;
pScreen = screenInfo.screens[stuff->screen];

pVidMode = VidModeGetPtr(pScreen);
if (pVidMode == NULL)
Expand Down Expand Up @@ -894,7 +893,6 @@ ProcVidModeModModeLine(ClientPtr client)
static int
VidModeModModeLine(ClientPtr client, xXF86VidModeModModeLineReq *stuff)
{
ScreenPtr pScreen;
VidModePtr pVidMode;
DisplayModePtr mode;
int dotClock;
Expand All @@ -913,9 +911,9 @@ VidModeModModeLine(ClientPtr client, xXF86VidModeModModeLineReq *stuff)
stuff->vsyncend < stuff->vsyncstart || stuff->vtotal < stuff->vsyncend)
return BadValue;

if (stuff->screen >= screenInfo.numScreens)
ScreenPtr pScreen = dixGetScreenPtr(stuff->screen);
if (!pScreen)
return BadValue;
pScreen = screenInfo.screens[stuff->screen];

pVidMode = VidModeGetPtr(pScreen);
if (pVidMode == NULL)
Expand Down Expand Up @@ -1076,7 +1074,6 @@ ProcVidModeValidateModeLine(ClientPtr client)
static int
VidModeValidateModeLine(ClientPtr client, xXF86VidModeValidateModeLineReq *stuff)
{
ScreenPtr pScreen;
VidModePtr pVidMode;
DisplayModePtr mode, modetmp = NULL;
int status, dotClock;
Expand All @@ -1090,9 +1087,9 @@ VidModeValidateModeLine(ClientPtr client, xXF86VidModeValidateModeLineReq *stuff
stuff->vdisplay, stuff->vsyncstart, stuff->vsyncend, stuff->vtotal,
(unsigned long) stuff->flags);

if (stuff->screen >= screenInfo.numScreens)
ScreenPtr pScreen = dixGetScreenPtr(stuff->screen);
if (!pScreen)
return BadValue;
pScreen = screenInfo.screens[stuff->screen];

status = MODE_OK;

Expand Down Expand Up @@ -1166,7 +1163,6 @@ ProcVidModeSwitchMode(ClientPtr client)
swaps(&stuff->zoom);
}

ScreenPtr pScreen;
VidModePtr pVidMode;

DEBUG_P("XF86VidModeSwitchMode");
Expand All @@ -1175,9 +1171,9 @@ ProcVidModeSwitchMode(ClientPtr client)
if (!VidModeAllowNonLocal && !client->local)
return VidModeErrorBase + XF86VidModeClientNotLocal;

if (stuff->screen >= screenInfo.numScreens)
ScreenPtr pScreen = dixGetScreenPtr(stuff->screen);
if (!pScreen)
return BadValue;
pScreen = screenInfo.screens[stuff->screen];

pVidMode = VidModeGetPtr(pScreen);
if (pVidMode == NULL)
Expand Down Expand Up @@ -1250,7 +1246,6 @@ ProcVidModeSwitchToMode(ClientPtr client)
static int
VidModeSwitchToMode(ClientPtr client, xXF86VidModeSwitchToModeReq *stuff)
{
ScreenPtr pScreen;
VidModePtr pVidMode;
DisplayModePtr mode;
int dotClock;
Expand All @@ -1264,9 +1259,9 @@ VidModeSwitchToMode(ClientPtr client, xXF86VidModeSwitchToModeReq *stuff)
stuff->vdisplay, stuff->vsyncstart, stuff->vsyncend, stuff->vtotal,
(unsigned long) stuff->flags);

if (stuff->screen >= screenInfo.numScreens)
ScreenPtr pScreen = dixGetScreenPtr(stuff->screen);
if (!pScreen)
return BadValue;
pScreen = screenInfo.screens[stuff->screen];

pVidMode = VidModeGetPtr(pScreen);
if (pVidMode == NULL)
Expand Down Expand Up @@ -1322,7 +1317,6 @@ ProcVidModeLockModeSwitch(ClientPtr client)
swaps(&stuff->lock);
}

ScreenPtr pScreen;
VidModePtr pVidMode;

DEBUG_P("XF86VidModeLockModeSwitch");
Expand All @@ -1331,9 +1325,9 @@ ProcVidModeLockModeSwitch(ClientPtr client)
if (!VidModeAllowNonLocal && !client->local)
return VidModeErrorBase + XF86VidModeClientNotLocal;

if (stuff->screen >= screenInfo.numScreens)
ScreenPtr pScreen = dixGetScreenPtr(stuff->screen);
if (!pScreen)
return BadValue;
pScreen = screenInfo.screens[stuff->screen];

pVidMode = VidModeGetPtr(pScreen);
if (pVidMode == NULL)
Expand Down Expand Up @@ -1364,9 +1358,9 @@ ProcVidModeGetMonitor(ClientPtr client)

DEBUG_P("XF86VidModeGetMonitor");

if (stuff->screen >= screenInfo.numScreens)
ScreenPtr pScreen = dixGetScreenPtr(stuff->screen);
if (!pScreen)
return BadValue;
ScreenPtr pScreen = screenInfo.screens[stuff->screen];

VidModePtr pVidMode = VidModeGetPtr(pScreen);
if (pVidMode == NULL)
Expand Down Expand Up @@ -1416,15 +1410,14 @@ ProcVidModeGetViewPort(ClientPtr client)
if (client->swapped)
swaps(&stuff->screen);

ScreenPtr pScreen;
VidModePtr pVidMode;
int x, y;

DEBUG_P("XF86VidModeGetViewPort");

if (stuff->screen >= screenInfo.numScreens)
ScreenPtr pScreen = dixGetScreenPtr(stuff->screen);
if (!pScreen)
return BadValue;
pScreen = screenInfo.screens[stuff->screen];

pVidMode = VidModeGetPtr(pScreen);
if (pVidMode == NULL)
Expand Down Expand Up @@ -1457,7 +1450,6 @@ ProcVidModeSetViewPort(ClientPtr client)
swapl(&stuff->y);
}

ScreenPtr pScreen;
VidModePtr pVidMode;

DEBUG_P("XF86VidModeSetViewPort");
Expand All @@ -1466,9 +1458,9 @@ ProcVidModeSetViewPort(ClientPtr client)
if (!VidModeAllowNonLocal && !client->local)
return VidModeErrorBase + XF86VidModeClientNotLocal;

if (stuff->screen >= screenInfo.numScreens)
ScreenPtr pScreen = dixGetScreenPtr(stuff->screen);
if (!pScreen)
return BadValue;
pScreen = screenInfo.screens[stuff->screen];

pVidMode = VidModeGetPtr(pScreen);
if (pVidMode == NULL)
Expand All @@ -1489,16 +1481,15 @@ ProcVidModeGetDotClocks(ClientPtr client)
if (client->swapped)
swaps(&stuff->screen);

ScreenPtr pScreen;
VidModePtr pVidMode;
int numClocks;
Bool ClockProg;

DEBUG_P("XF86VidModeGetDotClocks");

if (stuff->screen >= screenInfo.numScreens)
ScreenPtr pScreen = dixGetScreenPtr(stuff->screen);
if (!pScreen)
return BadValue;
pScreen = screenInfo.screens[stuff->screen];

pVidMode = VidModeGetPtr(pScreen);
if (pVidMode == NULL)
Expand Down Expand Up @@ -1551,7 +1542,6 @@ ProcVidModeSetGamma(ClientPtr client)
swapl(&stuff->blue);
}

ScreenPtr pScreen;
VidModePtr pVidMode;

DEBUG_P("XF86VidModeSetGamma");
Expand All @@ -1560,9 +1550,9 @@ ProcVidModeSetGamma(ClientPtr client)
if (!VidModeAllowNonLocal && !client->local)
return VidModeErrorBase + XF86VidModeClientNotLocal;

if (stuff->screen >= screenInfo.numScreens)
ScreenPtr pScreen = dixGetScreenPtr(stuff->screen);
if (!pScreen)
return BadValue;
pScreen = screenInfo.screens[stuff->screen];

pVidMode = VidModeGetPtr(pScreen);
if (pVidMode == NULL)
Expand All @@ -1585,15 +1575,14 @@ ProcVidModeGetGamma(ClientPtr client)
if (client->swapped)
swaps(&stuff->screen);

ScreenPtr pScreen;
VidModePtr pVidMode;
float red, green, blue;

DEBUG_P("XF86VidModeGetGamma");

if (stuff->screen >= screenInfo.numScreens)
ScreenPtr pScreen = dixGetScreenPtr(stuff->screen);
if (!pScreen)
return BadValue;
pScreen = screenInfo.screens[stuff->screen];

pVidMode = VidModeGetPtr(pScreen);
if (pVidMode == NULL)
Expand Down Expand Up @@ -1631,16 +1620,15 @@ ProcVidModeSetGammaRamp(ClientPtr client)
}

CARD16 *r, *g, *b;
ScreenPtr pScreen;
VidModePtr pVidMode;

/* limited to local-only connections */
if (!VidModeAllowNonLocal && !client->local)
return VidModeErrorBase + XF86VidModeClientNotLocal;

if (stuff->screen >= screenInfo.numScreens)
ScreenPtr pScreen = dixGetScreenPtr(stuff->screen);
if (!pScreen)
return BadValue;
pScreen = screenInfo.screens[stuff->screen];

pVidMode = VidModeGetPtr(pScreen);
if (pVidMode == NULL)
Expand Down Expand Up @@ -1674,9 +1662,9 @@ ProcVidModeGetGammaRamp(ClientPtr client)
swaps(&stuff->screen);
}

if (stuff->screen >= screenInfo.numScreens)
ScreenPtr pScreen = dixGetScreenPtr(stuff->screen);
if (!pScreen)
return BadValue;
ScreenPtr pScreen = screenInfo.screens[stuff->screen];

VidModePtr pVidMode = VidModeGetPtr(pScreen);
if (pVidMode == NULL)
Expand Down Expand Up @@ -1724,12 +1712,11 @@ ProcVidModeGetGammaRampSize(ClientPtr client)
if (client->swapped)
swaps(&stuff->screen);

ScreenPtr pScreen;
VidModePtr pVidMode;

if (stuff->screen >= screenInfo.numScreens)
ScreenPtr pScreen = dixGetScreenPtr(stuff->screen);
if (!pScreen)
return BadValue;
pScreen = screenInfo.screens[stuff->screen];

pVidMode = VidModeGetPtr(pScreen);
if (pVidMode == NULL)
Expand All @@ -1754,7 +1741,8 @@ ProcVidModeGetPermissions(ClientPtr client)
if (client->swapped)
swaps(&stuff->screen);

if (stuff->screen >= screenInfo.numScreens)
ScreenPtr pScreen = dixGetScreenPtr(stuff->screen);
if (!pScreen)
return BadValue;

xXF86VidModeGetPermissionsReply reply = {
Expand Down
5 changes: 2 additions & 3 deletions dbe/dbe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,8 +601,7 @@ ProcDbeGetVisualInfo(ClientPtr client)
x_rpcbuf_t rpcbuf = { .swapped = client->swapped, .err_clear = TRUE };

for (int i = 0; i < count; i++) {
ScreenPtr pScreen = (stuff->n == 0) ? screenInfo.screens[i] :
pDrawables[i]->pScreen;
ScreenPtr pScreen = (stuff->n == 0) ? dixGetScreenPtr(i) : pDrawables[i]->pScreen;
pDbeScreenPriv = DBE_SCREEN_PRIV(pScreen);

rc = XaceHookScreenAccess(client, pScreen, DixGetAttrAccess);
Expand Down Expand Up @@ -1033,7 +1032,7 @@ DbeExtensionInit(void)
*/

for (int j = 0; j < walkScreenIdx; j++) {
ScreenPtr pScreen = screenInfo.screens[j];
ScreenPtr pScreen = dixGetScreenPtr(j);
free(dixLookupPrivate(&pScreen->devPrivates, &dbeScreenPrivKeyRec));
dixSetPrivate(&pScreen->devPrivates, &dbeScreenPrivKeyRec, NULL);
}
Expand Down
2 changes: 1 addition & 1 deletion dix/cursor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ RealizeCursorAllScreens(CursorPtr pCurs)
pDevIt = pDevIt->next;
}
while (--walkScreenIdx>= 0) {
walkScreen = screenInfo.screens[walkScreenIdx];
walkScreen = dixGetScreenPtr(walkScreenIdx);
/* now unrealize all devices on previous screens */
pDevIt = inputInfo.devices;
while (pDevIt) {
Expand Down
Loading