emacs: src/xterm.c comparison

comparison src/xterm.c @ 35581:3a46a6389078

(x_after_update_window_line): Don't clear if frame's internal border width is zero. (x_clear_area): New function. (x_after_update_window_line, x_clear_end_of_line) (x_scroll_bar_create, x_scroll_bar_set_handle) (XTset_vertical_scroll_bar, x_erase_phys_cursor): Use x_clear_area instead of XClearArea.

author	Gerd Moellmann <gerd@gnu.org>
date	Thu, 25 Jan 2001 20:26:52 +0000
parents	1a9a88614b73
children	02652537e9d2

comparison

equal deleted inserted replaced

-:ff5045d1af58
+:3a46a6389078
 xassert (w);
 if (!desired_row->mode_line_p && !w->pseudo_window_p)
 {
+struct frame *f;
+int width;
 BLOCK_INPUT;
 x_draw_row_bitmaps (w, desired_row);
 /* When a window has disappeared, make sure that no rest of
 	 full-width rows stays visible in the internal border.  */
-if (windows_or_buffers_changed)
+if (windows_or_buffers_changed
+	  && (f = XFRAME (w->frame),
+	      width = FRAME_INTERNAL_BORDER_WIDTH (f),
+	      width != 0))
 	{
-	  struct frame *f = XFRAME (w->frame);
-	  int width = FRAME_INTERNAL_BORDER_WIDTH (f);
 	  int height = desired_row->visible_height;
 	  int x = (window_box_right (w, -1)
 		   + FRAME_X_RIGHT_FLAGS_AREA_WIDTH (f));
 	  int y = WINDOW_TO_FRAME_PIXEL_Y (w, max (0, desired_row->y));
-	  XClearArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+	  x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-		      x, y, width, height, False);
+			x, y, width, height, False);
 	}
 UNBLOCK_INPUT;
 }
 }
 {
 abort ();
 }
+/* Like XClearArea, but check that WIDTH and HEIGHT are reasonable.
+If they are <= 0, this is probably an error.  */
+void
+x_clear_area (dpy, window, x, y, width, height, exposures)
+Display *dpy;
+Window window;
+int x, y;
+int width, height;
+int exposures;
+{
+xassert (width > 0 && height > 0);
+XClearArea (dpy, window, x, y, width, height, exposures);
+}
 /* Erase the current text line from the nominal cursor position
 (inclusive) to pixel column TO_X (exclusive).  The idea is that
 everything from TO_X onward is already erased.
 TO_X is a pixel position relative to updated_area of
 /* Prevent inadvertently clearing to end of the X window.  */
 if (to_x > from_x && to_y > from_y)
 {
 BLOCK_INPUT;
-XClearArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-		  from_x, from_y, to_x - from_x, to_y - from_y,
+		    from_x, from_y, to_x - from_x, to_y - from_y,
-		  False);
+		    False);
 UNBLOCK_INPUT;
 }
 }
 mask = (CWBackPixel | CWEventMask | CWCursor);
 /* Clear the area of W that will serve as a scroll bar.  This is
 for the case that a window has been split horizontally.  In
 this case, no clear_frame is generated to reduce flickering.  */
-XClearArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-		left, top, width,
+		  left, top, width,
-		window_box_height (w), False);
+		  window_box_height (w), False);
 window = XCreateWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
 			    /* Position and size of scroll bar.  */
 			    left + VERTICAL_SCROLL_BAR_WIDTH_TRIM,
 			    top,
 end += VERTICAL_SCROLL_BAR_MIN_HANDLE;
 /* Draw the empty space above the handle.  Note that we can't clear
 zero-height areas; that means "clear to end of window."  */
 if (0 < start)
-XClearArea (FRAME_X_DISPLAY (f), w,
+x_clear_area (FRAME_X_DISPLAY (f), w,
+		    /* x, y, width, height, and exposures.  */
-		  /* x, y, width, height, and exposures.  */
+		    VERTICAL_SCROLL_BAR_LEFT_BORDER,
-		  VERTICAL_SCROLL_BAR_LEFT_BORDER,
+		    VERTICAL_SCROLL_BAR_TOP_BORDER,
-		  VERTICAL_SCROLL_BAR_TOP_BORDER,
+		    inside_width, start,
-		  inside_width, start,
+		    False);
-		  False);
 /* Change to proper foreground color if one is specified.  */
 if (f->output_data.x->scroll_bar_foreground_pixel != -1)
 XSetForeground (FRAME_X_DISPLAY (f), gc,
 		      f->output_data.x->scroll_bar_foreground_pixel);
 		      f->output_data.x->foreground_pixel);
 /* Draw the empty space below the handle.  Note that we can't
 clear zero-height areas; that means "clear to end of window." */
 if (end < inside_height)
-XClearArea (FRAME_X_DISPLAY (f), w,
+x_clear_area (FRAME_X_DISPLAY (f), w,
+		    /* x, y, width, height, and exposures.  */
-		  /* x, y, width, height, and exposures.  */
+		    VERTICAL_SCROLL_BAR_LEFT_BORDER,
-		  VERTICAL_SCROLL_BAR_LEFT_BORDER,
+		    VERTICAL_SCROLL_BAR_TOP_BORDER + end,
-		  VERTICAL_SCROLL_BAR_TOP_BORDER + end,
+		    inside_width, inside_height - end,
-		  inside_width, inside_height - end,
+		    False);
-		  False);
 }
 UNBLOCK_INPUT;
 }
 /* Does the scroll bar exist yet?  */
 if (NILP (w->vertical_scroll_bar))
 {
 BLOCK_INPUT;
-XClearArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-		  left, top, width, height, False);
+		    left, top, width, height, False);
 UNBLOCK_INPUT;
 bar = x_scroll_bar_create (w, top, sb_left, sb_width, height);
 }
 else
 {
 #ifdef USE_TOOLKIT_SCROLL_BARS
 /* Since toolkit scroll bars are smaller than the space reserved
 	 for them on the frame, we have to clear "under" them.  */
-XClearArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-		  left, top, width, height, False);
+		    left, top, width, height, False);
 /* Move/size the scroll bar widget.  */
 if (mask)
 	XtConfigureWidget (SCROLL_BAR_X_WIDGET (FRAME_X_DISPLAY (f), bar),
 			   sb_left + VERTICAL_SCROLL_BAR_WIDTH_TRIM,
 	{
 	  /* Clear areas not covered by the scroll bar.  This makes sure a
 	     previous mode line display is cleared after C-x 2 C-x 1, for
 	     example.  Non-toolkit scroll bars are as wide as the area
 	     reserved for scroll bars - trim at both sides.  */
-	  XClearArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+	  x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-		      left, top, VERTICAL_SCROLL_BAR_WIDTH_TRIM,
+			left, top, VERTICAL_SCROLL_BAR_WIDTH_TRIM,
-		      height, False);
+			height, False);
-	  XClearArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+	  x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-		      left + width - VERTICAL_SCROLL_BAR_WIDTH_TRIM,
+			left + width - VERTICAL_SCROLL_BAR_WIDTH_TRIM,
-		      top, VERTICAL_SCROLL_BAR_WIDTH_TRIM,
+			top, VERTICAL_SCROLL_BAR_WIDTH_TRIM,
-		      height, False);
+			height, False);
 	}
 /* Move/size the scroll bar window.  */
 if (mask)
 	{
 if we just turned off scroll bar mode.
 But in that case we should not clear them.  */
 if (FRAME_HAS_VERTICAL_SCROLL_BARS (f))
 for (bar = FRAME_SCROLL_BARS (f); VECTORP (bar);
 	 bar = XSCROLL_BAR (bar)->next)
-XClearArea (FRAME_X_DISPLAY (f), SCROLL_BAR_X_WINDOW (XSCROLL_BAR (bar)),
+XClearArea (FRAME_X_DISPLAY (f),
+		  SCROLL_BAR_X_WINDOW (XSCROLL_BAR (bar)),
 		  0, 0, 0, 0, True);
 #endif /* not USE_TOOLKIT_SCROLL_BARS */
 }
 /* This processes Expose events from the menu-bar specific X event
 if (cursor_glyph == NULL)
 	goto mark_cursor_off;
 x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x),
-XClearArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-		  x,
+		    x,
-		  WINDOW_TO_FRAME_PIXEL_Y (w, max (header_line_height,
+		    WINDOW_TO_FRAME_PIXEL_Y (w, max (header_line_height,
-						   cursor_row->y)),
+						     cursor_row->y)),
-		  cursor_glyph->pixel_width,
+		    cursor_glyph->pixel_width,
-		  cursor_row->visible_height,
+		    cursor_row->visible_height,
-		  False);
+		    False);
 }
 /* Erase the cursor by redrawing the character underneath it.  */
 if (mouse_face_here_p)
 hl = DRAW_MOUSE_FACE;

Mercurial > emacs

comparison src/xterm.c @ 35581:3a46a6389078