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

Move call to cocoa_window.m

Browse Source
This commit is contained in:
Alex Lau 2018-04-26 12:42:56 -07:00
parent b7b64ec513
commit b7f4f2e898
5 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kitty/cocoa_window.m
View File

@ -228,10 +228,9 @@ macos_change_titlebar_color(PyObject *self UNUSED, PyObject *val) {
Py_RETURN_NONE; Py_RETURN_NONE;
} }
static PyObject* void
macos_set_hide_from_tasks(PyObject *self UNUSED, PyObject *val UNUSED) { cocoa_set_hide_from_tasks(void) {
[NSApp setActivationPolicy:NSApplicationActivationPolicyAccessory]; [NSApp setActivationPolicy:NSApplicationActivationPolicyAccessory];
Py_RETURN_NONE;
} }
void void
@ -266,7 +265,6 @@ static PyMethodDef module_methods[] = {
{"cocoa_get_lang", (PyCFunction)cocoa_get_lang, METH_NOARGS, ""}, {"cocoa_get_lang", (PyCFunction)cocoa_get_lang, METH_NOARGS, ""},
{"cwd_of_process", (PyCFunction)cwd_of_process, METH_O, ""}, {"cwd_of_process", (PyCFunction)cwd_of_process, METH_O, ""},
{"macos_change_titlebar_color", (PyCFunction)macos_change_titlebar_color, METH_O, ""}, {"macos_change_titlebar_color", (PyCFunction)macos_change_titlebar_color, METH_O, ""},
{"macos_set_hide_from_tasks", (PyCFunction)macos_set_hide_from_tasks, METH_NOARGS, ""},
{NULL, NULL, 0, NULL} /* Sentinel */ {NULL, NULL, 0, NULL} /* Sentinel */
}; };

3
kitty/glfw.c
View File

@ -9,6 +9,7 @@
#include "glfw-wrapper.h" #include "glfw-wrapper.h"
extern bool cocoa_make_window_resizable(void *w); extern bool cocoa_make_window_resizable(void *w);
extern void cocoa_create_global_menu(void); extern void cocoa_create_global_menu(void);
extern void cocoa_set_hide_from_tasks(void);
extern void cocoa_set_titlebar_color(void *w); extern void cocoa_set_titlebar_color(void *w);
#if GLFW_KEY_LAST >= MAX_KEY_COUNT #if GLFW_KEY_LAST >= MAX_KEY_COUNT
@ -375,6 +376,8 @@ create_os_window(PyObject UNUSED *self, PyObject *args) {
#ifdef __APPLE__ #ifdef __APPLE__
cocoa_create_global_menu(); cocoa_create_global_menu();
if (OPT(macos_option_as_alt)) glfwSetCocoaTextInputFilter(glfw_window, filter_option); if (OPT(macos_option_as_alt)) glfwSetCocoaTextInputFilter(glfw_window, filter_option);
// This needs to be done only after the first window has been created, because glfw only sets the activation policy once upon initialization.
if (OPT(macos_hide_from_tasks)) cocoa_set_hide_from_tasks();
#endif #endif
is_first_window = false; is_first_window = false;
} }

4
kitty/main.py
View File

@ -45,10 +45,6 @@ def run_app(opts, args):
with cached_values_for('main') as cached_values: with cached_values_for('main') as cached_values:
w, h = initial_window_size(opts, cached_values) w, h = initial_window_size(opts, cached_values)
window_id = create_os_window(w, h, appname, args.name or args.cls or appname, args.cls or appname, load_all_shaders) window_id = create_os_window(w, h, appname, args.name or args.cls or appname, args.cls or appname, load_all_shaders)
if is_macos and opts.macos_hide_from_tasks:
from .fast_data_types import macos_set_hide_from_tasks
# This needs to be done after creating the OS window as glfw sets the activation policy as well.
macos_set_hide_from_tasks()
startup_ctx = init_startup_notification(window_id) startup_ctx = init_startup_notification(window_id)
show_window(window_id) show_window(window_id)
if not is_wayland and not is_macos: # no window icons on wayland if not is_wayland and not is_macos: # no window icons on wayland

1
kitty/state.c
View File

@ -358,6 +358,7 @@ PYWRAP1(set_options) {
S(close_on_child_death, PyObject_IsTrue); S(close_on_child_death, PyObject_IsTrue);
S(macos_option_as_alt, PyObject_IsTrue); S(macos_option_as_alt, PyObject_IsTrue);
S(macos_hide_titlebar, PyObject_IsTrue); S(macos_hide_titlebar, PyObject_IsTrue);
S(macos_hide_from_tasks, PyObject_IsTrue);
PyObject *chars = PyObject_GetAttrString(opts, "select_by_word_characters"); PyObject *chars = PyObject_GetAttrString(opts, "select_by_word_characters");
if (chars == NULL) return NULL; if (chars == NULL) return NULL;

2
kitty/state.h
View File

@ -23,7 +23,7 @@ typedef struct {
color_type url_color, background, active_border_color, inactive_border_color; color_type url_color, background, active_border_color, inactive_border_color;
double repaint_delay, input_delay; double repaint_delay, input_delay;
bool focus_follows_mouse; bool focus_follows_mouse;
bool macos_option_as_alt, macos_hide_titlebar; bool macos_option_as_alt, macos_hide_titlebar, macos_hide_from_tasks;
int adjust_line_height_px, adjust_column_width_px; int adjust_line_height_px, adjust_column_width_px;
float adjust_line_height_frac, adjust_column_width_frac; float adjust_line_height_frac, adjust_column_width_frac;
float background_opacity; float background_opacity;