[Emacs-diffs] /srv/bzr/emacs/trunk r99929: Set USER_POS in hint_flags to work around Cygwin problem.

[Jan D.]

------------------------------------------------------------
revno: 99929
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2010-04-18 13:24:59 +0200
message:
  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).
modified:
  src/ChangeLog
  src/gtkutil.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-04-17 15:53:55 +0000
+++ b/src/ChangeLog     2010-04-18 11:24:59 +0000
@@ -1,3 +1,8 @@
+2010-04-18  Jan Djärv  <address@hidden>
+
+       * 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  <address@hidden>
 
        Fix a crash when an NSM character is inserted at BEGV.

=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c     2010-04-13 15:16:42 +0000
+++ b/src/gtkutil.c     2010-04-18 11:24:59 +0000
@@ -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,