*** empty log message ***

diff --git a/Changes b/Changes
index 605e150..3012d89 100644 (file)
--- a/Changes
+++ b/Changes
@@ -22,8 +22,6 @@ DUMB: support tex fonts
 
 TODO: http://www.cl.cam.ac.uk/~mgk25/ucs/scw-proposal.html
 
-TODO: strwidth bug
-TODO:
 TODO: 0:52 <mmc> I think, that urxvt has the same bug as rxvt: FocusIn detail=NotifyPointer 
 TODO:            (and I care only on case mode=NotifyGrab) is interpreted as FocusIn, so 
 TODO:            the cursor is filled (while the input focus is actually elsewhere).
@@ -39,6 +37,9 @@ TODO: http://triplefusion.net/system/macosx-clipboard
 8. 
         - fix the assumption that chars < 256 are single-width. Now
           only assume this for codepoints 32 to 126 (reported by Dai.H.).
+        - $term->strwidth returned wide chars as width 1, because some jerk
+          confused min and max. Fixing this also fixes xim-onthespot.
+          Reported by Takano Akio.
        - secondaryScroll is now enabled by default (as per the manpage),
           reported by exg.
         - correct the description of [percent]color rgba format in the manpage.

diff --git a/src/rxvtperl.xs b/src/rxvtperl.xs
index 68a3515..6051a20 100644 (file)
--- a/src/rxvtperl.xs
+++ b/src/rxvtperl.xs
@@ -1130,7 +1130,7 @@ rxvt_term::strwidth (SV *str)
             int w = WCWIDTH (*wc);
 
             if (w)
-              RETVAL += min (w, 1);
+              RETVAL += max (w, 1);
           }
         rxvt_pop_locale ();