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

Basic text rendering works

Browse Source
This commit is contained in:
Kovid Goyal
2016-10-15 16:47:17 +05:30
parent 0336873afc
commit 1875ea7eb4
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
kitty/term.py
View File

@@ -4,7 +4,7 @@
from typing import Tuple, Iterator, Union from typing import Tuple, Iterator, Union
from PyQt5.QtCore import pyqtSignal, QTimer, Qt, QRect from PyQt5.QtCore import pyqtSignal, QTimer, QRect
from PyQt5.QtGui import QColor, QPainter, QFont, QFontMetrics, QRegion, QPen from PyQt5.QtGui import QColor, QPainter, QFont, QFontMetrics, QRegion, QPen
from PyQt5.QtWidgets import QWidget from PyQt5.QtWidgets import QWidget
@@ -23,6 +23,7 @@ class TerminalWidget(QWidget):
relayout_lines = pyqtSignal(object, object) relayout_lines = pyqtSignal(object, object)
cells_per_line = 80 cells_per_line = 80
scroll_amount = 0
def __init__(self, opts, linebuf, parent=None): def __init__(self, opts, linebuf, parent=None):
QWidget.__init__(self, parent) QWidget.__init__(self, parent)
@@ -49,6 +50,7 @@ class TerminalWidget(QWidget):
self.font_metrics = fm = QFontMetrics(self.font()) self.font_metrics = fm = QFontMetrics(self.font())
self.cell_height = fm.lineSpacing() self.cell_height = fm.lineSpacing()
self.cell_width = ascii_width(fm) self.cell_width = ascii_width(fm)
self.baseline_offset = fm.ascent()
self.do_layout() self.do_layout()
def do_layout(self): def do_layout(self):
@@ -80,7 +82,9 @@ class TerminalWidget(QWidget):
def line(self, screen_line: int) -> Union[Line, None]: def line(self, screen_line: int) -> Union[Line, None]:
try: try:
lpos = len(self.linebuf) - self.lines_per_screen if self.lines_per_screen > len(self.linebuf):
return self.linebuf[screen_line]
lpos = max(0, len(self.linebuf) - self.lines_per_screen - self.scroll_amount)
return self.linebuf[lpos] return self.linebuf[lpos]
except IndexError: except IndexError:
pass pass
@@ -100,9 +104,6 @@ class TerminalWidget(QWidget):
p.restore() p.restore()
def paint_cell(self, painter: QPainter, line: Line, col: int, y: int) -> None: def paint_cell(self, painter: QPainter, line: Line, col: int, y: int) -> None:
char = line.char[col]
if not char:
return
x = self.cell_positions[col] x = self.cell_positions[col]
r = QRect(x, y, self.cell_width, self.cell_height) r = QRect(x, y, self.cell_width, self.cell_height)
t, r, g, b = line.fg[col] t, r, g, b = line.fg[col]
@@ -112,4 +113,6 @@ class TerminalWidget(QWidget):
bg = as_color(line.bg[col], self.ansi_bg) bg = as_color(line.bg[col], self.ansi_bg)
if bg is not None: if bg is not None:
painter.fillRect(r, bg) painter.fillRect(r, bg)
painter.drawText(r, Qt.AlignHCenter | Qt.AlignBaseline | Qt.TextSingleLine, char) char = line.char[col]
if char:
painter.drawText(x, y + self.baseline_offset, char)