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

Neaten up main_loop()

Browse Source
This commit is contained in:
Kovid Goyal 2018-04-13 15:19:25 +05:30
parent 5630c0e434
commit 532d51c411
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
kitty/child-monitor.c
View File

@ -735,22 +735,15 @@ process_pending_resizes(double now) {
} }
} }
static PyObject* static inline void
main_loop(ChildMonitor *self, PyObject *a UNUSED) { close_all_windows() {
#define main_loop_doc "The main thread loop"
bool has_open_windows = true;
while (has_open_windows) {
double now = monotonic();
if (global_state.has_pending_resizes) process_pending_resizes(now);
render(now);
wait_for_events();
parse_input(self);
if (global_state.close_all_windows) {
for (size_t w = 0; w < global_state.num_os_windows; w++) mark_os_window_for_close(&global_state.os_windows[w], true); for (size_t w = 0; w < global_state.num_os_windows; w++) mark_os_window_for_close(&global_state.os_windows[w], true);
global_state.close_all_windows = false; global_state.close_all_windows = false;
} }
has_open_windows = false;
static inline bool
process_pending_closes(ChildMonitor *self) {
bool has_open_windows = false;
for (size_t w = global_state.num_os_windows; w > 0; w--) { for (size_t w = global_state.num_os_windows; w > 0; w--) {
OSWindow *os_window = global_state.os_windows + w - 1; OSWindow *os_window = global_state.os_windows + w - 1;
if (should_os_window_close(os_window)) { if (should_os_window_close(os_window)) {
@ -763,6 +756,22 @@ main_loop(ChildMonitor *self, PyObject *a UNUSED) {
remove_os_window(os_window->id); remove_os_window(os_window->id);
} else has_open_windows = true; } else has_open_windows = true;
} }
return has_open_windows;
}
static PyObject*
main_loop(ChildMonitor *self, PyObject *a UNUSED) {
#define main_loop_doc "The main thread loop"
bool has_open_windows = true;
while (has_open_windows) {
double now = monotonic();
if (global_state.has_pending_resizes) process_pending_resizes(now);
render(now);
wait_for_events();
parse_input(self);
if (global_state.close_all_windows) close_all_windows();
has_open_windows = process_pending_closes(self);
} }
if (PyErr_Occurred()) return NULL; if (PyErr_Occurred()) return NULL;
Py_RETURN_NONE; Py_RETURN_NONE;