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

Merge remote-tracking branch 'kibi/master'

This commit is contained in:
Keith Packard 2011-06-29 18:54:33 -07:00
parent 38d55f06cf 4edf49d032
commit d5ca33ca2d
17 changed files with 31 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Xext/xvmc.c
View File

@ -487,8 +487,8 @@ ProcXvMCListSubpictureTypes(ClientPtr client)
pScreen = pPort->pAdaptor->pScreen; pScreen = pPort->pAdaptor->pScreen;
if(XvMCScreenKey == NULL) /* No XvMC adaptors */ if (!dixPrivateKeyRegistered(XvMCScreenKey))
return BadMatch; return BadMatch; /* No XvMC adaptors */
if(!(pScreenPriv = XVMC_GET_PRIVATE(pScreen))) if(!(pScreenPriv = XVMC_GET_PRIVATE(pScreen)))
return BadMatch; /* None this screen */ return BadMatch; /* None this screen */
@ -668,8 +668,8 @@ XvMCExtensionInit(void)
{ {
ExtensionEntry *extEntry; ExtensionEntry *extEntry;
if(XvMCScreenKey == NULL) /* nobody supports it */ if (!dixPrivateKeyRegistered(XvMCScreenKey))
return; return;
if(!(XvMCRTContext = CreateNewResourceType(XvMCDestroyContextRes, if(!(XvMCRTContext = CreateNewResourceType(XvMCDestroyContextRes,
"XvMCRTContext"))) "XvMCRTContext")))
@ -746,7 +746,8 @@ XvImagePtr XvMCFindXvImage(XvPortPtr pPort, CARD32 id)
XvMCAdaptorPtr adaptor = NULL; XvMCAdaptorPtr adaptor = NULL;
int i; int i;
if(XvMCScreenKey == NULL) return NULL; if (!dixPrivateKeyRegistered(XvMCScreenKey))
return NULL;
if(!(pScreenPriv = XVMC_GET_PRIVATE(pScreen))) if(!(pScreenPriv = XVMC_GET_PRIVATE(pScreen)))
return NULL; return NULL;

2
configure.ac
View File

@ -785,7 +785,7 @@ WINDOWSWMPROTO="windowswmproto"
APPLEWMPROTO="applewmproto >= 1.4" APPLEWMPROTO="applewmproto >= 1.4"
dnl Core modules for most extensions, et al. dnl Core modules for most extensions, et al.
SDK_REQUIRED_MODULES="[xproto >= 7.0.17] [randrproto >= 1.2.99.3] [renderproto >= 0.11] [xextproto >= 7.1.99] [inputproto >= 1.9.99.902] [kbproto >= 1.0.3] fontsproto" SDK_REQUIRED_MODULES="[xproto >= 7.0.22] [randrproto >= 1.2.99.3] [renderproto >= 0.11] [xextproto >= 7.1.99] [inputproto >= 1.9.99.902] [kbproto >= 1.0.3] fontsproto"
# Make SDK_REQUIRED_MODULES available for inclusion in xorg-server.pc # Make SDK_REQUIRED_MODULES available for inclusion in xorg-server.pc
AC_SUBST(SDK_REQUIRED_MODULES) AC_SUBST(SDK_REQUIRED_MODULES)

4
fb/fb24_32.c
View File

@ -540,8 +540,8 @@ fb24_32ReformatTile(PixmapPtr pOldTile, int bitsPerPixel)
FbStride oldStride, newStride; FbStride oldStride, newStride;
int oldBpp, newBpp; int oldBpp, newBpp;
fb24_32BltFunc blt; fb24_32BltFunc blt;
int oldXoff, oldYoff; _X_UNUSED int oldXoff, oldYoff;
int newXoff, newYoff; _X_UNUSED int newXoff, newYoff;
pNewTile = pScreen->CreatePixmap(pScreen, pOldTile->drawable.width, pNewTile = pScreen->CreatePixmap(pScreen, pOldTile->drawable.width,
pOldTile->drawable.height, pOldTile->drawable.height,

9
fb/fbarc.c
View File

@ -68,15 +68,12 @@ fbPolyArc (DrawablePtr pDrawable,
BoxRec box; BoxRec box;
int x2, y2; int x2, y2;
RegionPtr cclip; RegionPtr cclip;
int wrapped = 0; #ifdef FB_ACCESS_WRAPPER
int wrapped = 1;
#endif
cclip = fbGetCompositeClip (pGC); cclip = fbGetCompositeClip (pGC);
fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff); fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
#ifdef FB_ACCESS_WRAPPER
wrapped = 1;
#else
wrapped = 0;
#endif
while (narcs--) while (narcs--)
{ {
if (miCanZeroArc (parcs)) if (miCanZeroArc (parcs))

6
fb/fbfill.c
View File

@ -69,7 +69,7 @@ fbFill (DrawablePtr pDrawable,
FbBits *stip; FbBits *stip;
FbStride stipStride; FbStride stipStride;
int stipBpp; int stipBpp;
int stipXoff, stipYoff; /* XXX assumed to be zero */ _X_UNUSED int stipXoff, stipYoff;
if (pGC->fillStyle == FillStippled) if (pGC->fillStyle == FillStippled)
alu = FbStipple1Rop(pGC->alu,pGC->fgPixel); alu = FbStipple1Rop(pGC->alu,pGC->fgPixel);
@ -97,7 +97,7 @@ fbFill (DrawablePtr pDrawable,
FbStip *stip; FbStip *stip;
FbStride stipStride; FbStride stipStride;
int stipBpp; int stipBpp;
int stipXoff, stipYoff; /* XXX assumed to be zero */ _X_UNUSED int stipXoff, stipYoff;
FbBits fgand, fgxor, bgand, bgxor; FbBits fgand, fgxor, bgand, bgxor;
fgand = pPriv->and; fgand = pPriv->and;
@ -139,7 +139,7 @@ fbFill (DrawablePtr pDrawable,
int tileBpp; int tileBpp;
int tileWidth; int tileWidth;
int tileHeight; int tileHeight;
int tileXoff, tileYoff; /* XXX assumed to be zero */ _X_UNUSED int tileXoff, tileYoff;
fbGetDrawable (&pTile->drawable, tile, tileStride, tileBpp, tileXoff, tileYoff); fbGetDrawable (&pTile->drawable, tile, tileStride, tileBpp, tileXoff, tileYoff);
tileWidth = pTile->drawable.width; tileWidth = pTile->drawable.width;

4
fb/fbgc.c
View File

@ -89,7 +89,7 @@ fbPadPixmap (PixmapPtr pPixmap)
int w; int w;
int stride; int stride;
int bpp; int bpp;
int xOff, yOff; _X_UNUSED int xOff, yOff;
fbGetDrawable (&pPixmap->drawable, bits, stride, bpp, xOff, yOff); fbGetDrawable (&pPixmap->drawable, bits, stride, bpp, xOff, yOff);
@ -163,7 +163,7 @@ fbCanEvenStipple (PixmapPtr pStipple, int bpp)
FbBits *bits; FbBits *bits;
int stride; int stride;
int stip_bpp; int stip_bpp;
int stipXoff, stipYoff; _X_UNUSED int stipXoff, stipYoff;
int h; int h;
/* can't even stipple 24bpp drawables */ /* can't even stipple 24bpp drawables */

2
fb/fbpush.c
View File

@ -235,7 +235,7 @@ fbPushPixels (GCPtr pGC,
FbStip *stip; FbStip *stip;
FbStride stipStride; FbStride stipStride;
int stipBpp; int stipBpp;
int stipXoff, stipYoff; /* Assumed to be zero */ _X_UNUSED int stipXoff, stipYoff;
fbGetStipDrawable (&pBitmap->drawable, stip, stipStride, stipBpp, stipXoff, stipYoff); fbGetStipDrawable (&pBitmap->drawable, stip, stipStride, stipBpp, stipXoff, stipYoff);

8
hw/dmx/config/xdmxconfig.c
View File

@ -877,8 +877,8 @@ int main(int argc, char **argv)
Widget parent, menubox, bottombox, databox, canvasbox; Widget parent, menubox, bottombox, databox, canvasbox;
Widget filebutton, helpbutton; Widget filebutton, helpbutton;
Widget filemenu, openbutton, savebutton, quitbutton; Widget filemenu, openbutton, savebutton, quitbutton;
Widget helpmenu, aboutbutton, aboutbox, abouttext, aboutok; Widget helpmenu, aboutbutton, aboutbox, aboutok;
Widget quitbox, quittext, quitok, quitcan; Widget quitbox, quitok, quitcan;
Widget ncbutton; Widget ncbutton;
Widget canbutton; Widget canbutton;
Widget ecbox, ecokbutton, eccanbutton; Widget ecbox, ecokbutton, eccanbutton;
@ -1096,7 +1096,7 @@ int main(int argc, char **argv)
toplevel, NULL); toplevel, NULL);
aboutbox = XtVaCreateManagedWidget("aboutbox", boxWidgetClass, aboutbox = XtVaCreateManagedWidget("aboutbox", boxWidgetClass,
aboutpopup, NULL); aboutpopup, NULL);
abouttext = XtVaCreateManagedWidget("abouttext", labelWidgetClass, XtVaCreateManagedWidget("abouttext", labelWidgetClass,
aboutbox, aboutbox,
XtNlabel, DMX_INFO, XtNlabel, DMX_INFO,
NULL); NULL);
@ -1108,7 +1108,7 @@ int main(int argc, char **argv)
toplevel, NULL); toplevel, NULL);
quitbox = XtVaCreateManagedWidget("quitbox", boxWidgetClass, quitbox = XtVaCreateManagedWidget("quitbox", boxWidgetClass,
quitpopup, NULL); quitpopup, NULL);
quittext = XtVaCreateManagedWidget("quittext", labelWidgetClass, XtVaCreateManagedWidget("quittext", labelWidgetClass,
quitbox, quitbox,
XtNlabel, XtNlabel,
"Changes to the configuration\n" "Changes to the configuration\n"

3
hw/dmx/examples/xbell.c
View File

@ -71,7 +71,6 @@ int main(int argc, char **argv)
XKeyboardControl kc; XKeyboardControl kc;
XKeyboardState ks; XKeyboardState ks;
unsigned long vm; unsigned long vm;
int percent;
if (argc != 5) { if (argc != 5) {
printf("Usage: xbell percent baseVolume pitch duration\n"); printf("Usage: xbell percent baseVolume pitch duration\n");
@ -81,7 +80,7 @@ int main(int argc, char **argv)
vm = (KBBellPercent vm = (KBBellPercent
| KBBellPitch | KBBellPitch
| KBBellDuration); | KBBellDuration);
percent = atoi(argv[1]); kc.key_click_percent = atoi(argv[1]);
kc.bell_percent = atoi(argv[2]); kc.bell_percent = atoi(argv[2]);
kc.bell_pitch = atoi(argv[3]); kc.bell_pitch = atoi(argv[3]);
kc.bell_duration = atoi(argv[4]); kc.bell_duration = atoi(argv[4]);

2
miext/shadow/shpacked.c
View File

@ -52,7 +52,7 @@ shadowUpdatePacked (ScreenPtr pScreen,
FbStride shaStride; FbStride shaStride;
int scrBase, scrLine, scr; int scrBase, scrLine, scr;
int shaBpp; int shaBpp;
int shaXoff, shaYoff; /* XXX assumed to be zero */ _X_UNUSED int shaXoff, shaYoff;
int x, y, w, h, width; int x, y, w, h, width;
int i; int i;
FbBits *winBase = NULL, *win; FbBits *winBase = NULL, *win;

2
miext/shadow/shplanar.c
View File

@ -98,7 +98,7 @@ shadowUpdatePlanar4 (ScreenPtr pScreen,
FbStride shaStride; FbStride shaStride;
int scrBase, scrLine, scr; int scrBase, scrLine, scr;
int shaBpp; int shaBpp;
int shaXoff, shaYoff; /* XXX assumed to be zero */ _X_UNUSED int shaXoff, shaYoff;
int x, y, w, h, width; int x, y, w, h, width;
int i; int i;
CARD32 *winBase = NULL, *win; CARD32 *winBase = NULL, *win;

2
miext/shadow/shplanar8.c
View File

@ -102,7 +102,7 @@ shadowUpdatePlanar4x8 (ScreenPtr pScreen,
FbStride shaStride; FbStride shaStride;
int scrBase, scrLine, scr; int scrBase, scrLine, scr;
int shaBpp; int shaBpp;
int shaXoff, shaYoff; /* XXX assumed to be zero */ _X_UNUSED int shaXoff, shaYoff;
int x, y, w, h, width; int x, y, w, h, width;
int i; int i;
CARD32 *winBase = NULL, *win; CARD32 *winBase = NULL, *win;

2
miext/shadow/shrotate.c
View File

@ -59,7 +59,7 @@ shadowUpdateRotatePacked (ScreenPtr pScreen,
FbBits *shaBits; FbBits *shaBits;
FbStride shaStride; FbStride shaStride;
int shaBpp; int shaBpp;
int shaXoff, shaYoff; _X_UNUSED int shaXoff, shaYoff;
int box_x1, box_x2, box_y1, box_y2; int box_x1, box_x2, box_y1, box_y2;
int sha_x1 = 0, sha_y1 = 0; int sha_x1 = 0, sha_y1 = 0;
int scr_x1 = 0, scr_x2 = 0, scr_y1 = 0, scr_y2 = 0, scr_w, scr_h; int scr_x1 = 0, scr_x2 = 0, scr_y1 = 0, scr_y2 = 0, scr_w, scr_h;

2
miext/shadow/shrotpack.h
View File

@ -106,7 +106,7 @@ FUNC (ScreenPtr pScreen,
FbStride shaStride; FbStride shaStride;
int scrBase, scrLine, scr; int scrBase, scrLine, scr;
int shaBpp; int shaBpp;
int shaXoff, shaYoff; /* XXX assumed to be zero */ _X_UNUSED int shaXoff, shaYoff;
int x, y, w, h, width; int x, y, w, h, width;
int i; int i;
Data *winBase = NULL, *win; Data *winBase = NULL, *win;

2
miext/shadow/shrotpackYX.h
View File

@ -69,7 +69,7 @@ FUNC (ScreenPtr pScreen,
Data *shaBase, *shaLine, *sha; Data *shaBase, *shaLine, *sha;
FbStride shaStride, winStride; FbStride shaStride, winStride;
int shaBpp; int shaBpp;
int shaXoff, shaYoff; /* XXX assumed to be zero */ _X_UNUSED int shaXoff, shaYoff;
int x, y, w, h; int x, y, w, h;
Data *winBase, *win, *winLine; Data *winBase, *win, *winLine;
CARD32 winSize; CARD32 winSize;

4
xfixes/cursor.c
View File

@ -196,8 +196,8 @@ CursorCloseScreen (int index, ScreenPtr pScreen)
{ {
CursorScreenPtr cs = GetCursorScreen (pScreen); CursorScreenPtr cs = GetCursorScreen (pScreen);
Bool ret; Bool ret;
CloseScreenProcPtr close_proc; _X_UNUSED CloseScreenProcPtr close_proc;
DisplayCursorProcPtr display_proc; _X_UNUSED DisplayCursorProcPtr display_proc;
ConstrainCursorHarderProcPtr constrain_proc; ConstrainCursorHarderProcPtr constrain_proc;
Unwrap (cs, pScreen, CloseScreen, close_proc); Unwrap (cs, pScreen, CloseScreen, close_proc);

2
xfixes/region.c
View File

@ -756,12 +756,10 @@ ProcXFixesSetPictureClipRegion (ClientPtr client)
{ {
PicturePtr pPicture; PicturePtr pPicture;
RegionPtr pRegion; RegionPtr pRegion;
ScreenPtr pScreen;
REQUEST(xXFixesSetPictureClipRegionReq); REQUEST(xXFixesSetPictureClipRegionReq);
REQUEST_SIZE_MATCH (xXFixesSetPictureClipRegionReq); REQUEST_SIZE_MATCH (xXFixesSetPictureClipRegionReq);
VERIFY_PICTURE(pPicture, stuff->picture, client, DixSetAttrAccess); VERIFY_PICTURE(pPicture, stuff->picture, client, DixSetAttrAccess);
pScreen = pPicture->pDrawable->pScreen;
VERIFY_REGION_OR_NONE(pRegion, stuff->region, client, DixReadAccess); VERIFY_REGION_OR_NONE(pRegion, stuff->region, client, DixReadAccess);
return SetPictureClipRegion (pPicture, stuff->xOrigin, stuff->yOrigin, return SetPictureClipRegion (pPicture, stuff->xOrigin, stuff->yOrigin,