6 files changed, 61 insertions, 21 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 34ef6c228bb..24db3a9c55a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,19 @@
+2005-03-10  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xfns.c (hourglass_started): New function.
+
+        * dispextern.h: Declare hourglass_started.
+
+        * keyboard.c (Fexecute_extended_command): Restart hourglass
+        after call to Fcompleting_read if already started.
+
+        * gtkutil.c (xg_update_scrollbar_pos): Call x_sync so that the
+        GTK main loop is entered in xterm.c, thus doing the redraw.
+
+2005-03-10  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (pos_visible_p): Fix X value in last line of buffer.
+
 2005-03-08  Kenichi Handa  <handa@m17n.org>
 
         * frame.c (x_set_font): Call set_default_ascii_font if an
diff --git a/src/dispextern.h b/src/dispextern.h
index feeae776149..b69f56d27b5 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2817,6 +2817,7 @@ EXFUN (Fx_show_tip, 6);
 EXFUN (Fx_hide_tip, 0);
 extern void start_hourglass P_ ((void));
 extern void cancel_hourglass P_ ((void));
+extern int hourglass_started P_ ((void));
 extern int display_hourglass_p;
 
 /* Returns the background color of IMG, calculating one heuristically if
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 6dcba3036c0..8bd83e40043 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -2999,9 +2999,14 @@ xg_update_scrollbar_pos (f, scrollbar_id, top, left, width, height)
       GtkWidget *wparent = gtk_widget_get_parent (wscroll);
 
       /* Move and resize to new values.  */
-      gtk_widget_set_size_request (wscroll, width, height);
       gtk_fixed_move (GTK_FIXED (wfixed), wparent, left, top);
-
+      gtk_widget_set_size_request (wscroll, width, height);
+      gtk_widget_queue_draw (wparent);
+      gdk_window_process_all_updates ();
+      /* GTK does not redraw until the main loop is entered again, but
+         if there are no X events pending we will not enter it.  So we sync
+         here to get some events.  */
+      x_sync (f);
       SET_FRAME_GARBAGED (f);
       cancel_mouse_face (f);
     }
diff --git a/src/keyboard.c b/src/keyboard.c
index 525958020af..77e7cf48139 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1350,6 +1350,11 @@ DEFUN ("top-level", Ftop_level, Stop_level, 0, 0, "",
     cancel_hourglass ();
 #endif
 
+  /* Unblock input if we enter with input blocked.  This may happen if
+     redisplay traps e.g. during tool-bar update with input blocked.  */
+  while (INPUT_BLOCKED_P)
+    UNBLOCK_INPUT;
+
   return Fthrow (Qtop_level, Qnil);
 }
 
@@ -9709,6 +9714,15 @@ DEFUN ("execute-extended-command", Fexecute_extended_command, Sexecute_extended_
   Lisp_Object saved_keys, saved_last_point_position_buffer;
   Lisp_Object bindings, value;
   struct gcpro gcpro1, gcpro2, gcpro3;
+#ifdef HAVE_X_WINDOWS
+  /* The call to Fcompleting_read wil start and cancel the hourglass,
+     but if the hourglass was already scheduled, this means that no
+     hourglass will be shown for the actual M-x command itself.
+     So we restart it if it is already scheduled.  Note that checking
+     hourglass_shown_p is not enough,  normally the hourglass is not shown,
+     just scheduled to be shown.  */
+  int hstarted = hourglass_started ();
+#endif
 
   saved_keys = Fvector (this_command_key_count,
                         XVECTOR (this_command_keys)->contents);
@@ -9740,6 +9754,10 @@ DEFUN ("execute-extended-command", Fexecute_extended_command, Sexecute_extended_
                                Qt, Qnil, Qextended_command_history, Qnil,
                                Qnil);
 
+#ifdef HAVE_X_WINDOWS
+  if (hstarted) start_hourglass ();
+#endif
+
   if (STRINGP (function) && SCHARS (function) == 0)
     error ("No command name given");
 
diff --git a/src/xdisp.c b/src/xdisp.c
index 3499e95d383..b9ef2830959 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1301,6 +1301,7 @@ pos_visible_p (w, charpos, x, y, rtop, rbot, exact_mode_line_heights_p)
   /* Note that we may overshoot because of invisible text.  */
   if (IT_CHARPOS (it) >= charpos)
     {
+      int top_x = it.current_x;
       int top_y = it.current_y;
       int bottom_y = (last_height = 0, line_bottom_y (&it));
       int window_top_y = WINDOW_HEADER_LINE_HEIGHT (w);
@@ -1309,15 +1310,12 @@ pos_visible_p (w, charpos, x, y, rtop, rbot, exact_mode_line_heights_p)
         visible_p = bottom_y > window_top_y;
       else if (top_y < it.last_visible_y)
           visible_p = 1;
-      if (visible_p && x)
+      if (visible_p)
         {
-          *x = it.current_x;
+          *x = top_x;
           *y = max (top_y + max (0, it.max_ascent - it.ascent), window_top_y);
-          if (rtop)
-            {
-              *rtop = max (0, window_top_y - top_y);
-              *rbot = max (0, bottom_y - it.last_visible_y);
-            }
+          *rtop = max (0, window_top_y - top_y);
+          *rbot = max (0, bottom_y - it.last_visible_y);
         }
     }
   else
@@ -1330,18 +1328,12 @@ pos_visible_p (w, charpos, x, y, rtop, rbot, exact_mode_line_heights_p)
       if (charpos < IT_CHARPOS (it))
         {
           visible_p = 1;
-          if (x)
-            {
-              move_it_to (&it2, charpos, -1, -1, -1, MOVE_TO_POS);
-              *x = it2.current_x;
-              *y = it2.current_y + it2.max_ascent - it2.ascent;
-              if (rtop)
-                {
-                  *rtop = max (0, -it2.current_y);
-                  *rbot = max (0, ((it2.current_y + it2.max_ascent + it2.max_descent)
-                                   - it.last_visible_y));
-                }
-            }
+          move_it_to (&it2, charpos, -1, -1, -1, MOVE_TO_POS);
+          *x = it2.current_x;
+          *y = it2.current_y + it2.max_ascent - it2.ascent;
+          *rtop = max (0, -it2.current_y);
+          *rbot = max (0, ((it2.current_y + it2.max_ascent + it2.max_descent)
+                           - it.last_visible_y));
         }
     }
 
diff --git a/src/xfns.c b/src/xfns.c
index 8267709767f..c45845e00ce 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -4275,6 +4275,14 @@ static Lisp_Object Vhourglass_delay;
 static void show_hourglass P_ ((struct atimer *));
 static void hide_hourglass P_ ((void));
 
+/* Return non-zero if houglass timer has been started or hourglass is shown.  */
+
+int
+hourglass_started ()
+{
+  return hourglass_shown_p || hourglass_atimer != NULL;
+}
+
 
 /* Cancel a currently active hourglass timer, and start a new one.  */