Merge remote-tracking branch 'origin/released'

Conflicts:
	pixman/pixman/pixman-mmx.c
	xorg-server/Xext/shm.c
	xorg-server/Xext/syncsrv.h
	xorg-server/Xext/xvmain.c
	xorg-server/Xi/exevents.c
	xorg-server/Xi/opendev.c
	xorg-server/composite/compalloc.c
	xorg-server/composite/compoverlay.c
	xorg-server/dix/colormap.c
	xorg-server/dix/devices.c
	xorg-server/dix/dispatch.c
	xorg-server/dix/dixfonts.c
	xorg-server/dix/eventconvert.c
	xorg-server/dix/events.c
	xorg-server/dix/gc.c
	xorg-server/dix/getevents.c
	xorg-server/dix/main.c
	xorg-server/dix/privates.c
	xorg-server/dix/registry.c
	xorg-server/dix/resource.c
	xorg-server/exa/exa_accel.c
	xorg-server/exa/exa_migration_classic.c
	xorg-server/exa/exa_unaccel.c
	xorg-server/fb/fb.h
	xorg-server/fb/fbcopy.c
	xorg-server/fb/fbpixmap.c
	xorg-server/glx/dispatch.h
	xorg-server/glx/glapi.h
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glapitable.h
	xorg-server/glx/glprocs.h
	xorg-server/glx/glxcmds.c
	xorg-server/glx/glxcmdsswap.c
	xorg-server/glx/glxdricommon.c
	xorg-server/glx/glxdriswrast.c
	xorg-server/glx/glxext.c
	xorg-server/glx/indirect_dispatch.c
	xorg-server/glx/indirect_dispatch.h
	xorg-server/glx/indirect_dispatch_swap.c
	xorg-server/glx/indirect_size.h
	xorg-server/glx/indirect_size_get.h
	xorg-server/glx/indirect_table.c
	xorg-server/glx/indirect_util.c
	xorg-server/glx/rensize.c
	xorg-server/glx/single2swap.c
	xorg-server/glx/singlepix.c
	xorg-server/glx/singlepixswap.c
	xorg-server/glx/singlesize.c
	xorg-server/hw/dmx/dmxinit.c
	xorg-server/hw/kdrive/ephyr/ephyr.c
	xorg-server/hw/kdrive/ephyr/hostx.c
	xorg-server/hw/kdrive/ephyr/hostx.h
	xorg-server/hw/kdrive/src/kinput.c
	xorg-server/hw/xfree86/common/compiler.h
	xorg-server/hw/xwin/InitInput.c
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/ddraw.h
	xorg-server/hw/xwin/glx/glwrap.c
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/hw/xwin/glx/wgl_ext_api.h
	xorg-server/hw/xwin/glx/winpriv.c
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winallpriv.c
	xorg-server/hw/xwin/winauth.c
	xorg-server/hw/xwin/winclipboard.h
	xorg-server/hw/xwin/winclipboardinit.c
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winclipboardunicode.c
	xorg-server/hw/xwin/winclipboardwndproc.c
	xorg-server/hw/xwin/winclipboardwrappers.c
	xorg-server/hw/xwin/winclipboardxevents.c
	xorg-server/hw/xwin/wincmap.c
	xorg-server/hw/xwin/winconfig.c
	xorg-server/hw/xwin/wincreatewnd.c
	xorg-server/hw/xwin/wincursor.c
	xorg-server/hw/xwin/windialogs.c
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/wingc.c
	xorg-server/hw/xwin/wingetsp.c
	xorg-server/hw/xwin/winkeybd.c
	xorg-server/hw/xwin/winkeybd.h
	xorg-server/hw/xwin/winlayouts.h
	xorg-server/hw/xwin/winmisc.c
	xorg-server/hw/xwin/winmonitors.c
	xorg-server/hw/xwin/winmouse.c
	xorg-server/hw/xwin/winmsg.c
	xorg-server/hw/xwin/winmsg.h
	xorg-server/hw/xwin/winmultiwindowclass.c
	xorg-server/hw/xwin/winmultiwindowicons.c
	xorg-server/hw/xwin/winmultiwindowshape.c
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winmultiwindowwm.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/hw/xwin/winnativegdi.c
	xorg-server/hw/xwin/winpfbdd.c
	xorg-server/hw/xwin/winpixmap.c
	xorg-server/hw/xwin/winpolyline.c
	xorg-server/hw/xwin/winprefs.c
	xorg-server/hw/xwin/winprocarg.c
	xorg-server/hw/xwin/winregistry.c
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/hw/xwin/winsetsp.c
	xorg-server/hw/xwin/winshaddd.c
	xorg-server/hw/xwin/winshadddnl.c
	xorg-server/hw/xwin/winshadgdi.c
	xorg-server/hw/xwin/wintrayicon.c
	xorg-server/hw/xwin/winwin32rootless.c
	xorg-server/hw/xwin/winwin32rootlesswindow.c
	xorg-server/hw/xwin/winwin32rootlesswndproc.c
	xorg-server/hw/xwin/winwindow.c
	xorg-server/hw/xwin/winwindow.h
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/hw/xwin/winwndproc.c
	xorg-server/include/callback.h
	xorg-server/include/dixstruct.h
	xorg-server/include/misc.h
	xorg-server/include/os.h
	xorg-server/include/scrnintstr.h
	xorg-server/mi/micmap.c
	xorg-server/mi/miinitext.c
	xorg-server/mi/mioverlay.c
	xorg-server/mi/misprite.c
	xorg-server/mi/mivaltree.c
	xorg-server/mi/miwindow.c
	xorg-server/miext/damage/damage.c
	xorg-server/miext/rootless/rootlessGC.c
	xorg-server/miext/rootless/rootlessWindow.c
	xorg-server/os/WaitFor.c
	xorg-server/os/access.c
	xorg-server/os/connection.c
	xorg-server/os/io.c
	xorg-server/os/log.c
	xorg-server/os/osinit.c
	xorg-server/os/utils.c
	xorg-server/os/xdmcp.c
	xorg-server/os/xprintf.c
	xorg-server/os/xstrans.c
	xorg-server/render/mipict.c
	xorg-server/xkb/xkbActions.c
	xorg-server/xkb/xkbInit.c
	xorg-server/xkeyboard-config/compat/default.in

1 files changed, 226 insertions, 228 deletions

diff --git a/xorg-server/glx/glxscreens.c b/xorg-server/glx/glxscreens.c
index d75f48a2b..1ece23038 100644
--- a/xorg-server/glx/glxscreens.c
+++ b/xorg-server/glx/glxscreens.c
@@ -49,118 +49,116 @@
 #include "protocol-versions.h"
 
 static DevPrivateKeyRec glxScreenPrivateKeyRec;
+
 #define glxScreenPrivateKey (&glxScreenPrivateKeyRec)
 
 const char GLServerVersion[] = "1.4";
-static const char GLServerExtensions[] = 
-			"GL_ARB_depth_texture "
-			"GL_ARB_draw_buffers "
-			"GL_ARB_fragment_program "
-			"GL_ARB_fragment_program_shadow "
-			"GL_ARB_imaging "
-			"GL_ARB_multisample "
-			"GL_ARB_multitexture "
-			"GL_ARB_occlusion_query "
-			"GL_ARB_point_parameters "
-			"GL_ARB_point_sprite "
-			"GL_ARB_shadow "
-			"GL_ARB_shadow_ambient "
-			"GL_ARB_texture_border_clamp "
-			"GL_ARB_texture_compression "
-			"GL_ARB_texture_cube_map "
-			"GL_ARB_texture_env_add "
-			"GL_ARB_texture_env_combine "
-			"GL_ARB_texture_env_crossbar "
-			"GL_ARB_texture_env_dot3 "
-			"GL_ARB_texture_mirrored_repeat "
-			"GL_ARB_texture_non_power_of_two "
-			"GL_ARB_transpose_matrix "
-			"GL_ARB_vertex_program "
-			"GL_ARB_window_pos "
-			"GL_EXT_abgr "
-			"GL_EXT_bgra "
- 			"GL_EXT_blend_color "
-			"GL_EXT_blend_equation_separate "
-			"GL_EXT_blend_func_separate "
-			"GL_EXT_blend_logic_op "
- 			"GL_EXT_blend_minmax "
- 			"GL_EXT_blend_subtract "
-			"GL_EXT_clip_volume_hint "
-			"GL_EXT_copy_texture "
-			"GL_EXT_draw_range_elements "
-			"GL_EXT_fog_coord "
-			"GL_EXT_framebuffer_object "
-			"GL_EXT_multi_draw_arrays "
-			"GL_EXT_packed_pixels "
-			"GL_EXT_paletted_texture "
-			"GL_EXT_point_parameters "
-			"GL_EXT_polygon_offset "
-			"GL_EXT_rescale_normal "
-			"GL_EXT_secondary_color "
-			"GL_EXT_separate_specular_color "
-			"GL_EXT_shadow_funcs "
-			"GL_EXT_shared_texture_palette "
- 			"GL_EXT_stencil_two_side "
-			"GL_EXT_stencil_wrap "
-			"GL_EXT_subtexture "
-			"GL_EXT_texture "
-			"GL_EXT_texture3D "
-			"GL_EXT_texture_compression_dxt1 "
-			"GL_EXT_texture_compression_s3tc "
-			"GL_EXT_texture_edge_clamp "
- 			"GL_EXT_texture_env_add "
- 			"GL_EXT_texture_env_combine "
- 			"GL_EXT_texture_env_dot3 "
- 			"GL_EXT_texture_filter_anisotropic "
-			"GL_EXT_texture_lod "
- 			"GL_EXT_texture_lod_bias "
- 			"GL_EXT_texture_mirror_clamp "
-			"GL_EXT_texture_object "
-			"GL_EXT_texture_rectangle "
-			"GL_EXT_vertex_array "
-			"GL_3DFX_texture_compression_FXT1 "
-			"GL_APPLE_packed_pixels "
-			"GL_ATI_draw_buffers "
-			"GL_ATI_texture_env_combine3 "
-			"GL_ATI_texture_mirror_once "
- 			"GL_HP_occlusion_test "
-			"GL_IBM_texture_mirrored_repeat "
-			"GL_INGR_blend_func_separate "
-			"GL_MESA_pack_invert "
-			"GL_MESA_ycbcr_texture "
-			"GL_NV_blend_square "
-			"GL_NV_depth_clamp "
-			"GL_NV_fog_distance "
-			"GL_NV_fragment_program "
-			"GL_NV_fragment_program_option "
-			"GL_NV_fragment_program2 "
-			"GL_NV_light_max_exponent "
-			"GL_NV_multisample_filter_hint "
-			"GL_NV_point_sprite "
-			"GL_NV_texgen_reflection "
-			"GL_NV_texture_compression_vtc "
-			"GL_NV_texture_env_combine4 "
-			"GL_NV_texture_expand_normal "
-			"GL_NV_texture_rectangle "
-			"GL_NV_vertex_program "
-			"GL_NV_vertex_program1_1 "
-			"GL_NV_vertex_program2 "
-			"GL_NV_vertex_program2_option "
-			"GL_NV_vertex_program3 "
-			"GL_OES_compressed_paletted_texture "
-			"GL_SGI_color_matrix "
-			"GL_SGI_color_table "
-			"GL_SGIS_generate_mipmap "
-			"GL_SGIS_multisample "
-			"GL_SGIS_point_parameters "
-			"GL_SGIS_texture_border_clamp "
-			"GL_SGIS_texture_edge_clamp "
-			"GL_SGIS_texture_lod "
-			"GL_SGIX_depth_texture "
-			"GL_SGIX_shadow "
-			"GL_SGIX_shadow_ambient "
-			"GL_SUN_slice_accum "
-			;
+static const char GLServerExtensions[] =
+    "GL_ARB_depth_texture "
+    "GL_ARB_draw_buffers "
+    "GL_ARB_fragment_program "
+    "GL_ARB_fragment_program_shadow "
+    "GL_ARB_imaging "
+    "GL_ARB_multisample "
+    "GL_ARB_multitexture "
+    "GL_ARB_occlusion_query "
+    "GL_ARB_point_parameters "
+    "GL_ARB_point_sprite "
+    "GL_ARB_shadow "
+    "GL_ARB_shadow_ambient "
+    "GL_ARB_texture_border_clamp "
+    "GL_ARB_texture_compression "
+    "GL_ARB_texture_cube_map "
+    "GL_ARB_texture_env_add "
+    "GL_ARB_texture_env_combine "
+    "GL_ARB_texture_env_crossbar "
+    "GL_ARB_texture_env_dot3 "
+    "GL_ARB_texture_mirrored_repeat "
+    "GL_ARB_texture_non_power_of_two "
+    "GL_ARB_transpose_matrix "
+    "GL_ARB_vertex_program "
+    "GL_ARB_window_pos "
+    "GL_EXT_abgr "
+    "GL_EXT_bgra "
+    "GL_EXT_blend_color "
+    "GL_EXT_blend_equation_separate "
+    "GL_EXT_blend_func_separate "
+    "GL_EXT_blend_logic_op "
+    "GL_EXT_blend_minmax "
+    "GL_EXT_blend_subtract "
+    "GL_EXT_clip_volume_hint "
+    "GL_EXT_copy_texture "
+    "GL_EXT_draw_range_elements "
+    "GL_EXT_fog_coord "
+    "GL_EXT_framebuffer_object "
+    "GL_EXT_multi_draw_arrays "
+    "GL_EXT_packed_pixels "
+    "GL_EXT_paletted_texture "
+    "GL_EXT_point_parameters "
+    "GL_EXT_polygon_offset "
+    "GL_EXT_rescale_normal "
+    "GL_EXT_secondary_color "
+    "GL_EXT_separate_specular_color "
+    "GL_EXT_shadow_funcs "
+    "GL_EXT_shared_texture_palette "
+    "GL_EXT_stencil_two_side "
+    "GL_EXT_stencil_wrap "
+    "GL_EXT_subtexture "
+    "GL_EXT_texture "
+    "GL_EXT_texture3D "
+    "GL_EXT_texture_compression_dxt1 "
+    "GL_EXT_texture_compression_s3tc "
+    "GL_EXT_texture_edge_clamp "
+    "GL_EXT_texture_env_add "
+    "GL_EXT_texture_env_combine "
+    "GL_EXT_texture_env_dot3 "
+    "GL_EXT_texture_filter_anisotropic "
+    "GL_EXT_texture_lod "
+    "GL_EXT_texture_lod_bias "
+    "GL_EXT_texture_mirror_clamp "
+    "GL_EXT_texture_object "
+    "GL_EXT_texture_rectangle "
+    "GL_EXT_vertex_array "
+    "GL_3DFX_texture_compression_FXT1 "
+    "GL_APPLE_packed_pixels "
+    "GL_ATI_draw_buffers "
+    "GL_ATI_texture_env_combine3 "
+    "GL_ATI_texture_mirror_once "
+    "GL_HP_occlusion_test "
+    "GL_IBM_texture_mirrored_repeat "
+    "GL_INGR_blend_func_separate "
+    "GL_MESA_pack_invert "
+    "GL_MESA_ycbcr_texture "
+    "GL_NV_blend_square "
+    "GL_NV_depth_clamp "
+    "GL_NV_fog_distance "
+    "GL_NV_fragment_program "
+    "GL_NV_fragment_program_option "
+    "GL_NV_fragment_program2 "
+    "GL_NV_light_max_exponent "
+    "GL_NV_multisample_filter_hint "
+    "GL_NV_point_sprite "
+    "GL_NV_texgen_reflection "
+    "GL_NV_texture_compression_vtc "
+    "GL_NV_texture_env_combine4 "
+    "GL_NV_texture_expand_normal "
+    "GL_NV_texture_rectangle "
+    "GL_NV_vertex_program "
+    "GL_NV_vertex_program1_1 "
+    "GL_NV_vertex_program2 "
+    "GL_NV_vertex_program2_option "
+    "GL_NV_vertex_program3 "
+    "GL_OES_compressed_paletted_texture "
+    "GL_SGI_color_matrix "
+    "GL_SGI_color_table "
+    "GL_SGIS_generate_mipmap "
+    "GL_SGIS_multisample "
+    "GL_SGIS_point_parameters "
+    "GL_SGIS_texture_border_clamp "
+    "GL_SGIS_texture_edge_clamp "
+    "GL_SGIS_texture_lod "
+    "GL_SGIX_depth_texture "
+    "GL_SGIX_shadow " "GL_SGIX_shadow_ambient " "GL_SUN_slice_accum ";
 
 /*
 ** We have made the simplifying assuption that the same extensions are 
@@ -170,24 +168,20 @@ static char GLXServerVendorName[] = "SGI";
 unsigned glxMajorVersion = SERVER_GLX_MAJOR_VERSION;
 unsigned glxMinorVersion = SERVER_GLX_MINOR_VERSION;
 static char GLXServerExtensions[] =
-			"GLX_ARB_multisample "
-			"GLX_EXT_visual_info "
-			"GLX_EXT_visual_rating "
-			"GLX_EXT_import_context "
-                        "GLX_EXT_texture_from_pixmap "
-			"GLX_OML_swap_method "
-			"GLX_SGI_make_current_read "
+    "GLX_ARB_multisample "
+    "GLX_EXT_visual_info "
+    "GLX_EXT_visual_rating "
+    "GLX_EXT_import_context "
+    "GLX_EXT_texture_from_pixmap "
+    "GLX_OML_swap_method " "GLX_SGI_make_current_read "
 #ifndef __APPLE__
-			"GLX_SGIS_multisample "
+    "GLX_SGIS_multisample "
 #endif
-			"GLX_SGIX_fbconfig "
-			"GLX_SGIX_pbuffer "
-			"GLX_MESA_copy_sub_buffer "
-                        "GLX_INTEL_swap_event"
-			;
+    "GLX_SGIX_fbconfig "
+    "GLX_SGIX_pbuffer " "GLX_MESA_copy_sub_buffer " "GLX_INTEL_swap_event";
 
 static Bool
-glxCloseScreen (int index, ScreenPtr pScreen)
+glxCloseScreen(int index, ScreenPtr pScreen)
 {
     __GLXscreen *pGlxScreen = glxGetScreen(pScreen);
 
@@ -204,23 +198,24 @@ glxGetScreen(ScreenPtr pScreen)
     return dixLookupPrivate(&pScreen->devPrivates, glxScreenPrivateKey);
 }
 
-_X_EXPORT void GlxSetVisualConfigs(int nconfigs,
-                         void *configs, void **privates)
+_X_EXPORT void
+GlxSetVisualConfigs(int nconfigs, void *configs, void **privates)
 {
     /* We keep this stub around for the DDX drivers that still
      * call it. */
 }
 
-GLint glxConvertToXVisualType(int visualType)
+GLint
+glxConvertToXVisualType(int visualType)
 {
     static const int x_visual_types[] = {
-	TrueColor,   DirectColor,
-	PseudoColor, StaticColor,
-	GrayScale,   StaticGray
+        TrueColor, DirectColor,
+        PseudoColor, StaticColor,
+        GrayScale, StaticGray
     };
 
-    return ( (unsigned) (visualType - GLX_TRUE_COLOR) < 6 )
-	? x_visual_types[ visualType - GLX_TRUE_COLOR ] : -1;
+    return ((unsigned) (visualType - GLX_TRUE_COLOR) < 6)
+        ? x_visual_types[visualType - GLX_TRUE_COLOR] : -1;
 }
 
 /* This code inspired by composite/compinit.c.  We could move this to
@@ -229,23 +224,23 @@ GLint glxConvertToXVisualType(int visualType)
 static VisualPtr
 AddScreenVisuals(ScreenPtr pScreen, int count, int d)
 {
-    int		 i;
-    DepthPtr	 depth;
+    int i;
+    DepthPtr depth;
 
     depth = NULL;
     for (i = 0; i < pScreen->numDepths; i++) {
-	if (pScreen->allowedDepths[i].depth == d) {
-	    depth = &pScreen->allowedDepths[i];
-	    break;
-	}
+        if (pScreen->allowedDepths[i].depth == d) {
+            depth = &pScreen->allowedDepths[i];
+            break;
+        }
     }
     if (depth == NULL)
-	return NULL;
+        return NULL;
 
     if (ResizeVisualArray(pScreen, count, depth) == FALSE)
         return NULL;
 
-    /* Return a pointer to the first of the added visuals. */ 
+    /* Return a pointer to the first of the added visuals. */
     return pScreen->visuals + pScreen->numVisuals - count;
 }
 
@@ -255,16 +250,17 @@ findFirstSet(unsigned int v)
     int i;
 
     for (i = 0; i < 32; i++)
-	if (v & (1 << i))
-	    return i;
+        if (v & (1 << i))
+            return i;
 
     return -1;
 }
 
 static void
-initGlxVisual(VisualPtr visual, __GLXconfig *config)
+initGlxVisual(VisualPtr visual, __GLXconfig * config)
 {
     int maxBits;
+
     maxBits = max(config->redBits, max(config->greenBits, config->blueBits));
 
     config->visualID = visual->vid;
@@ -282,59 +278,60 @@ initGlxVisual(VisualPtr visual, __GLXconfig *config)
 }
 
 static __GLXconfig *
-pickFBConfig(__GLXscreen *pGlxScreen, VisualPtr visual)
+pickFBConfig(__GLXscreen * pGlxScreen, VisualPtr visual)
 {
     __GLXconfig *best = NULL, *config;
     int best_score = 0;
 
     for (config = pGlxScreen->fbconfigs; config != NULL; config = config->next) {
-	int score = 0;
-
-	if (config->redMask != visual->redMask ||
-	    config->greenMask != visual->greenMask ||
-	    config->blueMask != visual->blueMask)
-	    continue;
-	if (config->visualRating != GLX_NONE)
-	    continue;
-	if (glxConvertToXVisualType(config->visualType) != visual->class)
-	    continue;
-	/* If it's the 32-bit RGBA visual, demand a 32-bit fbconfig. */
-	if (visual->nplanes == 32 && config->rgbBits != 32)
-	    continue;
-	/* Can't use the same FBconfig for multiple X visuals.  I think. */
-	if (config->visualID != 0)
-	    continue;
-
-	if (config->doubleBufferMode > 0)
-	    score += 8;
-	if (config->depthBits > 0)
-	    score += 4;
-	if (config->stencilBits > 0)
-	    score += 2;
-	if (config->alphaBits > 0)
-	    score++;
-
-	if (score > best_score) {
-	    best = config;
-	    best_score = score;
-	}
+        int score = 0;
+
+        if (config->redMask != visual->redMask ||
+            config->greenMask != visual->greenMask ||
+            config->blueMask != visual->blueMask)
+            continue;
+        if (config->visualRating != GLX_NONE)
+            continue;
+        if (glxConvertToXVisualType(config->visualType) != visual->class)
+            continue;
+        /* If it's the 32-bit RGBA visual, demand a 32-bit fbconfig. */
+        if (visual->nplanes == 32 && config->rgbBits != 32)
+            continue;
+        /* Can't use the same FBconfig for multiple X visuals.  I think. */
+        if (config->visualID != 0)
+            continue;
+
+        if (config->doubleBufferMode > 0)
+            score += 8;
+        if (config->depthBits > 0)
+            score += 4;
+        if (config->stencilBits > 0)
+            score += 2;
+        if (config->alphaBits > 0)
+            score++;
+
+        if (score > best_score) {
+            best = config;
+            best_score = score;
+        }
     }
 
     return best;
 }
 
-void __glXScreenInit(__GLXscreen *pGlxScreen, ScreenPtr pScreen)
+void
+__glXScreenInit(__GLXscreen * pGlxScreen, ScreenPtr pScreen)
 {
     __GLXconfig *m;
     __GLXconfig *config;
     int i;
 
     if (!dixRegisterPrivateKey(&glxScreenPrivateKeyRec, PRIVATE_SCREEN, 0))
-	return;
+        return;
 
-    pGlxScreen->pScreen       = pScreen;
-    pGlxScreen->GLextensions  = strdup(GLServerExtensions);
-    pGlxScreen->GLXvendor     = strdup(GLXServerVendorName);
+    pGlxScreen->pScreen = pScreen;
+    pGlxScreen->GLextensions = strdup(GLServerExtensions);
+    pGlxScreen->GLXvendor = strdup(GLXServerVendorName);
     pGlxScreen->GLXextensions = strdup(GLXServerExtensions);
 
     /* All GLX providers must support all of the functionality required for at
@@ -343,22 +340,22 @@ void __glXScreenInit(__GLXscreen *pGlxScreen, ScreenPtr pScreen)
      * most providers, the screen-probe routine is the caller of this
      * function.
      */
-    pGlxScreen->GLXmajor      = 1;
-    pGlxScreen->GLXminor      = 2;
+    pGlxScreen->GLXmajor = 1;
+    pGlxScreen->GLXminor = 2;
 
     pGlxScreen->CloseScreen = pScreen->CloseScreen;
     pScreen->CloseScreen = glxCloseScreen;
 
     i = 0;
     for (m = pGlxScreen->fbconfigs; m != NULL; m = m->next) {
-	m->fbconfigID = FakeClientID(0);
-	m->visualID = 0;
-	i++;
+        m->fbconfigID = FakeClientID(0);
+        m->visualID = 0;
+        i++;
     }
     pGlxScreen->numFBConfigs = i;
 
     pGlxScreen->visuals =
-	calloc(pGlxScreen->numFBConfigs, sizeof (__GLXconfig *));
+        calloc(pGlxScreen->numFBConfigs, sizeof(__GLXconfig *));
 
     /* First, try to choose featureful FBconfigs for the existing X visuals.
      * Note that if multiple X visuals end up with the same FBconfig being
@@ -366,62 +363,63 @@ void __glXScreenInit(__GLXscreen *pGlxScreen, ScreenPtr pScreen)
      * prioritize the root visual being GLX).
      */
     for (i = 0; i < pScreen->numVisuals; i++) {
-	VisualPtr visual = &pScreen->visuals[i];
+        VisualPtr visual = &pScreen->visuals[i];
 
-	config = pickFBConfig(pGlxScreen, visual);
-	if (config) {
-	    pGlxScreen->visuals[pGlxScreen->numVisuals++] = config;
-	    config->visualID = visual->vid;
-	}
+        config = pickFBConfig(pGlxScreen, visual);
+        if (config) {
+            pGlxScreen->visuals[pGlxScreen->numVisuals++] = config;
+            config->visualID = visual->vid;
+        }
     }
 
     /* Then, add new visuals corresponding to all FBconfigs that didn't have
      * an existing, appropriate visual.
      */
     for (config = pGlxScreen->fbconfigs; config != NULL; config = config->next) {
-	int depth;
-
-	VisualPtr visual;
-
-	if (config->visualID != 0)
-	    continue;
-
-	/* Only count RGB bits and not alpha, as we're not trying to create
-	 * visuals for compositing (that's what the 32-bit composite visual
-	 * set up above is for.
-	 */
-	depth = config->redBits + config->greenBits + config->blueBits;
-
-	/* Make sure that our FBconfig's depth can actually be displayed
-	 * (corresponds to an existing visual).
-	 */
-	for (i = 0; i < pScreen->numVisuals; i++) {
-	    if (depth == pScreen->visuals[i].nplanes)
-		break;
-	}
-	/* if it can't, fix up the fbconfig to not advertise window support */
-	if (i == pScreen->numVisuals)
-	    config->drawableType &= ~(GLX_WINDOW_BIT);
-
-       /* fbconfig must support window drawables */
-	if (!(config->drawableType & GLX_WINDOW_BIT)) {
-	    config->visualID = 0;
-	    continue;
-	}
-
-	/* Create a new X visual for our FBconfig. */
-	visual = AddScreenVisuals(pScreen, 1, depth);
-	if (visual == NULL)
-	    continue;
-
-	pGlxScreen->visuals[pGlxScreen->numVisuals++] = config;
-	initGlxVisual(visual, config);
+        int depth;
+
+        VisualPtr visual;
+
+        if (config->visualID != 0)
+            continue;
+
+        /* Only count RGB bits and not alpha, as we're not trying to create
+         * visuals for compositing (that's what the 32-bit composite visual
+         * set up above is for.
+         */
+        depth = config->redBits + config->greenBits + config->blueBits;
+
+        /* Make sure that our FBconfig's depth can actually be displayed
+         * (corresponds to an existing visual).
+         */
+        for (i = 0; i < pScreen->numVisuals; i++) {
+            if (depth == pScreen->visuals[i].nplanes)
+                break;
+        }
+        /* if it can't, fix up the fbconfig to not advertise window support */
+        if (i == pScreen->numVisuals)
+            config->drawableType &= ~(GLX_WINDOW_BIT);
+
+        /* fbconfig must support window drawables */
+        if (!(config->drawableType & GLX_WINDOW_BIT)) {
+            config->visualID = 0;
+            continue;
+        }
+
+        /* Create a new X visual for our FBconfig. */
+        visual = AddScreenVisuals(pScreen, 1, depth);
+        if (visual == NULL)
+            continue;
+
+        pGlxScreen->visuals[pGlxScreen->numVisuals++] = config;
+        initGlxVisual(visual, config);
     }
 
     dixSetPrivate(&pScreen->devPrivates, glxScreenPrivateKey, pGlxScreen);
 }
 
-void __glXScreenDestroy(__GLXscreen *screen)
+void
+__glXScreenDestroy(__GLXscreen * screen)
 {
     free(screen->GLXvendor);
     free(screen->GLXextensions);