Move hourglass machinery to RIF.

* dispextern.h (struct redisplay_interface): New members
show_hourglass and hide_hourglass.  Indent comments.
(show_hourglass, hide_hourglass): Remove prototypes.
* nsterm.m (show_hourgass, hide_hourglass): Refactor to ...
(ns_show_hourglass, ns_hide_hourglass): ... new no-ops.
(ns_redisplay_interface): Add them.
* w32fns.c (show_hourglass, hide_hourglass): Refactor to ...
* w32term.c (w32_show_hourglass, w32_hide_hourglass): ... these.
(w32_arrow_cursor): New function to hack around non-GUI frames.
(w32_redisplay_interface): Add new functions.
* w32term.h (w32_arror_cursor): Add prototype.
* xdisp.c (show_hourglass): New function, refactored out from
platform-dependend code.
(cancel_hourglass): Now call to RIF function.
* xfns.c (show_hourglass, hide_hourglass): Refactor to ...
* xterm.c (x_show_hourglass, x_hide_hourglass): ... these.
(x_redisplay_interface): Add new functions.

1 files changed, 0 insertions, 61 deletions

diff --git a/src/w32fns.c b/src/w32fns.c
index b76c81fdf1f..dbd83444c99 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -5488,67 +5488,6 @@ no value of TYPE (always string in the MS Windows case).  */)
 
 #endif /* TODO */
 
-
-/***********************************************************************
-                                Busy cursor
- ***********************************************************************/
-
-/* Display an hourglass cursor.  Set the hourglass_p flag in display info
-   to indicate that an hourglass cursor is shown.  */
-
-void
-show_hourglass (struct atimer *timer)
-{
-  hourglass_atimer = NULL;
-
-  if (!hourglass_shown_p)
-    {
-      Lisp_Object tail, frame;
-
-      block_input ();
-      FOR_EACH_FRAME (tail, frame)
-        {
-          struct frame *f = XFRAME (frame);
-
-          if (FRAME_W32_P (f) && !menubar_in_use && !current_popup_menu)
-            {
-              f->output_data.w32->hourglass_p = 1;
-              SetCursor (f->output_data.w32->hourglass_cursor);
-            }
-        }
-      unblock_input ();
-      hourglass_shown_p = 1;
-    }
-}
-
-/* Hide the hourglass cursor on all frames, if it is currently shown.  */
-
-void
-hide_hourglass (void)
-{
-  if (hourglass_shown_p)
-    {
-      Lisp_Object tail, frame;
-
-      block_input ();
-      FOR_EACH_FRAME (tail, frame)
-        {
-          struct frame *f = XFRAME (frame);
-
-          if (FRAME_W32_P (f))
-            {
-              f->output_data.w32->hourglass_p = 0;
-              SetCursor (f->output_data.w32->current_cursor);
-            }
-          else
-            /* No cursors on non GUI frames - restore to stock arrow cursor.  */
-            SetCursor (w32_load_cursor (IDC_ARROW));
-        }
-      unblock_input ();
-      hourglass_shown_p = 0;
-    }
-}
-
 /***********************************************************************
                                 Tool tips
  ***********************************************************************/