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

Make ringing bell not dependent on having a OSWindow

Browse Source
This commit is contained in:
Kovid Goyal 2020-08-05 10:58:00 +05:30
parent 1d0a3ce998
commit dba01bc014
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kitty/cocoa_window.m
View File

@ -537,6 +537,11 @@ cocoa_hide_titlebar(void *w)
} // autoreleasepool } // autoreleasepool
} }
void
cocoa_system_beep(void) {
NSBeep();
}
static PyMethodDef module_methods[] = { static PyMethodDef module_methods[] = {
{"cocoa_get_lang", (PyCFunction)cocoa_get_lang, METH_NOARGS, ""}, {"cocoa_get_lang", (PyCFunction)cocoa_get_lang, METH_NOARGS, ""},
{"cocoa_set_new_window_trigger", (PyCFunction)cocoa_set_new_window_trigger, METH_VARARGS, ""}, {"cocoa_set_new_window_trigger", (PyCFunction)cocoa_set_new_window_trigger, METH_VARARGS, ""},

14
kitty/glfw.c
View File

@ -15,6 +15,7 @@ extern long cocoa_window_number(void *w);
extern void cocoa_create_global_menu(void); extern void cocoa_create_global_menu(void);
extern void cocoa_hide_window_title(void *w); extern void cocoa_hide_window_title(void *w);
extern void cocoa_hide_titlebar(void *w); extern void cocoa_hide_titlebar(void *w);
extern void cocoa_system_beep(void *w);
extern void cocoa_set_activation_policy(bool); extern void cocoa_set_activation_policy(bool);
extern void cocoa_set_titlebar_color(void *w, color_type color); extern void cocoa_set_titlebar_color(void *w, color_type color);
extern bool cocoa_alt_option_key_pressed(unsigned long); extern bool cocoa_alt_option_key_pressed(unsigned long);
@ -888,16 +889,14 @@ get_clipboard_string(PYNOARG) {
return Py_BuildValue("s", ""); return Py_BuildValue("s", "");
} }
void static void
ring_audio_bell(OSWindow *w UNUSED) { ring_audio_bell(void) {
static monotonic_t last_bell_at = -1; static monotonic_t last_bell_at = -1;
monotonic_t now = monotonic(); monotonic_t now = monotonic();
if (now - last_bell_at <= ms_to_monotonic_t(100ll)) return; if (now - last_bell_at <= ms_to_monotonic_t(100ll)) return;
last_bell_at = now; last_bell_at = now;
#ifdef __APPLE__ #ifdef __APPLE__
if (w->handle) { cocoa_system_beep();
glfwWindowBell(w->handle);
}
#else #else
play_canberra_sound("bell", "kitty bell"); play_canberra_sound("bell", "kitty bell");
#endif #endif
@ -905,8 +904,7 @@ ring_audio_bell(OSWindow *w UNUSED) {
static PyObject* static PyObject*
ring_bell(PYNOARG) { ring_bell(PYNOARG) {
OSWindow *w = current_os_window(); ring_audio_bell();
ring_audio_bell(w);
Py_RETURN_NONE; Py_RETURN_NONE;
} }
@ -960,7 +958,7 @@ void
request_window_attention(id_type kitty_window_id, bool audio_bell) { request_window_attention(id_type kitty_window_id, bool audio_bell) {
OSWindow *w = os_window_for_kitty_window(kitty_window_id); OSWindow *w = os_window_for_kitty_window(kitty_window_id);
if (w) { if (w) {
if (audio_bell) ring_audio_bell(w); if (audio_bell) ring_audio_bell();
if (OPT(window_alert_on_bell)) glfwRequestWindowAttention(w->handle); if (OPT(window_alert_on_bell)) glfwRequestWindowAttention(w->handle);
glfwPostEmptyEvent(); glfwPostEmptyEvent();
} }