diff options
| author | Keith Packard <keithp@keithp.com> | 2012-03-21 12:55:09 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-03-21 13:54:42 -0700 |
| commit | 9838b7032ea9792bec21af424c53c07078636d21 (patch) | |
| tree | b72d0827dac50f0f3b8eab29b3b7639546d735d7 /hw/dmx/dmxvisual.c | |
| parent | 75199129c603fc8567185ac31866c9518193cb78 (diff) | |
Introduce a consistent coding style
This is strictly the application of the script 'x-indent-all.sh'
from util/modular. Compared to the patch that Daniel posted in
January, I've added a few indent flags:
-bap
-psl
-T PrivatePtr
-T pmWait
-T _XFUNCPROTOBEGIN
-T _XFUNCPROTOEND
-T _X_EXPORT
The typedefs were needed to make the output of sdksyms.sh match the
previous output, otherwise, the code is formatted badly enough that
sdksyms.sh generates incorrect output.
The generated code was compared with the previous version and found to
be essentially identical -- "assert" line numbers and BUILD_TIME were
the only differences found.
The comparison was done with this script:
dir1=$1
dir2=$2
for dir in $dir1 $dir2; do
(cd $dir && find . -name '*.o' | while read file; do
dir=`dirname $file`
base=`basename $file .o`
dump=$dir/$base.dump
objdump -d $file > $dump
done)
done
find $dir1 -name '*.dump' | while read dump; do
otherdump=`echo $dump | sed "s;$dir1;$dir2;"`
diff -u $dump $otherdump
done
Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Daniel Stone <daniel@fooishbar.org>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'hw/dmx/dmxvisual.c')
| -rw-r--r-- | hw/dmx/dmxvisual.c | 82 |
1 files changed, 44 insertions, 38 deletions
diff --git a/hw/dmx/dmxvisual.c b/hw/dmx/dmxvisual.c index 7b8771f9e..23b9bddea 100644 --- a/hw/dmx/dmxvisual.c +++ b/hw/dmx/dmxvisual.c @@ -48,24 +48,25 @@ #include <GL/glxint.h> extern VisualID glxMatchVisualInConfigList(ScreenPtr pScreen, - VisualPtr pVisual, - __GLXvisualConfig *configs, - int nconfigs); + VisualPtr pVisual, + __GLXvisualConfig * configs, + int nconfigs); -static Visual *dmxLookupGLXVisual(ScreenPtr pScreen, VisualPtr pVisual) +static Visual * +dmxLookupGLXVisual(ScreenPtr pScreen, VisualPtr pVisual) { DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum]; - int j; - VisualID vid; + int j; + VisualID vid; vid = glxMatchVisualInConfigList(pScreen, pVisual, - dmxScreen->glxVisuals, - dmxScreen->numGlxVisuals); + dmxScreen->glxVisuals, + dmxScreen->numGlxVisuals); if (vid) { - /* Find the X visual of the matching GLX visual */ - for (j = 0; j < dmxScreen->beNumVisuals; j++) - if (vid == dmxScreen->beVisuals[j].visualid) - return dmxScreen->beVisuals[j].visual; + /* Find the X visual of the matching GLX visual */ + for (j = 0; j < dmxScreen->beNumVisuals; j++) + if (vid == dmxScreen->beVisuals[j].visualid) + return dmxScreen->beVisuals[j].visual; } /* No matching visual found */ @@ -74,66 +75,71 @@ static Visual *dmxLookupGLXVisual(ScreenPtr pScreen, VisualPtr pVisual) #endif /** Return the visual that matched \a pVisual. */ -Visual *dmxLookupVisual(ScreenPtr pScreen, VisualPtr pVisual) +Visual * +dmxLookupVisual(ScreenPtr pScreen, VisualPtr pVisual) { DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum]; - int i; + int i; + #ifdef GLXEXT - Visual *retval; + Visual *retval; #endif if (!dmxScreen->beDisplay) - return NULL; + return NULL; #ifdef GLXEXT if ((retval = dmxLookupGLXVisual(pScreen, pVisual))) - return retval; + return retval; #endif for (i = 0; i < dmxScreen->beNumVisuals; i++) { - if (pVisual->class == dmxScreen->beVisuals[i].class && - pVisual->bitsPerRGBValue == dmxScreen->beVisuals[i].bits_per_rgb && - pVisual->ColormapEntries == dmxScreen->beVisuals[i].colormap_size && - pVisual->nplanes == dmxScreen->beVisuals[i].depth && - pVisual->redMask == dmxScreen->beVisuals[i].red_mask && - pVisual->greenMask == dmxScreen->beVisuals[i].green_mask && - pVisual->blueMask == dmxScreen->beVisuals[i].blue_mask) { - return dmxScreen->beVisuals[i].visual; - } + if (pVisual->class == dmxScreen->beVisuals[i].class && + pVisual->bitsPerRGBValue == dmxScreen->beVisuals[i].bits_per_rgb && + pVisual->ColormapEntries == dmxScreen->beVisuals[i].colormap_size && + pVisual->nplanes == dmxScreen->beVisuals[i].depth && + pVisual->redMask == dmxScreen->beVisuals[i].red_mask && + pVisual->greenMask == dmxScreen->beVisuals[i].green_mask && + pVisual->blueMask == dmxScreen->beVisuals[i].blue_mask) { + return dmxScreen->beVisuals[i].visual; + } } return NULL; } /** Return the visual that matched the \a vid. */ -Visual *dmxLookupVisualFromID(ScreenPtr pScreen, VisualID vid) +Visual * +dmxLookupVisualFromID(ScreenPtr pScreen, VisualID vid) { Visual *visual; - int i; + int i; if (!dmxScreens[pScreen->myNum].beDisplay) - return NULL; + return NULL; for (i = 0; i < pScreen->numVisuals; i++) { - if (pScreen->visuals[i].vid == vid) { - visual = dmxLookupVisual(pScreen, &pScreen->visuals[i]); - if (visual) return visual; - } + if (pScreen->visuals[i].vid == vid) { + visual = dmxLookupVisual(pScreen, &pScreen->visuals[i]); + if (visual) + return visual; + } } return NULL; } /** Return the colormap for the \a visual. */ -Colormap dmxColormapFromDefaultVisual(ScreenPtr pScreen, Visual *visual) +Colormap +dmxColormapFromDefaultVisual(ScreenPtr pScreen, Visual * visual) { DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum]; - int i; + int i; if (dmxScreen->beDisplay) { - for (i = 0; i < dmxScreen->beNumDefColormaps; i++) - if (visual == dmxScreen->beVisuals[i].visual) - return dmxScreen->beDefColormaps[i]; + for (i = 0; i < dmxScreen->beNumDefColormaps; i++) + if (visual == dmxScreen->beVisuals[i].visual) + return dmxScreen->beDefColormaps[i]; } return None; |