[Xorg-commit] xc/programs/xdm/greeter Login.c,1.1.4.2,1.1.4.3 greet.c,1.1.4.2,1.1.4.3

[Kaleb Keithley]

Committed by: kaleb

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

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

Index: Login.c
===================================================================
RCS file: /cvs/xorg/xc/programs/xdm/greeter/Login.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- Login.c	26 Nov 2003 22:49:11 -0000	1.1.4.2
+++ Login.c	18 Dec 2003 23:09:32 -0000	1.1.4.3
@@ -1025,8 +1025,8 @@
     Arg		position[2];
     Position	x, y;
 #ifdef USE_XINERAMA
-    XineramaScreenInfo *screens;
-    int                 s_num;
+    XRectangle *screens;
+    int		s_num;
 #endif
 
 #ifdef XPM
@@ -1167,14 +1167,13 @@
     }
 #ifdef USE_XINERAMA
     if (
-	XineramaIsActive(XtDisplay(w)) &&
-	(screens = XineramaQueryScreens(XtDisplay(w), &s_num)) != NULL
-       )
+	XineramaActive(XtDisplay(w), XtWindow(w)) &&
+	    XineramaGetData(XtDisplay(w), XtWindow(w), &screens, &s_num))
     {
 	if ((x = w->core.x) == -1)
-	    x = screens[0].x_org + (int)(screens[0].width - w->core.width) / 2;
+	    x = screens[0].x + (int)(screens[0].width - w->core.width) / 2;
 	if ((y = w->core.y) == -1)
-	    y = screens[0].y_org + (int)(screens[0].height - w->core.height) / 3;
+	    y = screens[0].y + (int)(screens[0].height - w->core.height) / 3;
 	
 	XFree(screens);
     }

Index: greet.c
===================================================================
RCS file: /cvs/xorg/xc/programs/xdm/greeter/greet.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- greet.c	26 Nov 2003 22:49:11 -0000	1.1.4.2
+++ greet.c	18 Dec 2003 23:09:32 -0000	1.1.4.3
@@ -181,8 +181,8 @@
     static char	*argv[] = { "xlogin", 0 };
     Display		*dpy;
 #ifdef USE_XINERAMA
-    XineramaScreenInfo *screens;
-    int                 s_num;
+    XRectangle *screens;
+    int		s_num;
 #endif
 
     Debug ("greet %s\n", d->name);
@@ -230,14 +230,13 @@
 
 #ifdef USE_XINERAMA
     if (
-	XineramaIsActive(dpy) &&
-	(screens = XineramaQueryScreens(dpy, &s_num)) != NULL
-       )
+	XineramaActive(dpy, XtWindow(login)) &&
+	    XineramaGetData(dpy, XtWindow(login), &screens, &s_num))
     {
 	XWarpPointer(dpy, None, XRootWindowOfScreen (scrn),
 			0, 0, 0, 0,
-			screens[0].x_org + screens[0].width / 2,
-			screens[0].y_org + screens[0].height / 2);
+			screens[0].x + screens[0].width / 2,
+			screens[0].y + screens[0].height / 2);
 
 	XFree(screens);
     }