[Emacs-diffs] Changes to emacs/src/xterm.c

[Kim F. Storm]

Index: emacs/src/xterm.c
diff -c emacs/src/xterm.c:1.705 emacs/src/xterm.c:1.706
*** emacs/src/xterm.c:1.705     Sat Feb 16 05:02:38 2002
--- emacs/src/xterm.c   Sat Feb 16 18:55:57 2002
***************
*** 6686,6696 ****
      }
  }
  
- /* This is used for debugging, to turn off note_mouse_highlight.  */
- 
- int disable_mouse_highlight;
- 
- 
  
  /************************************************************************
                              Mouse Face
--- 6686,6691 ----
***************
*** 6908,6914 ****
      return;
  #endif
  
!   if (disable_mouse_highlight
        || !f->glyphs_initialized_p)
      return;
  
--- 6903,6909 ----
      return;
  #endif
  
!   if (NILP (Vmouse_highlight)
        || !f->glyphs_initialized_p)
      return;
  
***************
*** 7814,7819 ****
--- 7809,7816 ----
    if (/* If window is in the process of being destroyed, don't bother
         to do anything.  */
        w->current_matrix != NULL
+       /* Don't update mouse highlight if hidden */
+       && (draw != DRAW_MOUSE_FACE || !dpyinfo->mouse_face_hidden)
        /* Recognize when we are called to operate on rows that don't exist
         anymore.  This can happen when a window is split.  */
        && dpyinfo->mouse_face_end_row < w->current_matrix->nrows)
***************
*** 10454,10459 ****
--- 10451,10462 ----
            case KeyPress:
              f = x_any_window_to_frame (dpyinfo, event.xkey.window);
  
+             if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight))
+               {
+                 dpyinfo->mouse_face_hidden = 1;
+                 clear_mouse_face (dpyinfo);
+               }
+ 
  #if defined USE_MOTIF && defined USE_TOOLKIT_SCROLL_BARS
              if (f == 0)
                {
***************
*** 10866,10871 ****
--- 10869,10880 ----
                else
                  f = x_window_to_frame (dpyinfo, event.xmotion.window);
  
+               if (dpyinfo->mouse_face_hidden)
+                 {
+                   dpyinfo->mouse_face_hidden = 0;
+                   clear_mouse_face (dpyinfo);
+                 }
+ 
                if (f)
                  note_mouse_movement (f, &event.xmotion);
                else
***************
*** 14680,14685 ****
--- 14689,14695 ----
    dpyinfo->mouse_face_overlay = Qnil;
    dpyinfo->mouse_face_mouse_x = dpyinfo->mouse_face_mouse_y = 0;
    dpyinfo->mouse_face_defer = 0;
+   dpyinfo->mouse_face_hidden = 0;
    dpyinfo->x_focus_frame = 0;
    dpyinfo->x_focus_event_frame = 0;
    dpyinfo->x_highlight_frame = 0;