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, 110 deletions

diff --git a/src/xfns.c b/src/xfns.c
index 6574beddc8b..7d87ddbb2b4 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -4735,116 +4735,6 @@ no value of TYPE (always string in the MS Windows case).  */)
   return prop_value;
 }
 
-
-
-/***********************************************************************
-                                Busy cursor
- ***********************************************************************/
-
-/* Timer function of hourglass_atimer.  TIMER is equal to
-   hourglass_atimer.
-
-   Display an hourglass pointer on all frames by mapping the frames'
-   hourglass_window.  Set the hourglass_p flag in the frames'
-   output_data.x structure to indicate that an hourglass cursor is
-   shown on the frames.  */
-
-void
-show_hourglass (struct atimer *timer)
-{
-  /* The timer implementation will cancel this timer automatically
-     after this function has run.  Set hourglass_atimer to null
-     so that we know the timer doesn't have to be canceled.  */
-  hourglass_atimer = NULL;
-
-  if (!hourglass_shown_p)
-    {
-      Lisp_Object rest, frame;
-
-      block_input ();
-
-      FOR_EACH_FRAME (rest, frame)
-        {
-          struct frame *f = XFRAME (frame);
-
-          if (FRAME_LIVE_P (f) && FRAME_X_P (f) && FRAME_X_DISPLAY (f))
-            {
-              Display *dpy = FRAME_X_DISPLAY (f);
-
-#ifdef USE_X_TOOLKIT
-              if (f->output_data.x->widget)
-#else
-              if (FRAME_OUTER_WINDOW (f))
-#endif
-                {
-                  f->output_data.x->hourglass_p = 1;
-
-                  if (!f->output_data.x->hourglass_window)
-                    {
-                      unsigned long mask = CWCursor;
-                      XSetWindowAttributes attrs;
-#ifdef USE_GTK
-                      Window parent = FRAME_X_WINDOW (f);
-#else
-                      Window parent = FRAME_OUTER_WINDOW (f);
-#endif
-                      attrs.cursor = f->output_data.x->hourglass_cursor;
-
-                      f->output_data.x->hourglass_window
-                        = XCreateWindow (dpy, parent,
-                                         0, 0, 32000, 32000, 0, 0,
-                                         InputOnly,
-                                         CopyFromParent,
-                                         mask, &attrs);
-                    }
-
-                  XMapRaised (dpy, f->output_data.x->hourglass_window);
-                  XFlush (dpy);
-                }
-            }
-        }
-
-      hourglass_shown_p = 1;
-      unblock_input ();
-    }
-}
-
-
-/* Hide the hourglass pointer on all frames, if it is currently
-   shown.  */
-
-void
-hide_hourglass (void)
-{
-  if (hourglass_shown_p)
-    {
-      Lisp_Object rest, frame;
-
-      block_input ();
-      FOR_EACH_FRAME (rest, frame)
-        {
-          struct frame *f = XFRAME (frame);
-
-          if (FRAME_X_P (f)
-              /* Watch out for newly created frames.  */
-              && f->output_data.x->hourglass_window)
-            {
-              XUnmapWindow (FRAME_X_DISPLAY (f),
-                            f->output_data.x->hourglass_window);
-              /* Sync here because XTread_socket looks at the
-                 hourglass_p flag that is reset to zero below.  */
-              XSync (FRAME_X_DISPLAY (f), False);
-              f->output_data.x->hourglass_p = 0;
-            }
-        }
-
-      hourglass_shown_p = 0;
-      unblock_input ();
-    }
-}
-
-
-
 /***********************************************************************
                                 Tool tips
  ***********************************************************************/