frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XineramaInitData ignores its argument. Quit passing one. 

Also fix up XineramaInitData's caller, XineramaReinitData.

Commit by Jamey Sharp and Josh Triplett.

Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Josh Triplett <josh@joshtriplett.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
This commit is contained in:
Jamey Sharp 2010-09-18 01:23:12 +02:00
parent b85c10a35d
commit 53a4744b69
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Xext/panoramiX.c
View File

@ -388,7 +388,7 @@ XineramaRegisterConnectionBlockCallback(void (*func)(void))
return TRUE; return TRUE;
} }
static void XineramaInitData(ScreenPtr pScreen) static void XineramaInitData(void)
{ {
int i, w, h; int i, w, h;
@ -397,7 +397,7 @@ static void XineramaInitData(ScreenPtr pScreen)
BoxRec TheBox; BoxRec TheBox;
RegionRec ScreenRegion; RegionRec ScreenRegion;
pScreen = screenInfo.screens[i]; ScreenPtr pScreen = screenInfo.screens[i];
TheBox.x1 = pScreen->x; TheBox.x1 = pScreen->x;
TheBox.x2 = TheBox.x1 + pScreen->width; TheBox.x2 = TheBox.x1 + pScreen->width;
@ -414,7 +414,7 @@ static void XineramaInitData(ScreenPtr pScreen)
PanoramiXPixHeight = screenInfo.screens[0]->y + screenInfo.screens[0]->height; PanoramiXPixHeight = screenInfo.screens[0]->y + screenInfo.screens[0]->height;
FOR_NSCREENS_FORWARD_SKIP(i) { FOR_NSCREENS_FORWARD_SKIP(i) {
pScreen = screenInfo.screens[i]; ScreenPtr pScreen = screenInfo.screens[i];
w = pScreen->x + pScreen->width; w = pScreen->x + pScreen->width;
h = pScreen->y + pScreen->height; h = pScreen->y + pScreen->height;
@ -425,10 +425,10 @@ static void XineramaInitData(ScreenPtr pScreen)
} }
} }
void XineramaReinitData(ScreenPtr pScreen) void XineramaReinitData(void)
{ {
RegionUninit(&PanoramiXScreenRegion); RegionUninit(&PanoramiXScreenRegion);
XineramaInitData(pScreen); XineramaInitData();
} }
/* /*
@ -525,7 +525,7 @@ void PanoramiXExtensionInit(int argc, char *argv[])
return; return;
} }
XineramaInitData(pScreen); XineramaInitData();
/* /*
* Put our processes into the ProcVector * Put our processes into the ProcVector

2
Xext/panoramiXsrv.h
View File

@ -19,7 +19,7 @@ extern _X_EXPORT PanoramiXRes * PanoramiXFindIDByScrnum(RESTYPE, XID, int);
extern _X_EXPORT Bool XineramaRegisterConnectionBlockCallback(void (*func)(void)); extern _X_EXPORT Bool XineramaRegisterConnectionBlockCallback(void (*func)(void));
extern _X_EXPORT int XineramaDeleteResource(pointer, XID); extern _X_EXPORT int XineramaDeleteResource(pointer, XID);
extern _X_EXPORT void XineramaReinitData(ScreenPtr); extern _X_EXPORT void XineramaReinitData(void);
extern _X_EXPORT RESTYPE XRC_DRAWABLE; extern _X_EXPORT RESTYPE XRC_DRAWABLE;
extern _X_EXPORT RESTYPE XRT_WINDOW; extern _X_EXPORT RESTYPE XRT_WINDOW;

2
hw/dmx/dmxextension.c
View File

@ -455,7 +455,7 @@ static void dmxSetRootWindowOrigin(int idx, int x, int y)
pScreen->y = dmxScreen->rootYOrigin; pScreen->y = dmxScreen->rootYOrigin;
/* Recalculate the Xinerama regions and data structs */ /* Recalculate the Xinerama regions and data structs */
XineramaReinitData(pScreen); XineramaReinitData();
/* Adjust each of the root window's children */ /* Adjust each of the root window's children */
if (!idx) ReinitializeRootWindow(screenInfo.screens[0]->root, xoff, yoff); if (!idx) ReinitializeRootWindow(screenInfo.screens[0]->root, xoff, yoff);