xserver: Branch 'xorg-server-1.4-apple' - 2 commits
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Thu Oct 23 16:27:10 PDT 2008
mi/mieq.c | 8 ----
miext/rootless/rootlessGC.c | 71 ++++++++++++++++++++++++++++-----------
miext/rootless/rootlessValTree.c | 33 ++++++++----------
3 files changed, 66 insertions(+), 46 deletions(-)
New commits:
commit 7162df3bb0d9647b1650a29581ce93f129815702
Author: George Peter Staplin <gps at Georges-Workstation.local>
Date: Thu Oct 23 16:27:02 2008 -0600
miext/rootless: Silence some warnings by using proper C prototypes.
(cherry picked from commit 050e46e09efcc7e6f090fa4a749e9076c972b760)
diff --git a/miext/rootless/rootlessGC.c b/miext/rootless/rootlessGC.c
index d4a5436..7ebc6a5 100644
--- a/miext/rootless/rootlessGC.c
+++ b/miext/rootless/rootlessGC.c
@@ -61,6 +61,8 @@ static void RootlessChangeClip(GCPtr pGC, int type, pointer pvalue,
static void RootlessDestroyClip(GCPtr pGC);
static void RootlessCopyClip(GCPtr pgcDst, GCPtr pgcSrc);
+Bool RootlessCreateGC(GCPtr pGC);
+
GCFuncs rootlessGCFuncs = {
RootlessValidateGC,
RootlessChangeGC,
@@ -72,26 +74,55 @@ GCFuncs rootlessGCFuncs = {
};
// GC operations
-static void RootlessFillSpans();
-static void RootlessSetSpans();
-static void RootlessPutImage();
-static RegionPtr RootlessCopyArea();
-static RegionPtr RootlessCopyPlane();
-static void RootlessPolyPoint();
-static void RootlessPolylines();
-static void RootlessPolySegment();
-static void RootlessPolyRectangle();
-static void RootlessPolyArc();
-static void RootlessFillPolygon();
-static void RootlessPolyFillRect();
-static void RootlessPolyFillArc();
-static int RootlessPolyText8();
-static int RootlessPolyText16();
-static void RootlessImageText8();
-static void RootlessImageText16();
-static void RootlessImageGlyphBlt();
-static void RootlessPolyGlyphBlt();
-static void RootlessPushPixels();
+static void RootlessFillSpans(DrawablePtr dst, GCPtr pGC, int nInit,
+ DDXPointPtr pptInit, int *pwidthInit,
+ int sorted);
+static void RootlessSetSpans(DrawablePtr dst, GCPtr pGC, char *pSrc,
+ DDXPointPtr pptInit, int *pwidthInit,
+ int nspans, int sorted);
+static void RootlessPutImage(DrawablePtr dst, GCPtr pGC,
+ int depth, int x, int y, int w, int h,
+ int leftPad, int format, char *pBits);
+static RegionPtr RootlessCopyArea(DrawablePtr pSrc, DrawablePtr dst, GCPtr pGC,
+ int srcx, int srcy, int w, int h,
+ int dstx, int dsty);
+static RegionPtr RootlessCopyPlane(DrawablePtr pSrc, DrawablePtr dst,
+ GCPtr pGC, int srcx, int srcy,
+ int w, int h, int dstx, int dsty,
+ unsigned long plane);
+static void RootlessPolyPoint(DrawablePtr dst, GCPtr pGC,
+ int mode, int npt, DDXPointPtr pptInit);
+static void RootlessPolylines(DrawablePtr dst, GCPtr pGC,
+ int mode, int npt, DDXPointPtr pptInit);
+static void RootlessPolySegment(DrawablePtr dst, GCPtr pGC,
+ int nseg, xSegment *pSeg);
+static void RootlessPolyRectangle(DrawablePtr dst, GCPtr pGC,
+ int nRects, xRectangle *pRects);
+static void RootlessPolyArc(DrawablePtr dst, GCPtr pGC, int narcs, xArc *parcs);
+static void RootlessFillPolygon(DrawablePtr dst, GCPtr pGC,
+ int shape, int mode, int count,
+ DDXPointPtr pptInit);
+static void RootlessPolyFillRect(DrawablePtr dst, GCPtr pGC,
+ int nRectsInit, xRectangle *pRectsInit);
+static void RootlessPolyFillArc(DrawablePtr dst, GCPtr pGC,
+ int narcsInit, xArc *parcsInit);
+static int RootlessPolyText8(DrawablePtr dst, GCPtr pGC,
+ int x, int y, int count, char *chars);
+static int RootlessPolyText16(DrawablePtr dst, GCPtr pGC,
+ int x, int y, int count, unsigned short *chars);
+static void RootlessImageText8(DrawablePtr dst, GCPtr pGC,
+ int x, int y, int count, char *chars);
+static void RootlessImageText16(DrawablePtr dst, GCPtr pGC,
+ int x, int y, int count, unsigned short *chars);
+static void RootlessImageGlyphBlt(DrawablePtr dst, GCPtr pGC,
+ int x, int y, unsigned int nglyphInit,
+ CharInfoPtr *ppciInit, pointer unused);
+static void RootlessPolyGlyphBlt(DrawablePtr dst, GCPtr pGC,
+ int x, int y, unsigned int nglyph,
+ CharInfoPtr *ppci, pointer pglyphBase);
+static void RootlessPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr dst,
+ int dx, int dy, int xOrg, int yOrg);
+
static GCOps rootlessGCOps = {
RootlessFillSpans,
diff --git a/miext/rootless/rootlessValTree.c b/miext/rootless/rootlessValTree.c
index 4f16530..e3e122c 100644
--- a/miext/rootless/rootlessValTree.c
+++ b/miext/rootless/rootlessValTree.c
@@ -104,16 +104,19 @@ Equipment Corporation.
#include "globals.h"
+int RootlessShapedWindowIn (ScreenPtr pScreen, RegionPtr universe,
+ RegionPtr bounding, BoxPtr rect, int x, int y);
+
+int RootlessMiValidateTree (WindowPtr pRoot, WindowPtr pChild, VTKind kind);
+
+
#ifdef SHAPE
/*
* Compute the visibility of a shaped window
*/
int
-RootlessShapedWindowIn (pScreen, universe, bounding, rect, x, y)
- ScreenPtr pScreen;
- RegionPtr universe, bounding;
- BoxPtr rect;
- register int x, y;
+RootlessShapedWindowIn (ScreenPtr pScreen, RegionPtr universe,
+ RegionPtr bounding, BoxPtr rect, int x, int y)
{
BoxRec box;
register BoxPtr boundBox;
@@ -191,12 +194,8 @@ RootlessShapedWindowIn (pScreen, universe, bounding, rect, x, y)
*-----------------------------------------------------------------------
*/
static void
-RootlessComputeClips (pParent, pScreen, universe, kind, exposed)
- register WindowPtr pParent;
- register ScreenPtr pScreen;
- register RegionPtr universe;
- VTKind kind;
- RegionPtr exposed; /* for intermediate calculations */
+RootlessComputeClips (WindowPtr pParent, ScreenPtr pScreen,
+ RegionPtr universe, VTKind kind, RegionPtr exposed)
{
int dx,
dy;
@@ -514,8 +513,7 @@ RootlessComputeClips (pParent, pScreen, universe, kind, exposed)
}
static void
-RootlessTreeObscured(pParent)
- register WindowPtr pParent;
+RootlessTreeObscured(WindowPtr pParent)
{
register WindowPtr pChild;
register int oldVis;
@@ -581,11 +579,10 @@ RootlessTreeObscured(pParent)
// fixme this is ugly
// Xprint/ValTree.c doesn't work, but maybe that method can?
int
-RootlessMiValidateTree (pRoot, pChild, kind)
- WindowPtr pRoot; /* Parent to validate */
- WindowPtr pChild; /* First child of pRoot that was
- * affected */
- VTKind kind; /* What kind of configuration caused call */
+RootlessMiValidateTree (WindowPtr pRoot, /* Parent to validate */
+ WindowPtr pChild, /* First child of pRoot that was
+ * affected */
+ VTKind kind /* What kind of configuration caused call */)
{
RegionRec childClip; /* The new borderClip for the current
* child */
commit 3b55803615bbce3a9a3d6b6747734f6735c0307c
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date: Thu Oct 23 16:25:31 2008 -0700
mi: Actually, we don't need to lock at all in mieqProcessInputEvents...
diff --git a/mi/mieq.c b/mi/mieq.c
index 23ba11b..e93d24f 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -235,10 +235,6 @@ mieqProcessInputEvents(void)
int x = 0, y = 0;
DeviceIntPtr dev = NULL;
-#ifdef XQUARTZ
- pthread_mutex_lock(&miEventQueueMutex);
-#endif
-
while (miEventQueue.head != miEventQueue.tail) {
if (screenIsSaved == SCREEN_SAVER_ON)
SaveScreens (SCREEN_SAVER_OFF, ScreenSaverReset);
@@ -253,10 +249,6 @@ mieqProcessInputEvents(void)
memcpy(&e, &miEventQueue.events[miEventQueue.head], sizeof(EventRec));
miEventQueue.head = (miEventQueue.head + 1) % QUEUE_SIZE;
-#ifdef XQUARTZ
- pthread_mutex_unlock(&miEventQueueMutex);
-#endif
-
if (miEventQueue.handlers[e.event[0].u.u.type]) {
/* If someone's registered a custom event handler, let them
* steal it. */
More information about the xorg-commit
mailing list