aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-09-22 19:45:54 -04:00
Code

Merge pull request #1493 from akce/wintitle-libc

Browse Source 
Draw wintitle using fputs and fprintf instead of /bin/echo.
This commit is contained in:
Michael Vetter 2021-03-05 12:10:25 +01:00 committed by GitHub
commit f025bceda3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/ui/core.c
View File

@ -82,7 +82,6 @@
#include "otr/otr.h" #include "otr/otr.h"
#endif #endif
static char* win_title;
static int inp_size; static int inp_size;
static gboolean perform_resize = FALSE; static gboolean perform_resize = FALSE;
static GTimer* ui_idle_time; static GTimer* ui_idle_time;
@ -1079,21 +1078,20 @@ ui_contact_offline(char* barejid, char* resource, char* status)
void void
ui_clear_win_title(void) ui_clear_win_title(void)
{ {
printf("%c]0;%c", '\033', '\007'); fputs("\e]0;\a", stdout);
fflush(stdout);
} }
void void
ui_goodbye_title(void) ui_goodbye_title(void)
{ {
int result = system("/bin/echo -ne \"\033]0;Thanks for using Profanity\007\""); fputs("\e]0;Thanks for using Profanity\a", stdout);
if (result == -1) fflush(stdout);
log_error("Error printing title on shutdown");
} }
static void static void
_ui_draw_term_title(void) _ui_draw_term_title(void)
{ {
char new_win_title[100];
jabber_conn_status_t status = connection_get_status(); jabber_conn_status_t status = connection_get_status();
if (status == JABBER_CONNECTED) { if (status == JABBER_CONNECTED) {
@ -1101,29 +1099,14 @@ _ui_draw_term_title(void)
gint unread = wins_get_total_unread(); gint unread = wins_get_total_unread();
if (unread != 0) { if (unread != 0) {
snprintf(new_win_title, sizeof(new_win_title), fprintf(stdout, "\e]0;Profanity (%d) - %s\a", unread, jid);
"/bin/echo -n \"%c]0;%s (%d) - %s%c\"", '\033', "Profanity",
unread, jid, '\007');
} else { } else {
snprintf(new_win_title, sizeof(new_win_title), fprintf(stdout, "\e]0;Profanity - %s\a", jid);
"/bin/echo -n \"%c]0;%s - %s%c\"", '\033', "Profanity", jid,
'\007');
} }
} else { } else {
snprintf(new_win_title, sizeof(new_win_title), "/bin/echo -n \"%c]0;%s%c\"", '\033', fputs("\e]0;Profanity\a", stdout);
"Profanity", '\007');
}
if (g_strcmp0(win_title, new_win_title) != 0) {
// print to x-window title bar
int res = system(new_win_title);
if (res == -1) {
log_error("Error writing terminal window title.");
}
if (win_title) {
free(win_title);
}
win_title = strdup(new_win_title);
} }
fflush(stdout);
} }
void void