A spot of refactoring

kitty/boss.py

@@ -30,7 +30,7 @@ from .char_grid import load_shader_programs
 from .constants import is_key_pressed
 from .keys import interpret_text_event, interpret_key_event, get_shortcut, get_sent_data
 from .session import create_session
-from .shaders import Sprites, ShaderProgram
+from .shaders import Sprites
 from .tabs import TabManager, SpecialWindow
 from .timers import Timers
 from .utils import handle_unix_signals, safe_print, pipe2
@@ -100,9 +100,7 @@ class Boss(Thread):
         glfw_window.window_focus_callback = self.on_focus
         self.tab_manager = TabManager(opts, args, startup_session)
         self.sprites = Sprites()
-        cell_shader, cursor_shader = load_shader_programs()
-        self.cell_program = ShaderProgram(*cell_shader)
-        self.cursor_program = ShaderProgram(*cursor_shader)
+        self.cell_program, self.cursor_program = load_shader_programs()
         self.borders_program = BordersProgram()
         glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)
         self.sprites.do_layout(cell_size.width, cell_size.height)

kitty/char_grid.py

@@ -20,7 +20,7 @@ from .fast_data_types import (
     glUniform4f, glUniform2i
 )
 from .rgb import to_color
-from .shaders import load_shaders
+from .shaders import load_shaders, ShaderProgram
 from .utils import (
     color_as_int, color_from_int, get_logical_dpi, open_url, safe_print,
     set_primary_selection
@@ -36,9 +36,9 @@ class DynamicColor(Enum):
 def load_shader_programs():
     vert, frag = load_shaders('cell')
     vert = vert.replace('STRIDE', str(DATA_CELL_SIZE))
-    cell = vert, frag
+    cell = ShaderProgram(vert, frag)
     cursor = load_shaders('cursor')
-    return cell, cursor
+    return cell, ShaderProgram(*cursor)
 
 
 class Selection:  # {{{