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

Fix develop() not running from ssh session

Browse Source
This commit is contained in:
Kovid Goyal 2017-01-11 19:43:30 +05:30
parent e9d239ac83
commit 6c76f292f4
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kitty/fonts/core_text.py
View File

@ -10,9 +10,14 @@ main_font = {}
cell_width = cell_height = baseline = CellTexture = WideCellTexture = underline_thickness = underline_position = None cell_width = cell_height = baseline = CellTexture = WideCellTexture = underline_thickness = underline_position = None
def set_font_family(family, size_in_pts): def set_font_family(family, size_in_pts, ignore_dpi_failure=False):
global cell_width, cell_height, baseline, CellTexture, WideCellTexture, underline_thickness, underline_position global cell_width, cell_height, baseline, CellTexture, WideCellTexture, underline_thickness, underline_position
dpi = get_logical_dpi() try:
dpi = get_logical_dpi()
except Exception:
if not ignore_dpi_failure:
raise
dpi = (72, 72) # Happens when running via develop() in an ssh session
dpi = sum(dpi) / 2.0 dpi = sum(dpi) / 2.0
if family.lower() == 'monospace': if family.lower() == 'monospace':
family = 'Menlo' family = 'Menlo'
@ -63,13 +68,18 @@ def develop(sz=288):
import pickle import pickle
from kitty.fast_data_types import glfw_init from kitty.fast_data_types import glfw_init
from .render import render_string from .render import render_string
import os
try:
os.remove('/tmp/cell.data')
except EnvironmentError:
pass
glfw_init() glfw_init()
set_font_family('monospace', sz) set_font_family('monospace', sz, ignore_dpi_failure=True)
for (bold, italic), face in main_font.items(): for (bold, italic), face in main_font.items():
print('bold: {} italic: {} family:{} full name: {}'.format(bold, italic, face.family_name, face.full_name)) print('bold: {} italic: {} family:{} full name: {}'.format(bold, italic, face.family_name, face.full_name))
f = main_font[(False, False)] f = main_font[(False, False)]
for attr in 'units_per_em ascent descent leading underline_position underline_thickness scaled_point_sz'.split(): for attr in 'units_per_em ascent descent leading underline_position underline_thickness scaled_point_sz'.split():
print(attr, getattr(f, attr)) print(attr, getattr(f, attr))
print('cell_width: {}, cell_height: {}, baseline: {}'.format(cell_width, cell_height, baseline)) print('cell_width: {}, cell_height: {}, baseline: {}'.format(cell_width, cell_height, baseline))
buf, w, h = render_string(sz=200) buf, w, h = render_string()
open('/tmp/cell.data', 'wb').write(pickle.dumps((bytearray(buf), w, h))) open('/tmp/cell.data', 'wb').write(pickle.dumps((bytearray(buf), w, h)))

6
kitty/fonts/render.py
View File

@ -76,8 +76,7 @@ def display_bitmap(data, w, h):
img.show() img.show()
def render_string(text='\'Qing👁a⧽', sz=144, family='monospace'): def render_string(text='\'Qing👁a⧽'):
set_font_family(family, sz)
cells = [] cells = []
for c in text: for c in text:
f, s = render_cell(c, underline=2, strikethrough=True) f, s = render_cell(c, underline=2, strikethrough=True)
@ -90,4 +89,5 @@ def render_string(text='\'Qing👁a⧽', sz=144, family='monospace'):
def test_rendering(text='\'Ping👁a⧽', sz=144, family='monospace'): def test_rendering(text='\'Ping👁a⧽', sz=144, family='monospace'):
display_bitmap(*render_string(text, sz, family)) set_font_family(family, sz)
display_bitmap(*render_string(text))