[Xorg-commit] xc/programs/xdm chooser.c,1.1.4.4,1.1.4.5

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/programs/xdm
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/programs/xdm

Modified Files:
      Tag: XORG-CURRENT
	chooser.c 
Log Message:
/home/kaleb/xin.commsg

Index: chooser.c
===================================================================
RCS file: /cvs/xorg/xc/programs/xdm/chooser.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- chooser.c	6 Dec 2003 18:51:45 -0000	1.1.4.4
+++ chooser.c	18 Dec 2003 23:09:32 -0000	1.1.4.5
@@ -1066,8 +1066,8 @@
     Dimension   width, height;
     Position	x, y;
 #ifdef USE_XINERAMA
-    XineramaScreenInfo *screens;
-    int                 s_num;
+    XRectangle *screens;
+    int		s_num;
 #endif
 
 
@@ -1099,12 +1099,11 @@
     XtGetValues (toplevel, position, (Cardinal) 2);
 #ifdef USE_XINERAMA
     if (
-	XineramaIsActive(XtDisplay(toplevel)) &&
-	(screens = XineramaQueryScreens(XtDisplay(toplevel), &s_num)) != NULL
-       )
+	XineramaActive(XtDisplay(toplevel),  XtWindow(toplevel)) &&
+	    XineramaGetData(XtDisplay(toplevel), XtWindow(toplevel), &screens, &s_num))
     {
-	x = (Position)(screens[0].x_org + (screens[0].width - width) / 2);
-	y = (Position)(screens[0].y_org + (screens[0].height - height) / 3);
+	x = (Position)(screens[0].x + (screens[0].width - width) / 2);
+	y = (Position)(screens[0].y + (screens[0].height - height) / 3);
 	
 	XFree(screens);
     }