From 7cc3aa8ce30990e12e7b102f61dfcaaf8baa4d16 Mon Sep 17 00:00:00 2001 From: Dylan Simon Date: Sun, 4 Oct 2009 17:30:23 -0400 Subject: Fix excessive redraw bug introduced by dbb8401026c421d64a2962e6ac6eb900f6dc141e Signed-off-by: Dylan Simon Signed-off-by: James Cloos --- Eyes.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/Eyes.c b/Eyes.c index 1bb36db..70905e8 100644 --- a/Eyes.c +++ b/Eyes.c @@ -137,7 +137,7 @@ static void Initialize ( * foreground - text, ticks black * border - border black (foreground) * - * This doesn't completely work since the parent has already made up a + * This doesn't completely work since the parent has already made up a * border. Sigh. */ if (w->eyes.reverse_video) { @@ -367,9 +367,13 @@ static void draw_eye(EyesWidget w, TPoint mouse, int eye1, int eye2) computePupils (mouse, newpupil); xpupil.x = Xx(w->eyes.pupil[0].x, w->eyes.pupil[0].y, &w->eyes.t); xpupil.y = Xy(w->eyes.pupil[0].x, w->eyes.pupil[0].y, &w->eyes.t); - xpupil.x = Xx(newpupil[0].x, newpupil[0].y, &w->eyes.t); - xpupil.y = Xy(newpupil[0].x, newpupil[0].y, &w->eyes.t); - if (!XPointEqual (xpupil, xnewpupil)) { + xnewpupil.x = Xx(newpupil[0].x, newpupil[0].y, &w->eyes.t); + xnewpupil.y = Xy(newpupil[0].x, newpupil[0].y, &w->eyes.t); + if ( +#ifdef XRENDER + w->eyes.picture ? !TPointEqual(w->eyes.pupil[0], newpupil[0]) : +#endif + !XPointEqual (xpupil, xnewpupil)) { if (w->eyes.pupil[0].x != TPOINT_NONE || w->eyes.pupil[0].y != TPOINT_NONE) eyeBall (w, FALSE, eye1); @@ -383,12 +387,15 @@ static void draw_eye(EyesWidget w, TPoint mouse, int eye1, int eye2) if (eye1 == eye2) return; - computePupils (mouse, newpupil); xpupil.x = Xx(w->eyes.pupil[1].x, w->eyes.pupil[1].y, &w->eyes.t); xpupil.y = Xy(w->eyes.pupil[1].x, w->eyes.pupil[1].y, &w->eyes.t); - xpupil.x = Xx(newpupil[1].x, newpupil[1].y, &w->eyes.t); - xpupil.y = Xy(newpupil[1].x, newpupil[1].y, &w->eyes.t); - if (!XPointEqual (xpupil, xnewpupil)) { + xnewpupil.x = Xx(newpupil[1].x, newpupil[1].y, &w->eyes.t); + xnewpupil.y = Xy(newpupil[1].x, newpupil[1].y, &w->eyes.t); + if ( +#ifdef XRENDER + w->eyes.picture ? !TPointEqual(w->eyes.pupil[1], newpupil[1]) : +#endif + !XPointEqual (xpupil, xnewpupil)) { if (w->eyes.pupil[1].x != TPOINT_NONE || w->eyes.pupil[1].y != TPOINT_NONE) eyeBall (w, FALSE, eye2); -- cgit v1.2.3