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

feat: implement asynchronous external editor support

Browse Source 
Move from blocking fork/wait logic to nonblocking fork and
g_child_watch_add.

This ensures that the Profanity main loop continues to run while an
external editor is open. So we don't loose connection and react to
pings.

We change editor handling also in vcard and muc subject editing.
In the new implementation we are launching the editor and passing a
callback which we will use once the editor exited.

We use the recently added ui_susped() and ui_resume().

To not clutter the UI we need to check whether Profanity UI is suspended
and omit drawing in this case.

Fixes: https://github.com/profanity-im/profanity/issues/1888
Ref: 9b112904a9bc7250dc013d901187ca8622580d98
Signed-off-by: Michael Vetter <jubalh@iodoru.org>
This commit is contained in:
Michael Vetter
2026-04-02 21:30:31 +02:00
parent fc66ddc2c1
commit 36ec2b0ae1
5 changed files with 178 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
src/command/cmd_funcs.c
View File

@@ -109,19 +109,26 @@ static gboolean _cmd_execute_alias(ProfWin* window, const char* const inp, gbool
static gboolean
_download_install_plugin(ProfWin* window, gchar* url, gchar* path);
static void
_vcard_editor_finished_cb(gchar* message, void* user_data)
{
if (message) {
char** field = user_data;
if (*field) {
free(*field);
}
*field = g_strdup(message);
cons_show("Field updated. Remember to call /me save to apply changes.");
}
}
static gboolean
_update_vcard_field(char** field, char* value)
{
if (!value) {
gchar* editor_value;
if (get_message_from_editor(*field, &editor_value)) {
if (launch_editor(*field, _vcard_editor_finished_cb, field)) {
return TRUE;
}
if (*field) {
free(*field);
}
*field = editor_value;
} else {
if (*field) {
free(*field);
@@ -1640,6 +1647,51 @@ cmd_help(ProfWin* window, const char* const command, gchar** args)
return TRUE;
}
static void
_cmd_editor_finished_cb(gchar* message, void* user_data)
{
if (message) {
rl_insert_text(message);
rl_point = rl_end;
rl_forced_update_display();
}
}
typedef struct
{
ProfWin* window;
char* roomjid;
} EditorFinishedContext;
static void
_cmd_room_editor_finished_cb(gchar* message, void* user_data)
{
EditorFinishedContext* ctx = user_data;
if (message && ctx->roomjid) {
message_send_groupchat_subject(ctx->roomjid, message);
}
if (ctx) {
g_free(ctx->roomjid);
g_free(ctx);
}
}
static void
_cmd_correct_editor_finished_cb(gchar* message, void* user_data)
{
EditorFinishedContext* ctx = user_data;
if (message && ctx->window) {
if (ctx->window->type == WIN_CHAT) {
ProfChatWin* chatwin = (ProfChatWin*)ctx->window;
cl_ev_send_msg_correct(chatwin, message, FALSE, TRUE);
} else if (ctx->window->type == WIN_MUC) {
ProfMucWin* mucwin = (ProfMucWin*)ctx->window;
cl_ev_send_muc_msg_corrected(mucwin, message, FALSE, TRUE);
}
}
g_free(ctx);
}
gboolean
cmd_about(ProfWin* window, const char* const command, gchar** args)
{
@@ -4033,18 +4085,13 @@ cmd_subject(ProfWin* window, const char* const command, gchar** args)
}
if (g_strcmp0(args[0], "editor") == 0) {
gchar* message = NULL;
char* subject = muc_subject(mucwin->roomjid);
if (get_message_from_editor(subject, &message)) {
return TRUE;
}
EditorFinishedContext* ctx = g_new0(EditorFinishedContext, 1);
ctx->roomjid = g_strdup(mucwin->roomjid);
launch_editor(subject, _cmd_room_editor_finished_cb, ctx);
if (message) {
message_send_groupchat_subject(mucwin->roomjid, message);
} else {
cons_bad_cmd_usage(command);
}
return TRUE;
}
@@ -9567,16 +9614,7 @@ cmd_change_password(ProfWin* window, const char* const command, gchar** args)
gboolean
cmd_editor(ProfWin* window, const char* const command, gchar** args)
{
auto_gchar gchar* message = NULL;
if (get_message_from_editor(NULL, &message)) {
return TRUE;
}
rl_insert_text(message);
ui_resize();
rl_point = rl_end;
rl_forced_update_display();
launch_editor(NULL, _cmd_editor_finished_cb, NULL);
return TRUE;
}
@@ -9590,20 +9628,10 @@ cmd_correct_editor(ProfWin* window, const char* const command, gchar** args)
gchar* initial_message = win_get_last_sent_message(window);
auto_gchar gchar* message = NULL;
if (get_message_from_editor(initial_message, &message)) {
return TRUE;
}
EditorFinishedContext* ctx = g_new0(EditorFinishedContext, 1);
ctx->window = window;
if (window->type == WIN_CHAT) {
ProfChatWin* chatwin = (ProfChatWin*)window;
cl_ev_send_msg_correct(chatwin, message, FALSE, TRUE);
} else if (window->type == WIN_MUC) {
ProfMucWin* mucwin = (ProfMucWin*)window;
cl_ev_send_muc_msg_corrected(mucwin, message, FALSE, TRUE);
}
launch_editor(initial_message, _cmd_correct_editor_finished_cb, ctx);
return TRUE;
}