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

hw/xnest: Eliminate shadowed names 

Just rename stuff; nothing fancy here.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Keith Packard 2013-12-15 01:56:36 -08:00
parent 1f3676a81e
commit f46c487625
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xnest/Events.c
View File

@ -64,15 +64,15 @@ SetTimeSinceLastInputEvent(void)
} }
static Bool static Bool
xnestExposurePredicate(Display * display, XEvent * event, char *args) xnestExposurePredicate(Display * dpy, XEvent * event, char *args)
{ {
return event->type == Expose || event->type == ProcessedExpose; return event->type == Expose || event->type == ProcessedExpose;
} }
static Bool static Bool
xnestNotExposurePredicate(Display * display, XEvent * event, char *args) xnestNotExposurePredicate(Display * dpy, XEvent * event, char *args)
{ {
return !xnestExposurePredicate(display, event, args); return !xnestExposurePredicate(dpy, event, args);
} }
void void

4
hw/xnest/GCOps.c
View File

@ -95,7 +95,7 @@ xnestPutImage(DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y,
} }
static int static int
xnestIgnoreErrorHandler (Display *display, xnestIgnoreErrorHandler (Display *dpy,
XErrorEvent *event) XErrorEvent *event)
{ {
return False; /* return value is ignored */ return False; /* return value is ignored */
@ -127,7 +127,7 @@ xnestGetImage(DrawablePtr pDrawable, int x, int y, int w, int h,
} }
static Bool static Bool
xnestBitBlitPredicate(Display * display, XEvent * event, char *args) xnestBitBlitPredicate(Display * dpy, XEvent * event, char *args)
{ {
return event->type == GraphicsExpose || event->type == NoExpose; return event->type == GraphicsExpose || event->type == NoExpose;
} }

22
hw/xnest/Init.c
View File

@ -46,29 +46,29 @@ is" without express or implied warranty.
Bool xnestDoFullGeneration = True; Bool xnestDoFullGeneration = True;
void void
InitOutput(ScreenInfo * screenInfo, int argc, char *argv[]) InitOutput(ScreenInfo * screen_info, int argc, char *argv[])
{ {
int i, j; int i, j;
xnestOpenDisplay(argc, argv); xnestOpenDisplay(argc, argv);
screenInfo->imageByteOrder = ImageByteOrder(xnestDisplay); screen_info->imageByteOrder = ImageByteOrder(xnestDisplay);
screenInfo->bitmapScanlineUnit = BitmapUnit(xnestDisplay); screen_info->bitmapScanlineUnit = BitmapUnit(xnestDisplay);
screenInfo->bitmapScanlinePad = BitmapPad(xnestDisplay); screen_info->bitmapScanlinePad = BitmapPad(xnestDisplay);
screenInfo->bitmapBitOrder = BitmapBitOrder(xnestDisplay); screen_info->bitmapBitOrder = BitmapBitOrder(xnestDisplay);
screenInfo->numPixmapFormats = 0; screen_info->numPixmapFormats = 0;
for (i = 0; i < xnestNumPixmapFormats; i++) for (i = 0; i < xnestNumPixmapFormats; i++)
for (j = 0; j < xnestNumDepths; j++) for (j = 0; j < xnestNumDepths; j++)
if ((xnestPixmapFormats[i].depth == 1) || if ((xnestPixmapFormats[i].depth == 1) ||
(xnestPixmapFormats[i].depth == xnestDepths[j])) { (xnestPixmapFormats[i].depth == xnestDepths[j])) {
screenInfo->formats[screenInfo->numPixmapFormats].depth = screen_info->formats[screen_info->numPixmapFormats].depth =
xnestPixmapFormats[i].depth; xnestPixmapFormats[i].depth;
screenInfo->formats[screenInfo->numPixmapFormats].bitsPerPixel = screen_info->formats[screen_info->numPixmapFormats].bitsPerPixel =
xnestPixmapFormats[i].bits_per_pixel; xnestPixmapFormats[i].bits_per_pixel;
screenInfo->formats[screenInfo->numPixmapFormats].scanlinePad = screen_info->formats[screen_info->numPixmapFormats].scanlinePad =
xnestPixmapFormats[i].scanline_pad; xnestPixmapFormats[i].scanline_pad;
screenInfo->numPixmapFormats++; screen_info->numPixmapFormats++;
break; break;
} }
@ -80,7 +80,7 @@ InitOutput(ScreenInfo * screenInfo, int argc, char *argv[])
for (i = 0; i < xnestNumScreens; i++) for (i = 0; i < xnestNumScreens; i++)
AddScreen(xnestOpenScreen, argc, argv); AddScreen(xnestOpenScreen, argc, argv);
xnestNumScreens = screenInfo->numScreens; xnestNumScreens = screen_info->numScreens;
xnestDoFullGeneration = xnestFullGeneration; xnestDoFullGeneration = xnestFullGeneration;
} }

2
hw/xnest/Window.c
View File

@ -380,7 +380,7 @@ xnestClipNotify(WindowPtr pWin, int dx, int dy)
} }
static Bool static Bool
xnestWindowExposurePredicate(Display * display, XEvent * event, XPointer ptr) xnestWindowExposurePredicate(Display * dpy, XEvent * event, XPointer ptr)
{ {
return (event->type == Expose && event->xexpose.window == *(Window *) ptr); return (event->type == Expose && event->xexpose.window == *(Window *) ptr);
} }