mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-09 05:35:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'us/master' of https://github.com/koekeishiya/kitty

Browse Source
This commit is contained in:
Kovid Goyal
2018-01-13 07:33:30 +05:30
parent 7780d52930 3695538a11
commit 5357a9a1cc
2 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
kitty/glfw.c
View File

@@ -143,12 +143,28 @@ scroll_callback(GLFWwindow *w, double xoffset, double yoffset) {
global_state.callback_os_window = NULL;
}
static struct {
id_type entries[16];
int next_entry;
} focus_history;
static inline id_type
pop_focus_history() {
int index = --focus_history.next_entry;
if (index < 0) {
focus_history.next_entry = index = 0;
}
id_type result = focus_history.entries[index];
focus_history.entries[index] = 0;
return result;
}
static inline void
push_focus_history(OSWindow *w) {
if (w->id != global_state.os_window_focus_history[1]) {
global_state.os_window_focus_history[0] = global_state.os_window_focus_history[1];
global_state.os_window_focus_history[1] = w->id;
}
focus_history.entries[focus_history.next_entry++] = w->id;
focus_history.next_entry %= (sizeof(focus_history.entries) / sizeof(*(focus_history.entries)));
}
static void
@@ -415,11 +431,17 @@ destroy_os_window(OSWindow *w) {
#ifdef __APPLE__
// On macOS when closing a window, any other existing windows belonging to the same application do not
// automatically get focus, so we do it manually.
for (size_t i = 0; i < global_state.num_os_windows; i++) {
OSWindow *c = global_state.os_windows + i;
if (c->id != w->id && c->handle && c->shown_once && (c->id == global_state.os_window_focus_history[0] || c->id == global_state.os_window_focus_history[1])) {
glfwFocusWindow(c->handle);
break;
bool change_focus = true;
while (change_focus) {
id_type new_focus_id = pop_focus_history();
if (new_focus_id == 0) break;
for (size_t i = 0; i < global_state.num_os_windows; i++) {
OSWindow *c = global_state.os_windows + i;
if (c->id != w->id && c->handle && c->shown_once && (c->id == new_focus_id)) {
glfwFocusWindow(c->handle);
change_focus = false;
break;
}
}
}
#endif

1
kitty/state.h
View File

@@ -128,7 +128,6 @@ typedef struct {
bool is_wayland;
bool debug_gl;
bool has_pending_resizes;
id_type os_window_focus_history[2];
} GlobalState;
extern GlobalState global_state;