xserver git update 20/5/2010

13 files changed, 2792 insertions, 2823 deletions

diff --git a/xorg-server/Xext/panoramiX.c b/xorg-server/Xext/panoramiX.c
index e26aadc95..65af9a71f 100644
--- a/xorg-server/Xext/panoramiX.c
+++ b/xorg-server/Xext/panoramiX.c
@@ -519,6 +519,10 @@ void PanoramiXExtensionInit(int argc, char *argv[])
 	    panoramiXGeneration = serverGeneration;

 	    success = TRUE;

 	}

+	SetResourceTypeErrorValue(XRT_WINDOW, BadWindow);

+	SetResourceTypeErrorValue(XRT_PIXMAP, BadPixmap);

+	SetResourceTypeErrorValue(XRT_GC, BadGC);

+	SetResourceTypeErrorValue(XRT_COLORMAP, BadColor);

     }

 

     if (!success) {

diff --git a/xorg-server/Xext/panoramiXprocs.c b/xorg-server/Xext/panoramiXprocs.c
index 369744c8c..2fe329886 100644
--- a/xorg-server/Xext/panoramiXprocs.c
+++ b/xorg-server/Xext/panoramiXprocs.c
@@ -74,7 +74,7 @@ int PanoramiXCreateWindow(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&parent, stuff->parent,

 				     XRT_WINDOW, client, DixWriteAccess);

     if (result != Success)

-        return (result == BadValue) ? BadWindow : result;

+        return result;

 

     if(stuff->class == CopyFromParent)

 	stuff->class = parent->u.win.class;

@@ -89,7 +89,7 @@ int PanoramiXCreateWindow(ClientPtr client)
 	    result = dixLookupResourceByType((pointer *)&backPix, tmp,

 					     XRT_PIXMAP, client, DixReadAccess);

 	    if (result != Success)

-		return (result == BadValue) ? BadPixmap : result;

+		return result;

 	}

     }

     if ((Mask)stuff->mask & CWBorderPixmap) {

@@ -99,7 +99,7 @@ int PanoramiXCreateWindow(ClientPtr client)
 	    result = dixLookupResourceByType((pointer *)&bordPix, tmp,

 					     XRT_PIXMAP, client, DixReadAccess);

 	    if (result != Success)

-		return (result == BadValue) ? BadPixmap : result;

+		return result;

 	}

     }

     if ((Mask)stuff->mask & CWColormap) {

@@ -109,7 +109,7 @@ int PanoramiXCreateWindow(ClientPtr client)
 	    result = dixLookupResourceByType((pointer *)&cmap, tmp,

 					     XRT_COLORMAP, client, DixReadAccess);

 	    if (result != Success)

-		return (result == BadValue) ? BadColor : result;

+		return result;

 	}

     }

 

@@ -179,7 +179,7 @@ int PanoramiXChangeWindowAttributes(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&win, stuff->window,

 				     XRT_WINDOW, client, DixWriteAccess);

     if (result != Success)

-        return (result == BadValue) ? BadWindow : result;

+        return result;

 

     if((win->u.win.class == InputOnly) && 

        (stuff->valueMask & (~INPUTONLY_LEGAL_MASK)))

@@ -192,7 +192,7 @@ int PanoramiXChangeWindowAttributes(ClientPtr client)
 	    result = dixLookupResourceByType((pointer *)&backPix, tmp,

 					     XRT_PIXMAP, client, DixReadAccess);

 	    if (result != Success)

-		return (result == BadValue) ? BadPixmap : result;

+		return result;

 	}

     }

     if ((Mask)stuff->valueMask & CWBorderPixmap) {

@@ -202,7 +202,7 @@ int PanoramiXChangeWindowAttributes(ClientPtr client)
 	    result = dixLookupResourceByType((pointer *)&bordPix, tmp,

 					     XRT_PIXMAP, client, DixReadAccess);

 	    if (result != Success)

-		return (result == BadValue) ? BadPixmap : result;

+		return result;

 	}

     }

     if ((Mask)stuff->valueMask & CWColormap) {

@@ -212,7 +212,7 @@ int PanoramiXChangeWindowAttributes(ClientPtr client)
 	    result = dixLookupResourceByType((pointer *)&cmap, tmp,

 					     XRT_COLORMAP, client, DixReadAccess);

 	    if (result != Success)

-		return (result == BadValue) ? BadColor : result;

+		return result;

 	}

     }

 

@@ -242,7 +242,7 @@ int PanoramiXDestroyWindow(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&win, stuff->id, XRT_WINDOW,

 				     client, DixDestroyAccess);

     if (result != Success)

-	return (result == BadValue) ? BadWindow : result;

+	return result;

 

     FOR_NSCREENS_BACKWARD(j) {

 	stuff->id = win->info[j].id;

@@ -268,7 +268,7 @@ int PanoramiXDestroySubwindows(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&win, stuff->id, XRT_WINDOW,

 				     client, DixDestroyAccess);

     if (result != Success)

-	return (result == BadValue) ? BadWindow : result;

+	return result;

 

     FOR_NSCREENS_BACKWARD(j) {

 	stuff->id = win->info[j].id;

@@ -294,7 +294,7 @@ int PanoramiXChangeSaveSet(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&win, stuff->window,

 				     XRT_WINDOW, client, DixReadAccess);

     if (result != Success)

-	return (result == BadValue) ? BadWindow : result;

+	return result;

 

     FOR_NSCREENS_BACKWARD(j) {

 	stuff->window = win->info[j].id;

@@ -319,12 +319,12 @@ int PanoramiXReparentWindow(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&win, stuff->window,

 				     XRT_WINDOW, client, DixWriteAccess);

     if (result != Success)

-	return (result == BadValue) ? BadWindow : result;

+	return result;

 

     result = dixLookupResourceByType((pointer *)&parent, stuff->parent,

 				     XRT_WINDOW, client, DixWriteAccess);

     if (result != Success)

-	return (result == BadValue) ? BadWindow : result;

+	return result;

 

     x = stuff->x;

     y = stuff->y;

@@ -356,7 +356,7 @@ int PanoramiXMapWindow(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&win, stuff->id,

 				     XRT_WINDOW, client, DixReadAccess);

     if (result != Success)

-	return (result == BadValue) ? BadWindow : result;

+	return result;

 

     FOR_NSCREENS_FORWARD(j) {

 	stuff->id = win->info[j].id;

@@ -379,7 +379,7 @@ int PanoramiXMapSubwindows(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&win, stuff->id,

 				     XRT_WINDOW, client, DixReadAccess);

     if (result != Success)

-	return (result == BadValue) ? BadWindow : result;

+	return result;

 

     FOR_NSCREENS_FORWARD(j) {

 	stuff->id = win->info[j].id;

@@ -402,7 +402,7 @@ int PanoramiXUnmapWindow(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&win, stuff->id,

 				     XRT_WINDOW, client, DixReadAccess);

     if (result != Success)

-	return (result == BadValue) ? BadWindow : result;

+	return result;

 

     FOR_NSCREENS_FORWARD(j) {

 	stuff->id = win->info[j].id;

@@ -425,7 +425,7 @@ int PanoramiXUnmapSubwindows(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&win, stuff->id,

 				     XRT_WINDOW, client, DixReadAccess);

     if (result != Success)

-	return (result == BadValue) ? BadWindow : result;

+	return result;

 

     FOR_NSCREENS_FORWARD(j) {

 	stuff->id = win->info[j].id;

@@ -457,12 +457,12 @@ int PanoramiXConfigureWindow(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&pWin, stuff->window,

 				     RT_WINDOW, client, DixWriteAccess);

     if (result != Success)

-	return (result == BadValue) ? BadWindow : result;

+	return result;

 

     result = dixLookupResourceByType((pointer *)&win, stuff->window,

 				     XRT_WINDOW, client, DixWriteAccess);

     if (result != Success)

-	return (result == BadValue) ? BadWindow : result;

+	return result;

 

     if ((Mask)stuff->mask & CWSibling) {

 	XID tmp;

@@ -471,7 +471,7 @@ int PanoramiXConfigureWindow(ClientPtr client)
 	    result = dixLookupResourceByType((pointer *)&sib, tmp, XRT_WINDOW,

 					     client, DixReadAccess);

 	    if (result != Success)

-		return (result == BadValue) ? BadWindow : result;

+		return result;

 	}

     }

 

@@ -517,7 +517,7 @@ int PanoramiXCirculateWindow(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&win, stuff->window,

 				     XRT_WINDOW, client, DixWriteAccess);

     if (result != Success)

-	return (result == BadValue) ? BadWindow : result;

+	return result;

 

     FOR_NSCREENS_FORWARD(j) {

 	stuff->window = win->info[j].id;

@@ -697,7 +697,7 @@ int PanoramiXFreePixmap(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&pix, stuff->id, XRT_PIXMAP,

 				     client, DixDestroyAccess);

     if (result != Success)

-	return (result == BadValue) ? BadPixmap : result;

+	return result;

 

     FOR_NSCREENS_BACKWARD(j) {

 	stuff->id = pix->info[j].id;

@@ -742,7 +742,7 @@ int PanoramiXCreateGC(ClientPtr client)
 	    result = dixLookupResourceByType((pointer *)&tile, tmp, XRT_PIXMAP,

 					     client, DixReadAccess);

 	    if (result != Success)

-		return (result == BadValue) ? BadPixmap : result;

+		return result;

 	}

     }

     if ((Mask)stuff->mask & GCStipple) {

@@ -751,7 +751,7 @@ int PanoramiXCreateGC(ClientPtr client)
 	    result = dixLookupResourceByType((pointer *)&stip, tmp, XRT_PIXMAP,

 					     client, DixReadAccess);

 	    if (result != Success)

-		return (result == BadValue) ? BadPixmap : result;

+		return result;

 	}

     }

     if ((Mask)stuff->mask & GCClipMask) {

@@ -760,7 +760,7 @@ int PanoramiXCreateGC(ClientPtr client)
 	    result = dixLookupResourceByType((pointer *)&clip, tmp, XRT_PIXMAP,

 					     client, DixReadAccess);

 	    if (result != Success)

-		return (result == BadValue) ? BadPixmap : result;

+		return result;

 	}

     }

 

@@ -813,7 +813,7 @@ int PanoramiXChangeGC(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&gc, stuff->gc, XRT_GC,

 				     client, DixReadAccess);

     if (result != Success)

-	return (result == BadValue) ? BadGC : result;

+	return result;

 

     if ((Mask)stuff->mask & GCTile) {

 	tile_offset = Ones((Mask)stuff->mask & (GCTile - 1));

@@ -821,7 +821,7 @@ int PanoramiXChangeGC(ClientPtr client)
 	    result = dixLookupResourceByType((pointer *)&tile, tmp, XRT_PIXMAP,

 					     client, DixReadAccess);

 	    if (result != Success)

-		return (result == BadValue) ? BadPixmap : result;

+		return result;

 	}

     }

     if ((Mask)stuff->mask & GCStipple) {

@@ -830,7 +830,7 @@ int PanoramiXChangeGC(ClientPtr client)
 	    result = dixLookupResourceByType((pointer *)&stip, tmp, XRT_PIXMAP,

 					     client, DixReadAccess);

 	    if (result != Success)

-		return (result == BadValue) ? BadPixmap : result;

+		return result;

 	}

     }

     if ((Mask)stuff->mask & GCClipMask) {

@@ -839,7 +839,7 @@ int PanoramiXChangeGC(ClientPtr client)
 	    result = dixLookupResourceByType((pointer *)&clip, tmp, XRT_PIXMAP,

 					     client, DixReadAccess);

 	    if (result != Success)

-		return (result == BadValue) ? BadPixmap : result;

+		return result;

 	}

     }

 

@@ -871,12 +871,12 @@ int PanoramiXCopyGC(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&srcGC, stuff->srcGC, XRT_GC,

 				     client, DixReadAccess);

     if (result != Success)

-	return (result == BadValue) ? BadGC : result;

+	return result;

 

     result = dixLookupResourceByType((pointer *)&dstGC, stuff->dstGC, XRT_GC,

 				     client, DixWriteAccess);

     if (result != Success)

-	return (result == BadValue) ? BadGC : result;

+	return result;

 

     FOR_NSCREENS(j) {

 	stuff->srcGC = srcGC->info[j].id;

@@ -900,7 +900,7 @@ int PanoramiXSetDashes(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&gc, stuff->gc, XRT_GC,

 				     client, DixWriteAccess);

     if (result != Success)

-	return (result == BadValue) ? BadGC : result;

+	return result;

 

     FOR_NSCREENS_BACKWARD(j) {

 	stuff->gc = gc->info[j].id;

@@ -923,7 +923,7 @@ int PanoramiXSetClipRectangles(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&gc, stuff->gc, XRT_GC,

 				     client, DixWriteAccess);

     if (result != Success)

-	return (result == BadValue) ? BadGC : result;

+	return result;

 

     FOR_NSCREENS_BACKWARD(j) {

 	stuff->gc = gc->info[j].id;

@@ -946,7 +946,7 @@ int PanoramiXFreeGC(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&gc, stuff->id, XRT_GC,

 				     client, DixDestroyAccess);

     if (result != Success)

-	return (result == BadValue) ? BadGC : result;

+	return result;

 

     FOR_NSCREENS_BACKWARD(j) {

 	stuff->id = gc->info[j].id;

@@ -973,7 +973,7 @@ int PanoramiXClearToBackground(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&win, stuff->window,

 				     XRT_WINDOW, client, DixWriteAccess);

     if (result != Success)

-	return (result == BadValue) ? BadWindow : result;

+	return result;

 

     x = stuff->x;

     y = stuff->y;

@@ -1033,7 +1033,7 @@ int PanoramiXCopyArea(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&gc, stuff->gc, XRT_GC,

 				     client, DixReadAccess);

     if (result != Success)

-	return (result == BadValue) ? BadGC : result;

+	return result;

 

     if((dst->type == XRT_WINDOW) && dst->u.win.root)

 	dstIsRoot = TRUE;

@@ -1188,7 +1188,7 @@ int PanoramiXCopyPlane(ClientPtr client)
     rc = dixLookupResourceByType((pointer *)&gc, stuff->gc, XRT_GC,

 				 client, DixReadAccess);

     if (rc != Success)

-	return (rc == BadValue) ? BadGC : rc;

+	return rc;

 

     if((dst->type == XRT_WINDOW) && dst->u.win.root)

 	dstIsRoot = TRUE;

@@ -1285,7 +1285,7 @@ int PanoramiXPolyPoint(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&gc, stuff->gc, XRT_GC,

 				     client, DixReadAccess);

     if (result != Success)

-	return (result == BadValue) ? BadGC : result;

+	return result;

 

     isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;

     npoint = bytes_to_int32((client->req_len << 2) - sizeof(xPolyPointReq));

@@ -1345,7 +1345,7 @@ int PanoramiXPolyLine(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&gc, stuff->gc, XRT_GC,

 				     client, DixReadAccess);

     if (result != Success)

-	return (result == BadValue) ? BadGC : result;

+	return result;

 

     isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;

     npoint = bytes_to_int32((client->req_len << 2) - sizeof(xPolyLineReq));

@@ -1405,7 +1405,7 @@ int PanoramiXPolySegment(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&gc, stuff->gc, XRT_GC,

 				     client, DixReadAccess);

     if (result != Success)

-	return (result == BadValue) ? BadGC : result;

+	return result;

 

     isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;

 

@@ -1468,7 +1468,7 @@ int PanoramiXPolyRectangle(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&gc, stuff->gc, XRT_GC,

 				     client, DixReadAccess);

     if (result != Success)

-	return (result == BadValue) ? BadGC : result;

+	return result;

 

     isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;

 

@@ -1530,7 +1530,7 @@ int PanoramiXPolyArc(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&gc, stuff->gc, XRT_GC,

 				     client, DixReadAccess);

     if (result != Success)

-	return (result == BadValue) ? BadGC : result;

+	return result;

 

     isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;

 

@@ -1590,7 +1590,7 @@ int PanoramiXFillPoly(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&gc, stuff->gc, XRT_GC,

 				     client, DixReadAccess);

     if (result != Success)

-	return (result == BadValue) ? BadGC : result;

+	return result;

 

     isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;

 

@@ -1651,7 +1651,7 @@ int PanoramiXPolyFillRectangle(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&gc, stuff->gc, XRT_GC,

 				     client, DixReadAccess);

     if (result != Success)

-	return (result == BadValue) ? BadGC : result;

+	return result;

 

     isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;

 

@@ -1712,7 +1712,7 @@ int PanoramiXPolyFillArc(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&gc, stuff->gc, XRT_GC,

 				     client, DixReadAccess);

     if (result != Success)

-	return (result == BadValue) ? BadGC : result;

+	return result;

 

     isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;

 

@@ -1772,7 +1772,7 @@ int PanoramiXPutImage(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&gc, stuff->gc, XRT_GC,

 				     client, DixReadAccess);

     if (result != Success)

-	return (result == BadValue) ? BadGC : result;

+	return result;

 

     isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;

 

@@ -1973,7 +1973,7 @@ PanoramiXPolyText8(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&gc, stuff->gc, XRT_GC,

 				     client, DixReadAccess);

     if (result != Success)

-	return (result == BadValue) ? BadGC : result;

+	return result;

 

     isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;

 

@@ -2014,7 +2014,7 @@ PanoramiXPolyText16(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&gc, stuff->gc, XRT_GC,

 				     client, DixReadAccess);

     if (result != Success)

-	return (result == BadValue) ? BadGC : result;

+	return result;

 

     isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;

 

@@ -2055,7 +2055,7 @@ int PanoramiXImageText8(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&gc, stuff->gc, XRT_GC,

 				     client, DixReadAccess);

     if (result != Success)

-	return (result == BadValue) ? BadGC : result;

+	return result;

 

     isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;

 

@@ -2096,7 +2096,7 @@ int PanoramiXImageText16(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&gc, stuff->gc, XRT_GC,

 				     client, DixReadAccess);

     if (result != Success)

-	return (result == BadValue) ? BadGC : result;

+	return result;

 

     isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;

 

@@ -2128,7 +2128,7 @@ int PanoramiXCreateColormap(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&win, stuff->window,

 				     XRT_WINDOW, client, DixReadAccess);

     if (result != Success)

-	return (result == BadValue) ? BadWindow : result;

+	return result;

 

     if(!(newCmap = malloc(sizeof(PanoramiXRes))))

         return BadAlloc;

@@ -2169,7 +2169,7 @@ int PanoramiXFreeColormap(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&cmap, stuff->id, XRT_COLORMAP,

 				     client, DixDestroyAccess);

     if (result != Success)

-        return (result == BadValue) ? BadColor : result;

+        return result;

 

     FOR_NSCREENS_BACKWARD(j) {

         stuff->id = cmap->info[j].id;

@@ -2199,7 +2199,7 @@ PanoramiXCopyColormapAndFree(ClientPtr client)
 				     XRT_COLORMAP, client,

 				     DixReadAccess | DixWriteAccess);

     if (result != Success)

-        return (result == BadValue) ? BadColor : result;

+        return result;

 

     if(!(newCmap = malloc(sizeof(PanoramiXRes))))

         return BadAlloc;

@@ -2238,7 +2238,7 @@ int PanoramiXInstallColormap(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&cmap, stuff->id, XRT_COLORMAP,

 				     client, DixReadAccess);

     if (result != Success)

-        return (result == BadValue) ? BadColor : result;

+        return result;

 

     FOR_NSCREENS_BACKWARD(j){

 	stuff->id = cmap->info[j].id;

@@ -2262,7 +2262,7 @@ int PanoramiXUninstallColormap(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&cmap, stuff->id, XRT_COLORMAP,

 				     client, DixReadAccess);

     if (result != Success)

-        return (result == BadValue) ? BadColor : result;

+        return result;

 

     FOR_NSCREENS_BACKWARD(j) {

 	stuff->id = cmap->info[j].id;

@@ -2286,7 +2286,7 @@ int PanoramiXAllocColor(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&cmap, stuff->cmap,

 				     XRT_COLORMAP, client, DixWriteAccess);

     if (result != Success)

-        return (result == BadValue) ? BadColor : result;

+        return result;

 

     FOR_NSCREENS_BACKWARD(j){

 	stuff->cmap = cmap->info[j].id;

@@ -2310,7 +2310,7 @@ int PanoramiXAllocNamedColor(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&cmap, stuff->cmap,

 				     XRT_COLORMAP, client, DixWriteAccess);

     if (result != Success)

-        return (result == BadValue) ? BadColor : result;

+        return result;

 

     FOR_NSCREENS_BACKWARD(j){

         stuff->cmap = cmap->info[j].id;

@@ -2334,7 +2334,7 @@ int PanoramiXAllocColorCells(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&cmap, stuff->cmap,

 				     XRT_COLORMAP, client, DixWriteAccess);

     if (result != Success)

-        return (result == BadValue) ? BadColor : result;

+        return result;

 	

     FOR_NSCREENS_BACKWARD(j){

 	stuff->cmap = cmap->info[j].id;

@@ -2358,7 +2358,7 @@ int PanoramiXAllocColorPlanes(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&cmap, stuff->cmap,

 				     XRT_COLORMAP, client, DixWriteAccess);

     if (result != Success)

-        return (result == BadValue) ? BadColor : result;

+        return result;

 	

     FOR_NSCREENS_BACKWARD(j){

 	stuff->cmap = cmap->info[j].id;

@@ -2383,7 +2383,7 @@ int PanoramiXFreeColors(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&cmap, stuff->cmap,

 				     XRT_COLORMAP, client, DixWriteAccess);

     if (result != Success)

-        return (result == BadValue) ? BadColor : result;

+        return result;

 

     FOR_NSCREENS_BACKWARD(j) {

         stuff->cmap = cmap->info[j].id;

@@ -2406,7 +2406,7 @@ int PanoramiXStoreColors(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&cmap, stuff->cmap,

 				     XRT_COLORMAP, client, DixWriteAccess);

     if (result != Success)

-        return (result == BadValue) ? BadColor : result;

+        return result;

 

     FOR_NSCREENS_BACKWARD(j){

 	stuff->cmap = cmap->info[j].id;

@@ -2430,7 +2430,7 @@ int PanoramiXStoreNamedColor(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&cmap, stuff->cmap,

 				     XRT_COLORMAP, client, DixWriteAccess);

     if (result != Success)

-        return (result == BadValue) ? BadColor : result;

+        return result;

 

     FOR_NSCREENS_BACKWARD(j){

 	stuff->cmap = cmap->info[j].id;

diff --git a/xorg-server/Xext/saver.c b/xorg-server/Xext/saver.c
index f82b4b51b..0efe5bf2a 100644
--- a/xorg-server/Xext/saver.c
+++ b/xorg-server/Xext/saver.c
@@ -480,7 +480,6 @@ SendScreenSaverNotify (ScreenPtr pScreen, int state, Bool forced)
     ScreenSaverEventPtr		pEv;

     unsigned long		mask;

     xScreenSaverNotifyEvent	ev;

-    ClientPtr			client;

     int				kind;

 

     UpdateCurrentTimeIf ();

@@ -499,20 +498,16 @@ SendScreenSaverNotify (ScreenPtr pScreen, int state, Bool forced)
 	kind = ScreenSaverInternal;

     for (pEv = pPriv->events; pEv; pEv = pEv->next)

     {

-	client = pEv->client;

-	if (client->clientGone)

-	    continue;

 	if (!(pEv->mask & mask))

 	    continue;

 	ev.type = ScreenSaverNotify + ScreenSaverEventBase;

 	ev.state = state;

-	ev.sequenceNumber = client->sequence;

 	ev.timestamp = currentTime.milliseconds;

 	ev.root = WindowTable[pScreen->myNum]->drawable.id;

 	ev.window = savedScreenInfo[pScreen->myNum].wid;

 	ev.kind = kind;

 	ev.forced = forced;

-	WriteEventsToClient (client, 1, (xEvent *) &ev);

+	WriteEventsToClient (pEv->client, 1, (xEvent *) &ev);

     }

 }

 

@@ -1048,7 +1043,6 @@ ScreenSaverSetAttributes (ClientPtr client)
 		}

 	        else

 		{

-		    ret = (ret == BadValue) ? BadPixmap : ret;

 		    client->errorValue = pixID;

 		    goto PatchUp;

 		}

@@ -1086,7 +1080,6 @@ ScreenSaverSetAttributes (ClientPtr client)
 		}

     	        else

 		{

-		    ret = (ret == BadValue) ? BadPixmap : ret;

 		    client->errorValue = pixID;

 		    goto PatchUp;

 		}

@@ -1168,7 +1161,6 @@ ScreenSaverSetAttributes (ClientPtr client)
 				    client, DixUseAccess);

 	    if (ret != Success)

 	    {

-		ret = (ret == BadValue) ? BadColor : ret;

 		client->errorValue = cmap;

 		goto PatchUp;

 	    }

@@ -1192,7 +1184,6 @@ ScreenSaverSetAttributes (ClientPtr client)
 					RT_CURSOR, client, DixUseAccess);

 	    	if (ret != Success)

 	    	{

-		    ret = (ret == BadValue) ? BadCursor : ret;

 		    client->errorValue = cursorID;

 		    goto PatchUp;

 	    	}

@@ -1281,7 +1272,7 @@ ProcScreenSaverSetAttributes (ClientPtr client)
 					       XRT_PIXMAP, client,

 					       DixReadAccess);

 	      if (status != Success)

-		  return (status == BadValue) ? BadPixmap : status;

+		  return status;

           }

        }

 

@@ -1293,7 +1284,7 @@ ProcScreenSaverSetAttributes (ClientPtr client)
 					       XRT_PIXMAP, client,

 					       DixReadAccess);

 	      if (status != Success)

-		  return (status == BadValue) ? BadPixmap : status;

+		  return status;

           }

        }

 

@@ -1305,7 +1296,7 @@ ProcScreenSaverSetAttributes (ClientPtr client)
 						XRT_COLORMAP, client,

 						DixReadAccess);

 	       if (status != Success)

-		   return (status == BadValue) ? BadColor : status;

+		   return status;

            }

        }

 

diff --git a/xorg-server/Xext/security.c b/xorg-server/Xext/security.c
index 289f9597d..4201e583d 100644
--- a/xorg-server/Xext/security.c
+++ b/xorg-server/Xext/security.c
@@ -198,16 +198,10 @@ SecurityDeleteAuthorization(
     while ((pEventClient = pAuth->eventClients))

     {

 	/* send revocation event event */

-	ClientPtr client = rClient(pEventClient);

-

-	if (!client->clientGone)

-	{

-	    xSecurityAuthorizationRevokedEvent are;

-	    are.type = SecurityEventBase + XSecurityAuthorizationRevoked;

-	    are.sequenceNumber = client->sequence;

-	    are.authId = pAuth->id;

-	    WriteEventsToClient(client, 1, (xEvent *)&are);

-	}

+	xSecurityAuthorizationRevokedEvent are;

+	are.type = SecurityEventBase + XSecurityAuthorizationRevoked;

+	are.authId = pAuth->id;

+	WriteEventsToClient(rClient(pEventClient), 1, (xEvent *)&are);

 	FreeResource(pEventClient->resource, RT_NONE);

     }

 

@@ -629,8 +623,7 @@ ProcSecurityRevokeAuthorization(
 				 SecurityAuthorizationResType, client,

 				 DixDestroyAccess);

     if (rc != Success)

-	return (rc == BadValue) ?

-	    SecurityErrorBase + XSecurityBadAuthorization : rc;

+	return rc;

 

     FreeResource(stuff->authId, RT_NONE);

     return Success;

@@ -1146,6 +1139,8 @@ SecurityExtensionInit(INITARGS)
     EventSwapVector[SecurityEventBase + XSecurityAuthorizationRevoked] =

 	(EventSwapPtr)SwapSecurityAuthorizationRevokedEvent;

 

+    SetResourceTypeErrorValue(SecurityAuthorizationResType, SecurityErrorBase + XSecurityBadAuthorization);

+

     /* Label objects that were created before we could register ourself */

     SecurityLabelInitial();

 }

diff --git a/xorg-server/Xext/shape.c b/xorg-server/Xext/shape.c
index edecc51ed..f57a20cbf 100644
--- a/xorg-server/Xext/shape.c
+++ b/xorg-server/Xext/shape.c
@@ -360,7 +360,7 @@ ProcPanoramiXShapeRectangles(
     result = dixLookupResourceByType((pointer *)&win, stuff->dest, XRT_WINDOW,

 				     client, DixWriteAccess);

     if (result != Success)

-	return (result == BadValue) ? BadWindow : result;

+	return result;

 

     FOR_NSCREENS(j) {

 	stuff->dest = win->info[j].id;

@@ -415,7 +415,7 @@ ProcShapeMask (ClientPtr client)
 	rc = dixLookupResourceByType((pointer *)&pPixmap, stuff->src, RT_PIXMAP,

 			       client, DixReadAccess);

         if (rc != Success)

-	    return (rc == BadValue) ? BadPixmap : rc;

+	    return rc;

 	if (pPixmap->drawable.pScreen != pScreen ||

 	    pPixmap->drawable.depth != 1)

 	    return BadMatch;

@@ -459,13 +459,13 @@ ProcPanoramiXShapeMask(
     result = dixLookupResourceByType((pointer *)&win, stuff->dest, XRT_WINDOW,

 				     client, DixWriteAccess);

     if (result != Success)

-	return (result == BadValue) ? BadWindow : result;

+	return result;

 

     if(stuff->src != None) {

 	result = dixLookupResourceByType((pointer *)&pmap, stuff->src,

 					 XRT_PIXMAP, client, DixReadAccess);

 	if (result != Success)

-	    return (result == BadValue) ? BadPixmap : result;

+	    return result;

     } else

 	pmap = NULL;

 

@@ -589,12 +589,12 @@ ProcPanoramiXShapeCombine(
     result = dixLookupResourceByType((pointer *)&win, stuff->dest, XRT_WINDOW,

 				     client, DixWriteAccess);

     if (result != Success)

-	return (result == BadValue) ? BadWindow : result;

+	return result;

 

     result = dixLookupResourceByType((pointer *)&win2, stuff->src, XRT_WINDOW,

 				     client, DixReadAccess);

     if (result != Success)

-	return (result == BadValue) ? BadWindow : result;

+	return result;

 

     FOR_NSCREENS(j) {

 	stuff->dest = win->info[j].id;

@@ -663,7 +663,7 @@ ProcPanoramiXShapeOffset(
     result = dixLookupResourceByType((pointer *)&win, stuff->dest, XRT_WINDOW,

 				     client, DixWriteAccess);

     if (result != Success)

-	return (result == BadValue) ? BadWindow : result;

+	return result;

 

     FOR_NSCREENS(j) {

 	stuff->dest = win->info[j].id;

@@ -885,7 +885,6 @@ void
 SendShapeNotify (WindowPtr pWin, int which)

 {

     ShapeEventPtr	*pHead, pShapeEvent;

-    ClientPtr		client;

     xShapeNotifyEvent	se;

     BoxRec		extents;

     RegionPtr		region;

@@ -940,20 +939,16 @@ SendShapeNotify (WindowPtr pWin, int which)
 	return;

     }

     for (pShapeEvent = *pHead; pShapeEvent; pShapeEvent = pShapeEvent->next) {

-	client = pShapeEvent->client;

-	if (client == serverClient || client->clientGone)

-	    continue;

 	se.type = ShapeNotify + ShapeEventBase;

 	se.kind = which;

 	se.window = pWin->drawable.id;

-	se.sequenceNumber = client->sequence;

 	se.x = extents.x1;

 	se.y = extents.y1;

 	se.width = extents.x2 - extents.x1;

 	se.height = extents.y2 - extents.y1;

 	se.time = currentTime.milliseconds;

 	se.shaped = shaped;

-	WriteEventsToClient (client, 1, (xEvent *) &se);

+	WriteEventsToClient (pShapeEvent->client, 1, (xEvent *) &se);

     }

 }

 

diff --git a/xorg-server/Xext/shm.c b/xorg-server/Xext/shm.c
index 0d78fbc06..885fd61ef 100644
--- a/xorg-server/Xext/shm.c
+++ b/xorg-server/Xext/shm.c
@@ -156,7 +156,7 @@ static ShmFuncs fbFuncs = {fbShmCreatePixmap, NULL};
     rc = dixLookupResourceByType((pointer *)&(shmdesc), shmseg, ShmSegType, \

                                  client, DixReadAccess); \

     if (rc != Success) \

-	return (rc == BadValue) ? BadShmSegCode : rc; \

+	return rc; \

 }

 

 #define VERIFY_SHMPTR(shmseg,offset,needwrite,shmdesc,client) \

@@ -286,6 +286,7 @@ ShmExtensionInit(INITARGS)
 	ShmReqCode = (unsigned char)extEntry->base;

 	ShmCompletionCode = extEntry->eventBase;

 	BadShmSegCode = extEntry->errorBase;

+	SetResourceTypeErrorValue(ShmSegType, BadShmSegCode);

 	EventSwapVector[ShmCompletionCode] = (EventSwapPtr) SShmCompletionEvent;

     }

 }

@@ -584,7 +585,7 @@ ProcPanoramiXShmPutImage(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&gc, stuff->gc,

 				     XRT_GC, client, DixReadAccess);

     if (result != Success)

-        return (result == BadValue) ? BadGC : result;

+        return result;

 

     isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;

 

@@ -943,7 +944,6 @@ ProcShmPutImage(ClientPtr client)
 

 	ev.type = ShmCompletionCode;

 	ev.drawable = stuff->drawable;

-	ev.sequenceNumber = client->sequence;

 	ev.minorEvent = X_ShmPutImage;

 	ev.majorEvent = ShmReqCode;

 	ev.shmseg = stuff->shmseg;

diff --git a/xorg-server/Xext/sync.c b/xorg-server/Xext/sync.c
index d46087a68..8eb228bf1 100644
--- a/xorg-server/Xext/sync.c
+++ b/xorg-server/Xext/sync.c
@@ -1,2399 +1,2394 @@
-/*
-
-Copyright 1991, 1993, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-
-Copyright 1991, 1993 by Digital Equipment Corporation, Maynard, Massachusetts,
-and Olivetti Research Limited, Cambridge, England.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the names of Digital or Olivetti
-not be used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  Digital and Olivetti
-make no representations about the suitability of this software
-for any purpose.  It is provided "as is" without express or implied warranty.
-
-DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL THEY BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-*/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include <string.h>
-
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include <X11/Xmd.h>
-#include "misc.h"
-#include "os.h"
-#include "extnsionst.h"
-#include "dixstruct.h"
-#include "resource.h"
-#include "opaque.h"
-#include <X11/extensions/syncproto.h>
-#include "syncsrv.h"
-
-#include <stdio.h>
-#if !defined(WIN32)
-#include <sys/time.h>
-#endif
-
-#include "modinit.h"
-
-/*
- * Local Global Variables
- */
-static int      SyncEventBase;
-static int      SyncErrorBase;
-static RESTYPE  RTCounter = 0;
-static RESTYPE  RTAwait;
-static RESTYPE  RTAlarm;
-static RESTYPE  RTAlarmClient;
-static int SyncNumSystemCounters = 0;
-static SyncCounter **SysCounterList = NULL;
-
-#define IsSystemCounter(pCounter) \
-    (pCounter && (pCounter->client == NULL))
-
-/* these are all the alarm attributes that pertain to the alarm's trigger */
-#define XSyncCAAllTrigger \
-    (XSyncCACounter | XSyncCAValueType | XSyncCAValue | XSyncCATestType)
-
-static void SyncComputeBracketValues(SyncCounter *);
-
-static void SyncInitServerTime(void);
-
-static void SyncInitIdleTime(void);
-
-static DISPATCH_PROC(ProcSyncAwait);
-static DISPATCH_PROC(ProcSyncChangeAlarm);
-static DISPATCH_PROC(ProcSyncChangeCounter);
-static DISPATCH_PROC(ProcSyncCreateAlarm);
-static DISPATCH_PROC(ProcSyncCreateCounter);
-static DISPATCH_PROC(ProcSyncDestroyAlarm);
-static DISPATCH_PROC(ProcSyncDestroyCounter);
-static DISPATCH_PROC(ProcSyncDispatch);
-static DISPATCH_PROC(ProcSyncGetPriority);
-static DISPATCH_PROC(ProcSyncInitialize);
-static DISPATCH_PROC(ProcSyncListSystemCounters);
-static DISPATCH_PROC(ProcSyncQueryAlarm);
-static DISPATCH_PROC(ProcSyncQueryCounter);
-static DISPATCH_PROC(ProcSyncSetCounter);
-static DISPATCH_PROC(ProcSyncSetPriority);
-static DISPATCH_PROC(SProcSyncAwait);
-static DISPATCH_PROC(SProcSyncChangeAlarm);
-static DISPATCH_PROC(SProcSyncChangeCounter);
-static DISPATCH_PROC(SProcSyncCreateAlarm);
-static DISPATCH_PROC(SProcSyncCreateCounter);
-static DISPATCH_PROC(SProcSyncDestroyAlarm);
-static DISPATCH_PROC(SProcSyncDestroyCounter);
-static DISPATCH_PROC(SProcSyncDispatch);
-static DISPATCH_PROC(SProcSyncGetPriority);
-static DISPATCH_PROC(SProcSyncInitialize);
-static DISPATCH_PROC(SProcSyncListSystemCounters);
-static DISPATCH_PROC(SProcSyncQueryAlarm);
-static DISPATCH_PROC(SProcSyncQueryCounter);
-static DISPATCH_PROC(SProcSyncSetCounter);
-static DISPATCH_PROC(SProcSyncSetPriority);
-
-/*  Each counter maintains a simple linked list of triggers that are
- *  interested in the counter.  The two functions below are used to
- *  delete and add triggers on this list.
- */
-static void
-SyncDeleteTriggerFromCounter(SyncTrigger *pTrigger)
-{
-    SyncTriggerList *pCur;
-    SyncTriggerList *pPrev;
-
-    /* pCounter needs to be stored in pTrigger before calling here. */
-
-    if (!pTrigger->pCounter)
-	return;
-
-    pPrev = NULL;
-    pCur = pTrigger->pCounter->pTriglist;
-
-    while (pCur)
-    {
-	if (pCur->pTrigger == pTrigger)
-	{
-	    if (pPrev)
-		pPrev->next = pCur->next;
-	    else
-		pTrigger->pCounter->pTriglist = pCur->next;
-
-	    free(pCur);
-	    break;
-	}
-	
-	pPrev = pCur;
-	pCur = pCur->next;
-    }
-
-    if (IsSystemCounter(pTrigger->pCounter))
-	SyncComputeBracketValues(pTrigger->pCounter);
-}
-
-
-static int
-SyncAddTriggerToCounter(SyncTrigger *pTrigger)
-{
-    SyncTriggerList *pCur;
-
-    if (!pTrigger->pCounter)
-	return Success;
-
-    /* don't do anything if it's already there */
-    for (pCur = pTrigger->pCounter->pTriglist; pCur; pCur = pCur->next)
-    {
-	if (pCur->pTrigger == pTrigger)
-	    return Success;
-    }
-
-    if (!(pCur = malloc(sizeof(SyncTriggerList))))
-	return BadAlloc;
-
-    pCur->pTrigger = pTrigger;
-    pCur->next = pTrigger->pCounter->pTriglist;
-    pTrigger->pCounter->pTriglist = pCur;
-
-    if (IsSystemCounter(pTrigger->pCounter))
-	SyncComputeBracketValues(pTrigger->pCounter);
-
-    return Success;
-}
-
-
-/*  Below are four possible functions that can be plugged into
- *  pTrigger->CheckTrigger, corresponding to the four possible
- *  test-types.  These functions are called after the counter's
- *  value changes but are also passed the old counter value
- *  so they can inspect both the old and new values.
- *  (PositiveTransition and NegativeTransition need to see both
- *  pieces of information.)  These functions return the truth value
- *  of the trigger.
- *
- *  All of them include the condition pTrigger->pCounter == NULL.
- *  This is because the spec says that a trigger with a counter value
- *  of None is always TRUE.
- */
-
-static Bool
-SyncCheckTriggerPositiveComparison(SyncTrigger *pTrigger, CARD64 oldval)
-{
-    return (pTrigger->pCounter == NULL ||
-	    XSyncValueGreaterOrEqual(pTrigger->pCounter->value,
-				     pTrigger->test_value));
-}
-
-static Bool
-SyncCheckTriggerNegativeComparison(SyncTrigger *pTrigger,  CARD64 oldval)
-{
-    return (pTrigger->pCounter == NULL ||
-	    XSyncValueLessOrEqual(pTrigger->pCounter->value,
-				  pTrigger->test_value));
-}
-
-static Bool
-SyncCheckTriggerPositiveTransition(SyncTrigger *pTrigger, CARD64 oldval)
-{
-    return (pTrigger->pCounter == NULL ||
-	    (XSyncValueLessThan(oldval, pTrigger->test_value) &&
-	     XSyncValueGreaterOrEqual(pTrigger->pCounter->value,
-				      pTrigger->test_value)));
-}
-
-static Bool
-SyncCheckTriggerNegativeTransition(SyncTrigger *pTrigger, CARD64 oldval)
-{
-    return (pTrigger->pCounter == NULL ||
-	    (XSyncValueGreaterThan(oldval, pTrigger->test_value) &&
-	     XSyncValueLessOrEqual(pTrigger->pCounter->value,
-				   pTrigger->test_value)));
-}
-
-static int
-SyncInitTrigger(ClientPtr client, SyncTrigger *pTrigger, XSyncCounter counter,
-		Mask changes)
-{
-    SyncCounter *pCounter = pTrigger->pCounter;
-    int		rc;
-    Bool	newcounter = FALSE;
-
-    if (changes & XSyncCACounter)
-    {
-	if (counter == None)
-	    pCounter = NULL;
-	else if (Success != (rc = dixLookupResourceByType ((pointer *)&pCounter,
-				counter, RTCounter, client, DixReadAccess)))
-	{
-	    client->errorValue = counter;
-	    return (rc == BadValue) ? SyncErrorBase + XSyncBadCounter : rc;
-	}
-	if (pCounter != pTrigger->pCounter)
-	{ /* new counter for trigger */
-	    SyncDeleteTriggerFromCounter(pTrigger);
-	    pTrigger->pCounter = pCounter;
-	    newcounter = TRUE;
-	}
-    }
-
-    /* if system counter, ask it what the current value is */
-
-    if (IsSystemCounter(pCounter))
-    {
-	(*pCounter->pSysCounterInfo->QueryValue) ((pointer) pCounter,
-						  &pCounter->value);
-    }
-
-    if (changes & XSyncCAValueType)
-    {
-	if (pTrigger->value_type != XSyncRelative &&
-	    pTrigger->value_type != XSyncAbsolute)
-	{
-	    client->errorValue = pTrigger->value_type;
-	    return BadValue;
-	}
-    }
-
-    if (changes & XSyncCATestType)
-    {
-	if (pTrigger->test_type != XSyncPositiveTransition &&
-	    pTrigger->test_type != XSyncNegativeTransition &&
-	    pTrigger->test_type != XSyncPositiveComparison &&
-	    pTrigger->test_type != XSyncNegativeComparison)
-	{
-	    client->errorValue = pTrigger->test_type;
-	    return BadValue;
-	}
-	/* select appropriate CheckTrigger function */
-
-	switch (pTrigger->test_type)
-	{
-        case XSyncPositiveTransition:
-	    pTrigger->CheckTrigger = SyncCheckTriggerPositiveTransition;
-	    break;
-        case XSyncNegativeTransition:
-	    pTrigger->CheckTrigger = SyncCheckTriggerNegativeTransition;
-	    break;
-        case XSyncPositiveComparison:
-	    pTrigger->CheckTrigger = SyncCheckTriggerPositiveComparison;
-	    break;
-        case XSyncNegativeComparison:
-	    pTrigger->CheckTrigger = SyncCheckTriggerNegativeComparison;
-	    break;
-	}
-    }
-
-    if (changes & (XSyncCAValueType | XSyncCAValue))
-    {
-	if (pTrigger->value_type == XSyncAbsolute)
-	    pTrigger->test_value = pTrigger->wait_value;
-	else /* relative */
-	{
-	    Bool overflow;
-	    if (pCounter == NULL)
-		return BadMatch;
-
-	    XSyncValueAdd(&pTrigger->test_value, pCounter->value,
-			  pTrigger->wait_value, &overflow);
-	    if (overflow)
-	    {
-		client->errorValue = XSyncValueHigh32(pTrigger->wait_value);
-		return BadValue;
-	    }
-	}
-    }
-
-    /*  we wait until we're sure there are no errors before registering
-     *  a new counter on a trigger
-     */
-    if (newcounter)
-    {
-	if ((rc = SyncAddTriggerToCounter(pTrigger)) != Success)
-	    return rc;
-    }
-    else if (IsSystemCounter(pCounter))
-    {
-	SyncComputeBracketValues(pCounter);
-    }
-
-    return Success;
-}
-
-/*  AlarmNotify events happen in response to actions taken on an Alarm or
- *  the counter used by the alarm.  AlarmNotify may be sent to multiple
- *  clients.  The alarm maintains a list of clients interested in events.
- */
-static void
-SyncSendAlarmNotifyEvents(SyncAlarm *pAlarm)
-{
-    SyncAlarmClientList *pcl;
-    xSyncAlarmNotifyEvent ane;
-    SyncTrigger *pTrigger = &pAlarm->trigger;
-
-    UpdateCurrentTime();
-
-    ane.type = SyncEventBase + XSyncAlarmNotify;
-    ane.kind = XSyncAlarmNotify;
-    ane.sequenceNumber = pAlarm->client->sequence;
-    ane.alarm = pAlarm->alarm_id;
-    if (pTrigger->pCounter)
-    {
-	ane.counter_value_hi = XSyncValueHigh32(pTrigger->pCounter->value);
-	ane.counter_value_lo = XSyncValueLow32(pTrigger->pCounter->value);
-    }
-    else
-    { /* XXX what else can we do if there's no counter? */
-	ane.counter_value_hi = ane.counter_value_lo = 0;
-    }
-
-    ane.alarm_value_hi = XSyncValueHigh32(pTrigger->test_value);
-    ane.alarm_value_lo = XSyncValueLow32(pTrigger->test_value);
-    ane.time = currentTime.milliseconds;
-    ane.state = pAlarm->state;
-
-    /* send to owner */
-    if (pAlarm->events && !pAlarm->client->clientGone)
-	WriteEventsToClient(pAlarm->client, 1, (xEvent *) &ane);
-
-    /* send to other interested clients */
-    for (pcl = pAlarm->pEventClients; pcl; pcl = pcl->next)
-    {
-	if (!pcl->client->clientGone)
-	{
-	    ane.sequenceNumber = pcl->client->sequence;
-	    WriteEventsToClient(pcl->client, 1, (xEvent *) &ane);
-	}
-    }
-}
-
-
-/*  CounterNotify events only occur in response to an Await.  The events
- *  go only to the Awaiting client.
- */
-static void
-SyncSendCounterNotifyEvents(ClientPtr client, SyncAwait **ppAwait,
-			    int num_events)
-{
-    xSyncCounterNotifyEvent *pEvents, *pev;
-    int i;
-
-    if (client->clientGone)
-	return;
-    pev = pEvents = malloc(num_events * sizeof(xSyncCounterNotifyEvent));
-    if (!pEvents)
-	return;
-    UpdateCurrentTime();
-    for (i = 0; i < num_events; i++, ppAwait++, pev++)
-    {
-	SyncTrigger *pTrigger = &(*ppAwait)->trigger;
-	pev->type = SyncEventBase + XSyncCounterNotify;
-	pev->kind = XSyncCounterNotify;
-	pev->sequenceNumber = client->sequence;
-	pev->counter = pTrigger->pCounter->id;
-	pev->wait_value_lo = XSyncValueLow32(pTrigger->test_value);
-	pev->wait_value_hi = XSyncValueHigh32(pTrigger->test_value);
-	pev->counter_value_lo = XSyncValueLow32(pTrigger->pCounter->value);
-	pev->counter_value_hi = XSyncValueHigh32(pTrigger->pCounter->value);
-	pev->time = currentTime.milliseconds;
-	pev->count = num_events - i - 1; /* events remaining */
-	pev->destroyed = pTrigger->pCounter->beingDestroyed;
-    }
-    /* swapping will be taken care of by this */
-    WriteEventsToClient(client, num_events, (xEvent *)pEvents);
-    free(pEvents);
-}
-
-
-/* This function is called when an alarm's counter is destroyed.
- * It is plugged into pTrigger->CounterDestroyed (for alarm triggers).
- */
-static void
-SyncAlarmCounterDestroyed(SyncTrigger *pTrigger)
-{
-    SyncAlarm *pAlarm = (SyncAlarm *)pTrigger;
-
-    pAlarm->state = XSyncAlarmInactive;
-    SyncSendAlarmNotifyEvents(pAlarm);
-    pTrigger->pCounter = NULL;
-}
-
-
-/*  This function is called when an alarm "goes off."
- *  It is plugged into pTrigger->TriggerFired (for alarm triggers).
- */
-static void
-SyncAlarmTriggerFired(SyncTrigger *pTrigger)
-{
-    SyncAlarm *pAlarm = (SyncAlarm *)pTrigger;
-    CARD64 new_test_value;
-
-    /* no need to check alarm unless it's active */
-    if (pAlarm->state != XSyncAlarmActive)
-	return;
-
-    /*  " if the counter value is None, or if the delta is 0 and
-     *    the test-type is PositiveComparison or NegativeComparison,
-     *    no change is made to value (test-value) and the alarm
-     *    state is changed to Inactive before the event is generated."
-     */
-    if (pAlarm->trigger.pCounter == NULL
-	|| (XSyncValueIsZero(pAlarm->delta)
-	    && (pAlarm->trigger.test_type == XSyncPositiveComparison
-		|| pAlarm->trigger.test_type == XSyncNegativeComparison)))
-	pAlarm->state = XSyncAlarmInactive;
-
-    new_test_value = pAlarm->trigger.test_value;
-
-    if (pAlarm->state == XSyncAlarmActive)
-    {
-	Bool overflow;
-	CARD64 oldvalue;
-	SyncTrigger *paTrigger = &pAlarm->trigger;
-
-	/* "The alarm is updated by repeatedly adding delta to the
-	 *  value of the trigger and re-initializing it until it
-	 *  becomes FALSE."
-	 */
-	oldvalue = paTrigger->test_value;
-
-	/* XXX really should do something smarter here */
-
-	do
-	{
-	    XSyncValueAdd(&paTrigger->test_value, paTrigger->test_value,
-			  pAlarm->delta, &overflow);
-	} while (!overflow &&
-	      (*paTrigger->CheckTrigger)(paTrigger,
-					paTrigger->pCounter->value));
-
-	new_test_value = paTrigger->test_value;
-	paTrigger->test_value = oldvalue;
-
-	/* "If this update would cause value to fall outside the range
-	 *  for an INT64...no change is made to value (test-value) and
-	 *  the alarm state is changed to Inactive before the event is
-	 *  generated."
-	 */
-	if (overflow)
-	{
-	    new_test_value = oldvalue;
-	    pAlarm->state = XSyncAlarmInactive;
-	}
-    }
-    /*  The AlarmNotify event has to have the "new state of the alarm"
-     *  which we can't be sure of until this point.  However, it has
-     *  to have the "old" trigger test value.  That's the reason for
-     *  all the newvalue/oldvalue shuffling above.  After we send the
-     *  events, give the trigger its new test value.
-     */
-    SyncSendAlarmNotifyEvents(pAlarm);
-    pTrigger->test_value = new_test_value;
-}
-
-
-/*  This function is called when an Await unblocks, either as a result
- *  of the trigger firing OR the counter being destroyed.
- *  It goes into pTrigger->TriggerFired AND pTrigger->CounterDestroyed
- *  (for Await triggers).
- */
-static void
-SyncAwaitTriggerFired(SyncTrigger *pTrigger)
-{
-    SyncAwait *pAwait = (SyncAwait *)pTrigger;
-    int numwaits;
-    SyncAwaitUnion *pAwaitUnion;
-    SyncAwait **ppAwait;
-    int num_events = 0;
-
-    pAwaitUnion = (SyncAwaitUnion *)pAwait->pHeader;
-    numwaits = pAwaitUnion->header.num_waitconditions;
-    ppAwait = malloc(numwaits * sizeof(SyncAwait *));
-    if (!ppAwait)
-	goto bail;
-
-    pAwait = &(pAwaitUnion+1)->await;
-
-    /* "When a client is unblocked, all the CounterNotify events for
-     *  the Await request are generated contiguously. If count is 0
-     *  there are no more events to follow for this request. If
-     *  count is n, there are at least n more events to follow."
-     *
-     *  Thus, it is best to find all the counters for which events
-     *  need to be sent first, so that an accurate count field can
-     *  be stored in the events.
-     */
-    for ( ; numwaits; numwaits--, pAwait++)
-    {
-	CARD64 diff;
-	Bool overflow, diffgreater, diffequal;
-
-	/* "A CounterNotify event with the destroyed flag set to TRUE is
-	 *  always generated if the counter for one of the triggers is
-	 *  destroyed."
-	 */
-	if (pAwait->trigger.pCounter->beingDestroyed)
-	{
-	    ppAwait[num_events++] = pAwait;
-	    continue;
-	}
-
-	/* "The difference between the counter and the test value is
-	 *  calculated by subtracting the test value from the value of
-	 *  the counter."
-	 */
-	XSyncValueSubtract(&diff, pAwait->trigger.pCounter->value,
-			   pAwait->trigger.test_value, &overflow);
-
-	/* "If the difference lies outside the range for an INT64, an
-	 *  event is not generated."
-	 */
-	if (overflow)
-	    continue;
-	diffgreater = XSyncValueGreaterThan(diff, pAwait->event_threshold);
-	diffequal   = XSyncValueEqual(diff, pAwait->event_threshold);
-
-	/* "If the test-type is PositiveTransition or
-	 *  PositiveComparison, a CounterNotify event is generated if
-	 *  the difference is at least event-threshold. If the test-type
-	 *  is NegativeTransition or NegativeComparison, a CounterNotify
-	 *  event is generated if the difference is at most
-	 *  event-threshold."
-	 */
-
-	if ( ((pAwait->trigger.test_type == XSyncPositiveComparison ||
-	       pAwait->trigger.test_type == XSyncPositiveTransition)
-	       && (diffgreater || diffequal))
-	     ||
-	     ((pAwait->trigger.test_type == XSyncNegativeComparison ||
-	       pAwait->trigger.test_type == XSyncNegativeTransition)
-	      && (!diffgreater) /* less or equal */
-	      )
-	   )
-	{
-	    ppAwait[num_events++] = pAwait;
-	}
-    }
-    if (num_events)
-	SyncSendCounterNotifyEvents(pAwaitUnion->header.client, ppAwait,
-				    num_events);
-    free(ppAwait);
-
-bail:
-    /* unblock the client */
-    AttendClient(pAwaitUnion->header.client);
-    /* delete the await */
-    FreeResource(pAwaitUnion->header.delete_id, RT_NONE);
-}
-
-
-/*  This function should always be used to change a counter's value so that
- *  any triggers depending on the counter will be checked.
- */
-void
-SyncChangeCounter(SyncCounter *pCounter, CARD64 newval)
-{
-    SyncTriggerList       *ptl, *pnext;
-    CARD64 oldval;
-
-    oldval = pCounter->value;
-    pCounter->value = newval;
-
-    /* run through triggers to see if any become true */
-    for (ptl = pCounter->pTriglist; ptl; ptl = pnext)
-    {
-	pnext = ptl->next;
-	if ((*ptl->pTrigger->CheckTrigger)(ptl->pTrigger, oldval))
-	    (*ptl->pTrigger->TriggerFired)(ptl->pTrigger);
-    }
-
-    if (IsSystemCounter(pCounter))
-    {
-	SyncComputeBracketValues(pCounter);
-    }
-}
-
-
-/* loosely based on dix/events.c/EventSelectForWindow */
-static Bool
-SyncEventSelectForAlarm(SyncAlarm *pAlarm, ClientPtr client, Bool wantevents)
-{
-    SyncAlarmClientList *pClients;
-
-    if (client == pAlarm->client) /* alarm owner */
-    {
-	pAlarm->events = wantevents;
-	return Success;
-    }
-
-    /* see if the client is already on the list (has events selected) */
-
-    for (pClients = pAlarm->pEventClients; pClients;
-	 pClients = pClients->next)
-    {
-	if (pClients->client == client)
-	{
-	    /* client's presence on the list indicates desire for
-	     * events.  If the client doesn't want events, remove it
-	     * from the list.  If the client does want events, do
-	     * nothing, since it's already got them.
-	     */
-	    if (!wantevents)
-	    {
-		FreeResource(pClients->delete_id, RT_NONE);
-	    }
-	    return Success;
-	}
-    }
-
-    /*  if we get here, this client does not currently have
-     *  events selected on the alarm
-     */
-
-    if (!wantevents)
-	/* client doesn't want events, and we just discovered that it
-	 * doesn't have them, so there's nothing to do.
-	 */
-	return Success;
-
-    /* add new client to pAlarm->pEventClients */
-
-    pClients = malloc(sizeof(SyncAlarmClientList));
-    if (!pClients)
-	return BadAlloc;
-
-    /*  register it as a resource so it will be cleaned up
-     *  if the client dies
-     */
-
-    pClients->delete_id = FakeClientID(client->index);
-    if (!AddResource(pClients->delete_id, RTAlarmClient, pAlarm))
-    {
-	free(pClients);
-	return BadAlloc;
-    }
-
-    /* link it into list after we know all the allocations succeed */
-
-    pClients->next = pAlarm->pEventClients;
-    pAlarm->pEventClients = pClients;
-    pClients->client = client;
-    return Success;
-}
-
-/*
- * ** SyncChangeAlarmAttributes ** This is used by CreateAlarm and ChangeAlarm
- */
-static int
-SyncChangeAlarmAttributes(ClientPtr client, SyncAlarm *pAlarm, Mask mask,
-			  CARD32 *values)
-{
-    int		   status;
-    XSyncCounter   counter;
-    Mask	   origmask = mask;
-
-    counter = pAlarm->trigger.pCounter ? pAlarm->trigger.pCounter->id : None;
-
-    while (mask)
-    {
-	int    index2 = lowbit(mask);
-	mask &= ~index2;
-	switch (index2)
-	{
-	  case XSyncCACounter:
-	    mask &= ~XSyncCACounter;
-	    /* sanity check in SyncInitTrigger */
-	    counter = *values++;
-	    break;
-
-	  case XSyncCAValueType:
-	    mask &= ~XSyncCAValueType;
-	    /* sanity check in SyncInitTrigger */
-	    pAlarm->trigger.value_type = *values++;
-	    break;
-
-	  case XSyncCAValue:
-	    mask &= ~XSyncCAValue;
-	    XSyncIntsToValue(&pAlarm->trigger.wait_value, values[1], values[0]);
-	    values += 2;
-	    break;
-
-	  case XSyncCATestType:
-	    mask &= ~XSyncCATestType;
-	    /* sanity check in SyncInitTrigger */
-	    pAlarm->trigger.test_type = *values++;
-	    break;
-
-	  case XSyncCADelta:
-	    mask &= ~XSyncCADelta;
-	    XSyncIntsToValue(&pAlarm->delta, values[1], values[0]);
-	    values += 2;
-	    break;
-
-	  case XSyncCAEvents:
-	    mask &= ~XSyncCAEvents;
-	    if ((*values != xTrue) && (*values != xFalse))
-	    {
-		client->errorValue = *values;
-		return BadValue;
-	    }
-	    status = SyncEventSelectForAlarm(pAlarm, client,
-					     (Bool)(*values++));
-	    if (status != Success)
-		return status;
-	    break;
-
-	  default:
-	    client->errorValue = mask;
-	    return BadValue;
-	}
-    }
-
-    /* "If the test-type is PositiveComparison or PositiveTransition
-     *  and delta is less than zero, or if the test-type is
-     *  NegativeComparison or NegativeTransition and delta is
-     *  greater than zero, a Match error is generated."
-     */
-    if (origmask & (XSyncCADelta|XSyncCATestType))
-    {
-	CARD64 zero;
-	XSyncIntToValue(&zero, 0);
-	if ((((pAlarm->trigger.test_type == XSyncPositiveComparison) ||
-	      (pAlarm->trigger.test_type == XSyncPositiveTransition))
-	     && XSyncValueLessThan(pAlarm->delta, zero))
-	    ||
-	    (((pAlarm->trigger.test_type == XSyncNegativeComparison) ||
-	      (pAlarm->trigger.test_type == XSyncNegativeTransition))
-	     && XSyncValueGreaterThan(pAlarm->delta, zero))
-	   )
-	{
-	    return BadMatch;
-	}
-    }
-
-    /* postpone this until now, when we're sure nothing else can go wrong */
-    if ((status = SyncInitTrigger(client, &pAlarm->trigger, counter,
-			     origmask & XSyncCAAllTrigger)) != Success)
-	return status;
-
-    /* XXX spec does not really say to do this - needs clarification */
-    pAlarm->state = XSyncAlarmActive;
-    return Success;
-}
-
-
-static SyncCounter *
-SyncCreateCounter(ClientPtr client, XSyncCounter id, CARD64 initialvalue)
-{
-    SyncCounter *pCounter;
-
-    if (!(pCounter = malloc(sizeof(SyncCounter))))
-	return NULL;
-
-    if (!AddResource(id, RTCounter, (pointer) pCounter))
-    {
-	free(pCounter);
-	return NULL;
-    }
-
-    pCounter->client = client;
-    pCounter->id = id;
-    pCounter->value = initialvalue;
-    pCounter->pTriglist = NULL;
-    pCounter->beingDestroyed = FALSE;
-    pCounter->pSysCounterInfo = NULL;
-    return pCounter;
-}
-
-static int FreeCounter(void *, XID);
-
-/*
- * ***** System Counter utilities
- */
-
-pointer
-SyncCreateSystemCounter(
-	char *name,
-	CARD64 initial,
-	CARD64 resolution,
-	SyncCounterType counterType,
-	void (*QueryValue)(pointer /* pCounter */,
-	      	           CARD64 * /* pValue_return */),
-	void (*BracketValues)(pointer /* pCounter */,
-	       	              CARD64 * /* pbracket_less */,
-	                      CARD64 * /* pbracket_greater */)
-	)
-{
-    SyncCounter    *pCounter;
-
-    SysCounterList = realloc(SysCounterList,
-			    (SyncNumSystemCounters+1)*sizeof(SyncCounter *));
-    if (!SysCounterList)
-	return NULL;
-
-    /* this function may be called before SYNC has been initialized, so we
-     * have to make sure RTCounter is created.
-     */
-    if (RTCounter == 0)
-    {
-	RTCounter = CreateNewResourceType(FreeCounter, "SyncCounter");
-	if (RTCounter == 0)
-	{
-	    return NULL;
-	}
-    }
-
-    pCounter = SyncCreateCounter(NULL, FakeClientID(0), initial);
-
-    if (pCounter)
-    {
-	SysCounterInfo *psci;
-
-	psci = malloc(sizeof(SysCounterInfo));
-	if (!psci)
-	{
-	    FreeResource(pCounter->id, RT_NONE);
-	    return pCounter;
-	}
-	pCounter->pSysCounterInfo = psci;
-	psci->name = name;
-	psci->resolution = resolution;
-	psci->counterType = counterType;
-	psci->QueryValue = QueryValue;
-	psci->BracketValues = BracketValues;
-	XSyncMaxValue(&psci->bracket_greater);
-	XSyncMinValue(&psci->bracket_less);
-	SysCounterList[SyncNumSystemCounters++] = pCounter;
-    }
-    return pCounter;
-}
-
-void
-SyncDestroySystemCounter(pointer pSysCounter)
-{
-    SyncCounter *pCounter = (SyncCounter *)pSysCounter;
-    FreeResource(pCounter->id, RT_NONE);
-}
-
-static void
-SyncComputeBracketValues(SyncCounter *pCounter)
-{
-    SyncTriggerList *pCur;
-    SyncTrigger *pTrigger;
-    SysCounterInfo *psci;
-    CARD64 *pnewgtval = NULL;
-    CARD64 *pnewltval = NULL;
-    SyncCounterType ct;
-
-    if (!pCounter)
-	return;
-
-    psci = pCounter->pSysCounterInfo;
-    ct = pCounter->pSysCounterInfo->counterType;
-    if (ct == XSyncCounterNeverChanges)
-	return;
-
-    XSyncMaxValue(&psci->bracket_greater);
-    XSyncMinValue(&psci->bracket_less);
-
-    for (pCur = pCounter->pTriglist; pCur; pCur = pCur->next)
-    {
-	pTrigger = pCur->pTrigger;
-	
-        if (pTrigger->test_type == XSyncPositiveComparison &&
-	    ct != XSyncCounterNeverIncreases)
-	{
-	    if (XSyncValueLessThan(pCounter->value, pTrigger->test_value) &&
-		XSyncValueLessThan(pTrigger->test_value,
-				   psci->bracket_greater))
-	    {
-		psci->bracket_greater = pTrigger->test_value;
-		pnewgtval = &psci->bracket_greater;
-	    }
-	}
-	else if (pTrigger->test_type == XSyncNegativeComparison &&
-		 ct != XSyncCounterNeverDecreases)
-	{
-	    if (XSyncValueGreaterThan(pCounter->value, pTrigger->test_value) &&
-		XSyncValueGreaterThan(pTrigger->test_value,
-				      psci->bracket_less))
-	    {
-		psci->bracket_less = pTrigger->test_value;
-		pnewltval = &psci->bracket_less;
-	    }
-	}
-	else if (pTrigger->test_type == XSyncNegativeTransition &&
-		   ct != XSyncCounterNeverIncreases)
-	{
-	    if (XSyncValueGreaterThan(pCounter->value, pTrigger->test_value) &&
-		XSyncValueGreaterThan(pTrigger->test_value, psci->bracket_less))
-	    {
-		psci->bracket_less = pTrigger->test_value;
-		pnewltval = &psci->bracket_less;
-	    }
-	}
-        else if (pTrigger->test_type == XSyncPositiveTransition &&
-		  ct != XSyncCounterNeverDecreases)
-	{
-	    if (XSyncValueLessThan(pCounter->value, pTrigger->test_value) &&
-		XSyncValueLessThan(pTrigger->test_value, psci->bracket_greater))
-	    {
-		psci->bracket_greater = pTrigger->test_value;
-		pnewgtval = &psci->bracket_greater;
-	    }
-	}
-    } /* end for each trigger */
-
-    if (pnewgtval || pnewltval)
-    {
-	(*psci->BracketValues)((pointer)pCounter, pnewltval, pnewgtval);
-    }
-}
-
-/*
- * *****  Resource delete functions
- */
-
-/* ARGSUSED */
-static int
-FreeAlarm(void *addr, XID id)
-{
-    SyncAlarm      *pAlarm = (SyncAlarm *) addr;
-
-    pAlarm->state = XSyncAlarmDestroyed;
-
-    SyncSendAlarmNotifyEvents(pAlarm);
-
-    /* delete event selections */
-
-    while (pAlarm->pEventClients)
-	FreeResource(pAlarm->pEventClients->delete_id, RT_NONE);
-
-    SyncDeleteTriggerFromCounter(&pAlarm->trigger);
-
-    free(pAlarm);
-    return Success;
-}
-
-
-/*
- * ** Cleanup after the destruction of a Counter
- */
-/* ARGSUSED */
-static int
-FreeCounter(void *env, XID id)
-{
-    SyncCounter     *pCounter = (SyncCounter *) env;
-    SyncTriggerList *ptl, *pnext;
-
-    pCounter->beingDestroyed = TRUE;
-    /* tell all the counter's triggers that the counter has been destroyed */
-    for (ptl = pCounter->pTriglist; ptl; ptl = pnext)
-    {
-	(*ptl->pTrigger->CounterDestroyed)(ptl->pTrigger);
-	pnext = ptl->next;
-	free(ptl); /* destroy the trigger list as we go */
-    }
-    if (IsSystemCounter(pCounter))
-    {
-	int i, found = 0;
-
-	free(pCounter->pSysCounterInfo);
-
-	/* find the counter in the list of system counters and remove it */
-
-	if (SysCounterList)
-	{
-	    for (i = 0; i < SyncNumSystemCounters; i++)
-	    {
-		if (SysCounterList[i] == pCounter)
-		{
-		    found = i;
-		    break;
-		}
-	    }
-	    if (found < (SyncNumSystemCounters-1))
-	    {
-		for (i = found; i < SyncNumSystemCounters-1; i++)
-		{
-		    SysCounterList[i] = SysCounterList[i+1];
-		}
-	    }
-	}
-	SyncNumSystemCounters--;
-    }
-    free(pCounter);
-    return Success;
-}
-
-/*
- * ** Cleanup after Await
- */
-/* ARGSUSED */
-static int
-FreeAwait(void *addr, XID id)
-{
-    SyncAwaitUnion *pAwaitUnion = (SyncAwaitUnion *) addr;
-    SyncAwait *pAwait;
-    int numwaits;
-
-    pAwait = &(pAwaitUnion+1)->await; /* first await on list */
-
-    /* remove triggers from counters */
-
-    for (numwaits = pAwaitUnion->header.num_waitconditions; numwaits;
-	 numwaits--, pAwait++)
-    {
-	/* If the counter is being destroyed, FreeCounter will delete
-	 * the trigger list itself, so don't do it here.
-	 */
-	SyncCounter *pCounter = pAwait->trigger.pCounter;
-	if (pCounter && !pCounter->beingDestroyed)
-	    SyncDeleteTriggerFromCounter(&pAwait->trigger);
-    }
-    free(pAwaitUnion);
-    return Success;
-}
-
-/* loosely based on dix/events.c/OtherClientGone */
-static int
-FreeAlarmClient(void *value, XID id)
-{
-    SyncAlarm *pAlarm = (SyncAlarm *)value;
-    SyncAlarmClientList *pCur, *pPrev;
-
-    for (pPrev = NULL, pCur = pAlarm->pEventClients;
-	 pCur;
-	 pPrev = pCur, pCur = pCur->next)
-    {
-	if (pCur->delete_id == id)
-	{
-	    if (pPrev)
-		pPrev->next = pCur->next;
-	    else
-		pAlarm->pEventClients = pCur->next;
-	    free(pCur);
-	    return Success;
-	}
-    }
-    FatalError("alarm client not on event list");
-    /*NOTREACHED*/
-}
-
-
-/*
- * *****  Proc functions
- */
-
-
-/*
- * ** Initialize the extension
- */
-static int
-ProcSyncInitialize(ClientPtr client)
-{
-    xSyncInitializeReply  rep;
-    int   n;
-
-    REQUEST_SIZE_MATCH(xSyncInitializeReq);
-
-    memset(&rep, 0, sizeof(xSyncInitializeReply));
-    rep.type = X_Reply;
-    rep.sequenceNumber = client->sequence;
-    rep.majorVersion = SYNC_MAJOR_VERSION;
-    rep.minorVersion = SYNC_MINOR_VERSION;
-    rep.length = 0;
-
-    if (client->swapped)
-    {
-	swaps(&rep.sequenceNumber, n);
-    }
-    WriteToClient(client, sizeof(rep), (char *) &rep);
-    return Success;
-}
-
-/*
- * ** Get list of system counters available through the extension
- */
-static int
-ProcSyncListSystemCounters(ClientPtr client)
-{
-    xSyncListSystemCountersReply  rep;
-    int i, len;
-    xSyncSystemCounter *list = NULL, *walklist = NULL;
-
-    REQUEST_SIZE_MATCH(xSyncListSystemCountersReq);
-
-    rep.type = X_Reply;
-    rep.sequenceNumber = client->sequence;
-    rep.nCounters = SyncNumSystemCounters;
-
-    for (i = len = 0; i < SyncNumSystemCounters; i++)
-    {
-	char *name = SysCounterList[i]->pSysCounterInfo->name;
-	/* pad to 4 byte boundary */
-	len += pad_to_int32(sz_xSyncSystemCounter + strlen(name));
-    }
-
-    if (len)
-    {
-	walklist = list = malloc(len);
-	if (!list)
-	    return BadAlloc;
-    }
-
-    rep.length = bytes_to_int32(len);
-
-    if (client->swapped)
-    {
-	char n;
-	swaps(&rep.sequenceNumber, n);
-	swapl(&rep.length, n);
-	swapl(&rep.nCounters, n);
-    }
-
-    for (i = 0; i < SyncNumSystemCounters; i++)
-    {
-	int namelen;
-	char *pname_in_reply;
-	SysCounterInfo *psci = SysCounterList[i]->pSysCounterInfo;
-
-	walklist->counter = SysCounterList[i]->id;
-	walklist->resolution_hi = XSyncValueHigh32(psci->resolution);
-	walklist->resolution_lo = XSyncValueLow32(psci->resolution);
-	namelen = strlen(psci->name);
-	walklist->name_length = namelen;
-
-	if (client->swapped)
-	{
-	    char n;
-	    swapl(&walklist->counter, n);
-	    swapl(&walklist->resolution_hi, n);
-	    swapl(&walklist->resolution_lo, n);
-	    swaps(&walklist->name_length, n);
-	}
-
-	pname_in_reply = ((char *)walklist) + sz_xSyncSystemCounter;
-	strncpy(pname_in_reply, psci->name, namelen);
-	walklist = (xSyncSystemCounter *) (((char *)walklist) +
-				pad_to_int32(sz_xSyncSystemCounter + namelen));
-    }
-
-    WriteToClient(client, sizeof(rep), (char *) &rep);
-    if (len)
-    {
-	WriteToClient(client, len, (char *) list);
-	free(list);
-    }
-
-    return Success;
-}
-
-/*
- * ** Set client Priority
- */
-static int
-ProcSyncSetPriority(ClientPtr client)
-{
-    REQUEST(xSyncSetPriorityReq);
-    ClientPtr priorityclient;
-    int rc;
-
-    REQUEST_SIZE_MATCH(xSyncSetPriorityReq);
-
-    if (stuff->id == None)
-	priorityclient = client;
-    else {
-	rc = dixLookupClient(&priorityclient, stuff->id, client,
-			     DixSetAttrAccess);
-	if (rc != Success)
-	    return rc;
-    }
-
-    if (priorityclient->priority != stuff->priority)
-    {
-	priorityclient->priority = stuff->priority;
-
-	/*  The following will force the server back into WaitForSomething
-	 *  so that the change in this client's priority is immediately
-	 *  reflected.
-	 */
-	isItTimeToYield = TRUE;
-	dispatchException |= DE_PRIORITYCHANGE;
-    }
-    return Success;
-}
-
-/*
- * ** Get client Priority
- */
-static int
-ProcSyncGetPriority(ClientPtr client)
-{
-    REQUEST(xSyncGetPriorityReq);
-    xSyncGetPriorityReply rep;
-    ClientPtr priorityclient;
-    int rc;
-
-    REQUEST_SIZE_MATCH(xSyncGetPriorityReq);
-
-    if (stuff->id == None)
-	priorityclient = client;
-    else {
-	rc = dixLookupClient(&priorityclient, stuff->id, client,
-			     DixGetAttrAccess);
-	if (rc != Success)
-	    return rc;
-    }
-
-    rep.type = X_Reply;
-    rep.length = 0;
-    rep.sequenceNumber = client->sequence;
-    rep.priority = priorityclient->priority;
-
-    if (client->swapped)
-    {
-	char n;
-	swaps(&rep.sequenceNumber, n);
-	swapl(&rep.priority, n);
-    }
-
-    WriteToClient(client, sizeof(xSyncGetPriorityReply), (char *) &rep);
-
-    return Success;
-}
-
-/*
- * ** Create a new counter
- */
-static int
-ProcSyncCreateCounter(ClientPtr client)
-{
-    REQUEST(xSyncCreateCounterReq);
-    CARD64          initial;
-
-    REQUEST_SIZE_MATCH(xSyncCreateCounterReq);
-
-    LEGAL_NEW_RESOURCE(stuff->cid, client);
-
-    XSyncIntsToValue(&initial, stuff->initial_value_lo, stuff->initial_value_hi);
-    if (!SyncCreateCounter(client, stuff->cid, initial))
-	return BadAlloc;
-
-    return Success;
-}
-
-/*
- * ** Set Counter value
- */
-static int
-ProcSyncSetCounter(ClientPtr client)
-{
-    REQUEST(xSyncSetCounterReq);
-    SyncCounter    *pCounter;
-    CARD64	   newvalue;
-    int	rc;
-
-    REQUEST_SIZE_MATCH(xSyncSetCounterReq);
-
-    rc = dixLookupResourceByType((pointer *)&pCounter, stuff->cid, RTCounter,
-				 client, DixWriteAccess);
-    if (rc != Success)
-	return (rc == BadValue) ? SyncErrorBase + XSyncBadCounter : rc;
-
-    if (IsSystemCounter(pCounter))
-    {
-	client->errorValue = stuff->cid;
-	return BadAccess;
-    }
-
-    XSyncIntsToValue(&newvalue, stuff->value_lo, stuff->value_hi);
-    SyncChangeCounter(pCounter, newvalue);
-    return Success;
-}
-
-/*
- * ** Change Counter value
- */
-static int
-ProcSyncChangeCounter(ClientPtr client)
-{
-    REQUEST(xSyncChangeCounterReq);
-    SyncCounter    *pCounter;
-    CARD64          newvalue;
-    Bool	    overflow;
-    int	rc;
-
-    REQUEST_SIZE_MATCH(xSyncChangeCounterReq);
-
-    rc = dixLookupResourceByType((pointer *)&pCounter, stuff->cid, RTCounter,
-				 client, DixWriteAccess);
-    if (rc != Success)
-	return (rc == BadValue) ? SyncErrorBase + XSyncBadCounter : rc;
-
-    if (IsSystemCounter(pCounter))
-    {
-	client->errorValue = stuff->cid;
-	return BadAccess;
-    }
-
-    XSyncIntsToValue(&newvalue, stuff->value_lo, stuff->value_hi);
-    XSyncValueAdd(&newvalue, pCounter->value, newvalue, &overflow);
-    if (overflow)
-    {
-	/* XXX 64 bit value can't fit in 32 bits; do the best we can */
-	client->errorValue = stuff->value_hi;
-	return BadValue;
-    }
-    SyncChangeCounter(pCounter, newvalue);
-    return Success;
-}
-
-/*
- * ** Destroy a counter
- */
-static int
-ProcSyncDestroyCounter(ClientPtr client)
-{
-    REQUEST(xSyncDestroyCounterReq);
-    SyncCounter    *pCounter;
-    int rc;
-
-    REQUEST_SIZE_MATCH(xSyncDestroyCounterReq);
-
-    rc = dixLookupResourceByType((pointer *)&pCounter, stuff->counter, RTCounter,
-				 client, DixDestroyAccess);
-    if (rc != Success)
-	return (rc == BadValue) ? SyncErrorBase + XSyncBadCounter : rc;
-
-    if (IsSystemCounter(pCounter))
-    {
-	client->errorValue = stuff->counter;
-	return BadAccess;
-    }
-    FreeResource(pCounter->id, RT_NONE);
-    return Success;
-}
-
-
-/*
- * ** Await
- */
-static int
-ProcSyncAwait(ClientPtr client)
-{
-    REQUEST(xSyncAwaitReq);
-    int             len, items;
-    int             i;
-    xSyncWaitCondition *pProtocolWaitConds;
-    SyncAwaitUnion *pAwaitUnion;
-    SyncAwait	   *pAwait;
-    int		   status;
-
-    REQUEST_AT_LEAST_SIZE(xSyncAwaitReq);
-
-    len = client->req_len << 2;
-    len -= sz_xSyncAwaitReq;
-    items = len / sz_xSyncWaitCondition;
-
-    if (items * sz_xSyncWaitCondition != len)
-    {
-	return BadLength;
-    }
-    if (items == 0)
-    {
-	client->errorValue = items; /* XXX protocol change */
-	return BadValue;
-    }
-
-    pProtocolWaitConds = (xSyncWaitCondition *) & stuff[1];
-
-    /*  all the memory for the entire await list is allocated
-     *  here in one chunk
-     */
-    pAwaitUnion = malloc((items+1) * sizeof(SyncAwaitUnion));
-    if (!pAwaitUnion)
-	return BadAlloc;
-
-    /* first item is the header, remainder are real wait conditions */
-
-    pAwaitUnion->header.delete_id = FakeClientID(client->index);
-    if (!AddResource(pAwaitUnion->header.delete_id, RTAwait, pAwaitUnion))
-    {
-	free(pAwaitUnion);
-	return BadAlloc;
-    }
-
-    /* don't need to do any more memory allocation for this request! */
-
-    pAwaitUnion->header.client = client;
-    pAwaitUnion->header.num_waitconditions = 0;
-
-    pAwait = &(pAwaitUnion+1)->await; /* skip over header */
-    for (i = 0; i < items; i++, pProtocolWaitConds++, pAwait++)
-    {
-	if (pProtocolWaitConds->counter == None) /* XXX protocol change */
-	{
-	    /*  this should take care of removing any triggers created by
-	     *  this request that have already been registered on counters
-	     */
-	    FreeResource(pAwaitUnion->header.delete_id, RT_NONE);
-	    client->errorValue = pProtocolWaitConds->counter;
-	    return SyncErrorBase + XSyncBadCounter;
-	}
-
-	/* sanity checks are in SyncInitTrigger */
-	pAwait->trigger.pCounter = NULL;
-	pAwait->trigger.value_type = pProtocolWaitConds->value_type;
-	XSyncIntsToValue(&pAwait->trigger.wait_value,
-			 pProtocolWaitConds->wait_value_lo,
-			 pProtocolWaitConds->wait_value_hi);
-	pAwait->trigger.test_type = pProtocolWaitConds->test_type;
-
-	status = SyncInitTrigger(client, &pAwait->trigger,
-			 pProtocolWaitConds->counter, XSyncCAAllTrigger);
-	if (status != Success)
-	{
-	    /*  this should take care of removing any triggers created by
-	     *  this request that have already been registered on counters
-	     */
-	    FreeResource(pAwaitUnion->header.delete_id, RT_NONE);
-	    return status;
-	}
-	/* this is not a mistake -- same function works for both cases */
-	pAwait->trigger.TriggerFired = SyncAwaitTriggerFired;
-	pAwait->trigger.CounterDestroyed = SyncAwaitTriggerFired;
-	XSyncIntsToValue(&pAwait->event_threshold,
-			 pProtocolWaitConds->event_threshold_lo,
-			 pProtocolWaitConds->event_threshold_hi);
-	pAwait->pHeader = &pAwaitUnion->header;
-	pAwaitUnion->header.num_waitconditions++;
-    }
-
-    IgnoreClient(client);
-
-    /* see if any of the triggers are already true */
-
-    pAwait = &(pAwaitUnion+1)->await; /* skip over header */
-    for (i = 0; i < items; i++, pAwait++)
-    {
-	/*  don't have to worry about NULL counters because the request
-	 *  errors before we get here out if they occur
-	 */
-	if ((*pAwait->trigger.CheckTrigger)(&pAwait->trigger,
-					    pAwait->trigger.pCounter->value))
-	{
-	    (*pAwait->trigger.TriggerFired)(&pAwait->trigger);
-	    break; /* once is enough */
-	}
-    }
-    return Success;
-}
-
-
-/*
- * ** Query a counter
- */
-static int
-ProcSyncQueryCounter(ClientPtr client)
-{
-    REQUEST(xSyncQueryCounterReq);
-    xSyncQueryCounterReply rep;
-    SyncCounter    *pCounter;
-    int rc;
-
-    REQUEST_SIZE_MATCH(xSyncQueryCounterReq);
-
-    rc = dixLookupResourceByType((pointer *)&pCounter, stuff->counter,
-				 RTCounter, client, DixReadAccess);
-    if (rc != Success)
-	return (rc == BadValue) ? SyncErrorBase + XSyncBadCounter : rc;
-
-    rep.type = X_Reply;
-    rep.length = 0;
-    rep.sequenceNumber = client->sequence;
-
-    /* if system counter, ask it what the current value is */
-
-    if (IsSystemCounter(pCounter))
-    {
-	(*pCounter->pSysCounterInfo->QueryValue) ((pointer) pCounter,
-						  &pCounter->value);
-    }
-
-    rep.value_hi = XSyncValueHigh32(pCounter->value);
-    rep.value_lo = XSyncValueLow32(pCounter->value);
-    if (client->swapped)
-    {
-	char n;
-	swaps(&rep.sequenceNumber, n);
-	swapl(&rep.length, n);
-	swapl(&rep.value_hi, n);
-	swapl(&rep.value_lo, n);
-    }
-    WriteToClient(client, sizeof(xSyncQueryCounterReply), (char *) &rep);
-    return Success;
-}
-
-
-/*
- * ** Create Alarm
- */
-static int
-ProcSyncCreateAlarm(ClientPtr client)
-{
-    REQUEST(xSyncCreateAlarmReq);
-    SyncAlarm      *pAlarm;
-    int             status;
-    unsigned long   len, vmask;
-    SyncTrigger	    *pTrigger;
-
-    REQUEST_AT_LEAST_SIZE(xSyncCreateAlarmReq);
-
-    LEGAL_NEW_RESOURCE(stuff->id, client);
-
-    vmask = stuff->valueMask;
-    len = client->req_len - bytes_to_int32(sizeof(xSyncCreateAlarmReq));
-    /* the "extra" call to Ones accounts for the presence of 64 bit values */
-    if (len != (Ones(vmask) + Ones(vmask & (XSyncCAValue|XSyncCADelta))))
-	return BadLength;
-
-    if (!(pAlarm = malloc(sizeof(SyncAlarm))))
-    {
-	return BadAlloc;
-    }
-
-    /* set up defaults */
-
-    pTrigger = &pAlarm->trigger;
-    pTrigger->pCounter = NULL;
-    pTrigger->value_type = XSyncAbsolute;
-    XSyncIntToValue(&pTrigger->wait_value, 0L);
-    pTrigger->test_type = XSyncPositiveComparison;
-    pTrigger->TriggerFired = SyncAlarmTriggerFired;
-    pTrigger->CounterDestroyed = SyncAlarmCounterDestroyed;
-    status = SyncInitTrigger(client, pTrigger, None, XSyncCAAllTrigger);
-    if (status != Success)
-    {
-	free(pAlarm);
-	return status;
-    }
-
-    pAlarm->client = client;
-    pAlarm->alarm_id = stuff->id;
-    XSyncIntToValue(&pAlarm->delta, 1L);
-    pAlarm->events = TRUE;
-    pAlarm->state = XSyncAlarmInactive;
-    pAlarm->pEventClients = NULL;
-    status = SyncChangeAlarmAttributes(client, pAlarm, vmask,
-				       (CARD32 *)&stuff[1]);
-    if (status != Success)
-    {
-	free(pAlarm);
-	return status;
-    }
-
-    if (!AddResource(stuff->id, RTAlarm, pAlarm))
-    {
-	free(pAlarm);
-	return BadAlloc;
-    }
-
-    /*  see if alarm already triggered.  NULL counter will not trigger
-     *  in CreateAlarm and sets alarm state to Inactive.
-     */
-
-    if (!pTrigger->pCounter)
-    {
-	pAlarm->state = XSyncAlarmInactive; /* XXX protocol change */
-    }
-    else if ((*pTrigger->CheckTrigger)(pTrigger, pTrigger->pCounter->value))
-    {
-	(*pTrigger->TriggerFired)(pTrigger);
-    }
-
-    return Success;
-}
-
-/*
- * ** Change Alarm
- */
-static int
-ProcSyncChangeAlarm(ClientPtr client)
-{
-    REQUEST(xSyncChangeAlarmReq);
-    SyncAlarm   *pAlarm;
-    long        vmask;
-    int         len, status;
-
-    REQUEST_AT_LEAST_SIZE(xSyncChangeAlarmReq);
-
-    status = dixLookupResourceByType((pointer *)&pAlarm, stuff->alarm, RTAlarm,
-				     client, DixWriteAccess);
-    if (status != Success)
-	return (status == BadValue) ? SyncErrorBase + XSyncBadAlarm : status;
-
-    vmask = stuff->valueMask;
-    len = client->req_len - bytes_to_int32(sizeof(xSyncChangeAlarmReq));
-    /* the "extra" call to Ones accounts for the presence of 64 bit values */
-    if (len != (Ones(vmask) + Ones(vmask & (XSyncCAValue|XSyncCADelta))))
-	return BadLength;
-
-    if ((status = SyncChangeAlarmAttributes(client, pAlarm, vmask,
-					    (CARD32 *)&stuff[1])) != Success)
-	return status;
-
-    /*  see if alarm already triggered.  NULL counter WILL trigger
-     *  in ChangeAlarm.
-     */
-
-    if (!pAlarm->trigger.pCounter ||
-	(*pAlarm->trigger.CheckTrigger)(&pAlarm->trigger,
-					pAlarm->trigger.pCounter->value))
-    {
-	(*pAlarm->trigger.TriggerFired)(&pAlarm->trigger);
-    }
-    return Success;
-}
-
-static int
-ProcSyncQueryAlarm(ClientPtr client)
-{
-    REQUEST(xSyncQueryAlarmReq);
-    SyncAlarm      *pAlarm;
-    xSyncQueryAlarmReply rep;
-    SyncTrigger    *pTrigger;
-    int rc;
-
-    REQUEST_SIZE_MATCH(xSyncQueryAlarmReq);
-
-    rc = dixLookupResourceByType((pointer *)&pAlarm, stuff->alarm, RTAlarm,
-				 client, DixReadAccess);
-    if (rc != Success)
-	return (rc == BadValue) ? SyncErrorBase + XSyncBadAlarm : rc;
-
-    rep.type = X_Reply;
-    rep.length = bytes_to_int32(sizeof(xSyncQueryAlarmReply) - sizeof(xGenericReply));
-    rep.sequenceNumber = client->sequence;
-
-    pTrigger = &pAlarm->trigger;
-    rep.counter = (pTrigger->pCounter) ? pTrigger->pCounter->id : None;
-
-#if 0 /* XXX unclear what to do, depends on whether relative value-types
-       * are "consumed" immediately and are considered absolute from then
-       * on.
-       */
-    rep.value_type = pTrigger->value_type;
-    rep.wait_value_hi = XSyncValueHigh32(pTrigger->wait_value);
-    rep.wait_value_lo = XSyncValueLow32(pTrigger->wait_value);
-#else
-    rep.value_type = XSyncAbsolute;
-    rep.wait_value_hi = XSyncValueHigh32(pTrigger->test_value);
-    rep.wait_value_lo = XSyncValueLow32(pTrigger->test_value);
-#endif
-
-    rep.test_type = pTrigger->test_type;
-    rep.delta_hi = XSyncValueHigh32(pAlarm->delta);
-    rep.delta_lo = XSyncValueLow32(pAlarm->delta);
-    rep.events = pAlarm->events;
-    rep.state = pAlarm->state;
-
-    if (client->swapped)
-    {
-	char n;
-	swaps(&rep.sequenceNumber, n);
-	swapl(&rep.length, n);
-	swapl(&rep.counter, n);
-	swapl(&rep.wait_value_hi, n);
-	swapl(&rep.wait_value_lo, n);
-	swapl(&rep.test_type, n);
-	swapl(&rep.delta_hi, n);
-	swapl(&rep.delta_lo, n);
-    }
-
-    WriteToClient(client, sizeof(xSyncQueryAlarmReply), (char *) &rep);
-    return Success;
-}
-
-static int
-ProcSyncDestroyAlarm(ClientPtr client)
-{
-    SyncAlarm *pAlarm;
-    int rc;
-    REQUEST(xSyncDestroyAlarmReq);
-
-    REQUEST_SIZE_MATCH(xSyncDestroyAlarmReq);
-
-    rc = dixLookupResourceByType((pointer *)&pAlarm, stuff->alarm, RTAlarm,
-				 client, DixDestroyAccess);
-    if (rc != Success)
-	return (rc == BadValue) ? SyncErrorBase + XSyncBadAlarm : rc;
-
-    FreeResource(stuff->alarm, RT_NONE);
-    return Success;
-}
-
-/*
- * ** Given an extension request, call the appropriate request procedure
- */
-static int
-ProcSyncDispatch(ClientPtr client)
-{
-    REQUEST(xReq);
-
-    switch (stuff->data)
-    {
-      case X_SyncInitialize:
-	return ProcSyncInitialize(client);
-      case X_SyncListSystemCounters:
-	return ProcSyncListSystemCounters(client);
-      case X_SyncCreateCounter:
-	return ProcSyncCreateCounter(client);
-      case X_SyncSetCounter:
-	return ProcSyncSetCounter(client);
-      case X_SyncChangeCounter:
-	return ProcSyncChangeCounter(client);
-      case X_SyncQueryCounter:
-	return ProcSyncQueryCounter(client);
-      case X_SyncDestroyCounter:
-	return ProcSyncDestroyCounter(client);
-      case X_SyncAwait:
-	return ProcSyncAwait(client);
-      case X_SyncCreateAlarm:
-	return ProcSyncCreateAlarm(client);
-      case X_SyncChangeAlarm:
-	return ProcSyncChangeAlarm(client);
-      case X_SyncQueryAlarm:
-	return ProcSyncQueryAlarm(client);
-      case X_SyncDestroyAlarm:
-	return ProcSyncDestroyAlarm(client);
-      case X_SyncSetPriority:
-	return ProcSyncSetPriority(client);
-      case X_SyncGetPriority:
-	return ProcSyncGetPriority(client);
-      default:
-	return BadRequest;
-    }
-}
-
-/*
- * Boring Swapping stuff ...
- */
-
-static int
-SProcSyncInitialize(ClientPtr client)
-{
-    REQUEST(xSyncInitializeReq);
-    char   n;
-
-    swaps(&stuff->length, n);
-    REQUEST_SIZE_MATCH (xSyncInitializeReq);
-
-    return ProcSyncInitialize(client);
-}
-
-static int
-SProcSyncListSystemCounters(ClientPtr client)
-{
-    REQUEST(xSyncListSystemCountersReq);
-    char   n;
-
-    swaps(&stuff->length, n);
-    REQUEST_SIZE_MATCH (xSyncListSystemCountersReq);
-
-    return ProcSyncListSystemCounters(client);
-}
-
-static int
-SProcSyncCreateCounter(ClientPtr client)
-{
-    REQUEST(xSyncCreateCounterReq);
-    char   n;
-
-    swaps(&stuff->length, n);
-    REQUEST_SIZE_MATCH (xSyncCreateCounterReq);
-    swapl(&stuff->cid, n);
-    swapl(&stuff->initial_value_lo, n);
-    swapl(&stuff->initial_value_hi, n);
-
-    return ProcSyncCreateCounter(client);
-}
-
-static int
-SProcSyncSetCounter(ClientPtr client)
-{
-    REQUEST(xSyncSetCounterReq);
-    char   n;
-
-    swaps(&stuff->length, n);
-    REQUEST_SIZE_MATCH (xSyncSetCounterReq);
-    swapl(&stuff->cid, n);
-    swapl(&stuff->value_lo, n);
-    swapl(&stuff->value_hi, n);
-
-    return ProcSyncSetCounter(client);
-}
-
-static int
-SProcSyncChangeCounter(ClientPtr client)
-{
-    REQUEST(xSyncChangeCounterReq);
-    char   n;
-
-    swaps(&stuff->length, n);
-    REQUEST_SIZE_MATCH (xSyncChangeCounterReq);
-    swapl(&stuff->cid, n);
-    swapl(&stuff->value_lo, n);
-    swapl(&stuff->value_hi, n);
-
-    return ProcSyncChangeCounter(client);
-}
-
-static int
-SProcSyncQueryCounter(ClientPtr client)
-{
-    REQUEST(xSyncQueryCounterReq);
-    char   n;
-
-    swaps(&stuff->length, n);
-    REQUEST_SIZE_MATCH (xSyncQueryCounterReq);
-    swapl(&stuff->counter, n);
-
-    return ProcSyncQueryCounter(client);
-}
-
-static int
-SProcSyncDestroyCounter(ClientPtr client)
-{
-    REQUEST(xSyncDestroyCounterReq);
-    char   n;
-
-    swaps(&stuff->length, n);
-    REQUEST_SIZE_MATCH (xSyncDestroyCounterReq);
-    swapl(&stuff->counter, n);
-
-    return ProcSyncDestroyCounter(client);
-}
-
-static int
-SProcSyncAwait(ClientPtr client)
-{
-    REQUEST(xSyncAwaitReq);
-    char   n;
-
-    swaps(&stuff->length, n);
-    REQUEST_AT_LEAST_SIZE(xSyncAwaitReq);
-    SwapRestL(stuff);
-
-    return ProcSyncAwait(client);
-}
-
-static int
-SProcSyncCreateAlarm(ClientPtr client)
-{
-    REQUEST(xSyncCreateAlarmReq);
-    char   n;
-
-    swaps(&stuff->length, n);
-    REQUEST_AT_LEAST_SIZE(xSyncCreateAlarmReq);
-    swapl(&stuff->id, n);
-    swapl(&stuff->valueMask, n);
-    SwapRestL(stuff);
-
-    return ProcSyncCreateAlarm(client);
-}
-
-static int
-SProcSyncChangeAlarm(ClientPtr client)
-{
-    REQUEST(xSyncChangeAlarmReq);
-    char   n;
-
-    swaps(&stuff->length, n);
-    REQUEST_AT_LEAST_SIZE(xSyncChangeAlarmReq);
-    swapl(&stuff->alarm, n);
-    swapl(&stuff->valueMask, n);
-    SwapRestL(stuff);
-    return ProcSyncChangeAlarm(client);
-}
-
-static int
-SProcSyncQueryAlarm(ClientPtr client)
-{
-    REQUEST(xSyncQueryAlarmReq);
-    char   n;
-
-    swaps(&stuff->length, n);
-    REQUEST_SIZE_MATCH (xSyncQueryAlarmReq);
-    swapl(&stuff->alarm, n);
-
-    return ProcSyncQueryAlarm(client);
-}
-
-static int
-SProcSyncDestroyAlarm(ClientPtr client)
-{
-    REQUEST(xSyncDestroyAlarmReq);
-    char   n;
-
-    swaps(&stuff->length, n);
-    REQUEST_SIZE_MATCH (xSyncDestroyAlarmReq);
-    swapl(&stuff->alarm, n);
-
-    return ProcSyncDestroyAlarm(client);
-}
-
-static int
-SProcSyncSetPriority(ClientPtr client)
-{
-    REQUEST(xSyncSetPriorityReq);
-    char   n;
-
-    swaps(&stuff->length, n);
-    REQUEST_SIZE_MATCH (xSyncSetPriorityReq);
-    swapl(&stuff->id, n);
-    swapl(&stuff->priority, n);
-
-    return ProcSyncSetPriority(client);
-}
-
-static int
-SProcSyncGetPriority(ClientPtr client)
-{
-    REQUEST(xSyncGetPriorityReq);
-    char   n;
-
-    swaps(&stuff->length, n);
-    REQUEST_SIZE_MATCH (xSyncGetPriorityReq);
-    swapl(&stuff->id, n);
-
-    return ProcSyncGetPriority(client);
-}
-
-
-static int
-SProcSyncDispatch(ClientPtr client)
-{
-    REQUEST(xReq);
-
-    switch (stuff->data)
-    {
-      case X_SyncInitialize:
-	return SProcSyncInitialize(client);
-      case X_SyncListSystemCounters:
-	return SProcSyncListSystemCounters(client);
-      case X_SyncCreateCounter:
-	return SProcSyncCreateCounter(client);
-      case X_SyncSetCounter:
-	return SProcSyncSetCounter(client);
-      case X_SyncChangeCounter:
-	return SProcSyncChangeCounter(client);
-      case X_SyncQueryCounter:
-	return SProcSyncQueryCounter(client);
-      case X_SyncDestroyCounter:
-	return SProcSyncDestroyCounter(client);
-      case X_SyncAwait:
-	return SProcSyncAwait(client);
-      case X_SyncCreateAlarm:
-	return SProcSyncCreateAlarm(client);
-      case X_SyncChangeAlarm:
-	return SProcSyncChangeAlarm(client);
-      case X_SyncQueryAlarm:
-	return SProcSyncQueryAlarm(client);
-      case X_SyncDestroyAlarm:
-	return SProcSyncDestroyAlarm(client);
-      case X_SyncSetPriority:
-	return SProcSyncSetPriority(client);
-      case X_SyncGetPriority:
-	return SProcSyncGetPriority(client);
-      default:
-	return BadRequest;
-    }
-}
-
-/*
- * Event Swapping
- */
-
-static void
-SCounterNotifyEvent(xSyncCounterNotifyEvent *from, xSyncCounterNotifyEvent *to)
-{
-    to->type = from->type;
-    to->kind = from->kind;
-    cpswaps(from->sequenceNumber, to->sequenceNumber);
-    cpswapl(from->counter, to->counter);
-    cpswapl(from->wait_value_lo, to->wait_value_lo);
-    cpswapl(from->wait_value_hi, to->wait_value_hi);
-    cpswapl(from->counter_value_lo, to->counter_value_lo);
-    cpswapl(from->counter_value_hi, to->counter_value_hi);
-    cpswapl(from->time, to->time);
-    cpswaps(from->count, to->count);
-    to->destroyed = from->destroyed;
-}
-
-
-static void
-SAlarmNotifyEvent(xSyncAlarmNotifyEvent *from, xSyncAlarmNotifyEvent *to)
-{
-    to->type = from->type;
-    to->kind = from->kind;
-    cpswaps(from->sequenceNumber, to->sequenceNumber);
-    cpswapl(from->alarm, to->alarm);
-    cpswapl(from->counter_value_lo, to->counter_value_lo);
-    cpswapl(from->counter_value_hi, to->counter_value_hi);
-    cpswapl(from->alarm_value_lo, to->alarm_value_lo);
-    cpswapl(from->alarm_value_hi, to->alarm_value_hi);
-    cpswapl(from->time, to->time);
-    to->state = from->state;
-}
-
-/*
- * ** Close everything down. ** This is fairly simple for now.
- */
-/* ARGSUSED */
-static void
-SyncResetProc(ExtensionEntry *extEntry)
-{
-    free(SysCounterList);
-    SysCounterList = NULL;
-    RTCounter = 0;
-}
-
-
-/*
- * ** Initialise the extension.
- */
-void
-SyncExtensionInit(void)
-{
-    ExtensionEntry *extEntry;
-
-    if (RTCounter == 0)
-    {
-	RTCounter = CreateNewResourceType(FreeCounter, "SyncCounter");
-    }
-    RTAlarm = CreateNewResourceType(FreeAlarm, "SyncAlarm");
-    RTAwait = CreateNewResourceType(FreeAwait, "SyncAwait");
-    if (RTAwait)
-	RTAwait |= RC_NEVERRETAIN;
-    RTAlarmClient = CreateNewResourceType(FreeAlarmClient, "SyncAlarmClient");
-    if (RTAlarmClient)
-	RTAlarmClient |= RC_NEVERRETAIN;
-
-    if (RTCounter == 0 || RTAwait == 0 || RTAlarm == 0 ||
-	RTAlarmClient == 0 ||
-	(extEntry = AddExtension(SYNC_NAME,
-				 XSyncNumberEvents, XSyncNumberErrors,
-				 ProcSyncDispatch, SProcSyncDispatch,
-				 SyncResetProc,
-				 StandardMinorOpcode)) == NULL)
-    {
-	ErrorF("Sync Extension %d.%d failed to Initialise\n",
-		SYNC_MAJOR_VERSION, SYNC_MINOR_VERSION);
-	return;
-    }
-
-    SyncEventBase = extEntry->eventBase;
-    SyncErrorBase = extEntry->errorBase;
-    EventSwapVector[SyncEventBase + XSyncCounterNotify] = (EventSwapPtr) SCounterNotifyEvent;
-    EventSwapVector[SyncEventBase + XSyncAlarmNotify] = (EventSwapPtr) SAlarmNotifyEvent;
-
-    /*
-     * Although SERVERTIME is implemented by the OS layer, we initialise it
-     * here because doing it in OsInit() is too early. The resource database
-     * is not initialised when OsInit() is called. This is just about OK
-     * because there is always a servertime counter.
-     */
-    SyncInitServerTime();
-    SyncInitIdleTime();
-
-#ifdef DEBUG
-    fprintf(stderr, "Sync Extension %d.%d\n",
-	    SYNC_MAJOR_VERSION, SYNC_MINOR_VERSION);
-#endif
-}
-
-
-/*
- * ***** SERVERTIME implementation - should go in its own file in OS directory?
- */
-
-
-
-static pointer ServertimeCounter;
-static XSyncValue Now;
-static XSyncValue *pnext_time;
-
-#define GetTime()\
-{\
-    unsigned long millis = GetTimeInMillis();\
-    unsigned long maxis = XSyncValueHigh32(Now);\
-    if (millis < XSyncValueLow32(Now)) maxis++;\
-    XSyncIntsToValue(&Now, millis, maxis);\
-}
-
-/*
-*** Server Block Handler
-*** code inspired by multibuffer extension (now deprecated)
- */
-/*ARGSUSED*/
-static void
-ServertimeBlockHandler(void *env, struct timeval **wt, void *LastSelectMask)
-{
-    XSyncValue delay;
-    unsigned long timeout;
-
-    if (pnext_time)
-    {
-        GetTime();
-
-        if (XSyncValueGreaterOrEqual(Now, *pnext_time))
-	{
-            timeout = 0;
-        }
-	else
-	{
-	    Bool overflow;
-            XSyncValueSubtract(&delay, *pnext_time, Now, &overflow);
-	    (void)overflow;
-            timeout = XSyncValueLow32(delay);
-        }
-        AdjustWaitForDelay(wt, timeout); /* os/utils.c */
-    }
-}
-
-/*
-*** Wakeup Handler
- */
-/*ARGSUSED*/
-static void
-ServertimeWakeupHandler(void *env, int rc, void *LastSelectMask)
-{
-    if (pnext_time)
-    {
-        GetTime();
-
-        if (XSyncValueGreaterOrEqual(Now, *pnext_time))
-	{
-            SyncChangeCounter(ServertimeCounter, Now);
-        }
-    }
-}
-
-static void
-ServertimeQueryValue(void *pCounter, CARD64 *pValue_return)
-{
-    GetTime();
-    *pValue_return = Now;
-}
-
-static void
-ServertimeBracketValues(void *pCounter, CARD64 *pbracket_less,
-			CARD64 *pbracket_greater)
-{
-    if (!pnext_time && pbracket_greater)
-    {
-	RegisterBlockAndWakeupHandlers(ServertimeBlockHandler,
-				       ServertimeWakeupHandler,
-				       NULL);
-    }
-    else if (pnext_time && !pbracket_greater)
-    {
-	RemoveBlockAndWakeupHandlers(ServertimeBlockHandler,
-				     ServertimeWakeupHandler,
-				     NULL);
-    }
-    pnext_time = pbracket_greater;
-}
-
-static void
-SyncInitServerTime(void)
-{
-    CARD64 resolution;
-
-    XSyncIntsToValue(&Now, GetTimeInMillis(), 0);
-    XSyncIntToValue(&resolution, 4);
-    ServertimeCounter = SyncCreateSystemCounter("SERVERTIME", Now, resolution,
-			    XSyncCounterNeverDecreases,
-			    ServertimeQueryValue, ServertimeBracketValues);
-    pnext_time = NULL;
-}
-
-
-
-/*
- * IDLETIME implementation
- */
-
-static SyncCounter *IdleTimeCounter;
-static XSyncValue *pIdleTimeValueLess;
-static XSyncValue *pIdleTimeValueGreater;
-
-static void
-IdleTimeQueryValue (pointer pCounter, CARD64 *pValue_return)
-{
-    CARD32 idle = GetTimeInMillis() - lastDeviceEventTime.milliseconds;
-    XSyncIntsToValue (pValue_return, idle, 0);
-}
-
-static void
-IdleTimeBlockHandler(pointer env, struct timeval **wt, pointer LastSelectMask)
-{
-    XSyncValue idle, old_idle;
-    SyncTriggerList *list = IdleTimeCounter->pTriglist;
-    SyncTrigger *trig;
-
-    if (!pIdleTimeValueLess && !pIdleTimeValueGreater)
-	return;
-
-    old_idle = IdleTimeCounter->value;
-    IdleTimeQueryValue (NULL, &idle);
-    IdleTimeCounter->value = idle; /* push, so CheckTrigger works */
-
-    if (pIdleTimeValueLess &&
-        XSyncValueLessOrEqual (idle, *pIdleTimeValueLess))
-    {
-	/*
-	 * We've been idle for less than the threshold value, and someone
-	 * wants to know about that, but now we need to know whether they
-	 * want level or edge trigger.  Check the trigger list against the
-	 * current idle time, and if any succeed, bomb out of select()
-	 * immediately so we can reschedule.
-	 */
-
-	for (list = IdleTimeCounter->pTriglist; list; list = list->next) {
-	    trig = list->pTrigger;
-	    if (trig->CheckTrigger(trig, old_idle)) {
-		AdjustWaitForDelay(wt, 0);
-		break;
-	    }
-	}
-    }
-    else if (pIdleTimeValueGreater)
-    {
-	/*
-	 * There's a threshold in the positive direction.  If we've been
-	 * idle less than it, schedule a wakeup for sometime in the future.
-	 * If we've been idle more than it, and someone wants to know about
-	 * that level-triggered, schedule an immediate wakeup.
-	 */
-	unsigned long timeout = -1;
-
-	if (XSyncValueLessThan (idle, *pIdleTimeValueGreater)) {
-	    XSyncValue value;
-	    Bool overflow;
-
-	    XSyncValueSubtract (&value, *pIdleTimeValueGreater,
-	                        idle, &overflow);
-	    timeout = min(timeout, XSyncValueLow32 (value));
-	} else {
-	    for (list = IdleTimeCounter->pTriglist; list; list = list->next) {
-		trig = list->pTrigger;
-		if (trig->CheckTrigger(trig, old_idle)) {
-		    timeout = min(timeout, 0);
-		    break;
-		}
-	    }
-	}
-
-	AdjustWaitForDelay (wt, timeout);
-    }
-
-    IdleTimeCounter->value = old_idle; /* pop */
-}
-
-static void
-IdleTimeWakeupHandler (pointer env, int rc, pointer LastSelectMask)
-{
-    XSyncValue idle;
-
-    if (!pIdleTimeValueLess && !pIdleTimeValueGreater)
-	return;
-
-    IdleTimeQueryValue (NULL, &idle);
-
-    if ((pIdleTimeValueGreater &&
-         XSyncValueGreaterOrEqual (idle, *pIdleTimeValueGreater)) ||
-        (pIdleTimeValueLess &&
-	 XSyncValueLessOrEqual (idle, *pIdleTimeValueLess)))
-    {
-	SyncChangeCounter (IdleTimeCounter, idle);
-    }
-}
-
-static void
-IdleTimeBracketValues (pointer pCounter, CARD64 *pbracket_less,
-                       CARD64 *pbracket_greater)
-{
-    Bool registered = (pIdleTimeValueLess || pIdleTimeValueGreater);
-
-    if (registered && !pbracket_less && !pbracket_greater)
-    {
-	RemoveBlockAndWakeupHandlers(IdleTimeBlockHandler,
-	                             IdleTimeWakeupHandler,
-	                             NULL);
-    }
-    else if (!registered && (pbracket_less || pbracket_greater))
-    {
-	RegisterBlockAndWakeupHandlers(IdleTimeBlockHandler,
-	                               IdleTimeWakeupHandler,
-	                               NULL);
-    }
-
-    pIdleTimeValueGreater = pbracket_greater;
-    pIdleTimeValueLess    = pbracket_less;
-}
-
-static void
-SyncInitIdleTime (void)
-{
-    CARD64 resolution;
-    XSyncValue idle;
-
-    IdleTimeQueryValue (NULL, &idle);
-    XSyncIntToValue (&resolution, 4);
-
-    IdleTimeCounter = SyncCreateSystemCounter ("IDLETIME", idle, resolution,
-                                               XSyncCounterUnrestricted,
-                                               IdleTimeQueryValue,
-                                               IdleTimeBracketValues);
-
-    pIdleTimeValueLess = pIdleTimeValueGreater = NULL;
-}
+/*

+

+Copyright 1991, 1993, 1998  The Open Group

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation.

+

+The above copyright notice and this permission notice shall be included

+in all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

+IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of The Open Group shall

+not be used in advertising or otherwise to promote the sale, use or

+other dealings in this Software without prior written authorization

+from The Open Group.

+

+

+Copyright 1991, 1993 by Digital Equipment Corporation, Maynard, Massachusetts,

+and Olivetti Research Limited, Cambridge, England.

+

+                        All Rights Reserved

+

+Permission to use, copy, modify, and distribute this software and its

+documentation for any purpose and without fee is hereby granted,

+provided that the above copyright notice appear in all copies and that

+both that copyright notice and this permission notice appear in

+supporting documentation, and that the names of Digital or Olivetti

+not be used in advertising or publicity pertaining to distribution of the

+software without specific, written prior permission.  Digital and Olivetti

+make no representations about the suitability of this software

+for any purpose.  It is provided "as is" without express or implied warranty.

+

+DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS

+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

+FITNESS, IN NO EVENT SHALL THEY BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF

+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR

+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+PERFORMANCE OF THIS SOFTWARE.

+

+*/

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+#include <string.h>

+

+#include <X11/X.h>

+#include <X11/Xproto.h>

+#include <X11/Xmd.h>

+#include "misc.h"

+#include "os.h"

+#include "extnsionst.h"

+#include "dixstruct.h"

+#include "resource.h"

+#include "opaque.h"

+#include <X11/extensions/syncproto.h>

+#include "syncsrv.h"

+

+#include <stdio.h>

+#if !defined(WIN32)

+#include <sys/time.h>

+#endif

+

+#include "modinit.h"

+

+/*

+ * Local Global Variables

+ */

+static int      SyncEventBase;

+static int      SyncErrorBase;

+static RESTYPE  RTCounter = 0;

+static RESTYPE  RTAwait;

+static RESTYPE  RTAlarm;

+static RESTYPE  RTAlarmClient;

+static int SyncNumSystemCounters = 0;

+static SyncCounter **SysCounterList = NULL;

+

+#define IsSystemCounter(pCounter) \

+    (pCounter && (pCounter->client == NULL))

+

+/* these are all the alarm attributes that pertain to the alarm's trigger */

+#define XSyncCAAllTrigger \

+    (XSyncCACounter | XSyncCAValueType | XSyncCAValue | XSyncCATestType)

+

+static void SyncComputeBracketValues(SyncCounter *);

+

+static void SyncInitServerTime(void);

+

+static void SyncInitIdleTime(void);

+

+static DISPATCH_PROC(ProcSyncAwait);

+static DISPATCH_PROC(ProcSyncChangeAlarm);

+static DISPATCH_PROC(ProcSyncChangeCounter);

+static DISPATCH_PROC(ProcSyncCreateAlarm);

+static DISPATCH_PROC(ProcSyncCreateCounter);

+static DISPATCH_PROC(ProcSyncDestroyAlarm);

+static DISPATCH_PROC(ProcSyncDestroyCounter);

+static DISPATCH_PROC(ProcSyncDispatch);

+static DISPATCH_PROC(ProcSyncGetPriority);

+static DISPATCH_PROC(ProcSyncInitialize);

+static DISPATCH_PROC(ProcSyncListSystemCounters);

+static DISPATCH_PROC(ProcSyncQueryAlarm);

+static DISPATCH_PROC(ProcSyncQueryCounter);

+static DISPATCH_PROC(ProcSyncSetCounter);

+static DISPATCH_PROC(ProcSyncSetPriority);

+static DISPATCH_PROC(SProcSyncAwait);

+static DISPATCH_PROC(SProcSyncChangeAlarm);

+static DISPATCH_PROC(SProcSyncChangeCounter);

+static DISPATCH_PROC(SProcSyncCreateAlarm);

+static DISPATCH_PROC(SProcSyncCreateCounter);

+static DISPATCH_PROC(SProcSyncDestroyAlarm);

+static DISPATCH_PROC(SProcSyncDestroyCounter);

+static DISPATCH_PROC(SProcSyncDispatch);

+static DISPATCH_PROC(SProcSyncGetPriority);

+static DISPATCH_PROC(SProcSyncInitialize);

+static DISPATCH_PROC(SProcSyncListSystemCounters);

+static DISPATCH_PROC(SProcSyncQueryAlarm);

+static DISPATCH_PROC(SProcSyncQueryCounter);

+static DISPATCH_PROC(SProcSyncSetCounter);

+static DISPATCH_PROC(SProcSyncSetPriority);

+

+/*  Each counter maintains a simple linked list of triggers that are

+ *  interested in the counter.  The two functions below are used to

+ *  delete and add triggers on this list.

+ */

+static void

+SyncDeleteTriggerFromCounter(SyncTrigger *pTrigger)

+{

+    SyncTriggerList *pCur;

+    SyncTriggerList *pPrev;

+

+    /* pCounter needs to be stored in pTrigger before calling here. */

+

+    if (!pTrigger->pCounter)

+	return;

+

+    pPrev = NULL;

+    pCur = pTrigger->pCounter->pTriglist;

+

+    while (pCur)

+    {

+	if (pCur->pTrigger == pTrigger)

+	{

+	    if (pPrev)

+		pPrev->next = pCur->next;

+	    else

+		pTrigger->pCounter->pTriglist = pCur->next;

+

+	    free(pCur);

+	    break;

+	}

+	

+	pPrev = pCur;

+	pCur = pCur->next;

+    }

+

+    if (IsSystemCounter(pTrigger->pCounter))

+	SyncComputeBracketValues(pTrigger->pCounter);

+}

+

+

+static int

+SyncAddTriggerToCounter(SyncTrigger *pTrigger)

+{

+    SyncTriggerList *pCur;

+

+    if (!pTrigger->pCounter)

+	return Success;

+

+    /* don't do anything if it's already there */

+    for (pCur = pTrigger->pCounter->pTriglist; pCur; pCur = pCur->next)

+    {

+	if (pCur->pTrigger == pTrigger)

+	    return Success;

+    }

+

+    if (!(pCur = malloc(sizeof(SyncTriggerList))))

+	return BadAlloc;

+

+    pCur->pTrigger = pTrigger;

+    pCur->next = pTrigger->pCounter->pTriglist;

+    pTrigger->pCounter->pTriglist = pCur;

+

+    if (IsSystemCounter(pTrigger->pCounter))

+	SyncComputeBracketValues(pTrigger->pCounter);

+

+    return Success;

+}

+

+

+/*  Below are four possible functions that can be plugged into

+ *  pTrigger->CheckTrigger, corresponding to the four possible

+ *  test-types.  These functions are called after the counter's

+ *  value changes but are also passed the old counter value

+ *  so they can inspect both the old and new values.

+ *  (PositiveTransition and NegativeTransition need to see both

+ *  pieces of information.)  These functions return the truth value

+ *  of the trigger.

+ *

+ *  All of them include the condition pTrigger->pCounter == NULL.

+ *  This is because the spec says that a trigger with a counter value

+ *  of None is always TRUE.

+ */

+

+static Bool

+SyncCheckTriggerPositiveComparison(SyncTrigger *pTrigger, CARD64 oldval)

+{

+    return (pTrigger->pCounter == NULL ||

+	    XSyncValueGreaterOrEqual(pTrigger->pCounter->value,

+				     pTrigger->test_value));

+}

+

+static Bool

+SyncCheckTriggerNegativeComparison(SyncTrigger *pTrigger,  CARD64 oldval)

+{

+    return (pTrigger->pCounter == NULL ||

+	    XSyncValueLessOrEqual(pTrigger->pCounter->value,

+				  pTrigger->test_value));

+}

+

+static Bool

+SyncCheckTriggerPositiveTransition(SyncTrigger *pTrigger, CARD64 oldval)

+{

+    return (pTrigger->pCounter == NULL ||

+	    (XSyncValueLessThan(oldval, pTrigger->test_value) &&

+	     XSyncValueGreaterOrEqual(pTrigger->pCounter->value,

+				      pTrigger->test_value)));

+}

+

+static Bool

+SyncCheckTriggerNegativeTransition(SyncTrigger *pTrigger, CARD64 oldval)

+{

+    return (pTrigger->pCounter == NULL ||

+	    (XSyncValueGreaterThan(oldval, pTrigger->test_value) &&

+	     XSyncValueLessOrEqual(pTrigger->pCounter->value,

+				   pTrigger->test_value)));

+}

+

+static int

+SyncInitTrigger(ClientPtr client, SyncTrigger *pTrigger, XSyncCounter counter,

+		Mask changes)

+{

+    SyncCounter *pCounter = pTrigger->pCounter;

+    int		rc;

+    Bool	newcounter = FALSE;

+

+    if (changes & XSyncCACounter)

+    {

+	if (counter == None)

+	    pCounter = NULL;

+	else if (Success != (rc = dixLookupResourceByType ((pointer *)&pCounter,

+				counter, RTCounter, client, DixReadAccess)))

+	{

+	    client->errorValue = counter;

+	    return rc;

+	}

+	if (pCounter != pTrigger->pCounter)

+	{ /* new counter for trigger */

+	    SyncDeleteTriggerFromCounter(pTrigger);

+	    pTrigger->pCounter = pCounter;

+	    newcounter = TRUE;

+	}

+    }

+

+    /* if system counter, ask it what the current value is */

+

+    if (IsSystemCounter(pCounter))

+    {

+	(*pCounter->pSysCounterInfo->QueryValue) ((pointer) pCounter,

+						  &pCounter->value);

+    }

+

+    if (changes & XSyncCAValueType)

+    {

+	if (pTrigger->value_type != XSyncRelative &&

+	    pTrigger->value_type != XSyncAbsolute)

+	{

+	    client->errorValue = pTrigger->value_type;

+	    return BadValue;

+	}

+    }

+

+    if (changes & XSyncCATestType)

+    {

+	if (pTrigger->test_type != XSyncPositiveTransition &&

+	    pTrigger->test_type != XSyncNegativeTransition &&

+	    pTrigger->test_type != XSyncPositiveComparison &&

+	    pTrigger->test_type != XSyncNegativeComparison)

+	{

+	    client->errorValue = pTrigger->test_type;

+	    return BadValue;

+	}

+	/* select appropriate CheckTrigger function */

+

+	switch (pTrigger->test_type)

+	{

+        case XSyncPositiveTransition:

+	    pTrigger->CheckTrigger = SyncCheckTriggerPositiveTransition;

+	    break;

+        case XSyncNegativeTransition:

+	    pTrigger->CheckTrigger = SyncCheckTriggerNegativeTransition;

+	    break;

+        case XSyncPositiveComparison:

+	    pTrigger->CheckTrigger = SyncCheckTriggerPositiveComparison;

+	    break;

+        case XSyncNegativeComparison:

+	    pTrigger->CheckTrigger = SyncCheckTriggerNegativeComparison;

+	    break;

+	}

+    }

+

+    if (changes & (XSyncCAValueType | XSyncCAValue))

+    {

+	if (pTrigger->value_type == XSyncAbsolute)

+	    pTrigger->test_value = pTrigger->wait_value;

+	else /* relative */

+	{

+	    Bool overflow;

+	    if (pCounter == NULL)

+		return BadMatch;

+

+	    XSyncValueAdd(&pTrigger->test_value, pCounter->value,

+			  pTrigger->wait_value, &overflow);

+	    if (overflow)

+	    {

+		client->errorValue = XSyncValueHigh32(pTrigger->wait_value);

+		return BadValue;

+	    }

+	}

+    }

+

+    /*  we wait until we're sure there are no errors before registering

+     *  a new counter on a trigger

+     */

+    if (newcounter)

+    {

+	if ((rc = SyncAddTriggerToCounter(pTrigger)) != Success)

+	    return rc;

+    }

+    else if (IsSystemCounter(pCounter))

+    {

+	SyncComputeBracketValues(pCounter);

+    }

+

+    return Success;

+}

+

+/*  AlarmNotify events happen in response to actions taken on an Alarm or

+ *  the counter used by the alarm.  AlarmNotify may be sent to multiple

+ *  clients.  The alarm maintains a list of clients interested in events.

+ */

+static void

+SyncSendAlarmNotifyEvents(SyncAlarm *pAlarm)

+{

+    SyncAlarmClientList *pcl;

+    xSyncAlarmNotifyEvent ane;

+    SyncTrigger *pTrigger = &pAlarm->trigger;

+

+    UpdateCurrentTime();

+

+    ane.type = SyncEventBase + XSyncAlarmNotify;

+    ane.kind = XSyncAlarmNotify;

+    ane.alarm = pAlarm->alarm_id;

+    if (pTrigger->pCounter)

+    {

+	ane.counter_value_hi = XSyncValueHigh32(pTrigger->pCounter->value);

+	ane.counter_value_lo = XSyncValueLow32(pTrigger->pCounter->value);

+    }

+    else

+    { /* XXX what else can we do if there's no counter? */

+	ane.counter_value_hi = ane.counter_value_lo = 0;

+    }

+

+    ane.alarm_value_hi = XSyncValueHigh32(pTrigger->test_value);

+    ane.alarm_value_lo = XSyncValueLow32(pTrigger->test_value);

+    ane.time = currentTime.milliseconds;

+    ane.state = pAlarm->state;

+

+    /* send to owner */

+    if (pAlarm->events)

+	WriteEventsToClient(pAlarm->client, 1, (xEvent *) &ane);

+

+    /* send to other interested clients */

+    for (pcl = pAlarm->pEventClients; pcl; pcl = pcl->next)

+	WriteEventsToClient(pcl->client, 1, (xEvent *) &ane);

+}

+

+

+/*  CounterNotify events only occur in response to an Await.  The events

+ *  go only to the Awaiting client.

+ */

+static void

+SyncSendCounterNotifyEvents(ClientPtr client, SyncAwait **ppAwait,

+			    int num_events)

+{

+    xSyncCounterNotifyEvent *pEvents, *pev;

+    int i;

+

+    if (client->clientGone)

+	return;

+    pev = pEvents = malloc(num_events * sizeof(xSyncCounterNotifyEvent));

+    if (!pEvents)

+	return;

+    UpdateCurrentTime();

+    for (i = 0; i < num_events; i++, ppAwait++, pev++)

+    {

+	SyncTrigger *pTrigger = &(*ppAwait)->trigger;

+	pev->type = SyncEventBase + XSyncCounterNotify;

+	pev->kind = XSyncCounterNotify;

+	pev->counter = pTrigger->pCounter->id;

+	pev->wait_value_lo = XSyncValueLow32(pTrigger->test_value);

+	pev->wait_value_hi = XSyncValueHigh32(pTrigger->test_value);

+	pev->counter_value_lo = XSyncValueLow32(pTrigger->pCounter->value);

+	pev->counter_value_hi = XSyncValueHigh32(pTrigger->pCounter->value);

+	pev->time = currentTime.milliseconds;

+	pev->count = num_events - i - 1; /* events remaining */

+	pev->destroyed = pTrigger->pCounter->beingDestroyed;

+    }

+    /* swapping will be taken care of by this */

+    WriteEventsToClient(client, num_events, (xEvent *)pEvents);

+    free(pEvents);

+}

+

+

+/* This function is called when an alarm's counter is destroyed.

+ * It is plugged into pTrigger->CounterDestroyed (for alarm triggers).

+ */

+static void

+SyncAlarmCounterDestroyed(SyncTrigger *pTrigger)

+{

+    SyncAlarm *pAlarm = (SyncAlarm *)pTrigger;

+

+    pAlarm->state = XSyncAlarmInactive;

+    SyncSendAlarmNotifyEvents(pAlarm);

+    pTrigger->pCounter = NULL;

+}

+

+

+/*  This function is called when an alarm "goes off."

+ *  It is plugged into pTrigger->TriggerFired (for alarm triggers).

+ */

+static void

+SyncAlarmTriggerFired(SyncTrigger *pTrigger)

+{

+    SyncAlarm *pAlarm = (SyncAlarm *)pTrigger;

+    CARD64 new_test_value;

+

+    /* no need to check alarm unless it's active */

+    if (pAlarm->state != XSyncAlarmActive)

+	return;

+

+    /*  " if the counter value is None, or if the delta is 0 and

+     *    the test-type is PositiveComparison or NegativeComparison,

+     *    no change is made to value (test-value) and the alarm

+     *    state is changed to Inactive before the event is generated."

+     */

+    if (pAlarm->trigger.pCounter == NULL

+	|| (XSyncValueIsZero(pAlarm->delta)

+	    && (pAlarm->trigger.test_type == XSyncPositiveComparison

+		|| pAlarm->trigger.test_type == XSyncNegativeComparison)))

+	pAlarm->state = XSyncAlarmInactive;

+

+    new_test_value = pAlarm->trigger.test_value;

+

+    if (pAlarm->state == XSyncAlarmActive)

+    {

+	Bool overflow;

+	CARD64 oldvalue;

+	SyncTrigger *paTrigger = &pAlarm->trigger;

+

+	/* "The alarm is updated by repeatedly adding delta to the

+	 *  value of the trigger and re-initializing it until it

+	 *  becomes FALSE."

+	 */

+	oldvalue = paTrigger->test_value;

+

+	/* XXX really should do something smarter here */

+

+	do

+	{

+	    XSyncValueAdd(&paTrigger->test_value, paTrigger->test_value,

+			  pAlarm->delta, &overflow);

+	} while (!overflow &&

+	      (*paTrigger->CheckTrigger)(paTrigger,

+					paTrigger->pCounter->value));

+

+	new_test_value = paTrigger->test_value;

+	paTrigger->test_value = oldvalue;

+

+	/* "If this update would cause value to fall outside the range

+	 *  for an INT64...no change is made to value (test-value) and

+	 *  the alarm state is changed to Inactive before the event is

+	 *  generated."

+	 */

+	if (overflow)

+	{

+	    new_test_value = oldvalue;

+	    pAlarm->state = XSyncAlarmInactive;

+	}

+    }

+    /*  The AlarmNotify event has to have the "new state of the alarm"

+     *  which we can't be sure of until this point.  However, it has

+     *  to have the "old" trigger test value.  That's the reason for

+     *  all the newvalue/oldvalue shuffling above.  After we send the

+     *  events, give the trigger its new test value.

+     */

+    SyncSendAlarmNotifyEvents(pAlarm);

+    pTrigger->test_value = new_test_value;

+}

+

+

+/*  This function is called when an Await unblocks, either as a result

+ *  of the trigger firing OR the counter being destroyed.

+ *  It goes into pTrigger->TriggerFired AND pTrigger->CounterDestroyed

+ *  (for Await triggers).

+ */

+static void

+SyncAwaitTriggerFired(SyncTrigger *pTrigger)

+{

+    SyncAwait *pAwait = (SyncAwait *)pTrigger;

+    int numwaits;

+    SyncAwaitUnion *pAwaitUnion;

+    SyncAwait **ppAwait;

+    int num_events = 0;

+

+    pAwaitUnion = (SyncAwaitUnion *)pAwait->pHeader;

+    numwaits = pAwaitUnion->header.num_waitconditions;

+    ppAwait = malloc(numwaits * sizeof(SyncAwait *));

+    if (!ppAwait)

+	goto bail;

+

+    pAwait = &(pAwaitUnion+1)->await;

+

+    /* "When a client is unblocked, all the CounterNotify events for

+     *  the Await request are generated contiguously. If count is 0

+     *  there are no more events to follow for this request. If

+     *  count is n, there are at least n more events to follow."

+     *

+     *  Thus, it is best to find all the counters for which events

+     *  need to be sent first, so that an accurate count field can

+     *  be stored in the events.

+     */

+    for ( ; numwaits; numwaits--, pAwait++)

+    {

+	CARD64 diff;

+	Bool overflow, diffgreater, diffequal;

+

+	/* "A CounterNotify event with the destroyed flag set to TRUE is

+	 *  always generated if the counter for one of the triggers is

+	 *  destroyed."

+	 */

+	if (pAwait->trigger.pCounter->beingDestroyed)

+	{

+	    ppAwait[num_events++] = pAwait;

+	    continue;

+	}

+

+	/* "The difference between the counter and the test value is

+	 *  calculated by subtracting the test value from the value of

+	 *  the counter."

+	 */

+	XSyncValueSubtract(&diff, pAwait->trigger.pCounter->value,

+			   pAwait->trigger.test_value, &overflow);

+

+	/* "If the difference lies outside the range for an INT64, an

+	 *  event is not generated."

+	 */

+	if (overflow)

+	    continue;

+	diffgreater = XSyncValueGreaterThan(diff, pAwait->event_threshold);

+	diffequal   = XSyncValueEqual(diff, pAwait->event_threshold);

+

+	/* "If the test-type is PositiveTransition or

+	 *  PositiveComparison, a CounterNotify event is generated if

+	 *  the difference is at least event-threshold. If the test-type

+	 *  is NegativeTransition or NegativeComparison, a CounterNotify

+	 *  event is generated if the difference is at most

+	 *  event-threshold."

+	 */

+

+	if ( ((pAwait->trigger.test_type == XSyncPositiveComparison ||

+	       pAwait->trigger.test_type == XSyncPositiveTransition)

+	       && (diffgreater || diffequal))

+	     ||

+	     ((pAwait->trigger.test_type == XSyncNegativeComparison ||

+	       pAwait->trigger.test_type == XSyncNegativeTransition)

+	      && (!diffgreater) /* less or equal */

+	      )

+	   )

+	{

+	    ppAwait[num_events++] = pAwait;

+	}

+    }

+    if (num_events)

+	SyncSendCounterNotifyEvents(pAwaitUnion->header.client, ppAwait,

+				    num_events);

+    free(ppAwait);

+

+bail:

+    /* unblock the client */

+    AttendClient(pAwaitUnion->header.client);

+    /* delete the await */

+    FreeResource(pAwaitUnion->header.delete_id, RT_NONE);

+}

+

+

+/*  This function should always be used to change a counter's value so that

+ *  any triggers depending on the counter will be checked.

+ */

+void

+SyncChangeCounter(SyncCounter *pCounter, CARD64 newval)

+{

+    SyncTriggerList       *ptl, *pnext;

+    CARD64 oldval;

+

+    oldval = pCounter->value;

+    pCounter->value = newval;

+

+    /* run through triggers to see if any become true */

+    for (ptl = pCounter->pTriglist; ptl; ptl = pnext)

+    {

+	pnext = ptl->next;

+	if ((*ptl->pTrigger->CheckTrigger)(ptl->pTrigger, oldval))

+	    (*ptl->pTrigger->TriggerFired)(ptl->pTrigger);

+    }

+

+    if (IsSystemCounter(pCounter))

+    {

+	SyncComputeBracketValues(pCounter);

+    }

+}

+

+

+/* loosely based on dix/events.c/EventSelectForWindow */

+static Bool

+SyncEventSelectForAlarm(SyncAlarm *pAlarm, ClientPtr client, Bool wantevents)

+{

+    SyncAlarmClientList *pClients;

+

+    if (client == pAlarm->client) /* alarm owner */

+    {

+	pAlarm->events = wantevents;

+	return Success;

+    }

+

+    /* see if the client is already on the list (has events selected) */

+

+    for (pClients = pAlarm->pEventClients; pClients;

+	 pClients = pClients->next)

+    {

+	if (pClients->client == client)

+	{

+	    /* client's presence on the list indicates desire for

+	     * events.  If the client doesn't want events, remove it

+	     * from the list.  If the client does want events, do

+	     * nothing, since it's already got them.

+	     */

+	    if (!wantevents)

+	    {

+		FreeResource(pClients->delete_id, RT_NONE);

+	    }

+	    return Success;

+	}

+    }

+

+    /*  if we get here, this client does not currently have

+     *  events selected on the alarm

+     */

+

+    if (!wantevents)

+	/* client doesn't want events, and we just discovered that it

+	 * doesn't have them, so there's nothing to do.

+	 */

+	return Success;

+

+    /* add new client to pAlarm->pEventClients */

+

+    pClients = malloc(sizeof(SyncAlarmClientList));

+    if (!pClients)

+	return BadAlloc;

+

+    /*  register it as a resource so it will be cleaned up

+     *  if the client dies

+     */

+

+    pClients->delete_id = FakeClientID(client->index);

+    if (!AddResource(pClients->delete_id, RTAlarmClient, pAlarm))

+    {

+	free(pClients);

+	return BadAlloc;

+    }

+

+    /* link it into list after we know all the allocations succeed */

+

+    pClients->next = pAlarm->pEventClients;

+    pAlarm->pEventClients = pClients;

+    pClients->client = client;

+    return Success;

+}

+

+/*

+ * ** SyncChangeAlarmAttributes ** This is used by CreateAlarm and ChangeAlarm

+ */

+static int

+SyncChangeAlarmAttributes(ClientPtr client, SyncAlarm *pAlarm, Mask mask,

+			  CARD32 *values)

+{

+    int		   status;

+    XSyncCounter   counter;

+    Mask	   origmask = mask;

+

+    counter = pAlarm->trigger.pCounter ? pAlarm->trigger.pCounter->id : None;

+

+    while (mask)

+    {

+	int    index2 = lowbit(mask);

+	mask &= ~index2;

+	switch (index2)

+	{

+	  case XSyncCACounter:

+	    mask &= ~XSyncCACounter;

+	    /* sanity check in SyncInitTrigger */

+	    counter = *values++;

+	    break;

+

+	  case XSyncCAValueType:

+	    mask &= ~XSyncCAValueType;

+	    /* sanity check in SyncInitTrigger */

+	    pAlarm->trigger.value_type = *values++;

+	    break;

+

+	  case XSyncCAValue:

+	    mask &= ~XSyncCAValue;

+	    XSyncIntsToValue(&pAlarm->trigger.wait_value, values[1], values[0]);

+	    values += 2;

+	    break;

+

+	  case XSyncCATestType:

+	    mask &= ~XSyncCATestType;

+	    /* sanity check in SyncInitTrigger */

+	    pAlarm->trigger.test_type = *values++;

+	    break;

+

+	  case XSyncCADelta:

+	    mask &= ~XSyncCADelta;

+	    XSyncIntsToValue(&pAlarm->delta, values[1], values[0]);

+	    values += 2;

+	    break;

+

+	  case XSyncCAEvents:

+	    mask &= ~XSyncCAEvents;

+	    if ((*values != xTrue) && (*values != xFalse))

+	    {

+		client->errorValue = *values;

+		return BadValue;

+	    }

+	    status = SyncEventSelectForAlarm(pAlarm, client,

+					     (Bool)(*values++));

+	    if (status != Success)

+		return status;

+	    break;

+

+	  default:

+	    client->errorValue = mask;

+	    return BadValue;

+	}

+    }

+

+    /* "If the test-type is PositiveComparison or PositiveTransition

+     *  and delta is less than zero, or if the test-type is

+     *  NegativeComparison or NegativeTransition and delta is

+     *  greater than zero, a Match error is generated."

+     */

+    if (origmask & (XSyncCADelta|XSyncCATestType))

+    {

+	CARD64 zero;

+	XSyncIntToValue(&zero, 0);

+	if ((((pAlarm->trigger.test_type == XSyncPositiveComparison) ||

+	      (pAlarm->trigger.test_type == XSyncPositiveTransition))

+	     && XSyncValueLessThan(pAlarm->delta, zero))

+	    ||

+	    (((pAlarm->trigger.test_type == XSyncNegativeComparison) ||

+	      (pAlarm->trigger.test_type == XSyncNegativeTransition))

+	     && XSyncValueGreaterThan(pAlarm->delta, zero))

+	   )

+	{

+	    return BadMatch;

+	}

+    }

+

+    /* postpone this until now, when we're sure nothing else can go wrong */

+    if ((status = SyncInitTrigger(client, &pAlarm->trigger, counter,

+			     origmask & XSyncCAAllTrigger)) != Success)

+	return status;

+

+    /* XXX spec does not really say to do this - needs clarification */

+    pAlarm->state = XSyncAlarmActive;

+    return Success;

+}

+

+

+static SyncCounter *

+SyncCreateCounter(ClientPtr client, XSyncCounter id, CARD64 initialvalue)

+{

+    SyncCounter *pCounter;

+

+    if (!(pCounter = malloc(sizeof(SyncCounter))))

+	return NULL;

+

+    if (!AddResource(id, RTCounter, (pointer) pCounter))

+    {

+	free(pCounter);

+	return NULL;

+    }

+

+    pCounter->client = client;

+    pCounter->id = id;

+    pCounter->value = initialvalue;

+    pCounter->pTriglist = NULL;

+    pCounter->beingDestroyed = FALSE;

+    pCounter->pSysCounterInfo = NULL;

+    return pCounter;

+}

+

+static int FreeCounter(void *, XID);

+

+/*

+ * ***** System Counter utilities

+ */

+

+pointer

+SyncCreateSystemCounter(

+	char *name,

+	CARD64 initial,

+	CARD64 resolution,

+	SyncCounterType counterType,

+	void (*QueryValue)(pointer /* pCounter */,

+	      	           CARD64 * /* pValue_return */),

+	void (*BracketValues)(pointer /* pCounter */,

+	       	              CARD64 * /* pbracket_less */,

+	                      CARD64 * /* pbracket_greater */)

+	)

+{

+    SyncCounter    *pCounter;

+

+    SysCounterList = realloc(SysCounterList,

+			    (SyncNumSystemCounters+1)*sizeof(SyncCounter *));

+    if (!SysCounterList)

+	return NULL;

+

+    /* this function may be called before SYNC has been initialized, so we

+     * have to make sure RTCounter is created.

+     */

+    if (RTCounter == 0)

+    {

+	RTCounter = CreateNewResourceType(FreeCounter, "SyncCounter");

+	if (RTCounter == 0)

+	{

+	    return NULL;

+	}

+    }

+

+    pCounter = SyncCreateCounter(NULL, FakeClientID(0), initial);

+

+    if (pCounter)

+    {

+	SysCounterInfo *psci;

+

+	psci = malloc(sizeof(SysCounterInfo));

+	if (!psci)

+	{

+	    FreeResource(pCounter->id, RT_NONE);

+	    return pCounter;

+	}

+	pCounter->pSysCounterInfo = psci;

+	psci->name = name;

+	psci->resolution = resolution;

+	psci->counterType = counterType;

+	psci->QueryValue = QueryValue;

+	psci->BracketValues = BracketValues;

+	XSyncMaxValue(&psci->bracket_greater);

+	XSyncMinValue(&psci->bracket_less);

+	SysCounterList[SyncNumSystemCounters++] = pCounter;

+    }

+    return pCounter;

+}

+

+void

+SyncDestroySystemCounter(pointer pSysCounter)

+{

+    SyncCounter *pCounter = (SyncCounter *)pSysCounter;

+    FreeResource(pCounter->id, RT_NONE);

+}

+

+static void

+SyncComputeBracketValues(SyncCounter *pCounter)

+{

+    SyncTriggerList *pCur;

+    SyncTrigger *pTrigger;

+    SysCounterInfo *psci;

+    CARD64 *pnewgtval = NULL;

+    CARD64 *pnewltval = NULL;

+    SyncCounterType ct;

+

+    if (!pCounter)

+	return;

+

+    psci = pCounter->pSysCounterInfo;

+    ct = pCounter->pSysCounterInfo->counterType;

+    if (ct == XSyncCounterNeverChanges)

+	return;

+

+    XSyncMaxValue(&psci->bracket_greater);

+    XSyncMinValue(&psci->bracket_less);

+

+    for (pCur = pCounter->pTriglist; pCur; pCur = pCur->next)

+    {

+	pTrigger = pCur->pTrigger;

+	

+        if (pTrigger->test_type == XSyncPositiveComparison &&

+	    ct != XSyncCounterNeverIncreases)

+	{

+	    if (XSyncValueLessThan(pCounter->value, pTrigger->test_value) &&

+		XSyncValueLessThan(pTrigger->test_value,

+				   psci->bracket_greater))

+	    {

+		psci->bracket_greater = pTrigger->test_value;

+		pnewgtval = &psci->bracket_greater;

+	    }

+	}

+	else if (pTrigger->test_type == XSyncNegativeComparison &&

+		 ct != XSyncCounterNeverDecreases)

+	{

+	    if (XSyncValueGreaterThan(pCounter->value, pTrigger->test_value) &&

+		XSyncValueGreaterThan(pTrigger->test_value,

+				      psci->bracket_less))

+	    {

+		psci->bracket_less = pTrigger->test_value;

+		pnewltval = &psci->bracket_less;

+	    }

+	}

+	else if (pTrigger->test_type == XSyncNegativeTransition &&

+		   ct != XSyncCounterNeverIncreases)

+	{

+	    if (XSyncValueGreaterThan(pCounter->value, pTrigger->test_value) &&

+		XSyncValueGreaterThan(pTrigger->test_value, psci->bracket_less))

+	    {

+		psci->bracket_less = pTrigger->test_value;

+		pnewltval = &psci->bracket_less;

+	    }

+	}

+        else if (pTrigger->test_type == XSyncPositiveTransition &&

+		  ct != XSyncCounterNeverDecreases)

+	{

+	    if (XSyncValueLessThan(pCounter->value, pTrigger->test_value) &&

+		XSyncValueLessThan(pTrigger->test_value, psci->bracket_greater))

+	    {

+		psci->bracket_greater = pTrigger->test_value;

+		pnewgtval = &psci->bracket_greater;

+	    }

+	}

+    } /* end for each trigger */

+

+    if (pnewgtval || pnewltval)

+    {

+	(*psci->BracketValues)((pointer)pCounter, pnewltval, pnewgtval);

+    }

+}

+

+/*

+ * *****  Resource delete functions

+ */

+

+/* ARGSUSED */

+static int

+FreeAlarm(void *addr, XID id)

+{

+    SyncAlarm      *pAlarm = (SyncAlarm *) addr;

+

+    pAlarm->state = XSyncAlarmDestroyed;

+

+    SyncSendAlarmNotifyEvents(pAlarm);

+

+    /* delete event selections */

+

+    while (pAlarm->pEventClients)

+	FreeResource(pAlarm->pEventClients->delete_id, RT_NONE);

+

+    SyncDeleteTriggerFromCounter(&pAlarm->trigger);

+

+    free(pAlarm);

+    return Success;

+}

+

+

+/*

+ * ** Cleanup after the destruction of a Counter

+ */

+/* ARGSUSED */

+static int

+FreeCounter(void *env, XID id)

+{

+    SyncCounter     *pCounter = (SyncCounter *) env;

+    SyncTriggerList *ptl, *pnext;

+

+    pCounter->beingDestroyed = TRUE;

+    /* tell all the counter's triggers that the counter has been destroyed */

+    for (ptl = pCounter->pTriglist; ptl; ptl = pnext)

+    {

+	(*ptl->pTrigger->CounterDestroyed)(ptl->pTrigger);

+	pnext = ptl->next;

+	free(ptl); /* destroy the trigger list as we go */

+    }

+    if (IsSystemCounter(pCounter))

+    {

+	int i, found = 0;

+

+	free(pCounter->pSysCounterInfo);

+

+	/* find the counter in the list of system counters and remove it */

+

+	if (SysCounterList)

+	{

+	    for (i = 0; i < SyncNumSystemCounters; i++)

+	    {

+		if (SysCounterList[i] == pCounter)

+		{

+		    found = i;

+		    break;

+		}

+	    }

+	    if (found < (SyncNumSystemCounters-1))

+	    {

+		for (i = found; i < SyncNumSystemCounters-1; i++)

+		{

+		    SysCounterList[i] = SysCounterList[i+1];

+		}

+	    }

+	}

+	SyncNumSystemCounters--;

+    }

+    free(pCounter);

+    return Success;

+}

+

+/*

+ * ** Cleanup after Await

+ */

+/* ARGSUSED */

+static int

+FreeAwait(void *addr, XID id)

+{

+    SyncAwaitUnion *pAwaitUnion = (SyncAwaitUnion *) addr;

+    SyncAwait *pAwait;

+    int numwaits;

+

+    pAwait = &(pAwaitUnion+1)->await; /* first await on list */

+

+    /* remove triggers from counters */

+

+    for (numwaits = pAwaitUnion->header.num_waitconditions; numwaits;

+	 numwaits--, pAwait++)

+    {

+	/* If the counter is being destroyed, FreeCounter will delete

+	 * the trigger list itself, so don't do it here.

+	 */

+	SyncCounter *pCounter = pAwait->trigger.pCounter;

+	if (pCounter && !pCounter->beingDestroyed)

+	    SyncDeleteTriggerFromCounter(&pAwait->trigger);

+    }

+    free(pAwaitUnion);

+    return Success;

+}

+

+/* loosely based on dix/events.c/OtherClientGone */

+static int

+FreeAlarmClient(void *value, XID id)

+{

+    SyncAlarm *pAlarm = (SyncAlarm *)value;

+    SyncAlarmClientList *pCur, *pPrev;

+

+    for (pPrev = NULL, pCur = pAlarm->pEventClients;

+	 pCur;

+	 pPrev = pCur, pCur = pCur->next)

+    {

+	if (pCur->delete_id == id)

+	{

+	    if (pPrev)

+		pPrev->next = pCur->next;

+	    else

+		pAlarm->pEventClients = pCur->next;

+	    free(pCur);

+	    return Success;

+	}

+    }

+    FatalError("alarm client not on event list");

+    /*NOTREACHED*/

+}

+

+

+/*

+ * *****  Proc functions

+ */

+

+

+/*

+ * ** Initialize the extension

+ */

+static int

+ProcSyncInitialize(ClientPtr client)

+{

+    xSyncInitializeReply  rep;

+    int   n;

+

+    REQUEST_SIZE_MATCH(xSyncInitializeReq);

+

+    memset(&rep, 0, sizeof(xSyncInitializeReply));

+    rep.type = X_Reply;

+    rep.sequenceNumber = client->sequence;

+    rep.majorVersion = SYNC_MAJOR_VERSION;

+    rep.minorVersion = SYNC_MINOR_VERSION;

+    rep.length = 0;

+

+    if (client->swapped)

+    {

+	swaps(&rep.sequenceNumber, n);

+    }

+    WriteToClient(client, sizeof(rep), (char *) &rep);

+    return Success;

+}

+

+/*

+ * ** Get list of system counters available through the extension

+ */

+static int

+ProcSyncListSystemCounters(ClientPtr client)

+{

+    xSyncListSystemCountersReply  rep;

+    int i, len;

+    xSyncSystemCounter *list = NULL, *walklist = NULL;

+

+    REQUEST_SIZE_MATCH(xSyncListSystemCountersReq);

+

+    rep.type = X_Reply;

+    rep.sequenceNumber = client->sequence;

+    rep.nCounters = SyncNumSystemCounters;

+

+    for (i = len = 0; i < SyncNumSystemCounters; i++)

+    {

+	char *name = SysCounterList[i]->pSysCounterInfo->name;

+	/* pad to 4 byte boundary */

+	len += pad_to_int32(sz_xSyncSystemCounter + strlen(name));

+    }

+

+    if (len)

+    {

+	walklist = list = malloc(len);

+	if (!list)

+	    return BadAlloc;

+    }

+

+    rep.length = bytes_to_int32(len);

+

+    if (client->swapped)

+    {

+	char n;

+	swaps(&rep.sequenceNumber, n);

+	swapl(&rep.length, n);

+	swapl(&rep.nCounters, n);

+    }

+

+    for (i = 0; i < SyncNumSystemCounters; i++)

+    {

+	int namelen;

+	char *pname_in_reply;

+	SysCounterInfo *psci = SysCounterList[i]->pSysCounterInfo;

+

+	walklist->counter = SysCounterList[i]->id;

+	walklist->resolution_hi = XSyncValueHigh32(psci->resolution);

+	walklist->resolution_lo = XSyncValueLow32(psci->resolution);

+	namelen = strlen(psci->name);

+	walklist->name_length = namelen;

+

+	if (client->swapped)

+	{

+	    char n;

+	    swapl(&walklist->counter, n);

+	    swapl(&walklist->resolution_hi, n);

+	    swapl(&walklist->resolution_lo, n);

+	    swaps(&walklist->name_length, n);

+	}

+

+	pname_in_reply = ((char *)walklist) + sz_xSyncSystemCounter;

+	strncpy(pname_in_reply, psci->name, namelen);

+	walklist = (xSyncSystemCounter *) (((char *)walklist) +

+				pad_to_int32(sz_xSyncSystemCounter + namelen));

+    }

+

+    WriteToClient(client, sizeof(rep), (char *) &rep);

+    if (len)

+    {

+	WriteToClient(client, len, (char *) list);

+	free(list);

+    }

+

+    return Success;

+}

+

+/*

+ * ** Set client Priority

+ */

+static int

+ProcSyncSetPriority(ClientPtr client)

+{

+    REQUEST(xSyncSetPriorityReq);

+    ClientPtr priorityclient;

+    int rc;

+

+    REQUEST_SIZE_MATCH(xSyncSetPriorityReq);

+

+    if (stuff->id == None)

+	priorityclient = client;

+    else {

+	rc = dixLookupClient(&priorityclient, stuff->id, client,

+			     DixSetAttrAccess);

+	if (rc != Success)

+	    return rc;

+    }

+

+    if (priorityclient->priority != stuff->priority)

+    {

+	priorityclient->priority = stuff->priority;

+

+	/*  The following will force the server back into WaitForSomething

+	 *  so that the change in this client's priority is immediately

+	 *  reflected.

+	 */

+	isItTimeToYield = TRUE;

+	dispatchException |= DE_PRIORITYCHANGE;

+    }

+    return Success;

+}

+

+/*

+ * ** Get client Priority

+ */

+static int

+ProcSyncGetPriority(ClientPtr client)

+{

+    REQUEST(xSyncGetPriorityReq);

+    xSyncGetPriorityReply rep;

+    ClientPtr priorityclient;

+    int rc;

+

+    REQUEST_SIZE_MATCH(xSyncGetPriorityReq);

+

+    if (stuff->id == None)

+	priorityclient = client;

+    else {

+	rc = dixLookupClient(&priorityclient, stuff->id, client,

+			     DixGetAttrAccess);

+	if (rc != Success)

+	    return rc;

+    }

+

+    rep.type = X_Reply;

+    rep.length = 0;

+    rep.sequenceNumber = client->sequence;

+    rep.priority = priorityclient->priority;

+

+    if (client->swapped)

+    {

+	char n;

+	swaps(&rep.sequenceNumber, n);

+	swapl(&rep.priority, n);

+    }

+

+    WriteToClient(client, sizeof(xSyncGetPriorityReply), (char *) &rep);

+

+    return Success;

+}

+

+/*

+ * ** Create a new counter

+ */

+static int

+ProcSyncCreateCounter(ClientPtr client)

+{

+    REQUEST(xSyncCreateCounterReq);

+    CARD64          initial;

+

+    REQUEST_SIZE_MATCH(xSyncCreateCounterReq);

+

+    LEGAL_NEW_RESOURCE(stuff->cid, client);

+

+    XSyncIntsToValue(&initial, stuff->initial_value_lo, stuff->initial_value_hi);

+    if (!SyncCreateCounter(client, stuff->cid, initial))

+	return BadAlloc;

+

+    return Success;

+}

+

+/*

+ * ** Set Counter value

+ */

+static int

+ProcSyncSetCounter(ClientPtr client)

+{

+    REQUEST(xSyncSetCounterReq);

+    SyncCounter    *pCounter;

+    CARD64	   newvalue;

+    int	rc;

+

+    REQUEST_SIZE_MATCH(xSyncSetCounterReq);

+

+    rc = dixLookupResourceByType((pointer *)&pCounter, stuff->cid, RTCounter,

+				 client, DixWriteAccess);

+    if (rc != Success)

+	return rc;

+

+    if (IsSystemCounter(pCounter))

+    {

+	client->errorValue = stuff->cid;

+	return BadAccess;

+    }

+

+    XSyncIntsToValue(&newvalue, stuff->value_lo, stuff->value_hi);

+    SyncChangeCounter(pCounter, newvalue);

+    return Success;

+}

+

+/*

+ * ** Change Counter value

+ */

+static int

+ProcSyncChangeCounter(ClientPtr client)

+{

+    REQUEST(xSyncChangeCounterReq);

+    SyncCounter    *pCounter;

+    CARD64          newvalue;

+    Bool	    overflow;

+    int	rc;

+

+    REQUEST_SIZE_MATCH(xSyncChangeCounterReq);

+

+    rc = dixLookupResourceByType((pointer *)&pCounter, stuff->cid, RTCounter,

+				 client, DixWriteAccess);

+    if (rc != Success)

+	return rc;

+

+    if (IsSystemCounter(pCounter))

+    {

+	client->errorValue = stuff->cid;

+	return BadAccess;

+    }

+

+    XSyncIntsToValue(&newvalue, stuff->value_lo, stuff->value_hi);

+    XSyncValueAdd(&newvalue, pCounter->value, newvalue, &overflow);

+    if (overflow)

+    {

+	/* XXX 64 bit value can't fit in 32 bits; do the best we can */

+	client->errorValue = stuff->value_hi;

+	return BadValue;

+    }

+    SyncChangeCounter(pCounter, newvalue);

+    return Success;

+}

+

+/*

+ * ** Destroy a counter

+ */

+static int

+ProcSyncDestroyCounter(ClientPtr client)

+{

+    REQUEST(xSyncDestroyCounterReq);

+    SyncCounter    *pCounter;

+    int rc;

+

+    REQUEST_SIZE_MATCH(xSyncDestroyCounterReq);

+

+    rc = dixLookupResourceByType((pointer *)&pCounter, stuff->counter, RTCounter,

+				 client, DixDestroyAccess);

+    if (rc != Success)

+	return rc;

+

+    if (IsSystemCounter(pCounter))

+    {

+	client->errorValue = stuff->counter;

+	return BadAccess;

+    }

+    FreeResource(pCounter->id, RT_NONE);

+    return Success;

+}

+

+

+/*

+ * ** Await

+ */

+static int

+ProcSyncAwait(ClientPtr client)

+{

+    REQUEST(xSyncAwaitReq);

+    int             len, items;

+    int             i;

+    xSyncWaitCondition *pProtocolWaitConds;

+    SyncAwaitUnion *pAwaitUnion;

+    SyncAwait	   *pAwait;

+    int		   status;

+

+    REQUEST_AT_LEAST_SIZE(xSyncAwaitReq);

+

+    len = client->req_len << 2;

+    len -= sz_xSyncAwaitReq;

+    items = len / sz_xSyncWaitCondition;

+

+    if (items * sz_xSyncWaitCondition != len)

+    {

+	return BadLength;

+    }

+    if (items == 0)

+    {

+	client->errorValue = items; /* XXX protocol change */

+	return BadValue;

+    }

+

+    pProtocolWaitConds = (xSyncWaitCondition *) & stuff[1];

+

+    /*  all the memory for the entire await list is allocated

+     *  here in one chunk

+     */

+    pAwaitUnion = malloc((items+1) * sizeof(SyncAwaitUnion));

+    if (!pAwaitUnion)

+	return BadAlloc;

+

+    /* first item is the header, remainder are real wait conditions */

+

+    pAwaitUnion->header.delete_id = FakeClientID(client->index);

+    if (!AddResource(pAwaitUnion->header.delete_id, RTAwait, pAwaitUnion))

+    {

+	free(pAwaitUnion);

+	return BadAlloc;

+    }

+

+    /* don't need to do any more memory allocation for this request! */

+

+    pAwaitUnion->header.client = client;

+    pAwaitUnion->header.num_waitconditions = 0;

+

+    pAwait = &(pAwaitUnion+1)->await; /* skip over header */

+    for (i = 0; i < items; i++, pProtocolWaitConds++, pAwait++)

+    {

+	if (pProtocolWaitConds->counter == None) /* XXX protocol change */

+	{

+	    /*  this should take care of removing any triggers created by

+	     *  this request that have already been registered on counters

+	     */

+	    FreeResource(pAwaitUnion->header.delete_id, RT_NONE);

+	    client->errorValue = pProtocolWaitConds->counter;

+	    return SyncErrorBase + XSyncBadCounter;

+	}

+

+	/* sanity checks are in SyncInitTrigger */

+	pAwait->trigger.pCounter = NULL;

+	pAwait->trigger.value_type = pProtocolWaitConds->value_type;

+	XSyncIntsToValue(&pAwait->trigger.wait_value,

+			 pProtocolWaitConds->wait_value_lo,

+			 pProtocolWaitConds->wait_value_hi);

+	pAwait->trigger.test_type = pProtocolWaitConds->test_type;

+

+	status = SyncInitTrigger(client, &pAwait->trigger,

+			 pProtocolWaitConds->counter, XSyncCAAllTrigger);

+	if (status != Success)

+	{

+	    /*  this should take care of removing any triggers created by

+	     *  this request that have already been registered on counters

+	     */

+	    FreeResource(pAwaitUnion->header.delete_id, RT_NONE);

+	    return status;

+	}

+	/* this is not a mistake -- same function works for both cases */

+	pAwait->trigger.TriggerFired = SyncAwaitTriggerFired;

+	pAwait->trigger.CounterDestroyed = SyncAwaitTriggerFired;

+	XSyncIntsToValue(&pAwait->event_threshold,

+			 pProtocolWaitConds->event_threshold_lo,

+			 pProtocolWaitConds->event_threshold_hi);

+	pAwait->pHeader = &pAwaitUnion->header;

+	pAwaitUnion->header.num_waitconditions++;

+    }

+

+    IgnoreClient(client);

+

+    /* see if any of the triggers are already true */

+

+    pAwait = &(pAwaitUnion+1)->await; /* skip over header */

+    for (i = 0; i < items; i++, pAwait++)

+    {

+	/*  don't have to worry about NULL counters because the request

+	 *  errors before we get here out if they occur

+	 */

+	if ((*pAwait->trigger.CheckTrigger)(&pAwait->trigger,

+					    pAwait->trigger.pCounter->value))

+	{

+	    (*pAwait->trigger.TriggerFired)(&pAwait->trigger);

+	    break; /* once is enough */

+	}

+    }

+    return Success;

+}

+

+

+/*

+ * ** Query a counter

+ */

+static int

+ProcSyncQueryCounter(ClientPtr client)

+{

+    REQUEST(xSyncQueryCounterReq);

+    xSyncQueryCounterReply rep;

+    SyncCounter    *pCounter;

+    int rc;

+

+    REQUEST_SIZE_MATCH(xSyncQueryCounterReq);

+

+    rc = dixLookupResourceByType((pointer *)&pCounter, stuff->counter,

+				 RTCounter, client, DixReadAccess);

+    if (rc != Success)

+	return rc;

+

+    rep.type = X_Reply;

+    rep.length = 0;

+    rep.sequenceNumber = client->sequence;

+

+    /* if system counter, ask it what the current value is */

+

+    if (IsSystemCounter(pCounter))

+    {

+	(*pCounter->pSysCounterInfo->QueryValue) ((pointer) pCounter,

+						  &pCounter->value);

+    }

+

+    rep.value_hi = XSyncValueHigh32(pCounter->value);

+    rep.value_lo = XSyncValueLow32(pCounter->value);

+    if (client->swapped)

+    {

+	char n;

+	swaps(&rep.sequenceNumber, n);

+	swapl(&rep.length, n);

+	swapl(&rep.value_hi, n);

+	swapl(&rep.value_lo, n);

+    }

+    WriteToClient(client, sizeof(xSyncQueryCounterReply), (char *) &rep);

+    return Success;

+}

+

+

+/*

+ * ** Create Alarm

+ */

+static int

+ProcSyncCreateAlarm(ClientPtr client)

+{

+    REQUEST(xSyncCreateAlarmReq);

+    SyncAlarm      *pAlarm;

+    int             status;

+    unsigned long   len, vmask;

+    SyncTrigger	    *pTrigger;

+

+    REQUEST_AT_LEAST_SIZE(xSyncCreateAlarmReq);

+

+    LEGAL_NEW_RESOURCE(stuff->id, client);

+

+    vmask = stuff->valueMask;

+    len = client->req_len - bytes_to_int32(sizeof(xSyncCreateAlarmReq));

+    /* the "extra" call to Ones accounts for the presence of 64 bit values */

+    if (len != (Ones(vmask) + Ones(vmask & (XSyncCAValue|XSyncCADelta))))

+	return BadLength;

+

+    if (!(pAlarm = malloc(sizeof(SyncAlarm))))

+    {

+	return BadAlloc;

+    }

+

+    /* set up defaults */

+

+    pTrigger = &pAlarm->trigger;

+    pTrigger->pCounter = NULL;

+    pTrigger->value_type = XSyncAbsolute;

+    XSyncIntToValue(&pTrigger->wait_value, 0L);

+    pTrigger->test_type = XSyncPositiveComparison;

+    pTrigger->TriggerFired = SyncAlarmTriggerFired;

+    pTrigger->CounterDestroyed = SyncAlarmCounterDestroyed;

+    status = SyncInitTrigger(client, pTrigger, None, XSyncCAAllTrigger);

+    if (status != Success)

+    {

+	free(pAlarm);

+	return status;

+    }

+

+    pAlarm->client = client;

+    pAlarm->alarm_id = stuff->id;

+    XSyncIntToValue(&pAlarm->delta, 1L);

+    pAlarm->events = TRUE;

+    pAlarm->state = XSyncAlarmInactive;

+    pAlarm->pEventClients = NULL;

+    status = SyncChangeAlarmAttributes(client, pAlarm, vmask,

+				       (CARD32 *)&stuff[1]);

+    if (status != Success)

+    {

+	free(pAlarm);

+	return status;

+    }

+

+    if (!AddResource(stuff->id, RTAlarm, pAlarm))

+    {

+	free(pAlarm);

+	return BadAlloc;

+    }

+

+    /*  see if alarm already triggered.  NULL counter will not trigger

+     *  in CreateAlarm and sets alarm state to Inactive.

+     */

+

+    if (!pTrigger->pCounter)

+    {

+	pAlarm->state = XSyncAlarmInactive; /* XXX protocol change */

+    }

+    else if ((*pTrigger->CheckTrigger)(pTrigger, pTrigger->pCounter->value))

+    {

+	(*pTrigger->TriggerFired)(pTrigger);

+    }

+

+    return Success;

+}

+

+/*

+ * ** Change Alarm

+ */

+static int

+ProcSyncChangeAlarm(ClientPtr client)

+{

+    REQUEST(xSyncChangeAlarmReq);

+    SyncAlarm   *pAlarm;

+    long        vmask;

+    int         len, status;

+

+    REQUEST_AT_LEAST_SIZE(xSyncChangeAlarmReq);

+

+    status = dixLookupResourceByType((pointer *)&pAlarm, stuff->alarm, RTAlarm,

+				     client, DixWriteAccess);

+    if (status != Success)

+	return status;

+

+    vmask = stuff->valueMask;

+    len = client->req_len - bytes_to_int32(sizeof(xSyncChangeAlarmReq));

+    /* the "extra" call to Ones accounts for the presence of 64 bit values */

+    if (len != (Ones(vmask) + Ones(vmask & (XSyncCAValue|XSyncCADelta))))

+	return BadLength;

+

+    if ((status = SyncChangeAlarmAttributes(client, pAlarm, vmask,

+					    (CARD32 *)&stuff[1])) != Success)

+	return status;

+

+    /*  see if alarm already triggered.  NULL counter WILL trigger

+     *  in ChangeAlarm.

+     */

+

+    if (!pAlarm->trigger.pCounter ||

+	(*pAlarm->trigger.CheckTrigger)(&pAlarm->trigger,

+					pAlarm->trigger.pCounter->value))

+    {

+	(*pAlarm->trigger.TriggerFired)(&pAlarm->trigger);

+    }

+    return Success;

+}

+

+static int

+ProcSyncQueryAlarm(ClientPtr client)

+{

+    REQUEST(xSyncQueryAlarmReq);

+    SyncAlarm      *pAlarm;

+    xSyncQueryAlarmReply rep;

+    SyncTrigger    *pTrigger;

+    int rc;

+

+    REQUEST_SIZE_MATCH(xSyncQueryAlarmReq);

+

+    rc = dixLookupResourceByType((pointer *)&pAlarm, stuff->alarm, RTAlarm,

+				 client, DixReadAccess);

+    if (rc != Success)

+	return rc;

+

+    rep.type = X_Reply;

+    rep.length = bytes_to_int32(sizeof(xSyncQueryAlarmReply) - sizeof(xGenericReply));

+    rep.sequenceNumber = client->sequence;

+

+    pTrigger = &pAlarm->trigger;

+    rep.counter = (pTrigger->pCounter) ? pTrigger->pCounter->id : None;

+

+#if 0 /* XXX unclear what to do, depends on whether relative value-types

+       * are "consumed" immediately and are considered absolute from then

+       * on.

+       */

+    rep.value_type = pTrigger->value_type;

+    rep.wait_value_hi = XSyncValueHigh32(pTrigger->wait_value);

+    rep.wait_value_lo = XSyncValueLow32(pTrigger->wait_value);

+#else

+    rep.value_type = XSyncAbsolute;

+    rep.wait_value_hi = XSyncValueHigh32(pTrigger->test_value);

+    rep.wait_value_lo = XSyncValueLow32(pTrigger->test_value);

+#endif

+

+    rep.test_type = pTrigger->test_type;

+    rep.delta_hi = XSyncValueHigh32(pAlarm->delta);

+    rep.delta_lo = XSyncValueLow32(pAlarm->delta);

+    rep.events = pAlarm->events;

+    rep.state = pAlarm->state;

+

+    if (client->swapped)

+    {

+	char n;

+	swaps(&rep.sequenceNumber, n);

+	swapl(&rep.length, n);

+	swapl(&rep.counter, n);

+	swapl(&rep.wait_value_hi, n);

+	swapl(&rep.wait_value_lo, n);

+	swapl(&rep.test_type, n);

+	swapl(&rep.delta_hi, n);

+	swapl(&rep.delta_lo, n);

+    }

+

+    WriteToClient(client, sizeof(xSyncQueryAlarmReply), (char *) &rep);

+    return Success;

+}

+

+static int

+ProcSyncDestroyAlarm(ClientPtr client)

+{

+    SyncAlarm *pAlarm;

+    int rc;

+    REQUEST(xSyncDestroyAlarmReq);

+

+    REQUEST_SIZE_MATCH(xSyncDestroyAlarmReq);

+

+    rc = dixLookupResourceByType((pointer *)&pAlarm, stuff->alarm, RTAlarm,

+				 client, DixDestroyAccess);

+    if (rc != Success)

+	return rc;

+

+    FreeResource(stuff->alarm, RT_NONE);

+    return Success;

+}

+

+/*

+ * ** Given an extension request, call the appropriate request procedure

+ */

+static int

+ProcSyncDispatch(ClientPtr client)

+{

+    REQUEST(xReq);

+

+    switch (stuff->data)

+    {

+      case X_SyncInitialize:

+	return ProcSyncInitialize(client);

+      case X_SyncListSystemCounters:

+	return ProcSyncListSystemCounters(client);

+      case X_SyncCreateCounter:

+	return ProcSyncCreateCounter(client);

+      case X_SyncSetCounter:

+	return ProcSyncSetCounter(client);

+      case X_SyncChangeCounter:

+	return ProcSyncChangeCounter(client);

+      case X_SyncQueryCounter:

+	return ProcSyncQueryCounter(client);

+      case X_SyncDestroyCounter:

+	return ProcSyncDestroyCounter(client);

+      case X_SyncAwait:

+	return ProcSyncAwait(client);

+      case X_SyncCreateAlarm:

+	return ProcSyncCreateAlarm(client);

+      case X_SyncChangeAlarm:

+	return ProcSyncChangeAlarm(client);

+      case X_SyncQueryAlarm:

+	return ProcSyncQueryAlarm(client);

+      case X_SyncDestroyAlarm:

+	return ProcSyncDestroyAlarm(client);

+      case X_SyncSetPriority:

+	return ProcSyncSetPriority(client);

+      case X_SyncGetPriority:

+	return ProcSyncGetPriority(client);

+      default:

+	return BadRequest;

+    }

+}

+

+/*

+ * Boring Swapping stuff ...

+ */

+

+static int

+SProcSyncInitialize(ClientPtr client)

+{

+    REQUEST(xSyncInitializeReq);

+    char   n;

+

+    swaps(&stuff->length, n);

+    REQUEST_SIZE_MATCH (xSyncInitializeReq);

+

+    return ProcSyncInitialize(client);

+}

+

+static int

+SProcSyncListSystemCounters(ClientPtr client)

+{

+    REQUEST(xSyncListSystemCountersReq);

+    char   n;

+

+    swaps(&stuff->length, n);

+    REQUEST_SIZE_MATCH (xSyncListSystemCountersReq);

+

+    return ProcSyncListSystemCounters(client);

+}

+

+static int

+SProcSyncCreateCounter(ClientPtr client)

+{

+    REQUEST(xSyncCreateCounterReq);

+    char   n;

+

+    swaps(&stuff->length, n);

+    REQUEST_SIZE_MATCH (xSyncCreateCounterReq);

+    swapl(&stuff->cid, n);

+    swapl(&stuff->initial_value_lo, n);

+    swapl(&stuff->initial_value_hi, n);

+

+    return ProcSyncCreateCounter(client);

+}

+

+static int

+SProcSyncSetCounter(ClientPtr client)

+{

+    REQUEST(xSyncSetCounterReq);

+    char   n;

+

+    swaps(&stuff->length, n);

+    REQUEST_SIZE_MATCH (xSyncSetCounterReq);

+    swapl(&stuff->cid, n);

+    swapl(&stuff->value_lo, n);

+    swapl(&stuff->value_hi, n);

+

+    return ProcSyncSetCounter(client);

+}

+

+static int

+SProcSyncChangeCounter(ClientPtr client)

+{

+    REQUEST(xSyncChangeCounterReq);

+    char   n;

+

+    swaps(&stuff->length, n);

+    REQUEST_SIZE_MATCH (xSyncChangeCounterReq);

+    swapl(&stuff->cid, n);

+    swapl(&stuff->value_lo, n);

+    swapl(&stuff->value_hi, n);

+

+    return ProcSyncChangeCounter(client);

+}

+

+static int

+SProcSyncQueryCounter(ClientPtr client)

+{

+    REQUEST(xSyncQueryCounterReq);

+    char   n;

+

+    swaps(&stuff->length, n);

+    REQUEST_SIZE_MATCH (xSyncQueryCounterReq);

+    swapl(&stuff->counter, n);

+

+    return ProcSyncQueryCounter(client);

+}

+

+static int

+SProcSyncDestroyCounter(ClientPtr client)

+{

+    REQUEST(xSyncDestroyCounterReq);

+    char   n;

+

+    swaps(&stuff->length, n);

+    REQUEST_SIZE_MATCH (xSyncDestroyCounterReq);

+    swapl(&stuff->counter, n);

+

+    return ProcSyncDestroyCounter(client);

+}

+

+static int

+SProcSyncAwait(ClientPtr client)

+{

+    REQUEST(xSyncAwaitReq);

+    char   n;

+

+    swaps(&stuff->length, n);

+    REQUEST_AT_LEAST_SIZE(xSyncAwaitReq);

+    SwapRestL(stuff);

+

+    return ProcSyncAwait(client);

+}

+

+static int

+SProcSyncCreateAlarm(ClientPtr client)

+{

+    REQUEST(xSyncCreateAlarmReq);

+    char   n;

+

+    swaps(&stuff->length, n);

+    REQUEST_AT_LEAST_SIZE(xSyncCreateAlarmReq);

+    swapl(&stuff->id, n);

+    swapl(&stuff->valueMask, n);

+    SwapRestL(stuff);

+

+    return ProcSyncCreateAlarm(client);

+}

+

+static int

+SProcSyncChangeAlarm(ClientPtr client)

+{

+    REQUEST(xSyncChangeAlarmReq);

+    char   n;

+

+    swaps(&stuff->length, n);

+    REQUEST_AT_LEAST_SIZE(xSyncChangeAlarmReq);

+    swapl(&stuff->alarm, n);

+    swapl(&stuff->valueMask, n);

+    SwapRestL(stuff);

+    return ProcSyncChangeAlarm(client);

+}

+

+static int

+SProcSyncQueryAlarm(ClientPtr client)

+{

+    REQUEST(xSyncQueryAlarmReq);

+    char   n;

+

+    swaps(&stuff->length, n);

+    REQUEST_SIZE_MATCH (xSyncQueryAlarmReq);

+    swapl(&stuff->alarm, n);

+

+    return ProcSyncQueryAlarm(client);

+}

+

+static int

+SProcSyncDestroyAlarm(ClientPtr client)

+{

+    REQUEST(xSyncDestroyAlarmReq);

+    char   n;

+

+    swaps(&stuff->length, n);

+    REQUEST_SIZE_MATCH (xSyncDestroyAlarmReq);

+    swapl(&stuff->alarm, n);

+

+    return ProcSyncDestroyAlarm(client);

+}

+

+static int

+SProcSyncSetPriority(ClientPtr client)

+{

+    REQUEST(xSyncSetPriorityReq);

+    char   n;

+

+    swaps(&stuff->length, n);

+    REQUEST_SIZE_MATCH (xSyncSetPriorityReq);

+    swapl(&stuff->id, n);

+    swapl(&stuff->priority, n);

+

+    return ProcSyncSetPriority(client);

+}

+

+static int

+SProcSyncGetPriority(ClientPtr client)

+{

+    REQUEST(xSyncGetPriorityReq);

+    char   n;

+

+    swaps(&stuff->length, n);

+    REQUEST_SIZE_MATCH (xSyncGetPriorityReq);

+    swapl(&stuff->id, n);

+

+    return ProcSyncGetPriority(client);

+}

+

+

+static int

+SProcSyncDispatch(ClientPtr client)

+{

+    REQUEST(xReq);

+

+    switch (stuff->data)

+    {

+      case X_SyncInitialize:

+	return SProcSyncInitialize(client);

+      case X_SyncListSystemCounters:

+	return SProcSyncListSystemCounters(client);

+      case X_SyncCreateCounter:

+	return SProcSyncCreateCounter(client);

+      case X_SyncSetCounter:

+	return SProcSyncSetCounter(client);

+      case X_SyncChangeCounter:

+	return SProcSyncChangeCounter(client);

+      case X_SyncQueryCounter:

+	return SProcSyncQueryCounter(client);

+      case X_SyncDestroyCounter:

+	return SProcSyncDestroyCounter(client);

+      case X_SyncAwait:

+	return SProcSyncAwait(client);

+      case X_SyncCreateAlarm:

+	return SProcSyncCreateAlarm(client);

+      case X_SyncChangeAlarm:

+	return SProcSyncChangeAlarm(client);

+      case X_SyncQueryAlarm:

+	return SProcSyncQueryAlarm(client);

+      case X_SyncDestroyAlarm:

+	return SProcSyncDestroyAlarm(client);

+      case X_SyncSetPriority:

+	return SProcSyncSetPriority(client);

+      case X_SyncGetPriority:

+	return SProcSyncGetPriority(client);

+      default:

+	return BadRequest;

+    }

+}

+

+/*

+ * Event Swapping

+ */

+

+static void

+SCounterNotifyEvent(xSyncCounterNotifyEvent *from, xSyncCounterNotifyEvent *to)

+{

+    to->type = from->type;

+    to->kind = from->kind;

+    cpswaps(from->sequenceNumber, to->sequenceNumber);

+    cpswapl(from->counter, to->counter);

+    cpswapl(from->wait_value_lo, to->wait_value_lo);

+    cpswapl(from->wait_value_hi, to->wait_value_hi);

+    cpswapl(from->counter_value_lo, to->counter_value_lo);

+    cpswapl(from->counter_value_hi, to->counter_value_hi);

+    cpswapl(from->time, to->time);

+    cpswaps(from->count, to->count);

+    to->destroyed = from->destroyed;

+}

+

+

+static void

+SAlarmNotifyEvent(xSyncAlarmNotifyEvent *from, xSyncAlarmNotifyEvent *to)

+{

+    to->type = from->type;

+    to->kind = from->kind;

+    cpswaps(from->sequenceNumber, to->sequenceNumber);

+    cpswapl(from->alarm, to->alarm);

+    cpswapl(from->counter_value_lo, to->counter_value_lo);

+    cpswapl(from->counter_value_hi, to->counter_value_hi);

+    cpswapl(from->alarm_value_lo, to->alarm_value_lo);

+    cpswapl(from->alarm_value_hi, to->alarm_value_hi);

+    cpswapl(from->time, to->time);

+    to->state = from->state;

+}

+

+/*

+ * ** Close everything down. ** This is fairly simple for now.

+ */

+/* ARGSUSED */

+static void

+SyncResetProc(ExtensionEntry *extEntry)

+{

+    free(SysCounterList);

+    SysCounterList = NULL;

+    RTCounter = 0;

+}

+

+

+/*

+ * ** Initialise the extension.

+ */

+void

+SyncExtensionInit(void)

+{

+    ExtensionEntry *extEntry;

+

+    if (RTCounter == 0)

+    {

+	RTCounter = CreateNewResourceType(FreeCounter, "SyncCounter");

+    }

+    RTAlarm = CreateNewResourceType(FreeAlarm, "SyncAlarm");

+    RTAwait = CreateNewResourceType(FreeAwait, "SyncAwait");

+    if (RTAwait)

+	RTAwait |= RC_NEVERRETAIN;

+    RTAlarmClient = CreateNewResourceType(FreeAlarmClient, "SyncAlarmClient");

+    if (RTAlarmClient)

+	RTAlarmClient |= RC_NEVERRETAIN;

+

+    if (RTCounter == 0 || RTAwait == 0 || RTAlarm == 0 ||

+	RTAlarmClient == 0 ||

+	(extEntry = AddExtension(SYNC_NAME,

+				 XSyncNumberEvents, XSyncNumberErrors,

+				 ProcSyncDispatch, SProcSyncDispatch,

+				 SyncResetProc,

+				 StandardMinorOpcode)) == NULL)

+    {

+	ErrorF("Sync Extension %d.%d failed to Initialise\n",

+		SYNC_MAJOR_VERSION, SYNC_MINOR_VERSION);

+	return;

+    }

+

+    SyncEventBase = extEntry->eventBase;

+    SyncErrorBase = extEntry->errorBase;

+    EventSwapVector[SyncEventBase + XSyncCounterNotify] = (EventSwapPtr) SCounterNotifyEvent;

+    EventSwapVector[SyncEventBase + XSyncAlarmNotify] = (EventSwapPtr) SAlarmNotifyEvent;

+

+    SetResourceTypeErrorValue(RTCounter, SyncErrorBase + XSyncBadCounter);

+    SetResourceTypeErrorValue(RTAlarm, SyncErrorBase + XSyncBadAlarm);

+

+    /*

+     * Although SERVERTIME is implemented by the OS layer, we initialise it

+     * here because doing it in OsInit() is too early. The resource database

+     * is not initialised when OsInit() is called. This is just about OK

+     * because there is always a servertime counter.

+     */

+    SyncInitServerTime();

+    SyncInitIdleTime();

+

+#ifdef DEBUG

+    fprintf(stderr, "Sync Extension %d.%d\n",

+	    SYNC_MAJOR_VERSION, SYNC_MINOR_VERSION);

+#endif

+}

+

+

+/*

+ * ***** SERVERTIME implementation - should go in its own file in OS directory?

+ */

+

+

+

+static pointer ServertimeCounter;

+static XSyncValue Now;

+static XSyncValue *pnext_time;

+

+#define GetTime()\

+{\

+    unsigned long millis = GetTimeInMillis();\

+    unsigned long maxis = XSyncValueHigh32(Now);\

+    if (millis < XSyncValueLow32(Now)) maxis++;\

+    XSyncIntsToValue(&Now, millis, maxis);\

+}

+

+/*

+*** Server Block Handler

+*** code inspired by multibuffer extension (now deprecated)

+ */

+/*ARGSUSED*/

+static void

+ServertimeBlockHandler(void *env, struct timeval **wt, void *LastSelectMask)

+{

+    XSyncValue delay;

+    unsigned long timeout;

+

+    if (pnext_time)

+    {

+        GetTime();

+

+        if (XSyncValueGreaterOrEqual(Now, *pnext_time))

+	{

+            timeout = 0;

+        }

+	else

+	{

+	    Bool overflow;

+            XSyncValueSubtract(&delay, *pnext_time, Now, &overflow);

+	    (void)overflow;

+            timeout = XSyncValueLow32(delay);

+        }

+        AdjustWaitForDelay(wt, timeout); /* os/utils.c */

+    }

+}

+

+/*

+*** Wakeup Handler

+ */

+/*ARGSUSED*/

+static void

+ServertimeWakeupHandler(void *env, int rc, void *LastSelectMask)

+{

+    if (pnext_time)

+    {

+        GetTime();

+

+        if (XSyncValueGreaterOrEqual(Now, *pnext_time))

+	{

+            SyncChangeCounter(ServertimeCounter, Now);

+        }

+    }

+}

+

+static void

+ServertimeQueryValue(void *pCounter, CARD64 *pValue_return)

+{

+    GetTime();

+    *pValue_return = Now;

+}

+

+static void

+ServertimeBracketValues(void *pCounter, CARD64 *pbracket_less,

+			CARD64 *pbracket_greater)

+{

+    if (!pnext_time && pbracket_greater)

+    {

+	RegisterBlockAndWakeupHandlers(ServertimeBlockHandler,

+				       ServertimeWakeupHandler,

+				       NULL);

+    }

+    else if (pnext_time && !pbracket_greater)

+    {

+	RemoveBlockAndWakeupHandlers(ServertimeBlockHandler,

+				     ServertimeWakeupHandler,

+				     NULL);

+    }

+    pnext_time = pbracket_greater;

+}

+

+static void

+SyncInitServerTime(void)

+{

+    CARD64 resolution;

+

+    XSyncIntsToValue(&Now, GetTimeInMillis(), 0);

+    XSyncIntToValue(&resolution, 4);

+    ServertimeCounter = SyncCreateSystemCounter("SERVERTIME", Now, resolution,

+			    XSyncCounterNeverDecreases,

+			    ServertimeQueryValue, ServertimeBracketValues);

+    pnext_time = NULL;

+}

+

+

+

+/*

+ * IDLETIME implementation

+ */

+

+static SyncCounter *IdleTimeCounter;

+static XSyncValue *pIdleTimeValueLess;

+static XSyncValue *pIdleTimeValueGreater;

+

+static void

+IdleTimeQueryValue (pointer pCounter, CARD64 *pValue_return)

+{

+    CARD32 idle = GetTimeInMillis() - lastDeviceEventTime.milliseconds;

+    XSyncIntsToValue (pValue_return, idle, 0);

+}

+

+static void

+IdleTimeBlockHandler(pointer env, struct timeval **wt, pointer LastSelectMask)

+{

+    XSyncValue idle, old_idle;

+    SyncTriggerList *list = IdleTimeCounter->pTriglist;

+    SyncTrigger *trig;

+

+    if (!pIdleTimeValueLess && !pIdleTimeValueGreater)

+	return;

+

+    old_idle = IdleTimeCounter->value;

+    IdleTimeQueryValue (NULL, &idle);

+    IdleTimeCounter->value = idle; /* push, so CheckTrigger works */

+

+    if (pIdleTimeValueLess &&

+        XSyncValueLessOrEqual (idle, *pIdleTimeValueLess))

+    {

+	/*

+	 * We've been idle for less than the threshold value, and someone

+	 * wants to know about that, but now we need to know whether they

+	 * want level or edge trigger.  Check the trigger list against the

+	 * current idle time, and if any succeed, bomb out of select()

+	 * immediately so we can reschedule.

+	 */

+

+	for (list = IdleTimeCounter->pTriglist; list; list = list->next) {

+	    trig = list->pTrigger;

+	    if (trig->CheckTrigger(trig, old_idle)) {

+		AdjustWaitForDelay(wt, 0);

+		break;

+	    }

+	}

+    }

+    else if (pIdleTimeValueGreater)

+    {

+	/*

+	 * There's a threshold in the positive direction.  If we've been

+	 * idle less than it, schedule a wakeup for sometime in the future.

+	 * If we've been idle more than it, and someone wants to know about

+	 * that level-triggered, schedule an immediate wakeup.

+	 */

+	unsigned long timeout = -1;

+

+	if (XSyncValueLessThan (idle, *pIdleTimeValueGreater)) {

+	    XSyncValue value;

+	    Bool overflow;

+

+	    XSyncValueSubtract (&value, *pIdleTimeValueGreater,

+	                        idle, &overflow);

+	    timeout = min(timeout, XSyncValueLow32 (value));

+	} else {

+	    for (list = IdleTimeCounter->pTriglist; list; list = list->next) {

+		trig = list->pTrigger;

+		if (trig->CheckTrigger(trig, old_idle)) {

+		    timeout = min(timeout, 0);

+		    break;

+		}

+	    }

+	}

+

+	AdjustWaitForDelay (wt, timeout);

+    }

+

+    IdleTimeCounter->value = old_idle; /* pop */

+}

+

+static void

+IdleTimeWakeupHandler (pointer env, int rc, pointer LastSelectMask)

+{

+    XSyncValue idle;

+

+    if (!pIdleTimeValueLess && !pIdleTimeValueGreater)

+	return;

+

+    IdleTimeQueryValue (NULL, &idle);

+

+    if ((pIdleTimeValueGreater &&

+         XSyncValueGreaterOrEqual (idle, *pIdleTimeValueGreater)) ||

+        (pIdleTimeValueLess &&

+	 XSyncValueLessOrEqual (idle, *pIdleTimeValueLess)))

+    {

+	SyncChangeCounter (IdleTimeCounter, idle);

+    }

+}

+

+static void

+IdleTimeBracketValues (pointer pCounter, CARD64 *pbracket_less,

+                       CARD64 *pbracket_greater)

+{

+    Bool registered = (pIdleTimeValueLess || pIdleTimeValueGreater);

+

+    if (registered && !pbracket_less && !pbracket_greater)

+    {

+	RemoveBlockAndWakeupHandlers(IdleTimeBlockHandler,

+	                             IdleTimeWakeupHandler,

+	                             NULL);

+    }

+    else if (!registered && (pbracket_less || pbracket_greater))

+    {

+	RegisterBlockAndWakeupHandlers(IdleTimeBlockHandler,

+	                               IdleTimeWakeupHandler,

+	                               NULL);

+    }

+

+    pIdleTimeValueGreater = pbracket_greater;

+    pIdleTimeValueLess    = pbracket_less;

+}

+

+static void

+SyncInitIdleTime (void)

+{

+    CARD64 resolution;

+    XSyncValue idle;

+

+    IdleTimeQueryValue (NULL, &idle);

+    XSyncIntToValue (&resolution, 4);

+

+    IdleTimeCounter = SyncCreateSystemCounter ("IDLETIME", idle, resolution,

+                                               XSyncCounterUnrestricted,

+                                               IdleTimeQueryValue,

+                                               IdleTimeBracketValues);

+

+    pIdleTimeValueLess = pIdleTimeValueGreater = NULL;

+}

diff --git a/xorg-server/Xext/xcalibrate.c b/xorg-server/Xext/xcalibrate.c
index 029154fa0..a16c11bab 100644
--- a/xorg-server/Xext/xcalibrate.c
+++ b/xorg-server/Xext/xcalibrate.c
@@ -54,13 +54,11 @@ xcalibrate_event_hook (int x, int y, int pressure, void *closure)
   xXCalibrateRawTouchscreenEvent	ev;

 

   ev.type = XCalibrateEventBase + X_XCalibrateRawTouchscreen;

-  ev.sequenceNumber = pClient->sequence;

   ev.x = x;

   ev.y = y;

   ev.pressure = pressure;

 

-  if (!pClient->clientGone)

-    WriteEventsToClient (pClient, 1, (xEvent *) &ev);

+  WriteEventsToClient (pClient, 1, (xEvent *) &ev);

 }

 

 static int

diff --git a/xorg-server/Xext/xtest.c b/xorg-server/Xext/xtest.c
index 05395a7c1..b8f5e86d8 100644
--- a/xorg-server/Xext/xtest.c
+++ b/xorg-server/Xext/xtest.c
@@ -153,7 +153,7 @@ ProcXTestCompareCursor(ClientPtr client)
         if (rc != Success)

         {

             client->errorValue = stuff->cursor;

-            return (rc == BadValue) ? BadCursor : rc;

+            return rc;

         }

     }

     rep.type = X_Reply;

diff --git a/xorg-server/Xext/xvdisp.c b/xorg-server/Xext/xvdisp.c
index 34ea61ad3..f346b6cea 100644
--- a/xorg-server/Xext/xvdisp.c
+++ b/xorg-server/Xext/xvdisp.c
@@ -1025,7 +1025,6 @@ typedef struct _ShmDesc {
 } ShmDescRec, *ShmDescPtr;

 

 extern RESTYPE ShmSegType;

-extern int BadShmSegCode;

 extern int ShmCompletionCode;

 

 static int 

@@ -1077,7 +1076,7 @@ ProcXvShmPutImage(ClientPtr client)
   status = dixLookupResourceByType((pointer *)&shmdesc, stuff->shmseg,

 				   ShmSegType, serverClient, DixReadAccess);

   if (status != Success)

-      return (status == BadValue) ? BadShmSegCode : status;

+      return status;

  

   width = stuff->width;

   height = stuff->height;

@@ -1100,7 +1099,6 @@ ProcXvShmPutImage(ClientPtr client)
 

         ev.type = ShmCompletionCode;

         ev.drawable = stuff->drawable;

-        ev.sequenceNumber = client->sequence;

         ev.minorEvent = xv_ShmPutImage;

         ev.majorEvent = XvReqCode;

         ev.shmseg = stuff->shmseg;

@@ -1616,7 +1614,7 @@ XineramaXvStopVideo(ClientPtr client)
    result = dixLookupResourceByType((pointer *)&port, stuff->port,

 				    XvXRTPort, client, DixReadAccess);

    if (result != Success)

-       return (result == BadValue) ? _XvBadPort : result;

+       return result;

 

    FOR_NSCREENS_BACKWARD(i) {

 	if(port->info[i].id) {

@@ -1641,7 +1639,7 @@ XineramaXvSetPortAttribute(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&port, stuff->port,

 				     XvXRTPort, client, DixReadAccess);

     if (result != Success)

-	return (result == BadValue) ? _XvBadPort : result;

+	return result;

 

     FOR_NSCREENS_BACKWARD(i) {

 	if(port->info[i].id) {

@@ -1672,12 +1670,12 @@ XineramaXvShmPutImage(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&gc, stuff->gc,

 				     XRT_GC, client, DixReadAccess);

     if (result != Success)

-        return (result == BadValue) ? BadGC : result;

+        return result;

 

     result = dixLookupResourceByType((pointer *)&port, stuff->port,

 				     XvXRTPort, client, DixReadAccess);

     if (result != Success)

-	return (result == BadValue) ? _XvBadPort : result;

+	return result;

  

     isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;

 

@@ -1724,12 +1722,12 @@ XineramaXvPutImage(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&gc, stuff->gc,

 				     XRT_GC, client, DixReadAccess);

     if (result != Success)

-        return (result == BadValue) ? BadGC : result;

+        return result;

 

     result = dixLookupResourceByType((pointer *)&port, stuff->port,

 				     XvXRTPort, client, DixReadAccess);

     if (result != Success)

-	return (result == BadValue) ? _XvBadPort : result;

+	return result;

  

     isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;

 

@@ -1772,12 +1770,12 @@ XineramaXvPutVideo(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&gc, stuff->gc,

 				     XRT_GC, client, DixReadAccess);

     if (result != Success)

-        return (result == BadValue) ? BadGC : result;

+        return result;

 

     result = dixLookupResourceByType((pointer *)&port, stuff->port,

 				     XvXRTPort, client, DixReadAccess);

     if (result != Success)

-	return (result == BadValue) ? _XvBadPort : result;

+	return result;

 

     isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;

 

@@ -1820,12 +1818,12 @@ XineramaXvPutStill(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&gc, stuff->gc,

 				     XRT_GC, client, DixReadAccess);

     if (result != Success)

-        return (result == BadValue) ? BadGC : result;

+        return result;

 

     result = dixLookupResourceByType((pointer *)&port, stuff->port,

 				     XvXRTPort, client, DixReadAccess);

     if (result != Success)

-	return (result == BadValue) ? _XvBadPort : result;

+	return result;

 

     isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;

 

@@ -1911,6 +1909,7 @@ void XineramifyXv(void)
    XvXRTPort = CreateNewResourceType(XineramaDeleteResource, "XvXRTPort");

 

    if (!xvsp0 || !XvXRTPort) return;

+   SetResourceTypeErrorValue(XvXRTPort, _XvBadPort);

 

    for(i = 0; i < xvsp0->nAdaptors; i++) {

       Bool isOverlay;

diff --git a/xorg-server/Xext/xvdix.h b/xorg-server/Xext/xvdix.h
index 44f8f6b18..5104a4def 100644
--- a/xorg-server/Xext/xvdix.h
+++ b/xorg-server/Xext/xvdix.h
@@ -1,275 +1,275 @@
-/***********************************************************
-Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts,
-and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the names of Digital or MIT not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#ifndef XVDIX_H
-#define XVDIX_H
-/*
-** File: 
-**
-**   xvdix.h --- Xv device independent header file
-**
-** Author: 
-**
-**   David Carver (Digital Workstation Engineering/Project Athena)
-**
-** Revisions:
-**
-**   29.08.91 Carver
-**     - removed UnrealizeWindow wrapper unrealizing windows no longer 
-**       preempts video
-**
-**   11.06.91 Carver
-**     - changed SetPortControl to SetPortAttribute
-**     - changed GetPortControl to GetPortAttribute
-**     - changed QueryBestSize
-**
-**   15.05.91 Carver
-**     - version 2.0 upgrade
-**
-**   24.01.91 Carver
-**     - version 1.4 upgrade
-**
-*/
-
-#include "scrnintstr.h"
-#include <X11/extensions/Xvproto.h>
-
-#ifndef XorgLoader
-extern _X_EXPORT unsigned long XvExtensionGeneration;
-extern _X_EXPORT unsigned long XvScreenGeneration;
-extern _X_EXPORT unsigned long XvResourceGeneration;
-
-extern _X_EXPORT int XvReqCode;
-extern _X_EXPORT int XvEventBase;
-extern _X_EXPORT int XvErrorBase;
-
-extern _X_EXPORT unsigned long XvRTPort;
-extern _X_EXPORT unsigned long XvRTEncoding;
-extern _X_EXPORT unsigned long XvRTGrab;
-extern _X_EXPORT unsigned long XvRTVideoNotify;
-extern _X_EXPORT unsigned long XvRTVideoNotifyList;
-extern _X_EXPORT unsigned long XvRTPortNotify;
-#endif
-
-typedef struct {
-  int numerator;
-  int denominator;
-} XvRationalRec, *XvRationalPtr;
-
-typedef struct {
-  char depth;
-  unsigned long visual;
-} XvFormatRec, *XvFormatPtr;
-
-typedef struct {
-  unsigned long id;
-  ClientPtr client;
-} XvGrabRec, *XvGrabPtr;
-
-typedef struct _XvVideoNotifyRec {
-  struct _XvVideoNotifyRec *next;
-  ClientPtr client;
-  unsigned long id;
-  unsigned long mask;
-} XvVideoNotifyRec, *XvVideoNotifyPtr;
-
-typedef struct _XvPortNotifyRec {
-  struct _XvPortNotifyRec *next;
-  ClientPtr client;
-  unsigned long id;
-} XvPortNotifyRec, *XvPortNotifyPtr;
-
-typedef struct {
-  int id;
-  ScreenPtr pScreen;
-  char *name;
-  unsigned short width, height;
-  XvRationalRec rate;
-} XvEncodingRec, *XvEncodingPtr;
-
-typedef struct _XvAttributeRec {
-  int flags;
-  int min_value;
-  int max_value;
-  char *name;
-} XvAttributeRec, *XvAttributePtr;
-
-typedef struct {
-  int id;
-  int type;
-  int byte_order;
-  char guid[16];
-  int bits_per_pixel;
-  int format;
-  int num_planes;
-
-  /* for RGB formats only */
-  int depth;
-  unsigned int red_mask;       
-  unsigned int green_mask;   
-  unsigned int blue_mask;   
-
-  /* for YUV formats only */
-  unsigned int y_sample_bits;
-  unsigned int u_sample_bits;
-  unsigned int v_sample_bits;   
-  unsigned int horz_y_period;
-  unsigned int horz_u_period;
-  unsigned int horz_v_period;
-  unsigned int vert_y_period;
-  unsigned int vert_u_period;
-  unsigned int vert_v_period;
-  char component_order[32];
-  int scanline_order;
-} XvImageRec, *XvImagePtr; 
-
-typedef struct {
-  unsigned long base_id;
-  unsigned char type; 
-  char *name;
-  int nEncodings;
-  XvEncodingPtr pEncodings;  
-  int nFormats;
-  XvFormatPtr pFormats; 
-  int nAttributes;
-  XvAttributePtr pAttributes;
-  int nImages;
-  XvImagePtr pImages;
-  int nPorts;
-  struct _XvPortRec *pPorts;
-  ScreenPtr pScreen; 
-  int (* ddAllocatePort)(unsigned long, struct _XvPortRec*, 
-				struct _XvPortRec**);
-  int (* ddFreePort)(struct _XvPortRec*);
-  int (* ddPutVideo)(ClientPtr, DrawablePtr,struct _XvPortRec*, GCPtr,
-   				INT16, INT16, CARD16, CARD16, 
-				INT16, INT16, CARD16, CARD16); 
-  int (* ddPutStill)(ClientPtr, DrawablePtr,struct _XvPortRec*, GCPtr,
-   				INT16, INT16, CARD16, CARD16, 
-				INT16, INT16, CARD16, CARD16);
-  int (* ddGetVideo)(ClientPtr, DrawablePtr,struct _XvPortRec*, GCPtr,
-   				INT16, INT16, CARD16, CARD16, 
-				INT16, INT16, CARD16, CARD16);
-  int (* ddGetStill)(ClientPtr, DrawablePtr,struct _XvPortRec*, GCPtr,
-   				INT16, INT16, CARD16, CARD16, 
-				INT16, INT16, CARD16, CARD16);
-  int (* ddStopVideo)(ClientPtr, struct _XvPortRec*, DrawablePtr);
-  int (* ddSetPortAttribute)(ClientPtr, struct _XvPortRec*, Atom, INT32);
-  int (* ddGetPortAttribute)(ClientPtr, struct _XvPortRec*, Atom, INT32*);
-  int (* ddQueryBestSize)(ClientPtr, struct _XvPortRec*, CARD8,
-   				CARD16, CARD16,CARD16, CARD16, 
-				unsigned int*, unsigned int*);
-  int (* ddPutImage)(ClientPtr, DrawablePtr, struct _XvPortRec*, GCPtr,
-   				INT16, INT16, CARD16, CARD16, 
-				INT16, INT16, CARD16, CARD16,
-				XvImagePtr, unsigned char*, Bool,
-				CARD16, CARD16);
-  int (* ddQueryImageAttributes)(ClientPtr, struct _XvPortRec*, XvImagePtr, 
-				CARD16*, CARD16*, int*, int*);
-  DevUnion devPriv;
-} XvAdaptorRec, *XvAdaptorPtr;
-
-typedef struct _XvPortRec {
-  unsigned long id;
-  XvAdaptorPtr pAdaptor;
-  XvPortNotifyPtr pNotify;
-  DrawablePtr pDraw;
-  ClientPtr client;
-  XvGrabRec grab;
-  TimeStamp time;
-  DevUnion devPriv;
-} XvPortRec, *XvPortPtr;
-
-#define VALIDATE_XV_PORT(portID, pPort, mode)\
-    {\
-	int rc = dixLookupResourceByType((pointer *)&(pPort), portID,\
-	                                 XvRTPort, client, mode);\
-	if (rc != Success)\
-	    return (rc == BadValue) ? _XvBadPort : rc;\
-    }
-
-typedef struct {
-  int version, revision;
-  int nAdaptors;
-  XvAdaptorPtr pAdaptors;
-  DestroyWindowProcPtr DestroyWindow;
-  DestroyPixmapProcPtr DestroyPixmap;
-  CloseScreenProcPtr CloseScreen;
-  Bool (* ddCloseScreen)(int, ScreenPtr);
-  int (* ddQueryAdaptors)(ScreenPtr, XvAdaptorPtr*, int*);
-  DevUnion devPriv;
-} XvScreenRec, *XvScreenPtr;
-
-#define SCREEN_PROLOGUE(pScreen, field) ((pScreen)->field = ((XvScreenPtr) \
-    dixLookupPrivate(&(pScreen)->devPrivates, XvScreenKey))->field)
-
-#define SCREEN_EPILOGUE(pScreen, field, wrapper)\
-    ((pScreen)->field = wrapper)
-
-/* Errors */
-
-#define _XvBadPort (XvBadPort+XvErrorBase)
-#define _XvBadEncoding (XvBadEncoding+XvErrorBase)
-
-#ifndef XorgLoader
-extern _X_EXPORT int ProcXvDispatch(ClientPtr);
-extern _X_EXPORT int SProcXvDispatch(ClientPtr);
-
-extern _X_EXPORT void XvExtensionInit(void);
-extern _X_EXPORT int XvScreenInit(ScreenPtr);
-extern _X_EXPORT DevPrivateKey XvGetScreenKey(void);
-extern _X_EXPORT unsigned long XvGetRTPort(void);
-extern _X_EXPORT int XvdiSendPortNotify(XvPortPtr, Atom, INT32);
-extern _X_EXPORT int XvdiVideoStopped(XvPortPtr, int);
-
-extern _X_EXPORT int XvdiPutVideo(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
-   				INT16, INT16, CARD16, CARD16, 
-				INT16, INT16, CARD16, CARD16);
-extern _X_EXPORT int XvdiPutStill(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
-   				INT16, INT16, CARD16, CARD16, 
-				INT16, INT16, CARD16, CARD16);
-extern _X_EXPORT int XvdiGetVideo(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
-   				INT16, INT16, CARD16, CARD16, 
-				INT16, INT16, CARD16, CARD16);
-extern _X_EXPORT int XvdiGetStill(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
-   				INT16, INT16, CARD16, CARD16, 
-				INT16, INT16, CARD16, CARD16);
-extern _X_EXPORT int XvdiPutImage(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
-   				INT16, INT16, CARD16, CARD16, 
-				INT16, INT16, CARD16, CARD16,
-				XvImagePtr, unsigned char*, Bool,
-				CARD16, CARD16);
-extern _X_EXPORT int XvdiSelectVideoNotify(ClientPtr, DrawablePtr, BOOL);
-extern _X_EXPORT int XvdiSelectPortNotify(ClientPtr, XvPortPtr, BOOL);
-extern _X_EXPORT int XvdiSetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32);
-extern _X_EXPORT int XvdiGetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32*);
-extern _X_EXPORT int XvdiStopVideo(ClientPtr, XvPortPtr, DrawablePtr);
-extern _X_EXPORT int XvdiPreemptVideo(ClientPtr, XvPortPtr, DrawablePtr);
-extern _X_EXPORT int XvdiMatchPort(XvPortPtr, DrawablePtr);
-extern _X_EXPORT int XvdiGrabPort(ClientPtr, XvPortPtr, Time, int *);
-extern _X_EXPORT int XvdiUngrabPort( ClientPtr, XvPortPtr, Time);
-#endif /* XorgLoader */
-
-#endif /* XVDIX_H */
-
+/***********************************************************

+Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts,

+and the Massachusetts Institute of Technology, Cambridge, Massachusetts.

+

+                        All Rights Reserved

+

+Permission to use, copy, modify, and distribute this software and its 

+documentation for any purpose and without fee is hereby granted, 

+provided that the above copyright notice appear in all copies and that

+both that copyright notice and this permission notice appear in 

+supporting documentation, and that the names of Digital or MIT not be

+used in advertising or publicity pertaining to distribution of the

+software without specific, written prior permission.  

+

+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR

+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,

+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,

+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

+SOFTWARE.

+

+******************************************************************/

+

+#ifndef XVDIX_H

+#define XVDIX_H

+/*

+** File: 

+**

+**   xvdix.h --- Xv device independent header file

+**

+** Author: 

+**

+**   David Carver (Digital Workstation Engineering/Project Athena)

+**

+** Revisions:

+**

+**   29.08.91 Carver

+**     - removed UnrealizeWindow wrapper unrealizing windows no longer 

+**       preempts video

+**

+**   11.06.91 Carver

+**     - changed SetPortControl to SetPortAttribute

+**     - changed GetPortControl to GetPortAttribute

+**     - changed QueryBestSize

+**

+**   15.05.91 Carver

+**     - version 2.0 upgrade

+**

+**   24.01.91 Carver

+**     - version 1.4 upgrade

+**

+*/

+

+#include "scrnintstr.h"

+#include <X11/extensions/Xvproto.h>

+

+#ifndef XorgLoader

+extern _X_EXPORT unsigned long XvExtensionGeneration;

+extern _X_EXPORT unsigned long XvScreenGeneration;

+extern _X_EXPORT unsigned long XvResourceGeneration;

+

+extern _X_EXPORT int XvReqCode;

+extern _X_EXPORT int XvEventBase;

+extern _X_EXPORT int XvErrorBase;

+

+extern _X_EXPORT unsigned long XvRTPort;

+extern _X_EXPORT unsigned long XvRTEncoding;

+extern _X_EXPORT unsigned long XvRTGrab;

+extern _X_EXPORT unsigned long XvRTVideoNotify;

+extern _X_EXPORT unsigned long XvRTVideoNotifyList;

+extern _X_EXPORT unsigned long XvRTPortNotify;

+#endif

+

+typedef struct {

+  int numerator;

+  int denominator;

+} XvRationalRec, *XvRationalPtr;

+

+typedef struct {

+  char depth;

+  unsigned long visual;

+} XvFormatRec, *XvFormatPtr;

+

+typedef struct {

+  unsigned long id;

+  ClientPtr client;

+} XvGrabRec, *XvGrabPtr;

+

+typedef struct _XvVideoNotifyRec {

+  struct _XvVideoNotifyRec *next;

+  ClientPtr client;

+  unsigned long id;

+  unsigned long mask;

+} XvVideoNotifyRec, *XvVideoNotifyPtr;

+

+typedef struct _XvPortNotifyRec {

+  struct _XvPortNotifyRec *next;

+  ClientPtr client;

+  unsigned long id;

+} XvPortNotifyRec, *XvPortNotifyPtr;

+

+typedef struct {

+  int id;

+  ScreenPtr pScreen;

+  char *name;

+  unsigned short width, height;

+  XvRationalRec rate;

+} XvEncodingRec, *XvEncodingPtr;

+

+typedef struct _XvAttributeRec {

+  int flags;

+  int min_value;

+  int max_value;

+  char *name;

+} XvAttributeRec, *XvAttributePtr;

+

+typedef struct {

+  int id;

+  int type;

+  int byte_order;

+  char guid[16];

+  int bits_per_pixel;

+  int format;

+  int num_planes;

+

+  /* for RGB formats only */

+  int depth;

+  unsigned int red_mask;       

+  unsigned int green_mask;   

+  unsigned int blue_mask;   

+

+  /* for YUV formats only */

+  unsigned int y_sample_bits;

+  unsigned int u_sample_bits;

+  unsigned int v_sample_bits;   

+  unsigned int horz_y_period;

+  unsigned int horz_u_period;

+  unsigned int horz_v_period;

+  unsigned int vert_y_period;

+  unsigned int vert_u_period;

+  unsigned int vert_v_period;

+  char component_order[32];

+  int scanline_order;

+} XvImageRec, *XvImagePtr; 

+

+typedef struct {

+  unsigned long base_id;

+  unsigned char type; 

+  char *name;

+  int nEncodings;

+  XvEncodingPtr pEncodings;  

+  int nFormats;

+  XvFormatPtr pFormats; 

+  int nAttributes;

+  XvAttributePtr pAttributes;

+  int nImages;

+  XvImagePtr pImages;

+  int nPorts;

+  struct _XvPortRec *pPorts;

+  ScreenPtr pScreen; 

+  int (* ddAllocatePort)(unsigned long, struct _XvPortRec*, 

+				struct _XvPortRec**);

+  int (* ddFreePort)(struct _XvPortRec*);

+  int (* ddPutVideo)(ClientPtr, DrawablePtr,struct _XvPortRec*, GCPtr,

+   				INT16, INT16, CARD16, CARD16, 

+				INT16, INT16, CARD16, CARD16); 

+  int (* ddPutStill)(ClientPtr, DrawablePtr,struct _XvPortRec*, GCPtr,

+   				INT16, INT16, CARD16, CARD16, 

+				INT16, INT16, CARD16, CARD16);

+  int (* ddGetVideo)(ClientPtr, DrawablePtr,struct _XvPortRec*, GCPtr,

+   				INT16, INT16, CARD16, CARD16, 

+				INT16, INT16, CARD16, CARD16);

+  int (* ddGetStill)(ClientPtr, DrawablePtr,struct _XvPortRec*, GCPtr,

+   				INT16, INT16, CARD16, CARD16, 

+				INT16, INT16, CARD16, CARD16);

+  int (* ddStopVideo)(ClientPtr, struct _XvPortRec*, DrawablePtr);

+  int (* ddSetPortAttribute)(ClientPtr, struct _XvPortRec*, Atom, INT32);

+  int (* ddGetPortAttribute)(ClientPtr, struct _XvPortRec*, Atom, INT32*);

+  int (* ddQueryBestSize)(ClientPtr, struct _XvPortRec*, CARD8,

+   				CARD16, CARD16,CARD16, CARD16, 

+				unsigned int*, unsigned int*);

+  int (* ddPutImage)(ClientPtr, DrawablePtr, struct _XvPortRec*, GCPtr,

+   				INT16, INT16, CARD16, CARD16, 

+				INT16, INT16, CARD16, CARD16,

+				XvImagePtr, unsigned char*, Bool,

+				CARD16, CARD16);

+  int (* ddQueryImageAttributes)(ClientPtr, struct _XvPortRec*, XvImagePtr, 

+				CARD16*, CARD16*, int*, int*);

+  DevUnion devPriv;

+} XvAdaptorRec, *XvAdaptorPtr;

+

+typedef struct _XvPortRec {

+  unsigned long id;

+  XvAdaptorPtr pAdaptor;

+  XvPortNotifyPtr pNotify;

+  DrawablePtr pDraw;

+  ClientPtr client;

+  XvGrabRec grab;

+  TimeStamp time;

+  DevUnion devPriv;

+} XvPortRec, *XvPortPtr;

+

+#define VALIDATE_XV_PORT(portID, pPort, mode)\

+    {\

+	int rc = dixLookupResourceByType((pointer *)&(pPort), portID,\

+	                                 XvRTPort, client, mode);\

+	if (rc != Success)\

+	    return rc;\

+    }

+

+typedef struct {

+  int version, revision;

+  int nAdaptors;

+  XvAdaptorPtr pAdaptors;

+  DestroyWindowProcPtr DestroyWindow;

+  DestroyPixmapProcPtr DestroyPixmap;

+  CloseScreenProcPtr CloseScreen;

+  Bool (* ddCloseScreen)(int, ScreenPtr);

+  int (* ddQueryAdaptors)(ScreenPtr, XvAdaptorPtr*, int*);

+  DevUnion devPriv;

+} XvScreenRec, *XvScreenPtr;

+

+#define SCREEN_PROLOGUE(pScreen, field) ((pScreen)->field = ((XvScreenPtr) \

+    dixLookupPrivate(&(pScreen)->devPrivates, XvScreenKey))->field)

+

+#define SCREEN_EPILOGUE(pScreen, field, wrapper)\

+    ((pScreen)->field = wrapper)

+

+/* Errors */

+

+#define _XvBadPort (XvBadPort+XvErrorBase)

+#define _XvBadEncoding (XvBadEncoding+XvErrorBase)

+

+#ifndef XorgLoader

+extern _X_EXPORT int ProcXvDispatch(ClientPtr);

+extern _X_EXPORT int SProcXvDispatch(ClientPtr);

+

+extern _X_EXPORT void XvExtensionInit(void);

+extern _X_EXPORT int XvScreenInit(ScreenPtr);

+extern _X_EXPORT DevPrivateKey XvGetScreenKey(void);

+extern _X_EXPORT unsigned long XvGetRTPort(void);

+extern _X_EXPORT int XvdiSendPortNotify(XvPortPtr, Atom, INT32);

+extern _X_EXPORT int XvdiVideoStopped(XvPortPtr, int);

+

+extern _X_EXPORT int XvdiPutVideo(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,

+   				INT16, INT16, CARD16, CARD16, 

+				INT16, INT16, CARD16, CARD16);

+extern _X_EXPORT int XvdiPutStill(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,

+   				INT16, INT16, CARD16, CARD16, 

+				INT16, INT16, CARD16, CARD16);

+extern _X_EXPORT int XvdiGetVideo(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,

+   				INT16, INT16, CARD16, CARD16, 

+				INT16, INT16, CARD16, CARD16);

+extern _X_EXPORT int XvdiGetStill(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,

+   				INT16, INT16, CARD16, CARD16, 

+				INT16, INT16, CARD16, CARD16);

+extern _X_EXPORT int XvdiPutImage(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,

+   				INT16, INT16, CARD16, CARD16, 

+				INT16, INT16, CARD16, CARD16,

+				XvImagePtr, unsigned char*, Bool,

+				CARD16, CARD16);

+extern _X_EXPORT int XvdiSelectVideoNotify(ClientPtr, DrawablePtr, BOOL);

+extern _X_EXPORT int XvdiSelectPortNotify(ClientPtr, XvPortPtr, BOOL);

+extern _X_EXPORT int XvdiSetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32);

+extern _X_EXPORT int XvdiGetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32*);

+extern _X_EXPORT int XvdiStopVideo(ClientPtr, XvPortPtr, DrawablePtr);

+extern _X_EXPORT int XvdiPreemptVideo(ClientPtr, XvPortPtr, DrawablePtr);

+extern _X_EXPORT int XvdiMatchPort(XvPortPtr, DrawablePtr);

+extern _X_EXPORT int XvdiGrabPort(ClientPtr, XvPortPtr, Time, int *);

+extern _X_EXPORT int XvdiUngrabPort( ClientPtr, XvPortPtr, Time);

+#endif /* XorgLoader */

+

+#endif /* XVDIX_H */

+

diff --git a/xorg-server/Xext/xvmain.c b/xorg-server/Xext/xvmain.c
index 413b94015..58574b956 100644
--- a/xorg-server/Xext/xvmain.c
+++ b/xorg-server/Xext/xvmain.c
@@ -192,6 +192,7 @@ XvExtensionInit(void)
       EventSwapVector[XvEventBase+XvPortNotify] = 

 	(EventSwapPtr)WriteSwappedPortNotifyEvent;

 

+      SetResourceTypeErrorValue(XvRTPort, _XvBadPort);

       (void)MakeAtom(XvName, strlen(XvName), xTrue);

 

     }

@@ -530,17 +531,12 @@ XvdiSendVideoNotify(XvPortPtr pPort, DrawablePtr pDraw, int reason)
 

   while (pn) 

     {

-      if (pn->client)

-	{

-	  event.u.u.type = XvEventBase + XvVideoNotify;

-	  event.u.u.sequenceNumber = pn->client->sequence;

-	  event.u.videoNotify.time = currentTime.milliseconds;

-	  event.u.videoNotify.drawable = pDraw->id;

-	  event.u.videoNotify.port = pPort->id;

-	  event.u.videoNotify.reason = reason;

-	  TryClientEvents(pn->client, NULL, (xEventPtr)&event, 1,

-                          NoEventMask, NoEventMask, NullGrab);

-	}

+      event.u.u.type = XvEventBase + XvVideoNotify;

+      event.u.videoNotify.time = currentTime.milliseconds;

+      event.u.videoNotify.drawable = pDraw->id;

+      event.u.videoNotify.port = pPort->id;

+      event.u.videoNotify.reason = reason;

+      WriteEventsToClient(pn->client, 1, (xEventPtr)&event);

       pn = pn->next;

     }

 

@@ -562,17 +558,12 @@ XvdiSendPortNotify(
 

   while (pn) 

     {

-      if (pn->client)

-	{

-	  event.u.u.type = XvEventBase + XvPortNotify;

-	  event.u.u.sequenceNumber = pn->client->sequence;

-	  event.u.portNotify.time = currentTime.milliseconds;

-	  event.u.portNotify.port = pPort->id;

-	  event.u.portNotify.attribute = attribute;

-	  event.u.portNotify.value = value;

-	  TryClientEvents(pn->client, NULL, (xEventPtr)&event, 1,

-                          NoEventMask, NoEventMask, NullGrab);

-	}

+      event.u.u.type = XvEventBase + XvPortNotify;

+      event.u.portNotify.time = currentTime.milliseconds;

+      event.u.portNotify.port = pPort->id;

+      event.u.portNotify.attribute = attribute;

+      event.u.portNotify.value = value;

+      WriteEventsToClient(pn->client, 1, (xEventPtr)&event);

       pn = pn->next;

     }

 

diff --git a/xorg-server/Xext/xvmc.c b/xorg-server/Xext/xvmc.c
index 18a81c76b..4866d1d45 100644
--- a/xorg-server/Xext/xvmc.c
+++ b/xorg-server/Xext/xvmc.c
@@ -40,7 +40,6 @@ unsigned long XvMCGeneration = 0;
 

 int XvMCReqCode;

 int XvMCEventBase;

-int XvMCErrorBase;

 

 unsigned long XvMCRTContext;

 unsigned long XvMCRTSurface;

@@ -276,7 +275,7 @@ ProcXvMCDestroyContext(ClientPtr client)
     rc = dixLookupResourceByType(&val, stuff->context_id, XvMCRTContext,

 				 client, DixDestroyAccess);

     if (rc != Success)

-	return (rc == BadValue) ? XvMCBadContext + XvMCErrorBase : rc;

+	return rc;

 

     FreeResource(stuff->context_id, RT_NONE); 

 

@@ -299,7 +298,7 @@ ProcXvMCCreateSurface(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&pContext, stuff->context_id,

 				     XvMCRTContext, client, DixUseAccess);

     if (result != Success)

-        return (result == BadValue) ? XvMCBadContext + XvMCErrorBase : result;

+        return result;

 

     pScreenPriv = XVMC_GET_PRIVATE(pContext->pScreen);

 

@@ -346,7 +345,7 @@ ProcXvMCDestroySurface(ClientPtr client)
     rc = dixLookupResourceByType(&val, stuff->surface_id, XvMCRTSurface,

 				 client, DixDestroyAccess);

     if (rc != Success)

-        return (rc == BadValue) ? XvMCBadSurface + XvMCErrorBase : rc;

+        return rc;

 

     FreeResource(stuff->surface_id, RT_NONE);

 

@@ -371,7 +370,7 @@ ProcXvMCCreateSubpicture(ClientPtr client)
     result = dixLookupResourceByType((pointer *)&pContext, stuff->context_id,

 				     XvMCRTContext, client, DixUseAccess);

     if (result != Success)

-        return (result == BadValue) ? XvMCBadContext + XvMCErrorBase : result;

+        return result;

 

     pScreenPriv = XVMC_GET_PRIVATE(pContext->pScreen);

 

@@ -463,7 +462,7 @@ ProcXvMCDestroySubpicture(ClientPtr client)
     rc = dixLookupResourceByType(&val, stuff->subpicture_id, XvMCRTSubpicture,

 				 client, DixDestroyAccess);

     if (rc != Success)

-        return (rc == BadValue) ? XvMCBadSubpicture + XvMCErrorBase : rc;

+        return rc;

 

     FreeResource(stuff->subpicture_id, RT_NONE);

 

@@ -694,7 +693,9 @@ XvMCExtensionInit(void)
   

    XvMCReqCode = extEntry->base;

    XvMCEventBase = extEntry->eventBase;

-   XvMCErrorBase = extEntry->errorBase;

+   SetResourceTypeErrorValue(XvMCRTContext, extEntry->errorBase + XvMCBadContext);

+   SetResourceTypeErrorValue(XvMCRTSurface, extEntry->errorBase + XvMCBadSurface);

+   SetResourceTypeErrorValue(XvMCRTSubpicture, extEntry->errorBase + XvMCBadSubpicture);

 }

 

 static Bool