(coordinates_in_window): Check mouse on mode-line or

header-line first.

diff --git a/src/ChangeLog b/src/ChangeLog
index e193d4bbc9f9ef9fd50f27d24be41b9b9d29c23a..449ef0402fc74217b61a21d223f11a5fae41ab7a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2000-12-06  Gerd Moellmann  <gerd@gnu.org>
 
+       * window.c (coordinates_in_window): Check mouse on mode-line or
+       header-line first.
+
        * alloc.c (Fgarbage_collect): Dox fix.  Return a list as
        advertized by the function documentation.
 

diff --git a/src/window.c b/src/window.c
index 3b4bf2b1446224c09941400245509b2f1933adc0..708c047563689032186d81e3fc767c035f69da4f 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -524,16 +524,6 @@ coordinates_in_window (w, x, y)
       bottom_y = WINDOW_DISPLAY_BOTTOM_EDGE_PIXEL_Y (w);
     }
 
-  /* Completely outside anything interesting?  */
-  if (*y < top_y
-      || *y >= bottom_y
-      || *x < (left_x
-              - flags_area_width
-              - (FRAME_LEFT_SCROLL_BAR_WIDTH (f)
-                 * CANON_X_UNIT (f)))
-      || *x > right_x + flags_area_width)
-    return ON_NOTHING;
-  
   /* On the mode line or header line?  If it's near the start of
      the mode or header line of window that's has a horizontal
      sibling, say it's on the vertical line.  That's to be able
@@ -541,6 +531,7 @@ coordinates_in_window (w, x, y)
      scroll bars.  */
   
   if (WINDOW_WANTS_MODELINE_P (w)
+      && *y < bottom_y
       && *y >= bottom_y - CURRENT_MODE_LINE_HEIGHT (w))
     {
       if (!WINDOW_RIGHTMOST_P (w)
@@ -552,6 +543,7 @@ coordinates_in_window (w, x, y)
     }
   
   if (WINDOW_WANTS_HEADER_LINE_P (w)
+      && *y >= top_y
       && *y < top_y + CURRENT_HEADER_LINE_HEIGHT (w))
     {
       if (!WINDOW_RIGHTMOST_P (w)
@@ -562,6 +554,16 @@ coordinates_in_window (w, x, y)
       return ON_HEADER_LINE;
     }
 
+  /* Completely outside anything interesting?  */
+  if (*y < top_y
+      || *y >= bottom_y
+      || *x < (left_x
+              - flags_area_width
+              - (FRAME_LEFT_SCROLL_BAR_WIDTH (f)
+                 * CANON_X_UNIT (f)))
+      || *x > right_x + flags_area_width)
+    return ON_NOTHING;
+  
   if (FRAME_WINDOW_P (f))
     {
       if (!w->pseudo_window_p