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

Start work on displaying scrollback

Browse Source
This commit is contained in:
Kovid Goyal 2016-11-21 14:57:02 +05:30
parent 63934feaa9
commit 96d8d29154
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kitty/char_grid.py
View File

@ -145,6 +145,7 @@ class CharGrid:
def __init__(self, screen, opts, window_width, window_height): def __init__(self, screen, opts, window_width, window_height):
self.lock = Lock() self.lock = Lock()
self.scrolled_by = 0
self.dpix, self.dpiy = get_logical_dpi() self.dpix, self.dpiy = get_logical_dpi()
self.width, self.height = window_width, window_height self.width, self.height = window_width, window_height
self.color_profile = ColorProfile() self.color_profile = ColorProfile()
@ -195,7 +196,8 @@ class CharGrid:
self.width, self.height = w, h self.width, self.height = w, h
self.screen_geometry = sg = calculate_screen_geometry(self.cell_width, self.cell_height, self.width, self.height) self.screen_geometry = sg = calculate_screen_geometry(self.cell_width, self.cell_height, self.width, self.height)
self.screen.resize(sg.ynum, sg.xnum) self.screen.resize(sg.ynum, sg.xnum)
self.sprite_map = (c_uint * (sg.ynum * sg.xnum * 9))() self.main_sprite_map = (c_uint * (sg.ynum * sg.xnum * 9))()
self.scroll_sprite_map = (c_uint * (sg.ynum * sg.xnum * 9))()
self.update_cell_data(add_viewport_data=True) self.update_cell_data(add_viewport_data=True)
self.clear_count = 4 self.clear_count = 4
@ -220,13 +222,15 @@ class CharGrid:
if add_viewport_data: if add_viewport_data:
rd.viewport = Size(self.width, self.height) rd.viewport = Size(self.width, self.height)
rd.screen_geometry = self.screen_geometry rd.screen_geometry = self.screen_geometry
ptr = addressof(self.sprite_map)
with self.lock: with self.lock:
cursor_changed = self.screen.update_cell_data( cursor_changed = self.screen.update_cell_data(
self.sprites.backend, self.color_profile, ptr, self.default_fg, self.default_bg, add_viewport_data) self.sprites.backend, self.color_profile, addressof(self.main_sprite_map), self.default_fg, self.default_bg, add_viewport_data)
if self.scrolled_by:
self.screen.set_scroll_cell_data(
self.sprites.backend, self.color_profile, addressof(self.main_sprite_map), self.default_fg, self.default_bg,
self.scrolled_by, addressof(self.scroll_sprite_map))
rd.cell_data = copy(self.sprite_map) rd.cell_data = copy(self.scroll_sprite_map if self.scrolled_by else self.main_sprite_map)
rd.sprite_layout = self.sprites.layout
if cursor_changed: if cursor_changed:
c = self.screen.cursor c = self.screen.cursor
rd.cursor = Cursor(c.x, c.y, c.hidden, c.shape, c.color, c.blink) rd.cursor = Cursor(c.x, c.y, c.hidden, c.shape, c.color, c.blink)
@ -249,7 +253,7 @@ class CharGrid:
return return
sg = data.screen_geometry sg = data.screen_geometry
self.render_cells(sg, data.sprite_layout) self.render_cells(sg, data.sprite_layout)
if not data.cursor.hidden: if not data.cursor.hidden and not self.scrolled_by:
self.render_cursor(sg, data.cursor) self.render_cursor(sg, data.cursor)
def get_all_render_changes(self): def get_all_render_changes(self):