# HG changeset patch
# User Jan D. <jan.h.d@swipnet.se>
# Date 1271589899 -7200
# Node ID bf5fce1e8e34f5329279779c993a2b2c7abaafe1
# Parent  b2e098d47dff2052cdcd49fd1b1b3ca260c87ac6
Set USER_POS in hint_flags to work around Cygwin problem.

gtkutil.c (xg_set_geometry): Set size in geometry string also.
(x_wm_set_size_hint): Set USER_POS in hint_flags (Bug#5968).

diff -r b2e098d47dff -r bf5fce1e8e34 src/ChangeLog
--- a/src/ChangeLog	Sat Apr 17 23:13:09 2010 -0500
+++ b/src/ChangeLog	Sun Apr 18 13:24:59 2010 +0200
@@ -1,3 +1,8 @@
+2010-04-18  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* gtkutil.c (xg_set_geometry): Set size in geometry string also.
+	(x_wm_set_size_hint): Set USER_POS in hint_flags (Bug#5968).
+
 2010-04-17  Eli Zaretskii  <eliz@gnu.org>
 
 	Fix a crash when an NSM character is inserted at BEGV.
diff -r b2e098d47dff -r bf5fce1e8e34 src/gtkutil.c
--- a/src/gtkutil.c	Sat Apr 17 23:13:09 2010 -0500
+++ b/src/gtkutil.c	Sun Apr 18 13:24:59 2010 +0200
@@ -542,7 +542,9 @@
       if (yneg)
         top = -top;
 
-      sprintf (geom_str, "%c%d%c%d",
+      sprintf (geom_str, "=%dx%d%c%d%c%d",
+               FRAME_PIXEL_WIDTH (f),
+               FRAME_PIXEL_HEIGHT (f),
                (xneg ? '-' : '+'), left,
                (yneg ? '-' : '+'), top);
 
@@ -951,6 +953,12 @@
   else if (win_gravity == StaticGravity)
     size_hints.win_gravity = GDK_GRAVITY_STATIC;
 
+  if (user_position)
+    {
+      hint_flags &= ~GDK_HINT_POS;
+      hint_flags |= GDK_HINT_USER_POS;
+    }
+
   if (hint_flags != f->output_data.x->hint_flags
       || memcmp (&size_hints,
 		 &f->output_data.x->size_hints,