From 534c20b22f89ffbe99a4d6a1035b74eacc544ee5 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Wed, 8 May 2002 21:32:00 +0000 Subject: [PATCH] (x_draw_image_foreground, x_draw_image_foreground_1): Enlarge cursor rectangle drawn around image with non-zero relief. --- src/macterm.c | 16 ++++++++++++---- src/xterm.c | 16 ++++++++++++---- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/macterm.c b/src/macterm.c index 5fb67a9a588..15a63c58bd2 100644 --- a/src/macterm.c +++ b/src/macterm.c @@ -4395,8 +4395,12 @@ x_draw_image_foreground (s) the image. I believe it's looking better if we do nothing here for mouse-face. */ if (s->hl == DRAW_CURSOR) - mac_draw_rectangle (s->display, s->window, s->gc, x, y, - s->img->width - 1, s->img->height - 1); + { + int r = s->img->relief; + if (r < 0) r = -r; + mac_draw_rectangle (s->display, s->window, s->gc, x - r, y - r, + s->img->width + r*2 - 1, s->img->height + r*2 - 1); + } } } else @@ -4514,8 +4518,12 @@ x_draw_image_foreground_1 (s, pixmap) the image. I believe it's looking better if we do nothing here for mouse-face. */ if (s->hl == DRAW_CURSOR) - mac_draw_rectangle_to_pixmap (s->display, pixmap, s->gc, x, y, - s->img->width - 1, s->img->height - 1); + { + int r = s->img->relief; + if (r < 0) r = -r; + mac_draw_rectangle_to_pixmap (s->display, pixmap, s->gc, x - r, y - r, + s->img->width + r*2 - 1, s->img->height + r*2 - 1); + } } } else diff --git a/src/xterm.c b/src/xterm.c index d66f719fc9f..c87d8981daf 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -4116,8 +4116,12 @@ x_draw_image_foreground (s) the image. I believe it's looking better if we do nothing here for mouse-face. */ if (s->hl == DRAW_CURSOR) - XDrawRectangle (s->display, s->window, s->gc, x, y, - s->img->width - 1, s->img->height - 1); + { + int r = s->img->relief; + if (r < 0) r = -r; + XDrawRectangle (s->display, s->window, s->gc, x - r, y - r, + s->img->width + r*2 - 1, s->img->height + r*2 - 1); + } } } else @@ -4232,8 +4236,12 @@ x_draw_image_foreground_1 (s, pixmap) the image. I believe it's looking better if we do nothing here for mouse-face. */ if (s->hl == DRAW_CURSOR) - XDrawRectangle (s->display, pixmap, s->gc, x, y, - s->img->width - 1, s->img->height - 1); + { + int r = s->img->relief; + if (r < 0) r = -r; + XDrawRectangle (s->display, s->window, s->gc, x - r, y - r, + s->img->width + r*2 - 1, s->img->height + r*2 - 1); + } } } else -- 2.39.5