aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-02-02 15:08:15 -05:00
Code

Moved typing notification from main chat to title bar

Browse Source
This commit is contained in:
James Booth 2012-08-16 21:43:52 +01:00
parent 46c9a5ed4b
commit d9c47c9b0d
3 changed files with 86 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/title_bar.c
View File

@ -24,11 +24,15 @@
#include <string.h>
#include <ncurses.h>
#include <glib.h>
#include "common.h"
#include "ui.h"
static WINDOW *title_bar;
static char *current_title = NULL;
static char *recipient = NULL;
static GTimer *typing_elapsed;
static int dirty;
static jabber_presence_t current_status;
@ -51,6 +55,8 @@ create_title_bar(void)
void
title_bar_title(void)
{
recipient = NULL;
typing_elapsed = NULL;
title_bar_show("Profanity. Type /help for help information.");
dirty = TRUE;
}
@ -72,6 +78,27 @@ title_bar_resize(void)
void
title_bar_refresh(void)
{
if (recipient != NULL) {
if (typing_elapsed != NULL) {
gdouble seconds = g_timer_elapsed(typing_elapsed, NULL);
if (seconds >= 10) {
if (current_title != NULL) {
free(current_title);
}
current_title = (char *) malloc((strlen(recipient) + 1) * sizeof(char));
strcpy(current_title, recipient);
title_bar_draw();
dirty = TRUE;
}
}
}
if (dirty) {
wrefresh(title_bar);
inp_put_back();
@ -97,8 +124,57 @@ title_bar_set_status(jabber_presence_t status)
_title_bar_draw_status();
}
void
title_bar_set_recipient(char *from)
{
typing_elapsed = NULL;
recipient = from;
if (current_title != NULL) {
free(current_title);
}
current_title = (char *) malloc((strlen(from) + 1) * sizeof(char));
strcpy(current_title, from);
dirty = TRUE;
}
void
title_bar_set_typing(gboolean is_typing)
{
if (is_typing) {
if (typing_elapsed != NULL) {
g_timer_start(typing_elapsed);
} else {
typing_elapsed = g_timer_new();
}
}
if (current_title != NULL) {
free(current_title);
}
if (is_typing) {
current_title = (char *) malloc((strlen(recipient) + 13) * sizeof(char));
sprintf(current_title, "%s (typing...)", recipient);
} else {
current_title = (char *) malloc((strlen(recipient) + 1) * sizeof(char));
strcpy(current_title, recipient);
}
dirty = TRUE;
}
void
title_bar_draw(void)
{
_title_bar_draw_status();
_title_bar_draw_title();
}
static void
_title_bar_draw_status()
_title_bar_draw_status(void)
{
int rows, cols;
getmaxyx(stdscr, rows, cols);

3
src/ui.h
View File

@ -55,6 +55,9 @@ void title_bar_resize(void);
void title_bar_show(const char * const title);
void title_bar_title(void);
void title_bar_set_status(jabber_presence_t status);
void title_bar_set_recipient(char *from);
void title_bar_set_typing(gboolean is_typing);
void title_bar_draw(void);
// main window actions
int win_close_win(void);

10
src/windows.c
View File

@ -208,9 +208,8 @@ win_show_typing(const char * const from)
// in chat window with user
} else {
WINDOW *win = _wins[win_index].win;
_win_show_time(win);
_win_show_typing(win, short_from);
title_bar_set_typing(TRUE);
title_bar_draw();
status_bar_active(win_index);
dirty = TRUE;
@ -239,6 +238,8 @@ win_show_incomming_msg(const char * const from, const char * const message)
_win_show_message(win, message);
if (win_index == _curr_prof_win) {
title_bar_set_typing(FALSE);
title_bar_draw();
status_bar_active(win_index);
dirty = TRUE;
} else {
@ -713,7 +714,8 @@ _win_switch_if_active(const int i)
if (i == 0) {
title_bar_title();
} else {
title_bar_show(_wins[i].from);
title_bar_set_recipient(_wins[i].from);
title_bar_draw();;
status_bar_active(i);
}
}