emacs: src/xterm.c comparison

comparison src/xterm.c @ 90596:6823a91487f2

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 399-413) - Update from CVS - Rcirc update from Ryan Yeske - Merge from gnus--rel--5.10 - Miscellaneous tq-related fixes. * gnus--rel--5.10 (patch 126-127) - Merge from emacs--devo--0 - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-105

author	Miles Bader <miles@gnu.org>
date	Mon, 28 Aug 2006 04:33:45 +0000
parents	7f3f771c85fa 759e19ea81e5
children	a1a25ac6c88a

comparison

equal deleted inserted replaced

-:fd59c4164a14
+:6823a91487f2
 static Lisp_Object last_window;
 /* Non-zero means make use of UNDERLINE_POSITION font properties.  */
 int x_use_underline_position_properties;
+/* Non-zero means to draw the underline at the same place as the descent line.  */
+int x_underline_at_descent_line;
 /* This is a chain of structures for all the X displays currently in
 use.  */
 struct x_display_info *x_display_list;
 else if (!s->background_filled_p)
 {
 int background_width = s->background_width;
 int x = s->x, left_x = window_box_left_offset (s->w, TEXT_AREA);
-if (x < left_x)
+/* Don't draw into left margin, fringe or scrollbar area
+except for header line and mode line.  */
+if (x < left_x && !s->row->mode_line_p)
 	{
 	  background_width -= left_x - x;
 	  x = left_x;
 	}
 if (background_width > 0)
 	  else
 #endif	/* USE_FONT_BACKEND */
 	  if (!XGetFontProperty (s->font, XA_UNDERLINE_THICKNESS, &h))
 	    h = 1;
-	  /* Get the underline position.  This is the recommended
-	     vertical offset in pixels from the baseline to the top of
-	     the underline.  This is a signed value according to the
-	     specs, and its default is
-	     ROUND ((maximum descent) / 2), with
-	     ROUND(x) = floor (x + 0.5)  */
 #ifdef USE_FONT_BACKEND
 	  if (enable_font_backend)
 	    {
 	      if (s->face->font)
 		/* In the future, we must use information of font.  */
 	      else
 		y = s->y + s->height - h;
 	    }
 	  else
 #endif
-	  if (x_use_underline_position_properties
+if (x_underline_at_descent_line)
-	      && XGetFontProperty (s->font, XA_UNDERLINE_POSITION, &tem))
-	    y = s->ybase + (long) tem;
-	  else if (s->face->font)
-	    y = s->ybase + (s->face->font->max_bounds.descent + 1) / 2;
-	  else
 	    y = s->y + s->height - h;
+else
+{
+	      /* Get the underline position.  This is the recommended
+vertical offset in pixels from the baseline to the top of
+the underline.  This is a signed value according to the
+specs, and its default is
+	         ROUND ((maximum descent) / 2), with
+	         ROUND(x) = floor (x + 0.5)  */
+if (x_use_underline_position_properties
+&& XGetFontProperty (s->font, XA_UNDERLINE_POSITION, &tem))
+y = s->ybase + (long) tem;
+else if (s->face->font)
+y = s->ybase + (s->face->font->max_bounds.descent + 1) / 2;
+}
 	  if (s->face->underline_defaulted_p)
 	    XFillRectangle (s->display, s->window, s->gc,
-			    s->x, y, s->width, h);
+			    s->x, y, s->background_width, h);
 	  else
 	    {
 	      XGCValues xgcv;
 	      XGetGCValues (s->display, s->gc, GCForeground, &xgcv);
 	      XSetForeground (s->display, s->gc, s->face->underline_color);
 	      XFillRectangle (s->display, s->window, s->gc,
-			      s->x, y, s->width, h);
+			      s->x, y, s->background_width, h);
 	      XSetForeground (s->display, s->gc, xgcv.foreground);
 	    }
 	}
 /* Draw overline.  */
 	{
 	  unsigned long dy = 0, h = 1;
 	  if (s->face->overline_color_defaulted_p)
 	    XFillRectangle (s->display, s->window, s->gc, s->x, s->y + dy,
-			    s->width, h);
+			    s->background_width, h);
 	  else
 	    {
 	      XGCValues xgcv;
 	      XGetGCValues (s->display, s->gc, GCForeground, &xgcv);
 	      XSetForeground (s->display, s->gc, s->face->overline_color);
 	      XFillRectangle (s->display, s->window, s->gc, s->x, s->y + dy,
-			      s->width, h);
+			      s->background_width, h);
 	      XSetForeground (s->display, s->gc, xgcv.foreground);
 	    }
 	}
 /* Draw strike-through.  */
 nil means ignore them.  If you encounter fonts with bogus
 UNDERLINE_POSITION font properties, for example 7x13 on XFree prior
 to 4.1, set this to nil.  */);
 x_use_underline_position_properties = 1;
+DEFVAR_BOOL ("x-underline-at-descent-line",
+	       &x_underline_at_descent_line,
+doc: /* *Non-nil means to draw the underline at the same place as the descent line.
+nil means to draw the underline according to the value of the variable
+`x-use-underline-position-properties', which is usually at the baseline
+level.  The default value is nil.  */);
+x_underline_at_descent_line = 0;
 DEFVAR_BOOL ("x-mouse-click-focus-ignore-position",
 	       &x_mouse_click_focus_ignore_position,
 doc: /* Non-nil means that a mouse click to focus a frame does not move point.
 This variable is only used when the window manager requires that you
 click on a frame to select it (give it focus).  In that case, a value

Mercurial > emacs

comparison src/xterm.c @ 90596:6823a91487f2