From 9007623d0c217dc43e090fa9aa54f47f612f766d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 10 Feb 2020 07:27:40 +0530
Subject: [PATCH] macOS: Fix menubar title not updating on OS Window focus
 change

Fixes #2350
---
 docs/changelog.rst    |  2 ++
 kitty/boss.py         | 15 ++++++++++-----
 kitty/child-monitor.c | 27 ++++++++++++++++++++++++---
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 8b472deb6..0c884a9a8 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -31,6 +31,8 @@ To update |kitty|, :doc:`follow the instructions <binary>`.
 - Fix border/margin/padding sizes not being recalculated on DPI change
   (:iss:`2346`)
 
+- macOS: Fix menubar title not updating on OS Window focus change (:iss:`2350`)
+
 
 0.16.0 [2020-01-28]
 --------------------
diff --git a/kitty/boss.py b/kitty/boss.py
index 25cfac0ee..33daf4ecc 100644
--- a/kitty/boss.py
+++ b/kitty/boss.py
@@ -22,11 +22,12 @@ from .constants import (
 )
 from .fast_data_types import (
     ChildMonitor, background_opacity_of, change_background_opacity,
-    change_os_window_state, create_os_window, current_os_window,
-    destroy_global_data, focus_os_window, get_clipboard_string,
-    global_font_size, mark_os_window_for_close, os_window_font_size,
-    patch_global_colors, safe_pipe, set_background_image, set_clipboard_string,
-    set_in_sequence_mode, thread_write, toggle_fullscreen, toggle_maximized
+    change_os_window_state, cocoa_set_menubar_title, create_os_window,
+    current_os_window, destroy_global_data, focus_os_window,
+    get_clipboard_string, global_font_size, mark_os_window_for_close,
+    os_window_font_size, patch_global_colors, safe_pipe, set_background_image,
+    set_clipboard_string, set_in_sequence_mode, thread_write,
+    toggle_fullscreen, toggle_maximized
 )
 from .keys import get_shortcut, shortcut_matches
 from .layout import set_layout_options
@@ -627,6 +628,8 @@ class Boss:
             w = tm.active_window
             if w is not None:
                 w.focus_changed(focused)
+                if is_macos and focused:
+                    cocoa_set_menubar_title(w.title or '')
             tm.mark_tab_bar_dirty()
 
     def update_tab_bar_data(self, os_window_id):
@@ -648,6 +651,8 @@ class Boss:
             tm.destroy()
         for window_id in tuple(w.id for w in self.window_id_map.values() if getattr(w, 'os_window_id', None) == os_window_id):
             self.window_id_map.pop(window_id, None)
+        if not self.os_window_map and is_macos:
+            cocoa_set_menubar_title('')
         action = self.os_window_death_actions.pop(os_window_id, None)
         if action is not None:
             action()
diff --git a/kitty/child-monitor.c b/kitty/child-monitor.c
index 6113e5330..fb32a3139 100644
--- a/kitty/child-monitor.c
+++ b/kitty/child-monitor.c
@@ -512,15 +512,23 @@ collect_cursor_info(CursorRenderInfo *ans, Window *w, monotonic_t now, OSWindow
     ans->is_focused = os_window->is_focused;
 }
 
+static inline void
+change_menubar_title(PyObject *title UNUSED) {
+#ifdef __APPLE__
+    static PyObject *current_title = NULL;
+    if (title != current_title) {
+        current_title = title;
+        if (title && OPT(macos_show_window_title_in) & MENUBAR) cocoa_update_menu_bar_title(title);
+    }
+#endif
+}
+
 static inline bool
 update_window_title(Window *w, OSWindow *os_window) {
     if (w->title && w->title != os_window->window_title) {
         os_window->window_title = w->title;
         Py_INCREF(os_window->window_title);
         set_os_window_title(os_window, PyUnicode_AsUTF8(w->title));
-#ifdef __APPLE__
-        if (os_window->is_focused && (OPT(macos_show_window_title_in) & MENUBAR)) cocoa_update_menu_bar_title(w->title);
-#endif
         return true;
     }
     return false;
@@ -661,6 +669,7 @@ render(monotonic_t now, bool input_read) {
         if (!w->num_tabs) continue;
         if (!should_os_window_be_rendered(w)) {
             update_os_window_title(w);
+            if (w->is_focused) change_menubar_title(w->window_title);
             continue;
         }
         if (USE_RENDER_FRAMES && w->render_state != RENDER_FRAME_READY) {
@@ -691,6 +700,7 @@ render(monotonic_t now, bool input_read) {
         if (w->last_active_window_id != active_window_id || w->last_active_tab != w->active_tab || w->focused_at_last_render != w->is_focused) needs_render = true;
         if (w->render_calls < 3 && w->bgimage && w->bgimage->texture_id) needs_render = true;
         if (needs_render) render_os_window(w, now, active_window_id, active_window_bg, num_visible_windows, all_windows_have_same_bg);
+        if (w->is_focused) change_menubar_title(w->window_title);
     }
     last_render_at = now;
 #undef TD
@@ -1557,12 +1567,23 @@ safe_pipe(PyObject *self UNUSED, PyObject *args) {
     return Py_BuildValue("ii", fds[0], fds[1]);
 }
 
+static PyObject*
+cocoa_set_menubar_title(PyObject *self UNUSED, PyObject *args UNUSED) {
+#ifdef __APPLE__
+    PyObject *title = NULL;
+    if (!PyArg_ParseTuple(args, "U", &title)) return NULL;
+    change_menubar_title(title);
+#endif
+    Py_RETURN_NONE;
+}
+
 static PyMethodDef module_methods[] = {
     METHODB(safe_pipe, METH_VARARGS),
     {"add_timer", (PyCFunction)add_python_timer, METH_VARARGS, ""},
     {"remove_timer", (PyCFunction)remove_python_timer, METH_VARARGS, ""},
     METHODB(monitor_pid, METH_VARARGS),
     {"set_iutf8_winid", (PyCFunction)pyset_iutf8, METH_VARARGS, ""},
+    METHODB(cocoa_set_menubar_title, METH_VARARGS),
     {NULL}  /* Sentinel */
 };