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

Fix resize debounce implementation

Browse Source
This commit is contained in:
Kovid Goyal 2018-02-02 12:21:59 +05:30
parent 9b0ffdbf5a
commit 4c53a74fa9
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kitty/child-monitor.c
View File

@ -692,10 +692,10 @@ process_pending_resizes(double now) {
for (size_t i = 0; i < global_state.num_os_windows; i++) { for (size_t i = 0; i < global_state.num_os_windows; i++) {
OSWindow *w = global_state.os_windows + i; OSWindow *w = global_state.os_windows + i;
if (w->has_pending_resizes) { if (w->has_pending_resizes) {
if (now - w->last_resize_at >= RESIZE_DEBOUNCE_TIME) update_os_window_viewport(w, true); if (now - w->last_resize_event_at >= RESIZE_DEBOUNCE_TIME) update_os_window_viewport(w, true);
else { else {
global_state.has_pending_resizes = true; global_state.has_pending_resizes = true;
set_maximum_wait(RESIZE_DEBOUNCE_TIME - now + w->last_resize_at); set_maximum_wait(RESIZE_DEBOUNCE_TIME - now + w->last_resize_event_at);
} }
} }
} }

11
kitty/glfw.c
View File

@ -27,10 +27,11 @@ update_os_window_viewport(OSWindow *window, bool notify_boss) {
bool dpi_changed = (xr != 0.0 && xr != window->viewport_x_ratio) || (yr != 0.0 && yr != window->viewport_y_ratio); bool dpi_changed = (xr != 0.0 && xr != window->viewport_x_ratio) || (yr != 0.0 && yr != window->viewport_y_ratio);
window->viewport_size_dirty = true; window->viewport_size_dirty = true;
window->has_pending_resizes = false; window->has_pending_resizes = false;
window->viewport_width = MAX(window->viewport_width, 100);
window->viewport_height = MAX(window->viewport_height, 100);
if (notify_boss) { if (notify_boss) {
call_boss(on_window_resize, "KiiO", window->id, window->viewport_width, window->viewport_height, dpi_changed ? Py_True : Py_False); call_boss(on_window_resize, "KiiO", window->id, window->viewport_width, window->viewport_height, dpi_changed ? Py_True : Py_False);
} }
window->last_resize_at = monotonic();
} }
@ -77,13 +78,9 @@ static void
framebuffer_size_callback(GLFWwindow *w, int width, int height) { framebuffer_size_callback(GLFWwindow *w, int width, int height) {
if (!set_callback_window(w)) return; if (!set_callback_window(w)) return;
if (width > 100 && height > 100) { if (width > 100 && height > 100) {
double now = monotonic();
OSWindow *window = global_state.callback_os_window; OSWindow *window = global_state.callback_os_window;
if (now - window->last_resize_at < RESIZE_DEBOUNCE_TIME) { window->has_pending_resizes = true; global_state.has_pending_resizes = true; } window->has_pending_resizes = true; global_state.has_pending_resizes = true;
else { window->last_resize_event_at = monotonic();
update_os_window_viewport(global_state.callback_os_window, is_window_ready_for_callbacks());
glfwPostEmptyEvent();
}
} else fprintf(stderr, "Ignoring resize request for tiny size: %dx%d\n", width, height); } else fprintf(stderr, "Ignoring resize request for tiny size: %dx%d\n", width, height);
global_state.callback_os_window = NULL; global_state.callback_os_window = NULL;
} }

4
kitty/state.h
View File

@ -107,7 +107,7 @@ typedef struct {
PyObject *window_title; PyObject *window_title;
bool is_key_pressed[MAX_KEY_COUNT]; bool is_key_pressed[MAX_KEY_COUNT];
bool viewport_size_dirty; bool viewport_size_dirty;
double last_resize_at; double last_resize_event_at;
bool has_pending_resizes; bool has_pending_resizes;
bool is_semi_transparent; bool is_semi_transparent;
bool shown_once; bool shown_once;
@ -141,7 +141,7 @@ extern GlobalState global_state;
else Py_DECREF(cret_); \ else Py_DECREF(cret_); \
} }
#define RESIZE_DEBOUNCE_TIME 0.2 #define RESIZE_DEBOUNCE_TIME 0.1
void gl_init(); void gl_init();
void remove_vao(ssize_t vao_idx); void remove_vao(ssize_t vao_idx);