diff options
Diffstat (limited to 'src/common/hexchat.h')
| -rw-r--r-- | src/common/hexchat.h | 46 |
1 files changed, 11 insertions, 35 deletions
diff --git a/src/common/hexchat.h b/src/common/hexchat.h index bbf32da5..652dcf1d 100644 --- a/src/common/hexchat.h +++ b/src/common/hexchat.h @@ -22,6 +22,7 @@ #include <glib.h> #include <glib/gstdio.h> #include <glib/gi18n.h> +#include <gio/gio.h> #include <time.h> /* need time_t */ @@ -36,22 +37,7 @@ #endif #include "history.h" - -#ifndef HAVE_SNPRINTF -#define snprintf g_snprintf -#endif - -#ifndef HAVE_VSNPRINTF -#define vsnprintf _vsnprintf -#endif - -#ifdef SOCKS -#ifdef __sgi -#include <sys/time.h> -#define INCLUDE_PROTOTYPES 1 -#endif -#include <socks.h> -#endif +#include "tree.h" #ifdef USE_OPENSSL #include <openssl/ssl.h> /* SSL_() */ @@ -262,6 +248,7 @@ struct hexchatprefs int hex_gui_search_pos; int hex_gui_slist_select; int hex_gui_tab_layout; + int hex_gui_tab_middleclose; int hex_gui_tab_newtofront; int hex_gui_tab_pos; int hex_gui_tab_small; @@ -277,7 +264,7 @@ struct hexchatprefs int hex_gui_win_state; int hex_gui_win_top; int hex_gui_win_width; - int hex_input_balloon_time; + int hex_identd_port; int hex_irc_ban_type; int hex_irc_join_delay; int hex_irc_notice_pos; @@ -329,7 +316,6 @@ struct hexchatprefs guint32 dcc_ip; unsigned int wait_on_exit; /* wait for logs to be flushed to disk IF we're connected */ - unsigned int utf8_locale; /* Tells us if we need to save, only when they've been edited. This is so that we continue using internal defaults (which can @@ -382,12 +368,12 @@ typedef struct session guint8 text_strip; struct server *server; - void *usertree_alpha; /* pure alphabetical tree */ - void *usertree; /* ordered with Ops first */ + tree *usertree; /* alphabetical tree */ struct User *me; /* points to myself in the usertree */ char channel[CHANLEN]; char waitchannel[CHANLEN]; /* waiting to join channel (/join sent) */ char willjoinchannel[CHANLEN]; /* will issue /join for this channel */ + char session_name[CHANLEN]; /* the name of the session, should not modified */ char channelkey[64]; /* XXX correct max length? */ int limit; /* channel user limit */ int logfd; @@ -434,14 +420,6 @@ typedef struct session void (*scrollback_replay_marklast) (struct session *sess); } session; -struct msproxy_state_t -{ - gint32 clientid; - gint32 serverid; - unsigned char seq_recv; /* seq number of last packet recv. */ - unsigned char seq_sent; /* seq number of last packet sent. */ -}; - /* SASL Mechanisms */ #define MECH_PLAIN 0 #define MECH_BLOWFISH 1 @@ -499,9 +477,9 @@ typedef struct server int proxy_sok; /* Additional information for MS Proxy beast */ int proxy_sok4; int proxy_sok6; - struct msproxy_state_t msp_state; int id; /* unique ID number (for plugin API) */ #ifdef USE_OPENSSL + SSL_CTX *ctx; SSL *ssl; int ssl_do_connect_tag; #else @@ -554,7 +532,10 @@ typedef struct server time_t ping_recv; /* when we last got a ping reply */ time_t away_time; /* when we were marked away */ - char *encoding; /* NULL for system */ + char *encoding; + GIConv read_converter; /* iconv converter for converting from server encoding to UTF-8. */ + GIConv write_converter; /* iconv converter for converting from UTF-8 to server encoding. */ + GSList *favlist; /* list of channels & keys to join */ unsigned int motd_skipped:1; @@ -587,8 +568,6 @@ typedef struct server unsigned int have_except:1; /* ban exemptions +e */ unsigned int have_invite:1; /* invite exemptions +I */ unsigned int have_cert:1; /* have loaded a cert */ - unsigned int using_cp1255:1; /* encoding is CP1255/WINDOWS-1255? */ - unsigned int using_irc:1; /* encoding is "IRC" (CP1252/UTF-8 hybrid)? */ unsigned int use_who:1; /* whether to use WHO command to get dcc_ip */ unsigned int sasl_mech; /* mechanism for sasl auth */ unsigned int sent_saslauth:1; /* have sent AUTHENICATE yet */ @@ -631,7 +610,4 @@ struct popup /* CL: get a random int in the range [0..n-1]. DON'T use rand() % n, it gives terrible results. */ #define RAND_INT(n) ((int)(rand() / (RAND_MAX + 1.0) * (n))) -#define hexchat_filename_from_utf8 g_filename_from_utf8 -#define hexchat_filename_to_utf8 g_filename_to_utf8 - #endif |