emacs: src/w32term.c comparison

comparison src/w32term.c @ 90998:539530fa389c

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 832-838) - Remove lisp/erc/erc-nicklist.el - Update some .arch-inventory files - Fix void function definition error in cus-edit.el - Update from CVS - Restore lisp/emacs-lisp/cl-loaddefs.el - Merge from emacs--rel--22 * emacs--rel--22 (patch 75-83) - Update from CVS - Remove lisp/erc/erc-nicklist.el - Update some .arch-inventory files - Indicate that emacs--devo--0--patch-834 does not need to be applied - Merge from gnus--rel--5.10 - Restore lisp/emacs-lisp/cl-loaddefs.el * gnus--rel--5.10 (patch 239-241) - Merge from emacs--devo--0 - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-239

author	Miles Bader <miles@gnu.org>
date	Fri, 03 Aug 2007 05:20:51 +0000
parents	f55f9811f5d7 e0ebebf01b6d
children	424b655804ca

comparison

equal deleted inserted replaced

-:12fc8f96710b
+:539530fa389c
 struct face *face = p->face;
 int rowY;
 hdc = get_frame_dc (f);
+if (!p->overlay_p)
+{
+int bx = p->bx, by = p->by, nx = p->nx, ny = p->ny;
+/* If the fringe is adjacent to the left (right) scroll bar of a
+	 leftmost (rightmost, respectively) window, then extend its
+	 background to the gap between the fringe and the bar.  */
+if ((WINDOW_LEFTMOST_P (w)
+	   && WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w))
+	  || (WINDOW_RIGHTMOST_P (w)
+	      && WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (w)))
+	{
+	  int sb_width = WINDOW_CONFIG_SCROLL_BAR_WIDTH (w);
+	  if (sb_width > 0)
+	    {
+	      int left = WINDOW_SCROLL_BAR_AREA_X (w);
+	      int width = (WINDOW_CONFIG_SCROLL_BAR_COLS (w)
+			   * FRAME_COLUMN_WIDTH (f));
+	      if (bx < 0)
+		{
+		  /* Bitmap fills the fringe.  */
+		  if (left + width == p->x)
+		    bx = left + sb_width;
+		  else if (p->x + p->wd == left)
+		    bx = left;
+		  if (bx >= 0)
+		    {
+		      int header_line_height = WINDOW_HEADER_LINE_HEIGHT (w);
+		      nx = width - sb_width;
+		      by = WINDOW_TO_FRAME_PIXEL_Y (w, max (header_line_height,
+							    row->y));
+		      ny = row->visible_height;
+		    }
+		}
+	      else
+		{
+		  if (left + width == bx)
+		    {
+		      bx = left + sb_width;
+		      nx += width - sb_width;
+		    }
+		  else if (bx + nx == left)
+		    nx += width - sb_width;
+		}
+	    }
+	}
+if (bx >= 0 && nx > 0)
+	w32_fill_area (f, hdc, face->background, bx, by, nx, ny);
+}
 /* Must clip because of partially visible lines.  */
 rowY = WINDOW_TO_FRAME_PIXEL_Y (w, row->y);
 if (p->y < rowY)
 {
 /* Adjust position of "bottom aligned" bitmap on partially
 row->y = oldY;
 row->visible_height = oldVH;
 }
 else
 w32_clip_to_row (w, row, -1, hdc);
-if (p->bx >= 0 && !p->overlay_p)
-{
-w32_fill_area (f, hdc, face->background,
-		     p->bx, p->by, p->nx, p->ny);
-}
 if (p->which && p->which < max_fringe_bmp)
 {
 HBITMAP pixmap = fringe_bmp[p->which];
 HDC compat_hdc;
 XSETINT (bar->width, width);
 XSETINT (bar->height, height);
 XSETINT (bar->start, 0);
 XSETINT (bar->end, 0);
 bar->dragging = Qnil;
+bar->fringe_extended_p = Qnil;
 /* Requires geometry to be set before call to create the real window */
 hwnd = my_create_scrollbar (f, bar);
 {
 struct frame *f = XFRAME (w->frame);
 struct scroll_bar *bar;
 int top, height, left, sb_left, width, sb_width;
 int window_y, window_height;
+int fringe_extended_p;
 /* Get window dimensions.  */
 window_box (w, -1, 0, &window_y, 0, &window_height);
 top  = window_y;
 width = WINDOW_CONFIG_SCROLL_BAR_COLS (w) * FRAME_COLUMN_WIDTH (f);
 else
 sb_width = width;
 /* Compute the left edge of the scroll bar.  */
 if (WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (w))
-sb_left = left + width - sb_width - (width - sb_width) / 2;
+sb_left = left + (WINDOW_RIGHTMOST_P (w) ? width - sb_width : 0);
 else
-sb_left = left + (width - sb_width) / 2;
+sb_left = left + (WINDOW_LEFTMOST_P (w) ? 0 : width - sb_width);
+if (WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w))
+fringe_extended_p = (WINDOW_LEFTMOST_P (w)
+			 && WINDOW_LEFT_FRINGE_WIDTH (w)
+			 && (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w)
+			     || WINDOW_LEFT_MARGIN_COLS (w) == 0));
+else
+fringe_extended_p = (WINDOW_RIGHTMOST_P (w)
+			 && WINDOW_RIGHT_FRINGE_WIDTH (w)
+			 && (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w)
+			     || WINDOW_RIGHT_MARGIN_COLS (w) == 0));
 /* Does the scroll bar exist yet?  */
 if (NILP (w->vertical_scroll_bar))
 {
 HDC hdc;
 BLOCK_INPUT;
 if (width > 0 && height > 0)
 	{
 	  hdc = get_frame_dc (f);
-	  w32_clear_area (f, hdc, left, top, width, height);
+	  if (fringe_extended_p)
+	    w32_clear_area (f, hdc, sb_left, top, sb_width, height);
+	  else
+	    w32_clear_area (f, hdc, left, top, width, height);
 	  release_frame_dc (f, hdc);
 	}
 UNBLOCK_INPUT;
 bar = x_scroll_bar_create (w, top, sb_left, sb_width, height);
 /* If already correctly positioned, do nothing.  */
 if ( XINT (bar->left) == sb_left
 && XINT (bar->top) == top
 && XINT (bar->width) ==  sb_width
-&& XINT (bar->height) == height )
+&& XINT (bar->height) == height
+	   && !NILP (bar->fringe_extended_p) == fringe_extended_p )
 {
 /* Redraw after clear_frame. */
 if (!my_show_window (f, hwnd, SW_NORMAL))
 InvalidateRect (hwnd, NULL, FALSE);
 }
 	  if (width && height)
 	    {
 	      hdc = get_frame_dc (f);
 	      /* Since Windows scroll bars are smaller than the space reserved
 		 for them on the frame, we have to clear "under" them.  */
-	      w32_clear_area (f, hdc,
+	      if (fringe_extended_p)
-			      left,
+		w32_clear_area (f, hdc, sb_left, top, sb_width, height);
-			      top,
+	      else
-			      width,
+		w32_clear_area (f, hdc, left, top, width, height);
-			      height);
 	      release_frame_dc (f, hdc);
 	    }
 /* Make sure scroll bar is "visible" before moving, to ensure the
 area of the parent window now exposed will be refreshed.  */
 my_show_window (f, hwnd, SW_HIDE);
 XSETINT (bar->height, height);
 UNBLOCK_INPUT;
 }
 }
+bar->fringe_extended_p = fringe_extended_p ? Qt : Qnil;
 w32_set_scroll_bar_thumb (bar, portion, position, whole);
 XSETVECTOR (w->vertical_scroll_bar, bar);
 }

Mercurial > emacs

comparison src/w32term.c @ 90998:539530fa389c