devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 10 Actions Packages Projects 1 Releases Wiki Activity

fix(ui): stop status bar / chat bleed-through over the external editor #131

Closed
jabber.developer2 wants to merge 11 commits from fix/editor-ui-suspend-redraw into master
pull from: fix/editor-ui-suspend-redraw
merge into: devs:master
Conversation 2 Commits 11 Files Changed 11 +76 -15
7 changed files with 76 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b1ffc750a2 - Show all commits

8
src/ui/inputwin.c
View File

@@ -325,6 +325,10 @@ inp_get_line(void)
while (!line) { while (!line) {
line = inp_readline(); line = inp_readline();
ui_update(); ui_update();
jabber.developer marked this conversation as resolved Outdated
jabber.developer commented 2026-05-29 19:11:08 +00:00
Outdated
Review
Copy Link

is it safe from infinite looping?

is it safe from infinite looping?
jabber.developer2 commented 2026-05-31 12:22:55 +00:00
Outdated
Review
Copy Link

Yes. The inner g_main_context_iteration(NULL, FALSE) is non-blocking — returns FALSE as soon as no source is ready — and the only sources we have (g_child_watch for the editor, tray timer) dispatch once per state change, not re-arm in place. The outer while (!line) is the standard blocking-prompt pattern: it exits when readline accumulates a full line (user Enter). That same loop existed before; the only change is adding the GLib iteration so a prompt raised mid-editor-session can dispatch _editor_exit_cb instead of deadlocking until the editor exits. No new infinite-loop class.

Yes. The inner g_main_context_iteration(NULL, FALSE) is non-blocking — returns FALSE as soon as no source is ready — and the only sources we have (g_child_watch for the editor, tray timer) dispatch once per state change, not re-arm in place. The outer while (!line) is the standard blocking-prompt pattern: it exits when readline accumulates a full line (user Enter). That same loop existed before; the only change is adding the GLib iteration so a prompt raised mid-editor-session can dispatch _editor_exit_cb instead of deadlocking until the editor exits. No new infinite-loop class.
// Let GLib sources (notably the editor child watch) dispatch so
// ui_resume can run if the prompt was raised mid-editor-session.
while (g_main_context_iteration(NULL, FALSE))
;
} }
status_bar_clear_prompt(); status_bar_clear_prompt();
return line; return line;
@@ -356,6 +360,10 @@ inp_get_password(void)
while (!password) { while (!password) {
password = inp_readline(); password = inp_readline();
ui_update(); ui_update();
// Let GLib sources (notably the editor child watch) dispatch so
// ui_resume can run if the prompt was raised mid-editor-session.
while (g_main_context_iteration(NULL, FALSE))
;
} }
get_password = FALSE; get_password = FALSE;
status_bar_clear_prompt(); status_bar_clear_prompt();