xserver libX11 xkeyboard-config git update 30/9/2010

5 files changed, 193 insertions, 192 deletions

diff --git a/xorg-server/hw/xquartz/xpr/appledri.c b/xorg-server/hw/xquartz/xpr/appledri.c
index 1fceb525c..d42661c22 100644
--- a/xorg-server/hw/xquartz/xpr/appledri.c
+++ b/xorg-server/hw/xquartz/xpr/appledri.c
@@ -59,8 +59,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 

 static int DRIErrorBase = 0;

 

-static DISPATCH_PROC(ProcAppleDRIDispatch);

-static DISPATCH_PROC(SProcAppleDRIDispatch);

 

 static void AppleDRIResetProc(ExtensionEntry* extEntry);

 static int ProcAppleDRICreatePixmap(ClientPtr client);

@@ -78,27 +76,6 @@ typedef struct _DRIEvent {
     unsigned int    mask;

 } DRIEventRec;

 

-

-void

-AppleDRIExtensionInit(void)

-{

-    ExtensionEntry* extEntry;

-

-    if (DRIExtensionInit() &&

-        (extEntry = AddExtension(APPLEDRINAME,

-                                 AppleDRINumberEvents,

-                                 AppleDRINumberErrors,

-                                 ProcAppleDRIDispatch,

-                                 SProcAppleDRIDispatch,

-                                 AppleDRIResetProc,

-                                 StandardMinorOpcode))) {

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

-        DRIErrorBase = extEntry->errorBase;

-        DRIEventBase = extEntry->eventBase;

-        EventSwapVector[DRIEventBase] = (EventSwapPtr) SNotifyEvent;

-    }

-}

-

 /*ARGSUSED*/

 static void

 AppleDRIResetProc (

@@ -421,3 +398,23 @@ SProcAppleDRIDispatch (
         return BadRequest;

     }

 }

+

+void

+AppleDRIExtensionInit(void)

+{

+    ExtensionEntry* extEntry;

+

+    if (DRIExtensionInit() &&

+        (extEntry = AddExtension(APPLEDRINAME,

+                                 AppleDRINumberEvents,

+                                 AppleDRINumberErrors,

+                                 ProcAppleDRIDispatch,

+                                 SProcAppleDRIDispatch,

+                                 AppleDRIResetProc,

+                                 StandardMinorOpcode))) {

+        DRIReqCode = (unsigned char)extEntry->base;

+        DRIErrorBase = extEntry->errorBase;

+        DRIEventBase = extEntry->eventBase;

+        EventSwapVector[DRIEventBase] = (EventSwapPtr) SNotifyEvent;

+    }

+}

diff --git a/xorg-server/hw/xquartz/xpr/xprAppleWM.c b/xorg-server/hw/xquartz/xpr/xprAppleWM.c
index 4b31e3a11..59ce6375e 100644
--- a/xorg-server/hw/xquartz/xpr/xprAppleWM.c
+++ b/xorg-server/hw/xquartz/xpr/xprAppleWM.c
@@ -1,160 +1,160 @@
-/*
- * 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(quartzEnableRootless)
-        wc.window_level = normal_window_levels[level];
-    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,
-    int class,
-    unsigned int 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

+        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,

+    int class,

+    unsigned int 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/xprCursor.c b/xorg-server/hw/xquartz/xpr/xprCursor.c
index 07dd5c8fb..4a789cef4 100644
--- a/xorg-server/hw/xquartz/xpr/xprCursor.c
+++ b/xorg-server/hw/xquartz/xpr/xprCursor.c
@@ -35,7 +35,7 @@
 #include <dix-config.h>

 #endif

 

-#include "quartzCommon.h"

+#include "quartz.h"

 #include "xpr.h"

 #include "darwin.h"

 #include "darwinEvents.h"

@@ -226,7 +226,7 @@ QuartzSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, int x,
 {

     QuartzCursorScreenPtr ScreenPriv = CURSOR_PRIV(pScreen);

 

-    if (!quartzServerVisible)

+    if (!XQuartzServerVisible)

         return;

 

     if (pCursor == NULL)

@@ -295,7 +295,7 @@ QuartzCrossScreen(ScreenPtr pScreen, Bool entering)
 static void

 QuartzWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)

 {

-    if (quartzServerVisible)

+    if (XQuartzServerVisible)

     {

         int sx, sy;

 

diff --git a/xorg-server/hw/xquartz/xpr/xprFrame.c b/xorg-server/hw/xquartz/xpr/xprFrame.c
index 121f1de3d..fecae5a1b 100644
--- a/xorg-server/hw/xquartz/xpr/xprFrame.c
+++ b/xorg-server/hw/xquartz/xpr/xprFrame.c
@@ -171,7 +171,7 @@ xprCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,
 

     pFrame->level = !IsRoot (pWin) ? AppleWMWindowLevelNormal : AppleWMNumWindowLevels;

 

-    if(quartzEnableRootless)

+    if(XQuartzIsRootless)

         wc.window_level = normal_window_levels[pFrame->level];

     else

         wc.window_level = rooted_window_levels[pFrame->level];

@@ -285,7 +285,7 @@ static void xprRestackFrame(RootlessFrameID wid, RootlessFrameID nextWid) {
         RootlessWindowRec *winRec = x_hash_table_lookup(window_hash, wid, NULL);

 

         if(winRec) {

-            if(quartzEnableRootless)

+            if(XQuartzIsRootless)

                 wc.window_level = normal_window_levels[winRec->level];

             else

                 wc.window_level = rooted_window_levels[winRec->level];

diff --git a/xorg-server/hw/xquartz/xpr/xprScreen.c b/xorg-server/hw/xquartz/xpr/xprScreen.c
index 260bfee89..bd877d97c 100644
--- a/xorg-server/hw/xquartz/xpr/xprScreen.c
+++ b/xorg-server/hw/xquartz/xpr/xprScreen.c
@@ -36,6 +36,7 @@
 #include "quartzCommon.h"

 #include "inputstr.h"

 #include "quartz.h"

+#include "quartzRandR.h"

 #include "xpr.h"

 #include "xprEvent.h"

 #include "pseudoramiX.h"

@@ -157,7 +158,7 @@ displayScreenBounds(CGDirectDisplayID id)
               (int)frame.origin.x, (int)frame.origin.y);

     

     /* Remove menubar to help standard X11 window managers. */

-    if (quartzEnableRootless && 

+    if (XQuartzIsRootless && 

         frame.origin.x == 0 && frame.origin.y == 0) {

         frame.origin.y += aquaMenuBarHeight;

         frame.size.height -= aquaMenuBarHeight;

@@ -176,7 +177,7 @@ displayScreenBounds(CGDirectDisplayID id)
  *  with PseudoramiX.

  */

 static void

-xprAddPseudoramiXScreens(int *x, int *y, int *width, int *height)

+xprAddPseudoramiXScreens(int *x, int *y, int *width, int *height, ScreenPtr pScreen)

 {

     CGDisplayCount i, displayCount;

     CGDirectDisplayID *displayList = NULL;

@@ -199,6 +200,7 @@ xprAddPseudoramiXScreens(int *x, int *y, int *width, int *height)
     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++) {

@@ -272,7 +274,8 @@ xprDisplayInit(void)
     AppleDRIExtensionInit();

     xprAppleWMInit();

 

-    if (!quartzEnableRootless)

+    XQuartzIsRootless = XQuartzRootlessDefault;

+    if (!XQuartzIsRootless)

         RootlessHideAllWindows();

 }

 

@@ -336,6 +339,7 @@ xprAddScreen(int index, ScreenPtr pScreen)
         ErrorF("Warning: noPseudoramiXExtension!\n");

         

         dpy = displayAtIndex(index);

+        QuartzCopyDisplayIDs(pScreen, 1, &dpy);

 

         frame = displayScreenBounds(dpy);

 

@@ -346,7 +350,7 @@ xprAddScreen(int index, ScreenPtr pScreen)
     }

     else

     {

-        xprAddPseudoramiXScreens(&dfb->x, &dfb->y, &dfb->width, &dfb->height);

+        xprAddPseudoramiXScreens(&dfb->x, &dfb->y, &dfb->width, &dfb->height, pScreen);

     }

 

     /* Passing zero width (pitch) makes miCreateScreenResources set the