xserver: Branch 'xorg-server-1.4-apple'

[Jeremy Huddleston]

 hw/xquartz/pbproxy/x-selection.m |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 21a2d0b8d03faf1c66ec0c5c11fbd2ab24547727
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Mon Sep 15 09:33:55 2008 -0700

    XQuartz: pbproxy: Added global variables to customize how pbproxy behaves

diff --git a/hw/xquartz/pbproxy/x-selection.m b/hw/xquartz/pbproxy/x-selection.m
index e390dc0..514f3ce 100644
--- a/hw/xquartz/pbproxy/x-selection.m
+++ b/hw/xquartz/pbproxy/x-selection.m
@@ -36,6 +36,13 @@
 
 #include <unistd.h> /*GPS may not be needed now */
 
+// These will be set by X11Controller.m once this is integrated into a server thread
+BOOL pbproxy_active = YES;
+BOOL pbproxy_primary_on_grab = NO; // 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 pbproxy_clipboard_to_pasteboard = YES;
+BOOL pbproxy_pasteboard_to_primary = YES;
+BOOL pbproxy_pasteboard_to_clipboard = YES;
+
 @implementation x_selection
 
 static struct propdata null_propdata = {NULL, 0};