]> code.delx.au - gnu-emacs/commitdiff
handle_one_xevent: Must note mouse movement even for nil frames for GTK,
authorJan Djärv <jan.h.d@swipnet.se>
Thu, 9 Feb 2006 15:54:56 +0000 (15:54 +0000)
committerJan Djärv <jan.h.d@swipnet.se>
Thu, 9 Feb 2006 15:54:56 +0000 (15:54 +0000)
in that case it is the tool bar.

src/xterm.c

index 114a7f124593a551dd2034e53a965c50a5b941d5..e3407dcaaec3cafa9101b35bce4eb603a7e94941 100644 (file)
@@ -6495,6 +6495,12 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
         so update things that depend on mouse position.  */
       if (f && !f->output_data.x->hourglass_p)
        note_mouse_movement (f, &event.xmotion);
+#ifdef USE_GTK
+      /* We may get an EnterNotify on the buttons in the toolbar.  In that
+         case we moved out of any highlighted area and need to note this.  */
+      if (!f && last_mouse_glyph_frame)
+        note_mouse_movement (last_mouse_glyph_frame, &event);
+#endif
       goto OTHER;
 
     case FocusIn:
@@ -6522,6 +6528,11 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
           if (any_help_event_p)
            do_help = -1;
         }
+#ifdef USE_GTK
+      /* See comment in EnterNotify above */
+      else if (last_mouse_glyph_frame)
+        note_mouse_movement (last_mouse_glyph_frame, &event);
+#endif
       goto OTHER;
 
     case FocusOut: