And fix _cursor_ display on double-width double-width characters (as