Don't break a glyph run for a graphic, issue the draw and continue.

2007-02-23  Chris Wilson  <chris@chris-wilson.co.uk>

	* src/vte.c: (vte_terminal_draw_rows):
		Don't break a glyph run for a graphic, issue the draw
		and continue.


svn path=/trunk/; revision=1728

2 files changed, 22 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 13db6b8e..91d7adc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-02-23  Chris Wilson  <chris@chris-wilson.co.uk>
 
+	* src/vte.c: (vte_terminal_draw_rows):
+		Don't break a glyph run for a graphic, issue the draw
+		and continue.
+
+2007-02-23  Chris Wilson  <chris@chris-wilson.co.uk>
+
 	Cache the font metrics on the vte_xft_font, avoids having to remeasure
 	when opening a new terminal.
 
diff --git a/src/vte.c b/src/vte.c
index 9d92de97..85f7906d 100644
--- a/src/vte.c
+++ b/src/vte.c
@@ -9240,6 +9240,22 @@ vte_terminal_draw_rows(VteTerminal *terminal,
 							selected,
 							FALSE,
 							&nfore, &nback);
+					/* Graphic characters must be drawn individually. */
+					if (vte_unichar_is_local_graphic(cell->c)) {
+						if (vte_terminal_draw_graphic(terminal,
+									cell->c,
+									nfore, nback,
+									FALSE,
+									start_x + j * column_width,
+									y,
+									column_width,
+									cell->columns,
+									row_height)) {
+
+							j += cell->columns;
+							continue;
+						}
+					}
 					if (nfore != fore) {
 						break;
 					}
@@ -9247,10 +9263,6 @@ vte_terminal_draw_rows(VteTerminal *terminal,
 					if (nbold != bold) {
 						break;
 					}
-					/* Graphic characters must be drawn individually. */
-					if (vte_unichar_is_local_graphic(cell->c)) {
-						break;
-					}
 					/* Break up underlined/not-underlined text. */
 					nunderline = cell->underline;
 					if (nunderline != underline) {