mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-17 14:04:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression caused by overlay window support code

Browse Source 
Closing a window would not update the window layout, depending on the
position of the window in the current layout.
This commit is contained in:
Kovid Goyal
2018-02-15 09:16:00 +05:30
parent 6a51096304
commit 0bb8ec61e5
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
kitty/state.c
View File

@@ -448,16 +448,27 @@ PYWRAP1(mark_os_window_for_close) {
Py_RETURN_FALSE;
}
static inline bool
fix_window_idx(Tab *tab, id_type window_id, unsigned int *window_idx) {
for (id_type fix = 0; fix < tab->num_windows; fix++) {
if (tab->windows[fix].id == window_id) { *window_idx = fix; return true; }
}
return false;
}
PYWRAP1(set_window_render_data) {
#define A(name) &(d.name)
#define B(name) &(g.name)
id_type os_window_id, tab_id;
id_type os_window_id, tab_id, window_id;
unsigned int window_idx;
ScreenRenderData d = {0};
WindowGeometry g = {0};
PA("KKIffffOIIII", &os_window_id, &tab_id, &window_idx, A(xstart), A(ystart), A(dx), A(dy), A(screen), B(left), B(top), B(right), B(bottom));
PA("KKKIffffOIIII", &os_window_id, &tab_id, &window_id, &window_idx, A(xstart), A(ystart), A(dx), A(dy), A(screen), B(left), B(top), B(right), B(bottom));
WITH_TAB(os_window_id, tab_id);
if (tab->windows[window_idx].id != window_id) {
if (!fix_window_idx(tab, window_id, &window_idx)) Py_RETURN_NONE;
}
Py_CLEAR(tab->windows[window_idx].render_data.screen);
d.vao_idx = tab->windows[window_idx].render_data.vao_idx;
d.gvao_idx = tab->windows[window_idx].render_data.gvao_idx;
@@ -471,12 +482,15 @@ PYWRAP1(set_window_render_data) {
}
PYWRAP1(update_window_visibility) {
id_type os_window_id;
unsigned int window_idx, tab_id;
id_type os_window_id, tab_id, window_id;
unsigned int window_idx;
int visible;
PA("KIIp", &os_window_id, &tab_id, &window_idx, &visible);
PA("KKKIp", &os_window_id, &tab_id, &window_id, &window_idx, &visible);
WITH_TAB(os_window_id, tab_id);
tab->windows[window_idx].visible = visible & 1;
if (tab->windows[window_idx].id != window_id) {
if (!fix_window_idx(tab, window_id, &window_idx)) Py_RETURN_NONE;
}
tab->windows[window_idx].visible = visible & 1;
END_WITH_TAB;
Py_RETURN_NONE;
}