tyler.durden/powerline
1
0
Fork 0
mirror of https://github.com/powerline/powerline.git synced 2025-07-23 13:55:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix width calculations when using UCS-2 Python

Browse Source
This commit is contained in:
ZyX 2014-12-04 22:43:46 +03:00
parent 9576738bfa
commit b5b033d512
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
powerline/renderer.py
View File

@ -9,7 +9,7 @@ from unicodedata import east_asian_width, combining
from itertools import chain
from powerline.theme import Theme
from powerline.lib.unicode import unichr
from powerline.lib.unicode import unichr, surrogate_pair_to_character
NBSP = ' '
@ -189,7 +189,34 @@ class Renderer(object):
:return: unsigned integer.
'''
return sum((0 if combining(symbol) else self.width_data[east_asian_width(symbol)] for symbol in string))
return sum(((
(
0
) if combining(symbol) else (
self.width_data[east_asian_width(symbol)]
)
) for symbol in string))
if sys.maxunicode < 0x10FFFF:
old_strwidth = strwidth
def strwidth(self, string):
return sum(((
(
self.width_data[
east_asian_width(
unichr(surrogate_pair_to_character(ord(string[i - 1]), ord(symbol)))
)
]
) if 0xDC00 <= ord(symbol) <= 0xDFFF else (
0
) if combining(symbol) or 0xD800 <= ord(symbol) <= 0xDBFF else (
self.width_data[east_asian_width(symbol)]
)
) for i, symbol in enumerate(string)))
strwidth.__doc__ = old_strwidth.__doc__
del old_strwidth
def get_theme(self, matcher_info):
'''Get Theme object.