mcabber: mcabber/src/screen.c comparison

comparison mcabber/src/screen.c @ 1598:a087125d8fc8

Replace libjabber with loudmouth

author	franky
date	Sun, 11 Oct 2009 15:38:32 +0200
parents	8d1bcc83ae32
children	dcd5d4c75199

comparison

equal deleted inserted replaced

-:4f59a414217e
+:a087125d8fc8
 #include "compl.h"
 #include "roster.h"
 #include "histolog.h"
 #include "settings.h"
 #include "utils.h"
+#include "xmpp.h"
 #define get_color(col)  (COLOR_PAIR(col)|COLOR_ATTRIB[col])
 #define compose_color(col)  (COLOR_PAIR(col->color_pair)|col->color_attrib)
 #define DEFAULT_LOG_WIN_HEIGHT (5+2)
 static char   cmdhisto_backup[INPUTLINE_LENGTH+1];
 static int    chatstate; /* (0=active, 1=composing, 2=paused) */
 static bool   lock_chatstate;
 static time_t chatstate_timestamp;
+static guint  chatstate_timeout_id = 0;
 int chatstates_disabled;
 #define MAX_KEYSEQ_LENGTH 8
 typedef struct {
 void scr_WriteInWindow(const char *winId, const char *text, time_t timestamp,
 unsigned int prefix_flags, int force_show,
 unsigned mucnicklen);
-inline void scr_WriteMessage(const char *bjid, const char *text,
+void scr_WriteMessage(const char *bjid, const char *text,
 time_t timestamp, guint prefix_flags,
-unsigned mucnicklen);
+unsigned mucnicklen, gpointer xep184);
 inline void scr_UpdateBuddyWindow(void);
 inline void scr_set_chatmode(int enable);
 #define SPELLBADCHAR 5
 	int color_attrib;
 } ccolor;
 typedef struct {
 char *status, *wildcard;
-ccolor * color;
+ccolor *color;
 GPatternSpec *compiled;
 } rostercolor;
 static GSList *rostercolrules = NULL;
 static GHashTable *muccolors = NULL, *nickcolors = NULL;
 typedef struct {
 bool manual; // Manually set?
-ccolor * color;
+ccolor *color;
 } nickcolor;
 static int nickcolcount = 0;
 static ccolor ** nickcols = NULL;
 static muccoltype glob_muccol = MC_OFF;
 scr_LogPrint(LPRINT_LOGNORM, "ERROR: Wrong color: %s", name);
 return -1;
 }
-static ccolor * get_user_color(const char *color)
+static ccolor *get_user_color(const char *color)
 {
 bool isbright = FALSE;
 int cl;
-ccolor * ccol;
+ccolor *ccol;
 if (!strncmp(color, "bright", 6)) {
 isbright = TRUE;
 color += 6;
 }
 cl = FindColor(color);
 }
 g_free(snick);//They are not saved in the hash
 g_free(mnick);
 need_update = TRUE;
 } else {
-ccolor * cl = get_user_color(color);
+ccolor *cl = get_user_color(color);
 if (!cl) {
 scr_LogPrint(LPRINT_NORMAL, "No such color name");
 g_free(snick);
 g_free(mnick);
 } else {
 } else {
 scr_LogPrint(LPRINT_NORMAL, "No such color rule, nothing removed");
 return FALSE;
 }
 } else {
-ccolor * cl = get_user_color(color);
+ccolor *cl = get_user_color(color);
 if (!cl) {
 scr_LogPrint(LPRINT_NORMAL, "No such color name");
 return FALSE;
 }
 if (found) {
 while (ncolors < ncolor_end && *ncolors) {
 if ((*ncolors == ' ') || (*ncolors == '\t')) {
 ncolors++;
 } else {
 char *end = ncolors;
-ccolor * cl;
+ccolor *cl;
 while (*end && (*end != ' ') && (*end != '\t'))
 end++;
 *end = '\0';
 cl = get_user_color(ncolors);
 if (!cl) {
 //  scr_UpdateMainStatus()
 // Redraw the main (bottom) status line.
 void scr_UpdateMainStatus(int forceupdate)
 {
-char *sm = from_utf8(jb_getstatusmsg());
+char *sm = from_utf8(xmpp_getstatusmsg());
 const char *info = settings_opt_get("info");
 werase(mainstatusWnd);
 if (info) {
 char *info_locale = from_utf8(info);
 mvwprintw(mainstatusWnd, 0, 0, "%c[%c] %s: %s",
 (unread_msg(NULL) ? '#' : ' '),
-imstatus2char[jb_getstatus()],
+imstatus2char[xmpp_getstatus()],
 info_locale, (sm ? sm : ""));
 g_free(info_locale);
 } else
 mvwprintw(mainstatusWnd, 0, 0, "%c[%c] %s",
 (unread_msg(NULL) ? '#' : ' '),
-imstatus2char[jb_getstatus()], (sm ? sm : ""));
+imstatus2char[xmpp_getstatus()], (sm ? sm : ""));
 if (forceupdate) {
 top_panel(inputPanel);
 update_panels();
 }
 g_free(sm);
 if (ismuc) {
 if (buddy_getinsideroom(BUDDATA(current_buddy)))
 status = 'C';
 else
 status = 'x';
-} else if (jb_getstatus() != offline) {
+} else if (xmpp_getstatus() != offline) {
 enum imstatus budstate;
 budstate = buddy_getstatus(BUDDATA(current_buddy), NULL);
 if (budstate < imstatus_size)
 status = imstatus2char[budstate];
 }
 GList *buddy;
 int i, n;
 int rOffset;
 int cursor_backup;
 char status, pending;
-enum imstatus currentstatus = jb_getstatus();
+enum imstatus currentstatus = xmpp_getstatus();
 int x_pos;
 // We can reset update_roster
 update_roster = FALSE;
 g_utf8_strncpy(name, buddy_getname(BUDDATA(buddy)), Roster_Width-7);
 else
 name[0] = 0;
 if (isgrp) {
-if (ishid){
+if (ishid) {
 int group_count = 0;
 foreach_group_member(BUDDATA(buddy), increment_if_buddy_not_filtered,
 &group_count);
 snprintf(rline, 4*Roster_Width, " %c+++ %s (%i)", pending, name,
 group_count);
 static char *oldmsg;
 Autoaway = setaway;
 if (setaway) {
 const char *msg, *prevmsg;
-oldstatus = jb_getstatus();
+oldstatus = xmpp_getstatus();
 if (oldmsg) {
 g_free(oldmsg);
 oldmsg = NULL;
 }
-prevmsg = jb_getstatusmsg();
+prevmsg = xmpp_getstatusmsg();
 msg = settings_opt_get("message_autoaway");
 if (!msg)
 msg = prevmsg;
 if (prevmsg)
 oldmsg = g_strdup(prevmsg);
-jb_setstatus(away, NULL, msg, FALSE);
+xmpp_setstatus(away, NULL, msg, FALSE);
 } else {
 // Back
-jb_setstatus(oldstatus, NULL, (oldmsg ? oldmsg : ""), FALSE);
+xmpp_setstatus(oldstatus, NULL, (oldmsg ? oldmsg : ""), FALSE);
 if (oldmsg) {
 g_free(oldmsg);
 oldmsg = NULL;
 }
 }
 }
-long int scr_GetAutoAwayTimeout(time_t now)
-{
-enum imstatus cur_st;
-unsigned int autoaway_timeout = settings_opt_get_int("autoaway");
-if (Autoaway || !autoaway_timeout)
-return 86400;
-cur_st = jb_getstatus();
-// Auto-away is disabled for the following states
-if ((cur_st != available) && (cur_st != freeforchat))
-return 86400;
-if (now >= LastActivity + (time_t)autoaway_timeout)
-return 0;
-else
-return LastActivity + (time_t)autoaway_timeout - now;
-}
 //  set_chatstate(state)
 // Set the current chat state (0=active, 1=composing, 2=paused)
-// If the chat state has changed, call jb_send_chatstate()
+// If the chat state has changed, call xmpp_send_chatstate()
 static inline void set_chatstate(int state)
 {
 #if defined JEP0022 || defined JEP0085
 if (chatstates_disabled)
 return;
 if (state != chatstate) {
 chatstate = state;
 if (current_buddy &&
 buddy_gettype(BUDDATA(current_buddy)) == ROSTER_TYPE_USER) {
 guint jep_state;
-if (chatstate == 1)
+if (chatstate == 1) {
+if (chatstate_timeout_id == 0)
+chatstate_timeout_id = g_timeout_add_seconds(1,
+scr_ChatStatesTimeout,
+NULL);
 jep_state = ROSTER_EVENT_COMPOSING;
+}
 else if (chatstate == 2)
 jep_state = ROSTER_EVENT_PAUSED;
 else
 jep_state = ROSTER_EVENT_ACTIVE;
-jb_send_chatstate(BUDDATA(current_buddy), jep_state);
+xmpp_send_chatstate(BUDDATA(current_buddy), jep_state);
 }
 if (!chatstate)
 chatstate_timestamp = 0;
 }
 #endif
 }
 #if defined JEP0022 || defined JEP0085
-long int scr_GetChatStatesTimeout(time_t now)
+gboolean scr_ChatStatesTimeout(void)
 {
+time_t now;
+time(&now);
 // Check if we're currently composing...
-if (chatstate != 1 || !chatstate_timestamp)
+if (chatstate != 1 || !chatstate_timestamp) {
-return 86400;
+chatstate_timeout_id = 0;
+return FALSE;
+}
 // If the timeout is reached, let's change the state right now.
 if (now >= chatstate_timestamp + COMPOSING_TIMEOUT) {
 chatstate_timestamp = now;
 set_chatstate(2);
-return 86400;
+chatstate_timeout_id = 0;
-}
+return FALSE;
+}
-return chatstate_timestamp + COMPOSING_TIMEOUT - now;
+return TRUE;
 }
 #endif
 // Check if we should enter/leave automatic away status
 void scr_CheckAutoAway(int activity)
 if (Autoaway && activity) set_autoaway(FALSE);
 if (!autoaway_timeout) return;
 if (!LastActivity || activity) time(&LastActivity);
-cur_st = jb_getstatus();
+cur_st = xmpp_getstatus();
 // Auto-away is disabled for the following states
 if ((cur_st != available) && (cur_st != freeforchat))
 return;
 if (!activity) {

Mercurial > ~mikael > mcabber > hg

comparison mcabber/src/screen.c @ 1598:a087125d8fc8