[Emacs-diffs] emacs/src ChangeLog gtkutil.c

[Jan Djärv]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jan Djärv <jhd> 09/07/02 08:20:59

Modified files:
        src            : ChangeLog gtkutil.c 

Log message:
        (xg_frame_set_char_size): Do not set pixel width/height
        here or call change_frame_size. Just call flush_and_sync.
        (flush_and_sync): Reintroduced.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7623&r2=1.7624
http://cvs.savannah.gnu.org/viewcvs/emacs/src/gtkutil.c?cvsroot=emacs&r1=1.154&r2=1.155

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7623
retrieving revision 1.7624
diff -u -b -r1.7623 -r1.7624
--- ChangeLog   2 Jul 2009 07:48:23 -0000       1.7623
+++ ChangeLog   2 Jul 2009 08:20:56 -0000       1.7624
@@ -1,7 +1,8 @@
 2009-07-02  Jan Djärv  <address@hidden>
 
-       * gtkutil.c (xg_frame_set_char_size): Do not set pixel width/height 
here or
-       call change_frame_size.
+       * gtkutil.c (xg_frame_set_char_size): Do not set pixel width/height
+       here or call change_frame_size. Just call flush_and_sync.
+       (flush_and_sync): Reintroduced.
 
 2009-07-01  Jan Djärv  <address@hidden>
 

Index: gtkutil.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/gtkutil.c,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -b -r1.154 -r1.155
--- gtkutil.c   2 Jul 2009 07:48:25 -0000       1.154
+++ gtkutil.c   2 Jul 2009 08:20:58 -0000       1.155
@@ -636,6 +636,7 @@
      FRAME_PTR f;
      int pixelwidth, pixelheight;
 {
+  fprintf(stderr, "%s: %d/%d\n", __func__, pixelwidth, pixelheight);
   int rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, pixelheight);
   int columns = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, pixelwidth);
 
@@ -654,6 +655,20 @@
     }
 }
 
+static void
+flush_and_sync (f)
+     FRAME_PTR f;
+{
+  gdk_window_process_all_updates ();
+  x_sync (f);
+  while (gtk_events_pending ())
+    {
+      gtk_main_iteration ();
+      gdk_window_process_all_updates ();
+      x_sync (f);
+    }
+}
+
 /* Resize the outer window of frame F after chainging the height.
    COLUMNS/ROWS is the size the edit area shall have after the resize.  */
 
@@ -697,8 +712,7 @@
      request, XMonad does this all the time.  The best we can do
      is try to sync, so lisp code sees the updated size as fast as
      possible.  */
-  gdk_window_process_all_updates ();
-  x_sync (f);
+  flush_and_sync (f);
 }
 
 /* Handle height changes (i.e. add/remove menu/toolbar).