From 4b7d44c3c81e6458da81e2f2b8e183a867409ade Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 21 Nov 2016 14:09:07 +0530 Subject: [PATCH] Remove unused code --- kitty/char_grid.py | 11 +++-------- kitty/develop_gl.py | 4 ++-- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/kitty/char_grid.py b/kitty/char_grid.py index 26af008bb..a69b2c9ee 100644 --- a/kitty/char_grid.py +++ b/kitty/char_grid.py @@ -16,16 +16,13 @@ from .fast_data_types import ( glBlendFunc, GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, glClear, GL_COLOR_BUFFER_BIT, glClearColor, glViewport, glUniform2ui, glUniform4f, glUniform1i, glUniform2f, glDrawArraysInstanced, GL_TRIANGLE_FAN, - glEnable, glDisable, GL_BLEND, glDrawArrays, ColorProfile, REVERSE, + glEnable, glDisable, GL_BLEND, glDrawArrays, ColorProfile, CURSOR_BEAM, CURSOR_BLOCK, CURSOR_UNDERLINE ) Size = namedtuple('Size', 'width height') Cursor = namedtuple('Cursor', 'x y hidden shape color blink') ScreenGeometry = namedtuple('ScreenGeometry', 'xstart ystart xnum ynum dx dy') -COL_MASK = 0xFFFFFFFF -COL_SHIFT = 32 -REVERSE_MASK = 1 << REVERSE # cell shader {{{ @@ -112,7 +109,7 @@ void main() { # }}} -def calculate_vertices(cell_width, cell_height, screen_width, screen_height): +def calculate_screen_geometry(cell_width, cell_height, screen_width, screen_height): xnum = screen_width // cell_width ynum = screen_height // cell_height dx, dy = 2 * cell_width / screen_width, 2 * cell_height / screen_height @@ -139,8 +136,6 @@ class RenderData: if val is not None: setattr(self, k, val) -empty_cell = (' ', 0) - def color_as_int(val): return val[0] << 16 | val[1] << 8 | val[2] @@ -198,7 +193,7 @@ class CharGrid: def do_layout(self, w, h): self.width, self.height = w, h - self.screen_geometry = sg = calculate_vertices(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.sprite_map = (c_uint * (sg.ynum * sg.xnum * 9))() self.update_cell_data(add_viewport_data=True) diff --git a/kitty/develop_gl.py b/kitty/develop_gl.py index 181a495ec..695b75a27 100644 --- a/kitty/develop_gl.py +++ b/kitty/develop_gl.py @@ -8,7 +8,7 @@ import ctypes from kitty.shaders import ShaderProgram, GL_VERSION, Sprites from kitty.fonts import set_font_family, cell_size -from kitty.char_grid import calculate_vertices, cell_shader +from kitty.char_grid import calculate_screen_geometry, cell_shader from kitty.fast_data_types import ( glViewport, enable_automatic_opengl_error_checking, glClearColor, glUniform2f, glUniform4f, glUniform2ui, glUniform1i, glewInit, glGetString, @@ -54,7 +54,7 @@ class Renderer: cell_width, cell_height = cell_size() self.sprites.do_layout(cell_width, cell_height) self.sprites.ensure_state() - self.screen_geometry = sg = calculate_vertices(cell_width, cell_height, self.w, self.h) + self.screen_geometry = sg = calculate_screen_geometry(cell_width, cell_height, self.w, self.h) data = (ctypes.c_uint * (sg.xnum * sg.ynum * 9))() lb = LineBuf(sg.ynum, sg.xnum) i = -1