xserver: Branch 'master' - 4 commits
Keith Packard
keithp at kemper.freedesktop.org
Fri May 14 11:47:34 PDT 2010
dix/gc.c | 2 +-
hw/dmx/doc/dmx.sgml | 3 +--
hw/xnest/Screen.c | 1 -
hw/xquartz/quartz.c | 1 -
include/scrnintstr.h | 16 ----------------
mi/miexpose.c | 4 ++--
mi/mipointer.c | 12 ------------
mi/miscrinit.c | 1 -
8 files changed, 4 insertions(+), 36 deletions(-)
New commits:
commit f87002cb7d8729b1da4cbefe7653f4cfd3a2d956
Merge: a4fbc0f... 890f536...
Author: Keith Packard <keithp at keithp.com>
Date: Fri May 14 11:46:29 2010 -0700
Merge remote branch 'jamey/for-keith'
commit 890f536f8d66f08e7d6a5685659eef4001a8757d
Author: Jamey Sharp <jamey at minilop.net>
Date: Fri May 14 00:18:14 2010 -0700
Bugfix for "Pre-validate ChangeGC XIDs": off-by-one in loop index.
Signed-off-by: Jamey Sharp <jamey at minilop.net>
Tested-by: Colin Harrison <colin.harrison at virgin.net>
diff --git a/dix/gc.c b/dix/gc.c
index 00b63bd..5a0d00d 100644
--- a/dix/gc.c
+++ b/dix/gc.c
@@ -439,7 +439,7 @@ ChangeGCXIDs(ClientPtr client, GC *pGC, BITS32 mask, CARD32 *pC32)
client->errorValue = mask;
return BadValue;
}
- for (i = Ones(mask); i; --i)
+ for (i = Ones(mask); i--; )
vals[i].val = pC32[i];
for (i = 0; i < sizeof(xidfields) / sizeof(*xidfields); ++i)
{
commit a4fbc0fedafda6df98f647173a2deccb86ef0479
Author: Oliver McFadden <oliver.mcfadden at nokia.com>
Date: Fri May 14 07:49:31 2010 +0300
scrnintstr.h: removed unused PaintWindow function pointers.
Please note this patch breaks the ABI.
Signed-off-by: Oliver McFadden <oliver.mcfadden at nokia.com>
Reviewed-by: Keith Packard <keithp at keithp.com>
diff --git a/hw/dmx/doc/dmx.sgml b/hw/dmx/doc/dmx.sgml
index ef66d11..6aa0ec5 100644
--- a/hw/dmx/doc/dmx.sgml
+++ b/hw/dmx/doc/dmx.sgml
@@ -1001,8 +1001,7 @@ default routine is chosen during GC validation.
<p>Note that some pointers to functions that draw to the screen are
stored in the Screen structure. They include GetImage(), GetSpans(),
-PaintWindowBackground(), PaintWindowBorder(), CopyWindow() and
-RestoreAreas().
+CopyWindow() and RestoreAreas().
<sect2>Xnest
diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c
index 462be87..36d18eb 100644
--- a/hw/xquartz/quartz.c
+++ b/hw/xquartz/quartz.c
@@ -279,7 +279,6 @@ void QuartzUpdateScreens(void) {
pRoot = WindowTable[pScreen->myNum];
AppleWMSetScreenOrigin(pRoot);
pScreen->ResizeWindow(pRoot, x - sx, y - sy, width, height, NULL);
- //pScreen->PaintWindowBackground (pRoot, &pRoot->borderClip, PW_BACKGROUND);
miPaintWindow(pRoot, &pRoot->borderClip, PW_BACKGROUND);
/* <rdar://problem/7770779> pointer events are clipped to old display region after display reconfiguration
diff --git a/include/scrnintstr.h b/include/scrnintstr.h
index a4ca0c6..3a77e0c 100644
--- a/include/scrnintstr.h
+++ b/include/scrnintstr.h
@@ -168,14 +168,6 @@ typedef void (* WindowExposuresProcPtr)(
RegionPtr /*prgn*/,
RegionPtr /*other_exposed*/);
-typedef void (* PaintWindowProcPtr)(
- WindowPtr /*pWindow*/,
- RegionPtr /*pRegion*/,
- int /*what*/);
-
-typedef PaintWindowProcPtr PaintWindowBackgroundProcPtr;
-typedef PaintWindowProcPtr PaintWindowBorderProcPtr;
-
typedef void (* CopyWindowProcPtr)(
WindowPtr /*pWindow*/,
DDXPointRec /*ptOldOrg*/,
@@ -497,8 +489,6 @@ typedef struct _Screen {
ValidateTreeProcPtr ValidateTree;
PostValidateTreeProcPtr PostValidateTree;
WindowExposuresProcPtr WindowExposures;
- PaintWindowBackgroundProcPtr PaintWindowBackground; /** unused */
- PaintWindowBorderProcPtr PaintWindowBorder; /** unused */
CopyWindowProcPtr CopyWindow;
ClearToBackgroundProcPtr ClearToBackground;
ClipNotifyProcPtr ClipNotify;
diff --git a/mi/miexpose.c b/mi/miexpose.c
index a99e530..a50dc5e 100644
--- a/mi/miexpose.c
+++ b/mi/miexpose.c
@@ -297,7 +297,7 @@ miHandleExposures(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
if (extents)
{
- /* PaintWindowBackground doesn't clip, so we have to */
+ /* miPaintWindow doesn't clip, so we have to */
REGION_INTERSECT(pscr, &rgnExposed, &rgnExposed, &pWin->clipList);
}
miPaintWindow((WindowPtr)pDstDrawable, &rgnExposed, PW_BACKGROUND);
@@ -497,7 +497,7 @@ miWindowExposures( WindowPtr pWin, RegionPtr prgn, RegionPtr other_exposed)
REGION_RESET( pWin->drawable.pScreen, exposures, &box);
REGION_UNION( pWin->drawable.pScreen, prgn, prgn, exposures);
}
- /* PaintWindowBackground doesn't clip, so we have to */
+ /* miPaintWindow doesn't clip, so we have to */
REGION_INTERSECT( pWin->drawable.pScreen, prgn, prgn, &pWin->clipList);
}
if (prgn && !REGION_NIL(prgn))
commit 71296885b0bb946e7ab986169f5b872952c221a0
Author: Oliver McFadden <oliver.mcfadden at nokia.com>
Date: Thu May 13 07:12:43 2010 +0300
mi: removed unused PointerNonInterestBox functions.
Please note this patch breaks the ABI.
Signed-off-by: Oliver McFadden <oliver.mcfadden at nokia.com>
Reviewed-by: Keith Packard <keithp at keithp.com>
diff --git a/hw/xnest/Screen.c b/hw/xnest/Screen.c
index 8c1c244..62255b8 100644
--- a/hw/xnest/Screen.c
+++ b/hw/xnest/Screen.c
@@ -260,7 +260,6 @@ xnestOpenScreen(int index, ScreenPtr pScreen, int argc, char *argv[])
pScreen->SaveScreen = xnestSaveScreen;
pScreen->GetImage = xnestGetImage;
pScreen->GetSpans = xnestGetSpans;
- pScreen->PointerNonInterestBox = NULL;
pScreen->SourceValidate = NULL;
/* Window Procedures */
diff --git a/include/scrnintstr.h b/include/scrnintstr.h
index 5538936..a4ca0c6 100644
--- a/include/scrnintstr.h
+++ b/include/scrnintstr.h
@@ -121,11 +121,6 @@ typedef void (* GetSpansProcPtr)(
int /*nspans*/,
char * /*pdstStart*/);
-typedef void (* PointerNonInterestBoxProcPtr)(
- DeviceIntPtr /*pDev*/,
- ScreenPtr /*pScreen*/,
- BoxPtr /*pBox*/);
-
typedef void (* SourceValidateProcPtr)(
DrawablePtr /*pDrawable*/,
int /*x*/,
@@ -489,7 +484,6 @@ typedef struct _Screen {
SaveScreenProcPtr SaveScreen;
GetImageProcPtr GetImage;
GetSpansProcPtr GetSpans;
- PointerNonInterestBoxProcPtr PointerNonInterestBox;
SourceValidateProcPtr SourceValidate;
/* Window Procedures */
diff --git a/mi/mipointer.c b/mi/mipointer.c
index ad7b3db..296c57f 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -63,8 +63,6 @@ static Bool miPointerDisplayCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
CursorPtr pCursor);
static void miPointerConstrainCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
BoxPtr pBox);
-static void miPointerPointerNonInterestBox(DeviceIntPtr pDev,
- ScreenPtr pScreen, BoxPtr pBox);
static void miPointerCursorLimits(DeviceIntPtr pDev, ScreenPtr pScreen,
CursorPtr pCursor, BoxPtr pHotBox,
BoxPtr pTopLeftBox);
@@ -115,7 +113,6 @@ miPointerInitialize (ScreenPtr pScreen,
pScreen->UnrealizeCursor = miPointerUnrealizeCursor;
pScreen->SetCursorPosition = miPointerSetCursorPosition;
pScreen->RecolorCursor = miRecolorCursor;
- pScreen->PointerNonInterestBox = miPointerPointerNonInterestBox;
pScreen->DeviceCursorInitialize = miPointerDeviceInitialize;
pScreen->DeviceCursorCleanup = miPointerDeviceCleanup;
@@ -211,15 +208,6 @@ miPointerConstrainCursor (DeviceIntPtr pDev, ScreenPtr pScreen, BoxPtr pBox)
/*ARGSUSED*/
static void
-miPointerPointerNonInterestBox (DeviceIntPtr pDev,
- ScreenPtr pScreen,
- BoxPtr pBox)
-{
- /* until DIX uses this, this will remain a stub */
-}
-
-/*ARGSUSED*/
-static void
miPointerCursorLimits(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor,
BoxPtr pHotBox, BoxPtr pTopLeftBox)
{
diff --git a/mi/miscrinit.c b/mi/miscrinit.c
index d46b9f5..1b88ecb 100644
--- a/mi/miscrinit.c
+++ b/mi/miscrinit.c
@@ -246,7 +246,6 @@ miScreenInit(
}
/* else CloseScreen */
/* QueryBestSize, SaveScreen, GetImage, GetSpans */
- pScreen->PointerNonInterestBox = (PointerNonInterestBoxProcPtr) 0;
pScreen->SourceValidate = (SourceValidateProcPtr) 0;
/* CreateWindow, DestroyWindow, PositionWindow, ChangeWindowAttributes */
/* RealizeWindow, UnrealizeWindow */
More information about the xorg-commit
mailing list