Synchronised line endinge with release branch

47 files changed, 25403 insertions, 25403 deletions

diff --git a/xorg-server/hw/xquartz/GL/capabilities.c b/xorg-server/hw/xquartz/GL/capabilities.c
index da52cc7c4..dd3f855f4 100644
--- a/xorg-server/hw/xquartz/GL/capabilities.c
+++ b/xorg-server/hw/xquartz/GL/capabilities.c
@@ -1,543 +1,543 @@
-/*

- * Copyright (c) 2008 Apple Inc.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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.

- */

-

-#include <stdio.h>

-#include <stdlib.h>

-#include <assert.h>

-#include <OpenGL/OpenGL.h>

-#include <OpenGL/gl.h>

-#include <OpenGL/glu.h>

-#include <OpenGL/glext.h>

-#include <ApplicationServices/ApplicationServices.h>

-

-#include "capabilities.h"

-

-#define Cursor X_Cursor

-#include "os.h"

-#undef Cursor

-

-static void handleBufferModes(struct glCapabilitiesConfig *c, GLint bufferModes) {

-    if(bufferModes & kCGLStereoscopicBit) {

-	c->stereo = true;

-    }

-

-    if(bufferModes & kCGLDoubleBufferBit) {

-	c->buffers = 2;

-    } else {

-	c->buffers = 1;

-    }

-}

-

-static void handleStencilModes(struct glCapabilitiesConfig *c, GLint smodes) {

-    int offset = 0;

-    

-    if(kCGL0Bit & smodes)

-	c->stencil_bit_depths[offset++] = 0;

-

-    if(kCGL1Bit & smodes)

-	c->stencil_bit_depths[offset++] = 1;

-

-    if(kCGL2Bit & smodes)

-	c->stencil_bit_depths[offset++] = 2;

-    

-    if(kCGL3Bit & smodes)

-	c->stencil_bit_depths[offset++] = 3;

-

-    if(kCGL4Bit & smodes)

-	c->stencil_bit_depths[offset++] = 4;

-

-    if(kCGL5Bit & smodes)

-	c->stencil_bit_depths[offset++] = 5;

-    

-    if(kCGL6Bit & smodes)

-	c->stencil_bit_depths[offset++] = 6;

-

-    if(kCGL8Bit & smodes)

-	c->stencil_bit_depths[offset++] = 8;

-

-    if(kCGL10Bit & smodes)

-	c->stencil_bit_depths[offset++] = 10;

-

-    if(kCGL12Bit & smodes)

-	c->stencil_bit_depths[offset++] = 12;

-

-    if(kCGL16Bit & smodes)

-	c->stencil_bit_depths[offset++] = 16;

-

-    if(kCGL24Bit & smodes)

-	c->stencil_bit_depths[offset++] = 24;

-

-    if(kCGL32Bit & smodes)

-	c->stencil_bit_depths[offset++] = 32;

-    

-    if(kCGL48Bit & smodes)

-	c->stencil_bit_depths[offset++] = 48;

-    

-    if(kCGL64Bit & smodes)

-	c->stencil_bit_depths[offset++] = 64;

-    

-    if(kCGL96Bit & smodes)

-	c->stencil_bit_depths[offset++] = 96;

-    

-    if(kCGL128Bit & smodes)

-	c->stencil_bit_depths[offset++] = 128;

-

-    assert(offset < GLCAPS_STENCIL_BIT_DEPTH_BUFFERS);

-

-    c->total_stencil_bit_depths = offset;

-}

-

-static int handleColorAndAccumulation(struct glColorBufCapabilities *c, 

-				       GLint cmodes, int forAccum) {

-    int offset = 0;

-        

-    /*1*/

-    if(kCGLRGB444Bit & cmodes) {

-	c[offset].r = 4;

-	c[offset].g = 4; 

-	c[offset].b = 4;

-	++offset;

-    }

-    

-    /*2*/

-    if(kCGLARGB4444Bit & cmodes) {

-	c[offset].a = 4;

-	c[offset].r = 4;

-	c[offset].g = 4;

-	c[offset].b = 4;

-	c[offset].is_argb = true;

-	++offset;

-    }

-    

-    /*3*/

-    if(kCGLRGB444A8Bit & cmodes) {

-	c[offset].r = 4;

-	c[offset].g = 4;

-	c[offset].b = 4;

-	c[offset].a = 8;

-	++offset;

-    }

-

-    /*4*/

-    if(kCGLRGB555Bit & cmodes) {

-	c[offset].r = 5;

-	c[offset].g = 5;

-	c[offset].b = 5;

-	++offset;

-    }

-

-    /*5*/

-    if(kCGLARGB1555Bit & cmodes) {

-	c[offset].a = 1;

-	c[offset].r = 5;

-	c[offset].g = 5;

-	c[offset].b = 5;

-	c[offset].is_argb = true;

-	++offset;

-    }

-

-    /*6*/

-    if(kCGLRGB555A8Bit & cmodes) {

-	c[offset].r = 5;

-	c[offset].g = 5; 

-	c[offset].b = 5;

-	c[offset].a = 8;

-	++offset;

-    }

-

-    /*7*/

-    if(kCGLRGB565Bit & cmodes) {

-	c[offset].r = 5;

-	c[offset].g = 6;

-	c[offset].b = 5;

-	++offset;

-    }

-

-    /*8*/

-    if(kCGLRGB565A8Bit & cmodes) {

-	c[offset].r = 5;

-	c[offset].g = 6;

-	c[offset].b = 5;

-	c[offset].a = 8;

-	++offset;

-    }

-

-    /*9*/

-    if(kCGLRGB888Bit & cmodes) {

-	c[offset].r = 8;

-	c[offset].g = 8;

-	c[offset].b = 8;

-	++offset;

-    }

-

-    /*10*/

-    if(kCGLARGB8888Bit & cmodes) {

-	c[offset].a = 8;

-	c[offset].r = 8;

-	c[offset].g = 8;

-	c[offset].b = 8;

-	c[offset].is_argb = true;

-	++offset;

-    }

-

-    /*11*/

-    if(kCGLRGB888A8Bit & cmodes) {

-	c[offset].r = 8;

-	c[offset].g = 8;

-	c[offset].b = 8;

-	c[offset].a = 8;

-	++offset;

-    }

-

-    if(forAccum) {

-//#if 0

-    /* FIXME

-     * Disable this path, because some part of libGL, X, or Xplugin 

-     * doesn't work with sizes greater than 8.

-     * When this is enabled and visuals are chosen using depths

-     * such as 16, the result is that the windows don't redraw

-     * and are often white, until a resize.

-     */

-

-    /*12*/

-    if(kCGLRGB101010Bit & cmodes) {

-	c[offset].r = 10;

-	c[offset].g = 10;

-	c[offset].b = 10;

-	++offset;

-    }

-

-    /*13*/

-    if(kCGLARGB2101010Bit & cmodes) {

-	c[offset].a = 2;

-	c[offset].r = 10;

-	c[offset].g = 10;

-	c[offset].b = 10;

-	c[offset].is_argb = true;

-	++offset;

-    }

-

-    /*14*/

-    if(kCGLRGB101010_A8Bit & cmodes) {

-	c[offset].r = 10;

-	c[offset].g = 10;

-	c[offset].b = 10;

-	c[offset].a = 8;

-	++offset;

-    }

-

-    /*15*/

-    if(kCGLRGB121212Bit & cmodes) {

-	c[offset].r = 12;

-	c[offset].g = 12;

-	c[offset].b = 12;

-	++offset;	

-    }

-

-    /*16*/

-    if(kCGLARGB12121212Bit & cmodes) {

-	c[offset].a = 12;

-	c[offset].r = 12;

-	c[offset].g = 12;

-	c[offset].b = 12;

-	c[offset].is_argb = true;

-	++offset;

-    }

-

-    /*17*/

-    if(kCGLRGB161616Bit & cmodes) {

-	c[offset].r = 16;

-	c[offset].g = 16;

-	c[offset].b = 16;

-	++offset;

-    }

-

-    /*18*/

-    if(kCGLRGBA16161616Bit & cmodes) {

-	c[offset].r = 16;

-	c[offset].g = 16;

-	c[offset].b = 16;

-	c[offset].a = 16;

-	++offset;

-    }

-    }

-//#endif

-

-    /* FIXME should we handle the floating point color modes, and if so, how? */

-      

-    return offset;

-}

-

-

-static void handleColorModes(struct glCapabilitiesConfig *c, GLint cmodes) {

-    c->total_color_buffers = handleColorAndAccumulation(c->color_buffers,

-							cmodes, 0);

-    

-    assert(c->total_color_buffers < GLCAPS_COLOR_BUFFERS);

-}

-

-static void handleAccumulationModes(struct glCapabilitiesConfig *c, GLint cmodes) {

-    c->total_accum_buffers = handleColorAndAccumulation(c->accum_buffers,

-							cmodes, 1);

-    assert(c->total_accum_buffers < GLCAPS_COLOR_BUFFERS);

-}

-

-static void handleDepthModes(struct glCapabilitiesConfig *c, GLint dmodes) {

-    int offset = 0;

-#define DEPTH(flag,value) do { \

-	if(dmodes & flag) { \

-	    c->depth_buffers[offset++] = value; \

-	} \

-    } while(0)

-

-    /*1*/

-    DEPTH(kCGL0Bit, 0);

-    /*2*/

-    DEPTH(kCGL1Bit, 1);

-    /*3*/

-    DEPTH(kCGL2Bit, 2);

-    /*4*/

-    DEPTH(kCGL3Bit, 3);

-    /*5*/

-    DEPTH(kCGL4Bit, 4);

-    /*6*/

-    DEPTH(kCGL5Bit, 5);

-    /*7*/

-    DEPTH(kCGL6Bit, 6);

-    /*8*/

-    DEPTH(kCGL8Bit, 8);

-    /*9*/

-    DEPTH(kCGL10Bit, 10);

-    /*10*/

-    DEPTH(kCGL12Bit, 12);

-    /*11*/

-    DEPTH(kCGL16Bit, 16);

-    /*12*/

-    DEPTH(kCGL24Bit, 24);

-    /*13*/

-    DEPTH(kCGL32Bit, 32);

-    /*14*/

-    DEPTH(kCGL48Bit, 48);

-    /*15*/

-    DEPTH(kCGL64Bit, 64);

-    /*16*/

-    DEPTH(kCGL96Bit, 96);

-    /*17*/

-    DEPTH(kCGL128Bit, 128);

-

-#undef DEPTH

-

-    c->total_depth_buffer_depths = offset;

-    assert(c->total_depth_buffer_depths < GLCAPS_DEPTH_BUFFERS);

-}

-

-/* Return non-zero if an error occured. */

-static CGLError handleRendererDescriptions(CGLRendererInfoObj info, GLint r, 

-					   struct glCapabilitiesConfig *c) {

-    CGLError err;

-    GLint accelerated = 0, flags = 0, aux = 0, samplebufs = 0, samples = 0;

-

-    err = CGLDescribeRenderer (info, r, kCGLRPAccelerated, &accelerated);

-

-    if(err)

-	return err;

-    

-    c->accelerated = accelerated;

-

-    /* Buffering modes: single/double, stereo */

-    err = CGLDescribeRenderer(info, r, kCGLRPBufferModes, &flags);

-

-    if(err)

-	return err;

-    

-    handleBufferModes(c, flags);

-    

-    /* AUX buffers */

-    err = CGLDescribeRenderer(info, r, kCGLRPMaxAuxBuffers, &aux);

-

-    if(err)

-	return err;

-    

-    c->aux_buffers = aux;

-

-    

-    /* Depth buffer size */

-    err = CGLDescribeRenderer(info, r, kCGLRPDepthModes, &flags);

-    

-    if(err)

-	return err;

-

-    handleDepthModes(c, flags);

-

-

-    /* Multisample buffers */

-    err = CGLDescribeRenderer(info, r, kCGLRPMaxSampleBuffers, &samplebufs);

-

-    if(err)

-	return err;

-

-    c->multisample_buffers = samplebufs;

-    

-

-    /* Multisample samples per multisample buffer */

-    err = CGLDescribeRenderer(info, r, kCGLRPMaxSamples, &samples);

-

-    if(err)

-	return err;

-

-    c->multisample_samples = samples;

-

-

-    /* Stencil bit depths */

-    err = CGLDescribeRenderer(info, r, kCGLRPStencilModes, &flags);

-

-    if(err)

-	return err;

-

-    handleStencilModes(c, flags);   

-

-

-    /* Color modes (RGB/RGBA depths supported */

-    err = CGLDescribeRenderer(info, r, kCGLRPColorModes, &flags);

-

-    if(err)

-	return err;

-    

-    handleColorModes(c, flags);

-

-    err = CGLDescribeRenderer(info, r, kCGLRPAccumModes, &flags);

-

-    if(err)

-	return err;

-

-    handleAccumulationModes(c, flags);

-    

-    return kCGLNoError;

-}

-

-static void initCapabilities(struct glCapabilities *cap) {

-    cap->configurations = NULL;

-    cap->total_configurations = 0;

-}

-

-static void initConfig(struct glCapabilitiesConfig *c) {

-    int i;

-

-    c->accelerated = false;

-    c->stereo = false;

-    c->aux_buffers = 0;

-    c->buffers = 0;

-

-    c->total_depth_buffer_depths = 0;

-

-    for(i = 0; i < GLCAPS_DEPTH_BUFFERS; ++i) {

-	c->depth_buffers[i] = GLCAPS_INVALID_DEPTH_VALUE;

-    }

-

-    c->multisample_buffers = 0;

-    c->multisample_samples = 0;

-

-    c->total_stencil_bit_depths = 0;

-

-    for(i = 0; i < GLCAPS_STENCIL_BIT_DEPTH_BUFFERS; ++i) {

-	c->stencil_bit_depths[i] = GLCAPS_INVALID_STENCIL_DEPTH;

-    }

-   

-    c->total_color_buffers = 0;

-

-    for(i = 0; i < GLCAPS_COLOR_BUFFERS; ++i) {

-	c->color_buffers[i].r =	c->color_buffers[i].g =

-	    c->color_buffers[i].b = c->color_buffers[i].a = 

-	    GLCAPS_COLOR_BUF_INVALID_VALUE;

-	c->color_buffers[i].is_argb = false;

-     }

-

-    c->total_accum_buffers = 0;

-

-    for(i = 0; i < GLCAPS_COLOR_BUFFERS; ++i) {

-	c->accum_buffers[i].r = c->accum_buffers[i].g =

-	    c->accum_buffers[i].b = c->accum_buffers[i].a =

-	    GLCAPS_COLOR_BUF_INVALID_VALUE;

-	c->accum_buffers[i].is_argb = false;

-    }

-

-    c->next = NULL;

-}

-

-void freeGlCapabilities(struct glCapabilities *cap) {

-    struct glCapabilitiesConfig *conf, *next;

-    

-    conf = cap->configurations;

-

-    while(conf) {

-	next = conf->next;

-	free(conf);

-	conf = next;

-    }

-

-    cap->configurations = NULL;    

-}

-

-/*Return true if an error occured. */

-bool getGlCapabilities(struct glCapabilities *cap) {

-	CGLRendererInfoObj info;

-    CGLError err;

-	GLint numRenderers = 0, r;

-

-    initCapabilities(cap);

-

-	err = CGLQueryRendererInfo((GLuint)-1, &info, &numRenderers);

-    if(err) {

-	    ErrorF("CGLQueryRendererInfo error: %s\n", CGLErrorString(err));

-        return err;

-	}

-

-	for(r = 0; r < numRenderers; r++) {

-	    struct glCapabilitiesConfig tmpconf, *conf;

-

-	    initConfig(&tmpconf);

-

-	    err = handleRendererDescriptions(info, r, &tmpconf);

-	    if(err) {

-            ErrorF("handleRendererDescriptions returned error: %s\n", CGLErrorString(err));

-            ErrorF("trying to continue...\n");

-            continue;

-	    }

-

-	    conf = malloc(sizeof(*conf));

-	    if(NULL == conf) {

-                FatalError("Unable to allocate memory for OpenGL capabilities\n");

-	    }

-

-	    /* Copy the struct. */

-	    *conf = tmpconf;

-

-	    /* Now link the configuration into the list. */

-	    conf->next = cap->configurations;

-	    cap->configurations = conf;

-	}

-

-    CGLDestroyRendererInfo(info);

-

-    /* No error occured.  We are done. */

-    return kCGLNoError;

-}

+/*
+ * Copyright (c) 2008 Apple Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <OpenGL/OpenGL.h>
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#include <OpenGL/glext.h>
+#include <ApplicationServices/ApplicationServices.h>
+
+#include "capabilities.h"
+
+#define Cursor X_Cursor
+#include "os.h"
+#undef Cursor
+
+static void handleBufferModes(struct glCapabilitiesConfig *c, GLint bufferModes) {
+    if(bufferModes & kCGLStereoscopicBit) {
+	c->stereo = true;
+    }
+
+    if(bufferModes & kCGLDoubleBufferBit) {
+	c->buffers = 2;
+    } else {
+	c->buffers = 1;
+    }
+}
+
+static void handleStencilModes(struct glCapabilitiesConfig *c, GLint smodes) {
+    int offset = 0;
+    
+    if(kCGL0Bit & smodes)
+	c->stencil_bit_depths[offset++] = 0;
+
+    if(kCGL1Bit & smodes)
+	c->stencil_bit_depths[offset++] = 1;
+
+    if(kCGL2Bit & smodes)
+	c->stencil_bit_depths[offset++] = 2;
+    
+    if(kCGL3Bit & smodes)
+	c->stencil_bit_depths[offset++] = 3;
+
+    if(kCGL4Bit & smodes)
+	c->stencil_bit_depths[offset++] = 4;
+
+    if(kCGL5Bit & smodes)
+	c->stencil_bit_depths[offset++] = 5;
+    
+    if(kCGL6Bit & smodes)
+	c->stencil_bit_depths[offset++] = 6;
+
+    if(kCGL8Bit & smodes)
+	c->stencil_bit_depths[offset++] = 8;
+
+    if(kCGL10Bit & smodes)
+	c->stencil_bit_depths[offset++] = 10;
+
+    if(kCGL12Bit & smodes)
+	c->stencil_bit_depths[offset++] = 12;
+
+    if(kCGL16Bit & smodes)
+	c->stencil_bit_depths[offset++] = 16;
+
+    if(kCGL24Bit & smodes)
+	c->stencil_bit_depths[offset++] = 24;
+
+    if(kCGL32Bit & smodes)
+	c->stencil_bit_depths[offset++] = 32;
+    
+    if(kCGL48Bit & smodes)
+	c->stencil_bit_depths[offset++] = 48;
+    
+    if(kCGL64Bit & smodes)
+	c->stencil_bit_depths[offset++] = 64;
+    
+    if(kCGL96Bit & smodes)
+	c->stencil_bit_depths[offset++] = 96;
+    
+    if(kCGL128Bit & smodes)
+	c->stencil_bit_depths[offset++] = 128;
+
+    assert(offset < GLCAPS_STENCIL_BIT_DEPTH_BUFFERS);
+
+    c->total_stencil_bit_depths = offset;
+}
+
+static int handleColorAndAccumulation(struct glColorBufCapabilities *c, 
+				       GLint cmodes, int forAccum) {
+    int offset = 0;
+        
+    /*1*/
+    if(kCGLRGB444Bit & cmodes) {
+	c[offset].r = 4;
+	c[offset].g = 4; 
+	c[offset].b = 4;
+	++offset;
+    }
+    
+    /*2*/
+    if(kCGLARGB4444Bit & cmodes) {
+	c[offset].a = 4;
+	c[offset].r = 4;
+	c[offset].g = 4;
+	c[offset].b = 4;
+	c[offset].is_argb = true;
+	++offset;
+    }
+    
+    /*3*/
+    if(kCGLRGB444A8Bit & cmodes) {
+	c[offset].r = 4;
+	c[offset].g = 4;
+	c[offset].b = 4;
+	c[offset].a = 8;
+	++offset;
+    }
+
+    /*4*/
+    if(kCGLRGB555Bit & cmodes) {
+	c[offset].r = 5;
+	c[offset].g = 5;
+	c[offset].b = 5;
+	++offset;
+    }
+
+    /*5*/
+    if(kCGLARGB1555Bit & cmodes) {
+	c[offset].a = 1;
+	c[offset].r = 5;
+	c[offset].g = 5;
+	c[offset].b = 5;
+	c[offset].is_argb = true;
+	++offset;
+    }
+
+    /*6*/
+    if(kCGLRGB555A8Bit & cmodes) {
+	c[offset].r = 5;
+	c[offset].g = 5; 
+	c[offset].b = 5;
+	c[offset].a = 8;
+	++offset;
+    }
+
+    /*7*/
+    if(kCGLRGB565Bit & cmodes) {
+	c[offset].r = 5;
+	c[offset].g = 6;
+	c[offset].b = 5;
+	++offset;
+    }
+
+    /*8*/
+    if(kCGLRGB565A8Bit & cmodes) {
+	c[offset].r = 5;
+	c[offset].g = 6;
+	c[offset].b = 5;
+	c[offset].a = 8;
+	++offset;
+    }
+
+    /*9*/
+    if(kCGLRGB888Bit & cmodes) {
+	c[offset].r = 8;
+	c[offset].g = 8;
+	c[offset].b = 8;
+	++offset;
+    }
+
+    /*10*/
+    if(kCGLARGB8888Bit & cmodes) {
+	c[offset].a = 8;
+	c[offset].r = 8;
+	c[offset].g = 8;
+	c[offset].b = 8;
+	c[offset].is_argb = true;
+	++offset;
+    }
+
+    /*11*/
+    if(kCGLRGB888A8Bit & cmodes) {
+	c[offset].r = 8;
+	c[offset].g = 8;
+	c[offset].b = 8;
+	c[offset].a = 8;
+	++offset;
+    }
+
+    if(forAccum) {
+//#if 0
+    /* FIXME
+     * Disable this path, because some part of libGL, X, or Xplugin 
+     * doesn't work with sizes greater than 8.
+     * When this is enabled and visuals are chosen using depths
+     * such as 16, the result is that the windows don't redraw
+     * and are often white, until a resize.
+     */
+
+    /*12*/
+    if(kCGLRGB101010Bit & cmodes) {
+	c[offset].r = 10;
+	c[offset].g = 10;
+	c[offset].b = 10;
+	++offset;
+    }
+
+    /*13*/
+    if(kCGLARGB2101010Bit & cmodes) {
+	c[offset].a = 2;
+	c[offset].r = 10;
+	c[offset].g = 10;
+	c[offset].b = 10;
+	c[offset].is_argb = true;
+	++offset;
+    }
+
+    /*14*/
+    if(kCGLRGB101010_A8Bit & cmodes) {
+	c[offset].r = 10;
+	c[offset].g = 10;
+	c[offset].b = 10;
+	c[offset].a = 8;
+	++offset;
+    }
+
+    /*15*/
+    if(kCGLRGB121212Bit & cmodes) {
+	c[offset].r = 12;
+	c[offset].g = 12;
+	c[offset].b = 12;
+	++offset;	
+    }
+
+    /*16*/
+    if(kCGLARGB12121212Bit & cmodes) {
+	c[offset].a = 12;
+	c[offset].r = 12;
+	c[offset].g = 12;
+	c[offset].b = 12;
+	c[offset].is_argb = true;
+	++offset;
+    }
+
+    /*17*/
+    if(kCGLRGB161616Bit & cmodes) {
+	c[offset].r = 16;
+	c[offset].g = 16;
+	c[offset].b = 16;
+	++offset;
+    }
+
+    /*18*/
+    if(kCGLRGBA16161616Bit & cmodes) {
+	c[offset].r = 16;
+	c[offset].g = 16;
+	c[offset].b = 16;
+	c[offset].a = 16;
+	++offset;
+    }
+    }
+//#endif
+
+    /* FIXME should we handle the floating point color modes, and if so, how? */
+      
+    return offset;
+}
+
+
+static void handleColorModes(struct glCapabilitiesConfig *c, GLint cmodes) {
+    c->total_color_buffers = handleColorAndAccumulation(c->color_buffers,
+							cmodes, 0);
+    
+    assert(c->total_color_buffers < GLCAPS_COLOR_BUFFERS);
+}
+
+static void handleAccumulationModes(struct glCapabilitiesConfig *c, GLint cmodes) {
+    c->total_accum_buffers = handleColorAndAccumulation(c->accum_buffers,
+							cmodes, 1);
+    assert(c->total_accum_buffers < GLCAPS_COLOR_BUFFERS);
+}
+
+static void handleDepthModes(struct glCapabilitiesConfig *c, GLint dmodes) {
+    int offset = 0;
+#define DEPTH(flag,value) do { \
+	if(dmodes & flag) { \
+	    c->depth_buffers[offset++] = value; \
+	} \
+    } while(0)
+
+    /*1*/
+    DEPTH(kCGL0Bit, 0);
+    /*2*/
+    DEPTH(kCGL1Bit, 1);
+    /*3*/
+    DEPTH(kCGL2Bit, 2);
+    /*4*/
+    DEPTH(kCGL3Bit, 3);
+    /*5*/
+    DEPTH(kCGL4Bit, 4);
+    /*6*/
+    DEPTH(kCGL5Bit, 5);
+    /*7*/
+    DEPTH(kCGL6Bit, 6);
+    /*8*/
+    DEPTH(kCGL8Bit, 8);
+    /*9*/
+    DEPTH(kCGL10Bit, 10);
+    /*10*/
+    DEPTH(kCGL12Bit, 12);
+    /*11*/
+    DEPTH(kCGL16Bit, 16);
+    /*12*/
+    DEPTH(kCGL24Bit, 24);
+    /*13*/
+    DEPTH(kCGL32Bit, 32);
+    /*14*/
+    DEPTH(kCGL48Bit, 48);
+    /*15*/
+    DEPTH(kCGL64Bit, 64);
+    /*16*/
+    DEPTH(kCGL96Bit, 96);
+    /*17*/
+    DEPTH(kCGL128Bit, 128);
+
+#undef DEPTH
+
+    c->total_depth_buffer_depths = offset;
+    assert(c->total_depth_buffer_depths < GLCAPS_DEPTH_BUFFERS);
+}
+
+/* Return non-zero if an error occured. */
+static CGLError handleRendererDescriptions(CGLRendererInfoObj info, GLint r, 
+					   struct glCapabilitiesConfig *c) {
+    CGLError err;
+    GLint accelerated = 0, flags = 0, aux = 0, samplebufs = 0, samples = 0;
+
+    err = CGLDescribeRenderer (info, r, kCGLRPAccelerated, &accelerated);
+
+    if(err)
+	return err;
+    
+    c->accelerated = accelerated;
+
+    /* Buffering modes: single/double, stereo */
+    err = CGLDescribeRenderer(info, r, kCGLRPBufferModes, &flags);
+
+    if(err)
+	return err;
+    
+    handleBufferModes(c, flags);
+    
+    /* AUX buffers */
+    err = CGLDescribeRenderer(info, r, kCGLRPMaxAuxBuffers, &aux);
+
+    if(err)
+	return err;
+    
+    c->aux_buffers = aux;
+
+    
+    /* Depth buffer size */
+    err = CGLDescribeRenderer(info, r, kCGLRPDepthModes, &flags);
+    
+    if(err)
+	return err;
+
+    handleDepthModes(c, flags);
+
+
+    /* Multisample buffers */
+    err = CGLDescribeRenderer(info, r, kCGLRPMaxSampleBuffers, &samplebufs);
+
+    if(err)
+	return err;
+
+    c->multisample_buffers = samplebufs;
+    
+
+    /* Multisample samples per multisample buffer */
+    err = CGLDescribeRenderer(info, r, kCGLRPMaxSamples, &samples);
+
+    if(err)
+	return err;
+
+    c->multisample_samples = samples;
+
+
+    /* Stencil bit depths */
+    err = CGLDescribeRenderer(info, r, kCGLRPStencilModes, &flags);
+
+    if(err)
+	return err;
+
+    handleStencilModes(c, flags);   
+
+
+    /* Color modes (RGB/RGBA depths supported */
+    err = CGLDescribeRenderer(info, r, kCGLRPColorModes, &flags);
+
+    if(err)
+	return err;
+    
+    handleColorModes(c, flags);
+
+    err = CGLDescribeRenderer(info, r, kCGLRPAccumModes, &flags);
+
+    if(err)
+	return err;
+
+    handleAccumulationModes(c, flags);
+    
+    return kCGLNoError;
+}
+
+static void initCapabilities(struct glCapabilities *cap) {
+    cap->configurations = NULL;
+    cap->total_configurations = 0;
+}
+
+static void initConfig(struct glCapabilitiesConfig *c) {
+    int i;
+
+    c->accelerated = false;
+    c->stereo = false;
+    c->aux_buffers = 0;
+    c->buffers = 0;
+
+    c->total_depth_buffer_depths = 0;
+
+    for(i = 0; i < GLCAPS_DEPTH_BUFFERS; ++i) {
+	c->depth_buffers[i] = GLCAPS_INVALID_DEPTH_VALUE;
+    }
+
+    c->multisample_buffers = 0;
+    c->multisample_samples = 0;
+
+    c->total_stencil_bit_depths = 0;
+
+    for(i = 0; i < GLCAPS_STENCIL_BIT_DEPTH_BUFFERS; ++i) {
+	c->stencil_bit_depths[i] = GLCAPS_INVALID_STENCIL_DEPTH;
+    }
+   
+    c->total_color_buffers = 0;
+
+    for(i = 0; i < GLCAPS_COLOR_BUFFERS; ++i) {
+	c->color_buffers[i].r =	c->color_buffers[i].g =
+	    c->color_buffers[i].b = c->color_buffers[i].a = 
+	    GLCAPS_COLOR_BUF_INVALID_VALUE;
+	c->color_buffers[i].is_argb = false;
+     }
+
+    c->total_accum_buffers = 0;
+
+    for(i = 0; i < GLCAPS_COLOR_BUFFERS; ++i) {
+	c->accum_buffers[i].r = c->accum_buffers[i].g =
+	    c->accum_buffers[i].b = c->accum_buffers[i].a =
+	    GLCAPS_COLOR_BUF_INVALID_VALUE;
+	c->accum_buffers[i].is_argb = false;
+    }
+
+    c->next = NULL;
+}
+
+void freeGlCapabilities(struct glCapabilities *cap) {
+    struct glCapabilitiesConfig *conf, *next;
+    
+    conf = cap->configurations;
+
+    while(conf) {
+	next = conf->next;
+	free(conf);
+	conf = next;
+    }
+
+    cap->configurations = NULL;    
+}
+
+/*Return true if an error occured. */
+bool getGlCapabilities(struct glCapabilities *cap) {
+	CGLRendererInfoObj info;
+    CGLError err;
+	GLint numRenderers = 0, r;
+
+    initCapabilities(cap);
+
+	err = CGLQueryRendererInfo((GLuint)-1, &info, &numRenderers);
+    if(err) {
+	    ErrorF("CGLQueryRendererInfo error: %s\n", CGLErrorString(err));
+        return err;
+	}
+
+	for(r = 0; r < numRenderers; r++) {
+	    struct glCapabilitiesConfig tmpconf, *conf;
+
+	    initConfig(&tmpconf);
+
+	    err = handleRendererDescriptions(info, r, &tmpconf);
+	    if(err) {
+            ErrorF("handleRendererDescriptions returned error: %s\n", CGLErrorString(err));
+            ErrorF("trying to continue...\n");
+            continue;
+	    }
+
+	    conf = malloc(sizeof(*conf));
+	    if(NULL == conf) {
+                FatalError("Unable to allocate memory for OpenGL capabilities\n");
+	    }
+
+	    /* Copy the struct. */
+	    *conf = tmpconf;
+
+	    /* Now link the configuration into the list. */
+	    conf->next = cap->configurations;
+	    cap->configurations = conf;
+	}
+
+    CGLDestroyRendererInfo(info);
+
+    /* No error occured.  We are done. */
+    return kCGLNoError;
+}
diff --git a/xorg-server/hw/xquartz/GL/indirect.c b/xorg-server/hw/xquartz/GL/indirect.c
index 27fa7fc36..27d6daebd 100644
--- a/xorg-server/hw/xquartz/GL/indirect.c
+++ b/xorg-server/hw/xquartz/GL/indirect.c
@@ -1,615 +1,615 @@
-/*

- * GLX implementation that uses Apple's OpenGL.framework

- * (Indirect rendering path -- it's also used for some direct mode code too)

- *

- * Copyright (c) 2007-2011 Apple Inc.

- * Copyright (c) 2004 Torrey T. Lyons. All Rights Reserved.

- * Copyright (c) 2002 Greg Parker. All Rights Reserved.

- *

- * Portions of this file are copied from Mesa's xf86glx.c,

- * which contains the following copyright:

- *

- * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.

- * All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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.

- */

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include <AvailabilityMacros.h>

-

-#include <dlfcn.h>

-

-#include <OpenGL/OpenGL.h>

-#include <OpenGL/gl.h>     /* Just to prevent glxserver.h from loading mesa's and colliding with OpenGL.h */

-

-#include <X11/Xproto.h>

-#include <GL/glxproto.h>

-

-#include <glxserver.h>

-#include <glxutil.h>

-

-typedef unsigned long long GLuint64EXT;

-typedef long long GLint64EXT;

-#include <dispatch.h>

-#include <glapi.h>

-

-#include "x-hash.h"

-

-#include "visualConfigs.h"

-#include "dri.h"

-

-#include "darwin.h"

-#define GLAQUA_DEBUG_MSG(msg, args...) ASL_LOG(ASL_LEVEL_DEBUG, "GLXAqua", msg, ##args)

-

-__GLXprovider * GlxGetDRISWrastProvider (void);

-

-static void setup_dispatch_table(void);

-GLuint __glFloorLog2(GLuint val);

-void warn_func(void * p1, char *format, ...);

-

-// some prototypes

-static __GLXscreen * __glXAquaScreenProbe(ScreenPtr pScreen);

-static __GLXdrawable * __glXAquaScreenCreateDrawable(ClientPtr client, __GLXscreen *screen, DrawablePtr pDraw, XID drawId, int type, XID glxDrawId, __GLXconfig *conf);

-

-static void __glXAquaContextDestroy(__GLXcontext *baseContext);

-static int __glXAquaContextMakeCurrent(__GLXcontext *baseContext);

-static int __glXAquaContextLoseCurrent(__GLXcontext *baseContext);

-static int __glXAquaContextCopy(__GLXcontext *baseDst, __GLXcontext *baseSrc, unsigned long mask);

-

-static CGLPixelFormatObj makeFormat(__GLXconfig *conf);

-

-__GLXprovider __glXDRISWRastProvider = {

-    __glXAquaScreenProbe,

-    "Core OpenGL",

-    NULL

-};

-

-typedef struct __GLXAquaScreen   __GLXAquaScreen;

-typedef struct __GLXAquaContext  __GLXAquaContext;

-typedef struct __GLXAquaDrawable __GLXAquaDrawable;

-

-/*

- * The following structs must keep the base as the first member.

- * It's used to treat the start of the struct as a different struct

- * in GLX.  

- *

- * Note: these structs should be initialized with xcalloc or memset 

- * prior to usage, and some of them require initializing

- * the base with function pointers.

- */

-struct __GLXAquaScreen {

-    __GLXscreen base;

-    int index;

-    int num_vis;

-};

-

-struct __GLXAquaContext {

-    __GLXcontext base;

-    CGLContextObj ctx;

-    CGLPixelFormatObj pixelFormat;

-    xp_surface_id sid;

-    unsigned isAttached :1;

-};

-

-struct __GLXAquaDrawable {

-    __GLXdrawable base;

-    DrawablePtr pDraw;

-    xp_surface_id sid;

-    __GLXAquaContext *context;

-};

-

-

-static __GLXcontext *

-__glXAquaScreenCreateContext(__GLXscreen *screen,

-			     __GLXconfig *conf,

-			     __GLXcontext *baseShareContext)

-{

-    __GLXAquaContext *context;

-    __GLXAquaContext *shareContext = (__GLXAquaContext *) baseShareContext;

-    CGLError gl_err;

-  

-    GLAQUA_DEBUG_MSG("glXAquaScreenCreateContext\n");

-    

-    context = calloc(1, sizeof (__GLXAquaContext));

-    

-    if (context == NULL)

-	return NULL;

-

-    memset(context, 0, sizeof *context);

-    

-    context->base.pGlxScreen = screen;

-    

-    context->base.destroy        = __glXAquaContextDestroy;

-    context->base.makeCurrent    = __glXAquaContextMakeCurrent;

-    context->base.loseCurrent    = __glXAquaContextLoseCurrent;

-    context->base.copy           = __glXAquaContextCopy;

-    /*FIXME verify that the context->base is fully initialized. */

-    

-    context->pixelFormat = makeFormat(conf);

-    

-    if (!context->pixelFormat) {

-        free(context);

-        return NULL;

-    }

-

-    context->ctx = NULL;

-    gl_err = CGLCreateContext(context->pixelFormat,

-			      shareContext ? shareContext->ctx : NULL,

-			      &context->ctx);

-    

-    if (gl_err != 0) {

-	ErrorF("CGLCreateContext error: %s\n", CGLErrorString(gl_err));

-	CGLDestroyPixelFormat(context->pixelFormat);

-	free(context);

-	return NULL;

-    }

-    

-    setup_dispatch_table();

-    GLAQUA_DEBUG_MSG("glAquaCreateContext done\n");

-    

-    return &context->base;

-}

-

-/* maps from surface id -> list of __GLcontext */

-static x_hash_table *surface_hash;

-

-static void __glXAquaContextDestroy(__GLXcontext *baseContext) {

-    x_list *lst;

-

-    __GLXAquaContext *context = (__GLXAquaContext *) baseContext;

-    

-    GLAQUA_DEBUG_MSG("glAquaContextDestroy (ctx %p)\n", baseContext);

-    if (context != NULL) {

-      if (context->sid != 0 && surface_hash != NULL) {

-		lst = x_hash_table_lookup(surface_hash, x_cvt_uint_to_vptr(context->sid), NULL);

-		lst = x_list_remove(lst, context);

-		x_hash_table_insert(surface_hash, x_cvt_uint_to_vptr(context->sid), lst);

-      }

-

-      if (context->ctx != NULL)

-	  CGLDestroyContext(context->ctx);

-

-      if (context->pixelFormat != NULL)

-	  CGLDestroyPixelFormat(context->pixelFormat);

-      

-      free(context);

-    }

-}

-

-static int __glXAquaContextLoseCurrent(__GLXcontext *baseContext) {

-    CGLError gl_err;

-

-    GLAQUA_DEBUG_MSG("glAquaLoseCurrent (ctx 0x%p)\n", baseContext);

-

-    gl_err = CGLSetCurrentContext(NULL);

-    if (gl_err != 0)

-      ErrorF("CGLSetCurrentContext error: %s\n", CGLErrorString(gl_err));

-

-    /* 

-     * There should be no need to set __glXLastContext to NULL here, because

-     * glxcmds.c does it as part of the context cache flush after calling 

-     * this.

-     */

-

-    return GL_TRUE;

-}

-

-/* Called when a surface is destroyed as a side effect of destroying

-   the window it's attached to. */

-static void surface_notify(void *_arg, void *data) {

-    DRISurfaceNotifyArg *arg = (DRISurfaceNotifyArg *)_arg;

-    __GLXAquaDrawable *draw = (__GLXAquaDrawable *)data;

-    __GLXAquaContext *context;

-    x_list *lst;

-    if(_arg == NULL || data == NULL) {

-	    ErrorF("surface_notify called with bad params");

-	    return;

-    }

-	

-    GLAQUA_DEBUG_MSG("surface_notify(%p, %p)\n", _arg, data);

-    switch (arg->kind) {

-    case AppleDRISurfaceNotifyDestroyed:

-        if (surface_hash != NULL)

-            x_hash_table_remove(surface_hash, x_cvt_uint_to_vptr(arg->id));

-	draw->pDraw = NULL;

-	draw->sid = 0;

-        break;

-

-    case AppleDRISurfaceNotifyChanged:

-        if (surface_hash != NULL) {

-            lst = x_hash_table_lookup(surface_hash, x_cvt_uint_to_vptr(arg->id), NULL);

-            for (; lst != NULL; lst = lst->next)

-		{

-                context = lst->data;

-                xp_update_gl_context(context->ctx);

-            }

-        }

-        break;

-    default:

-	ErrorF("surface_notify: unknown kind %d\n", arg->kind);

-	break;

-    }

-}

-

-static BOOL attach(__GLXAquaContext *context, __GLXAquaDrawable *draw) {

-    DrawablePtr pDraw;

-    

-    GLAQUA_DEBUG_MSG("attach(%p, %p)\n", context, draw);

-	

-    if(NULL == context || NULL == draw)

-	return TRUE;

-

-    pDraw = draw->base.pDraw;

-

-    if(NULL == pDraw) {

-	ErrorF("%s:%s() pDraw is NULL!\n", __FILE__, __func__);

-	return TRUE;

-    }

-

-    if (draw->sid == 0) {

-	//if (!quartzProcs->CreateSurface(pDraw->pScreen, pDraw->id, pDraw,

-        if (!DRICreateSurface(pDraw->pScreen, pDraw->id, pDraw,

-			      0, &draw->sid, NULL,

-			      surface_notify, draw))

-            return TRUE;

-        draw->pDraw = pDraw;

-    } 

-    

-    if (!context->isAttached || context->sid != draw->sid) {

-        x_list *lst;

-	

-        if (xp_attach_gl_context(context->ctx, draw->sid) != Success) {

-	    //quartzProcs->DestroySurface(pDraw->pScreen, pDraw->id, pDraw,

-            DRIDestroySurface(pDraw->pScreen, pDraw->id, pDraw,

-			      surface_notify, draw);

-            if (surface_hash != NULL)

-                x_hash_table_remove(surface_hash, x_cvt_uint_to_vptr(draw->sid));

-	    

-            draw->sid = 0;

-            return TRUE;

-        }

-	

-        context->isAttached = TRUE;

-        context->sid = draw->sid;

-	

-        if (surface_hash == NULL)

-            surface_hash = x_hash_table_new(NULL, NULL, NULL, NULL);

-	

-        lst = x_hash_table_lookup(surface_hash, x_cvt_uint_to_vptr(context->sid), NULL);

-        if (x_list_find(lst, context) == NULL) {

-            lst = x_list_prepend(lst, context);

-            x_hash_table_insert(surface_hash, x_cvt_uint_to_vptr(context->sid), lst);

-        }

-	

-	

-

-        GLAQUA_DEBUG_MSG("attached 0x%x to 0x%x\n", (unsigned int) pDraw->id,

-                         (unsigned int) draw->sid);

-    } 

-

-    draw->context = context;

-

-    return FALSE;

-}

-

-#if 0     // unused

-static void unattach(__GLXAquaContext *context) {

-	x_list *lst;

-	GLAQUA_DEBUG_MSG("unattach\n");

-	if (context == NULL) {

-		ErrorF("Tried to unattach a null context\n");

-		return;

-	}

-    if (context->isAttached) {

-        GLAQUA_DEBUG_MSG("unattaching\n");

-

-        if (surface_hash != NULL) {

-            lst = x_hash_table_lookup(surface_hash, (void *) context->sid, NULL);

-            lst = x_list_remove(lst, context);

-            x_hash_table_insert(surface_hash, (void *) context->sid, lst);

-        }

-

-        CGLClearDrawable(context->ctx);

-        context->isAttached = FALSE;

-        context->sid = 0;

-    }

-}

-#endif

-

-static int __glXAquaContextMakeCurrent(__GLXcontext *baseContext) {

-    CGLError gl_err;

-    __GLXAquaContext *context = (__GLXAquaContext *) baseContext;

-    __GLXAquaDrawable *drawPriv = (__GLXAquaDrawable *) context->base.drawPriv;

-    

-    GLAQUA_DEBUG_MSG("glAquaMakeCurrent (ctx 0x%p)\n", baseContext);

-    

-    if(attach(context, drawPriv))

-	return /*error*/ 0;

-

-    gl_err = CGLSetCurrentContext(context->ctx);

-    if (gl_err != 0)

-        ErrorF("CGLSetCurrentContext error: %s\n", CGLErrorString(gl_err));

-    

-    return gl_err == 0;

-}

-

-static int __glXAquaContextCopy(__GLXcontext *baseDst, __GLXcontext *baseSrc, unsigned long mask)

-{

-    CGLError gl_err;

-

-    __GLXAquaContext *dst = (__GLXAquaContext *) baseDst;

-    __GLXAquaContext *src = (__GLXAquaContext *) baseSrc;

-

-    GLAQUA_DEBUG_MSG("GLXAquaContextCopy\n");

-

-    gl_err = CGLCopyContext(src->ctx, dst->ctx, mask);

-    if (gl_err != 0)

-        ErrorF("CGLCopyContext error: %s\n", CGLErrorString(gl_err));

-

-    return gl_err == 0;

-}

-

-/* Drawing surface notification callbacks */

-static GLboolean __glXAquaDrawableSwapBuffers(ClientPtr client, __GLXdrawable *base) {

-    CGLError err;

-    __GLXAquaDrawable *drawable;

- 

-    //    GLAQUA_DEBUG_MSG("glAquaDrawableSwapBuffers(%p)\n",base);

-	

-    if(!base) {

-	ErrorF("%s passed NULL\n", __func__);

-	return GL_FALSE;

-    }

-

-    drawable = (__GLXAquaDrawable *)base;

-

-    if(NULL == drawable->context) {

-	ErrorF("%s called with a NULL->context for drawable %p!\n",

-	       __func__, (void *)drawable);

-	return GL_FALSE;

-    }

-

-    err = CGLFlushDrawable(drawable->context->ctx);

-

-    if(kCGLNoError != err) {

-	ErrorF("CGLFlushDrawable error: %s in %s\n", CGLErrorString(err),

-	       __func__);

-	return GL_FALSE;

-    }

-

-    return GL_TRUE;

-}

-

-

-static CGLPixelFormatObj makeFormat(__GLXconfig *conf) {

-    CGLPixelFormatAttribute attr[64];

-    CGLPixelFormatObj fobj;

-    GLint formats;

-    CGLError error;

-    int i = 0;

-    

-    if(conf->doubleBufferMode)

-	attr[i++] = kCGLPFADoubleBuffer;

-

-    if(conf->stereoMode)

-	attr[i++] = kCGLPFAStereo;

-

-    attr[i++] = kCGLPFAColorSize;

-    attr[i++] = conf->redBits + conf->greenBits + conf->blueBits;

-    attr[i++] = kCGLPFAAlphaSize;

-    attr[i++] = conf->alphaBits;

-

-    if((conf->accumRedBits + conf->accumGreenBits + conf->accumBlueBits +

-	conf->accumAlphaBits) > 0) {

-

-	attr[i++] = kCGLPFAAccumSize;

-        attr[i++] = conf->accumRedBits + conf->accumGreenBits

-	    + conf->accumBlueBits + conf->accumAlphaBits;

-    }

-    

-    attr[i++] = kCGLPFADepthSize;

-    attr[i++] = conf->depthBits;

-

-    if(conf->stencilBits) {

-	attr[i++] = kCGLPFAStencilSize;

-        attr[i++] = conf->stencilBits;	

-    }

-    

-    if(conf->numAuxBuffers > 0) {

-	attr[i++] = kCGLPFAAuxBuffers;

-	attr[i++] = conf->numAuxBuffers;

-    }

-

-    if(conf->sampleBuffers > 0) {

-       attr[i++] = kCGLPFASampleBuffers;

-       attr[i++] = conf->sampleBuffers;

-       attr[i++] = kCGLPFASamples;

-       attr[i++] = conf->samples;

-    }

-     

-    attr[i] = 0;

-

-    error = CGLChoosePixelFormat(attr, &fobj, &formats);

-    if(error) {

-	ErrorF("error: creating pixel format %s\n", CGLErrorString(error));

-	return NULL;

-    }

-

-    return fobj;

-}

-

-static void __glXAquaScreenDestroy(__GLXscreen *screen) {

-

-    GLAQUA_DEBUG_MSG("glXAquaScreenDestroy(%p)\n", screen);

-    __glXScreenDestroy(screen);

-

-    free(screen);

-}

-

-/* This is called by __glXInitScreens(). */

-static __GLXscreen * __glXAquaScreenProbe(ScreenPtr pScreen) {

-    __GLXAquaScreen *screen;

-

-    GLAQUA_DEBUG_MSG("glXAquaScreenProbe\n");

-

-    if (pScreen == NULL) 

-	return NULL;

-

-    screen = calloc(1, sizeof *screen);

-

-    if(NULL == screen)

-	return NULL;

-    

-    screen->base.destroy        = __glXAquaScreenDestroy;

-    screen->base.createContext  = __glXAquaScreenCreateContext;

-    screen->base.createDrawable = __glXAquaScreenCreateDrawable;

-    screen->base.swapInterval = /*FIXME*/ NULL;

-    screen->base.pScreen       = pScreen;

-    

-    screen->base.fbconfigs = __glXAquaCreateVisualConfigs(&screen->base.numFBConfigs, pScreen->myNum);

-

-    __glXScreenInit(&screen->base, pScreen);

-

-    screen->base.GLXmajor = 1;

-    screen->base.GLXminor = 4;

-    screen->base.GLXextensions = strdup("GLX_SGIX_fbconfig "

-                                        "GLX_SGIS_multisample "

-                                        "GLX_ARB_multisample "

-                                        "GLX_EXT_visual_info "

-                                        "GLX_EXT_import_context ");

-    

-    /*We may be able to add more GLXextensions at a later time. */

-    

-    return &screen->base;

-}

-

-#if 0 // unused

-static void __glXAquaDrawableCopySubBuffer (__GLXdrawable *drawable,

-					    int x, int y, int w, int h) {

-    /*TODO finish me*/

-}

-#endif

-

-static void __glXAquaDrawableDestroy(__GLXdrawable *base) {

-    /* gstaplin: base is the head of the structure, so it's at the same 

-     * offset in memory.

-     * Is this safe with strict aliasing?   I noticed that the other dri code

-     * does this too...

-     */

-    __GLXAquaDrawable *glxPriv = (__GLXAquaDrawable *)base;

-

-    GLAQUA_DEBUG_MSG("TRACE");

-    

-    /* It doesn't work to call DRIDestroySurface here, the drawable's

-       already gone.. But dri.c notices the window destruction and

-       frees the surface itself. */

-

-    /*gstaplin: verify the statement above.  The surface destroy

-     *messages weren't making it through, and may still not be.

-     *We need a good test case for surface creation and destruction.

-     *We also need a good way to enable introspection on the server

-     *to validate the test, beyond using gdb with print.

-     */

-

-    free(glxPriv);

-}

-

-static __GLXdrawable *

-__glXAquaScreenCreateDrawable(ClientPtr client,

-                              __GLXscreen *screen,

-			      DrawablePtr pDraw,

-			      XID drawId,

-			      int type,

-			      XID glxDrawId,

-			      __GLXconfig *conf) {

-  __GLXAquaDrawable *glxPriv;

-

-  glxPriv = malloc(sizeof *glxPriv);

-

-  if(glxPriv == NULL)

-      return NULL;

-

-  memset(glxPriv, 0, sizeof *glxPriv);

-

-  if(!__glXDrawableInit(&glxPriv->base, screen, pDraw, type, glxDrawId, conf)) {

-    free(glxPriv);

-    return NULL;

-  }

-

-  glxPriv->base.destroy       = __glXAquaDrawableDestroy;

-  glxPriv->base.swapBuffers   = __glXAquaDrawableSwapBuffers;

-  glxPriv->base.copySubBuffer = NULL; /* __glXAquaDrawableCopySubBuffer; */

-

-  glxPriv->pDraw = pDraw;

-  glxPriv->sid = 0;

-  glxPriv->context = NULL;

-  

-  return &glxPriv->base;

-}

-

-// Extra goodies for glx

-

-GLuint __glFloorLog2(GLuint val)

-{

-    int c = 0;

-

-    while (val > 1) {

-        c++;

-        val >>= 1;

-    }

-    return c;

-}

-

-#ifndef OPENGL_FRAMEWORK_PATH

-#define OPENGL_FRAMEWORK_PATH "/System/Library/Frameworks/OpenGL.framework/OpenGL"

-#endif

-

-static void setup_dispatch_table(void) {

-    static struct _glapi_table *disp = NULL;

-    static void *handle;

-    const char *opengl_framework_path;

-

-    if(disp)  {

-        _glapi_set_dispatch(disp);

-        return;

-    }

-

-    opengl_framework_path = getenv("OPENGL_FRAMEWORK_PATH");

-    if (!opengl_framework_path) {

-        opengl_framework_path = OPENGL_FRAMEWORK_PATH;

-    }

-

-    (void) dlerror();            /*drain dlerror */

-    handle = dlopen(opengl_framework_path, RTLD_LOCAL);

-

-    if (!handle) {

-        ErrorF("unable to dlopen %s : %s, using RTLD_DEFAULT\n",

-                opengl_framework_path, dlerror());

-        handle = RTLD_DEFAULT;

-    }

-

-    disp = _glapi_create_table_from_handle(handle, "gl");

-    assert(disp);

-

-    _glapi_set_dispatch(disp);

-}

+/*
+ * GLX implementation that uses Apple's OpenGL.framework
+ * (Indirect rendering path -- it's also used for some direct mode code too)
+ *
+ * Copyright (c) 2007-2011 Apple Inc.
+ * Copyright (c) 2004 Torrey T. Lyons. All Rights Reserved.
+ * Copyright (c) 2002 Greg Parker. All Rights Reserved.
+ *
+ * Portions of this file are copied from Mesa's xf86glx.c,
+ * which contains the following copyright:
+ *
+ * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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.
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <AvailabilityMacros.h>
+
+#include <dlfcn.h>
+
+#include <OpenGL/OpenGL.h>
+#include <OpenGL/gl.h>     /* Just to prevent glxserver.h from loading mesa's and colliding with OpenGL.h */
+
+#include <X11/Xproto.h>
+#include <GL/glxproto.h>
+
+#include <glxserver.h>
+#include <glxutil.h>
+
+typedef unsigned long long GLuint64EXT;
+typedef long long GLint64EXT;
+#include <dispatch.h>
+#include <glapi.h>
+
+#include "x-hash.h"
+
+#include "visualConfigs.h"
+#include "dri.h"
+
+#include "darwin.h"
+#define GLAQUA_DEBUG_MSG(msg, args...) ASL_LOG(ASL_LEVEL_DEBUG, "GLXAqua", msg, ##args)
+
+__GLXprovider * GlxGetDRISWrastProvider (void);
+
+static void setup_dispatch_table(void);
+GLuint __glFloorLog2(GLuint val);
+void warn_func(void * p1, char *format, ...);
+
+// some prototypes
+static __GLXscreen * __glXAquaScreenProbe(ScreenPtr pScreen);
+static __GLXdrawable * __glXAquaScreenCreateDrawable(ClientPtr client, __GLXscreen *screen, DrawablePtr pDraw, XID drawId, int type, XID glxDrawId, __GLXconfig *conf);
+
+static void __glXAquaContextDestroy(__GLXcontext *baseContext);
+static int __glXAquaContextMakeCurrent(__GLXcontext *baseContext);
+static int __glXAquaContextLoseCurrent(__GLXcontext *baseContext);
+static int __glXAquaContextCopy(__GLXcontext *baseDst, __GLXcontext *baseSrc, unsigned long mask);
+
+static CGLPixelFormatObj makeFormat(__GLXconfig *conf);
+
+__GLXprovider __glXDRISWRastProvider = {
+    __glXAquaScreenProbe,
+    "Core OpenGL",
+    NULL
+};
+
+typedef struct __GLXAquaScreen   __GLXAquaScreen;
+typedef struct __GLXAquaContext  __GLXAquaContext;
+typedef struct __GLXAquaDrawable __GLXAquaDrawable;
+
+/*
+ * The following structs must keep the base as the first member.
+ * It's used to treat the start of the struct as a different struct
+ * in GLX.  
+ *
+ * Note: these structs should be initialized with xcalloc or memset 
+ * prior to usage, and some of them require initializing
+ * the base with function pointers.
+ */
+struct __GLXAquaScreen {
+    __GLXscreen base;
+    int index;
+    int num_vis;
+};
+
+struct __GLXAquaContext {
+    __GLXcontext base;
+    CGLContextObj ctx;
+    CGLPixelFormatObj pixelFormat;
+    xp_surface_id sid;
+    unsigned isAttached :1;
+};
+
+struct __GLXAquaDrawable {
+    __GLXdrawable base;
+    DrawablePtr pDraw;
+    xp_surface_id sid;
+    __GLXAquaContext *context;
+};
+
+
+static __GLXcontext *
+__glXAquaScreenCreateContext(__GLXscreen *screen,
+			     __GLXconfig *conf,
+			     __GLXcontext *baseShareContext)
+{
+    __GLXAquaContext *context;
+    __GLXAquaContext *shareContext = (__GLXAquaContext *) baseShareContext;
+    CGLError gl_err;
+  
+    GLAQUA_DEBUG_MSG("glXAquaScreenCreateContext\n");
+    
+    context = calloc(1, sizeof (__GLXAquaContext));
+    
+    if (context == NULL)
+	return NULL;
+
+    memset(context, 0, sizeof *context);
+    
+    context->base.pGlxScreen = screen;
+    
+    context->base.destroy        = __glXAquaContextDestroy;
+    context->base.makeCurrent    = __glXAquaContextMakeCurrent;
+    context->base.loseCurrent    = __glXAquaContextLoseCurrent;
+    context->base.copy           = __glXAquaContextCopy;
+    /*FIXME verify that the context->base is fully initialized. */
+    
+    context->pixelFormat = makeFormat(conf);
+    
+    if (!context->pixelFormat) {
+        free(context);
+        return NULL;
+    }
+
+    context->ctx = NULL;
+    gl_err = CGLCreateContext(context->pixelFormat,
+			      shareContext ? shareContext->ctx : NULL,
+			      &context->ctx);
+    
+    if (gl_err != 0) {
+	ErrorF("CGLCreateContext error: %s\n", CGLErrorString(gl_err));
+	CGLDestroyPixelFormat(context->pixelFormat);
+	free(context);
+	return NULL;
+    }
+    
+    setup_dispatch_table();
+    GLAQUA_DEBUG_MSG("glAquaCreateContext done\n");
+    
+    return &context->base;
+}
+
+/* maps from surface id -> list of __GLcontext */
+static x_hash_table *surface_hash;
+
+static void __glXAquaContextDestroy(__GLXcontext *baseContext) {
+    x_list *lst;
+
+    __GLXAquaContext *context = (__GLXAquaContext *) baseContext;
+    
+    GLAQUA_DEBUG_MSG("glAquaContextDestroy (ctx %p)\n", baseContext);
+    if (context != NULL) {
+      if (context->sid != 0 && surface_hash != NULL) {
+		lst = x_hash_table_lookup(surface_hash, x_cvt_uint_to_vptr(context->sid), NULL);
+		lst = x_list_remove(lst, context);
+		x_hash_table_insert(surface_hash, x_cvt_uint_to_vptr(context->sid), lst);
+      }
+
+      if (context->ctx != NULL)
+	  CGLDestroyContext(context->ctx);
+
+      if (context->pixelFormat != NULL)
+	  CGLDestroyPixelFormat(context->pixelFormat);
+      
+      free(context);
+    }
+}
+
+static int __glXAquaContextLoseCurrent(__GLXcontext *baseContext) {
+    CGLError gl_err;
+
+    GLAQUA_DEBUG_MSG("glAquaLoseCurrent (ctx 0x%p)\n", baseContext);
+
+    gl_err = CGLSetCurrentContext(NULL);
+    if (gl_err != 0)
+      ErrorF("CGLSetCurrentContext error: %s\n", CGLErrorString(gl_err));
+
+    /* 
+     * There should be no need to set __glXLastContext to NULL here, because
+     * glxcmds.c does it as part of the context cache flush after calling 
+     * this.
+     */
+
+    return GL_TRUE;
+}
+
+/* Called when a surface is destroyed as a side effect of destroying
+   the window it's attached to. */
+static void surface_notify(void *_arg, void *data) {
+    DRISurfaceNotifyArg *arg = (DRISurfaceNotifyArg *)_arg;
+    __GLXAquaDrawable *draw = (__GLXAquaDrawable *)data;
+    __GLXAquaContext *context;
+    x_list *lst;
+    if(_arg == NULL || data == NULL) {
+	    ErrorF("surface_notify called with bad params");
+	    return;
+    }
+	
+    GLAQUA_DEBUG_MSG("surface_notify(%p, %p)\n", _arg, data);
+    switch (arg->kind) {
+    case AppleDRISurfaceNotifyDestroyed:
+        if (surface_hash != NULL)
+            x_hash_table_remove(surface_hash, x_cvt_uint_to_vptr(arg->id));
+	draw->pDraw = NULL;
+	draw->sid = 0;
+        break;
+
+    case AppleDRISurfaceNotifyChanged:
+        if (surface_hash != NULL) {
+            lst = x_hash_table_lookup(surface_hash, x_cvt_uint_to_vptr(arg->id), NULL);
+            for (; lst != NULL; lst = lst->next)
+		{
+                context = lst->data;
+                xp_update_gl_context(context->ctx);
+            }
+        }
+        break;
+    default:
+	ErrorF("surface_notify: unknown kind %d\n", arg->kind);
+	break;
+    }
+}
+
+static BOOL attach(__GLXAquaContext *context, __GLXAquaDrawable *draw) {
+    DrawablePtr pDraw;
+    
+    GLAQUA_DEBUG_MSG("attach(%p, %p)\n", context, draw);
+	
+    if(NULL == context || NULL == draw)
+	return TRUE;
+
+    pDraw = draw->base.pDraw;
+
+    if(NULL == pDraw) {
+	ErrorF("%s:%s() pDraw is NULL!\n", __FILE__, __func__);
+	return TRUE;
+    }
+
+    if (draw->sid == 0) {
+	//if (!quartzProcs->CreateSurface(pDraw->pScreen, pDraw->id, pDraw,
+        if (!DRICreateSurface(pDraw->pScreen, pDraw->id, pDraw,
+			      0, &draw->sid, NULL,
+			      surface_notify, draw))
+            return TRUE;
+        draw->pDraw = pDraw;
+    } 
+    
+    if (!context->isAttached || context->sid != draw->sid) {
+        x_list *lst;
+	
+        if (xp_attach_gl_context(context->ctx, draw->sid) != Success) {
+	    //quartzProcs->DestroySurface(pDraw->pScreen, pDraw->id, pDraw,
+            DRIDestroySurface(pDraw->pScreen, pDraw->id, pDraw,
+			      surface_notify, draw);
+            if (surface_hash != NULL)
+                x_hash_table_remove(surface_hash, x_cvt_uint_to_vptr(draw->sid));
+	    
+            draw->sid = 0;
+            return TRUE;
+        }
+	
+        context->isAttached = TRUE;
+        context->sid = draw->sid;
+	
+        if (surface_hash == NULL)
+            surface_hash = x_hash_table_new(NULL, NULL, NULL, NULL);
+	
+        lst = x_hash_table_lookup(surface_hash, x_cvt_uint_to_vptr(context->sid), NULL);
+        if (x_list_find(lst, context) == NULL) {
+            lst = x_list_prepend(lst, context);
+            x_hash_table_insert(surface_hash, x_cvt_uint_to_vptr(context->sid), lst);
+        }
+	
+	
+
+        GLAQUA_DEBUG_MSG("attached 0x%x to 0x%x\n", (unsigned int) pDraw->id,
+                         (unsigned int) draw->sid);
+    } 
+
+    draw->context = context;
+
+    return FALSE;
+}
+
+#if 0     // unused
+static void unattach(__GLXAquaContext *context) {
+	x_list *lst;
+	GLAQUA_DEBUG_MSG("unattach\n");
+	if (context == NULL) {
+		ErrorF("Tried to unattach a null context\n");
+		return;
+	}
+    if (context->isAttached) {
+        GLAQUA_DEBUG_MSG("unattaching\n");
+
+        if (surface_hash != NULL) {
+            lst = x_hash_table_lookup(surface_hash, (void *) context->sid, NULL);
+            lst = x_list_remove(lst, context);
+            x_hash_table_insert(surface_hash, (void *) context->sid, lst);
+        }
+
+        CGLClearDrawable(context->ctx);
+        context->isAttached = FALSE;
+        context->sid = 0;
+    }
+}
+#endif
+
+static int __glXAquaContextMakeCurrent(__GLXcontext *baseContext) {
+    CGLError gl_err;
+    __GLXAquaContext *context = (__GLXAquaContext *) baseContext;
+    __GLXAquaDrawable *drawPriv = (__GLXAquaDrawable *) context->base.drawPriv;
+    
+    GLAQUA_DEBUG_MSG("glAquaMakeCurrent (ctx 0x%p)\n", baseContext);
+    
+    if(attach(context, drawPriv))
+	return /*error*/ 0;
+
+    gl_err = CGLSetCurrentContext(context->ctx);
+    if (gl_err != 0)
+        ErrorF("CGLSetCurrentContext error: %s\n", CGLErrorString(gl_err));
+    
+    return gl_err == 0;
+}
+
+static int __glXAquaContextCopy(__GLXcontext *baseDst, __GLXcontext *baseSrc, unsigned long mask)
+{
+    CGLError gl_err;
+
+    __GLXAquaContext *dst = (__GLXAquaContext *) baseDst;
+    __GLXAquaContext *src = (__GLXAquaContext *) baseSrc;
+
+    GLAQUA_DEBUG_MSG("GLXAquaContextCopy\n");
+
+    gl_err = CGLCopyContext(src->ctx, dst->ctx, mask);
+    if (gl_err != 0)
+        ErrorF("CGLCopyContext error: %s\n", CGLErrorString(gl_err));
+
+    return gl_err == 0;
+}
+
+/* Drawing surface notification callbacks */
+static GLboolean __glXAquaDrawableSwapBuffers(ClientPtr client, __GLXdrawable *base) {
+    CGLError err;
+    __GLXAquaDrawable *drawable;
+ 
+    //    GLAQUA_DEBUG_MSG("glAquaDrawableSwapBuffers(%p)\n",base);
+	
+    if(!base) {
+	ErrorF("%s passed NULL\n", __func__);
+	return GL_FALSE;
+    }
+
+    drawable = (__GLXAquaDrawable *)base;
+
+    if(NULL == drawable->context) {
+	ErrorF("%s called with a NULL->context for drawable %p!\n",
+	       __func__, (void *)drawable);
+	return GL_FALSE;
+    }
+
+    err = CGLFlushDrawable(drawable->context->ctx);
+
+    if(kCGLNoError != err) {
+	ErrorF("CGLFlushDrawable error: %s in %s\n", CGLErrorString(err),
+	       __func__);
+	return GL_FALSE;
+    }
+
+    return GL_TRUE;
+}
+
+
+static CGLPixelFormatObj makeFormat(__GLXconfig *conf) {
+    CGLPixelFormatAttribute attr[64];
+    CGLPixelFormatObj fobj;
+    GLint formats;
+    CGLError error;
+    int i = 0;
+    
+    if(conf->doubleBufferMode)
+	attr[i++] = kCGLPFADoubleBuffer;
+
+    if(conf->stereoMode)
+	attr[i++] = kCGLPFAStereo;
+
+    attr[i++] = kCGLPFAColorSize;
+    attr[i++] = conf->redBits + conf->greenBits + conf->blueBits;
+    attr[i++] = kCGLPFAAlphaSize;
+    attr[i++] = conf->alphaBits;
+
+    if((conf->accumRedBits + conf->accumGreenBits + conf->accumBlueBits +
+	conf->accumAlphaBits) > 0) {
+
+	attr[i++] = kCGLPFAAccumSize;
+        attr[i++] = conf->accumRedBits + conf->accumGreenBits
+	    + conf->accumBlueBits + conf->accumAlphaBits;
+    }
+    
+    attr[i++] = kCGLPFADepthSize;
+    attr[i++] = conf->depthBits;
+
+    if(conf->stencilBits) {
+	attr[i++] = kCGLPFAStencilSize;
+        attr[i++] = conf->stencilBits;	
+    }
+    
+    if(conf->numAuxBuffers > 0) {
+	attr[i++] = kCGLPFAAuxBuffers;
+	attr[i++] = conf->numAuxBuffers;
+    }
+
+    if(conf->sampleBuffers > 0) {
+       attr[i++] = kCGLPFASampleBuffers;
+       attr[i++] = conf->sampleBuffers;
+       attr[i++] = kCGLPFASamples;
+       attr[i++] = conf->samples;
+    }
+     
+    attr[i] = 0;
+
+    error = CGLChoosePixelFormat(attr, &fobj, &formats);
+    if(error) {
+	ErrorF("error: creating pixel format %s\n", CGLErrorString(error));
+	return NULL;
+    }
+
+    return fobj;
+}
+
+static void __glXAquaScreenDestroy(__GLXscreen *screen) {
+
+    GLAQUA_DEBUG_MSG("glXAquaScreenDestroy(%p)\n", screen);
+    __glXScreenDestroy(screen);
+
+    free(screen);
+}
+
+/* This is called by __glXInitScreens(). */
+static __GLXscreen * __glXAquaScreenProbe(ScreenPtr pScreen) {
+    __GLXAquaScreen *screen;
+
+    GLAQUA_DEBUG_MSG("glXAquaScreenProbe\n");
+
+    if (pScreen == NULL) 
+	return NULL;
+
+    screen = calloc(1, sizeof *screen);
+
+    if(NULL == screen)
+	return NULL;
+    
+    screen->base.destroy        = __glXAquaScreenDestroy;
+    screen->base.createContext  = __glXAquaScreenCreateContext;
+    screen->base.createDrawable = __glXAquaScreenCreateDrawable;
+    screen->base.swapInterval = /*FIXME*/ NULL;
+    screen->base.pScreen       = pScreen;
+    
+    screen->base.fbconfigs = __glXAquaCreateVisualConfigs(&screen->base.numFBConfigs, pScreen->myNum);
+
+    __glXScreenInit(&screen->base, pScreen);
+
+    screen->base.GLXmajor = 1;
+    screen->base.GLXminor = 4;
+    screen->base.GLXextensions = strdup("GLX_SGIX_fbconfig "
+                                        "GLX_SGIS_multisample "
+                                        "GLX_ARB_multisample "
+                                        "GLX_EXT_visual_info "
+                                        "GLX_EXT_import_context ");
+    
+    /*We may be able to add more GLXextensions at a later time. */
+    
+    return &screen->base;
+}
+
+#if 0 // unused
+static void __glXAquaDrawableCopySubBuffer (__GLXdrawable *drawable,
+					    int x, int y, int w, int h) {
+    /*TODO finish me*/
+}
+#endif
+
+static void __glXAquaDrawableDestroy(__GLXdrawable *base) {
+    /* gstaplin: base is the head of the structure, so it's at the same 
+     * offset in memory.
+     * Is this safe with strict aliasing?   I noticed that the other dri code
+     * does this too...
+     */
+    __GLXAquaDrawable *glxPriv = (__GLXAquaDrawable *)base;
+
+    GLAQUA_DEBUG_MSG("TRACE");
+    
+    /* It doesn't work to call DRIDestroySurface here, the drawable's
+       already gone.. But dri.c notices the window destruction and
+       frees the surface itself. */
+
+    /*gstaplin: verify the statement above.  The surface destroy
+     *messages weren't making it through, and may still not be.
+     *We need a good test case for surface creation and destruction.
+     *We also need a good way to enable introspection on the server
+     *to validate the test, beyond using gdb with print.
+     */
+
+    free(glxPriv);
+}
+
+static __GLXdrawable *
+__glXAquaScreenCreateDrawable(ClientPtr client,
+                              __GLXscreen *screen,
+			      DrawablePtr pDraw,
+			      XID drawId,
+			      int type,
+			      XID glxDrawId,
+			      __GLXconfig *conf) {
+  __GLXAquaDrawable *glxPriv;
+
+  glxPriv = malloc(sizeof *glxPriv);
+
+  if(glxPriv == NULL)
+      return NULL;
+
+  memset(glxPriv, 0, sizeof *glxPriv);
+
+  if(!__glXDrawableInit(&glxPriv->base, screen, pDraw, type, glxDrawId, conf)) {
+    free(glxPriv);
+    return NULL;
+  }
+
+  glxPriv->base.destroy       = __glXAquaDrawableDestroy;
+  glxPriv->base.swapBuffers   = __glXAquaDrawableSwapBuffers;
+  glxPriv->base.copySubBuffer = NULL; /* __glXAquaDrawableCopySubBuffer; */
+
+  glxPriv->pDraw = pDraw;
+  glxPriv->sid = 0;
+  glxPriv->context = NULL;
+  
+  return &glxPriv->base;
+}
+
+// Extra goodies for glx
+
+GLuint __glFloorLog2(GLuint val)
+{
+    int c = 0;
+
+    while (val > 1) {
+        c++;
+        val >>= 1;
+    }
+    return c;
+}
+
+#ifndef OPENGL_FRAMEWORK_PATH
+#define OPENGL_FRAMEWORK_PATH "/System/Library/Frameworks/OpenGL.framework/OpenGL"
+#endif
+
+static void setup_dispatch_table(void) {
+    static struct _glapi_table *disp = NULL;
+    static void *handle;
+    const char *opengl_framework_path;
+
+    if(disp)  {
+        _glapi_set_dispatch(disp);
+        return;
+    }
+
+    opengl_framework_path = getenv("OPENGL_FRAMEWORK_PATH");
+    if (!opengl_framework_path) {
+        opengl_framework_path = OPENGL_FRAMEWORK_PATH;
+    }
+
+    (void) dlerror();            /*drain dlerror */
+    handle = dlopen(opengl_framework_path, RTLD_LOCAL);
+
+    if (!handle) {
+        ErrorF("unable to dlopen %s : %s, using RTLD_DEFAULT\n",
+                opengl_framework_path, dlerror());
+        handle = RTLD_DEFAULT;
+    }
+
+    disp = _glapi_create_table_from_handle(handle, "gl");
+    assert(disp);
+
+    _glapi_set_dispatch(disp);
+}
diff --git a/xorg-server/hw/xquartz/GL/visualConfigs.c b/xorg-server/hw/xquartz/GL/visualConfigs.c
index f78b14a6e..2c2a9a29e 100644
--- a/xorg-server/hw/xquartz/GL/visualConfigs.c
+++ b/xorg-server/hw/xquartz/GL/visualConfigs.c
@@ -1,284 +1,284 @@
-/*

- * Copyright (c) 2007, 2008 Apple Inc.

- * Copyright (c) 2004 Torrey T. Lyons. All Rights Reserved.

- * Copyright (c) 2002 Greg Parker. All Rights Reserved.

- *

- * Portions of this file are copied from Mesa's xf86glx.c,

- * which contains the following copyright:

- *

- * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.

- * All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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.

- */

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include "dri.h"

-

-#include <OpenGL/OpenGL.h>

-#include <OpenGL/gl.h>

-#include <OpenGL/glext.h>

-#include <OpenGL/CGLContext.h>

-

-#include <GL/glxproto.h>

-#include <windowstr.h>

-#include <resource.h>

-#include <GL/glxint.h>

-#include <GL/glxtokens.h>

-#include <scrnintstr.h>

-#include <glxserver.h>

-#include <glxscreens.h>

-#include <glxdrawable.h>

-#include <glxcontext.h>

-#include <glxext.h>

-#include <glxutil.h>

-#include <GL/internal/glcore.h>

-

-#include "capabilities.h"

-#include "visualConfigs.h"

-#include "darwinfb.h"

-

-/* Based originally on code from indirect.c which was based on code from i830_dri.c. */

-__GLXconfig *__glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber) {

-    int numConfigs = 0;

-    __GLXconfig *visualConfigs, *c;

-    struct glCapabilities caps;

-    struct glCapabilitiesConfig *conf;

-    int stereo, depth, aux, buffers, stencil, accum, color, msample;

-    

-    if(getGlCapabilities(&caps)) {

-        ErrorF("error from getGlCapabilities()!\n");

-        return NULL;

-    }

-    

-    /*

-     conf->stereo is 0 or 1, but we need at least 1 iteration of the loop, 

-     so we treat a true conf->stereo as 2.

-     

-     The depth size is 0 or 24.  Thus we do 2 iterations for that.

-     

-     conf->aux_buffers (when available/non-zero) result in 2 iterations instead of 1.

-     

-     conf->buffers indicates whether we have single or double buffering.

-     

-     conf->total_stencil_bit_depths

-     

-     conf->total_color_buffers indicates the RGB/RGBA color depths.

-     

-     conf->total_accum_buffers iterations for accum (with at least 1 if equal to 0) 

-     

-     conf->total_depth_buffer_depths 

-     

-     conf->multisample_buffers iterations (with at least 1 if equal to 0).  We add 1

-     for the 0 multisampling config.

-     

-     */

-    

-    assert(NULL != caps.configurations);

-    

-    numConfigs = 0;

-    

-    for(conf = caps.configurations; conf; conf = conf->next) {

-        if(conf->total_color_buffers <= 0)

-            continue;

-        

-        numConfigs += (conf->stereo ? 2 : 1) 

-	    * (conf->aux_buffers ? 2 : 1) 

-	    * conf->buffers

-	    * ((conf->total_stencil_bit_depths > 0) ? conf->total_stencil_bit_depths : 1)

-	    * conf->total_color_buffers

-	    * ((conf->total_accum_buffers > 0) ? conf->total_accum_buffers : 1)

-	    * conf->total_depth_buffer_depths

-	    * (conf->multisample_buffers + 1);

-    }

-    

-    if(numConfigsPtr)

-        *numConfigsPtr = numConfigs; 

-    

-    visualConfigs = calloc(sizeof(*visualConfigs), numConfigs);

-    

-    if(NULL == visualConfigs) {

-        ErrorF("xcalloc failure when allocating visualConfigs\n");

-        freeGlCapabilities(&caps);

-        return NULL;

-    }

-    

-    c = visualConfigs; /* current buffer */

-    for(conf = caps.configurations; conf; conf = conf->next) {

-        for(stereo = 0; stereo < (conf->stereo ? 2 : 1); ++stereo) {

-            for(aux = 0; aux < (conf->aux_buffers ? 2 : 1); ++aux) {

-                for(buffers = 0; buffers < conf->buffers; ++buffers) {

-                    for(stencil = 0; stencil < ((conf->total_stencil_bit_depths > 0) ? 

-                                                conf->total_stencil_bit_depths : 1); ++stencil) {

-                        for(color = 0; color < conf->total_color_buffers; ++color) {

-                            for(accum = 0; accum < ((conf->total_accum_buffers > 0) ?

-                                                    conf->total_accum_buffers : 1); ++accum) {

-                                for(depth = 0; depth < conf->total_depth_buffer_depths; ++depth) {

-                                    for(msample = 0; msample < (conf->multisample_buffers + 1); ++msample) {

-                                        

-                                        // Global

-                                        c->visualID = -1;

-                                        c->visualType = GLX_TRUE_COLOR;

-                                        c->next = c + 1;

-

-                                        c->screen = screenNumber;

-

-                                        c->level = 0;

-                                        c->indexBits = 0;

-                                        c->pixmapMode = 0; // TODO: What should this be?

-                                        

-                                        if(conf->accelerated) {

-                                            c->visualRating = GLX_NONE;

-                                        } else {

-                                            c->visualRating = GLX_SLOW_VISUAL_EXT;

-                                        }

-                                        

-                                        c->transparentPixel = GLX_NONE;

-                                        c->transparentRed = GLX_NONE;

-                                        c->transparentGreen = GLX_NONE;

-                                        c->transparentBlue = GLX_NONE;

-                                        c->transparentAlpha = GLX_NONE;

-                                        c->transparentIndex = GLX_NONE;

-                                        

-                                        c->visualSelectGroup = 0;

-                                        

-                                        c->swapMethod = GLX_SWAP_UNDEFINED_OML;

-                                        

-                                        // Stereo

-                                        c->stereoMode = stereo ? TRUE : FALSE;

-

-                                        // Aux buffers

-                                        c->numAuxBuffers = aux ? conf->aux_buffers : 0;

-                                        

-                                        // Double Buffered

-                                        c->doubleBufferMode = buffers ? TRUE : FALSE;

-

-                                        // Stencil Buffer

-                                        if(conf->total_stencil_bit_depths > 0) {

-                                            c->stencilBits = conf->stencil_bit_depths[stencil];

-                                        } else {

-                                            c->stencilBits = 0;

-                                        }

-                                        

-                                        // Color

-                                        if(GLCAPS_COLOR_BUF_INVALID_VALUE != conf->color_buffers[color].a) {

-                                            c->alphaBits = conf->color_buffers[color].a;

-                                        } else {

-                                            c->alphaBits = 0;

-                                        }

-                                        c->redBits   = conf->color_buffers[color].r;

-                                        c->greenBits = conf->color_buffers[color].g;

-                                        c->blueBits  = conf->color_buffers[color].b;

-                                        

-                                        c->rgbBits = c->alphaBits + c->redBits + c->greenBits + c->blueBits;

-

-                                        c->alphaMask = AM_ARGB(c->alphaBits, c->redBits, c->greenBits, c->blueBits);

-                                        c->redMask   = RM_ARGB(c->alphaBits, c->redBits, c->greenBits, c->blueBits);

-                                        c->greenMask = GM_ARGB(c->alphaBits, c->redBits, c->greenBits, c->blueBits);

-                                        c->blueMask  = BM_ARGB(c->alphaBits, c->redBits, c->greenBits, c->blueBits);

-                                                                                

-                                        // Accumulation Buffers

-                                        if(conf->total_accum_buffers > 0) {

-                                            c->accumRedBits = conf->accum_buffers[accum].r;

-                                            c->accumGreenBits = conf->accum_buffers[accum].g;

-                                            c->accumBlueBits = conf->accum_buffers[accum].b;

-                                            if(GLCAPS_COLOR_BUF_INVALID_VALUE != conf->accum_buffers[accum].a) {

-                                                c->accumAlphaBits = conf->accum_buffers[accum].a;

-                                            } else {

-                                                c->accumAlphaBits = 0;

-                                            }

-                                        } else {

-                                            c->accumRedBits = 0;

-                                            c->accumGreenBits = 0;

-                                            c->accumBlueBits = 0;

-                                            c->accumAlphaBits = 0;

-                                        } 

-

-                                        // Depth

-                                        c->depthBits = conf->depth_buffers[depth];

-                                        

-                                        // MultiSample

-                                        if(msample > 0) {

-                                            c->samples = conf->multisample_samples;

-                                            c->sampleBuffers = conf->multisample_buffers;

-                                        } else {

-                                            c->samples = 0;

-                                            c->sampleBuffers = 0;

-                                        }

-										

-                                        /* 

-                                         * The Apple libGL supports GLXPixmaps and 

-                                         * GLXPbuffers in direct mode.

-                                         */

-                                        /* SGIX_fbconfig / GLX 1.3 */

-                                        c->drawableType = GLX_WINDOW_BIT | GLX_PIXMAP_BIT | GLX_PBUFFER_BIT;

-                                        c->renderType = GLX_RGBA_BIT;

-                                        c->xRenderable = GL_TRUE;

-                                        c->fbconfigID = -1;

-                                        

-                                        /* SGIX_pbuffer / GLX 1.3 */

-                                        

-                                        /* 

-                                         * The CGL layer provides a way of retrieving

-                                         * the maximum pbuffer width/height, but only

-                                         * if we create a context and call glGetIntegerv.

-                                         * 

-                                         * The following values are from a test program

-                                         * that does so.

-                                         */

-                                        c->maxPbufferWidth = 8192;

-                                        c->maxPbufferHeight = 8192;

-                                        c->maxPbufferPixels = /*Do we need this?*/ 0;

-                                        /* 

-                                         * There is no introspection for this sort of thing

-                                         * with CGL.  What should we do realistically?

-                                         */

-                                        c->optimalPbufferWidth = 0;

-                                        c->optimalPbufferHeight = 0;

-                                        

-                                        /* EXT_texture_from_pixmap */

-                                        c->bindToTextureRgb = 0;

-                                        c->bindToTextureRgba = 0;

-                                        c->bindToMipmapTexture = 0;

-                                        c->bindToTextureTargets = 0;

-                                        c->yInverted = 0;

-                                        

-                                        c = c->next;

-                                    }

-                                }

-                            }

-                        }

-                    }

-                }

-            }

-        }

-    }

-

-    (c-1)->next = NULL;

-

-    if (c - visualConfigs != numConfigs) {

-        FatalError("numConfigs calculation error in setVisualConfigs!  numConfigs is %d  i is %d\n", numConfigs, (int)(c - visualConfigs));

-    }

-    

-    freeGlCapabilities(&caps);

-    return visualConfigs;

-}

+/*
+ * Copyright (c) 2007, 2008 Apple Inc.
+ * Copyright (c) 2004 Torrey T. Lyons. All Rights Reserved.
+ * Copyright (c) 2002 Greg Parker. All Rights Reserved.
+ *
+ * Portions of this file are copied from Mesa's xf86glx.c,
+ * which contains the following copyright:
+ *
+ * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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.
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "dri.h"
+
+#include <OpenGL/OpenGL.h>
+#include <OpenGL/gl.h>
+#include <OpenGL/glext.h>
+#include <OpenGL/CGLContext.h>
+
+#include <GL/glxproto.h>
+#include <windowstr.h>
+#include <resource.h>
+#include <GL/glxint.h>
+#include <GL/glxtokens.h>
+#include <scrnintstr.h>
+#include <glxserver.h>
+#include <glxscreens.h>
+#include <glxdrawable.h>
+#include <glxcontext.h>
+#include <glxext.h>
+#include <glxutil.h>
+#include <GL/internal/glcore.h>
+
+#include "capabilities.h"
+#include "visualConfigs.h"
+#include "darwinfb.h"
+
+/* Based originally on code from indirect.c which was based on code from i830_dri.c. */
+__GLXconfig *__glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber) {
+    int numConfigs = 0;
+    __GLXconfig *visualConfigs, *c;
+    struct glCapabilities caps;
+    struct glCapabilitiesConfig *conf;
+    int stereo, depth, aux, buffers, stencil, accum, color, msample;
+    
+    if(getGlCapabilities(&caps)) {
+        ErrorF("error from getGlCapabilities()!\n");
+        return NULL;
+    }
+    
+    /*
+     conf->stereo is 0 or 1, but we need at least 1 iteration of the loop, 
+     so we treat a true conf->stereo as 2.
+     
+     The depth size is 0 or 24.  Thus we do 2 iterations for that.
+     
+     conf->aux_buffers (when available/non-zero) result in 2 iterations instead of 1.
+     
+     conf->buffers indicates whether we have single or double buffering.
+     
+     conf->total_stencil_bit_depths
+     
+     conf->total_color_buffers indicates the RGB/RGBA color depths.
+     
+     conf->total_accum_buffers iterations for accum (with at least 1 if equal to 0) 
+     
+     conf->total_depth_buffer_depths 
+     
+     conf->multisample_buffers iterations (with at least 1 if equal to 0).  We add 1
+     for the 0 multisampling config.
+     
+     */
+    
+    assert(NULL != caps.configurations);
+    
+    numConfigs = 0;
+    
+    for(conf = caps.configurations; conf; conf = conf->next) {
+        if(conf->total_color_buffers <= 0)
+            continue;
+        
+        numConfigs += (conf->stereo ? 2 : 1) 
+	    * (conf->aux_buffers ? 2 : 1) 
+	    * conf->buffers
+	    * ((conf->total_stencil_bit_depths > 0) ? conf->total_stencil_bit_depths : 1)
+	    * conf->total_color_buffers
+	    * ((conf->total_accum_buffers > 0) ? conf->total_accum_buffers : 1)
+	    * conf->total_depth_buffer_depths
+	    * (conf->multisample_buffers + 1);
+    }
+    
+    if(numConfigsPtr)
+        *numConfigsPtr = numConfigs; 
+    
+    visualConfigs = calloc(sizeof(*visualConfigs), numConfigs);
+    
+    if(NULL == visualConfigs) {
+        ErrorF("xcalloc failure when allocating visualConfigs\n");
+        freeGlCapabilities(&caps);
+        return NULL;
+    }
+    
+    c = visualConfigs; /* current buffer */
+    for(conf = caps.configurations; conf; conf = conf->next) {
+        for(stereo = 0; stereo < (conf->stereo ? 2 : 1); ++stereo) {
+            for(aux = 0; aux < (conf->aux_buffers ? 2 : 1); ++aux) {
+                for(buffers = 0; buffers < conf->buffers; ++buffers) {
+                    for(stencil = 0; stencil < ((conf->total_stencil_bit_depths > 0) ? 
+                                                conf->total_stencil_bit_depths : 1); ++stencil) {
+                        for(color = 0; color < conf->total_color_buffers; ++color) {
+                            for(accum = 0; accum < ((conf->total_accum_buffers > 0) ?
+                                                    conf->total_accum_buffers : 1); ++accum) {
+                                for(depth = 0; depth < conf->total_depth_buffer_depths; ++depth) {
+                                    for(msample = 0; msample < (conf->multisample_buffers + 1); ++msample) {
+                                        
+                                        // Global
+                                        c->visualID = -1;
+                                        c->visualType = GLX_TRUE_COLOR;
+                                        c->next = c + 1;
+
+                                        c->screen = screenNumber;
+
+                                        c->level = 0;
+                                        c->indexBits = 0;
+                                        c->pixmapMode = 0; // TODO: What should this be?
+                                        
+                                        if(conf->accelerated) {
+                                            c->visualRating = GLX_NONE;
+                                        } else {
+                                            c->visualRating = GLX_SLOW_VISUAL_EXT;
+                                        }
+                                        
+                                        c->transparentPixel = GLX_NONE;
+                                        c->transparentRed = GLX_NONE;
+                                        c->transparentGreen = GLX_NONE;
+                                        c->transparentBlue = GLX_NONE;
+                                        c->transparentAlpha = GLX_NONE;
+                                        c->transparentIndex = GLX_NONE;
+                                        
+                                        c->visualSelectGroup = 0;
+                                        
+                                        c->swapMethod = GLX_SWAP_UNDEFINED_OML;
+                                        
+                                        // Stereo
+                                        c->stereoMode = stereo ? TRUE : FALSE;
+
+                                        // Aux buffers
+                                        c->numAuxBuffers = aux ? conf->aux_buffers : 0;
+                                        
+                                        // Double Buffered
+                                        c->doubleBufferMode = buffers ? TRUE : FALSE;
+
+                                        // Stencil Buffer
+                                        if(conf->total_stencil_bit_depths > 0) {
+                                            c->stencilBits = conf->stencil_bit_depths[stencil];
+                                        } else {
+                                            c->stencilBits = 0;
+                                        }
+                                        
+                                        // Color
+                                        if(GLCAPS_COLOR_BUF_INVALID_VALUE != conf->color_buffers[color].a) {
+                                            c->alphaBits = conf->color_buffers[color].a;
+                                        } else {
+                                            c->alphaBits = 0;
+                                        }
+                                        c->redBits   = conf->color_buffers[color].r;
+                                        c->greenBits = conf->color_buffers[color].g;
+                                        c->blueBits  = conf->color_buffers[color].b;
+                                        
+                                        c->rgbBits = c->alphaBits + c->redBits + c->greenBits + c->blueBits;
+
+                                        c->alphaMask = AM_ARGB(c->alphaBits, c->redBits, c->greenBits, c->blueBits);
+                                        c->redMask   = RM_ARGB(c->alphaBits, c->redBits, c->greenBits, c->blueBits);
+                                        c->greenMask = GM_ARGB(c->alphaBits, c->redBits, c->greenBits, c->blueBits);
+                                        c->blueMask  = BM_ARGB(c->alphaBits, c->redBits, c->greenBits, c->blueBits);
+                                                                                
+                                        // Accumulation Buffers
+                                        if(conf->total_accum_buffers > 0) {
+                                            c->accumRedBits = conf->accum_buffers[accum].r;
+                                            c->accumGreenBits = conf->accum_buffers[accum].g;
+                                            c->accumBlueBits = conf->accum_buffers[accum].b;
+                                            if(GLCAPS_COLOR_BUF_INVALID_VALUE != conf->accum_buffers[accum].a) {
+                                                c->accumAlphaBits = conf->accum_buffers[accum].a;
+                                            } else {
+                                                c->accumAlphaBits = 0;
+                                            }
+                                        } else {
+                                            c->accumRedBits = 0;
+                                            c->accumGreenBits = 0;
+                                            c->accumBlueBits = 0;
+                                            c->accumAlphaBits = 0;
+                                        } 
+
+                                        // Depth
+                                        c->depthBits = conf->depth_buffers[depth];
+                                        
+                                        // MultiSample
+                                        if(msample > 0) {
+                                            c->samples = conf->multisample_samples;
+                                            c->sampleBuffers = conf->multisample_buffers;
+                                        } else {
+                                            c->samples = 0;
+                                            c->sampleBuffers = 0;
+                                        }
+										
+                                        /* 
+                                         * The Apple libGL supports GLXPixmaps and 
+                                         * GLXPbuffers in direct mode.
+                                         */
+                                        /* SGIX_fbconfig / GLX 1.3 */
+                                        c->drawableType = GLX_WINDOW_BIT | GLX_PIXMAP_BIT | GLX_PBUFFER_BIT;
+                                        c->renderType = GLX_RGBA_BIT;
+                                        c->xRenderable = GL_TRUE;
+                                        c->fbconfigID = -1;
+                                        
+                                        /* SGIX_pbuffer / GLX 1.3 */
+                                        
+                                        /* 
+                                         * The CGL layer provides a way of retrieving
+                                         * the maximum pbuffer width/height, but only
+                                         * if we create a context and call glGetIntegerv.
+                                         * 
+                                         * The following values are from a test program
+                                         * that does so.
+                                         */
+                                        c->maxPbufferWidth = 8192;
+                                        c->maxPbufferHeight = 8192;
+                                        c->maxPbufferPixels = /*Do we need this?*/ 0;
+                                        /* 
+                                         * There is no introspection for this sort of thing
+                                         * with CGL.  What should we do realistically?
+                                         */
+                                        c->optimalPbufferWidth = 0;
+                                        c->optimalPbufferHeight = 0;
+                                        
+                                        /* EXT_texture_from_pixmap */
+                                        c->bindToTextureRgb = 0;
+                                        c->bindToTextureRgba = 0;
+                                        c->bindToMipmapTexture = 0;
+                                        c->bindToTextureTargets = 0;
+                                        c->yInverted = 0;
+                                        
+                                        c = c->next;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    (c-1)->next = NULL;
+
+    if (c - visualConfigs != numConfigs) {
+        FatalError("numConfigs calculation error in setVisualConfigs!  numConfigs is %d  i is %d\n", numConfigs, (int)(c - visualConfigs));
+    }
+    
+    freeGlCapabilities(&caps);
+    return visualConfigs;
+}
diff --git a/xorg-server/hw/xquartz/Makefile.am b/xorg-server/hw/xquartz/Makefile.am
index d9dbccc71..a7cc012d9 100644
--- a/xorg-server/hw/xquartz/Makefile.am
+++ b/xorg-server/hw/xquartz/Makefile.am
@@ -1,54 +1,54 @@
-noinst_LTLIBRARIES = libXquartz.la

-AM_CFLAGS = $(DIX_CFLAGS)

-AM_OBJCFLAGS = $(DIX_CFLAGS)

-AM_CPPFLAGS = \

-	-DBUILD_DATE=\"$(BUILD_DATE)\" \

-	-DXSERVER_VERSION=\"$(VERSION)\" \

-	-DINXQUARTZ \

-	-DUSE_NEW_CLUT \

-	-DXFree86Server \

-	-I$(top_srcdir)/miext/rootless \

-	-DX11LIBDIR=\"$(libdir)\"

-

-if GLX

-GL_DIR = GL

-endif

-

-SUBDIRS = bundle . $(GL_DIR) xpr pbproxy mach-startup man

-

-DIST_SUBDIRS = bundle . GL xpr pbproxy mach-startup man

-

-libXquartz_la_SOURCES = \

-	$(top_srcdir)/fb/fbcmap_mi.c \

-	$(top_srcdir)/mi/miinitext.c \

-	X11Application.m \

-	X11Controller.m \

-	applewm.c \

-	darwin.c \

-	darwinEvents.c \

-	darwinXinput.c \

-	keysym2ucs.c \

-	pseudoramiX.c \

-	quartz.c \

-	quartzCocoa.m \

-	quartzKeyboard.c \

-	quartzStartup.c \

-	quartzRandR.c \

-	console_redirect.c

-

-EXTRA_DIST = \

-	X11Application.h \

-	X11Controller.h \

-	applewmExt.h \

-	darwin.h \

-	darwinfb.h \

-	darwinEvents.h \

-	keysym2ucs.h \

-	pseudoramiX.h \

-	quartz.h \

-	quartzCommon.h \

-	quartzKeyboard.h \

-	quartzRandR.h \

-	sanitizedCarbon.h \

-	sanitizedCocoa.h \

-	console_redirect.h

+noinst_LTLIBRARIES = libXquartz.la
+AM_CFLAGS = $(DIX_CFLAGS)
+AM_OBJCFLAGS = $(DIX_CFLAGS)
+AM_CPPFLAGS = \
+	-DBUILD_DATE=\"$(BUILD_DATE)\" \
+	-DXSERVER_VERSION=\"$(VERSION)\" \
+	-DINXQUARTZ \
+	-DUSE_NEW_CLUT \
+	-DXFree86Server \
+	-I$(top_srcdir)/miext/rootless \
+	-DX11LIBDIR=\"$(libdir)\"
+
+if GLX
+GL_DIR = GL
+endif
+
+SUBDIRS = bundle . $(GL_DIR) xpr pbproxy mach-startup man
+
+DIST_SUBDIRS = bundle . GL xpr pbproxy mach-startup man
+
+libXquartz_la_SOURCES = \
+	$(top_srcdir)/fb/fbcmap_mi.c \
+	$(top_srcdir)/mi/miinitext.c \
+	X11Application.m \
+	X11Controller.m \
+	applewm.c \
+	darwin.c \
+	darwinEvents.c \
+	darwinXinput.c \
+	keysym2ucs.c \
+	pseudoramiX.c \
+	quartz.c \
+	quartzCocoa.m \
+	quartzKeyboard.c \
+	quartzStartup.c \
+	quartzRandR.c \
+	console_redirect.c
+
+EXTRA_DIST = \
+	X11Application.h \
+	X11Controller.h \
+	applewmExt.h \
+	darwin.h \
+	darwinfb.h \
+	darwinEvents.h \
+	keysym2ucs.h \
+	pseudoramiX.h \
+	quartz.h \
+	quartzCommon.h \
+	quartzKeyboard.h \
+	quartzRandR.h \
+	sanitizedCarbon.h \
+	sanitizedCocoa.h \
+	console_redirect.h
diff --git a/xorg-server/hw/xquartz/X11Application.h b/xorg-server/hw/xquartz/X11Application.h
index 687551ec6..baee29d4c 100644
--- a/xorg-server/hw/xquartz/X11Application.h
+++ b/xorg-server/hw/xquartz/X11Application.h
@@ -1,116 +1,116 @@
-/* X11Application.h -- subclass of NSApplication to multiplex events

-

-   Copyright (c) 2002-2007 Apple Inc. All rights reserved.

-

-   Permission is hereby granted, free of charge, to any person

-   obtaining a copy of this software and associated documentation files

-   (the "Software"), to deal in the Software without restriction,

-   including without limitation the rights to use, copy, modify, merge,

-   publish, distribute, sublicense, and/or sell copies of the Software,

-   and to permit persons to whom the Software is furnished to do so,

-   subject to the following conditions:

-

-   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 ABOVE LISTED COPYRIGHT

-   HOLDER(S) 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(s) of the above

-   copyright holders shall not be used in advertising or otherwise to

-   promote the sale, use or other dealings in this Software without

-   prior written authorization. */

-

-#ifndef X11APPLICATION_H

-#define X11APPLICATION_H 1

-

-#if __OBJC__

-

-#import "X11Controller.h"

-

-@interface X11Application : NSApplication {

-    X11Controller *_controller;

-

-    unsigned int _x_active :1;

-}

-

-- (void) set_controller:controller;

-- (void) set_window_menu:(NSArray *)list;

-

-- (CFPropertyListRef) prefs_get_copy:(NSString *)key CF_RETURNS_RETAINED;

-- (int) prefs_get_integer:(NSString *)key default:(int)def;

-- (const char *) prefs_get_string:(NSString *)key default:(const char *)def;

-- (float) prefs_get_float:(NSString *)key default:(float)def;

-- (int) prefs_get_boolean:(NSString *)key default:(int)def;

-- (NSURL *) prefs_copy_url:(NSString *)key default:(NSURL *)def NS_RETURNS_RETAINED;

-- (NSArray *) prefs_get_array:(NSString *)key;

-- (void) prefs_set_integer:(NSString *)key value:(int)value;

-- (void) prefs_set_float:(NSString *)key value:(float)value;

-- (void) prefs_set_boolean:(NSString *)key value:(int)value;

-- (void) prefs_set_array:(NSString *)key value:(NSArray *)value;

-- (void) prefs_set_string:(NSString *)key value:(NSString *)value;

-- (void) prefs_synchronize;

-

-- (X11Controller *) controller;

-- (OSX_BOOL) x_active;

-@end

-

-extern X11Application *X11App;

-

-#endif /* __OBJC__ */

-

-void X11ApplicationSetWindowMenu (int nitems, const char **items,

-					 const char *shortcuts);

-void X11ApplicationSetWindowMenuCheck (int idx);

-void X11ApplicationSetFrontProcess (void);

-void X11ApplicationSetCanQuit (int state);

-void X11ApplicationServerReady (void);

-void X11ApplicationShowHideMenubar (int state);

-void X11ApplicationLaunchClient (const char *cmd);

-

-Bool X11ApplicationCanEnterRandR (void);

-

-void X11ApplicationMain(int argc, char **argv, char **envp);

-

-#define PREFS_APPSMENU              "apps_menu"

-#define PREFS_FAKEBUTTONS           "enable_fake_buttons"

-#define PREFS_KEYEQUIVS             "enable_key_equivalents"

-#define PREFS_FULLSCREEN_HOTKEYS    "fullscreen_hotkeys"

-#define PREFS_FULLSCREEN_MENU       "fullscreen_menu"

-#define PREFS_SYNC_KEYMAP           "sync_keymap"

-#define PREFS_DEPTH                 "depth"

-#define PREFS_NO_AUTH               "no_auth"

-#define PREFS_NO_TCP                "nolisten_tcp"

-#define PREFS_DONE_XINIT_CHECK      "done_xinit_check"

-#define PREFS_NO_QUIT_ALERT         "no_quit_alert"

-#define PREFS_NO_RANDR_ALERT        "no_randr_alert"

-#define PREFS_OPTION_SENDS_ALT      "option_sends_alt"

-#define PREFS_FAKE_BUTTON2          "fake_button2"

-#define PREFS_FAKE_BUTTON3          "fake_button3"

-#define PREFS_APPKIT_MODIFIERS      "appkit_modifiers"

-#define PREFS_WINDOW_ITEM_MODIFIERS "window_item_modifiers"

-#define PREFS_ROOTLESS              "rootless"

-#define PREFS_TEST_EXTENSIONS       "enable_test_extensions"

-#define PREFS_XP_OPTIONS            "xp_options"

-#define PREFS_LOGIN_SHELL           "login_shell"

-#define PREFS_UPDATE_FEED           "update_feed"

-#define PREFS_CLICK_THROUGH         "wm_click_through"

-#define PREFS_FFM                   "wm_ffm"

-#define PREFS_FOCUS_ON_NEW_WINDOW   "wm_focus_on_new_window"

-

-#define PREFS_SCROLL_IN_DEV_DIRECTION "scroll_in_device_direction"

-extern Bool XQuartzScrollInDeviceDirection;

-

-#define PREFS_SYNC_PB                "sync_pasteboard"

-#define PREFS_SYNC_PB_TO_CLIPBOARD   "sync_pasteboard_to_clipboard"

-#define PREFS_SYNC_PB_TO_PRIMARY     "sync_pasteboard_to_primary"

-#define PREFS_SYNC_CLIPBOARD_TO_PB   "sync_clipboard_to_pasteboard"

-#define PREFS_SYNC_PRIMARY_ON_SELECT "sync_primary_on_select"

-

-#endif /* X11APPLICATION_H */

+/* X11Application.h -- subclass of NSApplication to multiplex events
+
+   Copyright (c) 2002-2007 Apple Inc. All rights reserved.
+
+   Permission is hereby granted, free of charge, to any person
+   obtaining a copy of this software and associated documentation files
+   (the "Software"), to deal in the Software without restriction,
+   including without limitation the rights to use, copy, modify, merge,
+   publish, distribute, sublicense, and/or sell copies of the Software,
+   and to permit persons to whom the Software is furnished to do so,
+   subject to the following conditions:
+
+   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 ABOVE LISTED COPYRIGHT
+   HOLDER(S) 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(s) of the above
+   copyright holders shall not be used in advertising or otherwise to
+   promote the sale, use or other dealings in this Software without
+   prior written authorization. */
+
+#ifndef X11APPLICATION_H
+#define X11APPLICATION_H 1
+
+#if __OBJC__
+
+#import "X11Controller.h"
+
+@interface X11Application : NSApplication {
+    X11Controller *_controller;
+
+    unsigned int _x_active :1;
+}
+
+- (void) set_controller:controller;
+- (void) set_window_menu:(NSArray *)list;
+
+- (CFPropertyListRef) prefs_get_copy:(NSString *)key CF_RETURNS_RETAINED;
+- (int) prefs_get_integer:(NSString *)key default:(int)def;
+- (const char *) prefs_get_string:(NSString *)key default:(const char *)def;
+- (float) prefs_get_float:(NSString *)key default:(float)def;
+- (int) prefs_get_boolean:(NSString *)key default:(int)def;
+- (NSURL *) prefs_copy_url:(NSString *)key default:(NSURL *)def NS_RETURNS_RETAINED;
+- (NSArray *) prefs_get_array:(NSString *)key;
+- (void) prefs_set_integer:(NSString *)key value:(int)value;
+- (void) prefs_set_float:(NSString *)key value:(float)value;
+- (void) prefs_set_boolean:(NSString *)key value:(int)value;
+- (void) prefs_set_array:(NSString *)key value:(NSArray *)value;
+- (void) prefs_set_string:(NSString *)key value:(NSString *)value;
+- (void) prefs_synchronize;
+
+- (X11Controller *) controller;
+- (OSX_BOOL) x_active;
+@end
+
+extern X11Application *X11App;
+
+#endif /* __OBJC__ */
+
+void X11ApplicationSetWindowMenu (int nitems, const char **items,
+					 const char *shortcuts);
+void X11ApplicationSetWindowMenuCheck (int idx);
+void X11ApplicationSetFrontProcess (void);
+void X11ApplicationSetCanQuit (int state);
+void X11ApplicationServerReady (void);
+void X11ApplicationShowHideMenubar (int state);
+void X11ApplicationLaunchClient (const char *cmd);
+
+Bool X11ApplicationCanEnterRandR (void);
+
+void X11ApplicationMain(int argc, char **argv, char **envp);
+
+#define PREFS_APPSMENU              "apps_menu"
+#define PREFS_FAKEBUTTONS           "enable_fake_buttons"
+#define PREFS_KEYEQUIVS             "enable_key_equivalents"
+#define PREFS_FULLSCREEN_HOTKEYS    "fullscreen_hotkeys"
+#define PREFS_FULLSCREEN_MENU       "fullscreen_menu"
+#define PREFS_SYNC_KEYMAP           "sync_keymap"
+#define PREFS_DEPTH                 "depth"
+#define PREFS_NO_AUTH               "no_auth"
+#define PREFS_NO_TCP                "nolisten_tcp"
+#define PREFS_DONE_XINIT_CHECK      "done_xinit_check"
+#define PREFS_NO_QUIT_ALERT         "no_quit_alert"
+#define PREFS_NO_RANDR_ALERT        "no_randr_alert"
+#define PREFS_OPTION_SENDS_ALT      "option_sends_alt"
+#define PREFS_FAKE_BUTTON2          "fake_button2"
+#define PREFS_FAKE_BUTTON3          "fake_button3"
+#define PREFS_APPKIT_MODIFIERS      "appkit_modifiers"
+#define PREFS_WINDOW_ITEM_MODIFIERS "window_item_modifiers"
+#define PREFS_ROOTLESS              "rootless"
+#define PREFS_TEST_EXTENSIONS       "enable_test_extensions"
+#define PREFS_XP_OPTIONS            "xp_options"
+#define PREFS_LOGIN_SHELL           "login_shell"
+#define PREFS_UPDATE_FEED           "update_feed"
+#define PREFS_CLICK_THROUGH         "wm_click_through"
+#define PREFS_FFM                   "wm_ffm"
+#define PREFS_FOCUS_ON_NEW_WINDOW   "wm_focus_on_new_window"
+
+#define PREFS_SCROLL_IN_DEV_DIRECTION "scroll_in_device_direction"
+extern Bool XQuartzScrollInDeviceDirection;
+
+#define PREFS_SYNC_PB                "sync_pasteboard"
+#define PREFS_SYNC_PB_TO_CLIPBOARD   "sync_pasteboard_to_clipboard"
+#define PREFS_SYNC_PB_TO_PRIMARY     "sync_pasteboard_to_primary"
+#define PREFS_SYNC_CLIPBOARD_TO_PB   "sync_clipboard_to_pasteboard"
+#define PREFS_SYNC_PRIMARY_ON_SELECT "sync_primary_on_select"
+
+#endif /* X11APPLICATION_H */
diff --git a/xorg-server/hw/xquartz/X11Application.m b/xorg-server/hw/xquartz/X11Application.m
index 1dec6c03a..7fd7dab3c 100644
--- a/xorg-server/hw/xquartz/X11Application.m
+++ b/xorg-server/hw/xquartz/X11Application.m
@@ -1,1421 +1,1421 @@
-/* X11Application.m -- subclass of NSApplication to multiplex events

- 

- Copyright (c) 2002-2008 Apple Inc.

- 

- Permission is hereby granted, free of charge, to any person

- obtaining a copy of this software and associated documentation files

- (the "Software"), to deal in the Software without restriction,

- including without limitation the rights to use, copy, modify, merge,

- publish, distribute, sublicense, and/or sell copies of the Software,

- and to permit persons to whom the Software is furnished to do so,

- subject to the following conditions:

- 

- 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 ABOVE LISTED COPYRIGHT

- HOLDER(S) 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(s) of the above

- copyright holders shall not be used in advertising or otherwise to

- promote the sale, use or other dealings in this Software without

- prior written authorization. */

-

-#include "sanitizedCarbon.h"

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include "quartzCommon.h"

-

-#import "X11Application.h"

-

-#include "darwin.h"

-#include "quartz.h"

-#include "darwinEvents.h"

-#include "quartzKeyboard.h"

-#include <X11/extensions/applewmconst.h>

-#include "micmap.h"

-#include "exglobals.h"

-

-#include <mach/mach.h>

-#include <unistd.h>

-#include <AvailabilityMacros.h>

-

-#include <pthread.h>

-

-#include <Xplugin.h>

-

-// pbproxy/pbproxy.h

-extern int xpbproxy_run (void);

-

-#define DEFAULTS_FILE X11LIBDIR"/X11/xserver/Xquartz.plist"

-

-#ifndef XSERVER_VERSION

-#define XSERVER_VERSION "?"

-#endif

-

-#ifdef HAVE_LIBDISPATCH

-#include <dispatch/dispatch.h>

-

-static dispatch_queue_t eventTranslationQueue;

-#endif

-

-/* Stuck modifier / button state... force release when we context switch */

-static NSEventType keyState[NUM_KEYCODES];

-

-extern Bool noTestExtensions;

-

-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050

-static TISInputSourceRef last_key_layout;

-#else

-static KeyboardLayoutRef last_key_layout;

-#endif

-

-/* This preference is only tested on Lion or later as it's not relevant to

- * earlier OS versions.

- */

-Bool XQuartzScrollInDeviceDirection = FALSE;

-

-extern int darwinFakeButtons;

-

-/* Store the mouse location while in the background, and update X11's pointer

- * location when we become the foreground application

- */

-static NSPoint bgMouseLocation;

-static BOOL bgMouseLocationUpdated = FALSE;

-

-X11Application *X11App;

-

-CFStringRef app_prefs_domain_cfstr = NULL;

-

-#define ALL_KEY_MASKS (NSShiftKeyMask | NSControlKeyMask | NSAlternateKeyMask | NSCommandKeyMask)

-

-@interface X11Application (Private)

-- (void) sendX11NSEvent:(NSEvent *)e;

-@end

-

-@implementation X11Application

-

-typedef struct message_struct message;

-struct message_struct {

-    mach_msg_header_t hdr;

-    SEL selector;

-    NSObject *arg;

-};

-

-static mach_port_t _port;

-

-/* Quartz mode initialization routine. This is often dynamically loaded

-   but is statically linked into this X server. */

-Bool QuartzModeBundleInit(void);

-

-static void init_ports (void) {

-    kern_return_t r;

-    NSPort *p;

-	

-    if (_port != MACH_PORT_NULL) return;

-	

-    r = mach_port_allocate (mach_task_self (), MACH_PORT_RIGHT_RECEIVE, &_port);

-    if (r != KERN_SUCCESS) return;

-	

-    p = [NSMachPort portWithMachPort:_port];

-    [p setDelegate:NSApp];

-    [p scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];

-}

-

-static void message_kit_thread (SEL selector, NSObject *arg) {

-    message msg;

-    kern_return_t r;

-	

-    msg.hdr.msgh_bits = MACH_MSGH_BITS (MACH_MSG_TYPE_MAKE_SEND, 0);

-    msg.hdr.msgh_size = sizeof (msg);

-    msg.hdr.msgh_remote_port = _port;

-    msg.hdr.msgh_local_port = MACH_PORT_NULL;

-    msg.hdr.msgh_reserved = 0;

-    msg.hdr.msgh_id = 0;

-	

-    msg.selector = selector;

-    msg.arg = [arg retain];

-	

-    r = mach_msg (&msg.hdr, MACH_SEND_MSG, msg.hdr.msgh_size,

-		  0, MACH_PORT_NULL, 0, MACH_PORT_NULL);

-    if (r != KERN_SUCCESS)

-		ErrorF("%s: mach_msg failed: %x\n", __FUNCTION__, r);

-}

-

-- (void) handleMachMessage:(void *)_msg {

-    message *msg = _msg;

-	

-    [self performSelector:msg->selector withObject:msg->arg];

-    [msg->arg release];

-}

-

-- (void) set_controller:obj {

-    if (_controller == nil) _controller = [obj retain];

-}

-

-- (void) dealloc {

-    if (_controller != nil) [_controller release];

-	

-    if (_port != MACH_PORT_NULL)

-		mach_port_deallocate (mach_task_self (), _port);

-	

-    [super dealloc];

-}

-

-- (void) orderFrontStandardAboutPanel: (id) sender {

-    NSMutableDictionary *dict;

-    NSDictionary *infoDict;

-    NSString *tem;

-    

-    dict = [NSMutableDictionary dictionaryWithCapacity:3];

-    infoDict = [[NSBundle mainBundle] infoDictionary];

-    

-    [dict setObject: NSLocalizedString (@"The X Window System", @"About panel")

-          forKey:@"ApplicationName"];

-    

-    tem = [infoDict objectForKey:@"CFBundleShortVersionString"];

-    

-    [dict setObject:[NSString stringWithFormat:@"XQuartz %@", tem]

-          forKey:@"ApplicationVersion"];

-

-    [dict setObject:[NSString stringWithFormat:@"xorg-server %s", XSERVER_VERSION]

-          forKey:@"Version"];

-    

-    [self orderFrontStandardAboutPanelWithOptions: dict];

-}

-

-- (void) activateX:(OSX_BOOL)state {

-    size_t i;

-    DEBUG_LOG("state=%d, _x_active=%d, \n", state, _x_active);

-    if (state) {

-        if(bgMouseLocationUpdated) {

-            DarwinSendPointerEvents(darwinPointer, MotionNotify, 0, bgMouseLocation.x, bgMouseLocation.y, 0.0, 0.0, 0.0);

-            bgMouseLocationUpdated = FALSE;

-        }

-        DarwinSendDDXEvent(kXquartzActivate, 0);

-    } else {

-

-        if(darwin_all_modifier_flags)

-            DarwinUpdateModKeys(0);

-        for(i=0; i < NUM_KEYCODES; i++) {

-            if(keyState[i] == NSKeyDown) {

-                DarwinSendKeyboardEvents(KeyRelease, i);

-                keyState[i] = NSKeyUp;

-            }

-        }

-        

-        DarwinSendDDXEvent(kXquartzDeactivate, 0);

-    }

-

-    _x_active = state;

-}

-

-- (void) became_key:(NSWindow *)win {

-	[self activateX:NO];

-}

-

-- (void) sendEvent:(NSEvent *)e {

-    OSX_BOOL for_appkit, for_x;

-    

-    /* By default pass down the responder chain and to X. */

-    for_appkit = YES;

-    for_x = YES;

-    

-    switch ([e type]) {

-        case NSLeftMouseDown: case NSRightMouseDown: case NSOtherMouseDown:

-        case NSLeftMouseUp: case NSRightMouseUp: case NSOtherMouseUp:

-            if ([e window] != nil) {

-                /* Pointer event has an (AppKit) window. Probably something for the kit. */

-                for_x = NO;

-                if (_x_active) [self activateX:NO];

-            } else if ([self modalWindow] == nil) {

-                /* Must be an X window. Tell appkit it doesn't have focus. */

-                for_appkit = NO;

-                

-                if ([self isActive]) {

-                    [self deactivate];

-                    if (!_x_active && quartzProcs->IsX11Window([e windowNumber]))

-                        [self activateX:YES];

-                }

-            }

-

-            /* We want to force sending to appkit if we're over the menu bar */

-            if(!for_appkit) {

-                NSPoint NSlocation = [e locationInWindow];

-                NSWindow *window = [e window];

-                NSRect NSframe, NSvisibleFrame;

-                CGRect CGframe, CGvisibleFrame;

-                CGPoint CGlocation;

-

-                if (window != nil)	{

-                    NSRect frame = [window frame];

-                    NSlocation.x += frame.origin.x;

-                    NSlocation.y += frame.origin.y;

-                }

-

-                NSframe = [[NSScreen mainScreen] frame];

-                NSvisibleFrame = [[NSScreen mainScreen] visibleFrame];

-                

-                CGframe = CGRectMake(NSframe.origin.x, NSframe.origin.y,

-                                            NSframe.size.width, NSframe.size.height);

-                CGvisibleFrame = CGRectMake(NSvisibleFrame.origin.x,

-                                                   NSvisibleFrame.origin.y,

-                                                   NSvisibleFrame.size.width,

-                                                   NSvisibleFrame.size.height);

-                CGlocation = CGPointMake(NSlocation.x, NSlocation.y);

-                

-                if(CGRectContainsPoint(CGframe, CGlocation) &&

-                   !CGRectContainsPoint(CGvisibleFrame, CGlocation))

-                    for_appkit = YES;

-            }

-            

-            break;

-            

-        case NSKeyDown: case NSKeyUp:

-            

-            if(_x_active) {

-                static BOOL do_swallow = NO;

-                static int swallow_keycode;

-                

-                if([e type] == NSKeyDown) {

-                    /* Before that though, see if there are any global

-                     * shortcuts bound to it. */

-

-                    if(darwinAppKitModMask & [e modifierFlags]) {

-                        /* Override to force sending to Appkit */

-                        swallow_keycode = [e keyCode];

-                        do_swallow = YES;

-                        for_x = NO;

-#if XPLUGIN_VERSION >= 1

-                    } else if(XQuartzEnableKeyEquivalents &&

-                             xp_is_symbolic_hotkey_event([e eventRef])) {

-                        swallow_keycode = [e keyCode];

-                        do_swallow = YES;

-                        for_x = NO;

-#endif

-                    } else if(XQuartzEnableKeyEquivalents &&

-                              [[self mainMenu] performKeyEquivalent:e]) {

-                        swallow_keycode = [e keyCode];

-                        do_swallow = YES;

-                        for_appkit = NO;

-                        for_x = NO;

-                    } else if(!XQuartzIsRootless

-                              && ([e modifierFlags] & ALL_KEY_MASKS) == (NSCommandKeyMask | NSAlternateKeyMask)

-                              && ([e keyCode] == 0 /*a*/ || [e keyCode] == 53 /*Esc*/)) {

-                        /* We have this here to force processing fullscreen 

-                         * toggle even if XQuartzEnableKeyEquivalents is disabled */

-                        swallow_keycode = [e keyCode];

-                        do_swallow = YES;

-                        for_x = NO;

-                        for_appkit = NO;

-                        DarwinSendDDXEvent(kXquartzToggleFullscreen, 0);

-                    } else {

-                        /* No kit window is focused, so send it to X. */

-                        for_appkit = NO;

-                    }

-                } else { /* KeyUp */

-                    /* If we saw a key equivalent on the down, don't pass

-                     * the up through to X. */

-                    if (do_swallow && [e keyCode] == swallow_keycode) {

-                        do_swallow = NO;

-                        for_x = NO;

-                    }

-                }

-            } else { /* !_x_active */

-                for_x = NO;

-            }

-            break;

-            

-        case NSFlagsChanged:

-            /* Don't tell X11 about modifiers changing while it's not active */

-            if (!_x_active)

-                for_x = NO;

-            break;

-            

-        case NSAppKitDefined:

-            switch ([e subtype]) {

-                static BOOL x_was_active = NO;

-

-                case NSApplicationActivatedEventType:

-                    for_x = NO;

-                    if ([e window] == nil && x_was_active) {

-                        BOOL order_all_windows = YES, workspaces, ok;

-                        for_appkit = NO;

-

-                        /* FIXME: This is a hack to avoid passing the event to AppKit which

-                         *        would result in it raising one of its windows.

-                         */

-                        _appFlags._active = YES;

-

-                        X11ApplicationSetFrontProcess();

-

-                        /* Get the Spaces preference for SwitchOnActivate */

-                        (void)CFPreferencesAppSynchronize(CFSTR("com.apple.dock"));

-                        workspaces = CFPreferencesGetAppBooleanValue(CFSTR("workspaces"), CFSTR("com.apple.dock"), &ok);

-                        if (!ok)

-                            workspaces = NO;

-

-                        if (workspaces) {

-                            (void)CFPreferencesAppSynchronize(CFSTR(".GlobalPreferences"));

-                            order_all_windows = CFPreferencesGetAppBooleanValue(CFSTR("AppleSpacesSwitchOnActivate"), CFSTR(".GlobalPreferences"), &ok);

-                            if (!ok)

-                                order_all_windows = YES;

-                        }

-                        

-                        /* TODO: In the workspaces && !AppleSpacesSwitchOnActivate case, the windows are ordered

-                         *       correctly, but we need to activate the top window on this space if there is

-                         *       none active.

-                         *

-                         *       If there are no active windows, and there are minimized windows, we should

-                         *       be restoring one of them.

-                         */

-                        if ([e data2] & 0x10) { // 0x10 (bfCPSOrderAllWindowsForward) is set when we use cmd-tab or the dock icon

-                            DarwinSendDDXEvent(kXquartzBringAllToFront, 1, order_all_windows);

-                        }

-                    }

-                    break;

-                    

-                case 18: /* ApplicationDidReactivate */

-                    if (XQuartzFullscreenVisible) for_appkit = NO;

-                    break;

-                    

-                case NSApplicationDeactivatedEventType:

-                    for_x = NO;

-

-                    x_was_active = _x_active;

-                    if(_x_active)

-                        [self activateX:NO];

-                    break;

-            }

-            break;

-            

-        default: break; /* for gcc */

-    }

-    

-    if (for_appkit) [super sendEvent:e];

-    

-    if (for_x) {

-#ifdef HAVE_LIBDISPATCH

-        dispatch_async(eventTranslationQueue, ^{

-#endif

-            [self sendX11NSEvent:e];

-#ifdef HAVE_LIBDISPATCH

-        });

-#endif

-    }

-}

-

-- (void) set_window_menu:(NSArray *)list {

-	[_controller set_window_menu:list];

-}

-

-- (void) set_window_menu_check:(NSNumber *)n {

-	[_controller set_window_menu_check:n];

-}

-

-- (void) set_apps_menu:(NSArray *)list {

-	[_controller set_apps_menu:list];

-}

-

-- (void) set_front_process:unused {

-	[NSApp activateIgnoringOtherApps:YES];

-

-	if ([self modalWindow] == nil)

-		[self activateX:YES];

-}

-

-- (void) set_can_quit:(NSNumber *)state {

-	[_controller set_can_quit:[state boolValue]];

-}

-

-- (void) server_ready:unused {

-	[_controller server_ready];

-}

-

-- (void) show_hide_menubar:(NSNumber *)state {

-    /* Also shows/hides the dock */

-    if ([state boolValue])

-        SetSystemUIMode(kUIModeNormal, 0); 

-    else

-        SetSystemUIMode(kUIModeAllHidden, XQuartzFullscreenMenu ? kUIOptionAutoShowMenuBar : 0); // kUIModeAllSuppressed or kUIOptionAutoShowMenuBar can be used to allow "mouse-activation"

-}

-

-- (void) launch_client:(NSString *)cmd {

-    (void)[_controller application:self openFile:cmd];

-}

-

-/* user preferences */

-

-/* Note that these functions only work for arrays whose elements

- can be toll-free-bridged between NS and CF worlds. */

-

-static const void *cfretain (CFAllocatorRef a, const void *b) {

-    return CFRetain (b);

-}

-

-static void cfrelease (CFAllocatorRef a, const void *b) {

-    CFRelease (b);

-}

-

-static CFMutableArrayRef nsarray_to_cfarray (NSArray *in) {

-	CFMutableArrayRef out;

-	CFArrayCallBacks cb;

-	NSObject *ns;

-	const CFTypeRef *cf;

-	int i, count;

-

-	memset (&cb, 0, sizeof (cb));

-	cb.version = 0;

-	cb.retain = cfretain;

-	cb.release = cfrelease;

-

-	count = [in count];

-	out = CFArrayCreateMutable (NULL, count, &cb);

-

-	for (i = 0; i < count; i++) {

-		ns = [in objectAtIndex:i];

-

-		if ([ns isKindOfClass:[NSArray class]])

-			cf = (CFTypeRef) nsarray_to_cfarray ((NSArray *) ns);

-		else

-			cf = CFRetain ((CFTypeRef) ns);

-

-		CFArrayAppendValue (out, cf);

-		CFRelease (cf);

-	}

-

-	return out;

-}

-

-static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {

-	NSMutableArray *out;

-	const CFTypeRef *cf;

-	NSObject *ns;

-	int i, count;

-

-	count = CFArrayGetCount (in);

-	out = [[NSMutableArray alloc] initWithCapacity:count];

-

-	for (i = 0; i < count; i++) {

-		cf = CFArrayGetValueAtIndex (in, i);

-

-		if (CFGetTypeID (cf) == CFArrayGetTypeID ())

-			ns = cfarray_to_nsarray ((CFArrayRef) cf);

-		else

-			ns = [(id)cf retain];

-

-		[out addObject:ns];

-		[ns release];

-	}

-

-	return out;

-}

-

-- (CFPropertyListRef) prefs_get_copy:(NSString *)key {

-    CFPropertyListRef value;

-	

-    value = CFPreferencesCopyAppValue ((CFStringRef) key, app_prefs_domain_cfstr);

-	

-    if (value == NULL) {

-      static CFDictionaryRef defaults;

-      

-      if (defaults == NULL) {

-	CFStringRef error = NULL;

-	CFDataRef data;

-	CFURLRef url;

-	SInt32 error_code;

-	

-	url = (CFURLCreateFromFileSystemRepresentation

-	       (NULL, (unsigned char *)DEFAULTS_FILE, strlen (DEFAULTS_FILE), false));

-	if (CFURLCreateDataAndPropertiesFromResource (NULL, url, &data,

-						      NULL, NULL, &error_code)) {

-	  defaults = (CFPropertyListCreateFromXMLData

-		      (NULL, data, kCFPropertyListMutableContainersAndLeaves, &error));

-	  if (error != NULL) CFRelease (error);

-	  CFRelease (data);

-	}

-	CFRelease (url);

-			

-	if (defaults != NULL) {

-	  NSMutableArray *apps, *elt;

-	  int count, i;

-	  NSString *name, *nname;

-	  

-	  /* Localize the names in the default apps menu. */

-	  

-	  apps = [(NSDictionary *)defaults objectForKey:@PREFS_APPSMENU];

-	  if (apps != nil) {

-	    count = [apps count];

-	    for (i = 0; i < count; i++)	{

-	      elt = [apps objectAtIndex:i];

-	      if (elt != nil && [elt isKindOfClass:[NSArray class]]) {

-		name = [elt objectAtIndex:0];

-		if (name != nil) {

-		  nname = NSLocalizedString (name, nil);

-		  if (nname != nil && nname != name)

-		    [elt replaceObjectAtIndex:0 withObject:nname];

-		}

-	      }

-	    }

-	  }

-	}

-      }

-		

-      if (defaults != NULL) value = CFDictionaryGetValue (defaults, key);

-      if (value != NULL) CFRetain (value);

-    }

-	

-    return value;

-}

-

-- (int) prefs_get_integer:(NSString *)key default:(int)def {

-  CFPropertyListRef value;

-  int ret;

-  

-  value = [self prefs_get_copy:key];

-  

-  if (value != NULL && CFGetTypeID (value) == CFNumberGetTypeID ())

-    CFNumberGetValue (value, kCFNumberIntType, &ret);

-  else if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ())

-    ret = CFStringGetIntValue (value);

-  else

-    ret = def;

-  

-  if (value != NULL) CFRelease (value);

-  

-  return ret;

-}

-

-- (const char *) prefs_get_string:(NSString *)key default:(const char *)def {

-  CFPropertyListRef value;

-  const char *ret = NULL;

-  

-  value = [self prefs_get_copy:key];

-  

-  if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ()) {

-    NSString *s = (NSString *) value;

-    

-    ret = [s UTF8String];

-  }

-  

-  if (value != NULL) CFRelease (value);

-  

-  return ret != NULL ? ret : def;

-}

-

-- (NSURL *) prefs_copy_url:(NSString *)key default:(NSURL *)def {

-    CFPropertyListRef value;

-    NSURL *ret = NULL;

-    

-    value = [self prefs_get_copy:key];

-    

-    if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ()) {

-        NSString *s = (NSString *) value;

-

-        ret = [NSURL URLWithString:s];

-        [ret retain];

-    }

-    

-    if (value != NULL) CFRelease (value);

-    

-    return ret != NULL ? ret : def;

-}

-

-- (float) prefs_get_float:(NSString *)key default:(float)def {

-  CFPropertyListRef value;

-  float ret = def;

-  

-  value = [self prefs_get_copy:key];

-  

-  if (value != NULL

-      && CFGetTypeID (value) == CFNumberGetTypeID ()

-      && CFNumberIsFloatType (value))

-    CFNumberGetValue (value, kCFNumberFloatType, &ret);

-  else if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ())

-    ret = CFStringGetDoubleValue (value);

-	

-  if (value != NULL) CFRelease (value);

-  

-  return ret;

-}

-

-- (int) prefs_get_boolean:(NSString *)key default:(int)def {

-  CFPropertyListRef value;

-  int ret = def;

-  

-  value = [self prefs_get_copy:key];

-  

-  if (value != NULL) {

-    if (CFGetTypeID (value) == CFNumberGetTypeID ())

-      CFNumberGetValue (value, kCFNumberIntType, &ret);

-    else if (CFGetTypeID (value) == CFBooleanGetTypeID ())

-      ret = CFBooleanGetValue (value);

-    else if (CFGetTypeID (value) == CFStringGetTypeID ()) {

-      const char *tem = [(NSString *) value UTF8String];

-      if (strcasecmp (tem, "true") == 0 || strcasecmp (tem, "yes") == 0)

-	ret = YES;

-      else

-	ret = NO;

-    }

-    

-    CFRelease (value);

-  }

-  return ret;

-}

-

-- (NSArray *) prefs_get_array:(NSString *)key {

-  NSArray *ret = nil;

-  CFPropertyListRef value;

-  

-  value = [self prefs_get_copy:key];

-  

-  if (value != NULL) {

-    if (CFGetTypeID (value) == CFArrayGetTypeID ())

-      ret = [cfarray_to_nsarray (value) autorelease];

-    

-    CFRelease (value);

-  }

-  

-  return ret;

-}

-

-- (void) prefs_set_integer:(NSString *)key value:(int)value {

-    CFNumberRef x;

-	

-    x = CFNumberCreate (NULL, kCFNumberIntType, &value);

-	

-    CFPreferencesSetValue ((CFStringRef) key, (CFTypeRef) x, app_prefs_domain_cfstr,

-			   kCFPreferencesCurrentUser, kCFPreferencesAnyHost);

-	

-    CFRelease (x);

-}

-

-- (void) prefs_set_float:(NSString *)key value:(float)value {

-    CFNumberRef x;

-	

-    x = CFNumberCreate (NULL, kCFNumberFloatType, &value);

-	

-    CFPreferencesSetValue ((CFStringRef) key, (CFTypeRef) x, app_prefs_domain_cfstr,

-			   kCFPreferencesCurrentUser, kCFPreferencesAnyHost);

-	

-    CFRelease (x);

-}

-

-- (void) prefs_set_boolean:(NSString *)key value:(int)value {

-  CFPreferencesSetValue ((CFStringRef) key,

-			 (CFTypeRef) (value ? kCFBooleanTrue

-			 : kCFBooleanFalse), app_prefs_domain_cfstr,

-			 kCFPreferencesCurrentUser, kCFPreferencesAnyHost);

-  

-}

-

-- (void) prefs_set_array:(NSString *)key value:(NSArray *)value {

-  CFArrayRef cfarray;

-  

-  cfarray = nsarray_to_cfarray (value);

-  CFPreferencesSetValue ((CFStringRef) key,

-			 (CFTypeRef) cfarray,

-			 app_prefs_domain_cfstr,

-			 kCFPreferencesCurrentUser, kCFPreferencesAnyHost);

-  CFRelease (cfarray);

-}

-

-- (void) prefs_set_string:(NSString *)key value:(NSString *)value {

-  CFPreferencesSetValue ((CFStringRef) key, (CFTypeRef) value,

-			 app_prefs_domain_cfstr, kCFPreferencesCurrentUser,

-			 kCFPreferencesAnyHost);

-}

-

-- (void) prefs_synchronize {

-    CFPreferencesAppSynchronize (kCFPreferencesCurrentApplication);

-}

-

-- (void) read_defaults

-{

-    NSString *nsstr;

-    const char *tem;

-	

-    XQuartzRootlessDefault = [self prefs_get_boolean:@PREFS_ROOTLESS

-                                           default:XQuartzRootlessDefault];

-    XQuartzFullscreenMenu = [self prefs_get_boolean:@PREFS_FULLSCREEN_MENU

-                                           default:XQuartzFullscreenMenu];

-    XQuartzFullscreenDisableHotkeys = ![self prefs_get_boolean:@PREFS_FULLSCREEN_HOTKEYS

-                                                      default:!XQuartzFullscreenDisableHotkeys];

-    darwinFakeButtons = [self prefs_get_boolean:@PREFS_FAKEBUTTONS

-                                        default:darwinFakeButtons];

-    XQuartzOptionSendsAlt = [self prefs_get_boolean:@PREFS_OPTION_SENDS_ALT

-                                           default:XQuartzOptionSendsAlt];

-

-    if (darwinFakeButtons) {

-        const char *fake2, *fake3;

-

-        fake2 = [self prefs_get_string:@PREFS_FAKE_BUTTON2 default:NULL];

-        fake3 = [self prefs_get_string:@PREFS_FAKE_BUTTON3 default:NULL];

-

-        if (fake2 != NULL) darwinFakeMouse2Mask = DarwinParseModifierList(fake2, TRUE);

-        if (fake3 != NULL) darwinFakeMouse3Mask = DarwinParseModifierList(fake3, TRUE);

-    }

-

-    tem = [self prefs_get_string:@PREFS_APPKIT_MODIFIERS default:NULL];

-    if (tem != NULL) darwinAppKitModMask = DarwinParseModifierList(tem, TRUE);

-	

-    tem = [self prefs_get_string:@PREFS_WINDOW_ITEM_MODIFIERS default:NULL];

-    if (tem != NULL) {

-        windowItemModMask = DarwinParseModifierList(tem, FALSE);

-    } else {

-        nsstr = NSLocalizedString (@"window item modifiers", @"window item modifiers");

-        if(nsstr != NULL) {

-            tem = [nsstr UTF8String];

-            if((tem != NULL) && strcmp(tem, "window item modifiers")) {

-                windowItemModMask = DarwinParseModifierList(tem, FALSE);

-            }

-        }

-    }

-

-    XQuartzEnableKeyEquivalents = [self prefs_get_boolean:@PREFS_KEYEQUIVS

-                                              default:XQuartzEnableKeyEquivalents];

-	

-    darwinSyncKeymap = [self prefs_get_boolean:@PREFS_SYNC_KEYMAP

-                                       default:darwinSyncKeymap];

-		

-    darwinDesiredDepth = [self prefs_get_integer:@PREFS_DEPTH

-                                         default:darwinDesiredDepth];

-    

-    noTestExtensions = ![self prefs_get_boolean:@PREFS_TEST_EXTENSIONS

-                                        default:FALSE];

-    

-    XQuartzScrollInDeviceDirection = [self prefs_get_boolean:@PREFS_SCROLL_IN_DEV_DIRECTION

-                                                     default:XQuartzScrollInDeviceDirection];

-

-#if XQUARTZ_SPARKLE

-    NSURL *url =  [self prefs_copy_url:@PREFS_UPDATE_FEED default:nil];

-    if(url) {

-        [[SUUpdater sharedUpdater] setFeedURL:url];

-        [url release];

-    }

-#endif

-}

-

-/* This will end up at the end of the responder chain. */

-- (void) copy:sender {

-  DarwinSendDDXEvent(kXquartzPasteboardNotify, 1,

-			     AppleWMCopyToPasteboard);

-}

-

-- (X11Controller *) controller {

-    return _controller;

-}

-

-- (OSX_BOOL) x_active {

-    return _x_active;

-}

-

-@end

-

-static NSArray *

-array_with_strings_and_numbers (int nitems, const char **items,

-				const char *numbers) {

-  NSMutableArray *array, *subarray;

-  NSString *string, *number;

-  int i;

-	

-  /* (Can't autorelease on the X server thread) */

-  

-  array = [[NSMutableArray alloc] initWithCapacity:nitems];

-  

-  for (i = 0; i < nitems; i++) {

-    subarray = [[NSMutableArray alloc] initWithCapacity:2];

-    

-    string = [[NSString alloc] initWithUTF8String:items[i]];

-    [subarray addObject:string];

-    [string release];

-    

-    if (numbers[i] != 0) {

-      number = [[NSString alloc] initWithFormat:@"%d", numbers[i]];

-      [subarray addObject:number];

-      [number release];

-    } else

-      [subarray addObject:@""];

-    

-    [array addObject:subarray];

-    [subarray release];

-  }

-  

-  return array;

-}

-

-void X11ApplicationSetWindowMenu (int nitems, const char **items,

-				  const char *shortcuts) {

-  NSArray *array;

-  array = array_with_strings_and_numbers (nitems, items, shortcuts);

-  

-  /* Send the array of strings over to the appkit thread */

-  

-  message_kit_thread (@selector (set_window_menu:), array);

-  [array release];

-}

-

-void X11ApplicationSetWindowMenuCheck (int idx) {

-  NSNumber *n;

-  

-  n = [[NSNumber alloc] initWithInt:idx];

-  

-  message_kit_thread (@selector (set_window_menu_check:), n);

-  

-  [n release];

-}

-

-void X11ApplicationSetFrontProcess (void) {

-    message_kit_thread (@selector (set_front_process:), nil);

-}

-

-void X11ApplicationSetCanQuit (int state) {

-    NSNumber *n;

-	

-    n = [[NSNumber alloc] initWithBool:state];

-	

-    message_kit_thread (@selector (set_can_quit:), n);

-	

-    [n release];

-}

-

-void X11ApplicationServerReady (void) {

-    message_kit_thread (@selector (server_ready:), nil);

-}

-

-void X11ApplicationShowHideMenubar (int state) {

-    NSNumber *n;

-	

-    n = [[NSNumber alloc] initWithBool:state];

-	

-    message_kit_thread (@selector (show_hide_menubar:), n);

-	

-    [n release];

-}

-

-void X11ApplicationLaunchClient (const char *cmd) {

-    NSString *string;

-    

-    string = [[NSString alloc] initWithUTF8String:cmd];

-	

-    message_kit_thread (@selector (launch_client:), string);

-	

-    [string release];

-}

-

-/* This is a special function in that it is run from the *SERVER* thread and

- * not the AppKit thread.  We want to block entering a screen-capturing RandR

- * mode until we notify the user about how to get out if the X11 client crashes.

- */

-Bool X11ApplicationCanEnterRandR(void) {

-    NSString *title, *msg;

-    

-    if([X11App prefs_get_boolean:@PREFS_NO_RANDR_ALERT default:NO] || XQuartzShieldingWindowLevel != 0)

-        return TRUE;

-    

-    title = NSLocalizedString(@"Enter RandR mode?", @"Dialog title when switching to RandR");

-    msg = NSLocalizedString(@"An application has requested X11 to change the resolution of your display.  X11 will restore the display to its previous state when the requesting application requests to return to the previous state.  Alternatively, you can use the ⌥⌘A key sequence to force X11 to return to the previous state.",

-                            @"Dialog when switching to RandR");

-

-    if(!XQuartzIsRootless)

-        QuartzShowFullscreen(FALSE);

-    

-    switch(NSRunAlertPanel(title, msg, NSLocalizedString(@"Allow", @""), NSLocalizedString (@"Cancel", @""), NSLocalizedString (@"Always Allow", @""))) {

-        case NSAlertOtherReturn:

-            [X11App prefs_set_boolean:@PREFS_NO_RANDR_ALERT value:YES];

-            [X11App prefs_synchronize];

-        case NSAlertDefaultReturn:

-            return YES;

-

-        default:

-            return NO;

-    }

-}

-

-static void check_xinitrc (void) {

-    char *tem, buf[1024];

-    NSString *msg;

-	

-    if ([X11App prefs_get_boolean:@PREFS_DONE_XINIT_CHECK default:NO])

-		return;

-	

-    tem = getenv ("HOME");

-    if (tem == NULL) goto done;

-	

-    snprintf (buf, sizeof (buf), "%s/.xinitrc", tem);

-    if (access (buf, F_OK) != 0)

-		goto done;

-	

-    msg = NSLocalizedString (@"You have an existing ~/.xinitrc file.\n\n\

-Windows displayed by X11 applications may not have titlebars, or may look \

-different to windows displayed by native applications.\n\n\

-Would you like to move aside the existing file and use the standard X11 \

-environment the next time you start X11?", @"Startup xinitrc dialog");

-

-    if(NSAlertDefaultReturn == NSRunAlertPanel (nil, msg, NSLocalizedString (@"Yes", @""),

-                                                NSLocalizedString (@"No", @""), nil)) {

-        char buf2[1024];

-        int i = -1;

-      

-        snprintf (buf2, sizeof (buf2), "%s.old", buf);

-      

-        for(i = 1; access (buf2, F_OK) == 0; i++)

-            snprintf (buf2, sizeof (buf2), "%s.old.%d", buf, i);

-

-        rename (buf, buf2);

-    }

-    

- done:

-    [X11App prefs_set_boolean:@PREFS_DONE_XINIT_CHECK value:YES];

-    [X11App prefs_synchronize];

-}

-

-static inline pthread_t create_thread(void *(*func)(void *), void *arg) {

-    pthread_attr_t attr;

-    pthread_t tid;

-    

-    pthread_attr_init(&attr);

-    pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM);

-    pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);

-    pthread_create(&tid, &attr, func, arg);

-    pthread_attr_destroy(&attr);

-    

-    return tid;

-}

-

-static void *xpbproxy_x_thread(void *args) {

-    xpbproxy_run();

-

-    ErrorF("xpbproxy thread is terminating unexpectedly.\n");

-    return NULL;

-}

-

-void X11ApplicationMain (int argc, char **argv, char **envp) {

-    NSAutoreleasePool *pool;

-

-#ifdef DEBUG

-    while (access ("/tmp/x11-block", F_OK) == 0) sleep (1);

-#endif

-  

-    pool = [[NSAutoreleasePool alloc] init];

-    X11App = (X11Application *) [X11Application sharedApplication];

-    init_ports ();

-    

-    app_prefs_domain_cfstr = (CFStringRef)[[NSBundle mainBundle] bundleIdentifier];

-

-    if (app_prefs_domain_cfstr == NULL) {

-        ErrorF("X11ApplicationMain: Unable to determine bundle identifier.  Your installation of XQuartz may be broken.\n");

-        app_prefs_domain_cfstr = CFSTR(BUNDLE_ID_PREFIX".X11");

-    }

-

-    [NSApp read_defaults];

-    [NSBundle loadNibNamed:@"main" owner:NSApp];

-    [[NSNotificationCenter defaultCenter] addObserver:NSApp

-					selector:@selector (became_key:)

-					name:NSWindowDidBecomeKeyNotification object:nil];

-

-    /*

-     * The xpr Quartz mode is statically linked into this server.

-     * Initialize all the Quartz functions.

-     */

-    QuartzModeBundleInit();

-

-    /* Calculate the height of the menubar so we can avoid it. */

-    aquaMenuBarHeight = NSHeight([[NSScreen mainScreen] frame]) -

-    NSMaxY([[NSScreen mainScreen] visibleFrame]);

-

-#ifdef HAVE_LIBDISPATCH

-    eventTranslationQueue = dispatch_queue_create(BUNDLE_ID_PREFIX".X11.NSEventsToX11EventsQueue", NULL);

-    assert(eventTranslationQueue != NULL);

-#endif

-    

-    /* Set the key layout seed before we start the server */

-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050

-    last_key_layout = TISCopyCurrentKeyboardLayoutInputSource();    

-

-    if(!last_key_layout)

-        ErrorF("X11ApplicationMain: Unable to determine TISCopyCurrentKeyboardLayoutInputSource() at startup.\n");

-#else

-    KLGetCurrentKeyboardLayout(&last_key_layout);

-    if(!last_key_layout)

-        ErrorF("X11ApplicationMain: Unable to determine KLGetCurrentKeyboardLayout() at startup.\n");

-#endif

-

-    if (!QuartsResyncKeymap(FALSE)) {

-        ErrorF("X11ApplicationMain: Could not build a valid keymap.\n");

-    }

-

-    /* Tell the server thread that it can proceed */

-    QuartzInitServer(argc, argv, envp);

-    

-    /* This must be done after QuartzInitServer because it can result in

-     * an mieqEnqueue() - <rdar://problem/6300249>

-     */

-    check_xinitrc();

-    

-    create_thread(xpbproxy_x_thread, NULL);

-

-#if XQUARTZ_SPARKLE

-    [[X11App controller] setup_sparkle];

-    [[SUUpdater sharedUpdater] resetUpdateCycle];

-//    [[SUUpdater sharedUpdater] checkForUpdates:X11App];

-#endif

-

-    [pool release];

-    [NSApp run];

-    /* not reached */

-}

-

-@implementation X11Application (Private)

-

-#ifdef NX_DEVICELCMDKEYMASK

-/* This is to workaround a bug in the VNC server where we sometimes see the L

- * modifier and sometimes see no "side"

- */

-static inline int ensure_flag(int flags, int device_independent, int device_dependents, int device_dependent_default) {

-    if( (flags & device_independent) &&

-       !(flags & device_dependents))

-        flags |= device_dependent_default;

-    return flags;

-}

-#endif

-

-#ifdef DEBUG_UNTRUSTED_POINTER_DELTA

-static const char *untrusted_str(NSEvent *e) {

-    switch([e type]) {

-        case NSScrollWheel:

-            return "NSScrollWheel";

-        case NSTabletPoint:

-            return "NSTabletPoint";

-        case NSOtherMouseDown:

-            return "NSOtherMouseDown";

-        case NSOtherMouseUp:

-            return "NSOtherMouseUp";

-        case NSLeftMouseDown:

-            return "NSLeftMouseDown";

-        case NSLeftMouseUp:

-            return "NSLeftMouseUp";

-        default:

-            switch([e subtype]) {

-                case NSTabletPointEventSubtype:

-                    return "NSTabletPointEventSubtype";

-                case NSTabletProximityEventSubtype:

-                    return "NSTabletProximityEventSubtype";

-                default:

-                    return "Other";

-            }

-    }

-}

-#endif

-

-- (void) sendX11NSEvent:(NSEvent *)e {

-    NSPoint location = NSZeroPoint;

-    int ev_button, ev_type;

-    static float pressure = 0.0;       // static so ProximityOut will have the value from the previous tablet event

-    static NSPoint tilt;               // static so ProximityOut will have the value from the previous tablet event

-    static DeviceIntPtr darwinTabletCurrent = NULL;

-    static BOOL needsProximityIn = NO; // Do we do need to handle a pending ProximityIn once we have pressure/tilt?

-    DeviceIntPtr pDev;

-    int modifierFlags;

-    BOOL isMouseOrTabletEvent, isTabletEvent;

-

-#ifdef HAVE_LIBDISPATCH

-    static dispatch_once_t once_pred;

-    dispatch_once(&once_pred, ^{

-        tilt = NSZeroPoint;

-        darwinTabletCurrent = darwinTabletStylus;

-    });

-#else

-    if(!darwinTabletCurrent) {

-        tilt = NSZeroPoint;

-        darwinTabletCurrent = darwinTabletStylus;

-    }

-#endif

-    

-    isMouseOrTabletEvent =  [e type] == NSLeftMouseDown    ||  [e type] == NSOtherMouseDown    ||  [e type] == NSRightMouseDown    ||

-                            [e type] == NSLeftMouseUp      ||  [e type] == NSOtherMouseUp      ||  [e type] == NSRightMouseUp      ||

-                            [e type] == NSLeftMouseDragged ||  [e type] == NSOtherMouseDragged ||  [e type] == NSRightMouseDragged ||

-                            [e type] == NSMouseMoved       ||  [e type] == NSTabletPoint       ||  [e type] == NSScrollWheel;

-

-    isTabletEvent = ([e type] == NSTabletPoint) ||

-                    (isMouseOrTabletEvent && ([e subtype] == NSTabletPointEventSubtype || [e subtype] == NSTabletProximityEventSubtype));

-

-    if(isMouseOrTabletEvent) {

-        static NSPoint lastpt;

-        NSWindow *window = [e window];

-        NSRect screen = [[[NSScreen screens] objectAtIndex:0] frame];

-	    BOOL hasUntrustedPointerDelta;

-        

-        // NSEvents for tablets are not consistent wrt deltaXY between events, so we cannot rely on that

-        // Thus tablets will be subject to the warp-pointer bug worked around by the delta, but tablets

-        // are not normally used in cases where that bug would present itself, so this is a fair tradeoff

-        // <rdar://problem/7111003> deltaX and deltaY are incorrect for NSMouseMoved, NSTabletPointEventSubtype

-        // http://xquartz.macosforge.org/trac/ticket/288

-        hasUntrustedPointerDelta = isTabletEvent;

-        

-        // The deltaXY for middle click events also appear erroneous after fast user switching

-        // <rdar://problem/7979468> deltaX and deltaY are incorrect for NSOtherMouseDown and NSOtherMouseUp after FUS

-        // http://xquartz.macosforge.org/trac/ticket/389

-        hasUntrustedPointerDelta = hasUntrustedPointerDelta || [e type] == NSOtherMouseDown || [e type] == NSOtherMouseUp;

-

-        // The deltaXY for scroll events correspond to the scroll delta, not the pointer delta

-        // <rdar://problem/7989690> deltaXY for wheel events are being sent as mouse movement

-        hasUntrustedPointerDelta = hasUntrustedPointerDelta || [e type] == NSScrollWheel;

-

-#ifdef DEBUG_UNTRUSTED_POINTER_DELTA

-        hasUntrustedPointerDelta = hasUntrustedPointerDelta || [e type] == NSLeftMouseDown || [e type] == NSLeftMouseUp;

-#endif

-        

-        if (window != nil)	{

-            NSRect frame = [window frame];

-            location = [e locationInWindow];

-            location.x += frame.origin.x;

-            location.y += frame.origin.y;

-            lastpt = location;

-        } else if(hasUntrustedPointerDelta) {

-#ifdef DEBUG_UNTRUSTED_POINTER_DELTA

-            ErrorF("--- Begin Event Debug ---\n");

-            ErrorF("Event type: %s\n", untrusted_str(e));

-            ErrorF("old lastpt: (%0.2f, %0.2f)\n", lastpt.x, lastpt.y);

-            ErrorF("     delta: (%0.2f, %0.2f)\n", [e deltaX], -[e deltaY]);

-            ErrorF("  location: (%0.2f, %0.2f)\n", lastpt.x + [e deltaX], lastpt.y - [e deltaY]);

-            ErrorF("workaround: (%0.2f, %0.2f)\n", [e locationInWindow].x, [e locationInWindow].y);

-            ErrorF("--- End Event Debug ---\n");

-

-            location.x = lastpt.x + [e deltaX];

-            location.y = lastpt.y - [e deltaY];

-            lastpt = [e locationInWindow];

-#else

-            location = [e locationInWindow];

-            lastpt = location;

-#endif

-        } else {

-            location.x = lastpt.x + [e deltaX];

-            location.y = lastpt.y - [e deltaY];

-            lastpt = [e locationInWindow];

-        }

-        

-        /* Convert coordinate system */

-        location.y = (screen.origin.y + screen.size.height) - location.y;

-    }

-    

-    modifierFlags = [e modifierFlags];

-    

-#ifdef NX_DEVICELCMDKEYMASK

-    /* This is to workaround a bug in the VNC server where we sometimes see the L

-     * modifier and sometimes see no "side"

-     */

-    modifierFlags = ensure_flag(modifierFlags, NX_CONTROLMASK,   NX_DEVICELCTLKEYMASK   | NX_DEVICERCTLKEYMASK,     NX_DEVICELCTLKEYMASK);

-    modifierFlags = ensure_flag(modifierFlags, NX_SHIFTMASK,     NX_DEVICELSHIFTKEYMASK | NX_DEVICERSHIFTKEYMASK,   NX_DEVICELSHIFTKEYMASK);

-    modifierFlags = ensure_flag(modifierFlags, NX_COMMANDMASK,   NX_DEVICELCMDKEYMASK   | NX_DEVICERCMDKEYMASK,     NX_DEVICELCMDKEYMASK);

-    modifierFlags = ensure_flag(modifierFlags, NX_ALTERNATEMASK, NX_DEVICELALTKEYMASK   | NX_DEVICERALTKEYMASK,     NX_DEVICELALTKEYMASK);

-#endif

-

-    modifierFlags &= darwin_all_modifier_mask;

-

-    /* We don't receive modifier key events while out of focus, and 3button

-     * emulation mucks this up, so we need to check our modifier flag state

-     * on every event... ugg

-     */

-    

-    if(darwin_all_modifier_flags != modifierFlags)

-        DarwinUpdateModKeys(modifierFlags);

-    

-	switch ([e type]) {

-		case NSLeftMouseDown:     ev_button=1; ev_type=ButtonPress;   goto handle_mouse;

-		case NSOtherMouseDown:    ev_button=2; ev_type=ButtonPress;   goto handle_mouse;

-		case NSRightMouseDown:    ev_button=3; ev_type=ButtonPress;   goto handle_mouse;

-		case NSLeftMouseUp:       ev_button=1; ev_type=ButtonRelease; goto handle_mouse;

-		case NSOtherMouseUp:      ev_button=2; ev_type=ButtonRelease; goto handle_mouse;

-		case NSRightMouseUp:      ev_button=3; ev_type=ButtonRelease; goto handle_mouse;

-		case NSLeftMouseDragged:  ev_button=1; ev_type=MotionNotify;  goto handle_mouse;

-		case NSOtherMouseDragged: ev_button=2; ev_type=MotionNotify;  goto handle_mouse;

-		case NSRightMouseDragged: ev_button=3; ev_type=MotionNotify;  goto handle_mouse;

-		case NSMouseMoved:        ev_button=0; ev_type=MotionNotify;  goto handle_mouse;

-        case NSTabletPoint:       ev_button=0; ev_type=MotionNotify;  goto handle_mouse;

-            

-        handle_mouse:

-            pDev = darwinPointer;

-

-            /* NSTabletPoint can have no subtype */

-            if([e type] != NSTabletPoint &&

-               [e subtype] == NSTabletProximityEventSubtype) {

-                switch([e pointingDeviceType]) {

-                    case NSEraserPointingDevice:

-                        darwinTabletCurrent=darwinTabletEraser;

-                        break;

-                    case NSPenPointingDevice:

-                        darwinTabletCurrent=darwinTabletStylus;

-                        break;

-                    case NSCursorPointingDevice:

-                    case NSUnknownPointingDevice:

-                    default:

-                        darwinTabletCurrent=darwinTabletCursor;

-                        break;

-                }

-

-                if([e isEnteringProximity])

-                    needsProximityIn = YES;

-                else

-                    DarwinSendProximityEvents(darwinTabletCurrent, ProximityOut,

-                                              location.x, location.y, pressure,

-                                              tilt.x, tilt.y);

-                return;

-            }

-

-			if ([e type] == NSTabletPoint || [e subtype] == NSTabletPointEventSubtype) {

-                pressure = [e pressure];

-                tilt     = [e tilt];

-                

-                pDev = darwinTabletCurrent;

-                

-                if(needsProximityIn) {

-                    DarwinSendProximityEvents(darwinTabletCurrent, ProximityIn,

-                                              location.x, location.y, pressure,

-                                              tilt.x, tilt.y);

-

-                    needsProximityIn = NO;

-                }

-            }

-

-            if(!XQuartzServerVisible && noTestExtensions) {

-#if defined(XPLUGIN_VERSION) && XPLUGIN_VERSION > 0

-/* Older libXplugin (Tiger/"Stock" Leopard) aren't thread safe, so we can't call xp_find_window from the Appkit thread */

-                xp_window_id wid = 0;

-                xp_error err;

-

-                /* Sigh. Need to check that we're really over one of

-                 * our windows. (We need to receive pointer events while

-                 * not in the foreground, but we don't want to receive them

-                 * when another window is over us or we might show a tooltip)

-                 */

-

-                err = xp_find_window(location.x, location.y, 0, &wid);

-

-                if (err != XP_Success || (err == XP_Success && wid == 0))

-#endif

-                {

-                    bgMouseLocation = location;

-                    bgMouseLocationUpdated = TRUE;

-                    return;

-                }

-            }

-            

-            if(bgMouseLocationUpdated) {

-                if(!(ev_type == MotionNotify && ev_button == 0)) {

-                    DarwinSendPointerEvents(pDev, MotionNotify, 0, location.x,

-                                            location.y, pressure, tilt.x, tilt.y);

-                }

-                bgMouseLocationUpdated = FALSE;

-            }

-

-            DarwinSendPointerEvents(pDev, ev_type, ev_button, location.x, location.y,

-                                    pressure, tilt.x, tilt.y);

-            

-            break;

-            

-		case NSTabletProximity:

-            switch([e pointingDeviceType]) {

-                case NSEraserPointingDevice:

-                    darwinTabletCurrent=darwinTabletEraser;

-                    break;

-                case NSPenPointingDevice:

-                    darwinTabletCurrent=darwinTabletStylus;

-                    break;

-                case NSCursorPointingDevice:

-                case NSUnknownPointingDevice:

-                default:

-                    darwinTabletCurrent=darwinTabletCursor;

-                    break;

-            }

-            

-            if([e isEnteringProximity])

-                needsProximityIn = YES;

-            else

-                DarwinSendProximityEvents(darwinTabletCurrent, ProximityOut,

-                                          location.x, location.y, pressure,

-                                          tilt.x, tilt.y);

-            break;

-            

-		case NSScrollWheel:

-            {

-                float deltaX = [e deltaX];

-                float deltaY = [e deltaY];

-#if !defined(XPLUGIN_VERSION) || XPLUGIN_VERSION == 0

-                /* If we're in the background, we need to send a MotionNotify event

-                * first, since we aren't getting them on background mouse motion

-                */

-                if(!XQuartzServerVisible && noTestExtensions) {

-                    bgMouseLocationUpdated = FALSE;

-                    DarwinSendPointerEvents(darwinPointer, MotionNotify, 0, location.x,

-                                            location.y, pressure, tilt.x, tilt.y);

-                }

-#endif

-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070

-                // TODO: Change 1117 to NSAppKitVersionNumber10_7 when it is defined

-                if(NSAppKitVersionNumber >= 1117 && XQuartzScrollInDeviceDirection && [e isDirectionInvertedFromDevice]) {

-                    deltaX *= -1;

-                    deltaY *= -1;

-                }

-#endif

-                DarwinSendScrollEvents(deltaX, deltaY, location.x, location.y,

-                                       pressure, tilt.x, tilt.y);

-                break;

-            }

-        case NSKeyDown: case NSKeyUp:

-            {

-                /* XKB clobbers our keymap at startup, so we need to force it on the first keypress.

-                 * TODO: Make this less of a kludge.

-                 */

-                static int force_resync_keymap = YES;

-                if(force_resync_keymap) {

-                    DarwinSendDDXEvent(kXquartzReloadKeymap, 0);

-                    force_resync_keymap = NO;

-                }

-            }

-

-            if(darwinSyncKeymap) {

-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050

-                TISInputSourceRef key_layout = TISCopyCurrentKeyboardLayoutInputSource();

-                TISInputSourceRef clear;

-                if (CFEqual(key_layout, last_key_layout)) {

-                    CFRelease(key_layout);

-                } else {

-                    /* Swap/free thread-safely */

-                    clear = last_key_layout;

-                    last_key_layout = key_layout;

-                    CFRelease(clear);

-#else

-                KeyboardLayoutRef key_layout;

-                KLGetCurrentKeyboardLayout(&key_layout);

-                if(key_layout != last_key_layout) {

-                    last_key_layout = key_layout;

-#endif

-                    /* Update keyInfo */

-                    if (!QuartsResyncKeymap(TRUE)) {

-                        ErrorF("sendX11NSEvent: Could not build a valid keymap.\n");

-                    }

-                }

-            }

-

-            /* Avoid stuck keys on context switch */

-            if(keyState[[e keyCode]] == [e type])

-                return;

-            keyState[[e keyCode]] = [e type];

-

-            DarwinSendKeyboardEvents(([e type] == NSKeyDown) ? KeyPress : KeyRelease, [e keyCode]);

-            break;

-            

-        default: break; /* for gcc */

-	}	

-}

-@end

+/* X11Application.m -- subclass of NSApplication to multiplex events
+ 
+ Copyright (c) 2002-2008 Apple Inc.
+ 
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation files
+ (the "Software"), to deal in the Software without restriction,
+ including without limitation the rights to use, copy, modify, merge,
+ publish, distribute, sublicense, and/or sell copies of the Software,
+ and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+ 
+ 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 ABOVE LISTED COPYRIGHT
+ HOLDER(S) 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(s) of the above
+ copyright holders shall not be used in advertising or otherwise to
+ promote the sale, use or other dealings in this Software without
+ prior written authorization. */
+
+#include "sanitizedCarbon.h"
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "quartzCommon.h"
+
+#import "X11Application.h"
+
+#include "darwin.h"
+#include "quartz.h"
+#include "darwinEvents.h"
+#include "quartzKeyboard.h"
+#include <X11/extensions/applewmconst.h>
+#include "micmap.h"
+#include "exglobals.h"
+
+#include <mach/mach.h>
+#include <unistd.h>
+#include <AvailabilityMacros.h>
+
+#include <pthread.h>
+
+#include <Xplugin.h>
+
+// pbproxy/pbproxy.h
+extern int xpbproxy_run (void);
+
+#define DEFAULTS_FILE X11LIBDIR"/X11/xserver/Xquartz.plist"
+
+#ifndef XSERVER_VERSION
+#define XSERVER_VERSION "?"
+#endif
+
+#ifdef HAVE_LIBDISPATCH
+#include <dispatch/dispatch.h>
+
+static dispatch_queue_t eventTranslationQueue;
+#endif
+
+/* Stuck modifier / button state... force release when we context switch */
+static NSEventType keyState[NUM_KEYCODES];
+
+extern Bool noTestExtensions;
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+static TISInputSourceRef last_key_layout;
+#else
+static KeyboardLayoutRef last_key_layout;
+#endif
+
+/* This preference is only tested on Lion or later as it's not relevant to
+ * earlier OS versions.
+ */
+Bool XQuartzScrollInDeviceDirection = FALSE;
+
+extern int darwinFakeButtons;
+
+/* Store the mouse location while in the background, and update X11's pointer
+ * location when we become the foreground application
+ */
+static NSPoint bgMouseLocation;
+static BOOL bgMouseLocationUpdated = FALSE;
+
+X11Application *X11App;
+
+CFStringRef app_prefs_domain_cfstr = NULL;
+
+#define ALL_KEY_MASKS (NSShiftKeyMask | NSControlKeyMask | NSAlternateKeyMask | NSCommandKeyMask)
+
+@interface X11Application (Private)
+- (void) sendX11NSEvent:(NSEvent *)e;
+@end
+
+@implementation X11Application
+
+typedef struct message_struct message;
+struct message_struct {
+    mach_msg_header_t hdr;
+    SEL selector;
+    NSObject *arg;
+};
+
+static mach_port_t _port;
+
+/* Quartz mode initialization routine. This is often dynamically loaded
+   but is statically linked into this X server. */
+Bool QuartzModeBundleInit(void);
+
+static void init_ports (void) {
+    kern_return_t r;
+    NSPort *p;
+	
+    if (_port != MACH_PORT_NULL) return;
+	
+    r = mach_port_allocate (mach_task_self (), MACH_PORT_RIGHT_RECEIVE, &_port);
+    if (r != KERN_SUCCESS) return;
+	
+    p = [NSMachPort portWithMachPort:_port];
+    [p setDelegate:NSApp];
+    [p scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
+}
+
+static void message_kit_thread (SEL selector, NSObject *arg) {
+    message msg;
+    kern_return_t r;
+	
+    msg.hdr.msgh_bits = MACH_MSGH_BITS (MACH_MSG_TYPE_MAKE_SEND, 0);
+    msg.hdr.msgh_size = sizeof (msg);
+    msg.hdr.msgh_remote_port = _port;
+    msg.hdr.msgh_local_port = MACH_PORT_NULL;
+    msg.hdr.msgh_reserved = 0;
+    msg.hdr.msgh_id = 0;
+	
+    msg.selector = selector;
+    msg.arg = [arg retain];
+	
+    r = mach_msg (&msg.hdr, MACH_SEND_MSG, msg.hdr.msgh_size,
+		  0, MACH_PORT_NULL, 0, MACH_PORT_NULL);
+    if (r != KERN_SUCCESS)
+		ErrorF("%s: mach_msg failed: %x\n", __FUNCTION__, r);
+}
+
+- (void) handleMachMessage:(void *)_msg {
+    message *msg = _msg;
+	
+    [self performSelector:msg->selector withObject:msg->arg];
+    [msg->arg release];
+}
+
+- (void) set_controller:obj {
+    if (_controller == nil) _controller = [obj retain];
+}
+
+- (void) dealloc {
+    if (_controller != nil) [_controller release];
+	
+    if (_port != MACH_PORT_NULL)
+		mach_port_deallocate (mach_task_self (), _port);
+	
+    [super dealloc];
+}
+
+- (void) orderFrontStandardAboutPanel: (id) sender {
+    NSMutableDictionary *dict;
+    NSDictionary *infoDict;
+    NSString *tem;
+    
+    dict = [NSMutableDictionary dictionaryWithCapacity:3];
+    infoDict = [[NSBundle mainBundle] infoDictionary];
+    
+    [dict setObject: NSLocalizedString (@"The X Window System", @"About panel")
+          forKey:@"ApplicationName"];
+    
+    tem = [infoDict objectForKey:@"CFBundleShortVersionString"];
+    
+    [dict setObject:[NSString stringWithFormat:@"XQuartz %@", tem]
+          forKey:@"ApplicationVersion"];
+
+    [dict setObject:[NSString stringWithFormat:@"xorg-server %s", XSERVER_VERSION]
+          forKey:@"Version"];
+    
+    [self orderFrontStandardAboutPanelWithOptions: dict];
+}
+
+- (void) activateX:(OSX_BOOL)state {
+    size_t i;
+    DEBUG_LOG("state=%d, _x_active=%d, \n", state, _x_active);
+    if (state) {
+        if(bgMouseLocationUpdated) {
+            DarwinSendPointerEvents(darwinPointer, MotionNotify, 0, bgMouseLocation.x, bgMouseLocation.y, 0.0, 0.0, 0.0);
+            bgMouseLocationUpdated = FALSE;
+        }
+        DarwinSendDDXEvent(kXquartzActivate, 0);
+    } else {
+
+        if(darwin_all_modifier_flags)
+            DarwinUpdateModKeys(0);
+        for(i=0; i < NUM_KEYCODES; i++) {
+            if(keyState[i] == NSKeyDown) {
+                DarwinSendKeyboardEvents(KeyRelease, i);
+                keyState[i] = NSKeyUp;
+            }
+        }
+        
+        DarwinSendDDXEvent(kXquartzDeactivate, 0);
+    }
+
+    _x_active = state;
+}
+
+- (void) became_key:(NSWindow *)win {
+	[self activateX:NO];
+}
+
+- (void) sendEvent:(NSEvent *)e {
+    OSX_BOOL for_appkit, for_x;
+    
+    /* By default pass down the responder chain and to X. */
+    for_appkit = YES;
+    for_x = YES;
+    
+    switch ([e type]) {
+        case NSLeftMouseDown: case NSRightMouseDown: case NSOtherMouseDown:
+        case NSLeftMouseUp: case NSRightMouseUp: case NSOtherMouseUp:
+            if ([e window] != nil) {
+                /* Pointer event has an (AppKit) window. Probably something for the kit. */
+                for_x = NO;
+                if (_x_active) [self activateX:NO];
+            } else if ([self modalWindow] == nil) {
+                /* Must be an X window. Tell appkit it doesn't have focus. */
+                for_appkit = NO;
+                
+                if ([self isActive]) {
+                    [self deactivate];
+                    if (!_x_active && quartzProcs->IsX11Window([e windowNumber]))
+                        [self activateX:YES];
+                }
+            }
+
+            /* We want to force sending to appkit if we're over the menu bar */
+            if(!for_appkit) {
+                NSPoint NSlocation = [e locationInWindow];
+                NSWindow *window = [e window];
+                NSRect NSframe, NSvisibleFrame;
+                CGRect CGframe, CGvisibleFrame;
+                CGPoint CGlocation;
+
+                if (window != nil)	{
+                    NSRect frame = [window frame];
+                    NSlocation.x += frame.origin.x;
+                    NSlocation.y += frame.origin.y;
+                }
+
+                NSframe = [[NSScreen mainScreen] frame];
+                NSvisibleFrame = [[NSScreen mainScreen] visibleFrame];
+                
+                CGframe = CGRectMake(NSframe.origin.x, NSframe.origin.y,
+                                            NSframe.size.width, NSframe.size.height);
+                CGvisibleFrame = CGRectMake(NSvisibleFrame.origin.x,
+                                                   NSvisibleFrame.origin.y,
+                                                   NSvisibleFrame.size.width,
+                                                   NSvisibleFrame.size.height);
+                CGlocation = CGPointMake(NSlocation.x, NSlocation.y);
+                
+                if(CGRectContainsPoint(CGframe, CGlocation) &&
+                   !CGRectContainsPoint(CGvisibleFrame, CGlocation))
+                    for_appkit = YES;
+            }
+            
+            break;
+            
+        case NSKeyDown: case NSKeyUp:
+            
+            if(_x_active) {
+                static BOOL do_swallow = NO;
+                static int swallow_keycode;
+                
+                if([e type] == NSKeyDown) {
+                    /* Before that though, see if there are any global
+                     * shortcuts bound to it. */
+
+                    if(darwinAppKitModMask & [e modifierFlags]) {
+                        /* Override to force sending to Appkit */
+                        swallow_keycode = [e keyCode];
+                        do_swallow = YES;
+                        for_x = NO;
+#if XPLUGIN_VERSION >= 1
+                    } else if(XQuartzEnableKeyEquivalents &&
+                             xp_is_symbolic_hotkey_event([e eventRef])) {
+                        swallow_keycode = [e keyCode];
+                        do_swallow = YES;
+                        for_x = NO;
+#endif
+                    } else if(XQuartzEnableKeyEquivalents &&
+                              [[self mainMenu] performKeyEquivalent:e]) {
+                        swallow_keycode = [e keyCode];
+                        do_swallow = YES;
+                        for_appkit = NO;
+                        for_x = NO;
+                    } else if(!XQuartzIsRootless
+                              && ([e modifierFlags] & ALL_KEY_MASKS) == (NSCommandKeyMask | NSAlternateKeyMask)
+                              && ([e keyCode] == 0 /*a*/ || [e keyCode] == 53 /*Esc*/)) {
+                        /* We have this here to force processing fullscreen 
+                         * toggle even if XQuartzEnableKeyEquivalents is disabled */
+                        swallow_keycode = [e keyCode];
+                        do_swallow = YES;
+                        for_x = NO;
+                        for_appkit = NO;
+                        DarwinSendDDXEvent(kXquartzToggleFullscreen, 0);
+                    } else {
+                        /* No kit window is focused, so send it to X. */
+                        for_appkit = NO;
+                    }
+                } else { /* KeyUp */
+                    /* If we saw a key equivalent on the down, don't pass
+                     * the up through to X. */
+                    if (do_swallow && [e keyCode] == swallow_keycode) {
+                        do_swallow = NO;
+                        for_x = NO;
+                    }
+                }
+            } else { /* !_x_active */
+                for_x = NO;
+            }
+            break;
+            
+        case NSFlagsChanged:
+            /* Don't tell X11 about modifiers changing while it's not active */
+            if (!_x_active)
+                for_x = NO;
+            break;
+            
+        case NSAppKitDefined:
+            switch ([e subtype]) {
+                static BOOL x_was_active = NO;
+
+                case NSApplicationActivatedEventType:
+                    for_x = NO;
+                    if ([e window] == nil && x_was_active) {
+                        BOOL order_all_windows = YES, workspaces, ok;
+                        for_appkit = NO;
+
+                        /* FIXME: This is a hack to avoid passing the event to AppKit which
+                         *        would result in it raising one of its windows.
+                         */
+                        _appFlags._active = YES;
+
+                        X11ApplicationSetFrontProcess();
+
+                        /* Get the Spaces preference for SwitchOnActivate */
+                        (void)CFPreferencesAppSynchronize(CFSTR("com.apple.dock"));
+                        workspaces = CFPreferencesGetAppBooleanValue(CFSTR("workspaces"), CFSTR("com.apple.dock"), &ok);
+                        if (!ok)
+                            workspaces = NO;
+
+                        if (workspaces) {
+                            (void)CFPreferencesAppSynchronize(CFSTR(".GlobalPreferences"));
+                            order_all_windows = CFPreferencesGetAppBooleanValue(CFSTR("AppleSpacesSwitchOnActivate"), CFSTR(".GlobalPreferences"), &ok);
+                            if (!ok)
+                                order_all_windows = YES;
+                        }
+                        
+                        /* TODO: In the workspaces && !AppleSpacesSwitchOnActivate case, the windows are ordered
+                         *       correctly, but we need to activate the top window on this space if there is
+                         *       none active.
+                         *
+                         *       If there are no active windows, and there are minimized windows, we should
+                         *       be restoring one of them.
+                         */
+                        if ([e data2] & 0x10) { // 0x10 (bfCPSOrderAllWindowsForward) is set when we use cmd-tab or the dock icon
+                            DarwinSendDDXEvent(kXquartzBringAllToFront, 1, order_all_windows);
+                        }
+                    }
+                    break;
+                    
+                case 18: /* ApplicationDidReactivate */
+                    if (XQuartzFullscreenVisible) for_appkit = NO;
+                    break;
+                    
+                case NSApplicationDeactivatedEventType:
+                    for_x = NO;
+
+                    x_was_active = _x_active;
+                    if(_x_active)
+                        [self activateX:NO];
+                    break;
+            }
+            break;
+            
+        default: break; /* for gcc */
+    }
+    
+    if (for_appkit) [super sendEvent:e];
+    
+    if (for_x) {
+#ifdef HAVE_LIBDISPATCH
+        dispatch_async(eventTranslationQueue, ^{
+#endif
+            [self sendX11NSEvent:e];
+#ifdef HAVE_LIBDISPATCH
+        });
+#endif
+    }
+}
+
+- (void) set_window_menu:(NSArray *)list {
+	[_controller set_window_menu:list];
+}
+
+- (void) set_window_menu_check:(NSNumber *)n {
+	[_controller set_window_menu_check:n];
+}
+
+- (void) set_apps_menu:(NSArray *)list {
+	[_controller set_apps_menu:list];
+}
+
+- (void) set_front_process:unused {
+	[NSApp activateIgnoringOtherApps:YES];
+
+	if ([self modalWindow] == nil)
+		[self activateX:YES];
+}
+
+- (void) set_can_quit:(NSNumber *)state {
+	[_controller set_can_quit:[state boolValue]];
+}
+
+- (void) server_ready:unused {
+	[_controller server_ready];
+}
+
+- (void) show_hide_menubar:(NSNumber *)state {
+    /* Also shows/hides the dock */
+    if ([state boolValue])
+        SetSystemUIMode(kUIModeNormal, 0); 
+    else
+        SetSystemUIMode(kUIModeAllHidden, XQuartzFullscreenMenu ? kUIOptionAutoShowMenuBar : 0); // kUIModeAllSuppressed or kUIOptionAutoShowMenuBar can be used to allow "mouse-activation"
+}
+
+- (void) launch_client:(NSString *)cmd {
+    (void)[_controller application:self openFile:cmd];
+}
+
+/* user preferences */
+
+/* Note that these functions only work for arrays whose elements
+ can be toll-free-bridged between NS and CF worlds. */
+
+static const void *cfretain (CFAllocatorRef a, const void *b) {
+    return CFRetain (b);
+}
+
+static void cfrelease (CFAllocatorRef a, const void *b) {
+    CFRelease (b);
+}
+
+static CFMutableArrayRef nsarray_to_cfarray (NSArray *in) {
+	CFMutableArrayRef out;
+	CFArrayCallBacks cb;
+	NSObject *ns;
+	const CFTypeRef *cf;
+	int i, count;
+
+	memset (&cb, 0, sizeof (cb));
+	cb.version = 0;
+	cb.retain = cfretain;
+	cb.release = cfrelease;
+
+	count = [in count];
+	out = CFArrayCreateMutable (NULL, count, &cb);
+
+	for (i = 0; i < count; i++) {
+		ns = [in objectAtIndex:i];
+
+		if ([ns isKindOfClass:[NSArray class]])
+			cf = (CFTypeRef) nsarray_to_cfarray ((NSArray *) ns);
+		else
+			cf = CFRetain ((CFTypeRef) ns);
+
+		CFArrayAppendValue (out, cf);
+		CFRelease (cf);
+	}
+
+	return out;
+}
+
+static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
+	NSMutableArray *out;
+	const CFTypeRef *cf;
+	NSObject *ns;
+	int i, count;
+
+	count = CFArrayGetCount (in);
+	out = [[NSMutableArray alloc] initWithCapacity:count];
+
+	for (i = 0; i < count; i++) {
+		cf = CFArrayGetValueAtIndex (in, i);
+
+		if (CFGetTypeID (cf) == CFArrayGetTypeID ())
+			ns = cfarray_to_nsarray ((CFArrayRef) cf);
+		else
+			ns = [(id)cf retain];
+
+		[out addObject:ns];
+		[ns release];
+	}
+
+	return out;
+}
+
+- (CFPropertyListRef) prefs_get_copy:(NSString *)key {
+    CFPropertyListRef value;
+	
+    value = CFPreferencesCopyAppValue ((CFStringRef) key, app_prefs_domain_cfstr);
+	
+    if (value == NULL) {
+      static CFDictionaryRef defaults;
+      
+      if (defaults == NULL) {
+	CFStringRef error = NULL;
+	CFDataRef data;
+	CFURLRef url;
+	SInt32 error_code;
+	
+	url = (CFURLCreateFromFileSystemRepresentation
+	       (NULL, (unsigned char *)DEFAULTS_FILE, strlen (DEFAULTS_FILE), false));
+	if (CFURLCreateDataAndPropertiesFromResource (NULL, url, &data,
+						      NULL, NULL, &error_code)) {
+	  defaults = (CFPropertyListCreateFromXMLData
+		      (NULL, data, kCFPropertyListMutableContainersAndLeaves, &error));
+	  if (error != NULL) CFRelease (error);
+	  CFRelease (data);
+	}
+	CFRelease (url);
+			
+	if (defaults != NULL) {
+	  NSMutableArray *apps, *elt;
+	  int count, i;
+	  NSString *name, *nname;
+	  
+	  /* Localize the names in the default apps menu. */
+	  
+	  apps = [(NSDictionary *)defaults objectForKey:@PREFS_APPSMENU];
+	  if (apps != nil) {
+	    count = [apps count];
+	    for (i = 0; i < count; i++)	{
+	      elt = [apps objectAtIndex:i];
+	      if (elt != nil && [elt isKindOfClass:[NSArray class]]) {
+		name = [elt objectAtIndex:0];
+		if (name != nil) {
+		  nname = NSLocalizedString (name, nil);
+		  if (nname != nil && nname != name)
+		    [elt replaceObjectAtIndex:0 withObject:nname];
+		}
+	      }
+	    }
+	  }
+	}
+      }
+		
+      if (defaults != NULL) value = CFDictionaryGetValue (defaults, key);
+      if (value != NULL) CFRetain (value);
+    }
+	
+    return value;
+}
+
+- (int) prefs_get_integer:(NSString *)key default:(int)def {
+  CFPropertyListRef value;
+  int ret;
+  
+  value = [self prefs_get_copy:key];
+  
+  if (value != NULL && CFGetTypeID (value) == CFNumberGetTypeID ())
+    CFNumberGetValue (value, kCFNumberIntType, &ret);
+  else if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ())
+    ret = CFStringGetIntValue (value);
+  else
+    ret = def;
+  
+  if (value != NULL) CFRelease (value);
+  
+  return ret;
+}
+
+- (const char *) prefs_get_string:(NSString *)key default:(const char *)def {
+  CFPropertyListRef value;
+  const char *ret = NULL;
+  
+  value = [self prefs_get_copy:key];
+  
+  if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ()) {
+    NSString *s = (NSString *) value;
+    
+    ret = [s UTF8String];
+  }
+  
+  if (value != NULL) CFRelease (value);
+  
+  return ret != NULL ? ret : def;
+}
+
+- (NSURL *) prefs_copy_url:(NSString *)key default:(NSURL *)def {
+    CFPropertyListRef value;
+    NSURL *ret = NULL;
+    
+    value = [self prefs_get_copy:key];
+    
+    if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ()) {
+        NSString *s = (NSString *) value;
+
+        ret = [NSURL URLWithString:s];
+        [ret retain];
+    }
+    
+    if (value != NULL) CFRelease (value);
+    
+    return ret != NULL ? ret : def;
+}
+
+- (float) prefs_get_float:(NSString *)key default:(float)def {
+  CFPropertyListRef value;
+  float ret = def;
+  
+  value = [self prefs_get_copy:key];
+  
+  if (value != NULL
+      && CFGetTypeID (value) == CFNumberGetTypeID ()
+      && CFNumberIsFloatType (value))
+    CFNumberGetValue (value, kCFNumberFloatType, &ret);
+  else if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ())
+    ret = CFStringGetDoubleValue (value);
+	
+  if (value != NULL) CFRelease (value);
+  
+  return ret;
+}
+
+- (int) prefs_get_boolean:(NSString *)key default:(int)def {
+  CFPropertyListRef value;
+  int ret = def;
+  
+  value = [self prefs_get_copy:key];
+  
+  if (value != NULL) {
+    if (CFGetTypeID (value) == CFNumberGetTypeID ())
+      CFNumberGetValue (value, kCFNumberIntType, &ret);
+    else if (CFGetTypeID (value) == CFBooleanGetTypeID ())
+      ret = CFBooleanGetValue (value);
+    else if (CFGetTypeID (value) == CFStringGetTypeID ()) {
+      const char *tem = [(NSString *) value UTF8String];
+      if (strcasecmp (tem, "true") == 0 || strcasecmp (tem, "yes") == 0)
+	ret = YES;
+      else
+	ret = NO;
+    }
+    
+    CFRelease (value);
+  }
+  return ret;
+}
+
+- (NSArray *) prefs_get_array:(NSString *)key {
+  NSArray *ret = nil;
+  CFPropertyListRef value;
+  
+  value = [self prefs_get_copy:key];
+  
+  if (value != NULL) {
+    if (CFGetTypeID (value) == CFArrayGetTypeID ())
+      ret = [cfarray_to_nsarray (value) autorelease];
+    
+    CFRelease (value);
+  }
+  
+  return ret;
+}
+
+- (void) prefs_set_integer:(NSString *)key value:(int)value {
+    CFNumberRef x;
+	
+    x = CFNumberCreate (NULL, kCFNumberIntType, &value);
+	
+    CFPreferencesSetValue ((CFStringRef) key, (CFTypeRef) x, app_prefs_domain_cfstr,
+			   kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
+	
+    CFRelease (x);
+}
+
+- (void) prefs_set_float:(NSString *)key value:(float)value {
+    CFNumberRef x;
+	
+    x = CFNumberCreate (NULL, kCFNumberFloatType, &value);
+	
+    CFPreferencesSetValue ((CFStringRef) key, (CFTypeRef) x, app_prefs_domain_cfstr,
+			   kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
+	
+    CFRelease (x);
+}
+
+- (void) prefs_set_boolean:(NSString *)key value:(int)value {
+  CFPreferencesSetValue ((CFStringRef) key,
+			 (CFTypeRef) (value ? kCFBooleanTrue
+			 : kCFBooleanFalse), app_prefs_domain_cfstr,
+			 kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
+  
+}
+
+- (void) prefs_set_array:(NSString *)key value:(NSArray *)value {
+  CFArrayRef cfarray;
+  
+  cfarray = nsarray_to_cfarray (value);
+  CFPreferencesSetValue ((CFStringRef) key,
+			 (CFTypeRef) cfarray,
+			 app_prefs_domain_cfstr,
+			 kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
+  CFRelease (cfarray);
+}
+
+- (void) prefs_set_string:(NSString *)key value:(NSString *)value {
+  CFPreferencesSetValue ((CFStringRef) key, (CFTypeRef) value,
+			 app_prefs_domain_cfstr, kCFPreferencesCurrentUser,
+			 kCFPreferencesAnyHost);
+}
+
+- (void) prefs_synchronize {
+    CFPreferencesAppSynchronize (kCFPreferencesCurrentApplication);
+}
+
+- (void) read_defaults
+{
+    NSString *nsstr;
+    const char *tem;
+	
+    XQuartzRootlessDefault = [self prefs_get_boolean:@PREFS_ROOTLESS
+                                           default:XQuartzRootlessDefault];
+    XQuartzFullscreenMenu = [self prefs_get_boolean:@PREFS_FULLSCREEN_MENU
+                                           default:XQuartzFullscreenMenu];
+    XQuartzFullscreenDisableHotkeys = ![self prefs_get_boolean:@PREFS_FULLSCREEN_HOTKEYS
+                                                      default:!XQuartzFullscreenDisableHotkeys];
+    darwinFakeButtons = [self prefs_get_boolean:@PREFS_FAKEBUTTONS
+                                        default:darwinFakeButtons];
+    XQuartzOptionSendsAlt = [self prefs_get_boolean:@PREFS_OPTION_SENDS_ALT
+                                           default:XQuartzOptionSendsAlt];
+
+    if (darwinFakeButtons) {
+        const char *fake2, *fake3;
+
+        fake2 = [self prefs_get_string:@PREFS_FAKE_BUTTON2 default:NULL];
+        fake3 = [self prefs_get_string:@PREFS_FAKE_BUTTON3 default:NULL];
+
+        if (fake2 != NULL) darwinFakeMouse2Mask = DarwinParseModifierList(fake2, TRUE);
+        if (fake3 != NULL) darwinFakeMouse3Mask = DarwinParseModifierList(fake3, TRUE);
+    }
+
+    tem = [self prefs_get_string:@PREFS_APPKIT_MODIFIERS default:NULL];
+    if (tem != NULL) darwinAppKitModMask = DarwinParseModifierList(tem, TRUE);
+	
+    tem = [self prefs_get_string:@PREFS_WINDOW_ITEM_MODIFIERS default:NULL];
+    if (tem != NULL) {
+        windowItemModMask = DarwinParseModifierList(tem, FALSE);
+    } else {
+        nsstr = NSLocalizedString (@"window item modifiers", @"window item modifiers");
+        if(nsstr != NULL) {
+            tem = [nsstr UTF8String];
+            if((tem != NULL) && strcmp(tem, "window item modifiers")) {
+                windowItemModMask = DarwinParseModifierList(tem, FALSE);
+            }
+        }
+    }
+
+    XQuartzEnableKeyEquivalents = [self prefs_get_boolean:@PREFS_KEYEQUIVS
+                                              default:XQuartzEnableKeyEquivalents];
+	
+    darwinSyncKeymap = [self prefs_get_boolean:@PREFS_SYNC_KEYMAP
+                                       default:darwinSyncKeymap];
+		
+    darwinDesiredDepth = [self prefs_get_integer:@PREFS_DEPTH
+                                         default:darwinDesiredDepth];
+    
+    noTestExtensions = ![self prefs_get_boolean:@PREFS_TEST_EXTENSIONS
+                                        default:FALSE];
+    
+    XQuartzScrollInDeviceDirection = [self prefs_get_boolean:@PREFS_SCROLL_IN_DEV_DIRECTION
+                                                     default:XQuartzScrollInDeviceDirection];
+
+#if XQUARTZ_SPARKLE
+    NSURL *url =  [self prefs_copy_url:@PREFS_UPDATE_FEED default:nil];
+    if(url) {
+        [[SUUpdater sharedUpdater] setFeedURL:url];
+        [url release];
+    }
+#endif
+}
+
+/* This will end up at the end of the responder chain. */
+- (void) copy:sender {
+  DarwinSendDDXEvent(kXquartzPasteboardNotify, 1,
+			     AppleWMCopyToPasteboard);
+}
+
+- (X11Controller *) controller {
+    return _controller;
+}
+
+- (OSX_BOOL) x_active {
+    return _x_active;
+}
+
+@end
+
+static NSArray *
+array_with_strings_and_numbers (int nitems, const char **items,
+				const char *numbers) {
+  NSMutableArray *array, *subarray;
+  NSString *string, *number;
+  int i;
+	
+  /* (Can't autorelease on the X server thread) */
+  
+  array = [[NSMutableArray alloc] initWithCapacity:nitems];
+  
+  for (i = 0; i < nitems; i++) {
+    subarray = [[NSMutableArray alloc] initWithCapacity:2];
+    
+    string = [[NSString alloc] initWithUTF8String:items[i]];
+    [subarray addObject:string];
+    [string release];
+    
+    if (numbers[i] != 0) {
+      number = [[NSString alloc] initWithFormat:@"%d", numbers[i]];
+      [subarray addObject:number];
+      [number release];
+    } else
+      [subarray addObject:@""];
+    
+    [array addObject:subarray];
+    [subarray release];
+  }
+  
+  return array;
+}
+
+void X11ApplicationSetWindowMenu (int nitems, const char **items,
+				  const char *shortcuts) {
+  NSArray *array;
+  array = array_with_strings_and_numbers (nitems, items, shortcuts);
+  
+  /* Send the array of strings over to the appkit thread */
+  
+  message_kit_thread (@selector (set_window_menu:), array);
+  [array release];
+}
+
+void X11ApplicationSetWindowMenuCheck (int idx) {
+  NSNumber *n;
+  
+  n = [[NSNumber alloc] initWithInt:idx];
+  
+  message_kit_thread (@selector (set_window_menu_check:), n);
+  
+  [n release];
+}
+
+void X11ApplicationSetFrontProcess (void) {
+    message_kit_thread (@selector (set_front_process:), nil);
+}
+
+void X11ApplicationSetCanQuit (int state) {
+    NSNumber *n;
+	
+    n = [[NSNumber alloc] initWithBool:state];
+	
+    message_kit_thread (@selector (set_can_quit:), n);
+	
+    [n release];
+}
+
+void X11ApplicationServerReady (void) {
+    message_kit_thread (@selector (server_ready:), nil);
+}
+
+void X11ApplicationShowHideMenubar (int state) {
+    NSNumber *n;
+	
+    n = [[NSNumber alloc] initWithBool:state];
+	
+    message_kit_thread (@selector (show_hide_menubar:), n);
+	
+    [n release];
+}
+
+void X11ApplicationLaunchClient (const char *cmd) {
+    NSString *string;
+    
+    string = [[NSString alloc] initWithUTF8String:cmd];
+	
+    message_kit_thread (@selector (launch_client:), string);
+	
+    [string release];
+}
+
+/* This is a special function in that it is run from the *SERVER* thread and
+ * not the AppKit thread.  We want to block entering a screen-capturing RandR
+ * mode until we notify the user about how to get out if the X11 client crashes.
+ */
+Bool X11ApplicationCanEnterRandR(void) {
+    NSString *title, *msg;
+    
+    if([X11App prefs_get_boolean:@PREFS_NO_RANDR_ALERT default:NO] || XQuartzShieldingWindowLevel != 0)
+        return TRUE;
+    
+    title = NSLocalizedString(@"Enter RandR mode?", @"Dialog title when switching to RandR");
+    msg = NSLocalizedString(@"An application has requested X11 to change the resolution of your display.  X11 will restore the display to its previous state when the requesting application requests to return to the previous state.  Alternatively, you can use the ⌥⌘A key sequence to force X11 to return to the previous state.",
+                            @"Dialog when switching to RandR");
+
+    if(!XQuartzIsRootless)
+        QuartzShowFullscreen(FALSE);
+    
+    switch(NSRunAlertPanel(title, msg, NSLocalizedString(@"Allow", @""), NSLocalizedString (@"Cancel", @""), NSLocalizedString (@"Always Allow", @""))) {
+        case NSAlertOtherReturn:
+            [X11App prefs_set_boolean:@PREFS_NO_RANDR_ALERT value:YES];
+            [X11App prefs_synchronize];
+        case NSAlertDefaultReturn:
+            return YES;
+
+        default:
+            return NO;
+    }
+}
+
+static void check_xinitrc (void) {
+    char *tem, buf[1024];
+    NSString *msg;
+	
+    if ([X11App prefs_get_boolean:@PREFS_DONE_XINIT_CHECK default:NO])
+		return;
+	
+    tem = getenv ("HOME");
+    if (tem == NULL) goto done;
+	
+    snprintf (buf, sizeof (buf), "%s/.xinitrc", tem);
+    if (access (buf, F_OK) != 0)
+		goto done;
+	
+    msg = NSLocalizedString (@"You have an existing ~/.xinitrc file.\n\n\
+Windows displayed by X11 applications may not have titlebars, or may look \
+different to windows displayed by native applications.\n\n\
+Would you like to move aside the existing file and use the standard X11 \
+environment the next time you start X11?", @"Startup xinitrc dialog");
+
+    if(NSAlertDefaultReturn == NSRunAlertPanel (nil, msg, NSLocalizedString (@"Yes", @""),
+                                                NSLocalizedString (@"No", @""), nil)) {
+        char buf2[1024];
+        int i = -1;
+      
+        snprintf (buf2, sizeof (buf2), "%s.old", buf);
+      
+        for(i = 1; access (buf2, F_OK) == 0; i++)
+            snprintf (buf2, sizeof (buf2), "%s.old.%d", buf, i);
+
+        rename (buf, buf2);
+    }
+    
+ done:
+    [X11App prefs_set_boolean:@PREFS_DONE_XINIT_CHECK value:YES];
+    [X11App prefs_synchronize];
+}
+
+static inline pthread_t create_thread(void *(*func)(void *), void *arg) {
+    pthread_attr_t attr;
+    pthread_t tid;
+    
+    pthread_attr_init(&attr);
+    pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM);
+    pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+    pthread_create(&tid, &attr, func, arg);
+    pthread_attr_destroy(&attr);
+    
+    return tid;
+}
+
+static void *xpbproxy_x_thread(void *args) {
+    xpbproxy_run();
+
+    ErrorF("xpbproxy thread is terminating unexpectedly.\n");
+    return NULL;
+}
+
+void X11ApplicationMain (int argc, char **argv, char **envp) {
+    NSAutoreleasePool *pool;
+
+#ifdef DEBUG
+    while (access ("/tmp/x11-block", F_OK) == 0) sleep (1);
+#endif
+  
+    pool = [[NSAutoreleasePool alloc] init];
+    X11App = (X11Application *) [X11Application sharedApplication];
+    init_ports ();
+    
+    app_prefs_domain_cfstr = (CFStringRef)[[NSBundle mainBundle] bundleIdentifier];
+
+    if (app_prefs_domain_cfstr == NULL) {
+        ErrorF("X11ApplicationMain: Unable to determine bundle identifier.  Your installation of XQuartz may be broken.\n");
+        app_prefs_domain_cfstr = CFSTR(BUNDLE_ID_PREFIX".X11");
+    }
+
+    [NSApp read_defaults];
+    [NSBundle loadNibNamed:@"main" owner:NSApp];
+    [[NSNotificationCenter defaultCenter] addObserver:NSApp
+					selector:@selector (became_key:)
+					name:NSWindowDidBecomeKeyNotification object:nil];
+
+    /*
+     * The xpr Quartz mode is statically linked into this server.
+     * Initialize all the Quartz functions.
+     */
+    QuartzModeBundleInit();
+
+    /* Calculate the height of the menubar so we can avoid it. */
+    aquaMenuBarHeight = NSHeight([[NSScreen mainScreen] frame]) -
+    NSMaxY([[NSScreen mainScreen] visibleFrame]);
+
+#ifdef HAVE_LIBDISPATCH
+    eventTranslationQueue = dispatch_queue_create(BUNDLE_ID_PREFIX".X11.NSEventsToX11EventsQueue", NULL);
+    assert(eventTranslationQueue != NULL);
+#endif
+    
+    /* Set the key layout seed before we start the server */
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+    last_key_layout = TISCopyCurrentKeyboardLayoutInputSource();    
+
+    if(!last_key_layout)
+        ErrorF("X11ApplicationMain: Unable to determine TISCopyCurrentKeyboardLayoutInputSource() at startup.\n");
+#else
+    KLGetCurrentKeyboardLayout(&last_key_layout);
+    if(!last_key_layout)
+        ErrorF("X11ApplicationMain: Unable to determine KLGetCurrentKeyboardLayout() at startup.\n");
+#endif
+
+    if (!QuartsResyncKeymap(FALSE)) {
+        ErrorF("X11ApplicationMain: Could not build a valid keymap.\n");
+    }
+
+    /* Tell the server thread that it can proceed */
+    QuartzInitServer(argc, argv, envp);
+    
+    /* This must be done after QuartzInitServer because it can result in
+     * an mieqEnqueue() - <rdar://problem/6300249>
+     */
+    check_xinitrc();
+    
+    create_thread(xpbproxy_x_thread, NULL);
+
+#if XQUARTZ_SPARKLE
+    [[X11App controller] setup_sparkle];
+    [[SUUpdater sharedUpdater] resetUpdateCycle];
+//    [[SUUpdater sharedUpdater] checkForUpdates:X11App];
+#endif
+
+    [pool release];
+    [NSApp run];
+    /* not reached */
+}
+
+@implementation X11Application (Private)
+
+#ifdef NX_DEVICELCMDKEYMASK
+/* This is to workaround a bug in the VNC server where we sometimes see the L
+ * modifier and sometimes see no "side"
+ */
+static inline int ensure_flag(int flags, int device_independent, int device_dependents, int device_dependent_default) {
+    if( (flags & device_independent) &&
+       !(flags & device_dependents))
+        flags |= device_dependent_default;
+    return flags;
+}
+#endif
+
+#ifdef DEBUG_UNTRUSTED_POINTER_DELTA
+static const char *untrusted_str(NSEvent *e) {
+    switch([e type]) {
+        case NSScrollWheel:
+            return "NSScrollWheel";
+        case NSTabletPoint:
+            return "NSTabletPoint";
+        case NSOtherMouseDown:
+            return "NSOtherMouseDown";
+        case NSOtherMouseUp:
+            return "NSOtherMouseUp";
+        case NSLeftMouseDown:
+            return "NSLeftMouseDown";
+        case NSLeftMouseUp:
+            return "NSLeftMouseUp";
+        default:
+            switch([e subtype]) {
+                case NSTabletPointEventSubtype:
+                    return "NSTabletPointEventSubtype";
+                case NSTabletProximityEventSubtype:
+                    return "NSTabletProximityEventSubtype";
+                default:
+                    return "Other";
+            }
+    }
+}
+#endif
+
+- (void) sendX11NSEvent:(NSEvent *)e {
+    NSPoint location = NSZeroPoint;
+    int ev_button, ev_type;
+    static float pressure = 0.0;       // static so ProximityOut will have the value from the previous tablet event
+    static NSPoint tilt;               // static so ProximityOut will have the value from the previous tablet event
+    static DeviceIntPtr darwinTabletCurrent = NULL;
+    static BOOL needsProximityIn = NO; // Do we do need to handle a pending ProximityIn once we have pressure/tilt?
+    DeviceIntPtr pDev;
+    int modifierFlags;
+    BOOL isMouseOrTabletEvent, isTabletEvent;
+
+#ifdef HAVE_LIBDISPATCH
+    static dispatch_once_t once_pred;
+    dispatch_once(&once_pred, ^{
+        tilt = NSZeroPoint;
+        darwinTabletCurrent = darwinTabletStylus;
+    });
+#else
+    if(!darwinTabletCurrent) {
+        tilt = NSZeroPoint;
+        darwinTabletCurrent = darwinTabletStylus;
+    }
+#endif
+    
+    isMouseOrTabletEvent =  [e type] == NSLeftMouseDown    ||  [e type] == NSOtherMouseDown    ||  [e type] == NSRightMouseDown    ||
+                            [e type] == NSLeftMouseUp      ||  [e type] == NSOtherMouseUp      ||  [e type] == NSRightMouseUp      ||
+                            [e type] == NSLeftMouseDragged ||  [e type] == NSOtherMouseDragged ||  [e type] == NSRightMouseDragged ||
+                            [e type] == NSMouseMoved       ||  [e type] == NSTabletPoint       ||  [e type] == NSScrollWheel;
+
+    isTabletEvent = ([e type] == NSTabletPoint) ||
+                    (isMouseOrTabletEvent && ([e subtype] == NSTabletPointEventSubtype || [e subtype] == NSTabletProximityEventSubtype));
+
+    if(isMouseOrTabletEvent) {
+        static NSPoint lastpt;
+        NSWindow *window = [e window];
+        NSRect screen = [[[NSScreen screens] objectAtIndex:0] frame];
+	    BOOL hasUntrustedPointerDelta;
+        
+        // NSEvents for tablets are not consistent wrt deltaXY between events, so we cannot rely on that
+        // Thus tablets will be subject to the warp-pointer bug worked around by the delta, but tablets
+        // are not normally used in cases where that bug would present itself, so this is a fair tradeoff
+        // <rdar://problem/7111003> deltaX and deltaY are incorrect for NSMouseMoved, NSTabletPointEventSubtype
+        // http://xquartz.macosforge.org/trac/ticket/288
+        hasUntrustedPointerDelta = isTabletEvent;
+        
+        // The deltaXY for middle click events also appear erroneous after fast user switching
+        // <rdar://problem/7979468> deltaX and deltaY are incorrect for NSOtherMouseDown and NSOtherMouseUp after FUS
+        // http://xquartz.macosforge.org/trac/ticket/389
+        hasUntrustedPointerDelta = hasUntrustedPointerDelta || [e type] == NSOtherMouseDown || [e type] == NSOtherMouseUp;
+
+        // The deltaXY for scroll events correspond to the scroll delta, not the pointer delta
+        // <rdar://problem/7989690> deltaXY for wheel events are being sent as mouse movement
+        hasUntrustedPointerDelta = hasUntrustedPointerDelta || [e type] == NSScrollWheel;
+
+#ifdef DEBUG_UNTRUSTED_POINTER_DELTA
+        hasUntrustedPointerDelta = hasUntrustedPointerDelta || [e type] == NSLeftMouseDown || [e type] == NSLeftMouseUp;
+#endif
+        
+        if (window != nil)	{
+            NSRect frame = [window frame];
+            location = [e locationInWindow];
+            location.x += frame.origin.x;
+            location.y += frame.origin.y;
+            lastpt = location;
+        } else if(hasUntrustedPointerDelta) {
+#ifdef DEBUG_UNTRUSTED_POINTER_DELTA
+            ErrorF("--- Begin Event Debug ---\n");
+            ErrorF("Event type: %s\n", untrusted_str(e));
+            ErrorF("old lastpt: (%0.2f, %0.2f)\n", lastpt.x, lastpt.y);
+            ErrorF("     delta: (%0.2f, %0.2f)\n", [e deltaX], -[e deltaY]);
+            ErrorF("  location: (%0.2f, %0.2f)\n", lastpt.x + [e deltaX], lastpt.y - [e deltaY]);
+            ErrorF("workaround: (%0.2f, %0.2f)\n", [e locationInWindow].x, [e locationInWindow].y);
+            ErrorF("--- End Event Debug ---\n");
+
+            location.x = lastpt.x + [e deltaX];
+            location.y = lastpt.y - [e deltaY];
+            lastpt = [e locationInWindow];
+#else
+            location = [e locationInWindow];
+            lastpt = location;
+#endif
+        } else {
+            location.x = lastpt.x + [e deltaX];
+            location.y = lastpt.y - [e deltaY];
+            lastpt = [e locationInWindow];
+        }
+        
+        /* Convert coordinate system */
+        location.y = (screen.origin.y + screen.size.height) - location.y;
+    }
+    
+    modifierFlags = [e modifierFlags];
+    
+#ifdef NX_DEVICELCMDKEYMASK
+    /* This is to workaround a bug in the VNC server where we sometimes see the L
+     * modifier and sometimes see no "side"
+     */
+    modifierFlags = ensure_flag(modifierFlags, NX_CONTROLMASK,   NX_DEVICELCTLKEYMASK   | NX_DEVICERCTLKEYMASK,     NX_DEVICELCTLKEYMASK);
+    modifierFlags = ensure_flag(modifierFlags, NX_SHIFTMASK,     NX_DEVICELSHIFTKEYMASK | NX_DEVICERSHIFTKEYMASK,   NX_DEVICELSHIFTKEYMASK);
+    modifierFlags = ensure_flag(modifierFlags, NX_COMMANDMASK,   NX_DEVICELCMDKEYMASK   | NX_DEVICERCMDKEYMASK,     NX_DEVICELCMDKEYMASK);
+    modifierFlags = ensure_flag(modifierFlags, NX_ALTERNATEMASK, NX_DEVICELALTKEYMASK   | NX_DEVICERALTKEYMASK,     NX_DEVICELALTKEYMASK);
+#endif
+
+    modifierFlags &= darwin_all_modifier_mask;
+
+    /* We don't receive modifier key events while out of focus, and 3button
+     * emulation mucks this up, so we need to check our modifier flag state
+     * on every event... ugg
+     */
+    
+    if(darwin_all_modifier_flags != modifierFlags)
+        DarwinUpdateModKeys(modifierFlags);
+    
+	switch ([e type]) {
+		case NSLeftMouseDown:     ev_button=1; ev_type=ButtonPress;   goto handle_mouse;
+		case NSOtherMouseDown:    ev_button=2; ev_type=ButtonPress;   goto handle_mouse;
+		case NSRightMouseDown:    ev_button=3; ev_type=ButtonPress;   goto handle_mouse;
+		case NSLeftMouseUp:       ev_button=1; ev_type=ButtonRelease; goto handle_mouse;
+		case NSOtherMouseUp:      ev_button=2; ev_type=ButtonRelease; goto handle_mouse;
+		case NSRightMouseUp:      ev_button=3; ev_type=ButtonRelease; goto handle_mouse;
+		case NSLeftMouseDragged:  ev_button=1; ev_type=MotionNotify;  goto handle_mouse;
+		case NSOtherMouseDragged: ev_button=2; ev_type=MotionNotify;  goto handle_mouse;
+		case NSRightMouseDragged: ev_button=3; ev_type=MotionNotify;  goto handle_mouse;
+		case NSMouseMoved:        ev_button=0; ev_type=MotionNotify;  goto handle_mouse;
+        case NSTabletPoint:       ev_button=0; ev_type=MotionNotify;  goto handle_mouse;
+            
+        handle_mouse:
+            pDev = darwinPointer;
+
+            /* NSTabletPoint can have no subtype */
+            if([e type] != NSTabletPoint &&
+               [e subtype] == NSTabletProximityEventSubtype) {
+                switch([e pointingDeviceType]) {
+                    case NSEraserPointingDevice:
+                        darwinTabletCurrent=darwinTabletEraser;
+                        break;
+                    case NSPenPointingDevice:
+                        darwinTabletCurrent=darwinTabletStylus;
+                        break;
+                    case NSCursorPointingDevice:
+                    case NSUnknownPointingDevice:
+                    default:
+                        darwinTabletCurrent=darwinTabletCursor;
+                        break;
+                }
+
+                if([e isEnteringProximity])
+                    needsProximityIn = YES;
+                else
+                    DarwinSendProximityEvents(darwinTabletCurrent, ProximityOut,
+                                              location.x, location.y, pressure,
+                                              tilt.x, tilt.y);
+                return;
+            }
+
+			if ([e type] == NSTabletPoint || [e subtype] == NSTabletPointEventSubtype) {
+                pressure = [e pressure];
+                tilt     = [e tilt];
+                
+                pDev = darwinTabletCurrent;
+                
+                if(needsProximityIn) {
+                    DarwinSendProximityEvents(darwinTabletCurrent, ProximityIn,
+                                              location.x, location.y, pressure,
+                                              tilt.x, tilt.y);
+
+                    needsProximityIn = NO;
+                }
+            }
+
+            if(!XQuartzServerVisible && noTestExtensions) {
+#if defined(XPLUGIN_VERSION) && XPLUGIN_VERSION > 0
+/* Older libXplugin (Tiger/"Stock" Leopard) aren't thread safe, so we can't call xp_find_window from the Appkit thread */
+                xp_window_id wid = 0;
+                xp_error err;
+
+                /* Sigh. Need to check that we're really over one of
+                 * our windows. (We need to receive pointer events while
+                 * not in the foreground, but we don't want to receive them
+                 * when another window is over us or we might show a tooltip)
+                 */
+
+                err = xp_find_window(location.x, location.y, 0, &wid);
+
+                if (err != XP_Success || (err == XP_Success && wid == 0))
+#endif
+                {
+                    bgMouseLocation = location;
+                    bgMouseLocationUpdated = TRUE;
+                    return;
+                }
+            }
+            
+            if(bgMouseLocationUpdated) {
+                if(!(ev_type == MotionNotify && ev_button == 0)) {
+                    DarwinSendPointerEvents(pDev, MotionNotify, 0, location.x,
+                                            location.y, pressure, tilt.x, tilt.y);
+                }
+                bgMouseLocationUpdated = FALSE;
+            }
+
+            DarwinSendPointerEvents(pDev, ev_type, ev_button, location.x, location.y,
+                                    pressure, tilt.x, tilt.y);
+            
+            break;
+            
+		case NSTabletProximity:
+            switch([e pointingDeviceType]) {
+                case NSEraserPointingDevice:
+                    darwinTabletCurrent=darwinTabletEraser;
+                    break;
+                case NSPenPointingDevice:
+                    darwinTabletCurrent=darwinTabletStylus;
+                    break;
+                case NSCursorPointingDevice:
+                case NSUnknownPointingDevice:
+                default:
+                    darwinTabletCurrent=darwinTabletCursor;
+                    break;
+            }
+            
+            if([e isEnteringProximity])
+                needsProximityIn = YES;
+            else
+                DarwinSendProximityEvents(darwinTabletCurrent, ProximityOut,
+                                          location.x, location.y, pressure,
+                                          tilt.x, tilt.y);
+            break;
+            
+		case NSScrollWheel:
+            {
+                float deltaX = [e deltaX];
+                float deltaY = [e deltaY];
+#if !defined(XPLUGIN_VERSION) || XPLUGIN_VERSION == 0
+                /* If we're in the background, we need to send a MotionNotify event
+                * first, since we aren't getting them on background mouse motion
+                */
+                if(!XQuartzServerVisible && noTestExtensions) {
+                    bgMouseLocationUpdated = FALSE;
+                    DarwinSendPointerEvents(darwinPointer, MotionNotify, 0, location.x,
+                                            location.y, pressure, tilt.x, tilt.y);
+                }
+#endif
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
+                // TODO: Change 1117 to NSAppKitVersionNumber10_7 when it is defined
+                if(NSAppKitVersionNumber >= 1117 && XQuartzScrollInDeviceDirection && [e isDirectionInvertedFromDevice]) {
+                    deltaX *= -1;
+                    deltaY *= -1;
+                }
+#endif
+                DarwinSendScrollEvents(deltaX, deltaY, location.x, location.y,
+                                       pressure, tilt.x, tilt.y);
+                break;
+            }
+        case NSKeyDown: case NSKeyUp:
+            {
+                /* XKB clobbers our keymap at startup, so we need to force it on the first keypress.
+                 * TODO: Make this less of a kludge.
+                 */
+                static int force_resync_keymap = YES;
+                if(force_resync_keymap) {
+                    DarwinSendDDXEvent(kXquartzReloadKeymap, 0);
+                    force_resync_keymap = NO;
+                }
+            }
+
+            if(darwinSyncKeymap) {
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+                TISInputSourceRef key_layout = TISCopyCurrentKeyboardLayoutInputSource();
+                TISInputSourceRef clear;
+                if (CFEqual(key_layout, last_key_layout)) {
+                    CFRelease(key_layout);
+                } else {
+                    /* Swap/free thread-safely */
+                    clear = last_key_layout;
+                    last_key_layout = key_layout;
+                    CFRelease(clear);
+#else
+                KeyboardLayoutRef key_layout;
+                KLGetCurrentKeyboardLayout(&key_layout);
+                if(key_layout != last_key_layout) {
+                    last_key_layout = key_layout;
+#endif
+                    /* Update keyInfo */
+                    if (!QuartsResyncKeymap(TRUE)) {
+                        ErrorF("sendX11NSEvent: Could not build a valid keymap.\n");
+                    }
+                }
+            }
+
+            /* Avoid stuck keys on context switch */
+            if(keyState[[e keyCode]] == [e type])
+                return;
+            keyState[[e keyCode]] = [e type];
+
+            DarwinSendKeyboardEvents(([e type] == NSKeyDown) ? KeyPress : KeyRelease, [e keyCode]);
+            break;
+            
+        default: break; /* for gcc */
+	}	
+}
+@end
diff --git a/xorg-server/hw/xquartz/applewm.c b/xorg-server/hw/xquartz/applewm.c
index 3b8ca3094..2f26e61d9 100644
--- a/xorg-server/hw/xquartz/applewm.c
+++ b/xorg-server/hw/xquartz/applewm.c
@@ -1,736 +1,736 @@
-/**************************************************************************

-

-Copyright (c) 2002-2007 Apple Inc. All Rights Reserved.

-Copyright (c) 2003 Torrey T. Lyons. All Rights Reserved.

-

-Permission is hereby granted, free of charge, to any person obtaining a

-copy of this software and associated documentation files (the

-"Software"), to deal in the Software without restriction, including

-without limitation the rights to use, copy, modify, merge, publish,

-distribute, sub license, and/or sell copies of the Software, and to

-permit persons to whom the Software is furnished to do so, subject to

-the following conditions:

-

-The above copyright notice and this permission notice (including the

-next paragraph) 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 NON-INFRINGEMENT.

-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.

-

-**************************************************************************/

-

-#include "sanitizedCarbon.h"

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include "quartzCommon.h"

-

-#include "misc.h"

-#include "dixstruct.h"

-#include "globals.h"

-#include "extnsionst.h"

-#include "colormapst.h"

-#include "cursorstr.h"

-#include "scrnintstr.h"

-#include "windowstr.h"

-#include "servermd.h"

-#include "swaprep.h"

-#include "propertyst.h"

-#include <X11/Xatom.h>

-#include "darwin.h"

-#define _APPLEWM_SERVER_

-#include <X11/extensions/applewmproto.h>

-#include "applewmExt.h"

-#include "X11Application.h"

-#include "protocol-versions.h"

-

-#define DEFINE_ATOM_HELPER(func,atom_name)                      \

-static Atom func (void) {                                       \

-    static int generation;                                      \

-    static Atom atom;                                           \

-    if (generation != serverGeneration) {                       \

-        generation = serverGeneration;                          \

-        atom = MakeAtom (atom_name, strlen (atom_name), TRUE);  \

-    }                                                           \

-    return atom;                                                \

-}

-

-DEFINE_ATOM_HELPER(xa_native_screen_origin, "_NATIVE_SCREEN_ORIGIN")

-DEFINE_ATOM_HELPER (xa_apple_no_order_in, "_APPLE_NO_ORDER_IN")

-

-static AppleWMProcsPtr appleWMProcs;

-

-static int WMErrorBase;

-

-

-static unsigned char WMReqCode = 0;

-static int WMEventBase = 0;

-

-static RESTYPE ClientType, EventType; /* resource types for event masks */

-static XID eventResource;

-

-/* Currently selected events */

-static unsigned int eventMask = 0;

-

-static int WMFreeClient (pointer data, XID id);

-static int WMFreeEvents (pointer data, XID id);

-static void SNotifyEvent(xAppleWMNotifyEvent *from, xAppleWMNotifyEvent *to);

-

-typedef struct _WMEvent *WMEventPtr;

-typedef struct _WMEvent {

-    WMEventPtr      next;

-    ClientPtr       client;

-    XID             clientResource;

-    unsigned int    mask;

-} WMEventRec;

-

-static inline BoxRec

-make_box (int x, int y, int w, int h)

-{

-    BoxRec r;

-    r.x1 = x;

-    r.y1 = y;

-    r.x2 = x + w;

-    r.y2 = y + h;

-    return r;

-}

-

-/* Updates the _NATIVE_SCREEN_ORIGIN property on the given root window. */

-void

-AppleWMSetScreenOrigin(

-    WindowPtr pWin

-)

-{

-    int32_t data[2];

-

-    data[0] = pWin->drawable.pScreen->x + darwinMainScreenX;

-    data[1] = pWin->drawable.pScreen->y + darwinMainScreenY;

-

-    dixChangeWindowProperty(serverClient, pWin, xa_native_screen_origin(),

-			    XA_INTEGER, 32, PropModeReplace, 2, data, TRUE);

-}

-

-/* Window managers can set the _APPLE_NO_ORDER_IN property on windows

-   that are being genie-restored from the Dock. We want them to

-   be mapped but remain ordered-out until the animation

-   completes (when the Dock will order them in). */

-Bool

-AppleWMDoReorderWindow(

-    WindowPtr pWin

-)

-{

-    Atom atom;

-    PropertyPtr prop;

-    int rc;

-

-    atom = xa_apple_no_order_in();

-    rc = dixLookupProperty(&prop, pWin, atom, serverClient, DixReadAccess);

-    

-    if(Success == rc && prop->type == atom)

-	return 0;

-    

-    return 1;

-}

-

-

-static int

-ProcAppleWMQueryVersion(

-    register ClientPtr client

-)

-{

-    xAppleWMQueryVersionReply rep;

-    register int n;

-

-    REQUEST_SIZE_MATCH(xAppleWMQueryVersionReq);

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-    rep.majorVersion = SERVER_APPLEWM_MAJOR_VERSION;

-    rep.minorVersion = SERVER_APPLEWM_MINOR_VERSION;

-    rep.patchVersion = SERVER_APPLEWM_PATCH_VERSION;

-    if (client->swapped) {

-        swaps(&rep.sequenceNumber, n);

-        swapl(&rep.length, n);

-    }

-    WriteToClient(client, sizeof(xAppleWMQueryVersionReply), (char *)&rep);

-    return Success;

-}

-

-

-/* events */

-

-static inline void

-updateEventMask (WMEventPtr *pHead)

-{

-    WMEventPtr pCur;

-

-    eventMask = 0;

-    for (pCur = *pHead; pCur != NULL; pCur = pCur->next)

-        eventMask |= pCur->mask;

-}

-

-/*ARGSUSED*/

-static int

-WMFreeClient (pointer data, XID id) {

-    WMEventPtr   pEvent;

-    WMEventPtr   *pHead, pCur, pPrev;

-    int i;

-

-    pEvent = (WMEventPtr) data;

-    i = dixLookupResourceByType((pointer *)&pHead, eventResource, EventType, serverClient, DixReadAccess | DixWriteAccess | DixDestroyAccess);

-    if (i == Success && pHead) {

-        pPrev = 0;

-        for (pCur = *pHead; pCur && pCur != pEvent; pCur=pCur->next)

-            pPrev = pCur;

-        if (pCur) {

-            if (pPrev)

-                pPrev->next = pEvent->next;

-            else

-                *pHead = pEvent->next;

-        }

-        updateEventMask (pHead);

-    }

-    free((pointer) pEvent);

-    return 1;

-}

-

-/*ARGSUSED*/

-static int

-WMFreeEvents (pointer data, XID id) {

-    WMEventPtr   *pHead, pCur, pNext;

-

-    pHead = (WMEventPtr *) data;

-    for (pCur = *pHead; pCur; pCur = pNext) {

-        pNext = pCur->next;

-        FreeResource (pCur->clientResource, ClientType);

-        free((pointer) pCur);

-    }

-    free((pointer) pHead);

-    eventMask = 0;

-    return 1;

-}

-

-static int

-ProcAppleWMSelectInput (register ClientPtr client)

-{

-    REQUEST(xAppleWMSelectInputReq);

-    WMEventPtr      pEvent, pNewEvent, *pHead;

-    XID             clientResource;

-    int             i;

-

-    REQUEST_SIZE_MATCH (xAppleWMSelectInputReq);

-    i = dixLookupResourceByType((pointer *)&pHead, eventResource, EventType, client, DixWriteAccess);

-    if (stuff->mask != 0) {

-        if (i == Success && pHead) {

-            /* check for existing entry. */

-            for (pEvent = *pHead; pEvent; pEvent = pEvent->next)

-            {

-                if (pEvent->client == client)

-                {

-                    pEvent->mask = stuff->mask;

-                    updateEventMask (pHead);

-                    return Success;

-                }

-            }

-        }

-

-        /* build the entry */

-        pNewEvent = (WMEventPtr) malloc(sizeof (WMEventRec));

-        if (!pNewEvent)

-            return BadAlloc;

-        pNewEvent->next = 0;

-        pNewEvent->client = client;

-        pNewEvent->mask = stuff->mask;

-        /*

-         * add a resource that will be deleted when

-         * the client goes away

-         */

-        clientResource = FakeClientID (client->index);

-        pNewEvent->clientResource = clientResource;

-        if (!AddResource (clientResource, ClientType, (pointer)pNewEvent))

-            return BadAlloc;

-        /*

-         * create a resource to contain a pointer to the list

-         * of clients selecting input.  This must be indirect as

-         * the list may be arbitrarily rearranged which cannot be

-         * done through the resource database.

-         */

-        if (i != Success || !pHead)

-        {

-            pHead = (WMEventPtr *) malloc(sizeof (WMEventPtr));

-            if (!pHead ||

-                !AddResource (eventResource, EventType, (pointer)pHead))

-            {

-                FreeResource (clientResource, RT_NONE);

-                return BadAlloc;

-            }

-            *pHead = 0;

-        }

-        pNewEvent->next = *pHead;

-        *pHead = pNewEvent;

-        updateEventMask (pHead);

-    } else if (stuff->mask == 0) {

-        /* delete the interest */

-        if (i == Success && pHead) {

-            pNewEvent = 0;

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

-                if (pEvent->client == client)

-                    break;

-                pNewEvent = pEvent;

-            }

-            if (pEvent) {

-                FreeResource (pEvent->clientResource, ClientType);

-                if (pNewEvent)

-                    pNewEvent->next = pEvent->next;

-                else

-                    *pHead = pEvent->next;

-                free(pEvent);

-                updateEventMask (pHead);

-            }

-        }

-    } else {

-        client->errorValue = stuff->mask;

-        return BadValue;

-    }

-    return Success;

-}

-

-/*

- * deliver the event

- */

-

-void

-AppleWMSendEvent (int type, unsigned int mask, int which, int arg) {

-    WMEventPtr      *pHead, pEvent;

-    xAppleWMNotifyEvent se;

-    int             i;

-

-    i = dixLookupResourceByType((pointer *)&pHead, eventResource, EventType, serverClient, DixReadAccess);

-    if (i != Success || !pHead)

-        return;

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

-        if ((pEvent->mask & mask) == 0)

-            continue;

-        se.type = type + WMEventBase;

-        se.kind = which;

-        se.arg = arg;

-        se.time = currentTime.milliseconds;

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

-    }

-}

-

-/* Safe to call from any thread. */

-unsigned int

-AppleWMSelectedEvents (void)

-{

-    return eventMask;

-}

-

-

-/* general utility functions */

-

-static int

-ProcAppleWMDisableUpdate(

-    register ClientPtr client

-)

-{

-    REQUEST_SIZE_MATCH(xAppleWMDisableUpdateReq);

-

-    appleWMProcs->DisableUpdate();

-

-    return Success;

-}

-

-static int

-ProcAppleWMReenableUpdate(

-    register ClientPtr client

-)

-{

-    REQUEST_SIZE_MATCH(xAppleWMReenableUpdateReq);

-

-    appleWMProcs->EnableUpdate();

-

-    return Success;

-}

-

-

-/* window functions */

-

-static int

-ProcAppleWMSetWindowMenu(

-    register ClientPtr client

-)

-{

-    const char *bytes, **items;

-    char *shortcuts;

-    int max_len, nitems, i, j;

-    REQUEST(xAppleWMSetWindowMenuReq);

-

-    REQUEST_AT_LEAST_SIZE(xAppleWMSetWindowMenuReq);

-

-    nitems = stuff->nitems;

-    items = malloc(sizeof (char *) * nitems);

-    shortcuts = malloc(sizeof (char) * nitems);

-

-    max_len = (stuff->length << 2) - sizeof(xAppleWMSetWindowMenuReq);

-    bytes = (char *) &stuff[1];

-

-    for (i = j = 0; i < max_len && j < nitems;)

-    {

-        shortcuts[j] = bytes[i++];

-        items[j++] = bytes + i;

-

-        while (i < max_len)

-        {

-            if (bytes[i++] == 0)

-                break;

-        }

-    }

-    X11ApplicationSetWindowMenu (nitems, items, shortcuts);

-    free(items);

-    free(shortcuts);

-

-    return Success;

-}

-

-static int

-ProcAppleWMSetWindowMenuCheck(

-    register ClientPtr client

-)

-{

-    REQUEST(xAppleWMSetWindowMenuCheckReq);

-

-    REQUEST_SIZE_MATCH(xAppleWMSetWindowMenuCheckReq);

-    X11ApplicationSetWindowMenuCheck(stuff->index);

-    return Success;

-}

-

-static int

-ProcAppleWMSetFrontProcess(

-    register ClientPtr client

-)

-{

-    REQUEST_SIZE_MATCH(xAppleWMSetFrontProcessReq);

-

-    X11ApplicationSetFrontProcess();

-    return Success;

-}

-

-static int

-ProcAppleWMSetWindowLevel(register ClientPtr client)

-{

-    REQUEST(xAppleWMSetWindowLevelReq);

-    WindowPtr pWin;

-    int err;

-

-    REQUEST_SIZE_MATCH(xAppleWMSetWindowLevelReq);

-

-    if (Success != dixLookupWindow(&pWin, stuff->window, client,

-				   DixReadAccess))

-        return BadValue;

-

-    if (stuff->level >= AppleWMNumWindowLevels) {

-        return BadValue;

-    }

-

-     err = appleWMProcs->SetWindowLevel(pWin, stuff->level);

-     if (err != Success) {

-        return err;

-    }

-

-    return Success;

-}

-

-static int

-ProcAppleWMSendPSN(register ClientPtr client)

-{

-    REQUEST(xAppleWMSendPSNReq);

-    int err;

-    

-    REQUEST_SIZE_MATCH(xAppleWMSendPSNReq);

-    

-    if(!appleWMProcs->SendPSN)

-        return BadRequest;

-

-    err = appleWMProcs->SendPSN(stuff->psn_hi, stuff->psn_lo);

-    if (err != Success) {

-        return err;

-    }

-

-    return Success;

-}

-

-static int

-ProcAppleWMAttachTransient(register ClientPtr client)

-{

-    WindowPtr pWinChild, pWinParent;

-    REQUEST(xAppleWMAttachTransientReq);

-    int err;

-    

-    REQUEST_SIZE_MATCH(xAppleWMAttachTransientReq);

-    

-    if(!appleWMProcs->AttachTransient)

-        return BadRequest;

-

-    if (Success != dixLookupWindow(&pWinChild, stuff->child, client, DixReadAccess))

-        return BadValue;

-

-    if(stuff->parent) {

-        if(Success != dixLookupWindow(&pWinParent, stuff->parent, client, DixReadAccess))

-            return BadValue;

-    } else {

-        pWinParent = NULL;

-    }

-

-    err = appleWMProcs->AttachTransient(pWinChild, pWinParent);

-    if (err != Success) {

-        return err;

-    }

-

-    return Success;

-}

-

-static int

-ProcAppleWMSetCanQuit(

-    register ClientPtr client

-)

-{

-    REQUEST(xAppleWMSetCanQuitReq);

-

-    REQUEST_SIZE_MATCH(xAppleWMSetCanQuitReq);

-

-    X11ApplicationSetCanQuit(stuff->state);

-    return Success;

-}

-

-

-/* frame functions */

-

-static int

-ProcAppleWMFrameGetRect(

-    register ClientPtr client

-)

-{

-    xAppleWMFrameGetRectReply rep;

-    BoxRec ir, or, rr;

-    REQUEST(xAppleWMFrameGetRectReq);

-

-    REQUEST_SIZE_MATCH(xAppleWMFrameGetRectReq);

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-

-    ir = make_box (stuff->ix, stuff->iy, stuff->iw, stuff->ih);

-    or = make_box (stuff->ox, stuff->oy, stuff->ow, stuff->oh);

-

-    if (appleWMProcs->FrameGetRect(stuff->frame_rect,

-                                   stuff->frame_class,

-                                   &or, &ir, &rr) != Success)

-    {

-        return BadValue;

-    }

-

-    rep.x = rr.x1;

-    rep.y = rr.y1;

-    rep.w = rr.x2 - rr.x1;

-    rep.h = rr.y2 - rr.y1;

-

-    WriteToClient(client, sizeof(xAppleWMFrameGetRectReply), (char *)&rep);

-    return Success;

-}

-

-static int

-ProcAppleWMFrameHitTest(

-    register ClientPtr client

-)

-{

-    xAppleWMFrameHitTestReply rep;

-    BoxRec ir, or;

-    int ret;

-    REQUEST(xAppleWMFrameHitTestReq);

-

-    REQUEST_SIZE_MATCH(xAppleWMFrameHitTestReq);

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-

-    ir = make_box (stuff->ix, stuff->iy, stuff->iw, stuff->ih);

-    or = make_box (stuff->ox, stuff->oy, stuff->ow, stuff->oh);

-

-    if (appleWMProcs->FrameHitTest(stuff->frame_class, stuff->px,

-                                   stuff->py, &or, &ir, &ret) != Success)

-    {

-        return BadValue;

-    }

-

-    rep.ret = ret;

-

-    WriteToClient(client, sizeof(xAppleWMFrameHitTestReply), (char *)&rep);

-    return Success;

-}

-

-static int

-ProcAppleWMFrameDraw(

-    register ClientPtr client

-)

-{

-    BoxRec ir, or;

-    unsigned int title_length, title_max;

-    unsigned char *title_bytes;

-    REQUEST(xAppleWMFrameDrawReq);

-    WindowPtr pWin;

-

-    REQUEST_AT_LEAST_SIZE(xAppleWMFrameDrawReq);

-

-    if (Success != dixLookupWindow(&pWin, stuff->window, client,

-				   DixReadAccess))

-        return BadValue;

-

-    ir = make_box (stuff->ix, stuff->iy, stuff->iw, stuff->ih);

-    or = make_box (stuff->ox, stuff->oy, stuff->ow, stuff->oh);

-

-    title_length = stuff->title_length;

-    title_max = (stuff->length << 2) - sizeof(xAppleWMFrameDrawReq);

-

-    if (title_max < title_length)

-        return BadValue;

-

-    title_bytes = (unsigned char *) &stuff[1];

-

-    errno = appleWMProcs->FrameDraw(pWin, stuff->frame_class,

-                                    stuff->frame_attr, &or, &ir,

-                                    title_length, title_bytes);

-    if (errno != Success) {

-        return errno;

-    }

-

-    return Success;

-}

-

-

-/* dispatch */

-

-static int

-ProcAppleWMDispatch (

-    register ClientPtr  client

-)

-{

-    REQUEST(xReq);

-

-    switch (stuff->data)

-    {

-    case X_AppleWMQueryVersion:

-        return ProcAppleWMQueryVersion(client);

-    }

-

-    if (!LocalClient(client))

-        return WMErrorBase + AppleWMClientNotLocal;

-

-    switch (stuff->data)

-    {

-    case X_AppleWMSelectInput:

-        return ProcAppleWMSelectInput(client);

-    case X_AppleWMDisableUpdate:

-        return ProcAppleWMDisableUpdate(client);

-    case X_AppleWMReenableUpdate:

-        return ProcAppleWMReenableUpdate(client);

-    case X_AppleWMSetWindowMenu:

-        return ProcAppleWMSetWindowMenu(client);

-    case X_AppleWMSetWindowMenuCheck:

-        return ProcAppleWMSetWindowMenuCheck(client);

-    case X_AppleWMSetFrontProcess:

-        return ProcAppleWMSetFrontProcess(client);

-    case X_AppleWMSetWindowLevel:

-        return ProcAppleWMSetWindowLevel(client);

-    case X_AppleWMSetCanQuit:

-        return ProcAppleWMSetCanQuit(client);

-    case X_AppleWMFrameGetRect:

-        return ProcAppleWMFrameGetRect(client);

-    case X_AppleWMFrameHitTest:

-        return ProcAppleWMFrameHitTest(client);

-    case X_AppleWMFrameDraw:

-        return ProcAppleWMFrameDraw(client);

-    case X_AppleWMSendPSN:

-        return ProcAppleWMSendPSN(client);

-    case X_AppleWMAttachTransient:

-        return ProcAppleWMAttachTransient(client);

-    default:

-        return BadRequest;

-    }

-}

-

-static void

-SNotifyEvent(xAppleWMNotifyEvent *from, xAppleWMNotifyEvent *to) {

-    to->type = from->type;

-    to->kind = from->kind;

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

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

-    cpswapl (from->arg, to->arg);

-}

-

-static int

-SProcAppleWMQueryVersion(

-    register ClientPtr  client

-)

-{

-    register int n;

-    REQUEST(xAppleWMQueryVersionReq);

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

-    return ProcAppleWMQueryVersion(client);

-}

-

-static int

-SProcAppleWMDispatch (

-    register ClientPtr  client

-)

-{

-    REQUEST(xReq);

-

-    /* It is bound to be non-local when there is byte swapping */

-    if (!LocalClient(client))

-        return WMErrorBase + AppleWMClientNotLocal;

-

-    /* only local clients are allowed WM access */

-    switch (stuff->data)

-    {

-    case X_AppleWMQueryVersion:

-        return SProcAppleWMQueryVersion(client);

-    default:

-        return BadRequest;

-    }

-}

-

-void

-AppleWMExtensionInit(

-    AppleWMProcsPtr procsPtr)

-{

-    ExtensionEntry* extEntry;

-

-    ClientType = CreateNewResourceType(WMFreeClient, "WMClient");

-    EventType = CreateNewResourceType(WMFreeEvents, "WMEvent");

-    eventResource = FakeClientID(0);

-

-    if (ClientType && EventType &&

-        (extEntry = AddExtension(APPLEWMNAME,

-                                 AppleWMNumberEvents,

-                                 AppleWMNumberErrors,

-                                 ProcAppleWMDispatch,

-                                 SProcAppleWMDispatch,

-                                 NULL,

-                                 StandardMinorOpcode)))

-    {

-        WMReqCode = (unsigned char)extEntry->base;

-        WMErrorBase = extEntry->errorBase;

-        WMEventBase = extEntry->eventBase;

-        EventSwapVector[WMEventBase] = (EventSwapPtr) SNotifyEvent;

-        appleWMProcs = procsPtr;

-    }

-}

+/**************************************************************************
+
+Copyright (c) 2002-2007 Apple Inc. All Rights Reserved.
+Copyright (c) 2003 Torrey T. Lyons. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sub license, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) 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 NON-INFRINGEMENT.
+IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.
+
+**************************************************************************/
+
+#include "sanitizedCarbon.h"
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "quartzCommon.h"
+
+#include "misc.h"
+#include "dixstruct.h"
+#include "globals.h"
+#include "extnsionst.h"
+#include "colormapst.h"
+#include "cursorstr.h"
+#include "scrnintstr.h"
+#include "windowstr.h"
+#include "servermd.h"
+#include "swaprep.h"
+#include "propertyst.h"
+#include <X11/Xatom.h>
+#include "darwin.h"
+#define _APPLEWM_SERVER_
+#include <X11/extensions/applewmproto.h>
+#include "applewmExt.h"
+#include "X11Application.h"
+#include "protocol-versions.h"
+
+#define DEFINE_ATOM_HELPER(func,atom_name)                      \
+static Atom func (void) {                                       \
+    static int generation;                                      \
+    static Atom atom;                                           \
+    if (generation != serverGeneration) {                       \
+        generation = serverGeneration;                          \
+        atom = MakeAtom (atom_name, strlen (atom_name), TRUE);  \
+    }                                                           \
+    return atom;                                                \
+}
+
+DEFINE_ATOM_HELPER(xa_native_screen_origin, "_NATIVE_SCREEN_ORIGIN")
+DEFINE_ATOM_HELPER (xa_apple_no_order_in, "_APPLE_NO_ORDER_IN")
+
+static AppleWMProcsPtr appleWMProcs;
+
+static int WMErrorBase;
+
+
+static unsigned char WMReqCode = 0;
+static int WMEventBase = 0;
+
+static RESTYPE ClientType, EventType; /* resource types for event masks */
+static XID eventResource;
+
+/* Currently selected events */
+static unsigned int eventMask = 0;
+
+static int WMFreeClient (pointer data, XID id);
+static int WMFreeEvents (pointer data, XID id);
+static void SNotifyEvent(xAppleWMNotifyEvent *from, xAppleWMNotifyEvent *to);
+
+typedef struct _WMEvent *WMEventPtr;
+typedef struct _WMEvent {
+    WMEventPtr      next;
+    ClientPtr       client;
+    XID             clientResource;
+    unsigned int    mask;
+} WMEventRec;
+
+static inline BoxRec
+make_box (int x, int y, int w, int h)
+{
+    BoxRec r;
+    r.x1 = x;
+    r.y1 = y;
+    r.x2 = x + w;
+    r.y2 = y + h;
+    return r;
+}
+
+/* Updates the _NATIVE_SCREEN_ORIGIN property on the given root window. */
+void
+AppleWMSetScreenOrigin(
+    WindowPtr pWin
+)
+{
+    int32_t data[2];
+
+    data[0] = pWin->drawable.pScreen->x + darwinMainScreenX;
+    data[1] = pWin->drawable.pScreen->y + darwinMainScreenY;
+
+    dixChangeWindowProperty(serverClient, pWin, xa_native_screen_origin(),
+			    XA_INTEGER, 32, PropModeReplace, 2, data, TRUE);
+}
+
+/* Window managers can set the _APPLE_NO_ORDER_IN property on windows
+   that are being genie-restored from the Dock. We want them to
+   be mapped but remain ordered-out until the animation
+   completes (when the Dock will order them in). */
+Bool
+AppleWMDoReorderWindow(
+    WindowPtr pWin
+)
+{
+    Atom atom;
+    PropertyPtr prop;
+    int rc;
+
+    atom = xa_apple_no_order_in();
+    rc = dixLookupProperty(&prop, pWin, atom, serverClient, DixReadAccess);
+    
+    if(Success == rc && prop->type == atom)
+	return 0;
+    
+    return 1;
+}
+
+
+static int
+ProcAppleWMQueryVersion(
+    register ClientPtr client
+)
+{
+    xAppleWMQueryVersionReply rep;
+    register int n;
+
+    REQUEST_SIZE_MATCH(xAppleWMQueryVersionReq);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+    rep.majorVersion = SERVER_APPLEWM_MAJOR_VERSION;
+    rep.minorVersion = SERVER_APPLEWM_MINOR_VERSION;
+    rep.patchVersion = SERVER_APPLEWM_PATCH_VERSION;
+    if (client->swapped) {
+        swaps(&rep.sequenceNumber, n);
+        swapl(&rep.length, n);
+    }
+    WriteToClient(client, sizeof(xAppleWMQueryVersionReply), (char *)&rep);
+    return Success;
+}
+
+
+/* events */
+
+static inline void
+updateEventMask (WMEventPtr *pHead)
+{
+    WMEventPtr pCur;
+
+    eventMask = 0;
+    for (pCur = *pHead; pCur != NULL; pCur = pCur->next)
+        eventMask |= pCur->mask;
+}
+
+/*ARGSUSED*/
+static int
+WMFreeClient (pointer data, XID id) {
+    WMEventPtr   pEvent;
+    WMEventPtr   *pHead, pCur, pPrev;
+    int i;
+
+    pEvent = (WMEventPtr) data;
+    i = dixLookupResourceByType((pointer *)&pHead, eventResource, EventType, serverClient, DixReadAccess | DixWriteAccess | DixDestroyAccess);
+    if (i == Success && pHead) {
+        pPrev = 0;
+        for (pCur = *pHead; pCur && pCur != pEvent; pCur=pCur->next)
+            pPrev = pCur;
+        if (pCur) {
+            if (pPrev)
+                pPrev->next = pEvent->next;
+            else
+                *pHead = pEvent->next;
+        }
+        updateEventMask (pHead);
+    }
+    free((pointer) pEvent);
+    return 1;
+}
+
+/*ARGSUSED*/
+static int
+WMFreeEvents (pointer data, XID id) {
+    WMEventPtr   *pHead, pCur, pNext;
+
+    pHead = (WMEventPtr *) data;
+    for (pCur = *pHead; pCur; pCur = pNext) {
+        pNext = pCur->next;
+        FreeResource (pCur->clientResource, ClientType);
+        free((pointer) pCur);
+    }
+    free((pointer) pHead);
+    eventMask = 0;
+    return 1;
+}
+
+static int
+ProcAppleWMSelectInput (register ClientPtr client)
+{
+    REQUEST(xAppleWMSelectInputReq);
+    WMEventPtr      pEvent, pNewEvent, *pHead;
+    XID             clientResource;
+    int             i;
+
+    REQUEST_SIZE_MATCH (xAppleWMSelectInputReq);
+    i = dixLookupResourceByType((pointer *)&pHead, eventResource, EventType, client, DixWriteAccess);
+    if (stuff->mask != 0) {
+        if (i == Success && pHead) {
+            /* check for existing entry. */
+            for (pEvent = *pHead; pEvent; pEvent = pEvent->next)
+            {
+                if (pEvent->client == client)
+                {
+                    pEvent->mask = stuff->mask;
+                    updateEventMask (pHead);
+                    return Success;
+                }
+            }
+        }
+
+        /* build the entry */
+        pNewEvent = (WMEventPtr) malloc(sizeof (WMEventRec));
+        if (!pNewEvent)
+            return BadAlloc;
+        pNewEvent->next = 0;
+        pNewEvent->client = client;
+        pNewEvent->mask = stuff->mask;
+        /*
+         * add a resource that will be deleted when
+         * the client goes away
+         */
+        clientResource = FakeClientID (client->index);
+        pNewEvent->clientResource = clientResource;
+        if (!AddResource (clientResource, ClientType, (pointer)pNewEvent))
+            return BadAlloc;
+        /*
+         * create a resource to contain a pointer to the list
+         * of clients selecting input.  This must be indirect as
+         * the list may be arbitrarily rearranged which cannot be
+         * done through the resource database.
+         */
+        if (i != Success || !pHead)
+        {
+            pHead = (WMEventPtr *) malloc(sizeof (WMEventPtr));
+            if (!pHead ||
+                !AddResource (eventResource, EventType, (pointer)pHead))
+            {
+                FreeResource (clientResource, RT_NONE);
+                return BadAlloc;
+            }
+            *pHead = 0;
+        }
+        pNewEvent->next = *pHead;
+        *pHead = pNewEvent;
+        updateEventMask (pHead);
+    } else if (stuff->mask == 0) {
+        /* delete the interest */
+        if (i == Success && pHead) {
+            pNewEvent = 0;
+            for (pEvent = *pHead; pEvent; pEvent = pEvent->next) {
+                if (pEvent->client == client)
+                    break;
+                pNewEvent = pEvent;
+            }
+            if (pEvent) {
+                FreeResource (pEvent->clientResource, ClientType);
+                if (pNewEvent)
+                    pNewEvent->next = pEvent->next;
+                else
+                    *pHead = pEvent->next;
+                free(pEvent);
+                updateEventMask (pHead);
+            }
+        }
+    } else {
+        client->errorValue = stuff->mask;
+        return BadValue;
+    }
+    return Success;
+}
+
+/*
+ * deliver the event
+ */
+
+void
+AppleWMSendEvent (int type, unsigned int mask, int which, int arg) {
+    WMEventPtr      *pHead, pEvent;
+    xAppleWMNotifyEvent se;
+    int             i;
+
+    i = dixLookupResourceByType((pointer *)&pHead, eventResource, EventType, serverClient, DixReadAccess);
+    if (i != Success || !pHead)
+        return;
+    for (pEvent = *pHead; pEvent; pEvent = pEvent->next) {
+        if ((pEvent->mask & mask) == 0)
+            continue;
+        se.type = type + WMEventBase;
+        se.kind = which;
+        se.arg = arg;
+        se.time = currentTime.milliseconds;
+        WriteEventsToClient (pEvent->client, 1, (xEvent *) &se);
+    }
+}
+
+/* Safe to call from any thread. */
+unsigned int
+AppleWMSelectedEvents (void)
+{
+    return eventMask;
+}
+
+
+/* general utility functions */
+
+static int
+ProcAppleWMDisableUpdate(
+    register ClientPtr client
+)
+{
+    REQUEST_SIZE_MATCH(xAppleWMDisableUpdateReq);
+
+    appleWMProcs->DisableUpdate();
+
+    return Success;
+}
+
+static int
+ProcAppleWMReenableUpdate(
+    register ClientPtr client
+)
+{
+    REQUEST_SIZE_MATCH(xAppleWMReenableUpdateReq);
+
+    appleWMProcs->EnableUpdate();
+
+    return Success;
+}
+
+
+/* window functions */
+
+static int
+ProcAppleWMSetWindowMenu(
+    register ClientPtr client
+)
+{
+    const char *bytes, **items;
+    char *shortcuts;
+    int max_len, nitems, i, j;
+    REQUEST(xAppleWMSetWindowMenuReq);
+
+    REQUEST_AT_LEAST_SIZE(xAppleWMSetWindowMenuReq);
+
+    nitems = stuff->nitems;
+    items = malloc(sizeof (char *) * nitems);
+    shortcuts = malloc(sizeof (char) * nitems);
+
+    max_len = (stuff->length << 2) - sizeof(xAppleWMSetWindowMenuReq);
+    bytes = (char *) &stuff[1];
+
+    for (i = j = 0; i < max_len && j < nitems;)
+    {
+        shortcuts[j] = bytes[i++];
+        items[j++] = bytes + i;
+
+        while (i < max_len)
+        {
+            if (bytes[i++] == 0)
+                break;
+        }
+    }
+    X11ApplicationSetWindowMenu (nitems, items, shortcuts);
+    free(items);
+    free(shortcuts);
+
+    return Success;
+}
+
+static int
+ProcAppleWMSetWindowMenuCheck(
+    register ClientPtr client
+)
+{
+    REQUEST(xAppleWMSetWindowMenuCheckReq);
+
+    REQUEST_SIZE_MATCH(xAppleWMSetWindowMenuCheckReq);
+    X11ApplicationSetWindowMenuCheck(stuff->index);
+    return Success;
+}
+
+static int
+ProcAppleWMSetFrontProcess(
+    register ClientPtr client
+)
+{
+    REQUEST_SIZE_MATCH(xAppleWMSetFrontProcessReq);
+
+    X11ApplicationSetFrontProcess();
+    return Success;
+}
+
+static int
+ProcAppleWMSetWindowLevel(register ClientPtr client)
+{
+    REQUEST(xAppleWMSetWindowLevelReq);
+    WindowPtr pWin;
+    int err;
+
+    REQUEST_SIZE_MATCH(xAppleWMSetWindowLevelReq);
+
+    if (Success != dixLookupWindow(&pWin, stuff->window, client,
+				   DixReadAccess))
+        return BadValue;
+
+    if (stuff->level >= AppleWMNumWindowLevels) {
+        return BadValue;
+    }
+
+     err = appleWMProcs->SetWindowLevel(pWin, stuff->level);
+     if (err != Success) {
+        return err;
+    }
+
+    return Success;
+}
+
+static int
+ProcAppleWMSendPSN(register ClientPtr client)
+{
+    REQUEST(xAppleWMSendPSNReq);
+    int err;
+    
+    REQUEST_SIZE_MATCH(xAppleWMSendPSNReq);
+    
+    if(!appleWMProcs->SendPSN)
+        return BadRequest;
+
+    err = appleWMProcs->SendPSN(stuff->psn_hi, stuff->psn_lo);
+    if (err != Success) {
+        return err;
+    }
+
+    return Success;
+}
+
+static int
+ProcAppleWMAttachTransient(register ClientPtr client)
+{
+    WindowPtr pWinChild, pWinParent;
+    REQUEST(xAppleWMAttachTransientReq);
+    int err;
+    
+    REQUEST_SIZE_MATCH(xAppleWMAttachTransientReq);
+    
+    if(!appleWMProcs->AttachTransient)
+        return BadRequest;
+
+    if (Success != dixLookupWindow(&pWinChild, stuff->child, client, DixReadAccess))
+        return BadValue;
+
+    if(stuff->parent) {
+        if(Success != dixLookupWindow(&pWinParent, stuff->parent, client, DixReadAccess))
+            return BadValue;
+    } else {
+        pWinParent = NULL;
+    }
+
+    err = appleWMProcs->AttachTransient(pWinChild, pWinParent);
+    if (err != Success) {
+        return err;
+    }
+
+    return Success;
+}
+
+static int
+ProcAppleWMSetCanQuit(
+    register ClientPtr client
+)
+{
+    REQUEST(xAppleWMSetCanQuitReq);
+
+    REQUEST_SIZE_MATCH(xAppleWMSetCanQuitReq);
+
+    X11ApplicationSetCanQuit(stuff->state);
+    return Success;
+}
+
+
+/* frame functions */
+
+static int
+ProcAppleWMFrameGetRect(
+    register ClientPtr client
+)
+{
+    xAppleWMFrameGetRectReply rep;
+    BoxRec ir, or, rr;
+    REQUEST(xAppleWMFrameGetRectReq);
+
+    REQUEST_SIZE_MATCH(xAppleWMFrameGetRectReq);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+
+    ir = make_box (stuff->ix, stuff->iy, stuff->iw, stuff->ih);
+    or = make_box (stuff->ox, stuff->oy, stuff->ow, stuff->oh);
+
+    if (appleWMProcs->FrameGetRect(stuff->frame_rect,
+                                   stuff->frame_class,
+                                   &or, &ir, &rr) != Success)
+    {
+        return BadValue;
+    }
+
+    rep.x = rr.x1;
+    rep.y = rr.y1;
+    rep.w = rr.x2 - rr.x1;
+    rep.h = rr.y2 - rr.y1;
+
+    WriteToClient(client, sizeof(xAppleWMFrameGetRectReply), (char *)&rep);
+    return Success;
+}
+
+static int
+ProcAppleWMFrameHitTest(
+    register ClientPtr client
+)
+{
+    xAppleWMFrameHitTestReply rep;
+    BoxRec ir, or;
+    int ret;
+    REQUEST(xAppleWMFrameHitTestReq);
+
+    REQUEST_SIZE_MATCH(xAppleWMFrameHitTestReq);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+
+    ir = make_box (stuff->ix, stuff->iy, stuff->iw, stuff->ih);
+    or = make_box (stuff->ox, stuff->oy, stuff->ow, stuff->oh);
+
+    if (appleWMProcs->FrameHitTest(stuff->frame_class, stuff->px,
+                                   stuff->py, &or, &ir, &ret) != Success)
+    {
+        return BadValue;
+    }
+
+    rep.ret = ret;
+
+    WriteToClient(client, sizeof(xAppleWMFrameHitTestReply), (char *)&rep);
+    return Success;
+}
+
+static int
+ProcAppleWMFrameDraw(
+    register ClientPtr client
+)
+{
+    BoxRec ir, or;
+    unsigned int title_length, title_max;
+    unsigned char *title_bytes;
+    REQUEST(xAppleWMFrameDrawReq);
+    WindowPtr pWin;
+
+    REQUEST_AT_LEAST_SIZE(xAppleWMFrameDrawReq);
+
+    if (Success != dixLookupWindow(&pWin, stuff->window, client,
+				   DixReadAccess))
+        return BadValue;
+
+    ir = make_box (stuff->ix, stuff->iy, stuff->iw, stuff->ih);
+    or = make_box (stuff->ox, stuff->oy, stuff->ow, stuff->oh);
+
+    title_length = stuff->title_length;
+    title_max = (stuff->length << 2) - sizeof(xAppleWMFrameDrawReq);
+
+    if (title_max < title_length)
+        return BadValue;
+
+    title_bytes = (unsigned char *) &stuff[1];
+
+    errno = appleWMProcs->FrameDraw(pWin, stuff->frame_class,
+                                    stuff->frame_attr, &or, &ir,
+                                    title_length, title_bytes);
+    if (errno != Success) {
+        return errno;
+    }
+
+    return Success;
+}
+
+
+/* dispatch */
+
+static int
+ProcAppleWMDispatch (
+    register ClientPtr  client
+)
+{
+    REQUEST(xReq);
+
+    switch (stuff->data)
+    {
+    case X_AppleWMQueryVersion:
+        return ProcAppleWMQueryVersion(client);
+    }
+
+    if (!LocalClient(client))
+        return WMErrorBase + AppleWMClientNotLocal;
+
+    switch (stuff->data)
+    {
+    case X_AppleWMSelectInput:
+        return ProcAppleWMSelectInput(client);
+    case X_AppleWMDisableUpdate:
+        return ProcAppleWMDisableUpdate(client);
+    case X_AppleWMReenableUpdate:
+        return ProcAppleWMReenableUpdate(client);
+    case X_AppleWMSetWindowMenu:
+        return ProcAppleWMSetWindowMenu(client);
+    case X_AppleWMSetWindowMenuCheck:
+        return ProcAppleWMSetWindowMenuCheck(client);
+    case X_AppleWMSetFrontProcess:
+        return ProcAppleWMSetFrontProcess(client);
+    case X_AppleWMSetWindowLevel:
+        return ProcAppleWMSetWindowLevel(client);
+    case X_AppleWMSetCanQuit:
+        return ProcAppleWMSetCanQuit(client);
+    case X_AppleWMFrameGetRect:
+        return ProcAppleWMFrameGetRect(client);
+    case X_AppleWMFrameHitTest:
+        return ProcAppleWMFrameHitTest(client);
+    case X_AppleWMFrameDraw:
+        return ProcAppleWMFrameDraw(client);
+    case X_AppleWMSendPSN:
+        return ProcAppleWMSendPSN(client);
+    case X_AppleWMAttachTransient:
+        return ProcAppleWMAttachTransient(client);
+    default:
+        return BadRequest;
+    }
+}
+
+static void
+SNotifyEvent(xAppleWMNotifyEvent *from, xAppleWMNotifyEvent *to) {
+    to->type = from->type;
+    to->kind = from->kind;
+    cpswaps (from->sequenceNumber, to->sequenceNumber);
+    cpswapl (from->time, to->time);
+    cpswapl (from->arg, to->arg);
+}
+
+static int
+SProcAppleWMQueryVersion(
+    register ClientPtr  client
+)
+{
+    register int n;
+    REQUEST(xAppleWMQueryVersionReq);
+    swaps(&stuff->length, n);
+    return ProcAppleWMQueryVersion(client);
+}
+
+static int
+SProcAppleWMDispatch (
+    register ClientPtr  client
+)
+{
+    REQUEST(xReq);
+
+    /* It is bound to be non-local when there is byte swapping */
+    if (!LocalClient(client))
+        return WMErrorBase + AppleWMClientNotLocal;
+
+    /* only local clients are allowed WM access */
+    switch (stuff->data)
+    {
+    case X_AppleWMQueryVersion:
+        return SProcAppleWMQueryVersion(client);
+    default:
+        return BadRequest;
+    }
+}
+
+void
+AppleWMExtensionInit(
+    AppleWMProcsPtr procsPtr)
+{
+    ExtensionEntry* extEntry;
+
+    ClientType = CreateNewResourceType(WMFreeClient, "WMClient");
+    EventType = CreateNewResourceType(WMFreeEvents, "WMEvent");
+    eventResource = FakeClientID(0);
+
+    if (ClientType && EventType &&
+        (extEntry = AddExtension(APPLEWMNAME,
+                                 AppleWMNumberEvents,
+                                 AppleWMNumberErrors,
+                                 ProcAppleWMDispatch,
+                                 SProcAppleWMDispatch,
+                                 NULL,
+                                 StandardMinorOpcode)))
+    {
+        WMReqCode = (unsigned char)extEntry->base;
+        WMErrorBase = extEntry->errorBase;
+        WMEventBase = extEntry->eventBase;
+        EventSwapVector[WMEventBase] = (EventSwapPtr) SNotifyEvent;
+        appleWMProcs = procsPtr;
+    }
+}
diff --git a/xorg-server/hw/xquartz/applewmExt.h b/xorg-server/hw/xquartz/applewmExt.h
index 39a5a7a9a..c46a7bde4 100644
--- a/xorg-server/hw/xquartz/applewmExt.h
+++ b/xorg-server/hw/xquartz/applewmExt.h
@@ -1,95 +1,95 @@
-/*

- * External interface for the server's AppleWM support

- */

-/**************************************************************************

-

-Copyright (c) 2002 Apple Computer, Inc. All Rights Reserved.

-Copyright (c) 2003-2004 Torrey T. Lyons. All Rights Reserved.

-

-Permission is hereby granted, free of charge, to any person obtaining a

-copy of this software and associated documentation files (the

-"Software"), to deal in the Software without restriction, including

-without limitation the rights to use, copy, modify, merge, publish,

-distribute, sub license, and/or sell copies of the Software, and to

-permit persons to whom the Software is furnished to do so, subject to

-the following conditions:

-

-The above copyright notice and this permission notice (including the

-next paragraph) 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 NON-INFRINGEMENT.

-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.

-

-**************************************************************************/

-

-#ifndef _APPLEWMEXT_H_

-#define _APPLEWMEXT_H_

-

-#include "window.h"

-#include <Xplugin.h>

-

-#if XPLUGIN_VERSION < 4

-typedef int xp_frame_attr;

-typedef int xp_frame_class;

-typedef int xp_frame_rect;

-#endif

-

-typedef int (*DisableUpdateProc)(void);

-typedef int (*EnableUpdateProc)(void);

-typedef int (*SetWindowLevelProc)(WindowPtr pWin, int level);

-typedef int (*FrameGetRectProc)(xp_frame_rect type, xp_frame_class class, const BoxRec *outer,

-                                const BoxRec *inner, BoxRec *ret);

-typedef int (*FrameHitTestProc)(xp_frame_class class, int x, int y,

-                                const BoxRec *outer,

-                                const BoxRec *inner, int *ret);

-typedef int (*FrameDrawProc)(WindowPtr pWin, xp_frame_class class, xp_frame_attr attr,

-                             const BoxRec *outer, const BoxRec *inner,

-                             unsigned int title_len,

-                             const unsigned char *title_bytes);

-typedef int (*SendPSNProc)(uint32_t hi, uint32_t lo);

-typedef int (*AttachTransientProc)(WindowPtr pWinChild, WindowPtr pWinParent);

-

-/*

- * AppleWM implementation function list

- */

-typedef struct _AppleWMProcs {

-    DisableUpdateProc DisableUpdate;

-    EnableUpdateProc EnableUpdate;

-    SetWindowLevelProc SetWindowLevel;

-    FrameGetRectProc FrameGetRect;

-    FrameHitTestProc FrameHitTest;

-    FrameDrawProc FrameDraw;

-    SendPSNProc SendPSN;

-    AttachTransientProc AttachTransient;

-} AppleWMProcsRec, *AppleWMProcsPtr;

-

-void AppleWMExtensionInit(

-    AppleWMProcsPtr procsPtr

-);

-

-void AppleWMSetScreenOrigin(

-    WindowPtr pWin

-);

-

-Bool AppleWMDoReorderWindow(

-    WindowPtr pWin

-);

-

-void AppleWMSendEvent(

-    int             /* type */,

-    unsigned int    /* mask */,

-    int             /* which */,

-    int             /* arg */

-);

-

-unsigned int AppleWMSelectedEvents(

-    void

-);

-

-#endif /* _APPLEWMEXT_H_ */

+/*
+ * External interface for the server's AppleWM support
+ */
+/**************************************************************************
+
+Copyright (c) 2002 Apple Computer, Inc. All Rights Reserved.
+Copyright (c) 2003-2004 Torrey T. Lyons. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sub license, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) 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 NON-INFRINGEMENT.
+IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.
+
+**************************************************************************/
+
+#ifndef _APPLEWMEXT_H_
+#define _APPLEWMEXT_H_
+
+#include "window.h"
+#include <Xplugin.h>
+
+#if XPLUGIN_VERSION < 4
+typedef int xp_frame_attr;
+typedef int xp_frame_class;
+typedef int xp_frame_rect;
+#endif
+
+typedef int (*DisableUpdateProc)(void);
+typedef int (*EnableUpdateProc)(void);
+typedef int (*SetWindowLevelProc)(WindowPtr pWin, int level);
+typedef int (*FrameGetRectProc)(xp_frame_rect type, xp_frame_class class, const BoxRec *outer,
+                                const BoxRec *inner, BoxRec *ret);
+typedef int (*FrameHitTestProc)(xp_frame_class class, int x, int y,
+                                const BoxRec *outer,
+                                const BoxRec *inner, int *ret);
+typedef int (*FrameDrawProc)(WindowPtr pWin, xp_frame_class class, xp_frame_attr attr,
+                             const BoxRec *outer, const BoxRec *inner,
+                             unsigned int title_len,
+                             const unsigned char *title_bytes);
+typedef int (*SendPSNProc)(uint32_t hi, uint32_t lo);
+typedef int (*AttachTransientProc)(WindowPtr pWinChild, WindowPtr pWinParent);
+
+/*
+ * AppleWM implementation function list
+ */
+typedef struct _AppleWMProcs {
+    DisableUpdateProc DisableUpdate;
+    EnableUpdateProc EnableUpdate;
+    SetWindowLevelProc SetWindowLevel;
+    FrameGetRectProc FrameGetRect;
+    FrameHitTestProc FrameHitTest;
+    FrameDrawProc FrameDraw;
+    SendPSNProc SendPSN;
+    AttachTransientProc AttachTransient;
+} AppleWMProcsRec, *AppleWMProcsPtr;
+
+void AppleWMExtensionInit(
+    AppleWMProcsPtr procsPtr
+);
+
+void AppleWMSetScreenOrigin(
+    WindowPtr pWin
+);
+
+Bool AppleWMDoReorderWindow(
+    WindowPtr pWin
+);
+
+void AppleWMSendEvent(
+    int             /* type */,
+    unsigned int    /* mask */,
+    int             /* which */,
+    int             /* arg */
+);
+
+unsigned int AppleWMSelectedEvents(
+    void
+);
+
+#endif /* _APPLEWMEXT_H_ */
diff --git a/xorg-server/hw/xquartz/bundle/Info.plist.cpp b/xorg-server/hw/xquartz/bundle/Info.plist.cpp
index 444400674..a4b8e1926 100644
--- a/xorg-server/hw/xquartz/bundle/Info.plist.cpp
+++ b/xorg-server/hw/xquartz/bundle/Info.plist.cpp
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">

-<plist version="1.0">

-<dict>

-	<key>CFBundleDevelopmentRegion</key>

-		<string>English</string>

-	<key>CFBundleExecutable</key>

-		<string>X11</string>

-	<key>CFBundleGetInfoString</key>

-		<string>BUNDLE_ID_PREFIX.X11</string>

-	<key>CFBundleIconFile</key>

-		<string>X11.icns</string>

-	<key>CFBundleIdentifier</key>

-		<string>BUNDLE_ID_PREFIX.X11</string>

-	<key>CFBundleInfoDictionaryVersion</key>

-		<string>6.0</string>

-	<key>CFBundleName</key>

-		<string>APPLE_APPLICATION_NAME</string>

-	<key>CFBundlePackageType</key>

-		<string>APPL</string>

-	<key>CFBundleShortVersionString</key>

-		<string>2.7.0</string>

-	<key>CFBundleVersion</key>

-		<string>2.7.0</string>

-	<key>CFBundleSignature</key>

-		<string>x11a</string>

-	<key>CSResourcesFileMapped</key>

-		<true/>

-#ifdef XQUARTZ_SPARKLE

-	<key>SUEnableAutomaticChecks</key>

-		<true/>

-	<key>SUPublicDSAKeyFile</key>

-		<string>sparkle.pem</string>

-        <key>SUFeedURL</key>

-                <string>http://xquartz.macosforge.org/downloads/sparkle/release.xml</string>

-#endif

-	<key>LSApplicationCategoryType</key>

-		<string>public.app-category.utilities</string>

-	<key>NSHumanReadableCopyright</key>

-		<string>© 2003-2011 Apple Inc.

-© 2003 XFree86 Project, Inc.

-© 2003-2011 X.org Foundation, Inc.

-</string>

-	<key>NSMainNibFile</key>

-		<string>main</string>

-	<key>NSPrincipalClass</key>

-		<string>X11Application</string>

-</dict>

-</plist>

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+		<string>English</string>
+	<key>CFBundleExecutable</key>
+		<string>X11</string>
+	<key>CFBundleGetInfoString</key>
+		<string>BUNDLE_ID_PREFIX.X11</string>
+	<key>CFBundleIconFile</key>
+		<string>X11.icns</string>
+	<key>CFBundleIdentifier</key>
+		<string>BUNDLE_ID_PREFIX.X11</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+	<key>CFBundleName</key>
+		<string>APPLE_APPLICATION_NAME</string>
+	<key>CFBundlePackageType</key>
+		<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+		<string>2.7.0</string>
+	<key>CFBundleVersion</key>
+		<string>2.7.0</string>
+	<key>CFBundleSignature</key>
+		<string>x11a</string>
+	<key>CSResourcesFileMapped</key>
+		<true/>
+#ifdef XQUARTZ_SPARKLE
+	<key>SUEnableAutomaticChecks</key>
+		<true/>
+	<key>SUPublicDSAKeyFile</key>
+		<string>sparkle.pem</string>
+        <key>SUFeedURL</key>
+                <string>http://xquartz.macosforge.org/downloads/sparkle/release.xml</string>
+#endif
+	<key>LSApplicationCategoryType</key>
+		<string>public.app-category.utilities</string>
+	<key>NSHumanReadableCopyright</key>
+		<string>© 2003-2011 Apple Inc.
+© 2003 XFree86 Project, Inc.
+© 2003-2011 X.org Foundation, Inc.
+</string>
+	<key>NSMainNibFile</key>
+		<string>main</string>
+	<key>NSPrincipalClass</key>
+		<string>X11Application</string>
+</dict>
+</plist>
diff --git a/xorg-server/hw/xquartz/bundle/Makefile.am b/xorg-server/hw/xquartz/bundle/Makefile.am
index 2f86cdc95..6e83a42d6 100644
--- a/xorg-server/hw/xquartz/bundle/Makefile.am
+++ b/xorg-server/hw/xquartz/bundle/Makefile.am
@@ -1,101 +1,101 @@
-include cpprules.in

-

-CPP_FILES_FLAGS = \

-	-DBUNDLE_ID_PREFIX="$(BUNDLE_ID_PREFIX)" \

-	-DAPPLE_APPLICATION_NAME="$(APPLE_APPLICATION_NAME)"

-

-if XQUARTZ_SPARKLE

-CPP_FILES_FLAGS += -DXQUARTZ_SPARKLE

-endif

-

-install-data-hook:

-	$(srcdir)/mk_bundke.sh $(srcdir) $(builddir) $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app install

-

-uninstall-hook:

-	$(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/Resources

-	$(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/Info.plist

-	$(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/PkgInfo

-

-noinst_PRE = Info.plist.cpp

-noinst_DATA = $(noinst_PRE:plist.cpp=plist)

-

-CLEANFILES = $(noinst_DATA)

-

-resourcedir=$(libdir)/X11/xserver

-resource_DATA = Xquartz.plist

-

-EXTRA_DIST = \

-	mk_bundke.sh \

-	X11.sh \

-	Info.plist.cpp \

-	PkgInfo \

-	$(resource_DATA) \

-	Resources/ar.lproj/InfoPlist.strings \

-	Resources/ar.lproj/Localizable.strings \

-	Resources/ar.lproj/main.nib/designable.nib \

-	Resources/ar.lproj/main.nib/keyedobjects.nib \

-	Resources/da.lproj/InfoPlist.strings \

-	Resources/da.lproj/Localizable.strings \

-	Resources/da.lproj/main.nib/keyedobjects.nib \

-	Resources/Dutch.lproj/InfoPlist.strings \

-	Resources/Dutch.lproj/Localizable.strings \

-	Resources/Dutch.lproj/main.nib/keyedobjects.nib \

-	Resources/el.lproj/InfoPlist.strings \

-	Resources/el.lproj/Localizable.strings \

-	Resources/el.lproj/main.nib/keyedobjects.nib \

-	Resources/English.lproj/InfoPlist.strings \

-	Resources/English.lproj/Localizable.strings \

-	Resources/English.lproj/main.nib/designable.nib \

-	Resources/English.lproj/main.nib/keyedobjects.nib \

-	Resources/fi.lproj/InfoPlist.strings \

-	Resources/fi.lproj/Localizable.strings \

-	Resources/fi.lproj/main.nib/keyedobjects.nib \

-	Resources/French.lproj/InfoPlist.strings \

-	Resources/French.lproj/Localizable.strings \

-	Resources/French.lproj/main.nib/keyedobjects.nib \

-	Resources/German.lproj/InfoPlist.strings \

-	Resources/German.lproj/Localizable.strings \

-	Resources/German.lproj/main.nib/keyedobjects.nib \

-	Resources/he.lproj/InfoPlist.strings \

-	Resources/he.lproj/Localizable.strings \

-	Resources/he.lproj/main.nib/keyedobjects.nib \

-	Resources/Italian.lproj/InfoPlist.strings \

-	Resources/Italian.lproj/Localizable.strings \

-	Resources/Italian.lproj/main.nib/keyedobjects.nib \

-	Resources/Japanese.lproj/InfoPlist.strings \

-	Resources/Japanese.lproj/Localizable.strings \

-	Resources/Japanese.lproj/main.nib/keyedobjects.nib \

-	Resources/ko.lproj/InfoPlist.strings \

-	Resources/ko.lproj/Localizable.strings \

-	Resources/ko.lproj/main.nib/keyedobjects.nib \

-	Resources/no.lproj/InfoPlist.strings \

-	Resources/no.lproj/Localizable.strings \

-	Resources/no.lproj/main.nib/keyedobjects.nib \

-	Resources/pl.lproj/InfoPlist.strings \

-	Resources/pl.lproj/Localizable.strings \

-	Resources/pl.lproj/main.nib/keyedobjects.nib \

-	Resources/pt.lproj/InfoPlist.strings \

-	Resources/pt.lproj/Localizable.strings \

-	Resources/pt.lproj/main.nib/keyedobjects.nib \

-	Resources/pt_PT.lproj/InfoPlist.strings \

-	Resources/pt_PT.lproj/Localizable.strings \

-	Resources/pt_PT.lproj/main.nib/keyedobjects.nib \

-	Resources/ru.lproj/InfoPlist.strings \

-	Resources/ru.lproj/Localizable.strings \

-	Resources/ru.lproj/main.nib/keyedobjects.nib \

-	Resources/sk.lproj/InfoPlist.strings \

-	Resources/sk.lproj/Localizable.strings \

-	Resources/sk.lproj/main.nib/keyedobjects.nib \

-	Resources/Spanish.lproj/InfoPlist.strings \

-	Resources/Spanish.lproj/Localizable.strings \

-	Resources/Spanish.lproj/main.nib/keyedobjects.nib \

-	Resources/sv.lproj/InfoPlist.strings \

-	Resources/sv.lproj/Localizable.strings \

-	Resources/sv.lproj/main.nib/keyedobjects.nib \

-	Resources/X11.icns \

-	Resources/zh_CN.lproj/InfoPlist.strings \

-	Resources/zh_CN.lproj/Localizable.strings \

-	Resources/zh_CN.lproj/main.nib/keyedobjects.nib \

-	Resources/zh_TW.lproj/InfoPlist.strings \

-	Resources/zh_TW.lproj/Localizable.strings \

-	Resources/zh_TW.lproj/main.nib/keyedobjects.nib

+include cpprules.in
+
+CPP_FILES_FLAGS = \
+	-DBUNDLE_ID_PREFIX="$(BUNDLE_ID_PREFIX)" \
+	-DAPPLE_APPLICATION_NAME="$(APPLE_APPLICATION_NAME)"
+
+if XQUARTZ_SPARKLE
+CPP_FILES_FLAGS += -DXQUARTZ_SPARKLE
+endif
+
+install-data-hook:
+	$(srcdir)/mk_bundke.sh $(srcdir) $(builddir) $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app install
+
+uninstall-hook:
+	$(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/Resources
+	$(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/Info.plist
+	$(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/PkgInfo
+
+noinst_PRE = Info.plist.cpp
+noinst_DATA = $(noinst_PRE:plist.cpp=plist)
+
+CLEANFILES = $(noinst_DATA)
+
+resourcedir=$(libdir)/X11/xserver
+resource_DATA = Xquartz.plist
+
+EXTRA_DIST = \
+	mk_bundke.sh \
+	X11.sh \
+	Info.plist.cpp \
+	PkgInfo \
+	$(resource_DATA) \
+	Resources/ar.lproj/InfoPlist.strings \
+	Resources/ar.lproj/Localizable.strings \
+	Resources/ar.lproj/main.nib/designable.nib \
+	Resources/ar.lproj/main.nib/keyedobjects.nib \
+	Resources/da.lproj/InfoPlist.strings \
+	Resources/da.lproj/Localizable.strings \
+	Resources/da.lproj/main.nib/keyedobjects.nib \
+	Resources/Dutch.lproj/InfoPlist.strings \
+	Resources/Dutch.lproj/Localizable.strings \
+	Resources/Dutch.lproj/main.nib/keyedobjects.nib \
+	Resources/el.lproj/InfoPlist.strings \
+	Resources/el.lproj/Localizable.strings \
+	Resources/el.lproj/main.nib/keyedobjects.nib \
+	Resources/English.lproj/InfoPlist.strings \
+	Resources/English.lproj/Localizable.strings \
+	Resources/English.lproj/main.nib/designable.nib \
+	Resources/English.lproj/main.nib/keyedobjects.nib \
+	Resources/fi.lproj/InfoPlist.strings \
+	Resources/fi.lproj/Localizable.strings \
+	Resources/fi.lproj/main.nib/keyedobjects.nib \
+	Resources/French.lproj/InfoPlist.strings \
+	Resources/French.lproj/Localizable.strings \
+	Resources/French.lproj/main.nib/keyedobjects.nib \
+	Resources/German.lproj/InfoPlist.strings \
+	Resources/German.lproj/Localizable.strings \
+	Resources/German.lproj/main.nib/keyedobjects.nib \
+	Resources/he.lproj/InfoPlist.strings \
+	Resources/he.lproj/Localizable.strings \
+	Resources/he.lproj/main.nib/keyedobjects.nib \
+	Resources/Italian.lproj/InfoPlist.strings \
+	Resources/Italian.lproj/Localizable.strings \
+	Resources/Italian.lproj/main.nib/keyedobjects.nib \
+	Resources/Japanese.lproj/InfoPlist.strings \
+	Resources/Japanese.lproj/Localizable.strings \
+	Resources/Japanese.lproj/main.nib/keyedobjects.nib \
+	Resources/ko.lproj/InfoPlist.strings \
+	Resources/ko.lproj/Localizable.strings \
+	Resources/ko.lproj/main.nib/keyedobjects.nib \
+	Resources/no.lproj/InfoPlist.strings \
+	Resources/no.lproj/Localizable.strings \
+	Resources/no.lproj/main.nib/keyedobjects.nib \
+	Resources/pl.lproj/InfoPlist.strings \
+	Resources/pl.lproj/Localizable.strings \
+	Resources/pl.lproj/main.nib/keyedobjects.nib \
+	Resources/pt.lproj/InfoPlist.strings \
+	Resources/pt.lproj/Localizable.strings \
+	Resources/pt.lproj/main.nib/keyedobjects.nib \
+	Resources/pt_PT.lproj/InfoPlist.strings \
+	Resources/pt_PT.lproj/Localizable.strings \
+	Resources/pt_PT.lproj/main.nib/keyedobjects.nib \
+	Resources/ru.lproj/InfoPlist.strings \
+	Resources/ru.lproj/Localizable.strings \
+	Resources/ru.lproj/main.nib/keyedobjects.nib \
+	Resources/sk.lproj/InfoPlist.strings \
+	Resources/sk.lproj/Localizable.strings \
+	Resources/sk.lproj/main.nib/keyedobjects.nib \
+	Resources/Spanish.lproj/InfoPlist.strings \
+	Resources/Spanish.lproj/Localizable.strings \
+	Resources/Spanish.lproj/main.nib/keyedobjects.nib \
+	Resources/sv.lproj/InfoPlist.strings \
+	Resources/sv.lproj/Localizable.strings \
+	Resources/sv.lproj/main.nib/keyedobjects.nib \
+	Resources/X11.icns \
+	Resources/zh_CN.lproj/InfoPlist.strings \
+	Resources/zh_CN.lproj/Localizable.strings \
+	Resources/zh_CN.lproj/main.nib/keyedobjects.nib \
+	Resources/zh_TW.lproj/InfoPlist.strings \
+	Resources/zh_TW.lproj/Localizable.strings \
+	Resources/zh_TW.lproj/main.nib/keyedobjects.nib
diff --git a/xorg-server/hw/xquartz/bundle/Resources/French.lproj/locversion.plist b/xorg-server/hw/xquartz/bundle/Resources/French.lproj/locversion.plist
index ae019415c..04031c436 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/French.lproj/locversion.plist
+++ b/xorg-server/hw/xquartz/bundle/Resources/French.lproj/locversion.plist
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">

-<plist version="1.0">

-<dict>

-	<key>LprojCompatibleVersion</key>

-	<string>106</string>

-	<key>LprojLocale</key>

-	<string>fr</string>

-	<key>LprojRevisionLevel</key>

-	<string>1</string>

-	<key>LprojVersion</key>

-	<string>106</string>

-</dict>

-</plist>

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>LprojCompatibleVersion</key>
+	<string>106</string>
+	<key>LprojLocale</key>
+	<string>fr</string>
+	<key>LprojRevisionLevel</key>
+	<string>1</string>
+	<key>LprojVersion</key>
+	<string>106</string>
+</dict>
+</plist>
diff --git a/xorg-server/hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib b/xorg-server/hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib
index 285cae1c6..a56255966 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib
+++ b/xorg-server/hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib
@@ -1,3672 +1,3672 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">

-	<data>

-		<int key="IBDocument.SystemTarget">1040</int>

-		<string key="IBDocument.SystemVersion">11A289</string>

-		<string key="IBDocument.InterfaceBuilderVersion">900</string>

-		<string key="IBDocument.AppKitVersion">1094.2</string>

-		<string key="IBDocument.HIToolboxVersion">521.00</string>

-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">

-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>

-			<string key="NS.object.0">900</string>

-		</object>

-		<array class="NSMutableArray" key="IBDocument.EditedObjectIDs"/>

-		<array key="IBDocument.PluginDependencies">

-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>

-		</array>

-		<object class="NSMutableDictionary" key="IBDocument.Metadata">

-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>

-			<integer value="1" key="NS.object.0"/>

-		</object>

-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="904585544">

-			<object class="NSCustomObject" id="815810918">

-				<object class="NSMutableString" key="NSClassName">

-					<characters key="NS.bytes">NSApplication</characters>

-				</object>

-			</object>

-			<object class="NSCustomObject" id="941939442">

-				<string key="NSClassName">FirstResponder</string>

-			</object>

-			<object class="NSCustomObject" id="951368722">

-				<string key="NSClassName">NSApplication</string>

-			</object>

-			<object class="NSMenu" id="524015605">

-				<string key="NSTitle">MainMenu</string>

-				<array class="NSMutableArray" key="NSMenuItems">

-					<object class="NSMenuItem" id="365880285">

-						<reference key="NSMenu" ref="524015605"/>

-						<string key="NSTitle">X11</string>

-						<string key="NSKeyEquiv"/>

-						<int key="NSKeyEquivModMask">1048576</int>

-						<int key="NSMnemonicLoc">2147483647</int>

-						<object class="NSCustomResource" key="NSOnImage" id="531645050">

-							<string key="NSClassName">NSImage</string>

-							<string key="NSResourceName">NSMenuCheckmark</string>

-						</object>

-						<object class="NSCustomResource" key="NSMixedImage" id="351811234">

-							<string key="NSClassName">NSImage</string>

-							<string key="NSResourceName">NSMenuMixedState</string>

-						</object>

-						<string key="NSAction">submenuAction:</string>

-						<object class="NSMenu" key="NSSubmenu" id="576521955">

-							<string key="NSTitle">X11</string>

-							<array class="NSMutableArray" key="NSMenuItems">

-								<object class="NSMenuItem" id="139290918">

-									<reference key="NSMenu" ref="576521955"/>

-									<string key="NSTitle">À propos d’X11</string>

-									<string key="NSKeyEquiv"/>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="386173216">

-									<reference key="NSMenu" ref="576521955"/>

-									<string key="NSTitle">Préférences…</string>

-									<string key="NSKeyEquiv">,</string>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="272876017">

-									<reference key="NSMenu" ref="576521955"/>

-									<bool key="NSIsDisabled">YES</bool>

-									<bool key="NSIsSeparator">YES</bool>

-									<string key="NSTitle"/>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="32285361">

-									<reference key="NSMenu" ref="576521955"/>

-									<string key="NSTitle">Services</string>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-									<string key="NSAction">submenuAction:</string>

-									<object class="NSMenu" key="NSSubmenu" id="821388474">

-										<object class="NSMutableString" key="NSTitle">

-											<characters key="NS.bytes">Services</characters>

-										</object>

-										<array class="NSMutableArray" key="NSMenuItems"/>

-										<string key="NSName">_NSServicesMenu</string>

-									</object>

-								</object>

-								<object class="NSMenuItem" id="431301145">

-									<reference key="NSMenu" ref="576521955"/>

-									<bool key="NSIsDisabled">YES</bool>

-									<bool key="NSIsSeparator">YES</bool>

-									<string key="NSTitle"/>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="6876565">

-									<reference key="NSMenu" ref="576521955"/>

-									<string key="NSTitle">Basculer en mode plein écran</string>

-									<string key="NSKeyEquiv">a</string>

-									<int key="NSKeyEquivModMask">1572864</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="479677589">

-									<reference key="NSMenu" ref="576521955"/>

-									<bool key="NSIsDisabled">YES</bool>

-									<bool key="NSIsSeparator">YES</bool>

-									<string key="NSTitle"/>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="301008465">

-									<reference key="NSMenu" ref="576521955"/>

-									<string key="NSTitle">Masquer X11</string>

-									<string key="NSKeyEquiv">h</string>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-									<int key="NSTag">42</int>

-								</object>

-								<object class="NSMenuItem" id="206802571">

-									<reference key="NSMenu" ref="576521955"/>

-									<string key="NSTitle">Masquer les autres</string>

-									<string key="NSKeyEquiv">h</string>

-									<int key="NSKeyEquivModMask">1572864</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="1023546148">

-									<reference key="NSMenu" ref="576521955"/>

-									<string key="NSTitle">Tout afficher</string>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-									<int key="NSTag">42</int>

-								</object>

-								<object class="NSMenuItem" id="848095279">

-									<reference key="NSMenu" ref="576521955"/>

-									<bool key="NSIsDisabled">YES</bool>

-									<bool key="NSIsSeparator">YES</bool>

-									<string key="NSTitle"/>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="274138642">

-									<reference key="NSMenu" ref="576521955"/>

-									<string key="NSTitle">Quitter X11</string>

-									<string key="NSKeyEquiv">q</string>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-							</array>

-							<string key="NSName">_NSAppleMenu</string>

-						</object>

-					</object>

-					<object class="NSMenuItem" id="868031522">

-						<reference key="NSMenu" ref="524015605"/>

-						<string key="NSTitle">Applications</string>

-						<string key="NSKeyEquiv"/>

-						<int key="NSKeyEquivModMask">1048576</int>

-						<int key="NSMnemonicLoc">2147483647</int>

-						<reference key="NSOnImage" ref="531645050"/>

-						<reference key="NSMixedImage" ref="351811234"/>

-						<string key="NSAction">submenuAction:</string>

-						<object class="NSMenu" key="NSSubmenu" id="981161348">

-							<string key="NSTitle">Applications</string>

-							<array class="NSMutableArray" key="NSMenuItems">

-								<object class="NSMenuItem" id="390088328">

-									<reference key="NSMenu" ref="981161348"/>

-									<bool key="NSIsDisabled">YES</bool>

-									<bool key="NSIsSeparator">YES</bool>

-									<string key="NSTitle"/>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="1065386165">

-									<reference key="NSMenu" ref="981161348"/>

-									<string key="NSTitle">Personnaliser…</string>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-							</array>

-						</object>

-					</object>

-					<object class="NSMenuItem" id="200491363">

-						<reference key="NSMenu" ref="524015605"/>

-						<string key="NSTitle">Édition</string>

-						<string key="NSKeyEquiv"/>

-						<int key="NSKeyEquivModMask">1048576</int>

-						<int key="NSMnemonicLoc">2147483647</int>

-						<reference key="NSOnImage" ref="531645050"/>

-						<reference key="NSMixedImage" ref="351811234"/>

-						<string key="NSAction">submenuAction:</string>

-						<object class="NSMenu" key="NSSubmenu" id="526778998">

-							<string key="NSTitle">Édition</string>

-							<array class="NSMutableArray" key="NSMenuItems">

-								<object class="NSMenuItem" id="185296989">

-									<reference key="NSMenu" ref="526778998"/>

-									<string key="NSTitle">Copier</string>

-									<string key="NSKeyEquiv">c</string>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-							</array>

-						</object>

-					</object>

-					<object class="NSMenuItem" id="931553638">

-						<reference key="NSMenu" ref="524015605"/>

-						<string key="NSTitle">Fenêtre</string>

-						<string key="NSKeyEquiv"/>

-						<int key="NSKeyEquivModMask">1048576</int>

-						<int key="NSMnemonicLoc">2147483647</int>

-						<reference key="NSOnImage" ref="531645050"/>

-						<reference key="NSMixedImage" ref="351811234"/>

-						<string key="NSAction">submenuAction:</string>

-						<object class="NSMenu" key="NSSubmenu" id="96874957">

-							<string key="NSTitle">Fenêtre</string>

-							<array class="NSMutableArray" key="NSMenuItems">

-								<object class="NSMenuItem" id="984461797">

-									<reference key="NSMenu" ref="96874957"/>

-									<string key="NSTitle">Fermer</string>

-									<string key="NSKeyEquiv">w</string>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="677652931">

-									<reference key="NSMenu" ref="96874957"/>

-									<string key="NSTitle">Placer dans le Dock</string>

-									<string key="NSKeyEquiv">m</string>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="1066447520">

-									<reference key="NSMenu" ref="96874957"/>

-									<string key="NSTitle">Réduire/agrandir</string>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="280172320">

-									<reference key="NSMenu" ref="96874957"/>

-									<bool key="NSIsDisabled">YES</bool>

-									<bool key="NSIsSeparator">YES</bool>

-									<string key="NSTitle"/>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="1036389925">

-									<reference key="NSMenu" ref="96874957"/>

-									<string key="NSTitle">Faire défiler les fenêtres</string>

-									<string key="NSKeyEquiv">`</string>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="369641893">

-									<reference key="NSMenu" ref="96874957"/>

-									<string key="NSTitle">Faire défiler les fenêtres en sens inverse</string>

-									<string key="NSKeyEquiv">`</string>

-									<int key="NSKeyEquivModMask">1179648</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="155085383">

-									<reference key="NSMenu" ref="96874957"/>

-									<bool key="NSIsDisabled">YES</bool>

-									<bool key="NSIsSeparator">YES</bool>

-									<string key="NSTitle"/>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="276216762">

-									<reference key="NSMenu" ref="96874957"/>

-									<string key="NSTitle">Tout ramener au premier plan</string>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-							</array>

-							<string key="NSName">_NSWindowsMenu</string>

-						</object>

-					</object>

-					<object class="NSMenuItem" id="551174276">

-						<reference key="NSMenu" ref="524015605"/>

-						<string key="NSTitle">Aide</string>

-						<string key="NSKeyEquiv"/>

-						<int key="NSKeyEquivModMask">1048576</int>

-						<int key="NSMnemonicLoc">2147483647</int>

-						<reference key="NSOnImage" ref="531645050"/>

-						<reference key="NSMixedImage" ref="351811234"/>

-						<string key="NSAction">submenuAction:</string>

-						<object class="NSMenu" key="NSSubmenu" id="511848303">

-							<string key="NSTitle">Aide</string>

-							<array class="NSMutableArray" key="NSMenuItems">

-								<object class="NSMenuItem" id="504984881">

-									<reference key="NSMenu" ref="511848303"/>

-									<string key="NSTitle">Aide X11</string>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-							</array>

-						</object>

-					</object>

-				</array>

-				<string key="NSName">_NSMainMenu</string>

-			</object>

-			<object class="NSCustomObject" id="485884620">

-				<string key="NSClassName">X11Controller</string>

-			</object>

-			<object class="NSWindowTemplate" id="124913468">

-				<int key="NSWindowStyleMask">3</int>

-				<int key="NSWindowBacking">2</int>

-				<string key="NSWindowRect">{{414, 417.03906000000001}, {580, 341}}</string>

-				<int key="NSWTFlags">1350041600</int>

-				<string key="NSWindowTitle">Préférences d’X11</string>

-				<string key="NSWindowClass">NSPanel</string>

-				<object class="NSMutableString" key="NSViewClass">

-					<characters key="NS.bytes">View</characters>

-				</object>

-				<nil key="NSUserInterfaceItemIdentifier"/>

-				<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

-				<string key="NSWindowContentMinSize">{320, 240}</string>

-				<object class="NSView" key="NSWindowView" id="941366957">

-					<nil key="NSNextResponder"/>

-					<int key="NSvFlags">256</int>

-					<array class="NSMutableArray" key="NSSubviews">

-						<object class="NSTabView" id="448510093">

-							<reference key="NSNextResponder" ref="941366957"/>

-							<int key="NSvFlags">274</int>

-							<string key="NSFrame">{{13, 10}, {554, 325}}</string>

-							<reference key="NSSuperview" ref="941366957"/>

-							<array class="NSMutableArray" key="NSTabViewItems">

-								<object class="NSTabViewItem" id="287591690">

-									<object class="NSMutableString" key="NSIdentifier">

-										<characters key="NS.bytes">1</characters>

-									</object>

-									<object class="NSView" key="NSView" id="596750588">

-										<reference key="NSNextResponder" ref="448510093"/>

-										<int key="NSvFlags">256</int>

-										<array class="NSMutableArray" key="NSSubviews">

-											<object class="NSButton" id="119157981">

-												<reference key="NSNextResponder" ref="596750588"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{18, 243}, {402, 18}}</string>

-												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSNextKeyView" ref="179949713"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="990762273">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">Émuler une souris à trois boutons</string>

-													<object class="NSFont" key="NSSupport" id="463863101">

-														<string key="NSName">LucidaGrande</string>

-														<double key="NSSize">13</double>

-														<int key="NSfFlags">1044</int>

-													</object>

-													<reference key="NSControlView" ref="119157981"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<object class="NSCustomResource" key="NSNormalImage" id="967651788">

-														<string key="NSClassName">NSImage</string>

-														<string key="NSResourceName">NSSwitch</string>

-													</object>

-													<object class="NSButtonImageSource" key="NSAlternateImage" id="391434389">

-														<string key="NSImageName">NSSwitch</string>

-													</object>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSTextField" id="443008216">

-												<reference key="NSNextResponder" ref="596750588"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{36, 82}, {484, 42}}</string>

-												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSNextKeyView" ref="406291430"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="391919450">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">Quand cette option est activée, les touches équivalentes de la barre des menus peuvent perturber les applications X11 qui utilisent le modificateur d’instructions virtuelles.</string>

-													<object class="NSFont" key="NSSupport" id="26">

-														<string key="NSName">LucidaGrande</string>

-														<double key="NSSize">11</double>

-														<int key="NSfFlags">3100</int>

-													</object>

-													<string key="NSPlaceholderString"/>

-													<reference key="NSControlView" ref="443008216"/>

-													<object class="NSColor" key="NSBackgroundColor" id="57160303">

-														<int key="NSColorSpace">6</int>

-														<string key="NSCatalogName">System</string>

-														<string key="NSColorName">controlColor</string>

-														<object class="NSColor" key="NSColor" id="590688762">

-															<int key="NSColorSpace">3</int>

-															<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>

-														</object>

-													</object>

-													<object class="NSColor" key="NSTextColor" id="930815747">

-														<int key="NSColorSpace">6</int>

-														<string key="NSCatalogName">System</string>

-														<string key="NSColorName">controlTextColor</string>

-														<object class="NSColor" key="NSColor" id="214098874">

-															<int key="NSColorSpace">3</int>

-															<bytes key="NSWhite">MAA</bytes>

-														</object>

-													</object>

-												</object>

-											</object>

-											<object class="NSTextField" id="282885445">

-												<reference key="NSNextResponder" ref="596750588"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{36, 203}, {484, 34}}</string>

-												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSNextKeyView" ref="31160162"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="649334366">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string type="base64-UTF8" key="NSContents">TWFpbnRlbmV6IGxhIHRvdWNoZSBPcHRpb24gb3UgQ29tbWFuZGUgZW5mb25jw6llIHRvdXQgZW4gY2xp

-cXVhbnQgcG91ciBhY3RpdmVyIGxlIGJvdXRvbiBkcm9pdCBvdSBjZW50cmFsIGRlIGxhIHNvdXJpcy4K

-A</string>

-													<reference key="NSSupport" ref="26"/>

-													<string key="NSPlaceholderString"/>

-													<reference key="NSControlView" ref="282885445"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSButton" id="842100515">

-												<reference key="NSNextResponder" ref="596750588"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{18, 130}, {402, 18}}</string>

-												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSNextKeyView" ref="443008216"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="940564599">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">Activer les touches équivalentes sous X11</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="842100515"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="967651788"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSTextField" id="31160162">

-												<reference key="NSNextResponder" ref="596750588"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{36, 144}, {484, 29}}</string>

-												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSNextKeyView" ref="842100515"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="666057093">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">Autorise les modifications du menu d’entrée pour remplacer la disposition des touches du clavier X11.</string>

-													<reference key="NSSupport" ref="26"/>

-													<string key="NSPlaceholderString"/>

-													<reference key="NSControlView" ref="31160162"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSButton" id="179949713">

-												<reference key="NSNextResponder" ref="596750588"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{18, 179}, {402, 18}}</string>

-												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSNextKeyView" ref="282885445"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="967619578">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">Utiliser la disposition des touches du clavier du système</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="179949713"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="967651788"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSTextField" id="278155937">

-												<reference key="NSNextResponder" ref="596750588"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{36, 35}, {484, 28}}</string>

-												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSNextKeyView" ref="863505041"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="617441821">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">Une fois activées, les touches option envoient les symboles Alt_L et Alt_R au lieu de Mode_switch.</string>

-													<reference key="NSSupport" ref="26"/>

-													<reference key="NSControlView" ref="278155937"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSButton" id="406291430">

-												<reference key="NSNextResponder" ref="596750588"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{18, 69}, {402, 18}}</string>

-												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSNextKeyView" ref="278155937"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="67728988">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">Les touches option envoient Alt_L et Alt_R</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="406291430"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="967651788"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSButton" id="863505041">

-												<reference key="NSNextResponder" ref="596750588"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{18, 8}, {418, 18}}</string>

-												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSNextKeyView" ref="448510093"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="1016286396">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">Faire toujours défiler dans le sens du mouvement des doigts</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="863505041"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="967651788"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-										</array>

-										<string key="NSFrame">{{10, 33}, {534, 279}}</string>

-										<reference key="NSSuperview" ref="448510093"/>

-										<reference key="NSNextKeyView" ref="119157981"/>

-									</object>

-									<string key="NSLabel">Entrée</string>

-									<reference key="NSColor" ref="57160303"/>

-									<reference key="NSTabView" ref="448510093"/>

-								</object>

-								<object class="NSTabViewItem" id="960678392">

-									<object class="NSMutableString" key="NSIdentifier">

-										<characters key="NS.bytes">2</characters>

-									</object>

-									<object class="NSView" key="NSView" id="515308735">

-										<nil key="NSNextResponder"/>

-										<int key="NSvFlags">256</int>

-										<array class="NSMutableArray" key="NSSubviews">

-											<object class="NSPopUpButton" id="709074847">

-												<reference key="NSNextResponder" ref="515308735"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{90, 234}, {128, 26}}</string>

-												<reference key="NSSuperview" ref="515308735"/>

-												<reference key="NSNextKeyView" ref="86150604"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSPopUpButtonCell" key="NSCell" id="633115429">

-													<int key="NSCellFlags">-2076049856</int>

-													<int key="NSCellFlags2">1024</int>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="709074847"/>

-													<int key="NSButtonFlags">109199615</int>

-													<int key="NSButtonFlags2">1</int>

-													<object class="NSFont" key="NSAlternateImage">

-														<string key="NSName">LucidaGrande</string>

-														<double key="NSSize">13</double>

-														<int key="NSfFlags">16</int>

-													</object>

-													<string key="NSAlternateContents"/>

-													<object class="NSMutableString" key="NSKeyEquivalent">

-														<characters key="NS.bytes"/>

-													</object>

-													<int key="NSPeriodicDelay">400</int>

-													<int key="NSPeriodicInterval">75</int>

-													<object class="NSMenuItem" key="NSMenuItem" id="616492372">

-														<reference key="NSMenu" ref="341113515"/>

-														<string key="NSTitle">du moniteur</string>

-														<string key="NSKeyEquiv"/>

-														<int key="NSKeyEquivModMask">1048576</int>

-														<int key="NSMnemonicLoc">2147483647</int>

-														<int key="NSState">1</int>

-														<reference key="NSOnImage" ref="531645050"/>

-														<reference key="NSMixedImage" ref="351811234"/>

-														<string key="NSAction">_popUpItemAction:</string>

-														<int key="NSTag">-1</int>

-														<reference key="NSTarget" ref="633115429"/>

-													</object>

-													<bool key="NSMenuItemRespectAlignment">YES</bool>

-													<object class="NSMenu" key="NSMenu" id="341113515">

-														<object class="NSMutableString" key="NSTitle">

-															<characters key="NS.bytes">OtherViews</characters>

-														</object>

-														<array class="NSMutableArray" key="NSMenuItems">

-															<reference ref="616492372"/>

-															<object class="NSMenuItem" id="759499526">

-																<reference key="NSMenu" ref="341113515"/>

-																<string key="NSTitle">256 couleurs</string>

-																<string key="NSKeyEquiv"/>

-																<int key="NSKeyEquivModMask">1048576</int>

-																<int key="NSMnemonicLoc">2147483647</int>

-																<reference key="NSOnImage" ref="531645050"/>

-																<reference key="NSMixedImage" ref="351811234"/>

-																<string key="NSAction">_popUpItemAction:</string>

-																<int key="NSTag">8</int>

-																<reference key="NSTarget" ref="633115429"/>

-															</object>

-															<object class="NSMenuItem" id="543935434">

-																<reference key="NSMenu" ref="341113515"/>

-																<string key="NSTitle">milliers</string>

-																<string key="NSKeyEquiv"/>

-																<int key="NSKeyEquivModMask">1048576</int>

-																<int key="NSMnemonicLoc">2147483647</int>

-																<reference key="NSOnImage" ref="531645050"/>

-																<reference key="NSMixedImage" ref="351811234"/>

-																<string key="NSAction">_popUpItemAction:</string>

-																<int key="NSTag">15</int>

-																<reference key="NSTarget" ref="633115429"/>

-															</object>

-															<object class="NSMenuItem" id="836673018">

-																<reference key="NSMenu" ref="341113515"/>

-																<string key="NSTitle">millions</string>

-																<string key="NSKeyEquiv"/>

-																<int key="NSKeyEquivModMask">1048576</int>

-																<int key="NSMnemonicLoc">2147483647</int>

-																<reference key="NSOnImage" ref="531645050"/>

-																<reference key="NSMixedImage" ref="351811234"/>

-																<string key="NSAction">_popUpItemAction:</string>

-																<int key="NSTag">24</int>

-																<reference key="NSTarget" ref="633115429"/>

-															</object>

-														</array>

-													</object>

-													<int key="NSPreferredEdge">3</int>

-													<bool key="NSUsesItemFromMenu">YES</bool>

-													<bool key="NSAltersState">YES</bool>

-													<int key="NSArrowPosition">1</int>

-												</object>

-											</object>

-											<object class="NSTextField" id="201731424">

-												<reference key="NSNextResponder" ref="515308735"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{17, 238}, {71, 20}}</string>

-												<reference key="NSSuperview" ref="515308735"/>

-												<reference key="NSNextKeyView" ref="709074847"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="930265681">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">Couleurs :</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<string key="NSPlaceholderString"/>

-													<reference key="NSControlView" ref="201731424"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSTextField" id="86150604">

-												<reference key="NSNextResponder" ref="515308735"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{36, 216}, {392, 14}}</string>

-												<reference key="NSSuperview" ref="515308735"/>

-												<reference key="NSNextKeyView" ref="477203622"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="311969422">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">Cette option prend effet au prochain lancement d’X11.</string>

-													<reference key="NSSupport" ref="26"/>

-													<string key="NSPlaceholderString"/>

-													<reference key="NSControlView" ref="86150604"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSButton" id="477203622">

-												<reference key="NSNextResponder" ref="515308735"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{18, 182}, {409, 23}}</string>

-												<reference key="NSSuperview" ref="515308735"/>

-												<reference key="NSNextKeyView" ref="298603383"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="631531164">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">Mode plein écran</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="477203622"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="967651788"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSButton" id="57246850">

-												<reference key="NSNextResponder" ref="515308735"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{37, 116}, {468, 18}}</string>

-												<reference key="NSSuperview" ref="515308735"/>

-												<reference key="NSNextKeyView" ref="331853183"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="917248662">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">Autoriser un accès à la barre des menus en mode plein écran</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="57246850"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="967651788"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSTextField" id="298603383">

-												<reference key="NSNextResponder" ref="515308735"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{36, 145}, {484, 31}}</string>

-												<reference key="NSSuperview" ref="515308735"/>

-												<reference key="NSNextKeyView" ref="57246850"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="761107402">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">Active la fenêtre root X11. Utilisez le raccourci clavier Commande + Option + A pour ouvrir et fermer le mode plein écran.</string>

-													<reference key="NSSupport" ref="26"/>

-													<string key="NSPlaceholderString"/>

-													<reference key="NSControlView" ref="298603383"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSTextField" id="331853183">

-												<reference key="NSNextResponder" ref="515308735"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{54, 79}, {466, 31}}</string>

-												<reference key="NSSuperview" ref="515308735"/>

-												<reference key="NSNextKeyView" ref="448510093"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="1042813110">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">La barre des menus sera visible lorsque le curseur de souris est placé en haut de votre affichage principal.</string>

-													<reference key="NSSupport" ref="26"/>

-													<reference key="NSControlView" ref="331853183"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-										</array>

-										<string key="NSFrame">{{10, 33}, {534, 279}}</string>

-										<reference key="NSNextKeyView" ref="201731424"/>

-									</object>

-									<string key="NSLabel">Sortie</string>

-									<reference key="NSColor" ref="57160303"/>

-									<reference key="NSTabView" ref="448510093"/>

-								</object>

-								<object class="NSTabViewItem" id="723450037">

-									<object class="NSMutableString" key="NSIdentifier">

-										<characters key="NS.bytes">2</characters>

-									</object>

-									<object class="NSView" key="NSView" id="408298283">

-										<nil key="NSNextResponder"/>

-										<int key="NSvFlags">256</int>

-										<array class="NSMutableArray" key="NSSubviews">

-											<object class="NSButton" id="878106058">

-												<reference key="NSNextResponder" ref="408298283"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{18, 255}, {409, 23}}</string>

-												<reference key="NSSuperview" ref="408298283"/>

-												<reference key="NSNextKeyView" ref="386152084"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="718083688">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">Activer la synchronisation</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="878106058"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="967651788"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSTextField" id="386152084">

-												<reference key="NSNextResponder" ref="408298283"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{36, 207}, {494, 42}}</string>

-												<reference key="NSSuperview" ref="408298283"/>

-												<reference key="NSNextKeyView" ref="487809555"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="572508492">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">Active la commande de menu « Copier » et permet la synchronisation entre le presse-papiers de OSX, celui de X11 (CLIPBOARD) et les mémoires tampons principales (PRIMARY).</string>

-													<reference key="NSSupport" ref="26"/>

-													<reference key="NSControlView" ref="386152084"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSButton" id="477050998">

-												<reference key="NSNextResponder" ref="408298283"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{34, 129}, {458, 18}}</string>

-												<reference key="NSSuperview" ref="408298283"/>

-												<reference key="NSNextKeyView" ref="765780304"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="501304422">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">Mettre à jour CLIPBOARD lorsque le presse-papiers est modifié</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="477050998"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="967651788"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSButton" id="765780304">

-												<reference key="NSNextResponder" ref="408298283"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{34, 104}, {495, 18}}</string>

-												<reference key="NSSuperview" ref="408298283"/>

-												<reference key="NSNextKeyView" ref="1002778833"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="510771323">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">Mettre à jour PRIMARY (clic central) lorsque le presse-papiers est modifié</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="765780304"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="967651788"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSButton" id="1002778833">

-												<reference key="NSNextResponder" ref="408298283"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{34, 79}, {437, 18}}</string>

-												<reference key="NSSuperview" ref="408298283"/>

-												<reference key="NSNextKeyView" ref="522511724"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="897099877">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">Mettre à jour le presse-papiers dès la sélection de nouveau texte</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="1002778833"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="967651788"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSButton" id="487809555">

-												<reference key="NSNextResponder" ref="408298283"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{34, 192}, {474, 18}}</string>

-												<reference key="NSSuperview" ref="408298283"/>

-												<reference key="NSNextKeyView" ref="620944856"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="619977658">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">Mettre à jour le presse-papiers lorsque CLIPBOARD est modifié</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="487809555"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="967651788"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSTextField" id="620944856">

-												<reference key="NSNextResponder" ref="408298283"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{48, 158}, {482, 28}}</string>

-												<reference key="NSSuperview" ref="408298283"/>

-												<reference key="NSNextKeyView" ref="477050998"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="461823902">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">Désactivez cette option si vous voulez utiliser xclipboard, klipper, ou tout autre gestionnaire de presse-papiers X11.</string>

-													<reference key="NSSupport" ref="26"/>

-													<reference key="NSControlView" ref="620944856"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSTextField" id="522511724">

-												<reference key="NSNextResponder" ref="408298283"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{48, 47}, {482, 28}}</string>

-												<reference key="NSSuperview" ref="408298283"/>

-												<reference key="NSNextKeyView" ref="448510093"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="994587858">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">En raison de limitations du protocole X11, cette option ne fonctionnera pas toujours dans certaines applications.</string>

-													<reference key="NSSupport" ref="26"/>

-													<reference key="NSControlView" ref="522511724"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-										</array>

-										<string key="NSFrame">{{10, 33}, {534, 279}}</string>

-										<reference key="NSNextKeyView" ref="878106058"/>

-									</object>

-									<string key="NSLabel">Presse-papiers</string>

-									<reference key="NSColor" ref="57160303"/>

-									<reference key="NSTabView" ref="448510093"/>

-								</object>

-								<object class="NSTabViewItem" id="10973343">

-									<object class="NSMutableString" key="NSIdentifier">

-										<characters key="NS.bytes">2</characters>

-									</object>

-									<object class="NSView" key="NSView" id="184765684">

-										<nil key="NSNextResponder"/>

-										<int key="NSvFlags">256</int>

-										<array class="NSMutableArray" key="NSSubviews">

-											<object class="NSButton" id="657659108">

-												<reference key="NSNextResponder" ref="184765684"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{15, 245}, {402, 18}}</string>

-												<reference key="NSSuperview" ref="184765684"/>

-												<reference key="NSNextKeyView" ref="290578835"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="259618205">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">Activation des fenêtres inactives en un clic</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="657659108"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="967651788"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSTextField" id="290578835">

-												<reference key="NSNextResponder" ref="184765684"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{23, 208}, {505, 31}}</string>

-												<reference key="NSSuperview" ref="184765684"/>

-												<reference key="NSNextKeyView" ref="992839333"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="399127858">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">En cas d’activation de cette option, si vous cliquez sur une fenêtre inactive, celle-ci deviendra active et le clic sera effectif.</string>

-													<reference key="NSSupport" ref="26"/>

-													<string key="NSPlaceholderString"/>

-													<reference key="NSControlView" ref="290578835"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSButton" id="992839333">

-												<reference key="NSNextResponder" ref="184765684"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{15, 184}, {402, 18}}</string>

-												<reference key="NSSuperview" ref="184765684"/>

-												<reference key="NSNextKeyView" ref="138261120"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="959555182">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">Activation des fenêtres survolées par la souris</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="992839333"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="967651788"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSTextField" id="138261120">

-												<reference key="NSNextResponder" ref="184765684"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{23, 150}, {505, 28}}</string>

-												<reference key="NSSuperview" ref="184765684"/>

-												<reference key="NSNextKeyView" ref="128352289"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="183409141">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">L’activation des fenêtres X11 suit le curseur. Ceci comporte des effets adverses.</string>

-													<reference key="NSSupport" ref="26"/>

-													<string key="NSPlaceholderString"/>

-													<reference key="NSControlView" ref="138261120"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSButton" id="128352289">

-												<reference key="NSNextResponder" ref="184765684"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{15, 140}, {402, 18}}</string>

-												<reference key="NSSuperview" ref="184765684"/>

-												<reference key="NSNextKeyView" ref="57161931"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="556463187">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">Activation des nouvelles fenêtres</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="128352289"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="967651788"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSTextField" id="57161931">

-												<reference key="NSNextResponder" ref="184765684"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{23, 92}, {505, 42}}</string>

-												<reference key="NSSuperview" ref="184765684"/>

-												<reference key="NSNextKeyView" ref="448510093"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="989804990">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">Lorsque cette option est activée, la création d’une nouvelle fenêtre X11 fait passer X11.app au premier plan (au lieu de Finder.app, Terminal.app, etc.)</string>

-													<reference key="NSSupport" ref="26"/>

-													<string key="NSPlaceholderString"/>

-													<reference key="NSControlView" ref="57161931"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-										</array>

-										<string key="NSFrame">{{10, 33}, {534, 279}}</string>

-										<reference key="NSNextKeyView" ref="657659108"/>

-									</object>

-									<string key="NSLabel">Fenêtres</string>

-									<reference key="NSColor" ref="57160303"/>

-									<reference key="NSTabView" ref="448510093"/>

-								</object>

-								<object class="NSTabViewItem" id="348328898">

-									<object class="NSView" key="NSView" id="300811574">

-										<nil key="NSNextResponder"/>

-										<int key="NSvFlags">256</int>

-										<array class="NSMutableArray" key="NSSubviews">

-											<object class="NSButton" id="989050925">

-												<reference key="NSNextResponder" ref="300811574"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{18, 243}, {402, 18}}</string>

-												<reference key="NSSuperview" ref="300811574"/>

-												<reference key="NSNextKeyView" ref="168436707"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="189594322">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">Authentifier les connexions</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="989050925"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="967651788"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSButton" id="700826966">

-												<reference key="NSNextResponder" ref="300811574"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{18, 166}, {402, 18}}</string>

-												<reference key="NSSuperview" ref="300811574"/>

-												<reference key="NSNextKeyView" ref="363817195"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="489340979">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">Autoriser les connexions de clients réseau</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="700826966"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="967651788"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSTextField" id="168436707">

-												<reference key="NSNextResponder" ref="300811574"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{36, 195}, {484, 42}}</string>

-												<reference key="NSSuperview" ref="300811574"/>

-												<reference key="NSNextKeyView" ref="700826966"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="53243865">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">Le lancement d’X11 créera des touches de contrôle d’accès Xauthority. Si l’adresse IP du système change, ces touches ne seront plus valides, ce qui risquera d’empêcher le lancement des applications X11.</string>

-													<reference key="NSSupport" ref="26"/>

-													<string key="NSPlaceholderString"/>

-													<reference key="NSControlView" ref="168436707"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSTextField" id="363817195">

-												<reference key="NSNextResponder" ref="300811574"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{36, 104}, {484, 56}}</string>

-												<reference key="NSSuperview" ref="300811574"/>

-												<reference key="NSNextKeyView" ref="223835729"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="390084685">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">En cas d’activation de cette option, « Authentifier les connexions » doit aussi être activée pour garantir la sécurité du système. En cas de désactivation, les connexions à partir d’applications distantes sont interdites.</string>

-													<reference key="NSSupport" ref="26"/>

-													<string key="NSPlaceholderString"/>

-													<reference key="NSControlView" ref="363817195"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSTextField" id="223835729">

-												<reference key="NSNextResponder" ref="300811574"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{17, 17}, {404, 14}}</string>

-												<reference key="NSSuperview" ref="300811574"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="283628678">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">Ces options prennent effet au prochain lancement d’X11.</string>

-													<reference key="NSSupport" ref="26"/>

-													<string key="NSPlaceholderString"/>

-													<reference key="NSControlView" ref="223835729"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-										</array>

-										<string key="NSFrame">{{10, 33}, {534, 279}}</string>

-										<reference key="NSNextKeyView" ref="989050925"/>

-									</object>

-									<string key="NSLabel">Sécurité</string>

-									<reference key="NSColor" ref="57160303"/>

-									<reference key="NSTabView" ref="448510093"/>

-								</object>

-							</array>

-							<reference key="NSSelectedTabViewItem" ref="287591690"/>

-							<reference key="NSFont" ref="463863101"/>

-							<int key="NSTvFlags">0</int>

-							<bool key="NSAllowTruncatedLabels">YES</bool>

-							<bool key="NSDrawsBackground">YES</bool>

-							<array class="NSMutableArray" key="NSSubviews">

-								<reference ref="596750588"/>

-							</array>

-						</object>

-					</array>

-					<string key="NSFrameSize">{580, 341}</string>

-					<reference key="NSNextKeyView" ref="448510093"/>

-				</object>

-				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>

-				<string key="NSMinSize">{320, 262}</string>

-				<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

-				<string key="NSFrameAutosaveName">x11_prefs</string>

-			</object>

-			<object class="NSWindowTemplate" id="604417141">

-				<int key="NSWindowStyleMask">11</int>

-				<int key="NSWindowBacking">2</int>

-				<string key="NSWindowRect">{{302, 440}, {548, 271}}</string>

-				<int key="NSWTFlags">1350041600</int>

-				<string key="NSWindowTitle">Menu de l’application X11</string>

-				<string key="NSWindowClass">NSPanel</string>

-				<object class="NSMutableString" key="NSViewClass">

-					<characters key="NS.bytes">View</characters>

-				</object>

-				<nil key="NSUserInterfaceItemIdentifier"/>

-				<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

-				<string key="NSWindowContentMinSize">{320, 240}</string>

-				<object class="NSView" key="NSWindowView" id="85544634">

-					<nil key="NSNextResponder"/>

-					<int key="NSvFlags">256</int>

-					<array class="NSMutableArray" key="NSSubviews">

-						<object class="NSButton" id="671954382">

-							<reference key="NSNextResponder" ref="85544634"/>

-							<int key="NSvFlags">265</int>

-							<string key="NSFrame">{{372, 191}, {162, 32}}</string>

-							<reference key="NSSuperview" ref="85544634"/>

-							<bool key="NSEnabled">YES</bool>

-							<object class="NSButtonCell" key="NSCell" id="143554520">

-								<int key="NSCellFlags">67239424</int>

-								<int key="NSCellFlags2">137887744</int>

-								<string key="NSContents">Dupliquer</string>

-								<reference key="NSSupport" ref="463863101"/>

-								<reference key="NSControlView" ref="671954382"/>

-								<int key="NSButtonFlags">-2038284033</int>

-								<int key="NSButtonFlags2">1</int>

-								<object class="NSFont" key="NSAlternateImage" id="549406736">

-									<string key="NSName">Helvetica</string>

-									<double key="NSSize">13</double>

-									<int key="NSfFlags">16</int>

-								</object>

-								<string key="NSAlternateContents"/>

-								<object class="NSMutableString" key="NSKeyEquivalent">

-									<characters key="NS.bytes"/>

-								</object>

-								<int key="NSPeriodicDelay">200</int>

-								<int key="NSPeriodicInterval">25</int>

-							</object>

-						</object>

-						<object class="NSButton" id="492358940">

-							<reference key="NSNextResponder" ref="85544634"/>

-							<int key="NSvFlags">265</int>

-							<string key="NSFrame">{{372, 159}, {162, 32}}</string>

-							<reference key="NSSuperview" ref="85544634"/>

-							<bool key="NSEnabled">YES</bool>

-							<object class="NSButtonCell" key="NSCell" id="8201128">

-								<int key="NSCellFlags">67239424</int>

-								<int key="NSCellFlags2">137887744</int>

-								<string key="NSContents">Supprimer</string>

-								<reference key="NSSupport" ref="463863101"/>

-								<reference key="NSControlView" ref="492358940"/>

-								<int key="NSButtonFlags">-2038284033</int>

-								<int key="NSButtonFlags2">1</int>

-								<reference key="NSAlternateImage" ref="549406736"/>

-								<string key="NSAlternateContents"/>

-								<object class="NSMutableString" key="NSKeyEquivalent">

-									<characters key="NS.bytes"/>

-								</object>

-								<int key="NSPeriodicDelay">200</int>

-								<int key="NSPeriodicInterval">25</int>

-							</object>

-						</object>

-						<object class="NSScrollView" id="1063387772">

-							<reference key="NSNextResponder" ref="85544634"/>

-							<int key="NSvFlags">274</int>

-							<array class="NSMutableArray" key="NSSubviews">

-								<object class="NSClipView" id="580565898">

-									<reference key="NSNextResponder" ref="1063387772"/>

-									<int key="NSvFlags">2304</int>

-									<array class="NSMutableArray" key="NSSubviews">

-										<object class="NSTableView" id="905092943">

-											<reference key="NSNextResponder" ref="580565898"/>

-											<int key="NSvFlags">256</int>

-											<string key="NSFrameSize">{333, 198}</string>

-											<reference key="NSSuperview" ref="580565898"/>

-											<bool key="NSEnabled">YES</bool>

-											<object class="NSTableHeaderView" key="NSHeaderView" id="792419186">

-												<reference key="NSNextResponder" ref="672307654"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrameSize">{333, 17}</string>

-												<reference key="NSSuperview" ref="672307654"/>

-												<reference key="NSTableView" ref="905092943"/>

-											</object>

-											<object class="_NSCornerView" key="NSCornerView" id="898633680">

-												<reference key="NSNextResponder" ref="1063387772"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{334, 0}, {16, 17}}</string>

-												<reference key="NSSuperview" ref="1063387772"/>

-											</object>

-											<array class="NSMutableArray" key="NSTableColumns">

-												<object class="NSTableColumn" id="938444323">

-													<double key="NSWidth">155</double>

-													<double key="NSMinWidth">62.730998992919922</double>

-													<double key="NSMaxWidth">1000</double>

-													<object class="NSTableHeaderCell" key="NSHeaderCell">

-														<int key="NSCellFlags">75628096</int>

-														<int key="NSCellFlags2">2048</int>

-														<string key="NSContents">Nom</string>

-														<reference key="NSSupport" ref="26"/>

-														<object class="NSColor" key="NSBackgroundColor" id="113872566">

-															<int key="NSColorSpace">3</int>

-															<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>

-														</object>

-														<object class="NSColor" key="NSTextColor" id="249576247">

-															<int key="NSColorSpace">6</int>

-															<string key="NSCatalogName">System</string>

-															<string key="NSColorName">headerTextColor</string>

-															<reference key="NSColor" ref="214098874"/>

-														</object>

-													</object>

-													<object class="NSTextFieldCell" key="NSDataCell" id="825378892">

-														<int key="NSCellFlags">338820672</int>

-														<int key="NSCellFlags2">1024</int>

-														<string key="NSContents">Text Cell</string>

-														<reference key="NSSupport" ref="463863101"/>

-														<string key="NSPlaceholderString"/>

-														<reference key="NSControlView" ref="905092943"/>

-														<object class="NSColor" key="NSBackgroundColor" id="822946413">

-															<int key="NSColorSpace">3</int>

-															<bytes key="NSWhite">MQA</bytes>

-														</object>

-														<reference key="NSTextColor" ref="930815747"/>

-													</object>

-													<int key="NSResizingMask">3</int>

-													<bool key="NSIsResizeable">YES</bool>

-													<bool key="NSIsEditable">YES</bool>

-													<reference key="NSTableView" ref="905092943"/>

-													<string key="NSHeaderToolTip"/>

-												</object>

-												<object class="NSTableColumn" id="84282687">

-													<double key="NSWidth">100</double>

-													<double key="NSMinWidth">40</double>

-													<double key="NSMaxWidth">1000</double>

-													<object class="NSTableHeaderCell" key="NSHeaderCell">

-														<int key="NSCellFlags">75628096</int>

-														<int key="NSCellFlags2">2048</int>

-														<string key="NSContents">Commande</string>

-														<reference key="NSSupport" ref="26"/>

-														<reference key="NSBackgroundColor" ref="113872566"/>

-														<reference key="NSTextColor" ref="249576247"/>

-													</object>

-													<object class="NSTextFieldCell" key="NSDataCell" id="432610585">

-														<int key="NSCellFlags">338820672</int>

-														<int key="NSCellFlags2">1024</int>

-														<string key="NSContents">Text Cell</string>

-														<reference key="NSSupport" ref="463863101"/>

-														<string key="NSPlaceholderString"/>

-														<reference key="NSControlView" ref="905092943"/>

-														<reference key="NSBackgroundColor" ref="822946413"/>

-														<reference key="NSTextColor" ref="930815747"/>

-													</object>

-													<int key="NSResizingMask">3</int>

-													<bool key="NSIsResizeable">YES</bool>

-													<bool key="NSIsEditable">YES</bool>

-													<reference key="NSTableView" ref="905092943"/>

-													<string key="NSHeaderToolTip"/>

-												</object>

-												<object class="NSTableColumn" id="242608782">

-													<double key="NSWidth">69</double>

-													<double key="NSMinWidth">10</double>

-													<double key="NSMaxWidth">1000</double>

-													<object class="NSTableHeaderCell" key="NSHeaderCell">

-														<int key="NSCellFlags">75628096</int>

-														<int key="NSCellFlags2">2048</int>

-														<string key="NSContents">Raccourci</string>

-														<reference key="NSSupport" ref="26"/>

-														<object class="NSColor" key="NSBackgroundColor">

-															<int key="NSColorSpace">6</int>

-															<string key="NSCatalogName">System</string>

-															<string key="NSColorName">headerColor</string>

-															<reference key="NSColor" ref="822946413"/>

-														</object>

-														<reference key="NSTextColor" ref="249576247"/>

-													</object>

-													<object class="NSTextFieldCell" key="NSDataCell" id="34714764">

-														<int key="NSCellFlags">338820672</int>

-														<int key="NSCellFlags2">1024</int>

-														<string key="NSContents">Text Cell</string>

-														<object class="NSFont" key="NSSupport">

-															<string key="NSName">LucidaGrande</string>

-															<double key="NSSize">12</double>

-															<int key="NSfFlags">16</int>

-														</object>

-														<string key="NSPlaceholderString"/>

-														<reference key="NSControlView" ref="905092943"/>

-														<bool key="NSDrawsBackground">YES</bool>

-														<object class="NSColor" key="NSBackgroundColor" id="812484075">

-															<int key="NSColorSpace">6</int>

-															<string key="NSCatalogName">System</string>

-															<string key="NSColorName">controlBackgroundColor</string>

-															<reference key="NSColor" ref="590688762"/>

-														</object>

-														<reference key="NSTextColor" ref="930815747"/>

-													</object>

-													<int key="NSResizingMask">3</int>

-													<bool key="NSIsResizeable">YES</bool>

-													<bool key="NSIsEditable">YES</bool>

-													<reference key="NSTableView" ref="905092943"/>

-													<string key="NSHeaderToolTip"/>

-												</object>

-											</array>

-											<double key="NSIntercellSpacingWidth">3</double>

-											<double key="NSIntercellSpacingHeight">2</double>

-											<reference key="NSBackgroundColor" ref="822946413"/>

-											<object class="NSColor" key="NSGridColor">

-												<int key="NSColorSpace">6</int>

-												<string key="NSCatalogName">System</string>

-												<string key="NSColorName">gridColor</string>

-												<object class="NSColor" key="NSColor">

-													<int key="NSColorSpace">3</int>

-													<bytes key="NSWhite">MC41AA</bytes>

-												</object>

-											</object>

-											<double key="NSRowHeight">17</double>

-											<int key="NSTvFlags">1379958784</int>

-											<reference key="NSDelegate"/>

-											<reference key="NSDataSource"/>

-											<int key="NSColumnAutoresizingStyle">1</int>

-											<int key="NSDraggingSourceMaskForLocal">-1</int>

-											<int key="NSDraggingSourceMaskForNonLocal">0</int>

-											<bool key="NSAllowsTypeSelect">YES</bool>

-											<int key="NSTableViewDraggingDestinationStyle">0</int>

-											<int key="NSTableViewGroupRowStyle">1</int>

-										</object>

-									</array>

-									<string key="NSFrame">{{1, 17}, {333, 198}}</string>

-									<reference key="NSSuperview" ref="1063387772"/>

-									<reference key="NSNextKeyView" ref="905092943"/>

-									<reference key="NSDocView" ref="905092943"/>

-									<reference key="NSBGColor" ref="812484075"/>

-									<int key="NScvFlags">4</int>

-								</object>

-								<object class="NSScroller" id="842897584">

-									<reference key="NSNextResponder" ref="1063387772"/>

-									<int key="NSvFlags">256</int>

-									<string key="NSFrame">{{334, 17}, {15, 198}}</string>

-									<reference key="NSSuperview" ref="1063387772"/>

-									<reference key="NSTarget" ref="1063387772"/>

-									<string key="NSAction">_doScroller:</string>

-									<double key="NSPercent">0.99492377042770386</double>

-								</object>

-								<object class="NSScroller" id="17278747">

-									<reference key="NSNextResponder" ref="1063387772"/>

-									<int key="NSvFlags">256</int>

-									<string key="NSFrame">{{1, 215}, {333, 15}}</string>

-									<reference key="NSSuperview" ref="1063387772"/>

-									<int key="NSsFlags">1</int>

-									<reference key="NSTarget" ref="1063387772"/>

-									<string key="NSAction">_doScroller:</string>

-									<double key="NSPercent">0.68852460384368896</double>

-								</object>

-								<object class="NSClipView" id="672307654">

-									<reference key="NSNextResponder" ref="1063387772"/>

-									<int key="NSvFlags">2304</int>

-									<array class="NSMutableArray" key="NSSubviews">

-										<reference ref="792419186"/>

-									</array>

-									<string key="NSFrame">{{1, 0}, {333, 17}}</string>

-									<reference key="NSSuperview" ref="1063387772"/>

-									<reference key="NSNextKeyView" ref="792419186"/>

-									<reference key="NSDocView" ref="792419186"/>

-									<reference key="NSBGColor" ref="812484075"/>

-									<int key="NScvFlags">4</int>

-								</object>

-								<reference ref="898633680"/>

-							</array>

-							<string key="NSFrame">{{20, 20}, {350, 231}}</string>

-							<reference key="NSSuperview" ref="85544634"/>

-							<reference key="NSNextKeyView" ref="580565898"/>

-							<int key="NSsFlags">133170</int>

-							<reference key="NSVScroller" ref="842897584"/>

-							<reference key="NSHScroller" ref="17278747"/>

-							<reference key="NSContentView" ref="580565898"/>

-							<reference key="NSHeaderClipView" ref="672307654"/>

-							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>

-						</object>

-						<object class="NSButton" id="758204686">

-							<reference key="NSNextResponder" ref="85544634"/>

-							<int key="NSvFlags">265</int>

-							<string key="NSFrame">{{372, 223}, {162, 32}}</string>

-							<reference key="NSSuperview" ref="85544634"/>

-							<bool key="NSEnabled">YES</bool>

-							<object class="NSButtonCell" key="NSCell" id="1025474039">

-								<int key="NSCellFlags">-2080244224</int>

-								<int key="NSCellFlags2">137887744</int>

-								<string key="NSContents">Ajouter un élément</string>

-								<reference key="NSSupport" ref="463863101"/>

-								<reference key="NSControlView" ref="758204686"/>

-								<int key="NSButtonFlags">-2038284033</int>

-								<int key="NSButtonFlags2">1</int>

-								<reference key="NSAlternateImage" ref="549406736"/>

-								<string key="NSAlternateContents"/>

-								<object class="NSMutableString" key="NSKeyEquivalent">

-									<characters key="NS.bytes"/>

-								</object>

-								<int key="NSPeriodicDelay">200</int>

-								<int key="NSPeriodicInterval">25</int>

-							</object>

-						</object>

-					</array>

-					<string key="NSFrameSize">{548, 271}</string>

-				</object>

-				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>

-				<string key="NSMinSize">{320, 262}</string>

-				<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

-				<string key="NSFrameAutosaveName">x11_apps</string>

-			</object>

-			<object class="NSMenu" id="294137138">

-				<string key="NSTitle">Menu</string>

-				<array class="NSMutableArray" key="NSMenuItems">

-					<object class="NSMenuItem" id="318286212">

-						<reference key="NSMenu" ref="294137138"/>

-						<bool key="NSIsDisabled">YES</bool>

-						<bool key="NSIsSeparator">YES</bool>

-						<string key="NSTitle"/>

-						<string key="NSKeyEquiv"/>

-						<int key="NSKeyEquivModMask">1048576</int>

-						<int key="NSMnemonicLoc">2147483647</int>

-						<reference key="NSOnImage" ref="531645050"/>

-						<reference key="NSMixedImage" ref="351811234"/>

-					</object>

-					<object class="NSMenuItem" id="511651072">

-						<reference key="NSMenu" ref="294137138"/>

-						<string key="NSTitle">Applications</string>

-						<string key="NSKeyEquiv"/>

-						<int key="NSKeyEquivModMask">1048576</int>

-						<int key="NSMnemonicLoc">2147483647</int>

-						<reference key="NSOnImage" ref="531645050"/>

-						<reference key="NSMixedImage" ref="351811234"/>

-						<string key="NSAction">submenuAction:</string>

-						<object class="NSMenu" key="NSSubmenu" id="48278059">

-							<string key="NSTitle">Applications</string>

-							<array class="NSMutableArray" key="NSMenuItems">

-								<object class="NSMenuItem" id="563798000">

-									<reference key="NSMenu" ref="48278059"/>

-									<bool key="NSIsDisabled">YES</bool>

-									<bool key="NSIsSeparator">YES</bool>

-									<string key="NSTitle"/>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="1032342329">

-									<reference key="NSMenu" ref="48278059"/>

-									<string key="NSTitle">Personnaliser…</string>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-							</array>

-						</object>

-					</object>

-				</array>

-				<string key="NSName"/>

-			</object>

-		</array>

-		<object class="IBObjectContainer" key="IBDocument.Objects">

-			<array class="NSMutableArray" key="connectionRecords">

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">copy:</string>

-						<reference key="source" ref="941939442"/>

-						<reference key="destination" ref="185296989"/>

-					</object>

-					<int key="connectionID">181</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">minimize_window:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="677652931"/>

-					</object>

-					<int key="connectionID">202</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">close_window:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="984461797"/>

-					</object>

-					<int key="connectionID">205</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">zoom_window:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="1066447520"/>

-					</object>

-					<int key="connectionID">206</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">bring_to_front:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="276216762"/>

-					</object>

-					<int key="connectionID">207</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">hideOtherApplications:</string>

-						<reference key="source" ref="815810918"/>

-						<reference key="destination" ref="206802571"/>

-					</object>

-					<int key="connectionID">263</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">apps_separator</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="390088328"/>

-					</object>

-					<int key="connectionID">273</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">apps_table</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="905092943"/>

-					</object>

-					<int key="connectionID">301</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">apps_table_delete:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="492358940"/>

-					</object>

-					<int key="connectionID">303</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">apps_table_duplicate:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="671954382"/>

-					</object>

-					<int key="connectionID">304</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">apps_table_show:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="1065386165"/>

-					</object>

-					<int key="connectionID">308</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">apps_table_new:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="758204686"/>

-					</object>

-					<int key="connectionID">311</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_show:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="386173216"/>

-					</object>

-					<int key="connectionID">318</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">x11_about_item</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="139290918"/>

-					</object>

-					<int key="connectionID">321</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">enable_auth</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="989050925"/>

-					</object>

-					<int key="connectionID">387</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">enable_tcp</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="700826966"/>

-					</object>

-					<int key="connectionID">388</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">depth</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="709074847"/>

-					</object>

-					<int key="connectionID">389</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">fake_buttons</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="119157981"/>

-					</object>

-					<int key="connectionID">391</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">sync_keymap</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="179949713"/>

-					</object>

-					<int key="connectionID">392</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">enable_keyequivs</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="842100515"/>

-					</object>

-					<int key="connectionID">393</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="119157981"/>

-					</object>

-					<int key="connectionID">394</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="179949713"/>

-					</object>

-					<int key="connectionID">395</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="842100515"/>

-					</object>

-					<int key="connectionID">396</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="709074847"/>

-					</object>

-					<int key="connectionID">398</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="989050925"/>

-					</object>

-					<int key="connectionID">399</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="700826966"/>

-					</object>

-					<int key="connectionID">401</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">prefs_panel</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="124913468"/>

-					</object>

-					<int key="connectionID">402</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">x11_help:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="504984881"/>

-					</object>

-					<int key="connectionID">422</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">dockMenu</string>

-						<reference key="source" ref="815810918"/>

-						<reference key="destination" ref="294137138"/>

-					</object>

-					<int key="connectionID">426</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">dock_menu</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="294137138"/>

-					</object>

-					<int key="connectionID">428</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">delegate</string>

-						<reference key="source" ref="815810918"/>

-						<reference key="destination" ref="485884620"/>

-					</object>

-					<int key="connectionID">429</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">hide:</string>

-						<reference key="source" ref="815810918"/>

-						<reference key="destination" ref="301008465"/>

-					</object>

-					<int key="connectionID">430</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">unhideAllApplications:</string>

-						<reference key="source" ref="815810918"/>

-						<reference key="destination" ref="1023546148"/>

-					</object>

-					<int key="connectionID">431</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">orderFrontStandardAboutPanel:</string>

-						<reference key="source" ref="815810918"/>

-						<reference key="destination" ref="139290918"/>

-					</object>

-					<int key="connectionID">433</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">dock_apps_menu</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="48278059"/>

-					</object>

-					<int key="connectionID">530</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">dock_window_separator</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="318286212"/>

-					</object>

-					<int key="connectionID">531</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">apps_table_show:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="1032342329"/>

-					</object>

-					<int key="connectionID">534</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">next_window:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="1036389925"/>

-					</object>

-					<int key="connectionID">539</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">previous_window:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="369641893"/>

-					</object>

-					<int key="connectionID">540</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">enable_fullscreen</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="477203622"/>

-					</object>

-					<int key="connectionID">546</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">enable_fullscreen_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="477203622"/>

-					</object>

-					<int key="connectionID">547</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">toggle_fullscreen:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="6876565"/>

-					</object>

-					<int key="connectionID">548</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">toggle_fullscreen_item</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="6876565"/>

-					</object>

-					<int key="connectionID">549</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">menu</string>

-						<reference key="source" ref="815810918"/>

-						<reference key="destination" ref="524015605"/>

-					</object>

-					<int key="connectionID">300334</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">terminate:</string>

-						<reference key="source" ref="815810918"/>

-						<reference key="destination" ref="274138642"/>

-					</object>

-					<int key="connectionID">300336</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="657659108"/>

-					</object>

-					<int key="connectionID">300389</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="992839333"/>

-					</object>

-					<int key="connectionID">300390</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="128352289"/>

-					</object>

-					<int key="connectionID">300391</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">click_through</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="657659108"/>

-					</object>

-					<int key="connectionID">300392</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">focus_follows_mouse</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="992839333"/>

-					</object>

-					<int key="connectionID">300393</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">focus_on_new_window</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="128352289"/>

-					</object>

-					<int key="connectionID">300394</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">copy_menu_item</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="185296989"/>

-					</object>

-					<int key="connectionID">300443</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">sync_pasteboard</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="878106058"/>

-					</object>

-					<int key="connectionID">300444</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">sync_clipboard_to_pasteboard</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="487809555"/>

-					</object>

-					<int key="connectionID">300461</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">sync_pasteboard_to_clipboard</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="477050998"/>

-					</object>

-					<int key="connectionID">300462</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">sync_pasteboard_to_primary</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="765780304"/>

-					</object>

-					<int key="connectionID">300463</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">sync_primary_immediately</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="1002778833"/>

-					</object>

-					<int key="connectionID">300464</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="878106058"/>

-					</object>

-					<int key="connectionID">300465</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="487809555"/>

-					</object>

-					<int key="connectionID">300466</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="477050998"/>

-					</object>

-					<int key="connectionID">300467</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="765780304"/>

-					</object>

-					<int key="connectionID">300468</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="1002778833"/>

-					</object>

-					<int key="connectionID">300469</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">sync_text1</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="620944856"/>

-					</object>

-					<int key="connectionID">300470</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">sync_text2</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="522511724"/>

-					</object>

-					<int key="connectionID">300471</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">enable_fullscreen_menu</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="57246850"/>

-					</object>

-					<int key="connectionID">300474</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="57246850"/>

-					</object>

-					<int key="connectionID">300475</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="406291430"/>

-					</object>

-					<int key="connectionID">300480</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">option_sends_alt</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="406291430"/>

-					</object>

-					<int key="connectionID">300481</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="863505041"/>

-					</object>

-					<int key="connectionID">300484</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">enable_fullscreen_menu_text</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="331853183"/>

-					</object>

-					<int key="connectionID">300489</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">scroll_in_device_direction</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="863505041"/>

-					</object>

-					<int key="connectionID">300490</int>

-				</object>

-			</array>

-			<object class="IBMutableOrderedSet" key="objectRecords">

-				<array key="orderedObjects">

-					<object class="IBObjectRecord">

-						<int key="objectID">0</int>

-						<array key="object" id="0"/>

-						<reference key="children" ref="904585544"/>

-						<nil key="parent"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">-2</int>

-						<reference key="object" ref="815810918"/>

-						<reference key="parent" ref="0"/>

-						<string key="objectName">File's Owner</string>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">-1</int>

-						<reference key="object" ref="941939442"/>

-						<reference key="parent" ref="0"/>

-						<string key="objectName">First Responder</string>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">-3</int>

-						<reference key="object" ref="951368722"/>

-						<reference key="parent" ref="0"/>

-						<string key="objectName">Application</string>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">29</int>

-						<reference key="object" ref="524015605"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="931553638"/>

-							<reference ref="365880285"/>

-							<reference ref="200491363"/>

-							<reference ref="868031522"/>

-							<reference ref="551174276"/>

-						</array>

-						<reference key="parent" ref="0"/>

-						<string key="objectName">MainMenu</string>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">19</int>

-						<reference key="object" ref="931553638"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="96874957"/>

-						</array>

-						<reference key="parent" ref="524015605"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">24</int>

-						<reference key="object" ref="96874957"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="677652931"/>

-							<reference ref="276216762"/>

-							<reference ref="1066447520"/>

-							<reference ref="1036389925"/>

-							<reference ref="369641893"/>

-							<reference ref="155085383"/>

-							<reference ref="984461797"/>

-							<reference ref="280172320"/>

-						</array>

-						<reference key="parent" ref="931553638"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">5</int>

-						<reference key="object" ref="276216762"/>

-						<reference key="parent" ref="96874957"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">23</int>

-						<reference key="object" ref="677652931"/>

-						<reference key="parent" ref="96874957"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">92</int>

-						<reference key="object" ref="280172320"/>

-						<reference key="parent" ref="96874957"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">203</int>

-						<reference key="object" ref="984461797"/>

-						<reference key="parent" ref="96874957"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">204</int>

-						<reference key="object" ref="1066447520"/>

-						<reference key="parent" ref="96874957"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">536</int>

-						<reference key="object" ref="155085383"/>

-						<reference key="parent" ref="96874957"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">537</int>

-						<reference key="object" ref="1036389925"/>

-						<reference key="parent" ref="96874957"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">538</int>

-						<reference key="object" ref="369641893"/>

-						<reference key="parent" ref="96874957"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">56</int>

-						<reference key="object" ref="365880285"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="576521955"/>

-						</array>

-						<reference key="parent" ref="524015605"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">57</int>

-						<reference key="object" ref="576521955"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="139290918"/>

-							<reference ref="386173216"/>

-							<reference ref="32285361"/>

-							<reference ref="301008465"/>

-							<reference ref="274138642"/>

-							<reference ref="272876017"/>

-							<reference ref="431301145"/>

-							<reference ref="206802571"/>

-							<reference ref="848095279"/>

-							<reference ref="1023546148"/>

-							<reference ref="6876565"/>

-							<reference ref="479677589"/>

-						</array>

-						<reference key="parent" ref="365880285"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">58</int>

-						<reference key="object" ref="139290918"/>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">129</int>

-						<reference key="object" ref="386173216"/>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">131</int>

-						<reference key="object" ref="32285361"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="821388474"/>

-						</array>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">130</int>

-						<reference key="object" ref="821388474"/>

-						<reference key="parent" ref="32285361"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">134</int>

-						<reference key="object" ref="301008465"/>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">136</int>

-						<reference key="object" ref="274138642"/>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">143</int>

-						<reference key="object" ref="272876017"/>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">144</int>

-						<reference key="object" ref="431301145"/>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">145</int>

-						<reference key="object" ref="206802571"/>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">149</int>

-						<reference key="object" ref="848095279"/>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">150</int>

-						<reference key="object" ref="1023546148"/>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">544</int>

-						<reference key="object" ref="6876565"/>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">545</int>

-						<reference key="object" ref="479677589"/>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">163</int>

-						<reference key="object" ref="200491363"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="526778998"/>

-						</array>

-						<reference key="parent" ref="524015605"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">169</int>

-						<reference key="object" ref="526778998"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="185296989"/>

-						</array>

-						<reference key="parent" ref="200491363"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">157</int>

-						<reference key="object" ref="185296989"/>

-						<reference key="parent" ref="526778998"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">269</int>

-						<reference key="object" ref="868031522"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="981161348"/>

-						</array>

-						<reference key="parent" ref="524015605"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">270</int>

-						<reference key="object" ref="981161348"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="390088328"/>

-							<reference ref="1065386165"/>

-						</array>

-						<reference key="parent" ref="868031522"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">272</int>

-						<reference key="object" ref="390088328"/>

-						<reference key="parent" ref="981161348"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">305</int>

-						<reference key="object" ref="1065386165"/>

-						<reference key="parent" ref="981161348"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">419</int>

-						<reference key="object" ref="551174276"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="511848303"/>

-						</array>

-						<reference key="parent" ref="524015605"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">420</int>

-						<reference key="object" ref="511848303"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="504984881"/>

-						</array>

-						<reference key="parent" ref="551174276"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">421</int>

-						<reference key="object" ref="504984881"/>

-						<reference key="parent" ref="511848303"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">196</int>

-						<reference key="object" ref="485884620"/>

-						<reference key="parent" ref="0"/>

-						<string key="objectName">X11Controller</string>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">244</int>

-						<reference key="object" ref="124913468"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="941366957"/>

-						</array>

-						<reference key="parent" ref="0"/>

-						<string key="objectName">PrefsPanel</string>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">245</int>

-						<reference key="object" ref="941366957"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="448510093"/>

-						</array>

-						<reference key="parent" ref="124913468"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">348</int>

-						<reference key="object" ref="448510093"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="287591690"/>

-							<reference ref="960678392"/>

-							<reference ref="348328898"/>

-							<reference ref="10973343"/>

-							<reference ref="723450037"/>

-						</array>

-						<reference key="parent" ref="941366957"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">349</int>

-						<reference key="object" ref="287591690"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="596750588"/>

-						</array>

-						<reference key="parent" ref="448510093"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">351</int>

-						<reference key="object" ref="596750588"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="119157981"/>

-							<reference ref="443008216"/>

-							<reference ref="282885445"/>

-							<reference ref="842100515"/>

-							<reference ref="31160162"/>

-							<reference ref="179949713"/>

-							<reference ref="278155937"/>

-							<reference ref="406291430"/>

-							<reference ref="863505041"/>

-						</array>

-						<reference key="parent" ref="287591690"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">363</int>

-						<reference key="object" ref="119157981"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="990762273"/>

-						</array>

-						<reference key="parent" ref="596750588"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">364</int>

-						<reference key="object" ref="443008216"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="391919450"/>

-						</array>

-						<reference key="parent" ref="596750588"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">365</int>

-						<reference key="object" ref="282885445"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="649334366"/>

-						</array>

-						<reference key="parent" ref="596750588"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">368</int>

-						<reference key="object" ref="842100515"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="940564599"/>

-						</array>

-						<reference key="parent" ref="596750588"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">369</int>

-						<reference key="object" ref="31160162"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="666057093"/>

-						</array>

-						<reference key="parent" ref="596750588"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">370</int>

-						<reference key="object" ref="179949713"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="967619578"/>

-						</array>

-						<reference key="parent" ref="596750588"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">352</int>

-						<reference key="object" ref="960678392"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="515308735"/>

-						</array>

-						<reference key="parent" ref="448510093"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">350</int>

-						<reference key="object" ref="515308735"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="709074847"/>

-							<reference ref="201731424"/>

-							<reference ref="86150604"/>

-							<reference ref="477203622"/>

-							<reference ref="57246850"/>

-							<reference ref="298603383"/>

-							<reference ref="331853183"/>

-						</array>

-						<reference key="parent" ref="960678392"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">382</int>

-						<reference key="object" ref="709074847"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="633115429"/>

-						</array>

-						<reference key="parent" ref="515308735"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">385</int>

-						<reference key="object" ref="201731424"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="930265681"/>

-						</array>

-						<reference key="parent" ref="515308735"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">386</int>

-						<reference key="object" ref="86150604"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="311969422"/>

-						</array>

-						<reference key="parent" ref="515308735"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">541</int>

-						<reference key="object" ref="477203622"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="631531164"/>

-						</array>

-						<reference key="parent" ref="515308735"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">543</int>

-						<reference key="object" ref="298603383"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="761107402"/>

-						</array>

-						<reference key="parent" ref="515308735"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">353</int>

-						<reference key="object" ref="348328898"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="300811574"/>

-						</array>

-						<reference key="parent" ref="448510093"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">354</int>

-						<reference key="object" ref="300811574"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="989050925"/>

-							<reference ref="700826966"/>

-							<reference ref="168436707"/>

-							<reference ref="363817195"/>

-							<reference ref="223835729"/>

-						</array>

-						<reference key="parent" ref="348328898"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">374</int>

-						<reference key="object" ref="989050925"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="189594322"/>

-						</array>

-						<reference key="parent" ref="300811574"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">375</int>

-						<reference key="object" ref="700826966"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="489340979"/>

-						</array>

-						<reference key="parent" ref="300811574"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">376</int>

-						<reference key="object" ref="168436707"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="53243865"/>

-						</array>

-						<reference key="parent" ref="300811574"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">377</int>

-						<reference key="object" ref="363817195"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="390084685"/>

-						</array>

-						<reference key="parent" ref="300811574"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">379</int>

-						<reference key="object" ref="223835729"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="283628678"/>

-						</array>

-						<reference key="parent" ref="300811574"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">285</int>

-						<reference key="object" ref="604417141"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="85544634"/>

-						</array>

-						<reference key="parent" ref="0"/>

-						<string key="objectName">EditPrograms</string>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">286</int>

-						<reference key="object" ref="85544634"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="1063387772"/>

-							<reference ref="758204686"/>

-							<reference ref="671954382"/>

-							<reference ref="492358940"/>

-						</array>

-						<reference key="parent" ref="604417141"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">423</int>

-						<reference key="object" ref="294137138"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="318286212"/>

-							<reference ref="511651072"/>

-						</array>

-						<reference key="parent" ref="0"/>

-						<string key="objectName">DockMenu</string>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">524</int>

-						<reference key="object" ref="318286212"/>

-						<reference key="parent" ref="294137138"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">526</int>

-						<reference key="object" ref="511651072"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="48278059"/>

-						</array>

-						<reference key="parent" ref="294137138"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">527</int>

-						<reference key="object" ref="48278059"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="1032342329"/>

-							<reference ref="563798000"/>

-						</array>

-						<reference key="parent" ref="511651072"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">532</int>

-						<reference key="object" ref="1032342329"/>

-						<reference key="parent" ref="48278059"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">533</int>

-						<reference key="object" ref="563798000"/>

-						<reference key="parent" ref="48278059"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100363</int>

-						<reference key="object" ref="990762273"/>

-						<reference key="parent" ref="119157981"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100364</int>

-						<reference key="object" ref="391919450"/>

-						<reference key="parent" ref="443008216"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100365</int>

-						<reference key="object" ref="649334366"/>

-						<reference key="parent" ref="282885445"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100368</int>

-						<reference key="object" ref="940564599"/>

-						<reference key="parent" ref="842100515"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100369</int>

-						<reference key="object" ref="666057093"/>

-						<reference key="parent" ref="31160162"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100370</int>

-						<reference key="object" ref="967619578"/>

-						<reference key="parent" ref="179949713"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100382</int>

-						<reference key="object" ref="633115429"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="341113515"/>

-						</array>

-						<reference key="parent" ref="709074847"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100385</int>

-						<reference key="object" ref="930265681"/>

-						<reference key="parent" ref="201731424"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100386</int>

-						<reference key="object" ref="311969422"/>

-						<reference key="parent" ref="86150604"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100541</int>

-						<reference key="object" ref="631531164"/>

-						<reference key="parent" ref="477203622"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100543</int>

-						<reference key="object" ref="761107402"/>

-						<reference key="parent" ref="298603383"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100374</int>

-						<reference key="object" ref="189594322"/>

-						<reference key="parent" ref="989050925"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100375</int>

-						<reference key="object" ref="489340979"/>

-						<reference key="parent" ref="700826966"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100376</int>

-						<reference key="object" ref="53243865"/>

-						<reference key="parent" ref="168436707"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100377</int>

-						<reference key="object" ref="390084685"/>

-						<reference key="parent" ref="363817195"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100379</int>

-						<reference key="object" ref="283628678"/>

-						<reference key="parent" ref="223835729"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">380</int>

-						<reference key="object" ref="341113515"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="759499526"/>

-							<reference ref="616492372"/>

-							<reference ref="543935434"/>

-							<reference ref="836673018"/>

-						</array>

-						<reference key="parent" ref="633115429"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">435</int>

-						<reference key="object" ref="759499526"/>

-						<reference key="parent" ref="341113515"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">384</int>

-						<reference key="object" ref="616492372"/>

-						<reference key="parent" ref="341113515"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">383</int>

-						<reference key="object" ref="543935434"/>

-						<reference key="parent" ref="341113515"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">381</int>

-						<reference key="object" ref="836673018"/>

-						<reference key="parent" ref="341113515"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">295</int>

-						<reference key="object" ref="1063387772"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="792419186"/>

-							<reference ref="17278747"/>

-							<reference ref="842897584"/>

-							<reference ref="905092943"/>

-						</array>

-						<reference key="parent" ref="85544634"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300295</int>

-						<reference key="object" ref="792419186"/>

-						<reference key="parent" ref="1063387772"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">200295</int>

-						<reference key="object" ref="17278747"/>

-						<reference key="parent" ref="1063387772"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100295</int>

-						<reference key="object" ref="842897584"/>

-						<reference key="parent" ref="1063387772"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">296</int>

-						<reference key="object" ref="905092943"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="242608782"/>

-							<reference ref="938444323"/>

-							<reference ref="84282687"/>

-						</array>

-						<reference key="parent" ref="1063387772"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">535</int>

-						<reference key="object" ref="242608782"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="34714764"/>

-						</array>

-						<reference key="parent" ref="905092943"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">575</int>

-						<reference key="object" ref="34714764"/>

-						<reference key="parent" ref="242608782"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">298</int>

-						<reference key="object" ref="938444323"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="825378892"/>

-						</array>

-						<reference key="parent" ref="905092943"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">573</int>

-						<reference key="object" ref="825378892"/>

-						<reference key="parent" ref="938444323"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">297</int>

-						<reference key="object" ref="84282687"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="432610585"/>

-						</array>

-						<reference key="parent" ref="905092943"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">574</int>

-						<reference key="object" ref="432610585"/>

-						<reference key="parent" ref="84282687"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">310</int>

-						<reference key="object" ref="758204686"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="1025474039"/>

-						</array>

-						<reference key="parent" ref="85544634"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100310</int>

-						<reference key="object" ref="1025474039"/>

-						<reference key="parent" ref="758204686"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">292</int>

-						<reference key="object" ref="671954382"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="143554520"/>

-						</array>

-						<reference key="parent" ref="85544634"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100292</int>

-						<reference key="object" ref="143554520"/>

-						<reference key="parent" ref="671954382"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">293</int>

-						<reference key="object" ref="492358940"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="8201128"/>

-						</array>

-						<reference key="parent" ref="85544634"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100293</int>

-						<reference key="object" ref="8201128"/>

-						<reference key="parent" ref="492358940"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300337</int>

-						<reference key="object" ref="10973343"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="184765684"/>

-						</array>

-						<reference key="parent" ref="448510093"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300338</int>

-						<reference key="object" ref="184765684"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="657659108"/>

-							<reference ref="290578835"/>

-							<reference ref="992839333"/>

-							<reference ref="138261120"/>

-							<reference ref="128352289"/>

-							<reference ref="57161931"/>

-						</array>

-						<reference key="parent" ref="10973343"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300358</int>

-						<reference key="object" ref="290578835"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="399127858"/>

-						</array>

-						<reference key="parent" ref="184765684"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300359</int>

-						<reference key="object" ref="657659108"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="259618205"/>

-						</array>

-						<reference key="parent" ref="184765684"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300360</int>

-						<reference key="object" ref="259618205"/>

-						<reference key="parent" ref="657659108"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300361</int>

-						<reference key="object" ref="399127858"/>

-						<reference key="parent" ref="290578835"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300362</int>

-						<reference key="object" ref="992839333"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="959555182"/>

-						</array>

-						<reference key="parent" ref="184765684"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300363</int>

-						<reference key="object" ref="959555182"/>

-						<reference key="parent" ref="992839333"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300364</int>

-						<reference key="object" ref="138261120"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="183409141"/>

-						</array>

-						<reference key="parent" ref="184765684"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300365</int>

-						<reference key="object" ref="183409141"/>

-						<reference key="parent" ref="138261120"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300368</int>

-						<reference key="object" ref="128352289"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="556463187"/>

-						</array>

-						<reference key="parent" ref="184765684"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300369</int>

-						<reference key="object" ref="556463187"/>

-						<reference key="parent" ref="128352289"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300370</int>

-						<reference key="object" ref="57161931"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="989804990"/>

-						</array>

-						<reference key="parent" ref="184765684"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300371</int>

-						<reference key="object" ref="989804990"/>

-						<reference key="parent" ref="57161931"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300421</int>

-						<reference key="object" ref="723450037"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="408298283"/>

-						</array>

-						<reference key="parent" ref="448510093"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300422</int>

-						<reference key="object" ref="408298283"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="878106058"/>

-							<reference ref="386152084"/>

-							<reference ref="487809555"/>

-							<reference ref="620944856"/>

-							<reference ref="477050998"/>

-							<reference ref="765780304"/>

-							<reference ref="1002778833"/>

-							<reference ref="522511724"/>

-						</array>

-						<reference key="parent" ref="723450037"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300423</int>

-						<reference key="object" ref="386152084"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="572508492"/>

-						</array>

-						<reference key="parent" ref="408298283"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300424</int>

-						<reference key="object" ref="878106058"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="718083688"/>

-						</array>

-						<reference key="parent" ref="408298283"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300440</int>

-						<reference key="object" ref="718083688"/>

-						<reference key="parent" ref="878106058"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300441</int>

-						<reference key="object" ref="572508492"/>

-						<reference key="parent" ref="386152084"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300447</int>

-						<reference key="object" ref="477050998"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="501304422"/>

-						</array>

-						<reference key="parent" ref="408298283"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300450</int>

-						<reference key="object" ref="501304422"/>

-						<reference key="parent" ref="477050998"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300451</int>

-						<reference key="object" ref="765780304"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="510771323"/>

-						</array>

-						<reference key="parent" ref="408298283"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300452</int>

-						<reference key="object" ref="510771323"/>

-						<reference key="parent" ref="765780304"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300453</int>

-						<reference key="object" ref="487809555"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="619977658"/>

-						</array>

-						<reference key="parent" ref="408298283"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300454</int>

-						<reference key="object" ref="619977658"/>

-						<reference key="parent" ref="487809555"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300455</int>

-						<reference key="object" ref="620944856"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="461823902"/>

-						</array>

-						<reference key="parent" ref="408298283"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300456</int>

-						<reference key="object" ref="461823902"/>

-						<reference key="parent" ref="620944856"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300457</int>

-						<reference key="object" ref="1002778833"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="897099877"/>

-						</array>

-						<reference key="parent" ref="408298283"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300458</int>

-						<reference key="object" ref="897099877"/>

-						<reference key="parent" ref="1002778833"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300459</int>

-						<reference key="object" ref="522511724"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="994587858"/>

-						</array>

-						<reference key="parent" ref="408298283"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300460</int>

-						<reference key="object" ref="994587858"/>

-						<reference key="parent" ref="522511724"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300472</int>

-						<reference key="object" ref="57246850"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="917248662"/>

-						</array>

-						<reference key="parent" ref="515308735"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300473</int>

-						<reference key="object" ref="917248662"/>

-						<reference key="parent" ref="57246850"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300476</int>

-						<reference key="object" ref="278155937"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="617441821"/>

-						</array>

-						<reference key="parent" ref="596750588"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300477</int>

-						<reference key="object" ref="406291430"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="67728988"/>

-						</array>

-						<reference key="parent" ref="596750588"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300478</int>

-						<reference key="object" ref="67728988"/>

-						<reference key="parent" ref="406291430"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300479</int>

-						<reference key="object" ref="617441821"/>

-						<reference key="parent" ref="278155937"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300482</int>

-						<reference key="object" ref="863505041"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="1016286396"/>

-						</array>

-						<reference key="parent" ref="596750588"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300483</int>

-						<reference key="object" ref="1016286396"/>

-						<reference key="parent" ref="863505041"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300487</int>

-						<reference key="object" ref="331853183"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="1042813110"/>

-						</array>

-						<reference key="parent" ref="515308735"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300488</int>

-						<reference key="object" ref="1042813110"/>

-						<reference key="parent" ref="331853183"/>

-					</object>

-				</array>

-			</object>

-			<dictionary class="NSMutableDictionary" key="flattenedProperties">

-				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="-3.ImportedFromIB2"/>

-				<string key="100292.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100293.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="100295.IBShouldRemoveOnLegacySave"/>

-				<string key="100310.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100363.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100364.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100365.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100368.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100369.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100374.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100375.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100376.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100377.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100379.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100382.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100385.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100386.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100541.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100543.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="129.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="129.ImportedFromIB2"/>

-				<string key="130.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="130.ImportedFromIB2"/>

-				<string key="131.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="131.ImportedFromIB2"/>

-				<string key="134.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="134.ImportedFromIB2"/>

-				<string key="136.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="136.ImportedFromIB2"/>

-				<string key="143.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="143.ImportedFromIB2"/>

-				<string key="144.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="144.ImportedFromIB2"/>

-				<string key="145.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="145.ImportedFromIB2"/>

-				<string key="149.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="149.ImportedFromIB2"/>

-				<string key="150.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="150.ImportedFromIB2"/>

-				<string key="157.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="157.ImportedFromIB2"/>

-				<string key="163.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="163.ImportedFromIB2"/>

-				<string key="169.IBEditorWindowLastContentRect">{{168, 821}, {113, 23}}</string>

-				<string key="169.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="169.ImportedFromIB2"/>

-				<string key="169.editorWindowContentRectSynchronizationRect">{{202, 626}, {154, 153}}</string>

-				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="19.ImportedFromIB2"/>

-				<integer value="1" key="196.ImportedFromIB2"/>

-				<string key="200295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="200295.IBShouldRemoveOnLegacySave"/>

-				<string key="203.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="203.ImportedFromIB2"/>

-				<string key="204.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="204.ImportedFromIB2"/>

-				<string key="23.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="23.ImportedFromIB2"/>

-				<string key="24.IBEditorWindowLastContentRect">{{349, 868}, {315, 143}}</string>

-				<string key="24.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="24.ImportedFromIB2"/>

-				<string key="24.editorWindowContentRectSynchronizationRect">{{271, 666}, {301, 153}}</string>

-				<string key="244.IBEditorWindowLastContentRect">{{127, 515}, {580, 341}}</string>

-				<string key="244.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<boolean value="YES" key="244.IBViewEditorWindowController.showingLayoutRectangles"/>

-				<string key="244.IBWindowTemplateEditedContentRect">{{127, 515}, {580, 341}}</string>

-				<integer value="1" key="244.ImportedFromIB2"/>

-				<string key="244.editorWindowContentRectSynchronizationRect">{{184, 290}, {481, 345}}</string>

-				<string key="244.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<boolean value="YES" key="244.windowTemplate.hasMinSize"/>

-				<string key="244.windowTemplate.maxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

-				<string key="244.windowTemplate.minSize">{320, 240}</string>

-				<string key="245.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="245.ImportedFromIB2"/>

-				<string key="245.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="269.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="269.ImportedFromIB2"/>

-				<string key="270.IBEditorWindowLastContentRect">{{58, 803}, {155, 33}}</string>

-				<string key="270.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="270.ImportedFromIB2"/>

-				<string key="270.editorWindowContentRectSynchronizationRect">{{100, 746}, {155, 33}}</string>

-				<string key="272.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="272.ImportedFromIB2"/>

-				<string key="285.IBEditorWindowLastContentRect">{{68, 585}, {454, 271}}</string>

-				<string key="285.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="285.IBViewEditorWindowController.showingBoundsRectangles"/>

-				<integer value="1" key="285.IBViewEditorWindowController.showingLayoutRectangles"/>

-				<string key="285.IBWindowTemplateEditedContentRect">{{68, 585}, {454, 271}}</string>

-				<integer value="1" key="285.ImportedFromIB2"/>

-				<string key="285.editorWindowContentRectSynchronizationRect">{{433, 406}, {486, 327}}</string>

-				<string key="285.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<boolean value="YES" key="285.windowTemplate.hasMinSize"/>

-				<string key="285.windowTemplate.maxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

-				<string key="285.windowTemplate.minSize">{320, 240}</string>

-				<string key="286.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="286.ImportedFromIB2"/>

-				<string key="29.IBEditorWindowLastContentRect">{{145, 1011}, {336, 20}}</string>

-				<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="29.ImportedFromIB2"/>

-				<string key="29.editorWindowContentRectSynchronizationRect">{{67, 819}, {336, 20}}</string>

-				<string key="292.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="292.ImportedFromIB2"/>

-				<string key="293.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="293.ImportedFromIB2"/>

-				<string key="295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="295.ImportedFromIB2"/>

-				<string key="296.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="296.ImportedFromIB2"/>

-				<string key="297.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="297.ImportedFromIB2"/>

-				<string key="298.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="298.ImportedFromIB2"/>

-				<string key="300295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300295.IBShouldRemoveOnLegacySave"/>

-				<string key="300337.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300337.ImportedFromIB2"/>

-				<string key="300338.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300338.ImportedFromIB2"/>

-				<string key="300338.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="300358.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300358.ImportedFromIB2"/>

-				<string key="300358.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="300359.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300359.ImportedFromIB2"/>

-				<string key="300359.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="300360.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300361.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300362.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300362.ImportedFromIB2"/>

-				<string key="300362.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="300363.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300364.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300364.ImportedFromIB2"/>

-				<string key="300364.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="300365.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300368.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300368.ImportedFromIB2"/>

-				<string key="300368.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="300369.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300370.ImportedFromIB2"/>

-				<string key="300370.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="300371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300421.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300421.ImportedFromIB2"/>

-				<string key="300422.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300422.ImportedFromIB2"/>

-				<string key="300422.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="300423.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300423.ImportedFromIB2"/>

-				<string key="300423.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="300424.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300424.ImportedFromIB2"/>

-				<string key="300424.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="300440.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300441.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300447.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300447.ImportedFromIB2"/>

-				<string key="300447.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="300450.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300451.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300451.ImportedFromIB2"/>

-				<string key="300451.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="300452.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300453.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300453.ImportedFromIB2"/>

-				<string key="300453.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="300454.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300455.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300455.ImportedFromIB2"/>

-				<string key="300455.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="300456.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300457.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300457.ImportedFromIB2"/>

-				<string key="300457.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="300458.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300459.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300459.ImportedFromIB2"/>

-				<string key="300459.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="300460.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300472.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300472.ImportedFromIB2"/>

-				<string key="300472.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="300473.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300473.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="300476.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300476.ImportedFromIB2"/>

-				<string key="300476.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="300477.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300477.ImportedFromIB2"/>

-				<string key="300477.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="300478.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300479.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300482.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300482.ImportedFromIB2"/>

-				<string key="300482.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="300483.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300483.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="300487.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300487.ImportedFromIB2"/>

-				<string key="300487.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="300488.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300488.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="305.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="305.ImportedFromIB2"/>

-				<string key="310.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="310.ImportedFromIB2"/>

-				<string key="348.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<object class="NSAffineTransform" key="348.IBViewBoundsToFrameTransform">

-					<bytes key="NSTransformStruct">P4AAAL+AAABBUAAAw6aAAA</bytes>

-				</object>

-				<integer value="1" key="348.ImportedFromIB2"/>

-				<string key="348.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="349.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="349.ImportedFromIB2"/>

-				<string key="350.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="350.ImportedFromIB2"/>

-				<string key="350.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="351.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="351.ImportedFromIB2"/>

-				<string key="351.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="352.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="352.ImportedFromIB2"/>

-				<string key="353.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="353.ImportedFromIB2"/>

-				<string key="354.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="354.ImportedFromIB2"/>

-				<string key="354.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="363.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="363.ImportedFromIB2"/>

-				<string key="363.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="364.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="364.ImportedFromIB2"/>

-				<string key="364.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="365.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="365.ImportedFromIB2"/>

-				<string key="365.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="368.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="368.ImportedFromIB2"/>

-				<string key="368.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="369.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="369.ImportedFromIB2"/>

-				<string key="369.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="370.ImportedFromIB2"/>

-				<string key="370.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="374.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="374.ImportedFromIB2"/>

-				<string key="374.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="375.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="375.ImportedFromIB2"/>

-				<string key="375.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="376.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="376.ImportedFromIB2"/>

-				<string key="376.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="377.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="377.ImportedFromIB2"/>

-				<string key="377.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="379.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="379.ImportedFromIB2"/>

-				<string key="379.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="380.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="380.ImportedFromIB2"/>

-				<string key="381.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="381.ImportedFromIB2"/>

-				<string key="382.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="382.ImportedFromIB2"/>

-				<string key="382.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="383.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="383.ImportedFromIB2"/>

-				<string key="384.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="384.ImportedFromIB2"/>

-				<string key="385.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="385.ImportedFromIB2"/>

-				<string key="385.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="386.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="386.ImportedFromIB2"/>

-				<string key="386.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="419.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="419.ImportedFromIB2"/>

-				<string key="420.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="420.ImportedFromIB2"/>

-				<string key="421.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="421.ImportedFromIB2"/>

-				<string key="423.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="423.ImportedFromIB2"/>

-				<string key="435.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="435.ImportedFromIB2"/>

-				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="5.ImportedFromIB2"/>

-				<string key="524.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="524.ImportedFromIB2"/>

-				<string key="526.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="526.ImportedFromIB2"/>

-				<string key="527.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="527.ImportedFromIB2"/>

-				<string key="532.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="532.ImportedFromIB2"/>

-				<string key="533.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="533.ImportedFromIB2"/>

-				<string key="535.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="535.ImportedFromIB2"/>

-				<string key="536.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="536.ImportedFromIB2"/>

-				<string key="537.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="537.ImportedFromIB2"/>

-				<string key="537.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="538.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="538.ImportedFromIB2"/>

-				<string key="541.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="541.ImportedFromIB2"/>

-				<string key="541.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="543.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="543.ImportedFromIB2"/>

-				<string key="543.object.labelIdentifier">IBBuiltInLabel-Red</string>

-				<string key="544.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="544.ImportedFromIB2"/>

-				<string key="545.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="545.ImportedFromIB2"/>

-				<string key="56.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="56.ImportedFromIB2"/>

-				<string key="57.IBEditorWindowLastContentRect">{{20, 641}, {218, 203}}</string>

-				<string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="57.ImportedFromIB2"/>

-				<string key="57.editorWindowContentRectSynchronizationRect">{{79, 616}, {218, 203}}</string>

-				<string key="573.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="573.ImportedFromIB2"/>

-				<string key="574.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="574.ImportedFromIB2"/>

-				<string key="575.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="575.ImportedFromIB2"/>

-				<string key="58.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="58.ImportedFromIB2"/>

-				<string key="92.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="92.ImportedFromIB2"/>

-			</dictionary>

-			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>

-			<nil key="activeLocalization"/>

-			<dictionary class="NSMutableDictionary" key="localizations"/>

-			<nil key="sourceID"/>

-			<int key="maxID">300490</int>

-		</object>

-		<object class="IBClassDescriber" key="IBDocument.Classes"/>

-		<int key="IBDocument.localizationMode">0</int>

-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>

-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">

-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>

-			<integer value="1040" key="NS.object.0"/>

-		</object>

-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>

-		<nil key="IBDocument.LastKnownRelativeProjectPath"/>

-		<int key="IBDocument.defaultPropertyAccessControl">3</int>

-		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">

-			<string key="NSMenuCheckmark">{9, 8}</string>

-			<string key="NSMenuMixedState">{7, 2}</string>

-			<string key="NSSwitch">{15, 15}</string>

-		</dictionary>

-	</data>

-</archive>

+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1040</int>
+		<string key="IBDocument.SystemVersion">11A289</string>
+		<string key="IBDocument.InterfaceBuilderVersion">900</string>
+		<string key="IBDocument.AppKitVersion">1094.2</string>
+		<string key="IBDocument.HIToolboxVersion">521.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">900</string>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.EditedObjectIDs"/>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="904585544">
+			<object class="NSCustomObject" id="815810918">
+				<object class="NSMutableString" key="NSClassName">
+					<characters key="NS.bytes">NSApplication</characters>
+				</object>
+			</object>
+			<object class="NSCustomObject" id="941939442">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="951368722">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSMenu" id="524015605">
+				<string key="NSTitle">MainMenu</string>
+				<array class="NSMutableArray" key="NSMenuItems">
+					<object class="NSMenuItem" id="365880285">
+						<reference key="NSMenu" ref="524015605"/>
+						<string key="NSTitle">X11</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<object class="NSCustomResource" key="NSOnImage" id="531645050">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">NSMenuCheckmark</string>
+						</object>
+						<object class="NSCustomResource" key="NSMixedImage" id="351811234">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">NSMenuMixedState</string>
+						</object>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="576521955">
+							<string key="NSTitle">X11</string>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="139290918">
+									<reference key="NSMenu" ref="576521955"/>
+									<string key="NSTitle">À propos d’X11</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="386173216">
+									<reference key="NSMenu" ref="576521955"/>
+									<string key="NSTitle">Préférences…</string>
+									<string key="NSKeyEquiv">,</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="272876017">
+									<reference key="NSMenu" ref="576521955"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="32285361">
+									<reference key="NSMenu" ref="576521955"/>
+									<string key="NSTitle">Services</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+									<string key="NSAction">submenuAction:</string>
+									<object class="NSMenu" key="NSSubmenu" id="821388474">
+										<object class="NSMutableString" key="NSTitle">
+											<characters key="NS.bytes">Services</characters>
+										</object>
+										<array class="NSMutableArray" key="NSMenuItems"/>
+										<string key="NSName">_NSServicesMenu</string>
+									</object>
+								</object>
+								<object class="NSMenuItem" id="431301145">
+									<reference key="NSMenu" ref="576521955"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="6876565">
+									<reference key="NSMenu" ref="576521955"/>
+									<string key="NSTitle">Basculer en mode plein écran</string>
+									<string key="NSKeyEquiv">a</string>
+									<int key="NSKeyEquivModMask">1572864</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="479677589">
+									<reference key="NSMenu" ref="576521955"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="301008465">
+									<reference key="NSMenu" ref="576521955"/>
+									<string key="NSTitle">Masquer X11</string>
+									<string key="NSKeyEquiv">h</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+									<int key="NSTag">42</int>
+								</object>
+								<object class="NSMenuItem" id="206802571">
+									<reference key="NSMenu" ref="576521955"/>
+									<string key="NSTitle">Masquer les autres</string>
+									<string key="NSKeyEquiv">h</string>
+									<int key="NSKeyEquivModMask">1572864</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="1023546148">
+									<reference key="NSMenu" ref="576521955"/>
+									<string key="NSTitle">Tout afficher</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+									<int key="NSTag">42</int>
+								</object>
+								<object class="NSMenuItem" id="848095279">
+									<reference key="NSMenu" ref="576521955"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="274138642">
+									<reference key="NSMenu" ref="576521955"/>
+									<string key="NSTitle">Quitter X11</string>
+									<string key="NSKeyEquiv">q</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+							</array>
+							<string key="NSName">_NSAppleMenu</string>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="868031522">
+						<reference key="NSMenu" ref="524015605"/>
+						<string key="NSTitle">Applications</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="531645050"/>
+						<reference key="NSMixedImage" ref="351811234"/>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="981161348">
+							<string key="NSTitle">Applications</string>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="390088328">
+									<reference key="NSMenu" ref="981161348"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="1065386165">
+									<reference key="NSMenu" ref="981161348"/>
+									<string key="NSTitle">Personnaliser…</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+							</array>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="200491363">
+						<reference key="NSMenu" ref="524015605"/>
+						<string key="NSTitle">Édition</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="531645050"/>
+						<reference key="NSMixedImage" ref="351811234"/>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="526778998">
+							<string key="NSTitle">Édition</string>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="185296989">
+									<reference key="NSMenu" ref="526778998"/>
+									<string key="NSTitle">Copier</string>
+									<string key="NSKeyEquiv">c</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+							</array>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="931553638">
+						<reference key="NSMenu" ref="524015605"/>
+						<string key="NSTitle">Fenêtre</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="531645050"/>
+						<reference key="NSMixedImage" ref="351811234"/>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="96874957">
+							<string key="NSTitle">Fenêtre</string>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="984461797">
+									<reference key="NSMenu" ref="96874957"/>
+									<string key="NSTitle">Fermer</string>
+									<string key="NSKeyEquiv">w</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="677652931">
+									<reference key="NSMenu" ref="96874957"/>
+									<string key="NSTitle">Placer dans le Dock</string>
+									<string key="NSKeyEquiv">m</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="1066447520">
+									<reference key="NSMenu" ref="96874957"/>
+									<string key="NSTitle">Réduire/agrandir</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="280172320">
+									<reference key="NSMenu" ref="96874957"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="1036389925">
+									<reference key="NSMenu" ref="96874957"/>
+									<string key="NSTitle">Faire défiler les fenêtres</string>
+									<string key="NSKeyEquiv">`</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="369641893">
+									<reference key="NSMenu" ref="96874957"/>
+									<string key="NSTitle">Faire défiler les fenêtres en sens inverse</string>
+									<string key="NSKeyEquiv">`</string>
+									<int key="NSKeyEquivModMask">1179648</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="155085383">
+									<reference key="NSMenu" ref="96874957"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="276216762">
+									<reference key="NSMenu" ref="96874957"/>
+									<string key="NSTitle">Tout ramener au premier plan</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+							</array>
+							<string key="NSName">_NSWindowsMenu</string>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="551174276">
+						<reference key="NSMenu" ref="524015605"/>
+						<string key="NSTitle">Aide</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="531645050"/>
+						<reference key="NSMixedImage" ref="351811234"/>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="511848303">
+							<string key="NSTitle">Aide</string>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="504984881">
+									<reference key="NSMenu" ref="511848303"/>
+									<string key="NSTitle">Aide X11</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+							</array>
+						</object>
+					</object>
+				</array>
+				<string key="NSName">_NSMainMenu</string>
+			</object>
+			<object class="NSCustomObject" id="485884620">
+				<string key="NSClassName">X11Controller</string>
+			</object>
+			<object class="NSWindowTemplate" id="124913468">
+				<int key="NSWindowStyleMask">3</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{414, 417.03906000000001}, {580, 341}}</string>
+				<int key="NSWTFlags">1350041600</int>
+				<string key="NSWindowTitle">Préférences d’X11</string>
+				<string key="NSWindowClass">NSPanel</string>
+				<object class="NSMutableString" key="NSViewClass">
+					<characters key="NS.bytes">View</characters>
+				</object>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
+				<string key="NSWindowContentMinSize">{320, 240}</string>
+				<object class="NSView" key="NSWindowView" id="941366957">
+					<nil key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSTabView" id="448510093">
+							<reference key="NSNextResponder" ref="941366957"/>
+							<int key="NSvFlags">274</int>
+							<string key="NSFrame">{{13, 10}, {554, 325}}</string>
+							<reference key="NSSuperview" ref="941366957"/>
+							<array class="NSMutableArray" key="NSTabViewItems">
+								<object class="NSTabViewItem" id="287591690">
+									<object class="NSMutableString" key="NSIdentifier">
+										<characters key="NS.bytes">1</characters>
+									</object>
+									<object class="NSView" key="NSView" id="596750588">
+										<reference key="NSNextResponder" ref="448510093"/>
+										<int key="NSvFlags">256</int>
+										<array class="NSMutableArray" key="NSSubviews">
+											<object class="NSButton" id="119157981">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 243}, {402, 18}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="179949713"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="990762273">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Émuler une souris à trois boutons</string>
+													<object class="NSFont" key="NSSupport" id="463863101">
+														<string key="NSName">LucidaGrande</string>
+														<double key="NSSize">13</double>
+														<int key="NSfFlags">1044</int>
+													</object>
+													<reference key="NSControlView" ref="119157981"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<object class="NSCustomResource" key="NSNormalImage" id="967651788">
+														<string key="NSClassName">NSImage</string>
+														<string key="NSResourceName">NSSwitch</string>
+													</object>
+													<object class="NSButtonImageSource" key="NSAlternateImage" id="391434389">
+														<string key="NSImageName">NSSwitch</string>
+													</object>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="443008216">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 82}, {484, 42}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="406291430"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="391919450">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">Quand cette option est activée, les touches équivalentes de la barre des menus peuvent perturber les applications X11 qui utilisent le modificateur d’instructions virtuelles.</string>
+													<object class="NSFont" key="NSSupport" id="26">
+														<string key="NSName">LucidaGrande</string>
+														<double key="NSSize">11</double>
+														<int key="NSfFlags">3100</int>
+													</object>
+													<string key="NSPlaceholderString"/>
+													<reference key="NSControlView" ref="443008216"/>
+													<object class="NSColor" key="NSBackgroundColor" id="57160303">
+														<int key="NSColorSpace">6</int>
+														<string key="NSCatalogName">System</string>
+														<string key="NSColorName">controlColor</string>
+														<object class="NSColor" key="NSColor" id="590688762">
+															<int key="NSColorSpace">3</int>
+															<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+														</object>
+													</object>
+													<object class="NSColor" key="NSTextColor" id="930815747">
+														<int key="NSColorSpace">6</int>
+														<string key="NSCatalogName">System</string>
+														<string key="NSColorName">controlTextColor</string>
+														<object class="NSColor" key="NSColor" id="214098874">
+															<int key="NSColorSpace">3</int>
+															<bytes key="NSWhite">MAA</bytes>
+														</object>
+													</object>
+												</object>
+											</object>
+											<object class="NSTextField" id="282885445">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 203}, {484, 34}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="31160162"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="649334366">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string type="base64-UTF8" key="NSContents">TWFpbnRlbmV6IGxhIHRvdWNoZSBPcHRpb24gb3UgQ29tbWFuZGUgZW5mb25jw6llIHRvdXQgZW4gY2xp
+cXVhbnQgcG91ciBhY3RpdmVyIGxlIGJvdXRvbiBkcm9pdCBvdSBjZW50cmFsIGRlIGxhIHNvdXJpcy4K
+A</string>
+													<reference key="NSSupport" ref="26"/>
+													<string key="NSPlaceholderString"/>
+													<reference key="NSControlView" ref="282885445"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSButton" id="842100515">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 130}, {402, 18}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="443008216"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="940564599">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Activer les touches équivalentes sous X11</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="842100515"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="967651788"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="31160162">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 144}, {484, 29}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="842100515"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="666057093">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">Autorise les modifications du menu d’entrée pour remplacer la disposition des touches du clavier X11.</string>
+													<reference key="NSSupport" ref="26"/>
+													<string key="NSPlaceholderString"/>
+													<reference key="NSControlView" ref="31160162"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSButton" id="179949713">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 179}, {402, 18}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="282885445"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="967619578">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Utiliser la disposition des touches du clavier du système</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="179949713"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="967651788"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="278155937">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 35}, {484, 28}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="863505041"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="617441821">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">Une fois activées, les touches option envoient les symboles Alt_L et Alt_R au lieu de Mode_switch.</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="278155937"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSButton" id="406291430">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 69}, {402, 18}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="278155937"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="67728988">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Les touches option envoient Alt_L et Alt_R</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="406291430"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="967651788"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSButton" id="863505041">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 8}, {418, 18}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="448510093"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="1016286396">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Faire toujours défiler dans le sens du mouvement des doigts</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="863505041"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="967651788"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+										</array>
+										<string key="NSFrame">{{10, 33}, {534, 279}}</string>
+										<reference key="NSSuperview" ref="448510093"/>
+										<reference key="NSNextKeyView" ref="119157981"/>
+									</object>
+									<string key="NSLabel">Entrée</string>
+									<reference key="NSColor" ref="57160303"/>
+									<reference key="NSTabView" ref="448510093"/>
+								</object>
+								<object class="NSTabViewItem" id="960678392">
+									<object class="NSMutableString" key="NSIdentifier">
+										<characters key="NS.bytes">2</characters>
+									</object>
+									<object class="NSView" key="NSView" id="515308735">
+										<nil key="NSNextResponder"/>
+										<int key="NSvFlags">256</int>
+										<array class="NSMutableArray" key="NSSubviews">
+											<object class="NSPopUpButton" id="709074847">
+												<reference key="NSNextResponder" ref="515308735"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{90, 234}, {128, 26}}</string>
+												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSNextKeyView" ref="86150604"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSPopUpButtonCell" key="NSCell" id="633115429">
+													<int key="NSCellFlags">-2076049856</int>
+													<int key="NSCellFlags2">1024</int>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="709074847"/>
+													<int key="NSButtonFlags">109199615</int>
+													<int key="NSButtonFlags2">1</int>
+													<object class="NSFont" key="NSAlternateImage">
+														<string key="NSName">LucidaGrande</string>
+														<double key="NSSize">13</double>
+														<int key="NSfFlags">16</int>
+													</object>
+													<string key="NSAlternateContents"/>
+													<object class="NSMutableString" key="NSKeyEquivalent">
+														<characters key="NS.bytes"/>
+													</object>
+													<int key="NSPeriodicDelay">400</int>
+													<int key="NSPeriodicInterval">75</int>
+													<object class="NSMenuItem" key="NSMenuItem" id="616492372">
+														<reference key="NSMenu" ref="341113515"/>
+														<string key="NSTitle">du moniteur</string>
+														<string key="NSKeyEquiv"/>
+														<int key="NSKeyEquivModMask">1048576</int>
+														<int key="NSMnemonicLoc">2147483647</int>
+														<int key="NSState">1</int>
+														<reference key="NSOnImage" ref="531645050"/>
+														<reference key="NSMixedImage" ref="351811234"/>
+														<string key="NSAction">_popUpItemAction:</string>
+														<int key="NSTag">-1</int>
+														<reference key="NSTarget" ref="633115429"/>
+													</object>
+													<bool key="NSMenuItemRespectAlignment">YES</bool>
+													<object class="NSMenu" key="NSMenu" id="341113515">
+														<object class="NSMutableString" key="NSTitle">
+															<characters key="NS.bytes">OtherViews</characters>
+														</object>
+														<array class="NSMutableArray" key="NSMenuItems">
+															<reference ref="616492372"/>
+															<object class="NSMenuItem" id="759499526">
+																<reference key="NSMenu" ref="341113515"/>
+																<string key="NSTitle">256 couleurs</string>
+																<string key="NSKeyEquiv"/>
+																<int key="NSKeyEquivModMask">1048576</int>
+																<int key="NSMnemonicLoc">2147483647</int>
+																<reference key="NSOnImage" ref="531645050"/>
+																<reference key="NSMixedImage" ref="351811234"/>
+																<string key="NSAction">_popUpItemAction:</string>
+																<int key="NSTag">8</int>
+																<reference key="NSTarget" ref="633115429"/>
+															</object>
+															<object class="NSMenuItem" id="543935434">
+																<reference key="NSMenu" ref="341113515"/>
+																<string key="NSTitle">milliers</string>
+																<string key="NSKeyEquiv"/>
+																<int key="NSKeyEquivModMask">1048576</int>
+																<int key="NSMnemonicLoc">2147483647</int>
+																<reference key="NSOnImage" ref="531645050"/>
+																<reference key="NSMixedImage" ref="351811234"/>
+																<string key="NSAction">_popUpItemAction:</string>
+																<int key="NSTag">15</int>
+																<reference key="NSTarget" ref="633115429"/>
+															</object>
+															<object class="NSMenuItem" id="836673018">
+																<reference key="NSMenu" ref="341113515"/>
+																<string key="NSTitle">millions</string>
+																<string key="NSKeyEquiv"/>
+																<int key="NSKeyEquivModMask">1048576</int>
+																<int key="NSMnemonicLoc">2147483647</int>
+																<reference key="NSOnImage" ref="531645050"/>
+																<reference key="NSMixedImage" ref="351811234"/>
+																<string key="NSAction">_popUpItemAction:</string>
+																<int key="NSTag">24</int>
+																<reference key="NSTarget" ref="633115429"/>
+															</object>
+														</array>
+													</object>
+													<int key="NSPreferredEdge">3</int>
+													<bool key="NSUsesItemFromMenu">YES</bool>
+													<bool key="NSAltersState">YES</bool>
+													<int key="NSArrowPosition">1</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="201731424">
+												<reference key="NSNextResponder" ref="515308735"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{17, 238}, {71, 20}}</string>
+												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSNextKeyView" ref="709074847"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="930265681">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">Couleurs :</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<string key="NSPlaceholderString"/>
+													<reference key="NSControlView" ref="201731424"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSTextField" id="86150604">
+												<reference key="NSNextResponder" ref="515308735"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 216}, {392, 14}}</string>
+												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSNextKeyView" ref="477203622"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="311969422">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">Cette option prend effet au prochain lancement d’X11.</string>
+													<reference key="NSSupport" ref="26"/>
+													<string key="NSPlaceholderString"/>
+													<reference key="NSControlView" ref="86150604"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSButton" id="477203622">
+												<reference key="NSNextResponder" ref="515308735"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 182}, {409, 23}}</string>
+												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSNextKeyView" ref="298603383"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="631531164">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Mode plein écran</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="477203622"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="967651788"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSButton" id="57246850">
+												<reference key="NSNextResponder" ref="515308735"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{37, 116}, {468, 18}}</string>
+												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSNextKeyView" ref="331853183"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="917248662">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Autoriser un accès à la barre des menus en mode plein écran</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="57246850"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="967651788"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="298603383">
+												<reference key="NSNextResponder" ref="515308735"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 145}, {484, 31}}</string>
+												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSNextKeyView" ref="57246850"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="761107402">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">Active la fenêtre root X11. Utilisez le raccourci clavier Commande + Option + A pour ouvrir et fermer le mode plein écran.</string>
+													<reference key="NSSupport" ref="26"/>
+													<string key="NSPlaceholderString"/>
+													<reference key="NSControlView" ref="298603383"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSTextField" id="331853183">
+												<reference key="NSNextResponder" ref="515308735"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{54, 79}, {466, 31}}</string>
+												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSNextKeyView" ref="448510093"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="1042813110">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">La barre des menus sera visible lorsque le curseur de souris est placé en haut de votre affichage principal.</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="331853183"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+										</array>
+										<string key="NSFrame">{{10, 33}, {534, 279}}</string>
+										<reference key="NSNextKeyView" ref="201731424"/>
+									</object>
+									<string key="NSLabel">Sortie</string>
+									<reference key="NSColor" ref="57160303"/>
+									<reference key="NSTabView" ref="448510093"/>
+								</object>
+								<object class="NSTabViewItem" id="723450037">
+									<object class="NSMutableString" key="NSIdentifier">
+										<characters key="NS.bytes">2</characters>
+									</object>
+									<object class="NSView" key="NSView" id="408298283">
+										<nil key="NSNextResponder"/>
+										<int key="NSvFlags">256</int>
+										<array class="NSMutableArray" key="NSSubviews">
+											<object class="NSButton" id="878106058">
+												<reference key="NSNextResponder" ref="408298283"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 255}, {409, 23}}</string>
+												<reference key="NSSuperview" ref="408298283"/>
+												<reference key="NSNextKeyView" ref="386152084"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="718083688">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Activer la synchronisation</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="878106058"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="967651788"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="386152084">
+												<reference key="NSNextResponder" ref="408298283"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 207}, {494, 42}}</string>
+												<reference key="NSSuperview" ref="408298283"/>
+												<reference key="NSNextKeyView" ref="487809555"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="572508492">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">Active la commande de menu « Copier » et permet la synchronisation entre le presse-papiers de OSX, celui de X11 (CLIPBOARD) et les mémoires tampons principales (PRIMARY).</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="386152084"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSButton" id="477050998">
+												<reference key="NSNextResponder" ref="408298283"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{34, 129}, {458, 18}}</string>
+												<reference key="NSSuperview" ref="408298283"/>
+												<reference key="NSNextKeyView" ref="765780304"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="501304422">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Mettre à jour CLIPBOARD lorsque le presse-papiers est modifié</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="477050998"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="967651788"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSButton" id="765780304">
+												<reference key="NSNextResponder" ref="408298283"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{34, 104}, {495, 18}}</string>
+												<reference key="NSSuperview" ref="408298283"/>
+												<reference key="NSNextKeyView" ref="1002778833"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="510771323">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Mettre à jour PRIMARY (clic central) lorsque le presse-papiers est modifié</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="765780304"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="967651788"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSButton" id="1002778833">
+												<reference key="NSNextResponder" ref="408298283"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{34, 79}, {437, 18}}</string>
+												<reference key="NSSuperview" ref="408298283"/>
+												<reference key="NSNextKeyView" ref="522511724"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="897099877">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Mettre à jour le presse-papiers dès la sélection de nouveau texte</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="1002778833"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="967651788"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSButton" id="487809555">
+												<reference key="NSNextResponder" ref="408298283"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{34, 192}, {474, 18}}</string>
+												<reference key="NSSuperview" ref="408298283"/>
+												<reference key="NSNextKeyView" ref="620944856"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="619977658">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Mettre à jour le presse-papiers lorsque CLIPBOARD est modifié</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="487809555"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="967651788"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="620944856">
+												<reference key="NSNextResponder" ref="408298283"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{48, 158}, {482, 28}}</string>
+												<reference key="NSSuperview" ref="408298283"/>
+												<reference key="NSNextKeyView" ref="477050998"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="461823902">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">Désactivez cette option si vous voulez utiliser xclipboard, klipper, ou tout autre gestionnaire de presse-papiers X11.</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="620944856"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSTextField" id="522511724">
+												<reference key="NSNextResponder" ref="408298283"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{48, 47}, {482, 28}}</string>
+												<reference key="NSSuperview" ref="408298283"/>
+												<reference key="NSNextKeyView" ref="448510093"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="994587858">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">En raison de limitations du protocole X11, cette option ne fonctionnera pas toujours dans certaines applications.</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="522511724"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+										</array>
+										<string key="NSFrame">{{10, 33}, {534, 279}}</string>
+										<reference key="NSNextKeyView" ref="878106058"/>
+									</object>
+									<string key="NSLabel">Presse-papiers</string>
+									<reference key="NSColor" ref="57160303"/>
+									<reference key="NSTabView" ref="448510093"/>
+								</object>
+								<object class="NSTabViewItem" id="10973343">
+									<object class="NSMutableString" key="NSIdentifier">
+										<characters key="NS.bytes">2</characters>
+									</object>
+									<object class="NSView" key="NSView" id="184765684">
+										<nil key="NSNextResponder"/>
+										<int key="NSvFlags">256</int>
+										<array class="NSMutableArray" key="NSSubviews">
+											<object class="NSButton" id="657659108">
+												<reference key="NSNextResponder" ref="184765684"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{15, 245}, {402, 18}}</string>
+												<reference key="NSSuperview" ref="184765684"/>
+												<reference key="NSNextKeyView" ref="290578835"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="259618205">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Activation des fenêtres inactives en un clic</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="657659108"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="967651788"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="290578835">
+												<reference key="NSNextResponder" ref="184765684"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{23, 208}, {505, 31}}</string>
+												<reference key="NSSuperview" ref="184765684"/>
+												<reference key="NSNextKeyView" ref="992839333"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="399127858">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">En cas d’activation de cette option, si vous cliquez sur une fenêtre inactive, celle-ci deviendra active et le clic sera effectif.</string>
+													<reference key="NSSupport" ref="26"/>
+													<string key="NSPlaceholderString"/>
+													<reference key="NSControlView" ref="290578835"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSButton" id="992839333">
+												<reference key="NSNextResponder" ref="184765684"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{15, 184}, {402, 18}}</string>
+												<reference key="NSSuperview" ref="184765684"/>
+												<reference key="NSNextKeyView" ref="138261120"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="959555182">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Activation des fenêtres survolées par la souris</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="992839333"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="967651788"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="138261120">
+												<reference key="NSNextResponder" ref="184765684"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{23, 150}, {505, 28}}</string>
+												<reference key="NSSuperview" ref="184765684"/>
+												<reference key="NSNextKeyView" ref="128352289"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="183409141">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">L’activation des fenêtres X11 suit le curseur. Ceci comporte des effets adverses.</string>
+													<reference key="NSSupport" ref="26"/>
+													<string key="NSPlaceholderString"/>
+													<reference key="NSControlView" ref="138261120"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSButton" id="128352289">
+												<reference key="NSNextResponder" ref="184765684"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{15, 140}, {402, 18}}</string>
+												<reference key="NSSuperview" ref="184765684"/>
+												<reference key="NSNextKeyView" ref="57161931"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="556463187">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Activation des nouvelles fenêtres</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="128352289"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="967651788"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="57161931">
+												<reference key="NSNextResponder" ref="184765684"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{23, 92}, {505, 42}}</string>
+												<reference key="NSSuperview" ref="184765684"/>
+												<reference key="NSNextKeyView" ref="448510093"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="989804990">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">Lorsque cette option est activée, la création d’une nouvelle fenêtre X11 fait passer X11.app au premier plan (au lieu de Finder.app, Terminal.app, etc.)</string>
+													<reference key="NSSupport" ref="26"/>
+													<string key="NSPlaceholderString"/>
+													<reference key="NSControlView" ref="57161931"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+										</array>
+										<string key="NSFrame">{{10, 33}, {534, 279}}</string>
+										<reference key="NSNextKeyView" ref="657659108"/>
+									</object>
+									<string key="NSLabel">Fenêtres</string>
+									<reference key="NSColor" ref="57160303"/>
+									<reference key="NSTabView" ref="448510093"/>
+								</object>
+								<object class="NSTabViewItem" id="348328898">
+									<object class="NSView" key="NSView" id="300811574">
+										<nil key="NSNextResponder"/>
+										<int key="NSvFlags">256</int>
+										<array class="NSMutableArray" key="NSSubviews">
+											<object class="NSButton" id="989050925">
+												<reference key="NSNextResponder" ref="300811574"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 243}, {402, 18}}</string>
+												<reference key="NSSuperview" ref="300811574"/>
+												<reference key="NSNextKeyView" ref="168436707"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="189594322">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Authentifier les connexions</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="989050925"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="967651788"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSButton" id="700826966">
+												<reference key="NSNextResponder" ref="300811574"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 166}, {402, 18}}</string>
+												<reference key="NSSuperview" ref="300811574"/>
+												<reference key="NSNextKeyView" ref="363817195"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="489340979">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Autoriser les connexions de clients réseau</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="700826966"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="967651788"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="168436707">
+												<reference key="NSNextResponder" ref="300811574"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 195}, {484, 42}}</string>
+												<reference key="NSSuperview" ref="300811574"/>
+												<reference key="NSNextKeyView" ref="700826966"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="53243865">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">Le lancement d’X11 créera des touches de contrôle d’accès Xauthority. Si l’adresse IP du système change, ces touches ne seront plus valides, ce qui risquera d’empêcher le lancement des applications X11.</string>
+													<reference key="NSSupport" ref="26"/>
+													<string key="NSPlaceholderString"/>
+													<reference key="NSControlView" ref="168436707"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSTextField" id="363817195">
+												<reference key="NSNextResponder" ref="300811574"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 104}, {484, 56}}</string>
+												<reference key="NSSuperview" ref="300811574"/>
+												<reference key="NSNextKeyView" ref="223835729"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="390084685">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">En cas d’activation de cette option, « Authentifier les connexions » doit aussi être activée pour garantir la sécurité du système. En cas de désactivation, les connexions à partir d’applications distantes sont interdites.</string>
+													<reference key="NSSupport" ref="26"/>
+													<string key="NSPlaceholderString"/>
+													<reference key="NSControlView" ref="363817195"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSTextField" id="223835729">
+												<reference key="NSNextResponder" ref="300811574"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{17, 17}, {404, 14}}</string>
+												<reference key="NSSuperview" ref="300811574"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="283628678">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">Ces options prennent effet au prochain lancement d’X11.</string>
+													<reference key="NSSupport" ref="26"/>
+													<string key="NSPlaceholderString"/>
+													<reference key="NSControlView" ref="223835729"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+										</array>
+										<string key="NSFrame">{{10, 33}, {534, 279}}</string>
+										<reference key="NSNextKeyView" ref="989050925"/>
+									</object>
+									<string key="NSLabel">Sécurité</string>
+									<reference key="NSColor" ref="57160303"/>
+									<reference key="NSTabView" ref="448510093"/>
+								</object>
+							</array>
+							<reference key="NSSelectedTabViewItem" ref="287591690"/>
+							<reference key="NSFont" ref="463863101"/>
+							<int key="NSTvFlags">0</int>
+							<bool key="NSAllowTruncatedLabels">YES</bool>
+							<bool key="NSDrawsBackground">YES</bool>
+							<array class="NSMutableArray" key="NSSubviews">
+								<reference ref="596750588"/>
+							</array>
+						</object>
+					</array>
+					<string key="NSFrameSize">{580, 341}</string>
+					<reference key="NSNextKeyView" ref="448510093"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
+				<string key="NSMinSize">{320, 262}</string>
+				<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
+				<string key="NSFrameAutosaveName">x11_prefs</string>
+			</object>
+			<object class="NSWindowTemplate" id="604417141">
+				<int key="NSWindowStyleMask">11</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{302, 440}, {548, 271}}</string>
+				<int key="NSWTFlags">1350041600</int>
+				<string key="NSWindowTitle">Menu de l’application X11</string>
+				<string key="NSWindowClass">NSPanel</string>
+				<object class="NSMutableString" key="NSViewClass">
+					<characters key="NS.bytes">View</characters>
+				</object>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
+				<string key="NSWindowContentMinSize">{320, 240}</string>
+				<object class="NSView" key="NSWindowView" id="85544634">
+					<nil key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSButton" id="671954382">
+							<reference key="NSNextResponder" ref="85544634"/>
+							<int key="NSvFlags">265</int>
+							<string key="NSFrame">{{372, 191}, {162, 32}}</string>
+							<reference key="NSSuperview" ref="85544634"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="143554520">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">137887744</int>
+								<string key="NSContents">Dupliquer</string>
+								<reference key="NSSupport" ref="463863101"/>
+								<reference key="NSControlView" ref="671954382"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">1</int>
+								<object class="NSFont" key="NSAlternateImage" id="549406736">
+									<string key="NSName">Helvetica</string>
+									<double key="NSSize">13</double>
+									<int key="NSfFlags">16</int>
+								</object>
+								<string key="NSAlternateContents"/>
+								<object class="NSMutableString" key="NSKeyEquivalent">
+									<characters key="NS.bytes"/>
+								</object>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSButton" id="492358940">
+							<reference key="NSNextResponder" ref="85544634"/>
+							<int key="NSvFlags">265</int>
+							<string key="NSFrame">{{372, 159}, {162, 32}}</string>
+							<reference key="NSSuperview" ref="85544634"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="8201128">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">137887744</int>
+								<string key="NSContents">Supprimer</string>
+								<reference key="NSSupport" ref="463863101"/>
+								<reference key="NSControlView" ref="492358940"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">1</int>
+								<reference key="NSAlternateImage" ref="549406736"/>
+								<string key="NSAlternateContents"/>
+								<object class="NSMutableString" key="NSKeyEquivalent">
+									<characters key="NS.bytes"/>
+								</object>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSScrollView" id="1063387772">
+							<reference key="NSNextResponder" ref="85544634"/>
+							<int key="NSvFlags">274</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSClipView" id="580565898">
+									<reference key="NSNextResponder" ref="1063387772"/>
+									<int key="NSvFlags">2304</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<object class="NSTableView" id="905092943">
+											<reference key="NSNextResponder" ref="580565898"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrameSize">{333, 198}</string>
+											<reference key="NSSuperview" ref="580565898"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTableHeaderView" key="NSHeaderView" id="792419186">
+												<reference key="NSNextResponder" ref="672307654"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrameSize">{333, 17}</string>
+												<reference key="NSSuperview" ref="672307654"/>
+												<reference key="NSTableView" ref="905092943"/>
+											</object>
+											<object class="_NSCornerView" key="NSCornerView" id="898633680">
+												<reference key="NSNextResponder" ref="1063387772"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{334, 0}, {16, 17}}</string>
+												<reference key="NSSuperview" ref="1063387772"/>
+											</object>
+											<array class="NSMutableArray" key="NSTableColumns">
+												<object class="NSTableColumn" id="938444323">
+													<double key="NSWidth">155</double>
+													<double key="NSMinWidth">62.730998992919922</double>
+													<double key="NSMaxWidth">1000</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75628096</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">Nom</string>
+														<reference key="NSSupport" ref="26"/>
+														<object class="NSColor" key="NSBackgroundColor" id="113872566">
+															<int key="NSColorSpace">3</int>
+															<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
+														</object>
+														<object class="NSColor" key="NSTextColor" id="249576247">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">headerTextColor</string>
+															<reference key="NSColor" ref="214098874"/>
+														</object>
+													</object>
+													<object class="NSTextFieldCell" key="NSDataCell" id="825378892">
+														<int key="NSCellFlags">338820672</int>
+														<int key="NSCellFlags2">1024</int>
+														<string key="NSContents">Text Cell</string>
+														<reference key="NSSupport" ref="463863101"/>
+														<string key="NSPlaceholderString"/>
+														<reference key="NSControlView" ref="905092943"/>
+														<object class="NSColor" key="NSBackgroundColor" id="822946413">
+															<int key="NSColorSpace">3</int>
+															<bytes key="NSWhite">MQA</bytes>
+														</object>
+														<reference key="NSTextColor" ref="930815747"/>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<bool key="NSIsEditable">YES</bool>
+													<reference key="NSTableView" ref="905092943"/>
+													<string key="NSHeaderToolTip"/>
+												</object>
+												<object class="NSTableColumn" id="84282687">
+													<double key="NSWidth">100</double>
+													<double key="NSMinWidth">40</double>
+													<double key="NSMaxWidth">1000</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75628096</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">Commande</string>
+														<reference key="NSSupport" ref="26"/>
+														<reference key="NSBackgroundColor" ref="113872566"/>
+														<reference key="NSTextColor" ref="249576247"/>
+													</object>
+													<object class="NSTextFieldCell" key="NSDataCell" id="432610585">
+														<int key="NSCellFlags">338820672</int>
+														<int key="NSCellFlags2">1024</int>
+														<string key="NSContents">Text Cell</string>
+														<reference key="NSSupport" ref="463863101"/>
+														<string key="NSPlaceholderString"/>
+														<reference key="NSControlView" ref="905092943"/>
+														<reference key="NSBackgroundColor" ref="822946413"/>
+														<reference key="NSTextColor" ref="930815747"/>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<bool key="NSIsEditable">YES</bool>
+													<reference key="NSTableView" ref="905092943"/>
+													<string key="NSHeaderToolTip"/>
+												</object>
+												<object class="NSTableColumn" id="242608782">
+													<double key="NSWidth">69</double>
+													<double key="NSMinWidth">10</double>
+													<double key="NSMaxWidth">1000</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75628096</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">Raccourci</string>
+														<reference key="NSSupport" ref="26"/>
+														<object class="NSColor" key="NSBackgroundColor">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">headerColor</string>
+															<reference key="NSColor" ref="822946413"/>
+														</object>
+														<reference key="NSTextColor" ref="249576247"/>
+													</object>
+													<object class="NSTextFieldCell" key="NSDataCell" id="34714764">
+														<int key="NSCellFlags">338820672</int>
+														<int key="NSCellFlags2">1024</int>
+														<string key="NSContents">Text Cell</string>
+														<object class="NSFont" key="NSSupport">
+															<string key="NSName">LucidaGrande</string>
+															<double key="NSSize">12</double>
+															<int key="NSfFlags">16</int>
+														</object>
+														<string key="NSPlaceholderString"/>
+														<reference key="NSControlView" ref="905092943"/>
+														<bool key="NSDrawsBackground">YES</bool>
+														<object class="NSColor" key="NSBackgroundColor" id="812484075">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">controlBackgroundColor</string>
+															<reference key="NSColor" ref="590688762"/>
+														</object>
+														<reference key="NSTextColor" ref="930815747"/>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<bool key="NSIsEditable">YES</bool>
+													<reference key="NSTableView" ref="905092943"/>
+													<string key="NSHeaderToolTip"/>
+												</object>
+											</array>
+											<double key="NSIntercellSpacingWidth">3</double>
+											<double key="NSIntercellSpacingHeight">2</double>
+											<reference key="NSBackgroundColor" ref="822946413"/>
+											<object class="NSColor" key="NSGridColor">
+												<int key="NSColorSpace">6</int>
+												<string key="NSCatalogName">System</string>
+												<string key="NSColorName">gridColor</string>
+												<object class="NSColor" key="NSColor">
+													<int key="NSColorSpace">3</int>
+													<bytes key="NSWhite">MC41AA</bytes>
+												</object>
+											</object>
+											<double key="NSRowHeight">17</double>
+											<int key="NSTvFlags">1379958784</int>
+											<reference key="NSDelegate"/>
+											<reference key="NSDataSource"/>
+											<int key="NSColumnAutoresizingStyle">1</int>
+											<int key="NSDraggingSourceMaskForLocal">-1</int>
+											<int key="NSDraggingSourceMaskForNonLocal">0</int>
+											<bool key="NSAllowsTypeSelect">YES</bool>
+											<int key="NSTableViewDraggingDestinationStyle">0</int>
+											<int key="NSTableViewGroupRowStyle">1</int>
+										</object>
+									</array>
+									<string key="NSFrame">{{1, 17}, {333, 198}}</string>
+									<reference key="NSSuperview" ref="1063387772"/>
+									<reference key="NSNextKeyView" ref="905092943"/>
+									<reference key="NSDocView" ref="905092943"/>
+									<reference key="NSBGColor" ref="812484075"/>
+									<int key="NScvFlags">4</int>
+								</object>
+								<object class="NSScroller" id="842897584">
+									<reference key="NSNextResponder" ref="1063387772"/>
+									<int key="NSvFlags">256</int>
+									<string key="NSFrame">{{334, 17}, {15, 198}}</string>
+									<reference key="NSSuperview" ref="1063387772"/>
+									<reference key="NSTarget" ref="1063387772"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSPercent">0.99492377042770386</double>
+								</object>
+								<object class="NSScroller" id="17278747">
+									<reference key="NSNextResponder" ref="1063387772"/>
+									<int key="NSvFlags">256</int>
+									<string key="NSFrame">{{1, 215}, {333, 15}}</string>
+									<reference key="NSSuperview" ref="1063387772"/>
+									<int key="NSsFlags">1</int>
+									<reference key="NSTarget" ref="1063387772"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSPercent">0.68852460384368896</double>
+								</object>
+								<object class="NSClipView" id="672307654">
+									<reference key="NSNextResponder" ref="1063387772"/>
+									<int key="NSvFlags">2304</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<reference ref="792419186"/>
+									</array>
+									<string key="NSFrame">{{1, 0}, {333, 17}}</string>
+									<reference key="NSSuperview" ref="1063387772"/>
+									<reference key="NSNextKeyView" ref="792419186"/>
+									<reference key="NSDocView" ref="792419186"/>
+									<reference key="NSBGColor" ref="812484075"/>
+									<int key="NScvFlags">4</int>
+								</object>
+								<reference ref="898633680"/>
+							</array>
+							<string key="NSFrame">{{20, 20}, {350, 231}}</string>
+							<reference key="NSSuperview" ref="85544634"/>
+							<reference key="NSNextKeyView" ref="580565898"/>
+							<int key="NSsFlags">133170</int>
+							<reference key="NSVScroller" ref="842897584"/>
+							<reference key="NSHScroller" ref="17278747"/>
+							<reference key="NSContentView" ref="580565898"/>
+							<reference key="NSHeaderClipView" ref="672307654"/>
+							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
+						</object>
+						<object class="NSButton" id="758204686">
+							<reference key="NSNextResponder" ref="85544634"/>
+							<int key="NSvFlags">265</int>
+							<string key="NSFrame">{{372, 223}, {162, 32}}</string>
+							<reference key="NSSuperview" ref="85544634"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="1025474039">
+								<int key="NSCellFlags">-2080244224</int>
+								<int key="NSCellFlags2">137887744</int>
+								<string key="NSContents">Ajouter un élément</string>
+								<reference key="NSSupport" ref="463863101"/>
+								<reference key="NSControlView" ref="758204686"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">1</int>
+								<reference key="NSAlternateImage" ref="549406736"/>
+								<string key="NSAlternateContents"/>
+								<object class="NSMutableString" key="NSKeyEquivalent">
+									<characters key="NS.bytes"/>
+								</object>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+					</array>
+					<string key="NSFrameSize">{548, 271}</string>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
+				<string key="NSMinSize">{320, 262}</string>
+				<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
+				<string key="NSFrameAutosaveName">x11_apps</string>
+			</object>
+			<object class="NSMenu" id="294137138">
+				<string key="NSTitle">Menu</string>
+				<array class="NSMutableArray" key="NSMenuItems">
+					<object class="NSMenuItem" id="318286212">
+						<reference key="NSMenu" ref="294137138"/>
+						<bool key="NSIsDisabled">YES</bool>
+						<bool key="NSIsSeparator">YES</bool>
+						<string key="NSTitle"/>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="531645050"/>
+						<reference key="NSMixedImage" ref="351811234"/>
+					</object>
+					<object class="NSMenuItem" id="511651072">
+						<reference key="NSMenu" ref="294137138"/>
+						<string key="NSTitle">Applications</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="531645050"/>
+						<reference key="NSMixedImage" ref="351811234"/>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="48278059">
+							<string key="NSTitle">Applications</string>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="563798000">
+									<reference key="NSMenu" ref="48278059"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="1032342329">
+									<reference key="NSMenu" ref="48278059"/>
+									<string key="NSTitle">Personnaliser…</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+							</array>
+						</object>
+					</object>
+				</array>
+				<string key="NSName"/>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">copy:</string>
+						<reference key="source" ref="941939442"/>
+						<reference key="destination" ref="185296989"/>
+					</object>
+					<int key="connectionID">181</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">minimize_window:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="677652931"/>
+					</object>
+					<int key="connectionID">202</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">close_window:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="984461797"/>
+					</object>
+					<int key="connectionID">205</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">zoom_window:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="1066447520"/>
+					</object>
+					<int key="connectionID">206</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">bring_to_front:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="276216762"/>
+					</object>
+					<int key="connectionID">207</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">hideOtherApplications:</string>
+						<reference key="source" ref="815810918"/>
+						<reference key="destination" ref="206802571"/>
+					</object>
+					<int key="connectionID">263</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">apps_separator</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="390088328"/>
+					</object>
+					<int key="connectionID">273</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">apps_table</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="905092943"/>
+					</object>
+					<int key="connectionID">301</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">apps_table_delete:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="492358940"/>
+					</object>
+					<int key="connectionID">303</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">apps_table_duplicate:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="671954382"/>
+					</object>
+					<int key="connectionID">304</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">apps_table_show:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="1065386165"/>
+					</object>
+					<int key="connectionID">308</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">apps_table_new:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="758204686"/>
+					</object>
+					<int key="connectionID">311</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_show:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="386173216"/>
+					</object>
+					<int key="connectionID">318</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">x11_about_item</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="139290918"/>
+					</object>
+					<int key="connectionID">321</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">enable_auth</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="989050925"/>
+					</object>
+					<int key="connectionID">387</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">enable_tcp</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="700826966"/>
+					</object>
+					<int key="connectionID">388</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">depth</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="709074847"/>
+					</object>
+					<int key="connectionID">389</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">fake_buttons</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="119157981"/>
+					</object>
+					<int key="connectionID">391</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">sync_keymap</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="179949713"/>
+					</object>
+					<int key="connectionID">392</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">enable_keyequivs</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="842100515"/>
+					</object>
+					<int key="connectionID">393</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="119157981"/>
+					</object>
+					<int key="connectionID">394</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="179949713"/>
+					</object>
+					<int key="connectionID">395</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="842100515"/>
+					</object>
+					<int key="connectionID">396</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="709074847"/>
+					</object>
+					<int key="connectionID">398</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="989050925"/>
+					</object>
+					<int key="connectionID">399</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="700826966"/>
+					</object>
+					<int key="connectionID">401</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">prefs_panel</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="124913468"/>
+					</object>
+					<int key="connectionID">402</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">x11_help:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="504984881"/>
+					</object>
+					<int key="connectionID">422</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">dockMenu</string>
+						<reference key="source" ref="815810918"/>
+						<reference key="destination" ref="294137138"/>
+					</object>
+					<int key="connectionID">426</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">dock_menu</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="294137138"/>
+					</object>
+					<int key="connectionID">428</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="815810918"/>
+						<reference key="destination" ref="485884620"/>
+					</object>
+					<int key="connectionID">429</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">hide:</string>
+						<reference key="source" ref="815810918"/>
+						<reference key="destination" ref="301008465"/>
+					</object>
+					<int key="connectionID">430</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">unhideAllApplications:</string>
+						<reference key="source" ref="815810918"/>
+						<reference key="destination" ref="1023546148"/>
+					</object>
+					<int key="connectionID">431</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">orderFrontStandardAboutPanel:</string>
+						<reference key="source" ref="815810918"/>
+						<reference key="destination" ref="139290918"/>
+					</object>
+					<int key="connectionID">433</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">dock_apps_menu</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="48278059"/>
+					</object>
+					<int key="connectionID">530</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">dock_window_separator</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="318286212"/>
+					</object>
+					<int key="connectionID">531</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">apps_table_show:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="1032342329"/>
+					</object>
+					<int key="connectionID">534</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">next_window:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="1036389925"/>
+					</object>
+					<int key="connectionID">539</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">previous_window:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="369641893"/>
+					</object>
+					<int key="connectionID">540</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">enable_fullscreen</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="477203622"/>
+					</object>
+					<int key="connectionID">546</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">enable_fullscreen_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="477203622"/>
+					</object>
+					<int key="connectionID">547</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggle_fullscreen:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="6876565"/>
+					</object>
+					<int key="connectionID">548</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">toggle_fullscreen_item</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="6876565"/>
+					</object>
+					<int key="connectionID">549</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">menu</string>
+						<reference key="source" ref="815810918"/>
+						<reference key="destination" ref="524015605"/>
+					</object>
+					<int key="connectionID">300334</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">terminate:</string>
+						<reference key="source" ref="815810918"/>
+						<reference key="destination" ref="274138642"/>
+					</object>
+					<int key="connectionID">300336</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="657659108"/>
+					</object>
+					<int key="connectionID">300389</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="992839333"/>
+					</object>
+					<int key="connectionID">300390</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="128352289"/>
+					</object>
+					<int key="connectionID">300391</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">click_through</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="657659108"/>
+					</object>
+					<int key="connectionID">300392</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">focus_follows_mouse</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="992839333"/>
+					</object>
+					<int key="connectionID">300393</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">focus_on_new_window</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="128352289"/>
+					</object>
+					<int key="connectionID">300394</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">copy_menu_item</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="185296989"/>
+					</object>
+					<int key="connectionID">300443</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">sync_pasteboard</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="878106058"/>
+					</object>
+					<int key="connectionID">300444</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">sync_clipboard_to_pasteboard</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="487809555"/>
+					</object>
+					<int key="connectionID">300461</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">sync_pasteboard_to_clipboard</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="477050998"/>
+					</object>
+					<int key="connectionID">300462</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">sync_pasteboard_to_primary</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="765780304"/>
+					</object>
+					<int key="connectionID">300463</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">sync_primary_immediately</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="1002778833"/>
+					</object>
+					<int key="connectionID">300464</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="878106058"/>
+					</object>
+					<int key="connectionID">300465</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="487809555"/>
+					</object>
+					<int key="connectionID">300466</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="477050998"/>
+					</object>
+					<int key="connectionID">300467</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="765780304"/>
+					</object>
+					<int key="connectionID">300468</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="1002778833"/>
+					</object>
+					<int key="connectionID">300469</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">sync_text1</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="620944856"/>
+					</object>
+					<int key="connectionID">300470</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">sync_text2</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="522511724"/>
+					</object>
+					<int key="connectionID">300471</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">enable_fullscreen_menu</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="57246850"/>
+					</object>
+					<int key="connectionID">300474</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="57246850"/>
+					</object>
+					<int key="connectionID">300475</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="406291430"/>
+					</object>
+					<int key="connectionID">300480</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">option_sends_alt</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="406291430"/>
+					</object>
+					<int key="connectionID">300481</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="863505041"/>
+					</object>
+					<int key="connectionID">300484</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">enable_fullscreen_menu_text</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="331853183"/>
+					</object>
+					<int key="connectionID">300489</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">scroll_in_device_direction</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="863505041"/>
+					</object>
+					<int key="connectionID">300490</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="904585544"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="815810918"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="941939442"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="951368722"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">29</int>
+						<reference key="object" ref="524015605"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="931553638"/>
+							<reference ref="365880285"/>
+							<reference ref="200491363"/>
+							<reference ref="868031522"/>
+							<reference ref="551174276"/>
+						</array>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">MainMenu</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">19</int>
+						<reference key="object" ref="931553638"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="96874957"/>
+						</array>
+						<reference key="parent" ref="524015605"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">24</int>
+						<reference key="object" ref="96874957"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="677652931"/>
+							<reference ref="276216762"/>
+							<reference ref="1066447520"/>
+							<reference ref="1036389925"/>
+							<reference ref="369641893"/>
+							<reference ref="155085383"/>
+							<reference ref="984461797"/>
+							<reference ref="280172320"/>
+						</array>
+						<reference key="parent" ref="931553638"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5</int>
+						<reference key="object" ref="276216762"/>
+						<reference key="parent" ref="96874957"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">23</int>
+						<reference key="object" ref="677652931"/>
+						<reference key="parent" ref="96874957"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">92</int>
+						<reference key="object" ref="280172320"/>
+						<reference key="parent" ref="96874957"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">203</int>
+						<reference key="object" ref="984461797"/>
+						<reference key="parent" ref="96874957"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">204</int>
+						<reference key="object" ref="1066447520"/>
+						<reference key="parent" ref="96874957"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">536</int>
+						<reference key="object" ref="155085383"/>
+						<reference key="parent" ref="96874957"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">537</int>
+						<reference key="object" ref="1036389925"/>
+						<reference key="parent" ref="96874957"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">538</int>
+						<reference key="object" ref="369641893"/>
+						<reference key="parent" ref="96874957"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">56</int>
+						<reference key="object" ref="365880285"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="576521955"/>
+						</array>
+						<reference key="parent" ref="524015605"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">57</int>
+						<reference key="object" ref="576521955"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="139290918"/>
+							<reference ref="386173216"/>
+							<reference ref="32285361"/>
+							<reference ref="301008465"/>
+							<reference ref="274138642"/>
+							<reference ref="272876017"/>
+							<reference ref="431301145"/>
+							<reference ref="206802571"/>
+							<reference ref="848095279"/>
+							<reference ref="1023546148"/>
+							<reference ref="6876565"/>
+							<reference ref="479677589"/>
+						</array>
+						<reference key="parent" ref="365880285"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">58</int>
+						<reference key="object" ref="139290918"/>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">129</int>
+						<reference key="object" ref="386173216"/>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">131</int>
+						<reference key="object" ref="32285361"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="821388474"/>
+						</array>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">130</int>
+						<reference key="object" ref="821388474"/>
+						<reference key="parent" ref="32285361"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">134</int>
+						<reference key="object" ref="301008465"/>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">136</int>
+						<reference key="object" ref="274138642"/>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">143</int>
+						<reference key="object" ref="272876017"/>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">144</int>
+						<reference key="object" ref="431301145"/>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">145</int>
+						<reference key="object" ref="206802571"/>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">149</int>
+						<reference key="object" ref="848095279"/>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">150</int>
+						<reference key="object" ref="1023546148"/>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">544</int>
+						<reference key="object" ref="6876565"/>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">545</int>
+						<reference key="object" ref="479677589"/>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">163</int>
+						<reference key="object" ref="200491363"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="526778998"/>
+						</array>
+						<reference key="parent" ref="524015605"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">169</int>
+						<reference key="object" ref="526778998"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="185296989"/>
+						</array>
+						<reference key="parent" ref="200491363"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">157</int>
+						<reference key="object" ref="185296989"/>
+						<reference key="parent" ref="526778998"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">269</int>
+						<reference key="object" ref="868031522"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="981161348"/>
+						</array>
+						<reference key="parent" ref="524015605"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">270</int>
+						<reference key="object" ref="981161348"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="390088328"/>
+							<reference ref="1065386165"/>
+						</array>
+						<reference key="parent" ref="868031522"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">272</int>
+						<reference key="object" ref="390088328"/>
+						<reference key="parent" ref="981161348"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">305</int>
+						<reference key="object" ref="1065386165"/>
+						<reference key="parent" ref="981161348"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">419</int>
+						<reference key="object" ref="551174276"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="511848303"/>
+						</array>
+						<reference key="parent" ref="524015605"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">420</int>
+						<reference key="object" ref="511848303"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="504984881"/>
+						</array>
+						<reference key="parent" ref="551174276"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">421</int>
+						<reference key="object" ref="504984881"/>
+						<reference key="parent" ref="511848303"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">196</int>
+						<reference key="object" ref="485884620"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">X11Controller</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">244</int>
+						<reference key="object" ref="124913468"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="941366957"/>
+						</array>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">PrefsPanel</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">245</int>
+						<reference key="object" ref="941366957"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="448510093"/>
+						</array>
+						<reference key="parent" ref="124913468"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">348</int>
+						<reference key="object" ref="448510093"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="287591690"/>
+							<reference ref="960678392"/>
+							<reference ref="348328898"/>
+							<reference ref="10973343"/>
+							<reference ref="723450037"/>
+						</array>
+						<reference key="parent" ref="941366957"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">349</int>
+						<reference key="object" ref="287591690"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="596750588"/>
+						</array>
+						<reference key="parent" ref="448510093"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">351</int>
+						<reference key="object" ref="596750588"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="119157981"/>
+							<reference ref="443008216"/>
+							<reference ref="282885445"/>
+							<reference ref="842100515"/>
+							<reference ref="31160162"/>
+							<reference ref="179949713"/>
+							<reference ref="278155937"/>
+							<reference ref="406291430"/>
+							<reference ref="863505041"/>
+						</array>
+						<reference key="parent" ref="287591690"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">363</int>
+						<reference key="object" ref="119157981"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="990762273"/>
+						</array>
+						<reference key="parent" ref="596750588"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">364</int>
+						<reference key="object" ref="443008216"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="391919450"/>
+						</array>
+						<reference key="parent" ref="596750588"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">365</int>
+						<reference key="object" ref="282885445"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="649334366"/>
+						</array>
+						<reference key="parent" ref="596750588"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">368</int>
+						<reference key="object" ref="842100515"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="940564599"/>
+						</array>
+						<reference key="parent" ref="596750588"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">369</int>
+						<reference key="object" ref="31160162"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="666057093"/>
+						</array>
+						<reference key="parent" ref="596750588"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">370</int>
+						<reference key="object" ref="179949713"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="967619578"/>
+						</array>
+						<reference key="parent" ref="596750588"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">352</int>
+						<reference key="object" ref="960678392"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="515308735"/>
+						</array>
+						<reference key="parent" ref="448510093"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">350</int>
+						<reference key="object" ref="515308735"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="709074847"/>
+							<reference ref="201731424"/>
+							<reference ref="86150604"/>
+							<reference ref="477203622"/>
+							<reference ref="57246850"/>
+							<reference ref="298603383"/>
+							<reference ref="331853183"/>
+						</array>
+						<reference key="parent" ref="960678392"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">382</int>
+						<reference key="object" ref="709074847"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="633115429"/>
+						</array>
+						<reference key="parent" ref="515308735"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">385</int>
+						<reference key="object" ref="201731424"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="930265681"/>
+						</array>
+						<reference key="parent" ref="515308735"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">386</int>
+						<reference key="object" ref="86150604"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="311969422"/>
+						</array>
+						<reference key="parent" ref="515308735"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">541</int>
+						<reference key="object" ref="477203622"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="631531164"/>
+						</array>
+						<reference key="parent" ref="515308735"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">543</int>
+						<reference key="object" ref="298603383"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="761107402"/>
+						</array>
+						<reference key="parent" ref="515308735"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">353</int>
+						<reference key="object" ref="348328898"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="300811574"/>
+						</array>
+						<reference key="parent" ref="448510093"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">354</int>
+						<reference key="object" ref="300811574"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="989050925"/>
+							<reference ref="700826966"/>
+							<reference ref="168436707"/>
+							<reference ref="363817195"/>
+							<reference ref="223835729"/>
+						</array>
+						<reference key="parent" ref="348328898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">374</int>
+						<reference key="object" ref="989050925"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="189594322"/>
+						</array>
+						<reference key="parent" ref="300811574"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">375</int>
+						<reference key="object" ref="700826966"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="489340979"/>
+						</array>
+						<reference key="parent" ref="300811574"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">376</int>
+						<reference key="object" ref="168436707"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="53243865"/>
+						</array>
+						<reference key="parent" ref="300811574"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">377</int>
+						<reference key="object" ref="363817195"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="390084685"/>
+						</array>
+						<reference key="parent" ref="300811574"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">379</int>
+						<reference key="object" ref="223835729"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="283628678"/>
+						</array>
+						<reference key="parent" ref="300811574"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">285</int>
+						<reference key="object" ref="604417141"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="85544634"/>
+						</array>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">EditPrograms</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">286</int>
+						<reference key="object" ref="85544634"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1063387772"/>
+							<reference ref="758204686"/>
+							<reference ref="671954382"/>
+							<reference ref="492358940"/>
+						</array>
+						<reference key="parent" ref="604417141"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">423</int>
+						<reference key="object" ref="294137138"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="318286212"/>
+							<reference ref="511651072"/>
+						</array>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">DockMenu</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">524</int>
+						<reference key="object" ref="318286212"/>
+						<reference key="parent" ref="294137138"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">526</int>
+						<reference key="object" ref="511651072"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="48278059"/>
+						</array>
+						<reference key="parent" ref="294137138"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">527</int>
+						<reference key="object" ref="48278059"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1032342329"/>
+							<reference ref="563798000"/>
+						</array>
+						<reference key="parent" ref="511651072"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">532</int>
+						<reference key="object" ref="1032342329"/>
+						<reference key="parent" ref="48278059"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">533</int>
+						<reference key="object" ref="563798000"/>
+						<reference key="parent" ref="48278059"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100363</int>
+						<reference key="object" ref="990762273"/>
+						<reference key="parent" ref="119157981"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100364</int>
+						<reference key="object" ref="391919450"/>
+						<reference key="parent" ref="443008216"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100365</int>
+						<reference key="object" ref="649334366"/>
+						<reference key="parent" ref="282885445"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100368</int>
+						<reference key="object" ref="940564599"/>
+						<reference key="parent" ref="842100515"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100369</int>
+						<reference key="object" ref="666057093"/>
+						<reference key="parent" ref="31160162"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100370</int>
+						<reference key="object" ref="967619578"/>
+						<reference key="parent" ref="179949713"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100382</int>
+						<reference key="object" ref="633115429"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="341113515"/>
+						</array>
+						<reference key="parent" ref="709074847"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100385</int>
+						<reference key="object" ref="930265681"/>
+						<reference key="parent" ref="201731424"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100386</int>
+						<reference key="object" ref="311969422"/>
+						<reference key="parent" ref="86150604"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100541</int>
+						<reference key="object" ref="631531164"/>
+						<reference key="parent" ref="477203622"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100543</int>
+						<reference key="object" ref="761107402"/>
+						<reference key="parent" ref="298603383"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100374</int>
+						<reference key="object" ref="189594322"/>
+						<reference key="parent" ref="989050925"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100375</int>
+						<reference key="object" ref="489340979"/>
+						<reference key="parent" ref="700826966"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100376</int>
+						<reference key="object" ref="53243865"/>
+						<reference key="parent" ref="168436707"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100377</int>
+						<reference key="object" ref="390084685"/>
+						<reference key="parent" ref="363817195"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100379</int>
+						<reference key="object" ref="283628678"/>
+						<reference key="parent" ref="223835729"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">380</int>
+						<reference key="object" ref="341113515"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="759499526"/>
+							<reference ref="616492372"/>
+							<reference ref="543935434"/>
+							<reference ref="836673018"/>
+						</array>
+						<reference key="parent" ref="633115429"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">435</int>
+						<reference key="object" ref="759499526"/>
+						<reference key="parent" ref="341113515"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">384</int>
+						<reference key="object" ref="616492372"/>
+						<reference key="parent" ref="341113515"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">383</int>
+						<reference key="object" ref="543935434"/>
+						<reference key="parent" ref="341113515"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">381</int>
+						<reference key="object" ref="836673018"/>
+						<reference key="parent" ref="341113515"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">295</int>
+						<reference key="object" ref="1063387772"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="792419186"/>
+							<reference ref="17278747"/>
+							<reference ref="842897584"/>
+							<reference ref="905092943"/>
+						</array>
+						<reference key="parent" ref="85544634"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300295</int>
+						<reference key="object" ref="792419186"/>
+						<reference key="parent" ref="1063387772"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">200295</int>
+						<reference key="object" ref="17278747"/>
+						<reference key="parent" ref="1063387772"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100295</int>
+						<reference key="object" ref="842897584"/>
+						<reference key="parent" ref="1063387772"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">296</int>
+						<reference key="object" ref="905092943"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="242608782"/>
+							<reference ref="938444323"/>
+							<reference ref="84282687"/>
+						</array>
+						<reference key="parent" ref="1063387772"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">535</int>
+						<reference key="object" ref="242608782"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="34714764"/>
+						</array>
+						<reference key="parent" ref="905092943"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">575</int>
+						<reference key="object" ref="34714764"/>
+						<reference key="parent" ref="242608782"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">298</int>
+						<reference key="object" ref="938444323"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="825378892"/>
+						</array>
+						<reference key="parent" ref="905092943"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">573</int>
+						<reference key="object" ref="825378892"/>
+						<reference key="parent" ref="938444323"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">297</int>
+						<reference key="object" ref="84282687"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="432610585"/>
+						</array>
+						<reference key="parent" ref="905092943"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">574</int>
+						<reference key="object" ref="432610585"/>
+						<reference key="parent" ref="84282687"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">310</int>
+						<reference key="object" ref="758204686"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1025474039"/>
+						</array>
+						<reference key="parent" ref="85544634"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100310</int>
+						<reference key="object" ref="1025474039"/>
+						<reference key="parent" ref="758204686"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">292</int>
+						<reference key="object" ref="671954382"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="143554520"/>
+						</array>
+						<reference key="parent" ref="85544634"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100292</int>
+						<reference key="object" ref="143554520"/>
+						<reference key="parent" ref="671954382"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">293</int>
+						<reference key="object" ref="492358940"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="8201128"/>
+						</array>
+						<reference key="parent" ref="85544634"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100293</int>
+						<reference key="object" ref="8201128"/>
+						<reference key="parent" ref="492358940"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300337</int>
+						<reference key="object" ref="10973343"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="184765684"/>
+						</array>
+						<reference key="parent" ref="448510093"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300338</int>
+						<reference key="object" ref="184765684"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="657659108"/>
+							<reference ref="290578835"/>
+							<reference ref="992839333"/>
+							<reference ref="138261120"/>
+							<reference ref="128352289"/>
+							<reference ref="57161931"/>
+						</array>
+						<reference key="parent" ref="10973343"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300358</int>
+						<reference key="object" ref="290578835"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="399127858"/>
+						</array>
+						<reference key="parent" ref="184765684"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300359</int>
+						<reference key="object" ref="657659108"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="259618205"/>
+						</array>
+						<reference key="parent" ref="184765684"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300360</int>
+						<reference key="object" ref="259618205"/>
+						<reference key="parent" ref="657659108"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300361</int>
+						<reference key="object" ref="399127858"/>
+						<reference key="parent" ref="290578835"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300362</int>
+						<reference key="object" ref="992839333"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="959555182"/>
+						</array>
+						<reference key="parent" ref="184765684"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300363</int>
+						<reference key="object" ref="959555182"/>
+						<reference key="parent" ref="992839333"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300364</int>
+						<reference key="object" ref="138261120"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="183409141"/>
+						</array>
+						<reference key="parent" ref="184765684"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300365</int>
+						<reference key="object" ref="183409141"/>
+						<reference key="parent" ref="138261120"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300368</int>
+						<reference key="object" ref="128352289"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="556463187"/>
+						</array>
+						<reference key="parent" ref="184765684"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300369</int>
+						<reference key="object" ref="556463187"/>
+						<reference key="parent" ref="128352289"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300370</int>
+						<reference key="object" ref="57161931"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="989804990"/>
+						</array>
+						<reference key="parent" ref="184765684"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300371</int>
+						<reference key="object" ref="989804990"/>
+						<reference key="parent" ref="57161931"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300421</int>
+						<reference key="object" ref="723450037"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="408298283"/>
+						</array>
+						<reference key="parent" ref="448510093"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300422</int>
+						<reference key="object" ref="408298283"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="878106058"/>
+							<reference ref="386152084"/>
+							<reference ref="487809555"/>
+							<reference ref="620944856"/>
+							<reference ref="477050998"/>
+							<reference ref="765780304"/>
+							<reference ref="1002778833"/>
+							<reference ref="522511724"/>
+						</array>
+						<reference key="parent" ref="723450037"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300423</int>
+						<reference key="object" ref="386152084"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="572508492"/>
+						</array>
+						<reference key="parent" ref="408298283"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300424</int>
+						<reference key="object" ref="878106058"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="718083688"/>
+						</array>
+						<reference key="parent" ref="408298283"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300440</int>
+						<reference key="object" ref="718083688"/>
+						<reference key="parent" ref="878106058"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300441</int>
+						<reference key="object" ref="572508492"/>
+						<reference key="parent" ref="386152084"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300447</int>
+						<reference key="object" ref="477050998"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="501304422"/>
+						</array>
+						<reference key="parent" ref="408298283"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300450</int>
+						<reference key="object" ref="501304422"/>
+						<reference key="parent" ref="477050998"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300451</int>
+						<reference key="object" ref="765780304"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="510771323"/>
+						</array>
+						<reference key="parent" ref="408298283"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300452</int>
+						<reference key="object" ref="510771323"/>
+						<reference key="parent" ref="765780304"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300453</int>
+						<reference key="object" ref="487809555"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="619977658"/>
+						</array>
+						<reference key="parent" ref="408298283"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300454</int>
+						<reference key="object" ref="619977658"/>
+						<reference key="parent" ref="487809555"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300455</int>
+						<reference key="object" ref="620944856"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="461823902"/>
+						</array>
+						<reference key="parent" ref="408298283"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300456</int>
+						<reference key="object" ref="461823902"/>
+						<reference key="parent" ref="620944856"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300457</int>
+						<reference key="object" ref="1002778833"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="897099877"/>
+						</array>
+						<reference key="parent" ref="408298283"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300458</int>
+						<reference key="object" ref="897099877"/>
+						<reference key="parent" ref="1002778833"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300459</int>
+						<reference key="object" ref="522511724"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="994587858"/>
+						</array>
+						<reference key="parent" ref="408298283"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300460</int>
+						<reference key="object" ref="994587858"/>
+						<reference key="parent" ref="522511724"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300472</int>
+						<reference key="object" ref="57246850"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="917248662"/>
+						</array>
+						<reference key="parent" ref="515308735"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300473</int>
+						<reference key="object" ref="917248662"/>
+						<reference key="parent" ref="57246850"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300476</int>
+						<reference key="object" ref="278155937"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="617441821"/>
+						</array>
+						<reference key="parent" ref="596750588"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300477</int>
+						<reference key="object" ref="406291430"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="67728988"/>
+						</array>
+						<reference key="parent" ref="596750588"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300478</int>
+						<reference key="object" ref="67728988"/>
+						<reference key="parent" ref="406291430"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300479</int>
+						<reference key="object" ref="617441821"/>
+						<reference key="parent" ref="278155937"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300482</int>
+						<reference key="object" ref="863505041"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1016286396"/>
+						</array>
+						<reference key="parent" ref="596750588"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300483</int>
+						<reference key="object" ref="1016286396"/>
+						<reference key="parent" ref="863505041"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300487</int>
+						<reference key="object" ref="331853183"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1042813110"/>
+						</array>
+						<reference key="parent" ref="515308735"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300488</int>
+						<reference key="object" ref="1042813110"/>
+						<reference key="parent" ref="331853183"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="-3.ImportedFromIB2"/>
+				<string key="100292.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100293.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="100295.IBShouldRemoveOnLegacySave"/>
+				<string key="100310.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100363.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100364.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100365.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100368.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100369.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100374.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100375.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100376.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100377.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100379.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100382.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100385.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100386.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100541.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100543.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="129.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="129.ImportedFromIB2"/>
+				<string key="130.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="130.ImportedFromIB2"/>
+				<string key="131.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="131.ImportedFromIB2"/>
+				<string key="134.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="134.ImportedFromIB2"/>
+				<string key="136.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="136.ImportedFromIB2"/>
+				<string key="143.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="143.ImportedFromIB2"/>
+				<string key="144.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="144.ImportedFromIB2"/>
+				<string key="145.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="145.ImportedFromIB2"/>
+				<string key="149.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="149.ImportedFromIB2"/>
+				<string key="150.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="150.ImportedFromIB2"/>
+				<string key="157.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="157.ImportedFromIB2"/>
+				<string key="163.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="163.ImportedFromIB2"/>
+				<string key="169.IBEditorWindowLastContentRect">{{168, 821}, {113, 23}}</string>
+				<string key="169.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="169.ImportedFromIB2"/>
+				<string key="169.editorWindowContentRectSynchronizationRect">{{202, 626}, {154, 153}}</string>
+				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="19.ImportedFromIB2"/>
+				<integer value="1" key="196.ImportedFromIB2"/>
+				<string key="200295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="200295.IBShouldRemoveOnLegacySave"/>
+				<string key="203.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="203.ImportedFromIB2"/>
+				<string key="204.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="204.ImportedFromIB2"/>
+				<string key="23.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="23.ImportedFromIB2"/>
+				<string key="24.IBEditorWindowLastContentRect">{{349, 868}, {315, 143}}</string>
+				<string key="24.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="24.ImportedFromIB2"/>
+				<string key="24.editorWindowContentRectSynchronizationRect">{{271, 666}, {301, 153}}</string>
+				<string key="244.IBEditorWindowLastContentRect">{{127, 515}, {580, 341}}</string>
+				<string key="244.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="YES" key="244.IBViewEditorWindowController.showingLayoutRectangles"/>
+				<string key="244.IBWindowTemplateEditedContentRect">{{127, 515}, {580, 341}}</string>
+				<integer value="1" key="244.ImportedFromIB2"/>
+				<string key="244.editorWindowContentRectSynchronizationRect">{{184, 290}, {481, 345}}</string>
+				<string key="244.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<boolean value="YES" key="244.windowTemplate.hasMinSize"/>
+				<string key="244.windowTemplate.maxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
+				<string key="244.windowTemplate.minSize">{320, 240}</string>
+				<string key="245.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="245.ImportedFromIB2"/>
+				<string key="245.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="269.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="269.ImportedFromIB2"/>
+				<string key="270.IBEditorWindowLastContentRect">{{58, 803}, {155, 33}}</string>
+				<string key="270.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="270.ImportedFromIB2"/>
+				<string key="270.editorWindowContentRectSynchronizationRect">{{100, 746}, {155, 33}}</string>
+				<string key="272.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="272.ImportedFromIB2"/>
+				<string key="285.IBEditorWindowLastContentRect">{{68, 585}, {454, 271}}</string>
+				<string key="285.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="285.IBViewEditorWindowController.showingBoundsRectangles"/>
+				<integer value="1" key="285.IBViewEditorWindowController.showingLayoutRectangles"/>
+				<string key="285.IBWindowTemplateEditedContentRect">{{68, 585}, {454, 271}}</string>
+				<integer value="1" key="285.ImportedFromIB2"/>
+				<string key="285.editorWindowContentRectSynchronizationRect">{{433, 406}, {486, 327}}</string>
+				<string key="285.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<boolean value="YES" key="285.windowTemplate.hasMinSize"/>
+				<string key="285.windowTemplate.maxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
+				<string key="285.windowTemplate.minSize">{320, 240}</string>
+				<string key="286.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="286.ImportedFromIB2"/>
+				<string key="29.IBEditorWindowLastContentRect">{{145, 1011}, {336, 20}}</string>
+				<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="29.ImportedFromIB2"/>
+				<string key="29.editorWindowContentRectSynchronizationRect">{{67, 819}, {336, 20}}</string>
+				<string key="292.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="292.ImportedFromIB2"/>
+				<string key="293.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="293.ImportedFromIB2"/>
+				<string key="295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="295.ImportedFromIB2"/>
+				<string key="296.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="296.ImportedFromIB2"/>
+				<string key="297.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="297.ImportedFromIB2"/>
+				<string key="298.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="298.ImportedFromIB2"/>
+				<string key="300295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300295.IBShouldRemoveOnLegacySave"/>
+				<string key="300337.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300337.ImportedFromIB2"/>
+				<string key="300338.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300338.ImportedFromIB2"/>
+				<string key="300338.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="300358.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300358.ImportedFromIB2"/>
+				<string key="300358.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="300359.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300359.ImportedFromIB2"/>
+				<string key="300359.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="300360.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300361.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300362.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300362.ImportedFromIB2"/>
+				<string key="300362.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="300363.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300364.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300364.ImportedFromIB2"/>
+				<string key="300364.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="300365.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300368.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300368.ImportedFromIB2"/>
+				<string key="300368.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="300369.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300370.ImportedFromIB2"/>
+				<string key="300370.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="300371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300421.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300421.ImportedFromIB2"/>
+				<string key="300422.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300422.ImportedFromIB2"/>
+				<string key="300422.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="300423.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300423.ImportedFromIB2"/>
+				<string key="300423.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="300424.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300424.ImportedFromIB2"/>
+				<string key="300424.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="300440.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300441.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300447.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300447.ImportedFromIB2"/>
+				<string key="300447.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="300450.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300451.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300451.ImportedFromIB2"/>
+				<string key="300451.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="300452.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300453.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300453.ImportedFromIB2"/>
+				<string key="300453.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="300454.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300455.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300455.ImportedFromIB2"/>
+				<string key="300455.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="300456.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300457.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300457.ImportedFromIB2"/>
+				<string key="300457.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="300458.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300459.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300459.ImportedFromIB2"/>
+				<string key="300459.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="300460.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300472.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300472.ImportedFromIB2"/>
+				<string key="300472.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="300473.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300473.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="300476.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300476.ImportedFromIB2"/>
+				<string key="300476.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="300477.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300477.ImportedFromIB2"/>
+				<string key="300477.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="300478.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300479.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300482.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300482.ImportedFromIB2"/>
+				<string key="300482.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="300483.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300483.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="300487.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300487.ImportedFromIB2"/>
+				<string key="300487.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="300488.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300488.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="305.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="305.ImportedFromIB2"/>
+				<string key="310.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="310.ImportedFromIB2"/>
+				<string key="348.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSAffineTransform" key="348.IBViewBoundsToFrameTransform">
+					<bytes key="NSTransformStruct">P4AAAL+AAABBUAAAw6aAAA</bytes>
+				</object>
+				<integer value="1" key="348.ImportedFromIB2"/>
+				<string key="348.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="349.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="349.ImportedFromIB2"/>
+				<string key="350.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="350.ImportedFromIB2"/>
+				<string key="350.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="351.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="351.ImportedFromIB2"/>
+				<string key="351.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="352.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="352.ImportedFromIB2"/>
+				<string key="353.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="353.ImportedFromIB2"/>
+				<string key="354.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="354.ImportedFromIB2"/>
+				<string key="354.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="363.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="363.ImportedFromIB2"/>
+				<string key="363.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="364.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="364.ImportedFromIB2"/>
+				<string key="364.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="365.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="365.ImportedFromIB2"/>
+				<string key="365.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="368.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="368.ImportedFromIB2"/>
+				<string key="368.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="369.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="369.ImportedFromIB2"/>
+				<string key="369.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="370.ImportedFromIB2"/>
+				<string key="370.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="374.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="374.ImportedFromIB2"/>
+				<string key="374.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="375.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="375.ImportedFromIB2"/>
+				<string key="375.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="376.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="376.ImportedFromIB2"/>
+				<string key="376.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="377.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="377.ImportedFromIB2"/>
+				<string key="377.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="379.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="379.ImportedFromIB2"/>
+				<string key="379.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="380.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="380.ImportedFromIB2"/>
+				<string key="381.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="381.ImportedFromIB2"/>
+				<string key="382.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="382.ImportedFromIB2"/>
+				<string key="382.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="383.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="383.ImportedFromIB2"/>
+				<string key="384.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="384.ImportedFromIB2"/>
+				<string key="385.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="385.ImportedFromIB2"/>
+				<string key="385.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="386.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="386.ImportedFromIB2"/>
+				<string key="386.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="419.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="419.ImportedFromIB2"/>
+				<string key="420.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="420.ImportedFromIB2"/>
+				<string key="421.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="421.ImportedFromIB2"/>
+				<string key="423.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="423.ImportedFromIB2"/>
+				<string key="435.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="435.ImportedFromIB2"/>
+				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="5.ImportedFromIB2"/>
+				<string key="524.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="524.ImportedFromIB2"/>
+				<string key="526.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="526.ImportedFromIB2"/>
+				<string key="527.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="527.ImportedFromIB2"/>
+				<string key="532.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="532.ImportedFromIB2"/>
+				<string key="533.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="533.ImportedFromIB2"/>
+				<string key="535.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="535.ImportedFromIB2"/>
+				<string key="536.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="536.ImportedFromIB2"/>
+				<string key="537.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="537.ImportedFromIB2"/>
+				<string key="537.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="538.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="538.ImportedFromIB2"/>
+				<string key="541.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="541.ImportedFromIB2"/>
+				<string key="541.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="543.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="543.ImportedFromIB2"/>
+				<string key="543.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="544.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="544.ImportedFromIB2"/>
+				<string key="545.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="545.ImportedFromIB2"/>
+				<string key="56.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="56.ImportedFromIB2"/>
+				<string key="57.IBEditorWindowLastContentRect">{{20, 641}, {218, 203}}</string>
+				<string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="57.ImportedFromIB2"/>
+				<string key="57.editorWindowContentRectSynchronizationRect">{{79, 616}, {218, 203}}</string>
+				<string key="573.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="573.ImportedFromIB2"/>
+				<string key="574.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="574.ImportedFromIB2"/>
+				<string key="575.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="575.ImportedFromIB2"/>
+				<string key="58.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="58.ImportedFromIB2"/>
+				<string key="92.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="92.ImportedFromIB2"/>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">300490</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<integer value="1040" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<nil key="IBDocument.LastKnownRelativeProjectPath"/>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="NSMenuCheckmark">{9, 8}</string>
+			<string key="NSMenuMixedState">{7, 2}</string>
+			<string key="NSSwitch">{15, 15}</string>
+		</dictionary>
+	</data>
+</archive>
diff --git a/xorg-server/hw/xquartz/bundle/Resources/German.lproj/locversion.plist b/xorg-server/hw/xquartz/bundle/Resources/German.lproj/locversion.plist
index 0052a22d7..62820e18b 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/German.lproj/locversion.plist
+++ b/xorg-server/hw/xquartz/bundle/Resources/German.lproj/locversion.plist
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">

-<plist version="1.0">

-<dict>

-	<key>LprojCompatibleVersion</key>

-	<string>106</string>

-	<key>LprojLocale</key>

-	<string>de</string>

-	<key>LprojRevisionLevel</key>

-	<string>1</string>

-	<key>LprojVersion</key>

-	<string>106</string>

-</dict>

-</plist>

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>LprojCompatibleVersion</key>
+	<string>106</string>
+	<key>LprojLocale</key>
+	<string>de</string>
+	<key>LprojRevisionLevel</key>
+	<string>1</string>
+	<key>LprojVersion</key>
+	<string>106</string>
+</dict>
+</plist>
diff --git a/xorg-server/hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib b/xorg-server/hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib
index 5e70cf291..d42b04645 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib
+++ b/xorg-server/hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib
@@ -1,3615 +1,3615 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">

-	<data>

-		<int key="IBDocument.SystemTarget">1040</int>

-		<string key="IBDocument.SystemVersion">11A289</string>

-		<string key="IBDocument.InterfaceBuilderVersion">903</string>

-		<string key="IBDocument.AppKitVersion">1094.2</string>

-		<string key="IBDocument.HIToolboxVersion">521.00</string>

-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">

-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>

-			<string key="NS.object.0">903</string>

-		</object>

-		<array class="NSMutableArray" key="IBDocument.EditedObjectIDs"/>

-		<array key="IBDocument.PluginDependencies">

-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>

-		</array>

-		<object class="NSMutableDictionary" key="IBDocument.Metadata">

-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>

-			<integer value="1" key="NS.object.0"/>

-		</object>

-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="904585544">

-			<object class="NSCustomObject" id="815810918">

-				<object class="NSMutableString" key="NSClassName">

-					<characters key="NS.bytes">NSApplication</characters>

-				</object>

-			</object>

-			<object class="NSCustomObject" id="941939442">

-				<string key="NSClassName">FirstResponder</string>

-			</object>

-			<object class="NSCustomObject" id="951368722">

-				<string key="NSClassName">NSApplication</string>

-			</object>

-			<object class="NSMenu" id="524015605">

-				<string key="NSTitle">MainMenu</string>

-				<array class="NSMutableArray" key="NSMenuItems">

-					<object class="NSMenuItem" id="365880285">

-						<reference key="NSMenu" ref="524015605"/>

-						<string key="NSTitle">X11</string>

-						<string key="NSKeyEquiv"/>

-						<int key="NSKeyEquivModMask">1048576</int>

-						<int key="NSMnemonicLoc">2147483647</int>

-						<object class="NSCustomResource" key="NSOnImage" id="531645050">

-							<string key="NSClassName">NSImage</string>

-							<string key="NSResourceName">NSMenuCheckmark</string>

-						</object>

-						<object class="NSCustomResource" key="NSMixedImage" id="351811234">

-							<string key="NSClassName">NSImage</string>

-							<string key="NSResourceName">NSMenuMixedState</string>

-						</object>

-						<string key="NSAction">submenuAction:</string>

-						<object class="NSMenu" key="NSSubmenu" id="576521955">

-							<string key="NSTitle">X11</string>

-							<array class="NSMutableArray" key="NSMenuItems">

-								<object class="NSMenuItem" id="139290918">

-									<reference key="NSMenu" ref="576521955"/>

-									<string key="NSTitle">Über X11</string>

-									<string key="NSKeyEquiv"/>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="386173216">

-									<reference key="NSMenu" ref="576521955"/>

-									<string key="NSTitle">Einstellungen …</string>

-									<string key="NSKeyEquiv">,</string>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="272876017">

-									<reference key="NSMenu" ref="576521955"/>

-									<bool key="NSIsDisabled">YES</bool>

-									<bool key="NSIsSeparator">YES</bool>

-									<string key="NSTitle"/>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="32285361">

-									<reference key="NSMenu" ref="576521955"/>

-									<string key="NSTitle">Dienste</string>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-									<string key="NSAction">submenuAction:</string>

-									<object class="NSMenu" key="NSSubmenu" id="821388474">

-										<string key="NSTitle">Dienste</string>

-										<array class="NSMutableArray" key="NSMenuItems"/>

-										<string key="NSName">_NSServicesMenu</string>

-									</object>

-								</object>

-								<object class="NSMenuItem" id="431301145">

-									<reference key="NSMenu" ref="576521955"/>

-									<bool key="NSIsDisabled">YES</bool>

-									<bool key="NSIsSeparator">YES</bool>

-									<string key="NSTitle"/>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="6876565">

-									<reference key="NSMenu" ref="576521955"/>

-									<string key="NSTitle">Vollbildmodus ein-/ausschalten</string>

-									<string key="NSKeyEquiv">a</string>

-									<int key="NSKeyEquivModMask">1572864</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="479677589">

-									<reference key="NSMenu" ref="576521955"/>

-									<bool key="NSIsDisabled">YES</bool>

-									<bool key="NSIsSeparator">YES</bool>

-									<string key="NSTitle"/>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="301008465">

-									<reference key="NSMenu" ref="576521955"/>

-									<string key="NSTitle">X11 ausblenden</string>

-									<string key="NSKeyEquiv">h</string>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-									<int key="NSTag">42</int>

-								</object>

-								<object class="NSMenuItem" id="206802571">

-									<reference key="NSMenu" ref="576521955"/>

-									<string key="NSTitle">Andere ausblenden</string>

-									<string key="NSKeyEquiv">h</string>

-									<int key="NSKeyEquivModMask">1572864</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="1023546148">

-									<reference key="NSMenu" ref="576521955"/>

-									<string key="NSTitle">Alle einblenden</string>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-									<int key="NSTag">42</int>

-								</object>

-								<object class="NSMenuItem" id="848095279">

-									<reference key="NSMenu" ref="576521955"/>

-									<bool key="NSIsDisabled">YES</bool>

-									<bool key="NSIsSeparator">YES</bool>

-									<string key="NSTitle"/>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="274138642">

-									<reference key="NSMenu" ref="576521955"/>

-									<string key="NSTitle">X11 beenden</string>

-									<string key="NSKeyEquiv">q</string>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-							</array>

-							<string key="NSName">_NSAppleMenu</string>

-						</object>

-					</object>

-					<object class="NSMenuItem" id="868031522">

-						<reference key="NSMenu" ref="524015605"/>

-						<string key="NSTitle">Programme</string>

-						<string key="NSKeyEquiv"/>

-						<int key="NSKeyEquivModMask">1048576</int>

-						<int key="NSMnemonicLoc">2147483647</int>

-						<reference key="NSOnImage" ref="531645050"/>

-						<reference key="NSMixedImage" ref="351811234"/>

-						<string key="NSAction">submenuAction:</string>

-						<object class="NSMenu" key="NSSubmenu" id="981161348">

-							<string key="NSTitle">Programme</string>

-							<array class="NSMutableArray" key="NSMenuItems">

-								<object class="NSMenuItem" id="390088328">

-									<reference key="NSMenu" ref="981161348"/>

-									<bool key="NSIsDisabled">YES</bool>

-									<bool key="NSIsSeparator">YES</bool>

-									<string key="NSTitle"/>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="1065386165">

-									<reference key="NSMenu" ref="981161348"/>

-									<string key="NSTitle">Anpassen …</string>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-							</array>

-						</object>

-					</object>

-					<object class="NSMenuItem" id="200491363">

-						<reference key="NSMenu" ref="524015605"/>

-						<string key="NSTitle">Bearbeiten</string>

-						<string key="NSKeyEquiv"/>

-						<int key="NSKeyEquivModMask">1048576</int>

-						<int key="NSMnemonicLoc">2147483647</int>

-						<reference key="NSOnImage" ref="531645050"/>

-						<reference key="NSMixedImage" ref="351811234"/>

-						<string key="NSAction">submenuAction:</string>

-						<object class="NSMenu" key="NSSubmenu" id="526778998">

-							<string key="NSTitle">Bearbeiten</string>

-							<array class="NSMutableArray" key="NSMenuItems">

-								<object class="NSMenuItem" id="185296989">

-									<reference key="NSMenu" ref="526778998"/>

-									<string key="NSTitle">Kopieren</string>

-									<string key="NSKeyEquiv">c</string>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-							</array>

-						</object>

-					</object>

-					<object class="NSMenuItem" id="931553638">

-						<reference key="NSMenu" ref="524015605"/>

-						<string key="NSTitle">Fenster</string>

-						<string key="NSKeyEquiv"/>

-						<int key="NSKeyEquivModMask">1048576</int>

-						<int key="NSMnemonicLoc">2147483647</int>

-						<reference key="NSOnImage" ref="531645050"/>

-						<reference key="NSMixedImage" ref="351811234"/>

-						<string key="NSAction">submenuAction:</string>

-						<object class="NSMenu" key="NSSubmenu" id="96874957">

-							<string key="NSTitle">Fenster</string>

-							<array class="NSMutableArray" key="NSMenuItems">

-								<object class="NSMenuItem" id="984461797">

-									<reference key="NSMenu" ref="96874957"/>

-									<string key="NSTitle">Schließen</string>

-									<string key="NSKeyEquiv">w</string>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="677652931">

-									<reference key="NSMenu" ref="96874957"/>

-									<string key="NSTitle">Im Dock ablegen</string>

-									<string key="NSKeyEquiv">m</string>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="1066447520">

-									<reference key="NSMenu" ref="96874957"/>

-									<string key="NSTitle">Zoomen</string>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="280172320">

-									<reference key="NSMenu" ref="96874957"/>

-									<bool key="NSIsDisabled">YES</bool>

-									<bool key="NSIsSeparator">YES</bool>

-									<string key="NSTitle"/>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="1036389925">

-									<reference key="NSMenu" ref="96874957"/>

-									<string key="NSTitle">Vorwärts blättern</string>

-									<string key="NSKeyEquiv">&lt;</string>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="369641893">

-									<reference key="NSMenu" ref="96874957"/>

-									<string key="NSTitle">Rückwärts blättern</string>

-									<string key="NSKeyEquiv">&gt;</string>

-									<int key="NSKeyEquivModMask">1179648</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="155085383">

-									<reference key="NSMenu" ref="96874957"/>

-									<bool key="NSIsDisabled">YES</bool>

-									<bool key="NSIsSeparator">YES</bool>

-									<string key="NSTitle"/>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="276216762">

-									<reference key="NSMenu" ref="96874957"/>

-									<string key="NSTitle">Alle nach vorne bringen</string>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-							</array>

-							<string key="NSName">_NSWindowsMenu</string>

-						</object>

-					</object>

-					<object class="NSMenuItem" id="551174276">

-						<reference key="NSMenu" ref="524015605"/>

-						<string key="NSTitle">Hilfe</string>

-						<string key="NSKeyEquiv"/>

-						<int key="NSKeyEquivModMask">1048576</int>

-						<int key="NSMnemonicLoc">2147483647</int>

-						<reference key="NSOnImage" ref="531645050"/>

-						<reference key="NSMixedImage" ref="351811234"/>

-						<string key="NSAction">submenuAction:</string>

-						<object class="NSMenu" key="NSSubmenu" id="511848303">

-							<string key="NSTitle">Hilfe</string>

-							<array class="NSMutableArray" key="NSMenuItems">

-								<object class="NSMenuItem" id="504984881">

-									<reference key="NSMenu" ref="511848303"/>

-									<string key="NSTitle">X11 Hilfe</string>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-							</array>

-						</object>

-					</object>

-				</array>

-				<string key="NSName">_NSMainMenu</string>

-			</object>

-			<object class="NSCustomObject" id="485884620">

-				<string key="NSClassName">X11Controller</string>

-			</object>

-			<object class="NSWindowTemplate" id="124913468">

-				<int key="NSWindowStyleMask">3</int>

-				<int key="NSWindowBacking">2</int>

-				<string key="NSWindowRect">{{2350, 1291.0391}, {550, 341}}</string>

-				<int key="NSWTFlags">1350041600</int>

-				<string key="NSWindowTitle">X11 Einstellungen</string>

-				<string key="NSWindowClass">NSPanel</string>

-				<object class="NSMutableString" key="NSViewClass">

-					<characters key="NS.bytes">View</characters>

-				</object>

-				<nil key="NSUserInterfaceItemIdentifier"/>

-				<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

-				<string key="NSWindowContentMinSize">{320, 240}</string>

-				<object class="NSView" key="NSWindowView" id="941366957">

-					<nil key="NSNextResponder"/>

-					<int key="NSvFlags">256</int>

-					<array class="NSMutableArray" key="NSSubviews">

-						<object class="NSTabView" id="448510093">

-							<reference key="NSNextResponder" ref="941366957"/>

-							<int key="NSvFlags">274</int>

-							<string key="NSFrame">{{13, 10}, {524, 325}}</string>

-							<reference key="NSSuperview" ref="941366957"/>

-							<array class="NSMutableArray" key="NSTabViewItems">

-								<object class="NSTabViewItem" id="287591690">

-									<object class="NSMutableString" key="NSIdentifier">

-										<characters key="NS.bytes">1</characters>

-									</object>

-									<object class="NSView" key="NSView" id="596750588">

-										<nil key="NSNextResponder"/>

-										<int key="NSvFlags">256</int>

-										<array class="NSMutableArray" key="NSSubviews">

-											<object class="NSButton" id="119157981">

-												<reference key="NSNextResponder" ref="596750588"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{18, 243}, {402, 18}}</string>

-												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSNextKeyView" ref="179949713"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="990762273">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">Drei Maustasten nachbilden</string>

-													<object class="NSFont" key="NSSupport" id="463863101">

-														<string key="NSName">LucidaGrande</string>

-														<double key="NSSize">13</double>

-														<int key="NSfFlags">1044</int>

-													</object>

-													<reference key="NSControlView" ref="119157981"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<object class="NSCustomResource" key="NSNormalImage" id="192701610">

-														<string key="NSClassName">NSImage</string>

-														<string key="NSResourceName">NSSwitch</string>

-													</object>

-													<object class="NSButtonImageSource" key="NSAlternateImage" id="391434389">

-														<string key="NSImageName">NSSwitch</string>

-													</object>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSTextField" id="443008216">

-												<reference key="NSNextResponder" ref="596750588"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{36, 93}, {461, 28}}</string>

-												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSNextKeyView" ref="406291430"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="391919450">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">Bei Aktivierung können die Tastenentsprechungen für die Menüleiste die X11-Programme stören, die Meta-Sondertasten verwenden.</string>

-													<object class="NSFont" key="NSSupport" id="26">

-														<string key="NSName">LucidaGrande</string>

-														<double key="NSSize">11</double>

-														<int key="NSfFlags">3100</int>

-													</object>

-													<string key="NSPlaceholderString"/>

-													<reference key="NSControlView" ref="443008216"/>

-													<object class="NSColor" key="NSBackgroundColor" id="57160303">

-														<int key="NSColorSpace">6</int>

-														<string key="NSCatalogName">System</string>

-														<string key="NSColorName">controlColor</string>

-														<object class="NSColor" key="NSColor" id="590688762">

-															<int key="NSColorSpace">3</int>

-															<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>

-														</object>

-													</object>

-													<object class="NSColor" key="NSTextColor" id="930815747">

-														<int key="NSColorSpace">6</int>

-														<string key="NSCatalogName">System</string>

-														<string key="NSColorName">controlTextColor</string>

-														<object class="NSColor" key="NSColor" id="214098874">

-															<int key="NSColorSpace">3</int>

-															<bytes key="NSWhite">MAA</bytes>

-														</object>

-													</object>

-												</object>

-											</object>

-											<object class="NSTextField" id="282885445">

-												<reference key="NSNextResponder" ref="596750588"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{36, 203}, {461, 34}}</string>

-												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSNextKeyView" ref="31160162"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="649334366">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string type="base64-UTF8" key="NSContents">SGFsdGVuIFNpZSBiZWltIEtsaWNrZW4gZGllIFdhaGx0YXN0ZSBvZGVyIGRpZSBCZWZlaGxzdGFzdGUg

-Z2VkcsO8Y2t0LCB1bSBkaWUgbWl0dGxlcmUgb2RlciBkaWUgcmVjaHRlIE1hdXN0YXN0ZSB6dSBha3Rp

-dmllcmVuLgo</string>

-													<reference key="NSSupport" ref="26"/>

-													<string key="NSPlaceholderString"/>

-													<reference key="NSControlView" ref="282885445"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSButton" id="842100515">

-												<reference key="NSNextResponder" ref="596750588"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{18, 127}, {402, 18}}</string>

-												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSNextKeyView" ref="443008216"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="940564599">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">Tastenentsprechungen unter X11 aktivieren</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="842100515"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="192701610"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSTextField" id="31160162">

-												<reference key="NSNextResponder" ref="596750588"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{36, 151}, {461, 28}}</string>

-												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSNextKeyView" ref="842100515"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="666057093">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">Bei Aktivierung kann Ihre aktuelle X11-Keymap durch Änderungen des Tastaturmenüs überschrieben werden.</string>

-													<reference key="NSSupport" ref="26"/>

-													<string key="NSPlaceholderString"/>

-													<reference key="NSControlView" ref="31160162"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSButton" id="179949713">

-												<reference key="NSNextResponder" ref="596750588"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{18, 185}, {402, 18}}</string>

-												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSNextKeyView" ref="282885445"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="967619578">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">Tastaturbelegung des Systems verwenden</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="179949713"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="192701610"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSTextField" id="278155937">

-												<reference key="NSNextResponder" ref="596750588"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{36, 32}, {461, 31}}</string>

-												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSNextKeyView" ref="863505041"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="617441821">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">Bei Aktivierung entsprechen die Wahltasten Alt_L und Alt_R X11-Tastensymbolen anstatt „Mode_switch“.</string>

-													<reference key="NSSupport" ref="26"/>

-													<reference key="NSControlView" ref="278155937"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSButton" id="406291430">

-												<reference key="NSNextResponder" ref="596750588"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{18, 69}, {402, 18}}</string>

-												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSNextKeyView" ref="278155937"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="67728988">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">Wahltasten entsprechen Alt_L und Alt_R</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="406291430"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="192701610"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSButton" id="863505041">

-												<reference key="NSNextResponder" ref="596750588"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{18, 8}, {418, 18}}</string>

-												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSNextKeyView" ref="448510093"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="1016286396">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">Immer in Bewegungsrichtung der Finger scrollen</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="863505041"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="192701610"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-										</array>

-										<string key="NSFrame">{{10, 33}, {504, 279}}</string>

-										<reference key="NSNextKeyView" ref="119157981"/>

-									</object>

-									<string key="NSLabel">Eingabe</string>

-									<reference key="NSColor" ref="57160303"/>

-									<reference key="NSTabView" ref="448510093"/>

-								</object>

-								<object class="NSTabViewItem" id="960678392">

-									<object class="NSMutableString" key="NSIdentifier">

-										<characters key="NS.bytes">2</characters>

-									</object>

-									<object class="NSView" key="NSView" id="515308735">

-										<nil key="NSNextResponder"/>

-										<int key="NSvFlags">256</int>

-										<array class="NSMutableArray" key="NSSubviews">

-											<object class="NSPopUpButton" id="709074847">

-												<reference key="NSNextResponder" ref="515308735"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{74, 235}, {197, 26}}</string>

-												<reference key="NSSuperview" ref="515308735"/>

-												<reference key="NSNextKeyView" ref="86150604"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSPopUpButtonCell" key="NSCell" id="633115429">

-													<int key="NSCellFlags">-2076049856</int>

-													<int key="NSCellFlags2">1024</int>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="709074847"/>

-													<int key="NSButtonFlags">109199615</int>

-													<int key="NSButtonFlags2">1</int>

-													<object class="NSFont" key="NSAlternateImage">

-														<string key="NSName">LucidaGrande</string>

-														<double key="NSSize">13</double>

-														<int key="NSfFlags">16</int>

-													</object>

-													<string key="NSAlternateContents"/>

-													<object class="NSMutableString" key="NSKeyEquivalent">

-														<characters key="NS.bytes"/>

-													</object>

-													<int key="NSPeriodicDelay">400</int>

-													<int key="NSPeriodicInterval">75</int>

-													<object class="NSMenuItem" key="NSMenuItem" id="616492372">

-														<reference key="NSMenu" ref="341113515"/>

-														<string key="NSTitle">Vom Monitor</string>

-														<string key="NSKeyEquiv"/>

-														<int key="NSKeyEquivModMask">1048576</int>

-														<int key="NSMnemonicLoc">2147483647</int>

-														<int key="NSState">1</int>

-														<reference key="NSOnImage" ref="531645050"/>

-														<reference key="NSMixedImage" ref="351811234"/>

-														<string key="NSAction">_popUpItemAction:</string>

-														<int key="NSTag">-1</int>

-														<reference key="NSTarget" ref="633115429"/>

-													</object>

-													<bool key="NSMenuItemRespectAlignment">YES</bool>

-													<object class="NSMenu" key="NSMenu" id="341113515">

-														<object class="NSMutableString" key="NSTitle">

-															<characters key="NS.bytes">OtherViews</characters>

-														</object>

-														<array class="NSMutableArray" key="NSMenuItems">

-															<reference ref="616492372"/>

-															<object class="NSMenuItem" id="759499526">

-																<reference key="NSMenu" ref="341113515"/>

-																<string key="NSTitle">256 Farben</string>

-																<string key="NSKeyEquiv"/>

-																<int key="NSKeyEquivModMask">1048576</int>

-																<int key="NSMnemonicLoc">2147483647</int>

-																<reference key="NSOnImage" ref="531645050"/>

-																<reference key="NSMixedImage" ref="351811234"/>

-																<string key="NSAction">_popUpItemAction:</string>

-																<int key="NSTag">8</int>

-																<reference key="NSTarget" ref="633115429"/>

-															</object>

-															<object class="NSMenuItem" id="543935434">

-																<reference key="NSMenu" ref="341113515"/>

-																<string key="NSTitle">32768 Farben</string>

-																<string key="NSKeyEquiv"/>

-																<int key="NSKeyEquivModMask">1048576</int>

-																<int key="NSMnemonicLoc">2147483647</int>

-																<reference key="NSOnImage" ref="531645050"/>

-																<reference key="NSMixedImage" ref="351811234"/>

-																<string key="NSAction">_popUpItemAction:</string>

-																<int key="NSTag">15</int>

-																<reference key="NSTarget" ref="633115429"/>

-															</object>

-															<object class="NSMenuItem" id="836673018">

-																<reference key="NSMenu" ref="341113515"/>

-																<string key="NSTitle">16,7 Millionen Farben</string>

-																<string key="NSKeyEquiv"/>

-																<int key="NSKeyEquivModMask">1048576</int>

-																<int key="NSMnemonicLoc">2147483647</int>

-																<reference key="NSOnImage" ref="531645050"/>

-																<reference key="NSMixedImage" ref="351811234"/>

-																<string key="NSAction">_popUpItemAction:</string>

-																<int key="NSTag">24</int>

-																<reference key="NSTarget" ref="633115429"/>

-															</object>

-														</array>

-													</object>

-													<int key="NSPreferredEdge">3</int>

-													<bool key="NSUsesItemFromMenu">YES</bool>

-													<bool key="NSAltersState">YES</bool>

-													<int key="NSArrowPosition">1</int>

-												</object>

-											</object>

-											<object class="NSTextField" id="201731424">

-												<reference key="NSNextResponder" ref="515308735"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{17, 238}, {55, 20}}</string>

-												<reference key="NSSuperview" ref="515308735"/>

-												<reference key="NSNextKeyView" ref="709074847"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="930265681">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">Farben:</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<string key="NSPlaceholderString"/>

-													<reference key="NSControlView" ref="201731424"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSTextField" id="86150604">

-												<reference key="NSNextResponder" ref="515308735"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{36, 216}, {392, 14}}</string>

-												<reference key="NSSuperview" ref="515308735"/>

-												<reference key="NSNextKeyView" ref="477203622"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="311969422">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">Diese Option wird beim nächsten Start von X11 wirksam.</string>

-													<reference key="NSSupport" ref="26"/>

-													<string key="NSPlaceholderString"/>

-													<reference key="NSControlView" ref="86150604"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSButton" id="477203622">

-												<reference key="NSNextResponder" ref="515308735"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{18, 182}, {409, 23}}</string>

-												<reference key="NSSuperview" ref="515308735"/>

-												<reference key="NSNextKeyView" ref="298603383"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="631531164">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">Vollbildmodus</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="477203622"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="192701610"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSButton" id="57246850">

-												<reference key="NSNextResponder" ref="515308735"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{37, 116}, {409, 23}}</string>

-												<reference key="NSSuperview" ref="515308735"/>

-												<reference key="NSNextKeyView" ref="331853183"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="917248662">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">Zugriff auf Menüleiste im Vollbildmodus erlauben</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="57246850"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="192701610"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSTextField" id="298603383">

-												<reference key="NSNextResponder" ref="515308735"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{36, 145}, {461, 42}}</string>

-												<reference key="NSSuperview" ref="515308735"/>

-												<reference key="NSNextKeyView" ref="57246850"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="761107402">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">Hiermit wird das X11-Hauptfenster aktiviert. Verwenden Sie die Tastenkombination Befehl+Wahl+A, um den Vollbildmodus ein- oder auszuschalten.</string>

-													<reference key="NSSupport" ref="26"/>

-													<string key="NSPlaceholderString"/>

-													<reference key="NSControlView" ref="298603383"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSTextField" id="331853183">

-												<reference key="NSNextResponder" ref="515308735"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{54, 79}, {436, 31}}</string>

-												<reference key="NSSuperview" ref="515308735"/>

-												<reference key="NSNextKeyView" ref="448510093"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="1042813110">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">Die Menüleiste wird sichtbar, sobald Sie den Mauszeiger in den oberen Bereich Ihres primären Display bewegen.</string>

-													<reference key="NSSupport" ref="26"/>

-													<reference key="NSControlView" ref="331853183"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-										</array>

-										<string key="NSFrame">{{10, 33}, {504, 279}}</string>

-										<reference key="NSNextKeyView" ref="201731424"/>

-									</object>

-									<string key="NSLabel">Ausgabe</string>

-									<reference key="NSColor" ref="57160303"/>

-									<reference key="NSTabView" ref="448510093"/>

-								</object>

-								<object class="NSTabViewItem" id="723450037">

-									<object class="NSMutableString" key="NSIdentifier">

-										<characters key="NS.bytes">2</characters>

-									</object>

-									<object class="NSView" key="NSView" id="408298283">

-										<reference key="NSNextResponder" ref="448510093"/>

-										<int key="NSvFlags">256</int>

-										<array class="NSMutableArray" key="NSSubviews">

-											<object class="NSButton" id="878106058">

-												<reference key="NSNextResponder" ref="408298283"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{11, 255}, {409, 23}}</string>

-												<reference key="NSSuperview" ref="408298283"/>

-												<reference key="NSNextKeyView" ref="386152084"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="718083688">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">Synchronisierung aktivieren</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="878106058"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="192701610"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSTextField" id="386152084">

-												<reference key="NSNextResponder" ref="408298283"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{29, 221}, {464, 28}}</string>

-												<reference key="NSSuperview" ref="408298283"/>

-												<reference key="NSNextKeyView" ref="487809555"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="572508492">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">Aktiviert das Menüobjekt „Kopieren“ und ermöglicht die Synchronisierung zwischen dem „OSX Pasteboard“ und den Pufferspeichern „CLIPBOARD“ und „PRIMARY“ von X11.</string>

-													<reference key="NSSupport" ref="26"/>

-													<reference key="NSControlView" ref="386152084"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSButton" id="477050998">

-												<reference key="NSNextResponder" ref="408298283"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{27, 129}, {436, 18}}</string>

-												<reference key="NSSuperview" ref="408298283"/>

-												<reference key="NSNextKeyView" ref="765780304"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="501304422">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">CLIPBOARD aktualisieren, wenn Pasteboard geändert wird</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="477050998"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="192701610"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSButton" id="765780304">

-												<reference key="NSNextResponder" ref="408298283"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{27, 104}, {463, 18}}</string>

-												<reference key="NSSuperview" ref="408298283"/>

-												<reference key="NSNextKeyView" ref="1002778833"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="510771323">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">PRIMARY (Mittel-Klick) aktualisieren, wenn Pasteboard geändert wird</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="765780304"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="192701610"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSButton" id="1002778833">

-												<reference key="NSNextResponder" ref="408298283"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{27, 81}, {498, 18}}</string>

-												<reference key="NSSuperview" ref="408298283"/>

-												<reference key="NSNextKeyView" ref="522511724"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="897099877">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">Pasteboard sofort aktualisieren, wenn Text ausgewählt wird</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="1002778833"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="192701610"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSButton" id="487809555">

-												<reference key="NSNextResponder" ref="408298283"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{27, 192}, {438, 18}}</string>

-												<reference key="NSSuperview" ref="408298283"/>

-												<reference key="NSNextKeyView" ref="620944856"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="619977658">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">Pasteboard aktualisieren, wenn CLIPBOARD geändert wird</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="487809555"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="192701610"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSTextField" id="620944856">

-												<reference key="NSNextResponder" ref="408298283"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{41, 158}, {452, 28}}</string>

-												<reference key="NSSuperview" ref="408298283"/>

-												<reference key="NSNextKeyView" ref="477050998"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="461823902">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">Deaktivieren Sie diese Option, wenn Sie „xclipboard“, „klipper“ oder einen beliebigen anderen X11-Zwischenablage-Manager verwenden möchten.</string>

-													<reference key="NSSupport" ref="26"/>

-													<reference key="NSControlView" ref="620944856"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSTextField" id="522511724">

-												<reference key="NSNextResponder" ref="408298283"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{41, 47}, {450, 28}}</string>

-												<reference key="NSSuperview" ref="408298283"/>

-												<reference key="NSNextKeyView" ref="448510093"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="994587858">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">Aufgrund von Einschränkungen im X11-Protokoll funktioniert diese Option in manchen Programmen u. U. nicht immer.</string>

-													<reference key="NSSupport" ref="26"/>

-													<reference key="NSControlView" ref="522511724"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-										</array>

-										<string key="NSFrame">{{10, 33}, {504, 279}}</string>

-										<reference key="NSSuperview" ref="448510093"/>

-										<reference key="NSNextKeyView" ref="878106058"/>

-									</object>

-									<string key="NSLabel">Zwischenablage</string>

-									<reference key="NSColor" ref="57160303"/>

-									<reference key="NSTabView" ref="448510093"/>

-								</object>

-								<object class="NSTabViewItem" id="10973343">

-									<object class="NSMutableString" key="NSIdentifier">

-										<characters key="NS.bytes">2</characters>

-									</object>

-									<object class="NSView" key="NSView" id="184765684">

-										<nil key="NSNextResponder"/>

-										<int key="NSvFlags">256</int>

-										<array class="NSMutableArray" key="NSSubviews">

-											<object class="NSButton" id="657659108">

-												<reference key="NSNextResponder" ref="184765684"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{15, 245}, {213, 18}}</string>

-												<reference key="NSSuperview" ref="184765684"/>

-												<reference key="NSNextKeyView" ref="290578835"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="259618205">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">Durch inaktive Fenster klicken</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="657659108"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="192701610"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSTextField" id="290578835">

-												<reference key="NSNextResponder" ref="184765684"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{23, 211}, {456, 28}}</string>

-												<reference key="NSSuperview" ref="184765684"/>

-												<reference key="NSNextKeyView" ref="992839333"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="399127858">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">Bei Aktivierung wird beim Klicken auf ein inaktives Fenster der Mausklick zusätzlich an dieses Fenster weitergegeben.</string>

-													<reference key="NSSupport" ref="26"/>

-													<reference key="NSControlView" ref="290578835"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSButton" id="992839333">

-												<reference key="NSNextResponder" ref="184765684"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{15, 184}, {155, 18}}</string>

-												<reference key="NSSuperview" ref="184765684"/>

-												<reference key="NSNextKeyView" ref="138261120"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="959555182">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">Fokus folgt der Maus</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="992839333"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="192701610"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSTextField" id="138261120">

-												<reference key="NSNextResponder" ref="184765684"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{23, 161}, {442, 17}}</string>

-												<reference key="NSSuperview" ref="184765684"/>

-												<reference key="NSNextKeyView" ref="128352289"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="183409141">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">Der Fokus des X11-Fensters folgt dem Cursor. Dies hat einige nachteilige Effekte.</string>

-													<reference key="NSSupport" ref="26"/>

-													<reference key="NSControlView" ref="138261120"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSButton" id="128352289">

-												<reference key="NSNextResponder" ref="184765684"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{15, 140}, {402, 18}}</string>

-												<reference key="NSSuperview" ref="184765684"/>

-												<reference key="NSNextKeyView" ref="57161931"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="556463187">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">Fokus auf neuem Fenster</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="128352289"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="192701610"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSTextField" id="57161931">

-												<reference key="NSNextResponder" ref="184765684"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{23, 92}, {456, 42}}</string>

-												<reference key="NSSuperview" ref="184765684"/>

-												<reference key="NSNextKeyView" ref="448510093"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="989804990">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">Bei Aktivierung wird beim Erzeugen eines neuen X11-Fensters das „X11.app“ in den Vordergrund gebracht (anstelle von „Finder.app“, „Terminal.app“ usw.).</string>

-													<reference key="NSSupport" ref="26"/>

-													<reference key="NSControlView" ref="57161931"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-										</array>

-										<string key="NSFrame">{{10, 33}, {504, 279}}</string>

-										<reference key="NSNextKeyView" ref="657659108"/>

-									</object>

-									<string key="NSLabel">Fenster</string>

-									<reference key="NSColor" ref="57160303"/>

-									<reference key="NSTabView" ref="448510093"/>

-								</object>

-								<object class="NSTabViewItem" id="348328898">

-									<object class="NSView" key="NSView" id="300811574">

-										<nil key="NSNextResponder"/>

-										<int key="NSvFlags">256</int>

-										<array class="NSMutableArray" key="NSSubviews">

-											<object class="NSButton" id="989050925">

-												<reference key="NSNextResponder" ref="300811574"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{18, 243}, {215, 18}}</string>

-												<reference key="NSSuperview" ref="300811574"/>

-												<reference key="NSNextKeyView" ref="168436707"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="189594322">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">Verbindungen authentifizieren</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="989050925"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="192701610"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSButton" id="700826966">

-												<reference key="NSNextResponder" ref="300811574"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{18, 166}, {312, 18}}</string>

-												<reference key="NSSuperview" ref="300811574"/>

-												<reference key="NSNextKeyView" ref="363817195"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="489340979">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">Verbindungen von Netzwerk-Clients erlauben</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="700826966"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="192701610"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSTextField" id="168436707">

-												<reference key="NSNextResponder" ref="300811574"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{36, 189}, {463, 48}}</string>

-												<reference key="NSSuperview" ref="300811574"/>

-												<reference key="NSNextKeyView" ref="700826966"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="53243865">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">Beim Starten von X11 werden Xauthority-Schlüssel zur Zugriffskontrolle erstellt. Wenn sich die IP-Adresse des Systems ändert, sind diese Schlüssel nicht mehr gültig. Möglicherweise können die X11-Programme dann nicht mehr gestartet werden.</string>

-													<reference key="NSSupport" ref="26"/>

-													<string key="NSPlaceholderString"/>

-													<reference key="NSControlView" ref="168436707"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSTextField" id="363817195">

-												<reference key="NSNextResponder" ref="300811574"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{36, 104}, {463, 56}}</string>

-												<reference key="NSSuperview" ref="300811574"/>

-												<reference key="NSNextKeyView" ref="223835729"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="390084685">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">Bei Aktivierung muss „Verbindungen authentifizieren“ ebenfalls aktiviert sein, damit die Sicherheit des System gewährleistet ist. Bei Deaktivierung sind Verbindungen von entfernten Programmen nicht erlaubt.</string>

-													<reference key="NSSupport" ref="26"/>

-													<string key="NSPlaceholderString"/>

-													<reference key="NSControlView" ref="363817195"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSTextField" id="223835729">

-												<reference key="NSNextResponder" ref="300811574"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{17, 17}, {404, 14}}</string>

-												<reference key="NSSuperview" ref="300811574"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="283628678">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">Diese Optionen werden beim nächsten Start von X11 wirksam.</string>

-													<reference key="NSSupport" ref="26"/>

-													<string key="NSPlaceholderString"/>

-													<reference key="NSControlView" ref="223835729"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-										</array>

-										<string key="NSFrame">{{10, 33}, {504, 279}}</string>

-										<reference key="NSNextKeyView" ref="989050925"/>

-									</object>

-									<string key="NSLabel">Sicherheit</string>

-									<reference key="NSColor" ref="57160303"/>

-									<reference key="NSTabView" ref="448510093"/>

-								</object>

-							</array>

-							<reference key="NSSelectedTabViewItem" ref="723450037"/>

-							<reference key="NSFont" ref="463863101"/>

-							<int key="NSTvFlags">0</int>

-							<bool key="NSAllowTruncatedLabels">YES</bool>

-							<bool key="NSDrawsBackground">YES</bool>

-							<array class="NSMutableArray" key="NSSubviews">

-								<reference ref="408298283"/>

-							</array>

-						</object>

-					</array>

-					<string key="NSFrameSize">{550, 341}</string>

-					<reference key="NSNextKeyView" ref="448510093"/>

-				</object>

-				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>

-				<string key="NSMinSize">{320, 262}</string>

-				<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

-				<string key="NSFrameAutosaveName">x11_prefs</string>

-			</object>

-			<object class="NSWindowTemplate" id="604417141">

-				<int key="NSWindowStyleMask">11</int>

-				<int key="NSWindowBacking">2</int>

-				<string key="NSWindowRect">{{360, 400}, {512, 271}}</string>

-				<int key="NSWTFlags">1350041600</int>

-				<string key="NSWindowTitle">X11-Programmmenü</string>

-				<string key="NSWindowClass">NSPanel</string>

-				<object class="NSMutableString" key="NSViewClass">

-					<characters key="NS.bytes">View</characters>

-				</object>

-				<nil key="NSUserInterfaceItemIdentifier"/>

-				<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

-				<string key="NSWindowContentMinSize">{512, 240}</string>

-				<object class="NSView" key="NSWindowView" id="85544634">

-					<nil key="NSNextResponder"/>

-					<int key="NSvFlags">256</int>

-					<array class="NSMutableArray" key="NSSubviews">

-						<object class="NSButton" id="671954382">

-							<reference key="NSNextResponder" ref="85544634"/>

-							<int key="NSvFlags">265</int>

-							<string key="NSFrame">{{340, 191}, {158, 32}}</string>

-							<reference key="NSSuperview" ref="85544634"/>

-							<bool key="NSEnabled">YES</bool>

-							<object class="NSButtonCell" key="NSCell" id="143554520">

-								<int key="NSCellFlags">67239424</int>

-								<int key="NSCellFlags2">137887744</int>

-								<string key="NSContents">Duplizieren</string>

-								<reference key="NSSupport" ref="463863101"/>

-								<reference key="NSControlView" ref="671954382"/>

-								<int key="NSButtonFlags">-2038284033</int>

-								<int key="NSButtonFlags2">1</int>

-								<object class="NSFont" key="NSAlternateImage" id="549406736">

-									<string key="NSName">Helvetica</string>

-									<double key="NSSize">13</double>

-									<int key="NSfFlags">16</int>

-								</object>

-								<string key="NSAlternateContents"/>

-								<object class="NSMutableString" key="NSKeyEquivalent">

-									<characters key="NS.bytes"/>

-								</object>

-								<int key="NSPeriodicDelay">200</int>

-								<int key="NSPeriodicInterval">25</int>

-							</object>

-						</object>

-						<object class="NSButton" id="492358940">

-							<reference key="NSNextResponder" ref="85544634"/>

-							<int key="NSvFlags">265</int>

-							<string key="NSFrame">{{340, 159}, {158, 32}}</string>

-							<reference key="NSSuperview" ref="85544634"/>

-							<bool key="NSEnabled">YES</bool>

-							<object class="NSButtonCell" key="NSCell" id="8201128">

-								<int key="NSCellFlags">67239424</int>

-								<int key="NSCellFlags2">137887744</int>

-								<string key="NSContents">Entfernen</string>

-								<reference key="NSSupport" ref="463863101"/>

-								<reference key="NSControlView" ref="492358940"/>

-								<int key="NSButtonFlags">-2038284033</int>

-								<int key="NSButtonFlags2">1</int>

-								<reference key="NSAlternateImage" ref="549406736"/>

-								<string key="NSAlternateContents"/>

-								<object class="NSMutableString" key="NSKeyEquivalent">

-									<characters key="NS.bytes"/>

-								</object>

-								<int key="NSPeriodicDelay">200</int>

-								<int key="NSPeriodicInterval">25</int>

-							</object>

-						</object>

-						<object class="NSScrollView" id="1063387772">

-							<reference key="NSNextResponder" ref="85544634"/>

-							<int key="NSvFlags">274</int>

-							<array class="NSMutableArray" key="NSSubviews">

-								<object class="NSClipView" id="580565898">

-									<reference key="NSNextResponder" ref="1063387772"/>

-									<int key="NSvFlags">2304</int>

-									<array class="NSMutableArray" key="NSSubviews">

-										<object class="NSTableView" id="905092943">

-											<reference key="NSNextResponder" ref="580565898"/>

-											<int key="NSvFlags">256</int>

-											<string key="NSFrameSize">{301, 198}</string>

-											<reference key="NSSuperview" ref="580565898"/>

-											<bool key="NSEnabled">YES</bool>

-											<object class="NSTableHeaderView" key="NSHeaderView" id="792419186">

-												<reference key="NSNextResponder" ref="672307654"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrameSize">{301, 17}</string>

-												<reference key="NSSuperview" ref="672307654"/>

-												<reference key="NSTableView" ref="905092943"/>

-											</object>

-											<object class="_NSCornerView" key="NSCornerView" id="898633680">

-												<reference key="NSNextResponder" ref="1063387772"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{302, 0}, {16, 17}}</string>

-												<reference key="NSSuperview" ref="1063387772"/>

-											</object>

-											<array class="NSMutableArray" key="NSTableColumns">

-												<object class="NSTableColumn" id="938444323">

-													<double key="NSWidth">122.73100280761719</double>

-													<double key="NSMinWidth">62.730998992919922</double>

-													<double key="NSMaxWidth">1000</double>

-													<object class="NSTableHeaderCell" key="NSHeaderCell">

-														<int key="NSCellFlags">75628096</int>

-														<int key="NSCellFlags2">2048</int>

-														<string key="NSContents">Name</string>

-														<reference key="NSSupport" ref="26"/>

-														<object class="NSColor" key="NSBackgroundColor" id="113872566">

-															<int key="NSColorSpace">3</int>

-															<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>

-														</object>

-														<object class="NSColor" key="NSTextColor" id="249576247">

-															<int key="NSColorSpace">6</int>

-															<string key="NSCatalogName">System</string>

-															<string key="NSColorName">headerTextColor</string>

-															<reference key="NSColor" ref="214098874"/>

-														</object>

-													</object>

-													<object class="NSTextFieldCell" key="NSDataCell" id="825378892">

-														<int key="NSCellFlags">338820672</int>

-														<int key="NSCellFlags2">1024</int>

-														<string key="NSContents">Textzelle</string>

-														<reference key="NSSupport" ref="463863101"/>

-														<string key="NSPlaceholderString"/>

-														<reference key="NSControlView" ref="905092943"/>

-														<object class="NSColor" key="NSBackgroundColor" id="822946413">

-															<int key="NSColorSpace">3</int>

-															<bytes key="NSWhite">MQA</bytes>

-														</object>

-														<reference key="NSTextColor" ref="930815747"/>

-													</object>

-													<int key="NSResizingMask">3</int>

-													<bool key="NSIsResizeable">YES</bool>

-													<bool key="NSIsEditable">YES</bool>

-													<reference key="NSTableView" ref="905092943"/>

-												</object>

-												<object class="NSTableColumn" id="84282687">

-													<double key="NSWidth">100</double>

-													<double key="NSMinWidth">40</double>

-													<double key="NSMaxWidth">1000</double>

-													<object class="NSTableHeaderCell" key="NSHeaderCell">

-														<int key="NSCellFlags">75628096</int>

-														<int key="NSCellFlags2">2048</int>

-														<string key="NSContents">Befehl</string>

-														<reference key="NSSupport" ref="26"/>

-														<reference key="NSBackgroundColor" ref="113872566"/>

-														<reference key="NSTextColor" ref="249576247"/>

-													</object>

-													<object class="NSTextFieldCell" key="NSDataCell" id="432610585">

-														<int key="NSCellFlags">338820672</int>

-														<int key="NSCellFlags2">1024</int>

-														<string key="NSContents">Textzelle</string>

-														<reference key="NSSupport" ref="463863101"/>

-														<string key="NSPlaceholderString"/>

-														<reference key="NSControlView" ref="905092943"/>

-														<reference key="NSBackgroundColor" ref="822946413"/>

-														<reference key="NSTextColor" ref="930815747"/>

-													</object>

-													<int key="NSResizingMask">3</int>

-													<bool key="NSIsResizeable">YES</bool>

-													<bool key="NSIsEditable">YES</bool>

-													<reference key="NSTableView" ref="905092943"/>

-												</object>

-												<object class="NSTableColumn" id="242608782">

-													<double key="NSWidth">69</double>

-													<double key="NSMinWidth">10</double>

-													<double key="NSMaxWidth">1000</double>

-													<object class="NSTableHeaderCell" key="NSHeaderCell">

-														<int key="NSCellFlags">75628096</int>

-														<int key="NSCellFlags2">2048</int>

-														<string key="NSContents">Kurzbefehl</string>

-														<reference key="NSSupport" ref="26"/>

-														<object class="NSColor" key="NSBackgroundColor">

-															<int key="NSColorSpace">6</int>

-															<string key="NSCatalogName">System</string>

-															<string key="NSColorName">headerColor</string>

-															<reference key="NSColor" ref="822946413"/>

-														</object>

-														<reference key="NSTextColor" ref="249576247"/>

-													</object>

-													<object class="NSTextFieldCell" key="NSDataCell" id="34714764">

-														<int key="NSCellFlags">338820672</int>

-														<int key="NSCellFlags2">1024</int>

-														<string key="NSContents">Textzelle</string>

-														<object class="NSFont" key="NSSupport">

-															<string key="NSName">LucidaGrande</string>

-															<double key="NSSize">12</double>

-															<int key="NSfFlags">16</int>

-														</object>

-														<string key="NSPlaceholderString"/>

-														<reference key="NSControlView" ref="905092943"/>

-														<bool key="NSDrawsBackground">YES</bool>

-														<object class="NSColor" key="NSBackgroundColor" id="812484075">

-															<int key="NSColorSpace">6</int>

-															<string key="NSCatalogName">System</string>

-															<string key="NSColorName">controlBackgroundColor</string>

-															<reference key="NSColor" ref="590688762"/>

-														</object>

-														<reference key="NSTextColor" ref="930815747"/>

-													</object>

-													<int key="NSResizingMask">3</int>

-													<bool key="NSIsResizeable">YES</bool>

-													<bool key="NSIsEditable">YES</bool>

-													<reference key="NSTableView" ref="905092943"/>

-												</object>

-											</array>

-											<double key="NSIntercellSpacingWidth">3</double>

-											<double key="NSIntercellSpacingHeight">2</double>

-											<reference key="NSBackgroundColor" ref="822946413"/>

-											<object class="NSColor" key="NSGridColor">

-												<int key="NSColorSpace">6</int>

-												<string key="NSCatalogName">System</string>

-												<string key="NSColorName">gridColor</string>

-												<object class="NSColor" key="NSColor">

-													<int key="NSColorSpace">3</int>

-													<bytes key="NSWhite">MC41AA</bytes>

-												</object>

-											</object>

-											<double key="NSRowHeight">17</double>

-											<int key="NSTvFlags">1379958784</int>

-											<reference key="NSDelegate"/>

-											<reference key="NSDataSource"/>

-											<int key="NSColumnAutoresizingStyle">1</int>

-											<int key="NSDraggingSourceMaskForLocal">-1</int>

-											<int key="NSDraggingSourceMaskForNonLocal">0</int>

-											<bool key="NSAllowsTypeSelect">YES</bool>

-											<int key="NSTableViewDraggingDestinationStyle">0</int>

-											<int key="NSTableViewGroupRowStyle">1</int>

-										</object>

-									</array>

-									<string key="NSFrame">{{1, 17}, {301, 198}}</string>

-									<reference key="NSSuperview" ref="1063387772"/>

-									<reference key="NSNextKeyView" ref="905092943"/>

-									<reference key="NSDocView" ref="905092943"/>

-									<reference key="NSBGColor" ref="812484075"/>

-									<int key="NScvFlags">4</int>

-								</object>

-								<object class="NSScroller" id="842897584">

-									<reference key="NSNextResponder" ref="1063387772"/>

-									<int key="NSvFlags">256</int>

-									<string key="NSFrame">{{302, 17}, {15, 198}}</string>

-									<reference key="NSSuperview" ref="1063387772"/>

-									<reference key="NSTarget" ref="1063387772"/>

-									<string key="NSAction">_doScroller:</string>

-									<double key="NSPercent">0.99492377042770386</double>

-								</object>

-								<object class="NSScroller" id="17278747">

-									<reference key="NSNextResponder" ref="1063387772"/>

-									<int key="NSvFlags">256</int>

-									<string key="NSFrame">{{1, 215}, {301, 15}}</string>

-									<reference key="NSSuperview" ref="1063387772"/>

-									<int key="NSsFlags">1</int>

-									<reference key="NSTarget" ref="1063387772"/>

-									<string key="NSAction">_doScroller:</string>

-									<double key="NSPercent">0.68852460384368896</double>

-								</object>

-								<object class="NSClipView" id="672307654">

-									<reference key="NSNextResponder" ref="1063387772"/>

-									<int key="NSvFlags">2304</int>

-									<array class="NSMutableArray" key="NSSubviews">

-										<reference ref="792419186"/>

-									</array>

-									<string key="NSFrame">{{1, 0}, {301, 17}}</string>

-									<reference key="NSSuperview" ref="1063387772"/>

-									<reference key="NSNextKeyView" ref="792419186"/>

-									<reference key="NSDocView" ref="792419186"/>

-									<reference key="NSBGColor" ref="812484075"/>

-									<int key="NScvFlags">4</int>

-								</object>

-								<reference ref="898633680"/>

-							</array>

-							<string key="NSFrame">{{20, 20}, {318, 231}}</string>

-							<reference key="NSSuperview" ref="85544634"/>

-							<reference key="NSNextKeyView" ref="580565898"/>

-							<int key="NSsFlags">133170</int>

-							<reference key="NSVScroller" ref="842897584"/>

-							<reference key="NSHScroller" ref="17278747"/>

-							<reference key="NSContentView" ref="580565898"/>

-							<reference key="NSHeaderClipView" ref="672307654"/>

-							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>

-						</object>

-						<object class="NSButton" id="758204686">

-							<reference key="NSNextResponder" ref="85544634"/>

-							<int key="NSvFlags">265</int>

-							<string key="NSFrame">{{340, 223}, {158, 32}}</string>

-							<reference key="NSSuperview" ref="85544634"/>

-							<bool key="NSEnabled">YES</bool>

-							<object class="NSButtonCell" key="NSCell" id="1025474039">

-								<int key="NSCellFlags">-2080244224</int>

-								<int key="NSCellFlags2">137887744</int>

-								<string key="NSContents">Objekt hinzufügen</string>

-								<reference key="NSSupport" ref="463863101"/>

-								<reference key="NSControlView" ref="758204686"/>

-								<int key="NSButtonFlags">-2038284033</int>

-								<int key="NSButtonFlags2">1</int>

-								<reference key="NSAlternateImage" ref="549406736"/>

-								<string key="NSAlternateContents"/>

-								<object class="NSMutableString" key="NSKeyEquivalent">

-									<characters key="NS.bytes"/>

-								</object>

-								<int key="NSPeriodicDelay">200</int>

-								<int key="NSPeriodicInterval">25</int>

-							</object>

-						</object>

-					</array>

-					<string key="NSFrameSize">{512, 271}</string>

-				</object>

-				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>

-				<string key="NSMinSize">{512, 262}</string>

-				<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

-				<string key="NSFrameAutosaveName">x11_apps</string>

-			</object>

-			<object class="NSMenu" id="294137138">

-				<string key="NSTitle">Menü</string>

-				<array class="NSMutableArray" key="NSMenuItems">

-					<object class="NSMenuItem" id="318286212">

-						<reference key="NSMenu" ref="294137138"/>

-						<bool key="NSIsDisabled">YES</bool>

-						<bool key="NSIsSeparator">YES</bool>

-						<string key="NSTitle"/>

-						<string key="NSKeyEquiv"/>

-						<int key="NSKeyEquivModMask">1048576</int>

-						<int key="NSMnemonicLoc">2147483647</int>

-						<reference key="NSOnImage" ref="531645050"/>

-						<reference key="NSMixedImage" ref="351811234"/>

-					</object>

-					<object class="NSMenuItem" id="511651072">

-						<reference key="NSMenu" ref="294137138"/>

-						<string key="NSTitle">Programme</string>

-						<string key="NSKeyEquiv"/>

-						<int key="NSKeyEquivModMask">1048576</int>

-						<int key="NSMnemonicLoc">2147483647</int>

-						<reference key="NSOnImage" ref="531645050"/>

-						<reference key="NSMixedImage" ref="351811234"/>

-						<string key="NSAction">submenuAction:</string>

-						<object class="NSMenu" key="NSSubmenu" id="48278059">

-							<string key="NSTitle">Programme</string>

-							<array class="NSMutableArray" key="NSMenuItems">

-								<object class="NSMenuItem" id="563798000">

-									<reference key="NSMenu" ref="48278059"/>

-									<bool key="NSIsDisabled">YES</bool>

-									<bool key="NSIsSeparator">YES</bool>

-									<string key="NSTitle"/>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="1032342329">

-									<reference key="NSMenu" ref="48278059"/>

-									<string key="NSTitle">Anpassen …</string>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-							</array>

-						</object>

-					</object>

-				</array>

-				<string key="NSName"/>

-			</object>

-		</array>

-		<object class="IBObjectContainer" key="IBDocument.Objects">

-			<array class="NSMutableArray" key="connectionRecords">

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">copy:</string>

-						<reference key="source" ref="941939442"/>

-						<reference key="destination" ref="185296989"/>

-					</object>

-					<int key="connectionID">181</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">minimize_window:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="677652931"/>

-					</object>

-					<int key="connectionID">202</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">close_window:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="984461797"/>

-					</object>

-					<int key="connectionID">205</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">zoom_window:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="1066447520"/>

-					</object>

-					<int key="connectionID">206</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">bring_to_front:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="276216762"/>

-					</object>

-					<int key="connectionID">207</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">hideOtherApplications:</string>

-						<reference key="source" ref="815810918"/>

-						<reference key="destination" ref="206802571"/>

-					</object>

-					<int key="connectionID">263</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">apps_separator</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="390088328"/>

-					</object>

-					<int key="connectionID">273</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">apps_table</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="905092943"/>

-					</object>

-					<int key="connectionID">301</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">apps_table_delete:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="492358940"/>

-					</object>

-					<int key="connectionID">303</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">apps_table_duplicate:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="671954382"/>

-					</object>

-					<int key="connectionID">304</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">apps_table_show:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="1065386165"/>

-					</object>

-					<int key="connectionID">308</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">apps_table_new:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="758204686"/>

-					</object>

-					<int key="connectionID">311</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_show:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="386173216"/>

-					</object>

-					<int key="connectionID">318</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">x11_about_item</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="139290918"/>

-					</object>

-					<int key="connectionID">321</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">enable_auth</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="989050925"/>

-					</object>

-					<int key="connectionID">387</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">enable_tcp</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="700826966"/>

-					</object>

-					<int key="connectionID">388</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">depth</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="709074847"/>

-					</object>

-					<int key="connectionID">389</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">fake_buttons</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="119157981"/>

-					</object>

-					<int key="connectionID">391</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">sync_keymap</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="179949713"/>

-					</object>

-					<int key="connectionID">392</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">enable_keyequivs</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="842100515"/>

-					</object>

-					<int key="connectionID">393</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="119157981"/>

-					</object>

-					<int key="connectionID">394</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="179949713"/>

-					</object>

-					<int key="connectionID">395</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="842100515"/>

-					</object>

-					<int key="connectionID">396</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="709074847"/>

-					</object>

-					<int key="connectionID">398</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="989050925"/>

-					</object>

-					<int key="connectionID">399</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="700826966"/>

-					</object>

-					<int key="connectionID">401</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">prefs_panel</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="124913468"/>

-					</object>

-					<int key="connectionID">402</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">x11_help:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="504984881"/>

-					</object>

-					<int key="connectionID">422</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">dockMenu</string>

-						<reference key="source" ref="815810918"/>

-						<reference key="destination" ref="294137138"/>

-					</object>

-					<int key="connectionID">426</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">dock_menu</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="294137138"/>

-					</object>

-					<int key="connectionID">428</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">delegate</string>

-						<reference key="source" ref="815810918"/>

-						<reference key="destination" ref="485884620"/>

-					</object>

-					<int key="connectionID">429</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">hide:</string>

-						<reference key="source" ref="815810918"/>

-						<reference key="destination" ref="301008465"/>

-					</object>

-					<int key="connectionID">430</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">unhideAllApplications:</string>

-						<reference key="source" ref="815810918"/>

-						<reference key="destination" ref="1023546148"/>

-					</object>

-					<int key="connectionID">431</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">orderFrontStandardAboutPanel:</string>

-						<reference key="source" ref="815810918"/>

-						<reference key="destination" ref="139290918"/>

-					</object>

-					<int key="connectionID">433</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">dock_apps_menu</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="48278059"/>

-					</object>

-					<int key="connectionID">530</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">dock_window_separator</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="318286212"/>

-					</object>

-					<int key="connectionID">531</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">apps_table_show:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="1032342329"/>

-					</object>

-					<int key="connectionID">534</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">next_window:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="1036389925"/>

-					</object>

-					<int key="connectionID">539</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">previous_window:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="369641893"/>

-					</object>

-					<int key="connectionID">540</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">enable_fullscreen</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="477203622"/>

-					</object>

-					<int key="connectionID">546</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">enable_fullscreen_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="477203622"/>

-					</object>

-					<int key="connectionID">547</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">toggle_fullscreen:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="6876565"/>

-					</object>

-					<int key="connectionID">548</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">toggle_fullscreen_item</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="6876565"/>

-					</object>

-					<int key="connectionID">549</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">menu</string>

-						<reference key="source" ref="815810918"/>

-						<reference key="destination" ref="524015605"/>

-					</object>

-					<int key="connectionID">300334</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">terminate:</string>

-						<reference key="source" ref="815810918"/>

-						<reference key="destination" ref="274138642"/>

-					</object>

-					<int key="connectionID">300336</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="657659108"/>

-					</object>

-					<int key="connectionID">300389</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="992839333"/>

-					</object>

-					<int key="connectionID">300390</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="128352289"/>

-					</object>

-					<int key="connectionID">300391</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">click_through</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="657659108"/>

-					</object>

-					<int key="connectionID">300392</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">focus_follows_mouse</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="992839333"/>

-					</object>

-					<int key="connectionID">300393</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">focus_on_new_window</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="128352289"/>

-					</object>

-					<int key="connectionID">300394</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">copy_menu_item</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="185296989"/>

-					</object>

-					<int key="connectionID">300443</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">sync_pasteboard</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="878106058"/>

-					</object>

-					<int key="connectionID">300444</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">sync_clipboard_to_pasteboard</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="487809555"/>

-					</object>

-					<int key="connectionID">300461</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">sync_pasteboard_to_clipboard</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="477050998"/>

-					</object>

-					<int key="connectionID">300462</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">sync_pasteboard_to_primary</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="765780304"/>

-					</object>

-					<int key="connectionID">300463</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">sync_primary_immediately</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="1002778833"/>

-					</object>

-					<int key="connectionID">300464</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="878106058"/>

-					</object>

-					<int key="connectionID">300465</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="487809555"/>

-					</object>

-					<int key="connectionID">300466</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="477050998"/>

-					</object>

-					<int key="connectionID">300467</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="765780304"/>

-					</object>

-					<int key="connectionID">300468</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="1002778833"/>

-					</object>

-					<int key="connectionID">300469</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">sync_text1</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="620944856"/>

-					</object>

-					<int key="connectionID">300470</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">sync_text2</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="522511724"/>

-					</object>

-					<int key="connectionID">300471</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">enable_fullscreen_menu</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="57246850"/>

-					</object>

-					<int key="connectionID">300474</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="57246850"/>

-					</object>

-					<int key="connectionID">300475</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="406291430"/>

-					</object>

-					<int key="connectionID">300480</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">option_sends_alt</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="406291430"/>

-					</object>

-					<int key="connectionID">300481</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="863505041"/>

-					</object>

-					<int key="connectionID">300484</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">enable_fullscreen_menu_text</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="331853183"/>

-					</object>

-					<int key="connectionID">300489</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">scroll_in_device_direction</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="863505041"/>

-					</object>

-					<int key="connectionID">300490</int>

-				</object>

-			</array>

-			<object class="IBMutableOrderedSet" key="objectRecords">

-				<array key="orderedObjects">

-					<object class="IBObjectRecord">

-						<int key="objectID">0</int>

-						<array key="object" id="0"/>

-						<reference key="children" ref="904585544"/>

-						<nil key="parent"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">-2</int>

-						<reference key="object" ref="815810918"/>

-						<reference key="parent" ref="0"/>

-						<string key="objectName">File's Owner</string>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">-1</int>

-						<reference key="object" ref="941939442"/>

-						<reference key="parent" ref="0"/>

-						<string key="objectName">First Responder</string>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">-3</int>

-						<reference key="object" ref="951368722"/>

-						<reference key="parent" ref="0"/>

-						<string key="objectName">Application</string>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">29</int>

-						<reference key="object" ref="524015605"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="931553638"/>

-							<reference ref="365880285"/>

-							<reference ref="200491363"/>

-							<reference ref="868031522"/>

-							<reference ref="551174276"/>

-						</array>

-						<reference key="parent" ref="0"/>

-						<string key="objectName">MainMenu</string>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">19</int>

-						<reference key="object" ref="931553638"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="96874957"/>

-						</array>

-						<reference key="parent" ref="524015605"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">24</int>

-						<reference key="object" ref="96874957"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="677652931"/>

-							<reference ref="276216762"/>

-							<reference ref="1066447520"/>

-							<reference ref="1036389925"/>

-							<reference ref="369641893"/>

-							<reference ref="155085383"/>

-							<reference ref="984461797"/>

-							<reference ref="280172320"/>

-						</array>

-						<reference key="parent" ref="931553638"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">5</int>

-						<reference key="object" ref="276216762"/>

-						<reference key="parent" ref="96874957"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">23</int>

-						<reference key="object" ref="677652931"/>

-						<reference key="parent" ref="96874957"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">92</int>

-						<reference key="object" ref="280172320"/>

-						<reference key="parent" ref="96874957"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">203</int>

-						<reference key="object" ref="984461797"/>

-						<reference key="parent" ref="96874957"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">204</int>

-						<reference key="object" ref="1066447520"/>

-						<reference key="parent" ref="96874957"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">536</int>

-						<reference key="object" ref="155085383"/>

-						<reference key="parent" ref="96874957"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">537</int>

-						<reference key="object" ref="1036389925"/>

-						<reference key="parent" ref="96874957"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">538</int>

-						<reference key="object" ref="369641893"/>

-						<reference key="parent" ref="96874957"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">56</int>

-						<reference key="object" ref="365880285"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="576521955"/>

-						</array>

-						<reference key="parent" ref="524015605"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">57</int>

-						<reference key="object" ref="576521955"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="139290918"/>

-							<reference ref="386173216"/>

-							<reference ref="32285361"/>

-							<reference ref="301008465"/>

-							<reference ref="274138642"/>

-							<reference ref="272876017"/>

-							<reference ref="431301145"/>

-							<reference ref="206802571"/>

-							<reference ref="848095279"/>

-							<reference ref="1023546148"/>

-							<reference ref="6876565"/>

-							<reference ref="479677589"/>

-						</array>

-						<reference key="parent" ref="365880285"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">58</int>

-						<reference key="object" ref="139290918"/>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">129</int>

-						<reference key="object" ref="386173216"/>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">131</int>

-						<reference key="object" ref="32285361"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="821388474"/>

-						</array>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">130</int>

-						<reference key="object" ref="821388474"/>

-						<reference key="parent" ref="32285361"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">134</int>

-						<reference key="object" ref="301008465"/>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">136</int>

-						<reference key="object" ref="274138642"/>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">143</int>

-						<reference key="object" ref="272876017"/>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">144</int>

-						<reference key="object" ref="431301145"/>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">145</int>

-						<reference key="object" ref="206802571"/>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">149</int>

-						<reference key="object" ref="848095279"/>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">150</int>

-						<reference key="object" ref="1023546148"/>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">544</int>

-						<reference key="object" ref="6876565"/>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">545</int>

-						<reference key="object" ref="479677589"/>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">163</int>

-						<reference key="object" ref="200491363"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="526778998"/>

-						</array>

-						<reference key="parent" ref="524015605"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">169</int>

-						<reference key="object" ref="526778998"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="185296989"/>

-						</array>

-						<reference key="parent" ref="200491363"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">157</int>

-						<reference key="object" ref="185296989"/>

-						<reference key="parent" ref="526778998"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">269</int>

-						<reference key="object" ref="868031522"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="981161348"/>

-						</array>

-						<reference key="parent" ref="524015605"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">270</int>

-						<reference key="object" ref="981161348"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="390088328"/>

-							<reference ref="1065386165"/>

-						</array>

-						<reference key="parent" ref="868031522"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">272</int>

-						<reference key="object" ref="390088328"/>

-						<reference key="parent" ref="981161348"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">305</int>

-						<reference key="object" ref="1065386165"/>

-						<reference key="parent" ref="981161348"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">419</int>

-						<reference key="object" ref="551174276"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="511848303"/>

-						</array>

-						<reference key="parent" ref="524015605"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">420</int>

-						<reference key="object" ref="511848303"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="504984881"/>

-						</array>

-						<reference key="parent" ref="551174276"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">421</int>

-						<reference key="object" ref="504984881"/>

-						<reference key="parent" ref="511848303"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">196</int>

-						<reference key="object" ref="485884620"/>

-						<reference key="parent" ref="0"/>

-						<string key="objectName">X11Controller</string>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">244</int>

-						<reference key="object" ref="124913468"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="941366957"/>

-						</array>

-						<reference key="parent" ref="0"/>

-						<string key="objectName">PrefsPanel</string>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">245</int>

-						<reference key="object" ref="941366957"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="448510093"/>

-						</array>

-						<reference key="parent" ref="124913468"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">348</int>

-						<reference key="object" ref="448510093"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="287591690"/>

-							<reference ref="960678392"/>

-							<reference ref="348328898"/>

-							<reference ref="10973343"/>

-							<reference ref="723450037"/>

-						</array>

-						<reference key="parent" ref="941366957"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">349</int>

-						<reference key="object" ref="287591690"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="596750588"/>

-						</array>

-						<reference key="parent" ref="448510093"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">351</int>

-						<reference key="object" ref="596750588"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="119157981"/>

-							<reference ref="443008216"/>

-							<reference ref="282885445"/>

-							<reference ref="842100515"/>

-							<reference ref="31160162"/>

-							<reference ref="179949713"/>

-							<reference ref="278155937"/>

-							<reference ref="406291430"/>

-							<reference ref="863505041"/>

-						</array>

-						<reference key="parent" ref="287591690"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">363</int>

-						<reference key="object" ref="119157981"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="990762273"/>

-						</array>

-						<reference key="parent" ref="596750588"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">364</int>

-						<reference key="object" ref="443008216"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="391919450"/>

-						</array>

-						<reference key="parent" ref="596750588"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">365</int>

-						<reference key="object" ref="282885445"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="649334366"/>

-						</array>

-						<reference key="parent" ref="596750588"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">368</int>

-						<reference key="object" ref="842100515"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="940564599"/>

-						</array>

-						<reference key="parent" ref="596750588"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">369</int>

-						<reference key="object" ref="31160162"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="666057093"/>

-						</array>

-						<reference key="parent" ref="596750588"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">370</int>

-						<reference key="object" ref="179949713"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="967619578"/>

-						</array>

-						<reference key="parent" ref="596750588"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">352</int>

-						<reference key="object" ref="960678392"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="515308735"/>

-						</array>

-						<reference key="parent" ref="448510093"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">350</int>

-						<reference key="object" ref="515308735"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="709074847"/>

-							<reference ref="201731424"/>

-							<reference ref="86150604"/>

-							<reference ref="477203622"/>

-							<reference ref="57246850"/>

-							<reference ref="298603383"/>

-							<reference ref="331853183"/>

-						</array>

-						<reference key="parent" ref="960678392"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">382</int>

-						<reference key="object" ref="709074847"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="633115429"/>

-						</array>

-						<reference key="parent" ref="515308735"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">385</int>

-						<reference key="object" ref="201731424"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="930265681"/>

-						</array>

-						<reference key="parent" ref="515308735"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">386</int>

-						<reference key="object" ref="86150604"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="311969422"/>

-						</array>

-						<reference key="parent" ref="515308735"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">541</int>

-						<reference key="object" ref="477203622"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="631531164"/>

-						</array>

-						<reference key="parent" ref="515308735"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">543</int>

-						<reference key="object" ref="298603383"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="761107402"/>

-						</array>

-						<reference key="parent" ref="515308735"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">353</int>

-						<reference key="object" ref="348328898"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="300811574"/>

-						</array>

-						<reference key="parent" ref="448510093"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">354</int>

-						<reference key="object" ref="300811574"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="989050925"/>

-							<reference ref="700826966"/>

-							<reference ref="168436707"/>

-							<reference ref="363817195"/>

-							<reference ref="223835729"/>

-						</array>

-						<reference key="parent" ref="348328898"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">374</int>

-						<reference key="object" ref="989050925"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="189594322"/>

-						</array>

-						<reference key="parent" ref="300811574"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">375</int>

-						<reference key="object" ref="700826966"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="489340979"/>

-						</array>

-						<reference key="parent" ref="300811574"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">376</int>

-						<reference key="object" ref="168436707"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="53243865"/>

-						</array>

-						<reference key="parent" ref="300811574"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">377</int>

-						<reference key="object" ref="363817195"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="390084685"/>

-						</array>

-						<reference key="parent" ref="300811574"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">379</int>

-						<reference key="object" ref="223835729"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="283628678"/>

-						</array>

-						<reference key="parent" ref="300811574"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">285</int>

-						<reference key="object" ref="604417141"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="85544634"/>

-						</array>

-						<reference key="parent" ref="0"/>

-						<string key="objectName">EditPrograms</string>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">286</int>

-						<reference key="object" ref="85544634"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="1063387772"/>

-							<reference ref="758204686"/>

-							<reference ref="671954382"/>

-							<reference ref="492358940"/>

-						</array>

-						<reference key="parent" ref="604417141"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">423</int>

-						<reference key="object" ref="294137138"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="318286212"/>

-							<reference ref="511651072"/>

-						</array>

-						<reference key="parent" ref="0"/>

-						<string key="objectName">DockMenu</string>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">524</int>

-						<reference key="object" ref="318286212"/>

-						<reference key="parent" ref="294137138"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">526</int>

-						<reference key="object" ref="511651072"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="48278059"/>

-						</array>

-						<reference key="parent" ref="294137138"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">527</int>

-						<reference key="object" ref="48278059"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="1032342329"/>

-							<reference ref="563798000"/>

-						</array>

-						<reference key="parent" ref="511651072"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">532</int>

-						<reference key="object" ref="1032342329"/>

-						<reference key="parent" ref="48278059"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">533</int>

-						<reference key="object" ref="563798000"/>

-						<reference key="parent" ref="48278059"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100363</int>

-						<reference key="object" ref="990762273"/>

-						<reference key="parent" ref="119157981"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100364</int>

-						<reference key="object" ref="391919450"/>

-						<reference key="parent" ref="443008216"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100365</int>

-						<reference key="object" ref="649334366"/>

-						<reference key="parent" ref="282885445"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100368</int>

-						<reference key="object" ref="940564599"/>

-						<reference key="parent" ref="842100515"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100369</int>

-						<reference key="object" ref="666057093"/>

-						<reference key="parent" ref="31160162"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100370</int>

-						<reference key="object" ref="967619578"/>

-						<reference key="parent" ref="179949713"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100382</int>

-						<reference key="object" ref="633115429"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="341113515"/>

-						</array>

-						<reference key="parent" ref="709074847"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100385</int>

-						<reference key="object" ref="930265681"/>

-						<reference key="parent" ref="201731424"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100386</int>

-						<reference key="object" ref="311969422"/>

-						<reference key="parent" ref="86150604"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100541</int>

-						<reference key="object" ref="631531164"/>

-						<reference key="parent" ref="477203622"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100543</int>

-						<reference key="object" ref="761107402"/>

-						<reference key="parent" ref="298603383"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100374</int>

-						<reference key="object" ref="189594322"/>

-						<reference key="parent" ref="989050925"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100375</int>

-						<reference key="object" ref="489340979"/>

-						<reference key="parent" ref="700826966"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100376</int>

-						<reference key="object" ref="53243865"/>

-						<reference key="parent" ref="168436707"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100377</int>

-						<reference key="object" ref="390084685"/>

-						<reference key="parent" ref="363817195"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100379</int>

-						<reference key="object" ref="283628678"/>

-						<reference key="parent" ref="223835729"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">380</int>

-						<reference key="object" ref="341113515"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="759499526"/>

-							<reference ref="616492372"/>

-							<reference ref="543935434"/>

-							<reference ref="836673018"/>

-						</array>

-						<reference key="parent" ref="633115429"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">435</int>

-						<reference key="object" ref="759499526"/>

-						<reference key="parent" ref="341113515"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">384</int>

-						<reference key="object" ref="616492372"/>

-						<reference key="parent" ref="341113515"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">383</int>

-						<reference key="object" ref="543935434"/>

-						<reference key="parent" ref="341113515"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">381</int>

-						<reference key="object" ref="836673018"/>

-						<reference key="parent" ref="341113515"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">295</int>

-						<reference key="object" ref="1063387772"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="792419186"/>

-							<reference ref="17278747"/>

-							<reference ref="842897584"/>

-							<reference ref="905092943"/>

-						</array>

-						<reference key="parent" ref="85544634"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300295</int>

-						<reference key="object" ref="792419186"/>

-						<reference key="parent" ref="1063387772"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">200295</int>

-						<reference key="object" ref="17278747"/>

-						<reference key="parent" ref="1063387772"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100295</int>

-						<reference key="object" ref="842897584"/>

-						<reference key="parent" ref="1063387772"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">296</int>

-						<reference key="object" ref="905092943"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="242608782"/>

-							<reference ref="938444323"/>

-							<reference ref="84282687"/>

-						</array>

-						<reference key="parent" ref="1063387772"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">535</int>

-						<reference key="object" ref="242608782"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="34714764"/>

-						</array>

-						<reference key="parent" ref="905092943"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">575</int>

-						<reference key="object" ref="34714764"/>

-						<reference key="parent" ref="242608782"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">298</int>

-						<reference key="object" ref="938444323"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="825378892"/>

-						</array>

-						<reference key="parent" ref="905092943"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">573</int>

-						<reference key="object" ref="825378892"/>

-						<reference key="parent" ref="938444323"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">297</int>

-						<reference key="object" ref="84282687"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="432610585"/>

-						</array>

-						<reference key="parent" ref="905092943"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">574</int>

-						<reference key="object" ref="432610585"/>

-						<reference key="parent" ref="84282687"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">310</int>

-						<reference key="object" ref="758204686"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="1025474039"/>

-						</array>

-						<reference key="parent" ref="85544634"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100310</int>

-						<reference key="object" ref="1025474039"/>

-						<reference key="parent" ref="758204686"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">292</int>

-						<reference key="object" ref="671954382"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="143554520"/>

-						</array>

-						<reference key="parent" ref="85544634"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100292</int>

-						<reference key="object" ref="143554520"/>

-						<reference key="parent" ref="671954382"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">293</int>

-						<reference key="object" ref="492358940"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="8201128"/>

-						</array>

-						<reference key="parent" ref="85544634"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100293</int>

-						<reference key="object" ref="8201128"/>

-						<reference key="parent" ref="492358940"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300337</int>

-						<reference key="object" ref="10973343"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="184765684"/>

-						</array>

-						<reference key="parent" ref="448510093"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300338</int>

-						<reference key="object" ref="184765684"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="657659108"/>

-							<reference ref="290578835"/>

-							<reference ref="992839333"/>

-							<reference ref="138261120"/>

-							<reference ref="128352289"/>

-							<reference ref="57161931"/>

-						</array>

-						<reference key="parent" ref="10973343"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300358</int>

-						<reference key="object" ref="290578835"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="399127858"/>

-						</array>

-						<reference key="parent" ref="184765684"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300359</int>

-						<reference key="object" ref="657659108"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="259618205"/>

-						</array>

-						<reference key="parent" ref="184765684"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300360</int>

-						<reference key="object" ref="259618205"/>

-						<reference key="parent" ref="657659108"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300361</int>

-						<reference key="object" ref="399127858"/>

-						<reference key="parent" ref="290578835"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300362</int>

-						<reference key="object" ref="992839333"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="959555182"/>

-						</array>

-						<reference key="parent" ref="184765684"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300363</int>

-						<reference key="object" ref="959555182"/>

-						<reference key="parent" ref="992839333"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300364</int>

-						<reference key="object" ref="138261120"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="183409141"/>

-						</array>

-						<reference key="parent" ref="184765684"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300365</int>

-						<reference key="object" ref="183409141"/>

-						<reference key="parent" ref="138261120"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300368</int>

-						<reference key="object" ref="128352289"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="556463187"/>

-						</array>

-						<reference key="parent" ref="184765684"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300369</int>

-						<reference key="object" ref="556463187"/>

-						<reference key="parent" ref="128352289"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300370</int>

-						<reference key="object" ref="57161931"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="989804990"/>

-						</array>

-						<reference key="parent" ref="184765684"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300371</int>

-						<reference key="object" ref="989804990"/>

-						<reference key="parent" ref="57161931"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300421</int>

-						<reference key="object" ref="723450037"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="408298283"/>

-						</array>

-						<reference key="parent" ref="448510093"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300422</int>

-						<reference key="object" ref="408298283"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="878106058"/>

-							<reference ref="386152084"/>

-							<reference ref="487809555"/>

-							<reference ref="620944856"/>

-							<reference ref="477050998"/>

-							<reference ref="765780304"/>

-							<reference ref="522511724"/>

-							<reference ref="1002778833"/>

-						</array>

-						<reference key="parent" ref="723450037"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300423</int>

-						<reference key="object" ref="386152084"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="572508492"/>

-						</array>

-						<reference key="parent" ref="408298283"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300424</int>

-						<reference key="object" ref="878106058"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="718083688"/>

-						</array>

-						<reference key="parent" ref="408298283"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300440</int>

-						<reference key="object" ref="718083688"/>

-						<reference key="parent" ref="878106058"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300441</int>

-						<reference key="object" ref="572508492"/>

-						<reference key="parent" ref="386152084"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300447</int>

-						<reference key="object" ref="477050998"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="501304422"/>

-						</array>

-						<reference key="parent" ref="408298283"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300450</int>

-						<reference key="object" ref="501304422"/>

-						<reference key="parent" ref="477050998"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300451</int>

-						<reference key="object" ref="765780304"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="510771323"/>

-						</array>

-						<reference key="parent" ref="408298283"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300452</int>

-						<reference key="object" ref="510771323"/>

-						<reference key="parent" ref="765780304"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300453</int>

-						<reference key="object" ref="487809555"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="619977658"/>

-						</array>

-						<reference key="parent" ref="408298283"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300454</int>

-						<reference key="object" ref="619977658"/>

-						<reference key="parent" ref="487809555"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300455</int>

-						<reference key="object" ref="620944856"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="461823902"/>

-						</array>

-						<reference key="parent" ref="408298283"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300456</int>

-						<reference key="object" ref="461823902"/>

-						<reference key="parent" ref="620944856"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300457</int>

-						<reference key="object" ref="1002778833"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="897099877"/>

-						</array>

-						<reference key="parent" ref="408298283"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300458</int>

-						<reference key="object" ref="897099877"/>

-						<reference key="parent" ref="1002778833"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300459</int>

-						<reference key="object" ref="522511724"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="994587858"/>

-						</array>

-						<reference key="parent" ref="408298283"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300460</int>

-						<reference key="object" ref="994587858"/>

-						<reference key="parent" ref="522511724"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300472</int>

-						<reference key="object" ref="57246850"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="917248662"/>

-						</array>

-						<reference key="parent" ref="515308735"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300473</int>

-						<reference key="object" ref="917248662"/>

-						<reference key="parent" ref="57246850"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300476</int>

-						<reference key="object" ref="278155937"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="617441821"/>

-						</array>

-						<reference key="parent" ref="596750588"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300477</int>

-						<reference key="object" ref="406291430"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="67728988"/>

-						</array>

-						<reference key="parent" ref="596750588"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300478</int>

-						<reference key="object" ref="67728988"/>

-						<reference key="parent" ref="406291430"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300479</int>

-						<reference key="object" ref="617441821"/>

-						<reference key="parent" ref="278155937"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300482</int>

-						<reference key="object" ref="863505041"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="1016286396"/>

-						</array>

-						<reference key="parent" ref="596750588"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300483</int>

-						<reference key="object" ref="1016286396"/>

-						<reference key="parent" ref="863505041"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300487</int>

-						<reference key="object" ref="331853183"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="1042813110"/>

-						</array>

-						<reference key="parent" ref="515308735"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300488</int>

-						<reference key="object" ref="1042813110"/>

-						<reference key="parent" ref="331853183"/>

-					</object>

-				</array>

-			</object>

-			<dictionary class="NSMutableDictionary" key="flattenedProperties">

-				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="-3.ImportedFromIB2"/>

-				<string key="100292.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100293.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="100295.IBShouldRemoveOnLegacySave"/>

-				<string key="100310.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100363.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100364.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100365.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100368.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100369.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100374.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100375.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100376.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100377.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100379.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100382.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100385.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100386.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100541.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100543.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="129.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="129.ImportedFromIB2"/>

-				<string key="130.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="130.ImportedFromIB2"/>

-				<string key="131.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="131.ImportedFromIB2"/>

-				<string key="134.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="134.ImportedFromIB2"/>

-				<string key="136.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="136.ImportedFromIB2"/>

-				<string key="143.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="143.ImportedFromIB2"/>

-				<string key="144.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="144.ImportedFromIB2"/>

-				<string key="145.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="145.ImportedFromIB2"/>

-				<string key="149.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="149.ImportedFromIB2"/>

-				<string key="150.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="150.ImportedFromIB2"/>

-				<string key="157.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="157.ImportedFromIB2"/>

-				<string key="163.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="163.ImportedFromIB2"/>

-				<string key="169.IBEditorWindowLastContentRect">{{168, 821}, {113, 23}}</string>

-				<string key="169.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="169.ImportedFromIB2"/>

-				<string key="169.editorWindowContentRectSynchronizationRect">{{202, 626}, {154, 153}}</string>

-				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="19.ImportedFromIB2"/>

-				<integer value="1" key="196.ImportedFromIB2"/>

-				<string key="200295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="200295.IBShouldRemoveOnLegacySave"/>

-				<string key="203.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="203.ImportedFromIB2"/>

-				<string key="204.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="204.ImportedFromIB2"/>

-				<string key="23.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="23.ImportedFromIB2"/>

-				<string key="24.IBEditorWindowLastContentRect">{{349, 868}, {315, 143}}</string>

-				<string key="24.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="24.ImportedFromIB2"/>

-				<string key="24.editorWindowContentRectSynchronizationRect">{{271, 666}, {301, 153}}</string>

-				<string key="244.IBEditorWindowLastContentRect">{{329, 408}, {550, 341}}</string>

-				<string key="244.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="244.IBWindowTemplateEditedContentRect">{{329, 408}, {550, 341}}</string>

-				<integer value="1" key="244.ImportedFromIB2"/>

-				<string key="244.editorWindowContentRectSynchronizationRect">{{184, 290}, {481, 345}}</string>

-				<boolean value="YES" key="244.windowTemplate.hasMinSize"/>

-				<string key="244.windowTemplate.maxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

-				<string key="244.windowTemplate.minSize">{320, 240}</string>

-				<string key="245.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="245.ImportedFromIB2"/>

-				<string key="269.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="269.ImportedFromIB2"/>

-				<string key="270.IBEditorWindowLastContentRect">{{58, 803}, {155, 33}}</string>

-				<string key="270.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="270.ImportedFromIB2"/>

-				<string key="270.editorWindowContentRectSynchronizationRect">{{100, 746}, {155, 33}}</string>

-				<string key="272.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="272.ImportedFromIB2"/>

-				<string key="285.IBEditorWindowLastContentRect">{{68, 585}, {454, 271}}</string>

-				<string key="285.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="285.IBViewEditorWindowController.showingBoundsRectangles"/>

-				<integer value="1" key="285.IBViewEditorWindowController.showingLayoutRectangles"/>

-				<string key="285.IBWindowTemplateEditedContentRect">{{68, 585}, {454, 271}}</string>

-				<integer value="1" key="285.ImportedFromIB2"/>

-				<string key="285.editorWindowContentRectSynchronizationRect">{{433, 406}, {486, 327}}</string>

-				<boolean value="YES" key="285.windowTemplate.hasMinSize"/>

-				<string key="285.windowTemplate.maxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

-				<string key="285.windowTemplate.minSize">{512, 240}</string>

-				<string key="286.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="286.ImportedFromIB2"/>

-				<string key="29.IBEditorWindowLastContentRect">{{145, 1011}, {336, 20}}</string>

-				<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="29.ImportedFromIB2"/>

-				<string key="29.editorWindowContentRectSynchronizationRect">{{67, 819}, {336, 20}}</string>

-				<string key="292.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="292.ImportedFromIB2"/>

-				<string key="293.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="293.ImportedFromIB2"/>

-				<string key="295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="295.ImportedFromIB2"/>

-				<string key="296.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="296.ImportedFromIB2"/>

-				<string key="297.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="297.ImportedFromIB2"/>

-				<string key="298.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="298.ImportedFromIB2"/>

-				<string key="300295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300295.IBShouldRemoveOnLegacySave"/>

-				<string key="300337.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300337.ImportedFromIB2"/>

-				<string key="300338.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300338.ImportedFromIB2"/>

-				<string key="300358.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300358.ImportedFromIB2"/>

-				<string key="300359.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300359.ImportedFromIB2"/>

-				<string key="300360.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300361.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300362.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300362.ImportedFromIB2"/>

-				<string key="300363.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300364.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300364.ImportedFromIB2"/>

-				<string key="300365.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300368.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300368.ImportedFromIB2"/>

-				<string key="300369.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300370.ImportedFromIB2"/>

-				<string key="300371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300421.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300421.ImportedFromIB2"/>

-				<string key="300422.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300422.ImportedFromIB2"/>

-				<string key="300423.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300423.ImportedFromIB2"/>

-				<string key="300424.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300424.ImportedFromIB2"/>

-				<string key="300440.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300441.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300447.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300447.ImportedFromIB2"/>

-				<string key="300450.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300451.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300451.ImportedFromIB2"/>

-				<string key="300452.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300453.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300453.ImportedFromIB2"/>

-				<string key="300454.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300455.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300455.ImportedFromIB2"/>

-				<string key="300456.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300457.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<object class="NSAffineTransform" key="300457.IBViewBoundsToFrameTransform">

-					<bytes key="NSTransformStruct">P4AAAL+AAABCCAAAwr4AAA</bytes>

-				</object>

-				<integer value="1" key="300457.ImportedFromIB2"/>

-				<string key="300458.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300459.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300459.ImportedFromIB2"/>

-				<string key="300460.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300472.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300472.ImportedFromIB2"/>

-				<string key="300473.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300476.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300476.ImportedFromIB2"/>

-				<string key="300477.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300477.ImportedFromIB2"/>

-				<string key="300478.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300479.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300482.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300482.ImportedFromIB2"/>

-				<string key="300483.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300487.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300487.ImportedFromIB2"/>

-				<string key="300488.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="305.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="305.ImportedFromIB2"/>

-				<string key="310.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="310.ImportedFromIB2"/>

-				<string key="348.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="348.ImportedFromIB2"/>

-				<string key="349.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="349.ImportedFromIB2"/>

-				<string key="350.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="350.ImportedFromIB2"/>

-				<string key="351.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="351.ImportedFromIB2"/>

-				<string key="352.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="352.ImportedFromIB2"/>

-				<string key="353.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="353.ImportedFromIB2"/>

-				<string key="354.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="354.ImportedFromIB2"/>

-				<string key="363.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="363.ImportedFromIB2"/>

-				<string key="364.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="364.ImportedFromIB2"/>

-				<string key="365.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="365.ImportedFromIB2"/>

-				<string key="368.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="368.ImportedFromIB2"/>

-				<string key="369.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="369.ImportedFromIB2"/>

-				<string key="370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="370.ImportedFromIB2"/>

-				<string key="374.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="374.ImportedFromIB2"/>

-				<string key="375.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="375.ImportedFromIB2"/>

-				<string key="376.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="376.ImportedFromIB2"/>

-				<string key="377.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="377.ImportedFromIB2"/>

-				<string key="379.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="379.ImportedFromIB2"/>

-				<string key="380.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="380.ImportedFromIB2"/>

-				<string key="381.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="381.ImportedFromIB2"/>

-				<string key="382.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="382.ImportedFromIB2"/>

-				<string key="383.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="383.ImportedFromIB2"/>

-				<string key="384.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="384.ImportedFromIB2"/>

-				<string key="385.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="385.ImportedFromIB2"/>

-				<string key="386.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="386.ImportedFromIB2"/>

-				<string key="419.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="419.ImportedFromIB2"/>

-				<string key="420.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="420.ImportedFromIB2"/>

-				<string key="421.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="421.ImportedFromIB2"/>

-				<string key="423.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="423.ImportedFromIB2"/>

-				<string key="435.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="435.ImportedFromIB2"/>

-				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="5.ImportedFromIB2"/>

-				<string key="524.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="524.ImportedFromIB2"/>

-				<string key="526.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="526.ImportedFromIB2"/>

-				<string key="527.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="527.ImportedFromIB2"/>

-				<string key="532.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="532.ImportedFromIB2"/>

-				<string key="533.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="533.ImportedFromIB2"/>

-				<string key="535.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="535.ImportedFromIB2"/>

-				<string key="536.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="536.ImportedFromIB2"/>

-				<string key="537.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="537.ImportedFromIB2"/>

-				<string key="538.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="538.ImportedFromIB2"/>

-				<string key="541.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="541.ImportedFromIB2"/>

-				<string key="543.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="543.ImportedFromIB2"/>

-				<string key="544.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="544.ImportedFromIB2"/>

-				<string key="545.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="545.ImportedFromIB2"/>

-				<string key="56.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="56.ImportedFromIB2"/>

-				<string key="57.IBEditorWindowLastContentRect">{{20, 641}, {218, 203}}</string>

-				<string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="57.ImportedFromIB2"/>

-				<string key="57.editorWindowContentRectSynchronizationRect">{{79, 616}, {218, 203}}</string>

-				<string key="573.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="573.ImportedFromIB2"/>

-				<string key="574.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="574.ImportedFromIB2"/>

-				<string key="575.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="575.ImportedFromIB2"/>

-				<string key="58.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="58.ImportedFromIB2"/>

-				<string key="92.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="92.ImportedFromIB2"/>

-			</dictionary>

-			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>

-			<nil key="activeLocalization"/>

-			<dictionary class="NSMutableDictionary" key="localizations"/>

-			<nil key="sourceID"/>

-			<int key="maxID">300490</int>

-		</object>

-		<object class="IBClassDescriber" key="IBDocument.Classes"/>

-		<int key="IBDocument.localizationMode">0</int>

-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>

-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">

-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>

-			<integer value="1040" key="NS.object.0"/>

-		</object>

-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>

-		<nil key="IBDocument.LastKnownRelativeProjectPath"/>

-		<int key="IBDocument.defaultPropertyAccessControl">3</int>

-		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">

-			<string key="NSMenuCheckmark">{9, 8}</string>

-			<string key="NSMenuMixedState">{7, 2}</string>

-			<string key="NSSwitch">{15, 15}</string>

-		</dictionary>

-	</data>

-</archive>

+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1040</int>
+		<string key="IBDocument.SystemVersion">11A289</string>
+		<string key="IBDocument.InterfaceBuilderVersion">903</string>
+		<string key="IBDocument.AppKitVersion">1094.2</string>
+		<string key="IBDocument.HIToolboxVersion">521.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">903</string>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.EditedObjectIDs"/>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="904585544">
+			<object class="NSCustomObject" id="815810918">
+				<object class="NSMutableString" key="NSClassName">
+					<characters key="NS.bytes">NSApplication</characters>
+				</object>
+			</object>
+			<object class="NSCustomObject" id="941939442">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="951368722">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSMenu" id="524015605">
+				<string key="NSTitle">MainMenu</string>
+				<array class="NSMutableArray" key="NSMenuItems">
+					<object class="NSMenuItem" id="365880285">
+						<reference key="NSMenu" ref="524015605"/>
+						<string key="NSTitle">X11</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<object class="NSCustomResource" key="NSOnImage" id="531645050">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">NSMenuCheckmark</string>
+						</object>
+						<object class="NSCustomResource" key="NSMixedImage" id="351811234">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">NSMenuMixedState</string>
+						</object>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="576521955">
+							<string key="NSTitle">X11</string>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="139290918">
+									<reference key="NSMenu" ref="576521955"/>
+									<string key="NSTitle">Über X11</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="386173216">
+									<reference key="NSMenu" ref="576521955"/>
+									<string key="NSTitle">Einstellungen …</string>
+									<string key="NSKeyEquiv">,</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="272876017">
+									<reference key="NSMenu" ref="576521955"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="32285361">
+									<reference key="NSMenu" ref="576521955"/>
+									<string key="NSTitle">Dienste</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+									<string key="NSAction">submenuAction:</string>
+									<object class="NSMenu" key="NSSubmenu" id="821388474">
+										<string key="NSTitle">Dienste</string>
+										<array class="NSMutableArray" key="NSMenuItems"/>
+										<string key="NSName">_NSServicesMenu</string>
+									</object>
+								</object>
+								<object class="NSMenuItem" id="431301145">
+									<reference key="NSMenu" ref="576521955"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="6876565">
+									<reference key="NSMenu" ref="576521955"/>
+									<string key="NSTitle">Vollbildmodus ein-/ausschalten</string>
+									<string key="NSKeyEquiv">a</string>
+									<int key="NSKeyEquivModMask">1572864</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="479677589">
+									<reference key="NSMenu" ref="576521955"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="301008465">
+									<reference key="NSMenu" ref="576521955"/>
+									<string key="NSTitle">X11 ausblenden</string>
+									<string key="NSKeyEquiv">h</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+									<int key="NSTag">42</int>
+								</object>
+								<object class="NSMenuItem" id="206802571">
+									<reference key="NSMenu" ref="576521955"/>
+									<string key="NSTitle">Andere ausblenden</string>
+									<string key="NSKeyEquiv">h</string>
+									<int key="NSKeyEquivModMask">1572864</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="1023546148">
+									<reference key="NSMenu" ref="576521955"/>
+									<string key="NSTitle">Alle einblenden</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+									<int key="NSTag">42</int>
+								</object>
+								<object class="NSMenuItem" id="848095279">
+									<reference key="NSMenu" ref="576521955"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="274138642">
+									<reference key="NSMenu" ref="576521955"/>
+									<string key="NSTitle">X11 beenden</string>
+									<string key="NSKeyEquiv">q</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+							</array>
+							<string key="NSName">_NSAppleMenu</string>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="868031522">
+						<reference key="NSMenu" ref="524015605"/>
+						<string key="NSTitle">Programme</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="531645050"/>
+						<reference key="NSMixedImage" ref="351811234"/>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="981161348">
+							<string key="NSTitle">Programme</string>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="390088328">
+									<reference key="NSMenu" ref="981161348"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="1065386165">
+									<reference key="NSMenu" ref="981161348"/>
+									<string key="NSTitle">Anpassen …</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+							</array>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="200491363">
+						<reference key="NSMenu" ref="524015605"/>
+						<string key="NSTitle">Bearbeiten</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="531645050"/>
+						<reference key="NSMixedImage" ref="351811234"/>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="526778998">
+							<string key="NSTitle">Bearbeiten</string>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="185296989">
+									<reference key="NSMenu" ref="526778998"/>
+									<string key="NSTitle">Kopieren</string>
+									<string key="NSKeyEquiv">c</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+							</array>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="931553638">
+						<reference key="NSMenu" ref="524015605"/>
+						<string key="NSTitle">Fenster</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="531645050"/>
+						<reference key="NSMixedImage" ref="351811234"/>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="96874957">
+							<string key="NSTitle">Fenster</string>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="984461797">
+									<reference key="NSMenu" ref="96874957"/>
+									<string key="NSTitle">Schließen</string>
+									<string key="NSKeyEquiv">w</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="677652931">
+									<reference key="NSMenu" ref="96874957"/>
+									<string key="NSTitle">Im Dock ablegen</string>
+									<string key="NSKeyEquiv">m</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="1066447520">
+									<reference key="NSMenu" ref="96874957"/>
+									<string key="NSTitle">Zoomen</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="280172320">
+									<reference key="NSMenu" ref="96874957"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="1036389925">
+									<reference key="NSMenu" ref="96874957"/>
+									<string key="NSTitle">Vorwärts blättern</string>
+									<string key="NSKeyEquiv">&lt;</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="369641893">
+									<reference key="NSMenu" ref="96874957"/>
+									<string key="NSTitle">Rückwärts blättern</string>
+									<string key="NSKeyEquiv">&gt;</string>
+									<int key="NSKeyEquivModMask">1179648</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="155085383">
+									<reference key="NSMenu" ref="96874957"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="276216762">
+									<reference key="NSMenu" ref="96874957"/>
+									<string key="NSTitle">Alle nach vorne bringen</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+							</array>
+							<string key="NSName">_NSWindowsMenu</string>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="551174276">
+						<reference key="NSMenu" ref="524015605"/>
+						<string key="NSTitle">Hilfe</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="531645050"/>
+						<reference key="NSMixedImage" ref="351811234"/>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="511848303">
+							<string key="NSTitle">Hilfe</string>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="504984881">
+									<reference key="NSMenu" ref="511848303"/>
+									<string key="NSTitle">X11 Hilfe</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+							</array>
+						</object>
+					</object>
+				</array>
+				<string key="NSName">_NSMainMenu</string>
+			</object>
+			<object class="NSCustomObject" id="485884620">
+				<string key="NSClassName">X11Controller</string>
+			</object>
+			<object class="NSWindowTemplate" id="124913468">
+				<int key="NSWindowStyleMask">3</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{2350, 1291.0391}, {550, 341}}</string>
+				<int key="NSWTFlags">1350041600</int>
+				<string key="NSWindowTitle">X11 Einstellungen</string>
+				<string key="NSWindowClass">NSPanel</string>
+				<object class="NSMutableString" key="NSViewClass">
+					<characters key="NS.bytes">View</characters>
+				</object>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
+				<string key="NSWindowContentMinSize">{320, 240}</string>
+				<object class="NSView" key="NSWindowView" id="941366957">
+					<nil key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSTabView" id="448510093">
+							<reference key="NSNextResponder" ref="941366957"/>
+							<int key="NSvFlags">274</int>
+							<string key="NSFrame">{{13, 10}, {524, 325}}</string>
+							<reference key="NSSuperview" ref="941366957"/>
+							<array class="NSMutableArray" key="NSTabViewItems">
+								<object class="NSTabViewItem" id="287591690">
+									<object class="NSMutableString" key="NSIdentifier">
+										<characters key="NS.bytes">1</characters>
+									</object>
+									<object class="NSView" key="NSView" id="596750588">
+										<nil key="NSNextResponder"/>
+										<int key="NSvFlags">256</int>
+										<array class="NSMutableArray" key="NSSubviews">
+											<object class="NSButton" id="119157981">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 243}, {402, 18}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="179949713"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="990762273">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Drei Maustasten nachbilden</string>
+													<object class="NSFont" key="NSSupport" id="463863101">
+														<string key="NSName">LucidaGrande</string>
+														<double key="NSSize">13</double>
+														<int key="NSfFlags">1044</int>
+													</object>
+													<reference key="NSControlView" ref="119157981"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<object class="NSCustomResource" key="NSNormalImage" id="192701610">
+														<string key="NSClassName">NSImage</string>
+														<string key="NSResourceName">NSSwitch</string>
+													</object>
+													<object class="NSButtonImageSource" key="NSAlternateImage" id="391434389">
+														<string key="NSImageName">NSSwitch</string>
+													</object>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="443008216">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 93}, {461, 28}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="406291430"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="391919450">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">Bei Aktivierung können die Tastenentsprechungen für die Menüleiste die X11-Programme stören, die Meta-Sondertasten verwenden.</string>
+													<object class="NSFont" key="NSSupport" id="26">
+														<string key="NSName">LucidaGrande</string>
+														<double key="NSSize">11</double>
+														<int key="NSfFlags">3100</int>
+													</object>
+													<string key="NSPlaceholderString"/>
+													<reference key="NSControlView" ref="443008216"/>
+													<object class="NSColor" key="NSBackgroundColor" id="57160303">
+														<int key="NSColorSpace">6</int>
+														<string key="NSCatalogName">System</string>
+														<string key="NSColorName">controlColor</string>
+														<object class="NSColor" key="NSColor" id="590688762">
+															<int key="NSColorSpace">3</int>
+															<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+														</object>
+													</object>
+													<object class="NSColor" key="NSTextColor" id="930815747">
+														<int key="NSColorSpace">6</int>
+														<string key="NSCatalogName">System</string>
+														<string key="NSColorName">controlTextColor</string>
+														<object class="NSColor" key="NSColor" id="214098874">
+															<int key="NSColorSpace">3</int>
+															<bytes key="NSWhite">MAA</bytes>
+														</object>
+													</object>
+												</object>
+											</object>
+											<object class="NSTextField" id="282885445">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 203}, {461, 34}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="31160162"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="649334366">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string type="base64-UTF8" key="NSContents">SGFsdGVuIFNpZSBiZWltIEtsaWNrZW4gZGllIFdhaGx0YXN0ZSBvZGVyIGRpZSBCZWZlaGxzdGFzdGUg
+Z2VkcsO8Y2t0LCB1bSBkaWUgbWl0dGxlcmUgb2RlciBkaWUgcmVjaHRlIE1hdXN0YXN0ZSB6dSBha3Rp
+dmllcmVuLgo</string>
+													<reference key="NSSupport" ref="26"/>
+													<string key="NSPlaceholderString"/>
+													<reference key="NSControlView" ref="282885445"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSButton" id="842100515">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 127}, {402, 18}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="443008216"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="940564599">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Tastenentsprechungen unter X11 aktivieren</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="842100515"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="192701610"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="31160162">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 151}, {461, 28}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="842100515"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="666057093">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">Bei Aktivierung kann Ihre aktuelle X11-Keymap durch Änderungen des Tastaturmenüs überschrieben werden.</string>
+													<reference key="NSSupport" ref="26"/>
+													<string key="NSPlaceholderString"/>
+													<reference key="NSControlView" ref="31160162"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSButton" id="179949713">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 185}, {402, 18}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="282885445"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="967619578">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Tastaturbelegung des Systems verwenden</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="179949713"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="192701610"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="278155937">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 32}, {461, 31}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="863505041"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="617441821">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">Bei Aktivierung entsprechen die Wahltasten Alt_L und Alt_R X11-Tastensymbolen anstatt „Mode_switch“.</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="278155937"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSButton" id="406291430">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 69}, {402, 18}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="278155937"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="67728988">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Wahltasten entsprechen Alt_L und Alt_R</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="406291430"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="192701610"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSButton" id="863505041">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 8}, {418, 18}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="448510093"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="1016286396">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Immer in Bewegungsrichtung der Finger scrollen</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="863505041"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="192701610"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+										</array>
+										<string key="NSFrame">{{10, 33}, {504, 279}}</string>
+										<reference key="NSNextKeyView" ref="119157981"/>
+									</object>
+									<string key="NSLabel">Eingabe</string>
+									<reference key="NSColor" ref="57160303"/>
+									<reference key="NSTabView" ref="448510093"/>
+								</object>
+								<object class="NSTabViewItem" id="960678392">
+									<object class="NSMutableString" key="NSIdentifier">
+										<characters key="NS.bytes">2</characters>
+									</object>
+									<object class="NSView" key="NSView" id="515308735">
+										<nil key="NSNextResponder"/>
+										<int key="NSvFlags">256</int>
+										<array class="NSMutableArray" key="NSSubviews">
+											<object class="NSPopUpButton" id="709074847">
+												<reference key="NSNextResponder" ref="515308735"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{74, 235}, {197, 26}}</string>
+												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSNextKeyView" ref="86150604"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSPopUpButtonCell" key="NSCell" id="633115429">
+													<int key="NSCellFlags">-2076049856</int>
+													<int key="NSCellFlags2">1024</int>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="709074847"/>
+													<int key="NSButtonFlags">109199615</int>
+													<int key="NSButtonFlags2">1</int>
+													<object class="NSFont" key="NSAlternateImage">
+														<string key="NSName">LucidaGrande</string>
+														<double key="NSSize">13</double>
+														<int key="NSfFlags">16</int>
+													</object>
+													<string key="NSAlternateContents"/>
+													<object class="NSMutableString" key="NSKeyEquivalent">
+														<characters key="NS.bytes"/>
+													</object>
+													<int key="NSPeriodicDelay">400</int>
+													<int key="NSPeriodicInterval">75</int>
+													<object class="NSMenuItem" key="NSMenuItem" id="616492372">
+														<reference key="NSMenu" ref="341113515"/>
+														<string key="NSTitle">Vom Monitor</string>
+														<string key="NSKeyEquiv"/>
+														<int key="NSKeyEquivModMask">1048576</int>
+														<int key="NSMnemonicLoc">2147483647</int>
+														<int key="NSState">1</int>
+														<reference key="NSOnImage" ref="531645050"/>
+														<reference key="NSMixedImage" ref="351811234"/>
+														<string key="NSAction">_popUpItemAction:</string>
+														<int key="NSTag">-1</int>
+														<reference key="NSTarget" ref="633115429"/>
+													</object>
+													<bool key="NSMenuItemRespectAlignment">YES</bool>
+													<object class="NSMenu" key="NSMenu" id="341113515">
+														<object class="NSMutableString" key="NSTitle">
+															<characters key="NS.bytes">OtherViews</characters>
+														</object>
+														<array class="NSMutableArray" key="NSMenuItems">
+															<reference ref="616492372"/>
+															<object class="NSMenuItem" id="759499526">
+																<reference key="NSMenu" ref="341113515"/>
+																<string key="NSTitle">256 Farben</string>
+																<string key="NSKeyEquiv"/>
+																<int key="NSKeyEquivModMask">1048576</int>
+																<int key="NSMnemonicLoc">2147483647</int>
+																<reference key="NSOnImage" ref="531645050"/>
+																<reference key="NSMixedImage" ref="351811234"/>
+																<string key="NSAction">_popUpItemAction:</string>
+																<int key="NSTag">8</int>
+																<reference key="NSTarget" ref="633115429"/>
+															</object>
+															<object class="NSMenuItem" id="543935434">
+																<reference key="NSMenu" ref="341113515"/>
+																<string key="NSTitle">32768 Farben</string>
+																<string key="NSKeyEquiv"/>
+																<int key="NSKeyEquivModMask">1048576</int>
+																<int key="NSMnemonicLoc">2147483647</int>
+																<reference key="NSOnImage" ref="531645050"/>
+																<reference key="NSMixedImage" ref="351811234"/>
+																<string key="NSAction">_popUpItemAction:</string>
+																<int key="NSTag">15</int>
+																<reference key="NSTarget" ref="633115429"/>
+															</object>
+															<object class="NSMenuItem" id="836673018">
+																<reference key="NSMenu" ref="341113515"/>
+																<string key="NSTitle">16,7 Millionen Farben</string>
+																<string key="NSKeyEquiv"/>
+																<int key="NSKeyEquivModMask">1048576</int>
+																<int key="NSMnemonicLoc">2147483647</int>
+																<reference key="NSOnImage" ref="531645050"/>
+																<reference key="NSMixedImage" ref="351811234"/>
+																<string key="NSAction">_popUpItemAction:</string>
+																<int key="NSTag">24</int>
+																<reference key="NSTarget" ref="633115429"/>
+															</object>
+														</array>
+													</object>
+													<int key="NSPreferredEdge">3</int>
+													<bool key="NSUsesItemFromMenu">YES</bool>
+													<bool key="NSAltersState">YES</bool>
+													<int key="NSArrowPosition">1</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="201731424">
+												<reference key="NSNextResponder" ref="515308735"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{17, 238}, {55, 20}}</string>
+												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSNextKeyView" ref="709074847"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="930265681">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">Farben:</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<string key="NSPlaceholderString"/>
+													<reference key="NSControlView" ref="201731424"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSTextField" id="86150604">
+												<reference key="NSNextResponder" ref="515308735"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 216}, {392, 14}}</string>
+												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSNextKeyView" ref="477203622"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="311969422">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">Diese Option wird beim nächsten Start von X11 wirksam.</string>
+													<reference key="NSSupport" ref="26"/>
+													<string key="NSPlaceholderString"/>
+													<reference key="NSControlView" ref="86150604"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSButton" id="477203622">
+												<reference key="NSNextResponder" ref="515308735"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 182}, {409, 23}}</string>
+												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSNextKeyView" ref="298603383"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="631531164">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Vollbildmodus</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="477203622"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="192701610"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSButton" id="57246850">
+												<reference key="NSNextResponder" ref="515308735"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{37, 116}, {409, 23}}</string>
+												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSNextKeyView" ref="331853183"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="917248662">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Zugriff auf Menüleiste im Vollbildmodus erlauben</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="57246850"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="192701610"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="298603383">
+												<reference key="NSNextResponder" ref="515308735"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 145}, {461, 42}}</string>
+												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSNextKeyView" ref="57246850"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="761107402">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">Hiermit wird das X11-Hauptfenster aktiviert. Verwenden Sie die Tastenkombination Befehl+Wahl+A, um den Vollbildmodus ein- oder auszuschalten.</string>
+													<reference key="NSSupport" ref="26"/>
+													<string key="NSPlaceholderString"/>
+													<reference key="NSControlView" ref="298603383"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSTextField" id="331853183">
+												<reference key="NSNextResponder" ref="515308735"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{54, 79}, {436, 31}}</string>
+												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSNextKeyView" ref="448510093"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="1042813110">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">Die Menüleiste wird sichtbar, sobald Sie den Mauszeiger in den oberen Bereich Ihres primären Display bewegen.</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="331853183"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+										</array>
+										<string key="NSFrame">{{10, 33}, {504, 279}}</string>
+										<reference key="NSNextKeyView" ref="201731424"/>
+									</object>
+									<string key="NSLabel">Ausgabe</string>
+									<reference key="NSColor" ref="57160303"/>
+									<reference key="NSTabView" ref="448510093"/>
+								</object>
+								<object class="NSTabViewItem" id="723450037">
+									<object class="NSMutableString" key="NSIdentifier">
+										<characters key="NS.bytes">2</characters>
+									</object>
+									<object class="NSView" key="NSView" id="408298283">
+										<reference key="NSNextResponder" ref="448510093"/>
+										<int key="NSvFlags">256</int>
+										<array class="NSMutableArray" key="NSSubviews">
+											<object class="NSButton" id="878106058">
+												<reference key="NSNextResponder" ref="408298283"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{11, 255}, {409, 23}}</string>
+												<reference key="NSSuperview" ref="408298283"/>
+												<reference key="NSNextKeyView" ref="386152084"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="718083688">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Synchronisierung aktivieren</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="878106058"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="192701610"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="386152084">
+												<reference key="NSNextResponder" ref="408298283"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{29, 221}, {464, 28}}</string>
+												<reference key="NSSuperview" ref="408298283"/>
+												<reference key="NSNextKeyView" ref="487809555"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="572508492">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">Aktiviert das Menüobjekt „Kopieren“ und ermöglicht die Synchronisierung zwischen dem „OSX Pasteboard“ und den Pufferspeichern „CLIPBOARD“ und „PRIMARY“ von X11.</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="386152084"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSButton" id="477050998">
+												<reference key="NSNextResponder" ref="408298283"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{27, 129}, {436, 18}}</string>
+												<reference key="NSSuperview" ref="408298283"/>
+												<reference key="NSNextKeyView" ref="765780304"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="501304422">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">CLIPBOARD aktualisieren, wenn Pasteboard geändert wird</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="477050998"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="192701610"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSButton" id="765780304">
+												<reference key="NSNextResponder" ref="408298283"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{27, 104}, {463, 18}}</string>
+												<reference key="NSSuperview" ref="408298283"/>
+												<reference key="NSNextKeyView" ref="1002778833"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="510771323">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">PRIMARY (Mittel-Klick) aktualisieren, wenn Pasteboard geändert wird</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="765780304"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="192701610"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSButton" id="1002778833">
+												<reference key="NSNextResponder" ref="408298283"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{27, 81}, {498, 18}}</string>
+												<reference key="NSSuperview" ref="408298283"/>
+												<reference key="NSNextKeyView" ref="522511724"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="897099877">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Pasteboard sofort aktualisieren, wenn Text ausgewählt wird</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="1002778833"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="192701610"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSButton" id="487809555">
+												<reference key="NSNextResponder" ref="408298283"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{27, 192}, {438, 18}}</string>
+												<reference key="NSSuperview" ref="408298283"/>
+												<reference key="NSNextKeyView" ref="620944856"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="619977658">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Pasteboard aktualisieren, wenn CLIPBOARD geändert wird</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="487809555"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="192701610"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="620944856">
+												<reference key="NSNextResponder" ref="408298283"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{41, 158}, {452, 28}}</string>
+												<reference key="NSSuperview" ref="408298283"/>
+												<reference key="NSNextKeyView" ref="477050998"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="461823902">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">Deaktivieren Sie diese Option, wenn Sie „xclipboard“, „klipper“ oder einen beliebigen anderen X11-Zwischenablage-Manager verwenden möchten.</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="620944856"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSTextField" id="522511724">
+												<reference key="NSNextResponder" ref="408298283"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{41, 47}, {450, 28}}</string>
+												<reference key="NSSuperview" ref="408298283"/>
+												<reference key="NSNextKeyView" ref="448510093"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="994587858">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">Aufgrund von Einschränkungen im X11-Protokoll funktioniert diese Option in manchen Programmen u. U. nicht immer.</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="522511724"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+										</array>
+										<string key="NSFrame">{{10, 33}, {504, 279}}</string>
+										<reference key="NSSuperview" ref="448510093"/>
+										<reference key="NSNextKeyView" ref="878106058"/>
+									</object>
+									<string key="NSLabel">Zwischenablage</string>
+									<reference key="NSColor" ref="57160303"/>
+									<reference key="NSTabView" ref="448510093"/>
+								</object>
+								<object class="NSTabViewItem" id="10973343">
+									<object class="NSMutableString" key="NSIdentifier">
+										<characters key="NS.bytes">2</characters>
+									</object>
+									<object class="NSView" key="NSView" id="184765684">
+										<nil key="NSNextResponder"/>
+										<int key="NSvFlags">256</int>
+										<array class="NSMutableArray" key="NSSubviews">
+											<object class="NSButton" id="657659108">
+												<reference key="NSNextResponder" ref="184765684"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{15, 245}, {213, 18}}</string>
+												<reference key="NSSuperview" ref="184765684"/>
+												<reference key="NSNextKeyView" ref="290578835"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="259618205">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Durch inaktive Fenster klicken</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="657659108"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="192701610"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="290578835">
+												<reference key="NSNextResponder" ref="184765684"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{23, 211}, {456, 28}}</string>
+												<reference key="NSSuperview" ref="184765684"/>
+												<reference key="NSNextKeyView" ref="992839333"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="399127858">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">Bei Aktivierung wird beim Klicken auf ein inaktives Fenster der Mausklick zusätzlich an dieses Fenster weitergegeben.</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="290578835"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSButton" id="992839333">
+												<reference key="NSNextResponder" ref="184765684"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{15, 184}, {155, 18}}</string>
+												<reference key="NSSuperview" ref="184765684"/>
+												<reference key="NSNextKeyView" ref="138261120"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="959555182">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Fokus folgt der Maus</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="992839333"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="192701610"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="138261120">
+												<reference key="NSNextResponder" ref="184765684"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{23, 161}, {442, 17}}</string>
+												<reference key="NSSuperview" ref="184765684"/>
+												<reference key="NSNextKeyView" ref="128352289"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="183409141">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">Der Fokus des X11-Fensters folgt dem Cursor. Dies hat einige nachteilige Effekte.</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="138261120"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSButton" id="128352289">
+												<reference key="NSNextResponder" ref="184765684"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{15, 140}, {402, 18}}</string>
+												<reference key="NSSuperview" ref="184765684"/>
+												<reference key="NSNextKeyView" ref="57161931"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="556463187">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Fokus auf neuem Fenster</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="128352289"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="192701610"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="57161931">
+												<reference key="NSNextResponder" ref="184765684"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{23, 92}, {456, 42}}</string>
+												<reference key="NSSuperview" ref="184765684"/>
+												<reference key="NSNextKeyView" ref="448510093"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="989804990">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">Bei Aktivierung wird beim Erzeugen eines neuen X11-Fensters das „X11.app“ in den Vordergrund gebracht (anstelle von „Finder.app“, „Terminal.app“ usw.).</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="57161931"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+										</array>
+										<string key="NSFrame">{{10, 33}, {504, 279}}</string>
+										<reference key="NSNextKeyView" ref="657659108"/>
+									</object>
+									<string key="NSLabel">Fenster</string>
+									<reference key="NSColor" ref="57160303"/>
+									<reference key="NSTabView" ref="448510093"/>
+								</object>
+								<object class="NSTabViewItem" id="348328898">
+									<object class="NSView" key="NSView" id="300811574">
+										<nil key="NSNextResponder"/>
+										<int key="NSvFlags">256</int>
+										<array class="NSMutableArray" key="NSSubviews">
+											<object class="NSButton" id="989050925">
+												<reference key="NSNextResponder" ref="300811574"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 243}, {215, 18}}</string>
+												<reference key="NSSuperview" ref="300811574"/>
+												<reference key="NSNextKeyView" ref="168436707"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="189594322">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Verbindungen authentifizieren</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="989050925"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="192701610"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSButton" id="700826966">
+												<reference key="NSNextResponder" ref="300811574"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 166}, {312, 18}}</string>
+												<reference key="NSSuperview" ref="300811574"/>
+												<reference key="NSNextKeyView" ref="363817195"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="489340979">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Verbindungen von Netzwerk-Clients erlauben</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="700826966"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="192701610"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="168436707">
+												<reference key="NSNextResponder" ref="300811574"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 189}, {463, 48}}</string>
+												<reference key="NSSuperview" ref="300811574"/>
+												<reference key="NSNextKeyView" ref="700826966"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="53243865">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">Beim Starten von X11 werden Xauthority-Schlüssel zur Zugriffskontrolle erstellt. Wenn sich die IP-Adresse des Systems ändert, sind diese Schlüssel nicht mehr gültig. Möglicherweise können die X11-Programme dann nicht mehr gestartet werden.</string>
+													<reference key="NSSupport" ref="26"/>
+													<string key="NSPlaceholderString"/>
+													<reference key="NSControlView" ref="168436707"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSTextField" id="363817195">
+												<reference key="NSNextResponder" ref="300811574"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 104}, {463, 56}}</string>
+												<reference key="NSSuperview" ref="300811574"/>
+												<reference key="NSNextKeyView" ref="223835729"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="390084685">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">Bei Aktivierung muss „Verbindungen authentifizieren“ ebenfalls aktiviert sein, damit die Sicherheit des System gewährleistet ist. Bei Deaktivierung sind Verbindungen von entfernten Programmen nicht erlaubt.</string>
+													<reference key="NSSupport" ref="26"/>
+													<string key="NSPlaceholderString"/>
+													<reference key="NSControlView" ref="363817195"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSTextField" id="223835729">
+												<reference key="NSNextResponder" ref="300811574"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{17, 17}, {404, 14}}</string>
+												<reference key="NSSuperview" ref="300811574"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="283628678">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">Diese Optionen werden beim nächsten Start von X11 wirksam.</string>
+													<reference key="NSSupport" ref="26"/>
+													<string key="NSPlaceholderString"/>
+													<reference key="NSControlView" ref="223835729"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+										</array>
+										<string key="NSFrame">{{10, 33}, {504, 279}}</string>
+										<reference key="NSNextKeyView" ref="989050925"/>
+									</object>
+									<string key="NSLabel">Sicherheit</string>
+									<reference key="NSColor" ref="57160303"/>
+									<reference key="NSTabView" ref="448510093"/>
+								</object>
+							</array>
+							<reference key="NSSelectedTabViewItem" ref="723450037"/>
+							<reference key="NSFont" ref="463863101"/>
+							<int key="NSTvFlags">0</int>
+							<bool key="NSAllowTruncatedLabels">YES</bool>
+							<bool key="NSDrawsBackground">YES</bool>
+							<array class="NSMutableArray" key="NSSubviews">
+								<reference ref="408298283"/>
+							</array>
+						</object>
+					</array>
+					<string key="NSFrameSize">{550, 341}</string>
+					<reference key="NSNextKeyView" ref="448510093"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
+				<string key="NSMinSize">{320, 262}</string>
+				<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
+				<string key="NSFrameAutosaveName">x11_prefs</string>
+			</object>
+			<object class="NSWindowTemplate" id="604417141">
+				<int key="NSWindowStyleMask">11</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{360, 400}, {512, 271}}</string>
+				<int key="NSWTFlags">1350041600</int>
+				<string key="NSWindowTitle">X11-Programmmenü</string>
+				<string key="NSWindowClass">NSPanel</string>
+				<object class="NSMutableString" key="NSViewClass">
+					<characters key="NS.bytes">View</characters>
+				</object>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
+				<string key="NSWindowContentMinSize">{512, 240}</string>
+				<object class="NSView" key="NSWindowView" id="85544634">
+					<nil key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSButton" id="671954382">
+							<reference key="NSNextResponder" ref="85544634"/>
+							<int key="NSvFlags">265</int>
+							<string key="NSFrame">{{340, 191}, {158, 32}}</string>
+							<reference key="NSSuperview" ref="85544634"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="143554520">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">137887744</int>
+								<string key="NSContents">Duplizieren</string>
+								<reference key="NSSupport" ref="463863101"/>
+								<reference key="NSControlView" ref="671954382"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">1</int>
+								<object class="NSFont" key="NSAlternateImage" id="549406736">
+									<string key="NSName">Helvetica</string>
+									<double key="NSSize">13</double>
+									<int key="NSfFlags">16</int>
+								</object>
+								<string key="NSAlternateContents"/>
+								<object class="NSMutableString" key="NSKeyEquivalent">
+									<characters key="NS.bytes"/>
+								</object>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSButton" id="492358940">
+							<reference key="NSNextResponder" ref="85544634"/>
+							<int key="NSvFlags">265</int>
+							<string key="NSFrame">{{340, 159}, {158, 32}}</string>
+							<reference key="NSSuperview" ref="85544634"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="8201128">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">137887744</int>
+								<string key="NSContents">Entfernen</string>
+								<reference key="NSSupport" ref="463863101"/>
+								<reference key="NSControlView" ref="492358940"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">1</int>
+								<reference key="NSAlternateImage" ref="549406736"/>
+								<string key="NSAlternateContents"/>
+								<object class="NSMutableString" key="NSKeyEquivalent">
+									<characters key="NS.bytes"/>
+								</object>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSScrollView" id="1063387772">
+							<reference key="NSNextResponder" ref="85544634"/>
+							<int key="NSvFlags">274</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSClipView" id="580565898">
+									<reference key="NSNextResponder" ref="1063387772"/>
+									<int key="NSvFlags">2304</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<object class="NSTableView" id="905092943">
+											<reference key="NSNextResponder" ref="580565898"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrameSize">{301, 198}</string>
+											<reference key="NSSuperview" ref="580565898"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTableHeaderView" key="NSHeaderView" id="792419186">
+												<reference key="NSNextResponder" ref="672307654"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrameSize">{301, 17}</string>
+												<reference key="NSSuperview" ref="672307654"/>
+												<reference key="NSTableView" ref="905092943"/>
+											</object>
+											<object class="_NSCornerView" key="NSCornerView" id="898633680">
+												<reference key="NSNextResponder" ref="1063387772"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{302, 0}, {16, 17}}</string>
+												<reference key="NSSuperview" ref="1063387772"/>
+											</object>
+											<array class="NSMutableArray" key="NSTableColumns">
+												<object class="NSTableColumn" id="938444323">
+													<double key="NSWidth">122.73100280761719</double>
+													<double key="NSMinWidth">62.730998992919922</double>
+													<double key="NSMaxWidth">1000</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75628096</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">Name</string>
+														<reference key="NSSupport" ref="26"/>
+														<object class="NSColor" key="NSBackgroundColor" id="113872566">
+															<int key="NSColorSpace">3</int>
+															<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
+														</object>
+														<object class="NSColor" key="NSTextColor" id="249576247">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">headerTextColor</string>
+															<reference key="NSColor" ref="214098874"/>
+														</object>
+													</object>
+													<object class="NSTextFieldCell" key="NSDataCell" id="825378892">
+														<int key="NSCellFlags">338820672</int>
+														<int key="NSCellFlags2">1024</int>
+														<string key="NSContents">Textzelle</string>
+														<reference key="NSSupport" ref="463863101"/>
+														<string key="NSPlaceholderString"/>
+														<reference key="NSControlView" ref="905092943"/>
+														<object class="NSColor" key="NSBackgroundColor" id="822946413">
+															<int key="NSColorSpace">3</int>
+															<bytes key="NSWhite">MQA</bytes>
+														</object>
+														<reference key="NSTextColor" ref="930815747"/>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<bool key="NSIsEditable">YES</bool>
+													<reference key="NSTableView" ref="905092943"/>
+												</object>
+												<object class="NSTableColumn" id="84282687">
+													<double key="NSWidth">100</double>
+													<double key="NSMinWidth">40</double>
+													<double key="NSMaxWidth">1000</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75628096</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">Befehl</string>
+														<reference key="NSSupport" ref="26"/>
+														<reference key="NSBackgroundColor" ref="113872566"/>
+														<reference key="NSTextColor" ref="249576247"/>
+													</object>
+													<object class="NSTextFieldCell" key="NSDataCell" id="432610585">
+														<int key="NSCellFlags">338820672</int>
+														<int key="NSCellFlags2">1024</int>
+														<string key="NSContents">Textzelle</string>
+														<reference key="NSSupport" ref="463863101"/>
+														<string key="NSPlaceholderString"/>
+														<reference key="NSControlView" ref="905092943"/>
+														<reference key="NSBackgroundColor" ref="822946413"/>
+														<reference key="NSTextColor" ref="930815747"/>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<bool key="NSIsEditable">YES</bool>
+													<reference key="NSTableView" ref="905092943"/>
+												</object>
+												<object class="NSTableColumn" id="242608782">
+													<double key="NSWidth">69</double>
+													<double key="NSMinWidth">10</double>
+													<double key="NSMaxWidth">1000</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75628096</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">Kurzbefehl</string>
+														<reference key="NSSupport" ref="26"/>
+														<object class="NSColor" key="NSBackgroundColor">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">headerColor</string>
+															<reference key="NSColor" ref="822946413"/>
+														</object>
+														<reference key="NSTextColor" ref="249576247"/>
+													</object>
+													<object class="NSTextFieldCell" key="NSDataCell" id="34714764">
+														<int key="NSCellFlags">338820672</int>
+														<int key="NSCellFlags2">1024</int>
+														<string key="NSContents">Textzelle</string>
+														<object class="NSFont" key="NSSupport">
+															<string key="NSName">LucidaGrande</string>
+															<double key="NSSize">12</double>
+															<int key="NSfFlags">16</int>
+														</object>
+														<string key="NSPlaceholderString"/>
+														<reference key="NSControlView" ref="905092943"/>
+														<bool key="NSDrawsBackground">YES</bool>
+														<object class="NSColor" key="NSBackgroundColor" id="812484075">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">controlBackgroundColor</string>
+															<reference key="NSColor" ref="590688762"/>
+														</object>
+														<reference key="NSTextColor" ref="930815747"/>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<bool key="NSIsEditable">YES</bool>
+													<reference key="NSTableView" ref="905092943"/>
+												</object>
+											</array>
+											<double key="NSIntercellSpacingWidth">3</double>
+											<double key="NSIntercellSpacingHeight">2</double>
+											<reference key="NSBackgroundColor" ref="822946413"/>
+											<object class="NSColor" key="NSGridColor">
+												<int key="NSColorSpace">6</int>
+												<string key="NSCatalogName">System</string>
+												<string key="NSColorName">gridColor</string>
+												<object class="NSColor" key="NSColor">
+													<int key="NSColorSpace">3</int>
+													<bytes key="NSWhite">MC41AA</bytes>
+												</object>
+											</object>
+											<double key="NSRowHeight">17</double>
+											<int key="NSTvFlags">1379958784</int>
+											<reference key="NSDelegate"/>
+											<reference key="NSDataSource"/>
+											<int key="NSColumnAutoresizingStyle">1</int>
+											<int key="NSDraggingSourceMaskForLocal">-1</int>
+											<int key="NSDraggingSourceMaskForNonLocal">0</int>
+											<bool key="NSAllowsTypeSelect">YES</bool>
+											<int key="NSTableViewDraggingDestinationStyle">0</int>
+											<int key="NSTableViewGroupRowStyle">1</int>
+										</object>
+									</array>
+									<string key="NSFrame">{{1, 17}, {301, 198}}</string>
+									<reference key="NSSuperview" ref="1063387772"/>
+									<reference key="NSNextKeyView" ref="905092943"/>
+									<reference key="NSDocView" ref="905092943"/>
+									<reference key="NSBGColor" ref="812484075"/>
+									<int key="NScvFlags">4</int>
+								</object>
+								<object class="NSScroller" id="842897584">
+									<reference key="NSNextResponder" ref="1063387772"/>
+									<int key="NSvFlags">256</int>
+									<string key="NSFrame">{{302, 17}, {15, 198}}</string>
+									<reference key="NSSuperview" ref="1063387772"/>
+									<reference key="NSTarget" ref="1063387772"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSPercent">0.99492377042770386</double>
+								</object>
+								<object class="NSScroller" id="17278747">
+									<reference key="NSNextResponder" ref="1063387772"/>
+									<int key="NSvFlags">256</int>
+									<string key="NSFrame">{{1, 215}, {301, 15}}</string>
+									<reference key="NSSuperview" ref="1063387772"/>
+									<int key="NSsFlags">1</int>
+									<reference key="NSTarget" ref="1063387772"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSPercent">0.68852460384368896</double>
+								</object>
+								<object class="NSClipView" id="672307654">
+									<reference key="NSNextResponder" ref="1063387772"/>
+									<int key="NSvFlags">2304</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<reference ref="792419186"/>
+									</array>
+									<string key="NSFrame">{{1, 0}, {301, 17}}</string>
+									<reference key="NSSuperview" ref="1063387772"/>
+									<reference key="NSNextKeyView" ref="792419186"/>
+									<reference key="NSDocView" ref="792419186"/>
+									<reference key="NSBGColor" ref="812484075"/>
+									<int key="NScvFlags">4</int>
+								</object>
+								<reference ref="898633680"/>
+							</array>
+							<string key="NSFrame">{{20, 20}, {318, 231}}</string>
+							<reference key="NSSuperview" ref="85544634"/>
+							<reference key="NSNextKeyView" ref="580565898"/>
+							<int key="NSsFlags">133170</int>
+							<reference key="NSVScroller" ref="842897584"/>
+							<reference key="NSHScroller" ref="17278747"/>
+							<reference key="NSContentView" ref="580565898"/>
+							<reference key="NSHeaderClipView" ref="672307654"/>
+							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
+						</object>
+						<object class="NSButton" id="758204686">
+							<reference key="NSNextResponder" ref="85544634"/>
+							<int key="NSvFlags">265</int>
+							<string key="NSFrame">{{340, 223}, {158, 32}}</string>
+							<reference key="NSSuperview" ref="85544634"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="1025474039">
+								<int key="NSCellFlags">-2080244224</int>
+								<int key="NSCellFlags2">137887744</int>
+								<string key="NSContents">Objekt hinzufügen</string>
+								<reference key="NSSupport" ref="463863101"/>
+								<reference key="NSControlView" ref="758204686"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">1</int>
+								<reference key="NSAlternateImage" ref="549406736"/>
+								<string key="NSAlternateContents"/>
+								<object class="NSMutableString" key="NSKeyEquivalent">
+									<characters key="NS.bytes"/>
+								</object>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+					</array>
+					<string key="NSFrameSize">{512, 271}</string>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
+				<string key="NSMinSize">{512, 262}</string>
+				<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
+				<string key="NSFrameAutosaveName">x11_apps</string>
+			</object>
+			<object class="NSMenu" id="294137138">
+				<string key="NSTitle">Menü</string>
+				<array class="NSMutableArray" key="NSMenuItems">
+					<object class="NSMenuItem" id="318286212">
+						<reference key="NSMenu" ref="294137138"/>
+						<bool key="NSIsDisabled">YES</bool>
+						<bool key="NSIsSeparator">YES</bool>
+						<string key="NSTitle"/>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="531645050"/>
+						<reference key="NSMixedImage" ref="351811234"/>
+					</object>
+					<object class="NSMenuItem" id="511651072">
+						<reference key="NSMenu" ref="294137138"/>
+						<string key="NSTitle">Programme</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="531645050"/>
+						<reference key="NSMixedImage" ref="351811234"/>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="48278059">
+							<string key="NSTitle">Programme</string>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="563798000">
+									<reference key="NSMenu" ref="48278059"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="1032342329">
+									<reference key="NSMenu" ref="48278059"/>
+									<string key="NSTitle">Anpassen …</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+							</array>
+						</object>
+					</object>
+				</array>
+				<string key="NSName"/>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">copy:</string>
+						<reference key="source" ref="941939442"/>
+						<reference key="destination" ref="185296989"/>
+					</object>
+					<int key="connectionID">181</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">minimize_window:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="677652931"/>
+					</object>
+					<int key="connectionID">202</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">close_window:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="984461797"/>
+					</object>
+					<int key="connectionID">205</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">zoom_window:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="1066447520"/>
+					</object>
+					<int key="connectionID">206</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">bring_to_front:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="276216762"/>
+					</object>
+					<int key="connectionID">207</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">hideOtherApplications:</string>
+						<reference key="source" ref="815810918"/>
+						<reference key="destination" ref="206802571"/>
+					</object>
+					<int key="connectionID">263</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">apps_separator</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="390088328"/>
+					</object>
+					<int key="connectionID">273</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">apps_table</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="905092943"/>
+					</object>
+					<int key="connectionID">301</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">apps_table_delete:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="492358940"/>
+					</object>
+					<int key="connectionID">303</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">apps_table_duplicate:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="671954382"/>
+					</object>
+					<int key="connectionID">304</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">apps_table_show:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="1065386165"/>
+					</object>
+					<int key="connectionID">308</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">apps_table_new:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="758204686"/>
+					</object>
+					<int key="connectionID">311</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_show:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="386173216"/>
+					</object>
+					<int key="connectionID">318</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">x11_about_item</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="139290918"/>
+					</object>
+					<int key="connectionID">321</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">enable_auth</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="989050925"/>
+					</object>
+					<int key="connectionID">387</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">enable_tcp</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="700826966"/>
+					</object>
+					<int key="connectionID">388</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">depth</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="709074847"/>
+					</object>
+					<int key="connectionID">389</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">fake_buttons</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="119157981"/>
+					</object>
+					<int key="connectionID">391</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">sync_keymap</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="179949713"/>
+					</object>
+					<int key="connectionID">392</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">enable_keyequivs</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="842100515"/>
+					</object>
+					<int key="connectionID">393</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="119157981"/>
+					</object>
+					<int key="connectionID">394</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="179949713"/>
+					</object>
+					<int key="connectionID">395</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="842100515"/>
+					</object>
+					<int key="connectionID">396</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="709074847"/>
+					</object>
+					<int key="connectionID">398</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="989050925"/>
+					</object>
+					<int key="connectionID">399</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="700826966"/>
+					</object>
+					<int key="connectionID">401</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">prefs_panel</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="124913468"/>
+					</object>
+					<int key="connectionID">402</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">x11_help:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="504984881"/>
+					</object>
+					<int key="connectionID">422</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">dockMenu</string>
+						<reference key="source" ref="815810918"/>
+						<reference key="destination" ref="294137138"/>
+					</object>
+					<int key="connectionID">426</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">dock_menu</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="294137138"/>
+					</object>
+					<int key="connectionID">428</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="815810918"/>
+						<reference key="destination" ref="485884620"/>
+					</object>
+					<int key="connectionID">429</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">hide:</string>
+						<reference key="source" ref="815810918"/>
+						<reference key="destination" ref="301008465"/>
+					</object>
+					<int key="connectionID">430</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">unhideAllApplications:</string>
+						<reference key="source" ref="815810918"/>
+						<reference key="destination" ref="1023546148"/>
+					</object>
+					<int key="connectionID">431</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">orderFrontStandardAboutPanel:</string>
+						<reference key="source" ref="815810918"/>
+						<reference key="destination" ref="139290918"/>
+					</object>
+					<int key="connectionID">433</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">dock_apps_menu</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="48278059"/>
+					</object>
+					<int key="connectionID">530</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">dock_window_separator</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="318286212"/>
+					</object>
+					<int key="connectionID">531</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">apps_table_show:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="1032342329"/>
+					</object>
+					<int key="connectionID">534</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">next_window:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="1036389925"/>
+					</object>
+					<int key="connectionID">539</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">previous_window:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="369641893"/>
+					</object>
+					<int key="connectionID">540</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">enable_fullscreen</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="477203622"/>
+					</object>
+					<int key="connectionID">546</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">enable_fullscreen_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="477203622"/>
+					</object>
+					<int key="connectionID">547</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggle_fullscreen:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="6876565"/>
+					</object>
+					<int key="connectionID">548</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">toggle_fullscreen_item</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="6876565"/>
+					</object>
+					<int key="connectionID">549</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">menu</string>
+						<reference key="source" ref="815810918"/>
+						<reference key="destination" ref="524015605"/>
+					</object>
+					<int key="connectionID">300334</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">terminate:</string>
+						<reference key="source" ref="815810918"/>
+						<reference key="destination" ref="274138642"/>
+					</object>
+					<int key="connectionID">300336</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="657659108"/>
+					</object>
+					<int key="connectionID">300389</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="992839333"/>
+					</object>
+					<int key="connectionID">300390</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="128352289"/>
+					</object>
+					<int key="connectionID">300391</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">click_through</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="657659108"/>
+					</object>
+					<int key="connectionID">300392</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">focus_follows_mouse</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="992839333"/>
+					</object>
+					<int key="connectionID">300393</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">focus_on_new_window</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="128352289"/>
+					</object>
+					<int key="connectionID">300394</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">copy_menu_item</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="185296989"/>
+					</object>
+					<int key="connectionID">300443</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">sync_pasteboard</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="878106058"/>
+					</object>
+					<int key="connectionID">300444</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">sync_clipboard_to_pasteboard</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="487809555"/>
+					</object>
+					<int key="connectionID">300461</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">sync_pasteboard_to_clipboard</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="477050998"/>
+					</object>
+					<int key="connectionID">300462</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">sync_pasteboard_to_primary</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="765780304"/>
+					</object>
+					<int key="connectionID">300463</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">sync_primary_immediately</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="1002778833"/>
+					</object>
+					<int key="connectionID">300464</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="878106058"/>
+					</object>
+					<int key="connectionID">300465</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="487809555"/>
+					</object>
+					<int key="connectionID">300466</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="477050998"/>
+					</object>
+					<int key="connectionID">300467</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="765780304"/>
+					</object>
+					<int key="connectionID">300468</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="1002778833"/>
+					</object>
+					<int key="connectionID">300469</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">sync_text1</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="620944856"/>
+					</object>
+					<int key="connectionID">300470</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">sync_text2</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="522511724"/>
+					</object>
+					<int key="connectionID">300471</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">enable_fullscreen_menu</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="57246850"/>
+					</object>
+					<int key="connectionID">300474</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="57246850"/>
+					</object>
+					<int key="connectionID">300475</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="406291430"/>
+					</object>
+					<int key="connectionID">300480</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">option_sends_alt</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="406291430"/>
+					</object>
+					<int key="connectionID">300481</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="863505041"/>
+					</object>
+					<int key="connectionID">300484</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">enable_fullscreen_menu_text</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="331853183"/>
+					</object>
+					<int key="connectionID">300489</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">scroll_in_device_direction</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="863505041"/>
+					</object>
+					<int key="connectionID">300490</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="904585544"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="815810918"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="941939442"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="951368722"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">29</int>
+						<reference key="object" ref="524015605"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="931553638"/>
+							<reference ref="365880285"/>
+							<reference ref="200491363"/>
+							<reference ref="868031522"/>
+							<reference ref="551174276"/>
+						</array>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">MainMenu</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">19</int>
+						<reference key="object" ref="931553638"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="96874957"/>
+						</array>
+						<reference key="parent" ref="524015605"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">24</int>
+						<reference key="object" ref="96874957"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="677652931"/>
+							<reference ref="276216762"/>
+							<reference ref="1066447520"/>
+							<reference ref="1036389925"/>
+							<reference ref="369641893"/>
+							<reference ref="155085383"/>
+							<reference ref="984461797"/>
+							<reference ref="280172320"/>
+						</array>
+						<reference key="parent" ref="931553638"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5</int>
+						<reference key="object" ref="276216762"/>
+						<reference key="parent" ref="96874957"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">23</int>
+						<reference key="object" ref="677652931"/>
+						<reference key="parent" ref="96874957"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">92</int>
+						<reference key="object" ref="280172320"/>
+						<reference key="parent" ref="96874957"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">203</int>
+						<reference key="object" ref="984461797"/>
+						<reference key="parent" ref="96874957"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">204</int>
+						<reference key="object" ref="1066447520"/>
+						<reference key="parent" ref="96874957"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">536</int>
+						<reference key="object" ref="155085383"/>
+						<reference key="parent" ref="96874957"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">537</int>
+						<reference key="object" ref="1036389925"/>
+						<reference key="parent" ref="96874957"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">538</int>
+						<reference key="object" ref="369641893"/>
+						<reference key="parent" ref="96874957"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">56</int>
+						<reference key="object" ref="365880285"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="576521955"/>
+						</array>
+						<reference key="parent" ref="524015605"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">57</int>
+						<reference key="object" ref="576521955"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="139290918"/>
+							<reference ref="386173216"/>
+							<reference ref="32285361"/>
+							<reference ref="301008465"/>
+							<reference ref="274138642"/>
+							<reference ref="272876017"/>
+							<reference ref="431301145"/>
+							<reference ref="206802571"/>
+							<reference ref="848095279"/>
+							<reference ref="1023546148"/>
+							<reference ref="6876565"/>
+							<reference ref="479677589"/>
+						</array>
+						<reference key="parent" ref="365880285"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">58</int>
+						<reference key="object" ref="139290918"/>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">129</int>
+						<reference key="object" ref="386173216"/>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">131</int>
+						<reference key="object" ref="32285361"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="821388474"/>
+						</array>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">130</int>
+						<reference key="object" ref="821388474"/>
+						<reference key="parent" ref="32285361"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">134</int>
+						<reference key="object" ref="301008465"/>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">136</int>
+						<reference key="object" ref="274138642"/>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">143</int>
+						<reference key="object" ref="272876017"/>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">144</int>
+						<reference key="object" ref="431301145"/>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">145</int>
+						<reference key="object" ref="206802571"/>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">149</int>
+						<reference key="object" ref="848095279"/>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">150</int>
+						<reference key="object" ref="1023546148"/>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">544</int>
+						<reference key="object" ref="6876565"/>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">545</int>
+						<reference key="object" ref="479677589"/>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">163</int>
+						<reference key="object" ref="200491363"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="526778998"/>
+						</array>
+						<reference key="parent" ref="524015605"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">169</int>
+						<reference key="object" ref="526778998"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="185296989"/>
+						</array>
+						<reference key="parent" ref="200491363"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">157</int>
+						<reference key="object" ref="185296989"/>
+						<reference key="parent" ref="526778998"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">269</int>
+						<reference key="object" ref="868031522"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="981161348"/>
+						</array>
+						<reference key="parent" ref="524015605"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">270</int>
+						<reference key="object" ref="981161348"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="390088328"/>
+							<reference ref="1065386165"/>
+						</array>
+						<reference key="parent" ref="868031522"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">272</int>
+						<reference key="object" ref="390088328"/>
+						<reference key="parent" ref="981161348"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">305</int>
+						<reference key="object" ref="1065386165"/>
+						<reference key="parent" ref="981161348"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">419</int>
+						<reference key="object" ref="551174276"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="511848303"/>
+						</array>
+						<reference key="parent" ref="524015605"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">420</int>
+						<reference key="object" ref="511848303"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="504984881"/>
+						</array>
+						<reference key="parent" ref="551174276"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">421</int>
+						<reference key="object" ref="504984881"/>
+						<reference key="parent" ref="511848303"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">196</int>
+						<reference key="object" ref="485884620"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">X11Controller</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">244</int>
+						<reference key="object" ref="124913468"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="941366957"/>
+						</array>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">PrefsPanel</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">245</int>
+						<reference key="object" ref="941366957"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="448510093"/>
+						</array>
+						<reference key="parent" ref="124913468"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">348</int>
+						<reference key="object" ref="448510093"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="287591690"/>
+							<reference ref="960678392"/>
+							<reference ref="348328898"/>
+							<reference ref="10973343"/>
+							<reference ref="723450037"/>
+						</array>
+						<reference key="parent" ref="941366957"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">349</int>
+						<reference key="object" ref="287591690"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="596750588"/>
+						</array>
+						<reference key="parent" ref="448510093"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">351</int>
+						<reference key="object" ref="596750588"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="119157981"/>
+							<reference ref="443008216"/>
+							<reference ref="282885445"/>
+							<reference ref="842100515"/>
+							<reference ref="31160162"/>
+							<reference ref="179949713"/>
+							<reference ref="278155937"/>
+							<reference ref="406291430"/>
+							<reference ref="863505041"/>
+						</array>
+						<reference key="parent" ref="287591690"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">363</int>
+						<reference key="object" ref="119157981"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="990762273"/>
+						</array>
+						<reference key="parent" ref="596750588"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">364</int>
+						<reference key="object" ref="443008216"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="391919450"/>
+						</array>
+						<reference key="parent" ref="596750588"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">365</int>
+						<reference key="object" ref="282885445"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="649334366"/>
+						</array>
+						<reference key="parent" ref="596750588"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">368</int>
+						<reference key="object" ref="842100515"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="940564599"/>
+						</array>
+						<reference key="parent" ref="596750588"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">369</int>
+						<reference key="object" ref="31160162"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="666057093"/>
+						</array>
+						<reference key="parent" ref="596750588"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">370</int>
+						<reference key="object" ref="179949713"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="967619578"/>
+						</array>
+						<reference key="parent" ref="596750588"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">352</int>
+						<reference key="object" ref="960678392"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="515308735"/>
+						</array>
+						<reference key="parent" ref="448510093"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">350</int>
+						<reference key="object" ref="515308735"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="709074847"/>
+							<reference ref="201731424"/>
+							<reference ref="86150604"/>
+							<reference ref="477203622"/>
+							<reference ref="57246850"/>
+							<reference ref="298603383"/>
+							<reference ref="331853183"/>
+						</array>
+						<reference key="parent" ref="960678392"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">382</int>
+						<reference key="object" ref="709074847"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="633115429"/>
+						</array>
+						<reference key="parent" ref="515308735"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">385</int>
+						<reference key="object" ref="201731424"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="930265681"/>
+						</array>
+						<reference key="parent" ref="515308735"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">386</int>
+						<reference key="object" ref="86150604"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="311969422"/>
+						</array>
+						<reference key="parent" ref="515308735"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">541</int>
+						<reference key="object" ref="477203622"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="631531164"/>
+						</array>
+						<reference key="parent" ref="515308735"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">543</int>
+						<reference key="object" ref="298603383"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="761107402"/>
+						</array>
+						<reference key="parent" ref="515308735"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">353</int>
+						<reference key="object" ref="348328898"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="300811574"/>
+						</array>
+						<reference key="parent" ref="448510093"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">354</int>
+						<reference key="object" ref="300811574"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="989050925"/>
+							<reference ref="700826966"/>
+							<reference ref="168436707"/>
+							<reference ref="363817195"/>
+							<reference ref="223835729"/>
+						</array>
+						<reference key="parent" ref="348328898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">374</int>
+						<reference key="object" ref="989050925"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="189594322"/>
+						</array>
+						<reference key="parent" ref="300811574"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">375</int>
+						<reference key="object" ref="700826966"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="489340979"/>
+						</array>
+						<reference key="parent" ref="300811574"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">376</int>
+						<reference key="object" ref="168436707"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="53243865"/>
+						</array>
+						<reference key="parent" ref="300811574"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">377</int>
+						<reference key="object" ref="363817195"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="390084685"/>
+						</array>
+						<reference key="parent" ref="300811574"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">379</int>
+						<reference key="object" ref="223835729"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="283628678"/>
+						</array>
+						<reference key="parent" ref="300811574"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">285</int>
+						<reference key="object" ref="604417141"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="85544634"/>
+						</array>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">EditPrograms</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">286</int>
+						<reference key="object" ref="85544634"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1063387772"/>
+							<reference ref="758204686"/>
+							<reference ref="671954382"/>
+							<reference ref="492358940"/>
+						</array>
+						<reference key="parent" ref="604417141"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">423</int>
+						<reference key="object" ref="294137138"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="318286212"/>
+							<reference ref="511651072"/>
+						</array>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">DockMenu</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">524</int>
+						<reference key="object" ref="318286212"/>
+						<reference key="parent" ref="294137138"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">526</int>
+						<reference key="object" ref="511651072"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="48278059"/>
+						</array>
+						<reference key="parent" ref="294137138"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">527</int>
+						<reference key="object" ref="48278059"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1032342329"/>
+							<reference ref="563798000"/>
+						</array>
+						<reference key="parent" ref="511651072"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">532</int>
+						<reference key="object" ref="1032342329"/>
+						<reference key="parent" ref="48278059"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">533</int>
+						<reference key="object" ref="563798000"/>
+						<reference key="parent" ref="48278059"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100363</int>
+						<reference key="object" ref="990762273"/>
+						<reference key="parent" ref="119157981"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100364</int>
+						<reference key="object" ref="391919450"/>
+						<reference key="parent" ref="443008216"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100365</int>
+						<reference key="object" ref="649334366"/>
+						<reference key="parent" ref="282885445"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100368</int>
+						<reference key="object" ref="940564599"/>
+						<reference key="parent" ref="842100515"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100369</int>
+						<reference key="object" ref="666057093"/>
+						<reference key="parent" ref="31160162"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100370</int>
+						<reference key="object" ref="967619578"/>
+						<reference key="parent" ref="179949713"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100382</int>
+						<reference key="object" ref="633115429"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="341113515"/>
+						</array>
+						<reference key="parent" ref="709074847"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100385</int>
+						<reference key="object" ref="930265681"/>
+						<reference key="parent" ref="201731424"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100386</int>
+						<reference key="object" ref="311969422"/>
+						<reference key="parent" ref="86150604"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100541</int>
+						<reference key="object" ref="631531164"/>
+						<reference key="parent" ref="477203622"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100543</int>
+						<reference key="object" ref="761107402"/>
+						<reference key="parent" ref="298603383"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100374</int>
+						<reference key="object" ref="189594322"/>
+						<reference key="parent" ref="989050925"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100375</int>
+						<reference key="object" ref="489340979"/>
+						<reference key="parent" ref="700826966"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100376</int>
+						<reference key="object" ref="53243865"/>
+						<reference key="parent" ref="168436707"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100377</int>
+						<reference key="object" ref="390084685"/>
+						<reference key="parent" ref="363817195"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100379</int>
+						<reference key="object" ref="283628678"/>
+						<reference key="parent" ref="223835729"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">380</int>
+						<reference key="object" ref="341113515"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="759499526"/>
+							<reference ref="616492372"/>
+							<reference ref="543935434"/>
+							<reference ref="836673018"/>
+						</array>
+						<reference key="parent" ref="633115429"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">435</int>
+						<reference key="object" ref="759499526"/>
+						<reference key="parent" ref="341113515"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">384</int>
+						<reference key="object" ref="616492372"/>
+						<reference key="parent" ref="341113515"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">383</int>
+						<reference key="object" ref="543935434"/>
+						<reference key="parent" ref="341113515"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">381</int>
+						<reference key="object" ref="836673018"/>
+						<reference key="parent" ref="341113515"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">295</int>
+						<reference key="object" ref="1063387772"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="792419186"/>
+							<reference ref="17278747"/>
+							<reference ref="842897584"/>
+							<reference ref="905092943"/>
+						</array>
+						<reference key="parent" ref="85544634"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300295</int>
+						<reference key="object" ref="792419186"/>
+						<reference key="parent" ref="1063387772"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">200295</int>
+						<reference key="object" ref="17278747"/>
+						<reference key="parent" ref="1063387772"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100295</int>
+						<reference key="object" ref="842897584"/>
+						<reference key="parent" ref="1063387772"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">296</int>
+						<reference key="object" ref="905092943"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="242608782"/>
+							<reference ref="938444323"/>
+							<reference ref="84282687"/>
+						</array>
+						<reference key="parent" ref="1063387772"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">535</int>
+						<reference key="object" ref="242608782"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="34714764"/>
+						</array>
+						<reference key="parent" ref="905092943"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">575</int>
+						<reference key="object" ref="34714764"/>
+						<reference key="parent" ref="242608782"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">298</int>
+						<reference key="object" ref="938444323"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="825378892"/>
+						</array>
+						<reference key="parent" ref="905092943"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">573</int>
+						<reference key="object" ref="825378892"/>
+						<reference key="parent" ref="938444323"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">297</int>
+						<reference key="object" ref="84282687"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="432610585"/>
+						</array>
+						<reference key="parent" ref="905092943"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">574</int>
+						<reference key="object" ref="432610585"/>
+						<reference key="parent" ref="84282687"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">310</int>
+						<reference key="object" ref="758204686"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1025474039"/>
+						</array>
+						<reference key="parent" ref="85544634"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100310</int>
+						<reference key="object" ref="1025474039"/>
+						<reference key="parent" ref="758204686"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">292</int>
+						<reference key="object" ref="671954382"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="143554520"/>
+						</array>
+						<reference key="parent" ref="85544634"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100292</int>
+						<reference key="object" ref="143554520"/>
+						<reference key="parent" ref="671954382"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">293</int>
+						<reference key="object" ref="492358940"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="8201128"/>
+						</array>
+						<reference key="parent" ref="85544634"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100293</int>
+						<reference key="object" ref="8201128"/>
+						<reference key="parent" ref="492358940"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300337</int>
+						<reference key="object" ref="10973343"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="184765684"/>
+						</array>
+						<reference key="parent" ref="448510093"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300338</int>
+						<reference key="object" ref="184765684"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="657659108"/>
+							<reference ref="290578835"/>
+							<reference ref="992839333"/>
+							<reference ref="138261120"/>
+							<reference ref="128352289"/>
+							<reference ref="57161931"/>
+						</array>
+						<reference key="parent" ref="10973343"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300358</int>
+						<reference key="object" ref="290578835"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="399127858"/>
+						</array>
+						<reference key="parent" ref="184765684"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300359</int>
+						<reference key="object" ref="657659108"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="259618205"/>
+						</array>
+						<reference key="parent" ref="184765684"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300360</int>
+						<reference key="object" ref="259618205"/>
+						<reference key="parent" ref="657659108"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300361</int>
+						<reference key="object" ref="399127858"/>
+						<reference key="parent" ref="290578835"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300362</int>
+						<reference key="object" ref="992839333"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="959555182"/>
+						</array>
+						<reference key="parent" ref="184765684"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300363</int>
+						<reference key="object" ref="959555182"/>
+						<reference key="parent" ref="992839333"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300364</int>
+						<reference key="object" ref="138261120"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="183409141"/>
+						</array>
+						<reference key="parent" ref="184765684"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300365</int>
+						<reference key="object" ref="183409141"/>
+						<reference key="parent" ref="138261120"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300368</int>
+						<reference key="object" ref="128352289"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="556463187"/>
+						</array>
+						<reference key="parent" ref="184765684"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300369</int>
+						<reference key="object" ref="556463187"/>
+						<reference key="parent" ref="128352289"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300370</int>
+						<reference key="object" ref="57161931"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="989804990"/>
+						</array>
+						<reference key="parent" ref="184765684"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300371</int>
+						<reference key="object" ref="989804990"/>
+						<reference key="parent" ref="57161931"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300421</int>
+						<reference key="object" ref="723450037"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="408298283"/>
+						</array>
+						<reference key="parent" ref="448510093"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300422</int>
+						<reference key="object" ref="408298283"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="878106058"/>
+							<reference ref="386152084"/>
+							<reference ref="487809555"/>
+							<reference ref="620944856"/>
+							<reference ref="477050998"/>
+							<reference ref="765780304"/>
+							<reference ref="522511724"/>
+							<reference ref="1002778833"/>
+						</array>
+						<reference key="parent" ref="723450037"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300423</int>
+						<reference key="object" ref="386152084"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="572508492"/>
+						</array>
+						<reference key="parent" ref="408298283"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300424</int>
+						<reference key="object" ref="878106058"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="718083688"/>
+						</array>
+						<reference key="parent" ref="408298283"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300440</int>
+						<reference key="object" ref="718083688"/>
+						<reference key="parent" ref="878106058"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300441</int>
+						<reference key="object" ref="572508492"/>
+						<reference key="parent" ref="386152084"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300447</int>
+						<reference key="object" ref="477050998"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="501304422"/>
+						</array>
+						<reference key="parent" ref="408298283"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300450</int>
+						<reference key="object" ref="501304422"/>
+						<reference key="parent" ref="477050998"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300451</int>
+						<reference key="object" ref="765780304"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="510771323"/>
+						</array>
+						<reference key="parent" ref="408298283"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300452</int>
+						<reference key="object" ref="510771323"/>
+						<reference key="parent" ref="765780304"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300453</int>
+						<reference key="object" ref="487809555"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="619977658"/>
+						</array>
+						<reference key="parent" ref="408298283"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300454</int>
+						<reference key="object" ref="619977658"/>
+						<reference key="parent" ref="487809555"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300455</int>
+						<reference key="object" ref="620944856"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="461823902"/>
+						</array>
+						<reference key="parent" ref="408298283"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300456</int>
+						<reference key="object" ref="461823902"/>
+						<reference key="parent" ref="620944856"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300457</int>
+						<reference key="object" ref="1002778833"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="897099877"/>
+						</array>
+						<reference key="parent" ref="408298283"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300458</int>
+						<reference key="object" ref="897099877"/>
+						<reference key="parent" ref="1002778833"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300459</int>
+						<reference key="object" ref="522511724"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="994587858"/>
+						</array>
+						<reference key="parent" ref="408298283"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300460</int>
+						<reference key="object" ref="994587858"/>
+						<reference key="parent" ref="522511724"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300472</int>
+						<reference key="object" ref="57246850"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="917248662"/>
+						</array>
+						<reference key="parent" ref="515308735"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300473</int>
+						<reference key="object" ref="917248662"/>
+						<reference key="parent" ref="57246850"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300476</int>
+						<reference key="object" ref="278155937"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="617441821"/>
+						</array>
+						<reference key="parent" ref="596750588"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300477</int>
+						<reference key="object" ref="406291430"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="67728988"/>
+						</array>
+						<reference key="parent" ref="596750588"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300478</int>
+						<reference key="object" ref="67728988"/>
+						<reference key="parent" ref="406291430"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300479</int>
+						<reference key="object" ref="617441821"/>
+						<reference key="parent" ref="278155937"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300482</int>
+						<reference key="object" ref="863505041"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1016286396"/>
+						</array>
+						<reference key="parent" ref="596750588"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300483</int>
+						<reference key="object" ref="1016286396"/>
+						<reference key="parent" ref="863505041"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300487</int>
+						<reference key="object" ref="331853183"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1042813110"/>
+						</array>
+						<reference key="parent" ref="515308735"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300488</int>
+						<reference key="object" ref="1042813110"/>
+						<reference key="parent" ref="331853183"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="-3.ImportedFromIB2"/>
+				<string key="100292.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100293.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="100295.IBShouldRemoveOnLegacySave"/>
+				<string key="100310.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100363.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100364.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100365.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100368.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100369.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100374.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100375.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100376.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100377.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100379.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100382.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100385.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100386.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100541.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100543.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="129.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="129.ImportedFromIB2"/>
+				<string key="130.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="130.ImportedFromIB2"/>
+				<string key="131.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="131.ImportedFromIB2"/>
+				<string key="134.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="134.ImportedFromIB2"/>
+				<string key="136.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="136.ImportedFromIB2"/>
+				<string key="143.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="143.ImportedFromIB2"/>
+				<string key="144.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="144.ImportedFromIB2"/>
+				<string key="145.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="145.ImportedFromIB2"/>
+				<string key="149.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="149.ImportedFromIB2"/>
+				<string key="150.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="150.ImportedFromIB2"/>
+				<string key="157.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="157.ImportedFromIB2"/>
+				<string key="163.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="163.ImportedFromIB2"/>
+				<string key="169.IBEditorWindowLastContentRect">{{168, 821}, {113, 23}}</string>
+				<string key="169.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="169.ImportedFromIB2"/>
+				<string key="169.editorWindowContentRectSynchronizationRect">{{202, 626}, {154, 153}}</string>
+				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="19.ImportedFromIB2"/>
+				<integer value="1" key="196.ImportedFromIB2"/>
+				<string key="200295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="200295.IBShouldRemoveOnLegacySave"/>
+				<string key="203.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="203.ImportedFromIB2"/>
+				<string key="204.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="204.ImportedFromIB2"/>
+				<string key="23.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="23.ImportedFromIB2"/>
+				<string key="24.IBEditorWindowLastContentRect">{{349, 868}, {315, 143}}</string>
+				<string key="24.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="24.ImportedFromIB2"/>
+				<string key="24.editorWindowContentRectSynchronizationRect">{{271, 666}, {301, 153}}</string>
+				<string key="244.IBEditorWindowLastContentRect">{{329, 408}, {550, 341}}</string>
+				<string key="244.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="244.IBWindowTemplateEditedContentRect">{{329, 408}, {550, 341}}</string>
+				<integer value="1" key="244.ImportedFromIB2"/>
+				<string key="244.editorWindowContentRectSynchronizationRect">{{184, 290}, {481, 345}}</string>
+				<boolean value="YES" key="244.windowTemplate.hasMinSize"/>
+				<string key="244.windowTemplate.maxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
+				<string key="244.windowTemplate.minSize">{320, 240}</string>
+				<string key="245.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="245.ImportedFromIB2"/>
+				<string key="269.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="269.ImportedFromIB2"/>
+				<string key="270.IBEditorWindowLastContentRect">{{58, 803}, {155, 33}}</string>
+				<string key="270.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="270.ImportedFromIB2"/>
+				<string key="270.editorWindowContentRectSynchronizationRect">{{100, 746}, {155, 33}}</string>
+				<string key="272.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="272.ImportedFromIB2"/>
+				<string key="285.IBEditorWindowLastContentRect">{{68, 585}, {454, 271}}</string>
+				<string key="285.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="285.IBViewEditorWindowController.showingBoundsRectangles"/>
+				<integer value="1" key="285.IBViewEditorWindowController.showingLayoutRectangles"/>
+				<string key="285.IBWindowTemplateEditedContentRect">{{68, 585}, {454, 271}}</string>
+				<integer value="1" key="285.ImportedFromIB2"/>
+				<string key="285.editorWindowContentRectSynchronizationRect">{{433, 406}, {486, 327}}</string>
+				<boolean value="YES" key="285.windowTemplate.hasMinSize"/>
+				<string key="285.windowTemplate.maxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
+				<string key="285.windowTemplate.minSize">{512, 240}</string>
+				<string key="286.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="286.ImportedFromIB2"/>
+				<string key="29.IBEditorWindowLastContentRect">{{145, 1011}, {336, 20}}</string>
+				<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="29.ImportedFromIB2"/>
+				<string key="29.editorWindowContentRectSynchronizationRect">{{67, 819}, {336, 20}}</string>
+				<string key="292.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="292.ImportedFromIB2"/>
+				<string key="293.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="293.ImportedFromIB2"/>
+				<string key="295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="295.ImportedFromIB2"/>
+				<string key="296.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="296.ImportedFromIB2"/>
+				<string key="297.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="297.ImportedFromIB2"/>
+				<string key="298.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="298.ImportedFromIB2"/>
+				<string key="300295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300295.IBShouldRemoveOnLegacySave"/>
+				<string key="300337.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300337.ImportedFromIB2"/>
+				<string key="300338.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300338.ImportedFromIB2"/>
+				<string key="300358.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300358.ImportedFromIB2"/>
+				<string key="300359.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300359.ImportedFromIB2"/>
+				<string key="300360.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300361.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300362.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300362.ImportedFromIB2"/>
+				<string key="300363.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300364.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300364.ImportedFromIB2"/>
+				<string key="300365.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300368.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300368.ImportedFromIB2"/>
+				<string key="300369.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300370.ImportedFromIB2"/>
+				<string key="300371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300421.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300421.ImportedFromIB2"/>
+				<string key="300422.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300422.ImportedFromIB2"/>
+				<string key="300423.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300423.ImportedFromIB2"/>
+				<string key="300424.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300424.ImportedFromIB2"/>
+				<string key="300440.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300441.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300447.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300447.ImportedFromIB2"/>
+				<string key="300450.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300451.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300451.ImportedFromIB2"/>
+				<string key="300452.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300453.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300453.ImportedFromIB2"/>
+				<string key="300454.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300455.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300455.ImportedFromIB2"/>
+				<string key="300456.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300457.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSAffineTransform" key="300457.IBViewBoundsToFrameTransform">
+					<bytes key="NSTransformStruct">P4AAAL+AAABCCAAAwr4AAA</bytes>
+				</object>
+				<integer value="1" key="300457.ImportedFromIB2"/>
+				<string key="300458.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300459.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300459.ImportedFromIB2"/>
+				<string key="300460.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300472.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300472.ImportedFromIB2"/>
+				<string key="300473.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300476.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300476.ImportedFromIB2"/>
+				<string key="300477.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300477.ImportedFromIB2"/>
+				<string key="300478.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300479.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300482.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300482.ImportedFromIB2"/>
+				<string key="300483.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300487.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300487.ImportedFromIB2"/>
+				<string key="300488.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="305.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="305.ImportedFromIB2"/>
+				<string key="310.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="310.ImportedFromIB2"/>
+				<string key="348.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="348.ImportedFromIB2"/>
+				<string key="349.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="349.ImportedFromIB2"/>
+				<string key="350.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="350.ImportedFromIB2"/>
+				<string key="351.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="351.ImportedFromIB2"/>
+				<string key="352.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="352.ImportedFromIB2"/>
+				<string key="353.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="353.ImportedFromIB2"/>
+				<string key="354.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="354.ImportedFromIB2"/>
+				<string key="363.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="363.ImportedFromIB2"/>
+				<string key="364.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="364.ImportedFromIB2"/>
+				<string key="365.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="365.ImportedFromIB2"/>
+				<string key="368.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="368.ImportedFromIB2"/>
+				<string key="369.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="369.ImportedFromIB2"/>
+				<string key="370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="370.ImportedFromIB2"/>
+				<string key="374.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="374.ImportedFromIB2"/>
+				<string key="375.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="375.ImportedFromIB2"/>
+				<string key="376.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="376.ImportedFromIB2"/>
+				<string key="377.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="377.ImportedFromIB2"/>
+				<string key="379.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="379.ImportedFromIB2"/>
+				<string key="380.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="380.ImportedFromIB2"/>
+				<string key="381.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="381.ImportedFromIB2"/>
+				<string key="382.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="382.ImportedFromIB2"/>
+				<string key="383.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="383.ImportedFromIB2"/>
+				<string key="384.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="384.ImportedFromIB2"/>
+				<string key="385.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="385.ImportedFromIB2"/>
+				<string key="386.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="386.ImportedFromIB2"/>
+				<string key="419.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="419.ImportedFromIB2"/>
+				<string key="420.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="420.ImportedFromIB2"/>
+				<string key="421.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="421.ImportedFromIB2"/>
+				<string key="423.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="423.ImportedFromIB2"/>
+				<string key="435.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="435.ImportedFromIB2"/>
+				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="5.ImportedFromIB2"/>
+				<string key="524.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="524.ImportedFromIB2"/>
+				<string key="526.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="526.ImportedFromIB2"/>
+				<string key="527.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="527.ImportedFromIB2"/>
+				<string key="532.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="532.ImportedFromIB2"/>
+				<string key="533.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="533.ImportedFromIB2"/>
+				<string key="535.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="535.ImportedFromIB2"/>
+				<string key="536.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="536.ImportedFromIB2"/>
+				<string key="537.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="537.ImportedFromIB2"/>
+				<string key="538.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="538.ImportedFromIB2"/>
+				<string key="541.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="541.ImportedFromIB2"/>
+				<string key="543.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="543.ImportedFromIB2"/>
+				<string key="544.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="544.ImportedFromIB2"/>
+				<string key="545.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="545.ImportedFromIB2"/>
+				<string key="56.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="56.ImportedFromIB2"/>
+				<string key="57.IBEditorWindowLastContentRect">{{20, 641}, {218, 203}}</string>
+				<string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="57.ImportedFromIB2"/>
+				<string key="57.editorWindowContentRectSynchronizationRect">{{79, 616}, {218, 203}}</string>
+				<string key="573.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="573.ImportedFromIB2"/>
+				<string key="574.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="574.ImportedFromIB2"/>
+				<string key="575.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="575.ImportedFromIB2"/>
+				<string key="58.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="58.ImportedFromIB2"/>
+				<string key="92.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="92.ImportedFromIB2"/>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">300490</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<integer value="1040" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<nil key="IBDocument.LastKnownRelativeProjectPath"/>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="NSMenuCheckmark">{9, 8}</string>
+			<string key="NSMenuMixedState">{7, 2}</string>
+			<string key="NSSwitch">{15, 15}</string>
+		</dictionary>
+	</data>
+</archive>
diff --git a/xorg-server/hw/xquartz/bundle/Resources/Japanese.lproj/locversion.plist b/xorg-server/hw/xquartz/bundle/Resources/Japanese.lproj/locversion.plist
index afdc96f72..4dce0add7 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/Japanese.lproj/locversion.plist
+++ b/xorg-server/hw/xquartz/bundle/Resources/Japanese.lproj/locversion.plist
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">

-<plist version="1.0">

-<dict>

-	<key>LprojCompatibleVersion</key>

-	<string>106.3</string>

-	<key>LprojLocale</key>

-	<string>ja</string>

-	<key>LprojRevisionLevel</key>

-	<string>1</string>

-	<key>LprojVersion</key>

-	<string>106.3</string>

-</dict>

-</plist>

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>LprojCompatibleVersion</key>
+	<string>106.3</string>
+	<key>LprojLocale</key>
+	<string>ja</string>
+	<key>LprojRevisionLevel</key>
+	<string>1</string>
+	<key>LprojVersion</key>
+	<string>106.3</string>
+</dict>
+</plist>
diff --git a/xorg-server/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib b/xorg-server/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib
index a707b0095..743edb60a 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib
+++ b/xorg-server/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib
@@ -1,3620 +1,3620 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">

-	<data>

-		<int key="IBDocument.SystemTarget">1040</int>

-		<string key="IBDocument.SystemVersion">11A289</string>

-		<string key="IBDocument.InterfaceBuilderVersion">903</string>

-		<string key="IBDocument.AppKitVersion">1094.2</string>

-		<string key="IBDocument.HIToolboxVersion">521.00</string>

-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">

-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>

-			<string key="NS.object.0">903</string>

-		</object>

-		<array class="NSMutableArray" key="IBDocument.EditedObjectIDs"/>

-		<array key="IBDocument.PluginDependencies">

-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>

-		</array>

-		<object class="NSMutableDictionary" key="IBDocument.Metadata">

-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>

-			<integer value="1" key="NS.object.0"/>

-		</object>

-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="904585544">

-			<object class="NSCustomObject" id="815810918">

-				<object class="NSMutableString" key="NSClassName">

-					<characters key="NS.bytes">NSApplication</characters>

-				</object>

-			</object>

-			<object class="NSCustomObject" id="941939442">

-				<string key="NSClassName">FirstResponder</string>

-			</object>

-			<object class="NSCustomObject" id="951368722">

-				<string key="NSClassName">NSApplication</string>

-			</object>

-			<object class="NSMenu" id="524015605">

-				<string key="NSTitle">MainMenu</string>

-				<array class="NSMutableArray" key="NSMenuItems">

-					<object class="NSMenuItem" id="365880285">

-						<reference key="NSMenu" ref="524015605"/>

-						<string key="NSTitle">X11</string>

-						<string key="NSKeyEquiv"/>

-						<int key="NSKeyEquivModMask">1048576</int>

-						<int key="NSMnemonicLoc">2147483647</int>

-						<object class="NSCustomResource" key="NSOnImage" id="531645050">

-							<string key="NSClassName">NSImage</string>

-							<string key="NSResourceName">NSMenuCheckmark</string>

-						</object>

-						<object class="NSCustomResource" key="NSMixedImage" id="351811234">

-							<string key="NSClassName">NSImage</string>

-							<string key="NSResourceName">NSMenuMixedState</string>

-						</object>

-						<string key="NSAction">submenuAction:</string>

-						<object class="NSMenu" key="NSSubmenu" id="576521955">

-							<string key="NSTitle">X11</string>

-							<array class="NSMutableArray" key="NSMenuItems">

-								<object class="NSMenuItem" id="139290918">

-									<reference key="NSMenu" ref="576521955"/>

-									<string key="NSTitle">X11 について</string>

-									<string key="NSKeyEquiv"/>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="386173216">

-									<reference key="NSMenu" ref="576521955"/>

-									<string key="NSTitle">環境設定...</string>

-									<string key="NSKeyEquiv">,</string>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="272876017">

-									<reference key="NSMenu" ref="576521955"/>

-									<bool key="NSIsDisabled">YES</bool>

-									<bool key="NSIsSeparator">YES</bool>

-									<string key="NSTitle"/>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="32285361">

-									<reference key="NSMenu" ref="576521955"/>

-									<string key="NSTitle">サービス</string>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-									<string key="NSAction">submenuAction:</string>

-									<object class="NSMenu" key="NSSubmenu" id="821388474">

-										<string key="NSTitle">サービス</string>

-										<array class="NSMutableArray" key="NSMenuItems"/>

-										<string key="NSName">_NSServicesMenu</string>

-									</object>

-								</object>

-								<object class="NSMenuItem" id="431301145">

-									<reference key="NSMenu" ref="576521955"/>

-									<bool key="NSIsDisabled">YES</bool>

-									<bool key="NSIsSeparator">YES</bool>

-									<string key="NSTitle"/>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="6876565">

-									<reference key="NSMenu" ref="576521955"/>

-									<string key="NSTitle">フルスクリーンを切り替える</string>

-									<string key="NSKeyEquiv">a</string>

-									<int key="NSKeyEquivModMask">1572864</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="479677589">

-									<reference key="NSMenu" ref="576521955"/>

-									<bool key="NSIsDisabled">YES</bool>

-									<bool key="NSIsSeparator">YES</bool>

-									<string key="NSTitle"/>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="301008465">

-									<reference key="NSMenu" ref="576521955"/>

-									<string key="NSTitle">X11 を隠す</string>

-									<string key="NSKeyEquiv">h</string>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-									<int key="NSTag">42</int>

-								</object>

-								<object class="NSMenuItem" id="206802571">

-									<reference key="NSMenu" ref="576521955"/>

-									<string key="NSTitle">ほかを隠す</string>

-									<string key="NSKeyEquiv">h</string>

-									<int key="NSKeyEquivModMask">1572864</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="1023546148">

-									<reference key="NSMenu" ref="576521955"/>

-									<string key="NSTitle">すべてを表示</string>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-									<int key="NSTag">42</int>

-								</object>

-								<object class="NSMenuItem" id="848095279">

-									<reference key="NSMenu" ref="576521955"/>

-									<bool key="NSIsDisabled">YES</bool>

-									<bool key="NSIsSeparator">YES</bool>

-									<string key="NSTitle"/>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="274138642">

-									<reference key="NSMenu" ref="576521955"/>

-									<string key="NSTitle">X11 を終了</string>

-									<string key="NSKeyEquiv">q</string>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-							</array>

-							<string key="NSName">_NSAppleMenu</string>

-						</object>

-					</object>

-					<object class="NSMenuItem" id="868031522">

-						<reference key="NSMenu" ref="524015605"/>

-						<string key="NSTitle">アプリケーション</string>

-						<string key="NSKeyEquiv"/>

-						<int key="NSKeyEquivModMask">1048576</int>

-						<int key="NSMnemonicLoc">2147483647</int>

-						<reference key="NSOnImage" ref="531645050"/>

-						<reference key="NSMixedImage" ref="351811234"/>

-						<string key="NSAction">submenuAction:</string>

-						<object class="NSMenu" key="NSSubmenu" id="981161348">

-							<string key="NSTitle">アプリケーション</string>

-							<array class="NSMutableArray" key="NSMenuItems">

-								<object class="NSMenuItem" id="390088328">

-									<reference key="NSMenu" ref="981161348"/>

-									<bool key="NSIsDisabled">YES</bool>

-									<bool key="NSIsSeparator">YES</bool>

-									<string key="NSTitle"/>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="1065386165">

-									<reference key="NSMenu" ref="981161348"/>

-									<string key="NSTitle">カスタマイズ...</string>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-							</array>

-						</object>

-					</object>

-					<object class="NSMenuItem" id="200491363">

-						<reference key="NSMenu" ref="524015605"/>

-						<string key="NSTitle">編集</string>

-						<string key="NSKeyEquiv"/>

-						<int key="NSKeyEquivModMask">1048576</int>

-						<int key="NSMnemonicLoc">2147483647</int>

-						<reference key="NSOnImage" ref="531645050"/>

-						<reference key="NSMixedImage" ref="351811234"/>

-						<string key="NSAction">submenuAction:</string>

-						<object class="NSMenu" key="NSSubmenu" id="526778998">

-							<string key="NSTitle">編集</string>

-							<array class="NSMutableArray" key="NSMenuItems">

-								<object class="NSMenuItem" id="185296989">

-									<reference key="NSMenu" ref="526778998"/>

-									<string key="NSTitle">コピー</string>

-									<string key="NSKeyEquiv">c</string>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-							</array>

-						</object>

-					</object>

-					<object class="NSMenuItem" id="931553638">

-						<reference key="NSMenu" ref="524015605"/>

-						<string key="NSTitle">ウインドウ</string>

-						<string key="NSKeyEquiv"/>

-						<int key="NSKeyEquivModMask">1048576</int>

-						<int key="NSMnemonicLoc">2147483647</int>

-						<reference key="NSOnImage" ref="531645050"/>

-						<reference key="NSMixedImage" ref="351811234"/>

-						<string key="NSAction">submenuAction:</string>

-						<object class="NSMenu" key="NSSubmenu" id="96874957">

-							<string key="NSTitle">ウインドウ</string>

-							<array class="NSMutableArray" key="NSMenuItems">

-								<object class="NSMenuItem" id="984461797">

-									<reference key="NSMenu" ref="96874957"/>

-									<string key="NSTitle">閉じる</string>

-									<string key="NSKeyEquiv">w</string>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="677652931">

-									<reference key="NSMenu" ref="96874957"/>

-									<string key="NSTitle">しまう</string>

-									<string key="NSKeyEquiv">m</string>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="1066447520">

-									<reference key="NSMenu" ref="96874957"/>

-									<string key="NSTitle">拡大／縮小</string>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="280172320">

-									<reference key="NSMenu" ref="96874957"/>

-									<bool key="NSIsDisabled">YES</bool>

-									<bool key="NSIsSeparator">YES</bool>

-									<string key="NSTitle"/>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="1036389925">

-									<reference key="NSMenu" ref="96874957"/>

-									<string key="NSTitle">ウインドウを巡回</string>

-									<string key="NSKeyEquiv"></string>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="369641893">

-									<reference key="NSMenu" ref="96874957"/>

-									<string key="NSTitle">ウインドウを逆方向に巡回</string>

-									<string key="NSKeyEquiv"></string>

-									<int key="NSKeyEquivModMask">1179648</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="155085383">

-									<reference key="NSMenu" ref="96874957"/>

-									<bool key="NSIsDisabled">YES</bool>

-									<bool key="NSIsSeparator">YES</bool>

-									<string key="NSTitle"/>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="276216762">

-									<reference key="NSMenu" ref="96874957"/>

-									<string key="NSTitle">すべてを手前に移動</string>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-							</array>

-							<string key="NSName">_NSWindowsMenu</string>

-						</object>

-					</object>

-					<object class="NSMenuItem" id="551174276">

-						<reference key="NSMenu" ref="524015605"/>

-						<string key="NSTitle">ヘルプ</string>

-						<string key="NSKeyEquiv"/>

-						<int key="NSKeyEquivModMask">1048576</int>

-						<int key="NSMnemonicLoc">2147483647</int>

-						<reference key="NSOnImage" ref="531645050"/>

-						<reference key="NSMixedImage" ref="351811234"/>

-						<string key="NSAction">submenuAction:</string>

-						<object class="NSMenu" key="NSSubmenu" id="511848303">

-							<string key="NSTitle">ヘルプ</string>

-							<array class="NSMutableArray" key="NSMenuItems">

-								<object class="NSMenuItem" id="504984881">

-									<reference key="NSMenu" ref="511848303"/>

-									<string key="NSTitle">X11 ヘルプ</string>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-							</array>

-						</object>

-					</object>

-				</array>

-				<string key="NSName">_NSMainMenu</string>

-			</object>

-			<object class="NSCustomObject" id="485884620">

-				<string key="NSClassName">X11Controller</string>

-			</object>

-			<object class="NSWindowTemplate" id="124913468">

-				<int key="NSWindowStyleMask">3</int>

-				<int key="NSWindowBacking">2</int>

-				<string key="NSWindowRect">{{319, 328.03906000000001}, {584, 341}}</string>

-				<int key="NSWTFlags">1350041600</int>

-				<string key="NSWindowTitle">X11 の環境設定</string>

-				<string key="NSWindowClass">NSPanel</string>

-				<object class="NSMutableString" key="NSViewClass">

-					<characters key="NS.bytes">View</characters>

-				</object>

-				<nil key="NSUserInterfaceItemIdentifier"/>

-				<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

-				<string key="NSWindowContentMinSize">{320, 240}</string>

-				<object class="NSView" key="NSWindowView" id="941366957">

-					<nil key="NSNextResponder"/>

-					<int key="NSvFlags">256</int>

-					<array class="NSMutableArray" key="NSSubviews">

-						<object class="NSTabView" id="448510093">

-							<reference key="NSNextResponder" ref="941366957"/>

-							<int key="NSvFlags">274</int>

-							<string key="NSFrame">{{13, 10}, {558, 325}}</string>

-							<reference key="NSSuperview" ref="941366957"/>

-							<array class="NSMutableArray" key="NSTabViewItems">

-								<object class="NSTabViewItem" id="287591690">

-									<object class="NSMutableString" key="NSIdentifier">

-										<characters key="NS.bytes">1</characters>

-									</object>

-									<object class="NSView" key="NSView" id="596750588">

-										<reference key="NSNextResponder" ref="448510093"/>

-										<int key="NSvFlags">256</int>

-										<array class="NSMutableArray" key="NSSubviews">

-											<object class="NSButton" id="119157981">

-												<reference key="NSNextResponder" ref="596750588"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{18, 243}, {505, 18}}</string>

-												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSNextKeyView" ref="179949713"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="990762273">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">3  ボタンマウスをエミュレート</string>

-													<object class="NSFont" key="NSSupport" id="463863101">

-														<string key="NSName">LucidaGrande</string>

-														<double key="NSSize">13</double>

-														<int key="NSfFlags">1044</int>

-													</object>

-													<reference key="NSControlView" ref="119157981"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<object class="NSCustomResource" key="NSNormalImage" id="815090595">

-														<string key="NSClassName">NSImage</string>

-														<string key="NSResourceName">NSSwitch</string>

-													</object>

-													<object class="NSButtonImageSource" key="NSAlternateImage" id="391434389">

-														<string key="NSImageName">NSSwitch</string>

-													</object>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSTextField" id="443008216">

-												<reference key="NSNextResponder" ref="596750588"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{36, 96}, {488, 28}}</string>

-												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSNextKeyView" ref="406291430"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="391919450">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">有効にすると、メニューバーの代替キーによって X11 アプリケーションのメタ修飾キーを使用できなくなる場合があります。</string>

-													<object class="NSFont" key="NSSupport" id="26">

-														<string key="NSName">LucidaGrande</string>

-														<double key="NSSize">11</double>

-														<int key="NSfFlags">3100</int>

-													</object>

-													<string key="NSPlaceholderString"/>

-													<reference key="NSControlView" ref="443008216"/>

-													<object class="NSColor" key="NSBackgroundColor" id="57160303">

-														<int key="NSColorSpace">6</int>

-														<string key="NSCatalogName">System</string>

-														<string key="NSColorName">controlColor</string>

-														<object class="NSColor" key="NSColor" id="590688762">

-															<int key="NSColorSpace">3</int>

-															<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>

-														</object>

-													</object>

-													<object class="NSColor" key="NSTextColor" id="930815747">

-														<int key="NSColorSpace">6</int>

-														<string key="NSCatalogName">System</string>

-														<string key="NSColorName">controlTextColor</string>

-														<object class="NSColor" key="NSColor" id="214098874">

-															<int key="NSColorSpace">3</int>

-															<bytes key="NSWhite">MAA</bytes>

-														</object>

-													</object>

-												</object>

-											</object>

-											<object class="NSTextField" id="282885445">

-												<reference key="NSNextResponder" ref="596750588"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{36, 209}, {488, 28}}</string>

-												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSNextKeyView" ref="31160162"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="649334366">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string type="base64-UTF8" key="NSContents">T3B0aW9uIOOCreODvOOCkuaKvOOBl+OBn+OBvuOBvuOCr+ODquODg+OCr+OBmeOCi+OBqOODnuOCpuOC

-ueOBruS4reODnOOCv+ODs+aTjeS9nOOBq+OBquOCiuOAgUNvbW1hbmQg44Kt44O844KS5oq844GX44Gf

-44G+44G+44Kv44Oq44OD44Kv44GZ44KL44Go44Oe44Km44K544Gu5Y+z44Oc44K/44Oz5pON5L2c44Gr

-44Gq44KK44G+44GZ44CCCg</string>

-													<reference key="NSSupport" ref="26"/>

-													<string key="NSPlaceholderString"/>

-													<reference key="NSControlView" ref="282885445"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSButton" id="842100515">

-												<reference key="NSNextResponder" ref="596750588"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{18, 130}, {505, 18}}</string>

-												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSNextKeyView" ref="443008216"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="940564599">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">X11 の代替キーを有効にする</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="842100515"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="815090595"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSTextField" id="31160162">

-												<reference key="NSNextResponder" ref="596750588"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{36, 156}, {488, 17}}</string>

-												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSNextKeyView" ref="842100515"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="666057093">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">入力メニューを変更して現在の X11 キーマップを上書きすることを許可します。</string>

-													<reference key="NSSupport" ref="26"/>

-													<string key="NSPlaceholderString"/>

-													<reference key="NSControlView" ref="31160162"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSButton" id="179949713">

-												<reference key="NSNextResponder" ref="596750588"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{18, 179}, {505, 18}}</string>

-												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSNextKeyView" ref="282885445"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="967619578">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">システムのキーボードレイアウトに従う</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="179949713"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="815090595"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSTextField" id="278155937">

-												<reference key="NSNextResponder" ref="596750588"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{36, 32}, {488, 31}}</string>

-												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSNextKeyView" ref="863505041"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="617441821">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">有効にすると、option キー で Mode_switch の代わりに X11 キーシンボルの Alt_L と Alt_R が送信されます。 </string>

-													<reference key="NSSupport" ref="26"/>

-													<reference key="NSControlView" ref="278155937"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSButton" id="406291430">

-												<reference key="NSNextResponder" ref="596750588"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{18, 69}, {505, 18}}</string>

-												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSNextKeyView" ref="278155937"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="67728988">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">Option キーで Alt_L と Alt_R を送信</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="406291430"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="815090595"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSButton" id="863505041">

-												<reference key="NSNextResponder" ref="596750588"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{18, 8}, {505, 18}}</string>

-												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSNextKeyView" ref="448510093"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="1016286396">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">常に指を動かした方向にスクロール</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="863505041"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="815090595"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-										</array>

-										<string key="NSFrame">{{10, 33}, {538, 279}}</string>

-										<reference key="NSSuperview" ref="448510093"/>

-										<reference key="NSNextKeyView" ref="119157981"/>

-									</object>

-									<string key="NSLabel">入力</string>

-									<reference key="NSColor" ref="57160303"/>

-									<reference key="NSTabView" ref="448510093"/>

-								</object>

-								<object class="NSTabViewItem" id="960678392">

-									<object class="NSMutableString" key="NSIdentifier">

-										<characters key="NS.bytes">2</characters>

-									</object>

-									<object class="NSView" key="NSView" id="515308735">

-										<nil key="NSNextResponder"/>

-										<int key="NSvFlags">256</int>

-										<array class="NSMutableArray" key="NSSubviews">

-											<object class="NSPopUpButton" id="709074847">

-												<reference key="NSNextResponder" ref="515308735"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{75, 234}, {163, 26}}</string>

-												<reference key="NSSuperview" ref="515308735"/>

-												<reference key="NSNextKeyView" ref="86150604"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSPopUpButtonCell" key="NSCell" id="633115429">

-													<int key="NSCellFlags">-2076049856</int>

-													<int key="NSCellFlags2">1024</int>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="709074847"/>

-													<int key="NSButtonFlags">109199615</int>

-													<int key="NSButtonFlags2">1</int>

-													<object class="NSFont" key="NSAlternateImage">

-														<string key="NSName">LucidaGrande</string>

-														<double key="NSSize">13</double>

-														<int key="NSfFlags">16</int>

-													</object>

-													<string key="NSAlternateContents"/>

-													<object class="NSMutableString" key="NSKeyEquivalent">

-														<characters key="NS.bytes"/>

-													</object>

-													<int key="NSPeriodicDelay">400</int>

-													<int key="NSPeriodicInterval">75</int>

-													<object class="NSMenuItem" key="NSMenuItem" id="616492372">

-														<reference key="NSMenu" ref="341113515"/>

-														<string key="NSTitle">ディスプレイから</string>

-														<string key="NSKeyEquiv"/>

-														<int key="NSKeyEquivModMask">1048576</int>

-														<int key="NSMnemonicLoc">2147483647</int>

-														<int key="NSState">1</int>

-														<reference key="NSOnImage" ref="531645050"/>

-														<reference key="NSMixedImage" ref="351811234"/>

-														<string key="NSAction">_popUpItemAction:</string>

-														<int key="NSTag">-1</int>

-														<reference key="NSTarget" ref="633115429"/>

-													</object>

-													<bool key="NSMenuItemRespectAlignment">YES</bool>

-													<object class="NSMenu" key="NSMenu" id="341113515">

-														<object class="NSMutableString" key="NSTitle">

-															<characters key="NS.bytes">OtherViews</characters>

-														</object>

-														<array class="NSMutableArray" key="NSMenuItems">

-															<reference ref="616492372"/>

-															<object class="NSMenuItem" id="759499526">

-																<reference key="NSMenu" ref="341113515"/>

-																<string key="NSTitle">256 色</string>

-																<string key="NSKeyEquiv"/>

-																<int key="NSKeyEquivModMask">1048576</int>

-																<int key="NSMnemonicLoc">2147483647</int>

-																<reference key="NSOnImage" ref="531645050"/>

-																<reference key="NSMixedImage" ref="351811234"/>

-																<string key="NSAction">_popUpItemAction:</string>

-																<int key="NSTag">8</int>

-																<reference key="NSTarget" ref="633115429"/>

-															</object>

-															<object class="NSMenuItem" id="543935434">

-																<reference key="NSMenu" ref="341113515"/>

-																<string key="NSTitle">約 32000 色</string>

-																<string key="NSKeyEquiv"/>

-																<int key="NSKeyEquivModMask">1048576</int>

-																<int key="NSMnemonicLoc">2147483647</int>

-																<reference key="NSOnImage" ref="531645050"/>

-																<reference key="NSMixedImage" ref="351811234"/>

-																<string key="NSAction">_popUpItemAction:</string>

-																<int key="NSTag">15</int>

-																<reference key="NSTarget" ref="633115429"/>

-															</object>

-															<object class="NSMenuItem" id="836673018">

-																<reference key="NSMenu" ref="341113515"/>

-																<string key="NSTitle">約 1670 万色</string>

-																<string key="NSKeyEquiv"/>

-																<int key="NSKeyEquivModMask">1048576</int>

-																<int key="NSMnemonicLoc">2147483647</int>

-																<reference key="NSOnImage" ref="531645050"/>

-																<reference key="NSMixedImage" ref="351811234"/>

-																<string key="NSAction">_popUpItemAction:</string>

-																<int key="NSTag">24</int>

-																<reference key="NSTarget" ref="633115429"/>

-															</object>

-														</array>

-													</object>

-													<int key="NSPreferredEdge">3</int>

-													<bool key="NSUsesItemFromMenu">YES</bool>

-													<bool key="NSAltersState">YES</bool>

-													<int key="NSArrowPosition">1</int>

-												</object>

-											</object>

-											<object class="NSTextField" id="201731424">

-												<reference key="NSNextResponder" ref="515308735"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{17, 238}, {56, 19}}</string>

-												<reference key="NSSuperview" ref="515308735"/>

-												<reference key="NSNextKeyView" ref="709074847"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="930265681">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">カラー：</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<string key="NSPlaceholderString"/>

-													<reference key="NSControlView" ref="201731424"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSTextField" id="86150604">

-												<reference key="NSNextResponder" ref="515308735"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{36, 216}, {488, 14}}</string>

-												<reference key="NSSuperview" ref="515308735"/>

-												<reference key="NSNextKeyView" ref="477203622"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="311969422">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">このオプションは、次回 X11 を起動したときに有効になります。</string>

-													<reference key="NSSupport" ref="26"/>

-													<string key="NSPlaceholderString"/>

-													<reference key="NSControlView" ref="86150604"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSButton" id="477203622">

-												<reference key="NSNextResponder" ref="515308735"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{18, 182}, {505, 23}}</string>

-												<reference key="NSSuperview" ref="515308735"/>

-												<reference key="NSNextKeyView" ref="298603383"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="631531164">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">フルスクリーンモード</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="477203622"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="815090595"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSButton" id="57246850">

-												<reference key="NSNextResponder" ref="515308735"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{37, 118}, {492, 23}}</string>

-												<reference key="NSSuperview" ref="515308735"/>

-												<reference key="NSNextKeyView" ref="331853183"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="917248662">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">フルスクリーンモード時のメニューバーへのアクセスを許可</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="57246850"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="815090595"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSTextField" id="298603383">

-												<reference key="NSNextResponder" ref="515308735"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{36, 147}, {494, 28}}</string>

-												<reference key="NSSuperview" ref="515308735"/>

-												<reference key="NSNextKeyView" ref="57246850"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="761107402">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">X11 のルートウインドウを有効にします。フルスクリーンモードに切り替えたり、フルスクリーンモードを終了するときは、コマンド + Option + A キーを押します。</string>

-													<reference key="NSSupport" ref="26"/>

-													<string key="NSPlaceholderString"/>

-													<reference key="NSControlView" ref="298603383"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSTextField" id="331853183">

-												<reference key="NSNextResponder" ref="515308735"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{54, 70}, {476, 42}}</string>

-												<reference key="NSSuperview" ref="515308735"/>

-												<reference key="NSNextKeyView" ref="448510093"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="1042813110">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">マウスカーソルが主ディスプレイの一番上に置かれたときにメニューバーが表示されます。</string>

-													<reference key="NSSupport" ref="26"/>

-													<reference key="NSControlView" ref="331853183"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-										</array>

-										<string key="NSFrame">{{10, 33}, {538, 279}}</string>

-										<reference key="NSNextKeyView" ref="201731424"/>

-									</object>

-									<string key="NSLabel">出力</string>

-									<reference key="NSColor" ref="57160303"/>

-									<reference key="NSTabView" ref="448510093"/>

-								</object>

-								<object class="NSTabViewItem" id="723450037">

-									<object class="NSMutableString" key="NSIdentifier">

-										<characters key="NS.bytes">2</characters>

-									</object>

-									<object class="NSView" key="NSView" id="408298283">

-										<nil key="NSNextResponder"/>

-										<int key="NSvFlags">256</int>

-										<array class="NSMutableArray" key="NSSubviews">

-											<object class="NSButton" id="878106058">

-												<reference key="NSNextResponder" ref="408298283"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{18, 255}, {505, 23}}</string>

-												<reference key="NSSuperview" ref="408298283"/>

-												<reference key="NSNextKeyView" ref="386152084"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="718083688">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">同期を有効にする</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="878106058"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="815090595"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSTextField" id="386152084">

-												<reference key="NSNextResponder" ref="408298283"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{36, 221}, {488, 28}}</string>

-												<reference key="NSSuperview" ref="408298283"/>

-												<reference key="NSNextKeyView" ref="487809555"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="572508492">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">“コピー”メニュー項目を有効にして、OSX のペーストボードと X11 の CLIPBOARD バッファおよび PRIMARY バッファを同期できるようにします。</string>

-													<reference key="NSSupport" ref="26"/>

-													<reference key="NSControlView" ref="386152084"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSButton" id="477050998">

-												<reference key="NSNextResponder" ref="408298283"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{34, 129}, {489, 18}}</string>

-												<reference key="NSSuperview" ref="408298283"/>

-												<reference key="NSNextKeyView" ref="765780304"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="501304422">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">ペーストボードが変更されたときに CLIPBOARD をアップデート</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="477050998"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="815090595"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSButton" id="765780304">

-												<reference key="NSNextResponder" ref="408298283"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{34, 104}, {489, 18}}</string>

-												<reference key="NSSuperview" ref="408298283"/>

-												<reference key="NSNextKeyView" ref="1002778833"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="510771323">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">ペーストボードが変更されたときに PRIMARY （中クリック）をアップデート</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="765780304"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="815090595"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSButton" id="1002778833">

-												<reference key="NSNextResponder" ref="408298283"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{34, 79}, {489, 18}}</string>

-												<reference key="NSSuperview" ref="408298283"/>

-												<reference key="NSNextKeyView" ref="522511724"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="897099877">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">新しいテキストが選択されたら、すぐにペーストボードをアップデート</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="1002778833"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="815090595"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSButton" id="487809555">

-												<reference key="NSNextResponder" ref="408298283"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{34, 192}, {489, 18}}</string>

-												<reference key="NSSuperview" ref="408298283"/>

-												<reference key="NSNextKeyView" ref="620944856"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="619977658">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">CLIPBOARD が変更されたときにペーストボードをアップデート</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="487809555"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="815090595"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSTextField" id="620944856">

-												<reference key="NSNextResponder" ref="408298283"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{48, 158}, {476, 28}}</string>

-												<reference key="NSSuperview" ref="408298283"/>

-												<reference key="NSNextKeyView" ref="477050998"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="461823902">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">xclipboard、klipper、その他の X11 クリップボードマネージャを使用したい場合は、このオプションを無効にしてください。</string>

-													<reference key="NSSupport" ref="26"/>

-													<reference key="NSControlView" ref="620944856"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSTextField" id="522511724">

-												<reference key="NSNextResponder" ref="408298283"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{48, 47}, {476, 28}}</string>

-												<reference key="NSSuperview" ref="408298283"/>

-												<reference key="NSNextKeyView" ref="448510093"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="994587858">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">X11 プロトコルの制限により、このオプションは、一部のアプリケーションで機能しない場合があります。</string>

-													<reference key="NSSupport" ref="26"/>

-													<reference key="NSControlView" ref="522511724"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-										</array>

-										<string key="NSFrame">{{10, 33}, {538, 279}}</string>

-										<reference key="NSNextKeyView" ref="878106058"/>

-									</object>

-									<string key="NSLabel">ペーストボード</string>

-									<reference key="NSColor" ref="57160303"/>

-									<reference key="NSTabView" ref="448510093"/>

-								</object>

-								<object class="NSTabViewItem" id="10973343">

-									<object class="NSMutableString" key="NSIdentifier">

-										<characters key="NS.bytes">2</characters>

-									</object>

-									<object class="NSView" key="NSView" id="184765684">

-										<nil key="NSNextResponder"/>

-										<int key="NSvFlags">256</int>

-										<array class="NSMutableArray" key="NSSubviews">

-											<object class="NSButton" id="657659108">

-												<reference key="NSNextResponder" ref="184765684"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{15, 245}, {508, 18}}</string>

-												<reference key="NSSuperview" ref="184765684"/>

-												<reference key="NSNextKeyView" ref="290578835"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="259618205">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">選択されていないウインドウを直接クリック</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="657659108"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="815090595"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSTextField" id="290578835">

-												<reference key="NSNextResponder" ref="184765684"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{23, 211}, {501, 28}}</string>

-												<reference key="NSSuperview" ref="184765684"/>

-												<reference key="NSNextKeyView" ref="992839333"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="399127858">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">有効にした場合、選択されていないウインドウをクリックしたときに、そのウインドウを一番手前に表示するだけでなく、ウインドウ内の項目を直接クリックします。</string>

-													<reference key="NSSupport" ref="26"/>

-													<string key="NSPlaceholderString"/>

-													<reference key="NSControlView" ref="290578835"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSButton" id="992839333">

-												<reference key="NSNextResponder" ref="184765684"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{15, 184}, {508, 18}}</string>

-												<reference key="NSSuperview" ref="184765684"/>

-												<reference key="NSNextKeyView" ref="138261120"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="959555182">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">フォーカスをマウスと一緒に移動</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="992839333"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="815090595"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSTextField" id="138261120">

-												<reference key="NSNextResponder" ref="184765684"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{23, 164}, {501, 14}}</string>

-												<reference key="NSSuperview" ref="184765684"/>

-												<reference key="NSNextKeyView" ref="128352289"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="183409141">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">X11 ウインドウのフォーカスがカーソルと一緒に移動します。逆効果になる場合もあります。</string>

-													<reference key="NSSupport" ref="26"/>

-													<string key="NSPlaceholderString"/>

-													<reference key="NSControlView" ref="138261120"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSButton" id="128352289">

-												<reference key="NSNextResponder" ref="184765684"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{15, 140}, {508, 18}}</string>

-												<reference key="NSSuperview" ref="184765684"/>

-												<reference key="NSNextKeyView" ref="57161931"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="556463187">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">新規ウインドウにフォーカス</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="128352289"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="815090595"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSTextField" id="57161931">

-												<reference key="NSNextResponder" ref="184765684"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{23, 106}, {501, 28}}</string>

-												<reference key="NSSuperview" ref="184765684"/>

-												<reference key="NSNextKeyView" ref="448510093"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="989804990">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">有効にした場合、新しい X11 ウインドウを作成すると、Finder.app や ターミナル.app などの代わりに、X11.app が前面に移動します。</string>

-													<reference key="NSSupport" ref="26"/>

-													<string key="NSPlaceholderString"/>

-													<reference key="NSControlView" ref="57161931"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-										</array>

-										<string key="NSFrame">{{10, 33}, {538, 279}}</string>

-										<reference key="NSNextKeyView" ref="657659108"/>

-									</object>

-									<string key="NSLabel">ウインドウ</string>

-									<reference key="NSColor" ref="57160303"/>

-									<reference key="NSTabView" ref="448510093"/>

-								</object>

-								<object class="NSTabViewItem" id="348328898">

-									<object class="NSView" key="NSView" id="300811574">

-										<nil key="NSNextResponder"/>

-										<int key="NSvFlags">256</int>

-										<array class="NSMutableArray" key="NSSubviews">

-											<object class="NSButton" id="989050925">

-												<reference key="NSNextResponder" ref="300811574"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{18, 243}, {482, 18}}</string>

-												<reference key="NSSuperview" ref="300811574"/>

-												<reference key="NSNextKeyView" ref="168436707"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="189594322">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">接続を認証</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="989050925"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="815090595"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSButton" id="700826966">

-												<reference key="NSNextResponder" ref="300811574"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{18, 180}, {402, 18}}</string>

-												<reference key="NSSuperview" ref="300811574"/>

-												<reference key="NSNextKeyView" ref="363817195"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSButtonCell" key="NSCell" id="489340979">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">0</int>

-													<string key="NSContents">ネットワーク・クライアントからの接続を許可</string>

-													<reference key="NSSupport" ref="463863101"/>

-													<reference key="NSControlView" ref="700826966"/>

-													<int key="NSButtonFlags">1211912703</int>

-													<int key="NSButtonFlags2">2</int>

-													<reference key="NSNormalImage" ref="815090595"/>

-													<reference key="NSAlternateImage" ref="391434389"/>

-													<string key="NSAlternateContents"/>

-													<string key="NSKeyEquivalent"/>

-													<int key="NSPeriodicDelay">200</int>

-													<int key="NSPeriodicInterval">25</int>

-												</object>

-											</object>

-											<object class="NSTextField" id="168436707">

-												<reference key="NSNextResponder" ref="300811574"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{36, 209}, {488, 28}}</string>

-												<reference key="NSSuperview" ref="300811574"/>

-												<reference key="NSNextKeyView" ref="700826966"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="53243865">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">X11 の起動時に、Xauthority アクセス制御キーを作成します。システムの IP アドレスが変更されると、これらのキーが無効になり、X11 アプリケーションが起動しなくなることがあります。</string>

-													<reference key="NSSupport" ref="26"/>

-													<string key="NSPlaceholderString"/>

-													<reference key="NSControlView" ref="168436707"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSTextField" id="363817195">

-												<reference key="NSNextResponder" ref="300811574"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{36, 132}, {488, 42}}</string>

-												<reference key="NSSuperview" ref="300811574"/>

-												<reference key="NSNextKeyView" ref="223835729"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="390084685">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">有効にする場合は、システムのセキュリティを維持するために、“接続を認証”も有効にしてください。無効にすると、リモートアプリケーションからの接続は拒否されます。</string>

-													<reference key="NSSupport" ref="26"/>

-													<string key="NSPlaceholderString"/>

-													<reference key="NSControlView" ref="363817195"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-											<object class="NSTextField" id="223835729">

-												<reference key="NSNextResponder" ref="300811574"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{17, 17}, {404, 14}}</string>

-												<reference key="NSSuperview" ref="300811574"/>

-												<bool key="NSEnabled">YES</bool>

-												<object class="NSTextFieldCell" key="NSCell" id="283628678">

-													<int key="NSCellFlags">67239424</int>

-													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">これらのオプションは、次回 X11 を起動したときに有効になります。</string>

-													<reference key="NSSupport" ref="26"/>

-													<string key="NSPlaceholderString"/>

-													<reference key="NSControlView" ref="223835729"/>

-													<reference key="NSBackgroundColor" ref="57160303"/>

-													<reference key="NSTextColor" ref="930815747"/>

-												</object>

-											</object>

-										</array>

-										<string key="NSFrame">{{10, 33}, {538, 279}}</string>

-										<reference key="NSNextKeyView" ref="989050925"/>

-									</object>

-									<string key="NSLabel">セキュリティ</string>

-									<reference key="NSColor" ref="57160303"/>

-									<reference key="NSTabView" ref="448510093"/>

-								</object>

-							</array>

-							<reference key="NSSelectedTabViewItem" ref="287591690"/>

-							<reference key="NSFont" ref="463863101"/>

-							<int key="NSTvFlags">0</int>

-							<bool key="NSAllowTruncatedLabels">YES</bool>

-							<bool key="NSDrawsBackground">YES</bool>

-							<array class="NSMutableArray" key="NSSubviews">

-								<reference ref="596750588"/>

-							</array>

-						</object>

-					</array>

-					<string key="NSFrameSize">{584, 341}</string>

-					<reference key="NSNextKeyView" ref="448510093"/>

-				</object>

-				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>

-				<string key="NSMinSize">{320, 262}</string>

-				<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

-				<string key="NSFrameAutosaveName">x11_prefs</string>

-			</object>

-			<object class="NSWindowTemplate" id="604417141">

-				<int key="NSWindowStyleMask">11</int>

-				<int key="NSWindowBacking">2</int>

-				<string key="NSWindowRect">{{360, 402}, {454, 271}}</string>

-				<int key="NSWTFlags">1350041600</int>

-				<string key="NSWindowTitle">X11 アプリケーションメニュー</string>

-				<string key="NSWindowClass">NSPanel</string>

-				<object class="NSMutableString" key="NSViewClass">

-					<characters key="NS.bytes">View</characters>

-				</object>

-				<nil key="NSUserInterfaceItemIdentifier"/>

-				<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

-				<string key="NSWindowContentMinSize">{454, 271}</string>

-				<object class="NSView" key="NSWindowView" id="85544634">

-					<nil key="NSNextResponder"/>

-					<int key="NSvFlags">256</int>

-					<array class="NSMutableArray" key="NSSubviews">

-						<object class="NSButton" id="671954382">

-							<reference key="NSNextResponder" ref="85544634"/>

-							<int key="NSvFlags">265</int>

-							<string key="NSFrame">{{340, 191}, {105, 32}}</string>

-							<reference key="NSSuperview" ref="85544634"/>

-							<bool key="NSEnabled">YES</bool>

-							<object class="NSButtonCell" key="NSCell" id="143554520">

-								<int key="NSCellFlags">67239424</int>

-								<int key="NSCellFlags2">137887744</int>

-								<string key="NSContents">複製</string>

-								<reference key="NSSupport" ref="463863101"/>

-								<reference key="NSControlView" ref="671954382"/>

-								<int key="NSButtonFlags">-2038284033</int>

-								<int key="NSButtonFlags2">1</int>

-								<object class="NSFont" key="NSAlternateImage" id="549406736">

-									<string key="NSName">Helvetica</string>

-									<double key="NSSize">13</double>

-									<int key="NSfFlags">16</int>

-								</object>

-								<string key="NSAlternateContents"/>

-								<object class="NSMutableString" key="NSKeyEquivalent">

-									<characters key="NS.bytes"/>

-								</object>

-								<int key="NSPeriodicDelay">200</int>

-								<int key="NSPeriodicInterval">25</int>

-							</object>

-						</object>

-						<object class="NSButton" id="492358940">

-							<reference key="NSNextResponder" ref="85544634"/>

-							<int key="NSvFlags">265</int>

-							<string key="NSFrame">{{340, 159}, {105, 32}}</string>

-							<reference key="NSSuperview" ref="85544634"/>

-							<bool key="NSEnabled">YES</bool>

-							<object class="NSButtonCell" key="NSCell" id="8201128">

-								<int key="NSCellFlags">67239424</int>

-								<int key="NSCellFlags2">137887744</int>

-								<string key="NSContents">削除</string>

-								<reference key="NSSupport" ref="463863101"/>

-								<reference key="NSControlView" ref="492358940"/>

-								<int key="NSButtonFlags">-2038284033</int>

-								<int key="NSButtonFlags2">1</int>

-								<reference key="NSAlternateImage" ref="549406736"/>

-								<string key="NSAlternateContents"/>

-								<object class="NSMutableString" key="NSKeyEquivalent">

-									<characters key="NS.bytes"/>

-								</object>

-								<int key="NSPeriodicDelay">200</int>

-								<int key="NSPeriodicInterval">25</int>

-							</object>

-						</object>

-						<object class="NSScrollView" id="1063387772">

-							<reference key="NSNextResponder" ref="85544634"/>

-							<int key="NSvFlags">274</int>

-							<array class="NSMutableArray" key="NSSubviews">

-								<object class="NSClipView" id="580565898">

-									<reference key="NSNextResponder" ref="1063387772"/>

-									<int key="NSvFlags">2304</int>

-									<array class="NSMutableArray" key="NSSubviews">

-										<object class="NSTableView" id="905092943">

-											<reference key="NSNextResponder" ref="580565898"/>

-											<int key="NSvFlags">256</int>

-											<string key="NSFrameSize">{301, 198}</string>

-											<reference key="NSSuperview" ref="580565898"/>

-											<bool key="NSEnabled">YES</bool>

-											<object class="NSTableHeaderView" key="NSHeaderView" id="792419186">

-												<reference key="NSNextResponder" ref="672307654"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrameSize">{301, 17}</string>

-												<reference key="NSSuperview" ref="672307654"/>

-												<reference key="NSTableView" ref="905092943"/>

-											</object>

-											<object class="_NSCornerView" key="NSCornerView" id="898633680">

-												<reference key="NSNextResponder" ref="1063387772"/>

-												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{302, 0}, {16, 17}}</string>

-												<reference key="NSSuperview" ref="1063387772"/>

-											</object>

-											<array class="NSMutableArray" key="NSTableColumns">

-												<object class="NSTableColumn" id="938444323">

-													<double key="NSWidth">103</double>

-													<double key="NSMinWidth">43</double>

-													<double key="NSMaxWidth">1000</double>

-													<object class="NSTableHeaderCell" key="NSHeaderCell">

-														<int key="NSCellFlags">75628096</int>

-														<int key="NSCellFlags2">2048</int>

-														<string key="NSContents">名前</string>

-														<reference key="NSSupport" ref="26"/>

-														<object class="NSColor" key="NSBackgroundColor" id="113872566">

-															<int key="NSColorSpace">3</int>

-															<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>

-														</object>

-														<object class="NSColor" key="NSTextColor" id="249576247">

-															<int key="NSColorSpace">6</int>

-															<string key="NSCatalogName">System</string>

-															<string key="NSColorName">headerTextColor</string>

-															<reference key="NSColor" ref="214098874"/>

-														</object>

-													</object>

-													<object class="NSTextFieldCell" key="NSDataCell" id="825378892">

-														<int key="NSCellFlags">338820672</int>

-														<int key="NSCellFlags2">1024</int>

-														<string key="NSContents">テキストセル</string>

-														<reference key="NSSupport" ref="463863101"/>

-														<string key="NSPlaceholderString"/>

-														<reference key="NSControlView" ref="905092943"/>

-														<object class="NSColor" key="NSBackgroundColor" id="822946413">

-															<int key="NSColorSpace">3</int>

-															<bytes key="NSWhite">MQA</bytes>

-														</object>

-														<reference key="NSTextColor" ref="930815747"/>

-													</object>

-													<int key="NSResizingMask">3</int>

-													<bool key="NSIsResizeable">YES</bool>

-													<bool key="NSIsEditable">YES</bool>

-													<reference key="NSTableView" ref="905092943"/>

-													<string key="NSHeaderToolTip"/>

-												</object>

-												<object class="NSTableColumn" id="84282687">

-													<double key="NSWidth">100</double>

-													<double key="NSMinWidth">40</double>

-													<double key="NSMaxWidth">1000</double>

-													<object class="NSTableHeaderCell" key="NSHeaderCell">

-														<int key="NSCellFlags">75628096</int>

-														<int key="NSCellFlags2">2048</int>

-														<string key="NSContents">コマンド</string>

-														<reference key="NSSupport" ref="26"/>

-														<reference key="NSBackgroundColor" ref="113872566"/>

-														<reference key="NSTextColor" ref="249576247"/>

-													</object>

-													<object class="NSTextFieldCell" key="NSDataCell" id="432610585">

-														<int key="NSCellFlags">338820672</int>

-														<int key="NSCellFlags2">1024</int>

-														<string key="NSContents">テキストセル</string>

-														<reference key="NSSupport" ref="463863101"/>

-														<string key="NSPlaceholderString"/>

-														<reference key="NSControlView" ref="905092943"/>

-														<reference key="NSBackgroundColor" ref="822946413"/>

-														<reference key="NSTextColor" ref="930815747"/>

-													</object>

-													<int key="NSResizingMask">3</int>

-													<bool key="NSIsResizeable">YES</bool>

-													<bool key="NSIsEditable">YES</bool>

-													<reference key="NSTableView" ref="905092943"/>

-													<string key="NSHeaderToolTip"/>

-												</object>

-												<object class="NSTableColumn" id="242608782">

-													<double key="NSWidth">89</double>

-													<double key="NSMinWidth">30</double>

-													<double key="NSMaxWidth">1000</double>

-													<object class="NSTableHeaderCell" key="NSHeaderCell">

-														<int key="NSCellFlags">75628096</int>

-														<int key="NSCellFlags2">2048</int>

-														<string key="NSContents">ショートカット</string>

-														<reference key="NSSupport" ref="26"/>

-														<object class="NSColor" key="NSBackgroundColor">

-															<int key="NSColorSpace">6</int>

-															<string key="NSCatalogName">System</string>

-															<string key="NSColorName">headerColor</string>

-															<reference key="NSColor" ref="822946413"/>

-														</object>

-														<reference key="NSTextColor" ref="249576247"/>

-													</object>

-													<object class="NSTextFieldCell" key="NSDataCell" id="34714764">

-														<int key="NSCellFlags">338820672</int>

-														<int key="NSCellFlags2">1024</int>

-														<string key="NSContents">テキストセル</string>

-														<object class="NSFont" key="NSSupport">

-															<string key="NSName">LucidaGrande</string>

-															<double key="NSSize">12</double>

-															<int key="NSfFlags">16</int>

-														</object>

-														<string key="NSPlaceholderString"/>

-														<reference key="NSControlView" ref="905092943"/>

-														<bool key="NSDrawsBackground">YES</bool>

-														<object class="NSColor" key="NSBackgroundColor" id="812484075">

-															<int key="NSColorSpace">6</int>

-															<string key="NSCatalogName">System</string>

-															<string key="NSColorName">controlBackgroundColor</string>

-															<reference key="NSColor" ref="590688762"/>

-														</object>

-														<reference key="NSTextColor" ref="930815747"/>

-													</object>

-													<int key="NSResizingMask">3</int>

-													<bool key="NSIsResizeable">YES</bool>

-													<bool key="NSIsEditable">YES</bool>

-													<reference key="NSTableView" ref="905092943"/>

-													<string key="NSHeaderToolTip"/>

-												</object>

-											</array>

-											<double key="NSIntercellSpacingWidth">3</double>

-											<double key="NSIntercellSpacingHeight">2</double>

-											<reference key="NSBackgroundColor" ref="822946413"/>

-											<object class="NSColor" key="NSGridColor">

-												<int key="NSColorSpace">6</int>

-												<string key="NSCatalogName">System</string>

-												<string key="NSColorName">gridColor</string>

-												<object class="NSColor" key="NSColor">

-													<int key="NSColorSpace">3</int>

-													<bytes key="NSWhite">MC41AA</bytes>

-												</object>

-											</object>

-											<double key="NSRowHeight">17</double>

-											<int key="NSTvFlags">1379958784</int>

-											<reference key="NSDelegate"/>

-											<reference key="NSDataSource"/>

-											<int key="NSColumnAutoresizingStyle">1</int>

-											<int key="NSDraggingSourceMaskForLocal">-1</int>

-											<int key="NSDraggingSourceMaskForNonLocal">0</int>

-											<bool key="NSAllowsTypeSelect">YES</bool>

-											<int key="NSTableViewDraggingDestinationStyle">0</int>

-											<int key="NSTableViewGroupRowStyle">1</int>

-										</object>

-									</array>

-									<string key="NSFrame">{{1, 17}, {301, 198}}</string>

-									<reference key="NSSuperview" ref="1063387772"/>

-									<reference key="NSNextKeyView" ref="905092943"/>

-									<reference key="NSDocView" ref="905092943"/>

-									<reference key="NSBGColor" ref="812484075"/>

-									<int key="NScvFlags">4</int>

-								</object>

-								<object class="NSScroller" id="842897584">

-									<reference key="NSNextResponder" ref="1063387772"/>

-									<int key="NSvFlags">256</int>

-									<string key="NSFrame">{{302, 17}, {15, 198}}</string>

-									<reference key="NSSuperview" ref="1063387772"/>

-									<reference key="NSTarget" ref="1063387772"/>

-									<string key="NSAction">_doScroller:</string>

-									<double key="NSPercent">0.99492377042770386</double>

-								</object>

-								<object class="NSScroller" id="17278747">

-									<reference key="NSNextResponder" ref="1063387772"/>

-									<int key="NSvFlags">256</int>

-									<string key="NSFrame">{{1, 215}, {301, 15}}</string>

-									<reference key="NSSuperview" ref="1063387772"/>

-									<int key="NSsFlags">1</int>

-									<reference key="NSTarget" ref="1063387772"/>

-									<string key="NSAction">_doScroller:</string>

-									<double key="NSPercent">0.68852460384368896</double>

-								</object>

-								<object class="NSClipView" id="672307654">

-									<reference key="NSNextResponder" ref="1063387772"/>

-									<int key="NSvFlags">2304</int>

-									<array class="NSMutableArray" key="NSSubviews">

-										<reference ref="792419186"/>

-									</array>

-									<string key="NSFrame">{{1, 0}, {301, 17}}</string>

-									<reference key="NSSuperview" ref="1063387772"/>

-									<reference key="NSNextKeyView" ref="792419186"/>

-									<reference key="NSDocView" ref="792419186"/>

-									<reference key="NSBGColor" ref="812484075"/>

-									<int key="NScvFlags">4</int>

-								</object>

-								<reference ref="898633680"/>

-							</array>

-							<string key="NSFrame">{{20, 20}, {318, 231}}</string>

-							<reference key="NSSuperview" ref="85544634"/>

-							<reference key="NSNextKeyView" ref="580565898"/>

-							<int key="NSsFlags">133170</int>

-							<reference key="NSVScroller" ref="842897584"/>

-							<reference key="NSHScroller" ref="17278747"/>

-							<reference key="NSContentView" ref="580565898"/>

-							<reference key="NSHeaderClipView" ref="672307654"/>

-							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>

-						</object>

-						<object class="NSButton" id="758204686">

-							<reference key="NSNextResponder" ref="85544634"/>

-							<int key="NSvFlags">265</int>

-							<string key="NSFrame">{{340, 223}, {105, 32}}</string>

-							<reference key="NSSuperview" ref="85544634"/>

-							<bool key="NSEnabled">YES</bool>

-							<object class="NSButtonCell" key="NSCell" id="1025474039">

-								<int key="NSCellFlags">-2080244224</int>

-								<int key="NSCellFlags2">137887744</int>

-								<string key="NSContents">項目を追加</string>

-								<reference key="NSSupport" ref="463863101"/>

-								<reference key="NSControlView" ref="758204686"/>

-								<int key="NSButtonFlags">-2038284033</int>

-								<int key="NSButtonFlags2">1</int>

-								<reference key="NSAlternateImage" ref="549406736"/>

-								<string key="NSAlternateContents"/>

-								<object class="NSMutableString" key="NSKeyEquivalent">

-									<characters key="NS.bytes"/>

-								</object>

-								<int key="NSPeriodicDelay">200</int>

-								<int key="NSPeriodicInterval">25</int>

-							</object>

-						</object>

-					</array>

-					<string key="NSFrameSize">{454, 271}</string>

-				</object>

-				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>

-				<string key="NSMinSize">{454, 293}</string>

-				<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

-				<string key="NSFrameAutosaveName">x11_apps</string>

-			</object>

-			<object class="NSMenu" id="294137138">

-				<string key="NSTitle">メニュー</string>

-				<array class="NSMutableArray" key="NSMenuItems">

-					<object class="NSMenuItem" id="318286212">

-						<reference key="NSMenu" ref="294137138"/>

-						<bool key="NSIsDisabled">YES</bool>

-						<bool key="NSIsSeparator">YES</bool>

-						<string key="NSTitle"/>

-						<string key="NSKeyEquiv"/>

-						<int key="NSKeyEquivModMask">1048576</int>

-						<int key="NSMnemonicLoc">2147483647</int>

-						<reference key="NSOnImage" ref="531645050"/>

-						<reference key="NSMixedImage" ref="351811234"/>

-					</object>

-					<object class="NSMenuItem" id="511651072">

-						<reference key="NSMenu" ref="294137138"/>

-						<string key="NSTitle">アプリケーション</string>

-						<string key="NSKeyEquiv"/>

-						<int key="NSKeyEquivModMask">1048576</int>

-						<int key="NSMnemonicLoc">2147483647</int>

-						<reference key="NSOnImage" ref="531645050"/>

-						<reference key="NSMixedImage" ref="351811234"/>

-						<string key="NSAction">submenuAction:</string>

-						<object class="NSMenu" key="NSSubmenu" id="48278059">

-							<string key="NSTitle">アプリケーション</string>

-							<array class="NSMutableArray" key="NSMenuItems">

-								<object class="NSMenuItem" id="563798000">

-									<reference key="NSMenu" ref="48278059"/>

-									<bool key="NSIsDisabled">YES</bool>

-									<bool key="NSIsSeparator">YES</bool>

-									<string key="NSTitle"/>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-								<object class="NSMenuItem" id="1032342329">

-									<reference key="NSMenu" ref="48278059"/>

-									<string key="NSTitle">カスタマイズ...</string>

-									<string key="NSKeyEquiv"/>

-									<int key="NSKeyEquivModMask">1048576</int>

-									<int key="NSMnemonicLoc">2147483647</int>

-									<reference key="NSOnImage" ref="531645050"/>

-									<reference key="NSMixedImage" ref="351811234"/>

-								</object>

-							</array>

-						</object>

-					</object>

-				</array>

-				<string key="NSName"/>

-			</object>

-		</array>

-		<object class="IBObjectContainer" key="IBDocument.Objects">

-			<array class="NSMutableArray" key="connectionRecords">

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">copy:</string>

-						<reference key="source" ref="941939442"/>

-						<reference key="destination" ref="185296989"/>

-					</object>

-					<int key="connectionID">181</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">minimize_window:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="677652931"/>

-					</object>

-					<int key="connectionID">202</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">close_window:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="984461797"/>

-					</object>

-					<int key="connectionID">205</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">zoom_window:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="1066447520"/>

-					</object>

-					<int key="connectionID">206</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">bring_to_front:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="276216762"/>

-					</object>

-					<int key="connectionID">207</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">hideOtherApplications:</string>

-						<reference key="source" ref="815810918"/>

-						<reference key="destination" ref="206802571"/>

-					</object>

-					<int key="connectionID">263</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">apps_separator</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="390088328"/>

-					</object>

-					<int key="connectionID">273</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">apps_table</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="905092943"/>

-					</object>

-					<int key="connectionID">301</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">apps_table_delete:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="492358940"/>

-					</object>

-					<int key="connectionID">303</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">apps_table_duplicate:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="671954382"/>

-					</object>

-					<int key="connectionID">304</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">apps_table_show:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="1065386165"/>

-					</object>

-					<int key="connectionID">308</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">apps_table_new:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="758204686"/>

-					</object>

-					<int key="connectionID">311</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_show:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="386173216"/>

-					</object>

-					<int key="connectionID">318</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">x11_about_item</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="139290918"/>

-					</object>

-					<int key="connectionID">321</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">enable_auth</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="989050925"/>

-					</object>

-					<int key="connectionID">387</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">enable_tcp</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="700826966"/>

-					</object>

-					<int key="connectionID">388</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">depth</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="709074847"/>

-					</object>

-					<int key="connectionID">389</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">fake_buttons</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="119157981"/>

-					</object>

-					<int key="connectionID">391</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">sync_keymap</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="179949713"/>

-					</object>

-					<int key="connectionID">392</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">enable_keyequivs</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="842100515"/>

-					</object>

-					<int key="connectionID">393</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="119157981"/>

-					</object>

-					<int key="connectionID">394</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="179949713"/>

-					</object>

-					<int key="connectionID">395</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="842100515"/>

-					</object>

-					<int key="connectionID">396</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="709074847"/>

-					</object>

-					<int key="connectionID">398</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="989050925"/>

-					</object>

-					<int key="connectionID">399</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="700826966"/>

-					</object>

-					<int key="connectionID">401</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">prefs_panel</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="124913468"/>

-					</object>

-					<int key="connectionID">402</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">x11_help:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="504984881"/>

-					</object>

-					<int key="connectionID">422</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">dockMenu</string>

-						<reference key="source" ref="815810918"/>

-						<reference key="destination" ref="294137138"/>

-					</object>

-					<int key="connectionID">426</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">dock_menu</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="294137138"/>

-					</object>

-					<int key="connectionID">428</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">delegate</string>

-						<reference key="source" ref="815810918"/>

-						<reference key="destination" ref="485884620"/>

-					</object>

-					<int key="connectionID">429</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">hide:</string>

-						<reference key="source" ref="815810918"/>

-						<reference key="destination" ref="301008465"/>

-					</object>

-					<int key="connectionID">430</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">unhideAllApplications:</string>

-						<reference key="source" ref="815810918"/>

-						<reference key="destination" ref="1023546148"/>

-					</object>

-					<int key="connectionID">431</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">orderFrontStandardAboutPanel:</string>

-						<reference key="source" ref="815810918"/>

-						<reference key="destination" ref="139290918"/>

-					</object>

-					<int key="connectionID">433</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">dock_apps_menu</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="48278059"/>

-					</object>

-					<int key="connectionID">530</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">dock_window_separator</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="318286212"/>

-					</object>

-					<int key="connectionID">531</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">apps_table_show:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="1032342329"/>

-					</object>

-					<int key="connectionID">534</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">next_window:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="1036389925"/>

-					</object>

-					<int key="connectionID">539</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">previous_window:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="369641893"/>

-					</object>

-					<int key="connectionID">540</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">enable_fullscreen</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="477203622"/>

-					</object>

-					<int key="connectionID">546</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">enable_fullscreen_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="477203622"/>

-					</object>

-					<int key="connectionID">547</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">toggle_fullscreen:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="6876565"/>

-					</object>

-					<int key="connectionID">548</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">toggle_fullscreen_item</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="6876565"/>

-					</object>

-					<int key="connectionID">549</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">menu</string>

-						<reference key="source" ref="815810918"/>

-						<reference key="destination" ref="524015605"/>

-					</object>

-					<int key="connectionID">300334</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">terminate:</string>

-						<reference key="source" ref="815810918"/>

-						<reference key="destination" ref="274138642"/>

-					</object>

-					<int key="connectionID">300336</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="657659108"/>

-					</object>

-					<int key="connectionID">300389</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="992839333"/>

-					</object>

-					<int key="connectionID">300390</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="128352289"/>

-					</object>

-					<int key="connectionID">300391</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">click_through</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="657659108"/>

-					</object>

-					<int key="connectionID">300392</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">focus_follows_mouse</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="992839333"/>

-					</object>

-					<int key="connectionID">300393</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">focus_on_new_window</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="128352289"/>

-					</object>

-					<int key="connectionID">300394</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">copy_menu_item</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="185296989"/>

-					</object>

-					<int key="connectionID">300443</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">sync_pasteboard</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="878106058"/>

-					</object>

-					<int key="connectionID">300444</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">sync_clipboard_to_pasteboard</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="487809555"/>

-					</object>

-					<int key="connectionID">300461</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">sync_pasteboard_to_clipboard</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="477050998"/>

-					</object>

-					<int key="connectionID">300462</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">sync_pasteboard_to_primary</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="765780304"/>

-					</object>

-					<int key="connectionID">300463</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">sync_primary_immediately</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="1002778833"/>

-					</object>

-					<int key="connectionID">300464</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="878106058"/>

-					</object>

-					<int key="connectionID">300465</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="487809555"/>

-					</object>

-					<int key="connectionID">300466</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="477050998"/>

-					</object>

-					<int key="connectionID">300467</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="765780304"/>

-					</object>

-					<int key="connectionID">300468</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="1002778833"/>

-					</object>

-					<int key="connectionID">300469</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">sync_text1</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="620944856"/>

-					</object>

-					<int key="connectionID">300470</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">sync_text2</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="522511724"/>

-					</object>

-					<int key="connectionID">300471</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">enable_fullscreen_menu</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="57246850"/>

-					</object>

-					<int key="connectionID">300474</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="57246850"/>

-					</object>

-					<int key="connectionID">300475</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="406291430"/>

-					</object>

-					<int key="connectionID">300480</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">option_sends_alt</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="406291430"/>

-					</object>

-					<int key="connectionID">300481</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBActionConnection" key="connection">

-						<string key="label">prefs_changed:</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="863505041"/>

-					</object>

-					<int key="connectionID">300484</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">enable_fullscreen_menu_text</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="331853183"/>

-					</object>

-					<int key="connectionID">300489</int>

-				</object>

-				<object class="IBConnectionRecord">

-					<object class="IBOutletConnection" key="connection">

-						<string key="label">scroll_in_device_direction</string>

-						<reference key="source" ref="485884620"/>

-						<reference key="destination" ref="863505041"/>

-					</object>

-					<int key="connectionID">300490</int>

-				</object>

-			</array>

-			<object class="IBMutableOrderedSet" key="objectRecords">

-				<array key="orderedObjects">

-					<object class="IBObjectRecord">

-						<int key="objectID">0</int>

-						<array key="object" id="0"/>

-						<reference key="children" ref="904585544"/>

-						<nil key="parent"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">-2</int>

-						<reference key="object" ref="815810918"/>

-						<reference key="parent" ref="0"/>

-						<string key="objectName">File's Owner</string>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">-1</int>

-						<reference key="object" ref="941939442"/>

-						<reference key="parent" ref="0"/>

-						<string key="objectName">First Responder</string>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">-3</int>

-						<reference key="object" ref="951368722"/>

-						<reference key="parent" ref="0"/>

-						<string key="objectName">Application</string>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">29</int>

-						<reference key="object" ref="524015605"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="931553638"/>

-							<reference ref="365880285"/>

-							<reference ref="200491363"/>

-							<reference ref="868031522"/>

-							<reference ref="551174276"/>

-						</array>

-						<reference key="parent" ref="0"/>

-						<string key="objectName">MainMenu</string>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">19</int>

-						<reference key="object" ref="931553638"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="96874957"/>

-						</array>

-						<reference key="parent" ref="524015605"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">24</int>

-						<reference key="object" ref="96874957"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="677652931"/>

-							<reference ref="276216762"/>

-							<reference ref="1066447520"/>

-							<reference ref="1036389925"/>

-							<reference ref="369641893"/>

-							<reference ref="155085383"/>

-							<reference ref="984461797"/>

-							<reference ref="280172320"/>

-						</array>

-						<reference key="parent" ref="931553638"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">5</int>

-						<reference key="object" ref="276216762"/>

-						<reference key="parent" ref="96874957"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">23</int>

-						<reference key="object" ref="677652931"/>

-						<reference key="parent" ref="96874957"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">92</int>

-						<reference key="object" ref="280172320"/>

-						<reference key="parent" ref="96874957"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">203</int>

-						<reference key="object" ref="984461797"/>

-						<reference key="parent" ref="96874957"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">204</int>

-						<reference key="object" ref="1066447520"/>

-						<reference key="parent" ref="96874957"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">536</int>

-						<reference key="object" ref="155085383"/>

-						<reference key="parent" ref="96874957"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">537</int>

-						<reference key="object" ref="1036389925"/>

-						<reference key="parent" ref="96874957"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">538</int>

-						<reference key="object" ref="369641893"/>

-						<reference key="parent" ref="96874957"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">56</int>

-						<reference key="object" ref="365880285"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="576521955"/>

-						</array>

-						<reference key="parent" ref="524015605"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">57</int>

-						<reference key="object" ref="576521955"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="139290918"/>

-							<reference ref="386173216"/>

-							<reference ref="32285361"/>

-							<reference ref="301008465"/>

-							<reference ref="274138642"/>

-							<reference ref="272876017"/>

-							<reference ref="431301145"/>

-							<reference ref="206802571"/>

-							<reference ref="848095279"/>

-							<reference ref="1023546148"/>

-							<reference ref="6876565"/>

-							<reference ref="479677589"/>

-						</array>

-						<reference key="parent" ref="365880285"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">58</int>

-						<reference key="object" ref="139290918"/>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">129</int>

-						<reference key="object" ref="386173216"/>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">131</int>

-						<reference key="object" ref="32285361"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="821388474"/>

-						</array>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">130</int>

-						<reference key="object" ref="821388474"/>

-						<reference key="parent" ref="32285361"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">134</int>

-						<reference key="object" ref="301008465"/>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">136</int>

-						<reference key="object" ref="274138642"/>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">143</int>

-						<reference key="object" ref="272876017"/>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">144</int>

-						<reference key="object" ref="431301145"/>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">145</int>

-						<reference key="object" ref="206802571"/>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">149</int>

-						<reference key="object" ref="848095279"/>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">150</int>

-						<reference key="object" ref="1023546148"/>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">544</int>

-						<reference key="object" ref="6876565"/>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">545</int>

-						<reference key="object" ref="479677589"/>

-						<reference key="parent" ref="576521955"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">163</int>

-						<reference key="object" ref="200491363"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="526778998"/>

-						</array>

-						<reference key="parent" ref="524015605"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">169</int>

-						<reference key="object" ref="526778998"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="185296989"/>

-						</array>

-						<reference key="parent" ref="200491363"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">157</int>

-						<reference key="object" ref="185296989"/>

-						<reference key="parent" ref="526778998"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">269</int>

-						<reference key="object" ref="868031522"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="981161348"/>

-						</array>

-						<reference key="parent" ref="524015605"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">270</int>

-						<reference key="object" ref="981161348"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="390088328"/>

-							<reference ref="1065386165"/>

-						</array>

-						<reference key="parent" ref="868031522"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">272</int>

-						<reference key="object" ref="390088328"/>

-						<reference key="parent" ref="981161348"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">305</int>

-						<reference key="object" ref="1065386165"/>

-						<reference key="parent" ref="981161348"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">419</int>

-						<reference key="object" ref="551174276"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="511848303"/>

-						</array>

-						<reference key="parent" ref="524015605"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">420</int>

-						<reference key="object" ref="511848303"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="504984881"/>

-						</array>

-						<reference key="parent" ref="551174276"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">421</int>

-						<reference key="object" ref="504984881"/>

-						<reference key="parent" ref="511848303"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">196</int>

-						<reference key="object" ref="485884620"/>

-						<reference key="parent" ref="0"/>

-						<string key="objectName">X11Controller</string>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">244</int>

-						<reference key="object" ref="124913468"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="941366957"/>

-						</array>

-						<reference key="parent" ref="0"/>

-						<string key="objectName">PrefsPanel</string>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">245</int>

-						<reference key="object" ref="941366957"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="448510093"/>

-						</array>

-						<reference key="parent" ref="124913468"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">348</int>

-						<reference key="object" ref="448510093"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="287591690"/>

-							<reference ref="960678392"/>

-							<reference ref="348328898"/>

-							<reference ref="10973343"/>

-							<reference ref="723450037"/>

-						</array>

-						<reference key="parent" ref="941366957"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">349</int>

-						<reference key="object" ref="287591690"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="596750588"/>

-						</array>

-						<reference key="parent" ref="448510093"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">351</int>

-						<reference key="object" ref="596750588"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="119157981"/>

-							<reference ref="443008216"/>

-							<reference ref="282885445"/>

-							<reference ref="842100515"/>

-							<reference ref="31160162"/>

-							<reference ref="179949713"/>

-							<reference ref="278155937"/>

-							<reference ref="406291430"/>

-							<reference ref="863505041"/>

-						</array>

-						<reference key="parent" ref="287591690"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">363</int>

-						<reference key="object" ref="119157981"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="990762273"/>

-						</array>

-						<reference key="parent" ref="596750588"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">364</int>

-						<reference key="object" ref="443008216"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="391919450"/>

-						</array>

-						<reference key="parent" ref="596750588"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">365</int>

-						<reference key="object" ref="282885445"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="649334366"/>

-						</array>

-						<reference key="parent" ref="596750588"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">368</int>

-						<reference key="object" ref="842100515"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="940564599"/>

-						</array>

-						<reference key="parent" ref="596750588"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">369</int>

-						<reference key="object" ref="31160162"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="666057093"/>

-						</array>

-						<reference key="parent" ref="596750588"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">370</int>

-						<reference key="object" ref="179949713"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="967619578"/>

-						</array>

-						<reference key="parent" ref="596750588"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">352</int>

-						<reference key="object" ref="960678392"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="515308735"/>

-						</array>

-						<reference key="parent" ref="448510093"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">350</int>

-						<reference key="object" ref="515308735"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="709074847"/>

-							<reference ref="201731424"/>

-							<reference ref="86150604"/>

-							<reference ref="477203622"/>

-							<reference ref="57246850"/>

-							<reference ref="298603383"/>

-							<reference ref="331853183"/>

-						</array>

-						<reference key="parent" ref="960678392"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">382</int>

-						<reference key="object" ref="709074847"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="633115429"/>

-						</array>

-						<reference key="parent" ref="515308735"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">385</int>

-						<reference key="object" ref="201731424"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="930265681"/>

-						</array>

-						<reference key="parent" ref="515308735"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">386</int>

-						<reference key="object" ref="86150604"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="311969422"/>

-						</array>

-						<reference key="parent" ref="515308735"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">541</int>

-						<reference key="object" ref="477203622"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="631531164"/>

-						</array>

-						<reference key="parent" ref="515308735"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">543</int>

-						<reference key="object" ref="298603383"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="761107402"/>

-						</array>

-						<reference key="parent" ref="515308735"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">353</int>

-						<reference key="object" ref="348328898"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="300811574"/>

-						</array>

-						<reference key="parent" ref="448510093"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">354</int>

-						<reference key="object" ref="300811574"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="989050925"/>

-							<reference ref="700826966"/>

-							<reference ref="168436707"/>

-							<reference ref="363817195"/>

-							<reference ref="223835729"/>

-						</array>

-						<reference key="parent" ref="348328898"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">374</int>

-						<reference key="object" ref="989050925"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="189594322"/>

-						</array>

-						<reference key="parent" ref="300811574"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">375</int>

-						<reference key="object" ref="700826966"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="489340979"/>

-						</array>

-						<reference key="parent" ref="300811574"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">376</int>

-						<reference key="object" ref="168436707"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="53243865"/>

-						</array>

-						<reference key="parent" ref="300811574"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">377</int>

-						<reference key="object" ref="363817195"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="390084685"/>

-						</array>

-						<reference key="parent" ref="300811574"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">379</int>

-						<reference key="object" ref="223835729"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="283628678"/>

-						</array>

-						<reference key="parent" ref="300811574"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">285</int>

-						<reference key="object" ref="604417141"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="85544634"/>

-						</array>

-						<reference key="parent" ref="0"/>

-						<string key="objectName">EditPrograms</string>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">286</int>

-						<reference key="object" ref="85544634"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="1063387772"/>

-							<reference ref="758204686"/>

-							<reference ref="671954382"/>

-							<reference ref="492358940"/>

-						</array>

-						<reference key="parent" ref="604417141"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">423</int>

-						<reference key="object" ref="294137138"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="318286212"/>

-							<reference ref="511651072"/>

-						</array>

-						<reference key="parent" ref="0"/>

-						<string key="objectName">DockMenu</string>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">524</int>

-						<reference key="object" ref="318286212"/>

-						<reference key="parent" ref="294137138"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">526</int>

-						<reference key="object" ref="511651072"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="48278059"/>

-						</array>

-						<reference key="parent" ref="294137138"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">527</int>

-						<reference key="object" ref="48278059"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="1032342329"/>

-							<reference ref="563798000"/>

-						</array>

-						<reference key="parent" ref="511651072"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">532</int>

-						<reference key="object" ref="1032342329"/>

-						<reference key="parent" ref="48278059"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">533</int>

-						<reference key="object" ref="563798000"/>

-						<reference key="parent" ref="48278059"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100363</int>

-						<reference key="object" ref="990762273"/>

-						<reference key="parent" ref="119157981"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100364</int>

-						<reference key="object" ref="391919450"/>

-						<reference key="parent" ref="443008216"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100365</int>

-						<reference key="object" ref="649334366"/>

-						<reference key="parent" ref="282885445"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100368</int>

-						<reference key="object" ref="940564599"/>

-						<reference key="parent" ref="842100515"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100369</int>

-						<reference key="object" ref="666057093"/>

-						<reference key="parent" ref="31160162"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100370</int>

-						<reference key="object" ref="967619578"/>

-						<reference key="parent" ref="179949713"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100382</int>

-						<reference key="object" ref="633115429"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="341113515"/>

-						</array>

-						<reference key="parent" ref="709074847"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100385</int>

-						<reference key="object" ref="930265681"/>

-						<reference key="parent" ref="201731424"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100386</int>

-						<reference key="object" ref="311969422"/>

-						<reference key="parent" ref="86150604"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100541</int>

-						<reference key="object" ref="631531164"/>

-						<reference key="parent" ref="477203622"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100543</int>

-						<reference key="object" ref="761107402"/>

-						<reference key="parent" ref="298603383"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100374</int>

-						<reference key="object" ref="189594322"/>

-						<reference key="parent" ref="989050925"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100375</int>

-						<reference key="object" ref="489340979"/>

-						<reference key="parent" ref="700826966"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100376</int>

-						<reference key="object" ref="53243865"/>

-						<reference key="parent" ref="168436707"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100377</int>

-						<reference key="object" ref="390084685"/>

-						<reference key="parent" ref="363817195"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100379</int>

-						<reference key="object" ref="283628678"/>

-						<reference key="parent" ref="223835729"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">380</int>

-						<reference key="object" ref="341113515"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="759499526"/>

-							<reference ref="616492372"/>

-							<reference ref="543935434"/>

-							<reference ref="836673018"/>

-						</array>

-						<reference key="parent" ref="633115429"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">435</int>

-						<reference key="object" ref="759499526"/>

-						<reference key="parent" ref="341113515"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">384</int>

-						<reference key="object" ref="616492372"/>

-						<reference key="parent" ref="341113515"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">383</int>

-						<reference key="object" ref="543935434"/>

-						<reference key="parent" ref="341113515"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">381</int>

-						<reference key="object" ref="836673018"/>

-						<reference key="parent" ref="341113515"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">295</int>

-						<reference key="object" ref="1063387772"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="792419186"/>

-							<reference ref="17278747"/>

-							<reference ref="842897584"/>

-							<reference ref="905092943"/>

-						</array>

-						<reference key="parent" ref="85544634"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300295</int>

-						<reference key="object" ref="792419186"/>

-						<reference key="parent" ref="1063387772"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">200295</int>

-						<reference key="object" ref="17278747"/>

-						<reference key="parent" ref="1063387772"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100295</int>

-						<reference key="object" ref="842897584"/>

-						<reference key="parent" ref="1063387772"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">296</int>

-						<reference key="object" ref="905092943"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="242608782"/>

-							<reference ref="938444323"/>

-							<reference ref="84282687"/>

-						</array>

-						<reference key="parent" ref="1063387772"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">535</int>

-						<reference key="object" ref="242608782"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="34714764"/>

-						</array>

-						<reference key="parent" ref="905092943"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">575</int>

-						<reference key="object" ref="34714764"/>

-						<reference key="parent" ref="242608782"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">298</int>

-						<reference key="object" ref="938444323"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="825378892"/>

-						</array>

-						<reference key="parent" ref="905092943"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">573</int>

-						<reference key="object" ref="825378892"/>

-						<reference key="parent" ref="938444323"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">297</int>

-						<reference key="object" ref="84282687"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="432610585"/>

-						</array>

-						<reference key="parent" ref="905092943"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">574</int>

-						<reference key="object" ref="432610585"/>

-						<reference key="parent" ref="84282687"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">310</int>

-						<reference key="object" ref="758204686"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="1025474039"/>

-						</array>

-						<reference key="parent" ref="85544634"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100310</int>

-						<reference key="object" ref="1025474039"/>

-						<reference key="parent" ref="758204686"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">292</int>

-						<reference key="object" ref="671954382"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="143554520"/>

-						</array>

-						<reference key="parent" ref="85544634"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100292</int>

-						<reference key="object" ref="143554520"/>

-						<reference key="parent" ref="671954382"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">293</int>

-						<reference key="object" ref="492358940"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="8201128"/>

-						</array>

-						<reference key="parent" ref="85544634"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">100293</int>

-						<reference key="object" ref="8201128"/>

-						<reference key="parent" ref="492358940"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300337</int>

-						<reference key="object" ref="10973343"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="184765684"/>

-						</array>

-						<reference key="parent" ref="448510093"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300338</int>

-						<reference key="object" ref="184765684"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="657659108"/>

-							<reference ref="290578835"/>

-							<reference ref="992839333"/>

-							<reference ref="138261120"/>

-							<reference ref="128352289"/>

-							<reference ref="57161931"/>

-						</array>

-						<reference key="parent" ref="10973343"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300358</int>

-						<reference key="object" ref="290578835"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="399127858"/>

-						</array>

-						<reference key="parent" ref="184765684"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300359</int>

-						<reference key="object" ref="657659108"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="259618205"/>

-						</array>

-						<reference key="parent" ref="184765684"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300360</int>

-						<reference key="object" ref="259618205"/>

-						<reference key="parent" ref="657659108"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300361</int>

-						<reference key="object" ref="399127858"/>

-						<reference key="parent" ref="290578835"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300362</int>

-						<reference key="object" ref="992839333"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="959555182"/>

-						</array>

-						<reference key="parent" ref="184765684"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300363</int>

-						<reference key="object" ref="959555182"/>

-						<reference key="parent" ref="992839333"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300364</int>

-						<reference key="object" ref="138261120"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="183409141"/>

-						</array>

-						<reference key="parent" ref="184765684"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300365</int>

-						<reference key="object" ref="183409141"/>

-						<reference key="parent" ref="138261120"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300368</int>

-						<reference key="object" ref="128352289"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="556463187"/>

-						</array>

-						<reference key="parent" ref="184765684"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300369</int>

-						<reference key="object" ref="556463187"/>

-						<reference key="parent" ref="128352289"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300370</int>

-						<reference key="object" ref="57161931"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="989804990"/>

-						</array>

-						<reference key="parent" ref="184765684"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300371</int>

-						<reference key="object" ref="989804990"/>

-						<reference key="parent" ref="57161931"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300421</int>

-						<reference key="object" ref="723450037"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="408298283"/>

-						</array>

-						<reference key="parent" ref="448510093"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300422</int>

-						<reference key="object" ref="408298283"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="878106058"/>

-							<reference ref="386152084"/>

-							<reference ref="487809555"/>

-							<reference ref="620944856"/>

-							<reference ref="477050998"/>

-							<reference ref="765780304"/>

-							<reference ref="1002778833"/>

-							<reference ref="522511724"/>

-						</array>

-						<reference key="parent" ref="723450037"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300423</int>

-						<reference key="object" ref="386152084"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="572508492"/>

-						</array>

-						<reference key="parent" ref="408298283"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300424</int>

-						<reference key="object" ref="878106058"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="718083688"/>

-						</array>

-						<reference key="parent" ref="408298283"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300440</int>

-						<reference key="object" ref="718083688"/>

-						<reference key="parent" ref="878106058"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300441</int>

-						<reference key="object" ref="572508492"/>

-						<reference key="parent" ref="386152084"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300447</int>

-						<reference key="object" ref="477050998"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="501304422"/>

-						</array>

-						<reference key="parent" ref="408298283"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300450</int>

-						<reference key="object" ref="501304422"/>

-						<reference key="parent" ref="477050998"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300451</int>

-						<reference key="object" ref="765780304"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="510771323"/>

-						</array>

-						<reference key="parent" ref="408298283"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300452</int>

-						<reference key="object" ref="510771323"/>

-						<reference key="parent" ref="765780304"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300453</int>

-						<reference key="object" ref="487809555"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="619977658"/>

-						</array>

-						<reference key="parent" ref="408298283"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300454</int>

-						<reference key="object" ref="619977658"/>

-						<reference key="parent" ref="487809555"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300455</int>

-						<reference key="object" ref="620944856"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="461823902"/>

-						</array>

-						<reference key="parent" ref="408298283"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300456</int>

-						<reference key="object" ref="461823902"/>

-						<reference key="parent" ref="620944856"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300457</int>

-						<reference key="object" ref="1002778833"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="897099877"/>

-						</array>

-						<reference key="parent" ref="408298283"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300458</int>

-						<reference key="object" ref="897099877"/>

-						<reference key="parent" ref="1002778833"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300459</int>

-						<reference key="object" ref="522511724"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="994587858"/>

-						</array>

-						<reference key="parent" ref="408298283"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300460</int>

-						<reference key="object" ref="994587858"/>

-						<reference key="parent" ref="522511724"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300472</int>

-						<reference key="object" ref="57246850"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="917248662"/>

-						</array>

-						<reference key="parent" ref="515308735"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300473</int>

-						<reference key="object" ref="917248662"/>

-						<reference key="parent" ref="57246850"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300476</int>

-						<reference key="object" ref="278155937"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="617441821"/>

-						</array>

-						<reference key="parent" ref="596750588"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300477</int>

-						<reference key="object" ref="406291430"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="67728988"/>

-						</array>

-						<reference key="parent" ref="596750588"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300478</int>

-						<reference key="object" ref="67728988"/>

-						<reference key="parent" ref="406291430"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300479</int>

-						<reference key="object" ref="617441821"/>

-						<reference key="parent" ref="278155937"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300482</int>

-						<reference key="object" ref="863505041"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="1016286396"/>

-						</array>

-						<reference key="parent" ref="596750588"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300483</int>

-						<reference key="object" ref="1016286396"/>

-						<reference key="parent" ref="863505041"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300487</int>

-						<reference key="object" ref="331853183"/>

-						<array class="NSMutableArray" key="children">

-							<reference ref="1042813110"/>

-						</array>

-						<reference key="parent" ref="515308735"/>

-					</object>

-					<object class="IBObjectRecord">

-						<int key="objectID">300488</int>

-						<reference key="object" ref="1042813110"/>

-						<reference key="parent" ref="331853183"/>

-					</object>

-				</array>

-			</object>

-			<dictionary class="NSMutableDictionary" key="flattenedProperties">

-				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="-3.ImportedFromIB2"/>

-				<string key="100292.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100293.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="100295.IBShouldRemoveOnLegacySave"/>

-				<string key="100310.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100363.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100364.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100365.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100368.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100369.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100374.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100375.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100376.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100377.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100379.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100382.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100385.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100386.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100541.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="100543.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="129.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="129.ImportedFromIB2"/>

-				<string key="130.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="130.ImportedFromIB2"/>

-				<string key="131.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="131.ImportedFromIB2"/>

-				<string key="134.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="134.ImportedFromIB2"/>

-				<string key="136.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="136.ImportedFromIB2"/>

-				<string key="143.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="143.ImportedFromIB2"/>

-				<string key="144.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="144.ImportedFromIB2"/>

-				<string key="145.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="145.ImportedFromIB2"/>

-				<string key="149.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="149.ImportedFromIB2"/>

-				<string key="150.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="150.ImportedFromIB2"/>

-				<string key="157.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="157.ImportedFromIB2"/>

-				<string key="163.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="163.ImportedFromIB2"/>

-				<string key="169.IBEditorWindowLastContentRect">{{168, 821}, {113, 23}}</string>

-				<string key="169.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="169.ImportedFromIB2"/>

-				<string key="169.editorWindowContentRectSynchronizationRect">{{202, 626}, {154, 153}}</string>

-				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="19.ImportedFromIB2"/>

-				<integer value="1" key="196.ImportedFromIB2"/>

-				<string key="200295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="200295.IBShouldRemoveOnLegacySave"/>

-				<string key="203.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="203.ImportedFromIB2"/>

-				<string key="204.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="204.ImportedFromIB2"/>

-				<string key="23.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="23.ImportedFromIB2"/>

-				<string key="24.IBEditorWindowLastContentRect">{{349, 868}, {315, 143}}</string>

-				<string key="24.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="24.ImportedFromIB2"/>

-				<string key="24.editorWindowContentRectSynchronizationRect">{{271, 666}, {301, 153}}</string>

-				<string key="244.IBEditorWindowLastContentRect">{{507, 515}, {584, 341}}</string>

-				<string key="244.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<boolean value="YES" key="244.IBViewEditorWindowController.showingLayoutRectangles"/>

-				<string key="244.IBWindowTemplateEditedContentRect">{{507, 515}, {584, 341}}</string>

-				<integer value="1" key="244.ImportedFromIB2"/>

-				<string key="244.editorWindowContentRectSynchronizationRect">{{184, 290}, {481, 345}}</string>

-				<boolean value="YES" key="244.windowTemplate.hasMinSize"/>

-				<string key="244.windowTemplate.maxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

-				<string key="244.windowTemplate.minSize">{320, 240}</string>

-				<string key="245.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="245.ImportedFromIB2"/>

-				<string key="269.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="269.ImportedFromIB2"/>

-				<string key="270.IBEditorWindowLastContentRect">{{58, 803}, {155, 33}}</string>

-				<string key="270.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="270.ImportedFromIB2"/>

-				<string key="270.editorWindowContentRectSynchronizationRect">{{100, 746}, {155, 33}}</string>

-				<string key="272.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="272.ImportedFromIB2"/>

-				<string key="285.IBEditorWindowLastContentRect">{{68, 585}, {454, 271}}</string>

-				<string key="285.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="285.IBViewEditorWindowController.showingBoundsRectangles"/>

-				<integer value="1" key="285.IBViewEditorWindowController.showingLayoutRectangles"/>

-				<string key="285.IBWindowTemplateEditedContentRect">{{68, 585}, {454, 271}}</string>

-				<integer value="1" key="285.ImportedFromIB2"/>

-				<string key="285.editorWindowContentRectSynchronizationRect">{{433, 406}, {486, 327}}</string>

-				<boolean value="YES" key="285.windowTemplate.hasMinSize"/>

-				<string key="285.windowTemplate.maxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

-				<string key="285.windowTemplate.minSize">{454, 271}</string>

-				<string key="286.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="286.ImportedFromIB2"/>

-				<string key="29.IBEditorWindowLastContentRect">{{145, 1011}, {336, 20}}</string>

-				<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="29.ImportedFromIB2"/>

-				<string key="29.editorWindowContentRectSynchronizationRect">{{67, 819}, {336, 20}}</string>

-				<string key="292.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="292.ImportedFromIB2"/>

-				<string key="293.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="293.ImportedFromIB2"/>

-				<string key="295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="295.ImportedFromIB2"/>

-				<string key="296.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="296.ImportedFromIB2"/>

-				<string key="297.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="297.ImportedFromIB2"/>

-				<string key="298.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="298.ImportedFromIB2"/>

-				<string key="300295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300295.IBShouldRemoveOnLegacySave"/>

-				<string key="300337.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300337.ImportedFromIB2"/>

-				<string key="300338.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300338.ImportedFromIB2"/>

-				<string key="300358.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300358.ImportedFromIB2"/>

-				<string key="300359.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300359.ImportedFromIB2"/>

-				<string key="300360.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300361.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300362.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300362.ImportedFromIB2"/>

-				<string key="300363.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300364.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300364.ImportedFromIB2"/>

-				<string key="300365.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300368.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300368.ImportedFromIB2"/>

-				<string key="300369.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300370.ImportedFromIB2"/>

-				<string key="300371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300421.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300421.ImportedFromIB2"/>

-				<string key="300422.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300422.ImportedFromIB2"/>

-				<string key="300423.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300423.ImportedFromIB2"/>

-				<string key="300424.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300424.ImportedFromIB2"/>

-				<string key="300440.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300441.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300447.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300447.ImportedFromIB2"/>

-				<string key="300450.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300451.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300451.ImportedFromIB2"/>

-				<string key="300452.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300453.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300453.ImportedFromIB2"/>

-				<string key="300454.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300455.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300455.ImportedFromIB2"/>

-				<string key="300456.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300457.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300457.ImportedFromIB2"/>

-				<string key="300458.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300459.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300459.ImportedFromIB2"/>

-				<string key="300460.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300472.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300472.ImportedFromIB2"/>

-				<string key="300473.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300476.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300476.ImportedFromIB2"/>

-				<string key="300477.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300477.ImportedFromIB2"/>

-				<string key="300478.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300479.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300482.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300482.ImportedFromIB2"/>

-				<string key="300483.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="300487.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="300487.ImportedFromIB2"/>

-				<string key="300488.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="305.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="305.ImportedFromIB2"/>

-				<string key="310.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="310.ImportedFromIB2"/>

-				<string key="348.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="348.ImportedFromIB2"/>

-				<string key="349.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="349.ImportedFromIB2"/>

-				<string key="350.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="350.ImportedFromIB2"/>

-				<string key="351.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="351.ImportedFromIB2"/>

-				<string key="352.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="352.ImportedFromIB2"/>

-				<string key="353.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="353.ImportedFromIB2"/>

-				<string key="354.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="354.ImportedFromIB2"/>

-				<string key="363.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="363.ImportedFromIB2"/>

-				<string key="364.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="364.ImportedFromIB2"/>

-				<string key="365.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="365.ImportedFromIB2"/>

-				<string key="368.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="368.ImportedFromIB2"/>

-				<string key="369.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="369.ImportedFromIB2"/>

-				<string key="370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="370.ImportedFromIB2"/>

-				<string key="374.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="374.ImportedFromIB2"/>

-				<string key="375.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="375.ImportedFromIB2"/>

-				<string key="376.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="376.ImportedFromIB2"/>

-				<string key="377.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="377.ImportedFromIB2"/>

-				<string key="379.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="379.ImportedFromIB2"/>

-				<string key="380.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="380.ImportedFromIB2"/>

-				<string key="381.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="381.ImportedFromIB2"/>

-				<string key="382.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="382.ImportedFromIB2"/>

-				<string key="383.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="383.ImportedFromIB2"/>

-				<string key="384.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="384.ImportedFromIB2"/>

-				<string key="385.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="385.ImportedFromIB2"/>

-				<string key="386.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="386.ImportedFromIB2"/>

-				<string key="419.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="419.ImportedFromIB2"/>

-				<string key="420.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="420.ImportedFromIB2"/>

-				<string key="421.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="421.ImportedFromIB2"/>

-				<string key="423.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="423.ImportedFromIB2"/>

-				<string key="435.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="435.ImportedFromIB2"/>

-				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="5.ImportedFromIB2"/>

-				<string key="524.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="524.ImportedFromIB2"/>

-				<string key="526.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="526.ImportedFromIB2"/>

-				<string key="527.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="527.ImportedFromIB2"/>

-				<string key="532.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="532.ImportedFromIB2"/>

-				<string key="533.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="533.ImportedFromIB2"/>

-				<string key="535.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="535.ImportedFromIB2"/>

-				<string key="536.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="536.ImportedFromIB2"/>

-				<string key="537.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="537.ImportedFromIB2"/>

-				<string key="538.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="538.ImportedFromIB2"/>

-				<string key="541.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="541.ImportedFromIB2"/>

-				<string key="543.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="543.ImportedFromIB2"/>

-				<string key="544.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="544.ImportedFromIB2"/>

-				<string key="545.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="545.ImportedFromIB2"/>

-				<string key="56.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="56.ImportedFromIB2"/>

-				<string key="57.IBEditorWindowLastContentRect">{{20, 641}, {218, 203}}</string>

-				<string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="57.ImportedFromIB2"/>

-				<string key="57.editorWindowContentRectSynchronizationRect">{{79, 616}, {218, 203}}</string>

-				<string key="573.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="573.ImportedFromIB2"/>

-				<string key="574.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="574.ImportedFromIB2"/>

-				<string key="575.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="575.ImportedFromIB2"/>

-				<string key="58.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="58.ImportedFromIB2"/>

-				<string key="92.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<integer value="1" key="92.ImportedFromIB2"/>

-			</dictionary>

-			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>

-			<nil key="activeLocalization"/>

-			<dictionary class="NSMutableDictionary" key="localizations"/>

-			<nil key="sourceID"/>

-			<int key="maxID">300490</int>

-		</object>

-		<object class="IBClassDescriber" key="IBDocument.Classes"/>

-		<int key="IBDocument.localizationMode">0</int>

-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>

-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">

-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>

-			<integer value="1040" key="NS.object.0"/>

-		</object>

-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>

-		<nil key="IBDocument.LastKnownRelativeProjectPath"/>

-		<int key="IBDocument.defaultPropertyAccessControl">3</int>

-		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">

-			<string key="NSMenuCheckmark">{9, 8}</string>

-			<string key="NSMenuMixedState">{7, 2}</string>

-			<string key="NSSwitch">{15, 15}</string>

-		</dictionary>

-	</data>

-</archive>

+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1040</int>
+		<string key="IBDocument.SystemVersion">11A289</string>
+		<string key="IBDocument.InterfaceBuilderVersion">903</string>
+		<string key="IBDocument.AppKitVersion">1094.2</string>
+		<string key="IBDocument.HIToolboxVersion">521.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">903</string>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.EditedObjectIDs"/>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="904585544">
+			<object class="NSCustomObject" id="815810918">
+				<object class="NSMutableString" key="NSClassName">
+					<characters key="NS.bytes">NSApplication</characters>
+				</object>
+			</object>
+			<object class="NSCustomObject" id="941939442">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="951368722">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSMenu" id="524015605">
+				<string key="NSTitle">MainMenu</string>
+				<array class="NSMutableArray" key="NSMenuItems">
+					<object class="NSMenuItem" id="365880285">
+						<reference key="NSMenu" ref="524015605"/>
+						<string key="NSTitle">X11</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<object class="NSCustomResource" key="NSOnImage" id="531645050">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">NSMenuCheckmark</string>
+						</object>
+						<object class="NSCustomResource" key="NSMixedImage" id="351811234">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">NSMenuMixedState</string>
+						</object>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="576521955">
+							<string key="NSTitle">X11</string>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="139290918">
+									<reference key="NSMenu" ref="576521955"/>
+									<string key="NSTitle">X11 について</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="386173216">
+									<reference key="NSMenu" ref="576521955"/>
+									<string key="NSTitle">環境設定...</string>
+									<string key="NSKeyEquiv">,</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="272876017">
+									<reference key="NSMenu" ref="576521955"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="32285361">
+									<reference key="NSMenu" ref="576521955"/>
+									<string key="NSTitle">サービス</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+									<string key="NSAction">submenuAction:</string>
+									<object class="NSMenu" key="NSSubmenu" id="821388474">
+										<string key="NSTitle">サービス</string>
+										<array class="NSMutableArray" key="NSMenuItems"/>
+										<string key="NSName">_NSServicesMenu</string>
+									</object>
+								</object>
+								<object class="NSMenuItem" id="431301145">
+									<reference key="NSMenu" ref="576521955"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="6876565">
+									<reference key="NSMenu" ref="576521955"/>
+									<string key="NSTitle">フルスクリーンを切り替える</string>
+									<string key="NSKeyEquiv">a</string>
+									<int key="NSKeyEquivModMask">1572864</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="479677589">
+									<reference key="NSMenu" ref="576521955"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="301008465">
+									<reference key="NSMenu" ref="576521955"/>
+									<string key="NSTitle">X11 を隠す</string>
+									<string key="NSKeyEquiv">h</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+									<int key="NSTag">42</int>
+								</object>
+								<object class="NSMenuItem" id="206802571">
+									<reference key="NSMenu" ref="576521955"/>
+									<string key="NSTitle">ほかを隠す</string>
+									<string key="NSKeyEquiv">h</string>
+									<int key="NSKeyEquivModMask">1572864</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="1023546148">
+									<reference key="NSMenu" ref="576521955"/>
+									<string key="NSTitle">すべてを表示</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+									<int key="NSTag">42</int>
+								</object>
+								<object class="NSMenuItem" id="848095279">
+									<reference key="NSMenu" ref="576521955"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="274138642">
+									<reference key="NSMenu" ref="576521955"/>
+									<string key="NSTitle">X11 を終了</string>
+									<string key="NSKeyEquiv">q</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+							</array>
+							<string key="NSName">_NSAppleMenu</string>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="868031522">
+						<reference key="NSMenu" ref="524015605"/>
+						<string key="NSTitle">アプリケーション</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="531645050"/>
+						<reference key="NSMixedImage" ref="351811234"/>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="981161348">
+							<string key="NSTitle">アプリケーション</string>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="390088328">
+									<reference key="NSMenu" ref="981161348"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="1065386165">
+									<reference key="NSMenu" ref="981161348"/>
+									<string key="NSTitle">カスタマイズ...</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+							</array>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="200491363">
+						<reference key="NSMenu" ref="524015605"/>
+						<string key="NSTitle">編集</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="531645050"/>
+						<reference key="NSMixedImage" ref="351811234"/>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="526778998">
+							<string key="NSTitle">編集</string>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="185296989">
+									<reference key="NSMenu" ref="526778998"/>
+									<string key="NSTitle">コピー</string>
+									<string key="NSKeyEquiv">c</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+							</array>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="931553638">
+						<reference key="NSMenu" ref="524015605"/>
+						<string key="NSTitle">ウインドウ</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="531645050"/>
+						<reference key="NSMixedImage" ref="351811234"/>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="96874957">
+							<string key="NSTitle">ウインドウ</string>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="984461797">
+									<reference key="NSMenu" ref="96874957"/>
+									<string key="NSTitle">閉じる</string>
+									<string key="NSKeyEquiv">w</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="677652931">
+									<reference key="NSMenu" ref="96874957"/>
+									<string key="NSTitle">しまう</string>
+									<string key="NSKeyEquiv">m</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="1066447520">
+									<reference key="NSMenu" ref="96874957"/>
+									<string key="NSTitle">拡大／縮小</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="280172320">
+									<reference key="NSMenu" ref="96874957"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="1036389925">
+									<reference key="NSMenu" ref="96874957"/>
+									<string key="NSTitle">ウインドウを巡回</string>
+									<string key="NSKeyEquiv"></string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="369641893">
+									<reference key="NSMenu" ref="96874957"/>
+									<string key="NSTitle">ウインドウを逆方向に巡回</string>
+									<string key="NSKeyEquiv"></string>
+									<int key="NSKeyEquivModMask">1179648</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="155085383">
+									<reference key="NSMenu" ref="96874957"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="276216762">
+									<reference key="NSMenu" ref="96874957"/>
+									<string key="NSTitle">すべてを手前に移動</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+							</array>
+							<string key="NSName">_NSWindowsMenu</string>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="551174276">
+						<reference key="NSMenu" ref="524015605"/>
+						<string key="NSTitle">ヘルプ</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="531645050"/>
+						<reference key="NSMixedImage" ref="351811234"/>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="511848303">
+							<string key="NSTitle">ヘルプ</string>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="504984881">
+									<reference key="NSMenu" ref="511848303"/>
+									<string key="NSTitle">X11 ヘルプ</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+							</array>
+						</object>
+					</object>
+				</array>
+				<string key="NSName">_NSMainMenu</string>
+			</object>
+			<object class="NSCustomObject" id="485884620">
+				<string key="NSClassName">X11Controller</string>
+			</object>
+			<object class="NSWindowTemplate" id="124913468">
+				<int key="NSWindowStyleMask">3</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{319, 328.03906000000001}, {584, 341}}</string>
+				<int key="NSWTFlags">1350041600</int>
+				<string key="NSWindowTitle">X11 の環境設定</string>
+				<string key="NSWindowClass">NSPanel</string>
+				<object class="NSMutableString" key="NSViewClass">
+					<characters key="NS.bytes">View</characters>
+				</object>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
+				<string key="NSWindowContentMinSize">{320, 240}</string>
+				<object class="NSView" key="NSWindowView" id="941366957">
+					<nil key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSTabView" id="448510093">
+							<reference key="NSNextResponder" ref="941366957"/>
+							<int key="NSvFlags">274</int>
+							<string key="NSFrame">{{13, 10}, {558, 325}}</string>
+							<reference key="NSSuperview" ref="941366957"/>
+							<array class="NSMutableArray" key="NSTabViewItems">
+								<object class="NSTabViewItem" id="287591690">
+									<object class="NSMutableString" key="NSIdentifier">
+										<characters key="NS.bytes">1</characters>
+									</object>
+									<object class="NSView" key="NSView" id="596750588">
+										<reference key="NSNextResponder" ref="448510093"/>
+										<int key="NSvFlags">256</int>
+										<array class="NSMutableArray" key="NSSubviews">
+											<object class="NSButton" id="119157981">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 243}, {505, 18}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="179949713"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="990762273">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">3  ボタンマウスをエミュレート</string>
+													<object class="NSFont" key="NSSupport" id="463863101">
+														<string key="NSName">LucidaGrande</string>
+														<double key="NSSize">13</double>
+														<int key="NSfFlags">1044</int>
+													</object>
+													<reference key="NSControlView" ref="119157981"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<object class="NSCustomResource" key="NSNormalImage" id="815090595">
+														<string key="NSClassName">NSImage</string>
+														<string key="NSResourceName">NSSwitch</string>
+													</object>
+													<object class="NSButtonImageSource" key="NSAlternateImage" id="391434389">
+														<string key="NSImageName">NSSwitch</string>
+													</object>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="443008216">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 96}, {488, 28}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="406291430"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="391919450">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">有効にすると、メニューバーの代替キーによって X11 アプリケーションのメタ修飾キーを使用できなくなる場合があります。</string>
+													<object class="NSFont" key="NSSupport" id="26">
+														<string key="NSName">LucidaGrande</string>
+														<double key="NSSize">11</double>
+														<int key="NSfFlags">3100</int>
+													</object>
+													<string key="NSPlaceholderString"/>
+													<reference key="NSControlView" ref="443008216"/>
+													<object class="NSColor" key="NSBackgroundColor" id="57160303">
+														<int key="NSColorSpace">6</int>
+														<string key="NSCatalogName">System</string>
+														<string key="NSColorName">controlColor</string>
+														<object class="NSColor" key="NSColor" id="590688762">
+															<int key="NSColorSpace">3</int>
+															<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+														</object>
+													</object>
+													<object class="NSColor" key="NSTextColor" id="930815747">
+														<int key="NSColorSpace">6</int>
+														<string key="NSCatalogName">System</string>
+														<string key="NSColorName">controlTextColor</string>
+														<object class="NSColor" key="NSColor" id="214098874">
+															<int key="NSColorSpace">3</int>
+															<bytes key="NSWhite">MAA</bytes>
+														</object>
+													</object>
+												</object>
+											</object>
+											<object class="NSTextField" id="282885445">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 209}, {488, 28}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="31160162"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="649334366">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string type="base64-UTF8" key="NSContents">T3B0aW9uIOOCreODvOOCkuaKvOOBl+OBn+OBvuOBvuOCr+ODquODg+OCr+OBmeOCi+OBqOODnuOCpuOC
+ueOBruS4reODnOOCv+ODs+aTjeS9nOOBq+OBquOCiuOAgUNvbW1hbmQg44Kt44O844KS5oq844GX44Gf
+44G+44G+44Kv44Oq44OD44Kv44GZ44KL44Go44Oe44Km44K544Gu5Y+z44Oc44K/44Oz5pON5L2c44Gr
+44Gq44KK44G+44GZ44CCCg</string>
+													<reference key="NSSupport" ref="26"/>
+													<string key="NSPlaceholderString"/>
+													<reference key="NSControlView" ref="282885445"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSButton" id="842100515">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 130}, {505, 18}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="443008216"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="940564599">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">X11 の代替キーを有効にする</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="842100515"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="815090595"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="31160162">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 156}, {488, 17}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="842100515"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="666057093">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">入力メニューを変更して現在の X11 キーマップを上書きすることを許可します。</string>
+													<reference key="NSSupport" ref="26"/>
+													<string key="NSPlaceholderString"/>
+													<reference key="NSControlView" ref="31160162"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSButton" id="179949713">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 179}, {505, 18}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="282885445"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="967619578">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">システムのキーボードレイアウトに従う</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="179949713"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="815090595"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="278155937">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 32}, {488, 31}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="863505041"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="617441821">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">有効にすると、option キー で Mode_switch の代わりに X11 キーシンボルの Alt_L と Alt_R が送信されます。 </string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="278155937"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSButton" id="406291430">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 69}, {505, 18}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="278155937"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="67728988">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Option キーで Alt_L と Alt_R を送信</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="406291430"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="815090595"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSButton" id="863505041">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 8}, {505, 18}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="448510093"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="1016286396">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">常に指を動かした方向にスクロール</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="863505041"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="815090595"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+										</array>
+										<string key="NSFrame">{{10, 33}, {538, 279}}</string>
+										<reference key="NSSuperview" ref="448510093"/>
+										<reference key="NSNextKeyView" ref="119157981"/>
+									</object>
+									<string key="NSLabel">入力</string>
+									<reference key="NSColor" ref="57160303"/>
+									<reference key="NSTabView" ref="448510093"/>
+								</object>
+								<object class="NSTabViewItem" id="960678392">
+									<object class="NSMutableString" key="NSIdentifier">
+										<characters key="NS.bytes">2</characters>
+									</object>
+									<object class="NSView" key="NSView" id="515308735">
+										<nil key="NSNextResponder"/>
+										<int key="NSvFlags">256</int>
+										<array class="NSMutableArray" key="NSSubviews">
+											<object class="NSPopUpButton" id="709074847">
+												<reference key="NSNextResponder" ref="515308735"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{75, 234}, {163, 26}}</string>
+												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSNextKeyView" ref="86150604"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSPopUpButtonCell" key="NSCell" id="633115429">
+													<int key="NSCellFlags">-2076049856</int>
+													<int key="NSCellFlags2">1024</int>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="709074847"/>
+													<int key="NSButtonFlags">109199615</int>
+													<int key="NSButtonFlags2">1</int>
+													<object class="NSFont" key="NSAlternateImage">
+														<string key="NSName">LucidaGrande</string>
+														<double key="NSSize">13</double>
+														<int key="NSfFlags">16</int>
+													</object>
+													<string key="NSAlternateContents"/>
+													<object class="NSMutableString" key="NSKeyEquivalent">
+														<characters key="NS.bytes"/>
+													</object>
+													<int key="NSPeriodicDelay">400</int>
+													<int key="NSPeriodicInterval">75</int>
+													<object class="NSMenuItem" key="NSMenuItem" id="616492372">
+														<reference key="NSMenu" ref="341113515"/>
+														<string key="NSTitle">ディスプレイから</string>
+														<string key="NSKeyEquiv"/>
+														<int key="NSKeyEquivModMask">1048576</int>
+														<int key="NSMnemonicLoc">2147483647</int>
+														<int key="NSState">1</int>
+														<reference key="NSOnImage" ref="531645050"/>
+														<reference key="NSMixedImage" ref="351811234"/>
+														<string key="NSAction">_popUpItemAction:</string>
+														<int key="NSTag">-1</int>
+														<reference key="NSTarget" ref="633115429"/>
+													</object>
+													<bool key="NSMenuItemRespectAlignment">YES</bool>
+													<object class="NSMenu" key="NSMenu" id="341113515">
+														<object class="NSMutableString" key="NSTitle">
+															<characters key="NS.bytes">OtherViews</characters>
+														</object>
+														<array class="NSMutableArray" key="NSMenuItems">
+															<reference ref="616492372"/>
+															<object class="NSMenuItem" id="759499526">
+																<reference key="NSMenu" ref="341113515"/>
+																<string key="NSTitle">256 色</string>
+																<string key="NSKeyEquiv"/>
+																<int key="NSKeyEquivModMask">1048576</int>
+																<int key="NSMnemonicLoc">2147483647</int>
+																<reference key="NSOnImage" ref="531645050"/>
+																<reference key="NSMixedImage" ref="351811234"/>
+																<string key="NSAction">_popUpItemAction:</string>
+																<int key="NSTag">8</int>
+																<reference key="NSTarget" ref="633115429"/>
+															</object>
+															<object class="NSMenuItem" id="543935434">
+																<reference key="NSMenu" ref="341113515"/>
+																<string key="NSTitle">約 32000 色</string>
+																<string key="NSKeyEquiv"/>
+																<int key="NSKeyEquivModMask">1048576</int>
+																<int key="NSMnemonicLoc">2147483647</int>
+																<reference key="NSOnImage" ref="531645050"/>
+																<reference key="NSMixedImage" ref="351811234"/>
+																<string key="NSAction">_popUpItemAction:</string>
+																<int key="NSTag">15</int>
+																<reference key="NSTarget" ref="633115429"/>
+															</object>
+															<object class="NSMenuItem" id="836673018">
+																<reference key="NSMenu" ref="341113515"/>
+																<string key="NSTitle">約 1670 万色</string>
+																<string key="NSKeyEquiv"/>
+																<int key="NSKeyEquivModMask">1048576</int>
+																<int key="NSMnemonicLoc">2147483647</int>
+																<reference key="NSOnImage" ref="531645050"/>
+																<reference key="NSMixedImage" ref="351811234"/>
+																<string key="NSAction">_popUpItemAction:</string>
+																<int key="NSTag">24</int>
+																<reference key="NSTarget" ref="633115429"/>
+															</object>
+														</array>
+													</object>
+													<int key="NSPreferredEdge">3</int>
+													<bool key="NSUsesItemFromMenu">YES</bool>
+													<bool key="NSAltersState">YES</bool>
+													<int key="NSArrowPosition">1</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="201731424">
+												<reference key="NSNextResponder" ref="515308735"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{17, 238}, {56, 19}}</string>
+												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSNextKeyView" ref="709074847"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="930265681">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">カラー：</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<string key="NSPlaceholderString"/>
+													<reference key="NSControlView" ref="201731424"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSTextField" id="86150604">
+												<reference key="NSNextResponder" ref="515308735"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 216}, {488, 14}}</string>
+												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSNextKeyView" ref="477203622"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="311969422">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">このオプションは、次回 X11 を起動したときに有効になります。</string>
+													<reference key="NSSupport" ref="26"/>
+													<string key="NSPlaceholderString"/>
+													<reference key="NSControlView" ref="86150604"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSButton" id="477203622">
+												<reference key="NSNextResponder" ref="515308735"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 182}, {505, 23}}</string>
+												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSNextKeyView" ref="298603383"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="631531164">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">フルスクリーンモード</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="477203622"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="815090595"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSButton" id="57246850">
+												<reference key="NSNextResponder" ref="515308735"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{37, 118}, {492, 23}}</string>
+												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSNextKeyView" ref="331853183"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="917248662">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">フルスクリーンモード時のメニューバーへのアクセスを許可</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="57246850"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="815090595"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="298603383">
+												<reference key="NSNextResponder" ref="515308735"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 147}, {494, 28}}</string>
+												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSNextKeyView" ref="57246850"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="761107402">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">X11 のルートウインドウを有効にします。フルスクリーンモードに切り替えたり、フルスクリーンモードを終了するときは、コマンド + Option + A キーを押します。</string>
+													<reference key="NSSupport" ref="26"/>
+													<string key="NSPlaceholderString"/>
+													<reference key="NSControlView" ref="298603383"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSTextField" id="331853183">
+												<reference key="NSNextResponder" ref="515308735"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{54, 70}, {476, 42}}</string>
+												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSNextKeyView" ref="448510093"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="1042813110">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">マウスカーソルが主ディスプレイの一番上に置かれたときにメニューバーが表示されます。</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="331853183"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+										</array>
+										<string key="NSFrame">{{10, 33}, {538, 279}}</string>
+										<reference key="NSNextKeyView" ref="201731424"/>
+									</object>
+									<string key="NSLabel">出力</string>
+									<reference key="NSColor" ref="57160303"/>
+									<reference key="NSTabView" ref="448510093"/>
+								</object>
+								<object class="NSTabViewItem" id="723450037">
+									<object class="NSMutableString" key="NSIdentifier">
+										<characters key="NS.bytes">2</characters>
+									</object>
+									<object class="NSView" key="NSView" id="408298283">
+										<nil key="NSNextResponder"/>
+										<int key="NSvFlags">256</int>
+										<array class="NSMutableArray" key="NSSubviews">
+											<object class="NSButton" id="878106058">
+												<reference key="NSNextResponder" ref="408298283"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 255}, {505, 23}}</string>
+												<reference key="NSSuperview" ref="408298283"/>
+												<reference key="NSNextKeyView" ref="386152084"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="718083688">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">同期を有効にする</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="878106058"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="815090595"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="386152084">
+												<reference key="NSNextResponder" ref="408298283"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 221}, {488, 28}}</string>
+												<reference key="NSSuperview" ref="408298283"/>
+												<reference key="NSNextKeyView" ref="487809555"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="572508492">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">“コピー”メニュー項目を有効にして、OSX のペーストボードと X11 の CLIPBOARD バッファおよび PRIMARY バッファを同期できるようにします。</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="386152084"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSButton" id="477050998">
+												<reference key="NSNextResponder" ref="408298283"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{34, 129}, {489, 18}}</string>
+												<reference key="NSSuperview" ref="408298283"/>
+												<reference key="NSNextKeyView" ref="765780304"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="501304422">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">ペーストボードが変更されたときに CLIPBOARD をアップデート</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="477050998"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="815090595"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSButton" id="765780304">
+												<reference key="NSNextResponder" ref="408298283"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{34, 104}, {489, 18}}</string>
+												<reference key="NSSuperview" ref="408298283"/>
+												<reference key="NSNextKeyView" ref="1002778833"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="510771323">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">ペーストボードが変更されたときに PRIMARY （中クリック）をアップデート</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="765780304"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="815090595"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSButton" id="1002778833">
+												<reference key="NSNextResponder" ref="408298283"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{34, 79}, {489, 18}}</string>
+												<reference key="NSSuperview" ref="408298283"/>
+												<reference key="NSNextKeyView" ref="522511724"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="897099877">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">新しいテキストが選択されたら、すぐにペーストボードをアップデート</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="1002778833"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="815090595"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSButton" id="487809555">
+												<reference key="NSNextResponder" ref="408298283"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{34, 192}, {489, 18}}</string>
+												<reference key="NSSuperview" ref="408298283"/>
+												<reference key="NSNextKeyView" ref="620944856"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="619977658">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">CLIPBOARD が変更されたときにペーストボードをアップデート</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="487809555"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="815090595"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="620944856">
+												<reference key="NSNextResponder" ref="408298283"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{48, 158}, {476, 28}}</string>
+												<reference key="NSSuperview" ref="408298283"/>
+												<reference key="NSNextKeyView" ref="477050998"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="461823902">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">xclipboard、klipper、その他の X11 クリップボードマネージャを使用したい場合は、このオプションを無効にしてください。</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="620944856"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSTextField" id="522511724">
+												<reference key="NSNextResponder" ref="408298283"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{48, 47}, {476, 28}}</string>
+												<reference key="NSSuperview" ref="408298283"/>
+												<reference key="NSNextKeyView" ref="448510093"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="994587858">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">X11 プロトコルの制限により、このオプションは、一部のアプリケーションで機能しない場合があります。</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="522511724"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+										</array>
+										<string key="NSFrame">{{10, 33}, {538, 279}}</string>
+										<reference key="NSNextKeyView" ref="878106058"/>
+									</object>
+									<string key="NSLabel">ペーストボード</string>
+									<reference key="NSColor" ref="57160303"/>
+									<reference key="NSTabView" ref="448510093"/>
+								</object>
+								<object class="NSTabViewItem" id="10973343">
+									<object class="NSMutableString" key="NSIdentifier">
+										<characters key="NS.bytes">2</characters>
+									</object>
+									<object class="NSView" key="NSView" id="184765684">
+										<nil key="NSNextResponder"/>
+										<int key="NSvFlags">256</int>
+										<array class="NSMutableArray" key="NSSubviews">
+											<object class="NSButton" id="657659108">
+												<reference key="NSNextResponder" ref="184765684"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{15, 245}, {508, 18}}</string>
+												<reference key="NSSuperview" ref="184765684"/>
+												<reference key="NSNextKeyView" ref="290578835"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="259618205">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">選択されていないウインドウを直接クリック</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="657659108"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="815090595"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="290578835">
+												<reference key="NSNextResponder" ref="184765684"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{23, 211}, {501, 28}}</string>
+												<reference key="NSSuperview" ref="184765684"/>
+												<reference key="NSNextKeyView" ref="992839333"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="399127858">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">有効にした場合、選択されていないウインドウをクリックしたときに、そのウインドウを一番手前に表示するだけでなく、ウインドウ内の項目を直接クリックします。</string>
+													<reference key="NSSupport" ref="26"/>
+													<string key="NSPlaceholderString"/>
+													<reference key="NSControlView" ref="290578835"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSButton" id="992839333">
+												<reference key="NSNextResponder" ref="184765684"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{15, 184}, {508, 18}}</string>
+												<reference key="NSSuperview" ref="184765684"/>
+												<reference key="NSNextKeyView" ref="138261120"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="959555182">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">フォーカスをマウスと一緒に移動</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="992839333"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="815090595"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="138261120">
+												<reference key="NSNextResponder" ref="184765684"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{23, 164}, {501, 14}}</string>
+												<reference key="NSSuperview" ref="184765684"/>
+												<reference key="NSNextKeyView" ref="128352289"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="183409141">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">X11 ウインドウのフォーカスがカーソルと一緒に移動します。逆効果になる場合もあります。</string>
+													<reference key="NSSupport" ref="26"/>
+													<string key="NSPlaceholderString"/>
+													<reference key="NSControlView" ref="138261120"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSButton" id="128352289">
+												<reference key="NSNextResponder" ref="184765684"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{15, 140}, {508, 18}}</string>
+												<reference key="NSSuperview" ref="184765684"/>
+												<reference key="NSNextKeyView" ref="57161931"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="556463187">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">新規ウインドウにフォーカス</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="128352289"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="815090595"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="57161931">
+												<reference key="NSNextResponder" ref="184765684"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{23, 106}, {501, 28}}</string>
+												<reference key="NSSuperview" ref="184765684"/>
+												<reference key="NSNextKeyView" ref="448510093"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="989804990">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">有効にした場合、新しい X11 ウインドウを作成すると、Finder.app や ターミナル.app などの代わりに、X11.app が前面に移動します。</string>
+													<reference key="NSSupport" ref="26"/>
+													<string key="NSPlaceholderString"/>
+													<reference key="NSControlView" ref="57161931"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+										</array>
+										<string key="NSFrame">{{10, 33}, {538, 279}}</string>
+										<reference key="NSNextKeyView" ref="657659108"/>
+									</object>
+									<string key="NSLabel">ウインドウ</string>
+									<reference key="NSColor" ref="57160303"/>
+									<reference key="NSTabView" ref="448510093"/>
+								</object>
+								<object class="NSTabViewItem" id="348328898">
+									<object class="NSView" key="NSView" id="300811574">
+										<nil key="NSNextResponder"/>
+										<int key="NSvFlags">256</int>
+										<array class="NSMutableArray" key="NSSubviews">
+											<object class="NSButton" id="989050925">
+												<reference key="NSNextResponder" ref="300811574"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 243}, {482, 18}}</string>
+												<reference key="NSSuperview" ref="300811574"/>
+												<reference key="NSNextKeyView" ref="168436707"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="189594322">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">接続を認証</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="989050925"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="815090595"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSButton" id="700826966">
+												<reference key="NSNextResponder" ref="300811574"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 180}, {402, 18}}</string>
+												<reference key="NSSuperview" ref="300811574"/>
+												<reference key="NSNextKeyView" ref="363817195"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="489340979">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">ネットワーク・クライアントからの接続を許可</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="700826966"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="815090595"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="168436707">
+												<reference key="NSNextResponder" ref="300811574"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 209}, {488, 28}}</string>
+												<reference key="NSSuperview" ref="300811574"/>
+												<reference key="NSNextKeyView" ref="700826966"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="53243865">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">X11 の起動時に、Xauthority アクセス制御キーを作成します。システムの IP アドレスが変更されると、これらのキーが無効になり、X11 アプリケーションが起動しなくなることがあります。</string>
+													<reference key="NSSupport" ref="26"/>
+													<string key="NSPlaceholderString"/>
+													<reference key="NSControlView" ref="168436707"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSTextField" id="363817195">
+												<reference key="NSNextResponder" ref="300811574"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 132}, {488, 42}}</string>
+												<reference key="NSSuperview" ref="300811574"/>
+												<reference key="NSNextKeyView" ref="223835729"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="390084685">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">有効にする場合は、システムのセキュリティを維持するために、“接続を認証”も有効にしてください。無効にすると、リモートアプリケーションからの接続は拒否されます。</string>
+													<reference key="NSSupport" ref="26"/>
+													<string key="NSPlaceholderString"/>
+													<reference key="NSControlView" ref="363817195"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSTextField" id="223835729">
+												<reference key="NSNextResponder" ref="300811574"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{17, 17}, {404, 14}}</string>
+												<reference key="NSSuperview" ref="300811574"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="283628678">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">これらのオプションは、次回 X11 を起動したときに有効になります。</string>
+													<reference key="NSSupport" ref="26"/>
+													<string key="NSPlaceholderString"/>
+													<reference key="NSControlView" ref="223835729"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+										</array>
+										<string key="NSFrame">{{10, 33}, {538, 279}}</string>
+										<reference key="NSNextKeyView" ref="989050925"/>
+									</object>
+									<string key="NSLabel">セキュリティ</string>
+									<reference key="NSColor" ref="57160303"/>
+									<reference key="NSTabView" ref="448510093"/>
+								</object>
+							</array>
+							<reference key="NSSelectedTabViewItem" ref="287591690"/>
+							<reference key="NSFont" ref="463863101"/>
+							<int key="NSTvFlags">0</int>
+							<bool key="NSAllowTruncatedLabels">YES</bool>
+							<bool key="NSDrawsBackground">YES</bool>
+							<array class="NSMutableArray" key="NSSubviews">
+								<reference ref="596750588"/>
+							</array>
+						</object>
+					</array>
+					<string key="NSFrameSize">{584, 341}</string>
+					<reference key="NSNextKeyView" ref="448510093"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
+				<string key="NSMinSize">{320, 262}</string>
+				<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
+				<string key="NSFrameAutosaveName">x11_prefs</string>
+			</object>
+			<object class="NSWindowTemplate" id="604417141">
+				<int key="NSWindowStyleMask">11</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{360, 402}, {454, 271}}</string>
+				<int key="NSWTFlags">1350041600</int>
+				<string key="NSWindowTitle">X11 アプリケーションメニュー</string>
+				<string key="NSWindowClass">NSPanel</string>
+				<object class="NSMutableString" key="NSViewClass">
+					<characters key="NS.bytes">View</characters>
+				</object>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
+				<string key="NSWindowContentMinSize">{454, 271}</string>
+				<object class="NSView" key="NSWindowView" id="85544634">
+					<nil key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSButton" id="671954382">
+							<reference key="NSNextResponder" ref="85544634"/>
+							<int key="NSvFlags">265</int>
+							<string key="NSFrame">{{340, 191}, {105, 32}}</string>
+							<reference key="NSSuperview" ref="85544634"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="143554520">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">137887744</int>
+								<string key="NSContents">複製</string>
+								<reference key="NSSupport" ref="463863101"/>
+								<reference key="NSControlView" ref="671954382"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">1</int>
+								<object class="NSFont" key="NSAlternateImage" id="549406736">
+									<string key="NSName">Helvetica</string>
+									<double key="NSSize">13</double>
+									<int key="NSfFlags">16</int>
+								</object>
+								<string key="NSAlternateContents"/>
+								<object class="NSMutableString" key="NSKeyEquivalent">
+									<characters key="NS.bytes"/>
+								</object>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSButton" id="492358940">
+							<reference key="NSNextResponder" ref="85544634"/>
+							<int key="NSvFlags">265</int>
+							<string key="NSFrame">{{340, 159}, {105, 32}}</string>
+							<reference key="NSSuperview" ref="85544634"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="8201128">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">137887744</int>
+								<string key="NSContents">削除</string>
+								<reference key="NSSupport" ref="463863101"/>
+								<reference key="NSControlView" ref="492358940"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">1</int>
+								<reference key="NSAlternateImage" ref="549406736"/>
+								<string key="NSAlternateContents"/>
+								<object class="NSMutableString" key="NSKeyEquivalent">
+									<characters key="NS.bytes"/>
+								</object>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSScrollView" id="1063387772">
+							<reference key="NSNextResponder" ref="85544634"/>
+							<int key="NSvFlags">274</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSClipView" id="580565898">
+									<reference key="NSNextResponder" ref="1063387772"/>
+									<int key="NSvFlags">2304</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<object class="NSTableView" id="905092943">
+											<reference key="NSNextResponder" ref="580565898"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrameSize">{301, 198}</string>
+											<reference key="NSSuperview" ref="580565898"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTableHeaderView" key="NSHeaderView" id="792419186">
+												<reference key="NSNextResponder" ref="672307654"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrameSize">{301, 17}</string>
+												<reference key="NSSuperview" ref="672307654"/>
+												<reference key="NSTableView" ref="905092943"/>
+											</object>
+											<object class="_NSCornerView" key="NSCornerView" id="898633680">
+												<reference key="NSNextResponder" ref="1063387772"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{302, 0}, {16, 17}}</string>
+												<reference key="NSSuperview" ref="1063387772"/>
+											</object>
+											<array class="NSMutableArray" key="NSTableColumns">
+												<object class="NSTableColumn" id="938444323">
+													<double key="NSWidth">103</double>
+													<double key="NSMinWidth">43</double>
+													<double key="NSMaxWidth">1000</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75628096</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">名前</string>
+														<reference key="NSSupport" ref="26"/>
+														<object class="NSColor" key="NSBackgroundColor" id="113872566">
+															<int key="NSColorSpace">3</int>
+															<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
+														</object>
+														<object class="NSColor" key="NSTextColor" id="249576247">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">headerTextColor</string>
+															<reference key="NSColor" ref="214098874"/>
+														</object>
+													</object>
+													<object class="NSTextFieldCell" key="NSDataCell" id="825378892">
+														<int key="NSCellFlags">338820672</int>
+														<int key="NSCellFlags2">1024</int>
+														<string key="NSContents">テキストセル</string>
+														<reference key="NSSupport" ref="463863101"/>
+														<string key="NSPlaceholderString"/>
+														<reference key="NSControlView" ref="905092943"/>
+														<object class="NSColor" key="NSBackgroundColor" id="822946413">
+															<int key="NSColorSpace">3</int>
+															<bytes key="NSWhite">MQA</bytes>
+														</object>
+														<reference key="NSTextColor" ref="930815747"/>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<bool key="NSIsEditable">YES</bool>
+													<reference key="NSTableView" ref="905092943"/>
+													<string key="NSHeaderToolTip"/>
+												</object>
+												<object class="NSTableColumn" id="84282687">
+													<double key="NSWidth">100</double>
+													<double key="NSMinWidth">40</double>
+													<double key="NSMaxWidth">1000</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75628096</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">コマンド</string>
+														<reference key="NSSupport" ref="26"/>
+														<reference key="NSBackgroundColor" ref="113872566"/>
+														<reference key="NSTextColor" ref="249576247"/>
+													</object>
+													<object class="NSTextFieldCell" key="NSDataCell" id="432610585">
+														<int key="NSCellFlags">338820672</int>
+														<int key="NSCellFlags2">1024</int>
+														<string key="NSContents">テキストセル</string>
+														<reference key="NSSupport" ref="463863101"/>
+														<string key="NSPlaceholderString"/>
+														<reference key="NSControlView" ref="905092943"/>
+														<reference key="NSBackgroundColor" ref="822946413"/>
+														<reference key="NSTextColor" ref="930815747"/>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<bool key="NSIsEditable">YES</bool>
+													<reference key="NSTableView" ref="905092943"/>
+													<string key="NSHeaderToolTip"/>
+												</object>
+												<object class="NSTableColumn" id="242608782">
+													<double key="NSWidth">89</double>
+													<double key="NSMinWidth">30</double>
+													<double key="NSMaxWidth">1000</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75628096</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">ショートカット</string>
+														<reference key="NSSupport" ref="26"/>
+														<object class="NSColor" key="NSBackgroundColor">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">headerColor</string>
+															<reference key="NSColor" ref="822946413"/>
+														</object>
+														<reference key="NSTextColor" ref="249576247"/>
+													</object>
+													<object class="NSTextFieldCell" key="NSDataCell" id="34714764">
+														<int key="NSCellFlags">338820672</int>
+														<int key="NSCellFlags2">1024</int>
+														<string key="NSContents">テキストセル</string>
+														<object class="NSFont" key="NSSupport">
+															<string key="NSName">LucidaGrande</string>
+															<double key="NSSize">12</double>
+															<int key="NSfFlags">16</int>
+														</object>
+														<string key="NSPlaceholderString"/>
+														<reference key="NSControlView" ref="905092943"/>
+														<bool key="NSDrawsBackground">YES</bool>
+														<object class="NSColor" key="NSBackgroundColor" id="812484075">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">controlBackgroundColor</string>
+															<reference key="NSColor" ref="590688762"/>
+														</object>
+														<reference key="NSTextColor" ref="930815747"/>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<bool key="NSIsEditable">YES</bool>
+													<reference key="NSTableView" ref="905092943"/>
+													<string key="NSHeaderToolTip"/>
+												</object>
+											</array>
+											<double key="NSIntercellSpacingWidth">3</double>
+											<double key="NSIntercellSpacingHeight">2</double>
+											<reference key="NSBackgroundColor" ref="822946413"/>
+											<object class="NSColor" key="NSGridColor">
+												<int key="NSColorSpace">6</int>
+												<string key="NSCatalogName">System</string>
+												<string key="NSColorName">gridColor</string>
+												<object class="NSColor" key="NSColor">
+													<int key="NSColorSpace">3</int>
+													<bytes key="NSWhite">MC41AA</bytes>
+												</object>
+											</object>
+											<double key="NSRowHeight">17</double>
+											<int key="NSTvFlags">1379958784</int>
+											<reference key="NSDelegate"/>
+											<reference key="NSDataSource"/>
+											<int key="NSColumnAutoresizingStyle">1</int>
+											<int key="NSDraggingSourceMaskForLocal">-1</int>
+											<int key="NSDraggingSourceMaskForNonLocal">0</int>
+											<bool key="NSAllowsTypeSelect">YES</bool>
+											<int key="NSTableViewDraggingDestinationStyle">0</int>
+											<int key="NSTableViewGroupRowStyle">1</int>
+										</object>
+									</array>
+									<string key="NSFrame">{{1, 17}, {301, 198}}</string>
+									<reference key="NSSuperview" ref="1063387772"/>
+									<reference key="NSNextKeyView" ref="905092943"/>
+									<reference key="NSDocView" ref="905092943"/>
+									<reference key="NSBGColor" ref="812484075"/>
+									<int key="NScvFlags">4</int>
+								</object>
+								<object class="NSScroller" id="842897584">
+									<reference key="NSNextResponder" ref="1063387772"/>
+									<int key="NSvFlags">256</int>
+									<string key="NSFrame">{{302, 17}, {15, 198}}</string>
+									<reference key="NSSuperview" ref="1063387772"/>
+									<reference key="NSTarget" ref="1063387772"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSPercent">0.99492377042770386</double>
+								</object>
+								<object class="NSScroller" id="17278747">
+									<reference key="NSNextResponder" ref="1063387772"/>
+									<int key="NSvFlags">256</int>
+									<string key="NSFrame">{{1, 215}, {301, 15}}</string>
+									<reference key="NSSuperview" ref="1063387772"/>
+									<int key="NSsFlags">1</int>
+									<reference key="NSTarget" ref="1063387772"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSPercent">0.68852460384368896</double>
+								</object>
+								<object class="NSClipView" id="672307654">
+									<reference key="NSNextResponder" ref="1063387772"/>
+									<int key="NSvFlags">2304</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<reference ref="792419186"/>
+									</array>
+									<string key="NSFrame">{{1, 0}, {301, 17}}</string>
+									<reference key="NSSuperview" ref="1063387772"/>
+									<reference key="NSNextKeyView" ref="792419186"/>
+									<reference key="NSDocView" ref="792419186"/>
+									<reference key="NSBGColor" ref="812484075"/>
+									<int key="NScvFlags">4</int>
+								</object>
+								<reference ref="898633680"/>
+							</array>
+							<string key="NSFrame">{{20, 20}, {318, 231}}</string>
+							<reference key="NSSuperview" ref="85544634"/>
+							<reference key="NSNextKeyView" ref="580565898"/>
+							<int key="NSsFlags">133170</int>
+							<reference key="NSVScroller" ref="842897584"/>
+							<reference key="NSHScroller" ref="17278747"/>
+							<reference key="NSContentView" ref="580565898"/>
+							<reference key="NSHeaderClipView" ref="672307654"/>
+							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
+						</object>
+						<object class="NSButton" id="758204686">
+							<reference key="NSNextResponder" ref="85544634"/>
+							<int key="NSvFlags">265</int>
+							<string key="NSFrame">{{340, 223}, {105, 32}}</string>
+							<reference key="NSSuperview" ref="85544634"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="1025474039">
+								<int key="NSCellFlags">-2080244224</int>
+								<int key="NSCellFlags2">137887744</int>
+								<string key="NSContents">項目を追加</string>
+								<reference key="NSSupport" ref="463863101"/>
+								<reference key="NSControlView" ref="758204686"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">1</int>
+								<reference key="NSAlternateImage" ref="549406736"/>
+								<string key="NSAlternateContents"/>
+								<object class="NSMutableString" key="NSKeyEquivalent">
+									<characters key="NS.bytes"/>
+								</object>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+					</array>
+					<string key="NSFrameSize">{454, 271}</string>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
+				<string key="NSMinSize">{454, 293}</string>
+				<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
+				<string key="NSFrameAutosaveName">x11_apps</string>
+			</object>
+			<object class="NSMenu" id="294137138">
+				<string key="NSTitle">メニュー</string>
+				<array class="NSMutableArray" key="NSMenuItems">
+					<object class="NSMenuItem" id="318286212">
+						<reference key="NSMenu" ref="294137138"/>
+						<bool key="NSIsDisabled">YES</bool>
+						<bool key="NSIsSeparator">YES</bool>
+						<string key="NSTitle"/>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="531645050"/>
+						<reference key="NSMixedImage" ref="351811234"/>
+					</object>
+					<object class="NSMenuItem" id="511651072">
+						<reference key="NSMenu" ref="294137138"/>
+						<string key="NSTitle">アプリケーション</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="531645050"/>
+						<reference key="NSMixedImage" ref="351811234"/>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="48278059">
+							<string key="NSTitle">アプリケーション</string>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="563798000">
+									<reference key="NSMenu" ref="48278059"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+								<object class="NSMenuItem" id="1032342329">
+									<reference key="NSMenu" ref="48278059"/>
+									<string key="NSTitle">カスタマイズ...</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="351811234"/>
+								</object>
+							</array>
+						</object>
+					</object>
+				</array>
+				<string key="NSName"/>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">copy:</string>
+						<reference key="source" ref="941939442"/>
+						<reference key="destination" ref="185296989"/>
+					</object>
+					<int key="connectionID">181</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">minimize_window:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="677652931"/>
+					</object>
+					<int key="connectionID">202</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">close_window:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="984461797"/>
+					</object>
+					<int key="connectionID">205</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">zoom_window:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="1066447520"/>
+					</object>
+					<int key="connectionID">206</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">bring_to_front:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="276216762"/>
+					</object>
+					<int key="connectionID">207</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">hideOtherApplications:</string>
+						<reference key="source" ref="815810918"/>
+						<reference key="destination" ref="206802571"/>
+					</object>
+					<int key="connectionID">263</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">apps_separator</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="390088328"/>
+					</object>
+					<int key="connectionID">273</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">apps_table</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="905092943"/>
+					</object>
+					<int key="connectionID">301</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">apps_table_delete:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="492358940"/>
+					</object>
+					<int key="connectionID">303</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">apps_table_duplicate:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="671954382"/>
+					</object>
+					<int key="connectionID">304</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">apps_table_show:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="1065386165"/>
+					</object>
+					<int key="connectionID">308</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">apps_table_new:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="758204686"/>
+					</object>
+					<int key="connectionID">311</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_show:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="386173216"/>
+					</object>
+					<int key="connectionID">318</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">x11_about_item</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="139290918"/>
+					</object>
+					<int key="connectionID">321</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">enable_auth</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="989050925"/>
+					</object>
+					<int key="connectionID">387</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">enable_tcp</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="700826966"/>
+					</object>
+					<int key="connectionID">388</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">depth</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="709074847"/>
+					</object>
+					<int key="connectionID">389</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">fake_buttons</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="119157981"/>
+					</object>
+					<int key="connectionID">391</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">sync_keymap</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="179949713"/>
+					</object>
+					<int key="connectionID">392</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">enable_keyequivs</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="842100515"/>
+					</object>
+					<int key="connectionID">393</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="119157981"/>
+					</object>
+					<int key="connectionID">394</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="179949713"/>
+					</object>
+					<int key="connectionID">395</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="842100515"/>
+					</object>
+					<int key="connectionID">396</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="709074847"/>
+					</object>
+					<int key="connectionID">398</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="989050925"/>
+					</object>
+					<int key="connectionID">399</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="700826966"/>
+					</object>
+					<int key="connectionID">401</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">prefs_panel</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="124913468"/>
+					</object>
+					<int key="connectionID">402</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">x11_help:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="504984881"/>
+					</object>
+					<int key="connectionID">422</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">dockMenu</string>
+						<reference key="source" ref="815810918"/>
+						<reference key="destination" ref="294137138"/>
+					</object>
+					<int key="connectionID">426</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">dock_menu</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="294137138"/>
+					</object>
+					<int key="connectionID">428</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="815810918"/>
+						<reference key="destination" ref="485884620"/>
+					</object>
+					<int key="connectionID">429</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">hide:</string>
+						<reference key="source" ref="815810918"/>
+						<reference key="destination" ref="301008465"/>
+					</object>
+					<int key="connectionID">430</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">unhideAllApplications:</string>
+						<reference key="source" ref="815810918"/>
+						<reference key="destination" ref="1023546148"/>
+					</object>
+					<int key="connectionID">431</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">orderFrontStandardAboutPanel:</string>
+						<reference key="source" ref="815810918"/>
+						<reference key="destination" ref="139290918"/>
+					</object>
+					<int key="connectionID">433</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">dock_apps_menu</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="48278059"/>
+					</object>
+					<int key="connectionID">530</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">dock_window_separator</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="318286212"/>
+					</object>
+					<int key="connectionID">531</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">apps_table_show:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="1032342329"/>
+					</object>
+					<int key="connectionID">534</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">next_window:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="1036389925"/>
+					</object>
+					<int key="connectionID">539</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">previous_window:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="369641893"/>
+					</object>
+					<int key="connectionID">540</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">enable_fullscreen</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="477203622"/>
+					</object>
+					<int key="connectionID">546</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">enable_fullscreen_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="477203622"/>
+					</object>
+					<int key="connectionID">547</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggle_fullscreen:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="6876565"/>
+					</object>
+					<int key="connectionID">548</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">toggle_fullscreen_item</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="6876565"/>
+					</object>
+					<int key="connectionID">549</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">menu</string>
+						<reference key="source" ref="815810918"/>
+						<reference key="destination" ref="524015605"/>
+					</object>
+					<int key="connectionID">300334</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">terminate:</string>
+						<reference key="source" ref="815810918"/>
+						<reference key="destination" ref="274138642"/>
+					</object>
+					<int key="connectionID">300336</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="657659108"/>
+					</object>
+					<int key="connectionID">300389</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="992839333"/>
+					</object>
+					<int key="connectionID">300390</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="128352289"/>
+					</object>
+					<int key="connectionID">300391</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">click_through</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="657659108"/>
+					</object>
+					<int key="connectionID">300392</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">focus_follows_mouse</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="992839333"/>
+					</object>
+					<int key="connectionID">300393</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">focus_on_new_window</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="128352289"/>
+					</object>
+					<int key="connectionID">300394</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">copy_menu_item</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="185296989"/>
+					</object>
+					<int key="connectionID">300443</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">sync_pasteboard</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="878106058"/>
+					</object>
+					<int key="connectionID">300444</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">sync_clipboard_to_pasteboard</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="487809555"/>
+					</object>
+					<int key="connectionID">300461</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">sync_pasteboard_to_clipboard</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="477050998"/>
+					</object>
+					<int key="connectionID">300462</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">sync_pasteboard_to_primary</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="765780304"/>
+					</object>
+					<int key="connectionID">300463</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">sync_primary_immediately</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="1002778833"/>
+					</object>
+					<int key="connectionID">300464</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="878106058"/>
+					</object>
+					<int key="connectionID">300465</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="487809555"/>
+					</object>
+					<int key="connectionID">300466</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="477050998"/>
+					</object>
+					<int key="connectionID">300467</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="765780304"/>
+					</object>
+					<int key="connectionID">300468</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="1002778833"/>
+					</object>
+					<int key="connectionID">300469</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">sync_text1</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="620944856"/>
+					</object>
+					<int key="connectionID">300470</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">sync_text2</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="522511724"/>
+					</object>
+					<int key="connectionID">300471</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">enable_fullscreen_menu</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="57246850"/>
+					</object>
+					<int key="connectionID">300474</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="57246850"/>
+					</object>
+					<int key="connectionID">300475</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="406291430"/>
+					</object>
+					<int key="connectionID">300480</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">option_sends_alt</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="406291430"/>
+					</object>
+					<int key="connectionID">300481</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="863505041"/>
+					</object>
+					<int key="connectionID">300484</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">enable_fullscreen_menu_text</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="331853183"/>
+					</object>
+					<int key="connectionID">300489</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">scroll_in_device_direction</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="863505041"/>
+					</object>
+					<int key="connectionID">300490</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="904585544"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="815810918"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="941939442"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="951368722"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">29</int>
+						<reference key="object" ref="524015605"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="931553638"/>
+							<reference ref="365880285"/>
+							<reference ref="200491363"/>
+							<reference ref="868031522"/>
+							<reference ref="551174276"/>
+						</array>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">MainMenu</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">19</int>
+						<reference key="object" ref="931553638"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="96874957"/>
+						</array>
+						<reference key="parent" ref="524015605"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">24</int>
+						<reference key="object" ref="96874957"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="677652931"/>
+							<reference ref="276216762"/>
+							<reference ref="1066447520"/>
+							<reference ref="1036389925"/>
+							<reference ref="369641893"/>
+							<reference ref="155085383"/>
+							<reference ref="984461797"/>
+							<reference ref="280172320"/>
+						</array>
+						<reference key="parent" ref="931553638"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5</int>
+						<reference key="object" ref="276216762"/>
+						<reference key="parent" ref="96874957"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">23</int>
+						<reference key="object" ref="677652931"/>
+						<reference key="parent" ref="96874957"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">92</int>
+						<reference key="object" ref="280172320"/>
+						<reference key="parent" ref="96874957"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">203</int>
+						<reference key="object" ref="984461797"/>
+						<reference key="parent" ref="96874957"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">204</int>
+						<reference key="object" ref="1066447520"/>
+						<reference key="parent" ref="96874957"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">536</int>
+						<reference key="object" ref="155085383"/>
+						<reference key="parent" ref="96874957"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">537</int>
+						<reference key="object" ref="1036389925"/>
+						<reference key="parent" ref="96874957"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">538</int>
+						<reference key="object" ref="369641893"/>
+						<reference key="parent" ref="96874957"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">56</int>
+						<reference key="object" ref="365880285"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="576521955"/>
+						</array>
+						<reference key="parent" ref="524015605"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">57</int>
+						<reference key="object" ref="576521955"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="139290918"/>
+							<reference ref="386173216"/>
+							<reference ref="32285361"/>
+							<reference ref="301008465"/>
+							<reference ref="274138642"/>
+							<reference ref="272876017"/>
+							<reference ref="431301145"/>
+							<reference ref="206802571"/>
+							<reference ref="848095279"/>
+							<reference ref="1023546148"/>
+							<reference ref="6876565"/>
+							<reference ref="479677589"/>
+						</array>
+						<reference key="parent" ref="365880285"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">58</int>
+						<reference key="object" ref="139290918"/>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">129</int>
+						<reference key="object" ref="386173216"/>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">131</int>
+						<reference key="object" ref="32285361"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="821388474"/>
+						</array>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">130</int>
+						<reference key="object" ref="821388474"/>
+						<reference key="parent" ref="32285361"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">134</int>
+						<reference key="object" ref="301008465"/>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">136</int>
+						<reference key="object" ref="274138642"/>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">143</int>
+						<reference key="object" ref="272876017"/>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">144</int>
+						<reference key="object" ref="431301145"/>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">145</int>
+						<reference key="object" ref="206802571"/>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">149</int>
+						<reference key="object" ref="848095279"/>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">150</int>
+						<reference key="object" ref="1023546148"/>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">544</int>
+						<reference key="object" ref="6876565"/>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">545</int>
+						<reference key="object" ref="479677589"/>
+						<reference key="parent" ref="576521955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">163</int>
+						<reference key="object" ref="200491363"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="526778998"/>
+						</array>
+						<reference key="parent" ref="524015605"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">169</int>
+						<reference key="object" ref="526778998"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="185296989"/>
+						</array>
+						<reference key="parent" ref="200491363"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">157</int>
+						<reference key="object" ref="185296989"/>
+						<reference key="parent" ref="526778998"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">269</int>
+						<reference key="object" ref="868031522"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="981161348"/>
+						</array>
+						<reference key="parent" ref="524015605"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">270</int>
+						<reference key="object" ref="981161348"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="390088328"/>
+							<reference ref="1065386165"/>
+						</array>
+						<reference key="parent" ref="868031522"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">272</int>
+						<reference key="object" ref="390088328"/>
+						<reference key="parent" ref="981161348"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">305</int>
+						<reference key="object" ref="1065386165"/>
+						<reference key="parent" ref="981161348"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">419</int>
+						<reference key="object" ref="551174276"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="511848303"/>
+						</array>
+						<reference key="parent" ref="524015605"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">420</int>
+						<reference key="object" ref="511848303"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="504984881"/>
+						</array>
+						<reference key="parent" ref="551174276"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">421</int>
+						<reference key="object" ref="504984881"/>
+						<reference key="parent" ref="511848303"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">196</int>
+						<reference key="object" ref="485884620"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">X11Controller</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">244</int>
+						<reference key="object" ref="124913468"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="941366957"/>
+						</array>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">PrefsPanel</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">245</int>
+						<reference key="object" ref="941366957"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="448510093"/>
+						</array>
+						<reference key="parent" ref="124913468"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">348</int>
+						<reference key="object" ref="448510093"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="287591690"/>
+							<reference ref="960678392"/>
+							<reference ref="348328898"/>
+							<reference ref="10973343"/>
+							<reference ref="723450037"/>
+						</array>
+						<reference key="parent" ref="941366957"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">349</int>
+						<reference key="object" ref="287591690"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="596750588"/>
+						</array>
+						<reference key="parent" ref="448510093"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">351</int>
+						<reference key="object" ref="596750588"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="119157981"/>
+							<reference ref="443008216"/>
+							<reference ref="282885445"/>
+							<reference ref="842100515"/>
+							<reference ref="31160162"/>
+							<reference ref="179949713"/>
+							<reference ref="278155937"/>
+							<reference ref="406291430"/>
+							<reference ref="863505041"/>
+						</array>
+						<reference key="parent" ref="287591690"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">363</int>
+						<reference key="object" ref="119157981"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="990762273"/>
+						</array>
+						<reference key="parent" ref="596750588"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">364</int>
+						<reference key="object" ref="443008216"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="391919450"/>
+						</array>
+						<reference key="parent" ref="596750588"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">365</int>
+						<reference key="object" ref="282885445"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="649334366"/>
+						</array>
+						<reference key="parent" ref="596750588"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">368</int>
+						<reference key="object" ref="842100515"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="940564599"/>
+						</array>
+						<reference key="parent" ref="596750588"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">369</int>
+						<reference key="object" ref="31160162"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="666057093"/>
+						</array>
+						<reference key="parent" ref="596750588"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">370</int>
+						<reference key="object" ref="179949713"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="967619578"/>
+						</array>
+						<reference key="parent" ref="596750588"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">352</int>
+						<reference key="object" ref="960678392"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="515308735"/>
+						</array>
+						<reference key="parent" ref="448510093"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">350</int>
+						<reference key="object" ref="515308735"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="709074847"/>
+							<reference ref="201731424"/>
+							<reference ref="86150604"/>
+							<reference ref="477203622"/>
+							<reference ref="57246850"/>
+							<reference ref="298603383"/>
+							<reference ref="331853183"/>
+						</array>
+						<reference key="parent" ref="960678392"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">382</int>
+						<reference key="object" ref="709074847"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="633115429"/>
+						</array>
+						<reference key="parent" ref="515308735"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">385</int>
+						<reference key="object" ref="201731424"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="930265681"/>
+						</array>
+						<reference key="parent" ref="515308735"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">386</int>
+						<reference key="object" ref="86150604"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="311969422"/>
+						</array>
+						<reference key="parent" ref="515308735"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">541</int>
+						<reference key="object" ref="477203622"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="631531164"/>
+						</array>
+						<reference key="parent" ref="515308735"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">543</int>
+						<reference key="object" ref="298603383"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="761107402"/>
+						</array>
+						<reference key="parent" ref="515308735"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">353</int>
+						<reference key="object" ref="348328898"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="300811574"/>
+						</array>
+						<reference key="parent" ref="448510093"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">354</int>
+						<reference key="object" ref="300811574"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="989050925"/>
+							<reference ref="700826966"/>
+							<reference ref="168436707"/>
+							<reference ref="363817195"/>
+							<reference ref="223835729"/>
+						</array>
+						<reference key="parent" ref="348328898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">374</int>
+						<reference key="object" ref="989050925"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="189594322"/>
+						</array>
+						<reference key="parent" ref="300811574"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">375</int>
+						<reference key="object" ref="700826966"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="489340979"/>
+						</array>
+						<reference key="parent" ref="300811574"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">376</int>
+						<reference key="object" ref="168436707"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="53243865"/>
+						</array>
+						<reference key="parent" ref="300811574"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">377</int>
+						<reference key="object" ref="363817195"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="390084685"/>
+						</array>
+						<reference key="parent" ref="300811574"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">379</int>
+						<reference key="object" ref="223835729"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="283628678"/>
+						</array>
+						<reference key="parent" ref="300811574"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">285</int>
+						<reference key="object" ref="604417141"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="85544634"/>
+						</array>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">EditPrograms</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">286</int>
+						<reference key="object" ref="85544634"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1063387772"/>
+							<reference ref="758204686"/>
+							<reference ref="671954382"/>
+							<reference ref="492358940"/>
+						</array>
+						<reference key="parent" ref="604417141"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">423</int>
+						<reference key="object" ref="294137138"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="318286212"/>
+							<reference ref="511651072"/>
+						</array>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">DockMenu</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">524</int>
+						<reference key="object" ref="318286212"/>
+						<reference key="parent" ref="294137138"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">526</int>
+						<reference key="object" ref="511651072"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="48278059"/>
+						</array>
+						<reference key="parent" ref="294137138"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">527</int>
+						<reference key="object" ref="48278059"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1032342329"/>
+							<reference ref="563798000"/>
+						</array>
+						<reference key="parent" ref="511651072"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">532</int>
+						<reference key="object" ref="1032342329"/>
+						<reference key="parent" ref="48278059"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">533</int>
+						<reference key="object" ref="563798000"/>
+						<reference key="parent" ref="48278059"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100363</int>
+						<reference key="object" ref="990762273"/>
+						<reference key="parent" ref="119157981"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100364</int>
+						<reference key="object" ref="391919450"/>
+						<reference key="parent" ref="443008216"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100365</int>
+						<reference key="object" ref="649334366"/>
+						<reference key="parent" ref="282885445"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100368</int>
+						<reference key="object" ref="940564599"/>
+						<reference key="parent" ref="842100515"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100369</int>
+						<reference key="object" ref="666057093"/>
+						<reference key="parent" ref="31160162"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100370</int>
+						<reference key="object" ref="967619578"/>
+						<reference key="parent" ref="179949713"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100382</int>
+						<reference key="object" ref="633115429"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="341113515"/>
+						</array>
+						<reference key="parent" ref="709074847"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100385</int>
+						<reference key="object" ref="930265681"/>
+						<reference key="parent" ref="201731424"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100386</int>
+						<reference key="object" ref="311969422"/>
+						<reference key="parent" ref="86150604"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100541</int>
+						<reference key="object" ref="631531164"/>
+						<reference key="parent" ref="477203622"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100543</int>
+						<reference key="object" ref="761107402"/>
+						<reference key="parent" ref="298603383"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100374</int>
+						<reference key="object" ref="189594322"/>
+						<reference key="parent" ref="989050925"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100375</int>
+						<reference key="object" ref="489340979"/>
+						<reference key="parent" ref="700826966"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100376</int>
+						<reference key="object" ref="53243865"/>
+						<reference key="parent" ref="168436707"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100377</int>
+						<reference key="object" ref="390084685"/>
+						<reference key="parent" ref="363817195"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100379</int>
+						<reference key="object" ref="283628678"/>
+						<reference key="parent" ref="223835729"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">380</int>
+						<reference key="object" ref="341113515"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="759499526"/>
+							<reference ref="616492372"/>
+							<reference ref="543935434"/>
+							<reference ref="836673018"/>
+						</array>
+						<reference key="parent" ref="633115429"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">435</int>
+						<reference key="object" ref="759499526"/>
+						<reference key="parent" ref="341113515"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">384</int>
+						<reference key="object" ref="616492372"/>
+						<reference key="parent" ref="341113515"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">383</int>
+						<reference key="object" ref="543935434"/>
+						<reference key="parent" ref="341113515"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">381</int>
+						<reference key="object" ref="836673018"/>
+						<reference key="parent" ref="341113515"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">295</int>
+						<reference key="object" ref="1063387772"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="792419186"/>
+							<reference ref="17278747"/>
+							<reference ref="842897584"/>
+							<reference ref="905092943"/>
+						</array>
+						<reference key="parent" ref="85544634"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300295</int>
+						<reference key="object" ref="792419186"/>
+						<reference key="parent" ref="1063387772"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">200295</int>
+						<reference key="object" ref="17278747"/>
+						<reference key="parent" ref="1063387772"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100295</int>
+						<reference key="object" ref="842897584"/>
+						<reference key="parent" ref="1063387772"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">296</int>
+						<reference key="object" ref="905092943"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="242608782"/>
+							<reference ref="938444323"/>
+							<reference ref="84282687"/>
+						</array>
+						<reference key="parent" ref="1063387772"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">535</int>
+						<reference key="object" ref="242608782"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="34714764"/>
+						</array>
+						<reference key="parent" ref="905092943"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">575</int>
+						<reference key="object" ref="34714764"/>
+						<reference key="parent" ref="242608782"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">298</int>
+						<reference key="object" ref="938444323"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="825378892"/>
+						</array>
+						<reference key="parent" ref="905092943"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">573</int>
+						<reference key="object" ref="825378892"/>
+						<reference key="parent" ref="938444323"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">297</int>
+						<reference key="object" ref="84282687"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="432610585"/>
+						</array>
+						<reference key="parent" ref="905092943"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">574</int>
+						<reference key="object" ref="432610585"/>
+						<reference key="parent" ref="84282687"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">310</int>
+						<reference key="object" ref="758204686"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1025474039"/>
+						</array>
+						<reference key="parent" ref="85544634"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100310</int>
+						<reference key="object" ref="1025474039"/>
+						<reference key="parent" ref="758204686"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">292</int>
+						<reference key="object" ref="671954382"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="143554520"/>
+						</array>
+						<reference key="parent" ref="85544634"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100292</int>
+						<reference key="object" ref="143554520"/>
+						<reference key="parent" ref="671954382"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">293</int>
+						<reference key="object" ref="492358940"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="8201128"/>
+						</array>
+						<reference key="parent" ref="85544634"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100293</int>
+						<reference key="object" ref="8201128"/>
+						<reference key="parent" ref="492358940"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300337</int>
+						<reference key="object" ref="10973343"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="184765684"/>
+						</array>
+						<reference key="parent" ref="448510093"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300338</int>
+						<reference key="object" ref="184765684"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="657659108"/>
+							<reference ref="290578835"/>
+							<reference ref="992839333"/>
+							<reference ref="138261120"/>
+							<reference ref="128352289"/>
+							<reference ref="57161931"/>
+						</array>
+						<reference key="parent" ref="10973343"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300358</int>
+						<reference key="object" ref="290578835"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="399127858"/>
+						</array>
+						<reference key="parent" ref="184765684"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300359</int>
+						<reference key="object" ref="657659108"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="259618205"/>
+						</array>
+						<reference key="parent" ref="184765684"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300360</int>
+						<reference key="object" ref="259618205"/>
+						<reference key="parent" ref="657659108"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300361</int>
+						<reference key="object" ref="399127858"/>
+						<reference key="parent" ref="290578835"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300362</int>
+						<reference key="object" ref="992839333"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="959555182"/>
+						</array>
+						<reference key="parent" ref="184765684"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300363</int>
+						<reference key="object" ref="959555182"/>
+						<reference key="parent" ref="992839333"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300364</int>
+						<reference key="object" ref="138261120"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="183409141"/>
+						</array>
+						<reference key="parent" ref="184765684"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300365</int>
+						<reference key="object" ref="183409141"/>
+						<reference key="parent" ref="138261120"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300368</int>
+						<reference key="object" ref="128352289"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="556463187"/>
+						</array>
+						<reference key="parent" ref="184765684"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300369</int>
+						<reference key="object" ref="556463187"/>
+						<reference key="parent" ref="128352289"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300370</int>
+						<reference key="object" ref="57161931"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="989804990"/>
+						</array>
+						<reference key="parent" ref="184765684"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300371</int>
+						<reference key="object" ref="989804990"/>
+						<reference key="parent" ref="57161931"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300421</int>
+						<reference key="object" ref="723450037"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="408298283"/>
+						</array>
+						<reference key="parent" ref="448510093"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300422</int>
+						<reference key="object" ref="408298283"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="878106058"/>
+							<reference ref="386152084"/>
+							<reference ref="487809555"/>
+							<reference ref="620944856"/>
+							<reference ref="477050998"/>
+							<reference ref="765780304"/>
+							<reference ref="1002778833"/>
+							<reference ref="522511724"/>
+						</array>
+						<reference key="parent" ref="723450037"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300423</int>
+						<reference key="object" ref="386152084"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="572508492"/>
+						</array>
+						<reference key="parent" ref="408298283"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300424</int>
+						<reference key="object" ref="878106058"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="718083688"/>
+						</array>
+						<reference key="parent" ref="408298283"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300440</int>
+						<reference key="object" ref="718083688"/>
+						<reference key="parent" ref="878106058"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300441</int>
+						<reference key="object" ref="572508492"/>
+						<reference key="parent" ref="386152084"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300447</int>
+						<reference key="object" ref="477050998"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="501304422"/>
+						</array>
+						<reference key="parent" ref="408298283"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300450</int>
+						<reference key="object" ref="501304422"/>
+						<reference key="parent" ref="477050998"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300451</int>
+						<reference key="object" ref="765780304"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="510771323"/>
+						</array>
+						<reference key="parent" ref="408298283"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300452</int>
+						<reference key="object" ref="510771323"/>
+						<reference key="parent" ref="765780304"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300453</int>
+						<reference key="object" ref="487809555"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="619977658"/>
+						</array>
+						<reference key="parent" ref="408298283"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300454</int>
+						<reference key="object" ref="619977658"/>
+						<reference key="parent" ref="487809555"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300455</int>
+						<reference key="object" ref="620944856"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="461823902"/>
+						</array>
+						<reference key="parent" ref="408298283"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300456</int>
+						<reference key="object" ref="461823902"/>
+						<reference key="parent" ref="620944856"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300457</int>
+						<reference key="object" ref="1002778833"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="897099877"/>
+						</array>
+						<reference key="parent" ref="408298283"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300458</int>
+						<reference key="object" ref="897099877"/>
+						<reference key="parent" ref="1002778833"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300459</int>
+						<reference key="object" ref="522511724"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="994587858"/>
+						</array>
+						<reference key="parent" ref="408298283"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300460</int>
+						<reference key="object" ref="994587858"/>
+						<reference key="parent" ref="522511724"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300472</int>
+						<reference key="object" ref="57246850"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="917248662"/>
+						</array>
+						<reference key="parent" ref="515308735"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300473</int>
+						<reference key="object" ref="917248662"/>
+						<reference key="parent" ref="57246850"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300476</int>
+						<reference key="object" ref="278155937"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="617441821"/>
+						</array>
+						<reference key="parent" ref="596750588"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300477</int>
+						<reference key="object" ref="406291430"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="67728988"/>
+						</array>
+						<reference key="parent" ref="596750588"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300478</int>
+						<reference key="object" ref="67728988"/>
+						<reference key="parent" ref="406291430"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300479</int>
+						<reference key="object" ref="617441821"/>
+						<reference key="parent" ref="278155937"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300482</int>
+						<reference key="object" ref="863505041"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1016286396"/>
+						</array>
+						<reference key="parent" ref="596750588"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300483</int>
+						<reference key="object" ref="1016286396"/>
+						<reference key="parent" ref="863505041"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300487</int>
+						<reference key="object" ref="331853183"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1042813110"/>
+						</array>
+						<reference key="parent" ref="515308735"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300488</int>
+						<reference key="object" ref="1042813110"/>
+						<reference key="parent" ref="331853183"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="-3.ImportedFromIB2"/>
+				<string key="100292.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100293.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="100295.IBShouldRemoveOnLegacySave"/>
+				<string key="100310.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100363.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100364.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100365.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100368.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100369.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100374.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100375.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100376.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100377.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100379.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100382.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100385.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100386.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100541.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100543.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="129.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="129.ImportedFromIB2"/>
+				<string key="130.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="130.ImportedFromIB2"/>
+				<string key="131.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="131.ImportedFromIB2"/>
+				<string key="134.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="134.ImportedFromIB2"/>
+				<string key="136.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="136.ImportedFromIB2"/>
+				<string key="143.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="143.ImportedFromIB2"/>
+				<string key="144.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="144.ImportedFromIB2"/>
+				<string key="145.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="145.ImportedFromIB2"/>
+				<string key="149.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="149.ImportedFromIB2"/>
+				<string key="150.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="150.ImportedFromIB2"/>
+				<string key="157.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="157.ImportedFromIB2"/>
+				<string key="163.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="163.ImportedFromIB2"/>
+				<string key="169.IBEditorWindowLastContentRect">{{168, 821}, {113, 23}}</string>
+				<string key="169.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="169.ImportedFromIB2"/>
+				<string key="169.editorWindowContentRectSynchronizationRect">{{202, 626}, {154, 153}}</string>
+				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="19.ImportedFromIB2"/>
+				<integer value="1" key="196.ImportedFromIB2"/>
+				<string key="200295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="200295.IBShouldRemoveOnLegacySave"/>
+				<string key="203.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="203.ImportedFromIB2"/>
+				<string key="204.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="204.ImportedFromIB2"/>
+				<string key="23.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="23.ImportedFromIB2"/>
+				<string key="24.IBEditorWindowLastContentRect">{{349, 868}, {315, 143}}</string>
+				<string key="24.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="24.ImportedFromIB2"/>
+				<string key="24.editorWindowContentRectSynchronizationRect">{{271, 666}, {301, 153}}</string>
+				<string key="244.IBEditorWindowLastContentRect">{{507, 515}, {584, 341}}</string>
+				<string key="244.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="YES" key="244.IBViewEditorWindowController.showingLayoutRectangles"/>
+				<string key="244.IBWindowTemplateEditedContentRect">{{507, 515}, {584, 341}}</string>
+				<integer value="1" key="244.ImportedFromIB2"/>
+				<string key="244.editorWindowContentRectSynchronizationRect">{{184, 290}, {481, 345}}</string>
+				<boolean value="YES" key="244.windowTemplate.hasMinSize"/>
+				<string key="244.windowTemplate.maxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
+				<string key="244.windowTemplate.minSize">{320, 240}</string>
+				<string key="245.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="245.ImportedFromIB2"/>
+				<string key="269.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="269.ImportedFromIB2"/>
+				<string key="270.IBEditorWindowLastContentRect">{{58, 803}, {155, 33}}</string>
+				<string key="270.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="270.ImportedFromIB2"/>
+				<string key="270.editorWindowContentRectSynchronizationRect">{{100, 746}, {155, 33}}</string>
+				<string key="272.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="272.ImportedFromIB2"/>
+				<string key="285.IBEditorWindowLastContentRect">{{68, 585}, {454, 271}}</string>
+				<string key="285.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="285.IBViewEditorWindowController.showingBoundsRectangles"/>
+				<integer value="1" key="285.IBViewEditorWindowController.showingLayoutRectangles"/>
+				<string key="285.IBWindowTemplateEditedContentRect">{{68, 585}, {454, 271}}</string>
+				<integer value="1" key="285.ImportedFromIB2"/>
+				<string key="285.editorWindowContentRectSynchronizationRect">{{433, 406}, {486, 327}}</string>
+				<boolean value="YES" key="285.windowTemplate.hasMinSize"/>
+				<string key="285.windowTemplate.maxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
+				<string key="285.windowTemplate.minSize">{454, 271}</string>
+				<string key="286.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="286.ImportedFromIB2"/>
+				<string key="29.IBEditorWindowLastContentRect">{{145, 1011}, {336, 20}}</string>
+				<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="29.ImportedFromIB2"/>
+				<string key="29.editorWindowContentRectSynchronizationRect">{{67, 819}, {336, 20}}</string>
+				<string key="292.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="292.ImportedFromIB2"/>
+				<string key="293.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="293.ImportedFromIB2"/>
+				<string key="295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="295.ImportedFromIB2"/>
+				<string key="296.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="296.ImportedFromIB2"/>
+				<string key="297.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="297.ImportedFromIB2"/>
+				<string key="298.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="298.ImportedFromIB2"/>
+				<string key="300295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300295.IBShouldRemoveOnLegacySave"/>
+				<string key="300337.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300337.ImportedFromIB2"/>
+				<string key="300338.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300338.ImportedFromIB2"/>
+				<string key="300358.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300358.ImportedFromIB2"/>
+				<string key="300359.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300359.ImportedFromIB2"/>
+				<string key="300360.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300361.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300362.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300362.ImportedFromIB2"/>
+				<string key="300363.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300364.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300364.ImportedFromIB2"/>
+				<string key="300365.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300368.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300368.ImportedFromIB2"/>
+				<string key="300369.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300370.ImportedFromIB2"/>
+				<string key="300371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300421.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300421.ImportedFromIB2"/>
+				<string key="300422.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300422.ImportedFromIB2"/>
+				<string key="300423.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300423.ImportedFromIB2"/>
+				<string key="300424.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300424.ImportedFromIB2"/>
+				<string key="300440.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300441.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300447.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300447.ImportedFromIB2"/>
+				<string key="300450.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300451.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300451.ImportedFromIB2"/>
+				<string key="300452.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300453.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300453.ImportedFromIB2"/>
+				<string key="300454.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300455.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300455.ImportedFromIB2"/>
+				<string key="300456.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300457.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300457.ImportedFromIB2"/>
+				<string key="300458.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300459.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300459.ImportedFromIB2"/>
+				<string key="300460.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300472.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300472.ImportedFromIB2"/>
+				<string key="300473.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300476.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300476.ImportedFromIB2"/>
+				<string key="300477.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300477.ImportedFromIB2"/>
+				<string key="300478.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300479.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300482.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300482.ImportedFromIB2"/>
+				<string key="300483.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300487.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300487.ImportedFromIB2"/>
+				<string key="300488.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="305.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="305.ImportedFromIB2"/>
+				<string key="310.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="310.ImportedFromIB2"/>
+				<string key="348.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="348.ImportedFromIB2"/>
+				<string key="349.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="349.ImportedFromIB2"/>
+				<string key="350.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="350.ImportedFromIB2"/>
+				<string key="351.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="351.ImportedFromIB2"/>
+				<string key="352.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="352.ImportedFromIB2"/>
+				<string key="353.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="353.ImportedFromIB2"/>
+				<string key="354.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="354.ImportedFromIB2"/>
+				<string key="363.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="363.ImportedFromIB2"/>
+				<string key="364.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="364.ImportedFromIB2"/>
+				<string key="365.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="365.ImportedFromIB2"/>
+				<string key="368.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="368.ImportedFromIB2"/>
+				<string key="369.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="369.ImportedFromIB2"/>
+				<string key="370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="370.ImportedFromIB2"/>
+				<string key="374.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="374.ImportedFromIB2"/>
+				<string key="375.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="375.ImportedFromIB2"/>
+				<string key="376.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="376.ImportedFromIB2"/>
+				<string key="377.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="377.ImportedFromIB2"/>
+				<string key="379.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="379.ImportedFromIB2"/>
+				<string key="380.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="380.ImportedFromIB2"/>
+				<string key="381.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="381.ImportedFromIB2"/>
+				<string key="382.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="382.ImportedFromIB2"/>
+				<string key="383.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="383.ImportedFromIB2"/>
+				<string key="384.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="384.ImportedFromIB2"/>
+				<string key="385.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="385.ImportedFromIB2"/>
+				<string key="386.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="386.ImportedFromIB2"/>
+				<string key="419.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="419.ImportedFromIB2"/>
+				<string key="420.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="420.ImportedFromIB2"/>
+				<string key="421.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="421.ImportedFromIB2"/>
+				<string key="423.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="423.ImportedFromIB2"/>
+				<string key="435.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="435.ImportedFromIB2"/>
+				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="5.ImportedFromIB2"/>
+				<string key="524.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="524.ImportedFromIB2"/>
+				<string key="526.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="526.ImportedFromIB2"/>
+				<string key="527.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="527.ImportedFromIB2"/>
+				<string key="532.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="532.ImportedFromIB2"/>
+				<string key="533.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="533.ImportedFromIB2"/>
+				<string key="535.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="535.ImportedFromIB2"/>
+				<string key="536.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="536.ImportedFromIB2"/>
+				<string key="537.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="537.ImportedFromIB2"/>
+				<string key="538.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="538.ImportedFromIB2"/>
+				<string key="541.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="541.ImportedFromIB2"/>
+				<string key="543.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="543.ImportedFromIB2"/>
+				<string key="544.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="544.ImportedFromIB2"/>
+				<string key="545.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="545.ImportedFromIB2"/>
+				<string key="56.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="56.ImportedFromIB2"/>
+				<string key="57.IBEditorWindowLastContentRect">{{20, 641}, {218, 203}}</string>
+				<string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="57.ImportedFromIB2"/>
+				<string key="57.editorWindowContentRectSynchronizationRect">{{79, 616}, {218, 203}}</string>
+				<string key="573.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="573.ImportedFromIB2"/>
+				<string key="574.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="574.ImportedFromIB2"/>
+				<string key="575.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="575.ImportedFromIB2"/>
+				<string key="58.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="58.ImportedFromIB2"/>
+				<string key="92.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="92.ImportedFromIB2"/>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">300490</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<integer value="1040" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<nil key="IBDocument.LastKnownRelativeProjectPath"/>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="NSMenuCheckmark">{9, 8}</string>
+			<string key="NSMenuMixedState">{7, 2}</string>
+			<string key="NSSwitch">{15, 15}</string>
+		</dictionary>
+	</data>
+</archive>
diff --git a/xorg-server/hw/xquartz/console_redirect.c b/xorg-server/hw/xquartz/console_redirect.c
index f7b95df2b..70a819e42 100644
--- a/xorg-server/hw/xquartz/console_redirect.c
+++ b/xorg-server/hw/xquartz/console_redirect.c
@@ -1,418 +1,418 @@
-/* Copyright (c) 2011 Apple Inc.

- *

- * Permission is hereby granted, free of charge, to any person

- * obtaining a copy of this software and associated documentation files

- * (the "Software"), to deal in the Software without restriction,

- * including without limitation the rights to use, copy, modify, merge,

- * publish, distribute, sublicense, and/or sell copies of the Software,

- * and to permit persons to whom the Software is furnished to do so,

- * subject to the following conditions:

- *

- * 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 ABOVE LISTED COPYRIGHT

- * HOLDER(S) 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(s) of the above

- * copyright holders shall not be used in advertising or otherwise to

- * promote the sale, use or other dealings in this Software without

- * prior written authorization.

- */

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#else

-#define DEBUG_CONSOLE_REDIRECT 1

-#define HAVE_LIBDISPATCH 1

-#endif

-

-#include <assert.h>

-#include <unistd.h>

-#include <stdio.h>

-#include <string.h>

-#include <stdlib.h>

-#include <sys/types.h>

-#include <sys/event.h>

-#include <asl.h>

-#include <errno.h>

-#include <fcntl.h>

-

-#include "console_redirect.h"

-

-#define BUF_SIZE 512

-

-#ifdef HAVE_LIBDISPATCH

-#include <dispatch/dispatch.h>

-

-static dispatch_queue_t redirect_serial_q;

-static dispatch_group_t read_source_group;

-#else

-#include <pthread.h>

-

-static pthread_t redirect_pthread;

-static pthread_mutex_t redirect_fds_lock = PTHREAD_MUTEX_INITIALIZER;

-

-static int kq;

-

-/* Notifications to our reader thread */

-#define ASL_REDIRECT_TERMINATE ((void *)(uintptr_t)1)

-#endif

-

-typedef struct {

-    int level;

-    aslclient asl;

-    aslmsg msg;

-

-    /* Buffered reading */

-    char *buf;

-    char *w;

-

-#ifdef HAVE_LIBDISPATCH

-    dispatch_source_t read_source;

-#endif

-} asl_redirect;

-

-static asl_redirect *redirect_fds = NULL;

-static int n_redirect_fds = 0;

-

-/* Read from the FD until there is no more to read and redirect to ASL.

- * Preconditions:

- *      1: pthread_mutex_lock lock is held (pthreads) or called

- *         from the appropriate serial queue for operating on

- *         redirect_fds

- *      2: fd corresponds to a valid entry in redirect_fds

- *

- * Return values:

- *      If the pipe is closed, EOF is returned regardless of how many bytes

- *      were processed.  If the pipe is still open, the number of read bytes

- *      is returned.

- */

-static inline int _read_redirect(int fd, int flush) {

-    int total_read = 0;

-    int nbytes;

-    asl_redirect *aslr = &redirect_fds[fd];

-

-    while((nbytes = read(fd, aslr->w, BUF_SIZE - (aslr->w - aslr->buf) - 1)) > 0) {

-        char *s, *p;

-

-        /* Increment our returned number read */

-        total_read += nbytes;

-

-        nbytes += (aslr->w - aslr->buf);

-        aslr->buf[nbytes] = '\0';

-

-        /* One line at a time */

-        for(p=aslr->buf; *p && (p - aslr->buf) < nbytes; p = s + 1) {

-            // Find null or \n

-            for(s=p; *s && *s != '\n'; s++);

-            if(*s == '\n') {

-                *s='\0';

-                asl_log(aslr->asl, aslr->msg, aslr->level, "%s", p);

-            } else if(aslr->buf != p) {

-                memmove(aslr->buf, p, BUF_SIZE - (p - aslr->buf));

-                aslr->w = aslr->buf + (s - p);

-                break;

-            } else if(nbytes == BUF_SIZE - 1) {

-                asl_log(aslr->asl, aslr->msg, aslr->level, "%s", p);

-                aslr->w = aslr->buf;

-                break;

-            }

-        }

-    }

-

-    /* Flush if requested or we're at EOF */

-    if(flush || nbytes == 0) {

-        if(aslr->w > aslr->buf) {

-            *aslr->w = '\0';

-            asl_log(aslr->asl, aslr->msg, aslr->level, "%s", aslr->buf);

-        }

-    }

-

-    if(nbytes == 0)

-        return EOF;

-    return total_read;

-}

-

-#ifdef HAVE_LIBDISPATCH

-static void read_from_source(void *_source) {

-    dispatch_source_t source = (dispatch_source_t)_source;

-    int fd = dispatch_source_get_handle(source);

-    if(_read_redirect(fd, 0) == EOF) {

-        dispatch_source_cancel(source);

-    }

-}

-

-static void cancel_source(void *_source) {

-    dispatch_source_t source = (dispatch_source_t)_source;

-    int fd = dispatch_source_get_handle(source);

-    asl_redirect *aslr = &redirect_fds[fd];

-

-    /* Flush the buffer */

-    _read_redirect(fd, 1);

-

-    close(fd);

-    free(aslr->buf);

-    memset(aslr, 0, sizeof(*aslr));

-    dispatch_release(source);

-    dispatch_group_leave(read_source_group);

-}

-

-#else /* !HAVE_LIBDISPATCH */

-static void *redirect_thread(void *ctx __unused) {

-    struct kevent ev;

-    int n;

-

-    while(1) {

-        n = kevent(kq, NULL, 0, &ev, 1, NULL);

-

-        /* Bail on errors */

-        if(n < 0) {

-            asl_log(NULL, NULL, ASL_LEVEL_ERR, "kevent failure: %s", strerror(errno));

-            break;

-        }

-        

-        /* This should not happen */

-        if(n == 0)

-            continue;

-

-        switch(ev.filter) {

-            case EVFILT_READ:

-                pthread_mutex_lock(&redirect_fds_lock);

-                {

-                    int fd = ev.ident;

-                    int close_fd = 0;

-                    asl_redirect *aslr = &redirect_fds[fd];

-

-                    if(fd < 0 || fd >= n_redirect_fds || aslr->buf == NULL) {

-                        asl_log(NULL, NULL, ASL_LEVEL_ERR, "Unexpected file descriptor: %d", fd);

-                        goto next;

-                    }

-

-                    if(ev.flags & EV_EOF) {

-                        close_fd = 1;

-                        if(EOF != _read_redirect(fd, 1)) {

-                            asl_log(NULL, NULL, ASL_LEVEL_ERR, "kevent reported EOF on %d, but read doesn't concur.", fd);

-                        }

-                    } else {

-                        close_fd = (EOF == _read_redirect(fd, 0));

-                    }

-                    

-                    if(close_fd) {

-                        EV_SET(&ev, fd, EVFILT_READ, EV_DELETE, 0, 0, 0);

-                        kevent(kq, &ev, 1, NULL, 0, NULL);

-                        close(fd);

-                        free(aslr->buf);

-                        memset(aslr, 0, sizeof(*aslr));

-                    }

-                }

-                next:

-                pthread_mutex_unlock(&redirect_fds_lock);

-

-            case EVFILT_TIMER:

-                if(ev.udata == ASL_REDIRECT_TERMINATE)

-                    return NULL;

-

-            default:

-                ;;

-        }

-    }

-

-    return NULL;

-}

-#endif

-

-static void redirect_atexit(void) {

-    /* stdout is linebuffered, so flush the buffer */

-    if(redirect_fds[STDOUT_FILENO].buf)

-        fflush(stdout);

-

-#ifdef HAVE_LIBDISPATCH

-    {

-        int i;

-

-        /* Cancel all of our dispatch sources, so they flush to ASL */

-        for(i=0; i < n_redirect_fds; i++)

-            if(redirect_fds[i].read_source)

-                dispatch_source_cancel(redirect_fds[i].read_source);

-

-        /* Wait at least three seconds for our sources to flush to ASL */

-        dispatch_group_wait(read_source_group, dispatch_time(DISPATCH_TIME_NOW, 3LL * NSEC_PER_SEC));

-    }

-#else

-    {

-        struct kevent ev;

-

-        /* Tell our reader thread it is time to pack up and go home */

-        EV_SET(&ev, 0, EVFILT_TIMER, EV_ADD | EV_ONESHOT, 0, 0, ASL_REDIRECT_TERMINATE);

-        kevent(kq, &ev, 1, NULL, 0, NULL);

-    

-        pthread_join(redirect_pthread, NULL);

-    }

-#endif

-}

-

-#ifdef HAVE_LIBDISPATCH

-static void xq_asl_init(void *ctx __unused)

-#else

-static void xq_asl_init(void)

-#endif

-{

-    assert((redirect_fds = calloc(16, sizeof(*redirect_fds))) != NULL);

-    n_redirect_fds = 16;

-

-#ifdef HAVE_LIBDISPATCH

-    redirect_serial_q = dispatch_queue_create("com.apple.asl-redirect", NULL);

-    assert(redirect_serial_q != NULL);

-

-    read_source_group = dispatch_group_create();

-    assert(read_source_group != NULL);

-#else

-    assert((kq = kqueue()) != -1);

-    assert(pthread_create(&redirect_pthread, NULL, redirect_thread, NULL) == 0);

-#endif

-

-    atexit(redirect_atexit);

-}

-

-int xq_asl_log_fd(aslclient asl, aslmsg msg, int level, int fd) {

-#ifdef HAVE_LIBDISPATCH

-    int err __block = 0;

-    static dispatch_once_t once_control;

-    dispatch_once_f(&once_control, NULL, xq_asl_init);

-#else

-    int err = 0;

-    static pthread_once_t once_control = PTHREAD_ONCE_INIT;

-    assert(pthread_once(&once_control, xq_asl_init) == 0);

-#endif

-    

-    if(fd < 0)

-        return EBADF;

-    

-#ifdef HAVE_LIBDISPATCH

-#define BLOCK_DONE return

-    dispatch_sync(redirect_serial_q, ^

-#else

-#define BLOCK_DONE goto done

-    assert(pthread_mutex_lock(&redirect_fds_lock) == 0);

-#endif

-    {

-        /* Reallocate if we need more space */

-        if(fd >= n_redirect_fds) {

-            size_t new_n = 1 << (ffs(fd) + 1);

-            asl_redirect *new_array = realloc(redirect_fds, new_n * sizeof(*redirect_fds));

-            if(!new_array) {

-                err = errno;

-                BLOCK_DONE;

-            }

-            redirect_fds = new_array;

-            memset(redirect_fds + n_redirect_fds, 0, new_n - n_redirect_fds);

-            n_redirect_fds = new_n;

-        }

-        

-        /* If we're already listening on it, return error. */

-        if(redirect_fds[fd].buf != NULL) {

-            err = EBADF;

-            BLOCK_DONE;

-        }

-        

-        /* Initialize our buffer */

-        redirect_fds[fd].buf = (char *)malloc(BUF_SIZE);

-        if(redirect_fds[fd].buf == NULL) {

-            err = errno;

-            BLOCK_DONE;

-        }

-        redirect_fds[fd].w = redirect_fds[fd].buf;

-        

-        /* Store our ASL settings */

-        redirect_fds[fd].level = level;

-        redirect_fds[fd].asl = asl;

-        redirect_fds[fd].msg = msg;

-        

-        /* Don't block on reads from this fd */

-        fcntl(fd, F_SETFL, O_NONBLOCK);

-        

-        /* Start listening */

-#ifdef HAVE_LIBDISPATCH

-        {

-            dispatch_source_t read_source = dispatch_source_create(DISPATCH_SOURCE_TYPE_READ, fd, 0, redirect_serial_q);

-            redirect_fds[fd].read_source = read_source;

-            dispatch_set_context(read_source, read_source);

-            dispatch_source_set_event_handler_f(read_source, read_from_source);

-            dispatch_source_set_cancel_handler_f(read_source, cancel_source);

-            dispatch_group_enter(read_source_group);

-            dispatch_resume(read_source);

-        }

-#else

-        {

-            struct kevent ev;

-            EV_SET(&ev, fd, EVFILT_READ, EV_ADD, 0, 0, 0);

-            kevent(kq, &ev, 1, NULL, 0, NULL);

-        }

-#endif

-    }

-#ifdef HAVE_LIBDISPATCH

-    );

-#else

-done:

-    assert(pthread_mutex_unlock(&redirect_fds_lock) == 0);

-#endif

-#undef BLOCK_DONE

-    

-    return err;

-}

-

-int xq_asl_capture_fd(aslclient asl, aslmsg msg, int level, int fd) {

-    int pipepair[2];

-    

-    /* Create pipe */

-    if(pipe(pipepair) == -1)

-        return errno;

-    

-    /* Close the read fd but not the write fd on exec */

-    if(fcntl(pipepair[0], F_SETFD, FD_CLOEXEC) == -1)

-        return errno;

-

-    /* Replace the existing fd */

-    if(dup2(pipepair[1], fd) == -1) {

-        close(pipepair[0]);

-        close(pipepair[1]);

-        return errno;

-    }

-

-    /* If we capture STDOUT_FILENO, make sure we linebuffer stdout */

-    if(fd == STDOUT_FILENO)

-        setlinebuf(stdout);

-    

-    /* Close the duplicate fds since they've been reassigned */

-    close(pipepair[1]);

-

-    /* Hand off the read end of our pipe to xq_asl_log_fd */

-    return xq_asl_log_fd(asl, msg, level, pipepair[0]);

-}

-

-#ifdef DEBUG_CONSOLE_REDIRECT

-int main(int argc __unused, char **argv __unused) {

-    xq_asl_capture_fd(NULL, NULL, ASL_LEVEL_NOTICE, STDOUT_FILENO);

-    xq_asl_capture_fd(NULL, NULL, ASL_LEVEL_ERR, STDERR_FILENO);

-

-    fprintf(stderr, "TEST ERR1\n");

-    fprintf(stdout, "TEST OUT1\n");

-    fprintf(stderr, "TEST ERR2\n");

-    fprintf(stdout, "TEST OUT2\n");

-    system("/bin/echo SYST OUT");

-    system("/bin/echo SYST ERR >&2");

-    fprintf(stdout, "TEST OUT3\n");

-    fprintf(stdout, "TEST OUT4\n");

-    fprintf(stderr, "TEST ERR3\n");

-    fprintf(stderr, "TEST ERR4\n");

-

-    exit(0);

-}

-#endif

+/* Copyright (c) 2011 Apple Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * 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 ABOVE LISTED COPYRIGHT
+ * HOLDER(S) 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(s) of the above
+ * copyright holders shall not be used in advertising or otherwise to
+ * promote the sale, use or other dealings in this Software without
+ * prior written authorization.
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#else
+#define DEBUG_CONSOLE_REDIRECT 1
+#define HAVE_LIBDISPATCH 1
+#endif
+
+#include <assert.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/event.h>
+#include <asl.h>
+#include <errno.h>
+#include <fcntl.h>
+
+#include "console_redirect.h"
+
+#define BUF_SIZE 512
+
+#ifdef HAVE_LIBDISPATCH
+#include <dispatch/dispatch.h>
+
+static dispatch_queue_t redirect_serial_q;
+static dispatch_group_t read_source_group;
+#else
+#include <pthread.h>
+
+static pthread_t redirect_pthread;
+static pthread_mutex_t redirect_fds_lock = PTHREAD_MUTEX_INITIALIZER;
+
+static int kq;
+
+/* Notifications to our reader thread */
+#define ASL_REDIRECT_TERMINATE ((void *)(uintptr_t)1)
+#endif
+
+typedef struct {
+    int level;
+    aslclient asl;
+    aslmsg msg;
+
+    /* Buffered reading */
+    char *buf;
+    char *w;
+
+#ifdef HAVE_LIBDISPATCH
+    dispatch_source_t read_source;
+#endif
+} asl_redirect;
+
+static asl_redirect *redirect_fds = NULL;
+static int n_redirect_fds = 0;
+
+/* Read from the FD until there is no more to read and redirect to ASL.
+ * Preconditions:
+ *      1: pthread_mutex_lock lock is held (pthreads) or called
+ *         from the appropriate serial queue for operating on
+ *         redirect_fds
+ *      2: fd corresponds to a valid entry in redirect_fds
+ *
+ * Return values:
+ *      If the pipe is closed, EOF is returned regardless of how many bytes
+ *      were processed.  If the pipe is still open, the number of read bytes
+ *      is returned.
+ */
+static inline int _read_redirect(int fd, int flush) {
+    int total_read = 0;
+    int nbytes;
+    asl_redirect *aslr = &redirect_fds[fd];
+
+    while((nbytes = read(fd, aslr->w, BUF_SIZE - (aslr->w - aslr->buf) - 1)) > 0) {
+        char *s, *p;
+
+        /* Increment our returned number read */
+        total_read += nbytes;
+
+        nbytes += (aslr->w - aslr->buf);
+        aslr->buf[nbytes] = '\0';
+
+        /* One line at a time */
+        for(p=aslr->buf; *p && (p - aslr->buf) < nbytes; p = s + 1) {
+            // Find null or \n
+            for(s=p; *s && *s != '\n'; s++);
+            if(*s == '\n') {
+                *s='\0';
+                asl_log(aslr->asl, aslr->msg, aslr->level, "%s", p);
+            } else if(aslr->buf != p) {
+                memmove(aslr->buf, p, BUF_SIZE - (p - aslr->buf));
+                aslr->w = aslr->buf + (s - p);
+                break;
+            } else if(nbytes == BUF_SIZE - 1) {
+                asl_log(aslr->asl, aslr->msg, aslr->level, "%s", p);
+                aslr->w = aslr->buf;
+                break;
+            }
+        }
+    }
+
+    /* Flush if requested or we're at EOF */
+    if(flush || nbytes == 0) {
+        if(aslr->w > aslr->buf) {
+            *aslr->w = '\0';
+            asl_log(aslr->asl, aslr->msg, aslr->level, "%s", aslr->buf);
+        }
+    }
+
+    if(nbytes == 0)
+        return EOF;
+    return total_read;
+}
+
+#ifdef HAVE_LIBDISPATCH
+static void read_from_source(void *_source) {
+    dispatch_source_t source = (dispatch_source_t)_source;
+    int fd = dispatch_source_get_handle(source);
+    if(_read_redirect(fd, 0) == EOF) {
+        dispatch_source_cancel(source);
+    }
+}
+
+static void cancel_source(void *_source) {
+    dispatch_source_t source = (dispatch_source_t)_source;
+    int fd = dispatch_source_get_handle(source);
+    asl_redirect *aslr = &redirect_fds[fd];
+
+    /* Flush the buffer */
+    _read_redirect(fd, 1);
+
+    close(fd);
+    free(aslr->buf);
+    memset(aslr, 0, sizeof(*aslr));
+    dispatch_release(source);
+    dispatch_group_leave(read_source_group);
+}
+
+#else /* !HAVE_LIBDISPATCH */
+static void *redirect_thread(void *ctx __unused) {
+    struct kevent ev;
+    int n;
+
+    while(1) {
+        n = kevent(kq, NULL, 0, &ev, 1, NULL);
+
+        /* Bail on errors */
+        if(n < 0) {
+            asl_log(NULL, NULL, ASL_LEVEL_ERR, "kevent failure: %s", strerror(errno));
+            break;
+        }
+        
+        /* This should not happen */
+        if(n == 0)
+            continue;
+
+        switch(ev.filter) {
+            case EVFILT_READ:
+                pthread_mutex_lock(&redirect_fds_lock);
+                {
+                    int fd = ev.ident;
+                    int close_fd = 0;
+                    asl_redirect *aslr = &redirect_fds[fd];
+
+                    if(fd < 0 || fd >= n_redirect_fds || aslr->buf == NULL) {
+                        asl_log(NULL, NULL, ASL_LEVEL_ERR, "Unexpected file descriptor: %d", fd);
+                        goto next;
+                    }
+
+                    if(ev.flags & EV_EOF) {
+                        close_fd = 1;
+                        if(EOF != _read_redirect(fd, 1)) {
+                            asl_log(NULL, NULL, ASL_LEVEL_ERR, "kevent reported EOF on %d, but read doesn't concur.", fd);
+                        }
+                    } else {
+                        close_fd = (EOF == _read_redirect(fd, 0));
+                    }
+                    
+                    if(close_fd) {
+                        EV_SET(&ev, fd, EVFILT_READ, EV_DELETE, 0, 0, 0);
+                        kevent(kq, &ev, 1, NULL, 0, NULL);
+                        close(fd);
+                        free(aslr->buf);
+                        memset(aslr, 0, sizeof(*aslr));
+                    }
+                }
+                next:
+                pthread_mutex_unlock(&redirect_fds_lock);
+
+            case EVFILT_TIMER:
+                if(ev.udata == ASL_REDIRECT_TERMINATE)
+                    return NULL;
+
+            default:
+                ;;
+        }
+    }
+
+    return NULL;
+}
+#endif
+
+static void redirect_atexit(void) {
+    /* stdout is linebuffered, so flush the buffer */
+    if(redirect_fds[STDOUT_FILENO].buf)
+        fflush(stdout);
+
+#ifdef HAVE_LIBDISPATCH
+    {
+        int i;
+
+        /* Cancel all of our dispatch sources, so they flush to ASL */
+        for(i=0; i < n_redirect_fds; i++)
+            if(redirect_fds[i].read_source)
+                dispatch_source_cancel(redirect_fds[i].read_source);
+
+        /* Wait at least three seconds for our sources to flush to ASL */
+        dispatch_group_wait(read_source_group, dispatch_time(DISPATCH_TIME_NOW, 3LL * NSEC_PER_SEC));
+    }
+#else
+    {
+        struct kevent ev;
+
+        /* Tell our reader thread it is time to pack up and go home */
+        EV_SET(&ev, 0, EVFILT_TIMER, EV_ADD | EV_ONESHOT, 0, 0, ASL_REDIRECT_TERMINATE);
+        kevent(kq, &ev, 1, NULL, 0, NULL);
+    
+        pthread_join(redirect_pthread, NULL);
+    }
+#endif
+}
+
+#ifdef HAVE_LIBDISPATCH
+static void xq_asl_init(void *ctx __unused)
+#else
+static void xq_asl_init(void)
+#endif
+{
+    assert((redirect_fds = calloc(16, sizeof(*redirect_fds))) != NULL);
+    n_redirect_fds = 16;
+
+#ifdef HAVE_LIBDISPATCH
+    redirect_serial_q = dispatch_queue_create("com.apple.asl-redirect", NULL);
+    assert(redirect_serial_q != NULL);
+
+    read_source_group = dispatch_group_create();
+    assert(read_source_group != NULL);
+#else
+    assert((kq = kqueue()) != -1);
+    assert(pthread_create(&redirect_pthread, NULL, redirect_thread, NULL) == 0);
+#endif
+
+    atexit(redirect_atexit);
+}
+
+int xq_asl_log_fd(aslclient asl, aslmsg msg, int level, int fd) {
+#ifdef HAVE_LIBDISPATCH
+    int err __block = 0;
+    static dispatch_once_t once_control;
+    dispatch_once_f(&once_control, NULL, xq_asl_init);
+#else
+    int err = 0;
+    static pthread_once_t once_control = PTHREAD_ONCE_INIT;
+    assert(pthread_once(&once_control, xq_asl_init) == 0);
+#endif
+    
+    if(fd < 0)
+        return EBADF;
+    
+#ifdef HAVE_LIBDISPATCH
+#define BLOCK_DONE return
+    dispatch_sync(redirect_serial_q, ^
+#else
+#define BLOCK_DONE goto done
+    assert(pthread_mutex_lock(&redirect_fds_lock) == 0);
+#endif
+    {
+        /* Reallocate if we need more space */
+        if(fd >= n_redirect_fds) {
+            size_t new_n = 1 << (ffs(fd) + 1);
+            asl_redirect *new_array = realloc(redirect_fds, new_n * sizeof(*redirect_fds));
+            if(!new_array) {
+                err = errno;
+                BLOCK_DONE;
+            }
+            redirect_fds = new_array;
+            memset(redirect_fds + n_redirect_fds, 0, new_n - n_redirect_fds);
+            n_redirect_fds = new_n;
+        }
+        
+        /* If we're already listening on it, return error. */
+        if(redirect_fds[fd].buf != NULL) {
+            err = EBADF;
+            BLOCK_DONE;
+        }
+        
+        /* Initialize our buffer */
+        redirect_fds[fd].buf = (char *)malloc(BUF_SIZE);
+        if(redirect_fds[fd].buf == NULL) {
+            err = errno;
+            BLOCK_DONE;
+        }
+        redirect_fds[fd].w = redirect_fds[fd].buf;
+        
+        /* Store our ASL settings */
+        redirect_fds[fd].level = level;
+        redirect_fds[fd].asl = asl;
+        redirect_fds[fd].msg = msg;
+        
+        /* Don't block on reads from this fd */
+        fcntl(fd, F_SETFL, O_NONBLOCK);
+        
+        /* Start listening */
+#ifdef HAVE_LIBDISPATCH
+        {
+            dispatch_source_t read_source = dispatch_source_create(DISPATCH_SOURCE_TYPE_READ, fd, 0, redirect_serial_q);
+            redirect_fds[fd].read_source = read_source;
+            dispatch_set_context(read_source, read_source);
+            dispatch_source_set_event_handler_f(read_source, read_from_source);
+            dispatch_source_set_cancel_handler_f(read_source, cancel_source);
+            dispatch_group_enter(read_source_group);
+            dispatch_resume(read_source);
+        }
+#else
+        {
+            struct kevent ev;
+            EV_SET(&ev, fd, EVFILT_READ, EV_ADD, 0, 0, 0);
+            kevent(kq, &ev, 1, NULL, 0, NULL);
+        }
+#endif
+    }
+#ifdef HAVE_LIBDISPATCH
+    );
+#else
+done:
+    assert(pthread_mutex_unlock(&redirect_fds_lock) == 0);
+#endif
+#undef BLOCK_DONE
+    
+    return err;
+}
+
+int xq_asl_capture_fd(aslclient asl, aslmsg msg, int level, int fd) {
+    int pipepair[2];
+    
+    /* Create pipe */
+    if(pipe(pipepair) == -1)
+        return errno;
+    
+    /* Close the read fd but not the write fd on exec */
+    if(fcntl(pipepair[0], F_SETFD, FD_CLOEXEC) == -1)
+        return errno;
+
+    /* Replace the existing fd */
+    if(dup2(pipepair[1], fd) == -1) {
+        close(pipepair[0]);
+        close(pipepair[1]);
+        return errno;
+    }
+
+    /* If we capture STDOUT_FILENO, make sure we linebuffer stdout */
+    if(fd == STDOUT_FILENO)
+        setlinebuf(stdout);
+    
+    /* Close the duplicate fds since they've been reassigned */
+    close(pipepair[1]);
+
+    /* Hand off the read end of our pipe to xq_asl_log_fd */
+    return xq_asl_log_fd(asl, msg, level, pipepair[0]);
+}
+
+#ifdef DEBUG_CONSOLE_REDIRECT
+int main(int argc __unused, char **argv __unused) {
+    xq_asl_capture_fd(NULL, NULL, ASL_LEVEL_NOTICE, STDOUT_FILENO);
+    xq_asl_capture_fd(NULL, NULL, ASL_LEVEL_ERR, STDERR_FILENO);
+
+    fprintf(stderr, "TEST ERR1\n");
+    fprintf(stdout, "TEST OUT1\n");
+    fprintf(stderr, "TEST ERR2\n");
+    fprintf(stdout, "TEST OUT2\n");
+    system("/bin/echo SYST OUT");
+    system("/bin/echo SYST ERR >&2");
+    fprintf(stdout, "TEST OUT3\n");
+    fprintf(stdout, "TEST OUT4\n");
+    fprintf(stderr, "TEST ERR3\n");
+    fprintf(stderr, "TEST ERR4\n");
+
+    exit(0);
+}
+#endif
diff --git a/xorg-server/hw/xquartz/darwin.c b/xorg-server/hw/xquartz/darwin.c
index 06099398d..b483000f8 100644
--- a/xorg-server/hw/xquartz/darwin.c
+++ b/xorg-server/hw/xquartz/darwin.c
@@ -1,786 +1,786 @@
-/**************************************************************

- *

- * Xquartz initialization code

- *

- * Copyright (c) 2007-2008 Apple Inc.

- * Copyright (c) 2001-2004 Torrey T. Lyons. All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright

- * holders shall not be used in advertising or otherwise to promote the sale,

- * use or other dealings in this Software without prior written authorization.

- */

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include <X11/X.h>

-#include <X11/Xproto.h>

-#include "os.h"

-#include "servermd.h"

-#include "inputstr.h"

-#include "scrnintstr.h"

-#include "mibstore.h"		// mi backing store implementation

-#include "mipointer.h"		// mi software cursor

-#include "micmap.h"		// mi colormap code

-#include "fb.h"			// fb framebuffer code

-#include "site.h"

-#include "globals.h"

-#include "dix.h"

-#include "xkbsrv.h"

-

-#include <X11/extensions/XI.h>

-#include <X11/extensions/XIproto.h>

-#include "exevents.h"

-#include "extinit.h"

-

-#include "xserver-properties.h"

-

-#include <sys/types.h>

-#include <sys/time.h>

-#include <sys/syslimits.h>

-#include <stdio.h>

-#include <fcntl.h>

-#include <unistd.h>

-#include <stdarg.h>

-

-#define HAS_UTSNAME 1

-#include <sys/utsname.h>

-

-#define NO_CFPLUGIN

-#include <IOKit/hidsystem/IOHIDLib.h>

-

-#ifdef MITSHM

-#include "shmint.h"

-#endif

-

-#include "darwin.h"

-#include "darwinEvents.h"

-#include "quartzKeyboard.h"

-#include "quartz.h"

-

-aslclient aslc;

-

-void xq_asl_log (int level, const char *subsystem, const char *file, const char *function, int line, const char *fmt, ...) {

-    va_list args;

-    aslmsg msg = asl_new(ASL_TYPE_MSG);

-

-    if(msg) {

-        char *_line;

-

-        asl_set(msg, "File", file);

-        asl_set(msg, "Function", function);

-        asprintf(&_line, "%d", line);

-        if(_line) {

-            asl_set(msg, "Line", _line);

-            free(_line);

-        }

-        if(subsystem)

-            asl_set(msg, "Subsystem", subsystem);

-    }

-

-    va_start(args, fmt);

-    asl_vlog(aslc, msg, level, fmt, args);

-    va_end(args);

-

-    if(msg)

-        asl_free(msg);

-}

-

-/*

- * X server shared global variables

- */

-int                     darwinScreensFound = 0;

-DevPrivateKeyRec        darwinScreenKeyRec;

-io_connect_t            darwinParamConnect = 0;

-int                     darwinEventReadFD = -1;

-int                     darwinEventWriteFD = -1;

-// int                     darwinMouseAccelChange = 1;

-int                     darwinFakeButtons = 0;

-

-// location of X11's (0,0) point in global screen coordinates

-int                     darwinMainScreenX = 0;

-int                     darwinMainScreenY = 0;

-

-// parameters read from the command line or user preferences

-int                     darwinDesiredDepth = -1;

-int                     darwinSyncKeymap = FALSE;

-

-// modifier masks for faking mouse buttons - ANY of these bits trigger it  (not all)

-#ifdef NX_DEVICELCMDKEYMASK

-int                     darwinFakeMouse2Mask = NX_DEVICELALTKEYMASK | NX_DEVICERALTKEYMASK;

-int                     darwinFakeMouse3Mask = NX_DEVICELCMDKEYMASK | NX_DEVICERCMDKEYMASK;

-#else

-int                     darwinFakeMouse2Mask = NX_ALTERNATEMASK;

-int                     darwinFakeMouse3Mask = NX_COMMANDMASK;

-#endif

-

-// Modifier mask for overriding event delivery to appkit (might be useful to set this to rcommand for input menu

-unsigned int            darwinAppKitModMask = 0; // Any of these bits

-

-// Modifier mask for items in the Window menu (0 and -1 cause shortcuts to be disabled)

-unsigned int            windowItemModMask = NX_COMMANDMASK;

-

-// devices

-DeviceIntPtr            darwinKeyboard = NULL;

-DeviceIntPtr            darwinPointer = NULL;

-DeviceIntPtr            darwinTabletStylus = NULL;

-DeviceIntPtr            darwinTabletCursor = NULL;

-DeviceIntPtr            darwinTabletEraser = NULL;

-

-// Common pixmap formats

-static PixmapFormatRec formats[] = {

-        { 1,    1,      BITMAP_SCANLINE_PAD },

-        { 4,    8,      BITMAP_SCANLINE_PAD },

-        { 8,    8,      BITMAP_SCANLINE_PAD },

-        { 15,   16,     BITMAP_SCANLINE_PAD },

-        { 16,   16,     BITMAP_SCANLINE_PAD },

-        { 24,   32,     BITMAP_SCANLINE_PAD },

-        { 32,   32,     BITMAP_SCANLINE_PAD }

-};

-const int NUMFORMATS = sizeof(formats)/sizeof(formats[0]);

-

-void

-DarwinPrintBanner(void)

-{ 

-  ErrorF("Xquartz starting:\n");

-  ErrorF("X.Org X Server %s\n", XSERVER_VERSION);

-  ErrorF("Build Date: %s\n", BUILD_DATE );

-}

-

-

-/*

- * DarwinSaveScreen

- *  X screensaver support. Not implemented.

- */

-static Bool DarwinSaveScreen(ScreenPtr pScreen, int on)

-{

-    // FIXME

-    if (on == SCREEN_SAVER_FORCER) {

-    } else if (on == SCREEN_SAVER_ON) {

-    } else {

-    }

-    return TRUE;

-}

-

-/*

- * DarwinScreenInit

- *  This is a callback from dix during AddScreen() from InitOutput().

- *  Initialize the screen and communicate information about it back to dix.

- */

-static Bool DarwinScreenInit(int index, ScreenPtr pScreen, int argc, char **argv) {

-    int         dpi;

-    static int  foundIndex = 0;

-    Bool        ret;

-    DarwinFramebufferPtr dfb;

-

-    if (!dixRegisterPrivateKey(&darwinScreenKeyRec, PRIVATE_SCREEN, 0))

-	return FALSE;

-

-    // reset index of found screens for each server generation

-    if (index == 0) {

-        foundIndex = 0;

-

-        // reset the visual list

-        miClearVisualTypes();

-    }

-

-    // allocate space for private per screen storage

-    dfb = malloc(sizeof(DarwinFramebufferRec));

-

-    // SCREEN_PRIV(pScreen) = dfb;

-    dixSetPrivate(&pScreen->devPrivates, darwinScreenKey, dfb);

-

-    // setup hardware/mode specific details

-    ret = QuartzAddScreen(foundIndex, pScreen);

-    foundIndex++;

-    if (! ret)

-        return FALSE;

-

-    // setup a single visual appropriate for our pixel type

-    if(!miSetVisualTypesAndMasks(dfb->depth, dfb->visuals, dfb->bitsPerRGB,

-                                 dfb->preferredCVC, dfb->redMask,

-                                 dfb->greenMask, dfb->blueMask)) {

-        return FALSE;

-    }

-  

-// TODO: Make PseudoColor visuals not suck in TrueColor mode  

-//    if(dfb->depth > 8)

-//        miSetVisualTypesAndMasks(8, PseudoColorMask, 8, PseudoColor, 0, 0, 0);

-    if(dfb->depth > 15)

-        miSetVisualTypesAndMasks(15, TrueColorMask, 5, TrueColor, RM_ARGB(0,5,5,5), GM_ARGB(0,5,5,5), BM_ARGB(0,5,5,5));

-    if(dfb->depth > 24)

-        miSetVisualTypesAndMasks(24, TrueColorMask, 8, TrueColor, RM_ARGB(0,8,8,8), GM_ARGB(0,8,8,8), BM_ARGB(0,8,8,8));

-

-    miSetPixmapDepths();

-

-    // machine independent screen init

-    // setup _Screen structure in pScreen

-    if (monitorResolution)

-        dpi = monitorResolution;

-    else

-        dpi = 96;

-

-    // initialize fb

-    if (! fbScreenInit(pScreen,

-                dfb->framebuffer,                 // pointer to screen bitmap

-                dfb->width, dfb->height,          // screen size in pixels

-                dpi, dpi,                         // dots per inch

-                dfb->pitch/(dfb->bitsPerPixel/8), // pixel width of framebuffer

-                dfb->bitsPerPixel))               // bits per pixel for screen

-    {

-        return FALSE;

-    }

-

-    if (! fbPictureInit(pScreen, 0, 0)) {

-        return FALSE;

-    }

-

-#ifdef MITSHM

-    ShmRegisterFbFuncs(pScreen);

-#endif

-

-    // this must be initialized (why doesn't X have a default?)

-    pScreen->SaveScreen = DarwinSaveScreen;

-

-    // finish mode dependent screen setup including cursor support

-    if (!QuartzSetupScreen(index, pScreen)) {

-        return FALSE;

-    }

-

-    // create and install the default colormap and

-    // set pScreen->blackPixel / pScreen->white

-    if (!miCreateDefColormap( pScreen )) {

-        return FALSE;

-    }

-

-    pScreen->x = dfb->x;

-    pScreen->y = dfb->y;

-

-    /*    ErrorF("Screen %d added: %dx%d @ (%d,%d)\n",

-	  index, dfb->width, dfb->height, dfb->x, dfb->y); */

-

-    return TRUE;

-}

-

-/*

- =============================================================================

-

- mouse and keyboard callbacks

-

- =============================================================================

-*/

-

-/*

- * DarwinMouseProc: Handle the initialization, etc. of a mouse

- */

-static int DarwinMouseProc(DeviceIntPtr pPointer, int what) {

-#define NBUTTONS 7

-#define NAXES 2

-	// 7 buttons: left, right, middle, then four scroll wheel "buttons"

-    CARD8 map[NBUTTONS + 1] = {0, 1, 2, 3, 4, 5, 6, 7};

-    Atom btn_labels[NBUTTONS] = {0};

-    Atom axes_labels[NAXES] = {0};

-

-    switch (what) {

-        case DEVICE_INIT:

-            pPointer->public.on = FALSE;

-

-            btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);

-            btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);

-            btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);

-            btn_labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);

-            btn_labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN);

-            btn_labels[5] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_LEFT);

-            btn_labels[6] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_RIGHT);

-

-            axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);

-            axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);

-

-

-            // Set button map.

-            InitPointerDeviceStruct((DevicePtr)pPointer, map, NBUTTONS,

-                                    btn_labels,

-                                    (PtrCtrlProcPtr)NoopDDA,

-                                    GetMotionHistorySize(), NAXES,

-                                    axes_labels);

-            InitValuatorAxisStruct(pPointer, 0, axes_labels[0], NO_AXIS_LIMITS, NO_AXIS_LIMITS, 0, 0, 0, Absolute);

-            InitValuatorAxisStruct(pPointer, 1, axes_labels[1], NO_AXIS_LIMITS, NO_AXIS_LIMITS, 0, 0, 0, Absolute);

-            break;

-        case DEVICE_ON:

-            pPointer->public.on = TRUE;

-            AddEnabledDevice( darwinEventReadFD );

-            return Success;

-        case DEVICE_CLOSE:

-        case DEVICE_OFF:

-            pPointer->public.on = FALSE;

-            RemoveEnabledDevice(darwinEventReadFD);

-            return Success;

-    }

-    

-    return Success;

-#undef NBUTTONS

-#undef NAXES

-}

-

-static int DarwinTabletProc(DeviceIntPtr pPointer, int what) {

-#define NBUTTONS 3

-#define NAXES 5

-    CARD8 map[NBUTTONS + 1] = {0, 1, 2, 3};

-    Atom btn_labels[NBUTTONS] = {0};

-    Atom axes_labels[NAXES] = {0};

-

-    switch (what) {

-        case DEVICE_INIT:

-            pPointer->public.on = FALSE;

-

-            btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);

-            btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);

-            btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);

-

-            axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_X);

-            axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_Y);

-            axes_labels[2] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_PRESSURE);

-            axes_labels[3] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_TILT_X);

-            axes_labels[4] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_TILT_Y);

-

-            // Set button map.

-            InitPointerDeviceStruct((DevicePtr)pPointer, map, NBUTTONS,

-                                    btn_labels,

-                                    (PtrCtrlProcPtr)NoopDDA,

-                                    GetMotionHistorySize(), NAXES,

-                                    axes_labels);

-            InitProximityClassDeviceStruct(pPointer);

-

-            InitValuatorAxisStruct(pPointer, 0, axes_labels[0], 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);

-            InitValuatorAxisStruct(pPointer, 1, axes_labels[1], 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);

-            InitValuatorAxisStruct(pPointer, 2, axes_labels[2], 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);

-            InitValuatorAxisStruct(pPointer, 3, axes_labels[3], -XQUARTZ_VALUATOR_LIMIT, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);

-            InitValuatorAxisStruct(pPointer, 4, axes_labels[4], -XQUARTZ_VALUATOR_LIMIT, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);

-//          pPointer->use = IsXExtensionDevice;

-            break;

-        case DEVICE_ON:

-            pPointer->public.on = TRUE;

-            AddEnabledDevice( darwinEventReadFD );

-            return Success;

-        case DEVICE_CLOSE:

-        case DEVICE_OFF:

-            pPointer->public.on = FALSE;

-            RemoveEnabledDevice(darwinEventReadFD);

-            return Success;

-    }

-    return Success;

-#undef NBUTTONS

-#undef NAXES

-}

-

-/*

- * DarwinKeybdProc

- *  Callback from X

- */

-static int DarwinKeybdProc( DeviceIntPtr pDev, int onoff )

-{

-    switch ( onoff ) {

-        case DEVICE_INIT:

-            DarwinKeyboardInit( pDev );

-            break;

-        case DEVICE_ON:

-            pDev->public.on = TRUE;

-            AddEnabledDevice( darwinEventReadFD );

-            break;

-        case DEVICE_OFF:

-            pDev->public.on = FALSE;

-            RemoveEnabledDevice( darwinEventReadFD );

-            break;

-        case DEVICE_CLOSE:

-            break;

-    }

-

-    return Success;

-}

-

-/*

-===========================================================================

-

- Utility routines

-

-===========================================================================

-*/

-

-/*

- * DarwinParseModifierList

- *  Parse a list of modifier names and return a corresponding modifier mask

- */

-int DarwinParseModifierList(const char *constmodifiers, int separatelr)

-{

-    int result = 0;

-

-    if (constmodifiers) {

-        char *modifiers = strdup(constmodifiers);

-        char *modifier;

-        int nxkey;

-        char *p = modifiers;

-

-        while (p) {

-            modifier = strsep(&p, " ,+&|/"); // allow lots of separators

-            nxkey = DarwinModifierStringToNXMask(modifier, separatelr);

-            if(nxkey)

-                result |= nxkey;

-            else

-                ErrorF("fakebuttons: Unknown modifier \"%s\"\n", modifier);

-        }

-        free(modifiers);

-    }

-    return result;

-}

-

-/*

-===========================================================================

-

- Functions needed to link against device independent X

-

-===========================================================================

-*/

-

-/*

- * InitInput

- *  Register the keyboard and mouse devices

- */

-void InitInput( int argc, char **argv )

-{

-    XkbRMLVOSet rmlvo = { .rules = "base", .model = "empty", .layout = "empty",

-                          .variant = NULL, .options = NULL };

-    /* We need to really have rules... or something... */

-    XkbSetRulesDflts(&rmlvo);

-

-    darwinKeyboard = AddInputDevice(serverClient, DarwinKeybdProc, TRUE);

-    darwinKeyboard->name = strdup("keyboard");

-

-    /* here's the snippet from the current gdk sources:

-    if (!strcmp (tmp_name, "pointer"))

-        gdkdev->info.source = GDK_SOURCE_MOUSE;

-    else if (!strcmp (tmp_name, "wacom") ||

-             !strcmp (tmp_name, "pen"))

-        gdkdev->info.source = GDK_SOURCE_PEN;

-    else if (!strcmp (tmp_name, "eraser"))

-        gdkdev->info.source = GDK_SOURCE_ERASER;

-    else if (!strcmp (tmp_name, "cursor"))

-        gdkdev->info.source = GDK_SOURCE_CURSOR;

-    else

-        gdkdev->info.source = GDK_SOURCE_PEN;

-    */

-

-    darwinPointer = AddInputDevice(serverClient, DarwinMouseProc, TRUE);

-    darwinPointer->name = strdup("pointer");

-

-    darwinTabletStylus = AddInputDevice(serverClient, DarwinTabletProc, TRUE);

-    darwinTabletStylus->name = strdup("pen");

-

-    darwinTabletCursor = AddInputDevice(serverClient, DarwinTabletProc, TRUE);

-    darwinTabletCursor->name = strdup("cursor");

-

-    darwinTabletEraser = AddInputDevice(serverClient, DarwinTabletProc, TRUE);

-    darwinTabletEraser->name = strdup("eraser");

-

-    DarwinEQInit();

-

-    QuartzInitInput(argc, argv);

-}

-

-void CloseInput(void)

-{

-    DarwinEQFini();

-}

-

-/*

- * DarwinAdjustScreenOrigins

- *  Shift all screens so the X11 (0, 0) coordinate is at the top

- *  left of the global screen coordinates.

- *

- *  Screens can be arranged so the top left isn't on any screen, so

- *  instead use the top left of the leftmost screen as (0,0). This

- *  may mean some screen space is in -y, but it's better that (0,0)

- *  be onscreen, or else default xterms disappear. It's better that

- *  -y be used than -x, because when popup menus are forced

- *  "onscreen" by dumb window managers like twm, they'll shift the

- *  menus down instead of left, which still looks funny but is an

- *  easier target to hit.

- */

-void

-DarwinAdjustScreenOrigins(ScreenInfo *pScreenInfo)

-{

-    int i, left, top;

-

-    left = pScreenInfo->screens[0]->x;

-    top  = pScreenInfo->screens[0]->y;

-

-    /* Find leftmost screen. If there's a tie, take the topmost of the two. */

-    for (i = 1; i < pScreenInfo->numScreens; i++) {

-        if (pScreenInfo->screens[i]->x < left  ||

-            (pScreenInfo->screens[i]->x == left && pScreenInfo->screens[i]->y < top))

-        {

-            left = pScreenInfo->screens[i]->x;

-            top = pScreenInfo->screens[i]->y;

-        }

-    }

-

-    darwinMainScreenX = left;

-    darwinMainScreenY = top;

-    

-    DEBUG_LOG("top = %d, left=%d\n", top, left);

-

-    /* Shift all screens so that there is a screen whose top left

-     * is at X11 (0,0) and at global screen coordinate

-     * (darwinMainScreenX, darwinMainScreenY).

-     */

-

-    if (darwinMainScreenX != 0 || darwinMainScreenY != 0) {

-        for (i = 0; i < pScreenInfo->numScreens; i++) {

-            pScreenInfo->screens[i]->x -= darwinMainScreenX;

-            pScreenInfo->screens[i]->y -= darwinMainScreenY;

-            DEBUG_LOG("Screen %d placed at X11 coordinate (%d,%d).\n",

-                      i, pScreenInfo->screens[i]->x, pScreenInfo->screens[i]->y);

-        }

-    }

-}

-

-

-/*

- * InitOutput

- *  Initialize screenInfo for all actually accessible framebuffers.

- *

- *  The display mode dependent code gets called three times. The mode

- *  specific InitOutput routines are expected to discover the number

- *  of potentially useful screens and cache routes to them internally.

- *  Inside DarwinScreenInit are two other mode specific calls.

- *  A mode specific AddScreen routine is called for each screen to

- *  actually initialize the screen with the ScreenPtr structure.

- *  After other screen setup has been done, a mode specific

- *  SetupScreen function can be called to finalize screen setup.

- */

-void InitOutput( ScreenInfo *pScreenInfo, int argc, char **argv )

-{

-    int i;

-

-    pScreenInfo->imageByteOrder = IMAGE_BYTE_ORDER;

-    pScreenInfo->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;

-    pScreenInfo->bitmapScanlinePad = BITMAP_SCANLINE_PAD;

-    pScreenInfo->bitmapBitOrder = BITMAP_BIT_ORDER;

-

-    // List how we want common pixmap formats to be padded

-    pScreenInfo->numPixmapFormats = NUMFORMATS;

-    for (i = 0; i < NUMFORMATS; i++)

-        pScreenInfo->formats[i] = formats[i];

-

-    // Discover screens and do mode specific initialization

-    QuartzInitOutput(argc, argv);

-

-    // Add screens

-    for (i = 0; i < darwinScreensFound; i++) {

-        AddScreen(DarwinScreenInit, argc, argv);

-    }

-

-    DarwinAdjustScreenOrigins(pScreenInfo);

-}

-

-

-/*

- * OsVendorFatalError

- */

-void OsVendorFatalError( void )

-{

-    ErrorF( "   OsVendorFatalError\n" );

-}

-

-

-/*

- * OsVendorInit

- *  Initialization of Darwin OS support.

- */

-void OsVendorInit(void)

-{

-    if (serverGeneration == 1) {

-        char *lf;

-        char *home = getenv("HOME");

-        assert(home);

-        assert(0 < asprintf(&lf, "%s/Library/Logs/X11.%s.log", home, bundle_id_prefix));

-        LogInit(lf, ".old");

-        free(lf);

-

-        DarwinPrintBanner();

-#ifdef ENABLE_DEBUG_LOG

-	{

-	  char *home_dir=NULL, *log_file_path=NULL;

-	  home_dir = getenv("HOME");

-	  if (home_dir) asprintf(&log_file_path, "%s/%s", home_dir, DEBUG_LOG_NAME);

-	  if (log_file_path) {

-	    if (!access(log_file_path, F_OK)) {

-	      debug_log_fp = fopen(log_file_path, "a");

-	      if (debug_log_fp) ErrorF("Debug logging enabled to %s\n", log_file_path);

-	    }

-	    free(log_file_path);

-	  }

-	}

-#endif

-    }

-}

-

-

-/*

- * ddxProcessArgument

- *  Process device-dependent command line args. Returns 0 if argument is

- *  not device dependent, otherwise Count of number of elements of argv

- *  that are part of a device dependent commandline option.

- */

-int ddxProcessArgument( int argc, char *argv[], int i )

-{

-//    if ( !strcmp( argv[i], "-fullscreen" ) ) {

-//        ErrorF( "Running full screen in parallel with Mac OS X Quartz window server.\n" );

-//        return 1;

-//    }

-

-//    if ( !strcmp( argv[i], "-rootless" ) ) {

-//        ErrorF( "Running rootless inside Mac OS X window server.\n" );

-//        return 1;

-//    }

-

-    // This command line arg is passed when launched from the Aqua GUI.

-    if ( !strncmp( argv[i], "-psn_", 5 ) ) {

-        return 1;

-    }

-

-    if ( !strcmp( argv[i], "-fakebuttons" ) ) {

-        darwinFakeButtons = TRUE;

-        ErrorF( "Faking a three button mouse\n" );

-        return 1;

-    }

-

-    if ( !strcmp( argv[i], "-nofakebuttons" ) ) {

-        darwinFakeButtons = FALSE;

-        ErrorF( "Not faking a three button mouse\n" );

-        return 1;

-    }

-

-    if (!strcmp( argv[i], "-fakemouse2" ) ) {

-        if ( i == argc-1 ) {

-            FatalError( "-fakemouse2 must be followed by a modifer list\n" );

-        }

-        if (!strcasecmp(argv[i+1], "none") || !strcmp(argv[i+1], ""))

-            darwinFakeMouse2Mask = 0;

-        else

-            darwinFakeMouse2Mask = DarwinParseModifierList(argv[i+1], 1);

-        ErrorF("Modifier mask to fake mouse button 2 = 0x%x\n",

-               darwinFakeMouse2Mask);

-        return 2;

-    }

-

-    if (!strcmp( argv[i], "-fakemouse3" ) ) {

-        if ( i == argc-1 ) {

-            FatalError( "-fakemouse3 must be followed by a modifer list\n" );

-        }

-        if (!strcasecmp(argv[i+1], "none") || !strcmp(argv[i+1], ""))

-            darwinFakeMouse3Mask = 0;

-        else

-            darwinFakeMouse3Mask = DarwinParseModifierList(argv[i+1], 1);

-        ErrorF("Modifier mask to fake mouse button 3 = 0x%x\n",

-               darwinFakeMouse3Mask);

-        return 2;

-    }

-

-    if ( !strcmp( argv[i], "+synckeymap" ) ) {

-        darwinSyncKeymap = TRUE;

-        return 1;

-    }

-

-    if ( !strcmp( argv[i], "-synckeymap" ) ) {

-        darwinSyncKeymap = FALSE;

-        return 1;

-    }

-

-    if ( !strcmp( argv[i], "-depth" ) ) {

-        if ( i == argc-1 ) {

-            FatalError( "-depth must be followed by a number\n" );

-        }

-        darwinDesiredDepth = atoi( argv[i+1] );

-        if(darwinDesiredDepth != -1 &&

-           darwinDesiredDepth != 8 &&

-           darwinDesiredDepth != 15 &&

-           darwinDesiredDepth != 24) {

-            FatalError( "Unsupported pixel depth. Use 8, 15, or 24 bits\n" );

-        }

-

-        ErrorF( "Attempting to use pixel depth of %i\n", darwinDesiredDepth );

-        return 2;

-    }

-

-    if (!strcmp( argv[i], "-showconfig" ) || !strcmp( argv[i], "-version" )) {

-        DarwinPrintBanner();

-        exit(0);

-    }

-

-    return 0;

-}

-

-

-/*

- * ddxUseMsg --

- *  Print out correct use of device dependent commandline options.

- *  Maybe the user now knows what really to do ...

- */

-void ddxUseMsg( void )

-{

-    ErrorF("\n");

-    ErrorF("\n");

-    ErrorF("Device Dependent Usage:\n");

-    ErrorF("\n");

-    ErrorF("-depth <8,15,24> : use this bit depth.\n");

-    ErrorF("-fakebuttons : fake a three button mouse with Command and Option keys.\n");

-    ErrorF("-nofakebuttons : don't fake a three button mouse.\n");

-    ErrorF("-fakemouse2 <modifiers> : fake middle mouse button with modifier keys.\n");

-    ErrorF("-fakemouse3 <modifiers> : fake right mouse button with modifier keys.\n");

-    ErrorF("  ex: -fakemouse2 \"option,shift\" = option-shift-click is middle button.\n");

-    ErrorF("-version : show the server version.\n");

-    ErrorF("\n");

-}

-

-

-/*

- * ddxGiveUp --

- *      Device dependent cleanup. Called by dix before normal server death.

- */

-void ddxGiveUp( enum ExitCode error )

-{

-    LogClose(error);

-}

-

-

-/*

- * AbortDDX --

- *      DDX - specific abort routine.  Called by AbortServer(). The attempt is

- *      made to restore all original setting of the displays. Also all devices

- *      are closed.

- */

-_X_NORETURN

-void AbortDDX( enum ExitCode error ) {

-    ErrorF( "   AbortDDX\n" );

-    OsAbort();

-}

-

+/**************************************************************
+ *
+ * Xquartz initialization code
+ *
+ * Copyright (c) 2007-2008 Apple Inc.
+ * Copyright (c) 2001-2004 Torrey T. Lyons. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include "os.h"
+#include "servermd.h"
+#include "inputstr.h"
+#include "scrnintstr.h"
+#include "mibstore.h"		// mi backing store implementation
+#include "mipointer.h"		// mi software cursor
+#include "micmap.h"		// mi colormap code
+#include "fb.h"			// fb framebuffer code
+#include "site.h"
+#include "globals.h"
+#include "dix.h"
+#include "xkbsrv.h"
+
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include "exevents.h"
+#include "extinit.h"
+
+#include "xserver-properties.h"
+
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/syslimits.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdarg.h>
+
+#define HAS_UTSNAME 1
+#include <sys/utsname.h>
+
+#define NO_CFPLUGIN
+#include <IOKit/hidsystem/IOHIDLib.h>
+
+#ifdef MITSHM
+#include "shmint.h"
+#endif
+
+#include "darwin.h"
+#include "darwinEvents.h"
+#include "quartzKeyboard.h"
+#include "quartz.h"
+
+aslclient aslc;
+
+void xq_asl_log (int level, const char *subsystem, const char *file, const char *function, int line, const char *fmt, ...) {
+    va_list args;
+    aslmsg msg = asl_new(ASL_TYPE_MSG);
+
+    if(msg) {
+        char *_line;
+
+        asl_set(msg, "File", file);
+        asl_set(msg, "Function", function);
+        asprintf(&_line, "%d", line);
+        if(_line) {
+            asl_set(msg, "Line", _line);
+            free(_line);
+        }
+        if(subsystem)
+            asl_set(msg, "Subsystem", subsystem);
+    }
+
+    va_start(args, fmt);
+    asl_vlog(aslc, msg, level, fmt, args);
+    va_end(args);
+
+    if(msg)
+        asl_free(msg);
+}
+
+/*
+ * X server shared global variables
+ */
+int                     darwinScreensFound = 0;
+DevPrivateKeyRec        darwinScreenKeyRec;
+io_connect_t            darwinParamConnect = 0;
+int                     darwinEventReadFD = -1;
+int                     darwinEventWriteFD = -1;
+// int                     darwinMouseAccelChange = 1;
+int                     darwinFakeButtons = 0;
+
+// location of X11's (0,0) point in global screen coordinates
+int                     darwinMainScreenX = 0;
+int                     darwinMainScreenY = 0;
+
+// parameters read from the command line or user preferences
+int                     darwinDesiredDepth = -1;
+int                     darwinSyncKeymap = FALSE;
+
+// modifier masks for faking mouse buttons - ANY of these bits trigger it  (not all)
+#ifdef NX_DEVICELCMDKEYMASK
+int                     darwinFakeMouse2Mask = NX_DEVICELALTKEYMASK | NX_DEVICERALTKEYMASK;
+int                     darwinFakeMouse3Mask = NX_DEVICELCMDKEYMASK | NX_DEVICERCMDKEYMASK;
+#else
+int                     darwinFakeMouse2Mask = NX_ALTERNATEMASK;
+int                     darwinFakeMouse3Mask = NX_COMMANDMASK;
+#endif
+
+// Modifier mask for overriding event delivery to appkit (might be useful to set this to rcommand for input menu
+unsigned int            darwinAppKitModMask = 0; // Any of these bits
+
+// Modifier mask for items in the Window menu (0 and -1 cause shortcuts to be disabled)
+unsigned int            windowItemModMask = NX_COMMANDMASK;
+
+// devices
+DeviceIntPtr            darwinKeyboard = NULL;
+DeviceIntPtr            darwinPointer = NULL;
+DeviceIntPtr            darwinTabletStylus = NULL;
+DeviceIntPtr            darwinTabletCursor = NULL;
+DeviceIntPtr            darwinTabletEraser = NULL;
+
+// Common pixmap formats
+static PixmapFormatRec formats[] = {
+        { 1,    1,      BITMAP_SCANLINE_PAD },
+        { 4,    8,      BITMAP_SCANLINE_PAD },
+        { 8,    8,      BITMAP_SCANLINE_PAD },
+        { 15,   16,     BITMAP_SCANLINE_PAD },
+        { 16,   16,     BITMAP_SCANLINE_PAD },
+        { 24,   32,     BITMAP_SCANLINE_PAD },
+        { 32,   32,     BITMAP_SCANLINE_PAD }
+};
+const int NUMFORMATS = sizeof(formats)/sizeof(formats[0]);
+
+void
+DarwinPrintBanner(void)
+{ 
+  ErrorF("Xquartz starting:\n");
+  ErrorF("X.Org X Server %s\n", XSERVER_VERSION);
+  ErrorF("Build Date: %s\n", BUILD_DATE );
+}
+
+
+/*
+ * DarwinSaveScreen
+ *  X screensaver support. Not implemented.
+ */
+static Bool DarwinSaveScreen(ScreenPtr pScreen, int on)
+{
+    // FIXME
+    if (on == SCREEN_SAVER_FORCER) {
+    } else if (on == SCREEN_SAVER_ON) {
+    } else {
+    }
+    return TRUE;
+}
+
+/*
+ * DarwinScreenInit
+ *  This is a callback from dix during AddScreen() from InitOutput().
+ *  Initialize the screen and communicate information about it back to dix.
+ */
+static Bool DarwinScreenInit(int index, ScreenPtr pScreen, int argc, char **argv) {
+    int         dpi;
+    static int  foundIndex = 0;
+    Bool        ret;
+    DarwinFramebufferPtr dfb;
+
+    if (!dixRegisterPrivateKey(&darwinScreenKeyRec, PRIVATE_SCREEN, 0))
+	return FALSE;
+
+    // reset index of found screens for each server generation
+    if (index == 0) {
+        foundIndex = 0;
+
+        // reset the visual list
+        miClearVisualTypes();
+    }
+
+    // allocate space for private per screen storage
+    dfb = malloc(sizeof(DarwinFramebufferRec));
+
+    // SCREEN_PRIV(pScreen) = dfb;
+    dixSetPrivate(&pScreen->devPrivates, darwinScreenKey, dfb);
+
+    // setup hardware/mode specific details
+    ret = QuartzAddScreen(foundIndex, pScreen);
+    foundIndex++;
+    if (! ret)
+        return FALSE;
+
+    // setup a single visual appropriate for our pixel type
+    if(!miSetVisualTypesAndMasks(dfb->depth, dfb->visuals, dfb->bitsPerRGB,
+                                 dfb->preferredCVC, dfb->redMask,
+                                 dfb->greenMask, dfb->blueMask)) {
+        return FALSE;
+    }
+  
+// TODO: Make PseudoColor visuals not suck in TrueColor mode  
+//    if(dfb->depth > 8)
+//        miSetVisualTypesAndMasks(8, PseudoColorMask, 8, PseudoColor, 0, 0, 0);
+    if(dfb->depth > 15)
+        miSetVisualTypesAndMasks(15, TrueColorMask, 5, TrueColor, RM_ARGB(0,5,5,5), GM_ARGB(0,5,5,5), BM_ARGB(0,5,5,5));
+    if(dfb->depth > 24)
+        miSetVisualTypesAndMasks(24, TrueColorMask, 8, TrueColor, RM_ARGB(0,8,8,8), GM_ARGB(0,8,8,8), BM_ARGB(0,8,8,8));
+
+    miSetPixmapDepths();
+
+    // machine independent screen init
+    // setup _Screen structure in pScreen
+    if (monitorResolution)
+        dpi = monitorResolution;
+    else
+        dpi = 96;
+
+    // initialize fb
+    if (! fbScreenInit(pScreen,
+                dfb->framebuffer,                 // pointer to screen bitmap
+                dfb->width, dfb->height,          // screen size in pixels
+                dpi, dpi,                         // dots per inch
+                dfb->pitch/(dfb->bitsPerPixel/8), // pixel width of framebuffer
+                dfb->bitsPerPixel))               // bits per pixel for screen
+    {
+        return FALSE;
+    }
+
+    if (! fbPictureInit(pScreen, 0, 0)) {
+        return FALSE;
+    }
+
+#ifdef MITSHM
+    ShmRegisterFbFuncs(pScreen);
+#endif
+
+    // this must be initialized (why doesn't X have a default?)
+    pScreen->SaveScreen = DarwinSaveScreen;
+
+    // finish mode dependent screen setup including cursor support
+    if (!QuartzSetupScreen(index, pScreen)) {
+        return FALSE;
+    }
+
+    // create and install the default colormap and
+    // set pScreen->blackPixel / pScreen->white
+    if (!miCreateDefColormap( pScreen )) {
+        return FALSE;
+    }
+
+    pScreen->x = dfb->x;
+    pScreen->y = dfb->y;
+
+    /*    ErrorF("Screen %d added: %dx%d @ (%d,%d)\n",
+	  index, dfb->width, dfb->height, dfb->x, dfb->y); */
+
+    return TRUE;
+}
+
+/*
+ =============================================================================
+
+ mouse and keyboard callbacks
+
+ =============================================================================
+*/
+
+/*
+ * DarwinMouseProc: Handle the initialization, etc. of a mouse
+ */
+static int DarwinMouseProc(DeviceIntPtr pPointer, int what) {
+#define NBUTTONS 7
+#define NAXES 2
+	// 7 buttons: left, right, middle, then four scroll wheel "buttons"
+    CARD8 map[NBUTTONS + 1] = {0, 1, 2, 3, 4, 5, 6, 7};
+    Atom btn_labels[NBUTTONS] = {0};
+    Atom axes_labels[NAXES] = {0};
+
+    switch (what) {
+        case DEVICE_INIT:
+            pPointer->public.on = FALSE;
+
+            btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
+            btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
+            btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
+            btn_labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);
+            btn_labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN);
+            btn_labels[5] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_LEFT);
+            btn_labels[6] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_RIGHT);
+
+            axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);
+            axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);
+
+
+            // Set button map.
+            InitPointerDeviceStruct((DevicePtr)pPointer, map, NBUTTONS,
+                                    btn_labels,
+                                    (PtrCtrlProcPtr)NoopDDA,
+                                    GetMotionHistorySize(), NAXES,
+                                    axes_labels);
+            InitValuatorAxisStruct(pPointer, 0, axes_labels[0], NO_AXIS_LIMITS, NO_AXIS_LIMITS, 0, 0, 0, Absolute);
+            InitValuatorAxisStruct(pPointer, 1, axes_labels[1], NO_AXIS_LIMITS, NO_AXIS_LIMITS, 0, 0, 0, Absolute);
+            break;
+        case DEVICE_ON:
+            pPointer->public.on = TRUE;
+            AddEnabledDevice( darwinEventReadFD );
+            return Success;
+        case DEVICE_CLOSE:
+        case DEVICE_OFF:
+            pPointer->public.on = FALSE;
+            RemoveEnabledDevice(darwinEventReadFD);
+            return Success;
+    }
+    
+    return Success;
+#undef NBUTTONS
+#undef NAXES
+}
+
+static int DarwinTabletProc(DeviceIntPtr pPointer, int what) {
+#define NBUTTONS 3
+#define NAXES 5
+    CARD8 map[NBUTTONS + 1] = {0, 1, 2, 3};
+    Atom btn_labels[NBUTTONS] = {0};
+    Atom axes_labels[NAXES] = {0};
+
+    switch (what) {
+        case DEVICE_INIT:
+            pPointer->public.on = FALSE;
+
+            btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
+            btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
+            btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
+
+            axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_X);
+            axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_Y);
+            axes_labels[2] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_PRESSURE);
+            axes_labels[3] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_TILT_X);
+            axes_labels[4] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_TILT_Y);
+
+            // Set button map.
+            InitPointerDeviceStruct((DevicePtr)pPointer, map, NBUTTONS,
+                                    btn_labels,
+                                    (PtrCtrlProcPtr)NoopDDA,
+                                    GetMotionHistorySize(), NAXES,
+                                    axes_labels);
+            InitProximityClassDeviceStruct(pPointer);
+
+            InitValuatorAxisStruct(pPointer, 0, axes_labels[0], 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
+            InitValuatorAxisStruct(pPointer, 1, axes_labels[1], 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
+            InitValuatorAxisStruct(pPointer, 2, axes_labels[2], 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
+            InitValuatorAxisStruct(pPointer, 3, axes_labels[3], -XQUARTZ_VALUATOR_LIMIT, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
+            InitValuatorAxisStruct(pPointer, 4, axes_labels[4], -XQUARTZ_VALUATOR_LIMIT, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
+//          pPointer->use = IsXExtensionDevice;
+            break;
+        case DEVICE_ON:
+            pPointer->public.on = TRUE;
+            AddEnabledDevice( darwinEventReadFD );
+            return Success;
+        case DEVICE_CLOSE:
+        case DEVICE_OFF:
+            pPointer->public.on = FALSE;
+            RemoveEnabledDevice(darwinEventReadFD);
+            return Success;
+    }
+    return Success;
+#undef NBUTTONS
+#undef NAXES
+}
+
+/*
+ * DarwinKeybdProc
+ *  Callback from X
+ */
+static int DarwinKeybdProc( DeviceIntPtr pDev, int onoff )
+{
+    switch ( onoff ) {
+        case DEVICE_INIT:
+            DarwinKeyboardInit( pDev );
+            break;
+        case DEVICE_ON:
+            pDev->public.on = TRUE;
+            AddEnabledDevice( darwinEventReadFD );
+            break;
+        case DEVICE_OFF:
+            pDev->public.on = FALSE;
+            RemoveEnabledDevice( darwinEventReadFD );
+            break;
+        case DEVICE_CLOSE:
+            break;
+    }
+
+    return Success;
+}
+
+/*
+===========================================================================
+
+ Utility routines
+
+===========================================================================
+*/
+
+/*
+ * DarwinParseModifierList
+ *  Parse a list of modifier names and return a corresponding modifier mask
+ */
+int DarwinParseModifierList(const char *constmodifiers, int separatelr)
+{
+    int result = 0;
+
+    if (constmodifiers) {
+        char *modifiers = strdup(constmodifiers);
+        char *modifier;
+        int nxkey;
+        char *p = modifiers;
+
+        while (p) {
+            modifier = strsep(&p, " ,+&|/"); // allow lots of separators
+            nxkey = DarwinModifierStringToNXMask(modifier, separatelr);
+            if(nxkey)
+                result |= nxkey;
+            else
+                ErrorF("fakebuttons: Unknown modifier \"%s\"\n", modifier);
+        }
+        free(modifiers);
+    }
+    return result;
+}
+
+/*
+===========================================================================
+
+ Functions needed to link against device independent X
+
+===========================================================================
+*/
+
+/*
+ * InitInput
+ *  Register the keyboard and mouse devices
+ */
+void InitInput( int argc, char **argv )
+{
+    XkbRMLVOSet rmlvo = { .rules = "base", .model = "empty", .layout = "empty",
+                          .variant = NULL, .options = NULL };
+    /* We need to really have rules... or something... */
+    XkbSetRulesDflts(&rmlvo);
+
+    darwinKeyboard = AddInputDevice(serverClient, DarwinKeybdProc, TRUE);
+    darwinKeyboard->name = strdup("keyboard");
+
+    /* here's the snippet from the current gdk sources:
+    if (!strcmp (tmp_name, "pointer"))
+        gdkdev->info.source = GDK_SOURCE_MOUSE;
+    else if (!strcmp (tmp_name, "wacom") ||
+             !strcmp (tmp_name, "pen"))
+        gdkdev->info.source = GDK_SOURCE_PEN;
+    else if (!strcmp (tmp_name, "eraser"))
+        gdkdev->info.source = GDK_SOURCE_ERASER;
+    else if (!strcmp (tmp_name, "cursor"))
+        gdkdev->info.source = GDK_SOURCE_CURSOR;
+    else
+        gdkdev->info.source = GDK_SOURCE_PEN;
+    */
+
+    darwinPointer = AddInputDevice(serverClient, DarwinMouseProc, TRUE);
+    darwinPointer->name = strdup("pointer");
+
+    darwinTabletStylus = AddInputDevice(serverClient, DarwinTabletProc, TRUE);
+    darwinTabletStylus->name = strdup("pen");
+
+    darwinTabletCursor = AddInputDevice(serverClient, DarwinTabletProc, TRUE);
+    darwinTabletCursor->name = strdup("cursor");
+
+    darwinTabletEraser = AddInputDevice(serverClient, DarwinTabletProc, TRUE);
+    darwinTabletEraser->name = strdup("eraser");
+
+    DarwinEQInit();
+
+    QuartzInitInput(argc, argv);
+}
+
+void CloseInput(void)
+{
+    DarwinEQFini();
+}
+
+/*
+ * DarwinAdjustScreenOrigins
+ *  Shift all screens so the X11 (0, 0) coordinate is at the top
+ *  left of the global screen coordinates.
+ *
+ *  Screens can be arranged so the top left isn't on any screen, so
+ *  instead use the top left of the leftmost screen as (0,0). This
+ *  may mean some screen space is in -y, but it's better that (0,0)
+ *  be onscreen, or else default xterms disappear. It's better that
+ *  -y be used than -x, because when popup menus are forced
+ *  "onscreen" by dumb window managers like twm, they'll shift the
+ *  menus down instead of left, which still looks funny but is an
+ *  easier target to hit.
+ */
+void
+DarwinAdjustScreenOrigins(ScreenInfo *pScreenInfo)
+{
+    int i, left, top;
+
+    left = pScreenInfo->screens[0]->x;
+    top  = pScreenInfo->screens[0]->y;
+
+    /* Find leftmost screen. If there's a tie, take the topmost of the two. */
+    for (i = 1; i < pScreenInfo->numScreens; i++) {
+        if (pScreenInfo->screens[i]->x < left  ||
+            (pScreenInfo->screens[i]->x == left && pScreenInfo->screens[i]->y < top))
+        {
+            left = pScreenInfo->screens[i]->x;
+            top = pScreenInfo->screens[i]->y;
+        }
+    }
+
+    darwinMainScreenX = left;
+    darwinMainScreenY = top;
+    
+    DEBUG_LOG("top = %d, left=%d\n", top, left);
+
+    /* Shift all screens so that there is a screen whose top left
+     * is at X11 (0,0) and at global screen coordinate
+     * (darwinMainScreenX, darwinMainScreenY).
+     */
+
+    if (darwinMainScreenX != 0 || darwinMainScreenY != 0) {
+        for (i = 0; i < pScreenInfo->numScreens; i++) {
+            pScreenInfo->screens[i]->x -= darwinMainScreenX;
+            pScreenInfo->screens[i]->y -= darwinMainScreenY;
+            DEBUG_LOG("Screen %d placed at X11 coordinate (%d,%d).\n",
+                      i, pScreenInfo->screens[i]->x, pScreenInfo->screens[i]->y);
+        }
+    }
+}
+
+
+/*
+ * InitOutput
+ *  Initialize screenInfo for all actually accessible framebuffers.
+ *
+ *  The display mode dependent code gets called three times. The mode
+ *  specific InitOutput routines are expected to discover the number
+ *  of potentially useful screens and cache routes to them internally.
+ *  Inside DarwinScreenInit are two other mode specific calls.
+ *  A mode specific AddScreen routine is called for each screen to
+ *  actually initialize the screen with the ScreenPtr structure.
+ *  After other screen setup has been done, a mode specific
+ *  SetupScreen function can be called to finalize screen setup.
+ */
+void InitOutput( ScreenInfo *pScreenInfo, int argc, char **argv )
+{
+    int i;
+
+    pScreenInfo->imageByteOrder = IMAGE_BYTE_ORDER;
+    pScreenInfo->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;
+    pScreenInfo->bitmapScanlinePad = BITMAP_SCANLINE_PAD;
+    pScreenInfo->bitmapBitOrder = BITMAP_BIT_ORDER;
+
+    // List how we want common pixmap formats to be padded
+    pScreenInfo->numPixmapFormats = NUMFORMATS;
+    for (i = 0; i < NUMFORMATS; i++)
+        pScreenInfo->formats[i] = formats[i];
+
+    // Discover screens and do mode specific initialization
+    QuartzInitOutput(argc, argv);
+
+    // Add screens
+    for (i = 0; i < darwinScreensFound; i++) {
+        AddScreen(DarwinScreenInit, argc, argv);
+    }
+
+    DarwinAdjustScreenOrigins(pScreenInfo);
+}
+
+
+/*
+ * OsVendorFatalError
+ */
+void OsVendorFatalError( void )
+{
+    ErrorF( "   OsVendorFatalError\n" );
+}
+
+
+/*
+ * OsVendorInit
+ *  Initialization of Darwin OS support.
+ */
+void OsVendorInit(void)
+{
+    if (serverGeneration == 1) {
+        char *lf;
+        char *home = getenv("HOME");
+        assert(home);
+        assert(0 < asprintf(&lf, "%s/Library/Logs/X11.%s.log", home, bundle_id_prefix));
+        LogInit(lf, ".old");
+        free(lf);
+
+        DarwinPrintBanner();
+#ifdef ENABLE_DEBUG_LOG
+	{
+	  char *home_dir=NULL, *log_file_path=NULL;
+	  home_dir = getenv("HOME");
+	  if (home_dir) asprintf(&log_file_path, "%s/%s", home_dir, DEBUG_LOG_NAME);
+	  if (log_file_path) {
+	    if (!access(log_file_path, F_OK)) {
+	      debug_log_fp = fopen(log_file_path, "a");
+	      if (debug_log_fp) ErrorF("Debug logging enabled to %s\n", log_file_path);
+	    }
+	    free(log_file_path);
+	  }
+	}
+#endif
+    }
+}
+
+
+/*
+ * ddxProcessArgument
+ *  Process device-dependent command line args. Returns 0 if argument is
+ *  not device dependent, otherwise Count of number of elements of argv
+ *  that are part of a device dependent commandline option.
+ */
+int ddxProcessArgument( int argc, char *argv[], int i )
+{
+//    if ( !strcmp( argv[i], "-fullscreen" ) ) {
+//        ErrorF( "Running full screen in parallel with Mac OS X Quartz window server.\n" );
+//        return 1;
+//    }
+
+//    if ( !strcmp( argv[i], "-rootless" ) ) {
+//        ErrorF( "Running rootless inside Mac OS X window server.\n" );
+//        return 1;
+//    }
+
+    // This command line arg is passed when launched from the Aqua GUI.
+    if ( !strncmp( argv[i], "-psn_", 5 ) ) {
+        return 1;
+    }
+
+    if ( !strcmp( argv[i], "-fakebuttons" ) ) {
+        darwinFakeButtons = TRUE;
+        ErrorF( "Faking a three button mouse\n" );
+        return 1;
+    }
+
+    if ( !strcmp( argv[i], "-nofakebuttons" ) ) {
+        darwinFakeButtons = FALSE;
+        ErrorF( "Not faking a three button mouse\n" );
+        return 1;
+    }
+
+    if (!strcmp( argv[i], "-fakemouse2" ) ) {
+        if ( i == argc-1 ) {
+            FatalError( "-fakemouse2 must be followed by a modifer list\n" );
+        }
+        if (!strcasecmp(argv[i+1], "none") || !strcmp(argv[i+1], ""))
+            darwinFakeMouse2Mask = 0;
+        else
+            darwinFakeMouse2Mask = DarwinParseModifierList(argv[i+1], 1);
+        ErrorF("Modifier mask to fake mouse button 2 = 0x%x\n",
+               darwinFakeMouse2Mask);
+        return 2;
+    }
+
+    if (!strcmp( argv[i], "-fakemouse3" ) ) {
+        if ( i == argc-1 ) {
+            FatalError( "-fakemouse3 must be followed by a modifer list\n" );
+        }
+        if (!strcasecmp(argv[i+1], "none") || !strcmp(argv[i+1], ""))
+            darwinFakeMouse3Mask = 0;
+        else
+            darwinFakeMouse3Mask = DarwinParseModifierList(argv[i+1], 1);
+        ErrorF("Modifier mask to fake mouse button 3 = 0x%x\n",
+               darwinFakeMouse3Mask);
+        return 2;
+    }
+
+    if ( !strcmp( argv[i], "+synckeymap" ) ) {
+        darwinSyncKeymap = TRUE;
+        return 1;
+    }
+
+    if ( !strcmp( argv[i], "-synckeymap" ) ) {
+        darwinSyncKeymap = FALSE;
+        return 1;
+    }
+
+    if ( !strcmp( argv[i], "-depth" ) ) {
+        if ( i == argc-1 ) {
+            FatalError( "-depth must be followed by a number\n" );
+        }
+        darwinDesiredDepth = atoi( argv[i+1] );
+        if(darwinDesiredDepth != -1 &&
+           darwinDesiredDepth != 8 &&
+           darwinDesiredDepth != 15 &&
+           darwinDesiredDepth != 24) {
+            FatalError( "Unsupported pixel depth. Use 8, 15, or 24 bits\n" );
+        }
+
+        ErrorF( "Attempting to use pixel depth of %i\n", darwinDesiredDepth );
+        return 2;
+    }
+
+    if (!strcmp( argv[i], "-showconfig" ) || !strcmp( argv[i], "-version" )) {
+        DarwinPrintBanner();
+        exit(0);
+    }
+
+    return 0;
+}
+
+
+/*
+ * ddxUseMsg --
+ *  Print out correct use of device dependent commandline options.
+ *  Maybe the user now knows what really to do ...
+ */
+void ddxUseMsg( void )
+{
+    ErrorF("\n");
+    ErrorF("\n");
+    ErrorF("Device Dependent Usage:\n");
+    ErrorF("\n");
+    ErrorF("-depth <8,15,24> : use this bit depth.\n");
+    ErrorF("-fakebuttons : fake a three button mouse with Command and Option keys.\n");
+    ErrorF("-nofakebuttons : don't fake a three button mouse.\n");
+    ErrorF("-fakemouse2 <modifiers> : fake middle mouse button with modifier keys.\n");
+    ErrorF("-fakemouse3 <modifiers> : fake right mouse button with modifier keys.\n");
+    ErrorF("  ex: -fakemouse2 \"option,shift\" = option-shift-click is middle button.\n");
+    ErrorF("-version : show the server version.\n");
+    ErrorF("\n");
+}
+
+
+/*
+ * ddxGiveUp --
+ *      Device dependent cleanup. Called by dix before normal server death.
+ */
+void ddxGiveUp( enum ExitCode error )
+{
+    LogClose(error);
+}
+
+
+/*
+ * AbortDDX --
+ *      DDX - specific abort routine.  Called by AbortServer(). The attempt is
+ *      made to restore all original setting of the displays. Also all devices
+ *      are closed.
+ */
+_X_NORETURN
+void AbortDDX( enum ExitCode error ) {
+    ErrorF( "   AbortDDX\n" );
+    OsAbort();
+}
+
diff --git a/xorg-server/hw/xquartz/darwin.h b/xorg-server/hw/xquartz/darwin.h
index c209147ef..aafc12fbf 100644
--- a/xorg-server/hw/xquartz/darwin.h
+++ b/xorg-server/hw/xquartz/darwin.h
@@ -1,86 +1,86 @@
-/*

- * Copyright (C) 2008 Apple, Inc.

- * Copyright (c) 2001-2004 Torrey T. Lyons. All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright

- * holders shall not be used in advertising or otherwise to promote the sale,

- * use or other dealings in this Software without prior written authorization.

- */

-

-#ifndef _DARWIN_H

-#define _DARWIN_H

-

-#include <IOKit/IOTypes.h>

-#include "inputstr.h"

-#include "scrnintstr.h"

-#include <X11/extensions/XKB.h>

-#include <asl.h>

-

-#include "darwinfb.h"

-

-// From darwin.c

-void DarwinPrintBanner(void);

-int DarwinParseModifierList(const char *constmodifiers, int separatelr);

-void DarwinAdjustScreenOrigins(ScreenInfo *pScreenInfo);

-

-#define SCREEN_PRIV(pScreen) ((DarwinFramebufferPtr) \

-    dixLookupPrivate(&pScreen->devPrivates, darwinScreenKey))

-

-/*

- * Global variables from darwin.c

- */

-extern DevPrivateKeyRec darwinScreenKeyRec;

-#define darwinScreenKey (&darwinScreenKeyRec)

-extern int              darwinScreensFound;

-extern io_connect_t     darwinParamConnect;

-extern int              darwinEventReadFD;

-extern int              darwinEventWriteFD;

-extern DeviceIntPtr     darwinPointer;

-extern DeviceIntPtr     darwinTabletCursor;

-extern DeviceIntPtr     darwinTabletStylus;

-extern DeviceIntPtr     darwinTabletEraser;

-extern DeviceIntPtr     darwinKeyboard;

-

-// User preferences

-extern int              darwinMouseAccelChange;

-extern int              darwinFakeButtons;

-extern int              darwinFakeMouse2Mask;

-extern int              darwinFakeMouse3Mask;

-extern unsigned int     darwinAppKitModMask;

-extern unsigned int     windowItemModMask;

-extern int              darwinSyncKeymap;

-extern int              darwinDesiredDepth;

-

-// location of X11's (0,0) point in global screen coordinates

-extern int              darwinMainScreenX;

-extern int              darwinMainScreenY;

-

-// bundle-main.c

-extern char *bundle_id_prefix;

-

-_X_ATTRIBUTE_PRINTF(6,7)

-extern void xq_asl_log (int level, const char *subsystem, const char *file, const char *function, int line, const char *fmt, ...);

-

-#define ASL_LOG(level, subsystem, msg, args...) xq_asl_log(level, subsystem, __FILE__, __FUNCTION__, __LINE__, msg, ##args)

-#define DEBUG_LOG(msg, args...) ASL_LOG(ASL_LEVEL_DEBUG, "XQuartz", msg, ##args)

-#define TRACE() DEBUG_LOG("TRACE")

-

-#endif  /* _DARWIN_H */

+/*
+ * Copyright (C) 2008 Apple, Inc.
+ * Copyright (c) 2001-2004 Torrey T. Lyons. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+
+#ifndef _DARWIN_H
+#define _DARWIN_H
+
+#include <IOKit/IOTypes.h>
+#include "inputstr.h"
+#include "scrnintstr.h"
+#include <X11/extensions/XKB.h>
+#include <asl.h>
+
+#include "darwinfb.h"
+
+// From darwin.c
+void DarwinPrintBanner(void);
+int DarwinParseModifierList(const char *constmodifiers, int separatelr);
+void DarwinAdjustScreenOrigins(ScreenInfo *pScreenInfo);
+
+#define SCREEN_PRIV(pScreen) ((DarwinFramebufferPtr) \
+    dixLookupPrivate(&pScreen->devPrivates, darwinScreenKey))
+
+/*
+ * Global variables from darwin.c
+ */
+extern DevPrivateKeyRec darwinScreenKeyRec;
+#define darwinScreenKey (&darwinScreenKeyRec)
+extern int              darwinScreensFound;
+extern io_connect_t     darwinParamConnect;
+extern int              darwinEventReadFD;
+extern int              darwinEventWriteFD;
+extern DeviceIntPtr     darwinPointer;
+extern DeviceIntPtr     darwinTabletCursor;
+extern DeviceIntPtr     darwinTabletStylus;
+extern DeviceIntPtr     darwinTabletEraser;
+extern DeviceIntPtr     darwinKeyboard;
+
+// User preferences
+extern int              darwinMouseAccelChange;
+extern int              darwinFakeButtons;
+extern int              darwinFakeMouse2Mask;
+extern int              darwinFakeMouse3Mask;
+extern unsigned int     darwinAppKitModMask;
+extern unsigned int     windowItemModMask;
+extern int              darwinSyncKeymap;
+extern int              darwinDesiredDepth;
+
+// location of X11's (0,0) point in global screen coordinates
+extern int              darwinMainScreenX;
+extern int              darwinMainScreenY;
+
+// bundle-main.c
+extern char *bundle_id_prefix;
+
+_X_ATTRIBUTE_PRINTF(6,7)
+extern void xq_asl_log (int level, const char *subsystem, const char *file, const char *function, int line, const char *fmt, ...);
+
+#define ASL_LOG(level, subsystem, msg, args...) xq_asl_log(level, subsystem, __FILE__, __FUNCTION__, __LINE__, msg, ##args)
+#define DEBUG_LOG(msg, args...) ASL_LOG(ASL_LEVEL_DEBUG, "XQuartz", msg, ##args)
+#define TRACE() DEBUG_LOG("TRACE")
+
+#endif  /* _DARWIN_H */
diff --git a/xorg-server/hw/xquartz/darwinEvents.c b/xorg-server/hw/xquartz/darwinEvents.c
index 8f39a39a7..c367e3c1c 100644
--- a/xorg-server/hw/xquartz/darwinEvents.c
+++ b/xorg-server/hw/xquartz/darwinEvents.c
@@ -1,602 +1,602 @@
-/*

-Darwin event queue and event handling

-

-Copyright 2007-2008 Apple Inc.

-Copyright 2004 Kaleb S. KEITHLEY. All Rights Reserved.

-Copyright (c) 2002-2004 Torrey T. Lyons. All Rights Reserved.

-

-This file is based on mieq.c by Keith Packard,

-which contains the following copyright:

-Copyright 1990, 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.

- */

-

-#include "sanitizedCarbon.h"

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include   <X11/X.h>

-#include   <X11/Xmd.h>

-#include   <X11/Xproto.h>

-#include   "misc.h"

-#include   "windowstr.h"

-#include   "pixmapstr.h"

-#include   "inputstr.h"

-#include   "inpututils.h"

-#include   "eventstr.h"

-#include   "mi.h"

-#include   "scrnintstr.h"

-#include   "mipointer.h"

-#include   "os.h"

-

-#include "darwin.h"

-#include "quartz.h"

-#include "quartzKeyboard.h"

-#include "quartzRandR.h"

-#include "darwinEvents.h"

-

-#include <sys/types.h>

-#include <sys/uio.h>

-#include <unistd.h>

-#include <pthread.h>

-#include <errno.h>

-#include <time.h>

-

-#include <IOKit/hidsystem/IOLLEvent.h>

-

-/* Fake button press/release for scroll wheel move. */

-#define SCROLLWHEELUPFAKE    4

-#define SCROLLWHEELDOWNFAKE  5

-#define SCROLLWHEELLEFTFAKE  6

-#define SCROLLWHEELRIGHTFAKE 7

-

-#include <X11/extensions/applewmconst.h>

-#include "applewmExt.h"

-

-/* FIXME: Abstract this better */

-extern Bool QuartzModeEventHandler(int screenNum, XQuartzEvent *e, DeviceIntPtr dev);

-

-int darwin_all_modifier_flags = 0;  // last known modifier state

-int darwin_all_modifier_mask = 0;

-int darwin_x11_modifier_mask = 0;

-

-#define FD_ADD_MAX 128

-static int fd_add[FD_ADD_MAX];

-int fd_add_count = 0;

-static pthread_mutex_t fd_add_lock = PTHREAD_MUTEX_INITIALIZER;

-static pthread_cond_t fd_add_ready_cond = PTHREAD_COND_INITIALIZER;

-static pthread_t fd_add_tid = NULL;

-

-static InternalEvent* darwinEvents = NULL;

-

-static pthread_mutex_t mieq_lock = PTHREAD_MUTEX_INITIALIZER;

-static pthread_cond_t mieq_ready_cond = PTHREAD_COND_INITIALIZER;

-

-/*** Pthread Magics ***/

-static pthread_t create_thread(void *(*func)(void *), void *arg) {

-    pthread_attr_t attr;

-    pthread_t tid;

-

-    pthread_attr_init (&attr);

-    pthread_attr_setscope (&attr, PTHREAD_SCOPE_SYSTEM);

-    pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);

-    pthread_create (&tid, &attr, func, arg);

-    pthread_attr_destroy (&attr);

-

-    return tid;

-}

-

-void darwinEvents_lock(void);

-void darwinEvents_lock(void) {

-    int err;

-    if((err = pthread_mutex_lock(&mieq_lock))) {

-        ErrorF("%s:%s:%d: Failed to lock mieq_lock: %d\n",

-               __FILE__, __FUNCTION__, __LINE__, err);

-        xorg_backtrace();

-    }

-    if(darwinEvents == NULL) {

-        pthread_cond_wait(&mieq_ready_cond, &mieq_lock);

-    }

-}

-

-void darwinEvents_unlock(void);

-void darwinEvents_unlock(void) {

-    int err;

-    if((err = pthread_mutex_unlock(&mieq_lock))) {

-        ErrorF("%s:%s:%d: Failed to unlock mieq_lock: %d\n",

-               __FILE__, __FUNCTION__, __LINE__, err);

-        xorg_backtrace();

-    }

-}

-

-/*

- * DarwinPressModifierKey

- * Press or release the given modifier key (one of NX_MODIFIERKEY_* constants)

- */

-static void DarwinPressModifierKey(int pressed, int key) {

-    int keycode = DarwinModifierNXKeyToNXKeycode(key, 0);

-

-    if (keycode == 0) {

-        ErrorF("DarwinPressModifierKey bad keycode: key=%d\n", key);

-        return;

-    }

-

-    DarwinSendKeyboardEvents(pressed, keycode);

-}

-

-/*

- * DarwinUpdateModifiers

- *  Send events to update the modifier state.

- */

-

-static int darwin_x11_modifier_mask_list[] = {

-#ifdef NX_DEVICELCMDKEYMASK

-    NX_DEVICELCTLKEYMASK, NX_DEVICERCTLKEYMASK,

-    NX_DEVICELSHIFTKEYMASK, NX_DEVICERSHIFTKEYMASK,

-    NX_DEVICELCMDKEYMASK, NX_DEVICERCMDKEYMASK,

-    NX_DEVICELALTKEYMASK, NX_DEVICERALTKEYMASK,

-#else

-    NX_CONTROLMASK, NX_SHIFTMASK, NX_COMMANDMASK, NX_ALTERNATEMASK,

-#endif

-    NX_ALPHASHIFTMASK,

-    0

-};

-

-static int darwin_all_modifier_mask_additions[] = { NX_SECONDARYFNMASK, };

-

-static void DarwinUpdateModifiers(

-    int pressed,        // KeyPress or KeyRelease

-    int flags )         // modifier flags that have changed

-{

-    int *f;

-    int key;

-

-    /* Capslock is special.  This mask is the state of capslock (on/off),

-     * not the state of the button.  Hopefully we can find a better solution.

-     */

-    if(NX_ALPHASHIFTMASK & flags) {

-        DarwinPressModifierKey(KeyPress, NX_MODIFIERKEY_ALPHALOCK);

-        DarwinPressModifierKey(KeyRelease, NX_MODIFIERKEY_ALPHALOCK);

-    }

-    

-    for(f=darwin_x11_modifier_mask_list; *f; f++)

-        if(*f & flags && *f != NX_ALPHASHIFTMASK) {

-            key = DarwinModifierNXMaskToNXKey(*f);

-            if(key == -1)

-                ErrorF("DarwinUpdateModifiers: Unsupported NXMask: 0x%x\n", *f);

-            else

-                DarwinPressModifierKey(pressed, key);

-        }

-}

-

-/* Generic handler for Xquartz-specifc events.  When possible, these should

-   be moved into their own individual functions and set as handlers using

-   mieqSetHandler. */

-

-static void DarwinEventHandler(int screenNum, InternalEvent *ie, DeviceIntPtr dev) {

-    XQuartzEvent *e = &(ie->xquartz_event);

-

-    switch(e->subtype) {

-        case kXquartzControllerNotify:

-            DEBUG_LOG("kXquartzControllerNotify\n");

-            AppleWMSendEvent(AppleWMControllerNotify,

-                             AppleWMControllerNotifyMask,

-                             e->data[0],

-                             e->data[1]);

-            break;

-            

-        case kXquartzPasteboardNotify:

-            DEBUG_LOG("kXquartzPasteboardNotify\n");

-            AppleWMSendEvent(AppleWMPasteboardNotify,

-                             AppleWMPasteboardNotifyMask,

-                             e->data[0],

-                             e->data[1]);

-            break;

-            

-        case kXquartzActivate:

-            DEBUG_LOG("kXquartzActivate\n");

-            QuartzShow();

-            AppleWMSendEvent(AppleWMActivationNotify,

-                             AppleWMActivationNotifyMask,

-                             AppleWMIsActive, 0);

-            break;

-            

-        case kXquartzDeactivate:

-            DEBUG_LOG("kXquartzDeactivate\n");

-            AppleWMSendEvent(AppleWMActivationNotify,

-                             AppleWMActivationNotifyMask,

-                             AppleWMIsInactive, 0);

-            QuartzHide();

-            break;

-

-        case kXquartzReloadPreferences:

-            DEBUG_LOG("kXquartzReloadPreferences\n");

-            AppleWMSendEvent(AppleWMActivationNotify,

-                             AppleWMActivationNotifyMask,

-                             AppleWMReloadPreferences, 0);

-            break;

-            

-        case kXquartzToggleFullscreen:

-            DEBUG_LOG("kXquartzToggleFullscreen\n");

-            if(XQuartzIsRootless)

-                ErrorF("Ignoring kXquartzToggleFullscreen because of rootless mode.");

-            else 

-                QuartzRandRToggleFullscreen();

-            break;

-            

-        case kXquartzSetRootless:

-            DEBUG_LOG("kXquartzSetRootless\n");

-            if(e->data[0]) {

-                QuartzRandRSetFakeRootless();

-            } else {

-                QuartzRandRSetFakeFullscreen(FALSE);

-            }

-            break;

-            

-        case kXquartzSetRootClip:

-            QuartzSetRootClip((Bool)e->data[0]);

-            break;

-            

-        case kXquartzQuit:

-            GiveUp(0);

-            break;

-            

-        case kXquartzSpaceChanged:

-            DEBUG_LOG("kXquartzSpaceChanged\n");

-            QuartzSpaceChanged(e->data[0]);

-            break;

-

-        case kXquartzListenOnOpenFD:

-            ErrorF("Calling ListenOnOpenFD() for new fd: %d\n", (int)e->data[0]);

-            ListenOnOpenFD((int)e->data[0], 1);

-            break;

-            

-        case kXquartzReloadKeymap:

-            DarwinKeyboardReloadHandler();

-            break;

-            

-        case kXquartzDisplayChanged:

-            DEBUG_LOG("kXquartzDisplayChanged\n");

-            QuartzUpdateScreens();

-

-            /* Update our RandR info */

-            QuartzRandRUpdateFakeModes(TRUE);

-            break;

-            

-        default:

-            if(!QuartzModeEventHandler(screenNum, e, dev))

-                ErrorF("Unknown application defined event type %d.\n", e->subtype);

-    }	

-}

-

-void DarwinListenOnOpenFD(int fd) {

-    ErrorF("DarwinListenOnOpenFD: %d\n", fd);

-    

-    pthread_mutex_lock(&fd_add_lock);

-    if(fd_add_count < FD_ADD_MAX)

-        fd_add[fd_add_count++] = fd;

-    else

-        ErrorF("FD Addition buffer at max.  Dropping fd addition request.\n");

-

-    pthread_cond_broadcast(&fd_add_ready_cond);

-    pthread_mutex_unlock(&fd_add_lock);

-}

-

-static void *DarwinProcessFDAdditionQueue_thread(void *args) {

-    /* TODO: Possibly adjust this to no longer be a race... maybe trigger this

-     *       once a client connects and claims to be the WM.

-     *

-     * From ajax:

-     * There's already an internal callback chain for setting selection [in 1.5]

-     * ownership.  See the CallSelectionCallback at the bottom of

-     * ProcSetSelectionOwner, and xfixes/select.c for an example of how to hook

-     * into it.

-     */

-

-    struct timespec sleep_for;

-    struct timespec sleep_remaining;

-

-    sleep_for.tv_sec = 3;

-    sleep_for.tv_nsec = 0;

-

-    ErrorF("X11.app: DarwinProcessFDAdditionQueue_thread: Sleeping to allow xinitrc to catchup.\n");

-    while(nanosleep(&sleep_for, &sleep_remaining) != 0) {

-        sleep_for = sleep_remaining;

-    }

-

-    pthread_mutex_lock(&fd_add_lock);

-    while(true) {

-        while(fd_add_count) {

-            DarwinSendDDXEvent(kXquartzListenOnOpenFD, 1, fd_add[--fd_add_count]);

-        }

-        pthread_cond_wait(&fd_add_ready_cond, &fd_add_lock);

-    }

-

-    return NULL;

-}

-

-Bool DarwinEQInit(void) { 

-    int *p;

-

-    for(p=darwin_x11_modifier_mask_list, darwin_all_modifier_mask=0; *p; p++) {

-        darwin_x11_modifier_mask |= *p;

-    }

-    

-    for(p=darwin_all_modifier_mask_additions, darwin_all_modifier_mask= darwin_x11_modifier_mask; *p; p++) {

-        darwin_all_modifier_mask |= *p;

-    }

-    

-    mieqInit();

-    mieqSetHandler(ET_XQuartz, DarwinEventHandler);

-

-    /* Note that this *could* cause a potential async issue, since we're checking

-     * darwinEvents without holding the lock, but darwinEvents is only ever set

-     * here, so I don't bother.

-     */

-    if (!darwinEvents) {

-        darwinEvents = InitEventList(GetMaximumEventsNum());;

-        

-        if (!darwinEvents)

-            FatalError("Couldn't allocate event buffer\n");

-        

-        darwinEvents_lock();

-        pthread_cond_broadcast(&mieq_ready_cond);

-        darwinEvents_unlock();

-    }

-

-    if(!fd_add_tid)

-        fd_add_tid = create_thread(DarwinProcessFDAdditionQueue_thread, NULL);

-    

-    return TRUE;

-}

-

-void DarwinEQFini(void) {

-    mieqFini();

-}

-

-/*

- * ProcessInputEvents

- *  Read and process events from the event queue until it is empty.

- */

-void ProcessInputEvents(void) {

-    char nullbyte;

-	int x = sizeof(nullbyte);

-    

-    mieqProcessInputEvents();

-

-    // Empty the signaling pipe

-    while (x == sizeof(nullbyte)) {

-      x = read(darwinEventReadFD, &nullbyte, sizeof(nullbyte));

-    }

-}

-

-/* Sends a null byte down darwinEventWriteFD, which will cause the

-   Dispatch() event loop to check out event queue */

-static void DarwinPokeEQ(void) {

-	char nullbyte=0;

-	//  <daniels> oh, i ... er ... christ.

-	write(darwinEventWriteFD, &nullbyte, sizeof(nullbyte));

-}

-

-/* Convert from Appkit pointer input values to X input values:

- * Note: pointer_x and pointer_y are relative to the upper-left of primary

- *       display.

- */

-static void DarwinPrepareValuators(DeviceIntPtr pDev, int *valuators, ScreenPtr screen,

-                                   float pointer_x, float pointer_y, 

-                                   float pressure, float tilt_x, float tilt_y) {

-    /* Fix offset between darwin and X screens */

-    pointer_x -= darwinMainScreenX + screen->x;

-    pointer_y -= darwinMainScreenY + screen->y;

-

-    if(pointer_x < 0.0)

-        pointer_x = 0.0;

-

-    if(pointer_y < 0.0)

-        pointer_y = 0.0;

-    

-    if(pDev == darwinPointer) {

-        valuators[0] = pointer_x;

-        valuators[1] = pointer_y;

-        valuators[2] = 0;

-        valuators[3] = 0;

-        valuators[4] = 0;

-    } else {

-        /* Setup our array of values */

-        valuators[0] = XQUARTZ_VALUATOR_LIMIT * (pointer_x / (float)screenInfo.screens[0]->width);

-        valuators[1] = XQUARTZ_VALUATOR_LIMIT * (pointer_y / (float)screenInfo.screens[0]->height);

-        valuators[2] = XQUARTZ_VALUATOR_LIMIT * pressure;

-        valuators[3] = XQUARTZ_VALUATOR_LIMIT * tilt_x;

-        valuators[4] = XQUARTZ_VALUATOR_LIMIT * tilt_y;

-    }

-    //DEBUG_LOG("Pointer (%f, %f), Valuators: {%d,%d,%d,%d,%d}\n", pointer_x, pointer_y,

-    //          valuators[0], valuators[1], valuators[2], valuators[3], valuators[4]);

-}

-

-void DarwinSendPointerEvents(DeviceIntPtr pDev, int ev_type, int ev_button, float pointer_x, float pointer_y, 

-			     float pressure, float tilt_x, float tilt_y) {

-	static int darwinFakeMouseButtonDown = 0;

-    ScreenPtr screen;

-    int valuators[5];

-	

-    //DEBUG_LOG("x=%f, y=%f, p=%f, tx=%f, ty=%f\n", pointer_x, pointer_y, pressure, tilt_x, tilt_y);

-    

-	if(!darwinEvents) {

-		DEBUG_LOG("DarwinSendPointerEvents called before darwinEvents was initialized\n");

-		return;

-	}

-

-    screen = miPointerGetScreen(pDev);

-    if(!screen) {

-        DEBUG_LOG("DarwinSendPointerEvents called before screen was initialized\n");

-        return;

-    }

-

-    /* Handle fake click */

-	if (ev_type == ButtonPress && darwinFakeButtons && ev_button == 1) {

-        if(darwinFakeMouseButtonDown != 0) {

-            /* We're currently "down" with another button, so release it first */

-            DarwinSendPointerEvents(pDev, ButtonRelease, darwinFakeMouseButtonDown, pointer_x, pointer_y, pressure, tilt_x, tilt_y);

-            darwinFakeMouseButtonDown=0;

-        }

-		if (darwin_all_modifier_flags & darwinFakeMouse2Mask) {

-            ev_button = 2;

-			darwinFakeMouseButtonDown = 2;

-            DarwinUpdateModKeys(darwin_all_modifier_flags & ~darwinFakeMouse2Mask);

-		} else if (darwin_all_modifier_flags & darwinFakeMouse3Mask) {

-            ev_button = 3;

-			darwinFakeMouseButtonDown = 3;

-            DarwinUpdateModKeys(darwin_all_modifier_flags & ~darwinFakeMouse3Mask);

-		}

-	}

-

-	if (ev_type == ButtonRelease && ev_button == 1) {

-        if(darwinFakeMouseButtonDown) {

-            ev_button = darwinFakeMouseButtonDown;

-        }

-

-        if(darwinFakeMouseButtonDown == 2) {

-            DarwinUpdateModKeys(darwin_all_modifier_flags & ~darwinFakeMouse2Mask);

-        } else if(darwinFakeMouseButtonDown == 3) {

-            DarwinUpdateModKeys(darwin_all_modifier_flags & ~darwinFakeMouse3Mask);

-        }

-

-        darwinFakeMouseButtonDown = 0;

-	}

-

-    DarwinPrepareValuators(pDev, valuators, screen, pointer_x, pointer_y, pressure, tilt_x, tilt_y);

-    darwinEvents_lock(); {

-        ValuatorMask mask;

-        valuator_mask_set_range(&mask, 0, (pDev == darwinPointer) ? 2 : 5, valuators);

-        QueuePointerEvents(pDev, ev_type, ev_button, POINTER_ABSOLUTE, &mask);

-        DarwinPokeEQ();

-    } darwinEvents_unlock();

-}

-

-void DarwinSendKeyboardEvents(int ev_type, int keycode) {

-

-	if(!darwinEvents) {

-		DEBUG_LOG("DarwinSendKeyboardEvents called before darwinEvents was initialized\n");

-		return;

-	}

-

-    darwinEvents_lock(); {

-        QueueKeyboardEvents(darwinKeyboard, ev_type, keycode + MIN_KEYCODE, NULL);

-        DarwinPokeEQ();

-    } darwinEvents_unlock();

-}

-

-void DarwinSendProximityEvents(DeviceIntPtr pDev, int ev_type, float pointer_x, float pointer_y,  

-                               float pressure, float tilt_x, float tilt_y) {

-    ScreenPtr screen;

-    int valuators[5];

-

-    DEBUG_LOG("DarwinSendProximityEvents: %d l:%f,%f p:%f t:%f,%f\n", ev_type, pointer_x, pointer_y, pressure, tilt_x, tilt_y);

-

-    if(!darwinEvents) {

-        DEBUG_LOG("DarwinSendProximityEvents called before darwinEvents was initialized\n");

-        return;

-    }

-    

-    screen = miPointerGetScreen(pDev);

-    if(!screen) {

-        DEBUG_LOG("DarwinSendPointerEvents called before screen was initialized\n");

-        return;

-    }    

-

-    DarwinPrepareValuators(pDev, valuators, screen, pointer_x, pointer_y, pressure, tilt_x, tilt_y);

-    darwinEvents_lock(); {

-        ValuatorMask mask;

-        valuator_mask_set_range(&mask, 0, 5, valuators);

-        QueueProximityEvents(pDev, ev_type, &mask);

-        DarwinPokeEQ();

-    } darwinEvents_unlock();

-}

-

-

-/* Send the appropriate number of button clicks to emulate scroll wheel */

-void DarwinSendScrollEvents(float count_x, float count_y, 

-							float pointer_x, float pointer_y, 

-			    			float pressure, float tilt_x, float tilt_y) {

-	int sign_x, sign_y;

-	if(!darwinEvents) {

-		DEBUG_LOG("DarwinSendScrollEvents called before darwinEvents was initialized\n");

-		return;

-	}

-

-	sign_x = count_x > 0.0f ? SCROLLWHEELLEFTFAKE : SCROLLWHEELRIGHTFAKE;

-	sign_y = count_y > 0.0f ? SCROLLWHEELUPFAKE : SCROLLWHEELDOWNFAKE;

-	count_x = fabs(count_x);

-	count_y = fabs(count_y);

-	

-	while ((count_x > 0.0f) || (count_y > 0.0f)) {

-		if (count_x > 0.0f) {

-			DarwinSendPointerEvents(darwinPointer, ButtonPress, sign_x, pointer_x, pointer_y, pressure, tilt_x, tilt_y);

-			DarwinSendPointerEvents(darwinPointer, ButtonRelease, sign_x, pointer_x, pointer_y, pressure, tilt_x, tilt_y);

-			count_x = count_x - 1.0f;

-		}

-		if (count_y > 0.0f) {

-			DarwinSendPointerEvents(darwinPointer, ButtonPress, sign_y, pointer_x, pointer_y, pressure, tilt_x, tilt_y);

-			DarwinSendPointerEvents(darwinPointer, ButtonRelease, sign_y, pointer_x, pointer_y, pressure, tilt_x, tilt_y);

-			count_y = count_y - 1.0f;

-		}

-	}

-}

-

-/* Send the appropriate KeyPress/KeyRelease events to GetKeyboardEvents to

-   reflect changing modifier flags (alt, control, meta, etc) */

-void DarwinUpdateModKeys(int flags) {

-	DarwinUpdateModifiers(KeyRelease, darwin_all_modifier_flags & ~flags & darwin_x11_modifier_mask);

-	DarwinUpdateModifiers(KeyPress, ~darwin_all_modifier_flags & flags & darwin_x11_modifier_mask);

-	darwin_all_modifier_flags = flags;

-}

-

-/*

- * DarwinSendDDXEvent

- *  Send the X server thread a message by placing it on the event queue.

- */

-void DarwinSendDDXEvent(int type, int argc, ...) {

-    XQuartzEvent e;

-    int i;

-    va_list args;

-

-    memset(&e, 0, sizeof(e));

-    e.header = ET_Internal;

-    e.type = ET_XQuartz;

-    e.length = sizeof(e);

-    e.time = GetTimeInMillis();

-    e.subtype = type;

-

-    if (argc > 0 && argc < XQUARTZ_EVENT_MAXARGS) {

-        va_start (args, argc);

-        for (i = 0; i < argc; i++)

-            e.data[i] = (uint32_t) va_arg (args, uint32_t);

-        va_end (args);

-    }

-

-    darwinEvents_lock(); {

-        mieqEnqueue(NULL, (InternalEvent*)&e);

-        DarwinPokeEQ();

-    } darwinEvents_unlock();

-}

+/*
+Darwin event queue and event handling
+
+Copyright 2007-2008 Apple Inc.
+Copyright 2004 Kaleb S. KEITHLEY. All Rights Reserved.
+Copyright (c) 2002-2004 Torrey T. Lyons. All Rights Reserved.
+
+This file is based on mieq.c by Keith Packard,
+which contains the following copyright:
+Copyright 1990, 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.
+ */
+
+#include "sanitizedCarbon.h"
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include   <X11/X.h>
+#include   <X11/Xmd.h>
+#include   <X11/Xproto.h>
+#include   "misc.h"
+#include   "windowstr.h"
+#include   "pixmapstr.h"
+#include   "inputstr.h"
+#include   "inpututils.h"
+#include   "eventstr.h"
+#include   "mi.h"
+#include   "scrnintstr.h"
+#include   "mipointer.h"
+#include   "os.h"
+
+#include "darwin.h"
+#include "quartz.h"
+#include "quartzKeyboard.h"
+#include "quartzRandR.h"
+#include "darwinEvents.h"
+
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <unistd.h>
+#include <pthread.h>
+#include <errno.h>
+#include <time.h>
+
+#include <IOKit/hidsystem/IOLLEvent.h>
+
+/* Fake button press/release for scroll wheel move. */
+#define SCROLLWHEELUPFAKE    4
+#define SCROLLWHEELDOWNFAKE  5
+#define SCROLLWHEELLEFTFAKE  6
+#define SCROLLWHEELRIGHTFAKE 7
+
+#include <X11/extensions/applewmconst.h>
+#include "applewmExt.h"
+
+/* FIXME: Abstract this better */
+extern Bool QuartzModeEventHandler(int screenNum, XQuartzEvent *e, DeviceIntPtr dev);
+
+int darwin_all_modifier_flags = 0;  // last known modifier state
+int darwin_all_modifier_mask = 0;
+int darwin_x11_modifier_mask = 0;
+
+#define FD_ADD_MAX 128
+static int fd_add[FD_ADD_MAX];
+int fd_add_count = 0;
+static pthread_mutex_t fd_add_lock = PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t fd_add_ready_cond = PTHREAD_COND_INITIALIZER;
+static pthread_t fd_add_tid = NULL;
+
+static InternalEvent* darwinEvents = NULL;
+
+static pthread_mutex_t mieq_lock = PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t mieq_ready_cond = PTHREAD_COND_INITIALIZER;
+
+/*** Pthread Magics ***/
+static pthread_t create_thread(void *(*func)(void *), void *arg) {
+    pthread_attr_t attr;
+    pthread_t tid;
+
+    pthread_attr_init (&attr);
+    pthread_attr_setscope (&attr, PTHREAD_SCOPE_SYSTEM);
+    pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
+    pthread_create (&tid, &attr, func, arg);
+    pthread_attr_destroy (&attr);
+
+    return tid;
+}
+
+void darwinEvents_lock(void);
+void darwinEvents_lock(void) {
+    int err;
+    if((err = pthread_mutex_lock(&mieq_lock))) {
+        ErrorF("%s:%s:%d: Failed to lock mieq_lock: %d\n",
+               __FILE__, __FUNCTION__, __LINE__, err);
+        xorg_backtrace();
+    }
+    if(darwinEvents == NULL) {
+        pthread_cond_wait(&mieq_ready_cond, &mieq_lock);
+    }
+}
+
+void darwinEvents_unlock(void);
+void darwinEvents_unlock(void) {
+    int err;
+    if((err = pthread_mutex_unlock(&mieq_lock))) {
+        ErrorF("%s:%s:%d: Failed to unlock mieq_lock: %d\n",
+               __FILE__, __FUNCTION__, __LINE__, err);
+        xorg_backtrace();
+    }
+}
+
+/*
+ * DarwinPressModifierKey
+ * Press or release the given modifier key (one of NX_MODIFIERKEY_* constants)
+ */
+static void DarwinPressModifierKey(int pressed, int key) {
+    int keycode = DarwinModifierNXKeyToNXKeycode(key, 0);
+
+    if (keycode == 0) {
+        ErrorF("DarwinPressModifierKey bad keycode: key=%d\n", key);
+        return;
+    }
+
+    DarwinSendKeyboardEvents(pressed, keycode);
+}
+
+/*
+ * DarwinUpdateModifiers
+ *  Send events to update the modifier state.
+ */
+
+static int darwin_x11_modifier_mask_list[] = {
+#ifdef NX_DEVICELCMDKEYMASK
+    NX_DEVICELCTLKEYMASK, NX_DEVICERCTLKEYMASK,
+    NX_DEVICELSHIFTKEYMASK, NX_DEVICERSHIFTKEYMASK,
+    NX_DEVICELCMDKEYMASK, NX_DEVICERCMDKEYMASK,
+    NX_DEVICELALTKEYMASK, NX_DEVICERALTKEYMASK,
+#else
+    NX_CONTROLMASK, NX_SHIFTMASK, NX_COMMANDMASK, NX_ALTERNATEMASK,
+#endif
+    NX_ALPHASHIFTMASK,
+    0
+};
+
+static int darwin_all_modifier_mask_additions[] = { NX_SECONDARYFNMASK, };
+
+static void DarwinUpdateModifiers(
+    int pressed,        // KeyPress or KeyRelease
+    int flags )         // modifier flags that have changed
+{
+    int *f;
+    int key;
+
+    /* Capslock is special.  This mask is the state of capslock (on/off),
+     * not the state of the button.  Hopefully we can find a better solution.
+     */
+    if(NX_ALPHASHIFTMASK & flags) {
+        DarwinPressModifierKey(KeyPress, NX_MODIFIERKEY_ALPHALOCK);
+        DarwinPressModifierKey(KeyRelease, NX_MODIFIERKEY_ALPHALOCK);
+    }
+    
+    for(f=darwin_x11_modifier_mask_list; *f; f++)
+        if(*f & flags && *f != NX_ALPHASHIFTMASK) {
+            key = DarwinModifierNXMaskToNXKey(*f);
+            if(key == -1)
+                ErrorF("DarwinUpdateModifiers: Unsupported NXMask: 0x%x\n", *f);
+            else
+                DarwinPressModifierKey(pressed, key);
+        }
+}
+
+/* Generic handler for Xquartz-specifc events.  When possible, these should
+   be moved into their own individual functions and set as handlers using
+   mieqSetHandler. */
+
+static void DarwinEventHandler(int screenNum, InternalEvent *ie, DeviceIntPtr dev) {
+    XQuartzEvent *e = &(ie->xquartz_event);
+
+    switch(e->subtype) {
+        case kXquartzControllerNotify:
+            DEBUG_LOG("kXquartzControllerNotify\n");
+            AppleWMSendEvent(AppleWMControllerNotify,
+                             AppleWMControllerNotifyMask,
+                             e->data[0],
+                             e->data[1]);
+            break;
+            
+        case kXquartzPasteboardNotify:
+            DEBUG_LOG("kXquartzPasteboardNotify\n");
+            AppleWMSendEvent(AppleWMPasteboardNotify,
+                             AppleWMPasteboardNotifyMask,
+                             e->data[0],
+                             e->data[1]);
+            break;
+            
+        case kXquartzActivate:
+            DEBUG_LOG("kXquartzActivate\n");
+            QuartzShow();
+            AppleWMSendEvent(AppleWMActivationNotify,
+                             AppleWMActivationNotifyMask,
+                             AppleWMIsActive, 0);
+            break;
+            
+        case kXquartzDeactivate:
+            DEBUG_LOG("kXquartzDeactivate\n");
+            AppleWMSendEvent(AppleWMActivationNotify,
+                             AppleWMActivationNotifyMask,
+                             AppleWMIsInactive, 0);
+            QuartzHide();
+            break;
+
+        case kXquartzReloadPreferences:
+            DEBUG_LOG("kXquartzReloadPreferences\n");
+            AppleWMSendEvent(AppleWMActivationNotify,
+                             AppleWMActivationNotifyMask,
+                             AppleWMReloadPreferences, 0);
+            break;
+            
+        case kXquartzToggleFullscreen:
+            DEBUG_LOG("kXquartzToggleFullscreen\n");
+            if(XQuartzIsRootless)
+                ErrorF("Ignoring kXquartzToggleFullscreen because of rootless mode.");
+            else 
+                QuartzRandRToggleFullscreen();
+            break;
+            
+        case kXquartzSetRootless:
+            DEBUG_LOG("kXquartzSetRootless\n");
+            if(e->data[0]) {
+                QuartzRandRSetFakeRootless();
+            } else {
+                QuartzRandRSetFakeFullscreen(FALSE);
+            }
+            break;
+            
+        case kXquartzSetRootClip:
+            QuartzSetRootClip((Bool)e->data[0]);
+            break;
+            
+        case kXquartzQuit:
+            GiveUp(0);
+            break;
+            
+        case kXquartzSpaceChanged:
+            DEBUG_LOG("kXquartzSpaceChanged\n");
+            QuartzSpaceChanged(e->data[0]);
+            break;
+
+        case kXquartzListenOnOpenFD:
+            ErrorF("Calling ListenOnOpenFD() for new fd: %d\n", (int)e->data[0]);
+            ListenOnOpenFD((int)e->data[0], 1);
+            break;
+            
+        case kXquartzReloadKeymap:
+            DarwinKeyboardReloadHandler();
+            break;
+            
+        case kXquartzDisplayChanged:
+            DEBUG_LOG("kXquartzDisplayChanged\n");
+            QuartzUpdateScreens();
+
+            /* Update our RandR info */
+            QuartzRandRUpdateFakeModes(TRUE);
+            break;
+            
+        default:
+            if(!QuartzModeEventHandler(screenNum, e, dev))
+                ErrorF("Unknown application defined event type %d.\n", e->subtype);
+    }	
+}
+
+void DarwinListenOnOpenFD(int fd) {
+    ErrorF("DarwinListenOnOpenFD: %d\n", fd);
+    
+    pthread_mutex_lock(&fd_add_lock);
+    if(fd_add_count < FD_ADD_MAX)
+        fd_add[fd_add_count++] = fd;
+    else
+        ErrorF("FD Addition buffer at max.  Dropping fd addition request.\n");
+
+    pthread_cond_broadcast(&fd_add_ready_cond);
+    pthread_mutex_unlock(&fd_add_lock);
+}
+
+static void *DarwinProcessFDAdditionQueue_thread(void *args) {
+    /* TODO: Possibly adjust this to no longer be a race... maybe trigger this
+     *       once a client connects and claims to be the WM.
+     *
+     * From ajax:
+     * There's already an internal callback chain for setting selection [in 1.5]
+     * ownership.  See the CallSelectionCallback at the bottom of
+     * ProcSetSelectionOwner, and xfixes/select.c for an example of how to hook
+     * into it.
+     */
+
+    struct timespec sleep_for;
+    struct timespec sleep_remaining;
+
+    sleep_for.tv_sec = 3;
+    sleep_for.tv_nsec = 0;
+
+    ErrorF("X11.app: DarwinProcessFDAdditionQueue_thread: Sleeping to allow xinitrc to catchup.\n");
+    while(nanosleep(&sleep_for, &sleep_remaining) != 0) {
+        sleep_for = sleep_remaining;
+    }
+
+    pthread_mutex_lock(&fd_add_lock);
+    while(true) {
+        while(fd_add_count) {
+            DarwinSendDDXEvent(kXquartzListenOnOpenFD, 1, fd_add[--fd_add_count]);
+        }
+        pthread_cond_wait(&fd_add_ready_cond, &fd_add_lock);
+    }
+
+    return NULL;
+}
+
+Bool DarwinEQInit(void) { 
+    int *p;
+
+    for(p=darwin_x11_modifier_mask_list, darwin_all_modifier_mask=0; *p; p++) {
+        darwin_x11_modifier_mask |= *p;
+    }
+    
+    for(p=darwin_all_modifier_mask_additions, darwin_all_modifier_mask= darwin_x11_modifier_mask; *p; p++) {
+        darwin_all_modifier_mask |= *p;
+    }
+    
+    mieqInit();
+    mieqSetHandler(ET_XQuartz, DarwinEventHandler);
+
+    /* Note that this *could* cause a potential async issue, since we're checking
+     * darwinEvents without holding the lock, but darwinEvents is only ever set
+     * here, so I don't bother.
+     */
+    if (!darwinEvents) {
+        darwinEvents = InitEventList(GetMaximumEventsNum());;
+        
+        if (!darwinEvents)
+            FatalError("Couldn't allocate event buffer\n");
+        
+        darwinEvents_lock();
+        pthread_cond_broadcast(&mieq_ready_cond);
+        darwinEvents_unlock();
+    }
+
+    if(!fd_add_tid)
+        fd_add_tid = create_thread(DarwinProcessFDAdditionQueue_thread, NULL);
+    
+    return TRUE;
+}
+
+void DarwinEQFini(void) {
+    mieqFini();
+}
+
+/*
+ * ProcessInputEvents
+ *  Read and process events from the event queue until it is empty.
+ */
+void ProcessInputEvents(void) {
+    char nullbyte;
+	int x = sizeof(nullbyte);
+    
+    mieqProcessInputEvents();
+
+    // Empty the signaling pipe
+    while (x == sizeof(nullbyte)) {
+      x = read(darwinEventReadFD, &nullbyte, sizeof(nullbyte));
+    }
+}
+
+/* Sends a null byte down darwinEventWriteFD, which will cause the
+   Dispatch() event loop to check out event queue */
+static void DarwinPokeEQ(void) {
+	char nullbyte=0;
+	//  <daniels> oh, i ... er ... christ.
+	write(darwinEventWriteFD, &nullbyte, sizeof(nullbyte));
+}
+
+/* Convert from Appkit pointer input values to X input values:
+ * Note: pointer_x and pointer_y are relative to the upper-left of primary
+ *       display.
+ */
+static void DarwinPrepareValuators(DeviceIntPtr pDev, int *valuators, ScreenPtr screen,
+                                   float pointer_x, float pointer_y, 
+                                   float pressure, float tilt_x, float tilt_y) {
+    /* Fix offset between darwin and X screens */
+    pointer_x -= darwinMainScreenX + screen->x;
+    pointer_y -= darwinMainScreenY + screen->y;
+
+    if(pointer_x < 0.0)
+        pointer_x = 0.0;
+
+    if(pointer_y < 0.0)
+        pointer_y = 0.0;
+    
+    if(pDev == darwinPointer) {
+        valuators[0] = pointer_x;
+        valuators[1] = pointer_y;
+        valuators[2] = 0;
+        valuators[3] = 0;
+        valuators[4] = 0;
+    } else {
+        /* Setup our array of values */
+        valuators[0] = XQUARTZ_VALUATOR_LIMIT * (pointer_x / (float)screenInfo.screens[0]->width);
+        valuators[1] = XQUARTZ_VALUATOR_LIMIT * (pointer_y / (float)screenInfo.screens[0]->height);
+        valuators[2] = XQUARTZ_VALUATOR_LIMIT * pressure;
+        valuators[3] = XQUARTZ_VALUATOR_LIMIT * tilt_x;
+        valuators[4] = XQUARTZ_VALUATOR_LIMIT * tilt_y;
+    }
+    //DEBUG_LOG("Pointer (%f, %f), Valuators: {%d,%d,%d,%d,%d}\n", pointer_x, pointer_y,
+    //          valuators[0], valuators[1], valuators[2], valuators[3], valuators[4]);
+}
+
+void DarwinSendPointerEvents(DeviceIntPtr pDev, int ev_type, int ev_button, float pointer_x, float pointer_y, 
+			     float pressure, float tilt_x, float tilt_y) {
+	static int darwinFakeMouseButtonDown = 0;
+    ScreenPtr screen;
+    int valuators[5];
+	
+    //DEBUG_LOG("x=%f, y=%f, p=%f, tx=%f, ty=%f\n", pointer_x, pointer_y, pressure, tilt_x, tilt_y);
+    
+	if(!darwinEvents) {
+		DEBUG_LOG("DarwinSendPointerEvents called before darwinEvents was initialized\n");
+		return;
+	}
+
+    screen = miPointerGetScreen(pDev);
+    if(!screen) {
+        DEBUG_LOG("DarwinSendPointerEvents called before screen was initialized\n");
+        return;
+    }
+
+    /* Handle fake click */
+	if (ev_type == ButtonPress && darwinFakeButtons && ev_button == 1) {
+        if(darwinFakeMouseButtonDown != 0) {
+            /* We're currently "down" with another button, so release it first */
+            DarwinSendPointerEvents(pDev, ButtonRelease, darwinFakeMouseButtonDown, pointer_x, pointer_y, pressure, tilt_x, tilt_y);
+            darwinFakeMouseButtonDown=0;
+        }
+		if (darwin_all_modifier_flags & darwinFakeMouse2Mask) {
+            ev_button = 2;
+			darwinFakeMouseButtonDown = 2;
+            DarwinUpdateModKeys(darwin_all_modifier_flags & ~darwinFakeMouse2Mask);
+		} else if (darwin_all_modifier_flags & darwinFakeMouse3Mask) {
+            ev_button = 3;
+			darwinFakeMouseButtonDown = 3;
+            DarwinUpdateModKeys(darwin_all_modifier_flags & ~darwinFakeMouse3Mask);
+		}
+	}
+
+	if (ev_type == ButtonRelease && ev_button == 1) {
+        if(darwinFakeMouseButtonDown) {
+            ev_button = darwinFakeMouseButtonDown;
+        }
+
+        if(darwinFakeMouseButtonDown == 2) {
+            DarwinUpdateModKeys(darwin_all_modifier_flags & ~darwinFakeMouse2Mask);
+        } else if(darwinFakeMouseButtonDown == 3) {
+            DarwinUpdateModKeys(darwin_all_modifier_flags & ~darwinFakeMouse3Mask);
+        }
+
+        darwinFakeMouseButtonDown = 0;
+	}
+
+    DarwinPrepareValuators(pDev, valuators, screen, pointer_x, pointer_y, pressure, tilt_x, tilt_y);
+    darwinEvents_lock(); {
+        ValuatorMask mask;
+        valuator_mask_set_range(&mask, 0, (pDev == darwinPointer) ? 2 : 5, valuators);
+        QueuePointerEvents(pDev, ev_type, ev_button, POINTER_ABSOLUTE, &mask);
+        DarwinPokeEQ();
+    } darwinEvents_unlock();
+}
+
+void DarwinSendKeyboardEvents(int ev_type, int keycode) {
+
+	if(!darwinEvents) {
+		DEBUG_LOG("DarwinSendKeyboardEvents called before darwinEvents was initialized\n");
+		return;
+	}
+
+    darwinEvents_lock(); {
+        QueueKeyboardEvents(darwinKeyboard, ev_type, keycode + MIN_KEYCODE, NULL);
+        DarwinPokeEQ();
+    } darwinEvents_unlock();
+}
+
+void DarwinSendProximityEvents(DeviceIntPtr pDev, int ev_type, float pointer_x, float pointer_y,  
+                               float pressure, float tilt_x, float tilt_y) {
+    ScreenPtr screen;
+    int valuators[5];
+
+    DEBUG_LOG("DarwinSendProximityEvents: %d l:%f,%f p:%f t:%f,%f\n", ev_type, pointer_x, pointer_y, pressure, tilt_x, tilt_y);
+
+    if(!darwinEvents) {
+        DEBUG_LOG("DarwinSendProximityEvents called before darwinEvents was initialized\n");
+        return;
+    }
+    
+    screen = miPointerGetScreen(pDev);
+    if(!screen) {
+        DEBUG_LOG("DarwinSendPointerEvents called before screen was initialized\n");
+        return;
+    }    
+
+    DarwinPrepareValuators(pDev, valuators, screen, pointer_x, pointer_y, pressure, tilt_x, tilt_y);
+    darwinEvents_lock(); {
+        ValuatorMask mask;
+        valuator_mask_set_range(&mask, 0, 5, valuators);
+        QueueProximityEvents(pDev, ev_type, &mask);
+        DarwinPokeEQ();
+    } darwinEvents_unlock();
+}
+
+
+/* Send the appropriate number of button clicks to emulate scroll wheel */
+void DarwinSendScrollEvents(float count_x, float count_y, 
+							float pointer_x, float pointer_y, 
+			    			float pressure, float tilt_x, float tilt_y) {
+	int sign_x, sign_y;
+	if(!darwinEvents) {
+		DEBUG_LOG("DarwinSendScrollEvents called before darwinEvents was initialized\n");
+		return;
+	}
+
+	sign_x = count_x > 0.0f ? SCROLLWHEELLEFTFAKE : SCROLLWHEELRIGHTFAKE;
+	sign_y = count_y > 0.0f ? SCROLLWHEELUPFAKE : SCROLLWHEELDOWNFAKE;
+	count_x = fabs(count_x);
+	count_y = fabs(count_y);
+	
+	while ((count_x > 0.0f) || (count_y > 0.0f)) {
+		if (count_x > 0.0f) {
+			DarwinSendPointerEvents(darwinPointer, ButtonPress, sign_x, pointer_x, pointer_y, pressure, tilt_x, tilt_y);
+			DarwinSendPointerEvents(darwinPointer, ButtonRelease, sign_x, pointer_x, pointer_y, pressure, tilt_x, tilt_y);
+			count_x = count_x - 1.0f;
+		}
+		if (count_y > 0.0f) {
+			DarwinSendPointerEvents(darwinPointer, ButtonPress, sign_y, pointer_x, pointer_y, pressure, tilt_x, tilt_y);
+			DarwinSendPointerEvents(darwinPointer, ButtonRelease, sign_y, pointer_x, pointer_y, pressure, tilt_x, tilt_y);
+			count_y = count_y - 1.0f;
+		}
+	}
+}
+
+/* Send the appropriate KeyPress/KeyRelease events to GetKeyboardEvents to
+   reflect changing modifier flags (alt, control, meta, etc) */
+void DarwinUpdateModKeys(int flags) {
+	DarwinUpdateModifiers(KeyRelease, darwin_all_modifier_flags & ~flags & darwin_x11_modifier_mask);
+	DarwinUpdateModifiers(KeyPress, ~darwin_all_modifier_flags & flags & darwin_x11_modifier_mask);
+	darwin_all_modifier_flags = flags;
+}
+
+/*
+ * DarwinSendDDXEvent
+ *  Send the X server thread a message by placing it on the event queue.
+ */
+void DarwinSendDDXEvent(int type, int argc, ...) {
+    XQuartzEvent e;
+    int i;
+    va_list args;
+
+    memset(&e, 0, sizeof(e));
+    e.header = ET_Internal;
+    e.type = ET_XQuartz;
+    e.length = sizeof(e);
+    e.time = GetTimeInMillis();
+    e.subtype = type;
+
+    if (argc > 0 && argc < XQUARTZ_EVENT_MAXARGS) {
+        va_start (args, argc);
+        for (i = 0; i < argc; i++)
+            e.data[i] = (uint32_t) va_arg (args, uint32_t);
+        va_end (args);
+    }
+
+    darwinEvents_lock(); {
+        mieqEnqueue(NULL, (InternalEvent*)&e);
+        DarwinPokeEQ();
+    } darwinEvents_unlock();
+}
diff --git a/xorg-server/hw/xquartz/darwinEvents.h b/xorg-server/hw/xquartz/darwinEvents.h
index 22fc88a01..aefb5c7bb 100644
--- a/xorg-server/hw/xquartz/darwinEvents.h
+++ b/xorg-server/hw/xquartz/darwinEvents.h
@@ -1,91 +1,91 @@
-/*

- * Copyright (c) 2008 Apple, Inc.

- * Copyright (c) 2001-2004 Torrey T. Lyons. All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright

- * holders shall not be used in advertising or otherwise to promote the sale,

- * use or other dealings in this Software without prior written authorization.

- */

-

-#ifndef _DARWIN_EVENTS_H

-#define _DARWIN_EVENTS_H

-

-/* For extra precision of our cursor and other valuators */

-#define XQUARTZ_VALUATOR_LIMIT (1 << 16)

-

-Bool DarwinEQInit(void);

-void DarwinEQFini(void);

-void DarwinEQEnqueue(const xEventPtr e);

-void DarwinEQPointerPost(DeviceIntPtr pDev, xEventPtr e);

-void DarwinEQSwitchScreen(ScreenPtr pScreen, Bool fromDIX);

-void DarwinSendPointerEvents(DeviceIntPtr pDev, int ev_type, int ev_button, float pointer_x, float pointer_y,

-			     float pressure, float tilt_x, float tilt_y);

-void DarwinSendProximityEvents(DeviceIntPtr pDev, int ev_type, float pointer_x, float pointer_y,

-                               float pressure, float tilt_x, float tilt_y);

-void DarwinSendKeyboardEvents(int ev_type, int keycode);

-void DarwinSendScrollEvents(float count_x, float count_y, float pointer_x, float pointer_y,

-			    float pressure, float tilt_x, float tilt_y);

-void DarwinUpdateModKeys(int flags);

-void DarwinListenOnOpenFD(int fd);

-

-/*

- * Subtypes for the ET_XQuartz event type

- */

-enum {

-    kXquartzReloadKeymap,     // Reload system keymap

-    kXquartzActivate,         // restore X drawing and cursor

-    kXquartzDeactivate,       // clip X drawing and switch to Aqua cursor

-    kXquartzSetRootClip,      // enable or disable drawing to the X screen

-    kXquartzQuit,             // kill the X server and release the display

-    kXquartzBringAllToFront,  // bring all X windows to front

-    kXquartzToggleFullscreen, // Enable/Disable fullscreen mode

-    kXquartzSetRootless,      // Set rootless mode

-    kXquartzSpaceChanged,     // Spaces changed

-    kXquartzListenOnOpenFD,   // Listen to the launchd fd (passed as arg)

-    /*

-     * AppleWM events

-     */

-    kXquartzControllerNotify, // send an AppleWMControllerNotify event

-    kXquartzPasteboardNotify, // notify the WM to copy or paste

-    kXquartzReloadPreferences, // send AppleWMReloadPreferences

-    /*

-     * Xplugin notification events

-     */

-    kXquartzDisplayChanged,   // display configuration has changed

-    kXquartzWindowState,      // window visibility state has changed

-    kXquartzWindowMoved,      // window has moved on screen

-};

-

-/* Send one of the above events to the server thread. */

-void DarwinSendDDXEvent(int type, int argc, ...);

-

-/* A mask of the modifiers that are in our X11 keyboard layout:

- * (Fn for example is just useful for 3button mouse emulation) */

-extern int darwin_all_modifier_mask;

-

-/* A mask of the modifiers that are in our X11 keyboard layout:

- * (Fn for example is just useful for 3button mouse emulation) */

-extern int darwin_x11_modifier_mask;

-

-/* The current state of the above listed modifiers */

-extern int darwin_all_modifier_flags;

-

-#endif  /* _DARWIN_EVENTS_H */

+/*
+ * Copyright (c) 2008 Apple, Inc.
+ * Copyright (c) 2001-2004 Torrey T. Lyons. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+
+#ifndef _DARWIN_EVENTS_H
+#define _DARWIN_EVENTS_H
+
+/* For extra precision of our cursor and other valuators */
+#define XQUARTZ_VALUATOR_LIMIT (1 << 16)
+
+Bool DarwinEQInit(void);
+void DarwinEQFini(void);
+void DarwinEQEnqueue(const xEventPtr e);
+void DarwinEQPointerPost(DeviceIntPtr pDev, xEventPtr e);
+void DarwinEQSwitchScreen(ScreenPtr pScreen, Bool fromDIX);
+void DarwinSendPointerEvents(DeviceIntPtr pDev, int ev_type, int ev_button, float pointer_x, float pointer_y,
+			     float pressure, float tilt_x, float tilt_y);
+void DarwinSendProximityEvents(DeviceIntPtr pDev, int ev_type, float pointer_x, float pointer_y,
+                               float pressure, float tilt_x, float tilt_y);
+void DarwinSendKeyboardEvents(int ev_type, int keycode);
+void DarwinSendScrollEvents(float count_x, float count_y, float pointer_x, float pointer_y,
+			    float pressure, float tilt_x, float tilt_y);
+void DarwinUpdateModKeys(int flags);
+void DarwinListenOnOpenFD(int fd);
+
+/*
+ * Subtypes for the ET_XQuartz event type
+ */
+enum {
+    kXquartzReloadKeymap,     // Reload system keymap
+    kXquartzActivate,         // restore X drawing and cursor
+    kXquartzDeactivate,       // clip X drawing and switch to Aqua cursor
+    kXquartzSetRootClip,      // enable or disable drawing to the X screen
+    kXquartzQuit,             // kill the X server and release the display
+    kXquartzBringAllToFront,  // bring all X windows to front
+    kXquartzToggleFullscreen, // Enable/Disable fullscreen mode
+    kXquartzSetRootless,      // Set rootless mode
+    kXquartzSpaceChanged,     // Spaces changed
+    kXquartzListenOnOpenFD,   // Listen to the launchd fd (passed as arg)
+    /*
+     * AppleWM events
+     */
+    kXquartzControllerNotify, // send an AppleWMControllerNotify event
+    kXquartzPasteboardNotify, // notify the WM to copy or paste
+    kXquartzReloadPreferences, // send AppleWMReloadPreferences
+    /*
+     * Xplugin notification events
+     */
+    kXquartzDisplayChanged,   // display configuration has changed
+    kXquartzWindowState,      // window visibility state has changed
+    kXquartzWindowMoved,      // window has moved on screen
+};
+
+/* Send one of the above events to the server thread. */
+void DarwinSendDDXEvent(int type, int argc, ...);
+
+/* A mask of the modifiers that are in our X11 keyboard layout:
+ * (Fn for example is just useful for 3button mouse emulation) */
+extern int darwin_all_modifier_mask;
+
+/* A mask of the modifiers that are in our X11 keyboard layout:
+ * (Fn for example is just useful for 3button mouse emulation) */
+extern int darwin_x11_modifier_mask;
+
+/* The current state of the above listed modifiers */
+extern int darwin_all_modifier_flags;
+
+#endif  /* _DARWIN_EVENTS_H */
diff --git a/xorg-server/hw/xquartz/darwinXinput.c b/xorg-server/hw/xquartz/darwinXinput.c
index 52d41d646..94c31bb23 100644
--- a/xorg-server/hw/xquartz/darwinXinput.c
+++ b/xorg-server/hw/xquartz/darwinXinput.c
@@ -1,151 +1,151 @@
-/*

- * X server support of the XINPUT extension for xquartz

- *

- * This is currently a copy of Xi/stubs.c, but eventually this

- * should include more complete XINPUT support.

- */

-

-/************************************************************

-

-Copyright 1989, 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 1989 by Hewlett-Packard Company, Palo Alto, California.

-

-			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 name of Hewlett-Packard not be

-used in advertising or publicity pertaining to distribution of the

-software without specific, written prior permission.

-

-HEWLETT-PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

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

-HEWLETT-PACKARD 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 <X11/X.h>

-#include <X11/Xproto.h>

-#include "inputstr.h"

-#include <X11/extensions/XI.h>

-#include <X11/extensions/XIproto.h>

-#include "XIstubs.h"

-#include "darwin.h"

-

-/****************************************************************************

- *

- * Caller:	ProcXSetDeviceMode

- *

- * Change the mode of an extension device.

- * This function is used to change the mode of a device from reporting

- * relative motion to reporting absolute positional information, and

- * vice versa.

- * The default implementation below is that no such devices are supported.

- *

- */

-

-int

-SetDeviceMode(ClientPtr client, DeviceIntPtr dev, int mode)

-{

-  DEBUG_LOG("SetDeviceMode(%p, %p, %d)\n", client, dev, mode);

-    return BadMatch;

-}

-

-/****************************************************************************

- *

- * Caller:	ProcXSetDeviceValuators

- *

- * Set the value of valuators on an extension input device.

- * This function is used to set the initial value of valuators on

- * those input devices that are capable of reporting either relative

- * motion or an absolute position, and allow an initial position to be set.

- * The default implementation below is that no such devices are supported.

- *

- */

-

-int

-SetDeviceValuators(ClientPtr client, DeviceIntPtr dev,

-		   int *valuators, int first_valuator, int num_valuators)

-{

-  DEBUG_LOG("SetDeviceValuators(%p, %p, %p, %d, %d)\n", client,

-	    dev, valuators, first_valuator, num_valuators);

-  return BadMatch;

-}

-

-/****************************************************************************

- *

- * Caller:	ProcXChangeDeviceControl

- *

- * Change the specified device controls on an extension input device.

- *

- */

-

-int

-ChangeDeviceControl(ClientPtr client, DeviceIntPtr dev,

-		    xDeviceCtl * control)

-{

-

-  DEBUG_LOG("ChangeDeviceControl(%p, %p, %p)\n", client, dev, control);

-  return BadMatch;

-}

-

-

-/****************************************************************************

- *

- * Caller: configAddDevice (and others)

- *

- * Add a new device with the specified options.

- *

- */

-int

-NewInputDeviceRequest(InputOption *options, InputAttributes *attrs,

-                      DeviceIntPtr *pdev)

-{

-  DEBUG_LOG("NewInputDeviceRequest(%p, %p)\n", options, pdev);

-  return BadValue;

-}

-

-/****************************************************************************

- *

- * Caller: configRemoveDevice (and others)

- *

- * Remove the specified device previously added.

- *

- */

-void

-DeleteInputDeviceRequest(DeviceIntPtr dev)

-{

-  DEBUG_LOG("DeleteInputDeviceRequest(%p)\n", dev);

-}

-

+/*
+ * X server support of the XINPUT extension for xquartz
+ *
+ * This is currently a copy of Xi/stubs.c, but eventually this
+ * should include more complete XINPUT support.
+ */
+
+/************************************************************
+
+Copyright 1989, 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 1989 by Hewlett-Packard Company, Palo Alto, California.
+
+			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 name of Hewlett-Packard not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+HEWLETT-PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+HEWLETT-PACKARD 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 <X11/X.h>
+#include <X11/Xproto.h>
+#include "inputstr.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include "XIstubs.h"
+#include "darwin.h"
+
+/****************************************************************************
+ *
+ * Caller:	ProcXSetDeviceMode
+ *
+ * Change the mode of an extension device.
+ * This function is used to change the mode of a device from reporting
+ * relative motion to reporting absolute positional information, and
+ * vice versa.
+ * The default implementation below is that no such devices are supported.
+ *
+ */
+
+int
+SetDeviceMode(ClientPtr client, DeviceIntPtr dev, int mode)
+{
+  DEBUG_LOG("SetDeviceMode(%p, %p, %d)\n", client, dev, mode);
+    return BadMatch;
+}
+
+/****************************************************************************
+ *
+ * Caller:	ProcXSetDeviceValuators
+ *
+ * Set the value of valuators on an extension input device.
+ * This function is used to set the initial value of valuators on
+ * those input devices that are capable of reporting either relative
+ * motion or an absolute position, and allow an initial position to be set.
+ * The default implementation below is that no such devices are supported.
+ *
+ */
+
+int
+SetDeviceValuators(ClientPtr client, DeviceIntPtr dev,
+		   int *valuators, int first_valuator, int num_valuators)
+{
+  DEBUG_LOG("SetDeviceValuators(%p, %p, %p, %d, %d)\n", client,
+	    dev, valuators, first_valuator, num_valuators);
+  return BadMatch;
+}
+
+/****************************************************************************
+ *
+ * Caller:	ProcXChangeDeviceControl
+ *
+ * Change the specified device controls on an extension input device.
+ *
+ */
+
+int
+ChangeDeviceControl(ClientPtr client, DeviceIntPtr dev,
+		    xDeviceCtl * control)
+{
+
+  DEBUG_LOG("ChangeDeviceControl(%p, %p, %p)\n", client, dev, control);
+  return BadMatch;
+}
+
+
+/****************************************************************************
+ *
+ * Caller: configAddDevice (and others)
+ *
+ * Add a new device with the specified options.
+ *
+ */
+int
+NewInputDeviceRequest(InputOption *options, InputAttributes *attrs,
+                      DeviceIntPtr *pdev)
+{
+  DEBUG_LOG("NewInputDeviceRequest(%p, %p)\n", options, pdev);
+  return BadValue;
+}
+
+/****************************************************************************
+ *
+ * Caller: configRemoveDevice (and others)
+ *
+ * Remove the specified device previously added.
+ *
+ */
+void
+DeleteInputDeviceRequest(DeviceIntPtr dev)
+{
+  DEBUG_LOG("DeleteInputDeviceRequest(%p)\n", dev);
+}
+
diff --git a/xorg-server/hw/xquartz/mach-startup/Makefile.am b/xorg-server/hw/xquartz/mach-startup/Makefile.am
index 388ecfa2a..0b1f8977e 100644
--- a/xorg-server/hw/xquartz/mach-startup/Makefile.am
+++ b/xorg-server/hw/xquartz/mach-startup/Makefile.am
@@ -1,84 +1,84 @@
-AM_CPPFLAGS = \

-	-I$(srcdir)/.. \

-	-DBUILD_DATE=\"$(BUILD_DATE)\" \

-	-DXSERVER_VERSION=\"$(VERSION)\" \

-	-DX11BINDIR=\"$(bindir)\"

-

-AM_CFLAGS = $(DIX_CFLAGS)

-

-x11appdir = $(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/MacOS

-x11app_PROGRAMS = X11.bin

-

-dist_X11_bin_SOURCES = \

-	bundle-main.c 

-

-nodist_X11_bin_SOURCES = \

-	mach_startupServer.c \

-	mach_startupUser.c

-

-X11_bin_LDADD = \

-	$(top_builddir)/hw/xquartz/libXquartz.la \

-	$(top_builddir)/hw/xquartz/xpr/libXquartzXpr.la \

-	$(top_builddir)/dix/dixfonts.lo \

-	$(top_builddir)/miext/rootless/librootless.la \

-	$(top_builddir)/hw/xquartz/pbproxy/libxpbproxy.la \

-	$(XQUARTZ_LIBS) $(XSERVER_LIBS)

-

-X11_bin_LDFLAGS =  \

-	$(XSERVER_SYS_LIBS) -lXplugin \

-	-XCClinker -Objc \

-	-Wl,-u,_miDCInitialize \

-	-Wl,-framework,Carbon \

-	-Wl,-framework,Cocoa \

-	-Wl,-framework,CoreAudio \

-	-Wl,-framework,IOKit

-

-if GLX

-X11_bin_LDADD += \

-	$(top_builddir)/hw/xquartz/GL/libCGLCore.la \

-	$(top_builddir)/glx/libglx.la

-

-X11_bin_LDFLAGS += \

-	-Wl,-framework,OpenGL

-endif

-

-if XQUARTZ_SPARKLE

-X11_bin_LDFLAGS += \

-	-Wl,-framework,Sparkle

-endif

-

-if RECORD

-X11_bin_LDADD += \

-	$(top_builddir)/record/librecord.la

-endif

-

-X11_bin_DEPENDENCIES = $(X11_bin_LDADD)

-

-bin_PROGRAMS = Xquartz

-

-dist_Xquartz_SOURCES = \

-	stub.c \

-	launchd_fd.c

-

-nodist_Xquartz_SOURCES = \

-	mach_startupUser.c

-

-Xquartz_LDFLAGS =  \

-	-Wl,-framework,CoreServices

-

-BUILT_SOURCES = \

-	mach_startupServer.c \

-	mach_startupUser.c \

-	mach_startupServer.h \

-	mach_startup.h

-

-CLEANFILES = \

-	$(BUILT_SOURCES)

-

-$(BUILT_SOURCES): $(srcdir)/mach_startup.defs

-	mig -sheader mach_startupServer.h $(srcdir)/mach_startup.defs

-

-EXTRA_DIST = \

-	launchd_fd.h \

-	mach_startup.defs \

-	mach_startup_types.h

+AM_CPPFLAGS = \
+	-I$(srcdir)/.. \
+	-DBUILD_DATE=\"$(BUILD_DATE)\" \
+	-DXSERVER_VERSION=\"$(VERSION)\" \
+	-DX11BINDIR=\"$(bindir)\"
+
+AM_CFLAGS = $(DIX_CFLAGS)
+
+x11appdir = $(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/MacOS
+x11app_PROGRAMS = X11.bin
+
+dist_X11_bin_SOURCES = \
+	bundle-main.c 
+
+nodist_X11_bin_SOURCES = \
+	mach_startupServer.c \
+	mach_startupUser.c
+
+X11_bin_LDADD = \
+	$(top_builddir)/hw/xquartz/libXquartz.la \
+	$(top_builddir)/hw/xquartz/xpr/libXquartzXpr.la \
+	$(top_builddir)/dix/dixfonts.lo \
+	$(top_builddir)/miext/rootless/librootless.la \
+	$(top_builddir)/hw/xquartz/pbproxy/libxpbproxy.la \
+	$(XQUARTZ_LIBS) $(XSERVER_LIBS)
+
+X11_bin_LDFLAGS =  \
+	$(XSERVER_SYS_LIBS) -lXplugin \
+	-XCClinker -Objc \
+	-Wl,-u,_miDCInitialize \
+	-Wl,-framework,Carbon \
+	-Wl,-framework,Cocoa \
+	-Wl,-framework,CoreAudio \
+	-Wl,-framework,IOKit
+
+if GLX
+X11_bin_LDADD += \
+	$(top_builddir)/hw/xquartz/GL/libCGLCore.la \
+	$(top_builddir)/glx/libglx.la
+
+X11_bin_LDFLAGS += \
+	-Wl,-framework,OpenGL
+endif
+
+if XQUARTZ_SPARKLE
+X11_bin_LDFLAGS += \
+	-Wl,-framework,Sparkle
+endif
+
+if RECORD
+X11_bin_LDADD += \
+	$(top_builddir)/record/librecord.la
+endif
+
+X11_bin_DEPENDENCIES = $(X11_bin_LDADD)
+
+bin_PROGRAMS = Xquartz
+
+dist_Xquartz_SOURCES = \
+	stub.c \
+	launchd_fd.c
+
+nodist_Xquartz_SOURCES = \
+	mach_startupUser.c
+
+Xquartz_LDFLAGS =  \
+	-Wl,-framework,CoreServices
+
+BUILT_SOURCES = \
+	mach_startupServer.c \
+	mach_startupUser.c \
+	mach_startupServer.h \
+	mach_startup.h
+
+CLEANFILES = \
+	$(BUILT_SOURCES)
+
+$(BUILT_SOURCES): $(srcdir)/mach_startup.defs
+	mig -sheader mach_startupServer.h $(srcdir)/mach_startup.defs
+
+EXTRA_DIST = \
+	launchd_fd.h \
+	mach_startup.defs \
+	mach_startup_types.h
diff --git a/xorg-server/hw/xquartz/mach-startup/bundle-main.c b/xorg-server/hw/xquartz/mach-startup/bundle-main.c
index 323ad0907..94c606823 100644
--- a/xorg-server/hw/xquartz/mach-startup/bundle-main.c
+++ b/xorg-server/hw/xquartz/mach-startup/bundle-main.c
@@ -1,754 +1,754 @@
-/* main.c -- X application launcher

- 

- Copyright (c) 2007 Jeremy Huddleston

- Copyright (c) 2007 Apple Inc

- 

- Permission is hereby granted, free of charge, to any person

- obtaining a copy of this software and associated documentation files

- (the "Software"), to deal in the Software without restriction,

- including without limitation the rights to use, copy, modify, merge,

- publish, distribute, sublicense, and/or sell copies of the Software,

- and to permit persons to whom the Software is furnished to do so,

- subject to the following conditions:

- 

- 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 ABOVE LISTED COPYRIGHT

- HOLDER(S) 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(s) of the above

- copyright holders shall not be used in advertising or otherwise to

- promote the sale, use or other dealings in this Software without

- prior written authorization. */

-

-#include <CoreFoundation/CoreFoundation.h>

-#include <AvailabilityMacros.h>

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include <X11/Xlib.h>

-#include <assert.h>

-#include <unistd.h>

-#include <stdio.h>

-#include <string.h>

-#include <stdlib.h>

-#include <stdbool.h>

-#include <signal.h>

-

-#ifdef HAVE_LIBDISPATCH

-#include <dispatch/dispatch.h>

-#else

-#include <pthread.h>

-#endif

-

-#include <sys/socket.h>

-#include <sys/un.h>

-

-#include <fcntl.h>

-

-#include <mach/mach.h>

-#include <mach/mach_error.h>

-#include <servers/bootstrap.h>

-#include "mach_startup.h"

-#include "mach_startupServer.h"

-

-#include "console_redirect.h"

-

-/* From darwinEvents.c ... but don't want to pull in all the server cruft */

-void DarwinListenOnOpenFD(int fd);

-

-extern aslclient aslc;

-

-/* Ditto, from os/log.c */

-extern void ErrorF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2);

-extern void FatalError(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2) _X_NORETURN;

-

-extern int noPanoramiXExtension;

-

-#define DEFAULT_CLIENT X11BINDIR "/xterm"

-#define DEFAULT_STARTX X11BINDIR "/startx"

-#define DEFAULT_SHELL  "/bin/sh"

-

-#ifndef BUILD_DATE

-#define BUILD_DATE ""

-#endif

-#ifndef XSERVER_VERSION

-#define XSERVER_VERSION "?"

-#endif

-

-static char __crashreporter_info_buff__[4096] = {0};

-static const char *__crashreporter_info__ __attribute__((__used__)) = &__crashreporter_info_buff__[0];

-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050

-// This is actually a toolchain requirement, but I'm not sure the correct check,

-// but it should be fine to just only include it for Leopard and later.  This line

-// just tells the linker to never strip this symbol (such as for space optimization)

-asm (".desc ___crashreporter_info__, 0x10");

-#endif

-

-static const char *__crashreporter_info__base = "X.Org X Server " XSERVER_VERSION " Build Date: " BUILD_DATE;

-

-char *bundle_id_prefix = NULL;

-static char *server_bootstrap_name = NULL;

-

-#define DEBUG 1

-

-/* This is in quartzStartup.c */

-int server_main(int argc, char **argv, char **envp);

-

-static int execute(const char *command);

-static char *command_from_prefs(const char *key, const char *default_value);

-

-static char *pref_app_to_run;

-static char *pref_login_shell;

-static char *pref_startx_script;

-

-#ifndef HAVE_LIBDISPATCH

-/*** Pthread Magics ***/

-static pthread_t create_thread(void *(*func)(void *), void *arg) {

-    pthread_attr_t attr;

-    pthread_t tid;

-	

-    pthread_attr_init (&attr);

-    pthread_attr_setscope (&attr, PTHREAD_SCOPE_SYSTEM);

-    pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);

-    pthread_create (&tid, &attr, func, arg);

-    pthread_attr_destroy (&attr);

-	

-    return tid;

-}

-#endif

-

-/*** Mach-O IPC Stuffs ***/

-

-union MaxMsgSize {

-	union __RequestUnion__mach_startup_subsystem req;

-	union __ReplyUnion__mach_startup_subsystem rep; 

-};

-

-static mach_port_t checkin_or_register(char *bname) {

-    kern_return_t kr;

-    mach_port_t mp;

-

-    /* If we're started by launchd or the old mach_init */

-    kr = bootstrap_check_in(bootstrap_port, bname, &mp);

-    if (kr == KERN_SUCCESS)

-        return mp;

-

-    /* We probably were not started by launchd or the old mach_init */

-    kr = mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &mp);

-    if (kr != KERN_SUCCESS) {

-        ErrorF("mach_port_allocate(): %s\n", mach_error_string(kr));

-        exit(EXIT_FAILURE);

-    }

-

-    kr = mach_port_insert_right(mach_task_self(), mp, mp, MACH_MSG_TYPE_MAKE_SEND);

-    if (kr != KERN_SUCCESS) {

-        ErrorF("mach_port_insert_right(): %s\n", mach_error_string(kr));

-        exit(EXIT_FAILURE);

-    }

-

-#ifdef __clang__

-#pragma clang diagnostic push

-#pragma clang diagnostic ignored "-Wdeprecated-declarations" // bootstrap_register

-#endif

-    kr = bootstrap_register(bootstrap_port, bname, mp);

-#ifdef __clang__

-#pragma clang diagnostic pop

-#endif

-

-    if (kr != KERN_SUCCESS) {

-        ErrorF("bootstrap_register(): %s\n", mach_error_string(kr));

-        exit(EXIT_FAILURE);

-    }

-

-    return mp;

-}

-

-/*** $DISPLAY handoff ***/

-static int accept_fd_handoff(int connected_fd) {

-    int launchd_fd;

-    

-    char databuf[] = "display";

-    struct iovec iov[1];

-    

-    union {

-        struct cmsghdr hdr;

-        char bytes[CMSG_SPACE(sizeof(int))];

-    } buf;

-    

-    struct msghdr msg;

-    struct cmsghdr *cmsg;

-

-    iov[0].iov_base = databuf;

-    iov[0].iov_len  = sizeof(databuf);

-    

-    msg.msg_iov = iov;

-    msg.msg_iovlen = 1;

-    msg.msg_control = buf.bytes;

-    msg.msg_controllen = sizeof(buf);

-    msg.msg_name = 0;

-    msg.msg_namelen = 0;

-    msg.msg_flags = 0;

-    

-    cmsg = CMSG_FIRSTHDR (&msg);

-    cmsg->cmsg_level = SOL_SOCKET;

-    cmsg->cmsg_type = SCM_RIGHTS;

-    cmsg->cmsg_len = CMSG_LEN(sizeof(int));

-    

-    msg.msg_controllen = cmsg->cmsg_len;

-    

-    *((int*)CMSG_DATA(cmsg)) = -1;

-    

-    if(recvmsg(connected_fd, &msg, 0) < 0) {

-        ErrorF("X11.app: Error receiving $DISPLAY file descriptor.  recvmsg() error: %s\n", strerror(errno));

-        return -1;

-    }

-    

-    launchd_fd = *((int*)CMSG_DATA(cmsg));

-    

-    return launchd_fd;

-}

-

-typedef struct {

-    int fd;

-    string_t filename;

-} socket_handoff_t;

-

-/* This thread accepts an incoming connection and hands off the file

- * descriptor for the new connection to accept_fd_handoff()

- */

-#ifdef HAVE_LIBDISPATCH

-static void socket_handoff(socket_handoff_t *handoff_data) {

-#else

-static void *socket_handoff_thread(void *arg) {

-    socket_handoff_t *handoff_data = (socket_handoff_t *)arg;

-#endif

-

-    int launchd_fd = -1;

-    int connected_fd;

-

-    /* Now actually get the passed file descriptor from this connection

-     * If we encounter an error, keep listening.

-     */

-    while(launchd_fd == -1) {

-        connected_fd = accept(handoff_data->fd, NULL, NULL);

-        if(connected_fd == -1) {

-            ErrorF("X11.app: Failed to accept incoming connection on socket (fd=%d): %s\n", handoff_data->fd, strerror(errno));

-            sleep(2);

-            continue;

-        }

-

-        launchd_fd = accept_fd_handoff(connected_fd);

-        if(launchd_fd == -1)

-            ErrorF("X11.app: Error receiving $DISPLAY file descriptor, no descriptor received?  Waiting for another connection.\n");

-

-        close(connected_fd);

-    }

-

-    close(handoff_data->fd);

-    unlink(handoff_data->filename);

-    free(handoff_data);

-        

-    ErrorF("X11.app Handing off fd to server thread via DarwinListenOnOpenFD(%d)\n", launchd_fd);

-    DarwinListenOnOpenFD(launchd_fd);

-

-#ifndef HAVE_LIBDISPATCH

-    return NULL;

-#endif

-}

-

-static int create_socket(char *filename_out) {

-    struct sockaddr_un servaddr_un;

-    struct sockaddr *servaddr;

-    socklen_t servaddr_len;

-    int ret_fd;

-    size_t try, try_max;

-    

-    for(try=0, try_max=5; try < try_max; try++) {

-        tmpnam(filename_out);

-        

-        /* Setup servaddr_un */

-        memset (&servaddr_un, 0, sizeof (struct sockaddr_un));

-        servaddr_un.sun_family = AF_UNIX;

-        strlcpy(servaddr_un.sun_path, filename_out, sizeof(servaddr_un.sun_path));

-        

-        servaddr = (struct sockaddr *) &servaddr_un;

-        servaddr_len = sizeof(struct sockaddr_un) - sizeof(servaddr_un.sun_path) + strlen(filename_out);

-        

-        ret_fd = socket(PF_UNIX, SOCK_STREAM, 0);

-        if(ret_fd == -1) {

-            ErrorF("X11.app: Failed to create socket (try %d / %d): %s - %s\n", (int)try+1, (int)try_max, filename_out, strerror(errno));

-            continue;

-        }

-        

-        if(bind(ret_fd, servaddr, servaddr_len) != 0) {

-            ErrorF("X11.app: Failed to bind socket: %d - %s\n", errno, strerror(errno));

-            close(ret_fd);

-            return 0;

-        }

-        

-        if(listen(ret_fd, 10) != 0) {

-            ErrorF("X11.app: Failed to listen to socket: %s - %d - %s\n", filename_out, errno, strerror(errno));

-            close(ret_fd);

-            return 0;

-        }

-        

-#ifdef DEBUG

-        ErrorF("X11.app: Listening on socket for fd handoff:  (%d) %s\n", ret_fd, filename_out);

-#endif

-        

-        return ret_fd;

-    }

-    

-    return 0;

-}

-

-static int launchd_socket_handed_off = 0;

-

-kern_return_t do_request_fd_handoff_socket(mach_port_t port, string_t filename) {

-    socket_handoff_t *handoff_data;

-    

-    launchd_socket_handed_off = 1;

-

-    handoff_data = (socket_handoff_t *)calloc(1,sizeof(socket_handoff_t));

-    if(!handoff_data) {

-        ErrorF("X11.app: Error allocating memory for handoff_data\n");

-        return KERN_FAILURE;

-    }

-

-    handoff_data->fd = create_socket(handoff_data->filename);

-    if(!handoff_data->fd) {

-        free(handoff_data);

-        return KERN_FAILURE;

-    }

-

-    strlcpy(filename, handoff_data->filename, STRING_T_SIZE);

-

-#ifdef HAVE_LIBDISPATCH

-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT,0), ^{

-        socket_handoff(handoff_data);

-    });

-#else

-    create_thread(socket_handoff_thread, handoff_data);

-#endif

-    

-#ifdef DEBUG

-    ErrorF("X11.app: Thread created for handoff.  Returning success to tell caller to connect and push the fd.\n");

-#endif

-

-    return KERN_SUCCESS;

-}

-

-kern_return_t do_request_pid(mach_port_t port, int *my_pid) {

-    *my_pid = getpid();

-    return KERN_SUCCESS;

-}

-

-/*** Server Startup ***/

-kern_return_t do_start_x11_server(mach_port_t port, string_array_t argv,

-                                  mach_msg_type_number_t argvCnt,

-                                  string_array_t envp,

-                                  mach_msg_type_number_t envpCnt) {

-    /* And now back to char ** */

-    char **_argv = alloca((argvCnt + 1) * sizeof(char *));

-    char **_envp = alloca((envpCnt + 1) * sizeof(char *));

-    size_t i;

-    

-    /* If we didn't get handed a launchd DISPLAY socket, we should

-     * unset DISPLAY or we can run into problems with pbproxy

-     */

-    if(!launchd_socket_handed_off) {

-        ErrorF("X11.app: No launchd socket handed off, unsetting DISPLAY\n");

-        unsetenv("DISPLAY");

-    }

-    

-    if(!_argv || !_envp) {

-        return KERN_FAILURE;

-    }

-

-    ErrorF("X11.app: do_start_x11_server(): argc=%d\n", argvCnt);

-    for(i=0; i < argvCnt; i++) {

-        _argv[i] = argv[i];

-        ErrorF("\targv[%u] = %s\n", (unsigned)i, argv[i]);

-    }

-    _argv[argvCnt] = NULL;

-    

-    for(i=0; i < envpCnt; i++) {

-        _envp[i] = envp[i];

-    }

-    _envp[envpCnt] = NULL;

-    

-    if(server_main(argvCnt, _argv, _envp) == 0)

-        return KERN_SUCCESS;

-    else

-        return KERN_FAILURE;

-}

-

-static int startup_trigger(int argc, char **argv, char **envp) {

-    Display *display;

-    const char *s;

-    

-    /* Take care of the case where we're called like a normal DDX */

-    if(argc > 1 && argv[1][0] == ':') {

-        size_t i;

-        kern_return_t kr;

-        mach_port_t mp;

-        string_array_t newenvp;

-        string_array_t newargv;

-

-        /* We need to count envp */

-        int envpc;

-        for(envpc=0; envp[envpc]; envpc++);

-

-        /* We have fixed-size string lengths due to limitations in IPC,

-         * so we need to copy our argv and envp.

-         */

-        newargv = (string_array_t)alloca(argc * sizeof(string_t));

-        newenvp = (string_array_t)alloca(envpc * sizeof(string_t));

-        

-        if(!newargv || !newenvp) {

-            ErrorF("Memory allocation failure\n");

-            exit(EXIT_FAILURE);

-        }

-        

-        for(i=0; i < argc; i++) {

-            strlcpy(newargv[i], argv[i], STRING_T_SIZE);

-        }

-        for(i=0; i < envpc; i++) {

-            strlcpy(newenvp[i], envp[i], STRING_T_SIZE);

-        }

-

-        kr = bootstrap_look_up(bootstrap_port, server_bootstrap_name, &mp);

-        if (kr != KERN_SUCCESS) {

-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050

-            ErrorF("bootstrap_look_up(%s): %s\n", server_bootstrap_name, bootstrap_strerror(kr));

-#else

-            ErrorF("bootstrap_look_up(%s): %ul\n", server_bootstrap_name, (unsigned long)kr);

-#endif

-            exit(EXIT_FAILURE);

-        }

-

-        kr = start_x11_server(mp, newargv, argc, newenvp, envpc);

-        if (kr != KERN_SUCCESS) {

-            ErrorF("start_x11_server: %s\n", mach_error_string(kr));

-            exit(EXIT_FAILURE);

-        }

-        exit(EXIT_SUCCESS);

-    }

-

-    /* If we have a process serial number and it's our only arg, act as if

-     * the user double clicked the app bundle: launch app_to_run if possible

-     */

-    if(argc == 1 || (argc == 2 && !strncmp(argv[1], "-psn_", 5))) {

-        /* Now, try to open a display, if so, run the launcher */

-        display = XOpenDisplay(NULL);

-        if(display) {

-            /* Could open the display, start the launcher */

-            XCloseDisplay(display);

-

-            return execute(pref_app_to_run);

-        }

-    }

-

-    /* Start the server */

-    if((s = getenv("DISPLAY"))) {

-        ErrorF("X11.app: Could not connect to server (DISPLAY=\"%s\", unsetting).  Starting X server.\n", s);

-        unsetenv("DISPLAY");

-    } else {

-        ErrorF("X11.app: Could not connect to server (DISPLAY is not set).  Starting X server.\n");

-    }

-    return execute(pref_startx_script);

-}

-

-/** Setup the environment we want our child processes to inherit */

-static void ensure_path(const char *dir) {

-    char buf[1024], *temp;

-    

-    /* Make sure /usr/X11/bin is in the $PATH */

-    temp = getenv("PATH");

-    if(temp == NULL || temp[0] == 0) {

-        snprintf(buf, sizeof(buf), "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:%s", dir);

-        setenv("PATH", buf, TRUE);

-    } else if(strnstr(temp, X11BINDIR, sizeof(temp)) == NULL) {

-        snprintf(buf, sizeof(buf), "%s:%s", temp, dir);

-        setenv("PATH", buf, TRUE);

-    }

-}

-

-static void setup_console_redirect(const char *bundle_id) {

-    char *asl_sender;

-    char *asl_facility;

-

-    asprintf(&asl_sender, "%s.server", bundle_id);

-    assert(asl_sender);

-

-    asl_facility = strdup(bundle_id);

-    assert(asl_facility);

-    if(strcmp(asl_facility + strlen(asl_facility) - 4, ".X11") == 0)

-        asl_facility[strlen(asl_facility) - 4] = '\0';

-

-    assert(aslc = asl_open(asl_sender, asl_facility, ASL_OPT_NO_DELAY));

-    free(asl_sender);

-    free(asl_facility);

-

-    asl_set_filter(aslc, ASL_FILTER_MASK_UPTO(ASL_LEVEL_WARNING));

-    xq_asl_capture_fd(aslc, NULL, ASL_LEVEL_INFO, STDOUT_FILENO);

-    xq_asl_capture_fd(aslc, NULL, ASL_LEVEL_NOTICE, STDERR_FILENO);

-}

-

-static void setup_env(void) {

-    char *temp;

-    const char *pds = NULL;

-    const char *disp = getenv("DISPLAY");

-    size_t len;

-

-    /* Pass on our prefs domain to startx and its inheritors (mainly for

-     * quartz-wm and the Xquartz stub's MachIPC)

-     */

-    CFBundleRef bundle = CFBundleGetMainBundle();

-    if(bundle) {

-        CFStringRef pd = CFBundleGetIdentifier(bundle);

-        if(pd) {

-            pds = CFStringGetCStringPtr(pd, 0);

-        }

-    }

-

-    /* fallback to hardcoded value if we can't discover it */

-    if(!pds) {

-        pds = BUNDLE_ID_PREFIX".X11";

-    }

-

-    setup_console_redirect(pds);

-

-    server_bootstrap_name = strdup(pds);

-    if(!server_bootstrap_name) {

-        ErrorF("X11.app: Memory allocation error.\n");

-        exit(1);

-    }

-    setenv("X11_PREFS_DOMAIN", server_bootstrap_name, 1);

-    

-    len = strlen(server_bootstrap_name);

-    bundle_id_prefix = malloc(sizeof(char) * (len - 3));

-    if(!bundle_id_prefix) {

-        ErrorF("X11.app: Memory allocation error.\n");

-        exit(1);

-    }

-    strlcpy(bundle_id_prefix, server_bootstrap_name, len - 3);

-    

-    /* We need to unset DISPLAY if it is not our socket */

-    if(disp) {

-        /* s = basename(disp) */

-        const char *d, *s;

-	    for(s = NULL, d = disp; *d; d++) {

-            if(*d == '/')

-                s = d + 1;

-        }

-

-        if(s && *s) {

-            if(strcmp(bundle_id_prefix, "org.x") == 0 && strcmp(s, ":0") == 0) {

-                ErrorF("X11.app: Detected old style launchd DISPLAY, please update xinit.\n");

-            } else {

-                temp = (char *)malloc(sizeof(char) * len);

-                if(!temp) {

-                    ErrorF("X11.app: Memory allocation error creating space for socket name test.\n");

-                    exit(1);

-                }

-                strlcpy(temp, bundle_id_prefix, len);

-                strlcat(temp, ":0", len);

-            

-                if(strcmp(temp, s) != 0) {

-                    /* If we don't have a match, unset it. */

-                    ErrorF("X11.app: DISPLAY (\"%s\") does not match our id (\"%s\"), unsetting.\n", disp, bundle_id_prefix);

-                    unsetenv("DISPLAY");

-                }

-                free(temp);

-            }

-        } else {

-            /* The DISPLAY environment variable is not formatted like a launchd socket, so reset. */

-            ErrorF("X11.app: DISPLAY does not look like a launchd set variable, unsetting.\n");

-            unsetenv("DISPLAY");

-        }

-    }

-

-    /* Make sure PATH is right */

-    ensure_path(X11BINDIR);

-    

-    /* cd $HOME */

-    temp = getenv("HOME");

-    if(temp != NULL && temp[0] != '\0')

-        chdir(temp);

-}

-

-/*** Main ***/

-int main(int argc, char **argv, char **envp) {

-    Bool listenOnly = FALSE;

-    int i;

-    mach_msg_size_t mxmsgsz = sizeof(union MaxMsgSize) + MAX_TRAILER_SIZE;

-    mach_port_t mp;

-    kern_return_t kr;

-

-    /* Setup our environment for our children */

-    setup_env();

-    

-    /* The server must not run the PanoramiX operations. */

-    noPanoramiXExtension = TRUE;

-

-    /* Setup the initial crasherporter info */

-    strlcpy(__crashreporter_info_buff__, __crashreporter_info__base, sizeof(__crashreporter_info_buff__));

-    

-    ErrorF("X11.app: main(): argc=%d\n", argc);

-    for(i=0; i < argc; i++) {

-        ErrorF("\targv[%u] = %s\n", (unsigned)i, argv[i]);

-        if(!strcmp(argv[i], "--listenonly")) {

-            listenOnly = TRUE;

-        }

-    }

-

-    mp = checkin_or_register(server_bootstrap_name);

-    if(mp == MACH_PORT_NULL) {

-        ErrorF("NULL mach service: %s", server_bootstrap_name);

-        return EXIT_FAILURE;

-    }

-    

-    /* Check if we need to do something other than listen, and make another

-     * thread handle it.

-     */

-    if(!listenOnly) {

-        pid_t child1, child2;

-        int status;

-

-        pref_app_to_run = command_from_prefs("app_to_run", DEFAULT_CLIENT);

-        assert(pref_app_to_run);

-

-        pref_login_shell = command_from_prefs("login_shell", DEFAULT_SHELL);

-        assert(pref_login_shell);

-

-        pref_startx_script = command_from_prefs("startx_script", DEFAULT_STARTX);

-        assert(pref_startx_script);

-

-        /* Do the fork-twice trick to avoid having to reap zombies */

-        child1 = fork();

-        switch (child1) {

-            case -1:                                /* error */

-                FatalError("fork() failed: %s\n", strerror(errno));

-

-            case 0:                                 /* child1 */

-                child2 = fork();

-

-                switch (child2) {

-                    int max_files;

-

-                    case -1:                            /* error */

-                        FatalError("fork() failed: %s\n", strerror(errno));

-

-                    case 0:                             /* child2 */

-                        /* close all open files except for standard streams */

-                        max_files = sysconf(_SC_OPEN_MAX);

-                        for(i = 3; i < max_files; i++)

-                            close(i);

-

-                        /* ensure stdin is on /dev/null */

-                        close(0);

-                        open("/dev/null", O_RDONLY);

-

-                        return startup_trigger(argc, argv, envp);

-

-                    default:                            /* parent (child1) */

-                        _exit(0);

-                }

-                break;

-

-            default:                                /* parent */

-              waitpid(child1, &status, 0);

-        }

-

-        free(pref_app_to_run);

-        free(pref_login_shell);

-        free(pref_startx_script);

-    }

-    

-    /* Main event loop */

-    ErrorF("Waiting for startup parameters via Mach IPC.\n");

-    kr = mach_msg_server(mach_startup_server, mxmsgsz, mp, 0);

-    if (kr != KERN_SUCCESS) {

-        ErrorF("%s.X11(mp): %s\n", BUNDLE_ID_PREFIX, mach_error_string(kr));

-        return EXIT_FAILURE;

-    }

-    

-    return EXIT_SUCCESS;

-}

-

-static int execute(const char *command) {

-    const char *newargv[4];

-    const char **p;

-    

-    newargv[0] = pref_login_shell;

-    newargv[1] = "-c";

-    newargv[2] = command;

-    newargv[3] = NULL;

-    

-    ErrorF("X11.app: Launching %s:\n", command);

-    for(p=newargv; *p; p++) {

-        ErrorF("\targv[%ld] = %s\n", (long int)(p - newargv), *p);

-    }

-

-    execvp (newargv[0], (char * const *) newargv);

-    perror ("X11.app: Couldn't exec.");

-    return 1;

-}

-

-static char *command_from_prefs(const char *key, const char *default_value) {

-    char *command = NULL;

-    

-    CFStringRef cfKey;

-    CFPropertyListRef PlistRef;

-

-    if(!key)

-        return NULL;

-

-    cfKey = CFStringCreateWithCString(NULL, key, kCFStringEncodingASCII);

-

-    if(!cfKey)

-        return NULL;

-

-    PlistRef = CFPreferencesCopyAppValue(cfKey, kCFPreferencesCurrentApplication);

-    

-    if ((PlistRef == NULL) || (CFGetTypeID(PlistRef) != CFStringGetTypeID())) {

-        CFStringRef cfDefaultValue = CFStringCreateWithCString(NULL, default_value, kCFStringEncodingASCII);

-        int len = strlen(default_value) + 1;

-

-        if(!cfDefaultValue)

-            goto command_from_prefs_out;

-

-        CFPreferencesSetAppValue(cfKey, cfDefaultValue, kCFPreferencesCurrentApplication);

-        CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);

-        CFRelease(cfDefaultValue);

-        

-        command = (char *)malloc(len * sizeof(char));

-        if(!command)

-            goto command_from_prefs_out;

-        strcpy(command, default_value);

-    } else {

-        int len = CFStringGetLength((CFStringRef)PlistRef) + 1;

-        command = (char *)malloc(len * sizeof(char));

-        if(!command)

-            goto command_from_prefs_out;

-        CFStringGetCString((CFStringRef)PlistRef, command, len,  kCFStringEncodingASCII);

-    }

-

-command_from_prefs_out:

-    if (PlistRef)

-        CFRelease(PlistRef);

-    if(cfKey)

-        CFRelease(cfKey);

-    return command;

-}

+/* main.c -- X application launcher
+ 
+ Copyright (c) 2007 Jeremy Huddleston
+ Copyright (c) 2007 Apple Inc
+ 
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation files
+ (the "Software"), to deal in the Software without restriction,
+ including without limitation the rights to use, copy, modify, merge,
+ publish, distribute, sublicense, and/or sell copies of the Software,
+ and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+ 
+ 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 ABOVE LISTED COPYRIGHT
+ HOLDER(S) 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(s) of the above
+ copyright holders shall not be used in advertising or otherwise to
+ promote the sale, use or other dealings in this Software without
+ prior written authorization. */
+
+#include <CoreFoundation/CoreFoundation.h>
+#include <AvailabilityMacros.h>
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <X11/Xlib.h>
+#include <assert.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <signal.h>
+
+#ifdef HAVE_LIBDISPATCH
+#include <dispatch/dispatch.h>
+#else
+#include <pthread.h>
+#endif
+
+#include <sys/socket.h>
+#include <sys/un.h>
+
+#include <fcntl.h>
+
+#include <mach/mach.h>
+#include <mach/mach_error.h>
+#include <servers/bootstrap.h>
+#include "mach_startup.h"
+#include "mach_startupServer.h"
+
+#include "console_redirect.h"
+
+/* From darwinEvents.c ... but don't want to pull in all the server cruft */
+void DarwinListenOnOpenFD(int fd);
+
+extern aslclient aslc;
+
+/* Ditto, from os/log.c */
+extern void ErrorF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2);
+extern void FatalError(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2) _X_NORETURN;
+
+extern int noPanoramiXExtension;
+
+#define DEFAULT_CLIENT X11BINDIR "/xterm"
+#define DEFAULT_STARTX X11BINDIR "/startx"
+#define DEFAULT_SHELL  "/bin/sh"
+
+#ifndef BUILD_DATE
+#define BUILD_DATE ""
+#endif
+#ifndef XSERVER_VERSION
+#define XSERVER_VERSION "?"
+#endif
+
+static char __crashreporter_info_buff__[4096] = {0};
+static const char *__crashreporter_info__ __attribute__((__used__)) = &__crashreporter_info_buff__[0];
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+// This is actually a toolchain requirement, but I'm not sure the correct check,
+// but it should be fine to just only include it for Leopard and later.  This line
+// just tells the linker to never strip this symbol (such as for space optimization)
+asm (".desc ___crashreporter_info__, 0x10");
+#endif
+
+static const char *__crashreporter_info__base = "X.Org X Server " XSERVER_VERSION " Build Date: " BUILD_DATE;
+
+char *bundle_id_prefix = NULL;
+static char *server_bootstrap_name = NULL;
+
+#define DEBUG 1
+
+/* This is in quartzStartup.c */
+int server_main(int argc, char **argv, char **envp);
+
+static int execute(const char *command);
+static char *command_from_prefs(const char *key, const char *default_value);
+
+static char *pref_app_to_run;
+static char *pref_login_shell;
+static char *pref_startx_script;
+
+#ifndef HAVE_LIBDISPATCH
+/*** Pthread Magics ***/
+static pthread_t create_thread(void *(*func)(void *), void *arg) {
+    pthread_attr_t attr;
+    pthread_t tid;
+	
+    pthread_attr_init (&attr);
+    pthread_attr_setscope (&attr, PTHREAD_SCOPE_SYSTEM);
+    pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
+    pthread_create (&tid, &attr, func, arg);
+    pthread_attr_destroy (&attr);
+	
+    return tid;
+}
+#endif
+
+/*** Mach-O IPC Stuffs ***/
+
+union MaxMsgSize {
+	union __RequestUnion__mach_startup_subsystem req;
+	union __ReplyUnion__mach_startup_subsystem rep; 
+};
+
+static mach_port_t checkin_or_register(char *bname) {
+    kern_return_t kr;
+    mach_port_t mp;
+
+    /* If we're started by launchd or the old mach_init */
+    kr = bootstrap_check_in(bootstrap_port, bname, &mp);
+    if (kr == KERN_SUCCESS)
+        return mp;
+
+    /* We probably were not started by launchd or the old mach_init */
+    kr = mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &mp);
+    if (kr != KERN_SUCCESS) {
+        ErrorF("mach_port_allocate(): %s\n", mach_error_string(kr));
+        exit(EXIT_FAILURE);
+    }
+
+    kr = mach_port_insert_right(mach_task_self(), mp, mp, MACH_MSG_TYPE_MAKE_SEND);
+    if (kr != KERN_SUCCESS) {
+        ErrorF("mach_port_insert_right(): %s\n", mach_error_string(kr));
+        exit(EXIT_FAILURE);
+    }
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations" // bootstrap_register
+#endif
+    kr = bootstrap_register(bootstrap_port, bname, mp);
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+    if (kr != KERN_SUCCESS) {
+        ErrorF("bootstrap_register(): %s\n", mach_error_string(kr));
+        exit(EXIT_FAILURE);
+    }
+
+    return mp;
+}
+
+/*** $DISPLAY handoff ***/
+static int accept_fd_handoff(int connected_fd) {
+    int launchd_fd;
+    
+    char databuf[] = "display";
+    struct iovec iov[1];
+    
+    union {
+        struct cmsghdr hdr;
+        char bytes[CMSG_SPACE(sizeof(int))];
+    } buf;
+    
+    struct msghdr msg;
+    struct cmsghdr *cmsg;
+
+    iov[0].iov_base = databuf;
+    iov[0].iov_len  = sizeof(databuf);
+    
+    msg.msg_iov = iov;
+    msg.msg_iovlen = 1;
+    msg.msg_control = buf.bytes;
+    msg.msg_controllen = sizeof(buf);
+    msg.msg_name = 0;
+    msg.msg_namelen = 0;
+    msg.msg_flags = 0;
+    
+    cmsg = CMSG_FIRSTHDR (&msg);
+    cmsg->cmsg_level = SOL_SOCKET;
+    cmsg->cmsg_type = SCM_RIGHTS;
+    cmsg->cmsg_len = CMSG_LEN(sizeof(int));
+    
+    msg.msg_controllen = cmsg->cmsg_len;
+    
+    *((int*)CMSG_DATA(cmsg)) = -1;
+    
+    if(recvmsg(connected_fd, &msg, 0) < 0) {
+        ErrorF("X11.app: Error receiving $DISPLAY file descriptor.  recvmsg() error: %s\n", strerror(errno));
+        return -1;
+    }
+    
+    launchd_fd = *((int*)CMSG_DATA(cmsg));
+    
+    return launchd_fd;
+}
+
+typedef struct {
+    int fd;
+    string_t filename;
+} socket_handoff_t;
+
+/* This thread accepts an incoming connection and hands off the file
+ * descriptor for the new connection to accept_fd_handoff()
+ */
+#ifdef HAVE_LIBDISPATCH
+static void socket_handoff(socket_handoff_t *handoff_data) {
+#else
+static void *socket_handoff_thread(void *arg) {
+    socket_handoff_t *handoff_data = (socket_handoff_t *)arg;
+#endif
+
+    int launchd_fd = -1;
+    int connected_fd;
+
+    /* Now actually get the passed file descriptor from this connection
+     * If we encounter an error, keep listening.
+     */
+    while(launchd_fd == -1) {
+        connected_fd = accept(handoff_data->fd, NULL, NULL);
+        if(connected_fd == -1) {
+            ErrorF("X11.app: Failed to accept incoming connection on socket (fd=%d): %s\n", handoff_data->fd, strerror(errno));
+            sleep(2);
+            continue;
+        }
+
+        launchd_fd = accept_fd_handoff(connected_fd);
+        if(launchd_fd == -1)
+            ErrorF("X11.app: Error receiving $DISPLAY file descriptor, no descriptor received?  Waiting for another connection.\n");
+
+        close(connected_fd);
+    }
+
+    close(handoff_data->fd);
+    unlink(handoff_data->filename);
+    free(handoff_data);
+        
+    ErrorF("X11.app Handing off fd to server thread via DarwinListenOnOpenFD(%d)\n", launchd_fd);
+    DarwinListenOnOpenFD(launchd_fd);
+
+#ifndef HAVE_LIBDISPATCH
+    return NULL;
+#endif
+}
+
+static int create_socket(char *filename_out) {
+    struct sockaddr_un servaddr_un;
+    struct sockaddr *servaddr;
+    socklen_t servaddr_len;
+    int ret_fd;
+    size_t try, try_max;
+    
+    for(try=0, try_max=5; try < try_max; try++) {
+        tmpnam(filename_out);
+        
+        /* Setup servaddr_un */
+        memset (&servaddr_un, 0, sizeof (struct sockaddr_un));
+        servaddr_un.sun_family = AF_UNIX;
+        strlcpy(servaddr_un.sun_path, filename_out, sizeof(servaddr_un.sun_path));
+        
+        servaddr = (struct sockaddr *) &servaddr_un;
+        servaddr_len = sizeof(struct sockaddr_un) - sizeof(servaddr_un.sun_path) + strlen(filename_out);
+        
+        ret_fd = socket(PF_UNIX, SOCK_STREAM, 0);
+        if(ret_fd == -1) {
+            ErrorF("X11.app: Failed to create socket (try %d / %d): %s - %s\n", (int)try+1, (int)try_max, filename_out, strerror(errno));
+            continue;
+        }
+        
+        if(bind(ret_fd, servaddr, servaddr_len) != 0) {
+            ErrorF("X11.app: Failed to bind socket: %d - %s\n", errno, strerror(errno));
+            close(ret_fd);
+            return 0;
+        }
+        
+        if(listen(ret_fd, 10) != 0) {
+            ErrorF("X11.app: Failed to listen to socket: %s - %d - %s\n", filename_out, errno, strerror(errno));
+            close(ret_fd);
+            return 0;
+        }
+        
+#ifdef DEBUG
+        ErrorF("X11.app: Listening on socket for fd handoff:  (%d) %s\n", ret_fd, filename_out);
+#endif
+        
+        return ret_fd;
+    }
+    
+    return 0;
+}
+
+static int launchd_socket_handed_off = 0;
+
+kern_return_t do_request_fd_handoff_socket(mach_port_t port, string_t filename) {
+    socket_handoff_t *handoff_data;
+    
+    launchd_socket_handed_off = 1;
+
+    handoff_data = (socket_handoff_t *)calloc(1,sizeof(socket_handoff_t));
+    if(!handoff_data) {
+        ErrorF("X11.app: Error allocating memory for handoff_data\n");
+        return KERN_FAILURE;
+    }
+
+    handoff_data->fd = create_socket(handoff_data->filename);
+    if(!handoff_data->fd) {
+        free(handoff_data);
+        return KERN_FAILURE;
+    }
+
+    strlcpy(filename, handoff_data->filename, STRING_T_SIZE);
+
+#ifdef HAVE_LIBDISPATCH
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT,0), ^{
+        socket_handoff(handoff_data);
+    });
+#else
+    create_thread(socket_handoff_thread, handoff_data);
+#endif
+    
+#ifdef DEBUG
+    ErrorF("X11.app: Thread created for handoff.  Returning success to tell caller to connect and push the fd.\n");
+#endif
+
+    return KERN_SUCCESS;
+}
+
+kern_return_t do_request_pid(mach_port_t port, int *my_pid) {
+    *my_pid = getpid();
+    return KERN_SUCCESS;
+}
+
+/*** Server Startup ***/
+kern_return_t do_start_x11_server(mach_port_t port, string_array_t argv,
+                                  mach_msg_type_number_t argvCnt,
+                                  string_array_t envp,
+                                  mach_msg_type_number_t envpCnt) {
+    /* And now back to char ** */
+    char **_argv = alloca((argvCnt + 1) * sizeof(char *));
+    char **_envp = alloca((envpCnt + 1) * sizeof(char *));
+    size_t i;
+    
+    /* If we didn't get handed a launchd DISPLAY socket, we should
+     * unset DISPLAY or we can run into problems with pbproxy
+     */
+    if(!launchd_socket_handed_off) {
+        ErrorF("X11.app: No launchd socket handed off, unsetting DISPLAY\n");
+        unsetenv("DISPLAY");
+    }
+    
+    if(!_argv || !_envp) {
+        return KERN_FAILURE;
+    }
+
+    ErrorF("X11.app: do_start_x11_server(): argc=%d\n", argvCnt);
+    for(i=0; i < argvCnt; i++) {
+        _argv[i] = argv[i];
+        ErrorF("\targv[%u] = %s\n", (unsigned)i, argv[i]);
+    }
+    _argv[argvCnt] = NULL;
+    
+    for(i=0; i < envpCnt; i++) {
+        _envp[i] = envp[i];
+    }
+    _envp[envpCnt] = NULL;
+    
+    if(server_main(argvCnt, _argv, _envp) == 0)
+        return KERN_SUCCESS;
+    else
+        return KERN_FAILURE;
+}
+
+static int startup_trigger(int argc, char **argv, char **envp) {
+    Display *display;
+    const char *s;
+    
+    /* Take care of the case where we're called like a normal DDX */
+    if(argc > 1 && argv[1][0] == ':') {
+        size_t i;
+        kern_return_t kr;
+        mach_port_t mp;
+        string_array_t newenvp;
+        string_array_t newargv;
+
+        /* We need to count envp */
+        int envpc;
+        for(envpc=0; envp[envpc]; envpc++);
+
+        /* We have fixed-size string lengths due to limitations in IPC,
+         * so we need to copy our argv and envp.
+         */
+        newargv = (string_array_t)alloca(argc * sizeof(string_t));
+        newenvp = (string_array_t)alloca(envpc * sizeof(string_t));
+        
+        if(!newargv || !newenvp) {
+            ErrorF("Memory allocation failure\n");
+            exit(EXIT_FAILURE);
+        }
+        
+        for(i=0; i < argc; i++) {
+            strlcpy(newargv[i], argv[i], STRING_T_SIZE);
+        }
+        for(i=0; i < envpc; i++) {
+            strlcpy(newenvp[i], envp[i], STRING_T_SIZE);
+        }
+
+        kr = bootstrap_look_up(bootstrap_port, server_bootstrap_name, &mp);
+        if (kr != KERN_SUCCESS) {
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+            ErrorF("bootstrap_look_up(%s): %s\n", server_bootstrap_name, bootstrap_strerror(kr));
+#else
+            ErrorF("bootstrap_look_up(%s): %ul\n", server_bootstrap_name, (unsigned long)kr);
+#endif
+            exit(EXIT_FAILURE);
+        }
+
+        kr = start_x11_server(mp, newargv, argc, newenvp, envpc);
+        if (kr != KERN_SUCCESS) {
+            ErrorF("start_x11_server: %s\n", mach_error_string(kr));
+            exit(EXIT_FAILURE);
+        }
+        exit(EXIT_SUCCESS);
+    }
+
+    /* If we have a process serial number and it's our only arg, act as if
+     * the user double clicked the app bundle: launch app_to_run if possible
+     */
+    if(argc == 1 || (argc == 2 && !strncmp(argv[1], "-psn_", 5))) {
+        /* Now, try to open a display, if so, run the launcher */
+        display = XOpenDisplay(NULL);
+        if(display) {
+            /* Could open the display, start the launcher */
+            XCloseDisplay(display);
+
+            return execute(pref_app_to_run);
+        }
+    }
+
+    /* Start the server */
+    if((s = getenv("DISPLAY"))) {
+        ErrorF("X11.app: Could not connect to server (DISPLAY=\"%s\", unsetting).  Starting X server.\n", s);
+        unsetenv("DISPLAY");
+    } else {
+        ErrorF("X11.app: Could not connect to server (DISPLAY is not set).  Starting X server.\n");
+    }
+    return execute(pref_startx_script);
+}
+
+/** Setup the environment we want our child processes to inherit */
+static void ensure_path(const char *dir) {
+    char buf[1024], *temp;
+    
+    /* Make sure /usr/X11/bin is in the $PATH */
+    temp = getenv("PATH");
+    if(temp == NULL || temp[0] == 0) {
+        snprintf(buf, sizeof(buf), "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:%s", dir);
+        setenv("PATH", buf, TRUE);
+    } else if(strnstr(temp, X11BINDIR, sizeof(temp)) == NULL) {
+        snprintf(buf, sizeof(buf), "%s:%s", temp, dir);
+        setenv("PATH", buf, TRUE);
+    }
+}
+
+static void setup_console_redirect(const char *bundle_id) {
+    char *asl_sender;
+    char *asl_facility;
+
+    asprintf(&asl_sender, "%s.server", bundle_id);
+    assert(asl_sender);
+
+    asl_facility = strdup(bundle_id);
+    assert(asl_facility);
+    if(strcmp(asl_facility + strlen(asl_facility) - 4, ".X11") == 0)
+        asl_facility[strlen(asl_facility) - 4] = '\0';
+
+    assert(aslc = asl_open(asl_sender, asl_facility, ASL_OPT_NO_DELAY));
+    free(asl_sender);
+    free(asl_facility);
+
+    asl_set_filter(aslc, ASL_FILTER_MASK_UPTO(ASL_LEVEL_WARNING));
+    xq_asl_capture_fd(aslc, NULL, ASL_LEVEL_INFO, STDOUT_FILENO);
+    xq_asl_capture_fd(aslc, NULL, ASL_LEVEL_NOTICE, STDERR_FILENO);
+}
+
+static void setup_env(void) {
+    char *temp;
+    const char *pds = NULL;
+    const char *disp = getenv("DISPLAY");
+    size_t len;
+
+    /* Pass on our prefs domain to startx and its inheritors (mainly for
+     * quartz-wm and the Xquartz stub's MachIPC)
+     */
+    CFBundleRef bundle = CFBundleGetMainBundle();
+    if(bundle) {
+        CFStringRef pd = CFBundleGetIdentifier(bundle);
+        if(pd) {
+            pds = CFStringGetCStringPtr(pd, 0);
+        }
+    }
+
+    /* fallback to hardcoded value if we can't discover it */
+    if(!pds) {
+        pds = BUNDLE_ID_PREFIX".X11";
+    }
+
+    setup_console_redirect(pds);
+
+    server_bootstrap_name = strdup(pds);
+    if(!server_bootstrap_name) {
+        ErrorF("X11.app: Memory allocation error.\n");
+        exit(1);
+    }
+    setenv("X11_PREFS_DOMAIN", server_bootstrap_name, 1);
+    
+    len = strlen(server_bootstrap_name);
+    bundle_id_prefix = malloc(sizeof(char) * (len - 3));
+    if(!bundle_id_prefix) {
+        ErrorF("X11.app: Memory allocation error.\n");
+        exit(1);
+    }
+    strlcpy(bundle_id_prefix, server_bootstrap_name, len - 3);
+    
+    /* We need to unset DISPLAY if it is not our socket */
+    if(disp) {
+        /* s = basename(disp) */
+        const char *d, *s;
+	    for(s = NULL, d = disp; *d; d++) {
+            if(*d == '/')
+                s = d + 1;
+        }
+
+        if(s && *s) {
+            if(strcmp(bundle_id_prefix, "org.x") == 0 && strcmp(s, ":0") == 0) {
+                ErrorF("X11.app: Detected old style launchd DISPLAY, please update xinit.\n");
+            } else {
+                temp = (char *)malloc(sizeof(char) * len);
+                if(!temp) {
+                    ErrorF("X11.app: Memory allocation error creating space for socket name test.\n");
+                    exit(1);
+                }
+                strlcpy(temp, bundle_id_prefix, len);
+                strlcat(temp, ":0", len);
+            
+                if(strcmp(temp, s) != 0) {
+                    /* If we don't have a match, unset it. */
+                    ErrorF("X11.app: DISPLAY (\"%s\") does not match our id (\"%s\"), unsetting.\n", disp, bundle_id_prefix);
+                    unsetenv("DISPLAY");
+                }
+                free(temp);
+            }
+        } else {
+            /* The DISPLAY environment variable is not formatted like a launchd socket, so reset. */
+            ErrorF("X11.app: DISPLAY does not look like a launchd set variable, unsetting.\n");
+            unsetenv("DISPLAY");
+        }
+    }
+
+    /* Make sure PATH is right */
+    ensure_path(X11BINDIR);
+    
+    /* cd $HOME */
+    temp = getenv("HOME");
+    if(temp != NULL && temp[0] != '\0')
+        chdir(temp);
+}
+
+/*** Main ***/
+int main(int argc, char **argv, char **envp) {
+    Bool listenOnly = FALSE;
+    int i;
+    mach_msg_size_t mxmsgsz = sizeof(union MaxMsgSize) + MAX_TRAILER_SIZE;
+    mach_port_t mp;
+    kern_return_t kr;
+
+    /* Setup our environment for our children */
+    setup_env();
+    
+    /* The server must not run the PanoramiX operations. */
+    noPanoramiXExtension = TRUE;
+
+    /* Setup the initial crasherporter info */
+    strlcpy(__crashreporter_info_buff__, __crashreporter_info__base, sizeof(__crashreporter_info_buff__));
+    
+    ErrorF("X11.app: main(): argc=%d\n", argc);
+    for(i=0; i < argc; i++) {
+        ErrorF("\targv[%u] = %s\n", (unsigned)i, argv[i]);
+        if(!strcmp(argv[i], "--listenonly")) {
+            listenOnly = TRUE;
+        }
+    }
+
+    mp = checkin_or_register(server_bootstrap_name);
+    if(mp == MACH_PORT_NULL) {
+        ErrorF("NULL mach service: %s", server_bootstrap_name);
+        return EXIT_FAILURE;
+    }
+    
+    /* Check if we need to do something other than listen, and make another
+     * thread handle it.
+     */
+    if(!listenOnly) {
+        pid_t child1, child2;
+        int status;
+
+        pref_app_to_run = command_from_prefs("app_to_run", DEFAULT_CLIENT);
+        assert(pref_app_to_run);
+
+        pref_login_shell = command_from_prefs("login_shell", DEFAULT_SHELL);
+        assert(pref_login_shell);
+
+        pref_startx_script = command_from_prefs("startx_script", DEFAULT_STARTX);
+        assert(pref_startx_script);
+
+        /* Do the fork-twice trick to avoid having to reap zombies */
+        child1 = fork();
+        switch (child1) {
+            case -1:                                /* error */
+                FatalError("fork() failed: %s\n", strerror(errno));
+
+            case 0:                                 /* child1 */
+                child2 = fork();
+
+                switch (child2) {
+                    int max_files;
+
+                    case -1:                            /* error */
+                        FatalError("fork() failed: %s\n", strerror(errno));
+
+                    case 0:                             /* child2 */
+                        /* close all open files except for standard streams */
+                        max_files = sysconf(_SC_OPEN_MAX);
+                        for(i = 3; i < max_files; i++)
+                            close(i);
+
+                        /* ensure stdin is on /dev/null */
+                        close(0);
+                        open("/dev/null", O_RDONLY);
+
+                        return startup_trigger(argc, argv, envp);
+
+                    default:                            /* parent (child1) */
+                        _exit(0);
+                }
+                break;
+
+            default:                                /* parent */
+              waitpid(child1, &status, 0);
+        }
+
+        free(pref_app_to_run);
+        free(pref_login_shell);
+        free(pref_startx_script);
+    }
+    
+    /* Main event loop */
+    ErrorF("Waiting for startup parameters via Mach IPC.\n");
+    kr = mach_msg_server(mach_startup_server, mxmsgsz, mp, 0);
+    if (kr != KERN_SUCCESS) {
+        ErrorF("%s.X11(mp): %s\n", BUNDLE_ID_PREFIX, mach_error_string(kr));
+        return EXIT_FAILURE;
+    }
+    
+    return EXIT_SUCCESS;
+}
+
+static int execute(const char *command) {
+    const char *newargv[4];
+    const char **p;
+    
+    newargv[0] = pref_login_shell;
+    newargv[1] = "-c";
+    newargv[2] = command;
+    newargv[3] = NULL;
+    
+    ErrorF("X11.app: Launching %s:\n", command);
+    for(p=newargv; *p; p++) {
+        ErrorF("\targv[%ld] = %s\n", (long int)(p - newargv), *p);
+    }
+
+    execvp (newargv[0], (char * const *) newargv);
+    perror ("X11.app: Couldn't exec.");
+    return 1;
+}
+
+static char *command_from_prefs(const char *key, const char *default_value) {
+    char *command = NULL;
+    
+    CFStringRef cfKey;
+    CFPropertyListRef PlistRef;
+
+    if(!key)
+        return NULL;
+
+    cfKey = CFStringCreateWithCString(NULL, key, kCFStringEncodingASCII);
+
+    if(!cfKey)
+        return NULL;
+
+    PlistRef = CFPreferencesCopyAppValue(cfKey, kCFPreferencesCurrentApplication);
+    
+    if ((PlistRef == NULL) || (CFGetTypeID(PlistRef) != CFStringGetTypeID())) {
+        CFStringRef cfDefaultValue = CFStringCreateWithCString(NULL, default_value, kCFStringEncodingASCII);
+        int len = strlen(default_value) + 1;
+
+        if(!cfDefaultValue)
+            goto command_from_prefs_out;
+
+        CFPreferencesSetAppValue(cfKey, cfDefaultValue, kCFPreferencesCurrentApplication);
+        CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
+        CFRelease(cfDefaultValue);
+        
+        command = (char *)malloc(len * sizeof(char));
+        if(!command)
+            goto command_from_prefs_out;
+        strcpy(command, default_value);
+    } else {
+        int len = CFStringGetLength((CFStringRef)PlistRef) + 1;
+        command = (char *)malloc(len * sizeof(char));
+        if(!command)
+            goto command_from_prefs_out;
+        CFStringGetCString((CFStringRef)PlistRef, command, len,  kCFStringEncodingASCII);
+    }
+
+command_from_prefs_out:
+    if (PlistRef)
+        CFRelease(PlistRef);
+    if(cfKey)
+        CFRelease(cfKey);
+    return command;
+}
diff --git a/xorg-server/hw/xquartz/mach-startup/launchd_fd.c b/xorg-server/hw/xquartz/mach-startup/launchd_fd.c
index 67a4dadd7..8003dd177 100644
--- a/xorg-server/hw/xquartz/mach-startup/launchd_fd.c
+++ b/xorg-server/hw/xquartz/mach-startup/launchd_fd.c
@@ -1,91 +1,91 @@
-/* Copyright (c) 2008 Apple Inc.

- *

- * Permission is hereby granted, free of charge, to any person

- * obtaining a copy of this software and associated documentation files

- * (the "Software"), to deal in the Software without restriction,

- * including without limitation the rights to use, copy, modify, merge,

- * publish, distribute, sublicense, and/or sell copies of the Software,

- * and to permit persons to whom the Software is furnished to do so,

- * subject to the following conditions:

- *

- * 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 ABOVE LISTED COPYRIGHT

- * HOLDER(S) 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(s) of the above

- * copyright holders shall not be used in advertising or otherwise to

- * promote the sale, use or other dealings in this Software without

- * prior written authorization.

- */

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include <launch.h>

-#include <asl.h>

-#include <errno.h>

-

-#include "launchd_fd.h"

-

-extern aslclient aslc;

-

-int launchd_display_fd(void) {

-    launch_data_t sockets_dict, checkin_request, checkin_response;

-    launch_data_t listening_fd_array, listening_fd;

-

-    /* Get launchd fd */

-    if ((checkin_request = launch_data_new_string(LAUNCH_KEY_CHECKIN)) == NULL) {

-        asl_log(aslc, NULL, ASL_LEVEL_ERR, "launch_data_new_string(\"" LAUNCH_KEY_CHECKIN "\") Unable to create string.\n");

-        return ERROR_FD;

-    }

-    

-    if ((checkin_response = launch_msg(checkin_request)) == NULL) {

-        asl_log(aslc, NULL, ASL_LEVEL_WARNING, "launch_msg(\"" LAUNCH_KEY_CHECKIN "\") IPC failure: %s\n",strerror(errno));

-        return ERROR_FD;

-    }

-    

-    if (LAUNCH_DATA_ERRNO == launch_data_get_type(checkin_response)) {

-        // ignore EACCES, which is common if we weren't started by launchd

-        if (launch_data_get_errno(checkin_response) != EACCES)

-            asl_log(aslc, NULL, ASL_LEVEL_ERR, "launchd check-in failed: %s\n", strerror(launch_data_get_errno(checkin_response)));

-        return ERROR_FD;

-    } 

-    

-    sockets_dict = launch_data_dict_lookup(checkin_response, LAUNCH_JOBKEY_SOCKETS);

-    if (NULL == sockets_dict) {

-        asl_log(aslc, NULL, ASL_LEVEL_ERR, "launchd check-in: no sockets found to answer requests on!\n");

-        return ERROR_FD;

-    }

-    

-    if (launch_data_dict_get_count(sockets_dict) > 1) {

-        asl_log(aslc, NULL, ASL_LEVEL_ERR, "launchd check-in: some sockets will be ignored!\n");

-        return ERROR_FD;

-    }

-    

-    listening_fd_array = launch_data_dict_lookup(sockets_dict, BUNDLE_ID_PREFIX":0");

-    if (NULL == listening_fd_array) {

-        listening_fd_array = launch_data_dict_lookup(sockets_dict, ":0");

-        if (NULL == listening_fd_array) {

-            asl_log(aslc, NULL, ASL_LEVEL_ERR, "launchd check-in: No known sockets found to answer requests on! \"%s:0\" and \":0\" failed.\n", BUNDLE_ID_PREFIX);

-            return ERROR_FD;

-        }

-    }

-    

-    if (launch_data_array_get_count(listening_fd_array)!=1) {

-        asl_log(aslc, NULL, ASL_LEVEL_ERR, "launchd check-in: Expected 1 socket from launchd, got %u)\n",

-                (unsigned)launch_data_array_get_count(listening_fd_array));

-        return ERROR_FD;

-    }

-    

-    listening_fd=launch_data_array_get_index(listening_fd_array, 0);

-    return launch_data_get_fd(listening_fd);

-}

+/* Copyright (c) 2008 Apple Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * 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 ABOVE LISTED COPYRIGHT
+ * HOLDER(S) 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(s) of the above
+ * copyright holders shall not be used in advertising or otherwise to
+ * promote the sale, use or other dealings in this Software without
+ * prior written authorization.
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <launch.h>
+#include <asl.h>
+#include <errno.h>
+
+#include "launchd_fd.h"
+
+extern aslclient aslc;
+
+int launchd_display_fd(void) {
+    launch_data_t sockets_dict, checkin_request, checkin_response;
+    launch_data_t listening_fd_array, listening_fd;
+
+    /* Get launchd fd */
+    if ((checkin_request = launch_data_new_string(LAUNCH_KEY_CHECKIN)) == NULL) {
+        asl_log(aslc, NULL, ASL_LEVEL_ERR, "launch_data_new_string(\"" LAUNCH_KEY_CHECKIN "\") Unable to create string.\n");
+        return ERROR_FD;
+    }
+    
+    if ((checkin_response = launch_msg(checkin_request)) == NULL) {
+        asl_log(aslc, NULL, ASL_LEVEL_WARNING, "launch_msg(\"" LAUNCH_KEY_CHECKIN "\") IPC failure: %s\n",strerror(errno));
+        return ERROR_FD;
+    }
+    
+    if (LAUNCH_DATA_ERRNO == launch_data_get_type(checkin_response)) {
+        // ignore EACCES, which is common if we weren't started by launchd
+        if (launch_data_get_errno(checkin_response) != EACCES)
+            asl_log(aslc, NULL, ASL_LEVEL_ERR, "launchd check-in failed: %s\n", strerror(launch_data_get_errno(checkin_response)));
+        return ERROR_FD;
+    } 
+    
+    sockets_dict = launch_data_dict_lookup(checkin_response, LAUNCH_JOBKEY_SOCKETS);
+    if (NULL == sockets_dict) {
+        asl_log(aslc, NULL, ASL_LEVEL_ERR, "launchd check-in: no sockets found to answer requests on!\n");
+        return ERROR_FD;
+    }
+    
+    if (launch_data_dict_get_count(sockets_dict) > 1) {
+        asl_log(aslc, NULL, ASL_LEVEL_ERR, "launchd check-in: some sockets will be ignored!\n");
+        return ERROR_FD;
+    }
+    
+    listening_fd_array = launch_data_dict_lookup(sockets_dict, BUNDLE_ID_PREFIX":0");
+    if (NULL == listening_fd_array) {
+        listening_fd_array = launch_data_dict_lookup(sockets_dict, ":0");
+        if (NULL == listening_fd_array) {
+            asl_log(aslc, NULL, ASL_LEVEL_ERR, "launchd check-in: No known sockets found to answer requests on! \"%s:0\" and \":0\" failed.\n", BUNDLE_ID_PREFIX);
+            return ERROR_FD;
+        }
+    }
+    
+    if (launch_data_array_get_count(listening_fd_array)!=1) {
+        asl_log(aslc, NULL, ASL_LEVEL_ERR, "launchd check-in: Expected 1 socket from launchd, got %u)\n",
+                (unsigned)launch_data_array_get_count(listening_fd_array));
+        return ERROR_FD;
+    }
+    
+    listening_fd=launch_data_array_get_index(listening_fd_array, 0);
+    return launch_data_get_fd(listening_fd);
+}
diff --git a/xorg-server/hw/xquartz/mach-startup/stub.c b/xorg-server/hw/xquartz/mach-startup/stub.c
index f6dda98e9..d8e4abdd1 100644
--- a/xorg-server/hw/xquartz/mach-startup/stub.c
+++ b/xorg-server/hw/xquartz/mach-startup/stub.c
@@ -1,318 +1,318 @@
-/* Copyright (c) 2008 Apple Inc.

- *

- * Permission is hereby granted, free of charge, to any person

- * obtaining a copy of this software and associated documentation files

- * (the "Software"), to deal in the Software without restriction,

- * including without limitation the rights to use, copy, modify, merge,

- * publish, distribute, sublicense, and/or sell copies of the Software,

- * and to permit persons to whom the Software is furnished to do so,

- * subject to the following conditions:

- *

- * 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 ABOVE LISTED COPYRIGHT

- * HOLDER(S) 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(s) of the above

- * copyright holders shall not be used in advertising or otherwise to

- * promote the sale, use or other dealings in this Software without

- * prior written authorization.

- */

-

-#include <CoreServices/CoreServices.h>

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include <string.h>

-#include <unistd.h>

-#include <errno.h>

-#include <asl.h>

-

-#include <sys/socket.h>

-#include <sys/un.h>

-

-#define kX11AppBundleId BUNDLE_ID_PREFIX".X11"

-#define kX11AppBundlePath "/Contents/MacOS/X11"

-

-#include <mach/mach.h>

-#include <mach/mach_error.h>

-#include <servers/bootstrap.h>

-#include "mach_startup.h"

-

-#include <signal.h>

-

-#include <AvailabilityMacros.h>

-

-#include "launchd_fd.h"

-

-static char x11_path[PATH_MAX + 1];

-static pid_t x11app_pid = 0;

-aslclient aslc;

-

-static void set_x11_path(void) {

-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050

-

-    CFURLRef appURL = NULL;

-    OSStatus osstatus = LSFindApplicationForInfo(kLSUnknownCreator, CFSTR(kX11AppBundleId), nil, nil, &appURL);

-

-    switch (osstatus) {

-        case noErr:

-            if (appURL == NULL) {

-                asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Invalid response from LSFindApplicationForInfo(%s)", 

-                        kX11AppBundleId);

-                exit(1);

-            }

-

-            if (!CFURLGetFileSystemRepresentation(appURL, true, (unsigned char *)x11_path, sizeof(x11_path))) {

-                asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Error resolving URL for %s", kX11AppBundleId);

-                exit(3);

-            }

-

-            strlcat(x11_path, kX11AppBundlePath, sizeof(x11_path));

-            asl_log(aslc, NULL, ASL_LEVEL_INFO, "Xquartz: X11.app = %s", x11_path);

-            break;

-        case kLSApplicationNotFoundErr:

-            asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Unable to find application for %s", kX11AppBundleId);

-            exit(10);

-        default:

-            asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Unable to find application for %s, error code = %d", 

-                    kX11AppBundleId, (int)osstatus);

-            exit(11);

-    }

-#else

-    /* TODO: Make Tiger smarter... but TBH, this should never get called on Tiger... */

-    strlcpy(x11_path, "/Applications/Utilities/X11.app/Contents/MacOS/X11", sizeof(x11_path));

-#endif

-}

-

-static int connect_to_socket(const char *filename) {

-    struct sockaddr_un servaddr_un;

-    struct sockaddr *servaddr;

-    socklen_t servaddr_len;

-    int ret_fd;

-

-    /* Setup servaddr_un */

-    memset (&servaddr_un, 0, sizeof (struct sockaddr_un));

-    servaddr_un.sun_family = AF_UNIX;

-    strlcpy(servaddr_un.sun_path, filename, sizeof(servaddr_un.sun_path));

-    

-    servaddr = (struct sockaddr *) &servaddr_un;

-    servaddr_len = sizeof(struct sockaddr_un) - sizeof(servaddr_un.sun_path) + strlen(filename);

-    

-    ret_fd = socket(PF_UNIX, SOCK_STREAM, 0);

-    if(ret_fd == -1) {

-        asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Failed to create socket: %s - %s", filename, strerror(errno));

-        return -1;

-    }

-

-    if(connect(ret_fd, servaddr, servaddr_len) < 0) {

-        asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Failed to connect to socket: %s - %d - %s", filename, errno, strerror(errno));

-        close(ret_fd);

-        return -1;

-    }

-    

-    return ret_fd;

-}

-

-static void send_fd_handoff(int connected_fd, int launchd_fd) {

-    char databuf[] = "display";

-    struct iovec iov[1];

-    

-    union {

-        struct cmsghdr hdr;

-        char bytes[CMSG_SPACE(sizeof(int))];

-    } buf;

-    

-    struct msghdr msg;

-    struct cmsghdr *cmsg;

-

-    iov[0].iov_base = databuf;

-    iov[0].iov_len  = sizeof(databuf);

-

-    msg.msg_iov = iov;

-    msg.msg_iovlen = 1;

-    msg.msg_control = buf.bytes;

-    msg.msg_controllen = sizeof(buf);

-    msg.msg_name = 0;

-    msg.msg_namelen = 0;

-    msg.msg_flags = 0;

-

-    cmsg = CMSG_FIRSTHDR (&msg);

-    cmsg->cmsg_level = SOL_SOCKET;

-    cmsg->cmsg_type = SCM_RIGHTS;

-    cmsg->cmsg_len = CMSG_LEN(sizeof(int));

-

-    msg.msg_controllen = cmsg->cmsg_len;

-    

-    *((int*)CMSG_DATA(cmsg)) = launchd_fd;

-    

-    if(sendmsg(connected_fd, &msg, 0) < 0) {

-        asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Error sending $DISPLAY file descriptor over fd %d: %d -- %s", connected_fd, errno, strerror(errno));

-        return;

-    }

-

-    asl_log(aslc, NULL, ASL_LEVEL_DEBUG, "Xquartz: Message sent.  Closing handoff fd.");

-    close(connected_fd);

-}

-

-__attribute__((__noreturn__))

-static void signal_handler(int sig) {

-    if(x11app_pid)

-        kill(x11app_pid, sig);

-    _exit(0);

-}

-

-int main(int argc, char **argv, char **envp) {

-    int envpc;

-    kern_return_t kr;

-    mach_port_t mp;

-    string_array_t newenvp;

-    string_array_t newargv;

-    size_t i;

-    int launchd_fd;

-    string_t handoff_socket_filename;

-    sig_t handler;

-    char *asl_sender;

-    char *asl_facility;

-    char *server_bootstrap_name = kX11AppBundleId;

-

-    if(getenv("X11_PREFS_DOMAIN"))

-        server_bootstrap_name = getenv("X11_PREFS_DOMAIN");

-

-    asprintf(&asl_sender, "%s.stub", server_bootstrap_name);

-    assert(asl_sender);

-

-    asl_facility = strdup(server_bootstrap_name);

-    assert(asl_facility);

-    if(strcmp(asl_facility + strlen(asl_facility) - 4, ".X11") == 0)

-        asl_facility[strlen(asl_facility) - 4] = '\0';    

-

-    assert(aslc = asl_open(asl_sender, asl_facility, ASL_OPT_NO_DELAY));

-    free(asl_sender);

-    free(asl_facility);

-

-    /* We don't have a mechanism in place to handle this interrupt driven

-     * server-start notification, so just send the signal now, so xinit doesn't

-     * time out waiting for it and will just poll for the server.

-     */

-    handler = signal(SIGUSR1, SIG_IGN);

-    if(handler == SIG_IGN)

-        kill(getppid(), SIGUSR1);

-    signal(SIGUSR1, handler);

-

-    /* Pass on SIGs to X11.app */

-    signal(SIGINT, signal_handler);

-    signal(SIGTERM, signal_handler);

-    

-    /* Get the $DISPLAY FD */

-    launchd_fd = launchd_display_fd();

-

-    kr = bootstrap_look_up(bootstrap_port, server_bootstrap_name, &mp);

-    if(kr != KERN_SUCCESS) {

-        pid_t child;

-

-        asl_log(aslc, NULL, ASL_LEVEL_WARNING, "Xquartz: Unable to locate waiting server: %s", server_bootstrap_name);

-        set_x11_path();

-

-        /* This forking is ugly and will be cleaned up later */

-        child = fork();

-        if(child == -1) {

-            asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Could not fork: %s", strerror(errno));

-            return EXIT_FAILURE;

-        }

-

-        if(child == 0) {

-            char *_argv[3];

-            _argv[0] = x11_path;

-            _argv[1] = "--listenonly";

-            _argv[2] = NULL;

-            asl_log(aslc, NULL, ASL_LEVEL_NOTICE, "Xquartz: Starting X server: %s --listenonly", x11_path);

-            return execvp(x11_path, _argv);

-        }

-

-        /* Try connecting for 10 seconds */

-        for(i=0; i < 80; i++) {

-            usleep(250000);

-            kr = bootstrap_look_up(bootstrap_port, server_bootstrap_name, &mp);

-            if(kr == KERN_SUCCESS)

-                break;

-        }

-

-        if(kr != KERN_SUCCESS) {

-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050

-            asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: bootstrap_look_up(): %s", bootstrap_strerror(kr));

-#else

-            asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: bootstrap_look_up(): %ul", (unsigned long)kr);

-#endif

-            return EXIT_FAILURE;

-        }

-    }

-    

-    /* Get X11.app's pid */

-    request_pid(mp, &x11app_pid);

-

-    /* Handoff the $DISPLAY FD */

-    if(launchd_fd != -1) {

-        size_t try, try_max;

-        int handoff_fd = -1;

-

-        for(try=0, try_max=5; try < try_max; try++) {

-            if(request_fd_handoff_socket(mp, handoff_socket_filename) != KERN_SUCCESS) {

-                asl_log(aslc, NULL, ASL_LEVEL_INFO, "Xquartz: Failed to request a socket from the server to send the $DISPLAY fd over (try %d of %d)", (int)try+1, (int)try_max);

-                continue;

-            }

-

-            handoff_fd = connect_to_socket(handoff_socket_filename);

-            if(handoff_fd == -1) {

-                asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Failed to connect to socket (try %d of %d)", (int)try+1, (int)try_max);

-                continue;

-            }

-

-            asl_log(aslc, NULL, ASL_LEVEL_INFO, "Xquartz: Handoff connection established (try %d of %d) on fd %d, \"%s\".  Sending message.", (int)try+1, (int)try_max, handoff_fd, handoff_socket_filename);

-            send_fd_handoff(handoff_fd, launchd_fd);            

-            close(handoff_fd);

-            break;

-        }

-    }

-

-    /* Count envp */

-    for(envpc=0; envp[envpc]; envpc++);

-    

-    /* We have fixed-size string lengths due to limitations in IPC,

-     * so we need to copy our argv and envp.

-     */

-    newargv = (string_array_t)calloc((1 + argc), sizeof(string_t));

-    newenvp = (string_array_t)calloc((1 + envpc), sizeof(string_t));

-

-    if(!newargv || !newenvp) {

-        asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Memory allocation failure");

-        return EXIT_FAILURE;

-    }

-    

-    for(i=0; i < argc; i++) {

-        strlcpy(newargv[i], argv[i], STRING_T_SIZE);

-    }

-    for(i=0; i < envpc; i++) {

-        strlcpy(newenvp[i], envp[i], STRING_T_SIZE);

-    }

-

-    kr = start_x11_server(mp, newargv, argc, newenvp, envpc);

-

-    free(newargv);

-    free(newenvp);

-

-    if (kr != KERN_SUCCESS) {

-        asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: start_x11_server: %s", mach_error_string(kr));

-        return EXIT_FAILURE;

-    }

-    return EXIT_SUCCESS;

-}

+/* Copyright (c) 2008 Apple Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * 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 ABOVE LISTED COPYRIGHT
+ * HOLDER(S) 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(s) of the above
+ * copyright holders shall not be used in advertising or otherwise to
+ * promote the sale, use or other dealings in this Software without
+ * prior written authorization.
+ */
+
+#include <CoreServices/CoreServices.h>
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <asl.h>
+
+#include <sys/socket.h>
+#include <sys/un.h>
+
+#define kX11AppBundleId BUNDLE_ID_PREFIX".X11"
+#define kX11AppBundlePath "/Contents/MacOS/X11"
+
+#include <mach/mach.h>
+#include <mach/mach_error.h>
+#include <servers/bootstrap.h>
+#include "mach_startup.h"
+
+#include <signal.h>
+
+#include <AvailabilityMacros.h>
+
+#include "launchd_fd.h"
+
+static char x11_path[PATH_MAX + 1];
+static pid_t x11app_pid = 0;
+aslclient aslc;
+
+static void set_x11_path(void) {
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+
+    CFURLRef appURL = NULL;
+    OSStatus osstatus = LSFindApplicationForInfo(kLSUnknownCreator, CFSTR(kX11AppBundleId), nil, nil, &appURL);
+
+    switch (osstatus) {
+        case noErr:
+            if (appURL == NULL) {
+                asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Invalid response from LSFindApplicationForInfo(%s)", 
+                        kX11AppBundleId);
+                exit(1);
+            }
+
+            if (!CFURLGetFileSystemRepresentation(appURL, true, (unsigned char *)x11_path, sizeof(x11_path))) {
+                asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Error resolving URL for %s", kX11AppBundleId);
+                exit(3);
+            }
+
+            strlcat(x11_path, kX11AppBundlePath, sizeof(x11_path));
+            asl_log(aslc, NULL, ASL_LEVEL_INFO, "Xquartz: X11.app = %s", x11_path);
+            break;
+        case kLSApplicationNotFoundErr:
+            asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Unable to find application for %s", kX11AppBundleId);
+            exit(10);
+        default:
+            asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Unable to find application for %s, error code = %d", 
+                    kX11AppBundleId, (int)osstatus);
+            exit(11);
+    }
+#else
+    /* TODO: Make Tiger smarter... but TBH, this should never get called on Tiger... */
+    strlcpy(x11_path, "/Applications/Utilities/X11.app/Contents/MacOS/X11", sizeof(x11_path));
+#endif
+}
+
+static int connect_to_socket(const char *filename) {
+    struct sockaddr_un servaddr_un;
+    struct sockaddr *servaddr;
+    socklen_t servaddr_len;
+    int ret_fd;
+
+    /* Setup servaddr_un */
+    memset (&servaddr_un, 0, sizeof (struct sockaddr_un));
+    servaddr_un.sun_family = AF_UNIX;
+    strlcpy(servaddr_un.sun_path, filename, sizeof(servaddr_un.sun_path));
+    
+    servaddr = (struct sockaddr *) &servaddr_un;
+    servaddr_len = sizeof(struct sockaddr_un) - sizeof(servaddr_un.sun_path) + strlen(filename);
+    
+    ret_fd = socket(PF_UNIX, SOCK_STREAM, 0);
+    if(ret_fd == -1) {
+        asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Failed to create socket: %s - %s", filename, strerror(errno));
+        return -1;
+    }
+
+    if(connect(ret_fd, servaddr, servaddr_len) < 0) {
+        asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Failed to connect to socket: %s - %d - %s", filename, errno, strerror(errno));
+        close(ret_fd);
+        return -1;
+    }
+    
+    return ret_fd;
+}
+
+static void send_fd_handoff(int connected_fd, int launchd_fd) {
+    char databuf[] = "display";
+    struct iovec iov[1];
+    
+    union {
+        struct cmsghdr hdr;
+        char bytes[CMSG_SPACE(sizeof(int))];
+    } buf;
+    
+    struct msghdr msg;
+    struct cmsghdr *cmsg;
+
+    iov[0].iov_base = databuf;
+    iov[0].iov_len  = sizeof(databuf);
+
+    msg.msg_iov = iov;
+    msg.msg_iovlen = 1;
+    msg.msg_control = buf.bytes;
+    msg.msg_controllen = sizeof(buf);
+    msg.msg_name = 0;
+    msg.msg_namelen = 0;
+    msg.msg_flags = 0;
+
+    cmsg = CMSG_FIRSTHDR (&msg);
+    cmsg->cmsg_level = SOL_SOCKET;
+    cmsg->cmsg_type = SCM_RIGHTS;
+    cmsg->cmsg_len = CMSG_LEN(sizeof(int));
+
+    msg.msg_controllen = cmsg->cmsg_len;
+    
+    *((int*)CMSG_DATA(cmsg)) = launchd_fd;
+    
+    if(sendmsg(connected_fd, &msg, 0) < 0) {
+        asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Error sending $DISPLAY file descriptor over fd %d: %d -- %s", connected_fd, errno, strerror(errno));
+        return;
+    }
+
+    asl_log(aslc, NULL, ASL_LEVEL_DEBUG, "Xquartz: Message sent.  Closing handoff fd.");
+    close(connected_fd);
+}
+
+__attribute__((__noreturn__))
+static void signal_handler(int sig) {
+    if(x11app_pid)
+        kill(x11app_pid, sig);
+    _exit(0);
+}
+
+int main(int argc, char **argv, char **envp) {
+    int envpc;
+    kern_return_t kr;
+    mach_port_t mp;
+    string_array_t newenvp;
+    string_array_t newargv;
+    size_t i;
+    int launchd_fd;
+    string_t handoff_socket_filename;
+    sig_t handler;
+    char *asl_sender;
+    char *asl_facility;
+    char *server_bootstrap_name = kX11AppBundleId;
+
+    if(getenv("X11_PREFS_DOMAIN"))
+        server_bootstrap_name = getenv("X11_PREFS_DOMAIN");
+
+    asprintf(&asl_sender, "%s.stub", server_bootstrap_name);
+    assert(asl_sender);
+
+    asl_facility = strdup(server_bootstrap_name);
+    assert(asl_facility);
+    if(strcmp(asl_facility + strlen(asl_facility) - 4, ".X11") == 0)
+        asl_facility[strlen(asl_facility) - 4] = '\0';    
+
+    assert(aslc = asl_open(asl_sender, asl_facility, ASL_OPT_NO_DELAY));
+    free(asl_sender);
+    free(asl_facility);
+
+    /* We don't have a mechanism in place to handle this interrupt driven
+     * server-start notification, so just send the signal now, so xinit doesn't
+     * time out waiting for it and will just poll for the server.
+     */
+    handler = signal(SIGUSR1, SIG_IGN);
+    if(handler == SIG_IGN)
+        kill(getppid(), SIGUSR1);
+    signal(SIGUSR1, handler);
+
+    /* Pass on SIGs to X11.app */
+    signal(SIGINT, signal_handler);
+    signal(SIGTERM, signal_handler);
+    
+    /* Get the $DISPLAY FD */
+    launchd_fd = launchd_display_fd();
+
+    kr = bootstrap_look_up(bootstrap_port, server_bootstrap_name, &mp);
+    if(kr != KERN_SUCCESS) {
+        pid_t child;
+
+        asl_log(aslc, NULL, ASL_LEVEL_WARNING, "Xquartz: Unable to locate waiting server: %s", server_bootstrap_name);
+        set_x11_path();
+
+        /* This forking is ugly and will be cleaned up later */
+        child = fork();
+        if(child == -1) {
+            asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Could not fork: %s", strerror(errno));
+            return EXIT_FAILURE;
+        }
+
+        if(child == 0) {
+            char *_argv[3];
+            _argv[0] = x11_path;
+            _argv[1] = "--listenonly";
+            _argv[2] = NULL;
+            asl_log(aslc, NULL, ASL_LEVEL_NOTICE, "Xquartz: Starting X server: %s --listenonly", x11_path);
+            return execvp(x11_path, _argv);
+        }
+
+        /* Try connecting for 10 seconds */
+        for(i=0; i < 80; i++) {
+            usleep(250000);
+            kr = bootstrap_look_up(bootstrap_port, server_bootstrap_name, &mp);
+            if(kr == KERN_SUCCESS)
+                break;
+        }
+
+        if(kr != KERN_SUCCESS) {
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+            asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: bootstrap_look_up(): %s", bootstrap_strerror(kr));
+#else
+            asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: bootstrap_look_up(): %ul", (unsigned long)kr);
+#endif
+            return EXIT_FAILURE;
+        }
+    }
+    
+    /* Get X11.app's pid */
+    request_pid(mp, &x11app_pid);
+
+    /* Handoff the $DISPLAY FD */
+    if(launchd_fd != -1) {
+        size_t try, try_max;
+        int handoff_fd = -1;
+
+        for(try=0, try_max=5; try < try_max; try++) {
+            if(request_fd_handoff_socket(mp, handoff_socket_filename) != KERN_SUCCESS) {
+                asl_log(aslc, NULL, ASL_LEVEL_INFO, "Xquartz: Failed to request a socket from the server to send the $DISPLAY fd over (try %d of %d)", (int)try+1, (int)try_max);
+                continue;
+            }
+
+            handoff_fd = connect_to_socket(handoff_socket_filename);
+            if(handoff_fd == -1) {
+                asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Failed to connect to socket (try %d of %d)", (int)try+1, (int)try_max);
+                continue;
+            }
+
+            asl_log(aslc, NULL, ASL_LEVEL_INFO, "Xquartz: Handoff connection established (try %d of %d) on fd %d, \"%s\".  Sending message.", (int)try+1, (int)try_max, handoff_fd, handoff_socket_filename);
+            send_fd_handoff(handoff_fd, launchd_fd);            
+            close(handoff_fd);
+            break;
+        }
+    }
+
+    /* Count envp */
+    for(envpc=0; envp[envpc]; envpc++);
+    
+    /* We have fixed-size string lengths due to limitations in IPC,
+     * so we need to copy our argv and envp.
+     */
+    newargv = (string_array_t)calloc((1 + argc), sizeof(string_t));
+    newenvp = (string_array_t)calloc((1 + envpc), sizeof(string_t));
+
+    if(!newargv || !newenvp) {
+        asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Memory allocation failure");
+        return EXIT_FAILURE;
+    }
+    
+    for(i=0; i < argc; i++) {
+        strlcpy(newargv[i], argv[i], STRING_T_SIZE);
+    }
+    for(i=0; i < envpc; i++) {
+        strlcpy(newenvp[i], envp[i], STRING_T_SIZE);
+    }
+
+    kr = start_x11_server(mp, newargv, argc, newenvp, envpc);
+
+    free(newargv);
+    free(newenvp);
+
+    if (kr != KERN_SUCCESS) {
+        asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: start_x11_server: %s", mach_error_string(kr));
+        return EXIT_FAILURE;
+    }
+    return EXIT_SUCCESS;
+}
diff --git a/xorg-server/hw/xquartz/man/Xquartz.man b/xorg-server/hw/xquartz/man/Xquartz.man
index cf4edcd20..0ea6e6eb8 100644
--- a/xorg-server/hw/xquartz/man/Xquartz.man
+++ b/xorg-server/hw/xquartz/man/Xquartz.man
@@ -1,192 +1,192 @@
-.TH XQUARTZ 1 __vendorversion__

-.SH NAME

-Xquartz \- X window system server for Mac OSX

-.SH SYNOPSIS

-.B Xquartz

-[ options ] ...

-.SH DESCRIPTION

-.I Xquartz

-is the X window server for Mac OS X provided by Apple.

-.I Xquartz

-runs in parallel with Aqua in rootless mode. In rootless mode, the X

-window system and Mac OS X share your display.  The root window of the

-X11 display is the size of the screen and contains all the other

-windows. The X11 root window is not displayed in rootless mode as Mac

-OS X handles the desktop background.

-.SH CUSTOMIZATION

-\fIXquartz\fP can be customized using the defaults(1) command. The available options are:

-.TP 8

-.B defaults write __bundle_id_prefix__.X11 enable_fake_buttons -boolean true

-Emulates a 3 button mouse using modifier keys. By default, the Command modifier

-is used to emulate button 2 and Option is used for button 3. Thus, clicking the

-first mouse button while holding down Command will act like clicking

-button 2. Holding down Option will simulate button 3.

-.TP 8

-.B defaults write __bundle_id_prefix__.X11 fake_button2 \fImodifiers\fP

-Change the modifier keys used to emulate the second mouse button. By default,

-Command is used to emulate the second button. Any combination of the following

-modifier names may be used: {l,r,}shift, {l,r,}option, {l,r,}control, {l,r,}command, fn

-.TP 8

-.B defaults write __bundle_id_prefix__.X11 fake_button3 \fImodifiers\fP

-Change the modifier keys used to emulate the second mouse button. By default,

-Command is used to emulate the second button. Any combination of the following

-modifier names may be used: {l,r,}shift, {l,r,}option, {l,r,}control, {l,r,}command, fn

-.TP 8

-.B defaults write __bundle_id_prefix__.X11 fullscreen_hotkeys -boolean true

-Enable OSX hotkeys while in fullscreen

-.TP 8

-.B defaults write __bundle_id_prefix__.X11 fullscreen_menu -boolean true

-Show the OSX menu while in fullscreen

-.TP 8

-.B defaults write __bundle_id_prefix__.X11 no_quit_alert -boolean true

-Disables the alert dialog displayed when attempting to quit X11.

-.TP 8

-.B defaults write __bundle_id_prefix__.X11 no_auth -boolean true

-Stops the X server requiring that clients authenticate themselves when

-connecting.  See Xsecurity(__miscmansuffix__).

-.TP 8

-.B defaults write __bundle_id_prefix__.X11 nolisten_tcp -boolean false

-This will tell the server to listen and accept TCP connections.  Doing this without enabling

-xauth is a possible security concern.  See Xsecurity(__miscmansuffix__).

-.TP 8

-.B defaults write __bundle_id_prefix__.X11 enable_system_beep -boolean false

-Don't use the standard system beep effect for X11 alerts.

-.TP 8

-.B defaults write __bundle_id_prefix__.X11 enable_key_equivalents -boolean false

-Disable menu keyboard equivalents while X11 windows are focused.

-.TP 8

-.B defaults write __bundle_id_prefix__.X11 depth \fIdepth\fP

-Specifies the color bit depth to use. Currently only 15, and 24 color

-bits per pixel are supported. If not specified, or a value of -1 is specified,

-defaults to the depth of the main display.

-.TP 8

-.B defaults write __bundle_id_prefix__.X11 sync_keymap -boolean true

-Keep the X11 keymap up to date with the OSX system keymap.

-.TP 8

-.B defaults write __bundle_id_prefix__.X11 option_sends_alt -boolean true

-The Option key will send Alt_L and Alt_R instead of Mode_switch.

-.TP 8

-.B defaults write __bundle_id_prefix__.X11 sync_pasteboard -boolean true

-Enable syncing between the OSX pasteboard and clipboard/primary selection buffers in X11.  This option needs to be true for any of the other pasteboard sync options to have an effect.

-.TP 8

-.B defaults write __bundle_id_prefix__.X11 sync_pasteboard_to_clipboard -boolean true

-Update the X11 CLIPBOARD when the OSX NSPasteboard is updated.

-.TP 8

-.B defaults write __bundle_id_prefix__.X11 sync_pasteboard_to_primary -boolean true

-Update the the X11 PRIMARY buffer when the OSX NSPasteboard is updated.

-.TP 8

-.B defaults write __bundle_id_prefix__.X11 sync_clipboard_to_pasteboard -boolean true

-Update the the OSX NSPasteboard when the X11 CLIPBOARD is updated.  Note that enabling this option causes the clipboard synchronization to act as a clipboard manager in X11.  This makes it impossible to use xclipboard, klipper, or any other such clipboard managers.  If you want to use any of these programs, you must disable this option.

-.TP 8

-.B defaults write __bundle_id_prefix__.X11 sync_primary_on_select -boolean true

-This option defaults to false and is provided only "for experts."  It updates the NSPasteboard whenever a new X11 selection is made (rather than requiring you to hit cmd-c to copy the selection to the NSPasteboard).  Since the X11 protocol does not require applications to send notification when they change selection, this might not work in all cases (if you run into this problem, try selecting text in another application first, then selecting the text you want).

-.TP 8

-.B defaults write __bundle_id_prefix__.X11 enable_test_extensions -boolean true

-This option defaults to false and is only accessible through the command line.  Enable this option to turn on the DEC-XTRAP, RECORD, and XTEST extensions in the server.

-.TP 8

-.B defaults write __laucnd_id_prefix__.X11 scroll_in_device_direction -boolean true

-This option defaults to false.  Enable this option to ensure that X11 scroll events are always in the direction of the device.  This overrides the related option in the Mouse/Trackpad section of System Preferences.

-.SH OPTIONS

-.PP

-In addition to the normal server options described in the \fIXserver(1)\fP

-manual page, \fIXquartz\fP accepts the following command line switches:

-.TP 8

-.B \-fakebuttons

-Same as enable_fake_buttons above with value true.

-.TP 8

-.B \-nofakebuttons

-Same as enable_fake_buttons above with value false.

-.TP 8

-.B "\-fakemouse2 \fImodifiers\fP"

-Same as fake_button2 above.

-.TP 8

-.B "\-fakemouse3 \fImodifiers\fP"

-Same as fake_button3 above.

-.TP 8

-.B "\-depth \fIdepth\fP"

-Same as depth above.

-.SH LOGGING

-XQuartz stores a server log at ~/Library/Logs/X11.__bundle_id_prefix__.log which

-is analogous to /var/log/Xorg.#.log on systems that use the XFree86 DDX such as

-Linux, BSD, and Solaris.

-.PP

-In addition to this server log, XQuartz sends messages to syslogd(8) using

-asl(3).  These logs are sent to the __bundle_id_prefix__ facility, and you can

-watch these logs using the following syslog(1) command:

-.TP 8

-.B $ syslog -w -k Facility eq __bundle_id_prefix__

-.PP

-or you can include extra information such as the file, line, and function where the message originated:

-.TP 8

-.B $ syslog -w -F '$(Time) $(Sender) <$(Level)> $(File):$(Line) $(Function) :: $(Message)' -k Facility eq __bundle_id_prefix__

-.PP

-By default, XQaurtz sets an ASL mask which prevents it from logging messages

-below the ASL_LEVEL_WARNING level (meaning almost all logging is done strictly

-to the file referenced above).  To force XQuartz to send all log messages to

-syslogd(8), you can adjust this mask using the following syslog(1) command:

-.TP 8

-.B $ syslog -c X11.bin -d

-.PP

-The stdout and stderr messages printed by any process launched by XQuartz will

-be redirected to this syslog facility with a priority level of ASL_LEVEL_INFO

-and ASL_LEVEL_NOTICE respectively.  In order to see these messages in syslog,

-you will need to adjust XQuartz's asl mask as above but using -i or -n

-instead of -d.

-.SH "SEE ALSO"

-.PP

-X(__miscmansuffix__), Xserver(1), xdm(1), xinit(1), syslog(1), syslogd(8)

-.PP

-http://xquartz.macosforge.org

-.PP

-.SH AUTHORS / HISTORY

-X11 was originally ported to Mac OS X Server by John Carmack.  Dave

-Zarzycki used this as the basis of his port of XFree86 4.0 to Darwin 1.0.

-Torrey T. Lyons improved and integrated this code into the XFree86

-Project's mainline for the 4.0.2 release.

-.PP

-The following members of the XonX Team contributed to the following

-releases (in alphabetical order):

-.TP 4

-XFree86 4.1.0:

-.br

-Rob Braun - Darwin x86 support

-.br

-Torrey T. Lyons - Project Lead

-.br

-Andreas Monitzer - Cocoa version of XDarwin front end

-.br

-Gregory Robert Parker - Original Quartz implementation

-.br

-Christoph Pfisterer - Dynamic shared X libraries

-.br

-Toshimitsu Tanaka - Japanese localization

-.TP 4

-XFree86 4.2.0:

-.br

-Rob Braun - Darwin x86 support

-.br

-Pablo Di Noto - Spanish localization

-.br

-Paul Edens - Dutch localization

-.br

-Kyunghwan Kim - Korean localization

-.br

-Mario Klebsch - Non-US keyboard support

-.br

-Torrey T. Lyons - Project Lead

-.br

-Andreas Monitzer - German localization

-.br

-Patrik Montgomery - Swedish localization

-.br

-Greg Parker - Rootless support

-.br

-Toshimitsu Tanaka - Japanese localization

-.br

-Olivier Verdier - French localization

-.PP

-Code from Apple's X11.app (which was based on XFree86 4.1) was integrated into X.org's XDarwin DDX by Ben Byer for xorg-server-1.2.

-The XDarwin DDX was renamed Xquartz to more accurately reflect its state (the pure-darwin backend was removed).

-Jeremy Huddleston took over as project lead and brought the project up to the X.org 1.4 server branch.

-.PP

-Jeremy Huddleston <jeremyhu@apple.com> is the current maintainer.

+.TH XQUARTZ 1 __vendorversion__
+.SH NAME
+Xquartz \- X window system server for Mac OSX
+.SH SYNOPSIS
+.B Xquartz
+[ options ] ...
+.SH DESCRIPTION
+.I Xquartz
+is the X window server for Mac OS X provided by Apple.
+.I Xquartz
+runs in parallel with Aqua in rootless mode. In rootless mode, the X
+window system and Mac OS X share your display.  The root window of the
+X11 display is the size of the screen and contains all the other
+windows. The X11 root window is not displayed in rootless mode as Mac
+OS X handles the desktop background.
+.SH CUSTOMIZATION
+\fIXquartz\fP can be customized using the defaults(1) command. The available options are:
+.TP 8
+.B defaults write __bundle_id_prefix__.X11 enable_fake_buttons -boolean true
+Emulates a 3 button mouse using modifier keys. By default, the Command modifier
+is used to emulate button 2 and Option is used for button 3. Thus, clicking the
+first mouse button while holding down Command will act like clicking
+button 2. Holding down Option will simulate button 3.
+.TP 8
+.B defaults write __bundle_id_prefix__.X11 fake_button2 \fImodifiers\fP
+Change the modifier keys used to emulate the second mouse button. By default,
+Command is used to emulate the second button. Any combination of the following
+modifier names may be used: {l,r,}shift, {l,r,}option, {l,r,}control, {l,r,}command, fn
+.TP 8
+.B defaults write __bundle_id_prefix__.X11 fake_button3 \fImodifiers\fP
+Change the modifier keys used to emulate the second mouse button. By default,
+Command is used to emulate the second button. Any combination of the following
+modifier names may be used: {l,r,}shift, {l,r,}option, {l,r,}control, {l,r,}command, fn
+.TP 8
+.B defaults write __bundle_id_prefix__.X11 fullscreen_hotkeys -boolean true
+Enable OSX hotkeys while in fullscreen
+.TP 8
+.B defaults write __bundle_id_prefix__.X11 fullscreen_menu -boolean true
+Show the OSX menu while in fullscreen
+.TP 8
+.B defaults write __bundle_id_prefix__.X11 no_quit_alert -boolean true
+Disables the alert dialog displayed when attempting to quit X11.
+.TP 8
+.B defaults write __bundle_id_prefix__.X11 no_auth -boolean true
+Stops the X server requiring that clients authenticate themselves when
+connecting.  See Xsecurity(__miscmansuffix__).
+.TP 8
+.B defaults write __bundle_id_prefix__.X11 nolisten_tcp -boolean false
+This will tell the server to listen and accept TCP connections.  Doing this without enabling
+xauth is a possible security concern.  See Xsecurity(__miscmansuffix__).
+.TP 8
+.B defaults write __bundle_id_prefix__.X11 enable_system_beep -boolean false
+Don't use the standard system beep effect for X11 alerts.
+.TP 8
+.B defaults write __bundle_id_prefix__.X11 enable_key_equivalents -boolean false
+Disable menu keyboard equivalents while X11 windows are focused.
+.TP 8
+.B defaults write __bundle_id_prefix__.X11 depth \fIdepth\fP
+Specifies the color bit depth to use. Currently only 15, and 24 color
+bits per pixel are supported. If not specified, or a value of -1 is specified,
+defaults to the depth of the main display.
+.TP 8
+.B defaults write __bundle_id_prefix__.X11 sync_keymap -boolean true
+Keep the X11 keymap up to date with the OSX system keymap.
+.TP 8
+.B defaults write __bundle_id_prefix__.X11 option_sends_alt -boolean true
+The Option key will send Alt_L and Alt_R instead of Mode_switch.
+.TP 8
+.B defaults write __bundle_id_prefix__.X11 sync_pasteboard -boolean true
+Enable syncing between the OSX pasteboard and clipboard/primary selection buffers in X11.  This option needs to be true for any of the other pasteboard sync options to have an effect.
+.TP 8
+.B defaults write __bundle_id_prefix__.X11 sync_pasteboard_to_clipboard -boolean true
+Update the X11 CLIPBOARD when the OSX NSPasteboard is updated.
+.TP 8
+.B defaults write __bundle_id_prefix__.X11 sync_pasteboard_to_primary -boolean true
+Update the the X11 PRIMARY buffer when the OSX NSPasteboard is updated.
+.TP 8
+.B defaults write __bundle_id_prefix__.X11 sync_clipboard_to_pasteboard -boolean true
+Update the the OSX NSPasteboard when the X11 CLIPBOARD is updated.  Note that enabling this option causes the clipboard synchronization to act as a clipboard manager in X11.  This makes it impossible to use xclipboard, klipper, or any other such clipboard managers.  If you want to use any of these programs, you must disable this option.
+.TP 8
+.B defaults write __bundle_id_prefix__.X11 sync_primary_on_select -boolean true
+This option defaults to false and is provided only "for experts."  It updates the NSPasteboard whenever a new X11 selection is made (rather than requiring you to hit cmd-c to copy the selection to the NSPasteboard).  Since the X11 protocol does not require applications to send notification when they change selection, this might not work in all cases (if you run into this problem, try selecting text in another application first, then selecting the text you want).
+.TP 8
+.B defaults write __bundle_id_prefix__.X11 enable_test_extensions -boolean true
+This option defaults to false and is only accessible through the command line.  Enable this option to turn on the DEC-XTRAP, RECORD, and XTEST extensions in the server.
+.TP 8
+.B defaults write __laucnd_id_prefix__.X11 scroll_in_device_direction -boolean true
+This option defaults to false.  Enable this option to ensure that X11 scroll events are always in the direction of the device.  This overrides the related option in the Mouse/Trackpad section of System Preferences.
+.SH OPTIONS
+.PP
+In addition to the normal server options described in the \fIXserver(1)\fP
+manual page, \fIXquartz\fP accepts the following command line switches:
+.TP 8
+.B \-fakebuttons
+Same as enable_fake_buttons above with value true.
+.TP 8
+.B \-nofakebuttons
+Same as enable_fake_buttons above with value false.
+.TP 8
+.B "\-fakemouse2 \fImodifiers\fP"
+Same as fake_button2 above.
+.TP 8
+.B "\-fakemouse3 \fImodifiers\fP"
+Same as fake_button3 above.
+.TP 8
+.B "\-depth \fIdepth\fP"
+Same as depth above.
+.SH LOGGING
+XQuartz stores a server log at ~/Library/Logs/X11.__bundle_id_prefix__.log which
+is analogous to /var/log/Xorg.#.log on systems that use the XFree86 DDX such as
+Linux, BSD, and Solaris.
+.PP
+In addition to this server log, XQuartz sends messages to syslogd(8) using
+asl(3).  These logs are sent to the __bundle_id_prefix__ facility, and you can
+watch these logs using the following syslog(1) command:
+.TP 8
+.B $ syslog -w -k Facility eq __bundle_id_prefix__
+.PP
+or you can include extra information such as the file, line, and function where the message originated:
+.TP 8
+.B $ syslog -w -F '$(Time) $(Sender) <$(Level)> $(File):$(Line) $(Function) :: $(Message)' -k Facility eq __bundle_id_prefix__
+.PP
+By default, XQaurtz sets an ASL mask which prevents it from logging messages
+below the ASL_LEVEL_WARNING level (meaning almost all logging is done strictly
+to the file referenced above).  To force XQuartz to send all log messages to
+syslogd(8), you can adjust this mask using the following syslog(1) command:
+.TP 8
+.B $ syslog -c X11.bin -d
+.PP
+The stdout and stderr messages printed by any process launched by XQuartz will
+be redirected to this syslog facility with a priority level of ASL_LEVEL_INFO
+and ASL_LEVEL_NOTICE respectively.  In order to see these messages in syslog,
+you will need to adjust XQuartz's asl mask as above but using -i or -n
+instead of -d.
+.SH "SEE ALSO"
+.PP
+X(__miscmansuffix__), Xserver(1), xdm(1), xinit(1), syslog(1), syslogd(8)
+.PP
+http://xquartz.macosforge.org
+.PP
+.SH AUTHORS / HISTORY
+X11 was originally ported to Mac OS X Server by John Carmack.  Dave
+Zarzycki used this as the basis of his port of XFree86 4.0 to Darwin 1.0.
+Torrey T. Lyons improved and integrated this code into the XFree86
+Project's mainline for the 4.0.2 release.
+.PP
+The following members of the XonX Team contributed to the following
+releases (in alphabetical order):
+.TP 4
+XFree86 4.1.0:
+.br
+Rob Braun - Darwin x86 support
+.br
+Torrey T. Lyons - Project Lead
+.br
+Andreas Monitzer - Cocoa version of XDarwin front end
+.br
+Gregory Robert Parker - Original Quartz implementation
+.br
+Christoph Pfisterer - Dynamic shared X libraries
+.br
+Toshimitsu Tanaka - Japanese localization
+.TP 4
+XFree86 4.2.0:
+.br
+Rob Braun - Darwin x86 support
+.br
+Pablo Di Noto - Spanish localization
+.br
+Paul Edens - Dutch localization
+.br
+Kyunghwan Kim - Korean localization
+.br
+Mario Klebsch - Non-US keyboard support
+.br
+Torrey T. Lyons - Project Lead
+.br
+Andreas Monitzer - German localization
+.br
+Patrik Montgomery - Swedish localization
+.br
+Greg Parker - Rootless support
+.br
+Toshimitsu Tanaka - Japanese localization
+.br
+Olivier Verdier - French localization
+.PP
+Code from Apple's X11.app (which was based on XFree86 4.1) was integrated into X.org's XDarwin DDX by Ben Byer for xorg-server-1.2.
+The XDarwin DDX was renamed Xquartz to more accurately reflect its state (the pure-darwin backend was removed).
+Jeremy Huddleston took over as project lead and brought the project up to the X.org 1.4 server branch.
+.PP
+Jeremy Huddleston <jeremyhu@apple.com> is the current maintainer.
diff --git a/xorg-server/hw/xquartz/pbproxy/Makefile.am b/xorg-server/hw/xquartz/pbproxy/Makefile.am
index e3782ac61..b8b95d232 100644
--- a/xorg-server/hw/xquartz/pbproxy/Makefile.am
+++ b/xorg-server/hw/xquartz/pbproxy/Makefile.am
@@ -1,28 +1,28 @@
-AM_CPPFLAGS=-F/System/Library/Frameworks/ApplicationServices.framework/Frameworks \

-	-DBUNDLE_ID_PREFIX=\"$(BUNDLE_ID_PREFIX)\"

-

-AM_CFLAGS=$(XPBPROXY_CFLAGS) 

-

-noinst_LTLIBRARIES = libxpbproxy.la

-libxpbproxy_la_SOURCES = \

-	trick_autotools.c \

-	main.m \

-	x-input.m \

-	x-selection.m

-

-libxpbproxy_la_LDFLAGS=$(XPBPROXY_LIBS)

-

-if STANDALONE_XPBPROXY

-

-bin_PROGRAMS = xpbproxy

-xpbproxy_SOURCES = app-main.m

-xpbproxy_LDADD = libxpbproxy.la

-xpbproxy_LDFLAGS = -Wl,-framework,Cocoa

-

-AM_CPPFLAGS += -DSTANDALONE_XPBPROXY

-

-endif

-

-EXTRA_DIST = \

-	pbproxy.h \

-	x-selection.h

+AM_CPPFLAGS=-F/System/Library/Frameworks/ApplicationServices.framework/Frameworks \
+	-DBUNDLE_ID_PREFIX=\"$(BUNDLE_ID_PREFIX)\"
+
+AM_CFLAGS=$(XPBPROXY_CFLAGS) 
+
+noinst_LTLIBRARIES = libxpbproxy.la
+libxpbproxy_la_SOURCES = \
+	trick_autotools.c \
+	main.m \
+	x-input.m \
+	x-selection.m
+
+libxpbproxy_la_LDFLAGS=$(XPBPROXY_LIBS)
+
+if STANDALONE_XPBPROXY
+
+bin_PROGRAMS = xpbproxy
+xpbproxy_SOURCES = app-main.m
+xpbproxy_LDADD = libxpbproxy.la
+xpbproxy_LDFLAGS = -Wl,-framework,Cocoa
+
+AM_CPPFLAGS += -DSTANDALONE_XPBPROXY
+
+endif
+
+EXTRA_DIST = \
+	pbproxy.h \
+	x-selection.h
diff --git a/xorg-server/hw/xquartz/pbproxy/app-main.m b/xorg-server/hw/xquartz/pbproxy/app-main.m
index 5758a33a7..772c458a1 100644
--- a/xorg-server/hw/xquartz/pbproxy/app-main.m
+++ b/xorg-server/hw/xquartz/pbproxy/app-main.m
@@ -1,114 +1,114 @@
-/* app-main.m

-   Copyright (c) 2002, 2008 Apple Computer, Inc. All rights reserved.

-

-   Permission is hereby granted, free of charge, to any person

-   obtaining a copy of this software and associated documentation files

-   (the "Software"), to deal in the Software without restriction,

-   including without limitation the rights to use, copy, modify, merge,

-   publish, distribute, sublicense, and/or sell copies of the Software,

-   and to permit persons to whom the Software is furnished to do so,

-   subject to the following conditions:

-

-   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 ABOVE LISTED COPYRIGHT

-   HOLDER(S) 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(s) of the above

-   copyright holders shall not be used in advertising or otherwise to

-   promote the sale, use or other dealings in this Software without

-   prior written authorization.

- */

-

-#include "pbproxy.h"

-#import "x-selection.h"

-

-#include <pthread.h>

-#include <unistd.h> /*for getpid*/

-#include <Cocoa/Cocoa.h>

-

-static const char *app_prefs_domain = 	BUNDLE_ID_PREFIX".xpbproxy";

-CFStringRef app_prefs_domain_cfstr;

-

-/* Stubs */

-char *display = NULL;

-BOOL serverRunning = YES;

-pthread_mutex_t serverRunningMutex = PTHREAD_MUTEX_INITIALIZER;

-pthread_cond_t serverRunningCond = PTHREAD_COND_INITIALIZER;

-

-static void signal_handler (int sig) {

-    switch(sig) {

-        case SIGHUP:

-            xpbproxy_prefs_reload = YES;

-            break;

-        default:

-            _exit(EXIT_SUCCESS);

-    }

-}

-

-void

-ErrorF(const char * f, ...)

-{

-    va_list args;

-

-    va_start(args, f);

-    vfprintf(stderr, f, args);

-    va_end(args);

-}

-

-/* TODO: Have this actually log to ASL */

-void xq_asl_log (int level, const char *subsystem, const char *file, const char *function, int line, const char *fmt, ...) {

-#ifdef DEBUG

-    va_list args;

-

-    va_start(args, fmt);

-    vfprintf(stderr, fmt, args);

-    va_end(args);

-#endif

-}

-

-int main (int argc, const char *argv[]) {

-    const char *s;

-    int i;

-

-#ifdef DEBUG

-    ErrorF("pid: %u\n", getpid());

-#endif

-

-    xpbproxy_is_standalone = YES;

-

-    if((s = getenv("X11_PREFS_DOMAIN")))

-        app_prefs_domain = s;

-

-    for (i = 1; i < argc; i++) {

-        if(strcmp (argv[i], "--prefs-domain") == 0 && i+1 < argc) {

-            app_prefs_domain = argv[++i];

-        } else if (strcmp (argv[i], "--help") == 0) {

-            ErrorF("usage: xpbproxy OPTIONS\n"

-                   "Pasteboard proxying for X11.\n\n"

-                   "--prefs-domain <domain>   Change the domain used for reading preferences\n"

-                   "                          (default: %s)\n", app_prefs_domain);

-            return 0;

-        } else {

-            ErrorF("usage: xpbproxy OPTIONS...\n"

-                    "Try 'xpbproxy --help' for more information.\n");

-            return 1;

-        }

-    }

-    

-    app_prefs_domain_cfstr = CFStringCreateWithCString(NULL, app_prefs_domain, kCFStringEncodingUTF8);

-    

-    signal (SIGINT, signal_handler);

-    signal (SIGTERM, signal_handler);

-    signal (SIGHUP, signal_handler);

-    signal (SIGPIPE, SIG_IGN);

-

-    return xpbproxy_run();

-}

+/* app-main.m
+   Copyright (c) 2002, 2008 Apple Computer, Inc. All rights reserved.
+
+   Permission is hereby granted, free of charge, to any person
+   obtaining a copy of this software and associated documentation files
+   (the "Software"), to deal in the Software without restriction,
+   including without limitation the rights to use, copy, modify, merge,
+   publish, distribute, sublicense, and/or sell copies of the Software,
+   and to permit persons to whom the Software is furnished to do so,
+   subject to the following conditions:
+
+   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 ABOVE LISTED COPYRIGHT
+   HOLDER(S) 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(s) of the above
+   copyright holders shall not be used in advertising or otherwise to
+   promote the sale, use or other dealings in this Software without
+   prior written authorization.
+ */
+
+#include "pbproxy.h"
+#import "x-selection.h"
+
+#include <pthread.h>
+#include <unistd.h> /*for getpid*/
+#include <Cocoa/Cocoa.h>
+
+static const char *app_prefs_domain = 	BUNDLE_ID_PREFIX".xpbproxy";
+CFStringRef app_prefs_domain_cfstr;
+
+/* Stubs */
+char *display = NULL;
+BOOL serverRunning = YES;
+pthread_mutex_t serverRunningMutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_cond_t serverRunningCond = PTHREAD_COND_INITIALIZER;
+
+static void signal_handler (int sig) {
+    switch(sig) {
+        case SIGHUP:
+            xpbproxy_prefs_reload = YES;
+            break;
+        default:
+            _exit(EXIT_SUCCESS);
+    }
+}
+
+void
+ErrorF(const char * f, ...)
+{
+    va_list args;
+
+    va_start(args, f);
+    vfprintf(stderr, f, args);
+    va_end(args);
+}
+
+/* TODO: Have this actually log to ASL */
+void xq_asl_log (int level, const char *subsystem, const char *file, const char *function, int line, const char *fmt, ...) {
+#ifdef DEBUG
+    va_list args;
+
+    va_start(args, fmt);
+    vfprintf(stderr, fmt, args);
+    va_end(args);
+#endif
+}
+
+int main (int argc, const char *argv[]) {
+    const char *s;
+    int i;
+
+#ifdef DEBUG
+    ErrorF("pid: %u\n", getpid());
+#endif
+
+    xpbproxy_is_standalone = YES;
+
+    if((s = getenv("X11_PREFS_DOMAIN")))
+        app_prefs_domain = s;
+
+    for (i = 1; i < argc; i++) {
+        if(strcmp (argv[i], "--prefs-domain") == 0 && i+1 < argc) {
+            app_prefs_domain = argv[++i];
+        } else if (strcmp (argv[i], "--help") == 0) {
+            ErrorF("usage: xpbproxy OPTIONS\n"
+                   "Pasteboard proxying for X11.\n\n"
+                   "--prefs-domain <domain>   Change the domain used for reading preferences\n"
+                   "                          (default: %s)\n", app_prefs_domain);
+            return 0;
+        } else {
+            ErrorF("usage: xpbproxy OPTIONS...\n"
+                    "Try 'xpbproxy --help' for more information.\n");
+            return 1;
+        }
+    }
+    
+    app_prefs_domain_cfstr = CFStringCreateWithCString(NULL, app_prefs_domain, kCFStringEncodingUTF8);
+    
+    signal (SIGINT, signal_handler);
+    signal (SIGTERM, signal_handler);
+    signal (SIGHUP, signal_handler);
+    signal (SIGPIPE, SIG_IGN);
+
+    return xpbproxy_run();
+}
diff --git a/xorg-server/hw/xquartz/pbproxy/main.m b/xorg-server/hw/xquartz/pbproxy/main.m
index f8450587e..29ce83b35 100644
--- a/xorg-server/hw/xquartz/pbproxy/main.m
+++ b/xorg-server/hw/xquartz/pbproxy/main.m
@@ -1,149 +1,149 @@
-/* main.m

-   Copyright (c) 2002, 2008 Apple Computer, Inc. All rights reserved.

-

-   Permission is hereby granted, free of charge, to any person

-   obtaining a copy of this software and associated documentation files

-   (the "Software"), to deal in the Software without restriction,

-   including without limitation the rights to use, copy, modify, merge,

-   publish, distribute, sublicense, and/or sell copies of the Software,

-   and to permit persons to whom the Software is furnished to do so,

-   subject to the following conditions:

-

-   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 ABOVE LISTED COPYRIGHT

-   HOLDER(S) 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(s) of the above

-   copyright holders shall not be used in advertising or otherwise to

-   promote the sale, use or other dealings in this Software without

-   prior written authorization.

- */

-

-#include "pbproxy.h"

-#import "x-selection.h"

-

-#include <pthread.h>

-#include <unistd.h>

-#include <X11/extensions/applewm.h>

-

-Display *xpbproxy_dpy;

-int xpbproxy_apple_wm_event_base, xpbproxy_apple_wm_error_base;

-int xpbproxy_xfixes_event_base, xpbproxy_xfixes_error_base;

-BOOL xpbproxy_have_xfixes;

-

-extern char *display;

-

-#ifdef STANDALONE_XPBPROXY

-BOOL xpbproxy_is_standalone = NO;

-#endif

-

-x_selection *_selection_object;

-

-extern BOOL serverRunning;

-extern pthread_mutex_t serverRunningMutex;

-extern pthread_cond_t serverRunningCond;

-

-static inline void wait_for_server_init(void) {

-    /* If the server hasn't finished initializing, wait for it... */

-    if(!serverRunning) {

-        pthread_mutex_lock(&serverRunningMutex);

-        while(!serverRunning)

-            pthread_cond_wait(&serverRunningCond, &serverRunningMutex);

-        pthread_mutex_unlock(&serverRunningMutex);

-    }

-}

-

-static int x_io_error_handler (Display *dpy) {

-    /* We lost our connection to the server. */

-    

-    TRACE ();

-

-    /* trigger the thread to restart?

-     *   NO - this would be to a "deeper" problem, and restarts would just

-     *        make things worse...

-     */

-#ifdef STANDALONE_XPBPROXY

-    if(xpbproxy_is_standalone)

-        exit(EXIT_FAILURE);

-#endif

-

-    /* Prevent _XIOError from calling exit() */

-    pthread_exit(NULL);

-    return 0;

-}

-

-static int x_error_handler (Display *dpy, XErrorEvent *errevent) {

-    return 0;

-}

-

-int xpbproxy_run (void) {

-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];

-    size_t i;

-    

-    wait_for_server_init();

-    

-    for(i=0, xpbproxy_dpy=NULL; !xpbproxy_dpy && i<5; i++) {

-        xpbproxy_dpy = XOpenDisplay(NULL);

-        

-        if(!xpbproxy_dpy && display) {

-            char _display[32];

-            snprintf(_display, sizeof(_display), ":%s", display);

-            setenv("DISPLAY", _display, TRUE);

-            

-            xpbproxy_dpy=XOpenDisplay(_display);

-        }

-        if(!xpbproxy_dpy)

-            sleep(1);

-    }

-    

-    if (xpbproxy_dpy == NULL) {

-        ErrorF("xpbproxy: can't open default display\n");

-        [pool release];

-        return EXIT_FAILURE;

-    }

-    

-    XSetIOErrorHandler (x_io_error_handler);

-    XSetErrorHandler (x_error_handler);

-    

-    if (!XAppleWMQueryExtension (xpbproxy_dpy, &xpbproxy_apple_wm_event_base,

-                                 &xpbproxy_apple_wm_error_base)) {

-        ErrorF("xpbproxy: can't open AppleWM server extension\n");

-        [pool release];

-        return EXIT_FAILURE;

-    }

-

-    xpbproxy_have_xfixes = XFixesQueryExtension(xpbproxy_dpy, &xpbproxy_xfixes_event_base, &xpbproxy_xfixes_error_base);

-

-    XAppleWMSelectInput (xpbproxy_dpy, AppleWMActivationNotifyMask |

-                         AppleWMPasteboardNotifyMask);

-    

-    _selection_object = [[x_selection alloc] init];

-    

-    if(!xpbproxy_input_register()) {

-        [pool release];

-        return EXIT_FAILURE;

-    }

-    

-    [pool release];

-    

-    CFRunLoopRun();

-

-    return EXIT_SUCCESS;

-}

-

-id xpbproxy_selection_object (void) {

-    return _selection_object;

-}

-

-Time xpbproxy_current_timestamp (void) {

-    /* FIXME: may want to fetch a timestamp from the server.. */

-    return CurrentTime;

-}

+/* main.m
+   Copyright (c) 2002, 2008 Apple Computer, Inc. All rights reserved.
+
+   Permission is hereby granted, free of charge, to any person
+   obtaining a copy of this software and associated documentation files
+   (the "Software"), to deal in the Software without restriction,
+   including without limitation the rights to use, copy, modify, merge,
+   publish, distribute, sublicense, and/or sell copies of the Software,
+   and to permit persons to whom the Software is furnished to do so,
+   subject to the following conditions:
+
+   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 ABOVE LISTED COPYRIGHT
+   HOLDER(S) 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(s) of the above
+   copyright holders shall not be used in advertising or otherwise to
+   promote the sale, use or other dealings in this Software without
+   prior written authorization.
+ */
+
+#include "pbproxy.h"
+#import "x-selection.h"
+
+#include <pthread.h>
+#include <unistd.h>
+#include <X11/extensions/applewm.h>
+
+Display *xpbproxy_dpy;
+int xpbproxy_apple_wm_event_base, xpbproxy_apple_wm_error_base;
+int xpbproxy_xfixes_event_base, xpbproxy_xfixes_error_base;
+BOOL xpbproxy_have_xfixes;
+
+extern char *display;
+
+#ifdef STANDALONE_XPBPROXY
+BOOL xpbproxy_is_standalone = NO;
+#endif
+
+x_selection *_selection_object;
+
+extern BOOL serverRunning;
+extern pthread_mutex_t serverRunningMutex;
+extern pthread_cond_t serverRunningCond;
+
+static inline void wait_for_server_init(void) {
+    /* If the server hasn't finished initializing, wait for it... */
+    if(!serverRunning) {
+        pthread_mutex_lock(&serverRunningMutex);
+        while(!serverRunning)
+            pthread_cond_wait(&serverRunningCond, &serverRunningMutex);
+        pthread_mutex_unlock(&serverRunningMutex);
+    }
+}
+
+static int x_io_error_handler (Display *dpy) {
+    /* We lost our connection to the server. */
+    
+    TRACE ();
+
+    /* trigger the thread to restart?
+     *   NO - this would be to a "deeper" problem, and restarts would just
+     *        make things worse...
+     */
+#ifdef STANDALONE_XPBPROXY
+    if(xpbproxy_is_standalone)
+        exit(EXIT_FAILURE);
+#endif
+
+    /* Prevent _XIOError from calling exit() */
+    pthread_exit(NULL);
+    return 0;
+}
+
+static int x_error_handler (Display *dpy, XErrorEvent *errevent) {
+    return 0;
+}
+
+int xpbproxy_run (void) {
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    size_t i;
+    
+    wait_for_server_init();
+    
+    for(i=0, xpbproxy_dpy=NULL; !xpbproxy_dpy && i<5; i++) {
+        xpbproxy_dpy = XOpenDisplay(NULL);
+        
+        if(!xpbproxy_dpy && display) {
+            char _display[32];
+            snprintf(_display, sizeof(_display), ":%s", display);
+            setenv("DISPLAY", _display, TRUE);
+            
+            xpbproxy_dpy=XOpenDisplay(_display);
+        }
+        if(!xpbproxy_dpy)
+            sleep(1);
+    }
+    
+    if (xpbproxy_dpy == NULL) {
+        ErrorF("xpbproxy: can't open default display\n");
+        [pool release];
+        return EXIT_FAILURE;
+    }
+    
+    XSetIOErrorHandler (x_io_error_handler);
+    XSetErrorHandler (x_error_handler);
+    
+    if (!XAppleWMQueryExtension (xpbproxy_dpy, &xpbproxy_apple_wm_event_base,
+                                 &xpbproxy_apple_wm_error_base)) {
+        ErrorF("xpbproxy: can't open AppleWM server extension\n");
+        [pool release];
+        return EXIT_FAILURE;
+    }
+
+    xpbproxy_have_xfixes = XFixesQueryExtension(xpbproxy_dpy, &xpbproxy_xfixes_event_base, &xpbproxy_xfixes_error_base);
+
+    XAppleWMSelectInput (xpbproxy_dpy, AppleWMActivationNotifyMask |
+                         AppleWMPasteboardNotifyMask);
+    
+    _selection_object = [[x_selection alloc] init];
+    
+    if(!xpbproxy_input_register()) {
+        [pool release];
+        return EXIT_FAILURE;
+    }
+    
+    [pool release];
+    
+    CFRunLoopRun();
+
+    return EXIT_SUCCESS;
+}
+
+id xpbproxy_selection_object (void) {
+    return _selection_object;
+}
+
+Time xpbproxy_current_timestamp (void) {
+    /* FIXME: may want to fetch a timestamp from the server.. */
+    return CurrentTime;
+}
diff --git a/xorg-server/hw/xquartz/pbproxy/pbproxy.h b/xorg-server/hw/xquartz/pbproxy/pbproxy.h
index 9d729531f..c80a660cc 100644
--- a/xorg-server/hw/xquartz/pbproxy/pbproxy.h
+++ b/xorg-server/hw/xquartz/pbproxy/pbproxy.h
@@ -1,93 +1,93 @@
-/* pbproxy.h

-   Copyright (c) 2002, 2008 Apple Computer, Inc. All rights reserved.

-

-   Permission is hereby granted, free of charge, to any person

-   obtaining a copy of this software and associated documentation files

-   (the "Software"), to deal in the Software without restriction,

-   including without limitation the rights to use, copy, modify, merge,

-   publish, distribute, sublicense, and/or sell copies of the Software,

-   and to permit persons to whom the Software is furnished to do so,

-   subject to the following conditions:

-

-   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 ABOVE LISTED COPYRIGHT

-   HOLDER(S) 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(s) of the above

-   copyright holders shall not be used in advertising or otherwise to

-   promote the sale, use or other dealings in this Software without

-   prior written authorization.

-*/

-

-#ifndef PBPROXY_H

-#define PBPROXY_H 1

-

-#import  <Foundation/Foundation.h>

-

-#include <asl.h>

-

-#include <AvailabilityMacros.h>

-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1050

-#if __LP64__ || NS_BUILD_32_LIKE_64

-typedef long NSInteger;

-typedef unsigned long NSUInteger;

-#else

-typedef int NSInteger;

-typedef unsigned int NSUInteger;

-#endif

-#endif

-

-#define  Cursor X_Cursor

-#undef _SHAPE_H_

-#include <X11/Xlib.h>

-#include <X11/extensions/shape.h>

-#undef   Cursor

-

-#ifdef STANDALONE_XPBPROXY

-/* Just used for the standalone to respond to SIGHUP to reload prefs */

-extern BOOL xpbproxy_prefs_reload;

-

-/* Setting this to YES (for the standalone app) causes us to ignore the

- * 'sync_pasteboard' defaults preference since we assume it to be on... this is

- * mainly useful for debugging/developing xpbproxy with XQuartz still running.

- * Just disable the one in the server with X11's preference pane, then run

- * the standalone app.

- */

-extern BOOL xpbproxy_is_standalone;

-#endif

-

-/* from main.m */

-extern void xpbproxy_set_is_active (BOOL state);

-extern BOOL xpbproxy_get_is_active (void);

-extern id xpbproxy_selection_object (void);

-extern Time xpbproxy_current_timestamp (void);

-extern int xpbproxy_run (void);

-

-extern Display *xpbproxy_dpy;

-extern int xpbproxy_apple_wm_event_base, xpbproxy_apple_wm_error_base;

-extern int xpbproxy_xfixes_event_base, xpbproxy_xfixes_error_base;

-extern BOOL xpbproxy_have_xfixes;

-

-/* from x-input.m */

-extern BOOL xpbproxy_input_register (void);

-

-/* os/log.c or app-main.m */

-extern void ErrorF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2);

-

-/* from darwin.h */

-_X_ATTRIBUTE_PRINTF(6,7)

-extern void xq_asl_log (int level, const char *subsystem, const char *file, const char *function, int line, const char *fmt, ...);

-

-#define ASL_LOG(level, subsystem, msg, args...) xq_asl_log(level, subsystem, __FILE__, __FUNCTION__, __LINE__, msg, ##args)

-#define DebugF(msg, args...) ASL_LOG(ASL_LEVEL_DEBUG, "xpbproxy", msg, ##args)

-#define TRACE() DebugF("TRACE")

-

-#endif /* PBPROXY_H */

+/* pbproxy.h
+   Copyright (c) 2002, 2008 Apple Computer, Inc. All rights reserved.
+
+   Permission is hereby granted, free of charge, to any person
+   obtaining a copy of this software and associated documentation files
+   (the "Software"), to deal in the Software without restriction,
+   including without limitation the rights to use, copy, modify, merge,
+   publish, distribute, sublicense, and/or sell copies of the Software,
+   and to permit persons to whom the Software is furnished to do so,
+   subject to the following conditions:
+
+   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 ABOVE LISTED COPYRIGHT
+   HOLDER(S) 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(s) of the above
+   copyright holders shall not be used in advertising or otherwise to
+   promote the sale, use or other dealings in this Software without
+   prior written authorization.
+*/
+
+#ifndef PBPROXY_H
+#define PBPROXY_H 1
+
+#import  <Foundation/Foundation.h>
+
+#include <asl.h>
+
+#include <AvailabilityMacros.h>
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1050
+#if __LP64__ || NS_BUILD_32_LIKE_64
+typedef long NSInteger;
+typedef unsigned long NSUInteger;
+#else
+typedef int NSInteger;
+typedef unsigned int NSUInteger;
+#endif
+#endif
+
+#define  Cursor X_Cursor
+#undef _SHAPE_H_
+#include <X11/Xlib.h>
+#include <X11/extensions/shape.h>
+#undef   Cursor
+
+#ifdef STANDALONE_XPBPROXY
+/* Just used for the standalone to respond to SIGHUP to reload prefs */
+extern BOOL xpbproxy_prefs_reload;
+
+/* Setting this to YES (for the standalone app) causes us to ignore the
+ * 'sync_pasteboard' defaults preference since we assume it to be on... this is
+ * mainly useful for debugging/developing xpbproxy with XQuartz still running.
+ * Just disable the one in the server with X11's preference pane, then run
+ * the standalone app.
+ */
+extern BOOL xpbproxy_is_standalone;
+#endif
+
+/* from main.m */
+extern void xpbproxy_set_is_active (BOOL state);
+extern BOOL xpbproxy_get_is_active (void);
+extern id xpbproxy_selection_object (void);
+extern Time xpbproxy_current_timestamp (void);
+extern int xpbproxy_run (void);
+
+extern Display *xpbproxy_dpy;
+extern int xpbproxy_apple_wm_event_base, xpbproxy_apple_wm_error_base;
+extern int xpbproxy_xfixes_event_base, xpbproxy_xfixes_error_base;
+extern BOOL xpbproxy_have_xfixes;
+
+/* from x-input.m */
+extern BOOL xpbproxy_input_register (void);
+
+/* os/log.c or app-main.m */
+extern void ErrorF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2);
+
+/* from darwin.h */
+_X_ATTRIBUTE_PRINTF(6,7)
+extern void xq_asl_log (int level, const char *subsystem, const char *file, const char *function, int line, const char *fmt, ...);
+
+#define ASL_LOG(level, subsystem, msg, args...) xq_asl_log(level, subsystem, __FILE__, __FUNCTION__, __LINE__, msg, ##args)
+#define DebugF(msg, args...) ASL_LOG(ASL_LEVEL_DEBUG, "xpbproxy", msg, ##args)
+#define TRACE() DebugF("TRACE")
+
+#endif /* PBPROXY_H */
diff --git a/xorg-server/hw/xquartz/pbproxy/x-input.m b/xorg-server/hw/xquartz/pbproxy/x-input.m
index 7ecc90896..ebb89980f 100644
--- a/xorg-server/hw/xquartz/pbproxy/x-input.m
+++ b/xorg-server/hw/xquartz/pbproxy/x-input.m
@@ -1,173 +1,173 @@
-/* x-input.m -- event handling

-   Copyright (c) 2002, 2008 Apple Computer, Inc. All rights reserved.

-

-   Permission is hereby granted, free of charge, to any person

-   obtaining a copy of this software and associated documentation files

-   (the "Software"), to deal in the Software without restriction,

-   including without limitation the rights to use, copy, modify, merge,

-   publish, distribute, sublicense, and/or sell copies of the Software,

-   and to permit persons to whom the Software is furnished to do so,

-   subject to the following conditions:

-

-   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 ABOVE LISTED COPYRIGHT

-   HOLDER(S) 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(s) of the above

-   copyright holders shall not be used in advertising or otherwise to

-   promote the sale, use or other dealings in this Software without

-   prior written authorization.

- */

-

-#include "pbproxy.h"

-#import "x-selection.h"

-

-#include <CoreFoundation/CFSocket.h>

-#include <CoreFoundation/CFRunLoop.h>

-

-#include <X11/Xatom.h>

-#include <X11/keysym.h>

-#include <X11/extensions/applewm.h>

-

-#include <unistd.h>

-

-static CFRunLoopSourceRef xpbproxy_dpy_source;

-

-#ifdef STANDALONE_XPBPROXY

-BOOL xpbproxy_prefs_reload = NO;

-#endif

-

-/* Timestamp when the X server last told us it's active */

-static Time last_activation_time;

-

-static void x_event_apple_wm_notify(XAppleWMNotifyEvent *e) {

-    int type = e->type - xpbproxy_apple_wm_event_base;

-    int kind = e->kind;

-

-    /* We want to reload prefs even if we're not active */

-    if(type == AppleWMActivationNotify &&

-       kind == AppleWMReloadPreferences)

-        [xpbproxy_selection_object() reload_preferences];

-

-    if(![xpbproxy_selection_object() is_active])

-        return;

-

-    switch (type) {              

-        case AppleWMActivationNotify:

-            switch (kind) {

-                case AppleWMIsActive:

-                    last_activation_time = e->time;

-                    [xpbproxy_selection_object() x_active:e->time];

-                    break;

-                    

-                case AppleWMIsInactive:

-                    [xpbproxy_selection_object() x_inactive:e->time];

-                    break;

-            }

-            break;

-            

-        case AppleWMPasteboardNotify:

-            switch (kind) {

-                case AppleWMCopyToPasteboard:

-                    [xpbproxy_selection_object() x_copy:e->time];

-            }

-            break;

-    }

-}

-

-static void xpbproxy_process_xevents(void) {

-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];

-    

-    if(pool == nil) {

-        ErrorF("unable to allocate/init auto release pool!\n");

-        return;

-    }

-    

-    while (XPending(xpbproxy_dpy) != 0) {

-        XEvent e;

-        

-        XNextEvent (xpbproxy_dpy, &e);

-        

-        switch (e.type) {                

-            case SelectionClear:

-                if([xpbproxy_selection_object() is_active])

-                    [xpbproxy_selection_object () clear_event:&e.xselectionclear];

-                break;

-                

-            case SelectionRequest:

-                [xpbproxy_selection_object () request_event:&e.xselectionrequest];

-                break;

-                

-            case SelectionNotify:

-                [xpbproxy_selection_object () notify_event:&e.xselection];

-                break;

-                

-            case PropertyNotify:

-                [xpbproxy_selection_object () property_event:&e.xproperty];

-                break;

-                

-            default:

-                if(e.type >= xpbproxy_apple_wm_event_base &&

-                   e.type < xpbproxy_apple_wm_event_base + AppleWMNumberEvents) {

-                    x_event_apple_wm_notify((XAppleWMNotifyEvent *) &e);

-                } else if(e.type == xpbproxy_xfixes_event_base + XFixesSelectionNotify) {

-                    [xpbproxy_selection_object() xfixes_selection_notify:(XFixesSelectionNotifyEvent *)&e];

-                }

-                break;

-        }

-        

-        XFlush(xpbproxy_dpy);

-    }

-    

-    [pool release];

-}

-

-static BOOL add_input_socket (int sock, CFOptionFlags callback_types,

-                             CFSocketCallBack callback, const CFSocketContext *ctx,

-                             CFRunLoopSourceRef *cf_source) {

-    CFSocketRef cf_sock;

-    

-    cf_sock = CFSocketCreateWithNative (kCFAllocatorDefault, sock,

-                                        callback_types, callback, ctx);

-    if (cf_sock == NULL) {

-        close (sock);

-        return FALSE;

-    }

-    

-    *cf_source = CFSocketCreateRunLoopSource (kCFAllocatorDefault,

-                                              cf_sock, 0);

-    CFRelease (cf_sock);

-    

-    if (*cf_source == NULL)

-        return FALSE;

-    

-    CFRunLoopAddSource (CFRunLoopGetCurrent (),

-                        *cf_source, kCFRunLoopDefaultMode);

-    return TRUE;

-}

-

-static void x_input_callback (CFSocketRef sock, CFSocketCallBackType type,

-                              CFDataRef address, const void *data, void *info) {

-

-#ifdef STANDALONE_XPBPROXY

-    if(xpbproxy_prefs_reload) {

-        [xpbproxy_selection_object() reload_preferences];

-        xpbproxy_prefs_reload = NO;

-    }

-#endif

-    

-    xpbproxy_process_xevents();

-}

-

-BOOL xpbproxy_input_register(void) {

-    return add_input_socket(ConnectionNumber(xpbproxy_dpy), kCFSocketReadCallBack,

-                            x_input_callback, NULL, &xpbproxy_dpy_source);

-}

+/* x-input.m -- event handling
+   Copyright (c) 2002, 2008 Apple Computer, Inc. All rights reserved.
+
+   Permission is hereby granted, free of charge, to any person
+   obtaining a copy of this software and associated documentation files
+   (the "Software"), to deal in the Software without restriction,
+   including without limitation the rights to use, copy, modify, merge,
+   publish, distribute, sublicense, and/or sell copies of the Software,
+   and to permit persons to whom the Software is furnished to do so,
+   subject to the following conditions:
+
+   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 ABOVE LISTED COPYRIGHT
+   HOLDER(S) 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(s) of the above
+   copyright holders shall not be used in advertising or otherwise to
+   promote the sale, use or other dealings in this Software without
+   prior written authorization.
+ */
+
+#include "pbproxy.h"
+#import "x-selection.h"
+
+#include <CoreFoundation/CFSocket.h>
+#include <CoreFoundation/CFRunLoop.h>
+
+#include <X11/Xatom.h>
+#include <X11/keysym.h>
+#include <X11/extensions/applewm.h>
+
+#include <unistd.h>
+
+static CFRunLoopSourceRef xpbproxy_dpy_source;
+
+#ifdef STANDALONE_XPBPROXY
+BOOL xpbproxy_prefs_reload = NO;
+#endif
+
+/* Timestamp when the X server last told us it's active */
+static Time last_activation_time;
+
+static void x_event_apple_wm_notify(XAppleWMNotifyEvent *e) {
+    int type = e->type - xpbproxy_apple_wm_event_base;
+    int kind = e->kind;
+
+    /* We want to reload prefs even if we're not active */
+    if(type == AppleWMActivationNotify &&
+       kind == AppleWMReloadPreferences)
+        [xpbproxy_selection_object() reload_preferences];
+
+    if(![xpbproxy_selection_object() is_active])
+        return;
+
+    switch (type) {              
+        case AppleWMActivationNotify:
+            switch (kind) {
+                case AppleWMIsActive:
+                    last_activation_time = e->time;
+                    [xpbproxy_selection_object() x_active:e->time];
+                    break;
+                    
+                case AppleWMIsInactive:
+                    [xpbproxy_selection_object() x_inactive:e->time];
+                    break;
+            }
+            break;
+            
+        case AppleWMPasteboardNotify:
+            switch (kind) {
+                case AppleWMCopyToPasteboard:
+                    [xpbproxy_selection_object() x_copy:e->time];
+            }
+            break;
+    }
+}
+
+static void xpbproxy_process_xevents(void) {
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    
+    if(pool == nil) {
+        ErrorF("unable to allocate/init auto release pool!\n");
+        return;
+    }
+    
+    while (XPending(xpbproxy_dpy) != 0) {
+        XEvent e;
+        
+        XNextEvent (xpbproxy_dpy, &e);
+        
+        switch (e.type) {                
+            case SelectionClear:
+                if([xpbproxy_selection_object() is_active])
+                    [xpbproxy_selection_object () clear_event:&e.xselectionclear];
+                break;
+                
+            case SelectionRequest:
+                [xpbproxy_selection_object () request_event:&e.xselectionrequest];
+                break;
+                
+            case SelectionNotify:
+                [xpbproxy_selection_object () notify_event:&e.xselection];
+                break;
+                
+            case PropertyNotify:
+                [xpbproxy_selection_object () property_event:&e.xproperty];
+                break;
+                
+            default:
+                if(e.type >= xpbproxy_apple_wm_event_base &&
+                   e.type < xpbproxy_apple_wm_event_base + AppleWMNumberEvents) {
+                    x_event_apple_wm_notify((XAppleWMNotifyEvent *) &e);
+                } else if(e.type == xpbproxy_xfixes_event_base + XFixesSelectionNotify) {
+                    [xpbproxy_selection_object() xfixes_selection_notify:(XFixesSelectionNotifyEvent *)&e];
+                }
+                break;
+        }
+        
+        XFlush(xpbproxy_dpy);
+    }
+    
+    [pool release];
+}
+
+static BOOL add_input_socket (int sock, CFOptionFlags callback_types,
+                             CFSocketCallBack callback, const CFSocketContext *ctx,
+                             CFRunLoopSourceRef *cf_source) {
+    CFSocketRef cf_sock;
+    
+    cf_sock = CFSocketCreateWithNative (kCFAllocatorDefault, sock,
+                                        callback_types, callback, ctx);
+    if (cf_sock == NULL) {
+        close (sock);
+        return FALSE;
+    }
+    
+    *cf_source = CFSocketCreateRunLoopSource (kCFAllocatorDefault,
+                                              cf_sock, 0);
+    CFRelease (cf_sock);
+    
+    if (*cf_source == NULL)
+        return FALSE;
+    
+    CFRunLoopAddSource (CFRunLoopGetCurrent (),
+                        *cf_source, kCFRunLoopDefaultMode);
+    return TRUE;
+}
+
+static void x_input_callback (CFSocketRef sock, CFSocketCallBackType type,
+                              CFDataRef address, const void *data, void *info) {
+
+#ifdef STANDALONE_XPBPROXY
+    if(xpbproxy_prefs_reload) {
+        [xpbproxy_selection_object() reload_preferences];
+        xpbproxy_prefs_reload = NO;
+    }
+#endif
+    
+    xpbproxy_process_xevents();
+}
+
+BOOL xpbproxy_input_register(void) {
+    return add_input_socket(ConnectionNumber(xpbproxy_dpy), kCFSocketReadCallBack,
+                            x_input_callback, NULL, &xpbproxy_dpy_source);
+}
diff --git a/xorg-server/hw/xquartz/pbproxy/x-selection.h b/xorg-server/hw/xquartz/pbproxy/x-selection.h
index b31d7515e..d4a39e58f 100644
--- a/xorg-server/hw/xquartz/pbproxy/x-selection.h
+++ b/xorg-server/hw/xquartz/pbproxy/x-selection.h
@@ -1,110 +1,110 @@
-/* x-selection.h -- proxies between NSPasteboard and X11 selections

-

-   Copyright (c) 2002, 2008 Apple Computer, Inc. All rights reserved.

-

-   Permission is hereby granted, free of charge, to any person

-   obtaining a copy of this software and associated documentation files

-   (the "Software"), to deal in the Software without restriction,

-   including without limitation the rights to use, copy, modify, merge,

-   publish, distribute, sublicense, and/or sell copies of the Software,

-   and to permit persons to whom the Software is furnished to do so,

-   subject to the following conditions:

-

-   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 ABOVE LISTED COPYRIGHT

-   HOLDER(S) 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(s) of the above

-   copyright holders shall not be used in advertising or otherwise to

-   promote the sale, use or other dealings in this Software without

-   prior written authorization.

-*/

-

-#ifndef X_SELECTION_H

-#define X_SELECTION_H 1

-

-#include "pbproxy.h"

-

-#define  Cursor X_Cursor

-#include <X11/extensions/Xfixes.h>

-#undef Cursor

-

-#include <AppKit/NSPasteboard.h>

-

-/* This stores image data or text. */

-struct propdata {

-	unsigned char *data;

-	size_t length;

-	int format;

-};

-

-struct atom_list {

-    Atom primary, clipboard, text, utf8_string, string, targets, multiple,

-        cstring, image_png, image_jpeg, incr, atom, clipboard_manager,

-        compound_text, atom_pair;

-};

-

-

-@interface x_selection : NSObject

-{

-@private

-

-    /* The unmapped window we use for fetching selections. */

-    Window _selection_window;

-

-    Atom request_atom;

-    

-    struct {

-        struct propdata propdata;

-        Window requestor;

-        Atom selection;

-    } pending;

-

-    /* 

-     * This is the number of times the user has requested a copy.

-     * Once the copy is completed, we --pending_copy, and if the 

-     * pending_copy is > 0 we do it again.

-     */

-    int pending_copy;

-    /* 

-     * This is used for the same purpose as pending_copy, but for the 

-     * CLIPBOARD.  It also prevents a race with INCR transfers.

-     */

-    int pending_clipboard; 

-    

-    struct atom_list atoms[1];

-}

-

-- (void) x_active:(Time)timestamp;

-- (void) x_inactive:(Time)timestamp;

-

-- (void) x_copy:(Time)timestamp;

-

-- (void) clear_event:(XSelectionClearEvent *)e;

-- (void) request_event:(XSelectionRequestEvent *)e;

-- (void) notify_event:(XSelectionEvent *)e;

-- (void) property_event:(XPropertyEvent *)e;

-- (void) xfixes_selection_notify:(XFixesSelectionNotifyEvent *)e;

-- (void) handle_selection:(Atom)selection type:(Atom)type propdata:(struct propdata *)pdata;

-- (void) claim_clipboard;

-- (BOOL) set_clipboard_manager_status:(BOOL)value;

-- (void) own_clipboard;

-- (void) copy_completed:(Atom)selection;

-

-- (void) reload_preferences;

-- (BOOL) is_active;

-- (void) send_none:(XSelectionRequestEvent *)e;

-@end

-

-/* main.m */

-extern x_selection *_selection_object;

-

-#endif /* X_SELECTION_H */

+/* x-selection.h -- proxies between NSPasteboard and X11 selections
+
+   Copyright (c) 2002, 2008 Apple Computer, Inc. All rights reserved.
+
+   Permission is hereby granted, free of charge, to any person
+   obtaining a copy of this software and associated documentation files
+   (the "Software"), to deal in the Software without restriction,
+   including without limitation the rights to use, copy, modify, merge,
+   publish, distribute, sublicense, and/or sell copies of the Software,
+   and to permit persons to whom the Software is furnished to do so,
+   subject to the following conditions:
+
+   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 ABOVE LISTED COPYRIGHT
+   HOLDER(S) 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(s) of the above
+   copyright holders shall not be used in advertising or otherwise to
+   promote the sale, use or other dealings in this Software without
+   prior written authorization.
+*/
+
+#ifndef X_SELECTION_H
+#define X_SELECTION_H 1
+
+#include "pbproxy.h"
+
+#define  Cursor X_Cursor
+#include <X11/extensions/Xfixes.h>
+#undef Cursor
+
+#include <AppKit/NSPasteboard.h>
+
+/* This stores image data or text. */
+struct propdata {
+	unsigned char *data;
+	size_t length;
+	int format;
+};
+
+struct atom_list {
+    Atom primary, clipboard, text, utf8_string, string, targets, multiple,
+        cstring, image_png, image_jpeg, incr, atom, clipboard_manager,
+        compound_text, atom_pair;
+};
+
+
+@interface x_selection : NSObject
+{
+@private
+
+    /* The unmapped window we use for fetching selections. */
+    Window _selection_window;
+
+    Atom request_atom;
+    
+    struct {
+        struct propdata propdata;
+        Window requestor;
+        Atom selection;
+    } pending;
+
+    /* 
+     * This is the number of times the user has requested a copy.
+     * Once the copy is completed, we --pending_copy, and if the 
+     * pending_copy is > 0 we do it again.
+     */
+    int pending_copy;
+    /* 
+     * This is used for the same purpose as pending_copy, but for the 
+     * CLIPBOARD.  It also prevents a race with INCR transfers.
+     */
+    int pending_clipboard; 
+    
+    struct atom_list atoms[1];
+}
+
+- (void) x_active:(Time)timestamp;
+- (void) x_inactive:(Time)timestamp;
+
+- (void) x_copy:(Time)timestamp;
+
+- (void) clear_event:(XSelectionClearEvent *)e;
+- (void) request_event:(XSelectionRequestEvent *)e;
+- (void) notify_event:(XSelectionEvent *)e;
+- (void) property_event:(XPropertyEvent *)e;
+- (void) xfixes_selection_notify:(XFixesSelectionNotifyEvent *)e;
+- (void) handle_selection:(Atom)selection type:(Atom)type propdata:(struct propdata *)pdata;
+- (void) claim_clipboard;
+- (BOOL) set_clipboard_manager_status:(BOOL)value;
+- (void) own_clipboard;
+- (void) copy_completed:(Atom)selection;
+
+- (void) reload_preferences;
+- (BOOL) is_active;
+- (void) send_none:(XSelectionRequestEvent *)e;
+@end
+
+/* main.m */
+extern x_selection *_selection_object;
+
+#endif /* X_SELECTION_H */
diff --git a/xorg-server/hw/xquartz/pbproxy/x-selection.m b/xorg-server/hw/xquartz/pbproxy/x-selection.m
index 0f48371d0..b5f4dde5c 100644
--- a/xorg-server/hw/xquartz/pbproxy/x-selection.m
+++ b/xorg-server/hw/xquartz/pbproxy/x-selection.m
@@ -1,1587 +1,1587 @@
-/* x-selection.m -- proxies between NSPasteboard and X11 selections

-

-   Copyright (c) 2002, 2008 Apple Computer, Inc. All rights reserved.

-

-   Permission is hereby granted, free of charge, to any person

-   obtaining a copy of this software and associated documentation files

-   (the "Software"), to deal in the Software without restriction,

-   including without limitation the rights to use, copy, modify, merge,

-   publish, distribute, sublicense, and/or sell copies of the Software,

-   and to permit persons to whom the Software is furnished to do so,

-   subject to the following conditions:

-

-   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 ABOVE LISTED COPYRIGHT

-   HOLDER(S) 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(s) of the above

-   copyright holders shall not be used in advertising or otherwise to

-   promote the sale, use or other dealings in this Software without

-   prior written authorization. 

-*/

-

-#import "x-selection.h"

-

-#include <stdio.h>

-#include <stdlib.h>

-#include <X11/Xatom.h>

-#include <X11/Xutil.h>

-#import <AppKit/NSGraphics.h>

-#import <AppKit/NSImage.h>

-#import <AppKit/NSBitmapImageRep.h>

-

-/*

- * The basic design of the pbproxy code is as follows.

- *

- * When a client selects text, say from an xterm - we only copy it when the

- * X11 Edit->Copy menu item is pressed or the shortcut activated.  In this

- * case we take the PRIMARY selection, and set it as the NSPasteboard data.

- *

- * When an X11 client copies something to the CLIPBOARD, pbproxy greedily grabs

- * the data, sets it as the NSPasteboard data, and finally sets itself as 

- * owner of the CLIPBOARD.

- * 

- * When an X11 window is activated we check to see if the NSPasteboard has

- * changed.  If the NSPasteboard has changed, then we set pbproxy as owner

- * of the PRIMARY and CLIPBOARD and respond to requests for text and images.

- *

- * The behavior is now dynamic since the information above was written.

- * The behavior is now dependent on the pbproxy_prefs below.

- */

-

-/*

- * TODO:

- * 1. handle MULTIPLE - I need to study the ICCCM further, and find a test app.

- * 2. Handle NSPasteboard updates immediately, not on active/inactive

- *    - Open xterm, run 'cat readme.txt | pbcopy'

- */

-

-static struct {

-    BOOL active ;

-    BOOL primary_on_grab; /* This is provided as an option for people who

-			   * want it and has issues that won't ever be

-			   * addressed to make it *always* work.

-			   */

-    BOOL clipboard_to_pasteboard;

-    BOOL pasteboard_to_primary;

-    BOOL pasteboard_to_clipboard;

-} pbproxy_prefs = { YES, NO, YES, YES, YES };

-

-@implementation x_selection

-

-static struct propdata null_propdata = {NULL, 0, 0};

-

-#ifdef DEBUG

-static void

-dump_prefs() {

-    ErrorF(fp, 

-	   "pbproxy preferences:\n"

-	   "\tactive %u\n"

-	   "\tprimary_on_grab %u\n"

-	   "\tclipboard_to_pasteboard %u\n"

-	   "\tpasteboard_to_primary %u\n"

-	   "\tpasteboard_to_clipboard %u\n",

-	   pbproxy_prefs.active,

-	   pbproxy_prefs.primary_on_grab,

-	   pbproxy_prefs.clipboard_to_pasteboard,

-	   pbproxy_prefs.pasteboard_to_primary,

-	   pbproxy_prefs.pasteboard_to_clipboard);

-}

-#endif

-

-extern CFStringRef app_prefs_domain_cfstr;

-

-static BOOL

-prefs_get_bool (CFStringRef key, BOOL defaultValue) {

-    Boolean value, ok;

-    

-    value = CFPreferencesGetAppBooleanValue (key, app_prefs_domain_cfstr, &ok);

-   

-    return ok ? (BOOL) value : defaultValue;

-}

-

-static void

-init_propdata (struct propdata *pdata)

-{

-    *pdata = null_propdata;

-}

-

-static void

-free_propdata (struct propdata *pdata)

-{

-    free (pdata->data);

-    *pdata = null_propdata;

-}

-

-/*

- * Return True if an error occurs.  Return False if pdata has data 

- * and we finished. 

- * The property is only deleted when bytesleft is 0 if delete is True.

- */

-static Bool

-get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Atom *type) 

-{

-    long offset = 0;

-    unsigned long numitems, bytesleft = 0;

-#ifdef TEST

-    /* This is used to test the growth handling. */

-    unsigned long length = 4UL;

-#else

-    unsigned long length = (100000UL + 3) / 4; 

-#endif

-    unsigned char *buf = NULL, *chunk = NULL;

-    size_t buflen = 0, chunkbytesize = 0;

-    int format;

-

-    TRACE ();

-    

-    if(None == property)

-	return True;

-    

-    do 

-    {

-	unsigned long newbuflen = 0;

-	unsigned char *newbuf = NULL;

-	

-#ifdef TEST   

-	ErrorF("bytesleft %lu\n", bytesleft);

-#endif

-

-	if (Success != XGetWindowProperty (xpbproxy_dpy, win, property,

-					   offset, length, delete, 

-					   AnyPropertyType,

-					   type, &format, &numitems, 

-					   &bytesleft, &chunk)) 

-	{

-	    DebugF ("Error while getting window property.\n");

-	    *pdata = null_propdata;

-	    free (buf);

-	    return True;

-	}

-	

-#ifdef TEST

-	ErrorF("format %d numitems %lu bytesleft %lu\n",

-	       format, numitems, bytesleft);

-	

-	ErrorF("type %s\n", XGetAtomName (xpbproxy_dpy, *type));

-#endif

-	

-	/* Format is the number of bits. */

-	if (format == 8)

-	  chunkbytesize = numitems;

-	else if (format == 16)

-	  chunkbytesize = numitems * sizeof(short);

-	else if (format == 32)

-	  chunkbytesize = numitems * sizeof(long);

-

-#ifdef TEST

-	ErrorF("chunkbytesize %zu\n", chunkbytesize);

-#endif

- 	newbuflen = buflen + chunkbytesize;

-	if (newbuflen > 0) 

-	{

-	    newbuf = realloc (buf, newbuflen);

-	    

-	    if (NULL == newbuf)

-	    {

-		XFree (chunk);

-		free (buf);

-		return True;

-	    }

-	

-	    memcpy (newbuf + buflen, chunk, chunkbytesize);

-	    XFree (chunk);

-	    buf = newbuf;

-	    buflen = newbuflen;

-	    /* offset is a multiple of 32 bits*/

-	    offset += chunkbytesize / 4;

-	} 

-	else 

-	{

-	    if (chunk) 

-		XFree (chunk);

-	}

-	

-#ifdef TEST

-	ErrorF("bytesleft %lu\n", bytesleft);

-#endif

-    } while (bytesleft > 0);

-    

-    pdata->data = buf;

-    pdata->length = buflen;

-    pdata->format = format;

-

-    return /*success*/ False;

-}

-

-

-/* Implementation methods */

-

-/* This finds the preferred type from a TARGETS list.*/

-- (Atom) find_preferred:(struct propdata *)pdata

-{

-    Atom a = None;

-    size_t i, step;

-    Bool png = False, jpeg = False, utf8 = False, string = False;

-

-    TRACE ();

-

-    if (pdata->format != 32)

-    {

-	ErrorF("Atom list is expected to be formatted as an array of 32bit values.\n");

-	return None;

-    }

-

-    for (i = 0, step = sizeof(long); i < pdata->length; i += step)

-    {

-	a = (Atom)*(long *)(pdata->data + i);

-

-	if (a == atoms->image_png)

-	{

-	    png = True;

-	}

-	else if (a == atoms->image_jpeg)

-	{

-	    jpeg = True;

-	}

-	else if (a == atoms->utf8_string)

-	{

-	    utf8 = True;

-        } 

-	else if (a == atoms->string)

-	{

-	    string = True;

-	}

-	else

-	{

-	    char *type = XGetAtomName(xpbproxy_dpy, a);

-	    if (type)

-	    {

-		DebugF("Unhandled X11 mime type: %s", type);

-		XFree(type);

-	    }

-	}

-    }

-

-    /*We prefer PNG over strings, and UTF8 over a Latin-1 string.*/

-    if (png)

-	return atoms->image_png;

-

-    if (jpeg)

-	return atoms->image_jpeg;

-

-    if (utf8)

-	return atoms->utf8_string;

-

-    if (string)

-	return atoms->string;

-

-    /* This is evidently something we don't know how to handle.*/

-    return None;

-}

-

-/* Return True if this is an INCR-style transfer. */

-- (Bool) is_incr_type:(XSelectionEvent *)e

-{

-    Atom seltype;

-    int format;

-    unsigned long numitems = 0UL, bytesleft = 0UL;

-    unsigned char *chunk;

-       

-    TRACE ();

-

-    if (Success != XGetWindowProperty (xpbproxy_dpy, e->requestor, e->property,

-				       /*offset*/ 0L, /*length*/ 4UL,

-				       /*Delete*/ False,

-				       AnyPropertyType, &seltype, &format,

-				       &numitems, &bytesleft, &chunk))

-    {

-	return False;

-    }

-

-    if(chunk)

-	XFree(chunk);

-

-    return (seltype == atoms->incr) ? True : False;

-}

-

-/* 

- * This should be called after a selection has been copied, 

- * or when the selection is unfinished before a transfer completes. 

- */

-- (void) release_pending

-{

-    TRACE ();

-

-    free_propdata (&pending.propdata);

-    pending.requestor = None;

-    pending.selection = None;

-}

-

-/* Return True if an error occurs during an append.*/

-/* Return False if the append succeeds. */

-- (Bool) append_to_pending:(struct propdata *)pdata requestor:(Window)requestor

-{

-    unsigned char *newdata;

-    size_t newlength;

-    

-    TRACE ();

-    

-    if (requestor != pending.requestor)

-    {

-	[self release_pending];

-	pending.requestor = requestor;

-    }

-	

-    newlength = pending.propdata.length + pdata->length;

-    newdata = realloc(pending.propdata.data, newlength);

-

-    if(NULL == newdata) 

-    {

-	perror("realloc propdata");

-	[self release_pending];

-        return True;

-    }

-

-    memcpy(newdata + pending.propdata.length, pdata->data, pdata->length);

-    pending.propdata.data = newdata;

-    pending.propdata.length = newlength;

-    

-    return False;

-}

-

-

-

-/* Called when X11 becomes active (i.e. has key focus) */

-- (void) x_active:(Time)timestamp

-{

-    static NSInteger changeCount;

-    NSInteger countNow;

-    NSPasteboard *pb;

-

-    TRACE ();

-

-    pb = [NSPasteboard generalPasteboard];

-

-    if (nil == pb)

-	return;

-

-    countNow = [pb changeCount];

-

-    if (countNow != changeCount)

-    {

-        DebugF ("changed pasteboard!\n");

-        changeCount = countNow;

-        

-        if (pbproxy_prefs.pasteboard_to_primary)

-        {

-            XSetSelectionOwner (xpbproxy_dpy, atoms->primary, _selection_window, CurrentTime);

-        }

-        

-        if (pbproxy_prefs.pasteboard_to_clipboard) {

-            [self own_clipboard];

-        }

-    }

-

-#if 0

-	/*gstaplin: we should perhaps investigate something like this branch above...*/

-	if ([_pasteboard availableTypeFromArray: _known_types] != nil)

-	{

-	    /* Pasteboard has data we should proxy; I think it makes

-	       sense to put it on both CLIPBOARD and PRIMARY */

-

-	    XSetSelectionOwner (xpbproxy_dpy, atoms->clipboard,

-				_selection_window, timestamp);

-	    XSetSelectionOwner (xpbproxy_dpy, atoms->primary,

-				_selection_window, timestamp);

-	}

-#endif

-}

-

-/* Called when X11 loses key focus */

-- (void) x_inactive:(Time)timestamp

-{

-    TRACE ();

-}

-

-/* This requests the TARGETS list from the PRIMARY selection owner. */

-- (void) x_copy_request_targets

-{

-    TRACE ();

-

-    request_atom = atoms->targets;

-    XConvertSelection (xpbproxy_dpy, atoms->primary, atoms->targets,

-		       atoms->primary, _selection_window, CurrentTime);

-}

-

-/* Called when the Edit/Copy item on the main X11 menubar is selected

- * and no appkit window claims it. */

-- (void) x_copy:(Time)timestamp

-{

-    Window w;

-

-    TRACE ();

-

-    w = XGetSelectionOwner (xpbproxy_dpy, atoms->primary);

-

-    if (None != w)

-    {

-	++pending_copy;

-	

-	if (1 == pending_copy) {

-	    /*

-	     * There are no other copy operations in progress, so we

-	     * can proceed safely.  Otherwise the copy_completed method

-	     * will see that the pending_copy is > 1, and do another copy.

-	     */	    

-	    [self x_copy_request_targets];

-	}

-    }

-}

-

-/* Set pbproxy as owner of the SELECTION_MANAGER selection.

- * This prevents tools like xclipboard from causing havoc.

- * Returns TRUE on success

- */

-- (BOOL) set_clipboard_manager_status:(BOOL)value

-{

-    TRACE ();

-

-    Window owner = XGetSelectionOwner (xpbproxy_dpy, atoms->clipboard_manager);

-

-    if(value) {

-        if(owner == _selection_window)

-            return TRUE;

-

-        if(owner != None) {

-            ErrorF("A clipboard manager using window 0x%lx already owns the clipboard selection.  "

-		   "pbproxy will not sync clipboard to pasteboard.\n", owner);

-            return FALSE;

-        }

-        

-        XSetSelectionOwner(xpbproxy_dpy, atoms->clipboard_manager, _selection_window, CurrentTime);

-        return (_selection_window == XGetSelectionOwner(xpbproxy_dpy, atoms->clipboard_manager));

-    } else {

-        if(owner != _selection_window)

-            return TRUE;

-

-        XSetSelectionOwner(xpbproxy_dpy, atoms->clipboard_manager, None, CurrentTime);

-        return(None == XGetSelectionOwner(xpbproxy_dpy, atoms->clipboard_manager));

-    }

-    

-    return FALSE;

-}

-

-/*

- * This occurs when we previously owned a selection, 

- * and then lost it from another client.

- */

-- (void) clear_event:(XSelectionClearEvent *)e

-{

-    

-

-    TRACE ();

-        

-    DebugF ("e->selection %s\n", XGetAtomName (xpbproxy_dpy, e->selection));

-    

-    if(e->selection == atoms->clipboard) {

-        /* 

-         * We lost ownership of the CLIPBOARD.

-         */

-        ++pending_clipboard;

-        

-        if (1 == pending_clipboard) {

-            /* Claim the clipboard contents from the new owner. */

-            [self claim_clipboard];

-        }

-    } else if(e->selection == atoms->clipboard_manager) {

-        if(pbproxy_prefs.clipboard_to_pasteboard) {

-            /* Another CLIPBOARD_MANAGER has set itself as owner.  Disable syncing

-             * to avoid a race.

-             */

-            ErrorF("Another clipboard manager was started!  "

-		    "xpbproxy is disabling syncing with clipboard.\n"); 

-            pbproxy_prefs.clipboard_to_pasteboard = NO;

-        }

-    }

-}

-

-/* 

- * We greedily acquire the clipboard after it changes, and on startup.

- */

-- (void) claim_clipboard

-{

-    Window owner;

-    

-    TRACE ();

-    

-    if (!pbproxy_prefs.clipboard_to_pasteboard)

-        return;

-    

-    owner = XGetSelectionOwner (xpbproxy_dpy, atoms->clipboard);

-    if (None == owner) {

-        /*

-         * The owner probably died or we are just starting up pbproxy.

-         * Set pbproxy's _selection_window as the owner, and continue.

-         */

-        DebugF ("No clipboard owner.\n");

-        [self copy_completed:atoms->clipboard];

-        return;

-    } else if (owner == _selection_window) {

-        [self copy_completed:atoms->clipboard];

-        return;

-    }

-    

-    DebugF ("requesting targets\n");

-    

-    request_atom = atoms->targets;

-    XConvertSelection (xpbproxy_dpy, atoms->clipboard, atoms->targets,

-                       atoms->clipboard, _selection_window, CurrentTime);

-    XFlush (xpbproxy_dpy);

-    /* Now we will get a SelectionNotify event in the future. */

-}

-

-/* Greedily acquire the clipboard. */

-- (void) own_clipboard

-{

-

-    TRACE ();

-

-    /* We should perhaps have a boundary limit on the number of iterations... */

-    do 

-    {

-	XSetSelectionOwner (xpbproxy_dpy, atoms->clipboard, _selection_window,

-			    CurrentTime);

-    } while (_selection_window != XGetSelectionOwner (xpbproxy_dpy,

-						      atoms->clipboard));

-}

-

-- (void) init_reply:(XEvent *)reply request:(XSelectionRequestEvent *)e

-{

-    reply->xselection.type = SelectionNotify;

-    reply->xselection.selection = e->selection;

-    reply->xselection.target = e->target;

-    reply->xselection.requestor = e->requestor;

-    reply->xselection.time = e->time;

-    reply->xselection.property = None; 

-}

-

-- (void) send_reply:(XEvent *)reply

-{

-    /*

-     * We are supposed to use an empty event mask, and not propagate

-     * the event, according to the ICCCM.

-     */

-    DebugF ("reply->xselection.requestor 0x%lx\n", reply->xselection.requestor);

-  

-    XSendEvent (xpbproxy_dpy, reply->xselection.requestor, False, 0, reply);

-    XFlush (xpbproxy_dpy);

-}

-

-/* 

- * This responds to a TARGETS request.

- * The result is a list of a ATOMs that correspond to the types available

- * for a selection.  

- * For instance an application might provide a UTF8_STRING and a STRING

- * (in Latin-1 encoding).  The requestor can then make the choice based on

- * the list.

- */

-- (void) send_targets:(XSelectionRequestEvent *)e pasteboard:(NSPasteboard *)pb

-{

-    XEvent reply;

-    NSArray *pbtypes;

-

-    [self init_reply:&reply request:e];

-

-    pbtypes = [pb types];

-    if (pbtypes)

-    {

-	long list[7]; /* Don't forget to increase this if we handle more types! */

-        long count = 0;

- 	

-	/*

-	 * I'm not sure if this is needed, but some toolkits/clients list 

-	 * TARGETS in response to targets. 

-	 */

-	list[count] = atoms->targets;

-	++count;

-

-	if ([pbtypes containsObject:NSStringPboardType])

-	{

-	    /* We have a string type that we can convert to UTF8, or Latin-1... */

-	    DebugF ("NSStringPboardType\n");

-	    list[count] = atoms->utf8_string;

-	    ++count;

-	    list[count] = atoms->string;

-	    ++count;

-	    list[count] = atoms->compound_text;

-	    ++count;

-	}

-

-	/* TODO add the NSPICTPboardType back again, once we have conversion

-	 * functionality in send_image.

-	 */

-#ifdef __clang__

-#pragma clang diagnostic push

-#pragma clang diagnostic ignored "-Wdeprecated-declarations" // NSPICTPboardType

-#endif

-

-	if ([pbtypes containsObject:NSPICTPboardType] 

-	    || [pbtypes containsObject:NSTIFFPboardType]) 

-	{

-	    /* We can convert a TIFF to a PNG or JPEG. */

-	    DebugF ("NSTIFFPboardType\n");

-	    list[count] = atoms->image_png;

-	    ++count;

-	    list[count] = atoms->image_jpeg;

-	    ++count;

-	} 

-

-#ifdef __clang__

-#pragma clang diagnostic pop

-#endif

-

-	if (count)

-	{

-	    /* We have a list of ATOMs to send. */

-	    XChangeProperty (xpbproxy_dpy, e->requestor, e->property, atoms->atom, 32,

-			 PropModeReplace, (unsigned char *) list, count);

-	    

-	    reply.xselection.property = e->property;

-	}

-    }

-

-    [self send_reply:&reply];

-}

-

-

-- (void) send_string:(XSelectionRequestEvent *)e utf8:(BOOL)utf8 pasteboard:(NSPasteboard *)pb

-{

-    XEvent reply;

-    NSArray *pbtypes;

-    NSString *data;

-    const char *bytes;

-    NSUInteger length;

-

-    TRACE ();

-

-    [self init_reply:&reply request:e];

-

-    pbtypes = [pb types];

- 

-    if (![pbtypes containsObject:NSStringPboardType])

-    {

-	[self send_reply:&reply];

-	return;

-    }

-

-#ifdef __LP64__

-    DebugF ("pbtypes retainCount after containsObject: %lu\n", [pbtypes retainCount]);

-#else

-    DebugF ("pbtypes retainCount after containsObject: %u\n", [pbtypes retainCount]);

-#endif

-

-    data = [pb stringForType:NSStringPboardType];

-

-    if (nil == data)

-    {

-	[self send_reply:&reply];

-	return;

-    }

-

-    if (utf8) 

-    {

-	bytes = [data UTF8String];

-	/*

-	 * We don't want the UTF-8 string length here.  

-	 * We want the length in bytes.

-	 */

-	length = strlen (bytes);

-	

-	if (length < 50) {

-	    DebugF ("UTF-8: %s\n", bytes);

-#ifdef __LP64__

-	    DebugF ("UTF-8 length: %lu\n", length); 

-#else

-	    DebugF ("UTF-8 length: %u\n", length); 

-#endif

-	}

-    } 

-    else 

-    {

-	DebugF ("Latin-1\n");

-	bytes = [data cStringUsingEncoding:NSISOLatin1StringEncoding];

-	/*WARNING: bytes is not NUL-terminated. */

-	length = [data lengthOfBytesUsingEncoding:NSISOLatin1StringEncoding];

-    }

-

-    DebugF ("e->target %s\n", XGetAtomName (xpbproxy_dpy, e->target));

-    

-    XChangeProperty (xpbproxy_dpy, e->requestor, e->property, e->target,

-		     8, PropModeReplace, (unsigned char *) bytes, length);

-    

-    reply.xselection.property = e->property;

-

-    [self send_reply:&reply];

-}

-

-- (void) send_compound_text:(XSelectionRequestEvent *)e pasteboard:(NSPasteboard *)pb

-{

-    XEvent reply;

-    NSArray *pbtypes;

-    

-    TRACE ();

-    

-    [self init_reply:&reply request:e];

-     

-    pbtypes = [pb types];

-

-    if ([pbtypes containsObject: NSStringPboardType])

-    {

-	NSString *data = [pb stringForType:NSStringPboardType];

-	if (nil != data)

-	{

-	    /*

-	     * Cast to (void *) to avoid a const warning. 

-	     * AFAIK Xutf8TextListToTextProperty does not modify the input memory.

-	     */

-	    void *utf8 = (void *)[data UTF8String];

-	    char *list[] = { utf8, NULL };

-	    XTextProperty textprop;

-	    

-	    textprop.value = NULL;

-

-	    if (Success == Xutf8TextListToTextProperty (xpbproxy_dpy, list, 1,

-							XCompoundTextStyle,

-							&textprop))

-	    {

-		

-		if (8 != textprop.format)

-		    DebugF ("textprop.format is unexpectedly not 8 - it's %d instead\n",

-			textprop.format);

-

-		XChangeProperty (xpbproxy_dpy, e->requestor, e->property, 

-				 atoms->compound_text, textprop.format, 

-				 PropModeReplace, textprop.value,

-				 textprop.nitems);

-		

-		reply.xselection.property = e->property;

-	    }

-

-	    if (textprop.value)

- 		XFree (textprop.value);

-

-	}

-    }

-    

-    [self send_reply:&reply];

-}

-

-/* Finding a test application that uses MULTIPLE has proven to be difficult. */

-- (void) send_multiple:(XSelectionRequestEvent *)e

-{

-    XEvent reply;

-

-    TRACE ();

-

-    [self init_reply:&reply request:e];

-

-    if (None != e->property) 

-    {

-	

-    }

-    

-    [self send_reply:&reply];

-}

-

-/* Return nil if an error occured. */

-/* DO NOT retain the encdata for longer than the length of an event response.  

- * The autorelease pool will reuse/free it.

- */ 

-- (NSData *) encode_image_data:(NSData *)data type:(NSBitmapImageFileType)enctype

-{

-    NSBitmapImageRep *bmimage = nil; 

-    NSData *encdata = nil;

-    NSDictionary *dict = nil;

-

-    bmimage = [[NSBitmapImageRep alloc] initWithData:data];

-

-    if (nil == bmimage)

-	return nil;

-

-    dict = [[NSDictionary alloc] init];

-    encdata = [bmimage representationUsingType:enctype properties:dict];

-

-    if (nil == encdata)

-    {

-	[dict autorelease];

-	[bmimage autorelease];

-	return nil;

-    }

-    

-    [dict autorelease];

-    [bmimage autorelease];

-

-    return encdata;

-}

-

-/* Return YES when an error has occured when trying to send the PICT. */

-/* The caller should send a default reponse with a property of None when an error occurs. */

-- (BOOL) send_image_pict_reply:(XSelectionRequestEvent *)e 

-		    pasteboard:(NSPasteboard *)pb 

-			  type:(NSBitmapImageFileType)imagetype

-{

-    XEvent reply;

-    NSImage *img = nil;

-    NSData *data = nil, *encdata = nil;

-    NSUInteger length;

-    const void *bytes = NULL;

-    

-    img = [[NSImage alloc] initWithPasteboard:pb];

-

-    if (nil == img) 

-    {

-	return YES;

-    }

-	    

-    data = [img TIFFRepresentation];

-

-    if (nil == data)

-    {

-	[img autorelease];

-	ErrorF("unable to convert PICT to TIFF!\n");

-	return YES;

-    }

-        

-    encdata = [self encode_image_data:data type:imagetype];

-    if(nil == encdata)

-    {

-	[img autorelease];

-	return YES;

-    }

-

-    [self init_reply:&reply request:e];

-

-    length = [encdata length];

-    bytes = [encdata bytes];

-    

-    XChangeProperty (xpbproxy_dpy, e->requestor, e->property, e->target,

-		     8, PropModeReplace, bytes, length);

-    reply.xselection.property = e->property;

-

-    [self send_reply:&reply];

-

-    [img autorelease];

-

-    return NO; /*no error*/

-}

-

-/* Return YES if an error occured. */

-/* The caller should send a reply with a property of None when an error occurs. */

-- (BOOL) send_image_tiff_reply:(XSelectionRequestEvent *)e

-		    pasteboard:(NSPasteboard *)pb 

-			  type:(NSBitmapImageFileType)imagetype

-{

-    XEvent reply;

-    NSData *data = nil;

-    NSData *encdata = nil;

-    NSUInteger length;

-    const void *bytes = NULL;

-

-    data = [pb dataForType:NSTIFFPboardType];

-

-    if (nil == data)

- 	return YES;

-  

-    encdata = [self encode_image_data:data type:imagetype];

-

-    if(nil == encdata)

-	return YES;

-

-    [self init_reply:&reply request:e];

-

-    length = [encdata length];

-    bytes = [encdata bytes];

-    

-    XChangeProperty (xpbproxy_dpy, e->requestor, e->property, e->target,

-		     8, PropModeReplace, bytes, length);

-    reply.xselection.property = e->property;

-    

-    [self send_reply:&reply];

-

-    return NO; /*no error*/

-}

-

-- (void) send_image:(XSelectionRequestEvent *)e pasteboard:(NSPasteboard *)pb

-{

-    NSArray *pbtypes = nil;

-    NSBitmapImageFileType imagetype = NSPNGFileType;

-

-    TRACE ();

-

-    if (e->target == atoms->image_png)

-	imagetype = NSPNGFileType;

-    else if (e->target == atoms->image_jpeg)

-	imagetype = NSJPEGFileType;

-    else 

-    {

-	ErrorF("internal failure in xpbproxy!  imagetype being sent isn't PNG or JPEG.\n");

-    }

-

-    pbtypes = [pb types];

-

-    if (pbtypes) 

-    {

-	if ([pbtypes containsObject:NSTIFFPboardType])

-	{

-	    if (NO == [self send_image_tiff_reply:e pasteboard:pb type:imagetype]) 

-	  	return;

-	} 

-#ifdef __clang__

-#pragma clang diagnostic push

-#pragma clang diagnostic ignored "-Wdeprecated-declarations" // NSPICTPboardType

-#endif

-     	else if ([pbtypes containsObject:NSPICTPboardType])

-#ifdef __clang__

-#pragma clang diagnostic pop

-#endif

-	{

-	    if (NO == [self send_image_pict_reply:e pasteboard:pb type:imagetype]) 

-		return;

-

-	    /* Fall through intentionally to the send_none: */

-	}

-    }

-

-    [self send_none:e];

-}

-

-- (void)send_none:(XSelectionRequestEvent *)e

-{

-    XEvent reply;

-

-    TRACE ();

-

-    [self init_reply:&reply request:e];

-    [self send_reply:&reply];

-}

-

-

-/* Another client requested the data or targets of data available from the clipboard. */

-- (void)request_event:(XSelectionRequestEvent *)e

-{

-    NSPasteboard *pb;

-

-    TRACE ();

-

-    /* TODO We should also keep track of the time of the selection, and 

-     * according to the ICCCM "refuse the request" if the event timestamp

-     * is before we owned it.

-     * What should we base the time on?  How can we get the current time just

-     * before an XSetSelectionOwner?  Is it the server's time, or the clients?

-     * According to the XSelectionRequestEvent manual page, the Time value

-     * may be set to CurrentTime or a time, so that makes it a bit different.

-     * Perhaps we should just punt and ignore races.

-     */

-

-    /*TODO we need a COMPOUND_TEXT test app*/

-    /*TODO we need a MULTIPLE test app*/

-

-    pb = [NSPasteboard generalPasteboard];

-    if (nil == pb) 

-    {

-	[self send_none:e];

-	return;

-    }

-    

-

-    if (None != e->target)

-	DebugF ("e->target %s\n", XGetAtomName (xpbproxy_dpy, e->target));

-

-    if (e->target == atoms->targets) 

-    {

-	/* The paste requestor wants to know what TARGETS we support. */

-	[self send_targets:e pasteboard:pb];

-    }

-    else if (e->target == atoms->multiple)

-    {

-	/*

-	 * This isn't finished, and may never be, unless I can find 

-	 * a good test app.

-	 */

-	[self send_multiple:e];

-    } 

-    else if (e->target == atoms->utf8_string)

-    {

-	[self send_string:e utf8:YES pasteboard:pb];

-    } 

-    else if (e->target == atoms->string)

-    {

-	[self send_string:e utf8:NO pasteboard:pb];

-    }

-    else if (e->target == atoms->compound_text)

-    {

-	[self send_compound_text:e pasteboard:pb];

-    }

-    else if (e->target == atoms->multiple)

-    {

-	[self send_multiple:e];

-    }

-    else if (e->target == atoms->image_png || e->target == atoms->image_jpeg)

-    {

-	[self send_image:e pasteboard:pb];

-    }

-    else

-    {

-	[self send_none:e];

-    }

-}

-

-/* This handles the events resulting from an XConvertSelection request. */

-- (void) notify_event:(XSelectionEvent *)e

-{

-    Atom type;

-    struct propdata pdata;

-	

-    TRACE ();

-

-    [self release_pending];

- 

-    if (None == e->property) {

-	DebugF ("e->property is None.\n");

-	[self copy_completed:e->selection];

-	/* Nothing is selected. */

-	return;

-    }

-

-#if 0

-    ErrorF("e->selection %s\n", XGetAtomName (xpbproxy_dpy, e->selection));

-    ErrorF("e->property %s\n", XGetAtomName (xpbproxy_dpy, e->property));

-#endif

-

-    if ([self is_incr_type:e]) 

-    {

-	/*

-	 * This is an INCR-style transfer, which means that we 

-	 * will get the data after a series of PropertyNotify events.

-	 */

-	DebugF ("is INCR\n");

-

-	if (get_property (e->requestor, e->property, &pdata, /*Delete*/ True, &type)) 

-	{

-	    /* 

-	     * An error occured, so we should invoke the copy_completed:, but

-	     * not handle_selection:type:propdata:

-	     */

-	    [self copy_completed:e->selection];

-	    return;

-	}

-

-	free_propdata (&pdata);

-

-      	pending.requestor = e->requestor;

-	pending.selection = e->selection;

-

-	DebugF ("set pending.requestor to 0x%lx\n", pending.requestor);

-    }

-    else

-    {

-	if (get_property (e->requestor, e->property, &pdata, /*Delete*/ True, &type))

-	{

-	    [self copy_completed:e->selection];

-	    return;

-	}

-

-	/* We have the complete selection data.*/

-	[self handle_selection:e->selection type:type propdata:&pdata];

-	

-	DebugF ("handled selection with the first notify_event\n");

-    }

-}

-

-/* This is used for INCR transfers.  See the ICCCM for the details. */

-/* This is used to retrieve PRIMARY and CLIPBOARD selections. */

-- (void) property_event:(XPropertyEvent *)e

-{

-    struct propdata pdata;

-    Atom type;

-

-    TRACE ();

-    

-    if (None != e->atom) 

-    {

-#ifdef DEBUG

-	char *name = XGetAtomName (xpbproxy_dpy, e->atom);

-

-	if (name) 

-	{

-	    DebugF ("e->atom %s\n", name);

-	    XFree(name);

-	}

-#endif

-    }

-

-    if (None != pending.requestor && PropertyNewValue == e->state) 

-    {

-	DebugF ("pending.requestor 0x%lx\n", pending.requestor);

-

-	if (get_property (e->window, e->atom, &pdata, /*Delete*/ True, &type))

-        {

-	    [self copy_completed:pending.selection];

-	    [self release_pending];

-	    return;

-	}

-

-	if (0 == pdata.length) 

-	{

-	    /*

-	     * We completed the transfer.

-	     * handle_selection will call copy_completed: for us.

-	     */

-	    [self handle_selection:pending.selection type:type propdata:&pending.propdata];

-	    free_propdata(&pdata);

-	    pending.propdata = null_propdata;

-	    pending.requestor = None;

-	    pending.selection = None;

-	}

-	else 

-	{

-	    [self append_to_pending:&pdata requestor:e->window];

-	    free_propdata (&pdata);

-	}

-    }

-}

-

-- (void) xfixes_selection_notify:(XFixesSelectionNotifyEvent *)e {

-    if(!pbproxy_prefs.active)

-        return;

-    

-    switch(e->subtype) {              

-        case XFixesSetSelectionOwnerNotify:

-            if(e->selection == atoms->primary && pbproxy_prefs.primary_on_grab)

-                [self x_copy:e->timestamp];

-            break;

-                

-        case XFixesSelectionWindowDestroyNotify:

-        case XFixesSelectionClientCloseNotify:

-        default:

-            ErrorF("Unhandled XFixesSelectionNotifyEvent: subtype=%d\n", e->subtype);

-            break;

-    }

-}

-

-- (void) handle_targets: (Atom)selection propdata:(struct propdata *)pdata

-{

-    /* Find a type we can handle and prefer from the list of ATOMs. */

-    Atom preferred;

-    char *name;

-

-    TRACE ();

-

-    preferred = [self find_preferred:pdata];

-    

-    if (None == preferred) 

-    {

-	/* 

-	 * This isn't required by the ICCCM, but some apps apparently 

-	 * don't respond to TARGETS properly.

-	 */

-	preferred = atoms->string;

-    }

-

-    (void)name; /* Avoid a warning with non-debug compiles. */

-#ifdef DEBUG

-    name = XGetAtomName (xpbproxy_dpy, preferred);

-

-    if (name)

-    {

-	DebugF ("requesting %s\n", name);

-    }

-#endif

-    request_atom = preferred;

-    XConvertSelection (xpbproxy_dpy, selection, preferred, selection,

-		       _selection_window, CurrentTime);    

-}

-

-/* This handles the image type of selection (typically in CLIPBOARD). */

-/* We convert to a TIFF, so that other applications can paste more easily. */

-- (void) handle_image: (struct propdata *)pdata pasteboard:(NSPasteboard *)pb

-{

-    NSArray *pbtypes;

-    NSUInteger length;

-    NSData *data, *tiff;

-    NSBitmapImageRep *bmimage;

-

-    TRACE ();

-

-    length = pdata->length;

-    data = [[NSData alloc] initWithBytes:pdata->data length:length];

-

-    if (nil == data)

-    {

-	DebugF ("unable to create NSData object!\n");

-	return;

-    }

-

-#ifdef __LP64__

-    DebugF ("data retainCount before NSBitmapImageRep initWithData: %lu\n",

-	[data retainCount]);

-#else

-    DebugF ("data retainCount before NSBitmapImageRep initWithData: %u\n",

-	[data retainCount]);

-#endif

-

-    bmimage = [[NSBitmapImageRep alloc] initWithData:data];

-

-    if (nil == bmimage)

-    {

-	[data autorelease];

-	DebugF ("unable to create NSBitmapImageRep!\n");

-	return;

-    }

-

-#ifdef __LP64__

-    DebugF ("data retainCount after NSBitmapImageRep initWithData: %lu\n", 

-	[data retainCount]);

-#else

-    DebugF ("data retainCount after NSBitmapImageRep initWithData: %u\n", 

-	[data retainCount]);

-#endif

-

-    @try 

-    {

-	tiff = [bmimage TIFFRepresentation];

-    }

-

-    @catch (NSException *e) 

-    {

-	DebugF ("NSTIFFException!\n");

-	[data autorelease];

-	[bmimage autorelease];

-	return;

-    }

-    

-#ifdef __LP64__

-    DebugF ("bmimage retainCount after TIFFRepresentation %lu\n", [bmimage retainCount]);

-#else

-    DebugF ("bmimage retainCount after TIFFRepresentation %u\n", [bmimage retainCount]);

-#endif

-

-    pbtypes = [NSArray arrayWithObjects:NSTIFFPboardType, nil];

-

-    if (nil == pbtypes)

-    {

-	[data autorelease];

-	[bmimage autorelease];

-	return;

-    }

-

-    [pb declareTypes:pbtypes owner:nil];

-    if (YES != [pb setData:tiff forType:NSTIFFPboardType])

-    {

-	DebugF ("writing pasteboard data failed!\n");

-    }

-

-    [data autorelease];

-

-#ifdef __LP64__

-    DebugF ("bmimage retainCount before release %lu\n", [bmimage retainCount]);

-#else

-    DebugF ("bmimage retainCount before release %u\n", [bmimage retainCount]);

-#endif

-

-    [bmimage autorelease];

-}

-

-/* This handles the UTF8_STRING type of selection. */

-- (void) handle_utf8_string:(struct propdata *)pdata pasteboard:(NSPasteboard *)pb

-{

-    NSString *string;

-    NSArray *pbtypes;

- 

-    TRACE ();

-

-    string = [[NSString alloc] initWithBytes:pdata->data length:pdata->length encoding:NSUTF8StringEncoding];

- 

-    if (nil == string)

-	return;

-

-    pbtypes = [NSArray arrayWithObjects:NSStringPboardType, nil];

-

-    if (nil == pbtypes)

-    {

-	[string autorelease];

-	return;	

-    }

-

-    [pb declareTypes:pbtypes owner:nil];

-    

-    if (YES != [pb setString:string forType:NSStringPboardType]) {

-	ErrorF("pasteboard setString:forType: failed!\n");

-    }

-    [string autorelease];

-    DebugF ("done handling utf8 string\n");

-}

-

-/* This handles the STRING type, which should be in Latin-1. */

-- (void) handle_string: (struct propdata *)pdata pasteboard:(NSPasteboard *)pb

-{

-    NSString *string; 

-    NSArray *pbtypes;

-

-    TRACE ();

-

-    string = [[NSString alloc] initWithBytes:pdata->data length:pdata->length encoding:NSISOLatin1StringEncoding];

-    

-    if (nil == string)

-	return;

-

-    pbtypes = [NSArray arrayWithObjects:NSStringPboardType, nil];

-

-    if (nil == pbtypes)

-    {

-	[string autorelease];

-	return;

-    }

-

-    [pb declareTypes:pbtypes owner:nil];

-    if (YES != [pb setString:string forType:NSStringPboardType]) {

-	ErrorF("pasteboard setString:forType failed in handle_string!\n");

-    }

-    [string autorelease];

-}

-

-/* This is called when the selection is completely retrieved from another client. */

-/* Warning: this frees the propdata. */

-- (void) handle_selection:(Atom)selection type:(Atom)type propdata:(struct propdata *)pdata

-{

-    NSPasteboard *pb;

-

-    TRACE ();

-

-    pb = [NSPasteboard generalPasteboard];

-

-    if (nil == pb) 

-    {

-	[self copy_completed:selection];

-	free_propdata (pdata);

-	return;

-    }

-

-    /*

-     * Some apps it seems set the type to TARGETS instead of ATOM, such as Eterm.

-     * These aren't ICCCM compliant apps, but we need these to work... 

-     */

-    if (request_atom == atoms->targets

-	&& (type == atoms->atom || type == atoms->targets))

-    {

-	[self handle_targets:selection propdata:pdata];

-	free_propdata(pdata);

-	return;

-    } 

-    else if (type == atoms->image_png)

-    {

-	[self handle_image:pdata pasteboard:pb];

-    } 

-    else if (type == atoms->image_jpeg)

-    {

-	[self handle_image:pdata pasteboard:pb];

-    }

-    else if (type == atoms->utf8_string) 

-    {

-	[self handle_utf8_string:pdata pasteboard:pb];

-    } 

-    else if (type == atoms->string)

-    {

-	[self handle_string:pdata pasteboard:pb];

-    } 

-   

-    free_propdata(pdata);

-

-    [self copy_completed:selection];

-}

-

-

-- (void) copy_completed:(Atom)selection

-{

-    TRACE ();

-    char *name;

-

-    (void)name; /* Avoid warning with non-debug compiles. */

-#ifdef DEBUG

-    name = XGetAtomName (xpbproxy_dpy, selection);

-    if (name)

-    {

-	DebugF ("copy_completed: %s\n", name);

-	XFree (name);

-    }

-#endif

-

-    if (selection == atoms->primary && pending_copy > 0)

-    {

-	--pending_copy;

-	if (pending_copy > 0)

-	{

-	    /* Copy PRIMARY again. */

-	    [self x_copy_request_targets];

-	    return;

-	}

-    }

-    else if (selection == atoms->clipboard && pending_clipboard > 0) 

-    {

-	--pending_clipboard;

-	if (pending_clipboard > 0) 

-	{

-	    /* Copy CLIPBOARD. */

-	    [self claim_clipboard];

-	    return;

-	} 

-	else 

-	{

-	    /* We got the final data.  Now set pbproxy as the owner. */

-	    [self own_clipboard];

-	    return;

-	}

-    }

-    

-    /* 

-     * We had 1 or more primary in progress, and the clipboard arrived

-     * while we were busy. 

-     */

-    if (pending_clipboard > 0)

-    {

-	[self claim_clipboard];

-    }

-}

-

-- (void) reload_preferences

-{

-    /*

-     * It's uncertain how we could handle the synchronization failing, so cast to void.

-     * The prefs_get_bool should fall back to defaults if the org.x.X11 plist doesn't exist or is invalid.

-     */

-    (void)CFPreferencesAppSynchronize(app_prefs_domain_cfstr);

-#ifdef STANDALONE_XPBPROXY

-    if(xpbproxy_is_standalone)

-        pbproxy_prefs.active = YES;

-    else

-#endif

-    pbproxy_prefs.active = prefs_get_bool(CFSTR("sync_pasteboard"), pbproxy_prefs.active);

-    pbproxy_prefs.primary_on_grab = prefs_get_bool(CFSTR("sync_primary_on_select"), pbproxy_prefs.primary_on_grab);

-    pbproxy_prefs.clipboard_to_pasteboard = prefs_get_bool(CFSTR("sync_clipboard_to_pasteboard"), pbproxy_prefs.clipboard_to_pasteboard);

-    pbproxy_prefs.pasteboard_to_primary = prefs_get_bool(CFSTR("sync_pasteboard_to_primary"), pbproxy_prefs.pasteboard_to_primary);

-    pbproxy_prefs.pasteboard_to_clipboard =  prefs_get_bool(CFSTR("sync_pasteboard_to_clipboard"), pbproxy_prefs.pasteboard_to_clipboard);

-

-    /* This is used for debugging. */

-    //dump_prefs();

-

-    if(pbproxy_prefs.active && pbproxy_prefs.primary_on_grab && !xpbproxy_have_xfixes) {

-        ErrorF("Disabling sync_primary_on_select functionality due to missing XFixes extension.\n");

-        pbproxy_prefs.primary_on_grab = NO;

-    }

-

-    /* Claim or release the CLIPBOARD_MANAGER atom */

-    if(![self set_clipboard_manager_status:(pbproxy_prefs.active && pbproxy_prefs.clipboard_to_pasteboard)])

-        pbproxy_prefs.clipboard_to_pasteboard = NO;

-    

-    if(pbproxy_prefs.active && pbproxy_prefs.clipboard_to_pasteboard)

-        [self claim_clipboard];

-}

-

-- (BOOL) is_active 

-{

-    return pbproxy_prefs.active;

-}

-

-/* NSPasteboard-required methods */

-

-- (void) paste:(id)sender

-{

-    TRACE ();

-}

-

-- (void) pasteboard:(NSPasteboard *)pb provideDataForType:(NSString *)type

-{

-    TRACE ();

-}

-

-- (void) pasteboardChangedOwner:(NSPasteboard *)pb

-{

-    TRACE ();

-

-    /* Right now we don't care with this. */

-}

-

-/* Allocation */

-

-- init

-{

-    unsigned long pixel;

-

-    self = [super init];

-    if (self == nil)

-	return nil;

-

-    atoms->primary = XInternAtom (xpbproxy_dpy, "PRIMARY", False);

-    atoms->clipboard = XInternAtom (xpbproxy_dpy, "CLIPBOARD", False);

-    atoms->text = XInternAtom (xpbproxy_dpy, "TEXT", False);

-    atoms->utf8_string = XInternAtom (xpbproxy_dpy, "UTF8_STRING", False);

-    atoms->string = XInternAtom (xpbproxy_dpy, "STRING", False);

-    atoms->targets = XInternAtom (xpbproxy_dpy, "TARGETS", False);

-    atoms->multiple = XInternAtom (xpbproxy_dpy, "MULTIPLE", False);

-    atoms->cstring = XInternAtom (xpbproxy_dpy, "CSTRING", False);

-    atoms->image_png = XInternAtom (xpbproxy_dpy, "image/png", False);

-    atoms->image_jpeg = XInternAtom (xpbproxy_dpy, "image/jpeg", False);

-    atoms->incr = XInternAtom (xpbproxy_dpy, "INCR", False);

-    atoms->atom = XInternAtom (xpbproxy_dpy, "ATOM", False);

-    atoms->clipboard_manager = XInternAtom (xpbproxy_dpy, "CLIPBOARD_MANAGER", False);

-    atoms->compound_text = XInternAtom (xpbproxy_dpy, "COMPOUND_TEXT", False);

-    atoms->atom_pair = XInternAtom (xpbproxy_dpy, "ATOM_PAIR", False);

-

-    pixel = BlackPixel (xpbproxy_dpy, DefaultScreen (xpbproxy_dpy));

-    _selection_window = XCreateSimpleWindow (xpbproxy_dpy, DefaultRootWindow (xpbproxy_dpy),

-					     0, 0, 1, 1, 0, pixel, pixel);

-

-    /* This is used to get PropertyNotify events when doing INCR transfers. */

-    XSelectInput (xpbproxy_dpy, _selection_window, PropertyChangeMask);

-

-    request_atom = None;

-

-    init_propdata (&pending.propdata);

-    pending.requestor = None;

-    pending.selection = None;

-

-    pending_copy = 0;

-    pending_clipboard = 0;

-

-    if(xpbproxy_have_xfixes)

-        XFixesSelectSelectionInput(xpbproxy_dpy, _selection_window, atoms->primary, 

-                                   XFixesSetSelectionOwnerNotifyMask);

-

-    [self reload_preferences];

-    

-    return self;

-}

-

-- (void) dealloc

-{

-    if (None != _selection_window)

-    {

-	XDestroyWindow (xpbproxy_dpy, _selection_window);

-	_selection_window = None;

-    }

-

-    free_propdata (&pending.propdata);

-

-    [super dealloc];

-}

-

-@end

+/* x-selection.m -- proxies between NSPasteboard and X11 selections
+
+   Copyright (c) 2002, 2008 Apple Computer, Inc. All rights reserved.
+
+   Permission is hereby granted, free of charge, to any person
+   obtaining a copy of this software and associated documentation files
+   (the "Software"), to deal in the Software without restriction,
+   including without limitation the rights to use, copy, modify, merge,
+   publish, distribute, sublicense, and/or sell copies of the Software,
+   and to permit persons to whom the Software is furnished to do so,
+   subject to the following conditions:
+
+   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 ABOVE LISTED COPYRIGHT
+   HOLDER(S) 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(s) of the above
+   copyright holders shall not be used in advertising or otherwise to
+   promote the sale, use or other dealings in this Software without
+   prior written authorization. 
+*/
+
+#import "x-selection.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <X11/Xatom.h>
+#include <X11/Xutil.h>
+#import <AppKit/NSGraphics.h>
+#import <AppKit/NSImage.h>
+#import <AppKit/NSBitmapImageRep.h>
+
+/*
+ * The basic design of the pbproxy code is as follows.
+ *
+ * When a client selects text, say from an xterm - we only copy it when the
+ * X11 Edit->Copy menu item is pressed or the shortcut activated.  In this
+ * case we take the PRIMARY selection, and set it as the NSPasteboard data.
+ *
+ * When an X11 client copies something to the CLIPBOARD, pbproxy greedily grabs
+ * the data, sets it as the NSPasteboard data, and finally sets itself as 
+ * owner of the CLIPBOARD.
+ * 
+ * When an X11 window is activated we check to see if the NSPasteboard has
+ * changed.  If the NSPasteboard has changed, then we set pbproxy as owner
+ * of the PRIMARY and CLIPBOARD and respond to requests for text and images.
+ *
+ * The behavior is now dynamic since the information above was written.
+ * The behavior is now dependent on the pbproxy_prefs below.
+ */
+
+/*
+ * TODO:
+ * 1. handle MULTIPLE - I need to study the ICCCM further, and find a test app.
+ * 2. Handle NSPasteboard updates immediately, not on active/inactive
+ *    - Open xterm, run 'cat readme.txt | pbcopy'
+ */
+
+static struct {
+    BOOL active ;
+    BOOL primary_on_grab; /* This is provided as an option for people who
+			   * want it and has issues that won't ever be
+			   * addressed to make it *always* work.
+			   */
+    BOOL clipboard_to_pasteboard;
+    BOOL pasteboard_to_primary;
+    BOOL pasteboard_to_clipboard;
+} pbproxy_prefs = { YES, NO, YES, YES, YES };
+
+@implementation x_selection
+
+static struct propdata null_propdata = {NULL, 0, 0};
+
+#ifdef DEBUG
+static void
+dump_prefs() {
+    ErrorF(fp, 
+	   "pbproxy preferences:\n"
+	   "\tactive %u\n"
+	   "\tprimary_on_grab %u\n"
+	   "\tclipboard_to_pasteboard %u\n"
+	   "\tpasteboard_to_primary %u\n"
+	   "\tpasteboard_to_clipboard %u\n",
+	   pbproxy_prefs.active,
+	   pbproxy_prefs.primary_on_grab,
+	   pbproxy_prefs.clipboard_to_pasteboard,
+	   pbproxy_prefs.pasteboard_to_primary,
+	   pbproxy_prefs.pasteboard_to_clipboard);
+}
+#endif
+
+extern CFStringRef app_prefs_domain_cfstr;
+
+static BOOL
+prefs_get_bool (CFStringRef key, BOOL defaultValue) {
+    Boolean value, ok;
+    
+    value = CFPreferencesGetAppBooleanValue (key, app_prefs_domain_cfstr, &ok);
+   
+    return ok ? (BOOL) value : defaultValue;
+}
+
+static void
+init_propdata (struct propdata *pdata)
+{
+    *pdata = null_propdata;
+}
+
+static void
+free_propdata (struct propdata *pdata)
+{
+    free (pdata->data);
+    *pdata = null_propdata;
+}
+
+/*
+ * Return True if an error occurs.  Return False if pdata has data 
+ * and we finished. 
+ * The property is only deleted when bytesleft is 0 if delete is True.
+ */
+static Bool
+get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Atom *type) 
+{
+    long offset = 0;
+    unsigned long numitems, bytesleft = 0;
+#ifdef TEST
+    /* This is used to test the growth handling. */
+    unsigned long length = 4UL;
+#else
+    unsigned long length = (100000UL + 3) / 4; 
+#endif
+    unsigned char *buf = NULL, *chunk = NULL;
+    size_t buflen = 0, chunkbytesize = 0;
+    int format;
+
+    TRACE ();
+    
+    if(None == property)
+	return True;
+    
+    do 
+    {
+	unsigned long newbuflen = 0;
+	unsigned char *newbuf = NULL;
+	
+#ifdef TEST   
+	ErrorF("bytesleft %lu\n", bytesleft);
+#endif
+
+	if (Success != XGetWindowProperty (xpbproxy_dpy, win, property,
+					   offset, length, delete, 
+					   AnyPropertyType,
+					   type, &format, &numitems, 
+					   &bytesleft, &chunk)) 
+	{
+	    DebugF ("Error while getting window property.\n");
+	    *pdata = null_propdata;
+	    free (buf);
+	    return True;
+	}
+	
+#ifdef TEST
+	ErrorF("format %d numitems %lu bytesleft %lu\n",
+	       format, numitems, bytesleft);
+	
+	ErrorF("type %s\n", XGetAtomName (xpbproxy_dpy, *type));
+#endif
+	
+	/* Format is the number of bits. */
+	if (format == 8)
+	  chunkbytesize = numitems;
+	else if (format == 16)
+	  chunkbytesize = numitems * sizeof(short);
+	else if (format == 32)
+	  chunkbytesize = numitems * sizeof(long);
+
+#ifdef TEST
+	ErrorF("chunkbytesize %zu\n", chunkbytesize);
+#endif
+ 	newbuflen = buflen + chunkbytesize;
+	if (newbuflen > 0) 
+	{
+	    newbuf = realloc (buf, newbuflen);
+	    
+	    if (NULL == newbuf)
+	    {
+		XFree (chunk);
+		free (buf);
+		return True;
+	    }
+	
+	    memcpy (newbuf + buflen, chunk, chunkbytesize);
+	    XFree (chunk);
+	    buf = newbuf;
+	    buflen = newbuflen;
+	    /* offset is a multiple of 32 bits*/
+	    offset += chunkbytesize / 4;
+	} 
+	else 
+	{
+	    if (chunk) 
+		XFree (chunk);
+	}
+	
+#ifdef TEST
+	ErrorF("bytesleft %lu\n", bytesleft);
+#endif
+    } while (bytesleft > 0);
+    
+    pdata->data = buf;
+    pdata->length = buflen;
+    pdata->format = format;
+
+    return /*success*/ False;
+}
+
+
+/* Implementation methods */
+
+/* This finds the preferred type from a TARGETS list.*/
+- (Atom) find_preferred:(struct propdata *)pdata
+{
+    Atom a = None;
+    size_t i, step;
+    Bool png = False, jpeg = False, utf8 = False, string = False;
+
+    TRACE ();
+
+    if (pdata->format != 32)
+    {
+	ErrorF("Atom list is expected to be formatted as an array of 32bit values.\n");
+	return None;
+    }
+
+    for (i = 0, step = sizeof(long); i < pdata->length; i += step)
+    {
+	a = (Atom)*(long *)(pdata->data + i);
+
+	if (a == atoms->image_png)
+	{
+	    png = True;
+	}
+	else if (a == atoms->image_jpeg)
+	{
+	    jpeg = True;
+	}
+	else if (a == atoms->utf8_string)
+	{
+	    utf8 = True;
+        } 
+	else if (a == atoms->string)
+	{
+	    string = True;
+	}
+	else
+	{
+	    char *type = XGetAtomName(xpbproxy_dpy, a);
+	    if (type)
+	    {
+		DebugF("Unhandled X11 mime type: %s", type);
+		XFree(type);
+	    }
+	}
+    }
+
+    /*We prefer PNG over strings, and UTF8 over a Latin-1 string.*/
+    if (png)
+	return atoms->image_png;
+
+    if (jpeg)
+	return atoms->image_jpeg;
+
+    if (utf8)
+	return atoms->utf8_string;
+
+    if (string)
+	return atoms->string;
+
+    /* This is evidently something we don't know how to handle.*/
+    return None;
+}
+
+/* Return True if this is an INCR-style transfer. */
+- (Bool) is_incr_type:(XSelectionEvent *)e
+{
+    Atom seltype;
+    int format;
+    unsigned long numitems = 0UL, bytesleft = 0UL;
+    unsigned char *chunk;
+       
+    TRACE ();
+
+    if (Success != XGetWindowProperty (xpbproxy_dpy, e->requestor, e->property,
+				       /*offset*/ 0L, /*length*/ 4UL,
+				       /*Delete*/ False,
+				       AnyPropertyType, &seltype, &format,
+				       &numitems, &bytesleft, &chunk))
+    {
+	return False;
+    }
+
+    if(chunk)
+	XFree(chunk);
+
+    return (seltype == atoms->incr) ? True : False;
+}
+
+/* 
+ * This should be called after a selection has been copied, 
+ * or when the selection is unfinished before a transfer completes. 
+ */
+- (void) release_pending
+{
+    TRACE ();
+
+    free_propdata (&pending.propdata);
+    pending.requestor = None;
+    pending.selection = None;
+}
+
+/* Return True if an error occurs during an append.*/
+/* Return False if the append succeeds. */
+- (Bool) append_to_pending:(struct propdata *)pdata requestor:(Window)requestor
+{
+    unsigned char *newdata;
+    size_t newlength;
+    
+    TRACE ();
+    
+    if (requestor != pending.requestor)
+    {
+	[self release_pending];
+	pending.requestor = requestor;
+    }
+	
+    newlength = pending.propdata.length + pdata->length;
+    newdata = realloc(pending.propdata.data, newlength);
+
+    if(NULL == newdata) 
+    {
+	perror("realloc propdata");
+	[self release_pending];
+        return True;
+    }
+
+    memcpy(newdata + pending.propdata.length, pdata->data, pdata->length);
+    pending.propdata.data = newdata;
+    pending.propdata.length = newlength;
+    
+    return False;
+}
+
+
+
+/* Called when X11 becomes active (i.e. has key focus) */
+- (void) x_active:(Time)timestamp
+{
+    static NSInteger changeCount;
+    NSInteger countNow;
+    NSPasteboard *pb;
+
+    TRACE ();
+
+    pb = [NSPasteboard generalPasteboard];
+
+    if (nil == pb)
+	return;
+
+    countNow = [pb changeCount];
+
+    if (countNow != changeCount)
+    {
+        DebugF ("changed pasteboard!\n");
+        changeCount = countNow;
+        
+        if (pbproxy_prefs.pasteboard_to_primary)
+        {
+            XSetSelectionOwner (xpbproxy_dpy, atoms->primary, _selection_window, CurrentTime);
+        }
+        
+        if (pbproxy_prefs.pasteboard_to_clipboard) {
+            [self own_clipboard];
+        }
+    }
+
+#if 0
+	/*gstaplin: we should perhaps investigate something like this branch above...*/
+	if ([_pasteboard availableTypeFromArray: _known_types] != nil)
+	{
+	    /* Pasteboard has data we should proxy; I think it makes
+	       sense to put it on both CLIPBOARD and PRIMARY */
+
+	    XSetSelectionOwner (xpbproxy_dpy, atoms->clipboard,
+				_selection_window, timestamp);
+	    XSetSelectionOwner (xpbproxy_dpy, atoms->primary,
+				_selection_window, timestamp);
+	}
+#endif
+}
+
+/* Called when X11 loses key focus */
+- (void) x_inactive:(Time)timestamp
+{
+    TRACE ();
+}
+
+/* This requests the TARGETS list from the PRIMARY selection owner. */
+- (void) x_copy_request_targets
+{
+    TRACE ();
+
+    request_atom = atoms->targets;
+    XConvertSelection (xpbproxy_dpy, atoms->primary, atoms->targets,
+		       atoms->primary, _selection_window, CurrentTime);
+}
+
+/* Called when the Edit/Copy item on the main X11 menubar is selected
+ * and no appkit window claims it. */
+- (void) x_copy:(Time)timestamp
+{
+    Window w;
+
+    TRACE ();
+
+    w = XGetSelectionOwner (xpbproxy_dpy, atoms->primary);
+
+    if (None != w)
+    {
+	++pending_copy;
+	
+	if (1 == pending_copy) {
+	    /*
+	     * There are no other copy operations in progress, so we
+	     * can proceed safely.  Otherwise the copy_completed method
+	     * will see that the pending_copy is > 1, and do another copy.
+	     */	    
+	    [self x_copy_request_targets];
+	}
+    }
+}
+
+/* Set pbproxy as owner of the SELECTION_MANAGER selection.
+ * This prevents tools like xclipboard from causing havoc.
+ * Returns TRUE on success
+ */
+- (BOOL) set_clipboard_manager_status:(BOOL)value
+{
+    TRACE ();
+
+    Window owner = XGetSelectionOwner (xpbproxy_dpy, atoms->clipboard_manager);
+
+    if(value) {
+        if(owner == _selection_window)
+            return TRUE;
+
+        if(owner != None) {
+            ErrorF("A clipboard manager using window 0x%lx already owns the clipboard selection.  "
+		   "pbproxy will not sync clipboard to pasteboard.\n", owner);
+            return FALSE;
+        }
+        
+        XSetSelectionOwner(xpbproxy_dpy, atoms->clipboard_manager, _selection_window, CurrentTime);
+        return (_selection_window == XGetSelectionOwner(xpbproxy_dpy, atoms->clipboard_manager));
+    } else {
+        if(owner != _selection_window)
+            return TRUE;
+
+        XSetSelectionOwner(xpbproxy_dpy, atoms->clipboard_manager, None, CurrentTime);
+        return(None == XGetSelectionOwner(xpbproxy_dpy, atoms->clipboard_manager));
+    }
+    
+    return FALSE;
+}
+
+/*
+ * This occurs when we previously owned a selection, 
+ * and then lost it from another client.
+ */
+- (void) clear_event:(XSelectionClearEvent *)e
+{
+    
+
+    TRACE ();
+        
+    DebugF ("e->selection %s\n", XGetAtomName (xpbproxy_dpy, e->selection));
+    
+    if(e->selection == atoms->clipboard) {
+        /* 
+         * We lost ownership of the CLIPBOARD.
+         */
+        ++pending_clipboard;
+        
+        if (1 == pending_clipboard) {
+            /* Claim the clipboard contents from the new owner. */
+            [self claim_clipboard];
+        }
+    } else if(e->selection == atoms->clipboard_manager) {
+        if(pbproxy_prefs.clipboard_to_pasteboard) {
+            /* Another CLIPBOARD_MANAGER has set itself as owner.  Disable syncing
+             * to avoid a race.
+             */
+            ErrorF("Another clipboard manager was started!  "
+		    "xpbproxy is disabling syncing with clipboard.\n"); 
+            pbproxy_prefs.clipboard_to_pasteboard = NO;
+        }
+    }
+}
+
+/* 
+ * We greedily acquire the clipboard after it changes, and on startup.
+ */
+- (void) claim_clipboard
+{
+    Window owner;
+    
+    TRACE ();
+    
+    if (!pbproxy_prefs.clipboard_to_pasteboard)
+        return;
+    
+    owner = XGetSelectionOwner (xpbproxy_dpy, atoms->clipboard);
+    if (None == owner) {
+        /*
+         * The owner probably died or we are just starting up pbproxy.
+         * Set pbproxy's _selection_window as the owner, and continue.
+         */
+        DebugF ("No clipboard owner.\n");
+        [self copy_completed:atoms->clipboard];
+        return;
+    } else if (owner == _selection_window) {
+        [self copy_completed:atoms->clipboard];
+        return;
+    }
+    
+    DebugF ("requesting targets\n");
+    
+    request_atom = atoms->targets;
+    XConvertSelection (xpbproxy_dpy, atoms->clipboard, atoms->targets,
+                       atoms->clipboard, _selection_window, CurrentTime);
+    XFlush (xpbproxy_dpy);
+    /* Now we will get a SelectionNotify event in the future. */
+}
+
+/* Greedily acquire the clipboard. */
+- (void) own_clipboard
+{
+
+    TRACE ();
+
+    /* We should perhaps have a boundary limit on the number of iterations... */
+    do 
+    {
+	XSetSelectionOwner (xpbproxy_dpy, atoms->clipboard, _selection_window,
+			    CurrentTime);
+    } while (_selection_window != XGetSelectionOwner (xpbproxy_dpy,
+						      atoms->clipboard));
+}
+
+- (void) init_reply:(XEvent *)reply request:(XSelectionRequestEvent *)e
+{
+    reply->xselection.type = SelectionNotify;
+    reply->xselection.selection = e->selection;
+    reply->xselection.target = e->target;
+    reply->xselection.requestor = e->requestor;
+    reply->xselection.time = e->time;
+    reply->xselection.property = None; 
+}
+
+- (void) send_reply:(XEvent *)reply
+{
+    /*
+     * We are supposed to use an empty event mask, and not propagate
+     * the event, according to the ICCCM.
+     */
+    DebugF ("reply->xselection.requestor 0x%lx\n", reply->xselection.requestor);
+  
+    XSendEvent (xpbproxy_dpy, reply->xselection.requestor, False, 0, reply);
+    XFlush (xpbproxy_dpy);
+}
+
+/* 
+ * This responds to a TARGETS request.
+ * The result is a list of a ATOMs that correspond to the types available
+ * for a selection.  
+ * For instance an application might provide a UTF8_STRING and a STRING
+ * (in Latin-1 encoding).  The requestor can then make the choice based on
+ * the list.
+ */
+- (void) send_targets:(XSelectionRequestEvent *)e pasteboard:(NSPasteboard *)pb
+{
+    XEvent reply;
+    NSArray *pbtypes;
+
+    [self init_reply:&reply request:e];
+
+    pbtypes = [pb types];
+    if (pbtypes)
+    {
+	long list[7]; /* Don't forget to increase this if we handle more types! */
+        long count = 0;
+ 	
+	/*
+	 * I'm not sure if this is needed, but some toolkits/clients list 
+	 * TARGETS in response to targets. 
+	 */
+	list[count] = atoms->targets;
+	++count;
+
+	if ([pbtypes containsObject:NSStringPboardType])
+	{
+	    /* We have a string type that we can convert to UTF8, or Latin-1... */
+	    DebugF ("NSStringPboardType\n");
+	    list[count] = atoms->utf8_string;
+	    ++count;
+	    list[count] = atoms->string;
+	    ++count;
+	    list[count] = atoms->compound_text;
+	    ++count;
+	}
+
+	/* TODO add the NSPICTPboardType back again, once we have conversion
+	 * functionality in send_image.
+	 */
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations" // NSPICTPboardType
+#endif
+
+	if ([pbtypes containsObject:NSPICTPboardType] 
+	    || [pbtypes containsObject:NSTIFFPboardType]) 
+	{
+	    /* We can convert a TIFF to a PNG or JPEG. */
+	    DebugF ("NSTIFFPboardType\n");
+	    list[count] = atoms->image_png;
+	    ++count;
+	    list[count] = atoms->image_jpeg;
+	    ++count;
+	} 
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+	if (count)
+	{
+	    /* We have a list of ATOMs to send. */
+	    XChangeProperty (xpbproxy_dpy, e->requestor, e->property, atoms->atom, 32,
+			 PropModeReplace, (unsigned char *) list, count);
+	    
+	    reply.xselection.property = e->property;
+	}
+    }
+
+    [self send_reply:&reply];
+}
+
+
+- (void) send_string:(XSelectionRequestEvent *)e utf8:(BOOL)utf8 pasteboard:(NSPasteboard *)pb
+{
+    XEvent reply;
+    NSArray *pbtypes;
+    NSString *data;
+    const char *bytes;
+    NSUInteger length;
+
+    TRACE ();
+
+    [self init_reply:&reply request:e];
+
+    pbtypes = [pb types];
+ 
+    if (![pbtypes containsObject:NSStringPboardType])
+    {
+	[self send_reply:&reply];
+	return;
+    }
+
+#ifdef __LP64__
+    DebugF ("pbtypes retainCount after containsObject: %lu\n", [pbtypes retainCount]);
+#else
+    DebugF ("pbtypes retainCount after containsObject: %u\n", [pbtypes retainCount]);
+#endif
+
+    data = [pb stringForType:NSStringPboardType];
+
+    if (nil == data)
+    {
+	[self send_reply:&reply];
+	return;
+    }
+
+    if (utf8) 
+    {
+	bytes = [data UTF8String];
+	/*
+	 * We don't want the UTF-8 string length here.  
+	 * We want the length in bytes.
+	 */
+	length = strlen (bytes);
+	
+	if (length < 50) {
+	    DebugF ("UTF-8: %s\n", bytes);
+#ifdef __LP64__
+	    DebugF ("UTF-8 length: %lu\n", length); 
+#else
+	    DebugF ("UTF-8 length: %u\n", length); 
+#endif
+	}
+    } 
+    else 
+    {
+	DebugF ("Latin-1\n");
+	bytes = [data cStringUsingEncoding:NSISOLatin1StringEncoding];
+	/*WARNING: bytes is not NUL-terminated. */
+	length = [data lengthOfBytesUsingEncoding:NSISOLatin1StringEncoding];
+    }
+
+    DebugF ("e->target %s\n", XGetAtomName (xpbproxy_dpy, e->target));
+    
+    XChangeProperty (xpbproxy_dpy, e->requestor, e->property, e->target,
+		     8, PropModeReplace, (unsigned char *) bytes, length);
+    
+    reply.xselection.property = e->property;
+
+    [self send_reply:&reply];
+}
+
+- (void) send_compound_text:(XSelectionRequestEvent *)e pasteboard:(NSPasteboard *)pb
+{
+    XEvent reply;
+    NSArray *pbtypes;
+    
+    TRACE ();
+    
+    [self init_reply:&reply request:e];
+     
+    pbtypes = [pb types];
+
+    if ([pbtypes containsObject: NSStringPboardType])
+    {
+	NSString *data = [pb stringForType:NSStringPboardType];
+	if (nil != data)
+	{
+	    /*
+	     * Cast to (void *) to avoid a const warning. 
+	     * AFAIK Xutf8TextListToTextProperty does not modify the input memory.
+	     */
+	    void *utf8 = (void *)[data UTF8String];
+	    char *list[] = { utf8, NULL };
+	    XTextProperty textprop;
+	    
+	    textprop.value = NULL;
+
+	    if (Success == Xutf8TextListToTextProperty (xpbproxy_dpy, list, 1,
+							XCompoundTextStyle,
+							&textprop))
+	    {
+		
+		if (8 != textprop.format)
+		    DebugF ("textprop.format is unexpectedly not 8 - it's %d instead\n",
+			textprop.format);
+
+		XChangeProperty (xpbproxy_dpy, e->requestor, e->property, 
+				 atoms->compound_text, textprop.format, 
+				 PropModeReplace, textprop.value,
+				 textprop.nitems);
+		
+		reply.xselection.property = e->property;
+	    }
+
+	    if (textprop.value)
+ 		XFree (textprop.value);
+
+	}
+    }
+    
+    [self send_reply:&reply];
+}
+
+/* Finding a test application that uses MULTIPLE has proven to be difficult. */
+- (void) send_multiple:(XSelectionRequestEvent *)e
+{
+    XEvent reply;
+
+    TRACE ();
+
+    [self init_reply:&reply request:e];
+
+    if (None != e->property) 
+    {
+	
+    }
+    
+    [self send_reply:&reply];
+}
+
+/* Return nil if an error occured. */
+/* DO NOT retain the encdata for longer than the length of an event response.  
+ * The autorelease pool will reuse/free it.
+ */ 
+- (NSData *) encode_image_data:(NSData *)data type:(NSBitmapImageFileType)enctype
+{
+    NSBitmapImageRep *bmimage = nil; 
+    NSData *encdata = nil;
+    NSDictionary *dict = nil;
+
+    bmimage = [[NSBitmapImageRep alloc] initWithData:data];
+
+    if (nil == bmimage)
+	return nil;
+
+    dict = [[NSDictionary alloc] init];
+    encdata = [bmimage representationUsingType:enctype properties:dict];
+
+    if (nil == encdata)
+    {
+	[dict autorelease];
+	[bmimage autorelease];
+	return nil;
+    }
+    
+    [dict autorelease];
+    [bmimage autorelease];
+
+    return encdata;
+}
+
+/* Return YES when an error has occured when trying to send the PICT. */
+/* The caller should send a default reponse with a property of None when an error occurs. */
+- (BOOL) send_image_pict_reply:(XSelectionRequestEvent *)e 
+		    pasteboard:(NSPasteboard *)pb 
+			  type:(NSBitmapImageFileType)imagetype
+{
+    XEvent reply;
+    NSImage *img = nil;
+    NSData *data = nil, *encdata = nil;
+    NSUInteger length;
+    const void *bytes = NULL;
+    
+    img = [[NSImage alloc] initWithPasteboard:pb];
+
+    if (nil == img) 
+    {
+	return YES;
+    }
+	    
+    data = [img TIFFRepresentation];
+
+    if (nil == data)
+    {
+	[img autorelease];
+	ErrorF("unable to convert PICT to TIFF!\n");
+	return YES;
+    }
+        
+    encdata = [self encode_image_data:data type:imagetype];
+    if(nil == encdata)
+    {
+	[img autorelease];
+	return YES;
+    }
+
+    [self init_reply:&reply request:e];
+
+    length = [encdata length];
+    bytes = [encdata bytes];
+    
+    XChangeProperty (xpbproxy_dpy, e->requestor, e->property, e->target,
+		     8, PropModeReplace, bytes, length);
+    reply.xselection.property = e->property;
+
+    [self send_reply:&reply];
+
+    [img autorelease];
+
+    return NO; /*no error*/
+}
+
+/* Return YES if an error occured. */
+/* The caller should send a reply with a property of None when an error occurs. */
+- (BOOL) send_image_tiff_reply:(XSelectionRequestEvent *)e
+		    pasteboard:(NSPasteboard *)pb 
+			  type:(NSBitmapImageFileType)imagetype
+{
+    XEvent reply;
+    NSData *data = nil;
+    NSData *encdata = nil;
+    NSUInteger length;
+    const void *bytes = NULL;
+
+    data = [pb dataForType:NSTIFFPboardType];
+
+    if (nil == data)
+ 	return YES;
+  
+    encdata = [self encode_image_data:data type:imagetype];
+
+    if(nil == encdata)
+	return YES;
+
+    [self init_reply:&reply request:e];
+
+    length = [encdata length];
+    bytes = [encdata bytes];
+    
+    XChangeProperty (xpbproxy_dpy, e->requestor, e->property, e->target,
+		     8, PropModeReplace, bytes, length);
+    reply.xselection.property = e->property;
+    
+    [self send_reply:&reply];
+
+    return NO; /*no error*/
+}
+
+- (void) send_image:(XSelectionRequestEvent *)e pasteboard:(NSPasteboard *)pb
+{
+    NSArray *pbtypes = nil;
+    NSBitmapImageFileType imagetype = NSPNGFileType;
+
+    TRACE ();
+
+    if (e->target == atoms->image_png)
+	imagetype = NSPNGFileType;
+    else if (e->target == atoms->image_jpeg)
+	imagetype = NSJPEGFileType;
+    else 
+    {
+	ErrorF("internal failure in xpbproxy!  imagetype being sent isn't PNG or JPEG.\n");
+    }
+
+    pbtypes = [pb types];
+
+    if (pbtypes) 
+    {
+	if ([pbtypes containsObject:NSTIFFPboardType])
+	{
+	    if (NO == [self send_image_tiff_reply:e pasteboard:pb type:imagetype]) 
+	  	return;
+	} 
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations" // NSPICTPboardType
+#endif
+     	else if ([pbtypes containsObject:NSPICTPboardType])
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+	{
+	    if (NO == [self send_image_pict_reply:e pasteboard:pb type:imagetype]) 
+		return;
+
+	    /* Fall through intentionally to the send_none: */
+	}
+    }
+
+    [self send_none:e];
+}
+
+- (void)send_none:(XSelectionRequestEvent *)e
+{
+    XEvent reply;
+
+    TRACE ();
+
+    [self init_reply:&reply request:e];
+    [self send_reply:&reply];
+}
+
+
+/* Another client requested the data or targets of data available from the clipboard. */
+- (void)request_event:(XSelectionRequestEvent *)e
+{
+    NSPasteboard *pb;
+
+    TRACE ();
+
+    /* TODO We should also keep track of the time of the selection, and 
+     * according to the ICCCM "refuse the request" if the event timestamp
+     * is before we owned it.
+     * What should we base the time on?  How can we get the current time just
+     * before an XSetSelectionOwner?  Is it the server's time, or the clients?
+     * According to the XSelectionRequestEvent manual page, the Time value
+     * may be set to CurrentTime or a time, so that makes it a bit different.
+     * Perhaps we should just punt and ignore races.
+     */
+
+    /*TODO we need a COMPOUND_TEXT test app*/
+    /*TODO we need a MULTIPLE test app*/
+
+    pb = [NSPasteboard generalPasteboard];
+    if (nil == pb) 
+    {
+	[self send_none:e];
+	return;
+    }
+    
+
+    if (None != e->target)
+	DebugF ("e->target %s\n", XGetAtomName (xpbproxy_dpy, e->target));
+
+    if (e->target == atoms->targets) 
+    {
+	/* The paste requestor wants to know what TARGETS we support. */
+	[self send_targets:e pasteboard:pb];
+    }
+    else if (e->target == atoms->multiple)
+    {
+	/*
+	 * This isn't finished, and may never be, unless I can find 
+	 * a good test app.
+	 */
+	[self send_multiple:e];
+    } 
+    else if (e->target == atoms->utf8_string)
+    {
+	[self send_string:e utf8:YES pasteboard:pb];
+    } 
+    else if (e->target == atoms->string)
+    {
+	[self send_string:e utf8:NO pasteboard:pb];
+    }
+    else if (e->target == atoms->compound_text)
+    {
+	[self send_compound_text:e pasteboard:pb];
+    }
+    else if (e->target == atoms->multiple)
+    {
+	[self send_multiple:e];
+    }
+    else if (e->target == atoms->image_png || e->target == atoms->image_jpeg)
+    {
+	[self send_image:e pasteboard:pb];
+    }
+    else
+    {
+	[self send_none:e];
+    }
+}
+
+/* This handles the events resulting from an XConvertSelection request. */
+- (void) notify_event:(XSelectionEvent *)e
+{
+    Atom type;
+    struct propdata pdata;
+	
+    TRACE ();
+
+    [self release_pending];
+ 
+    if (None == e->property) {
+	DebugF ("e->property is None.\n");
+	[self copy_completed:e->selection];
+	/* Nothing is selected. */
+	return;
+    }
+
+#if 0
+    ErrorF("e->selection %s\n", XGetAtomName (xpbproxy_dpy, e->selection));
+    ErrorF("e->property %s\n", XGetAtomName (xpbproxy_dpy, e->property));
+#endif
+
+    if ([self is_incr_type:e]) 
+    {
+	/*
+	 * This is an INCR-style transfer, which means that we 
+	 * will get the data after a series of PropertyNotify events.
+	 */
+	DebugF ("is INCR\n");
+
+	if (get_property (e->requestor, e->property, &pdata, /*Delete*/ True, &type)) 
+	{
+	    /* 
+	     * An error occured, so we should invoke the copy_completed:, but
+	     * not handle_selection:type:propdata:
+	     */
+	    [self copy_completed:e->selection];
+	    return;
+	}
+
+	free_propdata (&pdata);
+
+      	pending.requestor = e->requestor;
+	pending.selection = e->selection;
+
+	DebugF ("set pending.requestor to 0x%lx\n", pending.requestor);
+    }
+    else
+    {
+	if (get_property (e->requestor, e->property, &pdata, /*Delete*/ True, &type))
+	{
+	    [self copy_completed:e->selection];
+	    return;
+	}
+
+	/* We have the complete selection data.*/
+	[self handle_selection:e->selection type:type propdata:&pdata];
+	
+	DebugF ("handled selection with the first notify_event\n");
+    }
+}
+
+/* This is used for INCR transfers.  See the ICCCM for the details. */
+/* This is used to retrieve PRIMARY and CLIPBOARD selections. */
+- (void) property_event:(XPropertyEvent *)e
+{
+    struct propdata pdata;
+    Atom type;
+
+    TRACE ();
+    
+    if (None != e->atom) 
+    {
+#ifdef DEBUG
+	char *name = XGetAtomName (xpbproxy_dpy, e->atom);
+
+	if (name) 
+	{
+	    DebugF ("e->atom %s\n", name);
+	    XFree(name);
+	}
+#endif
+    }
+
+    if (None != pending.requestor && PropertyNewValue == e->state) 
+    {
+	DebugF ("pending.requestor 0x%lx\n", pending.requestor);
+
+	if (get_property (e->window, e->atom, &pdata, /*Delete*/ True, &type))
+        {
+	    [self copy_completed:pending.selection];
+	    [self release_pending];
+	    return;
+	}
+
+	if (0 == pdata.length) 
+	{
+	    /*
+	     * We completed the transfer.
+	     * handle_selection will call copy_completed: for us.
+	     */
+	    [self handle_selection:pending.selection type:type propdata:&pending.propdata];
+	    free_propdata(&pdata);
+	    pending.propdata = null_propdata;
+	    pending.requestor = None;
+	    pending.selection = None;
+	}
+	else 
+	{
+	    [self append_to_pending:&pdata requestor:e->window];
+	    free_propdata (&pdata);
+	}
+    }
+}
+
+- (void) xfixes_selection_notify:(XFixesSelectionNotifyEvent *)e {
+    if(!pbproxy_prefs.active)
+        return;
+    
+    switch(e->subtype) {              
+        case XFixesSetSelectionOwnerNotify:
+            if(e->selection == atoms->primary && pbproxy_prefs.primary_on_grab)
+                [self x_copy:e->timestamp];
+            break;
+                
+        case XFixesSelectionWindowDestroyNotify:
+        case XFixesSelectionClientCloseNotify:
+        default:
+            ErrorF("Unhandled XFixesSelectionNotifyEvent: subtype=%d\n", e->subtype);
+            break;
+    }
+}
+
+- (void) handle_targets: (Atom)selection propdata:(struct propdata *)pdata
+{
+    /* Find a type we can handle and prefer from the list of ATOMs. */
+    Atom preferred;
+    char *name;
+
+    TRACE ();
+
+    preferred = [self find_preferred:pdata];
+    
+    if (None == preferred) 
+    {
+	/* 
+	 * This isn't required by the ICCCM, but some apps apparently 
+	 * don't respond to TARGETS properly.
+	 */
+	preferred = atoms->string;
+    }
+
+    (void)name; /* Avoid a warning with non-debug compiles. */
+#ifdef DEBUG
+    name = XGetAtomName (xpbproxy_dpy, preferred);
+
+    if (name)
+    {
+	DebugF ("requesting %s\n", name);
+    }
+#endif
+    request_atom = preferred;
+    XConvertSelection (xpbproxy_dpy, selection, preferred, selection,
+		       _selection_window, CurrentTime);    
+}
+
+/* This handles the image type of selection (typically in CLIPBOARD). */
+/* We convert to a TIFF, so that other applications can paste more easily. */
+- (void) handle_image: (struct propdata *)pdata pasteboard:(NSPasteboard *)pb
+{
+    NSArray *pbtypes;
+    NSUInteger length;
+    NSData *data, *tiff;
+    NSBitmapImageRep *bmimage;
+
+    TRACE ();
+
+    length = pdata->length;
+    data = [[NSData alloc] initWithBytes:pdata->data length:length];
+
+    if (nil == data)
+    {
+	DebugF ("unable to create NSData object!\n");
+	return;
+    }
+
+#ifdef __LP64__
+    DebugF ("data retainCount before NSBitmapImageRep initWithData: %lu\n",
+	[data retainCount]);
+#else
+    DebugF ("data retainCount before NSBitmapImageRep initWithData: %u\n",
+	[data retainCount]);
+#endif
+
+    bmimage = [[NSBitmapImageRep alloc] initWithData:data];
+
+    if (nil == bmimage)
+    {
+	[data autorelease];
+	DebugF ("unable to create NSBitmapImageRep!\n");
+	return;
+    }
+
+#ifdef __LP64__
+    DebugF ("data retainCount after NSBitmapImageRep initWithData: %lu\n", 
+	[data retainCount]);
+#else
+    DebugF ("data retainCount after NSBitmapImageRep initWithData: %u\n", 
+	[data retainCount]);
+#endif
+
+    @try 
+    {
+	tiff = [bmimage TIFFRepresentation];
+    }
+
+    @catch (NSException *e) 
+    {
+	DebugF ("NSTIFFException!\n");
+	[data autorelease];
+	[bmimage autorelease];
+	return;
+    }
+    
+#ifdef __LP64__
+    DebugF ("bmimage retainCount after TIFFRepresentation %lu\n", [bmimage retainCount]);
+#else
+    DebugF ("bmimage retainCount after TIFFRepresentation %u\n", [bmimage retainCount]);
+#endif
+
+    pbtypes = [NSArray arrayWithObjects:NSTIFFPboardType, nil];
+
+    if (nil == pbtypes)
+    {
+	[data autorelease];
+	[bmimage autorelease];
+	return;
+    }
+
+    [pb declareTypes:pbtypes owner:nil];
+    if (YES != [pb setData:tiff forType:NSTIFFPboardType])
+    {
+	DebugF ("writing pasteboard data failed!\n");
+    }
+
+    [data autorelease];
+
+#ifdef __LP64__
+    DebugF ("bmimage retainCount before release %lu\n", [bmimage retainCount]);
+#else
+    DebugF ("bmimage retainCount before release %u\n", [bmimage retainCount]);
+#endif
+
+    [bmimage autorelease];
+}
+
+/* This handles the UTF8_STRING type of selection. */
+- (void) handle_utf8_string:(struct propdata *)pdata pasteboard:(NSPasteboard *)pb
+{
+    NSString *string;
+    NSArray *pbtypes;
+ 
+    TRACE ();
+
+    string = [[NSString alloc] initWithBytes:pdata->data length:pdata->length encoding:NSUTF8StringEncoding];
+ 
+    if (nil == string)
+	return;
+
+    pbtypes = [NSArray arrayWithObjects:NSStringPboardType, nil];
+
+    if (nil == pbtypes)
+    {
+	[string autorelease];
+	return;	
+    }
+
+    [pb declareTypes:pbtypes owner:nil];
+    
+    if (YES != [pb setString:string forType:NSStringPboardType]) {
+	ErrorF("pasteboard setString:forType: failed!\n");
+    }
+    [string autorelease];
+    DebugF ("done handling utf8 string\n");
+}
+
+/* This handles the STRING type, which should be in Latin-1. */
+- (void) handle_string: (struct propdata *)pdata pasteboard:(NSPasteboard *)pb
+{
+    NSString *string; 
+    NSArray *pbtypes;
+
+    TRACE ();
+
+    string = [[NSString alloc] initWithBytes:pdata->data length:pdata->length encoding:NSISOLatin1StringEncoding];
+    
+    if (nil == string)
+	return;
+
+    pbtypes = [NSArray arrayWithObjects:NSStringPboardType, nil];
+
+    if (nil == pbtypes)
+    {
+	[string autorelease];
+	return;
+    }
+
+    [pb declareTypes:pbtypes owner:nil];
+    if (YES != [pb setString:string forType:NSStringPboardType]) {
+	ErrorF("pasteboard setString:forType failed in handle_string!\n");
+    }
+    [string autorelease];
+}
+
+/* This is called when the selection is completely retrieved from another client. */
+/* Warning: this frees the propdata. */
+- (void) handle_selection:(Atom)selection type:(Atom)type propdata:(struct propdata *)pdata
+{
+    NSPasteboard *pb;
+
+    TRACE ();
+
+    pb = [NSPasteboard generalPasteboard];
+
+    if (nil == pb) 
+    {
+	[self copy_completed:selection];
+	free_propdata (pdata);
+	return;
+    }
+
+    /*
+     * Some apps it seems set the type to TARGETS instead of ATOM, such as Eterm.
+     * These aren't ICCCM compliant apps, but we need these to work... 
+     */
+    if (request_atom == atoms->targets
+	&& (type == atoms->atom || type == atoms->targets))
+    {
+	[self handle_targets:selection propdata:pdata];
+	free_propdata(pdata);
+	return;
+    } 
+    else if (type == atoms->image_png)
+    {
+	[self handle_image:pdata pasteboard:pb];
+    } 
+    else if (type == atoms->image_jpeg)
+    {
+	[self handle_image:pdata pasteboard:pb];
+    }
+    else if (type == atoms->utf8_string) 
+    {
+	[self handle_utf8_string:pdata pasteboard:pb];
+    } 
+    else if (type == atoms->string)
+    {
+	[self handle_string:pdata pasteboard:pb];
+    } 
+   
+    free_propdata(pdata);
+
+    [self copy_completed:selection];
+}
+
+
+- (void) copy_completed:(Atom)selection
+{
+    TRACE ();
+    char *name;
+
+    (void)name; /* Avoid warning with non-debug compiles. */
+#ifdef DEBUG
+    name = XGetAtomName (xpbproxy_dpy, selection);
+    if (name)
+    {
+	DebugF ("copy_completed: %s\n", name);
+	XFree (name);
+    }
+#endif
+
+    if (selection == atoms->primary && pending_copy > 0)
+    {
+	--pending_copy;
+	if (pending_copy > 0)
+	{
+	    /* Copy PRIMARY again. */
+	    [self x_copy_request_targets];
+	    return;
+	}
+    }
+    else if (selection == atoms->clipboard && pending_clipboard > 0) 
+    {
+	--pending_clipboard;
+	if (pending_clipboard > 0) 
+	{
+	    /* Copy CLIPBOARD. */
+	    [self claim_clipboard];
+	    return;
+	} 
+	else 
+	{
+	    /* We got the final data.  Now set pbproxy as the owner. */
+	    [self own_clipboard];
+	    return;
+	}
+    }
+    
+    /* 
+     * We had 1 or more primary in progress, and the clipboard arrived
+     * while we were busy. 
+     */
+    if (pending_clipboard > 0)
+    {
+	[self claim_clipboard];
+    }
+}
+
+- (void) reload_preferences
+{
+    /*
+     * It's uncertain how we could handle the synchronization failing, so cast to void.
+     * The prefs_get_bool should fall back to defaults if the org.x.X11 plist doesn't exist or is invalid.
+     */
+    (void)CFPreferencesAppSynchronize(app_prefs_domain_cfstr);
+#ifdef STANDALONE_XPBPROXY
+    if(xpbproxy_is_standalone)
+        pbproxy_prefs.active = YES;
+    else
+#endif
+    pbproxy_prefs.active = prefs_get_bool(CFSTR("sync_pasteboard"), pbproxy_prefs.active);
+    pbproxy_prefs.primary_on_grab = prefs_get_bool(CFSTR("sync_primary_on_select"), pbproxy_prefs.primary_on_grab);
+    pbproxy_prefs.clipboard_to_pasteboard = prefs_get_bool(CFSTR("sync_clipboard_to_pasteboard"), pbproxy_prefs.clipboard_to_pasteboard);
+    pbproxy_prefs.pasteboard_to_primary = prefs_get_bool(CFSTR("sync_pasteboard_to_primary"), pbproxy_prefs.pasteboard_to_primary);
+    pbproxy_prefs.pasteboard_to_clipboard =  prefs_get_bool(CFSTR("sync_pasteboard_to_clipboard"), pbproxy_prefs.pasteboard_to_clipboard);
+
+    /* This is used for debugging. */
+    //dump_prefs();
+
+    if(pbproxy_prefs.active && pbproxy_prefs.primary_on_grab && !xpbproxy_have_xfixes) {
+        ErrorF("Disabling sync_primary_on_select functionality due to missing XFixes extension.\n");
+        pbproxy_prefs.primary_on_grab = NO;
+    }
+
+    /* Claim or release the CLIPBOARD_MANAGER atom */
+    if(![self set_clipboard_manager_status:(pbproxy_prefs.active && pbproxy_prefs.clipboard_to_pasteboard)])
+        pbproxy_prefs.clipboard_to_pasteboard = NO;
+    
+    if(pbproxy_prefs.active && pbproxy_prefs.clipboard_to_pasteboard)
+        [self claim_clipboard];
+}
+
+- (BOOL) is_active 
+{
+    return pbproxy_prefs.active;
+}
+
+/* NSPasteboard-required methods */
+
+- (void) paste:(id)sender
+{
+    TRACE ();
+}
+
+- (void) pasteboard:(NSPasteboard *)pb provideDataForType:(NSString *)type
+{
+    TRACE ();
+}
+
+- (void) pasteboardChangedOwner:(NSPasteboard *)pb
+{
+    TRACE ();
+
+    /* Right now we don't care with this. */
+}
+
+/* Allocation */
+
+- init
+{
+    unsigned long pixel;
+
+    self = [super init];
+    if (self == nil)
+	return nil;
+
+    atoms->primary = XInternAtom (xpbproxy_dpy, "PRIMARY", False);
+    atoms->clipboard = XInternAtom (xpbproxy_dpy, "CLIPBOARD", False);
+    atoms->text = XInternAtom (xpbproxy_dpy, "TEXT", False);
+    atoms->utf8_string = XInternAtom (xpbproxy_dpy, "UTF8_STRING", False);
+    atoms->string = XInternAtom (xpbproxy_dpy, "STRING", False);
+    atoms->targets = XInternAtom (xpbproxy_dpy, "TARGETS", False);
+    atoms->multiple = XInternAtom (xpbproxy_dpy, "MULTIPLE", False);
+    atoms->cstring = XInternAtom (xpbproxy_dpy, "CSTRING", False);
+    atoms->image_png = XInternAtom (xpbproxy_dpy, "image/png", False);
+    atoms->image_jpeg = XInternAtom (xpbproxy_dpy, "image/jpeg", False);
+    atoms->incr = XInternAtom (xpbproxy_dpy, "INCR", False);
+    atoms->atom = XInternAtom (xpbproxy_dpy, "ATOM", False);
+    atoms->clipboard_manager = XInternAtom (xpbproxy_dpy, "CLIPBOARD_MANAGER", False);
+    atoms->compound_text = XInternAtom (xpbproxy_dpy, "COMPOUND_TEXT", False);
+    atoms->atom_pair = XInternAtom (xpbproxy_dpy, "ATOM_PAIR", False);
+
+    pixel = BlackPixel (xpbproxy_dpy, DefaultScreen (xpbproxy_dpy));
+    _selection_window = XCreateSimpleWindow (xpbproxy_dpy, DefaultRootWindow (xpbproxy_dpy),
+					     0, 0, 1, 1, 0, pixel, pixel);
+
+    /* This is used to get PropertyNotify events when doing INCR transfers. */
+    XSelectInput (xpbproxy_dpy, _selection_window, PropertyChangeMask);
+
+    request_atom = None;
+
+    init_propdata (&pending.propdata);
+    pending.requestor = None;
+    pending.selection = None;
+
+    pending_copy = 0;
+    pending_clipboard = 0;
+
+    if(xpbproxy_have_xfixes)
+        XFixesSelectSelectionInput(xpbproxy_dpy, _selection_window, atoms->primary, 
+                                   XFixesSetSelectionOwnerNotifyMask);
+
+    [self reload_preferences];
+    
+    return self;
+}
+
+- (void) dealloc
+{
+    if (None != _selection_window)
+    {
+	XDestroyWindow (xpbproxy_dpy, _selection_window);
+	_selection_window = None;
+    }
+
+    free_propdata (&pending.propdata);
+
+    [super dealloc];
+}
+
+@end
diff --git a/xorg-server/hw/xquartz/quartz.c b/xorg-server/hw/xquartz/quartz.c
index 45ea725b4..c395b42e6 100644
--- a/xorg-server/hw/xquartz/quartz.c
+++ b/xorg-server/hw/xquartz/quartz.c
@@ -1,488 +1,488 @@
-/*

- *

- * Quartz-specific support for the Darwin X Server

- *

- * Copyright (c) 2001-2004 Greg Parker and Torrey T. Lyons.

- *                 All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright

- * holders shall not be used in advertising or otherwise to promote the sale,

- * use or other dealings in this Software without prior written authorization.

- */

-

-#include "sanitizedCarbon.h"

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include "quartzCommon.h"

-#include "quartzRandR.h"

-#include "inputstr.h"

-#include "quartz.h"

-#include "darwin.h"

-#include "darwinEvents.h"

-#include "pseudoramiX.h"

-#define _APPLEWM_SERVER_

-#include "applewmExt.h"

-

-#include "X11Application.h"

-

-#include <X11/extensions/applewmconst.h>

-

-// X headers

-#include "scrnintstr.h"

-#include "windowstr.h"

-#include "colormapst.h"

-#include "globals.h"

-#include "mi.h"

-

-// System headers

-#include <stdlib.h>

-#include <string.h>

-#include <sys/types.h>

-#include <sys/stat.h>

-#include <fcntl.h>

-#include <IOKit/pwr_mgt/IOPMLib.h>

-#include <libkern/OSAtomic.h>

-#include <signal.h>

-

-#include <rootlessCommon.h>

-#include <Xplugin.h>

-

-DevPrivateKeyRec        quartzScreenKeyRec;

-int                     aquaMenuBarHeight = 0;

-QuartzModeProcsPtr      quartzProcs = NULL;

-const char             *quartzOpenGLBundle = NULL;

-

-Bool XQuartzFullscreenDisableHotkeys = TRUE;

-Bool XQuartzOptionSendsAlt = FALSE;

-Bool XQuartzEnableKeyEquivalents = TRUE;

-Bool XQuartzFullscreenVisible = FALSE;

-Bool XQuartzRootlessDefault = TRUE;

-Bool XQuartzIsRootless = TRUE;

-Bool XQuartzServerVisible = FALSE;

-Bool XQuartzFullscreenMenu = FALSE;

-

-int32_t XQuartzShieldingWindowLevel = 0;

-

-/*

-===========================================================================

-

- Screen functions

-

-===========================================================================

-*/

-

-/*

- * QuartzAddScreen

- *  Do mode dependent initialization of each screen for Quartz.

- */

-Bool QuartzAddScreen(

-    int index,

-    ScreenPtr pScreen)

-{

-    // allocate space for private per screen Quartz specific storage

-    QuartzScreenPtr displayInfo = calloc(sizeof(QuartzScreenRec), 1);

-

-    // QUARTZ_PRIV(pScreen) = displayInfo;

-    dixSetPrivate(&pScreen->devPrivates, quartzScreenKey, displayInfo);

-

-    // do Quartz mode specific initialization

-    return quartzProcs->AddScreen(index, pScreen);

-}

-

-

-/*

- * QuartzSetupScreen

- *  Finalize mode specific setup of each screen.

- */

-Bool QuartzSetupScreen(

-    int index,

-    ScreenPtr pScreen)

-{

-    // do Quartz mode specific setup

-    if (! quartzProcs->SetupScreen(index, pScreen))

-        return FALSE;

-

-    // setup cursor support

-    if (! quartzProcs->InitCursor(pScreen))

-        return FALSE;

-

-#if defined(RANDR)

-    if(!QuartzRandRInit(pScreen)) {

-        DEBUG_LOG("Failed to init RandR extension.\n");

-        return FALSE;

-    }

-#endif

-

-    return TRUE;

-}

-

-

-/*

- * QuartzInitOutput

- *  Quartz display initialization.

- */

-void QuartzInitOutput(

-    int argc,

-    char **argv )

-{

-    /* For XQuartz, we want to just use the default signal handler to work better with CrashTracer */

-    signal(SIGSEGV, SIG_DFL);

-    signal(SIGILL, SIG_DFL);

-#ifdef SIGEMT

-    signal(SIGEMT, SIG_DFL);

-#endif

-    signal(SIGFPE, SIG_DFL);

-#ifdef SIGBUS

-    signal(SIGBUS, SIG_DFL);

-#endif

-#ifdef SIGSYS

-    signal(SIGSYS, SIG_DFL);

-#endif

-#ifdef SIGXCPU

-    signal(SIGXCPU, SIG_DFL);

-#endif

-#ifdef SIGXFSZ

-    signal(SIGXFSZ, SIG_DFL);

-#endif

-

-    if (!RegisterBlockAndWakeupHandlers(QuartzBlockHandler,

-                                        QuartzWakeupHandler,

-                                        NULL))

-    {

-        FatalError("Could not register block and wakeup handlers.");

-    }

-

-    if (!dixRegisterPrivateKey(&quartzScreenKeyRec, PRIVATE_SCREEN, 0))

-	FatalError("Failed to alloc quartz screen private.\n");

-

-    // Do display mode specific initialization

-    quartzProcs->DisplayInit();

-}

-

-

-/*

- * QuartzInitInput

- *  Inform the main thread the X server is ready to handle events.

- */

-void QuartzInitInput(

-    int argc,

-    char **argv )

-{

-    X11ApplicationSetCanQuit(0);

-    X11ApplicationServerReady();

-    // Do final display mode specific initialization before handling events

-    if (quartzProcs->InitInput)

-        quartzProcs->InitInput(argc, argv);

-}

-

-

-void QuartzUpdateScreens(void) {

-    ScreenPtr pScreen;

-    WindowPtr pRoot;

-    int x, y, width, height, sx, sy;

-    xEvent e;

-    BoxRec bounds;

-    

-    if (noPseudoramiXExtension || screenInfo.numScreens != 1)

-    {

-        /* FIXME: if not using Xinerama, we have multiple screens, and

-         to do this properly may need to add or remove screens. Which

-         isn't possible. So don't do anything. Another reason why

-         we default to running with Xinerama. */

-        

-        return;

-    }

-    

-    pScreen = screenInfo.screens[0];

-    

-    PseudoramiXResetScreens();

-    quartzProcs->AddPseudoramiXScreens(&x, &y, &width, &height, pScreen);

-    

-    pScreen->x = x;

-    pScreen->y = y;

-    pScreen->mmWidth = pScreen->mmWidth * ((double) width / pScreen->width);

-    pScreen->mmHeight = pScreen->mmHeight * ((double) height / pScreen->height);

-    pScreen->width = width;

-    pScreen->height = height;

-    

-    DarwinAdjustScreenOrigins(&screenInfo);

-    

-    /* DarwinAdjustScreenOrigins or UpdateScreen may change pScreen->x/y,

-     * so use it rather than x/y

-     */

-    sx = pScreen->x + darwinMainScreenX;

-    sy = pScreen->y + darwinMainScreenY;

-    

-    /* Adjust the root window. */

-    pRoot = pScreen->root;

-    AppleWMSetScreenOrigin(pRoot);

-    pScreen->ResizeWindow(pRoot, x - sx, y - sy, width, height, NULL);

-

-    /* <rdar://problem/7770779> pointer events are clipped to old display region after display reconfiguration

-     * http://xquartz.macosforge.org/trac/ticket/346

-     */

-    bounds.x1 = 0;

-    bounds.x2 = width;

-    bounds.y1 = 0;

-    bounds.y2 = height;

-    pScreen->ConstrainCursor(inputInfo.pointer, pScreen, &bounds);

-    inputInfo.pointer->spriteInfo->sprite->physLimits = bounds;

-    inputInfo.pointer->spriteInfo->sprite->hotLimits = bounds;

-

-    DEBUG_LOG("Root Window: %dx%d @ (%d, %d) darwinMainScreen (%d, %d) xy (%d, %d) dixScreenOrigins (%d, %d)\n", width, height, x - sx, y - sy, darwinMainScreenX, darwinMainScreenY, x, y, pScreen->x, pScreen->y);

-

-    /* Send an event for the root reconfigure */

-    e.u.u.type = ConfigureNotify;

-    e.u.configureNotify.window = pRoot->drawable.id;

-    e.u.configureNotify.aboveSibling = None;

-    e.u.configureNotify.x = x - sx;

-    e.u.configureNotify.y = y - sy;

-    e.u.configureNotify.width = width;

-    e.u.configureNotify.height = height;

-    e.u.configureNotify.borderWidth = wBorderWidth(pRoot);

-    e.u.configureNotify.override = pRoot->overrideRedirect;

-    DeliverEvents(pRoot, &e, 1, NullWindow);

-

-    quartzProcs->UpdateScreen(pScreen);

-

-    /* miPaintWindow needs to be called after RootlessUpdateScreenPixmap (from xprUpdateScreen) */

-    miPaintWindow(pRoot, &pRoot->borderClip,  PW_BACKGROUND);

-

-    /* Tell RandR about the new size, so new connections get the correct info */

-    RRScreenSizeNotify(pScreen);

-}

-

-static void pokeActivityCallback(CFRunLoopTimerRef timer, void *info) {

-    UpdateSystemActivity(OverallAct);

-}

-

-static void QuartzScreenSaver(int state) {

-    static CFRunLoopTimerRef pokeActivityTimer = NULL;

-    static CFRunLoopTimerContext pokeActivityContext = { 0, NULL, NULL, NULL, NULL };

-    static OSSpinLock pokeActivitySpinLock = OS_SPINLOCK_INIT;

-

-    OSSpinLockLock(&pokeActivitySpinLock);

-

-    if(state) {

-        if(pokeActivityTimer == NULL)

-            goto QuartzScreenSaverEnd;

-

-        CFRunLoopTimerInvalidate(pokeActivityTimer);

-        CFRelease(pokeActivityTimer);

-        pokeActivityTimer = NULL;

-    } else {

-        if(pokeActivityTimer != NULL)

-            goto QuartzScreenSaverEnd;

-        

-        pokeActivityTimer = CFRunLoopTimerCreate(NULL, CFAbsoluteTimeGetCurrent(), 30, 0, 0, pokeActivityCallback, &pokeActivityContext);

-        if(pokeActivityTimer == NULL) {

-            ErrorF("Unable to create pokeActivityTimer.\n");

-            goto QuartzScreenSaverEnd;

-        }

-

-        CFRunLoopAddTimer(CFRunLoopGetMain(), pokeActivityTimer, kCFRunLoopCommonModes);

-    }

-QuartzScreenSaverEnd:

-    OSSpinLockUnlock(&pokeActivitySpinLock);

-}

-

-void QuartzShowFullscreen(int state) {

-    int i;

-    

-    DEBUG_LOG("QuartzShowFullscreen: state=%d\n", state);

-    

-    if(XQuartzIsRootless) {

-        ErrorF("QuartzShowFullscreen called while in rootless mode.\n");

-        return;

-    }

-    

-    QuartzScreenSaver(!state);

-    

-    if(XQuartzFullscreenVisible == state)

-        return;

-    

-    XQuartzFullscreenVisible = state;

-    

-    xp_disable_update ();

-    

-    if (!XQuartzFullscreenVisible)

-        RootlessHideAllWindows();

-    

-    RootlessUpdateRooted(XQuartzFullscreenVisible);

-    

-    if (XQuartzFullscreenVisible) {

-        RootlessShowAllWindows ();

-        for (i=0; i < screenInfo.numScreens; i++) {

-            ScreenPtr pScreen = screenInfo.screens[i];        

-            RootlessRepositionWindows(pScreen);

-            // JH: I don't think this is necessary, but keeping it here as a reminder

-            //RootlessUpdateScreenPixmap(pScreen);

-        }

-    }

-

-    /* Somehow the menubar manages to interfere with our event stream

-     * in fullscreen mode, even though it's not visible. 

-     */

-    X11ApplicationShowHideMenubar(!XQuartzFullscreenVisible);

-    

-    xp_reenable_update ();

-    

-    if (XQuartzFullscreenDisableHotkeys)

-        xp_disable_hot_keys(XQuartzFullscreenVisible);

-}

-

-void QuartzSetRootless(Bool state) {    

-    DEBUG_LOG("QuartzSetRootless state=%d\n", state);

-    

-    if(XQuartzIsRootless == state)

-        return;

-    

-    if(state)

-        QuartzShowFullscreen(FALSE);

-    

-    XQuartzIsRootless = state;

-

-    xp_disable_update();

-

-    /* When in rootless, the menubar is not part of the screen, so we need to update our screens on toggle */    

-    QuartzUpdateScreens();

-

-    if(XQuartzIsRootless) {

-        RootlessShowAllWindows();

-    } else {

-        RootlessHideAllWindows();

-    }

-

-    X11ApplicationShowHideMenubar(TRUE);

-

-    xp_reenable_update();

-

-    xp_disable_hot_keys(FALSE);

-}

-

-/*

- * QuartzShow

- *  Show the X server on screen. Does nothing if already shown.

- *  Calls mode specific screen resume to restore the X clip regions

- *  (if needed) and the X server cursor state.

- */

-void QuartzShow(void) {

-    int i;

-

-    if (XQuartzServerVisible)

-        return;

-    

-    XQuartzServerVisible = TRUE;

-    for (i = 0; i < screenInfo.numScreens; i++) {

-        if (screenInfo.screens[i]) {

-            quartzProcs->ResumeScreen(screenInfo.screens[i]);

-        }

-    }

-    

-    if (!XQuartzIsRootless)

-        QuartzShowFullscreen(TRUE);

-}

-

-

-/*

- * QuartzHide

- *  Remove the X server display from the screen. Does nothing if already

- *  hidden. Calls mode specific screen suspend to set X clip regions to

- *  prevent drawing (if needed) and restore the Aqua cursor.

- */

-void QuartzHide(void)

-{

-    int i;

-

-    if (XQuartzServerVisible) {

-        for (i = 0; i < screenInfo.numScreens; i++) {

-            if (screenInfo.screens[i]) {

-                quartzProcs->SuspendScreen(screenInfo.screens[i]);

-            }

-        }

-    }

-

-    if(!XQuartzIsRootless)

-        QuartzShowFullscreen(FALSE);

-    XQuartzServerVisible = FALSE;

-}

-

-

-/*

- * QuartzSetRootClip

- *  Enable or disable rendering to the X screen.

- */

-void QuartzSetRootClip(

-    BOOL enable)

-{

-    int i;

-

-    if (!XQuartzServerVisible)

-        return;

-

-    for (i = 0; i < screenInfo.numScreens; i++) {

-        if (screenInfo.screens[i]) {

-            SetRootClip(screenInfo.screens[i], enable);

-        }

-    }

-}

-

-/* 

- * QuartzSpaceChanged

- *  Unmap offscreen windows, map onscreen windows

- */

-void QuartzSpaceChanged(uint32_t space_id) {

-    /* Do something special here, so we don't depend on quartz-wm for spaces to work... */

-    DEBUG_LOG("Space Changed (%u) ... do something interesting...\n", space_id);

-}

-

-/*

- * QuartzCopyDisplayIDs

- *  Associate an X11 screen with one or more CoreGraphics display IDs by copying

- *  the list into a private array. Free the previously copied array, if present.

- */

-void QuartzCopyDisplayIDs(ScreenPtr pScreen,

-                          int displayCount, CGDirectDisplayID *displayIDs) {

-    QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);

-

-    free(pQuartzScreen->displayIDs);

-    if(displayCount) {

-        size_t size = displayCount * sizeof(CGDirectDisplayID);

-        pQuartzScreen->displayIDs = malloc(size);

-        memcpy(pQuartzScreen->displayIDs, displayIDs, size);

-    } else {

-       pQuartzScreen->displayIDs = NULL;

-    }

-    pQuartzScreen->displayCount = displayCount;

-}

-

-void NSBeep(void);

-void DDXRingBell(

-    int volume,         // volume is % of max

-    int pitch,          // pitch is Hz

-    int duration)       // duration is milliseconds

-{

-    if (volume)

-        NSBeep();

-}

+/*
+ *
+ * Quartz-specific support for the Darwin X Server
+ *
+ * Copyright (c) 2001-2004 Greg Parker and Torrey T. Lyons.
+ *                 All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+
+#include "sanitizedCarbon.h"
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "quartzCommon.h"
+#include "quartzRandR.h"
+#include "inputstr.h"
+#include "quartz.h"
+#include "darwin.h"
+#include "darwinEvents.h"
+#include "pseudoramiX.h"
+#define _APPLEWM_SERVER_
+#include "applewmExt.h"
+
+#include "X11Application.h"
+
+#include <X11/extensions/applewmconst.h>
+
+// X headers
+#include "scrnintstr.h"
+#include "windowstr.h"
+#include "colormapst.h"
+#include "globals.h"
+#include "mi.h"
+
+// System headers
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <IOKit/pwr_mgt/IOPMLib.h>
+#include <libkern/OSAtomic.h>
+#include <signal.h>
+
+#include <rootlessCommon.h>
+#include <Xplugin.h>
+
+DevPrivateKeyRec        quartzScreenKeyRec;
+int                     aquaMenuBarHeight = 0;
+QuartzModeProcsPtr      quartzProcs = NULL;
+const char             *quartzOpenGLBundle = NULL;
+
+Bool XQuartzFullscreenDisableHotkeys = TRUE;
+Bool XQuartzOptionSendsAlt = FALSE;
+Bool XQuartzEnableKeyEquivalents = TRUE;
+Bool XQuartzFullscreenVisible = FALSE;
+Bool XQuartzRootlessDefault = TRUE;
+Bool XQuartzIsRootless = TRUE;
+Bool XQuartzServerVisible = FALSE;
+Bool XQuartzFullscreenMenu = FALSE;
+
+int32_t XQuartzShieldingWindowLevel = 0;
+
+/*
+===========================================================================
+
+ Screen functions
+
+===========================================================================
+*/
+
+/*
+ * QuartzAddScreen
+ *  Do mode dependent initialization of each screen for Quartz.
+ */
+Bool QuartzAddScreen(
+    int index,
+    ScreenPtr pScreen)
+{
+    // allocate space for private per screen Quartz specific storage
+    QuartzScreenPtr displayInfo = calloc(sizeof(QuartzScreenRec), 1);
+
+    // QUARTZ_PRIV(pScreen) = displayInfo;
+    dixSetPrivate(&pScreen->devPrivates, quartzScreenKey, displayInfo);
+
+    // do Quartz mode specific initialization
+    return quartzProcs->AddScreen(index, pScreen);
+}
+
+
+/*
+ * QuartzSetupScreen
+ *  Finalize mode specific setup of each screen.
+ */
+Bool QuartzSetupScreen(
+    int index,
+    ScreenPtr pScreen)
+{
+    // do Quartz mode specific setup
+    if (! quartzProcs->SetupScreen(index, pScreen))
+        return FALSE;
+
+    // setup cursor support
+    if (! quartzProcs->InitCursor(pScreen))
+        return FALSE;
+
+#if defined(RANDR)
+    if(!QuartzRandRInit(pScreen)) {
+        DEBUG_LOG("Failed to init RandR extension.\n");
+        return FALSE;
+    }
+#endif
+
+    return TRUE;
+}
+
+
+/*
+ * QuartzInitOutput
+ *  Quartz display initialization.
+ */
+void QuartzInitOutput(
+    int argc,
+    char **argv )
+{
+    /* For XQuartz, we want to just use the default signal handler to work better with CrashTracer */
+    signal(SIGSEGV, SIG_DFL);
+    signal(SIGILL, SIG_DFL);
+#ifdef SIGEMT
+    signal(SIGEMT, SIG_DFL);
+#endif
+    signal(SIGFPE, SIG_DFL);
+#ifdef SIGBUS
+    signal(SIGBUS, SIG_DFL);
+#endif
+#ifdef SIGSYS
+    signal(SIGSYS, SIG_DFL);
+#endif
+#ifdef SIGXCPU
+    signal(SIGXCPU, SIG_DFL);
+#endif
+#ifdef SIGXFSZ
+    signal(SIGXFSZ, SIG_DFL);
+#endif
+
+    if (!RegisterBlockAndWakeupHandlers(QuartzBlockHandler,
+                                        QuartzWakeupHandler,
+                                        NULL))
+    {
+        FatalError("Could not register block and wakeup handlers.");
+    }
+
+    if (!dixRegisterPrivateKey(&quartzScreenKeyRec, PRIVATE_SCREEN, 0))
+	FatalError("Failed to alloc quartz screen private.\n");
+
+    // Do display mode specific initialization
+    quartzProcs->DisplayInit();
+}
+
+
+/*
+ * QuartzInitInput
+ *  Inform the main thread the X server is ready to handle events.
+ */
+void QuartzInitInput(
+    int argc,
+    char **argv )
+{
+    X11ApplicationSetCanQuit(0);
+    X11ApplicationServerReady();
+    // Do final display mode specific initialization before handling events
+    if (quartzProcs->InitInput)
+        quartzProcs->InitInput(argc, argv);
+}
+
+
+void QuartzUpdateScreens(void) {
+    ScreenPtr pScreen;
+    WindowPtr pRoot;
+    int x, y, width, height, sx, sy;
+    xEvent e;
+    BoxRec bounds;
+    
+    if (noPseudoramiXExtension || screenInfo.numScreens != 1)
+    {
+        /* FIXME: if not using Xinerama, we have multiple screens, and
+         to do this properly may need to add or remove screens. Which
+         isn't possible. So don't do anything. Another reason why
+         we default to running with Xinerama. */
+        
+        return;
+    }
+    
+    pScreen = screenInfo.screens[0];
+    
+    PseudoramiXResetScreens();
+    quartzProcs->AddPseudoramiXScreens(&x, &y, &width, &height, pScreen);
+    
+    pScreen->x = x;
+    pScreen->y = y;
+    pScreen->mmWidth = pScreen->mmWidth * ((double) width / pScreen->width);
+    pScreen->mmHeight = pScreen->mmHeight * ((double) height / pScreen->height);
+    pScreen->width = width;
+    pScreen->height = height;
+    
+    DarwinAdjustScreenOrigins(&screenInfo);
+    
+    /* DarwinAdjustScreenOrigins or UpdateScreen may change pScreen->x/y,
+     * so use it rather than x/y
+     */
+    sx = pScreen->x + darwinMainScreenX;
+    sy = pScreen->y + darwinMainScreenY;
+    
+    /* Adjust the root window. */
+    pRoot = pScreen->root;
+    AppleWMSetScreenOrigin(pRoot);
+    pScreen->ResizeWindow(pRoot, x - sx, y - sy, width, height, NULL);
+
+    /* <rdar://problem/7770779> pointer events are clipped to old display region after display reconfiguration
+     * http://xquartz.macosforge.org/trac/ticket/346
+     */
+    bounds.x1 = 0;
+    bounds.x2 = width;
+    bounds.y1 = 0;
+    bounds.y2 = height;
+    pScreen->ConstrainCursor(inputInfo.pointer, pScreen, &bounds);
+    inputInfo.pointer->spriteInfo->sprite->physLimits = bounds;
+    inputInfo.pointer->spriteInfo->sprite->hotLimits = bounds;
+
+    DEBUG_LOG("Root Window: %dx%d @ (%d, %d) darwinMainScreen (%d, %d) xy (%d, %d) dixScreenOrigins (%d, %d)\n", width, height, x - sx, y - sy, darwinMainScreenX, darwinMainScreenY, x, y, pScreen->x, pScreen->y);
+
+    /* Send an event for the root reconfigure */
+    e.u.u.type = ConfigureNotify;
+    e.u.configureNotify.window = pRoot->drawable.id;
+    e.u.configureNotify.aboveSibling = None;
+    e.u.configureNotify.x = x - sx;
+    e.u.configureNotify.y = y - sy;
+    e.u.configureNotify.width = width;
+    e.u.configureNotify.height = height;
+    e.u.configureNotify.borderWidth = wBorderWidth(pRoot);
+    e.u.configureNotify.override = pRoot->overrideRedirect;
+    DeliverEvents(pRoot, &e, 1, NullWindow);
+
+    quartzProcs->UpdateScreen(pScreen);
+
+    /* miPaintWindow needs to be called after RootlessUpdateScreenPixmap (from xprUpdateScreen) */
+    miPaintWindow(pRoot, &pRoot->borderClip,  PW_BACKGROUND);
+
+    /* Tell RandR about the new size, so new connections get the correct info */
+    RRScreenSizeNotify(pScreen);
+}
+
+static void pokeActivityCallback(CFRunLoopTimerRef timer, void *info) {
+    UpdateSystemActivity(OverallAct);
+}
+
+static void QuartzScreenSaver(int state) {
+    static CFRunLoopTimerRef pokeActivityTimer = NULL;
+    static CFRunLoopTimerContext pokeActivityContext = { 0, NULL, NULL, NULL, NULL };
+    static OSSpinLock pokeActivitySpinLock = OS_SPINLOCK_INIT;
+
+    OSSpinLockLock(&pokeActivitySpinLock);
+
+    if(state) {
+        if(pokeActivityTimer == NULL)
+            goto QuartzScreenSaverEnd;
+
+        CFRunLoopTimerInvalidate(pokeActivityTimer);
+        CFRelease(pokeActivityTimer);
+        pokeActivityTimer = NULL;
+    } else {
+        if(pokeActivityTimer != NULL)
+            goto QuartzScreenSaverEnd;
+        
+        pokeActivityTimer = CFRunLoopTimerCreate(NULL, CFAbsoluteTimeGetCurrent(), 30, 0, 0, pokeActivityCallback, &pokeActivityContext);
+        if(pokeActivityTimer == NULL) {
+            ErrorF("Unable to create pokeActivityTimer.\n");
+            goto QuartzScreenSaverEnd;
+        }
+
+        CFRunLoopAddTimer(CFRunLoopGetMain(), pokeActivityTimer, kCFRunLoopCommonModes);
+    }
+QuartzScreenSaverEnd:
+    OSSpinLockUnlock(&pokeActivitySpinLock);
+}
+
+void QuartzShowFullscreen(int state) {
+    int i;
+    
+    DEBUG_LOG("QuartzShowFullscreen: state=%d\n", state);
+    
+    if(XQuartzIsRootless) {
+        ErrorF("QuartzShowFullscreen called while in rootless mode.\n");
+        return;
+    }
+    
+    QuartzScreenSaver(!state);
+    
+    if(XQuartzFullscreenVisible == state)
+        return;
+    
+    XQuartzFullscreenVisible = state;
+    
+    xp_disable_update ();
+    
+    if (!XQuartzFullscreenVisible)
+        RootlessHideAllWindows();
+    
+    RootlessUpdateRooted(XQuartzFullscreenVisible);
+    
+    if (XQuartzFullscreenVisible) {
+        RootlessShowAllWindows ();
+        for (i=0; i < screenInfo.numScreens; i++) {
+            ScreenPtr pScreen = screenInfo.screens[i];        
+            RootlessRepositionWindows(pScreen);
+            // JH: I don't think this is necessary, but keeping it here as a reminder
+            //RootlessUpdateScreenPixmap(pScreen);
+        }
+    }
+
+    /* Somehow the menubar manages to interfere with our event stream
+     * in fullscreen mode, even though it's not visible. 
+     */
+    X11ApplicationShowHideMenubar(!XQuartzFullscreenVisible);
+    
+    xp_reenable_update ();
+    
+    if (XQuartzFullscreenDisableHotkeys)
+        xp_disable_hot_keys(XQuartzFullscreenVisible);
+}
+
+void QuartzSetRootless(Bool state) {    
+    DEBUG_LOG("QuartzSetRootless state=%d\n", state);
+    
+    if(XQuartzIsRootless == state)
+        return;
+    
+    if(state)
+        QuartzShowFullscreen(FALSE);
+    
+    XQuartzIsRootless = state;
+
+    xp_disable_update();
+
+    /* When in rootless, the menubar is not part of the screen, so we need to update our screens on toggle */    
+    QuartzUpdateScreens();
+
+    if(XQuartzIsRootless) {
+        RootlessShowAllWindows();
+    } else {
+        RootlessHideAllWindows();
+    }
+
+    X11ApplicationShowHideMenubar(TRUE);
+
+    xp_reenable_update();
+
+    xp_disable_hot_keys(FALSE);
+}
+
+/*
+ * QuartzShow
+ *  Show the X server on screen. Does nothing if already shown.
+ *  Calls mode specific screen resume to restore the X clip regions
+ *  (if needed) and the X server cursor state.
+ */
+void QuartzShow(void) {
+    int i;
+
+    if (XQuartzServerVisible)
+        return;
+    
+    XQuartzServerVisible = TRUE;
+    for (i = 0; i < screenInfo.numScreens; i++) {
+        if (screenInfo.screens[i]) {
+            quartzProcs->ResumeScreen(screenInfo.screens[i]);
+        }
+    }
+    
+    if (!XQuartzIsRootless)
+        QuartzShowFullscreen(TRUE);
+}
+
+
+/*
+ * QuartzHide
+ *  Remove the X server display from the screen. Does nothing if already
+ *  hidden. Calls mode specific screen suspend to set X clip regions to
+ *  prevent drawing (if needed) and restore the Aqua cursor.
+ */
+void QuartzHide(void)
+{
+    int i;
+
+    if (XQuartzServerVisible) {
+        for (i = 0; i < screenInfo.numScreens; i++) {
+            if (screenInfo.screens[i]) {
+                quartzProcs->SuspendScreen(screenInfo.screens[i]);
+            }
+        }
+    }
+
+    if(!XQuartzIsRootless)
+        QuartzShowFullscreen(FALSE);
+    XQuartzServerVisible = FALSE;
+}
+
+
+/*
+ * QuartzSetRootClip
+ *  Enable or disable rendering to the X screen.
+ */
+void QuartzSetRootClip(
+    BOOL enable)
+{
+    int i;
+
+    if (!XQuartzServerVisible)
+        return;
+
+    for (i = 0; i < screenInfo.numScreens; i++) {
+        if (screenInfo.screens[i]) {
+            SetRootClip(screenInfo.screens[i], enable);
+        }
+    }
+}
+
+/* 
+ * QuartzSpaceChanged
+ *  Unmap offscreen windows, map onscreen windows
+ */
+void QuartzSpaceChanged(uint32_t space_id) {
+    /* Do something special here, so we don't depend on quartz-wm for spaces to work... */
+    DEBUG_LOG("Space Changed (%u) ... do something interesting...\n", space_id);
+}
+
+/*
+ * QuartzCopyDisplayIDs
+ *  Associate an X11 screen with one or more CoreGraphics display IDs by copying
+ *  the list into a private array. Free the previously copied array, if present.
+ */
+void QuartzCopyDisplayIDs(ScreenPtr pScreen,
+                          int displayCount, CGDirectDisplayID *displayIDs) {
+    QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);
+
+    free(pQuartzScreen->displayIDs);
+    if(displayCount) {
+        size_t size = displayCount * sizeof(CGDirectDisplayID);
+        pQuartzScreen->displayIDs = malloc(size);
+        memcpy(pQuartzScreen->displayIDs, displayIDs, size);
+    } else {
+       pQuartzScreen->displayIDs = NULL;
+    }
+    pQuartzScreen->displayCount = displayCount;
+}
+
+void NSBeep(void);
+void DDXRingBell(
+    int volume,         // volume is % of max
+    int pitch,          // pitch is Hz
+    int duration)       // duration is milliseconds
+{
+    if (volume)
+        NSBeep();
+}
diff --git a/xorg-server/hw/xquartz/quartz.h b/xorg-server/hw/xquartz/quartz.h
index 7fa6d431c..0a9c47a6b 100644
--- a/xorg-server/hw/xquartz/quartz.h
+++ b/xorg-server/hw/xquartz/quartz.h
@@ -1,147 +1,147 @@
-/*

- * quartz.h

- *

- * External interface of the Quartz display modes seen by the generic, mode

- * independent parts of the Darwin X server.

- *

- * Copyright (c) 2001-2003 Greg Parker and Torrey T. Lyons.

- *                 All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright

- * holders shall not be used in advertising or otherwise to promote the sale,

- * use or other dealings in this Software without prior written authorization.

- */

-

-#ifndef _QUARTZ_H

-#define _QUARTZ_H

-

-#include "screenint.h"

-#include "window.h"

-#include "pixmap.h"

-

-/*------------------------------------------

-   Quartz display mode function types

-  ------------------------------------------*/

-

-/*

- * Display mode initialization

- */

-typedef void (*DisplayInitProc)(void);

-typedef Bool (*AddScreenProc)(int index, ScreenPtr pScreen);

-typedef Bool (*SetupScreenProc)(int index, ScreenPtr pScreen);

-typedef void (*InitInputProc)(int argc, char **argv);

-

-/*

- * Cursor functions

- */

-typedef Bool (*InitCursorProc)(ScreenPtr pScreen);

-

-/*

- * Suspend and resume X11 activity

- */

-typedef void (*SuspendScreenProc)(ScreenPtr pScreen);

-typedef void (*ResumeScreenProc)(ScreenPtr pScreen);

-

-/*

- * Screen state change support

- */

-typedef void (*AddPseudoramiXScreensProc)

-    (int *x, int *y, int *width, int *height, ScreenPtr pScreen);

-typedef void (*UpdateScreenProc)(ScreenPtr pScreen);

-

-/*

- * Rootless helper functions

- */

-typedef Bool (*IsX11WindowProc)(int windowNumber);

-typedef void (*HideWindowsProc)(Bool hide);

-

-/*

- * Rootless functions for optional export to GLX layer

- */

-typedef void * (*FrameForWindowProc)(WindowPtr pWin, Bool create);

-typedef WindowPtr (*TopLevelParentProc)(WindowPtr pWindow);

-typedef Bool (*CreateSurfaceProc)

-    (ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable,

-     unsigned int client_id, unsigned int *surface_id,

-     unsigned int key[2], void (*notify) (void *arg, void *data),

-     void *notify_data);

-typedef Bool (*DestroySurfaceProc)

-    (ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable,

-     void (*notify) (void *arg, void *data), void *notify_data);

-

-/*

- * Quartz display mode function list

- */

-typedef struct _QuartzModeProcs {

-    DisplayInitProc DisplayInit;

-    AddScreenProc AddScreen;

-    SetupScreenProc SetupScreen;

-    InitInputProc InitInput;

-

-    InitCursorProc InitCursor;

-

-    SuspendScreenProc SuspendScreen;

-    ResumeScreenProc ResumeScreen;

-

-    AddPseudoramiXScreensProc AddPseudoramiXScreens;

-    UpdateScreenProc UpdateScreen;

-

-    IsX11WindowProc IsX11Window;

-    HideWindowsProc HideWindows;

-

-    FrameForWindowProc FrameForWindow;

-    TopLevelParentProc TopLevelParent;

-    CreateSurfaceProc CreateSurface;

-    DestroySurfaceProc DestroySurface;

-} QuartzModeProcsRec, *QuartzModeProcsPtr;

-

-extern QuartzModeProcsPtr quartzProcs;

-

-extern Bool XQuartzFullscreenVisible; /* Are the windows visible (predicated on !rootless) */

-extern Bool XQuartzServerVisible;     /* Is the server visible ... TODO: Refactor to "active" */

-extern Bool XQuartzEnableKeyEquivalents;

-extern Bool XQuartzRootlessDefault;  /* Is our default mode rootless? */

-extern Bool XQuartzIsRootless;       /* Is our current mode rootless (or FS)? */

-extern Bool XQuartzFullscreenMenu;   /* Show the menu bar (autohide) while in FS */

-extern Bool XQuartzFullscreenDisableHotkeys;

-extern Bool XQuartzOptionSendsAlt;   /* Alt or Mode_switch? */

-

-extern int32_t XQuartzShieldingWindowLevel; /* CGShieldingWindowLevel() or 0 */

-

-Bool QuartzAddScreen(int index, ScreenPtr pScreen);

-Bool QuartzSetupScreen(int index, ScreenPtr pScreen);

-void QuartzInitOutput(int argc,char **argv);

-void QuartzInitInput(int argc, char **argv);

-void QuartzInitServer(int argc, char **argv, char **envp);

-void QuartzGiveUp(void);

-void QuartzProcessEvent(xEvent *xe);

-void QuartzUpdateScreens(void);

-

-void QuartzShow(void);

-void QuartzHide(void);

-void QuartzSetRootClip(BOOL enable);

-void QuartzSpaceChanged(uint32_t space_id);

-

-void QuartzSetRootless(Bool state);

-void QuartzShowFullscreen(Bool state);

-

-int server_main(int argc, char **argv, char **envp);

-#endif

+/*
+ * quartz.h
+ *
+ * External interface of the Quartz display modes seen by the generic, mode
+ * independent parts of the Darwin X server.
+ *
+ * Copyright (c) 2001-2003 Greg Parker and Torrey T. Lyons.
+ *                 All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+
+#ifndef _QUARTZ_H
+#define _QUARTZ_H
+
+#include "screenint.h"
+#include "window.h"
+#include "pixmap.h"
+
+/*------------------------------------------
+   Quartz display mode function types
+  ------------------------------------------*/
+
+/*
+ * Display mode initialization
+ */
+typedef void (*DisplayInitProc)(void);
+typedef Bool (*AddScreenProc)(int index, ScreenPtr pScreen);
+typedef Bool (*SetupScreenProc)(int index, ScreenPtr pScreen);
+typedef void (*InitInputProc)(int argc, char **argv);
+
+/*
+ * Cursor functions
+ */
+typedef Bool (*InitCursorProc)(ScreenPtr pScreen);
+
+/*
+ * Suspend and resume X11 activity
+ */
+typedef void (*SuspendScreenProc)(ScreenPtr pScreen);
+typedef void (*ResumeScreenProc)(ScreenPtr pScreen);
+
+/*
+ * Screen state change support
+ */
+typedef void (*AddPseudoramiXScreensProc)
+    (int *x, int *y, int *width, int *height, ScreenPtr pScreen);
+typedef void (*UpdateScreenProc)(ScreenPtr pScreen);
+
+/*
+ * Rootless helper functions
+ */
+typedef Bool (*IsX11WindowProc)(int windowNumber);
+typedef void (*HideWindowsProc)(Bool hide);
+
+/*
+ * Rootless functions for optional export to GLX layer
+ */
+typedef void * (*FrameForWindowProc)(WindowPtr pWin, Bool create);
+typedef WindowPtr (*TopLevelParentProc)(WindowPtr pWindow);
+typedef Bool (*CreateSurfaceProc)
+    (ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable,
+     unsigned int client_id, unsigned int *surface_id,
+     unsigned int key[2], void (*notify) (void *arg, void *data),
+     void *notify_data);
+typedef Bool (*DestroySurfaceProc)
+    (ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable,
+     void (*notify) (void *arg, void *data), void *notify_data);
+
+/*
+ * Quartz display mode function list
+ */
+typedef struct _QuartzModeProcs {
+    DisplayInitProc DisplayInit;
+    AddScreenProc AddScreen;
+    SetupScreenProc SetupScreen;
+    InitInputProc InitInput;
+
+    InitCursorProc InitCursor;
+
+    SuspendScreenProc SuspendScreen;
+    ResumeScreenProc ResumeScreen;
+
+    AddPseudoramiXScreensProc AddPseudoramiXScreens;
+    UpdateScreenProc UpdateScreen;
+
+    IsX11WindowProc IsX11Window;
+    HideWindowsProc HideWindows;
+
+    FrameForWindowProc FrameForWindow;
+    TopLevelParentProc TopLevelParent;
+    CreateSurfaceProc CreateSurface;
+    DestroySurfaceProc DestroySurface;
+} QuartzModeProcsRec, *QuartzModeProcsPtr;
+
+extern QuartzModeProcsPtr quartzProcs;
+
+extern Bool XQuartzFullscreenVisible; /* Are the windows visible (predicated on !rootless) */
+extern Bool XQuartzServerVisible;     /* Is the server visible ... TODO: Refactor to "active" */
+extern Bool XQuartzEnableKeyEquivalents;
+extern Bool XQuartzRootlessDefault;  /* Is our default mode rootless? */
+extern Bool XQuartzIsRootless;       /* Is our current mode rootless (or FS)? */
+extern Bool XQuartzFullscreenMenu;   /* Show the menu bar (autohide) while in FS */
+extern Bool XQuartzFullscreenDisableHotkeys;
+extern Bool XQuartzOptionSendsAlt;   /* Alt or Mode_switch? */
+
+extern int32_t XQuartzShieldingWindowLevel; /* CGShieldingWindowLevel() or 0 */
+
+Bool QuartzAddScreen(int index, ScreenPtr pScreen);
+Bool QuartzSetupScreen(int index, ScreenPtr pScreen);
+void QuartzInitOutput(int argc,char **argv);
+void QuartzInitInput(int argc, char **argv);
+void QuartzInitServer(int argc, char **argv, char **envp);
+void QuartzGiveUp(void);
+void QuartzProcessEvent(xEvent *xe);
+void QuartzUpdateScreens(void);
+
+void QuartzShow(void);
+void QuartzHide(void);
+void QuartzSetRootClip(BOOL enable);
+void QuartzSpaceChanged(uint32_t space_id);
+
+void QuartzSetRootless(Bool state);
+void QuartzShowFullscreen(Bool state);
+
+int server_main(int argc, char **argv, char **envp);
+#endif
diff --git a/xorg-server/hw/xquartz/quartzKeyboard.c b/xorg-server/hw/xquartz/quartzKeyboard.c
index 4db03a8de..e682f08b6 100644
--- a/xorg-server/hw/xquartz/quartzKeyboard.c
+++ b/xorg-server/hw/xquartz/quartzKeyboard.c
@@ -1,868 +1,868 @@
-/*

-   quartzKeyboard.c: Keyboard support for Xquartz

-

-   Copyright (c) 2003-2008 Apple Inc.

-   Copyright (c) 2001-2004 Torrey T. Lyons. All Rights Reserved.

-   Copyright 2004 Kaleb S. KEITHLEY. All Rights Reserved.

-

-   Copyright (C) 1999,2000 by Eric Sunshine <sunshine@sunshineco.com>

-   All rights reserved.

-

-   Redistribution and use in source and binary forms, with or without

-   modification, are permitted provided that the following conditions are met:

-

-     1. Redistributions of source code must retain the above copyright

-        notice, this list of conditions and the following disclaimer.

-     2. Redistributions in binary form must reproduce the above copyright

-        notice, this list of conditions and the following disclaimer in the

-        documentation and/or other materials provided with the distribution.

-     3. The name of the author may not be used to endorse or promote products

-        derived from this software without specific prior written permission.

-

-   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR

-   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

-   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN

-   NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED

-   TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF

-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-*/

-

-#include "sanitizedCarbon.h"

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#define HACK_MISSING 1

-#define HACK_KEYPAD 1

-#define HACK_BLACKLIST 1

-

-#include <unistd.h>

-#include <stdio.h>

-#include <stdlib.h>

-#include <errno.h>

-#include <sys/stat.h>

-#include <AvailabilityMacros.h>

-

-#include "quartz.h"

-#include "darwin.h"

-#include "darwinEvents.h"

-

-#include "quartzKeyboard.h"

-

-#include "X11Application.h"

-

-#include <assert.h>

-#include <pthread.h>

-

-#include "xkbsrv.h"

-#include "exevents.h"

-#include "X11/keysym.h"

-#include "keysym2ucs.h"

-

-extern void

-CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master);

-

-enum {

-    MOD_COMMAND = 256,

-    MOD_SHIFT = 512,

-    MOD_OPTION = 2048,

-    MOD_CONTROL = 4096,

-};

-

-#define UKEYSYM(u) ((u) | 0x01000000)

-

-#if HACK_MISSING

-/* Table of keycode->keysym mappings we use to fallback on for important

-   keys that are often not in the Unicode mapping. */

-

-const static struct {

-    unsigned short keycode;

-    KeySym keysym;

-} known_keys[] = {

-    {55,  XK_Meta_L},

-    {56,  XK_Shift_L},

-    {57,  XK_Caps_Lock},

-    {58,  XK_Alt_L},

-    {59,  XK_Control_L},

-

-    {60,  XK_Shift_R},

-    {61,  XK_Alt_R},

-    {62,  XK_Control_R},

-    {63,  XK_Meta_R},

-

-    {122, XK_F1},

-    {120, XK_F2},

-    {99,  XK_F3},

-    {118, XK_F4},

-    {96,  XK_F5},

-    {97,  XK_F6},

-    {98,  XK_F7},

-    {100, XK_F8},

-    {101, XK_F9},

-    {109, XK_F10},

-    {103, XK_F11},

-    {111, XK_F12},

-    {105, XK_F13},

-    {107, XK_F14},

-    {113, XK_F15},

-};

-#endif

-

-#if HACK_KEYPAD

-/* Table of keycode->old,new-keysym mappings we use to fixup the numeric

-   keypad entries. */

-

-const static struct {

-    unsigned short keycode;

-    KeySym normal, keypad;

-} known_numeric_keys[] = {

-    {65, XK_period, XK_KP_Decimal},

-    {67, XK_asterisk, XK_KP_Multiply},

-    {69, XK_plus, XK_KP_Add},

-    {75, XK_slash, XK_KP_Divide},

-    {76, 0x01000003, XK_KP_Enter},

-    {78, XK_minus, XK_KP_Subtract},

-    {81, XK_equal, XK_KP_Equal},

-    {82, XK_0, XK_KP_0},

-    {83, XK_1, XK_KP_1},

-    {84, XK_2, XK_KP_2},

-    {85, XK_3, XK_KP_3},

-    {86, XK_4, XK_KP_4},

-    {87, XK_5, XK_KP_5},

-    {88, XK_6, XK_KP_6},

-    {89, XK_7, XK_KP_7},

-    {91, XK_8, XK_KP_8},

-    {92, XK_9, XK_KP_9},

-};

-#endif

-

-#if HACK_BLACKLIST

-/* <rdar://problem/7824370> wine notepad produces wrong characters on shift+arrow

- * http://xquartz.macosforge.org/trac/ticket/295

- * http://developer.apple.com/legacy/mac/library/documentation/mac/Text/Text-579.html

- *

- * legacy Mac keycodes for arrow keys that shift-modify to math symbols

- */

-const static unsigned short keycode_blacklist[] = {66, 70, 72, 77};

-#endif

-

-/* Table mapping normal keysyms to their dead equivalents.

-   FIXME: all the unicode keysyms (apart from circumflex) were guessed. */

-

-const static struct {

-    KeySym normal, dead;

-} dead_keys[] = {

-    {XK_grave, XK_dead_grave},

-    {XK_apostrophe, XK_dead_acute},             /* US:"=" on a Czech keyboard */

-    {XK_acute, XK_dead_acute},

-    {UKEYSYM (0x384), XK_dead_acute},           /* US:";" on a Greek keyboard */

-//    {XK_Greek_accentdieresis, XK_dead_diaeresis},   /* US:"opt+;" on a Greek keyboard ... replace with dead_accentdieresis if there is one */

-    {XK_asciicircum, XK_dead_circumflex},

-    {UKEYSYM (0x2c6), XK_dead_circumflex},	/* MODIFIER LETTER CIRCUMFLEX ACCENT */

-    {XK_asciitilde, XK_dead_tilde},

-    {UKEYSYM (0x2dc), XK_dead_tilde},		/* SMALL TILDE */

-    {XK_macron, XK_dead_macron},

-    {XK_breve, XK_dead_breve},

-    {XK_abovedot, XK_dead_abovedot},

-    {XK_diaeresis, XK_dead_diaeresis},

-    {UKEYSYM (0x2da), XK_dead_abovering},	/* DOT ABOVE */

-    {XK_doubleacute, XK_dead_doubleacute},

-    {XK_caron, XK_dead_caron},

-    {XK_cedilla, XK_dead_cedilla},

-    {XK_ogonek, XK_dead_ogonek},

-    {UKEYSYM (0x269), XK_dead_iota},		/* LATIN SMALL LETTER IOTA */

-    {UKEYSYM (0x2ec), XK_dead_voiced_sound},	/* MODIFIER LETTER VOICING */

-/*  {XK_semivoiced_sound, XK_dead_semivoiced_sound}, */

-    {UKEYSYM (0x323), XK_dead_belowdot},	/* COMBINING DOT BELOW */

-    {UKEYSYM (0x309), XK_dead_hook}, 		/* COMBINING HOOK ABOVE */

-    {UKEYSYM (0x31b), XK_dead_horn},		/* COMBINING HORN */

-};

-

-typedef struct darwinKeyboardInfo_struct {

-    CARD8 modMap[MAP_LENGTH];

-    KeySym keyMap[MAP_LENGTH * GLYPHS_PER_KEY];

-    unsigned char modifierKeycodes[32][2];

-} darwinKeyboardInfo;

-

-darwinKeyboardInfo keyInfo;

-pthread_mutex_t keyInfo_mutex = PTHREAD_MUTEX_INITIALIZER;

-

-static void DarwinChangeKeyboardControl(DeviceIntPtr device, KeybdCtrl *ctrl) {

-    // FIXME: to be implemented

-    // keyclick, bell volume / pitch, autorepead, LED's

-}

-

-//-----------------------------------------------------------------------------

-// Utility functions to help parse Darwin keymap

-//-----------------------------------------------------------------------------

-

-/*

- * DarwinBuildModifierMaps

- *      Use the keyMap field of keyboard info structure to populate

- *      the modMap and modifierKeycodes fields.

- */

-static void DarwinBuildModifierMaps(darwinKeyboardInfo *info) {

-    int i;

-    KeySym *k;

-

-    memset(info->modMap, NoSymbol, sizeof(info->modMap));

-    memset(info->modifierKeycodes, 0, sizeof(info->modifierKeycodes));

-

-    for (i = 0; i < NUM_KEYCODES; i++) {

-        k = info->keyMap + i * GLYPHS_PER_KEY;

-

-        switch (*k) {

-            case XK_Shift_L:

-                info->modifierKeycodes[NX_MODIFIERKEY_SHIFT][0] = i;

-                info->modMap[MIN_KEYCODE + i] = ShiftMask;

-                break;

-

-            case XK_Shift_R:

-#ifdef NX_MODIFIERKEY_RSHIFT

-                info->modifierKeycodes[NX_MODIFIERKEY_RSHIFT][0] = i;

-#else

-                info->modifierKeycodes[NX_MODIFIERKEY_SHIFT][0] = i;

-#endif

-                info->modMap[MIN_KEYCODE + i] = ShiftMask;

-                break;

-

-            case XK_Control_L:

-                info->modifierKeycodes[NX_MODIFIERKEY_CONTROL][0] = i;

-                info->modMap[MIN_KEYCODE + i] = ControlMask;

-                break;

-

-            case XK_Control_R:

-#ifdef NX_MODIFIERKEY_RCONTROL

-                info->modifierKeycodes[NX_MODIFIERKEY_RCONTROL][0] = i;

-#else

-                info->modifierKeycodes[NX_MODIFIERKEY_CONTROL][0] = i;

-#endif

-                info->modMap[MIN_KEYCODE + i] = ControlMask;

-                break;

-

-            case XK_Caps_Lock:

-                info->modifierKeycodes[NX_MODIFIERKEY_ALPHALOCK][0] = i;

-                info->modMap[MIN_KEYCODE + i] = LockMask;

-                break;

-

-            case XK_Alt_L:

-                info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i;

-                info->modMap[MIN_KEYCODE + i] = Mod1Mask;

-                if(!XQuartzOptionSendsAlt)

-                    *k = XK_Mode_switch; // Yes, this is ugly.  This needs to be cleaned up when we integrate quartzKeyboard with this code and refactor.

-                break;

-

-            case XK_Alt_R:

-#ifdef NX_MODIFIERKEY_RALTERNATE

-                info->modifierKeycodes[NX_MODIFIERKEY_RALTERNATE][0] = i;

-#else

-                info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i;

-#endif

-                if(!XQuartzOptionSendsAlt)

-                    *k = XK_Mode_switch; // Yes, this is ugly.  This needs to be cleaned up when we integrate quartzKeyboard with this code and refactor.

-                info->modMap[MIN_KEYCODE + i] = Mod1Mask;

-                break;

-

-            case XK_Mode_switch:

-                ErrorF("DarwinBuildModifierMaps: XK_Mode_switch encountered, unable to determine side.\n");

-                info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i;

-#ifdef NX_MODIFIERKEY_RALTERNATE

-                info->modifierKeycodes[NX_MODIFIERKEY_RALTERNATE][0] = i;

-#endif

-                info->modMap[MIN_KEYCODE + i] = Mod1Mask;

-                break;

-

-            case XK_Meta_L:

-                info->modifierKeycodes[NX_MODIFIERKEY_COMMAND][0] = i;

-                info->modMap[MIN_KEYCODE + i] = Mod2Mask;

-                break;

-

-            case XK_Meta_R:

-#ifdef NX_MODIFIERKEY_RCOMMAND

-                info->modifierKeycodes[NX_MODIFIERKEY_RCOMMAND][0] = i;

-#else

-                info->modifierKeycodes[NX_MODIFIERKEY_COMMAND][0] = i;

-#endif

-                info->modMap[MIN_KEYCODE + i] = Mod2Mask;

-                break;

-

-            case XK_Num_Lock:

-                info->modMap[MIN_KEYCODE + i] = Mod3Mask;

-                break;

-        }

-    }

-}

-

-/*

- * DarwinKeyboardInit

- *      Get the Darwin keyboard map and compute an equivalent

- *      X keyboard map and modifier map. Set the new keyboard

- *      device structure.

- */

-void DarwinKeyboardInit(DeviceIntPtr pDev) {

-    // Open a shared connection to the HID System.

-    // Note that the Event Status Driver is really just a wrapper

-    // for a kIOHIDParamConnectType connection.

-    assert(darwinParamConnect = NXOpenEventStatus());

-

-    InitKeyboardDeviceStruct(pDev, NULL, NULL, DarwinChangeKeyboardControl);

-

-    DarwinKeyboardReloadHandler();

-

-    CopyKeyClass(pDev, inputInfo.keyboard);

-}

-

-/* Set the repeat rates based on global preferences and keycodes for modifiers.

- * Precondition: Has the keyInfo_mutex lock.

- */

-static void DarwinKeyboardSetRepeat(DeviceIntPtr pDev, int initialKeyRepeatValue, int keyRepeatValue) {

-    if(initialKeyRepeatValue == 300000) { // off

-        /* Turn off repeats globally */

-        XkbSetRepeatKeys(pDev, -1, AutoRepeatModeOff);

-    } else {

-        int i;

-        XkbControlsPtr      ctrl;

-        XkbControlsRec      old;

-

-        /* Turn on repeats globally */

-        XkbSetRepeatKeys(pDev, -1, AutoRepeatModeOn);

-        

-        /* Setup the bit mask for individual key repeats */

-        ctrl = pDev->key->xkbInfo->desc->ctrls;

-        old= *ctrl;

-        

-        ctrl->repeat_delay = initialKeyRepeatValue * 15;

-        ctrl->repeat_interval = keyRepeatValue * 15;

-

-        /* Turn off key-repeat for modifier keys, on for others */

-        /* First set them all on */

-        for(i=0; i < XkbPerKeyBitArraySize; i++)

-            ctrl->per_key_repeat[i] = -1;

-

-        /* Now turn off the modifiers */

-        for(i=0; i < 32; i++) {

-            unsigned char keycode;

-            

-            keycode = keyInfo.modifierKeycodes[i][0];

-            if(keycode)

-                ClearBit(ctrl->per_key_repeat, keycode + MIN_KEYCODE);

-

-            keycode = keyInfo.modifierKeycodes[i][1];

-            if(keycode)

-                ClearBit(ctrl->per_key_repeat, keycode + MIN_KEYCODE);

-        }

-

-        /* Hurray for data duplication */

-        if (pDev->kbdfeed)

-            memcpy(pDev->kbdfeed->ctrl.autoRepeats, ctrl->per_key_repeat, XkbPerKeyBitArraySize);

-

-        //ErrorF("per_key_repeat =\n");

-        //for(i=0; i < XkbPerKeyBitArraySize; i++)

-        //    ErrorF("%02x%s", ctrl->per_key_repeat[i], (i + 1) & 7 ? "" : "\n");

-

-        /* And now we notify the puppies about the changes */

-        XkbDDXChangeControls(pDev, &old, ctrl);

-    }

-}

-

-void DarwinKeyboardReloadHandler(void) {

-    KeySymsRec keySyms;

-    CFIndex initialKeyRepeatValue, keyRepeatValue;

-    BOOL ok;

-    DeviceIntPtr pDev;

-    const char *xmodmap = PROJECTROOT "/bin/xmodmap";

-    const char *sysmodmap = PROJECTROOT "/lib/X11/xinit/.Xmodmap";

-    const char *homedir = getenv("HOME");

-    char usermodmap[PATH_MAX], cmd[PATH_MAX];

-

-    DEBUG_LOG("DarwinKeyboardReloadHandler\n");

-

-    /* Get our key repeat settings from GlobalPreferences */

-    (void)CFPreferencesAppSynchronize(CFSTR(".GlobalPreferences"));

-    

-    initialKeyRepeatValue = CFPreferencesGetAppIntegerValue(CFSTR("InitialKeyRepeat"), CFSTR(".GlobalPreferences"), &ok);

-    if(!ok)

-        initialKeyRepeatValue = 35;

-    

-    keyRepeatValue = CFPreferencesGetAppIntegerValue(CFSTR("KeyRepeat"), CFSTR(".GlobalPreferences"), &ok);

-    if(!ok)

-        keyRepeatValue = 6;

-    

-    pthread_mutex_lock(&keyInfo_mutex); {

-        /* Initialize our keySyms */

-        keySyms.map = keyInfo.keyMap;

-        keySyms.mapWidth   = GLYPHS_PER_KEY;

-        keySyms.minKeyCode = MIN_KEYCODE;

-        keySyms.maxKeyCode = MAX_KEYCODE;

-

-	// TODO: We should build the entire XkbDescRec and use XkbCopyKeymap

-        /* Apply the mappings to darwinKeyboard */

-        XkbApplyMappingChange(darwinKeyboard, &keySyms, keySyms.minKeyCode,

-                              keySyms.maxKeyCode - keySyms.minKeyCode + 1,

-                              keyInfo.modMap, serverClient);

-        DarwinKeyboardSetRepeat(darwinKeyboard, initialKeyRepeatValue, keyRepeatValue);

-

-        /* Apply the mappings to the core keyboard */

-        for (pDev = inputInfo.devices; pDev; pDev = pDev->next) {

-            if ((pDev->coreEvents || pDev == inputInfo.keyboard) && pDev->key) {

-                XkbApplyMappingChange(pDev, &keySyms, keySyms.minKeyCode,

-                                      keySyms.maxKeyCode - keySyms.minKeyCode + 1,

-                                      keyInfo.modMap, serverClient);

-                DarwinKeyboardSetRepeat(pDev, initialKeyRepeatValue, keyRepeatValue);    

-            }

-        }

-    } pthread_mutex_unlock(&keyInfo_mutex);

-

-    /* Modify with xmodmap */

-    if (access(xmodmap, F_OK) == 0) {

-        /* Check for system .Xmodmap */

-        if (access(sysmodmap, F_OK) == 0) {

-            if(snprintf (cmd, sizeof(cmd), "%s %s", xmodmap, sysmodmap) < sizeof(cmd)) {

-                X11ApplicationLaunchClient(cmd);

-            } else {

-                ErrorF("X11.app: Unable to create / execute xmodmap command line");

-            }

-        }

-

-        /* Check for user's local .Xmodmap */

-        if ((homedir != NULL) && (snprintf (usermodmap, sizeof(usermodmap), "%s/.Xmodmap", homedir) < sizeof(usermodmap))) {

-            if (access(usermodmap, F_OK) == 0) {

-                if(snprintf (cmd, sizeof(cmd), "%s %s", xmodmap, usermodmap) < sizeof(cmd)) {

-                    X11ApplicationLaunchClient(cmd);

-                } else {

-                    ErrorF("X11.app: Unable to create / execute xmodmap command line");

-                }

-            }

-        } else {

-            ErrorF("X11.app: Unable to determine path to user's .Xmodmap");

-        }

-    }

-}

-

-//-----------------------------------------------------------------------------

-// Modifier translation functions

-//

-// There are three different ways to specify a Mac modifier key:

-// keycode - specifies hardware key, read from keymapping

-// key     - NX_MODIFIERKEY_*, really an index

-// mask    - NX_*MASK, mask for modifier flags in event record

-// Left and right side have different keycodes but the same key and mask.

-//-----------------------------------------------------------------------------

-

-/*

- * DarwinModifierNXKeyToNXKeycode

- *      Return the keycode for an NX_MODIFIERKEY_* modifier.

- *      side = 0 for left or 1 for right.

- *      Returns 0 if key+side is not a known modifier.

- */

-int DarwinModifierNXKeyToNXKeycode(int key, int side) {

-    int retval;

-    pthread_mutex_lock(&keyInfo_mutex);

-    retval = keyInfo.modifierKeycodes[key][side];

-    pthread_mutex_unlock(&keyInfo_mutex);

-

-    return retval;

-}

-

-/*

- * DarwinModifierNXKeycodeToNXKey

- *      Returns -1 if keycode+side is not a modifier key

- *      outSide may be NULL, else it gets 0 for left and 1 for right.

- */

-int DarwinModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide) {

-    int key, side;

-

-    keycode += MIN_KEYCODE;

-

-    // search modifierKeycodes for this keycode+side

-    pthread_mutex_lock(&keyInfo_mutex);

-    for (key = 0; key < NX_NUMMODIFIERS; key++) {

-        for (side = 0; side <= 1; side++) {

-            if (keyInfo.modifierKeycodes[key][side] == keycode) break;

-        }

-    }

-    pthread_mutex_unlock(&keyInfo_mutex);

-

-    if (key == NX_NUMMODIFIERS) {

-        return -1;

-    }

-    if (outSide) *outSide = side;

-

-    return key;

-}

-

-/*

- * DarwinModifierNXMaskToNXKey

- *      Returns -1 if mask is not a known modifier mask.

- */

-int DarwinModifierNXMaskToNXKey(int mask) {

-    switch (mask) {

-        case NX_ALPHASHIFTMASK:       return NX_MODIFIERKEY_ALPHALOCK;

-        case NX_SHIFTMASK:            return NX_MODIFIERKEY_SHIFT;

-#ifdef NX_DEVICELSHIFTKEYMASK

-        case NX_DEVICELSHIFTKEYMASK:  return NX_MODIFIERKEY_SHIFT;

-        case NX_DEVICERSHIFTKEYMASK:  return NX_MODIFIERKEY_RSHIFT;

-#endif

-        case NX_CONTROLMASK:          return NX_MODIFIERKEY_CONTROL;

-#ifdef NX_DEVICELCTLKEYMASK

-        case NX_DEVICELCTLKEYMASK:    return NX_MODIFIERKEY_CONTROL;

-        case NX_DEVICERCTLKEYMASK:    return NX_MODIFIERKEY_RCONTROL;

-#endif

-        case NX_ALTERNATEMASK:        return NX_MODIFIERKEY_ALTERNATE;

-#ifdef NX_DEVICELALTKEYMASK

-        case NX_DEVICELALTKEYMASK:    return NX_MODIFIERKEY_ALTERNATE;

-        case NX_DEVICERALTKEYMASK:    return NX_MODIFIERKEY_RALTERNATE;

-#endif

-        case NX_COMMANDMASK:          return NX_MODIFIERKEY_COMMAND;

-#ifdef NX_DEVICELCMDKEYMASK

-        case NX_DEVICELCMDKEYMASK:    return NX_MODIFIERKEY_COMMAND;

-        case NX_DEVICERCMDKEYMASK:    return NX_MODIFIERKEY_RCOMMAND;

-#endif

-        case NX_NUMERICPADMASK:       return NX_MODIFIERKEY_NUMERICPAD;

-        case NX_HELPMASK:             return NX_MODIFIERKEY_HELP;

-        case NX_SECONDARYFNMASK:      return NX_MODIFIERKEY_SECONDARYFN;

-    }

-    return -1;

-}

-

-/*

- * DarwinModifierNXKeyToNXMask

- *      Returns 0 if key is not a known modifier key.

- */

-int DarwinModifierNXKeyToNXMask(int key) {

-    switch (key) {

-        case NX_MODIFIERKEY_ALPHALOCK:   return NX_ALPHASHIFTMASK;

-#ifdef NX_DEVICELSHIFTKEYMASK

-        case NX_MODIFIERKEY_SHIFT:       return NX_DEVICELSHIFTKEYMASK;

-        case NX_MODIFIERKEY_RSHIFT:      return NX_DEVICERSHIFTKEYMASK;

-        case NX_MODIFIERKEY_CONTROL:     return NX_DEVICELCTLKEYMASK;

-        case NX_MODIFIERKEY_RCONTROL:    return NX_DEVICERCTLKEYMASK;

-        case NX_MODIFIERKEY_ALTERNATE:   return NX_DEVICELALTKEYMASK;

-        case NX_MODIFIERKEY_RALTERNATE:  return NX_DEVICERALTKEYMASK;

-        case NX_MODIFIERKEY_COMMAND:     return NX_DEVICELCMDKEYMASK;

-        case NX_MODIFIERKEY_RCOMMAND:    return NX_DEVICERCMDKEYMASK;

-#else

-        case NX_MODIFIERKEY_SHIFT:       return NX_SHIFTMASK;

-        case NX_MODIFIERKEY_CONTROL:     return NX_CONTROLMASK;

-        case NX_MODIFIERKEY_ALTERNATE:   return NX_ALTERNATEMASK;

-        case NX_MODIFIERKEY_COMMAND:     return NX_COMMANDMASK;

-#endif

-        case NX_MODIFIERKEY_NUMERICPAD:  return NX_NUMERICPADMASK;

-        case NX_MODIFIERKEY_HELP:        return NX_HELPMASK;

-        case NX_MODIFIERKEY_SECONDARYFN: return NX_SECONDARYFNMASK;

-    }

-    return 0;

-}

-

-/*

- * DarwinModifierStringToNXMask

- *      Returns 0 if string is not a known modifier.

- */

-int DarwinModifierStringToNXMask(const char *str, int separatelr) {

-#ifdef NX_DEVICELSHIFTKEYMASK

-    if(separatelr) {

-        if (!strcasecmp(str, "shift"))    return NX_DEVICELSHIFTKEYMASK | NX_DEVICERSHIFTKEYMASK;

-        if (!strcasecmp(str, "control"))  return NX_DEVICELCTLKEYMASK | NX_DEVICERCTLKEYMASK;

-        if (!strcasecmp(str, "option"))   return NX_DEVICELALTKEYMASK | NX_DEVICERALTKEYMASK;

-        if (!strcasecmp(str, "alt"))   return NX_DEVICELALTKEYMASK | NX_DEVICERALTKEYMASK;

-        if (!strcasecmp(str, "command"))  return NX_DEVICELCMDKEYMASK | NX_DEVICERCMDKEYMASK;

-        if (!strcasecmp(str, "lshift"))   return NX_DEVICELSHIFTKEYMASK;

-        if (!strcasecmp(str, "rshift"))   return NX_DEVICERSHIFTKEYMASK;

-        if (!strcasecmp(str, "lcontrol")) return NX_DEVICELCTLKEYMASK;

-        if (!strcasecmp(str, "rcontrol")) return NX_DEVICERCTLKEYMASK;

-        if (!strcasecmp(str, "loption"))  return NX_DEVICELALTKEYMASK;

-        if (!strcasecmp(str, "roption"))  return NX_DEVICERALTKEYMASK;

-        if (!strcasecmp(str, "lalt"))  return NX_DEVICELALTKEYMASK;

-        if (!strcasecmp(str, "ralt"))  return NX_DEVICERALTKEYMASK;

-        if (!strcasecmp(str, "lcommand")) return NX_DEVICELCMDKEYMASK;

-        if (!strcasecmp(str, "rcommand")) return NX_DEVICERCMDKEYMASK;

-    } else {

-#endif

-        if (!strcasecmp(str, "shift"))    return NX_SHIFTMASK;

-        if (!strcasecmp(str, "control"))  return NX_CONTROLMASK;

-        if (!strcasecmp(str, "option"))   return NX_ALTERNATEMASK;

-        if (!strcasecmp(str, "alt"))   return NX_ALTERNATEMASK;

-        if (!strcasecmp(str, "command"))  return NX_COMMANDMASK;

-        if (!strcasecmp(str, "lshift"))   return NX_SHIFTMASK;

-        if (!strcasecmp(str, "rshift"))   return NX_SHIFTMASK;

-        if (!strcasecmp(str, "lcontrol")) return NX_CONTROLMASK;

-        if (!strcasecmp(str, "rcontrol")) return NX_CONTROLMASK;

-        if (!strcasecmp(str, "loption"))  return NX_ALTERNATEMASK;

-        if (!strcasecmp(str, "roption"))  return NX_ALTERNATEMASK;

-        if (!strcasecmp(str, "lalt"))  return NX_ALTERNATEMASK;

-        if (!strcasecmp(str, "ralt"))  return NX_ALTERNATEMASK;

-        if (!strcasecmp(str, "lcommand")) return NX_COMMANDMASK;

-        if (!strcasecmp(str, "rcommand")) return NX_COMMANDMASK;

-#ifdef NX_DEVICELSHIFTKEYMASK

-    }

-#endif

-    if (!strcasecmp(str, "lock"))     return NX_ALPHASHIFTMASK;

-    if (!strcasecmp(str, "fn"))       return NX_SECONDARYFNMASK;

-    if (!strcasecmp(str, "help"))     return NX_HELPMASK;

-    if (!strcasecmp(str, "numlock"))  return NX_NUMERICPADMASK;

-    return 0;

-}

-

-/*

- * LegalModifier

- *      This allows the ddx layer to prevent some keys from being remapped

- *      as modifier keys.

- */

-Bool LegalModifier(unsigned int key, DeviceIntPtr pDev)

-{

-    return 1;

-}

-

-static inline UniChar macroman2ucs(unsigned char c) {

-    /* Precalculated table mapping MacRoman-128 to Unicode. Generated

-       by creating single element CFStringRefs then extracting the

-       first character. */

-

-    static const unsigned short table[128] = {

-        0xc4, 0xc5, 0xc7, 0xc9, 0xd1, 0xd6, 0xdc, 0xe1,

-        0xe0, 0xe2, 0xe4, 0xe3, 0xe5, 0xe7, 0xe9, 0xe8,

-        0xea, 0xeb, 0xed, 0xec, 0xee, 0xef, 0xf1, 0xf3,

-        0xf2, 0xf4, 0xf6, 0xf5, 0xfa, 0xf9, 0xfb, 0xfc,

-        0x2020, 0xb0, 0xa2, 0xa3, 0xa7, 0x2022, 0xb6, 0xdf,

-        0xae, 0xa9, 0x2122, 0xb4, 0xa8, 0x2260, 0xc6, 0xd8,

-        0x221e, 0xb1, 0x2264, 0x2265, 0xa5, 0xb5, 0x2202, 0x2211,

-        0x220f, 0x3c0, 0x222b, 0xaa, 0xba, 0x3a9, 0xe6, 0xf8,

-        0xbf, 0xa1, 0xac, 0x221a, 0x192, 0x2248, 0x2206, 0xab,

-        0xbb, 0x2026, 0xa0, 0xc0, 0xc3, 0xd5, 0x152, 0x153,

-        0x2013, 0x2014, 0x201c, 0x201d, 0x2018, 0x2019, 0xf7, 0x25ca,

-        0xff, 0x178, 0x2044, 0x20ac, 0x2039, 0x203a, 0xfb01, 0xfb02,

-        0x2021, 0xb7, 0x201a, 0x201e, 0x2030, 0xc2, 0xca, 0xc1,

-        0xcb, 0xc8, 0xcd, 0xce, 0xcf, 0xcc, 0xd3, 0xd4,

-        0xf8ff, 0xd2, 0xda, 0xdb, 0xd9, 0x131, 0x2c6, 0x2dc,

-        0xaf, 0x2d8, 0x2d9, 0x2da, 0xb8, 0x2dd, 0x2db, 0x2c7,

-    };

-

-    if (c < 128) return c;

-    else         return table[c - 128];

-}

-

-static KeySym make_dead_key(KeySym in) {

-    int i;

-

-    for (i = 0; i < sizeof (dead_keys) / sizeof (dead_keys[0]); i++)

-        if (dead_keys[i].normal == in) return dead_keys[i].dead;

-

-    return in;

-}

-

-static Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {

-#if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050

-    KeyboardLayoutRef key_layout;

-    int is_uchr = 1;

-#endif

-    const void *chr_data = NULL;

-    int num_keycodes = NUM_KEYCODES;

-    UInt32 keyboard_type = LMGetKbdType();

-    int i, j;

-    OSStatus err;

-    KeySym *k;

-    CFDataRef currentKeyLayoutDataRef = NULL;

-

-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050

-    TISInputSourceRef currentKeyLayoutRef = TISCopyCurrentKeyboardLayoutInputSource();

-

-    if (currentKeyLayoutRef) {

-      currentKeyLayoutDataRef = (CFDataRef )TISGetInputSourceProperty(currentKeyLayoutRef, kTISPropertyUnicodeKeyLayoutData);

-      if (currentKeyLayoutDataRef)

-          chr_data = CFDataGetBytePtr(currentKeyLayoutDataRef);

-    }

-#endif

-

-#ifdef __clang__

-#pragma clang diagnostic push

-#pragma clang diagnostic ignored "-Wdeprecated-declarations" // KLGetCurrentKeyboardLayout, KLGetKeyboardLayoutProperty

-#endif

-

-#if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050

-    if (chr_data == NULL) {

-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050

-        ErrorF("X11.app: Error detected in determining keyboard layout.  If you are using an Apple-provided keyboard layout, please report this error at http://xquartz.macosforge.org and http://bugreport.apple.com\n");

-        ErrorF("X11.app: Debug Info: keyboard_type=%u, currentKeyLayoutRef=%p, currentKeyLayoutDataRef=%p, chr_data=%p\n",

-               (unsigned)keyboard_type, currentKeyLayoutRef, currentKeyLayoutDataRef, chr_data);

-#endif

-

-        KLGetCurrentKeyboardLayout (&key_layout);

-        KLGetKeyboardLayoutProperty (key_layout, kKLuchrData, &chr_data);

-

-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050

-        if(chr_data != NULL) {

-            ErrorF("X11.app: Fallback succeeded, but this is still a bug.  Please report the above information.\n");

-        }

-#endif

-    }

-

-    if (chr_data == NULL) {

-        ErrorF("X11.app: Debug Info: kKLuchrData failed, trying kKLKCHRData.\n");

-        ErrorF("If you are using a 3rd party keyboard layout, please see http://xquartz.macosforge.org/trac/ticket/154\n");

-        KLGetKeyboardLayoutProperty (key_layout, kKLKCHRData, &chr_data);

-        is_uchr = 0;

-        num_keycodes = 128;

-        

-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050

-        if(chr_data != NULL) {

-            ErrorF("X11.app: Fallback succeeded, but this is still a bug.  Please report the above information.\n");

-        }

-#endif

-    }

-#endif

-

-#ifdef __clang__

-#pragma clang diagnostic pop

-#endif

-

-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050

-    if(currentKeyLayoutRef)

-        CFRelease(currentKeyLayoutRef);

-#endif

-    

-    if (chr_data == NULL) {

-      ErrorF ( "Couldn't get uchr or kchr resource\n");

-      return FALSE;

-    }

-    

-    /* Scan the keycode range for the Unicode character that each

-       key produces in the four shift states. Then convert that to

-       an X11 keysym (which may just the bit that says "this is

-       Unicode" if it can't find the real symbol.) */

-       

-    /* KeyTranslate is not available on 64-bit platforms; UCKeyTranslate

-       must be used instead. */

-

-    for (i = 0; i < num_keycodes; i++) {

-        static const int mods[4] = {0, MOD_SHIFT, MOD_OPTION,

-                                    MOD_OPTION | MOD_SHIFT};

-

-        k = info->keyMap + i * GLYPHS_PER_KEY;

-

-        for (j = 0; j < 4; j++) {

-#if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050

-            if (is_uchr)  {

-#endif

-                UniChar s[8];

-                UniCharCount len;

-                UInt32 dead_key_state = 0, extra_dead = 0;

-

-                err = UCKeyTranslate (chr_data, i, kUCKeyActionDown,

-                                      mods[j] >> 8, keyboard_type, 0,

-                                      &dead_key_state, 8, &len, s);

-                if (err != noErr) continue;

-

-                if (len == 0 && dead_key_state != 0) {

-                    /* Found a dead key. Work out which one it is, but

-                       remembering that it's dead. */

-                    err = UCKeyTranslate (chr_data, i, kUCKeyActionDown,

-                                          mods[j] >> 8, keyboard_type,

-                                          kUCKeyTranslateNoDeadKeysMask,

-                                          &extra_dead, 8, &len, s);

-                    if (err != noErr) continue;

-                }

-

-                /* Not sure why 0x0010 is there.

-                 * 0x0000 - <rdar://problem/7793566> 'Unicode Hex Input' ...

-                 */

-                if (len > 0 && s[0] != 0x0010 && s[0] != 0x0000) {

-                    k[j] = ucs2keysym (s[0]);

-                    if (dead_key_state != 0) k[j] = make_dead_key (k[j]);

-                }

-#if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050

-            } else { // kchr

-                UInt32 c, state = 0, state2 = 0;

-                UInt16 code;

-

-                code = i | mods[j];

-

-#ifdef __clang__

-#pragma clang diagnostic push

-#pragma clang diagnostic ignored "-Wdeprecated-declarations" // KeyTranslate

-#endif

-

-                c = KeyTranslate (chr_data, code, &state);

-

-                /* Dead keys are only processed on key-down, so ask

-                   to translate those events. When we find a dead key,

-                   translating the matching key up event will give

-                   us the actual dead character. */

-

-                if (state != 0)

-                    c = KeyTranslate (chr_data, code | 128, &state2);

-

-#ifdef __clang__

-#pragma clang diagnostic pop

-#endif

-

-                /* Characters seem to be in MacRoman encoding. */

-

-                if (c != 0 && c != 0x0010) {

-                    k[j] = ucs2keysym (macroman2ucs (c & 255));

-

-                    if (state != 0) k[j] = make_dead_key (k[j]);

-                }

-            }

-#endif

-        }

-

-        if (k[3] == k[2]) k[3] = NoSymbol;

-        if (k[1] == k[0]) k[1] = NoSymbol;

-        if (k[0] == k[2] && k[1] == k[3]) k[2] = k[3] = NoSymbol;

-        if (k[3] == k[0] && k[2] == k[1] && k[2] == NoSymbol) k[3] = NoSymbol;

-    }

-

-#if HACK_MISSING

-    /* Fix up some things that are normally missing.. */

-    

-    for (i = 0; i < sizeof (known_keys) / sizeof (known_keys[0]); i++) {

-        k = info->keyMap + known_keys[i].keycode * GLYPHS_PER_KEY;

-        

-        if (   k[0] == NoSymbol && k[1] == NoSymbol

-            && k[2] == NoSymbol && k[3] == NoSymbol)

-            k[0] = known_keys[i].keysym;

-    }

-#endif

-    

-#if HACK_KEYPAD

-    /* And some more things. We find the right symbols for the numeric

-     keypad, but not the KP_ keysyms. So try to convert known keycodes. */

-    for (i = 0; i < sizeof (known_numeric_keys) / sizeof (known_numeric_keys[0]); i++) {

-        k = info->keyMap + known_numeric_keys[i].keycode * GLYPHS_PER_KEY;

-        

-        if (k[0] == known_numeric_keys[i].normal)

-            k[0] = known_numeric_keys[i].keypad;

-    }

-#endif

-    

-#if HACK_BLACKLIST

-    for (i = 0; i < sizeof (keycode_blacklist) / sizeof (keycode_blacklist[0]); i++) {

-        k = info->keyMap + keycode_blacklist[i] * GLYPHS_PER_KEY;

-        k[0] = k[1] = k[2] = k[3] = NoSymbol;

-    }

-#endif

-

-    DarwinBuildModifierMaps(info);

-

-    return TRUE;

-}

-

-Bool QuartsResyncKeymap(Bool sendDDXEvent) {

-    Bool retval;

-    /* Update keyInfo */

-    pthread_mutex_lock(&keyInfo_mutex);

-    memset(keyInfo.keyMap, 0, sizeof(keyInfo.keyMap));

-    retval = QuartzReadSystemKeymap(&keyInfo);

-    pthread_mutex_unlock(&keyInfo_mutex);

-

-    /* Tell server thread to deal with new keyInfo */

-    if(sendDDXEvent)

-        DarwinSendDDXEvent(kXquartzReloadKeymap, 0);

-

-    return retval;

-}

+/*
+   quartzKeyboard.c: Keyboard support for Xquartz
+
+   Copyright (c) 2003-2008 Apple Inc.
+   Copyright (c) 2001-2004 Torrey T. Lyons. All Rights Reserved.
+   Copyright 2004 Kaleb S. KEITHLEY. All Rights Reserved.
+
+   Copyright (C) 1999,2000 by Eric Sunshine <sunshine@sunshineco.com>
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are met:
+
+     1. Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+     2. Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+     3. The name of the author may not be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+   NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+   TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "sanitizedCarbon.h"
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#define HACK_MISSING 1
+#define HACK_KEYPAD 1
+#define HACK_BLACKLIST 1
+
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <AvailabilityMacros.h>
+
+#include "quartz.h"
+#include "darwin.h"
+#include "darwinEvents.h"
+
+#include "quartzKeyboard.h"
+
+#include "X11Application.h"
+
+#include <assert.h>
+#include <pthread.h>
+
+#include "xkbsrv.h"
+#include "exevents.h"
+#include "X11/keysym.h"
+#include "keysym2ucs.h"
+
+extern void
+CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master);
+
+enum {
+    MOD_COMMAND = 256,
+    MOD_SHIFT = 512,
+    MOD_OPTION = 2048,
+    MOD_CONTROL = 4096,
+};
+
+#define UKEYSYM(u) ((u) | 0x01000000)
+
+#if HACK_MISSING
+/* Table of keycode->keysym mappings we use to fallback on for important
+   keys that are often not in the Unicode mapping. */
+
+const static struct {
+    unsigned short keycode;
+    KeySym keysym;
+} known_keys[] = {
+    {55,  XK_Meta_L},
+    {56,  XK_Shift_L},
+    {57,  XK_Caps_Lock},
+    {58,  XK_Alt_L},
+    {59,  XK_Control_L},
+
+    {60,  XK_Shift_R},
+    {61,  XK_Alt_R},
+    {62,  XK_Control_R},
+    {63,  XK_Meta_R},
+
+    {122, XK_F1},
+    {120, XK_F2},
+    {99,  XK_F3},
+    {118, XK_F4},
+    {96,  XK_F5},
+    {97,  XK_F6},
+    {98,  XK_F7},
+    {100, XK_F8},
+    {101, XK_F9},
+    {109, XK_F10},
+    {103, XK_F11},
+    {111, XK_F12},
+    {105, XK_F13},
+    {107, XK_F14},
+    {113, XK_F15},
+};
+#endif
+
+#if HACK_KEYPAD
+/* Table of keycode->old,new-keysym mappings we use to fixup the numeric
+   keypad entries. */
+
+const static struct {
+    unsigned short keycode;
+    KeySym normal, keypad;
+} known_numeric_keys[] = {
+    {65, XK_period, XK_KP_Decimal},
+    {67, XK_asterisk, XK_KP_Multiply},
+    {69, XK_plus, XK_KP_Add},
+    {75, XK_slash, XK_KP_Divide},
+    {76, 0x01000003, XK_KP_Enter},
+    {78, XK_minus, XK_KP_Subtract},
+    {81, XK_equal, XK_KP_Equal},
+    {82, XK_0, XK_KP_0},
+    {83, XK_1, XK_KP_1},
+    {84, XK_2, XK_KP_2},
+    {85, XK_3, XK_KP_3},
+    {86, XK_4, XK_KP_4},
+    {87, XK_5, XK_KP_5},
+    {88, XK_6, XK_KP_6},
+    {89, XK_7, XK_KP_7},
+    {91, XK_8, XK_KP_8},
+    {92, XK_9, XK_KP_9},
+};
+#endif
+
+#if HACK_BLACKLIST
+/* <rdar://problem/7824370> wine notepad produces wrong characters on shift+arrow
+ * http://xquartz.macosforge.org/trac/ticket/295
+ * http://developer.apple.com/legacy/mac/library/documentation/mac/Text/Text-579.html
+ *
+ * legacy Mac keycodes for arrow keys that shift-modify to math symbols
+ */
+const static unsigned short keycode_blacklist[] = {66, 70, 72, 77};
+#endif
+
+/* Table mapping normal keysyms to their dead equivalents.
+   FIXME: all the unicode keysyms (apart from circumflex) were guessed. */
+
+const static struct {
+    KeySym normal, dead;
+} dead_keys[] = {
+    {XK_grave, XK_dead_grave},
+    {XK_apostrophe, XK_dead_acute},             /* US:"=" on a Czech keyboard */
+    {XK_acute, XK_dead_acute},
+    {UKEYSYM (0x384), XK_dead_acute},           /* US:";" on a Greek keyboard */
+//    {XK_Greek_accentdieresis, XK_dead_diaeresis},   /* US:"opt+;" on a Greek keyboard ... replace with dead_accentdieresis if there is one */
+    {XK_asciicircum, XK_dead_circumflex},
+    {UKEYSYM (0x2c6), XK_dead_circumflex},	/* MODIFIER LETTER CIRCUMFLEX ACCENT */
+    {XK_asciitilde, XK_dead_tilde},
+    {UKEYSYM (0x2dc), XK_dead_tilde},		/* SMALL TILDE */
+    {XK_macron, XK_dead_macron},
+    {XK_breve, XK_dead_breve},
+    {XK_abovedot, XK_dead_abovedot},
+    {XK_diaeresis, XK_dead_diaeresis},
+    {UKEYSYM (0x2da), XK_dead_abovering},	/* DOT ABOVE */
+    {XK_doubleacute, XK_dead_doubleacute},
+    {XK_caron, XK_dead_caron},
+    {XK_cedilla, XK_dead_cedilla},
+    {XK_ogonek, XK_dead_ogonek},
+    {UKEYSYM (0x269), XK_dead_iota},		/* LATIN SMALL LETTER IOTA */
+    {UKEYSYM (0x2ec), XK_dead_voiced_sound},	/* MODIFIER LETTER VOICING */
+/*  {XK_semivoiced_sound, XK_dead_semivoiced_sound}, */
+    {UKEYSYM (0x323), XK_dead_belowdot},	/* COMBINING DOT BELOW */
+    {UKEYSYM (0x309), XK_dead_hook}, 		/* COMBINING HOOK ABOVE */
+    {UKEYSYM (0x31b), XK_dead_horn},		/* COMBINING HORN */
+};
+
+typedef struct darwinKeyboardInfo_struct {
+    CARD8 modMap[MAP_LENGTH];
+    KeySym keyMap[MAP_LENGTH * GLYPHS_PER_KEY];
+    unsigned char modifierKeycodes[32][2];
+} darwinKeyboardInfo;
+
+darwinKeyboardInfo keyInfo;
+pthread_mutex_t keyInfo_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+static void DarwinChangeKeyboardControl(DeviceIntPtr device, KeybdCtrl *ctrl) {
+    // FIXME: to be implemented
+    // keyclick, bell volume / pitch, autorepead, LED's
+}
+
+//-----------------------------------------------------------------------------
+// Utility functions to help parse Darwin keymap
+//-----------------------------------------------------------------------------
+
+/*
+ * DarwinBuildModifierMaps
+ *      Use the keyMap field of keyboard info structure to populate
+ *      the modMap and modifierKeycodes fields.
+ */
+static void DarwinBuildModifierMaps(darwinKeyboardInfo *info) {
+    int i;
+    KeySym *k;
+
+    memset(info->modMap, NoSymbol, sizeof(info->modMap));
+    memset(info->modifierKeycodes, 0, sizeof(info->modifierKeycodes));
+
+    for (i = 0; i < NUM_KEYCODES; i++) {
+        k = info->keyMap + i * GLYPHS_PER_KEY;
+
+        switch (*k) {
+            case XK_Shift_L:
+                info->modifierKeycodes[NX_MODIFIERKEY_SHIFT][0] = i;
+                info->modMap[MIN_KEYCODE + i] = ShiftMask;
+                break;
+
+            case XK_Shift_R:
+#ifdef NX_MODIFIERKEY_RSHIFT
+                info->modifierKeycodes[NX_MODIFIERKEY_RSHIFT][0] = i;
+#else
+                info->modifierKeycodes[NX_MODIFIERKEY_SHIFT][0] = i;
+#endif
+                info->modMap[MIN_KEYCODE + i] = ShiftMask;
+                break;
+
+            case XK_Control_L:
+                info->modifierKeycodes[NX_MODIFIERKEY_CONTROL][0] = i;
+                info->modMap[MIN_KEYCODE + i] = ControlMask;
+                break;
+
+            case XK_Control_R:
+#ifdef NX_MODIFIERKEY_RCONTROL
+                info->modifierKeycodes[NX_MODIFIERKEY_RCONTROL][0] = i;
+#else
+                info->modifierKeycodes[NX_MODIFIERKEY_CONTROL][0] = i;
+#endif
+                info->modMap[MIN_KEYCODE + i] = ControlMask;
+                break;
+
+            case XK_Caps_Lock:
+                info->modifierKeycodes[NX_MODIFIERKEY_ALPHALOCK][0] = i;
+                info->modMap[MIN_KEYCODE + i] = LockMask;
+                break;
+
+            case XK_Alt_L:
+                info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i;
+                info->modMap[MIN_KEYCODE + i] = Mod1Mask;
+                if(!XQuartzOptionSendsAlt)
+                    *k = XK_Mode_switch; // Yes, this is ugly.  This needs to be cleaned up when we integrate quartzKeyboard with this code and refactor.
+                break;
+
+            case XK_Alt_R:
+#ifdef NX_MODIFIERKEY_RALTERNATE
+                info->modifierKeycodes[NX_MODIFIERKEY_RALTERNATE][0] = i;
+#else
+                info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i;
+#endif
+                if(!XQuartzOptionSendsAlt)
+                    *k = XK_Mode_switch; // Yes, this is ugly.  This needs to be cleaned up when we integrate quartzKeyboard with this code and refactor.
+                info->modMap[MIN_KEYCODE + i] = Mod1Mask;
+                break;
+
+            case XK_Mode_switch:
+                ErrorF("DarwinBuildModifierMaps: XK_Mode_switch encountered, unable to determine side.\n");
+                info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i;
+#ifdef NX_MODIFIERKEY_RALTERNATE
+                info->modifierKeycodes[NX_MODIFIERKEY_RALTERNATE][0] = i;
+#endif
+                info->modMap[MIN_KEYCODE + i] = Mod1Mask;
+                break;
+
+            case XK_Meta_L:
+                info->modifierKeycodes[NX_MODIFIERKEY_COMMAND][0] = i;
+                info->modMap[MIN_KEYCODE + i] = Mod2Mask;
+                break;
+
+            case XK_Meta_R:
+#ifdef NX_MODIFIERKEY_RCOMMAND
+                info->modifierKeycodes[NX_MODIFIERKEY_RCOMMAND][0] = i;
+#else
+                info->modifierKeycodes[NX_MODIFIERKEY_COMMAND][0] = i;
+#endif
+                info->modMap[MIN_KEYCODE + i] = Mod2Mask;
+                break;
+
+            case XK_Num_Lock:
+                info->modMap[MIN_KEYCODE + i] = Mod3Mask;
+                break;
+        }
+    }
+}
+
+/*
+ * DarwinKeyboardInit
+ *      Get the Darwin keyboard map and compute an equivalent
+ *      X keyboard map and modifier map. Set the new keyboard
+ *      device structure.
+ */
+void DarwinKeyboardInit(DeviceIntPtr pDev) {
+    // Open a shared connection to the HID System.
+    // Note that the Event Status Driver is really just a wrapper
+    // for a kIOHIDParamConnectType connection.
+    assert(darwinParamConnect = NXOpenEventStatus());
+
+    InitKeyboardDeviceStruct(pDev, NULL, NULL, DarwinChangeKeyboardControl);
+
+    DarwinKeyboardReloadHandler();
+
+    CopyKeyClass(pDev, inputInfo.keyboard);
+}
+
+/* Set the repeat rates based on global preferences and keycodes for modifiers.
+ * Precondition: Has the keyInfo_mutex lock.
+ */
+static void DarwinKeyboardSetRepeat(DeviceIntPtr pDev, int initialKeyRepeatValue, int keyRepeatValue) {
+    if(initialKeyRepeatValue == 300000) { // off
+        /* Turn off repeats globally */
+        XkbSetRepeatKeys(pDev, -1, AutoRepeatModeOff);
+    } else {
+        int i;
+        XkbControlsPtr      ctrl;
+        XkbControlsRec      old;
+
+        /* Turn on repeats globally */
+        XkbSetRepeatKeys(pDev, -1, AutoRepeatModeOn);
+        
+        /* Setup the bit mask for individual key repeats */
+        ctrl = pDev->key->xkbInfo->desc->ctrls;
+        old= *ctrl;
+        
+        ctrl->repeat_delay = initialKeyRepeatValue * 15;
+        ctrl->repeat_interval = keyRepeatValue * 15;
+
+        /* Turn off key-repeat for modifier keys, on for others */
+        /* First set them all on */
+        for(i=0; i < XkbPerKeyBitArraySize; i++)
+            ctrl->per_key_repeat[i] = -1;
+
+        /* Now turn off the modifiers */
+        for(i=0; i < 32; i++) {
+            unsigned char keycode;
+            
+            keycode = keyInfo.modifierKeycodes[i][0];
+            if(keycode)
+                ClearBit(ctrl->per_key_repeat, keycode + MIN_KEYCODE);
+
+            keycode = keyInfo.modifierKeycodes[i][1];
+            if(keycode)
+                ClearBit(ctrl->per_key_repeat, keycode + MIN_KEYCODE);
+        }
+
+        /* Hurray for data duplication */
+        if (pDev->kbdfeed)
+            memcpy(pDev->kbdfeed->ctrl.autoRepeats, ctrl->per_key_repeat, XkbPerKeyBitArraySize);
+
+        //ErrorF("per_key_repeat =\n");
+        //for(i=0; i < XkbPerKeyBitArraySize; i++)
+        //    ErrorF("%02x%s", ctrl->per_key_repeat[i], (i + 1) & 7 ? "" : "\n");
+
+        /* And now we notify the puppies about the changes */
+        XkbDDXChangeControls(pDev, &old, ctrl);
+    }
+}
+
+void DarwinKeyboardReloadHandler(void) {
+    KeySymsRec keySyms;
+    CFIndex initialKeyRepeatValue, keyRepeatValue;
+    BOOL ok;
+    DeviceIntPtr pDev;
+    const char *xmodmap = PROJECTROOT "/bin/xmodmap";
+    const char *sysmodmap = PROJECTROOT "/lib/X11/xinit/.Xmodmap";
+    const char *homedir = getenv("HOME");
+    char usermodmap[PATH_MAX], cmd[PATH_MAX];
+
+    DEBUG_LOG("DarwinKeyboardReloadHandler\n");
+
+    /* Get our key repeat settings from GlobalPreferences */
+    (void)CFPreferencesAppSynchronize(CFSTR(".GlobalPreferences"));
+    
+    initialKeyRepeatValue = CFPreferencesGetAppIntegerValue(CFSTR("InitialKeyRepeat"), CFSTR(".GlobalPreferences"), &ok);
+    if(!ok)
+        initialKeyRepeatValue = 35;
+    
+    keyRepeatValue = CFPreferencesGetAppIntegerValue(CFSTR("KeyRepeat"), CFSTR(".GlobalPreferences"), &ok);
+    if(!ok)
+        keyRepeatValue = 6;
+    
+    pthread_mutex_lock(&keyInfo_mutex); {
+        /* Initialize our keySyms */
+        keySyms.map = keyInfo.keyMap;
+        keySyms.mapWidth   = GLYPHS_PER_KEY;
+        keySyms.minKeyCode = MIN_KEYCODE;
+        keySyms.maxKeyCode = MAX_KEYCODE;
+
+	// TODO: We should build the entire XkbDescRec and use XkbCopyKeymap
+        /* Apply the mappings to darwinKeyboard */
+        XkbApplyMappingChange(darwinKeyboard, &keySyms, keySyms.minKeyCode,
+                              keySyms.maxKeyCode - keySyms.minKeyCode + 1,
+                              keyInfo.modMap, serverClient);
+        DarwinKeyboardSetRepeat(darwinKeyboard, initialKeyRepeatValue, keyRepeatValue);
+
+        /* Apply the mappings to the core keyboard */
+        for (pDev = inputInfo.devices; pDev; pDev = pDev->next) {
+            if ((pDev->coreEvents || pDev == inputInfo.keyboard) && pDev->key) {
+                XkbApplyMappingChange(pDev, &keySyms, keySyms.minKeyCode,
+                                      keySyms.maxKeyCode - keySyms.minKeyCode + 1,
+                                      keyInfo.modMap, serverClient);
+                DarwinKeyboardSetRepeat(pDev, initialKeyRepeatValue, keyRepeatValue);    
+            }
+        }
+    } pthread_mutex_unlock(&keyInfo_mutex);
+
+    /* Modify with xmodmap */
+    if (access(xmodmap, F_OK) == 0) {
+        /* Check for system .Xmodmap */
+        if (access(sysmodmap, F_OK) == 0) {
+            if(snprintf (cmd, sizeof(cmd), "%s %s", xmodmap, sysmodmap) < sizeof(cmd)) {
+                X11ApplicationLaunchClient(cmd);
+            } else {
+                ErrorF("X11.app: Unable to create / execute xmodmap command line");
+            }
+        }
+
+        /* Check for user's local .Xmodmap */
+        if ((homedir != NULL) && (snprintf (usermodmap, sizeof(usermodmap), "%s/.Xmodmap", homedir) < sizeof(usermodmap))) {
+            if (access(usermodmap, F_OK) == 0) {
+                if(snprintf (cmd, sizeof(cmd), "%s %s", xmodmap, usermodmap) < sizeof(cmd)) {
+                    X11ApplicationLaunchClient(cmd);
+                } else {
+                    ErrorF("X11.app: Unable to create / execute xmodmap command line");
+                }
+            }
+        } else {
+            ErrorF("X11.app: Unable to determine path to user's .Xmodmap");
+        }
+    }
+}
+
+//-----------------------------------------------------------------------------
+// Modifier translation functions
+//
+// There are three different ways to specify a Mac modifier key:
+// keycode - specifies hardware key, read from keymapping
+// key     - NX_MODIFIERKEY_*, really an index
+// mask    - NX_*MASK, mask for modifier flags in event record
+// Left and right side have different keycodes but the same key and mask.
+//-----------------------------------------------------------------------------
+
+/*
+ * DarwinModifierNXKeyToNXKeycode
+ *      Return the keycode for an NX_MODIFIERKEY_* modifier.
+ *      side = 0 for left or 1 for right.
+ *      Returns 0 if key+side is not a known modifier.
+ */
+int DarwinModifierNXKeyToNXKeycode(int key, int side) {
+    int retval;
+    pthread_mutex_lock(&keyInfo_mutex);
+    retval = keyInfo.modifierKeycodes[key][side];
+    pthread_mutex_unlock(&keyInfo_mutex);
+
+    return retval;
+}
+
+/*
+ * DarwinModifierNXKeycodeToNXKey
+ *      Returns -1 if keycode+side is not a modifier key
+ *      outSide may be NULL, else it gets 0 for left and 1 for right.
+ */
+int DarwinModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide) {
+    int key, side;
+
+    keycode += MIN_KEYCODE;
+
+    // search modifierKeycodes for this keycode+side
+    pthread_mutex_lock(&keyInfo_mutex);
+    for (key = 0; key < NX_NUMMODIFIERS; key++) {
+        for (side = 0; side <= 1; side++) {
+            if (keyInfo.modifierKeycodes[key][side] == keycode) break;
+        }
+    }
+    pthread_mutex_unlock(&keyInfo_mutex);
+
+    if (key == NX_NUMMODIFIERS) {
+        return -1;
+    }
+    if (outSide) *outSide = side;
+
+    return key;
+}
+
+/*
+ * DarwinModifierNXMaskToNXKey
+ *      Returns -1 if mask is not a known modifier mask.
+ */
+int DarwinModifierNXMaskToNXKey(int mask) {
+    switch (mask) {
+        case NX_ALPHASHIFTMASK:       return NX_MODIFIERKEY_ALPHALOCK;
+        case NX_SHIFTMASK:            return NX_MODIFIERKEY_SHIFT;
+#ifdef NX_DEVICELSHIFTKEYMASK
+        case NX_DEVICELSHIFTKEYMASK:  return NX_MODIFIERKEY_SHIFT;
+        case NX_DEVICERSHIFTKEYMASK:  return NX_MODIFIERKEY_RSHIFT;
+#endif
+        case NX_CONTROLMASK:          return NX_MODIFIERKEY_CONTROL;
+#ifdef NX_DEVICELCTLKEYMASK
+        case NX_DEVICELCTLKEYMASK:    return NX_MODIFIERKEY_CONTROL;
+        case NX_DEVICERCTLKEYMASK:    return NX_MODIFIERKEY_RCONTROL;
+#endif
+        case NX_ALTERNATEMASK:        return NX_MODIFIERKEY_ALTERNATE;
+#ifdef NX_DEVICELALTKEYMASK
+        case NX_DEVICELALTKEYMASK:    return NX_MODIFIERKEY_ALTERNATE;
+        case NX_DEVICERALTKEYMASK:    return NX_MODIFIERKEY_RALTERNATE;
+#endif
+        case NX_COMMANDMASK:          return NX_MODIFIERKEY_COMMAND;
+#ifdef NX_DEVICELCMDKEYMASK
+        case NX_DEVICELCMDKEYMASK:    return NX_MODIFIERKEY_COMMAND;
+        case NX_DEVICERCMDKEYMASK:    return NX_MODIFIERKEY_RCOMMAND;
+#endif
+        case NX_NUMERICPADMASK:       return NX_MODIFIERKEY_NUMERICPAD;
+        case NX_HELPMASK:             return NX_MODIFIERKEY_HELP;
+        case NX_SECONDARYFNMASK:      return NX_MODIFIERKEY_SECONDARYFN;
+    }
+    return -1;
+}
+
+/*
+ * DarwinModifierNXKeyToNXMask
+ *      Returns 0 if key is not a known modifier key.
+ */
+int DarwinModifierNXKeyToNXMask(int key) {
+    switch (key) {
+        case NX_MODIFIERKEY_ALPHALOCK:   return NX_ALPHASHIFTMASK;
+#ifdef NX_DEVICELSHIFTKEYMASK
+        case NX_MODIFIERKEY_SHIFT:       return NX_DEVICELSHIFTKEYMASK;
+        case NX_MODIFIERKEY_RSHIFT:      return NX_DEVICERSHIFTKEYMASK;
+        case NX_MODIFIERKEY_CONTROL:     return NX_DEVICELCTLKEYMASK;
+        case NX_MODIFIERKEY_RCONTROL:    return NX_DEVICERCTLKEYMASK;
+        case NX_MODIFIERKEY_ALTERNATE:   return NX_DEVICELALTKEYMASK;
+        case NX_MODIFIERKEY_RALTERNATE:  return NX_DEVICERALTKEYMASK;
+        case NX_MODIFIERKEY_COMMAND:     return NX_DEVICELCMDKEYMASK;
+        case NX_MODIFIERKEY_RCOMMAND:    return NX_DEVICERCMDKEYMASK;
+#else
+        case NX_MODIFIERKEY_SHIFT:       return NX_SHIFTMASK;
+        case NX_MODIFIERKEY_CONTROL:     return NX_CONTROLMASK;
+        case NX_MODIFIERKEY_ALTERNATE:   return NX_ALTERNATEMASK;
+        case NX_MODIFIERKEY_COMMAND:     return NX_COMMANDMASK;
+#endif
+        case NX_MODIFIERKEY_NUMERICPAD:  return NX_NUMERICPADMASK;
+        case NX_MODIFIERKEY_HELP:        return NX_HELPMASK;
+        case NX_MODIFIERKEY_SECONDARYFN: return NX_SECONDARYFNMASK;
+    }
+    return 0;
+}
+
+/*
+ * DarwinModifierStringToNXMask
+ *      Returns 0 if string is not a known modifier.
+ */
+int DarwinModifierStringToNXMask(const char *str, int separatelr) {
+#ifdef NX_DEVICELSHIFTKEYMASK
+    if(separatelr) {
+        if (!strcasecmp(str, "shift"))    return NX_DEVICELSHIFTKEYMASK | NX_DEVICERSHIFTKEYMASK;
+        if (!strcasecmp(str, "control"))  return NX_DEVICELCTLKEYMASK | NX_DEVICERCTLKEYMASK;
+        if (!strcasecmp(str, "option"))   return NX_DEVICELALTKEYMASK | NX_DEVICERALTKEYMASK;
+        if (!strcasecmp(str, "alt"))   return NX_DEVICELALTKEYMASK | NX_DEVICERALTKEYMASK;
+        if (!strcasecmp(str, "command"))  return NX_DEVICELCMDKEYMASK | NX_DEVICERCMDKEYMASK;
+        if (!strcasecmp(str, "lshift"))   return NX_DEVICELSHIFTKEYMASK;
+        if (!strcasecmp(str, "rshift"))   return NX_DEVICERSHIFTKEYMASK;
+        if (!strcasecmp(str, "lcontrol")) return NX_DEVICELCTLKEYMASK;
+        if (!strcasecmp(str, "rcontrol")) return NX_DEVICERCTLKEYMASK;
+        if (!strcasecmp(str, "loption"))  return NX_DEVICELALTKEYMASK;
+        if (!strcasecmp(str, "roption"))  return NX_DEVICERALTKEYMASK;
+        if (!strcasecmp(str, "lalt"))  return NX_DEVICELALTKEYMASK;
+        if (!strcasecmp(str, "ralt"))  return NX_DEVICERALTKEYMASK;
+        if (!strcasecmp(str, "lcommand")) return NX_DEVICELCMDKEYMASK;
+        if (!strcasecmp(str, "rcommand")) return NX_DEVICERCMDKEYMASK;
+    } else {
+#endif
+        if (!strcasecmp(str, "shift"))    return NX_SHIFTMASK;
+        if (!strcasecmp(str, "control"))  return NX_CONTROLMASK;
+        if (!strcasecmp(str, "option"))   return NX_ALTERNATEMASK;
+        if (!strcasecmp(str, "alt"))   return NX_ALTERNATEMASK;
+        if (!strcasecmp(str, "command"))  return NX_COMMANDMASK;
+        if (!strcasecmp(str, "lshift"))   return NX_SHIFTMASK;
+        if (!strcasecmp(str, "rshift"))   return NX_SHIFTMASK;
+        if (!strcasecmp(str, "lcontrol")) return NX_CONTROLMASK;
+        if (!strcasecmp(str, "rcontrol")) return NX_CONTROLMASK;
+        if (!strcasecmp(str, "loption"))  return NX_ALTERNATEMASK;
+        if (!strcasecmp(str, "roption"))  return NX_ALTERNATEMASK;
+        if (!strcasecmp(str, "lalt"))  return NX_ALTERNATEMASK;
+        if (!strcasecmp(str, "ralt"))  return NX_ALTERNATEMASK;
+        if (!strcasecmp(str, "lcommand")) return NX_COMMANDMASK;
+        if (!strcasecmp(str, "rcommand")) return NX_COMMANDMASK;
+#ifdef NX_DEVICELSHIFTKEYMASK
+    }
+#endif
+    if (!strcasecmp(str, "lock"))     return NX_ALPHASHIFTMASK;
+    if (!strcasecmp(str, "fn"))       return NX_SECONDARYFNMASK;
+    if (!strcasecmp(str, "help"))     return NX_HELPMASK;
+    if (!strcasecmp(str, "numlock"))  return NX_NUMERICPADMASK;
+    return 0;
+}
+
+/*
+ * LegalModifier
+ *      This allows the ddx layer to prevent some keys from being remapped
+ *      as modifier keys.
+ */
+Bool LegalModifier(unsigned int key, DeviceIntPtr pDev)
+{
+    return 1;
+}
+
+static inline UniChar macroman2ucs(unsigned char c) {
+    /* Precalculated table mapping MacRoman-128 to Unicode. Generated
+       by creating single element CFStringRefs then extracting the
+       first character. */
+
+    static const unsigned short table[128] = {
+        0xc4, 0xc5, 0xc7, 0xc9, 0xd1, 0xd6, 0xdc, 0xe1,
+        0xe0, 0xe2, 0xe4, 0xe3, 0xe5, 0xe7, 0xe9, 0xe8,
+        0xea, 0xeb, 0xed, 0xec, 0xee, 0xef, 0xf1, 0xf3,
+        0xf2, 0xf4, 0xf6, 0xf5, 0xfa, 0xf9, 0xfb, 0xfc,
+        0x2020, 0xb0, 0xa2, 0xa3, 0xa7, 0x2022, 0xb6, 0xdf,
+        0xae, 0xa9, 0x2122, 0xb4, 0xa8, 0x2260, 0xc6, 0xd8,
+        0x221e, 0xb1, 0x2264, 0x2265, 0xa5, 0xb5, 0x2202, 0x2211,
+        0x220f, 0x3c0, 0x222b, 0xaa, 0xba, 0x3a9, 0xe6, 0xf8,
+        0xbf, 0xa1, 0xac, 0x221a, 0x192, 0x2248, 0x2206, 0xab,
+        0xbb, 0x2026, 0xa0, 0xc0, 0xc3, 0xd5, 0x152, 0x153,
+        0x2013, 0x2014, 0x201c, 0x201d, 0x2018, 0x2019, 0xf7, 0x25ca,
+        0xff, 0x178, 0x2044, 0x20ac, 0x2039, 0x203a, 0xfb01, 0xfb02,
+        0x2021, 0xb7, 0x201a, 0x201e, 0x2030, 0xc2, 0xca, 0xc1,
+        0xcb, 0xc8, 0xcd, 0xce, 0xcf, 0xcc, 0xd3, 0xd4,
+        0xf8ff, 0xd2, 0xda, 0xdb, 0xd9, 0x131, 0x2c6, 0x2dc,
+        0xaf, 0x2d8, 0x2d9, 0x2da, 0xb8, 0x2dd, 0x2db, 0x2c7,
+    };
+
+    if (c < 128) return c;
+    else         return table[c - 128];
+}
+
+static KeySym make_dead_key(KeySym in) {
+    int i;
+
+    for (i = 0; i < sizeof (dead_keys) / sizeof (dead_keys[0]); i++)
+        if (dead_keys[i].normal == in) return dead_keys[i].dead;
+
+    return in;
+}
+
+static Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
+#if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050
+    KeyboardLayoutRef key_layout;
+    int is_uchr = 1;
+#endif
+    const void *chr_data = NULL;
+    int num_keycodes = NUM_KEYCODES;
+    UInt32 keyboard_type = LMGetKbdType();
+    int i, j;
+    OSStatus err;
+    KeySym *k;
+    CFDataRef currentKeyLayoutDataRef = NULL;
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+    TISInputSourceRef currentKeyLayoutRef = TISCopyCurrentKeyboardLayoutInputSource();
+
+    if (currentKeyLayoutRef) {
+      currentKeyLayoutDataRef = (CFDataRef )TISGetInputSourceProperty(currentKeyLayoutRef, kTISPropertyUnicodeKeyLayoutData);
+      if (currentKeyLayoutDataRef)
+          chr_data = CFDataGetBytePtr(currentKeyLayoutDataRef);
+    }
+#endif
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations" // KLGetCurrentKeyboardLayout, KLGetKeyboardLayoutProperty
+#endif
+
+#if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050
+    if (chr_data == NULL) {
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+        ErrorF("X11.app: Error detected in determining keyboard layout.  If you are using an Apple-provided keyboard layout, please report this error at http://xquartz.macosforge.org and http://bugreport.apple.com\n");
+        ErrorF("X11.app: Debug Info: keyboard_type=%u, currentKeyLayoutRef=%p, currentKeyLayoutDataRef=%p, chr_data=%p\n",
+               (unsigned)keyboard_type, currentKeyLayoutRef, currentKeyLayoutDataRef, chr_data);
+#endif
+
+        KLGetCurrentKeyboardLayout (&key_layout);
+        KLGetKeyboardLayoutProperty (key_layout, kKLuchrData, &chr_data);
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+        if(chr_data != NULL) {
+            ErrorF("X11.app: Fallback succeeded, but this is still a bug.  Please report the above information.\n");
+        }
+#endif
+    }
+
+    if (chr_data == NULL) {
+        ErrorF("X11.app: Debug Info: kKLuchrData failed, trying kKLKCHRData.\n");
+        ErrorF("If you are using a 3rd party keyboard layout, please see http://xquartz.macosforge.org/trac/ticket/154\n");
+        KLGetKeyboardLayoutProperty (key_layout, kKLKCHRData, &chr_data);
+        is_uchr = 0;
+        num_keycodes = 128;
+        
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+        if(chr_data != NULL) {
+            ErrorF("X11.app: Fallback succeeded, but this is still a bug.  Please report the above information.\n");
+        }
+#endif
+    }
+#endif
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+    if(currentKeyLayoutRef)
+        CFRelease(currentKeyLayoutRef);
+#endif
+    
+    if (chr_data == NULL) {
+      ErrorF ( "Couldn't get uchr or kchr resource\n");
+      return FALSE;
+    }
+    
+    /* Scan the keycode range for the Unicode character that each
+       key produces in the four shift states. Then convert that to
+       an X11 keysym (which may just the bit that says "this is
+       Unicode" if it can't find the real symbol.) */
+       
+    /* KeyTranslate is not available on 64-bit platforms; UCKeyTranslate
+       must be used instead. */
+
+    for (i = 0; i < num_keycodes; i++) {
+        static const int mods[4] = {0, MOD_SHIFT, MOD_OPTION,
+                                    MOD_OPTION | MOD_SHIFT};
+
+        k = info->keyMap + i * GLYPHS_PER_KEY;
+
+        for (j = 0; j < 4; j++) {
+#if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050
+            if (is_uchr)  {
+#endif
+                UniChar s[8];
+                UniCharCount len;
+                UInt32 dead_key_state = 0, extra_dead = 0;
+
+                err = UCKeyTranslate (chr_data, i, kUCKeyActionDown,
+                                      mods[j] >> 8, keyboard_type, 0,
+                                      &dead_key_state, 8, &len, s);
+                if (err != noErr) continue;
+
+                if (len == 0 && dead_key_state != 0) {
+                    /* Found a dead key. Work out which one it is, but
+                       remembering that it's dead. */
+                    err = UCKeyTranslate (chr_data, i, kUCKeyActionDown,
+                                          mods[j] >> 8, keyboard_type,
+                                          kUCKeyTranslateNoDeadKeysMask,
+                                          &extra_dead, 8, &len, s);
+                    if (err != noErr) continue;
+                }
+
+                /* Not sure why 0x0010 is there.
+                 * 0x0000 - <rdar://problem/7793566> 'Unicode Hex Input' ...
+                 */
+                if (len > 0 && s[0] != 0x0010 && s[0] != 0x0000) {
+                    k[j] = ucs2keysym (s[0]);
+                    if (dead_key_state != 0) k[j] = make_dead_key (k[j]);
+                }
+#if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050
+            } else { // kchr
+                UInt32 c, state = 0, state2 = 0;
+                UInt16 code;
+
+                code = i | mods[j];
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations" // KeyTranslate
+#endif
+
+                c = KeyTranslate (chr_data, code, &state);
+
+                /* Dead keys are only processed on key-down, so ask
+                   to translate those events. When we find a dead key,
+                   translating the matching key up event will give
+                   us the actual dead character. */
+
+                if (state != 0)
+                    c = KeyTranslate (chr_data, code | 128, &state2);
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+                /* Characters seem to be in MacRoman encoding. */
+
+                if (c != 0 && c != 0x0010) {
+                    k[j] = ucs2keysym (macroman2ucs (c & 255));
+
+                    if (state != 0) k[j] = make_dead_key (k[j]);
+                }
+            }
+#endif
+        }
+
+        if (k[3] == k[2]) k[3] = NoSymbol;
+        if (k[1] == k[0]) k[1] = NoSymbol;
+        if (k[0] == k[2] && k[1] == k[3]) k[2] = k[3] = NoSymbol;
+        if (k[3] == k[0] && k[2] == k[1] && k[2] == NoSymbol) k[3] = NoSymbol;
+    }
+
+#if HACK_MISSING
+    /* Fix up some things that are normally missing.. */
+    
+    for (i = 0; i < sizeof (known_keys) / sizeof (known_keys[0]); i++) {
+        k = info->keyMap + known_keys[i].keycode * GLYPHS_PER_KEY;
+        
+        if (   k[0] == NoSymbol && k[1] == NoSymbol
+            && k[2] == NoSymbol && k[3] == NoSymbol)
+            k[0] = known_keys[i].keysym;
+    }
+#endif
+    
+#if HACK_KEYPAD
+    /* And some more things. We find the right symbols for the numeric
+     keypad, but not the KP_ keysyms. So try to convert known keycodes. */
+    for (i = 0; i < sizeof (known_numeric_keys) / sizeof (known_numeric_keys[0]); i++) {
+        k = info->keyMap + known_numeric_keys[i].keycode * GLYPHS_PER_KEY;
+        
+        if (k[0] == known_numeric_keys[i].normal)
+            k[0] = known_numeric_keys[i].keypad;
+    }
+#endif
+    
+#if HACK_BLACKLIST
+    for (i = 0; i < sizeof (keycode_blacklist) / sizeof (keycode_blacklist[0]); i++) {
+        k = info->keyMap + keycode_blacklist[i] * GLYPHS_PER_KEY;
+        k[0] = k[1] = k[2] = k[3] = NoSymbol;
+    }
+#endif
+
+    DarwinBuildModifierMaps(info);
+
+    return TRUE;
+}
+
+Bool QuartsResyncKeymap(Bool sendDDXEvent) {
+    Bool retval;
+    /* Update keyInfo */
+    pthread_mutex_lock(&keyInfo_mutex);
+    memset(keyInfo.keyMap, 0, sizeof(keyInfo.keyMap));
+    retval = QuartzReadSystemKeymap(&keyInfo);
+    pthread_mutex_unlock(&keyInfo_mutex);
+
+    /* Tell server thread to deal with new keyInfo */
+    if(sendDDXEvent)
+        DarwinSendDDXEvent(kXquartzReloadKeymap, 0);
+
+    return retval;
+}
diff --git a/xorg-server/hw/xquartz/quartzKeyboard.h b/xorg-server/hw/xquartz/quartzKeyboard.h
index bb5e84597..de4aed868 100644
--- a/xorg-server/hw/xquartz/quartzKeyboard.h
+++ b/xorg-server/hw/xquartz/quartzKeyboard.h
@@ -1,56 +1,56 @@
-/*

- * Copyright (c) 2003-2004 Torrey T. Lyons. All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright

- * holders shall not be used in advertising or otherwise to promote the sale,

- * use or other dealings in this Software without prior written authorization.

- */

-

-#ifndef QUARTZ_KEYBOARD_H

-#define QUARTZ_KEYBOARD_H 1

-

-#define XK_TECHNICAL		// needed to get XK_Escape

-#define XK_PUBLISHING

-#include "X11/keysym.h"

-#include "inputstr.h"

-

-// Each key can generate 4 glyphs. They are, in order:

-// unshifted, shifted, modeswitch unshifted, modeswitch shifted

-#define GLYPHS_PER_KEY  4

-#define NUM_KEYCODES    248	// NX_NUMKEYCODES might be better

-#define MIN_KEYCODE     XkbMinLegalKeyCode     // unfortunately, this isn't 0...

-#define MAX_KEYCODE     NUM_KEYCODES + MIN_KEYCODE - 1

-

-/* These functions need to be implemented by Xquartz, XDarwin, etc. */

-Bool QuartsResyncKeymap(Bool sendDDXEvent);

-

-/* Provided for darwinEvents.c */

-void DarwinKeyboardReloadHandler(void);

-int DarwinModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide);

-int DarwinModifierNXKeyToNXKeycode(int key, int side);

-int DarwinModifierNXKeyToNXMask(int key);

-int DarwinModifierNXMaskToNXKey(int mask);

-int DarwinModifierStringToNXMask(const char *string, int separatelr);

-

-/* Provided for darwin.c */

-void DarwinKeyboardInit(DeviceIntPtr pDev);

-

-#endif /* QUARTZ_KEYBOARD_H */

+/*
+ * Copyright (c) 2003-2004 Torrey T. Lyons. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+
+#ifndef QUARTZ_KEYBOARD_H
+#define QUARTZ_KEYBOARD_H 1
+
+#define XK_TECHNICAL		// needed to get XK_Escape
+#define XK_PUBLISHING
+#include "X11/keysym.h"
+#include "inputstr.h"
+
+// Each key can generate 4 glyphs. They are, in order:
+// unshifted, shifted, modeswitch unshifted, modeswitch shifted
+#define GLYPHS_PER_KEY  4
+#define NUM_KEYCODES    248	// NX_NUMKEYCODES might be better
+#define MIN_KEYCODE     XkbMinLegalKeyCode     // unfortunately, this isn't 0...
+#define MAX_KEYCODE     NUM_KEYCODES + MIN_KEYCODE - 1
+
+/* These functions need to be implemented by Xquartz, XDarwin, etc. */
+Bool QuartsResyncKeymap(Bool sendDDXEvent);
+
+/* Provided for darwinEvents.c */
+void DarwinKeyboardReloadHandler(void);
+int DarwinModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide);
+int DarwinModifierNXKeyToNXKeycode(int key, int side);
+int DarwinModifierNXKeyToNXMask(int key);
+int DarwinModifierNXMaskToNXKey(int mask);
+int DarwinModifierStringToNXMask(const char *string, int separatelr);
+
+/* Provided for darwin.c */
+void DarwinKeyboardInit(DeviceIntPtr pDev);
+
+#endif /* QUARTZ_KEYBOARD_H */
diff --git a/xorg-server/hw/xquartz/quartzRandR.c b/xorg-server/hw/xquartz/quartzRandR.c
index 651352b79..98b382d65 100644
--- a/xorg-server/hw/xquartz/quartzRandR.c
+++ b/xorg-server/hw/xquartz/quartzRandR.c
@@ -1,585 +1,585 @@
-/*

- * Quartz-specific support for the XRandR extension

- *

- * Copyright (c) 2001-2004 Greg Parker and Torrey T. Lyons,

- *               2010      Jan Hauffa.

- *               2010-2011 Apple Inc.

- *                 All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright

- * holders shall not be used in advertising or otherwise to promote the sale,

- * use or other dealings in this Software without prior written authorization.

- */

-

-#include "sanitizedCarbon.h"

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include "quartzCommon.h"

-#include "quartzRandR.h"

-#include "quartz.h"

-#include "darwin.h"

-

-#include "X11Application.h"

-

-#include <AvailabilityMacros.h>

-

-#include <X11/extensions/randr.h>

-#include <randrstr.h>

-#include <IOKit/graphics/IOGraphicsTypes.h>

-

-/* TODO: UGLY, find a better way!

- * We want to ignore kXquartzDisplayChanged which are generated by us

- */

-static Bool ignore_next_fake_mode_update = FALSE;

-

-#define FAKE_REFRESH_ROOTLESS 1

-#define FAKE_REFRESH_FULLSCREEN 2

-

-#define DEFAULT_REFRESH  60

-#define kDisplayModeUsableFlags  (kDisplayModeValidFlag | kDisplayModeSafeFlag)

-

-#define CALLBACK_SUCCESS 0

-#define CALLBACK_CONTINUE 1

-#define CALLBACK_ERROR -1

-

-typedef int (*QuartzModeCallback)

-    (ScreenPtr, QuartzModeInfoPtr, void *);

-

-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060

-

-static long getDictLong (CFDictionaryRef dictRef, CFStringRef key) {

-    long value;

-

-    CFNumberRef numRef = (CFNumberRef) CFDictionaryGetValue(dictRef, key);

-    if (!numRef)

-        return 0;

-

-    if (!CFNumberGetValue(numRef, kCFNumberLongType, &value))

-        return 0;

-    return value;

-}

-

-static double getDictDouble (CFDictionaryRef dictRef, CFStringRef key) {

-    double value;

-

-    CFNumberRef numRef = (CFNumberRef) CFDictionaryGetValue(dictRef, key);

-    if (!numRef)

-        return 0.0;

-

-    if (!CFNumberGetValue(numRef, kCFNumberDoubleType, &value))

-        return 0.0;

-    return value;

-}

-

-static void QuartzRandRGetModeInfo (CFDictionaryRef modeRef,

-                                    QuartzModeInfoPtr pMode) {

-    pMode->width = (size_t) getDictLong(modeRef, kCGDisplayWidth);

-    pMode->height = (size_t) getDictLong(modeRef, kCGDisplayHeight);

-    pMode->refresh = (int)(getDictDouble(modeRef, kCGDisplayRefreshRate) + 0.5);

-    if (pMode->refresh == 0)

-        pMode->refresh = DEFAULT_REFRESH;

-    pMode->ref = NULL;

-    pMode->pSize = NULL;

-}

-

-static Bool QuartzRandRCopyCurrentModeInfo (CGDirectDisplayID screenId,

-                                           QuartzModeInfoPtr pMode) {

-    CFDictionaryRef curModeRef = CGDisplayCurrentMode(screenId);

-    if (!curModeRef)

-        return FALSE;

-

-    QuartzRandRGetModeInfo(curModeRef, pMode);

-    pMode->ref = (void *)curModeRef;

-    CFRetain(pMode->ref);

-    return TRUE;

-}

-

-static Bool QuartzRandRSetCGMode (CGDirectDisplayID screenId,

-                                QuartzModeInfoPtr pMode) {

-    CFDictionaryRef modeRef = (CFDictionaryRef) pMode->ref;

-    return (CGDisplaySwitchToMode(screenId, modeRef) == kCGErrorSuccess);

-}

-

-static Bool QuartzRandREnumerateModes (ScreenPtr pScreen,

-                                       QuartzModeCallback callback,

-                                       void *data) {

-    Bool retval = FALSE;

-    QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);

-

-    /* Just an 800x600 fallback if we have no attached heads */

-    if(pQuartzScreen->displayIDs) {

-        CFDictionaryRef curModeRef, modeRef;

-        long curBpp;

-        CFArrayRef modes;

-        QuartzModeInfo modeInfo;

-        int i;

-        CGDirectDisplayID screenId = pQuartzScreen->displayIDs[0];

-

-        curModeRef = CGDisplayCurrentMode(screenId);

-        if (!curModeRef)

-            return FALSE;

-        curBpp = getDictLong(curModeRef, kCGDisplayBitsPerPixel);

-

-        modes = CGDisplayAvailableModes(screenId);

-        if (!modes)

-            return FALSE;

-        for (i = 0; i < CFArrayGetCount(modes); i++) {

-            int cb;

-            modeRef = (CFDictionaryRef) CFArrayGetValueAtIndex(modes, i);

-

-            /* Skip modes that are not usable on the current display or have a

-               different pixel encoding than the current mode. */

-            if (((unsigned long) getDictLong(modeRef, kCGDisplayIOFlags) &

-                 kDisplayModeUsableFlags) != kDisplayModeUsableFlags)

-                continue;

-            if (getDictLong(modeRef, kCGDisplayBitsPerPixel) != curBpp)

-                continue;

-

-            QuartzRandRGetModeInfo(modeRef, &modeInfo);

-            modeInfo.ref = (void *)modeRef;

-            cb = callback(pScreen, &modeInfo, data);

-            if (cb == CALLBACK_CONTINUE)

-                retval = TRUE;

-            else if (cb == CALLBACK_SUCCESS)

-                return TRUE;

-            else if (cb == CALLBACK_ERROR)

-                return FALSE;

-        }

-    }

-

-    switch(callback(pScreen, &pQuartzScreen->rootlessMode, data)) {

-        case CALLBACK_SUCCESS:

-            return TRUE;

-        case CALLBACK_ERROR:

-            return FALSE;

-        case CALLBACK_CONTINUE:

-            retval = TRUE;

-        default:

-            break;

-    }

-

-    switch(callback(pScreen, &pQuartzScreen->fullscreenMode, data)) {

-        case CALLBACK_SUCCESS:

-            return TRUE;

-        case CALLBACK_ERROR:

-            return FALSE;

-        case CALLBACK_CONTINUE:

-            retval = TRUE;

-        default:

-            break;

-    }

-

-    return retval;

-}

-

-#else /* we have the new CG APIs from Snow Leopard */

-

-static void QuartzRandRGetModeInfo (CGDisplayModeRef modeRef,

-                                    QuartzModeInfoPtr pMode) {

-    pMode->width = CGDisplayModeGetWidth(modeRef);

-    pMode->height = CGDisplayModeGetHeight(modeRef);

-    pMode->refresh = (int) (CGDisplayModeGetRefreshRate(modeRef) + 0.5);

-    if (pMode->refresh == 0)

-        pMode->refresh = DEFAULT_REFRESH;

-    pMode->ref = NULL;

-    pMode->pSize = NULL;

-}

-

-static Bool QuartzRandRCopyCurrentModeInfo (CGDirectDisplayID screenId,

-                                            QuartzModeInfoPtr pMode) {

-    CGDisplayModeRef curModeRef = CGDisplayCopyDisplayMode(screenId);

-    if (!curModeRef)

-        return FALSE;

-

-    QuartzRandRGetModeInfo(curModeRef, pMode);

-    pMode->ref = curModeRef;

-    return TRUE;

-}

-

-static Bool QuartzRandRSetCGMode (CGDirectDisplayID screenId,

-                                QuartzModeInfoPtr pMode) {

-    CGDisplayModeRef modeRef = (CGDisplayModeRef) pMode->ref;

-    if (!modeRef)

-        return FALSE;

-

-    return (CGDisplaySetDisplayMode(screenId, modeRef, NULL) == kCGErrorSuccess);

-}

-

-static Bool QuartzRandREnumerateModes (ScreenPtr pScreen,

-                                       QuartzModeCallback callback,

-                                       void *data) {

-    Bool retval = FALSE;

-    QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);

-

-    /* Just an 800x600 fallback if we have no attached heads */

-    if(pQuartzScreen->displayIDs) {

-        CGDisplayModeRef curModeRef, modeRef;

-        CFStringRef curPixelEnc, pixelEnc;

-        CFComparisonResult pixelEncEqual;

-        CFArrayRef modes;

-        QuartzModeInfo modeInfo;

-        int i;

-        CGDirectDisplayID screenId = pQuartzScreen->displayIDs[0];

-

-        curModeRef = CGDisplayCopyDisplayMode(screenId);

-        if (!curModeRef)

-            return FALSE;

-        curPixelEnc = CGDisplayModeCopyPixelEncoding(curModeRef);

-        CGDisplayModeRelease(curModeRef);

-

-        modes = CGDisplayCopyAllDisplayModes(screenId, NULL);

-        if (!modes) {

-            CFRelease(curPixelEnc);

-            return FALSE;

-        }

-        for (i = 0; i < CFArrayGetCount(modes); i++) {

-            int cb;

-            modeRef = (CGDisplayModeRef) CFArrayGetValueAtIndex(modes, i);

-

-            /* Skip modes that are not usable on the current display or have a

-               different pixel encoding than the current mode. */

-            if ((CGDisplayModeGetIOFlags(modeRef) & kDisplayModeUsableFlags) !=

-                kDisplayModeUsableFlags)

-                continue;

-            pixelEnc = CGDisplayModeCopyPixelEncoding(modeRef);

-            pixelEncEqual = CFStringCompare(pixelEnc, curPixelEnc, 0);

-            CFRelease(pixelEnc);

-            if (pixelEncEqual != kCFCompareEqualTo)

-                continue;

-

-            QuartzRandRGetModeInfo(modeRef, &modeInfo);

-            modeInfo.ref = modeRef;

-            cb = callback(pScreen, &modeInfo, data);

-            if (cb == CALLBACK_CONTINUE) {

-                retval = TRUE;

-            } else if (cb == CALLBACK_SUCCESS) {

-                CFRelease(modes);

-                CFRelease(curPixelEnc);

-                return TRUE;

-            } else if (cb == CALLBACK_ERROR) {

-                CFRelease(modes);

-                CFRelease(curPixelEnc);

-                return FALSE;

-            }

-        }

-

-        CFRelease(modes);

-        CFRelease(curPixelEnc);

-    }

-

-    switch(callback(pScreen, &pQuartzScreen->rootlessMode, data)) {

-        case CALLBACK_SUCCESS:

-            return TRUE;

-        case CALLBACK_ERROR:

-            return FALSE;

-        case CALLBACK_CONTINUE:

-            retval = TRUE;

-        default:

-            break;

-    }

-

-    switch(callback(pScreen, &pQuartzScreen->fullscreenMode, data)) {

-        case CALLBACK_SUCCESS:

-            return TRUE;

-        case CALLBACK_ERROR:

-            return FALSE;

-        case CALLBACK_CONTINUE:

-            retval = TRUE;

-        default:

-            break;

-    }

-

-    return retval;

-}

-

-#endif  /* Snow Leopard CoreGraphics APIs */

-

-

-static Bool QuartzRandRModesEqual (QuartzModeInfoPtr pMode1,

-                                   QuartzModeInfoPtr pMode2) {

-    return (pMode1->width == pMode2->width) &&

-           (pMode1->height == pMode2->height) &&

-           (pMode1->refresh == pMode2->refresh);

-}

-

-static Bool QuartzRandRRegisterMode (ScreenPtr pScreen,

-                                     QuartzModeInfoPtr pMode) {

-    QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);

-    Bool isCurrentMode = QuartzRandRModesEqual(&pQuartzScreen->currentMode, pMode);

-

-    /* TODO: DPI */

-    pMode->pSize = RRRegisterSize(pScreen, pMode->width, pMode->height, pScreen->mmWidth, pScreen->mmHeight);

-    if (pMode->pSize) {

-        //DEBUG_LOG("registering: %d x %d @ %d %s\n", (int)pMode->width, (int)pMode->height, (int)pMode->refresh, isCurrentMode ? "*" : "");

-        RRRegisterRate(pScreen, pMode->pSize, pMode->refresh);

-

-        if (isCurrentMode)

-            RRSetCurrentConfig(pScreen, RR_Rotate_0, pMode->refresh, pMode->pSize);

-

-        return TRUE;

-    }

-    return FALSE;

-}

-

-static int QuartzRandRRegisterModeCallback (ScreenPtr pScreen,

-                                        QuartzModeInfoPtr pMode,

-                                        void *data __unused) {

-    if(QuartzRandRRegisterMode(pScreen, pMode)) {

-        return CALLBACK_CONTINUE;

-    } else {

-        return CALLBACK_ERROR;

-    }

-}

-

-static Bool QuartzRandRSetMode(ScreenPtr pScreen, QuartzModeInfoPtr pMode, BOOL doRegister) {

-    QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);

-    Bool captureDisplay = (pMode->refresh != FAKE_REFRESH_FULLSCREEN && pMode->refresh != FAKE_REFRESH_ROOTLESS);

-    CGDirectDisplayID screenId;

-

-    if(pQuartzScreen->displayIDs == NULL)

-        return FALSE;

-

-    screenId = pQuartzScreen->displayIDs[0];

-    if(XQuartzShieldingWindowLevel == 0 && captureDisplay) {

-        if(!X11ApplicationCanEnterRandR())

-            return FALSE;

-        CGCaptureAllDisplays();

-        XQuartzShieldingWindowLevel = CGShieldingWindowLevel(); // 2147483630

-        DEBUG_LOG("Display captured.  ShieldWindowID: %u, Shield level: %d\n",

-                  CGShieldingWindowID(screenId), XQuartzShieldingWindowLevel);

-    }

-

-    if (pQuartzScreen->currentMode.ref && CFEqual(pMode->ref, pQuartzScreen->currentMode.ref)) {

-        DEBUG_LOG("Requested RandR resolution matches current CG mode\n");

-    } if (QuartzRandRSetCGMode(screenId, pMode)) {

-        ignore_next_fake_mode_update = TRUE;

-    } else {

-        DEBUG_LOG("Error while requesting CG resolution change.\n");

-        return FALSE;

-    }

-

-    /* If the client requested the fake rootless mode, switch to rootless.

-     * Otherwise, force fullscreen mode.

-     */

-    QuartzSetRootless(pMode->refresh == FAKE_REFRESH_ROOTLESS);

-    if (pMode->refresh != FAKE_REFRESH_ROOTLESS) {

-        QuartzShowFullscreen(TRUE);

-    }

-

-    if(pQuartzScreen->currentMode.ref)

-        CFRelease(pQuartzScreen->currentMode.ref);

-    pQuartzScreen->currentMode = *pMode;

-    if(pQuartzScreen->currentMode.ref)

-        CFRetain(pQuartzScreen->currentMode.ref);

-    

-    if(XQuartzShieldingWindowLevel != 0 && !captureDisplay) {

-        CGReleaseAllDisplays();

-        XQuartzShieldingWindowLevel = 0;

-    }

-

-    return TRUE;

-}

-

-static int QuartzRandRSetModeCallback (ScreenPtr pScreen,

-                                       QuartzModeInfoPtr pMode,

-                                       void *data) {

-    QuartzModeInfoPtr pReqMode = (QuartzModeInfoPtr) data;

-	

-    if (!QuartzRandRModesEqual(pMode, pReqMode))

-        return CALLBACK_CONTINUE;  /* continue enumeration */

-

-    DEBUG_LOG("Found a match for requested RandR resolution (%dx%d@%d).\n", (int)pMode->width, (int)pMode->height, (int)pMode->refresh);

-

-    if(QuartzRandRSetMode(pScreen, pMode, FALSE))

-        return CALLBACK_SUCCESS;

-    else

-        return CALLBACK_ERROR;

-}

-

-static Bool QuartzRandRGetInfo (ScreenPtr pScreen, Rotation *rotations) {

-    *rotations = RR_Rotate_0;  /* TODO: support rotation */

-

-    return QuartzRandREnumerateModes(pScreen, QuartzRandRRegisterModeCallback, NULL);

-}

-

-static Bool QuartzRandRSetConfig (ScreenPtr           pScreen,

-                                  Rotation            randr,

-                                  int                 rate,

-                                  RRScreenSizePtr     pSize) {

-    QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);

-    QuartzModeInfo reqMode;

-

-    reqMode.width = pSize->width;

-    reqMode.height = pSize->height;

-    reqMode.refresh = rate;

-

-    /* Do not switch modes if requested mode is equal to current mode. */

-    if (QuartzRandRModesEqual(&reqMode, &pQuartzScreen->currentMode))

-        return TRUE;

-        

-    if (QuartzRandREnumerateModes(pScreen, QuartzRandRSetModeCallback, &reqMode)) {

-        return TRUE;

-    }

-    

-    DEBUG_LOG("Unable to find a matching config: %d x %d @ %d\n", (int)reqMode.width, (int)reqMode.height, (int)reqMode.refresh);

-    return FALSE;

-}

-

-static Bool _QuartzRandRUpdateFakeModes (ScreenPtr pScreen) {

-    QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);

-    QuartzModeInfo activeMode;

-

-    if(pQuartzScreen->displayCount > 0) {

-        if(!QuartzRandRCopyCurrentModeInfo(pQuartzScreen->displayIDs[0], &activeMode)) {

-            ErrorF("Unable to determine current display mode.\n");

-            return FALSE;

-        }

-    } else {

-        memset(&activeMode, 0, sizeof(activeMode));

-        activeMode.width = 800;

-        activeMode.height = 600;

-        activeMode.refresh = 60;

-    }

-

-    if(pQuartzScreen->fullscreenMode.ref)

-        CFRelease(pQuartzScreen->fullscreenMode.ref);

-    if(pQuartzScreen->currentMode.ref)

-        CFRelease(pQuartzScreen->currentMode.ref);

-

-    if(pQuartzScreen->displayCount > 1) {

-        activeMode.width = pScreen->width;

-        activeMode.height = pScreen->height;

-        if(XQuartzIsRootless)

-            activeMode.height += aquaMenuBarHeight;

-    }

-

-    pQuartzScreen->fullscreenMode = activeMode; 

-    pQuartzScreen->fullscreenMode.refresh = FAKE_REFRESH_FULLSCREEN;

-

-    pQuartzScreen->rootlessMode = activeMode;

-    pQuartzScreen->rootlessMode.refresh = FAKE_REFRESH_ROOTLESS;

-    pQuartzScreen->rootlessMode.height -= aquaMenuBarHeight;

-

-    if(XQuartzIsRootless) {

-        pQuartzScreen->currentMode = pQuartzScreen->rootlessMode;

-    } else {

-        pQuartzScreen->currentMode = pQuartzScreen->fullscreenMode;

-    }

-

-    /* This extra retain is for currentMode's copy.

-     * fullscreen and rootless share a retain.

-     */

-    if(pQuartzScreen->currentMode.ref)

-        CFRetain(pQuartzScreen->currentMode.ref);

-    

-    DEBUG_LOG("rootlessMode: %d x %d\n", (int)pQuartzScreen->rootlessMode.width, (int)pQuartzScreen->rootlessMode.height);

-    DEBUG_LOG("fullscreenMode: %d x %d\n", (int)pQuartzScreen->fullscreenMode.width, (int)pQuartzScreen->fullscreenMode.height);

-    DEBUG_LOG("currentMode: %d x %d\n", (int)pQuartzScreen->currentMode.width, (int)pQuartzScreen->currentMode.height);

-    

-    return TRUE;

-}

-

-Bool QuartzRandRUpdateFakeModes (BOOL force_update) {

-    ScreenPtr pScreen = screenInfo.screens[0];

-    

-    if(ignore_next_fake_mode_update) {

-        DEBUG_LOG("Ignoring update request caused by RandR resolution change.\n");

-        ignore_next_fake_mode_update = FALSE;

-        return TRUE;

-    }

-    

-    if(!_QuartzRandRUpdateFakeModes(pScreen))

-        return FALSE;

-    

-    if(force_update)

-        RRGetInfo(pScreen, TRUE);

-

-    return TRUE;

-}

-

-Bool QuartzRandRInit (ScreenPtr pScreen) {

-    rrScrPrivPtr    pScrPriv;

-    

-    if (!RRScreenInit (pScreen)) return FALSE;

-    if (!_QuartzRandRUpdateFakeModes (pScreen)) return FALSE;

-

-    pScrPriv = rrGetScrPriv(pScreen);

-    pScrPriv->rrGetInfo = QuartzRandRGetInfo;

-    pScrPriv->rrSetConfig = QuartzRandRSetConfig;

-    return TRUE;

-}

-

-void QuartzRandRSetFakeRootless (void) {

-    int i;

-    

-    DEBUG_LOG("QuartzRandRSetFakeRootless called.\n");

-    

-    for (i=0; i < screenInfo.numScreens; i++) {

-        ScreenPtr pScreen = screenInfo.screens[i];

-        QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);

-

-        QuartzRandRSetMode(pScreen, &pQuartzScreen->rootlessMode, TRUE);

-    }

-}

-

-void QuartzRandRSetFakeFullscreen (BOOL state) {

-    int i;

-

-    DEBUG_LOG("QuartzRandRSetFakeFullscreen called.\n");

-    

-    for (i=0; i < screenInfo.numScreens; i++) {

-        ScreenPtr pScreen = screenInfo.screens[i];

-        QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);

-

-        QuartzRandRSetMode(pScreen, &pQuartzScreen->fullscreenMode, TRUE);

-    }

-    

-    QuartzShowFullscreen(state);

-}

-

-/* Toggle fullscreen mode.  If "fake" fullscreen is the current mode,

- * this will just show/hide the X11 windows.  If we are in a RandR fullscreen

- * mode, this will toggles us to the default fake mode and hide windows if

- * it is fullscreen

- */

-void QuartzRandRToggleFullscreen (void) {

-    ScreenPtr pScreen = screenInfo.screens[0];

-    QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);

-

-    if (pQuartzScreen->currentMode.ref == NULL) {

-        ErrorF("Ignoring QuartzRandRToggleFullscreen because don't have a current mode set.\n");

-    } else if (pQuartzScreen->currentMode.refresh == FAKE_REFRESH_ROOTLESS) {

-        ErrorF("Ignoring QuartzRandRToggleFullscreen because we are in rootless mode.\n");

-    } else if (pQuartzScreen->currentMode.refresh == FAKE_REFRESH_FULLSCREEN) {

-        /* Legacy fullscreen mode.  Hide/Show */

-        QuartzShowFullscreen(!XQuartzFullscreenVisible);

-    } else {

-        /* RandR fullscreen mode.  Return to default mode and hide if it is fullscreen. */

-        if(XQuartzRootlessDefault) {

-            QuartzRandRSetFakeRootless();

-        } else {

-            QuartzRandRSetFakeFullscreen(FALSE);

-        }

-    }    

-}

+/*
+ * Quartz-specific support for the XRandR extension
+ *
+ * Copyright (c) 2001-2004 Greg Parker and Torrey T. Lyons,
+ *               2010      Jan Hauffa.
+ *               2010-2011 Apple Inc.
+ *                 All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+
+#include "sanitizedCarbon.h"
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "quartzCommon.h"
+#include "quartzRandR.h"
+#include "quartz.h"
+#include "darwin.h"
+
+#include "X11Application.h"
+
+#include <AvailabilityMacros.h>
+
+#include <X11/extensions/randr.h>
+#include <randrstr.h>
+#include <IOKit/graphics/IOGraphicsTypes.h>
+
+/* TODO: UGLY, find a better way!
+ * We want to ignore kXquartzDisplayChanged which are generated by us
+ */
+static Bool ignore_next_fake_mode_update = FALSE;
+
+#define FAKE_REFRESH_ROOTLESS 1
+#define FAKE_REFRESH_FULLSCREEN 2
+
+#define DEFAULT_REFRESH  60
+#define kDisplayModeUsableFlags  (kDisplayModeValidFlag | kDisplayModeSafeFlag)
+
+#define CALLBACK_SUCCESS 0
+#define CALLBACK_CONTINUE 1
+#define CALLBACK_ERROR -1
+
+typedef int (*QuartzModeCallback)
+    (ScreenPtr, QuartzModeInfoPtr, void *);
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
+
+static long getDictLong (CFDictionaryRef dictRef, CFStringRef key) {
+    long value;
+
+    CFNumberRef numRef = (CFNumberRef) CFDictionaryGetValue(dictRef, key);
+    if (!numRef)
+        return 0;
+
+    if (!CFNumberGetValue(numRef, kCFNumberLongType, &value))
+        return 0;
+    return value;
+}
+
+static double getDictDouble (CFDictionaryRef dictRef, CFStringRef key) {
+    double value;
+
+    CFNumberRef numRef = (CFNumberRef) CFDictionaryGetValue(dictRef, key);
+    if (!numRef)
+        return 0.0;
+
+    if (!CFNumberGetValue(numRef, kCFNumberDoubleType, &value))
+        return 0.0;
+    return value;
+}
+
+static void QuartzRandRGetModeInfo (CFDictionaryRef modeRef,
+                                    QuartzModeInfoPtr pMode) {
+    pMode->width = (size_t) getDictLong(modeRef, kCGDisplayWidth);
+    pMode->height = (size_t) getDictLong(modeRef, kCGDisplayHeight);
+    pMode->refresh = (int)(getDictDouble(modeRef, kCGDisplayRefreshRate) + 0.5);
+    if (pMode->refresh == 0)
+        pMode->refresh = DEFAULT_REFRESH;
+    pMode->ref = NULL;
+    pMode->pSize = NULL;
+}
+
+static Bool QuartzRandRCopyCurrentModeInfo (CGDirectDisplayID screenId,
+                                           QuartzModeInfoPtr pMode) {
+    CFDictionaryRef curModeRef = CGDisplayCurrentMode(screenId);
+    if (!curModeRef)
+        return FALSE;
+
+    QuartzRandRGetModeInfo(curModeRef, pMode);
+    pMode->ref = (void *)curModeRef;
+    CFRetain(pMode->ref);
+    return TRUE;
+}
+
+static Bool QuartzRandRSetCGMode (CGDirectDisplayID screenId,
+                                QuartzModeInfoPtr pMode) {
+    CFDictionaryRef modeRef = (CFDictionaryRef) pMode->ref;
+    return (CGDisplaySwitchToMode(screenId, modeRef) == kCGErrorSuccess);
+}
+
+static Bool QuartzRandREnumerateModes (ScreenPtr pScreen,
+                                       QuartzModeCallback callback,
+                                       void *data) {
+    Bool retval = FALSE;
+    QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);
+
+    /* Just an 800x600 fallback if we have no attached heads */
+    if(pQuartzScreen->displayIDs) {
+        CFDictionaryRef curModeRef, modeRef;
+        long curBpp;
+        CFArrayRef modes;
+        QuartzModeInfo modeInfo;
+        int i;
+        CGDirectDisplayID screenId = pQuartzScreen->displayIDs[0];
+
+        curModeRef = CGDisplayCurrentMode(screenId);
+        if (!curModeRef)
+            return FALSE;
+        curBpp = getDictLong(curModeRef, kCGDisplayBitsPerPixel);
+
+        modes = CGDisplayAvailableModes(screenId);
+        if (!modes)
+            return FALSE;
+        for (i = 0; i < CFArrayGetCount(modes); i++) {
+            int cb;
+            modeRef = (CFDictionaryRef) CFArrayGetValueAtIndex(modes, i);
+
+            /* Skip modes that are not usable on the current display or have a
+               different pixel encoding than the current mode. */
+            if (((unsigned long) getDictLong(modeRef, kCGDisplayIOFlags) &
+                 kDisplayModeUsableFlags) != kDisplayModeUsableFlags)
+                continue;
+            if (getDictLong(modeRef, kCGDisplayBitsPerPixel) != curBpp)
+                continue;
+
+            QuartzRandRGetModeInfo(modeRef, &modeInfo);
+            modeInfo.ref = (void *)modeRef;
+            cb = callback(pScreen, &modeInfo, data);
+            if (cb == CALLBACK_CONTINUE)
+                retval = TRUE;
+            else if (cb == CALLBACK_SUCCESS)
+                return TRUE;
+            else if (cb == CALLBACK_ERROR)
+                return FALSE;
+        }
+    }
+
+    switch(callback(pScreen, &pQuartzScreen->rootlessMode, data)) {
+        case CALLBACK_SUCCESS:
+            return TRUE;
+        case CALLBACK_ERROR:
+            return FALSE;
+        case CALLBACK_CONTINUE:
+            retval = TRUE;
+        default:
+            break;
+    }
+
+    switch(callback(pScreen, &pQuartzScreen->fullscreenMode, data)) {
+        case CALLBACK_SUCCESS:
+            return TRUE;
+        case CALLBACK_ERROR:
+            return FALSE;
+        case CALLBACK_CONTINUE:
+            retval = TRUE;
+        default:
+            break;
+    }
+
+    return retval;
+}
+
+#else /* we have the new CG APIs from Snow Leopard */
+
+static void QuartzRandRGetModeInfo (CGDisplayModeRef modeRef,
+                                    QuartzModeInfoPtr pMode) {
+    pMode->width = CGDisplayModeGetWidth(modeRef);
+    pMode->height = CGDisplayModeGetHeight(modeRef);
+    pMode->refresh = (int) (CGDisplayModeGetRefreshRate(modeRef) + 0.5);
+    if (pMode->refresh == 0)
+        pMode->refresh = DEFAULT_REFRESH;
+    pMode->ref = NULL;
+    pMode->pSize = NULL;
+}
+
+static Bool QuartzRandRCopyCurrentModeInfo (CGDirectDisplayID screenId,
+                                            QuartzModeInfoPtr pMode) {
+    CGDisplayModeRef curModeRef = CGDisplayCopyDisplayMode(screenId);
+    if (!curModeRef)
+        return FALSE;
+
+    QuartzRandRGetModeInfo(curModeRef, pMode);
+    pMode->ref = curModeRef;
+    return TRUE;
+}
+
+static Bool QuartzRandRSetCGMode (CGDirectDisplayID screenId,
+                                QuartzModeInfoPtr pMode) {
+    CGDisplayModeRef modeRef = (CGDisplayModeRef) pMode->ref;
+    if (!modeRef)
+        return FALSE;
+
+    return (CGDisplaySetDisplayMode(screenId, modeRef, NULL) == kCGErrorSuccess);
+}
+
+static Bool QuartzRandREnumerateModes (ScreenPtr pScreen,
+                                       QuartzModeCallback callback,
+                                       void *data) {
+    Bool retval = FALSE;
+    QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);
+
+    /* Just an 800x600 fallback if we have no attached heads */
+    if(pQuartzScreen->displayIDs) {
+        CGDisplayModeRef curModeRef, modeRef;
+        CFStringRef curPixelEnc, pixelEnc;
+        CFComparisonResult pixelEncEqual;
+        CFArrayRef modes;
+        QuartzModeInfo modeInfo;
+        int i;
+        CGDirectDisplayID screenId = pQuartzScreen->displayIDs[0];
+
+        curModeRef = CGDisplayCopyDisplayMode(screenId);
+        if (!curModeRef)
+            return FALSE;
+        curPixelEnc = CGDisplayModeCopyPixelEncoding(curModeRef);
+        CGDisplayModeRelease(curModeRef);
+
+        modes = CGDisplayCopyAllDisplayModes(screenId, NULL);
+        if (!modes) {
+            CFRelease(curPixelEnc);
+            return FALSE;
+        }
+        for (i = 0; i < CFArrayGetCount(modes); i++) {
+            int cb;
+            modeRef = (CGDisplayModeRef) CFArrayGetValueAtIndex(modes, i);
+
+            /* Skip modes that are not usable on the current display or have a
+               different pixel encoding than the current mode. */
+            if ((CGDisplayModeGetIOFlags(modeRef) & kDisplayModeUsableFlags) !=
+                kDisplayModeUsableFlags)
+                continue;
+            pixelEnc = CGDisplayModeCopyPixelEncoding(modeRef);
+            pixelEncEqual = CFStringCompare(pixelEnc, curPixelEnc, 0);
+            CFRelease(pixelEnc);
+            if (pixelEncEqual != kCFCompareEqualTo)
+                continue;
+
+            QuartzRandRGetModeInfo(modeRef, &modeInfo);
+            modeInfo.ref = modeRef;
+            cb = callback(pScreen, &modeInfo, data);
+            if (cb == CALLBACK_CONTINUE) {
+                retval = TRUE;
+            } else if (cb == CALLBACK_SUCCESS) {
+                CFRelease(modes);
+                CFRelease(curPixelEnc);
+                return TRUE;
+            } else if (cb == CALLBACK_ERROR) {
+                CFRelease(modes);
+                CFRelease(curPixelEnc);
+                return FALSE;
+            }
+        }
+
+        CFRelease(modes);
+        CFRelease(curPixelEnc);
+    }
+
+    switch(callback(pScreen, &pQuartzScreen->rootlessMode, data)) {
+        case CALLBACK_SUCCESS:
+            return TRUE;
+        case CALLBACK_ERROR:
+            return FALSE;
+        case CALLBACK_CONTINUE:
+            retval = TRUE;
+        default:
+            break;
+    }
+
+    switch(callback(pScreen, &pQuartzScreen->fullscreenMode, data)) {
+        case CALLBACK_SUCCESS:
+            return TRUE;
+        case CALLBACK_ERROR:
+            return FALSE;
+        case CALLBACK_CONTINUE:
+            retval = TRUE;
+        default:
+            break;
+    }
+
+    return retval;
+}
+
+#endif  /* Snow Leopard CoreGraphics APIs */
+
+
+static Bool QuartzRandRModesEqual (QuartzModeInfoPtr pMode1,
+                                   QuartzModeInfoPtr pMode2) {
+    return (pMode1->width == pMode2->width) &&
+           (pMode1->height == pMode2->height) &&
+           (pMode1->refresh == pMode2->refresh);
+}
+
+static Bool QuartzRandRRegisterMode (ScreenPtr pScreen,
+                                     QuartzModeInfoPtr pMode) {
+    QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);
+    Bool isCurrentMode = QuartzRandRModesEqual(&pQuartzScreen->currentMode, pMode);
+
+    /* TODO: DPI */
+    pMode->pSize = RRRegisterSize(pScreen, pMode->width, pMode->height, pScreen->mmWidth, pScreen->mmHeight);
+    if (pMode->pSize) {
+        //DEBUG_LOG("registering: %d x %d @ %d %s\n", (int)pMode->width, (int)pMode->height, (int)pMode->refresh, isCurrentMode ? "*" : "");
+        RRRegisterRate(pScreen, pMode->pSize, pMode->refresh);
+
+        if (isCurrentMode)
+            RRSetCurrentConfig(pScreen, RR_Rotate_0, pMode->refresh, pMode->pSize);
+
+        return TRUE;
+    }
+    return FALSE;
+}
+
+static int QuartzRandRRegisterModeCallback (ScreenPtr pScreen,
+                                        QuartzModeInfoPtr pMode,
+                                        void *data __unused) {
+    if(QuartzRandRRegisterMode(pScreen, pMode)) {
+        return CALLBACK_CONTINUE;
+    } else {
+        return CALLBACK_ERROR;
+    }
+}
+
+static Bool QuartzRandRSetMode(ScreenPtr pScreen, QuartzModeInfoPtr pMode, BOOL doRegister) {
+    QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);
+    Bool captureDisplay = (pMode->refresh != FAKE_REFRESH_FULLSCREEN && pMode->refresh != FAKE_REFRESH_ROOTLESS);
+    CGDirectDisplayID screenId;
+
+    if(pQuartzScreen->displayIDs == NULL)
+        return FALSE;
+
+    screenId = pQuartzScreen->displayIDs[0];
+    if(XQuartzShieldingWindowLevel == 0 && captureDisplay) {
+        if(!X11ApplicationCanEnterRandR())
+            return FALSE;
+        CGCaptureAllDisplays();
+        XQuartzShieldingWindowLevel = CGShieldingWindowLevel(); // 2147483630
+        DEBUG_LOG("Display captured.  ShieldWindowID: %u, Shield level: %d\n",
+                  CGShieldingWindowID(screenId), XQuartzShieldingWindowLevel);
+    }
+
+    if (pQuartzScreen->currentMode.ref && CFEqual(pMode->ref, pQuartzScreen->currentMode.ref)) {
+        DEBUG_LOG("Requested RandR resolution matches current CG mode\n");
+    } if (QuartzRandRSetCGMode(screenId, pMode)) {
+        ignore_next_fake_mode_update = TRUE;
+    } else {
+        DEBUG_LOG("Error while requesting CG resolution change.\n");
+        return FALSE;
+    }
+
+    /* If the client requested the fake rootless mode, switch to rootless.
+     * Otherwise, force fullscreen mode.
+     */
+    QuartzSetRootless(pMode->refresh == FAKE_REFRESH_ROOTLESS);
+    if (pMode->refresh != FAKE_REFRESH_ROOTLESS) {
+        QuartzShowFullscreen(TRUE);
+    }
+
+    if(pQuartzScreen->currentMode.ref)
+        CFRelease(pQuartzScreen->currentMode.ref);
+    pQuartzScreen->currentMode = *pMode;
+    if(pQuartzScreen->currentMode.ref)
+        CFRetain(pQuartzScreen->currentMode.ref);
+    
+    if(XQuartzShieldingWindowLevel != 0 && !captureDisplay) {
+        CGReleaseAllDisplays();
+        XQuartzShieldingWindowLevel = 0;
+    }
+
+    return TRUE;
+}
+
+static int QuartzRandRSetModeCallback (ScreenPtr pScreen,
+                                       QuartzModeInfoPtr pMode,
+                                       void *data) {
+    QuartzModeInfoPtr pReqMode = (QuartzModeInfoPtr) data;
+	
+    if (!QuartzRandRModesEqual(pMode, pReqMode))
+        return CALLBACK_CONTINUE;  /* continue enumeration */
+
+    DEBUG_LOG("Found a match for requested RandR resolution (%dx%d@%d).\n", (int)pMode->width, (int)pMode->height, (int)pMode->refresh);
+
+    if(QuartzRandRSetMode(pScreen, pMode, FALSE))
+        return CALLBACK_SUCCESS;
+    else
+        return CALLBACK_ERROR;
+}
+
+static Bool QuartzRandRGetInfo (ScreenPtr pScreen, Rotation *rotations) {
+    *rotations = RR_Rotate_0;  /* TODO: support rotation */
+
+    return QuartzRandREnumerateModes(pScreen, QuartzRandRRegisterModeCallback, NULL);
+}
+
+static Bool QuartzRandRSetConfig (ScreenPtr           pScreen,
+                                  Rotation            randr,
+                                  int                 rate,
+                                  RRScreenSizePtr     pSize) {
+    QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);
+    QuartzModeInfo reqMode;
+
+    reqMode.width = pSize->width;
+    reqMode.height = pSize->height;
+    reqMode.refresh = rate;
+
+    /* Do not switch modes if requested mode is equal to current mode. */
+    if (QuartzRandRModesEqual(&reqMode, &pQuartzScreen->currentMode))
+        return TRUE;
+        
+    if (QuartzRandREnumerateModes(pScreen, QuartzRandRSetModeCallback, &reqMode)) {
+        return TRUE;
+    }
+    
+    DEBUG_LOG("Unable to find a matching config: %d x %d @ %d\n", (int)reqMode.width, (int)reqMode.height, (int)reqMode.refresh);
+    return FALSE;
+}
+
+static Bool _QuartzRandRUpdateFakeModes (ScreenPtr pScreen) {
+    QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);
+    QuartzModeInfo activeMode;
+
+    if(pQuartzScreen->displayCount > 0) {
+        if(!QuartzRandRCopyCurrentModeInfo(pQuartzScreen->displayIDs[0], &activeMode)) {
+            ErrorF("Unable to determine current display mode.\n");
+            return FALSE;
+        }
+    } else {
+        memset(&activeMode, 0, sizeof(activeMode));
+        activeMode.width = 800;
+        activeMode.height = 600;
+        activeMode.refresh = 60;
+    }
+
+    if(pQuartzScreen->fullscreenMode.ref)
+        CFRelease(pQuartzScreen->fullscreenMode.ref);
+    if(pQuartzScreen->currentMode.ref)
+        CFRelease(pQuartzScreen->currentMode.ref);
+
+    if(pQuartzScreen->displayCount > 1) {
+        activeMode.width = pScreen->width;
+        activeMode.height = pScreen->height;
+        if(XQuartzIsRootless)
+            activeMode.height += aquaMenuBarHeight;
+    }
+
+    pQuartzScreen->fullscreenMode = activeMode; 
+    pQuartzScreen->fullscreenMode.refresh = FAKE_REFRESH_FULLSCREEN;
+
+    pQuartzScreen->rootlessMode = activeMode;
+    pQuartzScreen->rootlessMode.refresh = FAKE_REFRESH_ROOTLESS;
+    pQuartzScreen->rootlessMode.height -= aquaMenuBarHeight;
+
+    if(XQuartzIsRootless) {
+        pQuartzScreen->currentMode = pQuartzScreen->rootlessMode;
+    } else {
+        pQuartzScreen->currentMode = pQuartzScreen->fullscreenMode;
+    }
+
+    /* This extra retain is for currentMode's copy.
+     * fullscreen and rootless share a retain.
+     */
+    if(pQuartzScreen->currentMode.ref)
+        CFRetain(pQuartzScreen->currentMode.ref);
+    
+    DEBUG_LOG("rootlessMode: %d x %d\n", (int)pQuartzScreen->rootlessMode.width, (int)pQuartzScreen->rootlessMode.height);
+    DEBUG_LOG("fullscreenMode: %d x %d\n", (int)pQuartzScreen->fullscreenMode.width, (int)pQuartzScreen->fullscreenMode.height);
+    DEBUG_LOG("currentMode: %d x %d\n", (int)pQuartzScreen->currentMode.width, (int)pQuartzScreen->currentMode.height);
+    
+    return TRUE;
+}
+
+Bool QuartzRandRUpdateFakeModes (BOOL force_update) {
+    ScreenPtr pScreen = screenInfo.screens[0];
+    
+    if(ignore_next_fake_mode_update) {
+        DEBUG_LOG("Ignoring update request caused by RandR resolution change.\n");
+        ignore_next_fake_mode_update = FALSE;
+        return TRUE;
+    }
+    
+    if(!_QuartzRandRUpdateFakeModes(pScreen))
+        return FALSE;
+    
+    if(force_update)
+        RRGetInfo(pScreen, TRUE);
+
+    return TRUE;
+}
+
+Bool QuartzRandRInit (ScreenPtr pScreen) {
+    rrScrPrivPtr    pScrPriv;
+    
+    if (!RRScreenInit (pScreen)) return FALSE;
+    if (!_QuartzRandRUpdateFakeModes (pScreen)) return FALSE;
+
+    pScrPriv = rrGetScrPriv(pScreen);
+    pScrPriv->rrGetInfo = QuartzRandRGetInfo;
+    pScrPriv->rrSetConfig = QuartzRandRSetConfig;
+    return TRUE;
+}
+
+void QuartzRandRSetFakeRootless (void) {
+    int i;
+    
+    DEBUG_LOG("QuartzRandRSetFakeRootless called.\n");
+    
+    for (i=0; i < screenInfo.numScreens; i++) {
+        ScreenPtr pScreen = screenInfo.screens[i];
+        QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);
+
+        QuartzRandRSetMode(pScreen, &pQuartzScreen->rootlessMode, TRUE);
+    }
+}
+
+void QuartzRandRSetFakeFullscreen (BOOL state) {
+    int i;
+
+    DEBUG_LOG("QuartzRandRSetFakeFullscreen called.\n");
+    
+    for (i=0; i < screenInfo.numScreens; i++) {
+        ScreenPtr pScreen = screenInfo.screens[i];
+        QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);
+
+        QuartzRandRSetMode(pScreen, &pQuartzScreen->fullscreenMode, TRUE);
+    }
+    
+    QuartzShowFullscreen(state);
+}
+
+/* Toggle fullscreen mode.  If "fake" fullscreen is the current mode,
+ * this will just show/hide the X11 windows.  If we are in a RandR fullscreen
+ * mode, this will toggles us to the default fake mode and hide windows if
+ * it is fullscreen
+ */
+void QuartzRandRToggleFullscreen (void) {
+    ScreenPtr pScreen = screenInfo.screens[0];
+    QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);
+
+    if (pQuartzScreen->currentMode.ref == NULL) {
+        ErrorF("Ignoring QuartzRandRToggleFullscreen because don't have a current mode set.\n");
+    } else if (pQuartzScreen->currentMode.refresh == FAKE_REFRESH_ROOTLESS) {
+        ErrorF("Ignoring QuartzRandRToggleFullscreen because we are in rootless mode.\n");
+    } else if (pQuartzScreen->currentMode.refresh == FAKE_REFRESH_FULLSCREEN) {
+        /* Legacy fullscreen mode.  Hide/Show */
+        QuartzShowFullscreen(!XQuartzFullscreenVisible);
+    } else {
+        /* RandR fullscreen mode.  Return to default mode and hide if it is fullscreen. */
+        if(XQuartzRootlessDefault) {
+            QuartzRandRSetFakeRootless();
+        } else {
+            QuartzRandRSetFakeFullscreen(FALSE);
+        }
+    }    
+}
diff --git a/xorg-server/hw/xquartz/quartzStartup.c b/xorg-server/hw/xquartz/quartzStartup.c
index e70194948..25ef76efa 100644
--- a/xorg-server/hw/xquartz/quartzStartup.c
+++ b/xorg-server/hw/xquartz/quartzStartup.c
@@ -1,119 +1,119 @@
-/**************************************************************

- *

- * Startup code for the Quartz Darwin X Server

- *

- * Copyright (c) 2001-2004 Torrey T. Lyons. All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright

- * holders shall not be used in advertising or otherwise to promote the sale,

- * use or other dealings in this Software without prior written authorization.

- */

-

-#include "sanitizedCarbon.h"

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include <fcntl.h>

-#include <unistd.h>

-#include <CoreFoundation/CoreFoundation.h>

-#include "quartzCommon.h"

-#include "X11Controller.h"

-#include "darwin.h"

-#include "darwinEvents.h"

-#include "quartz.h"

-#include "opaque.h"

-#include "micmap.h"

-

-#include <assert.h>

-

-#include <pthread.h>

-

-int dix_main(int argc, char **argv, char **envp);

-

-struct arg {

-    int argc;

-    char **argv;

-    char **envp;

-};

-

-_X_NORETURN

-static void server_thread (void *arg) {

-    struct arg args = *((struct arg *)arg);

-    free(arg);

-    exit (dix_main(args.argc, args.argv, args.envp));

-}

-

-static pthread_t create_thread (void *func, void *arg) {

-    pthread_attr_t attr;

-    pthread_t tid;

-	

-    pthread_attr_init (&attr);

-    pthread_attr_setscope (&attr, PTHREAD_SCOPE_SYSTEM);

-    pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);

-    pthread_create (&tid, &attr, func, arg);

-    pthread_attr_destroy (&attr);

-	

-    return tid;

-}

-

-void QuartzInitServer(int argc, char **argv, char **envp) {

-    struct arg *args = (struct arg*)malloc(sizeof(struct arg));

-    if(!args)

-        FatalError("Could not allocate memory.\n");

-    

-    args->argc = argc;

-    args->argv = argv;

-    args->envp = envp;

-    

-    if (!create_thread(server_thread, args)) {

-        FatalError("can't create secondary thread\n");

-    }

-}

-

-int server_main(int argc, char **argv, char **envp) {

-    int         i;

-    int         fd[2];

-

-    /* Unset CFProcessPath, so our children don't inherit this kludge we need

-     * to load our nib.  If an xterm gets this set, then it fails to

-     * 'open hi.txt' properly.

-     */

-    unsetenv("CFProcessPath");

-    

-    // Make a pipe to pass events

-    assert( pipe(fd) == 0 );

-    darwinEventReadFD = fd[0];

-    darwinEventWriteFD = fd[1];

-    fcntl(darwinEventReadFD, F_SETFL, O_NONBLOCK);

-

-    for (i = 1; i < argc; i++) {

-        // Display version info without starting Mac OS X UI if requested

-        if (!strcmp( argv[i], "-showconfig" ) || !strcmp( argv[i], "-version" )) {

-            DarwinPrintBanner();

-            exit(0);

-        }

-    }

-

-    X11ControllerMain(argc, argv, envp);

-    exit(0);

-}

+/**************************************************************
+ *
+ * Startup code for the Quartz Darwin X Server
+ *
+ * Copyright (c) 2001-2004 Torrey T. Lyons. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+
+#include "sanitizedCarbon.h"
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <fcntl.h>
+#include <unistd.h>
+#include <CoreFoundation/CoreFoundation.h>
+#include "quartzCommon.h"
+#include "X11Controller.h"
+#include "darwin.h"
+#include "darwinEvents.h"
+#include "quartz.h"
+#include "opaque.h"
+#include "micmap.h"
+
+#include <assert.h>
+
+#include <pthread.h>
+
+int dix_main(int argc, char **argv, char **envp);
+
+struct arg {
+    int argc;
+    char **argv;
+    char **envp;
+};
+
+_X_NORETURN
+static void server_thread (void *arg) {
+    struct arg args = *((struct arg *)arg);
+    free(arg);
+    exit (dix_main(args.argc, args.argv, args.envp));
+}
+
+static pthread_t create_thread (void *func, void *arg) {
+    pthread_attr_t attr;
+    pthread_t tid;
+	
+    pthread_attr_init (&attr);
+    pthread_attr_setscope (&attr, PTHREAD_SCOPE_SYSTEM);
+    pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
+    pthread_create (&tid, &attr, func, arg);
+    pthread_attr_destroy (&attr);
+	
+    return tid;
+}
+
+void QuartzInitServer(int argc, char **argv, char **envp) {
+    struct arg *args = (struct arg*)malloc(sizeof(struct arg));
+    if(!args)
+        FatalError("Could not allocate memory.\n");
+    
+    args->argc = argc;
+    args->argv = argv;
+    args->envp = envp;
+    
+    if (!create_thread(server_thread, args)) {
+        FatalError("can't create secondary thread\n");
+    }
+}
+
+int server_main(int argc, char **argv, char **envp) {
+    int         i;
+    int         fd[2];
+
+    /* Unset CFProcessPath, so our children don't inherit this kludge we need
+     * to load our nib.  If an xterm gets this set, then it fails to
+     * 'open hi.txt' properly.
+     */
+    unsetenv("CFProcessPath");
+    
+    // Make a pipe to pass events
+    assert( pipe(fd) == 0 );
+    darwinEventReadFD = fd[0];
+    darwinEventWriteFD = fd[1];
+    fcntl(darwinEventReadFD, F_SETFL, O_NONBLOCK);
+
+    for (i = 1; i < argc; i++) {
+        // Display version info without starting Mac OS X UI if requested
+        if (!strcmp( argv[i], "-showconfig" ) || !strcmp( argv[i], "-version" )) {
+            DarwinPrintBanner();
+            exit(0);
+        }
+    }
+
+    X11ControllerMain(argc, argv, envp);
+    exit(0);
+}
diff --git a/xorg-server/hw/xquartz/sanitizedCocoa.h b/xorg-server/hw/xquartz/sanitizedCocoa.h
index 5112ddf5a..5a2a282d1 100644
--- a/xorg-server/hw/xquartz/sanitizedCocoa.h
+++ b/xorg-server/hw/xquartz/sanitizedCocoa.h
@@ -1,64 +1,64 @@
-/*

- * Don't #include any of the AppKit, etc stuff directly since it will

- * pollute the X11 namespace.

- */

-

-#ifndef _XQ_SANITIZED_COCOA_H_

-#define _XQ_SANITIZED_COCOA_H_

-

-// QuickDraw in ApplicationServices has the following conflicts with

-// the basic X server headers. Use QD_<name> to use the QuickDraw

-// definition of any of these symbols, or the normal name for the

-// X11 definition.

-#define Cursor       QD_Cursor

-#define WindowPtr    QD_WindowPtr

-#define Picture      QD_Picture

-#define BOOL         OSX_BOOL

-#define EventType    HIT_EventType

-

-#import <Cocoa/Cocoa.h>

-#import <Foundation/Foundation.h>

-

-#undef Cursor

-#undef WindowPtr

-#undef Picture

-#undef BOOL

-#undef EventType

-

-#ifndef __has_feature

-#define __has_feature(x) 0 // Compatibility with non-clang compilers.

-#endif

-

-#ifndef NS_RETURNS_RETAINED

-#if __has_feature(attribute_ns_returns_retained)

-#define NS_RETURNS_RETAINED __attribute__((ns_returns_retained))

-#else

-#define NS_RETURNS_RETAINED

-#endif

-#endif

-

-#ifndef NS_RETURNS_NOT_RETAINED

-#if __has_feature(attribute_ns_returns_not_retained)

-#define NS_RETURNS_NOT_RETAINED __attribute__((ns_returns_not_retained))

-#else

-#define NS_RETURNS_NOT_RETAINED

-#endif

-#endif

-

-#ifndef CF_RETURNS_RETAINED

-#if __has_feature(attribute_cf_returns_retained)

-#define CF_RETURNS_RETAINED __attribute__((cf_returns_retained))

-#else

-#define CF_RETURNS_RETAINED

-#endif

-#endif

-

-#ifndef CF_RETURNS_NOT_RETAINED

-#if __has_feature(attribute_cf_returns_not_retained)

-#define CF_RETURNS_NOT_RETAINED __attribute__((cf_returns_not_retained))

-#else

-#define CF_RETURNS_NOT_RETAINED

-#endif

-#endif

-

-#endif  /* _XQ_SANITIZED_COCOA_H_ */

+/*
+ * Don't #include any of the AppKit, etc stuff directly since it will
+ * pollute the X11 namespace.
+ */
+
+#ifndef _XQ_SANITIZED_COCOA_H_
+#define _XQ_SANITIZED_COCOA_H_
+
+// QuickDraw in ApplicationServices has the following conflicts with
+// the basic X server headers. Use QD_<name> to use the QuickDraw
+// definition of any of these symbols, or the normal name for the
+// X11 definition.
+#define Cursor       QD_Cursor
+#define WindowPtr    QD_WindowPtr
+#define Picture      QD_Picture
+#define BOOL         OSX_BOOL
+#define EventType    HIT_EventType
+
+#import <Cocoa/Cocoa.h>
+#import <Foundation/Foundation.h>
+
+#undef Cursor
+#undef WindowPtr
+#undef Picture
+#undef BOOL
+#undef EventType
+
+#ifndef __has_feature
+#define __has_feature(x) 0 // Compatibility with non-clang compilers.
+#endif
+
+#ifndef NS_RETURNS_RETAINED
+#if __has_feature(attribute_ns_returns_retained)
+#define NS_RETURNS_RETAINED __attribute__((ns_returns_retained))
+#else
+#define NS_RETURNS_RETAINED
+#endif
+#endif
+
+#ifndef NS_RETURNS_NOT_RETAINED
+#if __has_feature(attribute_ns_returns_not_retained)
+#define NS_RETURNS_NOT_RETAINED __attribute__((ns_returns_not_retained))
+#else
+#define NS_RETURNS_NOT_RETAINED
+#endif
+#endif
+
+#ifndef CF_RETURNS_RETAINED
+#if __has_feature(attribute_cf_returns_retained)
+#define CF_RETURNS_RETAINED __attribute__((cf_returns_retained))
+#else
+#define CF_RETURNS_RETAINED
+#endif
+#endif
+
+#ifndef CF_RETURNS_NOT_RETAINED
+#if __has_feature(attribute_cf_returns_not_retained)
+#define CF_RETURNS_NOT_RETAINED __attribute__((cf_returns_not_retained))
+#else
+#define CF_RETURNS_NOT_RETAINED
+#endif
+#endif
+
+#endif  /* _XQ_SANITIZED_COCOA_H_ */
diff --git a/xorg-server/hw/xquartz/xpr/dri.c b/xorg-server/hw/xquartz/xpr/dri.c
index 63fcabe38..8bae6b009 100644
--- a/xorg-server/hw/xquartz/xpr/dri.c
+++ b/xorg-server/hw/xquartz/xpr/dri.c
@@ -1,884 +1,884 @@
-/**************************************************************************

-

-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.

-Copyright 2000 VA Linux Systems, Inc.

-Copyright (c) 2002, 2009 Apple Computer, Inc.

-All Rights Reserved.

-

-Permission is hereby granted, free of charge, to any person obtaining a

-copy of this software and associated documentation files (the

-"Software"), to deal in the Software without restriction, including

-without limitation the rights to use, copy, modify, merge, publish,

-distribute, sub license, and/or sell copies of the Software, and to

-permit persons to whom the Software is furnished to do so, subject to

-the following conditions:

-

-The above copyright notice and this permission notice (including the

-next paragraph) 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 NON-INFRINGEMENT.

-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.

-

-**************************************************************************/

-

-/*

- * Authors:

- *   Jens Owen <jens@valinux.com>

- *   Rickard E. (Rik) Faith <faith@valinux.com>

- *

- */

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#ifdef XFree86LOADER

-#include "xf86.h"

-#include "xf86_ansic.h"

-#else

-#include <sys/time.h>

-#include <unistd.h>

-#endif

-

-#include <X11/X.h>

-#include <X11/Xproto.h>

-#include <fcntl.h>

-#include <sys/mman.h>

-#include <sys/types.h>

-#include <sys/stat.h>

-#include "misc.h"

-#include "dixstruct.h"

-#include "extnsionst.h"

-#include "colormapst.h"

-#include "cursorstr.h"

-#include "scrnintstr.h"

-#include "windowstr.h"

-#include "servermd.h"

-#define _APPLEDRI_SERVER_

-#include "appledristr.h"

-#include "swaprep.h"

-#include "dri.h"

-#include "dristruct.h"

-#include "mi.h"

-#include "mipointer.h"

-#include "rootless.h"

-#include "x-hash.h"

-#include "x-hook.h"

-#include "driWrap.h"

-

-#include <AvailabilityMacros.h>

-

-static DevPrivateKeyRec DRIScreenPrivKeyRec;

-#define DRIScreenPrivKey (&DRIScreenPrivKeyRec)

-static DevPrivateKeyRec DRIWindowPrivKeyRec;

-#define DRIWindowPrivKey (&DRIWindowPrivKeyRec)

-static DevPrivateKeyRec DRIPixmapPrivKeyRec;

-#define DRIPixmapPrivKey (&DRIPixmapPrivKeyRec)

-static DevPrivateKeyRec DRIPixmapBufferPrivKeyRec;

-#define DRIPixmapBufferPrivKey (&DRIPixmapBufferPrivKeyRec)

-

-static RESTYPE DRIDrawablePrivResType;

-

-static x_hash_table *surface_hash;      /* maps surface ids -> drawablePrivs */

-

-static Bool DRIFreePixmapImp(DrawablePtr pDrawable);

-

-typedef struct {

-    DrawablePtr pDrawable;

-    int refCount;

-    int bytesPerPixel;

-    int width;

-    int height;

-    char shmPath[PATH_MAX];

-    int fd; /* From shm_open (for now) */

-    size_t length; /* length of buffer */

-    void *buffer;       

-} DRIPixmapBuffer, *DRIPixmapBufferPtr;

-

-Bool

-DRIScreenInit(ScreenPtr pScreen)

-{

-    DRIScreenPrivPtr    pDRIPriv;

-    int                 i;

-

-    if (!dixRegisterPrivateKey(&DRIScreenPrivKeyRec, PRIVATE_SCREEN, 0))

-	return FALSE;

-    if (!dixRegisterPrivateKey(&DRIWindowPrivKeyRec, PRIVATE_WINDOW, 0))

-	return FALSE;

-    if (!dixRegisterPrivateKey(&DRIPixmapPrivKeyRec, PRIVATE_PIXMAP, 0))

-	return FALSE;

-    if (!dixRegisterPrivateKey(&DRIPixmapBufferPrivKeyRec, PRIVATE_PIXMAP, 0))

-	return FALSE;

-

-    pDRIPriv = (DRIScreenPrivPtr) calloc(1, sizeof(DRIScreenPrivRec));

-    if (!pDRIPriv) {

-	dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);

-        return FALSE;

-    }

-

-    dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, pDRIPriv);

-    pDRIPriv->directRenderingSupport = TRUE;

-    pDRIPriv->nrWindows = 0;

-

-    /* Initialize drawable tables */

-    for (i = 0; i < DRI_MAX_DRAWABLES; i++) {

-        pDRIPriv->DRIDrawables[i] = NULL;

-    }

-

-    return TRUE;

-}

-

-Bool

-DRIFinishScreenInit(ScreenPtr pScreen)

-{

-    DRIScreenPrivPtr  pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-

-    /* Wrap DRI support */

-    pDRIPriv->wrap.ValidateTree = pScreen->ValidateTree;

-    pScreen->ValidateTree = DRIValidateTree;

-

-    pDRIPriv->wrap.PostValidateTree = pScreen->PostValidateTree;

-    pScreen->PostValidateTree = DRIPostValidateTree;

-

-    pDRIPriv->wrap.WindowExposures = pScreen->WindowExposures;

-    pScreen->WindowExposures = DRIWindowExposures;

-

-    pDRIPriv->wrap.CopyWindow = pScreen->CopyWindow;

-    pScreen->CopyWindow = DRICopyWindow;

-

-    pDRIPriv->wrap.ClipNotify = pScreen->ClipNotify;

-    pScreen->ClipNotify = DRIClipNotify;

-

-    //    ErrorF("[DRI] screen %d installation complete\n", pScreen->myNum);

-

-    return DRIWrapInit(pScreen);

-}

-

-void

-DRICloseScreen(ScreenPtr pScreen)

-{

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-

-    if (pDRIPriv && pDRIPriv->directRenderingSupport) {

-        free(pDRIPriv);

-	dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);

-    }

-}

-

-Bool

-DRIExtensionInit(void)

-{

-    DRIDrawablePrivResType = CreateNewResourceType(DRIDrawablePrivDelete,

-						   "DRIDrawable");

-

-    return DRIDrawablePrivResType != 0;

-}

-

-void

-DRIReset(void)

-{

-    /*

-     * This stub routine is called when the X Server recycles, resources

-     * allocated by DRIExtensionInit need to be managed here.

-     *

-     * Currently this routine is a stub because all the interesting resources

-     * are managed via the screen init process.

-     */

-}

-

-Bool

-DRIQueryDirectRenderingCapable(ScreenPtr pScreen, Bool* isCapable)

-{

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-

-    if (pDRIPriv)

-        *isCapable = pDRIPriv->directRenderingSupport;

-    else

-        *isCapable = FALSE;

-

-    return TRUE;

-}

-

-Bool

-DRIAuthConnection(ScreenPtr pScreen, unsigned int magic)

-{

-#if 0

-    /* FIXME: something? */

-

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-

-    if (drmAuthMagic(pDRIPriv->drmFD, magic)) return FALSE;

-#endif

-    return TRUE;

-}

-

-static void

-DRIUpdateSurface(DRIDrawablePrivPtr pDRIDrawablePriv, DrawablePtr pDraw)

-{

-    xp_window_changes wc;

-    unsigned int flags = 0;

-

-    if (pDRIDrawablePriv->sid == 0)

-        return;

-

-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1030

-    wc.depth = (pDraw->bitsPerPixel == 32 ? XP_DEPTH_ARGB8888

-                : pDraw->bitsPerPixel == 16 ? XP_DEPTH_RGB555 : XP_DEPTH_NIL);

-    if (wc.depth != XP_DEPTH_NIL)

-        flags |= XP_DEPTH;

-#endif

-

-    if (pDraw->type == DRAWABLE_WINDOW) {

-        WindowPtr pWin = (WindowPtr) pDraw;

-        WindowPtr pTopWin = TopLevelParent(pWin);

-

-        wc.x = pWin->drawable.x - (pTopWin->drawable.x - pTopWin->borderWidth);

-        wc.y = pWin->drawable.y - (pTopWin->drawable.y - pTopWin->borderWidth);

-        wc.width = pWin->drawable.width + 2 * pWin->borderWidth;

-        wc.height = pWin->drawable.height + 2 * pWin->borderWidth;

-        wc.bit_gravity = XP_GRAVITY_NONE;

-

-        wc.shape_nrects = RegionNumRects(&pWin->clipList);

-        wc.shape_rects = RegionRects(&pWin->clipList);

-        wc.shape_tx = - (pTopWin->drawable.x - pTopWin->borderWidth);

-        wc.shape_ty = - (pTopWin->drawable.y - pTopWin->borderWidth);

-

-        flags |= XP_BOUNDS | XP_SHAPE;

-

-    } else if (pDraw->type == DRAWABLE_PIXMAP) {

-        wc.x = 0;

-        wc.y = 0;

-        wc.width = pDraw->width;

-        wc.height = pDraw->height;

-        wc.bit_gravity = XP_GRAVITY_NONE;

-        flags |= XP_BOUNDS;

-    }

-

-    xp_configure_surface(pDRIDrawablePriv->sid, flags, &wc);

-}

-

-/* Return NULL if an error occurs. */

-static DRIDrawablePrivPtr

-CreateSurfaceForWindow(ScreenPtr pScreen, WindowPtr pWin, xp_window_id *widPtr) {

-    DRIDrawablePrivPtr pDRIDrawablePriv;

-    xp_window_id wid = 0;

-

-    *widPtr = 0;

-

-    pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);

-

-    if (pDRIDrawablePriv == NULL) {

-	xp_error err;

-	xp_window_changes wc;

-	

-	/* allocate a DRI Window Private record */

-	if (!(pDRIDrawablePriv = malloc(sizeof(*pDRIDrawablePriv)))) {

-	    return NULL;

-	}

-	

-	pDRIDrawablePriv->pDraw = (DrawablePtr)pWin;

-	pDRIDrawablePriv->pScreen = pScreen;

-	pDRIDrawablePriv->refCount = 0;

-	pDRIDrawablePriv->drawableIndex = -1;

-	pDRIDrawablePriv->notifiers = NULL;

-	

-	/* find the physical window */

-	wid = x_cvt_vptr_to_uint(RootlessFrameForWindow(pWin, TRUE));

-

-	if (wid == 0) {

-	    free(pDRIDrawablePriv);

-	    return NULL;

-	}

-	

-	/* allocate the physical surface */

-	err = xp_create_surface(wid, &pDRIDrawablePriv->sid);

-

-	if (err != Success) {

-	    free(pDRIDrawablePriv);

-	    return NULL;

-	}

-

-	/* Make it visible */

-	wc.stack_mode = XP_MAPPED_ABOVE;

-	wc.sibling = 0;

-	err = xp_configure_surface(pDRIDrawablePriv->sid, XP_STACKING, &wc);

-

-	if (err != Success) {

-	    xp_destroy_surface(pDRIDrawablePriv->sid);

-	    free(pDRIDrawablePriv);

-	    return NULL;

-	}

-

-	/* save private off of preallocated index */

-	dixSetPrivate(&pWin->devPrivates, DRIWindowPrivKey,

-		      pDRIDrawablePriv);

-    }

-

-    *widPtr = wid;

-

-    return pDRIDrawablePriv;

-}

-

-/* Return NULL if an error occurs. */

-static DRIDrawablePrivPtr

-CreateSurfaceForPixmap(ScreenPtr pScreen, PixmapPtr pPix) {

-    DRIDrawablePrivPtr pDRIDrawablePriv;

-     

-    pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_PIXMAP(pPix);

-

-    if (pDRIDrawablePriv == NULL) {

-	xp_error err;

-

-	/* allocate a DRI Window Private record */

-	if (!(pDRIDrawablePriv = calloc(1, sizeof(*pDRIDrawablePriv)))) {

-	    return NULL;

-	}

-	

-	pDRIDrawablePriv->pDraw = (DrawablePtr)pPix;

-	pDRIDrawablePriv->pScreen = pScreen;

-	pDRIDrawablePriv->refCount = 0;

-	pDRIDrawablePriv->drawableIndex = -1;

-	pDRIDrawablePriv->notifiers = NULL;

-	

-	/* Passing a null window id to Xplugin in 10.3+ asks for

-	   an accelerated offscreen surface. */

-	

-	err = xp_create_surface(0, &pDRIDrawablePriv->sid);

-	if (err != Success) {

-	    free(pDRIDrawablePriv);

-	    return NULL;

-	}

-

-	/* 

-	 * The DRIUpdateSurface will be called to resize the surface

-	 * after this function, if the export is successful.

-	 */

-

-	/* save private off of preallocated index */

-	dixSetPrivate(&pPix->devPrivates, DRIPixmapPrivKey,

-		      pDRIDrawablePriv);

-    }

-    

-    return pDRIDrawablePriv;

-}

-

-

-Bool

-DRICreateSurface(ScreenPtr pScreen, Drawable id,

-                 DrawablePtr pDrawable, xp_client_id client_id,

-                 xp_surface_id *surface_id, unsigned int ret_key[2],

-                 void (*notify) (void *arg, void *data), void *notify_data)

-{

-    DRIScreenPrivPtr    pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-    xp_window_id        wid = 0;

-    DRIDrawablePrivPtr  pDRIDrawablePriv;

-

-    if (pDrawable->type == DRAWABLE_WINDOW) {

-	pDRIDrawablePriv = CreateSurfaceForWindow(pScreen, 

-						  (WindowPtr)pDrawable, &wid);

-

-	if(NULL == pDRIDrawablePriv)

-	    return FALSE; /*error*/

-    }

-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1030

-    else if (pDrawable->type == DRAWABLE_PIXMAP) {

-	pDRIDrawablePriv = CreateSurfaceForPixmap(pScreen, 

-						  (PixmapPtr)pDrawable);

-

-	if(NULL == pDRIDrawablePriv)

-	    return FALSE; /*error*/

-    }

-#endif

-    else {

-	/* We handle GLXPbuffers in a different way (via CGL). */

-        return FALSE;

-    }

-    

-    

-    /* Finish initialization of new surfaces */

-    if (pDRIDrawablePriv->refCount == 0) {

-        unsigned int key[2] = {0};

-        xp_error err;

-

-        /* try to give the client access to the surface */

-        if (client_id != 0) {

-	    /*

-	     * Xplugin accepts a 0 wid if the surface id is offscreen, such 

-	     * as for a pixmap.

-	     */

-            err = xp_export_surface(wid, pDRIDrawablePriv->sid,

-                                    client_id, key);

-            if (err != Success) {

-                xp_destroy_surface(pDRIDrawablePriv->sid);

-                free(pDRIDrawablePriv);

-		

-		/* 

-		 * Now set the dix privates to NULL that were previously set.

-		 * This prevents reusing an invalid pointer.

-		 */

-		if(pDrawable->type == DRAWABLE_WINDOW) {

-		    WindowPtr pWin = (WindowPtr)pDrawable;

-		    

-		    dixSetPrivate(&pWin->devPrivates, DRIWindowPrivKey, NULL);

-		} else if(pDrawable->type == DRAWABLE_PIXMAP) {

-		    PixmapPtr pPix = (PixmapPtr)pDrawable;

-		    

-		    dixSetPrivate(&pPix->devPrivates, DRIPixmapPrivKey, NULL);

-		}

-		

-                return FALSE;

-            }

-        }

-

-        pDRIDrawablePriv->key[0] = key[0];

-        pDRIDrawablePriv->key[1] = key[1];

-

-        ++pDRIPriv->nrWindows;

-

-        /* and stash it by surface id */

-        if (surface_hash == NULL)

-            surface_hash = x_hash_table_new(NULL, NULL, NULL, NULL);

-        x_hash_table_insert(surface_hash,

-                            x_cvt_uint_to_vptr(pDRIDrawablePriv->sid), pDRIDrawablePriv);

-

-        /* track this in case this window is destroyed */

-        AddResource(id, DRIDrawablePrivResType, (pointer)pDrawable);

-

-        /* Initialize shape */

-        DRIUpdateSurface(pDRIDrawablePriv, pDrawable);

-    }

-

-    pDRIDrawablePriv->refCount++;

-

-    *surface_id = pDRIDrawablePriv->sid;

-

-    if (ret_key != NULL) {

-        ret_key[0] = pDRIDrawablePriv->key[0];

-        ret_key[1] = pDRIDrawablePriv->key[1];

-    }

-

-    if (notify != NULL) {

-        pDRIDrawablePriv->notifiers = x_hook_add(pDRIDrawablePriv->notifiers,

-                                                 notify, notify_data);

-    }

-

-    return TRUE;

-}

-

-Bool

-DRIDestroySurface(ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable,

-                  void (*notify) (void *, void *), void *notify_data)

-{

-    DRIDrawablePrivPtr  pDRIDrawablePriv;

-

-    if (pDrawable->type == DRAWABLE_WINDOW) {

-        pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW((WindowPtr)pDrawable);

-    } else if (pDrawable->type == DRAWABLE_PIXMAP) {

-        pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_PIXMAP((PixmapPtr)pDrawable);

-    } else {

-        return FALSE;

-    }

-

-    if (pDRIDrawablePriv != NULL) {

-	/*

-	 * This doesn't seem to be used, because notify is NULL in all callers.

-	 */

-

-        if (notify != NULL) {

-            pDRIDrawablePriv->notifiers = x_hook_remove(pDRIDrawablePriv->notifiers,

-                                                        notify, notify_data);

-        }

-

-	--pDRIDrawablePriv->refCount;

-

-	/* 

-	 * Check if the drawable privates still have a reference to the

-	 * surface.

-	 */

-

-        if (pDRIDrawablePriv->refCount <= 0) {

-            /*

-	     * This calls back to DRIDrawablePrivDelete which

-	     * frees the private area and dispatches events, if needed. 

-	     */

-            FreeResourceByType(id, DRIDrawablePrivResType, FALSE);

-        }

-    }

-

-    return TRUE;

-}

-

-/* 

- * The assumption is that this is called when the refCount of a surface

- * drops to <= 0, or the window/pixmap is destroyed.  

- */

-Bool

-DRIDrawablePrivDelete(pointer pResource, XID id)

-{

-    DrawablePtr         pDrawable = (DrawablePtr)pResource;

-    DRIScreenPrivPtr    pDRIPriv = DRI_SCREEN_PRIV(pDrawable->pScreen);

-    DRIDrawablePrivPtr  pDRIDrawablePriv = NULL;

-    WindowPtr           pWin = NULL;

-    PixmapPtr           pPix = NULL;

-

-    if (pDrawable->type == DRAWABLE_WINDOW) {

-        pWin = (WindowPtr)pDrawable;

-        pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);

-    } else if (pDrawable->type == DRAWABLE_PIXMAP) {

-        pPix = (PixmapPtr)pDrawable;

-        pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_PIXMAP(pPix);

-    }

-

-    if (pDRIDrawablePriv == NULL) {

-	/* 

-	 * We reuse __func__ and the resource type for the GLXPixmap code.

-	 * Attempt to free a pixmap buffer associated with the resource

-	 * if possible.

-	 */

-	return DRIFreePixmapImp(pDrawable);

-    }

-    

-    if (pDRIDrawablePriv->drawableIndex != -1) {

-        /* release drawable table entry */

-        pDRIPriv->DRIDrawables[pDRIDrawablePriv->drawableIndex] = NULL;

-    }

-

-    if (pDRIDrawablePriv->sid != 0) {

-	DRISurfaceNotify(pDRIDrawablePriv->sid, AppleDRISurfaceNotifyDestroyed);

-    }

-  

-

-    if (pDRIDrawablePriv->notifiers != NULL)

-        x_hook_free(pDRIDrawablePriv->notifiers);

-

-    free(pDRIDrawablePriv);

-

-    if (pDrawable->type == DRAWABLE_WINDOW) {

-	dixSetPrivate(&pWin->devPrivates, DRIWindowPrivKey, NULL);

-    } else if (pDrawable->type == DRAWABLE_PIXMAP) {

-	dixSetPrivate(&pPix->devPrivates, DRIPixmapPrivKey, NULL);

-    }

-

-    --pDRIPriv->nrWindows;

-

-    return TRUE;

-}

-

-void

-DRIWindowExposures(WindowPtr pWin, RegionPtr prgn, RegionPtr bsreg)

-{

-    ScreenPtr pScreen = pWin->drawable.pScreen;

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-    DRIDrawablePrivPtr pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);

-

-    if (pDRIDrawablePriv) {

-        /* FIXME: something? */

-    }

-

-    pScreen->WindowExposures = pDRIPriv->wrap.WindowExposures;

-

-    (*pScreen->WindowExposures)(pWin, prgn, bsreg);

-

-    pScreen->WindowExposures = DRIWindowExposures;

-}

-

-void

-DRICopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)

-{

-    ScreenPtr pScreen = pWin->drawable.pScreen;

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-    DRIDrawablePrivPtr pDRIDrawablePriv;

-

-    if (pDRIPriv->nrWindows > 0) {

-       pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);

-       if (pDRIDrawablePriv != NULL) {

-            DRIUpdateSurface(pDRIDrawablePriv, &pWin->drawable);

-       }

-    }

-

-    /* unwrap */

-    pScreen->CopyWindow = pDRIPriv->wrap.CopyWindow;

-

-    /* call lower layers */

-    (*pScreen->CopyWindow)(pWin, ptOldOrg, prgnSrc);

-

-    /* rewrap */

-    pScreen->CopyWindow = DRICopyWindow;

-}

-

-int

-DRIValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind)

-{

-    ScreenPtr pScreen = pParent->drawable.pScreen;

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-    int returnValue;

-

-    /* unwrap */

-    pScreen->ValidateTree = pDRIPriv->wrap.ValidateTree;

-

-    /* call lower layers */

-    returnValue = (*pScreen->ValidateTree)(pParent, pChild, kind);

-

-    /* rewrap */

-    pScreen->ValidateTree = DRIValidateTree;

-

-    return returnValue;

-}

-

-void

-DRIPostValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind)

-{

-    ScreenPtr pScreen;

-    DRIScreenPrivPtr pDRIPriv;

-

-    if (pParent) {

-        pScreen = pParent->drawable.pScreen;

-    } else {

-        pScreen = pChild->drawable.pScreen;

-    }

-    pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-

-    if (pDRIPriv->wrap.PostValidateTree) {

-        /* unwrap */

-        pScreen->PostValidateTree = pDRIPriv->wrap.PostValidateTree;

-

-        /* call lower layers */

-        (*pScreen->PostValidateTree)(pParent, pChild, kind);

-

-        /* rewrap */

-        pScreen->PostValidateTree = DRIPostValidateTree;

-    }

-}

-

-void

-DRIClipNotify(WindowPtr pWin, int dx, int dy)

-{

-    ScreenPtr pScreen = pWin->drawable.pScreen;

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-    DRIDrawablePrivPtr  pDRIDrawablePriv;

-

-    if ((pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin))) {

-        DRIUpdateSurface(pDRIDrawablePriv, &pWin->drawable);

-    }

-

-    if (pDRIPriv->wrap.ClipNotify) {

-        pScreen->ClipNotify = pDRIPriv->wrap.ClipNotify;

-

-        (*pScreen->ClipNotify)(pWin, dx, dy);

-

-        pScreen->ClipNotify = DRIClipNotify;

-    }

-}

-

-/* This lets us get at the unwrapped functions so that they can correctly

- * call the lower level functions, and choose whether they will be

- * called at every level of recursion (eg in validatetree).

- */

-DRIWrappedFuncsRec *

-DRIGetWrappedFuncs(ScreenPtr pScreen)

-{

-    return &(DRI_SCREEN_PRIV(pScreen)->wrap);

-}

-

-void

-DRIQueryVersion(int *majorVersion,

-                int *minorVersion,

-                int *patchVersion)

-{

-    *majorVersion = APPLE_DRI_MAJOR_VERSION;

-    *minorVersion = APPLE_DRI_MINOR_VERSION;

-    *patchVersion = APPLE_DRI_PATCH_VERSION;

-}

-

-/* 

- * Note: this also cleans up the hash table in addition to notifying clients.

- * The sid/surface-id should not be used after this, because it will be

- * invalid.

- */ 

-void

-DRISurfaceNotify(xp_surface_id id, int kind)

-{

-    DRIDrawablePrivPtr pDRIDrawablePriv = NULL;

-    DRISurfaceNotifyArg arg;

-

-    arg.id = id;

-    arg.kind = kind;

-

-    if (surface_hash != NULL)

-    {

-        pDRIDrawablePriv = x_hash_table_lookup(surface_hash,

-                                               x_cvt_uint_to_vptr(id), NULL);

-    }

-

-    if (pDRIDrawablePriv == NULL)

-        return;

-

-    if (kind == AppleDRISurfaceNotifyDestroyed)

-    {

-	x_hash_table_remove(surface_hash, x_cvt_uint_to_vptr(id));

-    }

-

-    x_hook_run(pDRIDrawablePriv->notifiers, &arg);

-

-    if (kind == AppleDRISurfaceNotifyDestroyed)

-    {

-	xp_error error;

-	

-	error = xp_destroy_surface(pDRIDrawablePriv->sid);

-	

-	if(error) 

-	    ErrorF("%s: xp_destroy_surface failed: %d\n", __func__, error);

-		

-	/* Guard against reuse, even though we are freeing after this. */

-	pDRIDrawablePriv->sid = 0;

-

-        FreeResourceByType(pDRIDrawablePriv->pDraw->id,

-                           DRIDrawablePrivResType, FALSE);

-    }

-}

-

-/*

- * This creates a shared memory buffer for use with GLXPixmaps

- * and AppleSGLX.

- */

-Bool DRICreatePixmap(ScreenPtr pScreen, Drawable id,

-		     DrawablePtr pDrawable, char *path,

-		     size_t pathmax) 

-{

-    DRIPixmapBufferPtr shared;

-    PixmapPtr pPix;

-    

-    if(pDrawable->type != DRAWABLE_PIXMAP)

-	return FALSE;

-

-    pPix = (PixmapPtr)pDrawable;

-

-    shared = malloc(sizeof(*shared));

-    if(NULL == shared) {

-        FatalError("failed to allocate DRIPixmapBuffer in %s\n", __func__);

-    }

-        

-    shared->pDrawable = pDrawable;

-    shared->refCount = 1;

-

-    if(pDrawable->bitsPerPixel >= 24) {

-	shared->bytesPerPixel = 4;

-    } else if(pDrawable->bitsPerPixel <= 16) {

-	shared->bytesPerPixel = 2;

-    }

-    

-    shared->width = pDrawable->width;

-    shared->height = pDrawable->height;

-    

-    if(-1 == snprintf(shared->shmPath, sizeof(shared->shmPath),

-                      "%d_0x%lx", getpid(),

-                      (unsigned long)id)) {

-        FatalError("buffer overflow in %s\n", __func__);

-    }

-    

-    shared->fd = shm_open(shared->shmPath, 

-                          O_RDWR | O_EXCL | O_CREAT, 

-                          S_IRUSR | S_IWUSR | S_IROTH | S_IWOTH);

-    

-    if(-1 == shared->fd) {

-	free(shared);

-        return FALSE;

-    }   

-    

-    shared->length = shared->width * shared->height * shared->bytesPerPixel;

-    

-    if(-1 == ftruncate(shared->fd, shared->length)) {

-	ErrorF("failed to ftruncate (extend) file.");

-	shm_unlink(shared->shmPath);

-	close(shared->fd);

-	free(shared);

-	return FALSE;

-    }

-

-    shared->buffer = mmap(NULL, shared->length,

-                          PROT_READ | PROT_WRITE,

-                          MAP_FILE | MAP_SHARED, shared->fd, 0);

-    

-    if(MAP_FAILED == shared->buffer) {

-	ErrorF("failed to mmap shared memory.");

-	shm_unlink(shared->shmPath);

-	close(shared->fd);

-	free(shared);

-	return FALSE;

-    }

-    

-    strncpy(path, shared->shmPath, pathmax);

-    path[pathmax - 1] = '\0';

-    

-    dixSetPrivate(&pPix->devPrivates, DRIPixmapBufferPrivKey, shared);

-

-    AddResource(id, DRIDrawablePrivResType, (pointer)pDrawable);

-

-    return TRUE;

-}

-

-

-Bool DRIGetPixmapData(DrawablePtr pDrawable, int *width, int *height,

-		      int *pitch, int *bpp, void **ptr) {

-    PixmapPtr pPix;

-    DRIPixmapBufferPtr shared;

-

-    if(pDrawable->type != DRAWABLE_PIXMAP)

-	return FALSE;

-

-    pPix = (PixmapPtr)pDrawable;

-

-    shared = dixLookupPrivate(&pPix->devPrivates, DRIPixmapBufferPrivKey);

-

-    if(NULL == shared)

-	return FALSE;

-

-    assert(pDrawable->width == shared->width);

-    assert(pDrawable->height == shared->height);

-    

-    *width = shared->width;

-    *height = shared->height;

-    *bpp = shared->bytesPerPixel;

-    *pitch = shared->width * shared->bytesPerPixel;

-    *ptr = shared->buffer;    

-

-    return TRUE;

-}

-

-static Bool

-DRIFreePixmapImp(DrawablePtr pDrawable) {

-    DRIPixmapBufferPtr shared;

-    PixmapPtr pPix;

-

-    if(pDrawable->type != DRAWABLE_PIXMAP)

-	return FALSE;

-

-    pPix = (PixmapPtr)pDrawable;

-

-    shared = dixLookupPrivate(&pPix->devPrivates, DRIPixmapBufferPrivKey);

-

-    if(NULL == shared)

-	return FALSE;

-

-    close(shared->fd);

-    munmap(shared->buffer, shared->length);

-    shm_unlink(shared->shmPath);

-    free(shared);

-

-    dixSetPrivate(&pPix->devPrivates, DRIPixmapBufferPrivKey, (pointer)NULL);

-

-    return TRUE;

-}

-

-void 

-DRIDestroyPixmap(DrawablePtr pDrawable) {

-    if(DRIFreePixmapImp(pDrawable))

-	FreeResourceByType(pDrawable->id, DRIDrawablePrivResType, FALSE);

-

-}

+/**************************************************************************
+
+Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+Copyright 2000 VA Linux Systems, Inc.
+Copyright (c) 2002, 2009 Apple Computer, Inc.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sub license, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) 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 NON-INFRINGEMENT.
+IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Jens Owen <jens@valinux.com>
+ *   Rickard E. (Rik) Faith <faith@valinux.com>
+ *
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#ifdef XFree86LOADER
+#include "xf86.h"
+#include "xf86_ansic.h"
+#else
+#include <sys/time.h>
+#include <unistd.h>
+#endif
+
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include "misc.h"
+#include "dixstruct.h"
+#include "extnsionst.h"
+#include "colormapst.h"
+#include "cursorstr.h"
+#include "scrnintstr.h"
+#include "windowstr.h"
+#include "servermd.h"
+#define _APPLEDRI_SERVER_
+#include "appledristr.h"
+#include "swaprep.h"
+#include "dri.h"
+#include "dristruct.h"
+#include "mi.h"
+#include "mipointer.h"
+#include "rootless.h"
+#include "x-hash.h"
+#include "x-hook.h"
+#include "driWrap.h"
+
+#include <AvailabilityMacros.h>
+
+static DevPrivateKeyRec DRIScreenPrivKeyRec;
+#define DRIScreenPrivKey (&DRIScreenPrivKeyRec)
+static DevPrivateKeyRec DRIWindowPrivKeyRec;
+#define DRIWindowPrivKey (&DRIWindowPrivKeyRec)
+static DevPrivateKeyRec DRIPixmapPrivKeyRec;
+#define DRIPixmapPrivKey (&DRIPixmapPrivKeyRec)
+static DevPrivateKeyRec DRIPixmapBufferPrivKeyRec;
+#define DRIPixmapBufferPrivKey (&DRIPixmapBufferPrivKeyRec)
+
+static RESTYPE DRIDrawablePrivResType;
+
+static x_hash_table *surface_hash;      /* maps surface ids -> drawablePrivs */
+
+static Bool DRIFreePixmapImp(DrawablePtr pDrawable);
+
+typedef struct {
+    DrawablePtr pDrawable;
+    int refCount;
+    int bytesPerPixel;
+    int width;
+    int height;
+    char shmPath[PATH_MAX];
+    int fd; /* From shm_open (for now) */
+    size_t length; /* length of buffer */
+    void *buffer;       
+} DRIPixmapBuffer, *DRIPixmapBufferPtr;
+
+Bool
+DRIScreenInit(ScreenPtr pScreen)
+{
+    DRIScreenPrivPtr    pDRIPriv;
+    int                 i;
+
+    if (!dixRegisterPrivateKey(&DRIScreenPrivKeyRec, PRIVATE_SCREEN, 0))
+	return FALSE;
+    if (!dixRegisterPrivateKey(&DRIWindowPrivKeyRec, PRIVATE_WINDOW, 0))
+	return FALSE;
+    if (!dixRegisterPrivateKey(&DRIPixmapPrivKeyRec, PRIVATE_PIXMAP, 0))
+	return FALSE;
+    if (!dixRegisterPrivateKey(&DRIPixmapBufferPrivKeyRec, PRIVATE_PIXMAP, 0))
+	return FALSE;
+
+    pDRIPriv = (DRIScreenPrivPtr) calloc(1, sizeof(DRIScreenPrivRec));
+    if (!pDRIPriv) {
+	dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);
+        return FALSE;
+    }
+
+    dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, pDRIPriv);
+    pDRIPriv->directRenderingSupport = TRUE;
+    pDRIPriv->nrWindows = 0;
+
+    /* Initialize drawable tables */
+    for (i = 0; i < DRI_MAX_DRAWABLES; i++) {
+        pDRIPriv->DRIDrawables[i] = NULL;
+    }
+
+    return TRUE;
+}
+
+Bool
+DRIFinishScreenInit(ScreenPtr pScreen)
+{
+    DRIScreenPrivPtr  pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+
+    /* Wrap DRI support */
+    pDRIPriv->wrap.ValidateTree = pScreen->ValidateTree;
+    pScreen->ValidateTree = DRIValidateTree;
+
+    pDRIPriv->wrap.PostValidateTree = pScreen->PostValidateTree;
+    pScreen->PostValidateTree = DRIPostValidateTree;
+
+    pDRIPriv->wrap.WindowExposures = pScreen->WindowExposures;
+    pScreen->WindowExposures = DRIWindowExposures;
+
+    pDRIPriv->wrap.CopyWindow = pScreen->CopyWindow;
+    pScreen->CopyWindow = DRICopyWindow;
+
+    pDRIPriv->wrap.ClipNotify = pScreen->ClipNotify;
+    pScreen->ClipNotify = DRIClipNotify;
+
+    //    ErrorF("[DRI] screen %d installation complete\n", pScreen->myNum);
+
+    return DRIWrapInit(pScreen);
+}
+
+void
+DRICloseScreen(ScreenPtr pScreen)
+{
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+
+    if (pDRIPriv && pDRIPriv->directRenderingSupport) {
+        free(pDRIPriv);
+	dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);
+    }
+}
+
+Bool
+DRIExtensionInit(void)
+{
+    DRIDrawablePrivResType = CreateNewResourceType(DRIDrawablePrivDelete,
+						   "DRIDrawable");
+
+    return DRIDrawablePrivResType != 0;
+}
+
+void
+DRIReset(void)
+{
+    /*
+     * This stub routine is called when the X Server recycles, resources
+     * allocated by DRIExtensionInit need to be managed here.
+     *
+     * Currently this routine is a stub because all the interesting resources
+     * are managed via the screen init process.
+     */
+}
+
+Bool
+DRIQueryDirectRenderingCapable(ScreenPtr pScreen, Bool* isCapable)
+{
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+
+    if (pDRIPriv)
+        *isCapable = pDRIPriv->directRenderingSupport;
+    else
+        *isCapable = FALSE;
+
+    return TRUE;
+}
+
+Bool
+DRIAuthConnection(ScreenPtr pScreen, unsigned int magic)
+{
+#if 0
+    /* FIXME: something? */
+
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+
+    if (drmAuthMagic(pDRIPriv->drmFD, magic)) return FALSE;
+#endif
+    return TRUE;
+}
+
+static void
+DRIUpdateSurface(DRIDrawablePrivPtr pDRIDrawablePriv, DrawablePtr pDraw)
+{
+    xp_window_changes wc;
+    unsigned int flags = 0;
+
+    if (pDRIDrawablePriv->sid == 0)
+        return;
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1030
+    wc.depth = (pDraw->bitsPerPixel == 32 ? XP_DEPTH_ARGB8888
+                : pDraw->bitsPerPixel == 16 ? XP_DEPTH_RGB555 : XP_DEPTH_NIL);
+    if (wc.depth != XP_DEPTH_NIL)
+        flags |= XP_DEPTH;
+#endif
+
+    if (pDraw->type == DRAWABLE_WINDOW) {
+        WindowPtr pWin = (WindowPtr) pDraw;
+        WindowPtr pTopWin = TopLevelParent(pWin);
+
+        wc.x = pWin->drawable.x - (pTopWin->drawable.x - pTopWin->borderWidth);
+        wc.y = pWin->drawable.y - (pTopWin->drawable.y - pTopWin->borderWidth);
+        wc.width = pWin->drawable.width + 2 * pWin->borderWidth;
+        wc.height = pWin->drawable.height + 2 * pWin->borderWidth;
+        wc.bit_gravity = XP_GRAVITY_NONE;
+
+        wc.shape_nrects = RegionNumRects(&pWin->clipList);
+        wc.shape_rects = RegionRects(&pWin->clipList);
+        wc.shape_tx = - (pTopWin->drawable.x - pTopWin->borderWidth);
+        wc.shape_ty = - (pTopWin->drawable.y - pTopWin->borderWidth);
+
+        flags |= XP_BOUNDS | XP_SHAPE;
+
+    } else if (pDraw->type == DRAWABLE_PIXMAP) {
+        wc.x = 0;
+        wc.y = 0;
+        wc.width = pDraw->width;
+        wc.height = pDraw->height;
+        wc.bit_gravity = XP_GRAVITY_NONE;
+        flags |= XP_BOUNDS;
+    }
+
+    xp_configure_surface(pDRIDrawablePriv->sid, flags, &wc);
+}
+
+/* Return NULL if an error occurs. */
+static DRIDrawablePrivPtr
+CreateSurfaceForWindow(ScreenPtr pScreen, WindowPtr pWin, xp_window_id *widPtr) {
+    DRIDrawablePrivPtr pDRIDrawablePriv;
+    xp_window_id wid = 0;
+
+    *widPtr = 0;
+
+    pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);
+
+    if (pDRIDrawablePriv == NULL) {
+	xp_error err;
+	xp_window_changes wc;
+	
+	/* allocate a DRI Window Private record */
+	if (!(pDRIDrawablePriv = malloc(sizeof(*pDRIDrawablePriv)))) {
+	    return NULL;
+	}
+	
+	pDRIDrawablePriv->pDraw = (DrawablePtr)pWin;
+	pDRIDrawablePriv->pScreen = pScreen;
+	pDRIDrawablePriv->refCount = 0;
+	pDRIDrawablePriv->drawableIndex = -1;
+	pDRIDrawablePriv->notifiers = NULL;
+	
+	/* find the physical window */
+	wid = x_cvt_vptr_to_uint(RootlessFrameForWindow(pWin, TRUE));
+
+	if (wid == 0) {
+	    free(pDRIDrawablePriv);
+	    return NULL;
+	}
+	
+	/* allocate the physical surface */
+	err = xp_create_surface(wid, &pDRIDrawablePriv->sid);
+
+	if (err != Success) {
+	    free(pDRIDrawablePriv);
+	    return NULL;
+	}
+
+	/* Make it visible */
+	wc.stack_mode = XP_MAPPED_ABOVE;
+	wc.sibling = 0;
+	err = xp_configure_surface(pDRIDrawablePriv->sid, XP_STACKING, &wc);
+
+	if (err != Success) {
+	    xp_destroy_surface(pDRIDrawablePriv->sid);
+	    free(pDRIDrawablePriv);
+	    return NULL;
+	}
+
+	/* save private off of preallocated index */
+	dixSetPrivate(&pWin->devPrivates, DRIWindowPrivKey,
+		      pDRIDrawablePriv);
+    }
+
+    *widPtr = wid;
+
+    return pDRIDrawablePriv;
+}
+
+/* Return NULL if an error occurs. */
+static DRIDrawablePrivPtr
+CreateSurfaceForPixmap(ScreenPtr pScreen, PixmapPtr pPix) {
+    DRIDrawablePrivPtr pDRIDrawablePriv;
+     
+    pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_PIXMAP(pPix);
+
+    if (pDRIDrawablePriv == NULL) {
+	xp_error err;
+
+	/* allocate a DRI Window Private record */
+	if (!(pDRIDrawablePriv = calloc(1, sizeof(*pDRIDrawablePriv)))) {
+	    return NULL;
+	}
+	
+	pDRIDrawablePriv->pDraw = (DrawablePtr)pPix;
+	pDRIDrawablePriv->pScreen = pScreen;
+	pDRIDrawablePriv->refCount = 0;
+	pDRIDrawablePriv->drawableIndex = -1;
+	pDRIDrawablePriv->notifiers = NULL;
+	
+	/* Passing a null window id to Xplugin in 10.3+ asks for
+	   an accelerated offscreen surface. */
+	
+	err = xp_create_surface(0, &pDRIDrawablePriv->sid);
+	if (err != Success) {
+	    free(pDRIDrawablePriv);
+	    return NULL;
+	}
+
+	/* 
+	 * The DRIUpdateSurface will be called to resize the surface
+	 * after this function, if the export is successful.
+	 */
+
+	/* save private off of preallocated index */
+	dixSetPrivate(&pPix->devPrivates, DRIPixmapPrivKey,
+		      pDRIDrawablePriv);
+    }
+    
+    return pDRIDrawablePriv;
+}
+
+
+Bool
+DRICreateSurface(ScreenPtr pScreen, Drawable id,
+                 DrawablePtr pDrawable, xp_client_id client_id,
+                 xp_surface_id *surface_id, unsigned int ret_key[2],
+                 void (*notify) (void *arg, void *data), void *notify_data)
+{
+    DRIScreenPrivPtr    pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    xp_window_id        wid = 0;
+    DRIDrawablePrivPtr  pDRIDrawablePriv;
+
+    if (pDrawable->type == DRAWABLE_WINDOW) {
+	pDRIDrawablePriv = CreateSurfaceForWindow(pScreen, 
+						  (WindowPtr)pDrawable, &wid);
+
+	if(NULL == pDRIDrawablePriv)
+	    return FALSE; /*error*/
+    }
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1030
+    else if (pDrawable->type == DRAWABLE_PIXMAP) {
+	pDRIDrawablePriv = CreateSurfaceForPixmap(pScreen, 
+						  (PixmapPtr)pDrawable);
+
+	if(NULL == pDRIDrawablePriv)
+	    return FALSE; /*error*/
+    }
+#endif
+    else {
+	/* We handle GLXPbuffers in a different way (via CGL). */
+        return FALSE;
+    }
+    
+    
+    /* Finish initialization of new surfaces */
+    if (pDRIDrawablePriv->refCount == 0) {
+        unsigned int key[2] = {0};
+        xp_error err;
+
+        /* try to give the client access to the surface */
+        if (client_id != 0) {
+	    /*
+	     * Xplugin accepts a 0 wid if the surface id is offscreen, such 
+	     * as for a pixmap.
+	     */
+            err = xp_export_surface(wid, pDRIDrawablePriv->sid,
+                                    client_id, key);
+            if (err != Success) {
+                xp_destroy_surface(pDRIDrawablePriv->sid);
+                free(pDRIDrawablePriv);
+		
+		/* 
+		 * Now set the dix privates to NULL that were previously set.
+		 * This prevents reusing an invalid pointer.
+		 */
+		if(pDrawable->type == DRAWABLE_WINDOW) {
+		    WindowPtr pWin = (WindowPtr)pDrawable;
+		    
+		    dixSetPrivate(&pWin->devPrivates, DRIWindowPrivKey, NULL);
+		} else if(pDrawable->type == DRAWABLE_PIXMAP) {
+		    PixmapPtr pPix = (PixmapPtr)pDrawable;
+		    
+		    dixSetPrivate(&pPix->devPrivates, DRIPixmapPrivKey, NULL);
+		}
+		
+                return FALSE;
+            }
+        }
+
+        pDRIDrawablePriv->key[0] = key[0];
+        pDRIDrawablePriv->key[1] = key[1];
+
+        ++pDRIPriv->nrWindows;
+
+        /* and stash it by surface id */
+        if (surface_hash == NULL)
+            surface_hash = x_hash_table_new(NULL, NULL, NULL, NULL);
+        x_hash_table_insert(surface_hash,
+                            x_cvt_uint_to_vptr(pDRIDrawablePriv->sid), pDRIDrawablePriv);
+
+        /* track this in case this window is destroyed */
+        AddResource(id, DRIDrawablePrivResType, (pointer)pDrawable);
+
+        /* Initialize shape */
+        DRIUpdateSurface(pDRIDrawablePriv, pDrawable);
+    }
+
+    pDRIDrawablePriv->refCount++;
+
+    *surface_id = pDRIDrawablePriv->sid;
+
+    if (ret_key != NULL) {
+        ret_key[0] = pDRIDrawablePriv->key[0];
+        ret_key[1] = pDRIDrawablePriv->key[1];
+    }
+
+    if (notify != NULL) {
+        pDRIDrawablePriv->notifiers = x_hook_add(pDRIDrawablePriv->notifiers,
+                                                 notify, notify_data);
+    }
+
+    return TRUE;
+}
+
+Bool
+DRIDestroySurface(ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable,
+                  void (*notify) (void *, void *), void *notify_data)
+{
+    DRIDrawablePrivPtr  pDRIDrawablePriv;
+
+    if (pDrawable->type == DRAWABLE_WINDOW) {
+        pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW((WindowPtr)pDrawable);
+    } else if (pDrawable->type == DRAWABLE_PIXMAP) {
+        pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_PIXMAP((PixmapPtr)pDrawable);
+    } else {
+        return FALSE;
+    }
+
+    if (pDRIDrawablePriv != NULL) {
+	/*
+	 * This doesn't seem to be used, because notify is NULL in all callers.
+	 */
+
+        if (notify != NULL) {
+            pDRIDrawablePriv->notifiers = x_hook_remove(pDRIDrawablePriv->notifiers,
+                                                        notify, notify_data);
+        }
+
+	--pDRIDrawablePriv->refCount;
+
+	/* 
+	 * Check if the drawable privates still have a reference to the
+	 * surface.
+	 */
+
+        if (pDRIDrawablePriv->refCount <= 0) {
+            /*
+	     * This calls back to DRIDrawablePrivDelete which
+	     * frees the private area and dispatches events, if needed. 
+	     */
+            FreeResourceByType(id, DRIDrawablePrivResType, FALSE);
+        }
+    }
+
+    return TRUE;
+}
+
+/* 
+ * The assumption is that this is called when the refCount of a surface
+ * drops to <= 0, or the window/pixmap is destroyed.  
+ */
+Bool
+DRIDrawablePrivDelete(pointer pResource, XID id)
+{
+    DrawablePtr         pDrawable = (DrawablePtr)pResource;
+    DRIScreenPrivPtr    pDRIPriv = DRI_SCREEN_PRIV(pDrawable->pScreen);
+    DRIDrawablePrivPtr  pDRIDrawablePriv = NULL;
+    WindowPtr           pWin = NULL;
+    PixmapPtr           pPix = NULL;
+
+    if (pDrawable->type == DRAWABLE_WINDOW) {
+        pWin = (WindowPtr)pDrawable;
+        pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);
+    } else if (pDrawable->type == DRAWABLE_PIXMAP) {
+        pPix = (PixmapPtr)pDrawable;
+        pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_PIXMAP(pPix);
+    }
+
+    if (pDRIDrawablePriv == NULL) {
+	/* 
+	 * We reuse __func__ and the resource type for the GLXPixmap code.
+	 * Attempt to free a pixmap buffer associated with the resource
+	 * if possible.
+	 */
+	return DRIFreePixmapImp(pDrawable);
+    }
+    
+    if (pDRIDrawablePriv->drawableIndex != -1) {
+        /* release drawable table entry */
+        pDRIPriv->DRIDrawables[pDRIDrawablePriv->drawableIndex] = NULL;
+    }
+
+    if (pDRIDrawablePriv->sid != 0) {
+	DRISurfaceNotify(pDRIDrawablePriv->sid, AppleDRISurfaceNotifyDestroyed);
+    }
+  
+
+    if (pDRIDrawablePriv->notifiers != NULL)
+        x_hook_free(pDRIDrawablePriv->notifiers);
+
+    free(pDRIDrawablePriv);
+
+    if (pDrawable->type == DRAWABLE_WINDOW) {
+	dixSetPrivate(&pWin->devPrivates, DRIWindowPrivKey, NULL);
+    } else if (pDrawable->type == DRAWABLE_PIXMAP) {
+	dixSetPrivate(&pPix->devPrivates, DRIPixmapPrivKey, NULL);
+    }
+
+    --pDRIPriv->nrWindows;
+
+    return TRUE;
+}
+
+void
+DRIWindowExposures(WindowPtr pWin, RegionPtr prgn, RegionPtr bsreg)
+{
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    DRIDrawablePrivPtr pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);
+
+    if (pDRIDrawablePriv) {
+        /* FIXME: something? */
+    }
+
+    pScreen->WindowExposures = pDRIPriv->wrap.WindowExposures;
+
+    (*pScreen->WindowExposures)(pWin, prgn, bsreg);
+
+    pScreen->WindowExposures = DRIWindowExposures;
+}
+
+void
+DRICopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
+{
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    DRIDrawablePrivPtr pDRIDrawablePriv;
+
+    if (pDRIPriv->nrWindows > 0) {
+       pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);
+       if (pDRIDrawablePriv != NULL) {
+            DRIUpdateSurface(pDRIDrawablePriv, &pWin->drawable);
+       }
+    }
+
+    /* unwrap */
+    pScreen->CopyWindow = pDRIPriv->wrap.CopyWindow;
+
+    /* call lower layers */
+    (*pScreen->CopyWindow)(pWin, ptOldOrg, prgnSrc);
+
+    /* rewrap */
+    pScreen->CopyWindow = DRICopyWindow;
+}
+
+int
+DRIValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind)
+{
+    ScreenPtr pScreen = pParent->drawable.pScreen;
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    int returnValue;
+
+    /* unwrap */
+    pScreen->ValidateTree = pDRIPriv->wrap.ValidateTree;
+
+    /* call lower layers */
+    returnValue = (*pScreen->ValidateTree)(pParent, pChild, kind);
+
+    /* rewrap */
+    pScreen->ValidateTree = DRIValidateTree;
+
+    return returnValue;
+}
+
+void
+DRIPostValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind)
+{
+    ScreenPtr pScreen;
+    DRIScreenPrivPtr pDRIPriv;
+
+    if (pParent) {
+        pScreen = pParent->drawable.pScreen;
+    } else {
+        pScreen = pChild->drawable.pScreen;
+    }
+    pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+
+    if (pDRIPriv->wrap.PostValidateTree) {
+        /* unwrap */
+        pScreen->PostValidateTree = pDRIPriv->wrap.PostValidateTree;
+
+        /* call lower layers */
+        (*pScreen->PostValidateTree)(pParent, pChild, kind);
+
+        /* rewrap */
+        pScreen->PostValidateTree = DRIPostValidateTree;
+    }
+}
+
+void
+DRIClipNotify(WindowPtr pWin, int dx, int dy)
+{
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    DRIDrawablePrivPtr  pDRIDrawablePriv;
+
+    if ((pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin))) {
+        DRIUpdateSurface(pDRIDrawablePriv, &pWin->drawable);
+    }
+
+    if (pDRIPriv->wrap.ClipNotify) {
+        pScreen->ClipNotify = pDRIPriv->wrap.ClipNotify;
+
+        (*pScreen->ClipNotify)(pWin, dx, dy);
+
+        pScreen->ClipNotify = DRIClipNotify;
+    }
+}
+
+/* This lets us get at the unwrapped functions so that they can correctly
+ * call the lower level functions, and choose whether they will be
+ * called at every level of recursion (eg in validatetree).
+ */
+DRIWrappedFuncsRec *
+DRIGetWrappedFuncs(ScreenPtr pScreen)
+{
+    return &(DRI_SCREEN_PRIV(pScreen)->wrap);
+}
+
+void
+DRIQueryVersion(int *majorVersion,
+                int *minorVersion,
+                int *patchVersion)
+{
+    *majorVersion = APPLE_DRI_MAJOR_VERSION;
+    *minorVersion = APPLE_DRI_MINOR_VERSION;
+    *patchVersion = APPLE_DRI_PATCH_VERSION;
+}
+
+/* 
+ * Note: this also cleans up the hash table in addition to notifying clients.
+ * The sid/surface-id should not be used after this, because it will be
+ * invalid.
+ */ 
+void
+DRISurfaceNotify(xp_surface_id id, int kind)
+{
+    DRIDrawablePrivPtr pDRIDrawablePriv = NULL;
+    DRISurfaceNotifyArg arg;
+
+    arg.id = id;
+    arg.kind = kind;
+
+    if (surface_hash != NULL)
+    {
+        pDRIDrawablePriv = x_hash_table_lookup(surface_hash,
+                                               x_cvt_uint_to_vptr(id), NULL);
+    }
+
+    if (pDRIDrawablePriv == NULL)
+        return;
+
+    if (kind == AppleDRISurfaceNotifyDestroyed)
+    {
+	x_hash_table_remove(surface_hash, x_cvt_uint_to_vptr(id));
+    }
+
+    x_hook_run(pDRIDrawablePriv->notifiers, &arg);
+
+    if (kind == AppleDRISurfaceNotifyDestroyed)
+    {
+	xp_error error;
+	
+	error = xp_destroy_surface(pDRIDrawablePriv->sid);
+	
+	if(error) 
+	    ErrorF("%s: xp_destroy_surface failed: %d\n", __func__, error);
+		
+	/* Guard against reuse, even though we are freeing after this. */
+	pDRIDrawablePriv->sid = 0;
+
+        FreeResourceByType(pDRIDrawablePriv->pDraw->id,
+                           DRIDrawablePrivResType, FALSE);
+    }
+}
+
+/*
+ * This creates a shared memory buffer for use with GLXPixmaps
+ * and AppleSGLX.
+ */
+Bool DRICreatePixmap(ScreenPtr pScreen, Drawable id,
+		     DrawablePtr pDrawable, char *path,
+		     size_t pathmax) 
+{
+    DRIPixmapBufferPtr shared;
+    PixmapPtr pPix;
+    
+    if(pDrawable->type != DRAWABLE_PIXMAP)
+	return FALSE;
+
+    pPix = (PixmapPtr)pDrawable;
+
+    shared = malloc(sizeof(*shared));
+    if(NULL == shared) {
+        FatalError("failed to allocate DRIPixmapBuffer in %s\n", __func__);
+    }
+        
+    shared->pDrawable = pDrawable;
+    shared->refCount = 1;
+
+    if(pDrawable->bitsPerPixel >= 24) {
+	shared->bytesPerPixel = 4;
+    } else if(pDrawable->bitsPerPixel <= 16) {
+	shared->bytesPerPixel = 2;
+    }
+    
+    shared->width = pDrawable->width;
+    shared->height = pDrawable->height;
+    
+    if(-1 == snprintf(shared->shmPath, sizeof(shared->shmPath),
+                      "%d_0x%lx", getpid(),
+                      (unsigned long)id)) {
+        FatalError("buffer overflow in %s\n", __func__);
+    }
+    
+    shared->fd = shm_open(shared->shmPath, 
+                          O_RDWR | O_EXCL | O_CREAT, 
+                          S_IRUSR | S_IWUSR | S_IROTH | S_IWOTH);
+    
+    if(-1 == shared->fd) {
+	free(shared);
+        return FALSE;
+    }   
+    
+    shared->length = shared->width * shared->height * shared->bytesPerPixel;
+    
+    if(-1 == ftruncate(shared->fd, shared->length)) {
+	ErrorF("failed to ftruncate (extend) file.");
+	shm_unlink(shared->shmPath);
+	close(shared->fd);
+	free(shared);
+	return FALSE;
+    }
+
+    shared->buffer = mmap(NULL, shared->length,
+                          PROT_READ | PROT_WRITE,
+                          MAP_FILE | MAP_SHARED, shared->fd, 0);
+    
+    if(MAP_FAILED == shared->buffer) {
+	ErrorF("failed to mmap shared memory.");
+	shm_unlink(shared->shmPath);
+	close(shared->fd);
+	free(shared);
+	return FALSE;
+    }
+    
+    strncpy(path, shared->shmPath, pathmax);
+    path[pathmax - 1] = '\0';
+    
+    dixSetPrivate(&pPix->devPrivates, DRIPixmapBufferPrivKey, shared);
+
+    AddResource(id, DRIDrawablePrivResType, (pointer)pDrawable);
+
+    return TRUE;
+}
+
+
+Bool DRIGetPixmapData(DrawablePtr pDrawable, int *width, int *height,
+		      int *pitch, int *bpp, void **ptr) {
+    PixmapPtr pPix;
+    DRIPixmapBufferPtr shared;
+
+    if(pDrawable->type != DRAWABLE_PIXMAP)
+	return FALSE;
+
+    pPix = (PixmapPtr)pDrawable;
+
+    shared = dixLookupPrivate(&pPix->devPrivates, DRIPixmapBufferPrivKey);
+
+    if(NULL == shared)
+	return FALSE;
+
+    assert(pDrawable->width == shared->width);
+    assert(pDrawable->height == shared->height);
+    
+    *width = shared->width;
+    *height = shared->height;
+    *bpp = shared->bytesPerPixel;
+    *pitch = shared->width * shared->bytesPerPixel;
+    *ptr = shared->buffer;    
+
+    return TRUE;
+}
+
+static Bool
+DRIFreePixmapImp(DrawablePtr pDrawable) {
+    DRIPixmapBufferPtr shared;
+    PixmapPtr pPix;
+
+    if(pDrawable->type != DRAWABLE_PIXMAP)
+	return FALSE;
+
+    pPix = (PixmapPtr)pDrawable;
+
+    shared = dixLookupPrivate(&pPix->devPrivates, DRIPixmapBufferPrivKey);
+
+    if(NULL == shared)
+	return FALSE;
+
+    close(shared->fd);
+    munmap(shared->buffer, shared->length);
+    shm_unlink(shared->shmPath);
+    free(shared);
+
+    dixSetPrivate(&pPix->devPrivates, DRIPixmapBufferPrivKey, (pointer)NULL);
+
+    return TRUE;
+}
+
+void 
+DRIDestroyPixmap(DrawablePtr pDrawable) {
+    if(DRIFreePixmapImp(pDrawable))
+	FreeResourceByType(pDrawable->id, DRIDrawablePrivResType, FALSE);
+
+}
diff --git a/xorg-server/hw/xquartz/xpr/xpr.h b/xorg-server/hw/xquartz/xpr/xpr.h
index d25f2acc8..0b138ddd7 100644
--- a/xorg-server/hw/xquartz/xpr/xpr.h
+++ b/xorg-server/hw/xquartz/xpr/xpr.h
@@ -1,69 +1,69 @@
-/*

- * Xplugin rootless implementation

- *

- * Copyright (c) 2003 Torrey T. Lyons. All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright

- * holders shall not be used in advertising or otherwise to promote the sale,

- * use or other dealings in this Software without prior written authorization.

- */

-

-#ifndef XPR_H

-#define XPR_H

-

-#include "windowstr.h"

-#include "screenint.h"

-#include <Xplugin.h>

-

-#include "darwin.h"

-

-#undef DEBUG_LOG

-#define DEBUG_LOG(msg, args...) ASL_LOG(ASL_LEVEL_DEBUG, "xpr", msg, ##args)

-

-Bool QuartzModeBundleInit(void);

-

-void AppleDRIExtensionInit(void);

-void xprAppleWMInit(void);

-Bool xprInit(ScreenPtr pScreen);

-Bool xprIsX11Window(int windowNumber);

-WindowPtr xprGetXWindow(xp_window_id wid);

-

-void xprHideWindows(Bool hide);

-

-Bool QuartzInitCursor(ScreenPtr pScreen);

-void QuartzSuspendXCursor(ScreenPtr pScreen);

-void QuartzResumeXCursor(ScreenPtr pScreen);

-

-/* If we are rooted, we need the root window and desktop levels to be below

- * the menubar (24) but above native windows.  Normal window level is 0.

- * Floating window level is 3.  The rest are filled in as appropriate.

- * See CGWindowLevel.h

- */

-

-#include <X11/extensions/applewmconst.h>

-static const int normal_window_levels[AppleWMNumWindowLevels+1] = {

-0, 3, 4, 5, INT_MIN + 30, INT_MIN + 29,

-};

-static const int rooted_window_levels[AppleWMNumWindowLevels+1] = {

-20, 21, 22, 23, 19, 18,

-};

-

-#endif /* XPR_H */

+/*
+ * Xplugin rootless implementation
+ *
+ * Copyright (c) 2003 Torrey T. Lyons. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+
+#ifndef XPR_H
+#define XPR_H
+
+#include "windowstr.h"
+#include "screenint.h"
+#include <Xplugin.h>
+
+#include "darwin.h"
+
+#undef DEBUG_LOG
+#define DEBUG_LOG(msg, args...) ASL_LOG(ASL_LEVEL_DEBUG, "xpr", msg, ##args)
+
+Bool QuartzModeBundleInit(void);
+
+void AppleDRIExtensionInit(void);
+void xprAppleWMInit(void);
+Bool xprInit(ScreenPtr pScreen);
+Bool xprIsX11Window(int windowNumber);
+WindowPtr xprGetXWindow(xp_window_id wid);
+
+void xprHideWindows(Bool hide);
+
+Bool QuartzInitCursor(ScreenPtr pScreen);
+void QuartzSuspendXCursor(ScreenPtr pScreen);
+void QuartzResumeXCursor(ScreenPtr pScreen);
+
+/* If we are rooted, we need the root window and desktop levels to be below
+ * the menubar (24) but above native windows.  Normal window level is 0.
+ * Floating window level is 3.  The rest are filled in as appropriate.
+ * See CGWindowLevel.h
+ */
+
+#include <X11/extensions/applewmconst.h>
+static const int normal_window_levels[AppleWMNumWindowLevels+1] = {
+0, 3, 4, 5, INT_MIN + 30, INT_MIN + 29,
+};
+static const int rooted_window_levels[AppleWMNumWindowLevels+1] = {
+20, 21, 22, 23, 19, 18,
+};
+
+#endif /* XPR_H */
diff --git a/xorg-server/hw/xquartz/xpr/xprAppleWM.c b/xorg-server/hw/xquartz/xpr/xprAppleWM.c
index 6f501e201..b6b9a5fc8 100644
--- a/xorg-server/hw/xquartz/xpr/xprAppleWM.c
+++ b/xorg-server/hw/xquartz/xpr/xprAppleWM.c
@@ -1,162 +1,162 @@
-/*

- * Xplugin rootless implementation functions for AppleWM extension

- *

- * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.

- * Copyright (c) 2003 Torrey T. Lyons. All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright

- * holders shall not be used in advertising or otherwise to promote the sale,

- * use or other dealings in this Software without prior written authorization.

- */

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include "xpr.h"

-

-#include <X11/extensions/applewmproto.h>

-

-#include "applewmExt.h"

-#include "rootless.h"

-#include "rootlessCommon.h"

-#include <Xplugin.h>

-#include <X11/X.h>

-#include "quartz.h"

-#include "x-hash.h"

-

-static int xprSetWindowLevel(

-    WindowPtr pWin,

-    int level)

-{

-    xp_window_id wid;

-    xp_window_changes wc;

-    RootlessWindowRec *winRec;

-

-    // AppleWMNumWindowLevels is allowed, but is only set by the server

-    // for the root window.

-    if (level < 0 || level >= AppleWMNumWindowLevels) {

-        return BadValue;

-    }

-    

-    wid = x_cvt_vptr_to_uint(RootlessFrameForWindow (pWin, TRUE));

-    if (wid == 0)

-        return BadWindow;

-

-    RootlessStopDrawing (pWin, FALSE);

-    winRec = WINREC(pWin);

- 

-    if(!winRec)

-        return BadWindow;

-    

-    if(XQuartzIsRootless)

-        wc.window_level = normal_window_levels[level];

-    else if(XQuartzShieldingWindowLevel)

-        wc.window_level = XQuartzShieldingWindowLevel + 1;

-    else

-        wc.window_level = rooted_window_levels[level];

-    

-    if (xp_configure_window (wid, XP_WINDOW_LEVEL, &wc) != Success) {

-        return BadValue;

-    }

-

-    winRec->level = level;

-

-    return Success;

-}

-

-#if defined(XPLUGIN_VERSION) && XPLUGIN_VERSION >= 3

-static int xprAttachTransient(WindowPtr pWinChild, WindowPtr pWinParent) {

-    xp_window_id child_wid, parent_wid; 

-    xp_window_changes wc;

-

-    child_wid = x_cvt_vptr_to_uint(RootlessFrameForWindow(pWinChild, TRUE));

-    if (child_wid == 0)

-        return BadWindow;

-

-    if(pWinParent) {

-        parent_wid = x_cvt_vptr_to_uint(RootlessFrameForWindow(pWinParent, TRUE));

-        if (parent_wid == 0)

-            return BadWindow;

-    } else {

-        parent_wid = 0;

-    }

-     

-    wc.transient_for = parent_wid;

-

-    RootlessStopDrawing (pWinChild, FALSE);

-

-    if (xp_configure_window(child_wid, XP_ATTACH_TRANSIENT, &wc) != Success) {

-        return BadValue;

-    }

-

-    return Success;    

-}

-#endif

-

-static int xprFrameDraw(

-    WindowPtr pWin,

-    xp_frame_class class,

-    xp_frame_attr attr,

-    const BoxRec *outer,

-    const BoxRec *inner,

-    unsigned int title_len,

-    const unsigned char *title_bytes)

-{

-    xp_window_id wid;

-

-    wid = x_cvt_vptr_to_uint(RootlessFrameForWindow (pWin, FALSE));

-    if (wid == 0)

-        return BadWindow;

-

-    if (xp_frame_draw (wid, class, attr, outer, inner,

-                       title_len, title_bytes) != Success)

-    {

-        return BadValue;

-    }

-

-    return Success;

-}

-

-static AppleWMProcsRec xprAppleWMProcs = {

-    xp_disable_update,

-    xp_reenable_update,

-    xprSetWindowLevel,

-    xp_frame_get_rect,

-    xp_frame_hit_test,

-    xprFrameDraw,

-#if defined(XPLUGIN_VERSION) && XPLUGIN_VERSION >= 3

-    xp_set_dock_proxy,

-    xprAttachTransient

-#elif defined(XPLUGIN_VERSION) && XPLUGIN_VERSION >= 2

-    xp_set_dock_proxy,

-    NULL

-#else

-    NULL,

-    NULL

-#endif

-};

-

-

-void xprAppleWMInit(void)

-{

-    AppleWMExtensionInit(&xprAppleWMProcs);

-}

+/*
+ * Xplugin rootless implementation functions for AppleWM extension
+ *
+ * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2003 Torrey T. Lyons. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "xpr.h"
+
+#include <X11/extensions/applewmproto.h>
+
+#include "applewmExt.h"
+#include "rootless.h"
+#include "rootlessCommon.h"
+#include <Xplugin.h>
+#include <X11/X.h>
+#include "quartz.h"
+#include "x-hash.h"
+
+static int xprSetWindowLevel(
+    WindowPtr pWin,
+    int level)
+{
+    xp_window_id wid;
+    xp_window_changes wc;
+    RootlessWindowRec *winRec;
+
+    // AppleWMNumWindowLevels is allowed, but is only set by the server
+    // for the root window.
+    if (level < 0 || level >= AppleWMNumWindowLevels) {
+        return BadValue;
+    }
+    
+    wid = x_cvt_vptr_to_uint(RootlessFrameForWindow (pWin, TRUE));
+    if (wid == 0)
+        return BadWindow;
+
+    RootlessStopDrawing (pWin, FALSE);
+    winRec = WINREC(pWin);
+ 
+    if(!winRec)
+        return BadWindow;
+    
+    if(XQuartzIsRootless)
+        wc.window_level = normal_window_levels[level];
+    else if(XQuartzShieldingWindowLevel)
+        wc.window_level = XQuartzShieldingWindowLevel + 1;
+    else
+        wc.window_level = rooted_window_levels[level];
+    
+    if (xp_configure_window (wid, XP_WINDOW_LEVEL, &wc) != Success) {
+        return BadValue;
+    }
+
+    winRec->level = level;
+
+    return Success;
+}
+
+#if defined(XPLUGIN_VERSION) && XPLUGIN_VERSION >= 3
+static int xprAttachTransient(WindowPtr pWinChild, WindowPtr pWinParent) {
+    xp_window_id child_wid, parent_wid; 
+    xp_window_changes wc;
+
+    child_wid = x_cvt_vptr_to_uint(RootlessFrameForWindow(pWinChild, TRUE));
+    if (child_wid == 0)
+        return BadWindow;
+
+    if(pWinParent) {
+        parent_wid = x_cvt_vptr_to_uint(RootlessFrameForWindow(pWinParent, TRUE));
+        if (parent_wid == 0)
+            return BadWindow;
+    } else {
+        parent_wid = 0;
+    }
+     
+    wc.transient_for = parent_wid;
+
+    RootlessStopDrawing (pWinChild, FALSE);
+
+    if (xp_configure_window(child_wid, XP_ATTACH_TRANSIENT, &wc) != Success) {
+        return BadValue;
+    }
+
+    return Success;    
+}
+#endif
+
+static int xprFrameDraw(
+    WindowPtr pWin,
+    xp_frame_class class,
+    xp_frame_attr attr,
+    const BoxRec *outer,
+    const BoxRec *inner,
+    unsigned int title_len,
+    const unsigned char *title_bytes)
+{
+    xp_window_id wid;
+
+    wid = x_cvt_vptr_to_uint(RootlessFrameForWindow (pWin, FALSE));
+    if (wid == 0)
+        return BadWindow;
+
+    if (xp_frame_draw (wid, class, attr, outer, inner,
+                       title_len, title_bytes) != Success)
+    {
+        return BadValue;
+    }
+
+    return Success;
+}
+
+static AppleWMProcsRec xprAppleWMProcs = {
+    xp_disable_update,
+    xp_reenable_update,
+    xprSetWindowLevel,
+    xp_frame_get_rect,
+    xp_frame_hit_test,
+    xprFrameDraw,
+#if defined(XPLUGIN_VERSION) && XPLUGIN_VERSION >= 3
+    xp_set_dock_proxy,
+    xprAttachTransient
+#elif defined(XPLUGIN_VERSION) && XPLUGIN_VERSION >= 2
+    xp_set_dock_proxy,
+    NULL
+#else
+    NULL,
+    NULL
+#endif
+};
+
+
+void xprAppleWMInit(void)
+{
+    AppleWMExtensionInit(&xprAppleWMProcs);
+}
diff --git a/xorg-server/hw/xquartz/xpr/xprEvent.c b/xorg-server/hw/xquartz/xpr/xprEvent.c
index 9d476d1f4..4e7ece64f 100644
--- a/xorg-server/hw/xquartz/xpr/xprEvent.c
+++ b/xorg-server/hw/xquartz/xpr/xprEvent.c
@@ -1,78 +1,78 @@
-/* Copyright (c) 2008 Apple Inc.

- *

- * Permission is hereby granted, free of charge, to any person

- * obtaining a copy of this software and associated documentation files

- * (the "Software"), to deal in the Software without restriction,

- * including without limitation the rights to use, copy, modify, merge,

- * publish, distribute, sublicense, and/or sell copies of the Software,

- * and to permit persons to whom the Software is furnished to do so,

- * subject to the following conditions:

- *

- * 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 ABOVE LISTED COPYRIGHT

- * HOLDER(S) 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(s) of the above

- * copyright holders shall not be used in advertising or otherwise to

- * promote the sale, use or other dealings in this Software without

- * prior written authorization.

- */

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include "xpr.h"

-

-#include   <X11/X.h>

-#include   <X11/Xmd.h>

-#include   <X11/Xproto.h>

-#include   "misc.h"

-#include   "windowstr.h"

-#include   "pixmapstr.h"

-#include   "inputstr.h"

-#include   "eventstr.h"

-#include   "mi.h"

-#include   "scrnintstr.h"

-#include   "mipointer.h"

-

-#include "quartz.h"

-#include "quartzKeyboard.h"

-#include "darwinEvents.h"

-

-#include <sys/types.h>

-#include <sys/uio.h>

-#include <unistd.h>

-

-#include "rootlessWindow.h"

-#include "xprEvent.h"

-

-Bool QuartzModeEventHandler(int screenNum, XQuartzEvent *e, DeviceIntPtr dev) {

-    switch(e->subtype) {

-        case kXquartzWindowState:

-            DEBUG_LOG("kXquartzWindowState\n");

-            RootlessNativeWindowStateChanged(xprGetXWindow(e->data[0]),

-                                             e->data[1]);

-            return TRUE;

-            

-        case kXquartzWindowMoved:

-            DEBUG_LOG("kXquartzWindowMoved\n");

-            RootlessNativeWindowMoved(xprGetXWindow(e->data[0]));

-            return TRUE;

-            

-        case kXquartzBringAllToFront:

-            DEBUG_LOG("kXquartzBringAllToFront\n");

-            RootlessOrderAllWindows(e->data[0]);

-            return TRUE;

-        default:

-            return FALSE;

-    }

-}

+/* Copyright (c) 2008 Apple Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * 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 ABOVE LISTED COPYRIGHT
+ * HOLDER(S) 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(s) of the above
+ * copyright holders shall not be used in advertising or otherwise to
+ * promote the sale, use or other dealings in this Software without
+ * prior written authorization.
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "xpr.h"
+
+#include   <X11/X.h>
+#include   <X11/Xmd.h>
+#include   <X11/Xproto.h>
+#include   "misc.h"
+#include   "windowstr.h"
+#include   "pixmapstr.h"
+#include   "inputstr.h"
+#include   "eventstr.h"
+#include   "mi.h"
+#include   "scrnintstr.h"
+#include   "mipointer.h"
+
+#include "quartz.h"
+#include "quartzKeyboard.h"
+#include "darwinEvents.h"
+
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <unistd.h>
+
+#include "rootlessWindow.h"
+#include "xprEvent.h"
+
+Bool QuartzModeEventHandler(int screenNum, XQuartzEvent *e, DeviceIntPtr dev) {
+    switch(e->subtype) {
+        case kXquartzWindowState:
+            DEBUG_LOG("kXquartzWindowState\n");
+            RootlessNativeWindowStateChanged(xprGetXWindow(e->data[0]),
+                                             e->data[1]);
+            return TRUE;
+            
+        case kXquartzWindowMoved:
+            DEBUG_LOG("kXquartzWindowMoved\n");
+            RootlessNativeWindowMoved(xprGetXWindow(e->data[0]));
+            return TRUE;
+            
+        case kXquartzBringAllToFront:
+            DEBUG_LOG("kXquartzBringAllToFront\n");
+            RootlessOrderAllWindows(e->data[0]);
+            return TRUE;
+        default:
+            return FALSE;
+    }
+}
diff --git a/xorg-server/hw/xquartz/xpr/xprFrame.c b/xorg-server/hw/xquartz/xpr/xprFrame.c
index 4214eff33..98f1cc3ed 100644
--- a/xorg-server/hw/xquartz/xpr/xprFrame.c
+++ b/xorg-server/hw/xquartz/xpr/xprFrame.c
@@ -1,608 +1,608 @@
-/*

- * Xplugin rootless implementation frame functions

- *

- * Copyright (c) 2002-2011 Apple Computer, Inc. All rights reserved.

- * Copyright (c) 2003 Torrey T. Lyons. All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright

- * holders shall not be used in advertising or otherwise to promote the sale,

- * use or other dealings in this Software without prior written authorization.

- */

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include "xpr.h"

-#include "rootlessCommon.h"

-#include <Xplugin.h>

-#include "x-hash.h"

-#include "applewmExt.h"

-

-#include "propertyst.h"

-#include "dix.h"

-#include <X11/Xatom.h>

-#include "windowstr.h"

-#include "quartz.h"

-

-#ifdef HAVE_LIBDISPATCH

-#include <dispatch/dispatch.h>

-#else

-#include <pthread.h>

-#endif

-

-#define DEFINE_ATOM_HELPER(func,atom_name)                      \

-static Atom func (void) {                                       \

-    static int generation;                                      \

-    static Atom atom;                                           \

-    if (generation != serverGeneration) {                       \

-        generation = serverGeneration;                          \

-        atom = MakeAtom (atom_name, strlen (atom_name), TRUE);  \

-    }                                                           \

-    return atom;                                                \

-}

-

-DEFINE_ATOM_HELPER(xa_native_window_id, "_NATIVE_WINDOW_ID")

-

-/* Maps xp_window_id -> RootlessWindowRec */

-static x_hash_table *window_hash;

-

-/* Need to guard window_hash since xprIsX11Window can be called from any thread. */

-#ifdef HAVE_LIBDISPATCH

-static dispatch_queue_t window_hash_serial_q;

-#else

-static pthread_rwlock_t window_hash_rwlock;

-#endif

-

-/* Prototypes for static functions */

-static Bool xprCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,

-               int newX, int newY, RegionPtr pShape);

-static void xprDestroyFrame(RootlessFrameID wid);

-static void xprMoveFrame(RootlessFrameID wid, ScreenPtr pScreen, int newX, int newY);

-static void xprResizeFrame(RootlessFrameID wid, ScreenPtr pScreen,

-               int newX, int newY, unsigned int newW, unsigned int newH,

-               unsigned int gravity);

-static void xprRestackFrame(RootlessFrameID wid, RootlessFrameID nextWid);

-static void xprReshapeFrame(RootlessFrameID wid, RegionPtr pShape);

-static void xprUnmapFrame(RootlessFrameID wid);

-static void xprStartDrawing(RootlessFrameID wid, char **pixelData, int *bytesPerRow);

-static void xprStopDrawing(RootlessFrameID wid, Bool flush);

-static void xprUpdateRegion(RootlessFrameID wid, RegionPtr pDamage);

-static void xprDamageRects(RootlessFrameID wid, int nrects, const BoxRec *rects,

-               int shift_x, int shift_y);

-static void xprSwitchWindow(RootlessWindowPtr pFrame, WindowPtr oldWin);

-static Bool xprDoReorderWindow(RootlessWindowPtr pFrame);

-static void xprHideWindow(RootlessFrameID wid);

-static void xprUpdateColormap(RootlessFrameID wid, ScreenPtr pScreen);

-static void xprCopyWindow(RootlessFrameID wid, int dstNrects, const BoxRec *dstRects,

-              int dx, int dy);

-

-

-static inline xp_error

-xprConfigureWindow(xp_window_id id, unsigned int mask,

-                   const xp_window_changes *values)

-{

-    return xp_configure_window(id, mask, values);

-}

-

-

-static void

-xprSetNativeProperty(RootlessWindowPtr pFrame)

-{

-    xp_error err;

-    unsigned int native_id;

-    long data;

-

-    err = xp_get_native_window(x_cvt_vptr_to_uint(pFrame->wid), &native_id);

-    if (err == Success)

-    {

-        /* FIXME: move this to AppleWM extension */

-

-        data = native_id;

-        dixChangeWindowProperty(serverClient, pFrame->win, xa_native_window_id(),

-				XA_INTEGER, 32, PropModeReplace, 1, &data, TRUE);

-    }

-}

-

-static xp_error

-xprColormapCallback(void *data, int first_color, int n_colors, uint32_t *colors)

-{

-    return (RootlessResolveColormap (data, first_color, n_colors, colors) ? XP_Success : XP_BadMatch);

-}

-

-/*

- * Create and display a new frame.

- */

-static Bool

-xprCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,

-               int newX, int newY, RegionPtr pShape)

-{

-    WindowPtr pWin = pFrame->win;

-    xp_window_changes wc;

-    unsigned int mask = 0;

-    xp_error err;

-

-    wc.x = newX;

-    wc.y = newY;

-    wc.width = pFrame->width;

-    wc.height = pFrame->height;

-    wc.bit_gravity = XP_GRAVITY_NONE;

-    mask |= XP_BOUNDS;

-

-    if (pWin->drawable.depth == 8)

-    {

-        wc.depth = XP_DEPTH_INDEX8;

-        wc.colormap = xprColormapCallback;

-        wc.colormap_data = pScreen;

-        mask |= XP_COLORMAP;

-    }

-    else if (pWin->drawable.depth == 15)

-        wc.depth = XP_DEPTH_RGB555;

-    else if (pWin->drawable.depth == 24)

-        wc.depth = XP_DEPTH_ARGB8888;

-    else

-        wc.depth = XP_DEPTH_NIL;

-    mask |= XP_DEPTH;

-

-    if (pShape != NULL)

-    {

-        wc.shape_nrects = RegionNumRects(pShape);

-        wc.shape_rects = RegionRects(pShape);

-        wc.shape_tx = wc.shape_ty = 0;

-        mask |= XP_SHAPE;

-    }

-

-    pFrame->level = !IsRoot (pWin) ? AppleWMWindowLevelNormal : AppleWMNumWindowLevels;

-

-    if(XQuartzIsRootless)

-        wc.window_level = normal_window_levels[pFrame->level];

-    else if(XQuartzShieldingWindowLevel)

-        wc.window_level = XQuartzShieldingWindowLevel + 1;

-    else

-        wc.window_level = rooted_window_levels[pFrame->level];

-    mask |= XP_WINDOW_LEVEL;

-

-    err = xp_create_window(mask, &wc, (xp_window_id *) &pFrame->wid);

-

-    if (err != Success)

-    {

-        return FALSE;

-    }

-

-#ifdef HAVE_LIBDISPATCH

-    dispatch_async(window_hash_serial_q, ^{

-        x_hash_table_insert(window_hash, pFrame->wid, pFrame);

-    });

-#else

-    pthread_rwlock_wrlock(&window_hash_rwlock);

-    x_hash_table_insert(window_hash, pFrame->wid, pFrame);

-    pthread_rwlock_wrlock(&window_hash_rwlock);

-#endif

-

-    xprSetNativeProperty(pFrame);

-

-    return TRUE;

-}

-

-

-/*

- * Destroy a frame.

- */

-static void

-xprDestroyFrame(RootlessFrameID wid)

-{

-    xp_error err;

-

-#ifdef HAVE_LIBDISPATCH

-    dispatch_async(window_hash_serial_q, ^{

-        x_hash_table_remove(window_hash, wid);

-    });

-#else

-    pthread_rwlock_wrlock(&window_hash_rwlock);

-    x_hash_table_remove(window_hash, wid);

-    pthread_rwlock_unlock(&window_hash_rwlock);

-#endif

-

-    err = xp_destroy_window(x_cvt_vptr_to_uint(wid));

-    if (err != Success)

-        FatalError("Could not destroy window %d (%d).", (int)x_cvt_vptr_to_uint(wid), (int)err);

-}

-

-

-/*

- * Move a frame on screen.

- */

-static void

-xprMoveFrame(RootlessFrameID wid, ScreenPtr pScreen, int newX, int newY)

-{

-    xp_window_changes wc;

-

-    wc.x = newX;

-    wc.y = newY;

-    //    ErrorF("xprMoveFrame(%d, %p, %d, %d)\n", wid, pScreen, newX, newY);

-    xprConfigureWindow(x_cvt_vptr_to_uint(wid), XP_ORIGIN, &wc);

-}

-

-

-/*

- * Resize and move a frame.

- */

-static void

-xprResizeFrame(RootlessFrameID wid, ScreenPtr pScreen,

-               int newX, int newY, unsigned int newW, unsigned int newH,

-               unsigned int gravity)

-{

-    xp_window_changes wc;

-

-    wc.x = newX;

-    wc.y = newY;

-    wc.width = newW;

-    wc.height = newH;

-    wc.bit_gravity = gravity;

-

-    /* It's unlikely that being async will save us anything here.

-       But it can't hurt. */

-

-    xprConfigureWindow(x_cvt_vptr_to_uint(wid), XP_BOUNDS, &wc);

-}

-

-

-/*

- * Change frame stacking.

- */

-static void xprRestackFrame(RootlessFrameID wid, RootlessFrameID nextWid) {

-    xp_window_changes wc;

-    unsigned int mask = XP_STACKING;

-#ifdef HAVE_LIBDISPATCH

-    __block

-#endif

-    RootlessWindowRec *winRec;

-

-    /* Stack frame below nextWid it if it exists, or raise

-       frame above everything otherwise. */

-

-    if(nextWid == NULL) {

-        wc.stack_mode = XP_MAPPED_ABOVE;

-        wc.sibling = 0;

-    } else {

-        wc.stack_mode = XP_MAPPED_BELOW;

-        wc.sibling = x_cvt_vptr_to_uint(nextWid);

-    }

-

-#ifdef HAVE_LIBDISPATCH

-    dispatch_sync(window_hash_serial_q, ^{

-        winRec = x_hash_table_lookup(window_hash, wid, NULL);

-    });

-#else

-    pthread_rwlock_rdlock(&window_hash_rwlock);

-    winRec = x_hash_table_lookup(window_hash, wid, NULL);

-    pthread_rwlock_unlock(&window_hash_rwlock);

-#endif

-    

-    if(winRec) {

-        if(XQuartzIsRootless)

-            wc.window_level = normal_window_levels[winRec->level];

-        else if(XQuartzShieldingWindowLevel)

-            wc.window_level = XQuartzShieldingWindowLevel + 1;

-        else

-            wc.window_level = rooted_window_levels[winRec->level];

-        mask |= XP_WINDOW_LEVEL;

-    }

-

-    xprConfigureWindow(x_cvt_vptr_to_uint(wid), mask, &wc);

-}

-

-

-/*

- * Change the frame's shape.

- */

-static void

-xprReshapeFrame(RootlessFrameID wid, RegionPtr pShape)

-{

-    xp_window_changes wc;

-

-    if (pShape != NULL)

-    {

-        wc.shape_nrects = RegionNumRects(pShape);

-        wc.shape_rects = RegionRects(pShape);

-    }

-    else

-    {

-        wc.shape_nrects = -1;

-        wc.shape_rects = NULL;

-    }

-

-    wc.shape_tx = wc.shape_ty = 0;

-

-    xprConfigureWindow(x_cvt_vptr_to_uint(wid), XP_SHAPE, &wc);

-}

-

-

-/*

- * Unmap a frame.

- */

-static void

-xprUnmapFrame(RootlessFrameID wid)

-{

-    xp_window_changes wc;

-

-    wc.stack_mode = XP_UNMAPPED;

-    wc.sibling = 0;

-

-    xprConfigureWindow(x_cvt_vptr_to_uint(wid), XP_STACKING, &wc);

-}

-

-

-/*

- * Start drawing to a frame.

- *  Prepare for direct access to its backing buffer.

- */

-static void

-xprStartDrawing(RootlessFrameID wid, char **pixelData, int *bytesPerRow)

-{

-    void *data[2];

-    unsigned int rowbytes[2];

-    xp_error err;

-

-    err = xp_lock_window(x_cvt_vptr_to_uint(wid), NULL, NULL, data, rowbytes, NULL);

-    if (err != Success)

-        FatalError("Could not lock window %d for drawing (%d).", (int)x_cvt_vptr_to_uint(wid), (int)err);

-

-    *pixelData = data[0];

-    *bytesPerRow = rowbytes[0];

-}

-

-

-/*

- * Stop drawing to a frame.

- */

-static void

-xprStopDrawing(RootlessFrameID wid, Bool flush)

-{

-    xp_error err;

-

-    err = xp_unlock_window(x_cvt_vptr_to_uint(wid), flush);

-    /* This should be a FatalError, but we started tripping over it.  Make it a

-     * FatalError after http://xquartz.macosforge.org/trac/ticket/482 is fixed.

-     */

-    if(err != Success)

-        ErrorF("Could not unlock window %d after drawing (%d).", (int)x_cvt_vptr_to_uint(wid), (int)err);

-}

-

-

-/*

- * Flush drawing updates to the screen.

- */

-static void

-xprUpdateRegion(RootlessFrameID wid, RegionPtr pDamage)

-{

-    xp_flush_window(x_cvt_vptr_to_uint(wid));

-}

-

-

-/*

- * Mark damaged rectangles as requiring redisplay to screen.

- */

-static void

-xprDamageRects(RootlessFrameID wid, int nrects, const BoxRec *rects,

-               int shift_x, int shift_y)

-{

-    xp_mark_window(x_cvt_vptr_to_uint(wid), nrects, rects, shift_x, shift_y);

-}

-

-

-/*

- * Called after the window associated with a frame has been switched

- * to a new top-level parent.

- */

-static void

-xprSwitchWindow(RootlessWindowPtr pFrame, WindowPtr oldWin)

-{

-    DeleteProperty(serverClient, oldWin, xa_native_window_id());

-

-    xprSetNativeProperty(pFrame);

-}

-

-

-/*

- * Called to check if the frame should be reordered when it is restacked.

- */

-static Bool xprDoReorderWindow(RootlessWindowPtr pFrame)

-{

-    WindowPtr pWin = pFrame->win;

-

-    return AppleWMDoReorderWindow(pWin);

-}

-

-

-/*

- * Copy area in frame to another part of frame.

- *  Used to accelerate scrolling.

- */

-static void

-xprCopyWindow(RootlessFrameID wid, int dstNrects, const BoxRec *dstRects,

-              int dx, int dy)

-{

-    xp_copy_window(x_cvt_vptr_to_uint(wid), x_cvt_vptr_to_uint(wid),

-                   dstNrects, dstRects, dx, dy);

-}

-

-

-static RootlessFrameProcsRec xprRootlessProcs = {

-    xprCreateFrame,

-    xprDestroyFrame,

-    xprMoveFrame,

-    xprResizeFrame,

-    xprRestackFrame,

-    xprReshapeFrame,

-    xprUnmapFrame,

-    xprStartDrawing,

-    xprStopDrawing,

-    xprUpdateRegion,

-    xprDamageRects,

-    xprSwitchWindow,

-    xprDoReorderWindow,

-    xprHideWindow,

-    xprUpdateColormap,

-    xp_copy_bytes,

-    xprCopyWindow

-};

-

-

-/*

- * Initialize XPR implementation

- */

-Bool

-xprInit(ScreenPtr pScreen)

-{

-    RootlessInit(pScreen, &xprRootlessProcs);

-

-    rootless_CopyBytes_threshold = xp_copy_bytes_threshold;

-    rootless_CopyWindow_threshold = xp_scroll_area_threshold;

-

-    assert((window_hash = x_hash_table_new(NULL, NULL, NULL, NULL)));

-#ifdef HAVE_LIBDISPATCH

-    assert((window_hash_serial_q = dispatch_queue_create(BUNDLE_ID_PREFIX".X11.xpr_window_hash", NULL)));

-#else

-    assert(0 == pthread_rwlock_init(&window_hash_rwlock, NULL));

-#endif

-    

-    return TRUE;

-}

-

-

-/*

- * Given the id of a physical window, try to find the top-level (or root)

- * X window that it represents.

- */

-WindowPtr

-xprGetXWindow(xp_window_id wid)

-{

-#ifdef HAVE_LIBDISPATCH

-    RootlessWindowRec *winRec __block;

-    dispatch_sync(window_hash_serial_q, ^{

-        winRec = x_hash_table_lookup(window_hash, x_cvt_uint_to_vptr(wid), NULL);

-    });

-#else

-    RootlessWindowRec *winRec;

-    pthread_rwlock_rdlock(&window_hash_rwlock);

-    winRec = x_hash_table_lookup(window_hash, x_cvt_uint_to_vptr(wid), NULL);

-    pthread_rwlock_unlock(&window_hash_rwlock);

-#endif

-

-    return winRec != NULL ? winRec->win : NULL;

-}

-

-/*

- * The windowNumber is an AppKit window number. Returns TRUE if xpr is

- * displaying a window with that number.

- */

-Bool

-xprIsX11Window(int windowNumber)

-{

-    Bool ret;

-    xp_window_id wid;

-

-    if (xp_lookup_native_window(windowNumber, &wid))

-        ret = xprGetXWindow(wid) != NULL;

-    else

-        ret = FALSE;

-

-    return ret;

-}

-

-

-/*

- * xprHideWindows

- *  Hide or unhide all top level windows. This is called for application hide/

- *  unhide events if the window manager is not Apple-WM aware. Xplugin windows

- *  do not hide or unhide themselves.

- */

-void

-xprHideWindows(Bool hide)

-{

-    int screen;

-    WindowPtr pRoot, pWin;

-

-    for (screen = 0; screen < screenInfo.numScreens; screen++) {

-        RootlessFrameID prevWid = NULL;

-        pRoot = screenInfo.screens[screen]->root;

-

-        for (pWin = pRoot->firstChild; pWin; pWin = pWin->nextSib) {

-            RootlessWindowRec *winRec = WINREC(pWin);

-

-            if (winRec != NULL) {

-                if (hide) {

-                    xprUnmapFrame(winRec->wid);

-                } else {

-                    BoxRec box;

-

-                    xprRestackFrame(winRec->wid, prevWid);

-                    prevWid = winRec->wid;

-

-                    box.x1 = 0;

-                    box.y1 = 0;

-                    box.x2 = winRec->width;

-                    box.y2 = winRec->height;

-

-                    xprDamageRects(winRec->wid, 1, &box, 0, 0);

-                    RootlessQueueRedisplay(screenInfo.screens[screen]);

-                }

-            }

-        }

-    }

-}

-

-// XXX: identical to x_cvt_vptr_to_uint ?

-#define MAKE_WINDOW_ID(x)		((xp_window_id)((size_t)(x)))

-

-Bool no_configure_window;

-

-static inline int

-configure_window (xp_window_id id, unsigned int mask,

-                  const xp_window_changes *values)

-{

-  if (!no_configure_window)

-    return xp_configure_window (id, mask, values);

-  else

-    return XP_Success;

-}

-

-

-static

-void xprUpdateColormap(RootlessFrameID wid, ScreenPtr pScreen)

-{

-  /* This is how we tell xp that the colormap may have changed. */

-  xp_window_changes wc;

-  wc.colormap = xprColormapCallback;

-  wc.colormap_data = pScreen;

-

-  configure_window(MAKE_WINDOW_ID(wid), XP_COLORMAP, &wc);

-}

-

-static

-void xprHideWindow(RootlessFrameID wid)

-{

-  xp_window_changes wc;

-  wc.stack_mode = XP_UNMAPPED;

-  wc.sibling = 0;

-  configure_window(MAKE_WINDOW_ID(wid), XP_STACKING, &wc);

-}

+/*
+ * Xplugin rootless implementation frame functions
+ *
+ * Copyright (c) 2002-2011 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2003 Torrey T. Lyons. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "xpr.h"
+#include "rootlessCommon.h"
+#include <Xplugin.h>
+#include "x-hash.h"
+#include "applewmExt.h"
+
+#include "propertyst.h"
+#include "dix.h"
+#include <X11/Xatom.h>
+#include "windowstr.h"
+#include "quartz.h"
+
+#ifdef HAVE_LIBDISPATCH
+#include <dispatch/dispatch.h>
+#else
+#include <pthread.h>
+#endif
+
+#define DEFINE_ATOM_HELPER(func,atom_name)                      \
+static Atom func (void) {                                       \
+    static int generation;                                      \
+    static Atom atom;                                           \
+    if (generation != serverGeneration) {                       \
+        generation = serverGeneration;                          \
+        atom = MakeAtom (atom_name, strlen (atom_name), TRUE);  \
+    }                                                           \
+    return atom;                                                \
+}
+
+DEFINE_ATOM_HELPER(xa_native_window_id, "_NATIVE_WINDOW_ID")
+
+/* Maps xp_window_id -> RootlessWindowRec */
+static x_hash_table *window_hash;
+
+/* Need to guard window_hash since xprIsX11Window can be called from any thread. */
+#ifdef HAVE_LIBDISPATCH
+static dispatch_queue_t window_hash_serial_q;
+#else
+static pthread_rwlock_t window_hash_rwlock;
+#endif
+
+/* Prototypes for static functions */
+static Bool xprCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,
+               int newX, int newY, RegionPtr pShape);
+static void xprDestroyFrame(RootlessFrameID wid);
+static void xprMoveFrame(RootlessFrameID wid, ScreenPtr pScreen, int newX, int newY);
+static void xprResizeFrame(RootlessFrameID wid, ScreenPtr pScreen,
+               int newX, int newY, unsigned int newW, unsigned int newH,
+               unsigned int gravity);
+static void xprRestackFrame(RootlessFrameID wid, RootlessFrameID nextWid);
+static void xprReshapeFrame(RootlessFrameID wid, RegionPtr pShape);
+static void xprUnmapFrame(RootlessFrameID wid);
+static void xprStartDrawing(RootlessFrameID wid, char **pixelData, int *bytesPerRow);
+static void xprStopDrawing(RootlessFrameID wid, Bool flush);
+static void xprUpdateRegion(RootlessFrameID wid, RegionPtr pDamage);
+static void xprDamageRects(RootlessFrameID wid, int nrects, const BoxRec *rects,
+               int shift_x, int shift_y);
+static void xprSwitchWindow(RootlessWindowPtr pFrame, WindowPtr oldWin);
+static Bool xprDoReorderWindow(RootlessWindowPtr pFrame);
+static void xprHideWindow(RootlessFrameID wid);
+static void xprUpdateColormap(RootlessFrameID wid, ScreenPtr pScreen);
+static void xprCopyWindow(RootlessFrameID wid, int dstNrects, const BoxRec *dstRects,
+              int dx, int dy);
+
+
+static inline xp_error
+xprConfigureWindow(xp_window_id id, unsigned int mask,
+                   const xp_window_changes *values)
+{
+    return xp_configure_window(id, mask, values);
+}
+
+
+static void
+xprSetNativeProperty(RootlessWindowPtr pFrame)
+{
+    xp_error err;
+    unsigned int native_id;
+    long data;
+
+    err = xp_get_native_window(x_cvt_vptr_to_uint(pFrame->wid), &native_id);
+    if (err == Success)
+    {
+        /* FIXME: move this to AppleWM extension */
+
+        data = native_id;
+        dixChangeWindowProperty(serverClient, pFrame->win, xa_native_window_id(),
+				XA_INTEGER, 32, PropModeReplace, 1, &data, TRUE);
+    }
+}
+
+static xp_error
+xprColormapCallback(void *data, int first_color, int n_colors, uint32_t *colors)
+{
+    return (RootlessResolveColormap (data, first_color, n_colors, colors) ? XP_Success : XP_BadMatch);
+}
+
+/*
+ * Create and display a new frame.
+ */
+static Bool
+xprCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,
+               int newX, int newY, RegionPtr pShape)
+{
+    WindowPtr pWin = pFrame->win;
+    xp_window_changes wc;
+    unsigned int mask = 0;
+    xp_error err;
+
+    wc.x = newX;
+    wc.y = newY;
+    wc.width = pFrame->width;
+    wc.height = pFrame->height;
+    wc.bit_gravity = XP_GRAVITY_NONE;
+    mask |= XP_BOUNDS;
+
+    if (pWin->drawable.depth == 8)
+    {
+        wc.depth = XP_DEPTH_INDEX8;
+        wc.colormap = xprColormapCallback;
+        wc.colormap_data = pScreen;
+        mask |= XP_COLORMAP;
+    }
+    else if (pWin->drawable.depth == 15)
+        wc.depth = XP_DEPTH_RGB555;
+    else if (pWin->drawable.depth == 24)
+        wc.depth = XP_DEPTH_ARGB8888;
+    else
+        wc.depth = XP_DEPTH_NIL;
+    mask |= XP_DEPTH;
+
+    if (pShape != NULL)
+    {
+        wc.shape_nrects = RegionNumRects(pShape);
+        wc.shape_rects = RegionRects(pShape);
+        wc.shape_tx = wc.shape_ty = 0;
+        mask |= XP_SHAPE;
+    }
+
+    pFrame->level = !IsRoot (pWin) ? AppleWMWindowLevelNormal : AppleWMNumWindowLevels;
+
+    if(XQuartzIsRootless)
+        wc.window_level = normal_window_levels[pFrame->level];
+    else if(XQuartzShieldingWindowLevel)
+        wc.window_level = XQuartzShieldingWindowLevel + 1;
+    else
+        wc.window_level = rooted_window_levels[pFrame->level];
+    mask |= XP_WINDOW_LEVEL;
+
+    err = xp_create_window(mask, &wc, (xp_window_id *) &pFrame->wid);
+
+    if (err != Success)
+    {
+        return FALSE;
+    }
+
+#ifdef HAVE_LIBDISPATCH
+    dispatch_async(window_hash_serial_q, ^{
+        x_hash_table_insert(window_hash, pFrame->wid, pFrame);
+    });
+#else
+    pthread_rwlock_wrlock(&window_hash_rwlock);
+    x_hash_table_insert(window_hash, pFrame->wid, pFrame);
+    pthread_rwlock_wrlock(&window_hash_rwlock);
+#endif
+
+    xprSetNativeProperty(pFrame);
+
+    return TRUE;
+}
+
+
+/*
+ * Destroy a frame.
+ */
+static void
+xprDestroyFrame(RootlessFrameID wid)
+{
+    xp_error err;
+
+#ifdef HAVE_LIBDISPATCH
+    dispatch_async(window_hash_serial_q, ^{
+        x_hash_table_remove(window_hash, wid);
+    });
+#else
+    pthread_rwlock_wrlock(&window_hash_rwlock);
+    x_hash_table_remove(window_hash, wid);
+    pthread_rwlock_unlock(&window_hash_rwlock);
+#endif
+
+    err = xp_destroy_window(x_cvt_vptr_to_uint(wid));
+    if (err != Success)
+        FatalError("Could not destroy window %d (%d).", (int)x_cvt_vptr_to_uint(wid), (int)err);
+}
+
+
+/*
+ * Move a frame on screen.
+ */
+static void
+xprMoveFrame(RootlessFrameID wid, ScreenPtr pScreen, int newX, int newY)
+{
+    xp_window_changes wc;
+
+    wc.x = newX;
+    wc.y = newY;
+    //    ErrorF("xprMoveFrame(%d, %p, %d, %d)\n", wid, pScreen, newX, newY);
+    xprConfigureWindow(x_cvt_vptr_to_uint(wid), XP_ORIGIN, &wc);
+}
+
+
+/*
+ * Resize and move a frame.
+ */
+static void
+xprResizeFrame(RootlessFrameID wid, ScreenPtr pScreen,
+               int newX, int newY, unsigned int newW, unsigned int newH,
+               unsigned int gravity)
+{
+    xp_window_changes wc;
+
+    wc.x = newX;
+    wc.y = newY;
+    wc.width = newW;
+    wc.height = newH;
+    wc.bit_gravity = gravity;
+
+    /* It's unlikely that being async will save us anything here.
+       But it can't hurt. */
+
+    xprConfigureWindow(x_cvt_vptr_to_uint(wid), XP_BOUNDS, &wc);
+}
+
+
+/*
+ * Change frame stacking.
+ */
+static void xprRestackFrame(RootlessFrameID wid, RootlessFrameID nextWid) {
+    xp_window_changes wc;
+    unsigned int mask = XP_STACKING;
+#ifdef HAVE_LIBDISPATCH
+    __block
+#endif
+    RootlessWindowRec *winRec;
+
+    /* Stack frame below nextWid it if it exists, or raise
+       frame above everything otherwise. */
+
+    if(nextWid == NULL) {
+        wc.stack_mode = XP_MAPPED_ABOVE;
+        wc.sibling = 0;
+    } else {
+        wc.stack_mode = XP_MAPPED_BELOW;
+        wc.sibling = x_cvt_vptr_to_uint(nextWid);
+    }
+
+#ifdef HAVE_LIBDISPATCH
+    dispatch_sync(window_hash_serial_q, ^{
+        winRec = x_hash_table_lookup(window_hash, wid, NULL);
+    });
+#else
+    pthread_rwlock_rdlock(&window_hash_rwlock);
+    winRec = x_hash_table_lookup(window_hash, wid, NULL);
+    pthread_rwlock_unlock(&window_hash_rwlock);
+#endif
+    
+    if(winRec) {
+        if(XQuartzIsRootless)
+            wc.window_level = normal_window_levels[winRec->level];
+        else if(XQuartzShieldingWindowLevel)
+            wc.window_level = XQuartzShieldingWindowLevel + 1;
+        else
+            wc.window_level = rooted_window_levels[winRec->level];
+        mask |= XP_WINDOW_LEVEL;
+    }
+
+    xprConfigureWindow(x_cvt_vptr_to_uint(wid), mask, &wc);
+}
+
+
+/*
+ * Change the frame's shape.
+ */
+static void
+xprReshapeFrame(RootlessFrameID wid, RegionPtr pShape)
+{
+    xp_window_changes wc;
+
+    if (pShape != NULL)
+    {
+        wc.shape_nrects = RegionNumRects(pShape);
+        wc.shape_rects = RegionRects(pShape);
+    }
+    else
+    {
+        wc.shape_nrects = -1;
+        wc.shape_rects = NULL;
+    }
+
+    wc.shape_tx = wc.shape_ty = 0;
+
+    xprConfigureWindow(x_cvt_vptr_to_uint(wid), XP_SHAPE, &wc);
+}
+
+
+/*
+ * Unmap a frame.
+ */
+static void
+xprUnmapFrame(RootlessFrameID wid)
+{
+    xp_window_changes wc;
+
+    wc.stack_mode = XP_UNMAPPED;
+    wc.sibling = 0;
+
+    xprConfigureWindow(x_cvt_vptr_to_uint(wid), XP_STACKING, &wc);
+}
+
+
+/*
+ * Start drawing to a frame.
+ *  Prepare for direct access to its backing buffer.
+ */
+static void
+xprStartDrawing(RootlessFrameID wid, char **pixelData, int *bytesPerRow)
+{
+    void *data[2];
+    unsigned int rowbytes[2];
+    xp_error err;
+
+    err = xp_lock_window(x_cvt_vptr_to_uint(wid), NULL, NULL, data, rowbytes, NULL);
+    if (err != Success)
+        FatalError("Could not lock window %d for drawing (%d).", (int)x_cvt_vptr_to_uint(wid), (int)err);
+
+    *pixelData = data[0];
+    *bytesPerRow = rowbytes[0];
+}
+
+
+/*
+ * Stop drawing to a frame.
+ */
+static void
+xprStopDrawing(RootlessFrameID wid, Bool flush)
+{
+    xp_error err;
+
+    err = xp_unlock_window(x_cvt_vptr_to_uint(wid), flush);
+    /* This should be a FatalError, but we started tripping over it.  Make it a
+     * FatalError after http://xquartz.macosforge.org/trac/ticket/482 is fixed.
+     */
+    if(err != Success)
+        ErrorF("Could not unlock window %d after drawing (%d).", (int)x_cvt_vptr_to_uint(wid), (int)err);
+}
+
+
+/*
+ * Flush drawing updates to the screen.
+ */
+static void
+xprUpdateRegion(RootlessFrameID wid, RegionPtr pDamage)
+{
+    xp_flush_window(x_cvt_vptr_to_uint(wid));
+}
+
+
+/*
+ * Mark damaged rectangles as requiring redisplay to screen.
+ */
+static void
+xprDamageRects(RootlessFrameID wid, int nrects, const BoxRec *rects,
+               int shift_x, int shift_y)
+{
+    xp_mark_window(x_cvt_vptr_to_uint(wid), nrects, rects, shift_x, shift_y);
+}
+
+
+/*
+ * Called after the window associated with a frame has been switched
+ * to a new top-level parent.
+ */
+static void
+xprSwitchWindow(RootlessWindowPtr pFrame, WindowPtr oldWin)
+{
+    DeleteProperty(serverClient, oldWin, xa_native_window_id());
+
+    xprSetNativeProperty(pFrame);
+}
+
+
+/*
+ * Called to check if the frame should be reordered when it is restacked.
+ */
+static Bool xprDoReorderWindow(RootlessWindowPtr pFrame)
+{
+    WindowPtr pWin = pFrame->win;
+
+    return AppleWMDoReorderWindow(pWin);
+}
+
+
+/*
+ * Copy area in frame to another part of frame.
+ *  Used to accelerate scrolling.
+ */
+static void
+xprCopyWindow(RootlessFrameID wid, int dstNrects, const BoxRec *dstRects,
+              int dx, int dy)
+{
+    xp_copy_window(x_cvt_vptr_to_uint(wid), x_cvt_vptr_to_uint(wid),
+                   dstNrects, dstRects, dx, dy);
+}
+
+
+static RootlessFrameProcsRec xprRootlessProcs = {
+    xprCreateFrame,
+    xprDestroyFrame,
+    xprMoveFrame,
+    xprResizeFrame,
+    xprRestackFrame,
+    xprReshapeFrame,
+    xprUnmapFrame,
+    xprStartDrawing,
+    xprStopDrawing,
+    xprUpdateRegion,
+    xprDamageRects,
+    xprSwitchWindow,
+    xprDoReorderWindow,
+    xprHideWindow,
+    xprUpdateColormap,
+    xp_copy_bytes,
+    xprCopyWindow
+};
+
+
+/*
+ * Initialize XPR implementation
+ */
+Bool
+xprInit(ScreenPtr pScreen)
+{
+    RootlessInit(pScreen, &xprRootlessProcs);
+
+    rootless_CopyBytes_threshold = xp_copy_bytes_threshold;
+    rootless_CopyWindow_threshold = xp_scroll_area_threshold;
+
+    assert((window_hash = x_hash_table_new(NULL, NULL, NULL, NULL)));
+#ifdef HAVE_LIBDISPATCH
+    assert((window_hash_serial_q = dispatch_queue_create(BUNDLE_ID_PREFIX".X11.xpr_window_hash", NULL)));
+#else
+    assert(0 == pthread_rwlock_init(&window_hash_rwlock, NULL));
+#endif
+    
+    return TRUE;
+}
+
+
+/*
+ * Given the id of a physical window, try to find the top-level (or root)
+ * X window that it represents.
+ */
+WindowPtr
+xprGetXWindow(xp_window_id wid)
+{
+#ifdef HAVE_LIBDISPATCH
+    RootlessWindowRec *winRec __block;
+    dispatch_sync(window_hash_serial_q, ^{
+        winRec = x_hash_table_lookup(window_hash, x_cvt_uint_to_vptr(wid), NULL);
+    });
+#else
+    RootlessWindowRec *winRec;
+    pthread_rwlock_rdlock(&window_hash_rwlock);
+    winRec = x_hash_table_lookup(window_hash, x_cvt_uint_to_vptr(wid), NULL);
+    pthread_rwlock_unlock(&window_hash_rwlock);
+#endif
+
+    return winRec != NULL ? winRec->win : NULL;
+}
+
+/*
+ * The windowNumber is an AppKit window number. Returns TRUE if xpr is
+ * displaying a window with that number.
+ */
+Bool
+xprIsX11Window(int windowNumber)
+{
+    Bool ret;
+    xp_window_id wid;
+
+    if (xp_lookup_native_window(windowNumber, &wid))
+        ret = xprGetXWindow(wid) != NULL;
+    else
+        ret = FALSE;
+
+    return ret;
+}
+
+
+/*
+ * xprHideWindows
+ *  Hide or unhide all top level windows. This is called for application hide/
+ *  unhide events if the window manager is not Apple-WM aware. Xplugin windows
+ *  do not hide or unhide themselves.
+ */
+void
+xprHideWindows(Bool hide)
+{
+    int screen;
+    WindowPtr pRoot, pWin;
+
+    for (screen = 0; screen < screenInfo.numScreens; screen++) {
+        RootlessFrameID prevWid = NULL;
+        pRoot = screenInfo.screens[screen]->root;
+
+        for (pWin = pRoot->firstChild; pWin; pWin = pWin->nextSib) {
+            RootlessWindowRec *winRec = WINREC(pWin);
+
+            if (winRec != NULL) {
+                if (hide) {
+                    xprUnmapFrame(winRec->wid);
+                } else {
+                    BoxRec box;
+
+                    xprRestackFrame(winRec->wid, prevWid);
+                    prevWid = winRec->wid;
+
+                    box.x1 = 0;
+                    box.y1 = 0;
+                    box.x2 = winRec->width;
+                    box.y2 = winRec->height;
+
+                    xprDamageRects(winRec->wid, 1, &box, 0, 0);
+                    RootlessQueueRedisplay(screenInfo.screens[screen]);
+                }
+            }
+        }
+    }
+}
+
+// XXX: identical to x_cvt_vptr_to_uint ?
+#define MAKE_WINDOW_ID(x)		((xp_window_id)((size_t)(x)))
+
+Bool no_configure_window;
+
+static inline int
+configure_window (xp_window_id id, unsigned int mask,
+                  const xp_window_changes *values)
+{
+  if (!no_configure_window)
+    return xp_configure_window (id, mask, values);
+  else
+    return XP_Success;
+}
+
+
+static
+void xprUpdateColormap(RootlessFrameID wid, ScreenPtr pScreen)
+{
+  /* This is how we tell xp that the colormap may have changed. */
+  xp_window_changes wc;
+  wc.colormap = xprColormapCallback;
+  wc.colormap_data = pScreen;
+
+  configure_window(MAKE_WINDOW_ID(wid), XP_COLORMAP, &wc);
+}
+
+static
+void xprHideWindow(RootlessFrameID wid)
+{
+  xp_window_changes wc;
+  wc.stack_mode = XP_UNMAPPED;
+  wc.sibling = 0;
+  configure_window(MAKE_WINDOW_ID(wid), XP_STACKING, &wc);
+}
diff --git a/xorg-server/hw/xquartz/xpr/xprScreen.c b/xorg-server/hw/xquartz/xpr/xprScreen.c
index 4df3b2b20..002355eca 100644
--- a/xorg-server/hw/xquartz/xpr/xprScreen.c
+++ b/xorg-server/hw/xquartz/xpr/xprScreen.c
@@ -1,485 +1,485 @@
-/*

- * Xplugin rootless implementation screen functions

- *

- * Copyright (c) 2002 Apple Computer, Inc. All Rights Reserved.

- * Copyright (c) 2004 Torrey T. Lyons. All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright

- * holders shall not be used in advertising or otherwise to promote the sale,

- * use or other dealings in this Software without prior written authorization.

- */

-

-#include "sanitizedCarbon.h"

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include "quartzCommon.h"

-#include "inputstr.h"

-#include "quartz.h"

-#include "quartzRandR.h"

-#include "xpr.h"

-#include "xprEvent.h"

-#include "pseudoramiX.h"

-#include "darwinEvents.h"

-#include "rootless.h"

-#include "dri.h"

-#include "globals.h"

-#include <Xplugin.h>

-#include "applewmExt.h"

-#include "micmap.h"

-

-#include "rootlessCommon.h"

-

-#ifdef DAMAGE

-# include "damage.h"

-#endif

-

-/* 10.4's deferred update makes X slower.. have to live with the tearing

-   for now.. */

-#define XP_NO_DEFERRED_UPDATES 8

-

-// Name of GLX bundle for native OpenGL

-static const char *xprOpenGLBundle = "glxCGL.bundle";

-

-/*

- * eventHandler

- *  Callback handler for Xplugin events.

- */

-static void eventHandler(unsigned int type, const void *arg,

-                         unsigned int arg_size, void *data) {

-    

-    switch (type) {

-        case XP_EVENT_DISPLAY_CHANGED:

-            DEBUG_LOG("XP_EVENT_DISPLAY_CHANGED\n");

-            DarwinSendDDXEvent(kXquartzDisplayChanged, 0);

-            break;

-            

-        case XP_EVENT_WINDOW_STATE_CHANGED:

-            if (arg_size >= sizeof(xp_window_state_event)) {

-                const xp_window_state_event *ws_arg = arg;

-                

-                DEBUG_LOG("XP_EVENT_WINDOW_STATE_CHANGED: id=%d, state=%d\n", ws_arg->id, ws_arg->state);

-                DarwinSendDDXEvent(kXquartzWindowState, 2,

-                                          ws_arg->id, ws_arg->state);

-            } else {

-                DEBUG_LOG("XP_EVENT_WINDOW_STATE_CHANGED: ignored\n");

-            }

-            break;

-            

-        case XP_EVENT_WINDOW_MOVED:

-            DEBUG_LOG("XP_EVENT_WINDOW_MOVED\n");

-            if (arg_size == sizeof(xp_window_id))  {

-                xp_window_id id = * (xp_window_id *) arg;

-                DarwinSendDDXEvent(kXquartzWindowMoved, 1, id);

-            }

-            break;

-            

-        case XP_EVENT_SURFACE_DESTROYED:

-            DEBUG_LOG("XP_EVENT_SURFACE_DESTROYED\n");

-        case XP_EVENT_SURFACE_CHANGED:

-            DEBUG_LOG("XP_EVENT_SURFACE_CHANGED\n");

-            if (arg_size == sizeof(xp_surface_id)) {

-                int kind;

-                

-                if (type == XP_EVENT_SURFACE_DESTROYED)

-                    kind = AppleDRISurfaceNotifyDestroyed;

-                else

-                    kind = AppleDRISurfaceNotifyChanged;

-                

-                DRISurfaceNotify(*(xp_surface_id *) arg, kind);

-            }

-            break;

-#ifdef XP_EVENT_SPACE_CHANGED

-        case  XP_EVENT_SPACE_CHANGED:

-            DEBUG_LOG("XP_EVENT_SPACE_CHANGED\n");

-            if(arg_size == sizeof(uint32_t)) {

-                uint32_t space_id = *(uint32_t *)arg;

-                DarwinSendDDXEvent(kXquartzSpaceChanged, 1, space_id);

-            }

-            break;

-#endif

-        default:

-            ErrorF("Unknown XP_EVENT type (%d) in xprScreen:eventHandler\n", type);

-    }

-}

-

-/*

- * displayAtIndex

- *  Return the display ID for a particular display index.

- */

-static CGDirectDisplayID

-displayAtIndex(int index)

-{

-    CGError err;

-    CGDisplayCount cnt;

-    CGDirectDisplayID dpy[index+1];

-

-    err = CGGetActiveDisplayList(index + 1, dpy, &cnt);

-    if (err == kCGErrorSuccess && cnt == index + 1)

-        return dpy[index];

-    else

-        return kCGNullDirectDisplay;

-}

-

-/*

- * displayScreenBounds

- *  Return the bounds of a particular display.

- */

-static CGRect

-displayScreenBounds(CGDirectDisplayID id)

-{

-    CGRect frame;

-

-    frame = CGDisplayBounds(id);

-

-    DEBUG_LOG("    %dx%d @ (%d,%d).\n",

-              (int)frame.size.width, (int)frame.size.height,

-              (int)frame.origin.x, (int)frame.origin.y);

-    

-    /* Remove menubar to help standard X11 window managers. */

-    if (XQuartzIsRootless && 

-        frame.origin.x == 0 && frame.origin.y == 0) {

-        frame.origin.y += aquaMenuBarHeight;

-        frame.size.height -= aquaMenuBarHeight;

-    }

-

-    DEBUG_LOG("    %dx%d @ (%d,%d).\n",

-              (int)frame.size.width, (int)frame.size.height,

-              (int)frame.origin.x, (int)frame.origin.y);

-

-    return frame;

-}

-

-/*

- * xprAddPseudoramiXScreens

- *  Add a single virtual screen encompassing all the physical screens

- *  with PseudoramiX.

- */

-static void

-xprAddPseudoramiXScreens(int *x, int *y, int *width, int *height, ScreenPtr pScreen)

-{

-    CGDisplayCount i, displayCount;

-    CGDirectDisplayID *displayList = NULL;

-    CGRect unionRect = CGRectNull, frame;

-

-    // Find all the CoreGraphics displays

-    CGGetActiveDisplayList(0, NULL, &displayCount);

-    DEBUG_LOG("displayCount: %d\n", (int)displayCount);

-

-    if(!displayCount) {

-        ErrorF("CoreGraphics has reported no connected displays.  Creating a stub 800x600 display.\n");

-        *x = *y = 0;

-        *width = 800;

-        *height = 600;

-        PseudoramiXAddScreen(*x, *y, *width, *height);

-        QuartzCopyDisplayIDs(pScreen, 0, NULL);

-        return;

-    }

-

-    /* If the displays are captured, we are in a RandR game mode

-     * on the primary display, so we only want to include the first

-     * display.  The others are covered by the shield window.

-     */

-    if (CGDisplayIsCaptured(kCGDirectMainDisplay))

-        displayCount = 1;

-

-    displayList = malloc(displayCount * sizeof(CGDirectDisplayID));

-    if(!displayList)

-        FatalError("Unable to allocate memory for list of displays.\n");

-    CGGetActiveDisplayList(displayCount, displayList, &displayCount);

-    QuartzCopyDisplayIDs(pScreen, displayCount, displayList);

-

-    /* Get the union of all screens */

-    for (i = 0; i < displayCount; i++) {

-        CGDirectDisplayID dpy = displayList[i];

-        frame = displayScreenBounds(dpy);

-        unionRect = CGRectUnion(unionRect, frame);

-    }

-

-    /* Use unionRect as the screen size for the X server. */

-    *x = unionRect.origin.x;

-    *y = unionRect.origin.y;

-    *width = unionRect.size.width;

-    *height = unionRect.size.height;

-

-    DEBUG_LOG("  screen union origin: (%d,%d) size: (%d,%d).\n",

-              *x, *y, *width, *height);

-

-    /* Tell PseudoramiX about the real screens. */

-    for (i = 0; i < displayCount; i++)

-    {

-        CGDirectDisplayID dpy = displayList[i];

-

-        frame = displayScreenBounds(dpy);

-        frame.origin.x -= unionRect.origin.x;

-        frame.origin.y -= unionRect.origin.y;

-

-        DEBUG_LOG("    placed at X11 coordinate (%d,%d).\n",

-                  (int)frame.origin.x, (int)frame.origin.y);

-

-        PseudoramiXAddScreen(frame.origin.x, frame.origin.y,

-                             frame.size.width, frame.size.height);

-    }

-

-    free(displayList);

-}

-

-/*

- * xprDisplayInit

- *  Find number of CoreGraphics displays and initialize Xplugin.

- */

-static void

-xprDisplayInit(void)

-{

-    CGDisplayCount displayCount;

-

-    TRACE();

-

-    CGGetActiveDisplayList(0, NULL, &displayCount);

-

-    /* With PseudoramiX, the X server only sees one screen; only PseudoramiX

-       itself knows about all of the screens. */

-

-    if (noPseudoramiXExtension)

-        darwinScreensFound = displayCount;

-    else

-        darwinScreensFound =  1;

-

-    if (xp_init(XP_BACKGROUND_EVENTS | XP_NO_DEFERRED_UPDATES) != Success)

-        FatalError("Could not initialize the Xplugin library.");

-

-    xp_select_events(XP_EVENT_DISPLAY_CHANGED

-                     | XP_EVENT_WINDOW_STATE_CHANGED

-                     | XP_EVENT_WINDOW_MOVED

-#ifdef XP_EVENT_SPACE_CHANGED

-                     | XP_EVENT_SPACE_CHANGED

-#endif

-                     | XP_EVENT_SURFACE_CHANGED

-                     | XP_EVENT_SURFACE_DESTROYED,

-                     eventHandler, NULL);

-

-    AppleDRIExtensionInit();

-    xprAppleWMInit();

-

-    XQuartzIsRootless = XQuartzRootlessDefault;

-    if (!XQuartzIsRootless)

-        RootlessHideAllWindows();

-}

-

-/*

- * xprAddScreen

- *  Init the framebuffer and record pixmap parameters for the screen.

- */

-static Bool

-xprAddScreen(int index, ScreenPtr pScreen)

-{

-    DarwinFramebufferPtr dfb = SCREEN_PRIV(pScreen);

-    int depth = darwinDesiredDepth;

-

-    DEBUG_LOG("index=%d depth=%d\n", index, depth);

-    

-    if(depth == -1) {

-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060

-        depth = CGDisplaySamplesPerPixel(kCGDirectMainDisplay) * CGDisplayBitsPerSample(kCGDirectMainDisplay);

-#else

-        CGDisplayModeRef modeRef;

-        CFStringRef encStrRef;

-        

-        modeRef = CGDisplayCopyDisplayMode(kCGDirectMainDisplay);

-        if(!modeRef)

-            goto have_depth;

-

-        encStrRef = CGDisplayModeCopyPixelEncoding(modeRef);

-        CFRelease(modeRef);

-        if(!encStrRef)

-            goto have_depth;

-        

-        if(CFStringCompare(encStrRef, CFSTR(IO32BitDirectPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo) {

-            depth = 24;

-        } else if(CFStringCompare(encStrRef, CFSTR(IO16BitDirectPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo) {

-            depth = 15;

-        } else if(CFStringCompare(encStrRef, CFSTR(IO8BitIndexedPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo) {

-            depth = 8;

-        }

-

-        CFRelease(encStrRef);

-#endif

-    }

-    

-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060

-have_depth:

-#endif

-    switch(depth) {

-        case 8: // pseudo-working

-            dfb->visuals = PseudoColorMask;

-            dfb->preferredCVC = PseudoColor;

-            dfb->depth = 8;

-            dfb->bitsPerRGB = 8;

-            dfb->bitsPerPixel = 8;

-            dfb->redMask = 0;

-            dfb->greenMask = 0;

-            dfb->blueMask = 0;

-            break;

-        case 15:

-            dfb->visuals = TrueColorMask; //LARGE_VISUALS;

-            dfb->preferredCVC = TrueColor;

-            dfb->depth = 15;

-            dfb->bitsPerRGB = 5;

-            dfb->bitsPerPixel = 16;

-            dfb->redMask   = RM_ARGB(0,5,5,5);

-            dfb->greenMask = GM_ARGB(0,5,5,5);

-            dfb->blueMask  = BM_ARGB(0,5,5,5);

-            break;

-//        case 24:

-        default:

-            if(depth != 24)

-                ErrorF("Unsupported color depth requested.  Defaulting to 24bit. (depth=%d darwinDesiredDepth=%d)\n", depth, darwinDesiredDepth);

-            dfb->visuals = TrueColorMask; //LARGE_VISUALS;

-            dfb->preferredCVC = TrueColor;

-            dfb->depth = 24;

-            dfb->bitsPerRGB = 8;

-            dfb->bitsPerPixel = 32;

-            dfb->redMask   = RM_ARGB(0,8,8,8);

-            dfb->greenMask = GM_ARGB(0,8,8,8);

-            dfb->blueMask  = BM_ARGB(0,8,8,8);

-            break;

-    }

-

-    if (noPseudoramiXExtension)

-    {

-        CGDirectDisplayID dpy;

-        CGRect frame;

-

-        ErrorF("Warning: noPseudoramiXExtension!\n");

-        

-        dpy = displayAtIndex(index);

-        QuartzCopyDisplayIDs(pScreen, 1, &dpy);

-

-        frame = displayScreenBounds(dpy);

-

-        dfb->x = frame.origin.x;

-        dfb->y = frame.origin.y;

-        dfb->width =  frame.size.width;

-        dfb->height = frame.size.height;

-    }

-    else

-    {

-        xprAddPseudoramiXScreens(&dfb->x, &dfb->y, &dfb->width, &dfb->height, pScreen);

-    }

-

-    /* Passing zero width (pitch) makes miCreateScreenResources set the

-       screen pixmap to the framebuffer pointer, i.e. NULL. The generic

-       rootless code takes care of making this work. */

-    dfb->pitch = 0;

-    dfb->framebuffer = NULL;

-

-    DRIScreenInit(pScreen);

-

-    return TRUE;

-}

-

-/*

- * xprSetupScreen

- *  Setup the screen for rootless access.

- */

-static Bool

-xprSetupScreen(int index, ScreenPtr pScreen)

-{

-#ifdef DAMAGE

-    // The Damage extension needs to wrap underneath the

-    // generic rootless layer, so do it now.

-    if (!DamageSetup(pScreen))

-        return FALSE;

-#endif

-

-    // Initialize generic rootless code

-    if (!xprInit(pScreen))

-        return FALSE;

-

-    return DRIFinishScreenInit(pScreen);

-}

-

-/*

- * xprUpdateScreen

- *  Update screen after configuation change.

- */

-static void

-xprUpdateScreen(ScreenPtr pScreen)

-{

-    rootlessGlobalOffsetX = darwinMainScreenX;

-    rootlessGlobalOffsetY = darwinMainScreenY;

-

-    AppleWMSetScreenOrigin(pScreen->root);

-

-    RootlessRepositionWindows(pScreen);

-    RootlessUpdateScreenPixmap(pScreen);

-}

-

-/*

- * xprInitInput

- *  Finalize xpr specific setup.

- */

-static void

-xprInitInput(int argc, char **argv)

-{

-    int i;

-

-    rootlessGlobalOffsetX = darwinMainScreenX;

-    rootlessGlobalOffsetY = darwinMainScreenY;

-

-    for (i = 0; i < screenInfo.numScreens; i++)

-        AppleWMSetScreenOrigin(screenInfo.screens[i]->root);

-}

-

-/*

- * Quartz display mode function list.

- */

-static QuartzModeProcsRec xprModeProcs = {

-    xprDisplayInit,

-    xprAddScreen,

-    xprSetupScreen,

-    xprInitInput,

-    QuartzInitCursor,

-    QuartzSuspendXCursor,

-    QuartzResumeXCursor,

-    xprAddPseudoramiXScreens,

-    xprUpdateScreen,

-    xprIsX11Window,

-    xprHideWindows,

-    RootlessFrameForWindow,

-    TopLevelParent,

-    DRICreateSurface,

-    DRIDestroySurface

-};

-

-/*

- * QuartzModeBundleInit

- *  Initialize the display mode bundle after loading.

- */

-Bool

-QuartzModeBundleInit(void)

-{

-    quartzProcs = &xprModeProcs;

-    quartzOpenGLBundle = xprOpenGLBundle;

-    return TRUE;

-}

+/*
+ * Xplugin rootless implementation screen functions
+ *
+ * Copyright (c) 2002 Apple Computer, Inc. All Rights Reserved.
+ * Copyright (c) 2004 Torrey T. Lyons. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+
+#include "sanitizedCarbon.h"
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "quartzCommon.h"
+#include "inputstr.h"
+#include "quartz.h"
+#include "quartzRandR.h"
+#include "xpr.h"
+#include "xprEvent.h"
+#include "pseudoramiX.h"
+#include "darwinEvents.h"
+#include "rootless.h"
+#include "dri.h"
+#include "globals.h"
+#include <Xplugin.h>
+#include "applewmExt.h"
+#include "micmap.h"
+
+#include "rootlessCommon.h"
+
+#ifdef DAMAGE
+# include "damage.h"
+#endif
+
+/* 10.4's deferred update makes X slower.. have to live with the tearing
+   for now.. */
+#define XP_NO_DEFERRED_UPDATES 8
+
+// Name of GLX bundle for native OpenGL
+static const char *xprOpenGLBundle = "glxCGL.bundle";
+
+/*
+ * eventHandler
+ *  Callback handler for Xplugin events.
+ */
+static void eventHandler(unsigned int type, const void *arg,
+                         unsigned int arg_size, void *data) {
+    
+    switch (type) {
+        case XP_EVENT_DISPLAY_CHANGED:
+            DEBUG_LOG("XP_EVENT_DISPLAY_CHANGED\n");
+            DarwinSendDDXEvent(kXquartzDisplayChanged, 0);
+            break;
+            
+        case XP_EVENT_WINDOW_STATE_CHANGED:
+            if (arg_size >= sizeof(xp_window_state_event)) {
+                const xp_window_state_event *ws_arg = arg;
+                
+                DEBUG_LOG("XP_EVENT_WINDOW_STATE_CHANGED: id=%d, state=%d\n", ws_arg->id, ws_arg->state);
+                DarwinSendDDXEvent(kXquartzWindowState, 2,
+                                          ws_arg->id, ws_arg->state);
+            } else {
+                DEBUG_LOG("XP_EVENT_WINDOW_STATE_CHANGED: ignored\n");
+            }
+            break;
+            
+        case XP_EVENT_WINDOW_MOVED:
+            DEBUG_LOG("XP_EVENT_WINDOW_MOVED\n");
+            if (arg_size == sizeof(xp_window_id))  {
+                xp_window_id id = * (xp_window_id *) arg;
+                DarwinSendDDXEvent(kXquartzWindowMoved, 1, id);
+            }
+            break;
+            
+        case XP_EVENT_SURFACE_DESTROYED:
+            DEBUG_LOG("XP_EVENT_SURFACE_DESTROYED\n");
+        case XP_EVENT_SURFACE_CHANGED:
+            DEBUG_LOG("XP_EVENT_SURFACE_CHANGED\n");
+            if (arg_size == sizeof(xp_surface_id)) {
+                int kind;
+                
+                if (type == XP_EVENT_SURFACE_DESTROYED)
+                    kind = AppleDRISurfaceNotifyDestroyed;
+                else
+                    kind = AppleDRISurfaceNotifyChanged;
+                
+                DRISurfaceNotify(*(xp_surface_id *) arg, kind);
+            }
+            break;
+#ifdef XP_EVENT_SPACE_CHANGED
+        case  XP_EVENT_SPACE_CHANGED:
+            DEBUG_LOG("XP_EVENT_SPACE_CHANGED\n");
+            if(arg_size == sizeof(uint32_t)) {
+                uint32_t space_id = *(uint32_t *)arg;
+                DarwinSendDDXEvent(kXquartzSpaceChanged, 1, space_id);
+            }
+            break;
+#endif
+        default:
+            ErrorF("Unknown XP_EVENT type (%d) in xprScreen:eventHandler\n", type);
+    }
+}
+
+/*
+ * displayAtIndex
+ *  Return the display ID for a particular display index.
+ */
+static CGDirectDisplayID
+displayAtIndex(int index)
+{
+    CGError err;
+    CGDisplayCount cnt;
+    CGDirectDisplayID dpy[index+1];
+
+    err = CGGetActiveDisplayList(index + 1, dpy, &cnt);
+    if (err == kCGErrorSuccess && cnt == index + 1)
+        return dpy[index];
+    else
+        return kCGNullDirectDisplay;
+}
+
+/*
+ * displayScreenBounds
+ *  Return the bounds of a particular display.
+ */
+static CGRect
+displayScreenBounds(CGDirectDisplayID id)
+{
+    CGRect frame;
+
+    frame = CGDisplayBounds(id);
+
+    DEBUG_LOG("    %dx%d @ (%d,%d).\n",
+              (int)frame.size.width, (int)frame.size.height,
+              (int)frame.origin.x, (int)frame.origin.y);
+    
+    /* Remove menubar to help standard X11 window managers. */
+    if (XQuartzIsRootless && 
+        frame.origin.x == 0 && frame.origin.y == 0) {
+        frame.origin.y += aquaMenuBarHeight;
+        frame.size.height -= aquaMenuBarHeight;
+    }
+
+    DEBUG_LOG("    %dx%d @ (%d,%d).\n",
+              (int)frame.size.width, (int)frame.size.height,
+              (int)frame.origin.x, (int)frame.origin.y);
+
+    return frame;
+}
+
+/*
+ * xprAddPseudoramiXScreens
+ *  Add a single virtual screen encompassing all the physical screens
+ *  with PseudoramiX.
+ */
+static void
+xprAddPseudoramiXScreens(int *x, int *y, int *width, int *height, ScreenPtr pScreen)
+{
+    CGDisplayCount i, displayCount;
+    CGDirectDisplayID *displayList = NULL;
+    CGRect unionRect = CGRectNull, frame;
+
+    // Find all the CoreGraphics displays
+    CGGetActiveDisplayList(0, NULL, &displayCount);
+    DEBUG_LOG("displayCount: %d\n", (int)displayCount);
+
+    if(!displayCount) {
+        ErrorF("CoreGraphics has reported no connected displays.  Creating a stub 800x600 display.\n");
+        *x = *y = 0;
+        *width = 800;
+        *height = 600;
+        PseudoramiXAddScreen(*x, *y, *width, *height);
+        QuartzCopyDisplayIDs(pScreen, 0, NULL);
+        return;
+    }
+
+    /* If the displays are captured, we are in a RandR game mode
+     * on the primary display, so we only want to include the first
+     * display.  The others are covered by the shield window.
+     */
+    if (CGDisplayIsCaptured(kCGDirectMainDisplay))
+        displayCount = 1;
+
+    displayList = malloc(displayCount * sizeof(CGDirectDisplayID));
+    if(!displayList)
+        FatalError("Unable to allocate memory for list of displays.\n");
+    CGGetActiveDisplayList(displayCount, displayList, &displayCount);
+    QuartzCopyDisplayIDs(pScreen, displayCount, displayList);
+
+    /* Get the union of all screens */
+    for (i = 0; i < displayCount; i++) {
+        CGDirectDisplayID dpy = displayList[i];
+        frame = displayScreenBounds(dpy);
+        unionRect = CGRectUnion(unionRect, frame);
+    }
+
+    /* Use unionRect as the screen size for the X server. */
+    *x = unionRect.origin.x;
+    *y = unionRect.origin.y;
+    *width = unionRect.size.width;
+    *height = unionRect.size.height;
+
+    DEBUG_LOG("  screen union origin: (%d,%d) size: (%d,%d).\n",
+              *x, *y, *width, *height);
+
+    /* Tell PseudoramiX about the real screens. */
+    for (i = 0; i < displayCount; i++)
+    {
+        CGDirectDisplayID dpy = displayList[i];
+
+        frame = displayScreenBounds(dpy);
+        frame.origin.x -= unionRect.origin.x;
+        frame.origin.y -= unionRect.origin.y;
+
+        DEBUG_LOG("    placed at X11 coordinate (%d,%d).\n",
+                  (int)frame.origin.x, (int)frame.origin.y);
+
+        PseudoramiXAddScreen(frame.origin.x, frame.origin.y,
+                             frame.size.width, frame.size.height);
+    }
+
+    free(displayList);
+}
+
+/*
+ * xprDisplayInit
+ *  Find number of CoreGraphics displays and initialize Xplugin.
+ */
+static void
+xprDisplayInit(void)
+{
+    CGDisplayCount displayCount;
+
+    TRACE();
+
+    CGGetActiveDisplayList(0, NULL, &displayCount);
+
+    /* With PseudoramiX, the X server only sees one screen; only PseudoramiX
+       itself knows about all of the screens. */
+
+    if (noPseudoramiXExtension)
+        darwinScreensFound = displayCount;
+    else
+        darwinScreensFound =  1;
+
+    if (xp_init(XP_BACKGROUND_EVENTS | XP_NO_DEFERRED_UPDATES) != Success)
+        FatalError("Could not initialize the Xplugin library.");
+
+    xp_select_events(XP_EVENT_DISPLAY_CHANGED
+                     | XP_EVENT_WINDOW_STATE_CHANGED
+                     | XP_EVENT_WINDOW_MOVED
+#ifdef XP_EVENT_SPACE_CHANGED
+                     | XP_EVENT_SPACE_CHANGED
+#endif
+                     | XP_EVENT_SURFACE_CHANGED
+                     | XP_EVENT_SURFACE_DESTROYED,
+                     eventHandler, NULL);
+
+    AppleDRIExtensionInit();
+    xprAppleWMInit();
+
+    XQuartzIsRootless = XQuartzRootlessDefault;
+    if (!XQuartzIsRootless)
+        RootlessHideAllWindows();
+}
+
+/*
+ * xprAddScreen
+ *  Init the framebuffer and record pixmap parameters for the screen.
+ */
+static Bool
+xprAddScreen(int index, ScreenPtr pScreen)
+{
+    DarwinFramebufferPtr dfb = SCREEN_PRIV(pScreen);
+    int depth = darwinDesiredDepth;
+
+    DEBUG_LOG("index=%d depth=%d\n", index, depth);
+    
+    if(depth == -1) {
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
+        depth = CGDisplaySamplesPerPixel(kCGDirectMainDisplay) * CGDisplayBitsPerSample(kCGDirectMainDisplay);
+#else
+        CGDisplayModeRef modeRef;
+        CFStringRef encStrRef;
+        
+        modeRef = CGDisplayCopyDisplayMode(kCGDirectMainDisplay);
+        if(!modeRef)
+            goto have_depth;
+
+        encStrRef = CGDisplayModeCopyPixelEncoding(modeRef);
+        CFRelease(modeRef);
+        if(!encStrRef)
+            goto have_depth;
+        
+        if(CFStringCompare(encStrRef, CFSTR(IO32BitDirectPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo) {
+            depth = 24;
+        } else if(CFStringCompare(encStrRef, CFSTR(IO16BitDirectPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo) {
+            depth = 15;
+        } else if(CFStringCompare(encStrRef, CFSTR(IO8BitIndexedPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo) {
+            depth = 8;
+        }
+
+        CFRelease(encStrRef);
+#endif
+    }
+    
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
+have_depth:
+#endif
+    switch(depth) {
+        case 8: // pseudo-working
+            dfb->visuals = PseudoColorMask;
+            dfb->preferredCVC = PseudoColor;
+            dfb->depth = 8;
+            dfb->bitsPerRGB = 8;
+            dfb->bitsPerPixel = 8;
+            dfb->redMask = 0;
+            dfb->greenMask = 0;
+            dfb->blueMask = 0;
+            break;
+        case 15:
+            dfb->visuals = TrueColorMask; //LARGE_VISUALS;
+            dfb->preferredCVC = TrueColor;
+            dfb->depth = 15;
+            dfb->bitsPerRGB = 5;
+            dfb->bitsPerPixel = 16;
+            dfb->redMask   = RM_ARGB(0,5,5,5);
+            dfb->greenMask = GM_ARGB(0,5,5,5);
+            dfb->blueMask  = BM_ARGB(0,5,5,5);
+            break;
+//        case 24:
+        default:
+            if(depth != 24)
+                ErrorF("Unsupported color depth requested.  Defaulting to 24bit. (depth=%d darwinDesiredDepth=%d)\n", depth, darwinDesiredDepth);
+            dfb->visuals = TrueColorMask; //LARGE_VISUALS;
+            dfb->preferredCVC = TrueColor;
+            dfb->depth = 24;
+            dfb->bitsPerRGB = 8;
+            dfb->bitsPerPixel = 32;
+            dfb->redMask   = RM_ARGB(0,8,8,8);
+            dfb->greenMask = GM_ARGB(0,8,8,8);
+            dfb->blueMask  = BM_ARGB(0,8,8,8);
+            break;
+    }
+
+    if (noPseudoramiXExtension)
+    {
+        CGDirectDisplayID dpy;
+        CGRect frame;
+
+        ErrorF("Warning: noPseudoramiXExtension!\n");
+        
+        dpy = displayAtIndex(index);
+        QuartzCopyDisplayIDs(pScreen, 1, &dpy);
+
+        frame = displayScreenBounds(dpy);
+
+        dfb->x = frame.origin.x;
+        dfb->y = frame.origin.y;
+        dfb->width =  frame.size.width;
+        dfb->height = frame.size.height;
+    }
+    else
+    {
+        xprAddPseudoramiXScreens(&dfb->x, &dfb->y, &dfb->width, &dfb->height, pScreen);
+    }
+
+    /* Passing zero width (pitch) makes miCreateScreenResources set the
+       screen pixmap to the framebuffer pointer, i.e. NULL. The generic
+       rootless code takes care of making this work. */
+    dfb->pitch = 0;
+    dfb->framebuffer = NULL;
+
+    DRIScreenInit(pScreen);
+
+    return TRUE;
+}
+
+/*
+ * xprSetupScreen
+ *  Setup the screen for rootless access.
+ */
+static Bool
+xprSetupScreen(int index, ScreenPtr pScreen)
+{
+#ifdef DAMAGE
+    // The Damage extension needs to wrap underneath the
+    // generic rootless layer, so do it now.
+    if (!DamageSetup(pScreen))
+        return FALSE;
+#endif
+
+    // Initialize generic rootless code
+    if (!xprInit(pScreen))
+        return FALSE;
+
+    return DRIFinishScreenInit(pScreen);
+}
+
+/*
+ * xprUpdateScreen
+ *  Update screen after configuation change.
+ */
+static void
+xprUpdateScreen(ScreenPtr pScreen)
+{
+    rootlessGlobalOffsetX = darwinMainScreenX;
+    rootlessGlobalOffsetY = darwinMainScreenY;
+
+    AppleWMSetScreenOrigin(pScreen->root);
+
+    RootlessRepositionWindows(pScreen);
+    RootlessUpdateScreenPixmap(pScreen);
+}
+
+/*
+ * xprInitInput
+ *  Finalize xpr specific setup.
+ */
+static void
+xprInitInput(int argc, char **argv)
+{
+    int i;
+
+    rootlessGlobalOffsetX = darwinMainScreenX;
+    rootlessGlobalOffsetY = darwinMainScreenY;
+
+    for (i = 0; i < screenInfo.numScreens; i++)
+        AppleWMSetScreenOrigin(screenInfo.screens[i]->root);
+}
+
+/*
+ * Quartz display mode function list.
+ */
+static QuartzModeProcsRec xprModeProcs = {
+    xprDisplayInit,
+    xprAddScreen,
+    xprSetupScreen,
+    xprInitInput,
+    QuartzInitCursor,
+    QuartzSuspendXCursor,
+    QuartzResumeXCursor,
+    xprAddPseudoramiXScreens,
+    xprUpdateScreen,
+    xprIsX11Window,
+    xprHideWindows,
+    RootlessFrameForWindow,
+    TopLevelParent,
+    DRICreateSurface,
+    DRIDestroySurface
+};
+
+/*
+ * QuartzModeBundleInit
+ *  Initialize the display mode bundle after loading.
+ */
+Bool
+QuartzModeBundleInit(void)
+{
+    quartzProcs = &xprModeProcs;
+    quartzOpenGLBundle = xprOpenGLBundle;
+    return TRUE;
+}