mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-24 01:08:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

macOS: Reduce energy consumption when idle by shutting down Apple's display link thread after 30 second of inactivity

Browse Source 
Fixes #1763
This commit is contained in:
Kovid Goyal
2019-06-29 14:21:47 +05:30
parent c84e73d8e6
commit 8c9d2d3ca2
3 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/changelog.rst
View File

@@ -23,6 +23,9 @@ To update |kitty|, :doc:`follow the instructions <binary>`.
- Fix a regression that caused closing an overlay window to focus - Fix a regression that caused closing an overlay window to focus
the previously focused window rather than the underlying window (:iss:`1720`) the previously focused window rather than the underlying window (:iss:`1720`)
- macOS: Reduce energy consumption when idle by shutting down Apple's display
link thread after 30 second of inactivity (:iss:`1763`)
0.14.2 [2019-06-09] 0.14.2 [2019-06-09]
--------------------- ---------------------

1
glfw/cocoa_platform.h vendored
View File

@@ -229,3 +229,4 @@ void _glfwRestartDisplayLinks(void);
void _glfwCocoaPostEmptyEvent(short subtype, long data1, bool at_start); void _glfwCocoaPostEmptyEvent(short subtype, long data1, bool at_start);
void _glfwDispatchTickCallback(void); void _glfwDispatchTickCallback(void);
void _glfwDispatchRenderFrame(CGDirectDisplayID); void _glfwDispatchRenderFrame(CGDirectDisplayID);
void _glfwShutdownCVDisplayLink(unsigned long long, void*);

18
glfw/cocoa_window.m
View File

@@ -62,6 +62,19 @@ CGDirectDisplayID displayIDForWindow(_GLFWwindow *w) {
return (CGDirectDisplayID)-1; return (CGDirectDisplayID)-1;
} }
static unsigned long long display_link_shutdown_timer = 0;
#define DISPLAY_LINK_SHUTDOWN_CHECK_INTERVAL 30
void
_glfwShutdownCVDisplayLink(unsigned long long timer_id, void *user_data) {
[_glfw.ns.displayLinks.lock lock];
display_link_shutdown_timer = 0;
for (size_t i = 0; i < _glfw.ns.displayLinks.count; i++) {
_GLFWDisplayLinkNS *dl = &_glfw.ns.displayLinks.entries[i];
if (dl->displayLink) CVDisplayLinkStop(dl->displayLink);
}
[_glfw.ns.displayLinks.lock unlock];
}
static inline void static inline void
requestRenderFrame(_GLFWwindow *w, GLFWcocoarenderframefun callback) { requestRenderFrame(_GLFWwindow *w, GLFWcocoarenderframefun callback) {
@@ -74,6 +87,11 @@ requestRenderFrame(_GLFWwindow *w, GLFWcocoarenderframefun callback) {
w->ns.renderFrameRequested = true; w->ns.renderFrameRequested = true;
CGDirectDisplayID displayID = displayIDForWindow(w); CGDirectDisplayID displayID = displayIDForWindow(w);
[_glfw.ns.displayLinks.lock lock]; [_glfw.ns.displayLinks.lock lock];
if (display_link_shutdown_timer) {
_glfwPlatformUpdateTimer(display_link_shutdown_timer, DISPLAY_LINK_SHUTDOWN_CHECK_INTERVAL, true);
} else {
display_link_shutdown_timer = _glfwPlatformAddTimer(DISPLAY_LINK_SHUTDOWN_CHECK_INTERVAL, false, _glfwShutdownCVDisplayLink, NULL, NULL);
}
for (size_t i = 0; i < _glfw.ns.displayLinks.count; i++) { for (size_t i = 0; i < _glfw.ns.displayLinks.count; i++) {
_GLFWDisplayLinkNS *dl = &_glfw.ns.displayLinks.entries[i]; _GLFWDisplayLinkNS *dl = &_glfw.ns.displayLinks.entries[i];
if (dl->displayID == displayID) { if (dl->displayID == displayID) {