CERBERUS/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2026-06-25 18:37:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'master' of https://github.com/rbong/kitty

Browse source
This commit is contained in:
Kovid Goyal 2024-07-31 07:34:43 +05:30
commit 5166915686
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
2 changed files with 125 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
kitty/fonts.c
View file

@ -608,6 +608,7 @@ START_ALLOW_CASE_RANGE
case 0xe0b0 ... 0xe0bf: case 0xe0d6 ... 0xe0d7: // powerline box drawing
case 0xee00 ... 0xee0b: // fira code progress bar/spinner
case 0x1fb00 ... 0x1fbae: // symbols for legacy computing
case 0xf5d0 ... 0xf5fb: // branch drawing characters
return BOX_FONT;
default:
*is_emoji_presentation = has_emoji_presentation(cpu_cell, gpu_cell);
@ -648,6 +649,8 @@ START_ALLOW_CASE_RANGE
return 0xf00 + ch - 0x2800; // IDs from 0xf00 to 0xfff
case 0x1fb00 ... 0x1fbae:
return 0x1000 + ch - 0x1fb00; // IDs from 0x1000 to 0x10ae
case 0xf5d0 ... 0xf5fb:
return 0x2000 + ch - 0xf5d0; // IDs from 0x2000 to 0x202b
default:
return 0xffff;
}

128
kitty/fonts/box_drawing.py
View file

@ -27,9 +27,9 @@ def thickness(level: int = 1, horizontal: bool = True) -> int:
return int(math.ceil(pts * (_dpi / 72.0)))
def draw_hline(buf: BufType, width: int, x1: int, x2: int, y: int, level: int) -> None:
' Draw a horizontal line between [x1, x2) centered at y with the thickness given by level '
sz = thickness(level=level, horizontal=False)
def draw_hline(buf: BufType, width: int, x1: int, x2: int, y: int, level: int, supersample_factor: int = 1) -> None:
' Draw a horizontal line between [x1, x2) centered at y with the thickness given by level and supersample factor '
sz = int(supersample_factor * thickness(level=level, horizontal=False))
start = y - sz // 2
for y in range(start, start + sz):
offset = y * width
@ -37,9 +37,9 @@ def draw_hline(buf: BufType, width: int, x1: int, x2: int, y: int, level: int) -
buf[offset + x] = 255
def draw_vline(buf: BufType, width: int, y1: int, y2: int, x: int, level: int) -> None:
' Draw a vertical line between [y1, y2) centered at x with the thickness given by level '
sz = thickness(level=level, horizontal=True)
def draw_vline(buf: BufType, width: int, y1: int, y2: int, x: int, level: int, supersample_factor: float = 1.0) -> None:
' Draw a vertical line between [y1, y2) centered at x with the thickness given by level and supersample factor '
sz = int(supersample_factor * thickness(level=level, horizontal=True))
start = x - sz // 2
for x in range(start, start + sz):
for y in range(y1, y2):
@ -329,6 +329,45 @@ def mid_lines(buf: SSByteArray, width: int, height: int, level: int = 1, pts: It
thick_line(buf, width, height, buf.supersample_factor * thickness(level), p1, p2)
def get_fading_lines(total_length: int, num: int = 1, fade: str = 'right') -> List[Tuple[int, int]]:
lines = []
if fade == 'left' or fade == 'up':
d1 = total_length
dir = -1
else:
d1 = 0
dir = 1
step = total_length // num
for i in range(num):
sz = step * (num - i) // (num + 1)
if sz >= step - 1 and step > 2:
sz = step - 2
d2 = d1 + dir * sz
lines.append(tuple(sorted((d1, d2))))
d1 += step * dir
return lines
@supersampled()
def fading_hline(buf: SSByteArray, width: int, height: int, level: int = 1, num: int = 1, fade: str = 'right') -> None:
factor = buf.supersample_factor
y = (height // 2 // factor) * factor
for x1, x2 in get_fading_lines(width, num, fade):
draw_hline(buf, width, x1, x2, y, level, supersample_factor = factor)
@supersampled()
def fading_vline(buf: SSByteArray, width: int, height: int, level: int = 1, num: int = 1, fade: str = 'down') -> None:
factor = buf.supersample_factor
x = (width // 2 // factor) * factor
for y1, y2 in get_fading_lines(height, num, fade):
draw_vline(buf, width, y1, y2, x, level, supersample_factor = factor)
ParameterizedFunc = Callable[[float], float]
@ -548,6 +587,38 @@ def spinner(buf: SSByteArray, width: int, height: int, level: int = 1, start: fl
draw_parametrized_curve(buf, width, height, level, arc_x, arc_y)
def draw_circle(buf: SSByteArray, width: int, height: int, scale: float = 1.0, gap: int = 0, invert: bool = False) -> None:
w, h = width // 2, height // 2
radius = int(scale * min(w, h) - gap / 2)
fill = 0 if invert else 255
for y in range(height):
for x in range(width):
if (x - w) ** 2 + (y - h) ** 2 <= radius ** 2:
buf[y * width + x] = fill
@supersampled()
def commit(buf: SSByteArray, width: int, height: int, level: int = 1, scale: float = 0.75, line: str = 'none', solid: bool = True) -> None:
' Draw a circular commit with the given scale. Commits can either be solid or hollow and can have vertical, horizontal, up, down, left, or right line(s) '
factor = buf.supersample_factor
# Round half width/height to supersample factor to avoid misalignment with non-supersampled lines
hwidth, hheight = factor * (width // 2 // factor), factor * (height // 2 // factor)
if line == 'horizontal' or line == 'right':
draw_hline(buf, width, hwidth, width, hheight, level, supersample_factor=factor)
if line == 'horizontal' or line == 'left':
draw_hline(buf, width, 0, hwidth, hheight, level, supersample_factor=factor)
if line == 'vertical' or line == 'down':
draw_vline(buf, width, hheight, height, hwidth, level, supersample_factor=factor)
if line == 'vertical' or line == 'up':
draw_vline(buf, width, 0, hheight, hwidth, level, supersample_factor=factor)
draw_circle(buf, width, height, scale=scale)
if not solid:
draw_circle(buf, width, height, scale=scale, gap=thickness(level) * factor, invert=True)
def half_dhline(buf: BufType, width: int, height: int, level: int = 1, which: str = 'left', only: Optional[str] = None) -> Tuple[int, int]:
x1, x2 = (0, width // 2) if which == 'left' else (width // 2, width)
gap = thickness(level + 1, horizontal=False)
@ -1231,6 +1302,51 @@ box_chars: Dict[str, List[Callable[[BufType, int, int], Any]]] = {
'🮬': [p(mid_lines, pts=('rt', 'lt', 'rb'))],
'🮭': [p(mid_lines, pts=('rt', 'lt', 'lb'))],
'🮮': [p(mid_lines, pts=('rt', 'rb', 'lt', 'lb'))],
'': [hline],
'': [vline],
'': [p(fading_hline, num=4, fade='right')],
'': [p(fading_hline, num=4, fade='left')],
'': [p(fading_vline, num=5, fade='down')],
'': [p(fading_vline, num=5, fade='up')],
'': [p(rounded_corner, which='╭')],
'': [p(rounded_corner, which='╮')],
'': [p(rounded_corner, which='╰')],
'': [p(rounded_corner, which='╯')],
'': [vline, p(rounded_corner, which='╰')],
'': [vline, p(rounded_corner, which='╭')],
'': [p(rounded_corner, which='╰'), p(rounded_corner, which='╭')],
'': [vline, p(rounded_corner, which='╯')],
'': [vline, p(rounded_corner, which='╮')],
'': [p(rounded_corner, which='╮'), p(rounded_corner, which='╯')],
'': [hline, p(rounded_corner, which='╮')],
'': [hline, p(rounded_corner, which='╭')],
'': [p(rounded_corner, which='╭'), p(rounded_corner, which='╮')],
'': [hline, p(rounded_corner, which='╯')],
'': [hline, p(rounded_corner, which='╰')],
'': [p(rounded_corner, which='╰'), p(rounded_corner, which='╯')],
'': [vline, p(rounded_corner, which='╰'), p(rounded_corner, which='╯')],
'': [vline, p(rounded_corner, which='╭'), p(rounded_corner, which='╮')],
'': [hline, p(rounded_corner, which='╮'), p(rounded_corner, which='╯')],
'': [hline, p(rounded_corner, which='╰'), p(rounded_corner, which='╭')],
'': [vline, p(rounded_corner, which='╭'), p(rounded_corner, which='╯')],
'': [vline, p(rounded_corner, which='╮'), p(rounded_corner, which='╰')],
'': [hline, p(rounded_corner, which='╭'), p(rounded_corner, which='╯')],
'': [hline, p(rounded_corner, which='╮'), p(rounded_corner, which='╰')],
'': [commit],
'': [p(commit, solid=False)],
'': [p(commit, line='right')],
'': [p(commit, solid=False, line='right')],
'': [p(commit, line='left')],
'': [p(commit, solid=False, line='left')],
'': [p(commit, line='horizontal')],
'': [p(commit, solid=False, line='horizontal')],
'': [p(commit, line='down')],
'': [p(commit, solid=False, line='down')],
'': [p(commit, line='up')],
'': [p(commit, solid=False, line='up')],
'': [p(commit, line='vertical')],
'': [p(commit, solid=False, line='vertical')],
}
t, f = 1, 3