More fixes for mouse glyph calculations (Bug#16647).

More fixes for mouse glyph calculations (Bug#16647).
* window.c (coordinates_in_window): In intersection of
horizontal and vertical window dividers prefer the horizontal
one.  Add some extra parens to last fix.
(window_relative_x_coord): Return x-coordinate for header and
mode line too.
* xdisp.c (remember_mouse_glyph): In text area don't extend
glyph into mode line to show the vertical drag cursor there
immediately.  Subdivide mouse glyphs in right fringes to show a
horizontal drag cursor as soon as we enter the "grabbable width"
portion.  Handle vertical border case separately.  Do not
subdivide window divider areas.
(note_mouse_highlight): On bottom divider of bottommost windows
show vertical drag cursor only when the minibuffer window can be
resized.

1 files changed, 19 insertions, 17 deletions

diff --git a/src/window.c b/src/window.c
index 2fb0dcaadaa..b2a6ff4ff2d 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1266,18 +1266,18 @@ coordinates_in_window (register struct window *w, int x, int y)
   if (y < top_y || y >= bottom_y || x < left_x || x >= right_x)
     return ON_NOTHING;
 
-  /* On vertical window divider (which prevails horizontal
-     dividers)?  */
-  if (!WINDOW_RIGHTMOST_P (w)
-      && WINDOW_RIGHT_DIVIDER_WIDTH (w) > 0
-      && x >= right_x - WINDOW_RIGHT_DIVIDER_WIDTH (w)
-      && x <= right_x)
-    return ON_RIGHT_DIVIDER;
-  /* On the horizontal window divider?  */
-  else if (WINDOW_BOTTOM_DIVIDER_WIDTH (w) > 0
-           && y >= (bottom_y - WINDOW_BOTTOM_DIVIDER_WIDTH (w))
-           && y <= bottom_y)
+  /* On the horizontal window divider (which prevails the vertical
+     divider)?  */
+  if (WINDOW_BOTTOM_DIVIDER_WIDTH (w) > 0
+      && y >= (bottom_y - WINDOW_BOTTOM_DIVIDER_WIDTH (w))
+      && y <= bottom_y)
     return ON_BOTTOM_DIVIDER;
+  /* On vertical window divider?  */
+  else if (!WINDOW_RIGHTMOST_P (w)
+           && WINDOW_RIGHT_DIVIDER_WIDTH (w) > 0
+           && x >= right_x - WINDOW_RIGHT_DIVIDER_WIDTH (w)
+           && x <= right_x)
+    return ON_RIGHT_DIVIDER;
   /* On the mode or header line?   */
   else if ((WINDOW_WANTS_MODELINE_P (w)
             && y >= (bottom_y
@@ -1295,12 +1295,12 @@ coordinates_in_window (register struct window *w, int x, int y)
          bars.  Note: If scrollbars are on the left, the window that
          must be eventually resized is that on the left of WINDOW.  */
       if ((WINDOW_RIGHT_DIVIDER_WIDTH (w) == 0)
-          && (WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w)
-              && !WINDOW_LEFTMOST_P (w)
-              && eabs (x - left_x) < grabbable_width)
-          || (!WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w)
-              && !WINDOW_RIGHTMOST_P (w)
-              && eabs (x - right_x) < grabbable_width))
+          && ((WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w)
+               && !WINDOW_LEFTMOST_P (w)
+               && eabs (x - left_x) < grabbable_width)
+              || (!WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w)
+                  && !WINDOW_RIGHTMOST_P (w)
+                  && eabs (x - right_x) < grabbable_width)))
         return ON_VERTICAL_BORDER;
       else
         return part;
@@ -1386,6 +1386,8 @@ window_relative_x_coord (struct window *w, enum window_part part, int x)
     case ON_TEXT:
       return x - window_box_left (w, TEXT_AREA);
 
+    case ON_HEADER_LINE:
+    case ON_MODE_LINE:
     case ON_LEFT_FRINGE:
       return x - left_x;