*** empty log message ***

diff --git a/doc/rxvt-unicode.spec b/doc/rxvt-unicode.spec
index 4db91246d5082dd2998b83a5fae069b1bf02b8ee..758af4a2dfc65e2727b6a7836ed719871a1854e4 100644 (file)
--- a/doc/rxvt-unicode.spec
+++ b/doc/rxvt-unicode.spec
@@ -1,5 +1,5 @@
 Name: rxvt-unicode
-Version: 4.1
+Version: 4.2
 Release: 1
 Summary: rxvt-unicode is an unicode version of rxvt
 License: GPL
@@ -43,6 +43,10 @@ tic -o $RPM_BUILD_ROOT/%_datadir/terminfo doc/etc/rxvt-unicode.terminfo
 %{_mandir}/man7/*
 %{_datadir}/terminfo/r/*
 
+
 %changelog
+* Mon Dec 01 2004 vherva@babbage 4.2-1
+- 4.2
+
 * Mon Nov 27 2004 vherva@babbage 4.1-1
 - 4.1

diff --git a/src/rxvtfont.C b/src/rxvtfont.C
index 3f602fe7a3aa53cde1c5bd477498b4b875c602b2..b6c3452fd67b64c613fdf964017a19be5292bf41 100644 (file)
--- a/src/rxvtfont.C
+++ b/src/rxvtfont.C
@@ -345,9 +345,14 @@ rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
           uint32_t *a = linedraw_command + (offs >> 4);
           uint32_t *b = a + (offs & 15);
 
-          int W = r->TermWin.fwidth * wcwidth (t);
+          int W = r->TermWin.fwidth;
           int H = r->TermWin.fheight;
 
+          // support double-width (but not more) graphics chars
+          // TODO: do this outside the if/elsif.. statement for all cases
+          if (len && *text == NOCHAR)
+            W += r->TermWin.fwidth;
+
           int x_[16];
           int y_[16];