Progress

Author: Luflosi

kitty/child-monitor.c

@@ -617,11 +617,11 @@ static inline void
 render_os_window(OSWindow *os_window, double now, unsigned int active_window_id, color_type active_window_bg, unsigned int num_visible_windows) {
     static bool first_time = true;
     if (first_time) {
-        setup_scroll(os_window->viewport_width, os_window->viewport_height);
+        setup_scroll(os_window);
         first_time = false;
     }
     // ensure all pixels are cleared to background color at least once in every buffer
-    if (os_window->clear_count++ < 3) blank_os_window(os_window);
+    if (os_window->clear_count++ < 2) blank_os_window(os_window);
     Tab *tab = os_window->tabs + os_window->active_tab;
     BorderRects *br = &tab->border_rects;
     bool static_live_resize_in_progress = os_window->live_resize.in_progress && OPT(resize_draw_strategy) == RESIZE_DRAW_STATIC;
@@ -644,8 +644,7 @@ render_os_window(OSWindow *os_window, double now, unsigned int active_window_id,
                 double bell_left = global_state.opts.visual_bell_duration - (now - WD.screen->start_visual_bell_at);
                 set_maximum_wait(bell_left);
             }
-            double pixels = get_scrolled_by_pixels(WD.screen);
-            after_render(pixels / os_window->viewport_height * 2);
+            after_render(os_window, (WD.screen->scrolled_by_pixels * 2.0) / os_window->viewport_height);
             w->cursor_visible_at_last_render = WD.screen->cursor_render_info.is_visible; w->last_cursor_x = WD.screen->cursor_render_info.x; w->last_cursor_y = WD.screen->cursor_render_info.y; w->last_cursor_shape = WD.screen->cursor_render_info.shape;
         }
     }
@@ -711,7 +710,7 @@ render(double now) {
         bool needs_render = w->is_damaged || w->live_resize.in_progress;
         if (w->viewport_size_dirty) {
             w->clear_count = 0;
-            update_surface_size(w->viewport_width, w->viewport_height, w->offscreen_texture_id);
+            update_surface_size(w->viewport_width, w->viewport_height, w->offscreen_texture_id, w->scroll_texture_id);
             w->viewport_size_dirty = false;
             needs_render = true;
         }

kitty/gl.h

@@ -67,8 +67,12 @@ gl_init() {
 }
 
 void
-update_surface_size(int w, int h, GLuint offscreen_texture_id) {
+update_surface_size(int w, int h, GLuint offscreen_texture_id, GLuint scroll_texture_id) {
     glViewport(0, 0, w, h);
+    if (scroll_texture_id) {
+        glBindTexture(GL_TEXTURE_2D, scroll_texture_id);
+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
+    }
     if (offscreen_texture_id) {
         glBindTexture(GL_TEXTURE_2D, offscreen_texture_id);
         glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);

kitty/glfw.c

@@ -160,7 +160,7 @@ framebuffer_size_callback(GLFWwindow *w, int width, int height) {
         window->live_resize.width = MAX(0, width); window->live_resize.height = MAX(0, height);
         window->live_resize.num_of_resize_events++;
         make_os_window_context_current(window);
-        update_surface_size(width, height, window->offscreen_texture_id);
+        update_surface_size(width, height, window->offscreen_texture_id, window->scroll_texture_id);
         request_tick_callback();
     } else log_error("Ignoring resize request for tiny size: %dx%d", width, height);
     global_state.callback_os_window = NULL;

kitty/mouse.c

@@ -602,9 +602,9 @@ scroll_event(double UNUSED xoffset, double yoffset, int flags) {
 
     if (is_high_resolution) {
         yoffset *= OPT(touch_scroll_multiplier);
-        double pixels = global_state.callback_os_window->pending_scroll_pixels + yoffset;
+        double pixels = screen->pending_scroll_pixels + yoffset;
         s = (int)round(pixels) / (int)global_state.callback_os_window->fonts_data->cell_height;
-        global_state.callback_os_window->pending_scroll_pixels = pixels - s * (int) global_state.callback_os_window->fonts_data->cell_height;
+        screen->pending_scroll_pixels = pixels - s * (int) global_state.callback_os_window->fonts_data->cell_height;
     } else {
         if (screen->linebuf == screen->main_linebuf || !screen->modes.mouse_tracking_mode) {
             // Only use wheel_scroll_multiplier if we are scrolling kitty scrollback or in mouse
@@ -621,8 +621,8 @@ scroll_event(double UNUSED xoffset, double yoffset, int flags) {
         if (s == 0 && yoffset != 0) s = yoffset > 0 ? 1 : -1;
     }
     bool upwards = s > 0;
-    int pixels = global_state.callback_os_window->pending_scroll_pixels;
-    //printf("asdf %f\n", pixels);
+    int pixels = screen->pending_scroll_pixels;
+    printf("asdf %d\n", pixels);
     if (screen->linebuf == screen->main_linebuf) {
         screen_history_scroll(screen, abs(s), upwards);
         if (screen->scrolled_by != 0) {

kitty/screen.c

@@ -1516,11 +1516,6 @@ screen_update_cell_data(Screen *self, void *address, FONTS_DATA_HANDLE fonts_dat
     }
 }
 
-double get_scrolled_by_pixels(Screen *self) {
-    return self->scrolled_by_pixels;
-}
-
-
 static inline bool
 is_selection_empty(Screen *self, unsigned int start_x, unsigned int start_y, unsigned int end_x, unsigned int end_y) {
     return (start_x >= self->columns || start_y >= self->lines || end_x >= self->columns || end_y >= self->lines || (start_x == end_x && start_y == end_y)) ? true : false;
@@ -2046,7 +2041,8 @@ screen_selection_range_for_word(Screen *self, index_type x, index_type *y1, inde
 #undef is_ok
 }
 
-void pixel_scroll(Screen *self, double amt) {
+void pixel_scroll(Screen *self, int amt) {
+    printf("pixel_scroll(%d)\n", amt);
     self->scrolled_by_pixels = amt;
     self->pixel_scroll_changed = true;
 }

kitty/screen.h

@@ -66,7 +66,8 @@ typedef struct {
 
     unsigned int columns, lines, margin_top, margin_bottom, charset, scrolled_by, last_selection_scrolled_by;
     unsigned int last_rendered_cursor_x, last_rendered_cursor_y;
-    double scrolled_by_pixels;
+    int scrolled_by_pixels;
+    double pending_scroll_pixels;
     CellPixelSize cell_size;
     OverlayLine overlay_line;
     id_type window_id;
@@ -180,13 +181,12 @@ bool screen_is_selection_dirty(Screen *self);
 bool screen_has_selection(Screen*);
 bool screen_invert_colors(Screen *self);
 void screen_update_cell_data(Screen *self, void *address, FONTS_DATA_HANDLE, bool cursor_has_moved);
-double get_scrolled_by_pixels(Screen *self);
 bool screen_is_cursor_visible(Screen *self);
 bool screen_selection_range_for_line(Screen *self, index_type y, index_type *start, index_type *end);
 bool screen_selection_range_for_word(Screen *self, index_type x, index_type *, index_type *, index_type *start, index_type *end, bool);
 void screen_start_selection(Screen *self, index_type x, index_type y, bool, SelectionExtendMode);
 void screen_update_selection(Screen *self, index_type x, index_type y, bool ended);
-void pixel_scroll(Screen *self, double amt);
+void pixel_scroll(Screen *self, int amt);
 bool screen_history_scroll(Screen *self, int amt, bool upwards);
 Line* screen_visual_line(Screen *self, index_type y);
 unsigned long screen_current_char_width(Screen *self);

kitty/shaders.c

@@ -155,7 +155,6 @@ typedef struct {
 static CellProgramLayout cell_program_layouts[NUM_PROGRAMS];
 static GLuint offscreen_framebuffer = 0;
 static GLuint scroll_framebuffer = 0;
-static unsigned int scroll_texture = 0;
 static unsigned int quadVAO, quadVBO;
 static ssize_t blit_vertex_array;
 
@@ -179,18 +178,18 @@ init_cell_program(void) {
     blit_vertex_array = create_vao();
 }
 
-void setup_scroll(int UNUSED width, int UNUSED height) {
+void setup_scroll(OSWindow *os_window) {
     glGenFramebuffers(1, &scroll_framebuffer);
     glBindFramebuffer(GL_FRAMEBUFFER, scroll_framebuffer);
-    glGenTextures(1, &scroll_texture);
-    glBindTexture(GL_TEXTURE_2D, scroll_texture);
-    printf("%d %d\n", width, height);
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL);
-    //glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, 640, 400, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL);
+    glGenTextures(1, &os_window->scroll_texture_id);
+    glBindTexture(GL_TEXTURE_2D, os_window->scroll_texture_id);
+    printf("%d %d\n", os_window->viewport_width, os_window->viewport_height);
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, os_window->viewport_width, os_window->viewport_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+    //glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 640, 400, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
     glBindTexture(GL_TEXTURE_2D, 0);
-    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, scroll_texture, 0);
+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, os_window->scroll_texture_id, 0);
 
     float quadVertices[] = { // vertex attributes for a quad that fills the entire screen in Normalized Device Coordinates.
         // positions   // texCoords
@@ -221,7 +220,7 @@ void before_render() {
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); // we're not using the stencil buffer now
 }
 
-void after_render(double pixels) {
+void after_render(OSWindow *os_window, double pixels) {
     // second pass
     glBindFramebuffer(GL_FRAMEBUFFER, 0); // back to default
     glClearColor(0.5f, 0.5f, 0.5f, 1.0f);
@@ -231,7 +230,7 @@ void after_render(double pixels) {
     bind_program(SCROLL_PROGRAM);
     glUniform1f(glGetUniformLocation(program_id(SCROLL_PROGRAM), "offset"), pixels);
     glBindVertexArray(quadVAO);
-    glBindTexture(GL_TEXTURE_2D, scroll_texture);
+    glBindTexture(GL_TEXTURE_2D, os_window->scroll_texture_id);
     glDrawArrays(GL_TRIANGLES, 0, 6);
 }
 

kitty/state.c

@@ -180,6 +180,7 @@ destroy_os_window_item(OSWindow *w) {
     }
     Py_CLEAR(w->window_title); Py_CLEAR(w->tab_bar_render_data.screen);
     if (w->offscreen_texture_id) free_texture(&w->offscreen_texture_id);
+    if (w->scroll_texture_id) free_texture(&w->scroll_texture_id);
     remove_vao(w->tab_bar_render_data.vao_idx);
     remove_vao(w->gvao_idx);
     free(w->tabs); w->tabs = NULL;

kitty/state.h

@@ -140,13 +140,12 @@ typedef struct {
     bool viewport_size_dirty;
     LiveResizeInfo live_resize;
     bool has_pending_resizes, is_semi_transparent, shown_once, is_damaged;
-    uint32_t offscreen_texture_id;
+    uint32_t offscreen_texture_id, scroll_texture_id;
     unsigned int clear_count;
     color_type last_titlebar_color;
     float background_opacity;
     FONTS_DATA_HANDLE fonts_data;
     id_type temp_font_group_id;
-    double pending_scroll_pixels;
     enum RENDER_STATE render_state;
     id_type last_focused_counter;
     ssize_t gvao_idx;
@@ -203,17 +202,17 @@ OSWindow* add_os_window(void);
 OSWindow* current_os_window(void);
 void os_window_regions(OSWindow*, Region *main, Region *tab_bar);
 bool drag_scroll(Window *, OSWindow*);
-void setup_scroll(int width, int height);
+void setup_scroll(OSWindow *os_window);
 void before_render();
-void after_render(double pixels);
+void after_render(OSWindow *os_window, double pixels);
 void draw_borders(ssize_t vao_idx, unsigned int num_border_rects, BorderRect *rect_buf, bool rect_data_is_dirty, uint32_t viewport_width, uint32_t viewport_height, color_type, unsigned int, OSWindow *w);
 ssize_t create_cell_vao(void);
 ssize_t create_graphics_vao(void);
 ssize_t create_border_vao(void);
 bool send_cell_data_to_gpu(ssize_t, ssize_t, float, float, float, float, Screen *, OSWindow *);
 void draw_cells(ssize_t, ssize_t, float, float, float, float, Screen *, OSWindow *, bool, bool);
 void draw_centered_alpha_mask(ssize_t gvao_idx, size_t screen_width, size_t screen_height, size_t width, size_t height, uint8_t *canvas);
-void update_surface_size(int, int, uint32_t);
+void update_surface_size(int, int, uint32_t, uint32_t);
 void free_texture(uint32_t*);
 void send_image_to_gpu(uint32_t*, const void*, int32_t, int32_t, bool, bool);
 void send_sprite_to_gpu(FONTS_DATA_HANDLE fg, unsigned int, unsigned int, unsigned int, pixel*);