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

1 files changed, 8 insertions, 4 deletions

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