Correct display of stretch glyphs within hscrolled windows

* src/haikuterm.c
(haiku_draw_glyphless_glyph_string_foreground): Make char2b
static, stifling a GCC warning.
(haiku_draw_stretch_glyph_string): Use computed X if s->x is
outside the confines of the text area.

diff --git a/src/haikuterm.c b/src/haikuterm.c
index 70984936bf940392885c384dfef919934534754e..b1a016b49a96556d8b829e6250570dda771197b7 100644 (file)
--- a/src/haikuterm.c
+++ b/src/haikuterm.c
@@ -1219,7 +1219,7 @@ static void
 haiku_draw_glyphless_glyph_string_foreground (struct glyph_string *s)
 {
   struct glyph *glyph = s->first_glyph;
-  unsigned char2b[8];
+  static unsigned char2b[8];
   int x, i, j;
   struct face *face = s->face;
   unsigned long color;
@@ -1399,7 +1399,7 @@ haiku_draw_stretch_glyph_string (struct glyph_string *s)
        }
 
       if (background_width > 0)
-       haiku_draw_background_rect (s, s->face, s->x, s->y,
+       haiku_draw_background_rect (s, s->face, x, s->y,
                                    background_width, s->height);
     }
   s->background_filled_p = 1;