# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1154691362 0
# Node ID b37e887392d9f04dac9f6e945d9a4711d3f62620
# Parent  c3d7d4008d2d4699fdf4565dd4a52e5a980d1305
(w32_createwindow): Handle -geometry command line option and the geometry
settings in the Registry.

diff -r c3d7d4008d2d -r b37e887392d9 src/w32fns.c
--- a/src/w32fns.c	Fri Aug 04 10:42:41 2006 +0000
+++ b/src/w32fns.c	Fri Aug 04 11:36:02 2006 +0000
@@ -2066,7 +2066,8 @@
 {
   HWND hwnd;
   RECT rect;
-  Lisp_Object top, left;
+  Lisp_Object top = Qunbound;
+  Lisp_Object left = Qunbound;
 
   rect.left = rect.top = 0;
   rect.right = FRAME_PIXEL_WIDTH (f);
@@ -2079,13 +2080,41 @@
 
   if (!hprevinst)
     {
+      Lisp_Object ifa;
+
       w32_init_class (hinst);
-    }
-
-  /* When called with RES_TYPE_NUMBER, w32_get_arg will return zero
-     for anything that is not a number and is not Qunbound.  */
-  left = w32_get_arg (Qnil, Qleft, "left", "Left", RES_TYPE_NUMBER);
-  top = w32_get_arg (Qnil, Qtop, "top", "Top", RES_TYPE_NUMBER);
+
+      /* Handle the -geometry command line option and the geometry
+	 settings in the registry.  They are decoded and put into
+	 initial-frame-alist by w32-win.el:x-handle-geometry.  */
+      ifa = Fsymbol_value (intern ("initial-frame-alist"));
+      if (CONSP (ifa))
+	{
+	  Lisp_Object lt = Fassq (Qleft, ifa);
+	  Lisp_Object tp = Fassq (Qtop,  ifa);
+
+	  if (!NILP (lt))
+	    {
+	      lt = XCDR (lt);
+	      if (INTEGERP (lt))
+		left = lt;
+	    }
+	  if (!NILP (tp))
+	    {
+	      tp = XCDR (tp);
+	      if (INTEGERP (tp))
+		top = tp;
+	    }
+	}
+    }
+
+  if (EQ (left, Qunbound) && EQ (top, Qunbound))
+    {
+      /* When called with RES_TYPE_NUMBER, w32_get_arg will return zero
+	 for anything that is not a number and is not Qunbound.  */
+      left = w32_get_arg (Qnil, Qleft, "left", "Left", RES_TYPE_NUMBER);
+      top = w32_get_arg (Qnil, Qtop, "top", "Top", RES_TYPE_NUMBER);
+    }
 
   FRAME_W32_WINDOW (f) = hwnd
     = CreateWindow (EMACS_CLASS,