emacs: src/window.c comparison

comparison src/window.c @ 34640:263ac9dec8b8

(coordinates_in_window): Fix computation for position on vertical line between mode lines.

author	Gerd Moellmann <gerd@gnu.org>
date	Sun, 17 Dec 2000 15:11:35 +0000
parents	a8944d7e6773
children	c794dfe043b6

comparison

equal deleted inserted replaced

-:911e673ddc04
+:263ac9dec8b8
 static int
 coordinates_in_window (w, x, y)
 register struct window *w;
 register int *x, *y;
 {
-struct frame *f = XFRAME (WINDOW_FRAME (w));
-int left_x, right_x, top_y, bottom_y;
-int flags_area_width = FRAME_LEFT_FLAGS_AREA_WIDTH (f);
 /* Let's make this a global enum later, instead of using numbers
 everywhere.  */
 enum {ON_NOTHING, ON_TEXT, ON_MODE_LINE, ON_VERTICAL_BORDER,
 	ON_HEADER_LINE, ON_LEFT_FRINGE, ON_RIGHT_FRINGE};
+struct frame *f = XFRAME (WINDOW_FRAME (w));
+int left_x, right_x, top_y, bottom_y;
+int flags_area_width = FRAME_LEFT_FLAGS_AREA_WIDTH (f);
+int part;
+int ux = CANON_X_UNIT (f), uy = CANON_Y_UNIT (f);
+int x0 = XFASTINT (w->left) * ux;
+int x1 = x0 + XFASTINT (w->width) * ux;
+if (*x < x0 || *x >= x1)
+return ON_NOTHING;
 /* In what's below, we subtract 1 when computing right_x because we
 want the rightmost pixel, which is given by left_pixel+width-1.  */
 if (w->pseudo_window_p)
 {
 left_x = 0;
-right_x = XFASTINT (w->width) * CANON_Y_UNIT (f) - 1;
+right_x = XFASTINT (w->width) * CANON_X_UNIT (f) - 1;
 top_y = WINDOW_DISPLAY_TOP_EDGE_PIXEL_Y (w);
 bottom_y = WINDOW_DISPLAY_BOTTOM_EDGE_PIXEL_Y (w);
 }
 else
 {
 /* 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
 to resize windows horizontally in case we're using toolkit
 scroll bars.  */
 if (WINDOW_WANTS_MODELINE_P (w)
-&& *y < bottom_y
+&& *y >= bottom_y - CURRENT_MODE_LINE_HEIGHT (w)
-&& *y >= bottom_y - CURRENT_MODE_LINE_HEIGHT (w))
+&& *y < bottom_y)
 {
-if (!WINDOW_RIGHTMOST_P (w)
+/* We're somewhere on the mode line.  We consider the place
-	  && (abs (*x - ((XFASTINT (w->left) + XFASTINT (w->width))
+	 between mode lines of horizontally adjacent mode lines
-			 * CANON_X_UNIT (f)))
+	 as the vertical border.    If scroll bars on the left,
-	      < CANON_X_UNIT (f) / 2))
+	 return the right window.  */
-	return ON_VERTICAL_BORDER;
+part = ON_MODE_LINE;
-return ON_MODE_LINE;
-}
+if (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT (f))
+	{
-if (WINDOW_WANTS_HEADER_LINE_P (w)
+	  if (abs (*x - x0) < ux / 2)
-&& *y >= top_y
+	    part = ON_VERTICAL_BORDER;
-&& *y < top_y + CURRENT_HEADER_LINE_HEIGHT (w))
+	}
-{
+else if (!WINDOW_RIGHTMOST_P (w) && abs (*x - x1) < ux / 2)
-if (!WINDOW_RIGHTMOST_P (w)
+	part = ON_VERTICAL_BORDER;
-	  && (abs (*x - ((XFASTINT (w->left) + XFASTINT (w->width))
+}
-			 * CANON_X_UNIT (f)))
+else if (WINDOW_WANTS_HEADER_LINE_P (w)
-	      < CANON_X_UNIT (f) / 2))
+	   && *y < top_y + CURRENT_HEADER_LINE_HEIGHT (w)
-	return ON_VERTICAL_BORDER;
+	   && *y >= top_y)
-return ON_HEADER_LINE;
+{
-}
+part = ON_HEADER_LINE;
-/* Completely outside anything interesting?  */
+if (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT (f))
-if (*y < top_y
+	{
-|| *y >= bottom_y
+	  if (abs (*x - x0) < ux / 2)
-|| *x < (left_x
+	    part = ON_VERTICAL_BORDER;
-	       - flags_area_width
+	}
-	       - (FRAME_LEFT_SCROLL_BAR_WIDTH (f)
+else if (!WINDOW_RIGHTMOST_P (w) && abs (*x - x1) < ux / 2)
-		  * CANON_X_UNIT (f)))
+	part = ON_VERTICAL_BORDER;
-|| *x > right_x + flags_area_width)
+}
-return ON_NOTHING;
+/* Outside anything interesting?  */
+else if (*y < top_y
-if (FRAME_WINDOW_P (f))
+	   || *y >= bottom_y
+	   || *x < (left_x
+		    - flags_area_width
+		    - FRAME_LEFT_SCROLL_BAR_WIDTH (f) * ux)
+	   || *x > right_x + flags_area_width)
+{
+part = ON_NOTHING;
+}
+else if (FRAME_WINDOW_P (f))
 {
 if (!w->pseudo_window_p
 	  && !FRAME_HAS_VERTICAL_SCROLL_BARS (f)
 	  && !WINDOW_RIGHTMOST_P (w)
-	  && (abs (*x - right_x - flags_area_width) < CANON_X_UNIT (f) / 2))
+	  && (abs (*x - right_x - flags_area_width) < ux / 2))
-	return ON_VERTICAL_BORDER;
+	{
+	  part = ON_VERTICAL_BORDER;
-if (*x < left_x || *x > right_x)
+	}
+else if (*x < left_x || *x > right_x)
 	{
 	  /* Other lines than the mode line don't include flags areas and
 	     scroll bars on the left.  */
 	  /* Convert X and Y to window-relative pixel coordinates.  */
 	  *x -= left_x;
 	  *y -= top_y;
-	  return *x < left_x ? ON_LEFT_FRINGE : ON_RIGHT_FRINGE;
+	  part = *x < left_x ? ON_LEFT_FRINGE : ON_RIGHT_FRINGE;
+	}
+else
+	{
+	  *x -= left_x;
+	  *y -= top_y;
+	  part = ON_TEXT;
 	}
 }
 else
 {
 /* Need to say "*x > right_x" rather than >=, since on character
 	     scroll bars on the left.  */
 	  /* Convert X and Y to window-relative pixel coordinates.  */
 	  *x -= left_x;
 	  *y -= top_y;
-	  return *x < left_x ? ON_LEFT_FRINGE : ON_RIGHT_FRINGE;
+	  part = *x < left_x ? ON_LEFT_FRINGE : ON_RIGHT_FRINGE;
 	}
 /* Here, too, "*x > right_x" is because of character terminals.  */
-if (!w->pseudo_window_p
+else if (!w->pseudo_window_p
-	  && !WINDOW_RIGHTMOST_P (w)
+	       && !WINDOW_RIGHTMOST_P (w)
-	  && *x > right_x - CANON_X_UNIT (f))
+	       && *x > right_x - ux)
-	/* On the border on the right side of the window?  Assume that
+	{
-	   this area begins at RIGHT_X minus a canonical char width.  */
+	  /* On the border on the right side of the window?  Assume that
-	return ON_VERTICAL_BORDER;
+	     this area begins at RIGHT_X minus a canonical char width.  */
-}
+	  part = ON_VERTICAL_BORDER;
+	}
-/* Convert X and Y to window-relative pixel coordinates.  */
+else
-*x -= left_x;
+	{
-*y -= top_y;
+	  /* Convert X and Y to window-relative pixel coordinates.  */
-return ON_TEXT;
+	  *x -= left_x;
-}
+	  *y -= top_y;
+	  part = ON_TEXT;
+	}
+}
+return part;
+}
 DEFUN ("coordinates-in-window-p", Fcoordinates_in_window_p,
 Scoordinates_in_window_p, 2, 2, 0,
 "Return non-nil if COORDINATES are in WINDOW.\n\
 COORDINATES is a cons of the form (X . Y), X and Y being distances\n\

Mercurial > emacs

comparison src/window.c @ 34640:263ac9dec8b8