KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

A spot of refactoring

Browse Source
This commit is contained in:
Kovid Goyal 2017-02-08 22:24:58 +05:30
parent b9b15d41f4
commit c58be6ddf5
1 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
kitty/fonts/fontconfig.py
View File

@ -28,6 +28,13 @@ def to_bool(x):
return x.lower() == 'true' return x.lower() == 'true'
def font_not_found(err, char):
msg = 'Failed to find font'
if char is not None:
msg = 'Failed to find font for character U+{:X}, error from fontconfig: {}'. format(ord(char[0]), err)
return FontNotFound(msg)
def get_font_subprocess( def get_font_subprocess(
family='monospace', family='monospace',
bold=False, bold=False,
@ -50,10 +57,13 @@ def get_font_subprocess(
query += ':weight=200' query += ':weight=200'
if italic: if italic:
query += ':slant=100' query += ':slant=100'
raw = subprocess.check_output([ try:
'fc-match', query, '-f', raw = subprocess.check_output([
'%{file}\x1e%{hinting}\x1e%{hintstyle}\x1e%{scalable}\x1e%{outline}\x1e%{weight}\x1e%{slant}\x1e%{index}' 'fc-match', query, '-f',
]).decode('utf-8') '%{file}\x1e%{hinting}\x1e%{hintstyle}\x1e%{scalable}\x1e%{outline}\x1e%{weight}\x1e%{slant}\x1e%{index}'
]).decode('utf-8')
except subprocess.CalledProcessError as err:
raise font_not_found(err, character)
parts = raw.split('\x1e') parts = raw.split('\x1e')
try: try:
path, hinting, hintstyle, scalable, outline, weight, slant, index = parts path, hinting, hintstyle, scalable, outline, weight, slant, index = parts
@ -78,10 +88,13 @@ def get_font_lib(
character=None, character=None,
dpi=None dpi=None
): ):
path, index, hintstyle, hinting, scalable, outline, weight, slant = get_fontconfig_font( try:
family, bold, italic, allow_bitmaped_fonts, size_in_pts or 0, path, index, hintstyle, hinting, scalable, outline, weight, slant = get_fontconfig_font(
0 if character is None else ord(character[0]), dpi or 0 family, bold, italic, allow_bitmaped_fonts, size_in_pts or 0,
) 0 if character is None else ord(character[0]), dpi or 0
)
except KeyError as err:
raise font_not_found(err, character)
return Font( return Font(
path, hinting, hintstyle, bold, italic, scalable, outline, weight, path, hinting, hintstyle, bold, italic, scalable, outline, weight,
@ -101,21 +114,15 @@ def find_font_for_character(
size_in_pts=None, size_in_pts=None,
dpi=None dpi=None
): ):
try: ans = get_font(
ans = get_font( family,
family, bold,
bold, italic,
italic, character=char,
character=char, allow_bitmaped_fonts=allow_bitmaped_fonts,
allow_bitmaped_fonts=allow_bitmaped_fonts, size_in_pts=size_in_pts,
size_in_pts=size_in_pts, dpi=dpi
dpi=dpi )
)
except (KeyError, subprocess.CalledProcessError) as err:
raise FontNotFound(
'Failed to find font for character U+{:X}, error from fontconfig: {}'.
format(ord(char[0]), err)
)
if not ans.face or not os.path.exists(ans.face): if not ans.face or not os.path.exists(ans.face):
raise FontNotFound( raise FontNotFound(
'Failed to find font for character U+{:X}'.format(ord(char[0])) 'Failed to find font for character U+{:X}'.format(ord(char[0]))