From: Jan Djärv Date: Thu, 17 Jun 2004 19:35:00 +0000 (+0000) Subject: * xterm.c (x_draw_image_foreground_1): Subtract slice.x/y from X-Git-Tag: ttn-vms-21-2-B4~5725 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=95911c74767b550f9c1fe6c315870c4d28f8eda3;p=emacs.git * xterm.c (x_draw_image_foreground_1): Subtract slice.x/y from clip_x/y_origin. --- diff --git a/src/ChangeLog b/src/ChangeLog index 298e2a5808d..2c1db9730f0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2004-06-17 Jan Dj,Ad(Brv + * xterm.c (x_draw_image_foreground_1): Subtract slice.x/y from + clip_x/y_origin. + * fns.c (string_to_multibyte): Use xmalloc/xfree instead of alloca. * macfns.c (Fx_display_color_cells): Do not limit return value to 256. diff --git a/src/xterm.c b/src/xterm.c index c7b0c2f0a45..d4a285f0558 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -2357,8 +2357,8 @@ x_draw_image_foreground_1 (s, pixmap) XGCValues xgcv; xgcv.clip_mask = s->img->mask; - xgcv.clip_x_origin = x; - xgcv.clip_y_origin = y; + xgcv.clip_x_origin = x - s->slice.x; + xgcv.clip_y_origin = y - s->slice.y; xgcv.function = GXcopy; XChangeGC (s->display, s->gc, mask, &xgcv);