Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.

[gnu-emacs] / src / xfns.c

diff --git a/src/xfns.c b/src/xfns.c
index ab4f288cb011116b0a0398ed2b8adeace5e876c2..6e8931b42d703fe9db7e154f881b09ca7277c4ad 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -255,7 +255,7 @@ extern Lisp_Object Vwindow_system_version;
 
 Lisp_Object Qface_set_after_frame_default;
 
-#ifdef GLYPH_DEBUG
+#if GLYPH_DEBUG
 int image_cache_refcount, dpyinfo_refcount;
 #endif
 
@@ -4043,7 +4043,7 @@ unwind_create_frame (frame)
   /* If frame is ``official'', nothing to do.  */
   if (!CONSP (Vframe_list) || !EQ (XCAR (Vframe_list), frame))
     {
-#ifdef GLYPH_DEBUG
+#if GLYPH_DEBUG
       struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
 #endif
       
@@ -4158,7 +4158,7 @@ This function is an internal primitive--use `make-frame' instead.")
     f->icon_name = Qnil;
 
   FRAME_X_DISPLAY_INFO (f) = dpyinfo;
-#ifdef GLYPH_DEBUG
+#if GLYPH_DEBUG
   image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount;
   dpyinfo_refcount = dpyinfo->reference_count;
 #endif /* GLYPH_DEBUG */
@@ -10268,31 +10268,41 @@ show_busy_cursor (timer)
       BLOCK_INPUT;
   
       FOR_EACH_FRAME (rest, frame)
-       if (FRAME_X_P (XFRAME (frame)))
-         {
-           struct frame *f = XFRAME (frame);
-       
-           f->output_data.x->busy_p = 1;
+       {
+         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->busy_p = 1;
        
-           if (!f->output_data.x->busy_window)
-             {
-               unsigned long mask = CWCursor;
-               XSetWindowAttributes attrs;
+                 if (!f->output_data.x->busy_window)
+                   {
+                     unsigned long mask = CWCursor;
+                     XSetWindowAttributes attrs;
            
-               attrs.cursor = f->output_data.x->busy_cursor;
+                     attrs.cursor = f->output_data.x->busy_cursor;
            
-               f->output_data.x->busy_window
-                 = XCreateWindow (FRAME_X_DISPLAY (f),
-                                  FRAME_OUTER_WINDOW (f),
-                                  0, 0, 32000, 32000, 0, 0,
-                                  InputOnly,
-                                  CopyFromParent,
-                                  mask, &attrs);
-             }
+                     f->output_data.x->busy_window
+                       = XCreateWindow (dpy, FRAME_OUTER_WINDOW (f),
+                                        0, 0, 32000, 32000, 0, 0,
+                                        InputOnly,
+                                        CopyFromParent,
+                                        mask, &attrs);
+                   }
        
-           XMapRaised (FRAME_X_DISPLAY (f), f->output_data.x->busy_window);
-           XFlush (FRAME_X_DISPLAY (f));
-         }
+                 XMapRaised (dpy, f->output_data.x->busy_window);
+                 XFlush (dpy);
+               }
+           }
+       }
 
       busy_cursor_shown_p = 1;
       UNBLOCK_INPUT;
@@ -10430,7 +10440,7 @@ x_create_tip_frame (dpyinfo, parms)
   f->output_data.x->scroll_bar_background_pixel = -1;
   f->icon_name = Qnil;
   FRAME_X_DISPLAY_INFO (f) = dpyinfo;
-#ifdef GLYPH_DEBUG
+#if GLYPH_DEBUG
   image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount;
   dpyinfo_refcount = dpyinfo->reference_count;
 #endif /* GLYPH_DEBUG */