Version 0.1.7

Reverse order for unloading plugins (fixes crash on FreeBSD)
Fixed charset decoding bug when displaying topic of a channel
2026-06-22 10:56:38 +02:00 · 2006-01-14 12:09:38 +00:00 · 2006-01-14 12:09:04 +00:00 · 2006-01-14 08:26:10 +00:00 · 2006-01-12 15:05:35 +00:00 · 2006-01-10 08:52:09 +00:00
246 changed files with 81094 additions and 47280 deletions
@@ -14,7 +14,7 @@ Developers:
      AIM   : FlashCode AIM
      Yahoo : FlashCode_Y

-* Python plugin
+* Scripts plugins

  Kolter <kolter@free.fr>
      Web   : http://kolter.free.fr
@@ -26,22 +26,18 @@ Debian packager:
 ---------------

 Julien Louis <ptitlouis@sysif.net>
-    IRC   : nicks are "ptitlouis" or "tioui" @ irc.freenode.net
+    IRC   : nick is "ptitlouis" @ irc.freenode.net
    Jabber: ptitlouis@amessage.info


-Testers:
-------
+Contributors:
+------------

-Bounga <bounga@altern.org>
-    Web   : http://bounga.ath.cx
-    IRC   : nick is "Bounga" @ irc.freenode.net
-    Jabber: Bounga@jabber.org
-    ICQ   : 178297842
-
-Xahlexx <xahlexx@weeland.org>
-    Web   : http://www.weeland.org
-    IRC   : nick is "xahlexx" @ irc.freenode.net
+Rudolf Polzer <rpolzer-rp@durchnull.de> (IRC: "divVerent")
+Jiri Golembiovsky <golemj@gmail.com> (IRC: "GolemJ")
+Jim Ramsay <i.am@jimramsay.com> (IRC: "lack")
+Odin <odin@dtdm.org> (IRC: "[Odin]")
+Pistos (IRC: "pistos")


 =====
@@ -1,13 +1,15 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================

-WeeChat known bugs, 2005-09-24
+WeeChat known bugs, 2006-01-14

- color display problems when term has white background
- ./configure does not check that Ruby libraries are installed
- ./configure does not check that Gtk 2.0 libraries are installed
- when quitting WeeChat term title is not restored (if look_set_title is ON)
+- display bugs with UTF-8 chars coded on more than 2 bytes
+- divide long messages (> 512 bytes) into more messages so IRC server can
+  parse them correctly 
+- some refresh bugs with splited windows
 - command name for /server can not contain spaces
- when many WeeChat are launched, log file is not properly written (cleared by
-  each WeeChat at startup)
- display problems with old Konsole versions (Kde terminal) (???)
+- when many WeeChat are launched, log file is not properly written
+  (cleared by each WeeChat at startup)
+- WeeChat may crash if too much nicks in nicklist when position is top
+  or bottom
+- ./configure does not check that Gtk 2.0 libraries are installed
@@ -2,7 +2,7 @@
 		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA


 Also add information on how to contact you by electronic and paper mail.
@@ -1,9 +1,62 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================

-ChangeLog - 2005-09-24
+ChangeLog - 2006-01-14


+Version 0.1.7 (2006-01-14):
+   * fixed msg command (now allowed in private buffer with "*" as target)
+   * removed "irc_default_msg_away" setting, for RFC 2812 conformity
+     (/away command wihtout argument only removes away status),
+     new values for "irc_display_away" (off, local, channel)
+   * fixed refresh bug with Solaris when term size is changed
+   * replaced Texinfo doc by XML Docbook
+   * added color for window separators (when splited)
+   * added completion system for plugins/scripts commands
+   * fixed plugins autoload
+   * added charset by server and channel, new command: /charset
+   * added Ruby script plugin
+   * added /upgrade command
+   * added ETA (Estimated Time of Arrival) for DCC files
+   * /nick command is now allowed when not connected to server
+   * added server/channel arg to /buffer command for jumping to buffer
+   * fixed display bug in chat window when a message length equals to window
+     width
+   * added new keys for switching to other windows: alt-w followed by
+     alt-{arrow}
+   * added new keys for scrolling to previous/next highlight: alt-P / alt-N
+   * added "read marker": an indicator for first unread line in a
+     server or channel buffer (new key alt-U to scroll to marker)
+   * new window maganement: custom size for windows, auto resize when
+     terminal is resized
+   * fixed infinite loop when resizing term to small size
+   * added /history command
+
+Version 0.1.6 (2005-11-11):
+   * new color management system, IRC colors are now correctly
+     displayed and can be removed by new options irc_colors_receive
+     and irc_colors_send
+   * fixed scroll problem when one line is bigger than screen size
+   * added setting for having one server buffer for all servers
+     (look_one_server_buffer)
+   * added setting for ignoring some chars when completing nicks
+   * fixed IRC message parser bug
+   * signal SIGPIPE is now ignored
+   * added partial match for highlights
+   * added dcc_own_ip and dcc_port_range settings
+   * full UTF-8 support, auto-detection of UTF-8 usage (locale)
+   * added "Day changed to [date]" message when day changes
+   * new plugin interface, rewritten from scratch: now loads dynamic C
+     library, and perl/python are script plugins
+   * log options (for server/channel/private) can now be set while
+     WeeChat is running
+   * added channel modes +e and +f
+   * added some missing IRC commands, fixed command 367
+   * added colors for input buffer and current channel of status bar
+   * added online help for config options (with /set full_option_name)
+   * enhanced "smart" hotlist, with names (new options:
+     look_hotlist_names_{count|level|length}) 
+
 Version 0.1.5 (2005-09-24):
   * added /ame command (send CTCP action to all channels of all
     connected servers)
@@ -1,4 +1,4 @@
-WeeChat FAQ, 2005-09-24
+WeeChat FAQ, 2006-01-14
 =======================

 Intended audience:
@@ -51,6 +51,7 @@ Q:	Why using WeeChat ? X-Chat and Irssi are so good...
 A:	Because WeeChat is very light and has new features.
 	Some new features:
 	  * many GUI (Curses, Gtk, wxWidgets, Qt)
+	  * available in many languages
 	  * nicklist available in all GUI
 	  * extensible with scripts (Perl, Python, Ruby)
 	  * horizontal and vertical window split
@@ -76,11 +77,10 @@ A:	For help you can type /help. For help about a command, type /help command.
 ================================================================================
 Q:	I don't see come chars with accents, what can I do?

-A:	You have to setup charset used for decoding, encoding, and internal WeeChat
-	charset.
-	Change value of option "look_charset_decode" to "UTF-8".
-	Option "look_charset_internal" should not be changed (default is
-	"ISO-8859-1").
+A:	You have to setup charset used for decoding (ISO and UTF), encoding, and
+	internal WeeChat charset.
+	Internal charset should be empty value, except if WeeChat failed to
+	detect your locale (WeeChat looks for "UTF-8" in your locale name).


 2.4
@@ -101,7 +101,6 @@ A:	You can use /perl command to load scripts (default path is
 	~/.weechat/perl).
 	Note that scripts in ~/.weechat/perl/autoload are automatically loaded
 	when WeeChat is starting up.
-	WeeChat Perl scripts are 80% compatible with X-Chat, but not with Irssi.


 2.6
@@ -113,14 +112,16 @@ A:	You can use /python command to load scripts (default path is
 	~/.weechat/python).
 	Note that scripts in ~/.weechat/python/autoload are automatically loaded
 	when WeeChat is starting up.
-	WeeChat Python scripts are 80% compatible with X-Chat, but not with Irssi.


 2.7
 ================================================================================
 Q:	How can I load Ruby scripts?

-A:	Today Ruby interface is not developed, so you can't load any Ruby script.
+A:	You can use /ruby command to load scripts (default path is
+	~/.weechat/ruby).
+	Note that scripts in ~/.weechat/ruby/autoload are automatically loaded
+	when WeeChat is starting up.


 3.1
@@ -165,13 +166,8 @@ A:	There is 2 ways to submit your feature request:
 ================================================================================
 Q:	What is the list of supported platforms for WeeChat?

-A:	Today WeeChat was succesfully tested on these platforms:
-	- GNU/Linux (any distribution / i386, AMD64, Sparc)
-	- FreeBSD
-	- NetBSD
-	- OpenBSD
-	- Mac OS X
-	- Microsoft Windows (with Cygwin and some code changes)
+A:	Full list is on this page:
+	http://weechat.flashtux.org/download.php?lang=en&view=supported_os


 3.5
@@ -1,4 +1,4 @@
-WeeChat FAQ, 2005-09-24
+WeeChat FAQ, 2006-01-14
 =======================

 Public concerné :
@@ -54,6 +54,7 @@ Q:	Pourquoi utiliser WeeChat ? X-Chat et Irssi sont si bien...
 R:	Parce que WeeChat est très léger et a de nouvelles fonctionnalités.
 	Quelques nouvelles fonctionnalités :
 	  * plusieurs interfaces (Curses, Gtk, wxWidgets, Qt)
+	  * disponible en plusieurs langues
 	  * liste des pseudos disponible dans toutes les interfaces
 	  * extensible par des scripts (Perl, Python, Ruby)
 	  * découpage de la fenêtre horizontalement et verticalement
@@ -80,11 +81,11 @@ R:	Pour obtenir de l'aide tapez /help. Pour de l'aide sur une commande,
 ================================================================================
 Q:	Je ne vois pas bien certains accents dans WeeChat, que faire ?

-R:	Il faut configurer le charset utilisé pour le décodage, l'encodage ainsi que
-	le charset interne à WeeChat.
-	Modifiez la valeur de l'option "look_charset_decode" en "UTF-8".
-	L'option "look_charset_internal" ne devrait pas être modifiée (par défaut
-	"ISO-8859-1").
+R:	Il faut configurer le charset utilisé pour le décodage (ISO et UTF),
+	l'encodage ainsi que le charset interne à WeeChat.
+	Le charset interne à WeeChat doit être une valeur vide, sauf si WeeChat
+	n'arrive pas à déterminer votre locale (WeeChat recherche "UTF-8" dans
+	le nom de la locale).


 2.4
@@ -105,7 +106,6 @@ R:	La commande /perl permet de charger les scripts Perl (le chemin par d
 	est ~/.weechat/perl).
 	Notez que les scripts dans ~/.weechat/perl/autoload sont automatiquement
 	chargés par WeeChat lorsqu'il démarre.
-	Les scripts Perl WeeChat sont 80% compatibles avec X-Chat, mais pas Irssi.


 2.6
@@ -117,15 +117,16 @@ R:	La commande /python permet de charger les scripts Python (le chemin par
 	défaut est ~/.weechat/python).
 	Notez que les scripts dans ~/.weechat/python/autoload sont automatiquement
 	chargés par WeeChat lorsqu'il démarre.
-	Les scripts Python WeeChat sont 80% compatibles avec X-Chat, mais pas Irssi.


 2.7
 ================================================================================
 Q:	Comment puis-je charger des scripts Ruby ?

-R:	Aujourd'hui l'interface Ruby n'est pas développée.
-	Vous ne pouvez donc charger aucun script Ruby.
+R:	La commande /ruby permet de charger les scripts Ruby (le chemin par
+	défaut est ~/.weechat/ruby).
+	Notez que les scripts dans ~/.weechat/ruby/autoload sont automatiquement
+	chargés par WeeChat lorsqu'il démarre.


 3.1
@@ -175,13 +176,8 @@ R:	Il y a 2 mani
 ================================================================================
 Q:	Quelle est la liste des plate-formes supportées par WeeChat ?

-R:	Aujourd'hui WeeChat a été testé avec succès sur ces plate-formes :
-	- GNU/Linux (toute distribution / i386, AMD64, Sparc)
-	- FreeBSD
-	- NetBSD
-	- OpenBSD
-	- Mac OS X
-	- Microsoft Windows (avec Cygwin et quelques modifications de code)
+R:	La liste complète est sur cette page :
+	http://weechat.flashtux.org/download.php?lang=fr&view=supported_os


 3.5
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2005 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2006 FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -12,17 +12,18 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #

 SUBDIRS = po doc intl src

 EXTRA_DIST = config.rpath BUGS FAQ FAQ.fr \
             debian/changelog debian/control \
-             debian/copyright \
+             debian/copyright debian/compat \
             debian/rules debian/weechat-common.docs \
             debian/weechat-common.install debian/weechat-curses.dirs \
-             debian/weechat-curses.install debian/weechat-gtk.dirs \
-             debian/weechat-gtk.install
+             debian/weechat-curses.install debian/weechat-plugins.install \
+				 debian/weechat-curses.menu debian/NEWS \
+             weechat.spec weechat_icon_32.png

 ACLOCAL_AMFLAGS = -I m4
@@ -1,6 +1,38 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================

+* FlashCode, 2006-01-14
+
+    WeeChat 0.1.7 released.
+
+    Important release notes:
+
+    - Ruby script plugin has been added but is experimental in this release.
+      You're warned!
+
+    - "/away" command was changed to be RFC 2812 compliant.
+      Now argument is required to set away, and no argument means
+      remove away ("back"). Setting "irc_default_msg_away" has been removed.
+
+* FlashCode, 2005-11-11
+
+    WeeChat 0.1.6 released.
+
+    Important release notes:
+
+    - incompatibility with some old scripts: now all handlers have to return
+      a code for completion, and to do some actions about message to ignore
+      (please look at documentation for detail)
+
+    - on OpenBSD, the new option "plugins_extension" should be set to ".so.0.0"
+      since the plugins names are ending by ".so.0.0" and not ".so"
+
+    - with new and full UTF-8 support, the option "look_charset_internal"
+      should be set to blank for most cases. Forces it only if your locale is
+      not properly detected by WeeChat (you can set "UTF-8" or "ISO-8859-15"
+      for example, depending on your locale). WeeChat is looking for "UTF-8" in
+      your locale name at startup.
+
 * FlashCode, 2005-09-24

    WeeChat 0.1.5 released.
@@ -12,17 +12,17 @@ Features
    * IRC chat client with multi-server connection
    * many GUI (curses, Gtk, Qt) (1)
    * small, fast and very light
-    * customizable and extensible with scripts (Perl, Python, Ruby) (2)
+    * customizable and extensible with plugins (scripts Perl, Python, Ruby) (2)
    * compliant with RFC 1459,2810,2811,2812,2813
    * developed from scratch
-    * multi-platform (GNU/Linux, *BSD, Windows & other) (3)
+    * multi-platform (GNU/Linux, *BSD, Mac OS X, QNX, Windows & other) (3)
    * 100% GPL & free


 Copyright
 ---------

-WeeChat (c) Copyright 2003-2005 by FlashCode <flashcode@flashtux.org>
+WeeChat (c) Copyright 2003-2006 by FlashCode <flashcode@flashtux.org>
 (see AUTHORS file if you want to contact authors)

 WeeChat is distributed under GPL licence (see COPYING file for complete license):
@@ -39,10 +39,10 @@ GNU General Public License for more details.

 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA


 ---
 (1) only Curses interface is available today
-(2) only Perl and Python interfaces are available today
-(3) only GNU/Linux and *BSD versions are available today
+(2) only Perl and Python plugins are available today
+(3) Windows is under construction
@@ -1,7 +1,7 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================

-TODO - 2005-09-24
+TODO - 2006-01-14

 Legend:
  #  done
@@ -10,51 +10,84 @@ Legend:
  ?  is this really necessary?


-v0.1.6:
------
-
 * General:
    + Windows version
-    + Solaris version
+    # Solaris version

 * Interface:
    + Gtk GUI
+    ? Qt GUI
    + internationalization (traduce WeeChat in many languages)
+    - add dark colors (demi intensity)
+    # color for nicks (except own nick) when nick colors are disabled
+    # allow decode/encode charsets for servers or chan (not globally)
+    - understand incomplete commands if unambigous (for example: /he for /help is ok)
+    - interpret 'old-school' special chars in messages: *bold* _underline_ /italic/
+    - minimal width of nick in text area
+    - display number of highlights since last buffer read (pink square)
+    - add "*" on the side of message buffer when alt-j or other meta modifier is on
+    - completion with tab key for all words starting with "#" by opened chans names
+    - completion when input line is empty should add last nick that wrote to me
+    - open new channels near server (not at the end of buffers)
+    - add filename completion (for example with /dcc send) 

 * WeeChat commands
    - be able to bind a key on more than one command
    - be able to make an alias running more than one command
    - host with "*" possible with /ignore command
-
- * Configuration:
-    - be able to launch more than one command when connecting to server
-
-
-Future versions:
---------------
+    - "/completion" command: do shortcuts (for example when we type "u"
+      in the text bar it send it to the server as "you")
+    - "/last": command to look for text in previous messages
+    # completion system for scripts arguments
+    # "/upgrade" command: reload WeeChat himself without disconnecting from server
+    - get help on config settings with /help option instead of /set option (since
+      many options can be displayed and help is not displayed in this case)
+    - "/cycle": do a /part then /join on current channel
+    - be able to save the current buffer with a single command
+      (/buffer dump /path/to/file), or to make it possible to write a script
+      that does so (see plugins)
+    - "/reconnect": reconnect to all servers, without waiting for auto-reconnect delay after disconnection 

 * IRC protocol:
-    - customizable CTCP version reply
+    # customizable CTCP version reply (possible by plugin script)
    - complete "/list" command: add regexp search, display only channels that
      match regexp
    - when we're away, WeeChat should log all the lines begenning by our nick.
      When we come back from our away it should print it to the current window
    - "/notify" and "/unnotify" command to be warn by WeeChat when a given
      nick/host connect to the given irc network
+    - display one time away message of remote user in private (optional)
+    - add max number of nicks for away check (do not check away nicks on channels with high number of nicks)
+    - add anti-flood mechanism, when pasting more than N lines
+    - add mask for /ban command, and ban types (host, nick)

- * WeeChat commands:
-    - "/completion" command: do shortcuts (for example when we type "u"
-      in the text bar it send it to the server as "you")
-    - "/last": command to look for text in previous messages
-    - completion system for scripts arguments
-
- * Interface:
-    - color for nicks (except own nick) when nick colors are disabled
-    - allow decode/encode charsets for servers or chan (not globally)
-    - interpret special chars in messages (color & bold for example)
-    - understand incomplete commands if unambigous (for example: /he for /help is ok)
-    ? Qt GUI
+ * Configuration:
+    - be able to launch more than one command when connecting to server
+    - use ~/.weechat/dcc by default for DCC incoming files (and create
+      directory at startup if not found)
+    - add global username/realname, used if server values are not filled
+    - add command line arg (--dir ?) to choose weechat home dir
+      (~/.weechat by default)
+    - be able to set more than one server address for network
+    - save buffer numbers (order) to config file and restore them when
+      opened, or make it possible by script 

 * Plugins:
+    - allow print function to write on all buffers or all channels of a server
    - Ruby plugin
    - "/ruby load" and "/ruby unload" commands to (un)load Ruby scripts
+    - add "outgoing" message event so scripts can edit user-input text before
+      it is sent to the channel
+    - add a timer function so scripts can do things like timeouts, delayed
+      processing, etc.
+    - allow print function to write on all buffers or all channels of a server
+    - allow plugins to perform actions on "highlight" messages
+    - get_servers(), get_channels(server), get_nicks(server,channel)
+    - Lua plugin
+    - Tcl plugin
+    - Php plugin (maybe if possible)
+    ? "fish" plugin (cf http://fish.sekure.us/)
+    - script plugins (perl, python, ruby, ..) should load scripts in system dir,
+      not only ~/.weechat/xxxx/autoload/
+    - allow plugins to get the contents of a specified (or at least the
+      "current") buffer.
@@ -6,6 +6,7 @@ cp Makefile.am Makefile.am.old
 gettextize --copy --force --intl --no-changelog &&
 mv Makefile.am.old Makefile.am
 mv configure.in.old configure.in
+libtoolize --automake --force --copy &&
 aclocal &&
 # autoheader creates config.h.in needed by autoconf
 autoheader &&
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2005 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2006 FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -12,35 +12,52 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #

 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.

 AC_PREREQ(2.56)
-AC_INIT(WeeChat, 0.1.5, flashcode@flashtux.org)
+AC_INIT(WeeChat, 0.1.7, flashcode@flashtux.org)
 AC_CONFIG_SRCDIR([src/common/weechat.c])
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([weechat], [0.1.5])
+AM_INIT_AUTOMAKE([weechat], [0.1.7])

-# Checks for programs.
+# Checks for programs
 AC_PROG_CC
 AC_PROG_MAKE_SET
-AC_PROG_RANLIB
+AM_PROG_LIBTOOL
+
+# Add some flags for some OS
+case "$host_os" in
+freebsd* | openbsd*)
+	LDFLAGS="$LDFLAGS -L/usr/local/lib"
+        ;;
+netbsd*)
+	CFLAGS="$CFLAGS -I/usr/pkg/include"
+	LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
+        ;;
+solaris*)
+	LDFLAGS="$LDFLAGS -lsocket -lxnet"
+	;;
+*)
+        ;;
+esac

 # Gettext
 ALL_LINGUAS="fr es cs"
 AM_GNU_GETTEXT

-# Checks for libraries.
-AC_CHECK_LIB([ncurses], [initscr], LIBNCURSES_FOUND=1, LIBNCURSES_FOUND=0)
+# Checks for libraries
+AC_CHECK_LIB(ncurses, initscr, LIBNCURSES_FOUND=1, LIBNCURSES_FOUND=0)
+AC_CHECK_LIB(ncursesw, initscr, LIBNCURSESW_FOUND=1, LIBNCURSESW_FOUND=0)

-# Checks for header files.
+# Checks for header files
 AC_HEADER_STDC
 AC_CHECK_HEADERS([arpa/inet.h libintl.h limits.h locale.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h sys/types.h unistd.h pwd.h errno.h])

-# Checks for typedefs, structures, and compiler characteristics.
+# Checks for typedefs, structures, and compiler characteristics
 AC_HEADER_TIME
 AC_STRUCT_TM

@@ -63,6 +80,11 @@ AC_FUNC_SELECT_ARGTYPES
 AC_TYPE_SIGNAL
 AC_CHECK_FUNCS([gethostbyname gethostname getsockname gettimeofday inet_ntoa memset mkdir select setlocale socket strcasecmp strchr strdup strncasecmp strpbrk strrchr strstr uname])

+# Variables in config.h
+
+AH_VERBATIM([PREFIX], [#undef PREFIX])
+AH_VERBATIM([WEECHAT_LIBDIR], [#undef WEECHAT_LIBDIR])
+AH_VERBATIM([WEECHAT_SHAREDIR], [#undef WEECHAT_SHAREDIR])
 AH_VERBATIM([PLUGINS], [#undef PLUGINS])
 AH_VERBATIM([PLUGIN_PERL], [#undef PLUGIN_PERL])
 AH_VERBATIM([PLUGIN_PYTHON], [#undef PLUGIN_PYTHON])
@@ -70,61 +92,75 @@ AH_VERBATIM([PLUGIN_RUBY], [#undef PLUGIN_RUBY])
 AH_VERBATIM([HAVE_GNUTLS], [#undef HAVE_GNUTLS])
 AH_VERBATIM([DEBUG], [#undef DEBUG])

-AC_ARG_ENABLE(ncurses,  [  --disable-ncurses       Turn off ncurses interface (default=auto)],enable_ncurses=$enableval,enable_ncurses=yes)
-AC_ARG_ENABLE(wxwidgets,[  --enable-wxwidgets      Turn on WxWidgets interface (default=no)],enable_wxwidgets=$enableval,enable_wxwidgets=no)
-AC_ARG_ENABLE(gtk,      [  --enable-gtk            Turn on Gtk+ interface (default=no)],enable_gtk=$enableval,enable_gtk=no)
-AC_ARG_ENABLE(qt,       [  --enable-qt             Turn on Qt interface (default=no)],enable_qt=$enableval,enable_qt=no)
-AC_ARG_ENABLE(perl,     [  --enable-perl           Turn on Perl plugins (default=no)],enable_perl=$enableval,enable_perl=no)
-AC_ARG_ENABLE(python,   [  --enable-python         Turn on Python plugins (default=no)],enable_python=$enableval,enable_python=no)
-AC_ARG_ENABLE(ruby,     [  --enable-ruby           Turn on Ruby plugins (default=no)],enable_ruby=$enableval,enable_ruby=no)
-AC_ARG_ENABLE(gnutls,   [  --disable-gnutls        Turn off gnutls support (default=auto)],enable_gnutls=$enableval,enable_gnutls=yes)
-AC_ARG_WITH(debug,      [  --with-debug            Debugging: 0=no debug, 1=debug compilation, 2=debug compilation + verbose msgs (default=0)],debug=$withval,debug=0)
+# Arguments for ./configure

-enable_plugins="no"
+AC_ARG_ENABLE(ncurses,       [  --disable-ncurses       Turn off ncurses interface (default=compiled if found)],enable_ncurses=$enableval,enable_ncurses=yes)
+AC_ARG_ENABLE(wxwidgets,     [  --enable-wxwidgets      Turn on WxWidgets interface (default=no wxwidgets)],enable_wxwidgets=$enableval,enable_wxwidgets=no)
+AC_ARG_ENABLE(gtk,           [  --enable-gtk            Turn on Gtk+ interface (default=no Gtk+)],enable_gtk=$enableval,enable_gtk=no)
+AC_ARG_ENABLE(qt,            [  --enable-qt             Turn on Qt interface (default=no Qt)],enable_qt=$enableval,enable_qt=no)
+AC_ARG_ENABLE(plugins,       [  --disable-plugins       Turn off plugins support (default=plugins enabled)],enable_plugins=$enableval,enable_plugins=yes)
+AC_ARG_ENABLE(perl,          [  --enable-perl           Turn on Perl script plugin (default=no Perl plugin)],enable_perl=$enableval,enable_perl=no)
+AC_ARG_ENABLE(python,        [  --enable-python         Turn on Python script plugin (default=no Python plugin)],enable_python=$enableval,enable_python=no)
+AC_ARG_ENABLE(ruby,          [  --enable-ruby           Turn on Ruby script plugin (default=no Ruby script)],enable_ruby=$enableval,enable_ruby=no)
+AC_ARG_ENABLE(gnutls,        [  --disable-gnutls        Turn off gnutls support (default=compiled if found)],enable_gnutls=$enableval,enable_gnutls=yes)
+AC_ARG_WITH(debug,           [  --with-debug            Debugging: 0=no debug, 1=debug compilation, 2=debug compilation + verbose msgs (default=1)],debug=$withval,debug=1)

-AM_CONDITIONAL(GUI_NCURSES,   test "$enable_ncurses" = "yes")
-AM_CONDITIONAL(GUI_WXWIDGETS, test "$enable_wxwidgets" = "yes")
-AM_CONDITIONAL(GUI_GTK,       test "$enable_gtk" = "yes")
-AM_CONDITIONAL(GUI_QT,        test "$enable_qt" = "yes")
-AM_CONDITIONAL(PLUGIN_PERL,   test "$enable_perl" = "yes")
-AM_CONDITIONAL(PLUGIN_PYTHON, test "$enable_python" = "yes")
-AM_CONDITIONAL(PLUGIN_RUBY,   test "$enable_ruby" = "yes")
-AM_CONDITIONAL(HAVE_GNUTLS,   test "$enable_gnutls" = "yes")
+AM_CONDITIONAL(GUI_NCURSES,          test "$enable_ncurses" = "yes")
+AM_CONDITIONAL(GUI_WXWIDGETS,        test "$enable_wxwidgets" = "yes")
+AM_CONDITIONAL(GUI_GTK,              test "$enable_gtk" = "yes")
+AM_CONDITIONAL(GUI_QT,               test "$enable_qt" = "yes")
+AM_CONDITIONAL(PLUGINS,              test "$enable_plugins" = "yes")
+AM_CONDITIONAL(PLUGIN_PERL,          test "$enable_perl" = "yes")
+AM_CONDITIONAL(PLUGIN_PYTHON,        test "$enable_python" = "yes")
+AM_CONDITIONAL(PLUGIN_RUBY,          test "$enable_ruby" = "yes")
+AM_CONDITIONAL(HAVE_GNUTLS,          test "$enable_gnutls" = "yes")
+
+# ------------------------------------------------------------------------------
+#                                    GUI
+# ------------------------------------------------------------------------------

 if test "x$enable_ncurses" = "xyes" ; then
-    if test "$LIBNCURSES_FOUND" = "0" ; then
-        AC_MSG_ERROR([
+    if test "$LIBNCURSESW_FOUND" = "0" ; then
+        if test "$LIBNCURSES_FOUND" = "0" ; then
+            AC_MSG_ERROR([
 *** ncurses library not found!
 *** Please install ncurses library or run ./configure with --disable-ncurses parameter.])
+        fi
+        AC_MSG_WARN([
+*** ncursesw library not found! Falling back to "ncurses"
+*** Be careful, UTF-8 display may not work properly if your locale is UTF-8.])
+        NCURSES_LIBS="-lncurses"
+    else
+        NCURSES_LIBS="-lncursesw"
+        AC_CHECK_HEADERS(ncursesw/curses.h)
    fi
-    NCURSES_LIBS="-lncurses"
    AC_SUBST(NCURSES_LIBS)
 fi

-if test "x$enable_wxwidgets" = "xyes" ; then
-	AM_OPTIONS_WXCONFIG
-	AM_PATH_WXCONFIG(2.3.4, wxWin=1)
-
-    if test "$wxWin" != 1; then
-        AC_MSG_ERROR([
-*** wxWindows must be installed on your system
-*** but wx-config script couldn't be found.
-
-*** Please check that wx-config is in path, the directory
-*** where wxWindows libraries are installed (returned by
-*** 'wx-config --libs' command) is in LD_LIBRARY_PATH or
-*** equivalent variable and wxWindows version is 2.3.4 or above.
-        ])
-    fi
-    
-    CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
-    CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
-    CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
-    LDFLAGS="$LDFLAGS $WX_LIBS"
-    
-    WXWIDGETS_CFLAGS=""
-    WXWIDGETS_LIBS=""
-fi
+#if test "x$enable_wxwidgets" = "xyes" ; then
+#    AM_OPTIONS_WXCONFIG
+#    AM_PATH_WXCONFIG(2.3.4, wxWin=1)
+#
+#    if test "$wxWin" != 1; then
+#        AC_MSG_ERROR([
+#*** wxWindows must be installed on your system
+#*** but wx-config script couldn't be found.
+#
+#*** Please check that wx-config is in path, the directory
+#*** where wxWindows libraries are installed (returned by
+#*** 'wx-config --libs' command) is in LD_LIBRARY_PATH or
+#*** equivalent variable and wxWindows version is 2.3.4 or above.
+#        ])
+#    fi
+#
+#    CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
+#    CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
+#    CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
+#    LDFLAGS="$LDFLAGS $WX_LIBS"
+#
+#    WXWIDGETS_CFLAGS=""
+#    WXWIDGETS_LIBS=""
+#fi

 if test "x$enable_gtk" = "xyes" ; then
    #if test "$LIBGTK_FOUND" = "0" ; then
@@ -136,12 +172,16 @@ if test "x$enable_gtk" = "xyes" ; then
    AC_SUBST(GTK_LIBS)
 fi

+# ------------------------------------------------------------------------------
+#                                   plugins
+# ------------------------------------------------------------------------------
+
 PLUGINS_LIBS=

 if test "x$enable_perl" = "xyes" ; then
    enable_plugins="yes"
    
-    AC_PATH_PROG(PERL, perl perl5)
+    AC_PATH_PROGS(PERL, perl perl5)
    if test -z $PERL ; then
        AC_MSG_ERROR([
 *** Perl must be installed on your system
@@ -169,7 +209,7 @@ it with your software package manager.])
    PERL_LIB_TEST=`PT=perltest.c ; echo "int main() { return 0; }" > $PT ; $CC -Wall $PT -o $PT.out $($PERL -MExtUtils::Embed -e ldopts) 1>/dev/null 2>&1; echo $?; rm -f $PT $PT.out 1>/dev/null 2>&1`

    if test "x$PERL_LIB_TEST" = "x0" ; then
-        PLUGINS_LIBS="$PLUGINS_LIBS ../../plugins/perl/lib_weechat_perl.a `$PERL -MExtUtils::Embed -e ldopts`"
+        PERL_LFLAGS=`$PERL -MExtUtils::Embed -e ldopts`
    else
        AC_MSG_ERROR([
 *** Perl library couldn't be found in your system.
@@ -178,13 +218,14 @@ it with your software package manager.])
    AC_MSG_RESULT(found)
 	    
    AC_SUBST(PERL_CFLAGS)
+    AC_SUBST(PERL_LFLAGS)
    AC_DEFINE(PLUGIN_PERL)
 fi

 if test "x$enable_python" = "xyes" ; then
    enable_plugins="yes"
    
-    AC_PATH_PROG(PYTHON, python python2.4 python2.3 python2.2)
+    AC_PATH_PROGS(PYTHON, python python2.4 python2.3 python2.2)
    if test -z $PYTHON ; then
        AC_MSG_ERROR([
 *** Python must be installed on your system
@@ -196,11 +237,11 @@ if test "x$enable_python" = "xyes" ; then
    
    PYTHON_SYSPREFIX=`$PYTHON -c 'import sys; print "%s" % sys.prefix'`
    PYTHON_VERSION=`$PYTHON -c 'import sys ; print sys.version[[:3]]'`
-    PYTHON_INCLUDE="$PYTHON_SYSPREFIX/include/python$PYTHON_VERSION"
+    PYTHON_INCLUDE=`$PYTHON -c "import distutils.sysconfig,string; print distutils.sysconfig.get_config_var('CONFINCLUDEPY')"`
    
    AC_MSG_CHECKING(for Python header files)
    if test -r "$PYTHON_INCLUDE/Python.h"; then
-        PYTHON_CFLAGS=-I`$PYTHON -c "import distutils.sysconfig,string; print distutils.sysconfig.get_config_var('CONFINCLUDEPY')"`
+        PYTHON_CFLAGS="-I$PYTHON_INCLUDE"
    else
        AC_MSG_ERROR([
 *** Python header files couldn't be found in your system.
@@ -208,11 +249,16 @@ if test "x$enable_python" = "xyes" ; then
    fi
    AC_MSG_RESULT(found)
    
-    PYTHON_LIB="$PYTHON_SYSPREFIX/lib/python$PYTHON_VERSION/config"
+    PYTHON_LIB=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBPL')"`
+    PYTHON_LFLAGS="-lpython$PYTHON_VERSION "`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBS')+' '+distutils.sysconfig.get_config_var('SYSLIBS')+' '+distutils.sysconfig.get_config_var('LINKFORSHARED')"`
    
    AC_MSG_CHECKING(for Python library)
-    if test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.so" -o -r "$PYTHON_SYSPREFIX/lib/libpython$PYTHON_VERSION.so"; then
-        PYTHON_LFLAGS="-lpython$PYTHON_VERSION -lpthread -lutil"
+    if test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.so"; then
+       PYTHON_LFLAGS="-L$PYTHON_LIB $PYTHON_LFLAGS"
+    elif test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.a"; then
+       PYTHON_LFLAGS="-L$PYTHON_LIB $PYTHON_LFLAGS"
+    elif test -r "$PYTHON_SYSPREFIX/lib/libpython$PYTHON_VERSION.so"; then
+       PYTHON_LFLAGS="-L$PYTHON_SYSPREFIX/lib/ $PYTHON_LFLAGS"
    else
        AC_MSG_ERROR([
 *** Python library couldn't be found in your system.            
@@ -220,29 +266,64 @@ if test "x$enable_python" = "xyes" ; then
    fi
    AC_MSG_RESULT(found)
    
-    PLUGINS_LIBS="$PLUGINS_LIBS ../../plugins/python/lib_weechat_python.a $PYTHON_LFLAGS"
    AC_SUBST(PYTHON_CFLAGS)
+    AC_SUBST(PYTHON_LFLAGS)
    AC_DEFINE(PLUGIN_PYTHON)
 fi

 if test "x$enable_ruby" = "xyes" ; then
    enable_plugins="yes"
+
+    AC_PATH_PROGS(RUBY, ruby ruby1.8 ruby1.9)
+    if test -z $RUBY ; then
+        AC_MSG_ERROR([
+*** Ruby must be installed on your system
+*** but ruby interpreter couldn't be found in path.
+
+*** Please check that ruby is in path, or install
+*** it with your software package manager.])
+    fi
    
-    # TODO: check that ruby lib and headers are installed
-    
-    RUBY_CFLAGS=-I`ruby -rrbconfig -e "puts Config::CONFIG[['archdir']]"`
-    RUBY_LFLAGS=-L`ruby -rrbconfig -e "puts Config::CONFIG[['archdir']]"` -lruby
-    PLUGINS_LIBS="$PLUGINS_LIBS ../../plugins/ruby/lib_weechat_ruby.a $RUBY_LFLAGS"
+    RUBY_INCLUDE=`$RUBY -rrbconfig -e "puts Config::CONFIG[['archdir']]"`
+
+    AC_MSG_CHECKING(for Ruby header files)
+    if test -r "$RUBY_INCLUDE/ruby.h"; then
+        RUBY_CFLAGS="-I$RUBY_INCLUDE"
+    else
+        AC_MSG_ERROR([
+*** Ruby header files couldn't be found in your system.
+*** Try to install them with your software package manager.])
+    fi
+    AC_MSG_RESULT(found)
+   
+    RUBY_LFLAGS=`$RUBY -rrbconfig -e "puts Config::CONFIG[['LIBRUBYARG_SHARED']]"`
+
    AC_SUBST(RUBY_CFLAGS)
+    AC_SUBST(RUBY_LFLAGS)
    AC_DEFINE(PLUGIN_RUBY)
 fi

 if test "x$enable_plugins" = "xyes" ; then
+    AC_CHECK_FUNCS(dlopen, LIBDL_FOUND=yes, LIBDL_FOUND=no)
+    if test "$LIBDL_FOUND" != "yes"; then
+        AC_CHECK_LIB(dl, dlopen, LIBDL_FOUND=yes, LIBDL_FOUND=no)
+        if test "$LIBDL_FOUND" = "yes"; then
+            PLUGINS_LIBS="-ldl"
+        else
+            AC_MSG_ERROR([
+*** "dl" library (dynamic library loader) couldn't be found in your system.
+*** Try to install it with your software package manager or disable plugins.])
+        fi
+    fi
    AC_DEFINE(PLUGINS)
 fi

 AC_SUBST(PLUGINS_LIBS)

+# ------------------------------------------------------------------------------
+#                                   gnutls
+# ------------------------------------------------------------------------------
+
 if test "x$enable_gnutls" = "xyes" ; then
    found_gnutls="no"
    AM_PATH_LIBGNUTLS( 1.0.0, found_gnutls=yes, AC_MSG_WARN([[
@@ -250,13 +331,38 @@ if test "x$enable_gnutls" = "xyes" ; then
 *** ftp://ftp.gnutls.org/pub/gnutls/
 *** WeeChat will be built without GnuTLS support.]]))
    if test "x$found_gnutls" = "xyes" ; then
-        GNUTLS_LIBS="-lgnutls"
-        AC_SUBST(GNUTLS_LIBS)
-        AC_DEFINE(HAVE_GNUTLS)
+       GNUTLS_CFLAGS=`libgnutls-config --cflags`
+       GNUTLS_LFLAGS=`libgnutls-config --libs`
+       AC_SUBST(GNUTLS_CFLAGS)
+       AC_SUBST(GNUTLS_LFLAGS)
+       AC_DEFINE(HAVE_GNUTLS)
    else
        enable_gnutls="no"
    fi
 fi
+
+# ------------------------------------------------------------------------------
+#                                general vars
+# ------------------------------------------------------------------------------
+
+if test "x$prefix" = "xNONE" ; then
+   prefix="$ac_default_prefix"
+fi
+
+if test "x$exec_prefix" = "xNONE" ; then
+   exec_prefix="$prefix"
+fi
+
+AC_DEFINE_UNQUOTED(PREFIX, "${prefix}")
+
+WEECHAT_LIBDIR=`eval echo ${libdir}/weechat`
+AC_DEFINE_UNQUOTED(WEECHAT_LIBDIR, "$WEECHAT_LIBDIR")
+
+WEECHAT_SHAREDIR=`eval echo ${datadir}/weechat`
+AC_DEFINE_UNQUOTED(WEECHAT_SHAREDIR, "$WEECHAT_SHAREDIR")
+
+weechat_libdir=${libdir}/weechat
+AC_SUBST(weechat_libdir)
 
 CFLAGS=`echo $CFLAGS | sed s/-g//g`
 if test "x$CFLAGS" = "x" ; then
@@ -272,19 +378,40 @@ if test "x$debug" = "x2" ; then
    AC_DEFINE(DEBUG)
 fi

-dnl For FreeBSD
 LIBS="$LIBS $INTLLIBS"
-CFLAGS="$CFLAGS $CPPFLAGS"
+
+case "$host_os" in
+freebsd* | netbsd*)
+        if test "x$enable_perl" = "xyes" -o "x$enable_python" = "xyes" ; then
+	   CFLAGS="$CFLAGS -pthread"
+        fi
+        CFLAGS="$CFLAGS $CPPFLAGS"
+        ;;
+openbsd*)
+        if test "x$enable_python" = "xyes" ; then
+           CFLAGS="$CFLAGS -pthread"
+        fi
+        ;;
+*)
+        ;;
+esac
+
+# ------------------------------------------------------------------------------
+#                                output Makefiles
+# ------------------------------------------------------------------------------

 AC_OUTPUT([Makefile
           doc/Makefile
+           doc/fr/Makefile
+           doc/en/Makefile
           src/Makefile
           src/common/Makefile
           src/irc/Makefile
           src/plugins/Makefile
-           src/plugins/perl/Makefile
-           src/plugins/python/Makefile
-           src/plugins/ruby/Makefile
+           src/plugins/scripts/Makefile
+           src/plugins/scripts/perl/Makefile
+           src/plugins/scripts/python/Makefile
+           src/plugins/scripts/ruby/Makefile
           src/gui/Makefile
           src/gui/curses/Makefile
           src/gui/wxwidgets/Makefile
@@ -293,8 +420,9 @@ AC_OUTPUT([Makefile
           intl/Makefile
           po/Makefile.in])

-echo
-echo $PACKAGE $VERSION
+# ------------------------------------------------------------------------------
+#                                  end message
+# ------------------------------------------------------------------------------

 listgui=
 if test "x$enable_ncurses" = "xyes" ; then
@@ -325,19 +453,17 @@ if test "x$debug" = "x2" ; then
    msg_debug_verbose="yes"
 fi

-echo
-echo Interfaces.................... :$listgui
-echo
-echo Build with Plugin support..... : $enable_plugins
-echo Build with Perl support....... : $enable_perl
-echo Build with Python support..... : $enable_python
-echo Build with Ruby support....... : $enable_ruby
-echo Build with GNUtls support..... : $enable_gnutls
-echo
-echo Compile with debug info....... : $msg_debug_compiler
-echo Print debugging messages...... : $msg_debug_verbose
-echo
-eval eval echo WeeChat will be installed in $bindir.
-echo
-echo configure complete, now type \'make\' to build WeeChat
-echo
+echo ""
+echo "Interfaces.................................... :$listgui"
+echo "Build with GNUtls support..................... : $enable_gnutls"
+echo "Build with Plugin support..................... : $enable_plugins"
+echo "              Perl plugin..................... : $enable_perl"
+echo "              Python plugin................... : $enable_python"
+echo "              Ruby plugin..................... : $enable_ruby"
+echo "Compile with debug info....................... : $msg_debug_compiler"
+echo "Print debugging messages...................... : $msg_debug_verbose"
+echo ""
+eval echo "WeeChat will be installed in $bindir."
+echo ""
+echo "configure complete, now type 'make' to build WeeChat $VERSION"
+echo ""
@@ -0,0 +1,6 @@
+weechat (0.1.6-1) unstable; urgency=low
+
+ This release introduces some incompatible changes with old scripts and locale
+ support, you can read the upstream NEWS file for more information.
+
+ -- Julien Louis <ptitlouis@sysif.net>  Fri, 11 Nov 2005 20:45:46 +0100
@@ -1,3 +1,150 @@
+weechat (0.1.6-2) unstable; urgency=low
+
+  * Apply path to fix segfault when removing server.
+  * Move plugins in a separate package
+
+ -- Julien Louis <ptitlouis@sysif.net>  Tue, 22 Nov 2005 08:33:09 +0100
+
+weechat (0.1.6-1) unstable; urgency=low
+
+  * New upstream release
+  * Add menu entry
+  * Move libperl5.8 and python2.3 from Depends to Recommends
+
+ -- Julien Louis <ptitlouis@sysif.net>  Fri, 11 Nov 2005 22:21:08 +0100
+
+weechat (0.1.5-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Julien Louis <ptitlouis@sysif.net>  Sat, 24 Sep 2005 14:08:55 +0200
+
+weechat (0.1.4-2) unstable; urgency=low
+
+  * Add autotools-dev to Build-Depends.
+  * update autotools stuff automatically to always
+    have up-to-date config.{guess,sub}
+  * Update Build-Depends: libgnutls11-dev -> libgnutls-dev
+
+ -- Julien Louis <ptitlouis@sysif.net>  Mon,  1 Aug 2005 11:46:39 +0200
+
+weechat (0.1.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Julien Louis <ptitlouis@sysif.net>  Sat, 30 Jul 2005 16:26:55 +0200
+
+weechat (0.1.3-2) unstable; urgency=low
+
+  * Update config.{guess,sub} to fix FTBFS on k*BSD (Closes: #316791)
+
+ -- Julien Louis <ptitlouis@sysif.net>  Fri,  8 Jul 2005 21:30:38 +0200
+
+weechat (0.1.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Julien Louis <ptitlouis@sysif.net>  Sat,  2 Jul 2005 20:06:29 +0200
+
+weechat (0.1.2-3) unstable; urgency=low
+
+  * Apply patch against gui-display.c to fix curses color bug.
+  * remove dh_install --sourcedir to allow builds on woody.
+
+ -- Julien Louis <ptitlouis@sysif.net>  Sun, 19 Jun 2005 22:37:11 +0200
+
+weechat (0.1.2-2) unstable; urgency=low
+
+  * Patch src/gui/curse/gui-display.c to fix segfault
+    when config file does not exists (Closes: #310589).
+
+ -- Julien Louis <ptitlouis@sysif.net>  Tue, 24 May 2005 20:55:02 +0200
+
+weechat (0.1.2-1) unstable; urgency=low
+
+  * WeeChat version 0.1.2, see ChangeLog for detail.
+  
+ -- Sebastien Helleu <flashcode@flashtux.org>  Sat, 21 May 2005 08:00:00 +0200
+
+weechat (0.1.1-2) unstable; urgency=low
+
+  * debian/control:
+    - Add myself to uploaders.
+    - Remove unecessary dependency on weechat-gtk (Closes: #308287).
+
+ -- Julien Louis <ptitlouis@sysif.net>  Tue, 10 May 2005 22:38:52 +0200
+
+weechat (0.1.1-1) unstable; urgency=low
+
+  * WeeChat version 0.1.1, see ChangeLog for detail (closes: #306492)
+  
+ -- Sebastien Helleu <flashcode@flashtux.org>  Sat, 20 Mar 2005 08:00:00 +0200
+
+weechat (0.1.0-1) unstable; urgency=low
+
+  * WeeChat version 0.1.0, see ChangeLog for detail.
+  
+ -- Sebastien Helleu <flashcode@flashtux.org>  Sat, 12 Feb 2005 12:00:00 +0200
+
+weechat (0.0.9-1) unstable; urgency=low
+
+  * WeeChat version 0.0.9, see ChangeLog for detail.
+  
+ -- FlashCode <flashcode@flashtux.org>  Sat, 01 Jan 2005 13:00:00 +0200
+
+weechat (0.0.8-1) unstable; urgency=low
+
+  * WeeChat version 0.0.8, see ChangeLog for detail.
+  
+ -- FlashCode <flashcode@flashtux.org>  Sat, 30 Oct 2004 11:40:00 +0200
+
+weechat (0.0.7-1) unstable; urgency=low
+
+  * WeeChat version 0.0.7, see ChangeLog for detail.
+  
+ -- FlashCode <flashcode@flashtux.org>  Sat, 08 Aug 2004 21:00:00 +0200
+
+weechat (0.0.6-1) unstable; urgency=low
+
+  * WeeChat version 0.0.6, see ChangeLog for detail.
+  
+ -- FlashCode <flashcode@flashtux.org>  Sat, 05 Jun 2004 11:30:00 +0200
+
+weechat (0.0.5-1) unstable; urgency=low
+
+  * WeeChat version 0.0.5, see ChangeLog for detail.
+  
+ -- FlashCode <flashcode@flashtux.org>  Sat, 07 Feb 2004 20:30:00 +0200
+
+weechat (0.0.4-1) unstable; urgency=low
+
+  * WeeChat version 0.0.4, see ChangeLog for detail.
+  
+ -- FlashCode <flashcode@flashtux.org>  Thu, 01 Jan 2004 13:00:00 +0200
+
+weechat (0.0.3-1) unstable; urgency=low
+
+  * WeeChat version 0.0.3, see ChangeLog for detail.
+  
+ -- FlashCode <flashcode@flashtux.org>  Mon, 03 Nov 2003 23:15:00 +0200
+
+weechat (0.0.2-1) unstable; urgency=low
+
+  * WeeChat version 0.0.2, see ChangeLog for detail.
+  
+ -- FlashCode <flashcode@flashtux.org>  Sun, 05 Oct 2003 12:00:00 +0200
+
+weechat (0.0.1-1) unstable; urgency=low
+
+  * First version.
+  
+ -- FlashCode <flashcode@flashtux.org>  Sat, 27 Sep 2003 12:00:00 +0200
+weechat (0.1.5-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Julien Louis <ptitlouis@sysif.net>  Sat, 24 Sep 2005 14:08:55 +0200
+
 weechat (0.1.4-2) unstable; urgency=low

  * Add autotools-dev to Build-Depends.
@@ -3,8 +3,8 @@ Section: net
 Priority: optional
 Maintainer: Sebastien Helleu <flashcode@flashtux.org>
 Uploaders: Julien Louis <ptitlouis@sysif.net>
-Build-Depends: debhelper (>> 4.0.0), libncurses5-dev (>= 5.2.20020112a-7), libperl-dev, python-dev, libgnutls-dev, autotools-dev
-Standards-Version: 3.6.2.1
+Build-Depends: debhelper (>> 4.0.0), libncursesw5-dev (>= 5.2.20020112a-7), ruby1.8-dev, libperl-dev, python-dev, libgnutls-dev, libtool, texinfo
+Standards-Version: 3.6.2

 Package: weechat
 Architecture: all
@@ -12,20 +12,46 @@ Depends: weechat-common (= ${Source-Version}), weechat-curses (= ${Source-Versio
 Description: Fast, light and extensible IRC client
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light IRC client
 for many operating systems. Everything can be done with a keyboard.
- It is customizable and extensible with scripts.
+ It is customizable and extensible with plugins/scripts, and includes:
+  - nicklist
+  - smart hotlist
+  - infobar with highlight notification
+  - horizontal and vertical split
+  - double charset support (decode/encode)
+  - FIFO pipe for remote control
+  - and much more!
+ .
+ Homepage: http://weechat.flashtux.org/

 Package: weechat-curses
 Architecture: any
 Depends: ${shlibs:Depends}, weechat-common (= ${Source-Version})
+Recommends: weechat-plugins (= ${Source-Version})
 Description: Fast, light and extensible IRC client
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light IRC client
 for many operating systems. Everything can be done with a keyboard.
- It is customizable and extensible with scripts.
+ It is customizable and extensible with plugins/scripts, and includes:
+  - nicklist
+  - smart hotlist
+  - infobar with highlight notification
+  - horizontal and vertical split
+  - double charset support (decode/encode)
+  - FIFO pipe for remote control
+  - and much more!
+ .
+ Homepage: http://weechat.flashtux.org/

 Package: weechat-common
 Architecture: all
 Replaces: weechat
-Recommends: weechat-curses | weechat-gtk
+Recommends: weechat-curses
 Description: Common files for WeeChat
 Documentation, examples, and locale files for WeeChat - fast, light and
- extensible IRC client. It is useless without weechat-curses or weechat-gtk.
+ extensible IRC client. It is useless without weechat-curses.
+
+Package: weechat-plugins
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Plugins for WeeChat
+ This package provides some plugins to enhance weechat with scripting languages
+ such as perl python or ruby.
@@ -15,7 +15,8 @@ configure: configure-stamp
 configure-stamp:
 	dh_testdir
 	./configure --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man \
-	--infodir=\$${prefix}/share/info	--enable-perl --enable-python
+	--infodir=\$${prefix}/share/info --enable-perl --enable-python --enable-ruby \
+	--with-debug=0
 	touch configure-stamp


@@ -31,10 +32,6 @@ clean:
 	dh_testroot
 	rm -f build-stamp configure-stamp
 	-$(MAKE) distclean
-	test -r /usr/share/misc/config.guess && \
-		cp -f /usr/share/misc/config.guess config.guess
-	test -r /usr/share/misc/config.sub && \
-		cp -f /usr/share/misc/config.sub config.sub
 	dh_clean

 install: build
@@ -46,6 +43,7 @@ install: build
 	dh_install
 #	install -o root -g root -m 755 src/gui/curses/weechat-curses $(CURDIR)/debian/weechat-curses/usr/bin
 	# install -o root -g root -m 755 src/gui/gtk/weechat-gtk $(CURDIR)/debian/weechat-gtk/usr/bin
+	install -D -o root -g root -m 644 weechat_icon_32.png $(CURDIR)/debian/weechat-common/usr/share/pixmaps/weechat_icon_32.png


 # Build architecture-independent files here.
@@ -67,20 +65,21 @@ binary-indep: build install

 # Build architecture-dependent files here.
 binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	# dh_installchangelogs -a
-	# dh_installdocs -a
+	dh_testdir -a -pweechat-curses -pweechat-plugins
+	dh_testroot -a -pweechat-curses -pweechat-plugins
+	dh_installchangelogs ChangeLog -pweechat-plugins
+	dh_installdocs -pweechat-plugins
 	dh_installman doc/weechat-curses.1 -pweechat-curses
-	dh_link -a usr/share/doc/weechat-common usr/share/doc/weechat-curses
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
+	dh_link -pweechat-curses usr/share/doc/weechat-common usr/share/doc/weechat-curses
+	dh_installmenu -pweechat-curses
+	dh_strip -a -pweechat-curses -pweechat-plugins --exclude=libperl.a
+	dh_compress -a -pweechat-curses -p weechat-plugins
+	dh_fixperms -a -pweechat-curses -pweechat-plugins
+	dh_installdeb -a -pweechat-curses -pweechat-plugins
+	dh_shlibdeps -a -pweechat-curses -pweechat-plugins
+	dh_gencontrol -a -pweechat-curses -pweechat-plugins
+	dh_md5sums -a -pweechat-curses -pweechat-plugins
+	dh_builddeb -a -pweechat-curses -pweechat-plugins

 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure
@@ -0,0 +1 @@
+usr/share/doc/weechat-common usr/share/doc/weechat-curses
@@ -0,0 +1,4 @@
+?package(weechat-curses):needs="text" section="Apps/Net" \
+		title="weechat-curses" \
+		icon="/usr/share/pixmaps/weechat_icon_32.png" \
+		command="/usr/bin/weechat-curses"
@@ -0,0 +1 @@
+usr/lib
@@ -0,0 +1 @@
+debian/tmp/usr/lib
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2005 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2006 FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -12,17 +12,11 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #

+SUBDIRS = fr en
+
 man_MANS = weechat-curses.1

-info_TEXINFOS = weechat_doc_fr.texi weechat_doc_en.texi \
-                weechat_doc_es.texi weechat_doc_pt.texi
-
-#weechat_TEXINFOS = weechat_doc_fr.texi weechat_doc_en.texi \
-#                   weechat_doc_es.texi weechat_doc_pt.texi
-
-AM_MAKEINFOHTMLFLAGS = --no-split --number-sections
-
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = $(man_MANS) weechat-doc.css weechat-html-one.xsl weechat-html.xsl
@@ -0,0 +1,169 @@
+#!/usr/bin/perl
+#
+# Copyright (c) 2003-2006 FlashCode <flashcode@flashtux.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+
+#
+# Build some XML code for WeeChat doc
+# with weechat-curses command
+#
+
+@all_lang      = ("fr_FR", "en_US");
+%all_encodings = ("fr_FR" => "iso-8859-1",
+                  "en_US" => "iso-8859-1");
+%all_types     = ("fr_FR" => "type",
+                  "en_US" => "type",
+                  "es_ES" => "tipo");
+%all_values    = ("fr_FR" => "valeurs",
+                  "en_US" => "values",
+                  "es_ES" => "valores");
+%all_default   = ("fr_FR" => "valeur par défaut",
+                  "en_US" => "default values",
+                  "es_ES" => "valor por defecto");
+%all_desc      = ("fr_FR" => "description",
+                  "en_US" => "description",
+                  "es_ES" => "descripción");
+
+foreach $lng (@all_lang)
+{
+    create_commands ($lng, $all_encodings{$lng},
+                     "weechat-curses -w | tail +3", "weechat_commands");
+    create_commands ($lng, $all_encodings{$lng},
+                     "weechat-curses -i | tail +3", "irc_commands");
+    create_key_func ($lng, $all_encodings{$lng},
+                     "weechat-curses -f | tail +3", "key_functions");
+    create_config ($lng, $all_encodings{$lng},
+                   "weechat-curses -c | tail +3", "config");
+    print "\n";
+}
+
+sub create_commands
+{
+    $lang = $_[0];
+    $lang2 = substr ($lang, 0, 2);
+    $encoding = $_[1];
+    $command = $_[2];
+    $file = $_[3];
+    print "Creating $lang2/$file.xml ($lang)...\n";
+    open XML, ">$lang2/$file.xml" or die "Error: can't write file!";
+    print XML "<?xml version=\"1.0\" encoding=\"$encoding\"?>\n";
+    
+    $started = 0;
+    $ENV{"LANG"} = $lang;
+    foreach (`$command`)
+    {
+        if (/\* (.*)/)
+        {
+            print XML "</programlisting>\n" if ($started == 1);
+            $started = 1;
+            print XML "<command>$1</command>\n";
+            print XML "<programlisting>";
+        }
+        else
+        {
+            chomp ($_);
+            print XML "$_\n";
+        }
+    }
+    print XML "</programlisting>\n";
+    close XML;
+    iconv_file ($lang2."/".$file, $encoding);
+}
+
+sub create_key_func
+{
+    $lang = $_[0];
+    $lang2 = substr ($lang, 0, 2);
+    $encoding = $_[1];
+    $command = $_[2];
+    $file = $_[3];
+    print "Creating $lang2/$file.xml ($lang)...\n";
+    open XML, ">$lang2/$file.xml" or die "Error: can't write file!";
+    print XML "<?xml version=\"1.0\" encoding=\"$encoding\"?>\n";
+    
+    $ENV{"LANG"} = $lang;
+    foreach (`$command`)
+    {
+        if (/\* (.*): (.*)/)
+        {
+            print XML "<row>\n";
+            print XML "  <entry><literal>$1</literal></entry>\n";
+            print XML "  <entry>$2</entry>\n";
+            print XML "</row>\n";
+        }
+    }
+    close XML;
+    iconv_file ($lang2."/".$file, $encoding);
+}
+
+sub create_config
+{
+    $lang = $_[0];
+    $lang2 = substr ($lang, 0, 2);
+    $encoding = $_[1];
+    $command = $_[2];
+    $file = $_[3];
+    print "Creating $lang2/$file.xml ($lang)...\n";
+    open XML, ">$lang2/$file.xml" or die "Error: can't write file!";
+    print XML "<?xml version=\"1.0\" encoding=\"$encoding\"?>\n";
+    $type = "";
+    $values = "";
+    $default = "";
+    $desc = "";
+    
+    $ENV{"LANG"} = $lang;
+    foreach (`weechat-curses -c`)
+    {
+        if (/\* (.*):/)
+        {
+            print XML "<row>\n";
+            print XML "  <entry><option>$1</option></entry>\n";
+        }
+        elsif (/  \. $all_types{$lang}: (.*)/)
+        {
+            $type = $1;
+        }
+        elsif (/  \. $all_values{$lang}: (.*)/)
+        {
+            $values = $1;
+        }
+        elsif (/  \. $all_default{$lang}: (.*)/)
+        {
+            $default = $1;
+        }
+        elsif (/  \. $all_desc{$lang}: (.*)/)
+        {
+            $_ = $1;
+            s/(.*)/\u$1/;
+            $desc = $_;
+            print XML "  <entry>".$type."</entry>\n";
+            print XML "  <entry>".$values."</entry>\n";
+            print XML "  <entry>".$default."</entry>\n";
+            print XML "  <entry>".$desc."</entry>\n";
+            print XML "</row>\n";
+        }
+    }
+    close XML;
+    iconv_file ($lang2."/".$file, $encoding);
+}
+
+sub iconv_file
+{
+    print "Converting $_[0].xml to $_[1]...\n";
+    system ("iconv -t $encoding -o $_[0].xml.$_[1] $_[0].xml");
+    system ("mv $_[0].xml.$_[1] $_[0].xml");
+}
@@ -0,0 +1,59 @@
+# Copyright (c) 2003-2006 FlashCode <flashcode@flashtux.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+
+LANGCODE = en
+BOOK = weechat.$(LANGCODE)
+BOOK_INCLUDE = weechat_commands.xml irc_commands.xml key_functions.xml config.xml
+
+EXTRA_DIST = $(BOOK).xml $(BOOK_INCLUDE)
+
+docdir = $(datadir)/doc/$(PACKAGE)
+
+all-local: html-stamp
+
+# HTML output with chunks (many pages)
+
+html: html-stamp
+
+html-stamp: $(BOOK).xml $(BOOK_INCLUDE) ../weechat-html.xsl ../weechat-doc.css
+	mkdir -p html/
+	xsltproc -o html/ ../weechat-html.xsl $(BOOK).xml || true
+	cp ../weechat-doc.css html/
+	touch html-stamp
+
+# HTML output, all in one page
+
+html1: html1-stamp
+
+html1-stamp: $(BOOK).xml $(BOOK_INCLUDE) ../weechat-html-one.xsl ../weechat-doc.css
+	mkdir -p html1/
+	xsltproc -o html1/$(BOOK).html ../weechat-html-one.xsl $(BOOK).xml || true
+	cp ../weechat-doc.css html1/
+	touch html1-stamp
+
+# install docs
+
+install-data-hook:
+	$(mkinstalldirs) $(DESTDIR)$(docdir)/html/$(LANGCODE)/
+	$(INSTALL_DATA) html/* $(DESTDIR)$(docdir)/html/$(LANGCODE)/
+
+# clean
+
+clean-local:
+	-rm -f *.html *.pdf *.txt
+	-rm -rf html/ html1/
+	-rm -f html-stamp html1-stamp
@@ -0,0 +1,438 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<command>admin  [target]</command>
+<programlisting>
+find information about the administrator of the server
+
+target: server
+
+</programlisting>
+<command>ame  message</command>
+<programlisting>
+send a CTCP action to all channels of all connected servers
+
+message: message to send
+
+</programlisting>
+<command>amsg  text</command>
+<programlisting>
+send message to all channels of all connected servers
+
+text: text to send
+
+</programlisting>
+<command>away  [-all] [message]</command>
+<programlisting>
+toggle away status
+
+   -all: toggle away status on all connected servers
+message: message for away (if no message is given, away status is removed)
+
+</programlisting>
+<command>ban  [channel] [nickname [nickname ...]]</command>
+<programlisting>
+bans nicks or hosts
+
+ channel: channel for ban
+nickname: user or host to ban
+
+</programlisting>
+<command>ctcp  nickname type [arguments]</command>
+<programlisting>
+send a CTCP message (Client-To-Client Protocol)
+
+ nickname: user to send CTCP to
+     type: CTCP type (examples: "version", "ping", ..)
+arguments: arguments for CTCP
+
+</programlisting>
+<command>dcc  action [nickname [file]]</command>
+<programlisting>
+starts DCC (file or chat) or close chat
+
+  action: 'send' (file) or 'chat' or 'close' (chat)
+nickname: nickname to send file or chat
+    file: filename (on local host)
+
+</programlisting>
+<command>dehalfop  [nickname [nickname]]</command>
+<programlisting>
+removes half channel operator status from nickname(s)
+
+</programlisting>
+<command>deop  [nickname [nickname]]</command>
+<programlisting>
+removes channel operator status from nickname(s)
+
+</programlisting>
+<command>devoice  [nickname [nickname]]</command>
+<programlisting>
+removes voice from nickname(s)
+
+</programlisting>
+<command>die</command>
+<programlisting>
+shutdown the server
+
+</programlisting>
+<command>halfop  [nickname [nickname]]</command>
+<programlisting>
+gives half channel operator status to nickname(s)
+
+</programlisting>
+<command>info  [target]</command>
+<programlisting>
+get information describing the server
+
+target: server name
+
+</programlisting>
+<command>invite  nickname channel</command>
+<programlisting>
+invite a nick on a channel
+
+nickname: nick to invite
+ channel: channel to invite
+
+</programlisting>
+<command>ison  nickname [nickname ...]</command>
+<programlisting>
+check if a nickname is currently on IRC
+
+nickname: nickname
+
+</programlisting>
+<command>join  channel[,channel] [key[,key]]</command>
+<programlisting>
+join a channel
+
+channel: channel name to join
+    key: key to join the channel
+
+</programlisting>
+<command>kick  [channel] nickname [comment]</command>
+<programlisting>
+forcibly remove a user from a channel
+
+ channel: channel where user is
+nickname: nickname to kick
+ comment: comment for kick
+
+</programlisting>
+<command>kickban  [channel] nickname [comment]</command>
+<programlisting>
+kicks and bans a nick from a channel
+
+ channel: channel where user is
+nickname: nickname to kick and ban
+ comment: comment for kick
+
+</programlisting>
+<command>kill  nickname comment</command>
+<programlisting>
+close client-server connection
+
+nickname: nickname
+ comment: comment for kill
+
+</programlisting>
+<command>links  [[server] server_mask]</command>
+<programlisting>
+list all servernames which are known by the server answering the query
+
+     server: this server should answer the query
+server_mask: list of servers must match this mask
+
+</programlisting>
+<command>list  [channel[,channel] [server]]</command>
+<programlisting>
+list channels and their topic
+
+channel: channel to list
+server: server name
+
+</programlisting>
+<command>lusers  [mask [target]]</command>
+<programlisting>
+get statistics about the size of the IRC network
+
+  mask: servers matching the mask only
+target: server for forwarding request
+
+</programlisting>
+<command>me  message</command>
+<programlisting>
+send a CTCP action to the current channel
+
+message: message to send
+
+</programlisting>
+<command>mode  { channel {[+|-]|o|p|s|i|t|n|b|v} [limit] [user] [ban mask] } | { nickname {[+|-]|i|w|s|o} }</command>
+<programlisting>
+change channel or user mode
+
+channel modes:
+  channel: channel name to modify
+  o: give/take channel operator privileges
+  p: private channel flag
+  s: secret channel flag
+  i: invite-only channel flag
+  t: topic settable by channel operator only flag
+  n: no messages to channel from clients on the outside
+  m: moderated channel
+  l: set the user limit to channel
+  b: set a ban mask to keep users out
+  e: set exception mask
+  v: give/take the ability to speak on a moderated channel
+  k: set a channel key (password)
+user modes:
+  nickname: nickname to modify
+  i: mark a user as invisible
+  s: mark a user for receive server notices
+  w: user receives wallops
+  o: operator flag
+
+</programlisting>
+<command>motd  [target]</command>
+<programlisting>
+get the "Message Of The Day"
+
+target: server name
+
+</programlisting>
+<command>msg  receiver[,receiver] text</command>
+<programlisting>
+send message to a nick or channel
+
+receiver: nick or channel (may be mask, '*' = current channel)
+text: text to send
+
+</programlisting>
+<command>names  [channel[,channel]]</command>
+<programlisting>
+list nicknames on channels
+
+channel: channel name
+
+</programlisting>
+<command>nick  [-all] nickname</command>
+<programlisting>
+change current nickname
+
+    -all: set new nickname for all connected servers
+nickname: new nickname
+
+</programlisting>
+<command>notice  nickname text</command>
+<programlisting>
+send notice message to user
+
+nickname: user to send notice to
+    text: text to send
+
+</programlisting>
+<command>op  nickname [nickname]</command>
+<programlisting>
+gives channel operator status to nickname(s)
+
+</programlisting>
+<command>oper  user password</command>
+<programlisting>
+get operator privileges
+
+user/password: used to get privileges on current IRC server
+
+</programlisting>
+<command>part  [channel[,channel]] [part_message]</command>
+<programlisting>
+leave a channel
+
+     channel: channel name to leave
+part_message: part message (displayed to other users)
+
+</programlisting>
+<command>ping  server1 [server2]</command>
+<programlisting>
+ping server
+
+server1: server to ping
+server2: forward ping to this server
+
+</programlisting>
+<command>pong  daemon [daemon2]</command>
+<programlisting>
+answer to a ping message
+
+ daemon: daemon who has responded to Ping message
+daemon2: forward message to this daemon
+
+</programlisting>
+<command>query  nickname [text]</command>
+<programlisting>
+send a private message to a nick
+
+nickname: nickname for private conversation
+    text: text to send
+
+</programlisting>
+<command>quit  [quit_message]</command>
+<programlisting>
+close all connections and quit
+
+quit_message: quit message (displayed to other users)
+
+</programlisting>
+<command>quote  data</command>
+<programlisting>
+send raw data to server without parsing
+
+data: raw data to send
+
+</programlisting>
+<command>rehash</command>
+<programlisting>
+tell the server to reload its config file
+
+</programlisting>
+<command>restart</command>
+<programlisting>
+tell the server to restart itself
+
+</programlisting>
+<command>service  nickname reserved distribution type reserved info</command>
+<programlisting>
+register a new service
+
+distribution: visibility of service
+        type: reserved for future usage
+
+</programlisting>
+<command>servlist  [mask [type]]</command>
+<programlisting>
+list services currently connected to the network
+
+mask: list only services matching this mask
+type: list only services of this type
+
+</programlisting>
+<command>squery  service text</command>
+<programlisting>
+deliver a message to a service
+
+service: name of service
+text: text to send
+
+</programlisting>
+<command>squit  server comment</command>
+<programlisting>
+disconnect server links
+
+server: server name
+comment: comment for quit
+
+</programlisting>
+<command>stats  [query [server]]</command>
+<programlisting>
+query statistics about server
+
+ query: c/h/i/k/l/m/o/y/u (see RFC1459)
+server: server name
+
+</programlisting>
+<command>summon  user [target [channel]]</command>
+<programlisting>
+give users who are on a host running an IRC server a message asking them to please join IRC
+
+   user: username
+target: server name
+channel: channel name
+
+</programlisting>
+<command>time  [target]</command>
+<programlisting>
+query local time from server
+
+target: query time from specified server
+
+</programlisting>
+<command>topic  [channel] [topic]</command>
+<programlisting>
+get/set channel topic
+
+channel: channel name
+topic: new topic for channel (if topic is "-delete" then topic is deleted)
+
+</programlisting>
+<command>trace  [target]</command>
+<programlisting>
+find the route to specific server
+
+target: server
+
+</programlisting>
+<command>unban  [channel] nickname [nickname ...]</command>
+<programlisting>
+unbans nicks or hosts
+
+ channel: channel for unban
+nickname: user or host to unban
+
+</programlisting>
+<command>userhost  nickname [nickname ...]</command>
+<programlisting>
+return a list of information about nicknames
+
+nickname: nickname
+
+</programlisting>
+<command>users  [target]</command>
+<programlisting>
+list of users logged into the server
+
+target: server
+
+</programlisting>
+<command>version  [server | nickname]</command>
+<programlisting>
+gives the version info of nick or server (current or specified)
+
+  server: server name
+nickname: nickname
+
+</programlisting>
+<command>voice  [nickname [nickname]]</command>
+<programlisting>
+gives voice to nickname(s)
+
+</programlisting>
+<command>wallops  text</command>
+<programlisting>
+send a message to all currently connected users who have set the 'w' user mode for themselves
+
+text to send
+
+</programlisting>
+<command>who  [mask ["o"]]</command>
+<programlisting>
+generate a query which returns a list of information
+
+mask: only information which match this mask
+   o: only operators are returned according to the mask supplied
+
+</programlisting>
+<command>whois  [server] nickname[,nickname]</command>
+<programlisting>
+query information about user(s)
+
+  server: server name
+nickname: nickname (may be a mask)
+
+</programlisting>
+<command>whowas  nickname [,nickname [,nickname ...]] [count [target]]</command>
+<programlisting>
+ask for information about a nickname which no longer exists
+
+nickname: nickname to search
+   count: number of replies to return (full search if negative number)
+  target: reply should match this mask
+
+</programlisting>
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<row>
+  <entry><literal>return</literal></entry>
+  <entry>terminate line</entry>
+</row>
+<row>
+  <entry><literal>tab</literal></entry>
+  <entry>complete word</entry>
+</row>
+<row>
+  <entry><literal>backspace</literal></entry>
+  <entry>delete previous char</entry>
+</row>
+<row>
+  <entry><literal>delete</literal></entry>
+  <entry>delete next char</entry>
+</row>
+<row>
+  <entry><literal>delete_end_line</literal></entry>
+  <entry>delete until end of line</entry>
+</row>
+<row>
+  <entry><literal>delete_beginning_line</literal></entry>
+  <entry>delete until beginning of line</entry>
+</row>
+<row>
+  <entry><literal>delete_line</literal></entry>
+  <entry>delete entire line</entry>
+</row>
+<row>
+  <entry><literal>delete_previous_word</literal></entry>
+  <entry>delete previous word</entry>
+</row>
+<row>
+  <entry><literal>delete_next_word</literal></entry>
+  <entry>delete next word</entry>
+</row>
+<row>
+  <entry><literal>clipboard_paste</literal></entry>
+  <entry>paste current clipboard content</entry>
+</row>
+<row>
+  <entry><literal>transpose_chars</literal></entry>
+  <entry>transpose chars</entry>
+</row>
+<row>
+  <entry><literal>home</literal></entry>
+  <entry>go to beginning of line</entry>
+</row>
+<row>
+  <entry><literal>end</literal></entry>
+  <entry>go to end of line</entry>
+</row>
+<row>
+  <entry><literal>left</literal></entry>
+  <entry>move one char left</entry>
+</row>
+<row>
+  <entry><literal>previous_word</literal></entry>
+  <entry>move to previous word</entry>
+</row>
+<row>
+  <entry><literal>right</literal></entry>
+  <entry>move one char right</entry>
+</row>
+<row>
+  <entry><literal>next_word</literal></entry>
+  <entry>move to next word</entry>
+</row>
+<row>
+  <entry><literal>up</literal></entry>
+  <entry>call previous command in history</entry>
+</row>
+<row>
+  <entry><literal>up_global</literal></entry>
+  <entry>call previous command in global history</entry>
+</row>
+<row>
+  <entry><literal>down</literal></entry>
+  <entry>call next command in history</entry>
+</row>
+<row>
+  <entry><literal>down_global</literal></entry>
+  <entry>call next command in global history</entry>
+</row>
+<row>
+  <entry><literal>page_up</literal></entry>
+  <entry>scroll one page up</entry>
+</row>
+<row>
+  <entry><literal>page_down</literal></entry>
+  <entry>scroll one page down</entry>
+</row>
+<row>
+  <entry><literal>nick_beginning</literal></entry>
+  <entry>display beginning of nicklist</entry>
+</row>
+<row>
+  <entry><literal>nick_end</literal></entry>
+  <entry>display end of nicklist</entry>
+</row>
+<row>
+  <entry><literal>nick_page_up</literal></entry>
+  <entry>scroll nicklist one page up</entry>
+</row>
+<row>
+  <entry><literal>nick_page_down</literal></entry>
+  <entry>scroll nicklist one page down</entry>
+</row>
+<row>
+  <entry><literal>jump_smart</literal></entry>
+  <entry>jump to buffer with activity</entry>
+</row>
+<row>
+  <entry><literal>jump_dcc</literal></entry>
+  <entry>jump to DCC buffer</entry>
+</row>
+<row>
+  <entry><literal>jump_last_buffer</literal></entry>
+  <entry>jump to last buffer</entry>
+</row>
+<row>
+  <entry><literal>jump_server</literal></entry>
+  <entry>jump to server buffer</entry>
+</row>
+<row>
+  <entry><literal>jump_next_server</literal></entry>
+  <entry>jump to next server</entry>
+</row>
+<row>
+  <entry><literal>switch_server</literal></entry>
+  <entry>switch active server on servers buffer</entry>
+</row>
+<row>
+  <entry><literal>scroll_previous_highlight</literal></entry>
+  <entry>scroll to previous highlight in buffer</entry>
+</row>
+<row>
+  <entry><literal>scroll_next_highlight</literal></entry>
+  <entry>scroll to next highlight in buffer</entry>
+</row>
+<row>
+  <entry><literal>scroll_unread</literal></entry>
+  <entry>scroll to first unread line in buffer</entry>
+</row>
+<row>
+  <entry><literal>hotlist_clear</literal></entry>
+  <entry>clear hotlist</entry>
+</row>
+<row>
+  <entry><literal>infobar_clear</literal></entry>
+  <entry>clear infobar</entry>
+</row>
+<row>
+  <entry><literal>refresh</literal></entry>
+  <entry>refresh screen</entry>
+</row>
+<row>
+  <entry><literal>grab_key</literal></entry>
+  <entry>grab a key</entry>
+</row>
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<command>alias  [alias_name [command [arguments]]</command>
+<programlisting>
+create an alias for a command
+
+alias_name: name of alias
+   command: command name (WeeChat or IRC command, without first '/')
+arguments: arguments for command
+
+</programlisting>
+<command>buffer  [action | number | [[server] [channel]]]</command>
+<programlisting>
+manage buffers
+
+ action: action to do:
+   move: move buffer in the list (may be relative, for example -1)
+  close: close buffer (for channel: same as /part without part message)
+   list: list opened buffers (no parameter implies this list)
+ notify: set notify level for buffer (0=never, 1=highlight, 2=1+msg, 3=2+join/part)
+server
+channel: jump to buffer by server and/or channel name
+ number: jump to buffer by number
+
+</programlisting>
+<command>charset  [(decode_iso | decode_utf | encode) charset]</command>
+<programlisting>
+change charset for server or channel
+
+decode_iso: charset used for decoding ISO
+decode_utf: charset used for decoding UTF
+    encode: charset used for encoding messages
+   charset: charset to use (for example: ISO-8859-15, UTF-8,..)
+
+</programlisting>
+<command>clear  [-all]</command>
+<programlisting>
+clear window(s)
+
+-all: clear all windows
+
+</programlisting>
+<command>connect  [servername]</command>
+<programlisting>
+connect to a server
+
+servername: server name to connect
+
+</programlisting>
+<command>disconnect  [servername]</command>
+<programlisting>
+disconnect from a server
+
+servername: server name to disconnect
+
+</programlisting>
+<command>debug  dump | windows</command>
+<programlisting>
+print debug messages
+
+   dump: save memory dump in WeeChat log file (same dump is written when WeeChat crashes)
+windows: display windows tree
+
+</programlisting>
+<command>help  [command]</command>
+<programlisting>
+display help about commands
+
+command: name of a WeeChat or IRC command
+
+</programlisting>
+<command>history  [clear | value]</command>
+<programlisting>
+show buffer command history
+
+clear: clear history
+value: number of history entries to show
+
+</programlisting>
+<command>ignore  [mask [[type | command] [channel [server]]]]</command>
+<programlisting>
+ignore IRC messages and/or hosts
+
+   mask: nick or host mask to ignore
+   type: type of message to ignore (action, ctcp, dcc, pv)
+command: IRC command
+channel: name of channel for ignore
+ server: name of server for ignore
+
+For each argument, '*' means all.
+Without argument, /ignore command lists all defined ignore.
+
+</programlisting>
+<command>key  [key function/command] [unbind key] [functions] [reset -yes]</command>
+<programlisting>
+bind/unbind keys
+
+      key: bind this key to an internal function or a command (beginning by "/")
+   unbind: unbind a key
+functions: list internal functions for key bindings
+    reset: restore bindings to the default values and delete ALL personal bindings (use carefully!)
+
+</programlisting>
+<command>plugin  [load filename] | [autoload] | [reload] | [unload]</command>
+<programlisting>
+list/load/unload plugins
+
+filename: WeeChat plugin (file) to load
+
+Without argument, /plugin command lists all loaded plugins.
+
+</programlisting>
+<command>server  [servername] | [servername hostname port [-auto | -noauto] [-ipv6] [-ssl] [-pwd password] [-nicks nick1 nick2 nick3] [-username username] [-realname realname] [-command command] [-autojoin channel[,channel]] ] | [del servername]</command>
+<programlisting>
+list, add or remove servers
+
+servername: server name, for internal and display use
+  hostname: name or IP address of server
+      port: port for server (integer)
+      ipv6: use IPv6 protocol
+       ssl: use SSL protocol
+  password: password for server
+     nick1: first nick for server
+     nick2: alternate nick for server
+     nick3: second alternate nick for server
+  username: user name
+  realname: real name of user
+
+</programlisting>
+<command>save  [file]</command>
+<programlisting>
+save config to disk
+
+file: filename for writing config
+
+</programlisting>
+<command>set  [option [ = value]]</command>
+<programlisting>
+set config parameters
+
+option: name of an option (if name is full and no value is given, then help is displayed on option)
+value: value for option
+
+</programlisting>
+<command>unalias  alias_name</command>
+<programlisting>
+remove an alias
+
+alias_name: name of alias to remove
+
+</programlisting>
+<command>unignore  [number | [mask [[type | command] [channel [server]]]]]</command>
+<programlisting>
+unignore IRC messages and/or hosts
+
+ number: # of ignore to unignore (number is displayed by list of ignore)
+   mask: nick or host mask to unignore
+   type: type of message to unignore (action, ctcp, dcc, pv)
+command: IRC command
+channel: name of channel for unignore
+ server: name of server for unignore
+
+For each argument, '*' means all.
+Without argument, /unignore command lists all defined ignore.
+
+</programlisting>
+<command>upgrade</command>
+<programlisting>
+upgrade WeeChat without disconnecting from servers
+
+</programlisting>
+<command>uptime  [-o]</command>
+<programlisting>
+show WeeChat uptime
+
+-o: send uptime on current channel as an IRC message
+
+</programlisting>
+<command>window  [list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv [pct] | resize pct | merge [all]]</command>
+<programlisting>
+manage windows
+
+  list: list opened windows (no parameter implies this list)
+    -1: jump to previous window
+    +1: jump to next window
+    b#: jump to next window displaying buffer number #
+    up: switch to window above current one
+  down: switch to window below current one
+  left: switch to window on the left
+ right: switch to window on the right
+splith: split current window horizontally
+splitv: split current window vertically
+resize: resize window size, new size is pct%% of parent window
+ merge: merge window with another (all = keep only one window)
+
+For splith and splitv, pct is a pourcentage which represents size of new window, computed with current window as size reference. For example 25 means create a new window with size = current_size / 4
+
+</programlisting>
@@ -0,0 +1,59 @@
+# Copyright (c) 2003-2006 FlashCode <flashcode@flashtux.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+
+LANGCODE = fr
+BOOK = weechat.$(LANGCODE)
+BOOK_INCLUDE = weechat_commands.xml irc_commands.xml key_functions.xml config.xml
+
+EXTRA_DIST = $(BOOK).xml $(BOOK_INCLUDE)
+
+docdir = $(datadir)/doc/$(PACKAGE)
+
+all-local: html-stamp
+
+# HTML output with chunks (many pages)
+
+html: html-stamp
+
+html-stamp: $(BOOK).xml $(BOOK_INCLUDE) ../weechat-html.xsl ../weechat-doc.css
+	mkdir -p html/
+	xsltproc -o html/ ../weechat-html.xsl $(BOOK).xml || true
+	cp ../weechat-doc.css html/
+	touch html-stamp
+
+# HTML output, all in one page
+
+html1: html1-stamp
+
+html1-stamp: $(BOOK).xml $(BOOK_INCLUDE) ../weechat-html-one.xsl ../weechat-doc.css
+	mkdir -p html1/
+	xsltproc -o html1/$(BOOK).html ../weechat-html-one.xsl $(BOOK).xml || true
+	cp ../weechat-doc.css html1/
+	touch html1-stamp
+
+# install docs
+
+install-data-hook:
+	$(mkinstalldirs) $(DESTDIR)$(docdir)/html/$(LANGCODE)/
+	$(INSTALL_DATA) html/* $(DESTDIR)$(docdir)/html/$(LANGCODE)/
+
+# clean
+
+clean-local:
+	-rm -f *.html *.pdf *.txt
+	-rm -rf html/ html1/
+	-rm -f html-stamp html1-stamp
@@ -0,0 +1,438 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<command>admin  [cible]</command>
+<programlisting>
+trouver les informations sur l'administrateur du serveur
+
+cible: serveur
+
+</programlisting>
+<command>ame  message</command>
+<programlisting>
+envoyer une action CTCP à tous les canaux de tous les serveurs connectés
+
+message: message à envoyer
+
+</programlisting>
+<command>amsg  texte</command>
+<programlisting>
+envoyer un message à tous les canaux de tous les serveurs connectés
+
+texte: texte à envoyer
+
+</programlisting>
+<command>away  [-all] [message]</command>
+<programlisting>
+basculer le statut absent
+
+   -all: basculer le statut absent sur tous les serveurs connectés
+message: message pour l'absence (si pas de message donné, le statut d'absence est supprimé)
+
+</programlisting>
+<command>ban  [canal] [pseudo [pseudo ...]]</command>
+<programlisting>
+bannit des pseudos ou masques
+
+ canal: nom du canal pour le bannissement
+pseudo: pseudo ou masque pour le bannissement
+
+</programlisting>
+<command>ctcp  pseudo type [arguments]</command>
+<programlisting>
+envoyer un message CTCP (Client-To-Client Protocol)
+
+   pseudo: utilisateur à qui envoyer le CTCP
+     type: type de CTCP (exemples: "version", "ping", etc...)
+arguments: arguments pour le CTCP
+
+</programlisting>
+<command>dcc  action [pseudo [fichier]]</command>
+<programlisting>
+démarre le DCC (fichier ou discussion) ou ferme une discussion
+
+ action: 'send' (envoi de fichier) ou 'chat' (discussion) ou 'close' (fermeture discussion)
+ pseudo: pseudo pour envoyer le fichier ou discuter
+fichier: nom du fichier (sur la machine locale)
+
+</programlisting>
+<command>dehalfop  [pseudo [pseudo]]</command>
+<programlisting>
+retire le statut de demi-opérateur du canal à/aux nick(s)
+
+</programlisting>
+<command>deop  [pseudo [pseudo]]</command>
+<programlisting>
+retire le statut d'opérateur du canal à/aux nick(s)
+
+</programlisting>
+<command>devoice  [pseudo [pseudo]]</command>
+<programlisting>
+retire la voix du/des pseudo(s)
+
+</programlisting>
+<command>die</command>
+<programlisting>
+arrêter le serveur
+
+</programlisting>
+<command>halfop  [pseudo [pseudo]]</command>
+<programlisting>
+donner le statut de demi-opérateur à un/des utilisateur(s)
+
+</programlisting>
+<command>info  [cible]</command>
+<programlisting>
+voir les informations décrivant le serveur
+
+cible: nom du serveur
+
+</programlisting>
+<command>invite  pseudo canal</command>
+<programlisting>
+inviter un utilisateur sur un canal
+
+ pseudo: utilisateur à inviter
+channel: canal pour l'invitation
+
+</programlisting>
+<command>ison  pseudo [pseudo ...]</command>
+<programlisting>
+vérifier si un utilisateur est actuellement sur IRC
+
+pseudo: pseudo
+
+</programlisting>
+<command>join  canal[,canal] [clé[,clé]]</command>
+<programlisting>
+joindre un canal
+
+canal: nom du canal à rejoindre
+  clé: clé pour rejoindre le canal
+
+</programlisting>
+<command>kick  [canal] pseudo [commentaire]</command>
+<programlisting>
+retirer par la force un utilisateur d'un canal
+
+      canal: canal où l'utilisateur se trouve
+     pseudo: utilisateur à éliminer
+commentaire: commentaire pour l'élimination
+
+</programlisting>
+<command>kickban  [canal] pseudo [commentaire]</command>
+<programlisting>
+retirer par la force un utilisateur d'un canal et le bannir
+
+      canal: canal où l'utilisateur se trouve
+     pseudo: utilisateur à éliminer et bannir
+commentaire: commentaire pour l'élimination
+
+</programlisting>
+<command>kill  pseudo commentaire</command>
+<programlisting>
+fermer la connexion client-serveur
+
+     pseudo: utilisateur
+commentaire: commentaire pour la mort
+
+</programlisting>
+<command>links  [[serveur] masque_serveur]</command>
+<programlisting>
+lister tous les noms de serveurs connus du serveur qui répondent à la requête
+
+       serveur: ce serveur doit répondre à la requête
+masque_serveur: liste des serveurs correspondant au masque
+
+</programlisting>
+<command>list  [canal[,canall] [serveur]]</command>
+<programlisting>
+lister les canaux et leur sujet
+
+canal: canal à lister
+serveur: nom du serveur
+
+</programlisting>
+<command>lusers  [masque [cible]]</command>
+<programlisting>
+obtenir des statistiques sur la taille du réseau IRC
+
+masque: serveurs qui correspondent au masque seulement
+ cible: serveur pour faire suivre la requête
+
+</programlisting>
+<command>me  message</command>
+<programlisting>
+envoyer une action CTCP au canal courant
+
+message: message à envoyer
+
+</programlisting>
+<command>mode  { canal {[+|-]|o|p|s|i|t|n|b|v} [limite] [utilisateur] [masque de banissement] } | { nick {[+|-]|i|w|s|o} }</command>
+<programlisting>
+changer le mode du canal ou de l'utilisateur
+
+modes de canaux :
+  canal: nom du canal à modifier
+  o: donner/reprendre le statut privilégié d'opérateur
+  p: indicateur de canal privé
+  s: indicateur de canal secret
+  i: indicateur de canal avec invitation seulement
+  t: le titre est modifiable seulement par un opérateur du canal
+  n: aucun message au canal depuis l'extérieur
+  m: canal modéré
+  l: fixer la limite d'utilisateurs pour le canal
+  b: paramétrer un masque de banissement pour garder des utilisateurs dehors
+  e: paramétrer un masque d'exception
+  v: donner/reprendre la possibilité de parler sur un canal modéré
+  k: définir une clé (mot de passe) pour accéder au canal
+modes utilisateur :
+  pseudo: utilisateur à modifier
+  i: marquer un utilisateur comme invisible
+  s: marquer un utilisateur pour recevoir les notices du serveur
+  w: l'utilisateur reçoit les wallops
+  o: drapeau opérateur
+
+</programlisting>
+<command>motd  [cible]</command>
+<programlisting>
+obtenir le message du jour
+
+cible: nom du serveur
+
+</programlisting>
+<command>msg  cible[,cible] texte</command>
+<programlisting>
+envoyer un message à un utilisateur ou canal
+
+cible: utilisateur ou canal (peut-être un masque, '*' = canal courant)
+texte: texte à envoyer
+
+</programlisting>
+<command>names  [canal[,canal]]</command>
+<programlisting>
+lister les utilisateurs sur des canaux
+
+canal: nom du canal
+
+</programlisting>
+<command>nick  [-all] pseudo</command>
+<programlisting>
+changer le pseudo courant
+
+  -all: définir le nouveau pseudo sur tous les serveurs connectés
+pseudo: nouveau pseudo
+
+</programlisting>
+<command>notice  pseudo texte</command>
+<programlisting>
+envoyer un message notice à un utilisateur
+
+pseudo: utilisateur cible pour la notice
+ texte: texte à envoyer
+
+</programlisting>
+<command>op  pseudo [pseudo]</command>
+<programlisting>
+donner le statut opérateur à un/des utilisateur(s)
+
+</programlisting>
+<command>oper  utilisateur mot_de_passe</command>
+<programlisting>
+obtenir le statut d'opérateur
+
+utilisateur/mot_de_passe: utilisé pour obtenir les privilèges sur le serveur IRC courant
+
+</programlisting>
+<command>part  [canal[,canall] [message_de_fin]</command>
+<programlisting>
+quitter un canal
+
+         canal: canal à quitter
+message_de_fin: message de fin (affiché aux autres utilisateurs)
+
+</programlisting>
+<command>ping  serveur1 [serveur2]</command>
+<programlisting>
+pinguer un serveur
+
+serveur1: serveur à pinguer
+serveur2: faire suivre le ping à ce serveur
+
+</programlisting>
+<command>pong  démon [démon2]</command>
+<programlisting>
+répondre à un message ping
+
+ démon: démon qui a répondu au message Ping
+démon2: faire suivre le message à ce démon
+
+</programlisting>
+<command>query  pseudo [texte]</command>
+<programlisting>
+envoyer un message privé à un utilisateur
+
+pseudo: utilisateur pour la conversation privée
+ texte: texte à envoyer
+
+</programlisting>
+<command>quit  [message_de_fin]</command>
+<programlisting>
+fermer toutes les connexions et quitter
+
+message_de_fin: message de fin (affiché aux autres utilisateurs)
+
+</programlisting>
+<command>quote  données</command>
+<programlisting>
+envoyer des données brutes au serveur sans analyse
+
+données: données brutes à envoyer
+
+</programlisting>
+<command>rehash</command>
+<programlisting>
+demander au serveur de recharger son fichier de configuration
+
+</programlisting>
+<command>restart</command>
+<programlisting>
+demander au serveur de redémarrer
+
+</programlisting>
+<command>service  pseudo réservé distribution type réservé info</command>
+<programlisting>
+enregister un nouveau service
+
+distribution: visibilité du service
+        type: réservé pour une utilisation future
+
+</programlisting>
+<command>servlist  [masque [type]]</command>
+<programlisting>
+lister les services actuellement connectés au réseau
+
+masque: lister seulement les services qui correspondent à ce masque
+  type: lister seulement les services de ce type
+
+</programlisting>
+<command>squery  service texte</command>
+<programlisting>
+envoyer un message à un service
+
+service: nom du service
+texte: texte à envoyer
+
+</programlisting>
+<command>squit  serveur commentaire</command>
+<programlisting>
+déconnecter les liens vers un serveur
+
+serveur: nom du serveur
+commentaire: commentaire pour quitter
+
+</programlisting>
+<command>stats  [requête [serveur]]</command>
+<programlisting>
+demander des statistiques sur le serveur
+
+requête: c/h/i/k/l/m/o/y/u (voir la RFC1459)
+serveur: nom du serveur
+
+</programlisting>
+<command>summon  utilisateur [cible [canal]]</command>
+<programlisting>
+envoyer aux utilisateurs d'un serveur IRC un message leur demandant de rejoindre IRC
+
+utilisateur: nom d'utilisateur
+      cible: nom du serveur
+      canal: nom du canal
+
+</programlisting>
+<command>time  [cible]</command>
+<programlisting>
+demander l'heure locale de serveur
+
+cible: demander l'heure de ce serveur
+
+</programlisting>
+<command>topic  [canal] [titre]</command>
+<programlisting>
+recevoir/définir le titre du canal
+
+canal: nom du canal
+titre: nouveau titre pour le canal (si le titre est "-delete" alors le titre est supprimé)
+
+</programlisting>
+<command>trace  [cible]</command>
+<programlisting>
+trouver le chemin jusqu'à un serveur spécifique
+
+cible: serveur
+
+</programlisting>
+<command>unban  [canal] pseudo [pseudo ...]</command>
+<programlisting>
+supprime le bannissement sur des pseudos ou masques
+
+ canal: nom du canal pour supprimer le bannissement
+pseudo: pseudo ou masque pour supprimer le bannissement
+
+</programlisting>
+<command>userhost  pseudo [pseudo ...]</command>
+<programlisting>
+retourne une liste d'informations sur des utilisateurs
+
+pseudo: pseudo
+
+</programlisting>
+<command>users  [cible]</command>
+<programlisting>
+liste des utilisateurs connectés au serveur
+
+cible: serveur
+
+</programlisting>
+<command>version  [serveur | pseudo]</command>
+<programlisting>
+retourne la version de l'utilisateur ou du serveur (courant ou spécifié)
+
+serveur: nom du serveur
+ pseudo: utilisateur
+
+</programlisting>
+<command>voice  [pseudo [pseudo]]</command>
+<programlisting>
+donne la voix à/aux utilisateur(s)
+
+</programlisting>
+<command>wallops  texte</command>
+<programlisting>
+envoyer un message à tous les utilisateurs connectés qui ont activé le mode utilisateur 'w' pour eux-mêmes
+
+texte à envoyer
+
+</programlisting>
+<command>who  [masque ["o"]]</command>
+<programlisting>
+génère une requête qui retourne une liste d'information
+
+masque: information qui correspond à ce masque uniquement
+     o: seul les opérateurs sont retournés correspondant au masque fourni
+
+</programlisting>
+<command>whois  [serveur] pseudo[,pseudo]</command>
+<programlisting>
+demande les informations sur le(s) utilisateur(s)
+
+serveur: nom du serveur
+ pseudo: utilisateur (peut être un masque)
+
+</programlisting>
+<command>whowas  pseudo [,pseudo [,pseudo ...]] [nombre [cible]]</command>
+<programlisting>
+demander de l'information sur un nick qui n'existe plus
+
+pseudo: pseudo à chercher
+nombre: nombre de réponses à retourner (recherche complète si nombre négatif)
+ cible: la réponse doit correspondre à ce masque
+
+</programlisting>
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<row>
+  <entry><literal>return</literal></entry>
+  <entry>terminer la ligne</entry>
+</row>
+<row>
+  <entry><literal>tab</literal></entry>
+  <entry>compléter le mot</entry>
+</row>
+<row>
+  <entry><literal>backspace</literal></entry>
+  <entry>effacer le caractère précédent</entry>
+</row>
+<row>
+  <entry><literal>delete</literal></entry>
+  <entry>effacer le caractère suivant</entry>
+</row>
+<row>
+  <entry><literal>delete_end_line</literal></entry>
+  <entry>effacer jusqu'à la fin de la ligne</entry>
+</row>
+<row>
+  <entry><literal>delete_beginning_line</literal></entry>
+  <entry>effacer jusqu'au début de la ligne</entry>
+</row>
+<row>
+  <entry><literal>delete_line</literal></entry>
+  <entry>effacer la ligne entière</entry>
+</row>
+<row>
+  <entry><literal>delete_previous_word</literal></entry>
+  <entry>effacer le mot précédent</entry>
+</row>
+<row>
+  <entry><literal>delete_next_word</literal></entry>
+  <entry>effacer le mot suivant</entry>
+</row>
+<row>
+  <entry><literal>clipboard_paste</literal></entry>
+  <entry>coller le contenu du presse-papier</entry>
+</row>
+<row>
+  <entry><literal>transpose_chars</literal></entry>
+  <entry>inverser les caractères</entry>
+</row>
+<row>
+  <entry><literal>home</literal></entry>
+  <entry>aller au début de la ligne</entry>
+</row>
+<row>
+  <entry><literal>end</literal></entry>
+  <entry>aller à la fin de la ligne</entry>
+</row>
+<row>
+  <entry><literal>left</literal></entry>
+  <entry>se déplacer d'un caractère à gauche</entry>
+</row>
+<row>
+  <entry><literal>previous_word</literal></entry>
+  <entry>se déplacer au mot précédent</entry>
+</row>
+<row>
+  <entry><literal>right</literal></entry>
+  <entry>se déplacer d'un caractère à droite</entry>
+</row>
+<row>
+  <entry><literal>next_word</literal></entry>
+  <entry>se déplacer au mot suivant</entry>
+</row>
+<row>
+  <entry><literal>up</literal></entry>
+  <entry>appeler la commande précédente dans l'historique</entry>
+</row>
+<row>
+  <entry><literal>up_global</literal></entry>
+  <entry>appeler la commande précédente dans l'historique global</entry>
+</row>
+<row>
+  <entry><literal>down</literal></entry>
+  <entry>appeler la commande suivante dans l'historique</entry>
+</row>
+<row>
+  <entry><literal>down_global</literal></entry>
+  <entry>appeler la commande suivante dans l'historique global</entry>
+</row>
+<row>
+  <entry><literal>page_up</literal></entry>
+  <entry>faire défiler d'une page vers le haut</entry>
+</row>
+<row>
+  <entry><literal>page_down</literal></entry>
+  <entry>faire défiler d'une page vers le bas</entry>
+</row>
+<row>
+  <entry><literal>nick_beginning</literal></entry>
+  <entry>afficher le début de la liste des pseudos</entry>
+</row>
+<row>
+  <entry><literal>nick_end</literal></entry>
+  <entry>afficher la fin de la liste des pseudos</entry>
+</row>
+<row>
+  <entry><literal>nick_page_up</literal></entry>
+  <entry>faire défiler la liste des pseudos d'une page vers le haut</entry>
+</row>
+<row>
+  <entry><literal>nick_page_down</literal></entry>
+  <entry>faire défiler la liste des pseudos d'une page vers le bas</entry>
+</row>
+<row>
+  <entry><literal>jump_smart</literal></entry>
+  <entry>sauter au tampon avec de l'activité</entry>
+</row>
+<row>
+  <entry><literal>jump_dcc</literal></entry>
+  <entry>sauter au tampon DCC</entry>
+</row>
+<row>
+  <entry><literal>jump_last_buffer</literal></entry>
+  <entry>sauter au dernier tampon</entry>
+</row>
+<row>
+  <entry><literal>jump_server</literal></entry>
+  <entry>sauter au tampon du serveur</entry>
+</row>
+<row>
+  <entry><literal>jump_next_server</literal></entry>
+  <entry>sauter au prochain serveur</entry>
+</row>
+<row>
+  <entry><literal>switch_server</literal></entry>
+  <entry>bascule de serveur actif sur le tampon des serveurs</entry>
+</row>
+<row>
+  <entry><literal>scroll_previous_highlight</literal></entry>
+  <entry>scroller jusqu'au highlight précédent du tampon</entry>
+</row>
+<row>
+  <entry><literal>scroll_next_highlight</literal></entry>
+  <entry>scroller jusqu'au highlight suivant du tampon</entry>
+</row>
+<row>
+  <entry><literal>scroll_unread</literal></entry>
+  <entry>scroller jusqu'à la première ligne non lue du tampon</entry>
+</row>
+<row>
+  <entry><literal>hotlist_clear</literal></entry>
+  <entry>effacer la liste d'activité</entry>
+</row>
+<row>
+  <entry><literal>infobar_clear</literal></entry>
+  <entry>effacer la barre d'infos</entry>
+</row>
+<row>
+  <entry><literal>refresh</literal></entry>
+  <entry>rafraîchir l'écran</entry>
+</row>
+<row>
+  <entry><literal>grab_key</literal></entry>
+  <entry>capturer une touche</entry>
+</row>
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<command>alias  [nom_alias [commande [paramètres]]</command>
+<programlisting>
+créer un alias pour une commande
+
+ nom_alias: nom de l'alias
+  commande: nom de la commande (commande WeeChat ou IRC, sans le premier '/')
+paramètres: paramètres pour la commande
+
+</programlisting>
+<command>buffer  [action | nombre | [[serveur] [canal]]]</command>
+<programlisting>
+gestion des tampons
+
+ action: action à effectuer:
+   move: déplacer le tampon dans la liste (peut être relatif, par exemple -1)
+  close: fermer le tampon (pour un canal: équivalent à /part sans message de fin)
+   list: liste les tampons ouverts (pas de paramètre affiche cette liste)
+ notify: fixer le niveau de notification (0=jamais, 1=highlight, 2=1+msg, 3=2+join/part)
+serveur
+  canal: sauter au tampon par serveur et/ou nom de canal
+ nombre: sauter au tampon qui a ce numéro
+
+</programlisting>
+<command>charset  [(decode_iso | decode_utf | encode) charset]</command>
+<programlisting>
+changer le jeu de caractères pour le serveur ou le canal
+
+decode_iso: jeu de caractères utilisé pour décoder l'ISO
+decode_utf: jeu de caractères utilisé pour décoder l'UTF
+    encode: jeu de caractères utilisé pour encoder les messages
+   charset: jeu de caractères à utiliser (par exemple: ISO-8859-15, UTF-8,..)
+
+</programlisting>
+<command>clear  [-all]</command>
+<programlisting>
+effacer la/les fenêtre(s)
+
+-all: effacer toutes les fenêtres
+
+</programlisting>
+<command>connect  [nom_serveur]</command>
+<programlisting>
+se connecter à un serveur
+
+nom_serveur: nom du serveur pour se connecter
+
+</programlisting>
+<command>disconnect  [nom_serveur]</command>
+<programlisting>
+se déconnecter d'un serveur
+
+nom_serveur: nom du serveur pour se déconnecter
+
+</programlisting>
+<command>debug  dump | windows</command>
+<programlisting>
+affiche des messages de debogage
+
+   dump: affiche les variables mémoire WeeChat dans le fichier log (les mêmes messages sont affichés lorsque WeeChat plante)
+windows: affiche l'arbre des fenêtres
+
+</programlisting>
+<command>help  [commande]</command>
+<programlisting>
+afficher l'aide sur les commandes
+
+commande: nom d'une commande WeeChat ou IRC
+
+</programlisting>
+<command>history  [clear | valeur]</command>
+<programlisting>
+affiche l'historique des commandes du tampon
+
+clear: effacer l'historique
+valeur: nombre d'entrées dans l'historique à afficher
+
+</programlisting>
+<command>ignore  [masque [[type | commande] [canal [serveur]]]]</command>
+<programlisting>
+ignorer des messages IRC et/ou des masques
+
+  masque: pseudo ou masque à ignorer
+    type: type de message à ignorer (action, ctcp, dcc, pv)
+commande: commande IRC
+   canal: nom du canal pour le ignore
+ serveur: nom du serveur pour le ignore
+
+Pour chaque paramètre, '*' signifie tou(te)s.
+Sans paramètres, la commande /ignore liste les ignore définis.
+
+</programlisting>
+<command>key  [touche fonction/commande] [unbind touche] [functions] [reset -yes]</command>
+<programlisting>
+associer/libérer des touches
+
+   touche: associer cette touche à une fonction interne ou une commande (commençant par "/")
+   unbind: supprimer l'association à une touche
+functions: lister la liste des fonctions internes pour les associations de touches
+    reset: restaure les touches aux valeurs par défaut et supprime TOUTES les touches personnelles (utiliser avec précaution !)
+
+</programlisting>
+<command>plugin  [load fichier] | [autoload] | [reload] | [unload]</command>
+<programlisting>
+liste/charge/décharge des extensions
+
+fichier: extension WeeChat (fichier) à charger
+
+Sans paramètre, la commande /plugin liste toutes les extensions chargées.
+
+</programlisting>
+<command>server  [nom_serveur] | [nom_serveur nom/IP port [-auto | -noauto] [-ipv6] [-ssl] [-pwd mot_de_passe] [-nicks pseudo1 pseudo2 pseudo3] [-username nom_utilisateur] [-realname nom_réel] [-command commande] [-autojoin canal[,canal]] ] | [del nom_serveur]</command>
+<programlisting>
+liste, ajoute ou retire des serveurs
+
+    nom_serveur: nom du serveur, pour usage interne et affichage
+         nom/IP: nom ou adresse IP du serveur
+           port: port pour le serveur (nombre entier)
+           ipv6: utiliser le protocole IPv6
+            ssl: utiliser le protocole SSL
+   mot_de_passe: mot de passe pour le serveur
+        pseudo1: premier pseudo pour le serveur
+        pseudo2: pseudo alternatif pour le serveur
+        pseudo3: second pseudo alternatif pour le serveur
+nom_utilisateur: nom d'utilisateur
+       nom_réel: nom réel de l'utilisateur
+
+</programlisting>
+<command>save  [fichier]</command>
+<programlisting>
+sauvegarder la configuration sur disque
+
+fichier: fichier pour sauvegarder la configuration
+
+</programlisting>
+<command>set  [option [ = valeur]]</command>
+<programlisting>
+modifier des paramètres de configuration
+
+option: nom de l'option (si le nom est complet et qu'aucune valeur n'est donnée, alors l'aide sur l'option est affichée)
+valeur: valeur pour l'option
+
+</programlisting>
+<command>unalias  nom_alias</command>
+<programlisting>
+supprimer un alias
+
+nom_alias: nom de l'alias à supprimer
+
+</programlisting>
+<command>unignore  [nombre | [masque [[type | commande] [canal [serveur]]]]]</command>
+<programlisting>
+supprimer le ignore des messages IRC et/ou des masques
+
+  nombre: numéro de ignore à supprimer (le nombre est affiché sur la liste des ignore)
+  masque: pseudo ou masque à ignorer
+    type: type de message à ignorer (action, ctcp, dcc, pv)
+commande: commande IRC
+   canal: nom du canal pour le ignore
+ serveur: nom du serveur pour le ignore
+
+Pour chaque paramètre, '*' signifie tou(te)s.
+Sans paramètre, /ignore liste les ignore définis.
+
+</programlisting>
+<command>upgrade</command>
+<programlisting>
+mettre à jour WeeChat sans se déconnecter des serveurs
+
+</programlisting>
+<command>uptime  [-o]</command>
+<programlisting>
+montrer l'uptime de WeeChat
+
+-o: envoyer l'uptime sur le canal courant en tant que message IRC
+
+</programlisting>
+<command>window  [list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv [ptc] | resize pct | merge [all]]</command>
+<programlisting>
+gestion des fenêtres
+
+  list: liste les fenêtres ouvertes (pas de paramètre affiche cette liste)
+    -1: saute à la fenêtre précédente
+    +1: saute à la fenêtre suivante
+    b#: saute à la fenêtre affichant le tampon n°#
+    up: saute à la fenêtre au dessus
+  down: saute à la fenêtre au dessous
+  left: saute à la fenêtre à gauche
+ right: saute à la fenêtre à droite
+splith: éclate la fenêtre en deux horizontalement
+splitv: éclate la fenêtre en deux verticalement
+resize: redimensionne une fenêtre, la nouvelle taille est pct%% de la fenêtre parent
+ merge: fusionne la fenêtre avec une autre
+
+Pour splith et splitv, pct est un pourcentage qui représente la taille de la nouvelle fenêtre, calculée par rapport à la taille de la fenêtre courante. Par exemple 25 signifie créer une fenêtre qui a pour taille: taille_courante / 4
+
+</programlisting>
@@ -1,4 +1,4 @@
-.TH WEECHAT 1 "September 2005" "FlashCode"
+.TH WEECHAT 1 "January 2006" "FlashCode"

 .SH NAME
 weechat-curses \- Wee Enhanced Environment for Chat (Curses version)
@@ -19,6 +19,10 @@ It is compliant with RFCs 1459, 2810, 2811, 2812, and 2813.

 .SH OPTIONS
 .TP
+.B \-a, \-\-no\-connect
+.br
+disable auto-connect to servers at startup
+.TP
 .B \-c, \-\-config
 .br
 display config file help (list of options)
@@ -43,6 +47,10 @@ display default keys
 .br
 display program license
 .TP
+.B \-p, \-\-no\-plugin
+.br
+don't load any plugin at startup
+.TP
 .B \-v, \-\-version
 .br
 display WeeChat version
@@ -0,0 +1,50 @@
+/*
+ * WeeChat doc CSS
+ * (c) 2006 by FlashCode <flashcode@flashtux.org>
+ */
+
+body {
+  font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+  font-size: 12px;
+}
+
+table {
+  font-size: 12px;
+}
+
+.informaltable table {
+  font-size: 11px;
+  font-family: Verdana;
+  border-collapse: collapse;
+}
+
+.informaltable table th {
+  padding: 2px 5px 2px 5px;
+  border: solid 1px #AAAAAA;
+  background-color: #DDDDFF;
+}
+
+.informaltable table td {
+  padding: 2px 5px 2px 5px;
+  border: solid 1px #AAAAAA;
+}
+
+.oddrow {
+  background-color: #F0F0F0;
+}
+
+.synopsis { 
+  font-size: 11px;
+}
+
+.programlisting {
+  font-size: 11px;
+}
+
+pre.screen {
+  font-size: 11px;
+  background-color: #F5F5F5;
+  border: solid 1px #CCCCCC;
+  padding: 4px;
+  margin: 0 40px 0 40px;
+}
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl"/>
+
+<xsl:output indent="yes"/>
+
+<xsl:param name="chunk.section.depth" select="2"/>
+<xsl:param name="chunk.quietly" select="1"/>
+<xsl:param name="chunk.first.sections" select="1"/>
+<xsl:param name="generate.section.toc.level" select="3"/>
+
+<xsl:param name="html.stylesheet">weechat-doc.css</xsl:param>
+
+<xsl:template name="tr.attributes">
+  <xsl:param name="row" select="."/>
+  <xsl:param name="rownum" select="0"/>
+
+  <xsl:if test="not(ancestor::table/@tabstyle = 'unstriped')">
+    <xsl:if test="$rownum mod 2 = 0">
+      <xsl:attribute name="class">oddrow</xsl:attribute>
+    </xsl:if>
+  </xsl:if>
+</xsl:template>
+
+</xsl:stylesheet>
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl"/>
+
+<xsl:output indent="yes"/>
+
+<xsl:param name="chunk.section.depth" select="2"/>
+<xsl:param name="chunk.quietly" select="1"/>
+<xsl:param name="chunk.first.sections" select="1"/>
+<xsl:param name="generate.section.toc.level" select="3"/>
+
+<xsl:param name="html.stylesheet">weechat-doc.css</xsl:param>
+
+<xsl:template name="tr.attributes">
+  <xsl:param name="row" select="."/>
+  <xsl:param name="rownum" select="0"/>
+
+  <xsl:if test="not(ancestor::table/@tabstyle = 'unstriped')">
+    <xsl:if test="$rownum mod 2 = 0">
+      <xsl:attribute name="class">oddrow</xsl:attribute>
+    </xsl:if>
+  </xsl:if>
+</xsl:template>
+
+</xsl:stylesheet>
@@ -8,18 +8,17 @@
 ./src/irc/irc-dcc.c
 ./src/irc/irc-ignore.c
 ./src/irc/irc.h
-./src/plugins/perl/wee-perl.c
-./src/plugins/perl/wee-perl.h
-./src/plugins/python/wee-python.c
-./src/plugins/python/wee-python.h
-./src/plugins/ruby/wee-ruby.c
-./src/plugins/ruby/wee-ruby.h
 ./src/plugins/plugins.c
 ./src/plugins/plugins.h
+./src/plugins/plugins-config.c
+./src/plugins/plugins-config.h
+./src/plugins/plugins-interface.c
+./src/plugins/weechat-plugin.h
 ./src/gui/curses/gui-input.c
 ./src/gui/curses/gui-display.c
 ./src/gui/gtk/gui-display.c
 ./src/gui/gtk/gui-input.c
+./src/gui/gui-action.c
 ./src/gui/gui-common.c
 ./src/gui/gui-keyboard.c
 ./src/gui/gui.h
@@ -35,6 +34,10 @@
 ./src/common/hotlist.h
 ./src/common/log.c
 ./src/common/log.h
+./src/common/session.c
+./src/common/session.h
+./src/common/utf8.c
+./src/common/utf8.h
 ./src/common/weechat.c
 ./src/common/weechat.h
 ./src/common/weeconfig.c
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2005 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2006 FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -12,7 +12,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #

 SUBDIRS = common irc plugins gui
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2005 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2006 FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -12,10 +12,10 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #

-INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\"
+INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\" $(GNUTLS_CFLAGS)

 noinst_LIBRARIES = lib_weechat_main.a

@@ -36,4 +36,8 @@ lib_weechat_main_a_SOURCES = weechat.c \
                             log.c \
                             log.h \
                             fifo.c \
-                             fifo.h
+                             fifo.h \
+                             session.c \
+                             session.h \
+                             utf8.c \
+                             utf8.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */


@@ -31,13 +31,17 @@ typedef struct t_weechat_command t_weechat_command;

 struct t_weechat_command
 {
-    char *command_name;
-    char *command_description;
-    char *arguments;
-    char *arguments_description;
-    int min_arg, max_arg;
-    int (*cmd_function_args)(int, char **);
-    int (*cmd_function_1arg)(char *);
+    char *command_name;             /* WeeChat (internal) command name        */
+    char *command_description;      /* command description (for /help)        */
+    char *arguments;                /* command arguments (for /help)          */
+    char *arguments_description;    /* arguments description (for /help)      */
+    char *completion_template;      /* template for completion                */
+                                    /* NULL=no completion, ""=default (nick)  */
+    int min_arg, max_arg;           /* min & max number of arguments          */
+    int (*cmd_function_args)(t_gui_window *, int, char **);
+                                    /* function called when user enters cmd   */
+    int (*cmd_function_1arg)(t_gui_window *, char *);
+                                    /* function called when user enters cmd   */
 };

 typedef struct t_weechat_alias t_weechat_alias;
@@ -60,27 +64,30 @@ extern void command_index_build ();
 extern void command_index_free ();
 extern t_weechat_alias *alias_new (char *, char *);
 extern void alias_free_all ();
-extern int exec_weechat_command (t_irc_server *, char *);
-extern void user_command (t_irc_server *, t_gui_buffer *, char *);
-extern int weechat_cmd_alias (char *);
-extern int weechat_cmd_buffer (int, char **);
-extern int weechat_cmd_clear (int, char **);
-extern int weechat_cmd_connect (int, char **);
-extern int weechat_cmd_debug (int, char **);
-extern int weechat_cmd_disconnect (int, char **);
-extern int weechat_cmd_help (int, char **);
+extern char **explode_string (char *, char *, int, int *);
+extern void free_exploded_string (char **);
+extern int exec_weechat_command (t_gui_window *, t_irc_server *, char *);
+extern void user_command (t_gui_buffer *, t_irc_server *, char *);
+extern int weechat_cmd_alias (t_gui_window *, char *);
+extern int weechat_cmd_buffer (t_gui_window *, int, char **);
+extern int weechat_cmd_charset (t_gui_window *, int, char **);
+extern int weechat_cmd_clear (t_gui_window *, int, char **);
+extern int weechat_cmd_connect (t_gui_window *, int, char **);
+extern int weechat_cmd_debug (t_gui_window *, int, char **);
+extern int weechat_cmd_disconnect (t_gui_window *, int, char **);
+extern int weechat_cmd_help (t_gui_window *, int, char **);
+extern int weechat_cmd_history (t_gui_window *, int, char **);
 extern void weechat_cmd_ignore_display (char *, t_irc_ignore *);
-extern int weechat_cmd_ignore (int, char **);
-extern int weechat_cmd_key (char *);
-extern int weechat_cmd_perl (int, char **);
-extern int weechat_cmd_python (int, char **);
-extern int weechat_cmd_ruby (int, char **);
-extern int weechat_cmd_save (int, char **);
-extern int weechat_cmd_server (int, char **);
-extern int weechat_cmd_set (char *);
-extern int weechat_cmd_unalias (char *);
-extern int weechat_cmd_unignore (int, char **);
-extern int weechat_cmd_unset (char *);
-extern int weechat_cmd_window (int, char **);
+extern int weechat_cmd_ignore (t_gui_window *, int, char **);
+extern int weechat_cmd_key (t_gui_window *, char *);
+extern int weechat_cmd_plugin (t_gui_window *, int, char **);
+extern int weechat_cmd_save (t_gui_window *, int, char **);
+extern int weechat_cmd_server (t_gui_window *, int, char **);
+extern int weechat_cmd_set (t_gui_window *, char *);
+extern int weechat_cmd_unalias (t_gui_window *, char *);
+extern int weechat_cmd_unignore (t_gui_window *, int, char **);
+extern int weechat_cmd_upgrade (t_gui_window *, int, char **);
+extern int weechat_cmd_uptime (t_gui_window *, int, char **);
+extern int weechat_cmd_window (t_gui_window *, int, char **);

 #endif /* command.h */
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */


@@ -33,26 +33,30 @@ typedef struct t_completion t_completion;
 struct t_completion
 {
    /* completion context */
-    int context;            /* context: null, nick, command, cmd arg        */
-    char *base_command;     /* command with arg to complete (can be NULL)   */
-    int base_command_arg;   /* # arg to complete (if context is cmd arg)    */
-    char *base_word;        /* word to complete (when Tab was pressed)      */
-    int base_word_pos;      /* beggining of base word                       */
-    int position;           /* position where Tab was pressed               */
-    char *args;             /* command line args (including base word)      */
+    void *server;               /* server pointer                             */
+    void *channel;              /* channel pointer                            */
+    int context;                /* context: null, nick, command, cmd arg      */
+    char *base_command;         /* command with arg to complete (can be NULL) */
+    int base_command_arg;       /* # arg to complete (if context is cmd arg)  */
+    int arg_is_nick;            /* argument is nick                           */
+    char *base_word;            /* word to complete (when Tab was pressed)    */
+    int base_word_pos;          /* beggining of base word                     */
+    int position;               /* position where Tab was pressed             */
+    char *args;                 /* command line args (including base word)    */
    
    /* for command argument completion */
-    t_weelist *completion_list; /* data list for completion                 */
-    t_weelist *last_completion; /* last data element for completion         */
+    t_weelist *completion_list; /* data list for completion                   */
+    t_weelist *last_completion; /* last data element for completion           */
    
    /* completion found */
-    char *word_found;       /* word found (to replace base word)            */
-    int position_replace;   /* position where word has to be replaced       */
-    int diff_size;          /* size difference (< 0 = char(s) deleted)      */
+    char *word_found;           /* word found (to replace base word)          */
+    int position_replace;       /* position where word has to be replaced     */
+    int diff_size;              /* size difference (< 0 = char(s) deleted)    */
+    int diff_length;            /* length difference (<= diff_size)           */
 };

-extern void completion_init (t_completion *);
+extern void completion_init (t_completion *, void *, void *);
 extern void completion_free (t_completion *);
-extern void completion_search (t_completion *, void *, char *, int, int);
+extern void completion_search (t_completion *, char *, int, int);

 #endif /* completion.h */
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

 /* fifo.c: FIFO pipe for WeeChat remote control */
@@ -70,8 +70,9 @@ fifo_create ()
            gui_printf (NULL,
                        _("%s unable to create FIFO pipe for remote control (%s)\n"),
                        WEECHAT_ERROR, weechat_fifo_filename);
-            wee_log_printf (_("%s unable to create FIFO pipe for remote control (%s)\n"),
-                            WEECHAT_ERROR, weechat_fifo_filename);
+            weechat_log_printf (_("%s unable to create FIFO pipe for "
+                                  "remote control (%s)\n"),
+                                WEECHAT_ERROR, weechat_fifo_filename);
            return;
        }
        
@@ -81,12 +82,12 @@ fifo_create ()
            gui_printf (NULL,
                        _("%s unable to open FIFO pipe (%s) for reading\n"),
                        WEECHAT_ERROR, weechat_fifo_filename);
-            wee_log_printf (_("%s unable to open FIFO pipe (%s) for reading\n"),
-                            WEECHAT_ERROR, weechat_fifo_filename);
+            weechat_log_printf (_("%s unable to open FIFO pipe (%s) for reading\n"),
+                                WEECHAT_ERROR, weechat_fifo_filename);
            return;
        }
        
-        wee_log_printf (_("FIFO pipe is open\n"));
+        weechat_log_printf (_("FIFO pipe is open\n"));
    }
 }

@@ -120,7 +121,7 @@ fifo_exec (char *text)
        pos_msg = strstr (text, " *");
        if (!pos_msg)
        {
-            irc_display_prefix (NULL, PREFIX_ERROR);
+            irc_display_prefix (NULL, NULL, PREFIX_ERROR);
            gui_printf (NULL, _("%s invalid text received on FIFO pipe\n"),
                        WEECHAT_WARNING);
            return;
@@ -142,23 +143,21 @@ fifo_exec (char *text)
            ptr_server = server_search (text);
            if (!ptr_server || !ptr_server->buffer)
            {
-                irc_display_prefix (NULL, PREFIX_ERROR);
+                irc_display_prefix (NULL, NULL, PREFIX_ERROR);
                gui_printf (NULL, _("%s server \"%s\" not found (FIFO pipe data)\n"),
                            WEECHAT_WARNING, text);
                return;
            }
-            if (ptr_server)
+            if (ptr_server && pos)
            {
-                if (pos)
+                ptr_channel = channel_search (ptr_server, pos + 1);
+                if (!ptr_channel)
                {
-                    ptr_channel = channel_search (ptr_server, pos + 1);
-                    if (!ptr_channel)
-                    {
-                        irc_display_prefix (NULL, PREFIX_ERROR);
-                        gui_printf (NULL, _("%s channel \"%s\" not found (FIFO pipe data)\n"),
-                                    WEECHAT_WARNING, pos + 1);
-                        return;
-                    }
+                    irc_display_prefix (NULL, NULL, PREFIX_ERROR);
+                    gui_printf (NULL,
+                                _("%s channel \"%s\" not found (FIFO pipe data)\n"),
+                                WEECHAT_WARNING, pos + 1);
+                    return;
                }
            }
        }
@@ -172,7 +171,7 @@ fifo_exec (char *text)
            ptr_buffer = gui_buffers;
    }
    
-    user_command (ptr_server, ptr_buffer, pos_msg);
+    user_command (ptr_buffer, ptr_server, pos_msg);
 }

 /*
@@ -248,8 +247,8 @@ fifo_read ()
            gui_printf (NULL,
                        _("%s error reading FIFO pipe, closing it\n"),
                        WEECHAT_ERROR);
-            wee_log_printf (_("%s error reading FIFO pipe, closing it\n"),
-                            WEECHAT_ERROR);
+            weechat_log_printf (_("%s error reading FIFO pipe, closing it\n"),
+                                WEECHAT_ERROR);
            fifo_remove ();
        }
        else
@@ -290,5 +289,5 @@ fifo_remove ()
        weechat_fifo_filename = NULL;
    }
    
-    wee_log_printf (_("FIFO pipe is closed\n"));
+    weechat_log_printf (_("FIFO pipe is closed\n"));
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */


@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

 /* history.c: memorize commands or text */
@@ -66,74 +66,92 @@ history_hide_password (char *string)
 }

 /*
- * history_add: add a text/command to history
+ * history_buffer_add: add a text/command to buffer's history
 */

 void
-history_add (void *buffer, char *string)
+history_buffer_add (void *buffer, char *string)
 {
    t_history *new_history, *ptr_history;
    
-    /* add history to global history */
-    new_history = (t_history *)malloc (sizeof (t_history));
-    if (new_history)
-    {
-        new_history->text = strdup (string);
-        if (cfg_log_hide_nickserv_pwd)
-            history_hide_password (new_history->text);
-        
-        if (history_global)
-            history_global->prev_history = new_history;
-        else
-            history_global_last = new_history;
-        new_history->next_history = history_global;
-        new_history->prev_history = NULL;
-        history_global = new_history;
-        num_history_global++;
-        
-        /* remove one command if necessary */
-        if ((cfg_history_max_commands > 0)
-            && (num_history_global > cfg_history_max_commands))
-        {
-            ptr_history = history_global_last->prev_history;
-            history_global_last->prev_history->next_history = NULL;
-            if (history_global_last->text)
-                free (history_global_last->text);
-            free (history_global_last);
-            history_global_last = ptr_history;
-            num_history_global--;
-        }
+    if ( !((t_gui_buffer *)(buffer))->history
+         || ( ((t_gui_buffer *)(buffer))->history
+              && ascii_strcasecmp (((t_gui_buffer *)(buffer))->history->text, string) != 0))
+    {	
+	new_history = (t_history *)malloc (sizeof (t_history));
+	if (new_history)
+	{
+	    new_history->text = strdup (string);
+	    if (cfg_log_hide_nickserv_pwd)
+		history_hide_password (new_history->text);
+	    
+	    if (((t_gui_buffer *)(buffer))->history)
+		((t_gui_buffer *)(buffer))->history->prev_history = new_history;
+	    else
+		((t_gui_buffer *)(buffer))->last_history = new_history;
+	    new_history->next_history = ((t_gui_buffer *)(buffer))->history;
+	    new_history->prev_history = NULL;
+	    ((t_gui_buffer *)buffer)->history = new_history;
+	    ((t_gui_buffer *)buffer)->num_history++;
+	    
+	    /* remove one command if necessary */
+	    if ((cfg_history_max_commands > 0)
+		&& (((t_gui_buffer *)(buffer))->num_history > cfg_history_max_commands))
+	    {
+		ptr_history = ((t_gui_buffer *)buffer)->last_history->prev_history;
+		((t_gui_buffer *)buffer)->last_history->prev_history->next_history = NULL;
+		if (((t_gui_buffer *)buffer)->last_history->text)
+		    free (((t_gui_buffer *)buffer)->last_history->text);
+		free (((t_gui_buffer *)buffer)->last_history);
+		((t_gui_buffer *)buffer)->last_history = ptr_history;
+		((t_gui_buffer *)(buffer))->num_history++;
+	    }
+	}
    }
-    
-    /* add history to local history */
-    new_history = (t_history *)malloc (sizeof (t_history));
-    if (new_history)
-    {
-        new_history->text = strdup (string);
-        if (cfg_log_hide_nickserv_pwd)
-            history_hide_password (new_history->text);
-        
-        if (((t_gui_buffer *)(buffer))->history)
-            ((t_gui_buffer *)(buffer))->history->prev_history = new_history;
-        else
-            ((t_gui_buffer *)(buffer))->last_history = new_history;
-        new_history->next_history = ((t_gui_buffer *)(buffer))->history;
-        new_history->prev_history = NULL;
-        ((t_gui_buffer *)buffer)->history = new_history;
-        ((t_gui_buffer *)(buffer))->num_history++;
-        
-        /* remove one command if necessary */
-        if ((cfg_history_max_commands > 0)
-            && (((t_gui_buffer *)(buffer))->num_history > cfg_history_max_commands))
-        {
-            ptr_history = ((t_gui_buffer *)buffer)->last_history->prev_history;
-            ((t_gui_buffer *)buffer)->last_history->prev_history->next_history = NULL;
-            if (((t_gui_buffer *)buffer)->last_history->text)
-                free (((t_gui_buffer *)buffer)->last_history->text);
-            free (((t_gui_buffer *)buffer)->last_history);
-            ((t_gui_buffer *)buffer)->last_history = ptr_history;
-            ((t_gui_buffer *)(buffer))->num_history++;
-        }
+}
+
+/*
+ * history_global_add: add a text/command to buffer's history
+ */
+
+void
+history_global_add (char *string)
+{
+    t_history *new_history, *ptr_history;
+
+    if (!history_global
+        || (history_global
+            && ascii_strcasecmp (history_global->text, string) != 0))
+    {    
+	new_history = (t_history *)malloc (sizeof (t_history));
+	if (new_history)
+	{
+	    new_history->text = strdup (string);
+	    if (cfg_log_hide_nickserv_pwd)
+		history_hide_password (new_history->text);
+	    
+	    if (history_global)
+		history_global->prev_history = new_history;
+	    else
+		history_global_last = new_history;
+	    new_history->next_history = history_global;
+	    new_history->prev_history = NULL;
+	    history_global = new_history;
+	    num_history_global++;
+	    
+	    /* remove one command if necessary */
+	    if ((cfg_history_max_commands > 0)
+		&& (num_history_global > cfg_history_max_commands))
+	    {
+		ptr_history = history_global_last->prev_history;
+		history_global_last->prev_history->next_history = NULL;
+		if (history_global_last->text)
+		    free (history_global_last->text);
+		free (history_global_last);
+		history_global_last = ptr_history;
+		num_history_global--;
+	    }
+	}
    }
 }

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */


@@ -34,7 +34,8 @@ extern t_history *history_global;
 extern t_history *history_global_last;
 extern t_history *history_global_ptr;

-extern void history_add (void *, char *);
+extern void history_buffer_add (void *, char *);
+extern void history_global_add (char *);
 extern void history_global_free ();
 extern void history_buffer_free (void *);

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

 /* hotlist.c: WeeChat hotlist (buffers with activity) */
@@ -76,7 +76,7 @@ hotlist_find_pos (t_weechat_hotlist *new_hotlist)
 */

 void
-hotlist_add (int priority, t_gui_buffer *buffer)
+hotlist_add (int priority, t_irc_server *server, t_gui_buffer *buffer)
 {
    t_weechat_hotlist *new_hotlist, *pos_hotlist;
    
@@ -104,6 +104,7 @@ hotlist_add (int priority, t_gui_buffer *buffer)
    }
    
    new_hotlist->priority = priority;
+    new_hotlist->server = server;
    new_hotlist->buffer = buffer;
    
    if (hotlist)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */


@@ -34,6 +34,7 @@ struct t_weechat_hotlist
 {
    int priority;                       /* 0=crappy msg (join/part), 1=msg, */
                                        /* 2=pv, 3=nick highlight           */
+    t_irc_server *server;               /* associated server                */
    t_gui_buffer *buffer;               /* associated buffer                */
    t_weechat_hotlist *prev_hotlist;    /* link to previous hotlist         */
    t_weechat_hotlist *next_hotlist;    /* link to next hotlist             */
@@ -42,7 +43,7 @@ struct t_weechat_hotlist
 extern t_weechat_hotlist *hotlist;
 extern t_gui_buffer *hotlist_initial_buffer;

-extern void hotlist_add (int, t_gui_buffer *);
+extern void hotlist_add (int, t_irc_server *, t_gui_buffer *);
 extern void hotlist_free (t_weechat_hotlist *);
 extern void hotlist_free_all ();
 extern void hotlist_remove_buffer (t_gui_buffer *);
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

 /* log.c: log buffers to files */
@@ -58,6 +58,27 @@ log_write_date (t_gui_buffer *buffer)
    }
 }

+/*
+ * log_write_line: writes a line to log file
+ */
+
+void
+log_write_line (t_gui_buffer *buffer, char *message)
+{
+    char *msg_no_color;
+    
+    if (buffer->log_file)
+    {
+        msg_no_color = (char *)gui_color_decode ((unsigned char *)message, 0);
+        log_write_date (buffer);
+        fprintf (buffer->log_file, "%s\n",
+                 (msg_no_color) ? msg_no_color : message);
+        fflush (buffer->log_file);
+        if (msg_no_color)
+            free (msg_no_color);
+    }
+}
+
 /*
 * log_write: writes a message to log file
 */
@@ -65,32 +86,16 @@ log_write_date (t_gui_buffer *buffer)
 void
 log_write (t_gui_buffer *buffer, char *message)
 {
-    if (buffer->log_file)
-    {    
-        fprintf (buffer->log_file, "%s", message);
-        fflush (buffer->log_file);
-    }
-}
-
-/*
- * log_write_line: writes a WeeChat line to log file
- */
-
-void
-log_write_line (t_gui_buffer *buffer, t_gui_line *line)
-{
-    t_gui_message *ptr_msg;
+    char *msg_no_color;
    
    if (buffer->log_file)
-    {    
-        log_write_date (buffer);
-        for (ptr_msg = line->messages; ptr_msg; ptr_msg = ptr_msg->next_message)
-        {
-            if (ptr_msg->type != MSG_TYPE_TIME)
-                fprintf (buffer->log_file, "%s", ptr_msg->message);
-        }
-        fprintf (buffer->log_file, "\n");
+    {
+        msg_no_color = (char *)gui_color_decode ((unsigned char *)message, 0);
+        fprintf (buffer->log_file, "%s",
+                 (msg_no_color) ? msg_no_color : message);
        fflush (buffer->log_file);
+        if (msg_no_color)
+            free (msg_no_color);
    }
 }

@@ -115,7 +120,7 @@ log_start (t_gui_buffer *buffer)
    buffer->log_filename = (char *) malloc (length);
    if (!buffer->log_filename)
    {
-        wee_log_printf (_("Not enough memory to write log file for a buffer\n"));
+        weechat_log_printf (_("Not enough memory to write log file for a buffer\n"));
        return;
    }
    if (cfg_log_path[0] == '~')
@@ -143,7 +148,7 @@ log_start (t_gui_buffer *buffer)
    buffer->log_file = fopen (buffer->log_filename, "a");
    if (!buffer->log_file)
    {
-        wee_log_printf (_("Unable to write log file for a buffer\n"));
+        weechat_log_printf (_("Unable to write log file for a buffer\n"));
        free (buffer->log_filename);
        return;
    }
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */


@@ -25,8 +25,8 @@
 #include "../gui/gui.h"

 extern void log_write_date (t_gui_buffer *);
+extern void log_write_line (t_gui_buffer *, char *);
 extern void log_write (t_gui_buffer *, char *);
-extern void log_write_line (t_gui_buffer *, t_gui_line *);
 extern void log_start (t_gui_buffer *);
 extern void log_end (t_gui_buffer *);

@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
+ * See README for License detail, AUTHORS for developers list.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+
+#ifndef __WEECHAT_SESSION_H
+#define __WEECHAT_SESSION_H 1
+
+#define WEECHAT_SESSION_NAME "weechat_session.bin"
+
+#define SESSION_SIGNATURE "== WeeChat Upgrade file v1.0 - binary, do not edit! =="
+
+/* For developers: please add new values ONLY AT THE END of enums */
+
+enum t_session_type
+{
+    SESSION_TYPE_INT = 0,
+    SESSION_TYPE_STR,
+    SESSION_TYPE_BUF
+};
+
+enum t_session_object
+{
+    SESSION_OBJ_END = 0,
+    SESSION_OBJ_SERVER,
+    SESSION_OBJ_CHANNEL,
+    SESSION_OBJ_NICK,
+    SESSION_OBJ_DCC,
+    SESSION_OBJ_HISTORY,
+    SESSION_OBJ_BUFFER,
+    SESSION_OBJ_LINE,
+    SESSION_OBJ_UPTIME
+};
+
+enum t_session_server
+{
+    SESSION_SERV_END = 0,
+    SESSION_SERV_NAME,
+    SESSION_SERV_AUTOCONNECT,
+    SESSION_SERV_AUTORECONNECT,
+    SESSION_SERV_AUTORECONNECT_DELAY,
+    SESSION_SERV_COMMAND_LINE,
+    SESSION_SERV_ADDRESS,
+    SESSION_SERV_PORT,
+    SESSION_SERV_IPV6,
+    SESSION_SERV_SSL,
+    SESSION_SERV_PASSWORD,
+    SESSION_SERV_NICK1,
+    SESSION_SERV_NICK2,
+    SESSION_SERV_NICK3,
+    SESSION_SERV_USERNAME,
+    SESSION_SERV_REALNAME,
+    SESSION_SERV_COMMAND,
+    SESSION_SERV_COMMAND_DELAY,
+    SESSION_SERV_AUTOJOIN,
+    SESSION_SERV_AUTOREJOIN,
+    SESSION_SERV_NOTIFY_LEVELS,
+    SESSION_SERV_CHILD_PID,
+    SESSION_SERV_CHILD_READ,
+    SESSION_SERV_CHILD_WRITE,
+    SESSION_SERV_SOCK,
+    SESSION_SERV_IS_CONNECTED,
+    SESSION_SERV_SSL_CONNECTED,
+    SESSION_SERV_GNUTLS_SESS,
+    SESSION_SERV_UNTERMINATED_MESSAGE,
+    SESSION_SERV_NICK,
+    SESSION_SERV_RECONNECT_START,
+    SESSION_SERV_RECONNECT_JOIN,
+    SESSION_SERV_IS_AWAY,
+    SESSION_SERV_AWAY_TIME,
+    SESSION_SERV_LAG,
+    SESSION_SERV_LAG_CHECK_TIME,
+    SESSION_SERV_LAG_NEXT_CHECK,
+    SESSION_SERV_CHARSET_DECODE_ISO,
+    SESSION_SERV_CHARSET_DECODE_UTF,
+    SESSION_SERV_CHARSET_ENCODE
+};
+
+enum t_session_channel
+{
+    SESSION_CHAN_END = 0,
+    SESSION_CHAN_TYPE,
+    SESSION_CHAN_NAME,
+    SESSION_CHAN_TOPIC,
+    SESSION_CHAN_MODES,
+    SESSION_CHAN_LIMIT,
+    SESSION_CHAN_KEY,
+    SESSION_CHAN_NICKS_COUNT,
+    SESSION_CHAN_CHECKING_AWAY
+};
+
+enum t_session_nick
+{
+    SESSION_NICK_END = 0,
+    SESSION_NICK_NICK,
+    SESSION_NICK_FLAGS,
+    SESSION_NICK_COLOR
+};
+
+enum t_session_dcc
+{
+    SESSION_DCC_END = 0,
+    SESSION_DCC_SERVER,
+    SESSION_DCC_CHANNEL,
+    SESSION_DCC_TYPE,
+    SESSION_DCC_STATUS,
+    SESSION_DCC_START_TIME,
+    SESSION_DCC_START_TRANSFER,
+    SESSION_DCC_ADDR,
+    SESSION_DCC_PORT,
+    SESSION_DCC_NICK,
+    SESSION_DCC_SOCK,
+    SESSION_DCC_UNTERMINATED_MESSAGE,
+    SESSION_DCC_FILE,
+    SESSION_DCC_FILENAME,
+    SESSION_DCC_LOCAL_FILENAME,
+    SESSION_DCC_FILENAME_SUFFIX,
+    SESSION_DCC_SIZE,
+    SESSION_DCC_POS,
+    SESSION_DCC_ACK,
+    SESSION_DCC_START_RESUME,
+    SESSION_DCC_LAST_CHECK_TIME,
+    SESSION_DCC_LAST_CHECK_POS,
+    SESSION_DCC_LAST_ACTIVITY,
+    SESSION_DCC_BYTES_PER_SEC,
+    SESSION_DCC_ETA
+};
+
+enum t_session_history
+{
+    SESSION_HIST_END = 0,
+    SESSION_HIST_TEXT
+};
+
+enum t_session_buffer
+{
+    SESSION_BUFF_END = 0,
+    SESSION_BUFF_SERVER,
+    SESSION_BUFF_CHANNEL,
+    SESSION_BUFF_DCC
+};
+
+enum t_session_line
+{
+    SESSION_LINE_END = 0,
+    SESSION_LINE_LENGTH,
+    SESSION_LINE_LENGTH_ALIGN,
+    SESSION_LINE_LOG_WRITE,
+    SESSION_LINE_WITH_MESSAGE,
+    SESSION_LINE_WITH_HIGHLIGHT,
+    SESSION_LINE_DATA,
+    SESSION_LINE_OFS_AFTER_DATE
+};
+
+enum t_session_uptime
+{
+    SESSION_UPT_END = 0,
+    SESSION_UPT_START_TIME
+};
+
+int session_save (char *filename);
+int session_load (char *filename);
+
+#endif /* session.h */
@@ -0,0 +1,330 @@
+/*
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
+ * See README for License detail, AUTHORS for developers list.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+/* utf8.c: UTF-8 string functions for WeeChat */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <string.h>
+
+#include "weechat.h"
+#include "utf8.h"
+#include "weeconfig.h"
+
+
+int local_utf8 = 0;
+
+
+/*
+ * utf8_init: initializes UTF-8 in WeeChat
+ */
+
+void
+utf8_init ()
+{
+    local_utf8 = 0;
+    
+    if (cfg_look_charset_internal && cfg_look_charset_internal[0])
+    {
+        if (strstr (cfg_look_charset_internal, "UTF-8")
+            || strstr (cfg_look_charset_internal, "utf-8"))
+            local_utf8 = 1;
+    }
+    else if ((local_charset)
+             && ((strstr (local_charset, "UTF-8")
+                  || strstr (local_charset, "utf-8"))))
+        local_utf8 = 1;
+}
+
+/*
+ * utf8_is_valid: return 1 if UTF-8 string is valid, 0 otherwise
+ */
+
+int
+utf8_is_valid (char *string)
+{
+    while (string[0])
+    {
+        /* UTF-8, 2 bytes, should be: 110vvvvv 10vvvvvv */
+        if (((unsigned char)(string[0]) & 0xE0) == 0xC0)
+        {
+            if (!string[1] || (((unsigned char)(string[1]) & 0xC0) != 0x80))
+                return 0;
+            string += 2;
+        }
+        /* UTF-8, 3 bytes, should be: 1110vvvv 10vvvvvv 10vvvvvv */
+        else if (((unsigned char)(string[0]) & 0xF0) == 0xE0)
+        {
+            if (!string[1] || !string[2]
+                || (((unsigned char)(string[1]) & 0xC0) != 0x80)
+                || (((unsigned char)(string[2]) & 0xC0) != 0x80))
+                return 0;
+            string += 3;
+        }
+        /* UTF-8, 4 bytes, should be: 11110vvv 10vvvvvv 10vvvvvv 10vvvvvv */
+        else if (((unsigned char)(string[0]) & 0xF8) == 0xF0)
+        {
+            if (!string[1] || !string[2] || !string[3]
+                || (((unsigned char)(string[1]) & 0xC0) != 0x80)
+                || (((unsigned char)(string[2]) & 0xC0) != 0x80)
+                || (((unsigned char)(string[3]) & 0xC0) != 0x80))
+                return 0;
+            string += 4;
+        }
+        /* UTF-8, 1 byte, should be: 0vvvvvvv */
+        else if ((unsigned char)(string[0]) >= 0x80)
+            return 0;
+        else
+            string++;
+    }
+    return 1;
+}
+
+/*
+ * utf8_prev_char: return previous UTF-8 char in a string
+ */
+
+char *
+utf8_prev_char (char *string_start, char *string)
+{
+    if (!string || (string <= string_start))
+        return NULL;
+    
+    string--;
+    
+    if (!local_utf8)
+        return string;
+    
+    if (((unsigned char)(string[0]) & 0xC0) == 0x80)
+    {
+        /* UTF-8, at least 2 bytes */
+        string--;
+        if (string < string_start)
+            return string + 1;
+        if (((unsigned char)(string[0]) & 0xC0) == 0x80)
+        {
+            /* UTF-8, at least 3 bytes */
+            string--;
+            if (string < string_start)
+                return string + 1;
+            if (((unsigned char)(string[0]) & 0xC0) == 0x80)
+            {
+                /* UTF-8, 4 bytes */
+                string--;
+                if (string < string_start)
+                    return string + 1;
+                return string;
+            }
+            else
+                return string;
+        }
+        else
+            return string;
+    }
+    return string;
+}
+
+/*
+ * utf8_next_char: return next UTF-8 char in a string
+ */
+
+char *
+utf8_next_char (char *string)
+{
+    if (!string)
+        return NULL;
+    
+    if (!local_utf8)
+        return string + 1;
+    
+    /* UTF-8, 2 bytes: 110vvvvv 10vvvvvv */
+    if (((unsigned char)(string[0]) & 0xE0) == 0xC0)
+    {
+        if (!string[1])
+            return string + 1;
+        return string + 2;
+    }
+    /* UTF-8, 3 bytes: 1110vvvv 10vvvvvv 10vvvvvv */
+    else if (((unsigned char)(string[0]) & 0xF0) == 0xE0)
+    {
+        if (!string[1])
+            return string + 1;
+        if (!string[2])
+            return string + 2;
+        return string + 3;
+    }
+    /* UTF-8, 4 bytes: 11110vvv 10vvvvvv 10vvvvvv 10vvvvvv */
+    else if (((unsigned char)(string[0]) & 0xF8) == 0xF0)
+    {
+        if (!string[1])
+            return string + 1;
+        if (!string[2])
+            return string + 2;
+        if (!string[3])
+            return string + 3;
+        return string + 4;
+    }
+    /* UTF-8, 1 byte: 0vvvvvvv */
+    return string + 1;
+}
+
+/*
+ * utf8_char_size: return UTF-8 char size
+ */
+
+int
+utf8_char_size (char *string)
+{
+    if (!string)
+        return 0;
+    
+    return utf8_next_char (string) - string;
+}
+
+/*
+ * utf8_strlen: return length of an UTF-8 string (<= strlen(string))
+ */
+
+int
+utf8_strlen (char *string)
+{
+    int length;
+    
+    if (!string)
+        return 0;
+    
+    if (!local_utf8)
+        return strlen (string);
+    
+    length = 0;
+    while (string[0])
+    {
+        string = utf8_next_char (string);
+        length++;
+    }
+    return length;
+}
+
+/*
+ * utf8_strlen: return length of an UTF-8 string, for N bytes
+ */
+
+int
+utf8_strnlen (char *string, int bytes)
+{
+    char *start;
+    int length;
+    
+    if (!string)
+        return 0;
+    
+    if (!local_utf8)
+    {
+        length = strlen (string);
+        if (bytes > length)
+            return length;
+        return bytes;
+    }
+    
+    start = string;
+    length = 0;
+    while (string[0] && (string - start < bytes))
+    {
+        string = utf8_next_char (string);
+        length++;
+    }
+    return length;
+}
+
+/*
+ * utf8_add_offset: moves forward N chars in an UTF-8 string
+ */
+
+char *
+utf8_add_offset (char *string, int offset)
+{
+    int count;
+
+    if (!string)
+        return string;
+    
+    if (!local_utf8)
+        return string + offset;
+    
+    count = 0;
+    while (string[0] && (count < offset))
+    {
+        string = utf8_next_char (string);
+        count++;
+    }
+    return string;
+}
+
+/*
+ * utf8_real_pos: get real position in UTF-8
+ *                for example: ("aébc", 2) returns 3
+ */
+
+int
+utf8_real_pos (char *string, int pos)
+{
+    int count, real_pos;
+    char *next_char;
+    
+    if (!string || !local_utf8)
+        return pos;
+    
+    count = 0;
+    real_pos = 0;
+    while (string[0] && (count < pos))
+    {
+        next_char = utf8_next_char (string);
+        real_pos += (next_char - string);
+        string = next_char;
+        count++;
+    }
+    return real_pos;
+}
+
+/*
+ * utf8_pos: get position in UTF-8
+ *           for example: ("aébc", 3) returns 2
+ */
+
+int
+utf8_pos (char *string, int real_pos)
+{
+    int count;
+    char *limit;
+    
+    if (!string || !local_charset)
+        return real_pos;
+    
+    count = 0;
+    limit = string + real_pos;
+    while (string[0] && (string < limit))
+    {
+        string = utf8_next_char (string);
+        count++;
+    }
+    return count;
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,21 +14,24 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */


-#ifndef __WEECHAT_RUBY_H
-#define __WEECHAT_RUBY_H 1
+#ifndef __WEECHAT_UTF8_H
+#define __WEECHAT_UTF8_H 1

-#include "../plugins.h"
+extern int local_utf8;

-extern void wee_ruby_init ();
-extern t_plugin_script *wee_ruby_search (char *);
-extern int wee_ruby_exec (char *, char *, char *);
-extern int wee_ruby_load (char *);
-extern void wee_ruby_unload (t_plugin_script *);
-extern void wee_ruby_unload_all ();
-extern void wee_ruby_end ();
+extern void utf8_init ();
+extern int utf8_is_valid (char *);
+extern char *utf8_prev_char (char *, char *);
+extern char *utf8_next_char (char *);
+extern int utf8_char_size (char *);
+extern int utf8_strlen (char *);
+extern int utf8_strnlen (char *, int);
+extern char *utf8_add_offset (char *, int);
+extern int utf8_real_pos (char *, int);
+extern int utf8_pos (char *, int);

-#endif /* wee-ruby.h */
+#endif /* utf8.h */
@@ -9,12 +9,12 @@
 * ###                 Fast & light environment for Chat                    ###
 * ###                                                                      ###
 * ###                By FlashCode <flashcode@flashtux.org>                 ###
-   ###                                                                      ###
+ * ###                                                                      ###
 * ###                     http://weechat.flashtux.org                      ###
 * ###                                                                      ###
 * ############################################################################
 *
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -29,7 +29,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

 /* weechat.c: core functions for WeeChat */
@@ -64,19 +64,29 @@
 #include "weeconfig.h"
 #include "command.h"
 #include "fifo.h"
+#include "utf8.h"
+#include "session.h"
 #include "../irc/irc.h"
 #include "../gui/gui.h"
+
+#ifdef PLUGINS
 #include "../plugins/plugins.h"
+#endif


+char *weechat_argv0 = NULL;     /* WeeChat binary file name (argv[0])               */
+char *weechat_session = NULL;   /* WeeChat session file (for /upgrade command)      */
+time_t weechat_start_time;      /* WeeChat start time (used by /uptime command)     */
 int quit_weechat;               /* = 1 if quit request from user... why ? :'(       */
 int sigsegv = 0;                /* SIGSEGV received?                                */
 char *weechat_home = NULL;      /* WeeChat home dir. (example: /home/toto/.weechat) */
 FILE *weechat_log_file = NULL;  /* WeeChat log file (~/.weechat/weechat.log)        */

-char *local_charset = NULL;     /* local charset, for example: ISO-8859-1   */
+char *local_charset = NULL;     /* local charset, for example: ISO-8859-1, UTF-8    */

-int server_cmd_line;    /* at least one server on WeeChat command line      */
+int server_cmd_line;            /* at least one server on WeeChat command line      */
+int auto_connect;               /* enabled by default, can by disabled on cmd line  */
+int auto_load_plugins;          /* enabled by default, can by disabled on cmd line  */

 #ifdef HAVE_GNUTLS
 gnutls_certificate_credentials gnutls_xcred;   /* gnutls client credentials */
@@ -156,13 +166,14 @@ ascii_strncasecmp (char *string1, char *string2, int max)
 }

 /*
- * wee_log_printf: displays a message in WeeChat log (~/.weechat/weechat.log)
+ * weechat_log_printf: displays a message in WeeChat log (~/.weechat/weechat.log)
 */

 void
-wee_log_printf (char *message, ...)
+weechat_log_printf (char *message, ...)
 {
    static char buffer[4096];
+    char *ptr_buffer;
    va_list argptr;
    static time_t seconds;
    struct tm *date_tmp;
@@ -174,6 +185,17 @@ wee_log_printf (char *message, ...)
    vsnprintf (buffer, sizeof (buffer) - 1, message, argptr);
    va_end (argptr);
    
+    /* keep only valid chars */
+    ptr_buffer = buffer;
+    while (ptr_buffer[0])
+    {
+        if ((ptr_buffer[0] != '\n')
+            && (ptr_buffer[0] != '\r')
+            && ((unsigned char)(ptr_buffer[0]) < 32))
+            ptr_buffer[0] = '.';
+        ptr_buffer++;
+    }
+    
    seconds = time (NULL);
    date_tmp = localtime (&seconds);
    if (date_tmp)
@@ -187,15 +209,15 @@ wee_log_printf (char *message, ...)
 }

 /*
- * weechat_convert_encoding: convert string to another encoding
+ * weechat_iconv: convert string to another charset
 */

 char *
-weechat_convert_encoding (char *from_code, char *to_code, char *string)
+weechat_iconv (char *from_code, char *to_code, char *string)
 {
    char *outbuf;
    
-    #ifdef HAVE_ICONV
+#ifdef HAVE_ICONV
    iconv_t cd;
    char *inbuf;
    ICONV_CONST char *ptr_inbuf;
@@ -230,12 +252,12 @@ weechat_convert_encoding (char *from_code, char *to_code, char *string)
    }
    else
        outbuf = strdup (string);
-    #else
+#else
    /* make gcc happy */
    (void) from_code;
    (void) to_code;
    outbuf = strdup (string);
-    #endif /* HAVE_ICONV */
+#endif /* HAVE_ICONV */
    
    return outbuf;
 }
@@ -244,7 +266,8 @@ weechat_convert_encoding (char *from_code, char *to_code, char *string)
 * get_timeval_diff: calculates difference between two times (return in milliseconds)
 */

-long get_timeval_diff(struct timeval *tv1, struct timeval *tv2)
+long
+get_timeval_diff (struct timeval *tv1, struct timeval *tv2)
 {
    long diff_sec, diff_usec;
    
@@ -260,10 +283,40 @@ long get_timeval_diff(struct timeval *tv1, struct timeval *tv2)
 }

 /*
- * wee_display_config_options: display config options
+ * weechat_display_usage: display WeeChat usage
 */

-void wee_display_config_options ()
+void
+weechat_display_usage (char *exec_name)
+{
+    printf ("\n");
+    printf (_("%s (c) Copyright 2003-2006, compiled on %s %s\n"
+              "Developed by FlashCode <flashcode@flashtux.org> - %s"),
+            PACKAGE_STRING, __DATE__, __TIME__, WEECHAT_WEBSITE);
+    printf ("\n\n");
+    printf (_("Usage: %s [options ...]\n" \
+              "   or: %s [irc[6][s]://[nickname[:password]@]irc.example.org[:port][/channel][,channel[...]]"),
+            exec_name, exec_name);
+    printf ("\n\n");
+    printf (_("  -a, --no-connect        disable auto-connect to servers at startup\n"
+              "  -c, --config            display config file options\n"
+              "  -f, --key-functions     display WeeChat internal functions for keys\n"
+              "  -h, --help              this help\n"
+              "  -i, --irc-commands      display IRC commands\n"
+              "  -k, --keys              display WeeChat default keys\n"
+              "  -l, --license           display WeeChat license\n"
+              "  -p, --no-plugin         don't load any plugin at startup\n"
+              "  -v, --version           display WeeChat version\n"
+              "  -w, --weechat-commands  display WeeChat commands\n"));
+    printf("\n");
+}
+
+/*
+ * weechat_display_config_options: display config options
+ */
+
+void
+weechat_display_config_options ()
 {
    int i, j, k;
    
@@ -280,63 +333,67 @@ void wee_display_config_options ()
                switch (weechat_options[i][j].option_type)
                {
                    case OPTION_TYPE_BOOLEAN:
-                        printf (_("  . type boolean (values: 'on' or 'off')\n"));
+                        printf (_("  . type: boolean\n"));
+                        printf (_("  . values: 'on' or 'off'\n"));
                        printf (_("  . default value: '%s'\n"),
-                            (weechat_options[i][j].default_int == BOOL_TRUE) ?
-                            "on" : "off");
+                                (weechat_options[i][j].default_int == BOOL_TRUE) ?
+                                "on" : "off");
                        break;
                    case OPTION_TYPE_INT:
-                        printf (_("  . type integer (values: between %d and %d)\n"),
-                            weechat_options[i][j].min,
-                            weechat_options[i][j].max);
+                        printf (_("  . type: integer\n"));
+                        printf (_("  . values: between %d and %d\n"),
+                                weechat_options[i][j].min,
+                                weechat_options[i][j].max);
                        printf (_("  . default value: %d\n"),
-                            weechat_options[i][j].default_int);
+                                weechat_options[i][j].default_int);
                        break;
                    case OPTION_TYPE_INT_WITH_STRING:
-                        printf (_("  . type string (values: "));
+                        printf (_("  . type: string\n"));
+                        printf (_("  . values: "));
                        k = 0;
                        while (weechat_options[i][j].array_values[k])
                        {
                            printf ("'%s'",
-                                weechat_options[i][j].array_values[k]);
+                                    weechat_options[i][j].array_values[k]);
                            if (weechat_options[i][j].array_values[k + 1])
                                printf (", ");
                            k++;
                        }
-                        printf (")\n");
+                        printf ("\n");
                        printf (_("  . default value: '%s'\n"),
-                            (weechat_options[i][j].default_string) ?
-                            weechat_options[i][j].default_string : _("empty"));
+                                (weechat_options[i][j].default_string) ?
+                                weechat_options[i][j].default_string : _("empty"));
                        break;
                    case OPTION_TYPE_COLOR:
-                        printf (_("  . type color (Curses or Gtk color, look at WeeChat doc)\n"));
+                        printf (_("  . type: color\n"));
+                        printf (_("  . values: Curses or Gtk color\n"));
                        printf (_("  . default value: '%s'\n"),
-                            (weechat_options[i][j].default_string) ?
-                            weechat_options[i][j].default_string : _("empty"));
+                                (weechat_options[i][j].default_string) ?
+                                weechat_options[i][j].default_string : _("empty"));
                        break;
                    case OPTION_TYPE_STRING:
-                        printf (_("  . type string (any string)\n"));
+                        printf (_("  . type: string\n"));
+                        printf (_("  . values: any string\n"));
                        printf (_("  . default value: '%s'\n"),
-                            (weechat_options[i][j].default_string) ?
-                            weechat_options[i][j].default_string : _("empty"));
+                                (weechat_options[i][j].default_string) ?
+                                weechat_options[i][j].default_string : _("empty"));
                        break;
                }
-                printf (_("  . description: %s\n\n"),
-                    _(weechat_options[i][j].long_description));
+                printf (_("  . description: %s\n"),
+                        _(weechat_options[i][j].long_description));
+                printf ("\n");
                j++;
            }
        }
    }
-    printf (_("Moreover, you can define aliases in [alias] section, by adding lines like:\n"));
-    printf ("j=join\n");
-    printf (_("where 'j' is alias name, and 'join' associated command.\n\n"));
 }

 /*
- * wee_display_commands: display WeeChat and/or IRC commands
+ * weechat_display_commands: display WeeChat and/or IRC commands
 */

-void wee_display_commands (int weechat_cmd, int irc_cmd)
+void
+weechat_display_commands (int weechat_cmd, int irc_cmd)
 {
    int i;
    
@@ -386,10 +443,11 @@ void wee_display_commands (int weechat_cmd, int irc_cmd)
 }

 /*
- * wee_display_key_functions: display WeeChat key functions
+ * weechat_display_key_functions: display WeeChat key functions
 */

-void wee_display_key_functions ()
+void
+weechat_display_key_functions ()
 {
    int i;
    
@@ -406,10 +464,11 @@ void wee_display_key_functions ()
 }

 /*
- * wee_display_keys: display WeeChat default keys
+ * weechat_display_keys: display WeeChat default keys
 */

-void wee_display_keys ()
+void
+weechat_display_keys ()
 {
    t_gui_key *ptr_key;
    char *expanded_name;
@@ -428,67 +487,88 @@ void wee_display_keys ()
 }

 /*
- * wee_parse_args: parse command line args
+ * weechat_parse_args: parse command line args
 */

 void
-wee_parse_args (int argc, char *argv[])
+weechat_parse_args (int argc, char *argv[])
 {
    int i;
    t_irc_server server_tmp;

+    weechat_argv0 = strdup (argv[0]);
+    weechat_session = NULL;
    server_cmd_line = 0;
+    auto_connect = 1;
+    auto_load_plugins = 1;
    
    for (i = 1; i < argc; i++)
    {
-        if ((strcmp (argv[i], "-c") == 0)
+        if ((strcmp (argv[i], "-a") == 0)
+            || (strcmp (argv[i], "--no-connect") == 0))
+            auto_connect = 0;
+        else if ((strcmp (argv[i], "-c") == 0)
            || (strcmp (argv[i], "--config") == 0))
        {
-            wee_display_config_options ();
-            wee_shutdown (EXIT_SUCCESS, 0);
+            weechat_display_config_options ();
+            weechat_shutdown (EXIT_SUCCESS, 0);
        }
        else if ((strcmp (argv[i], "-f") == 0)
            || (strcmp (argv[i], "--key-functions") == 0))
        {
-            wee_display_key_functions ();
-            wee_shutdown (EXIT_SUCCESS, 0);
+            weechat_display_key_functions ();
+            weechat_shutdown (EXIT_SUCCESS, 0);
        }
        else if ((strcmp (argv[i], "-h") == 0)
                || (strcmp (argv[i], "--help") == 0))
        {
-            printf ("\n" WEE_USAGE1, argv[0], argv[0]);
-            printf ("%s", WEE_USAGE2);
-            wee_shutdown (EXIT_SUCCESS, 0);
+            weechat_display_usage (argv[0]);
+            weechat_shutdown (EXIT_SUCCESS, 0);
        }
        else if ((strcmp (argv[i], "-i") == 0)
            || (strcmp (argv[i], "--irc-commands") == 0))
        {
-            wee_display_commands (0, 1);
-            wee_shutdown (EXIT_SUCCESS, 0);
+            weechat_display_commands (0, 1);
+            weechat_shutdown (EXIT_SUCCESS, 0);
        }
        else if ((strcmp (argv[i], "-k") == 0)
            || (strcmp (argv[i], "--keys") == 0))
        {
-            wee_display_keys ();
-            wee_shutdown (EXIT_SUCCESS, 0);
+            weechat_display_keys ();
+            weechat_shutdown (EXIT_SUCCESS, 0);
        }
        else if ((strcmp (argv[i], "-l") == 0)
                 || (strcmp (argv[i], "--license") == 0))
        {
            printf ("\n%s%s", WEE_LICENSE);
-            wee_shutdown (EXIT_SUCCESS, 0);
+            weechat_shutdown (EXIT_SUCCESS, 0);
+        }
+        else if ((strcmp (argv[i], "-p") == 0)
+                 || (strcmp (argv[i], "--no-plugin") == 0))
+            auto_load_plugins = 0;
+        else if (strcmp (argv[i], "--session") == 0)
+        {
+            if (i + 1 < argc)
+                weechat_session = strdup (argv[++i]);
+            else
+            {
+                fprintf (stderr,
+                         _("%s missing argument for --session option\n"),
+                         WEECHAT_ERROR);
+                weechat_shutdown (EXIT_FAILURE, 0);
+            }
        }
        else if ((strcmp (argv[i], "-v") == 0)
                 || (strcmp (argv[i], "--version") == 0))
        {
            printf (PACKAGE_VERSION "\n");
-            wee_shutdown (EXIT_SUCCESS, 0);
+            weechat_shutdown (EXIT_SUCCESS, 0);
        }
        else if ((strcmp (argv[i], "-w") == 0)
            || (strcmp (argv[i], "--weechat-commands") == 0))
        {
-            wee_display_commands (1, 0);
-            wee_shutdown (EXIT_SUCCESS, 0);
+            weechat_display_commands (1, 0);
+            weechat_shutdown (EXIT_SUCCESS, 0);
        }
        else if ((ascii_strncasecmp (argv[i], "irc", 3) == 0))
        {
@@ -506,7 +586,8 @@ wee_parse_args (int argc, char *argv[])
                                 server_tmp.ipv6, server_tmp.ssl,
                                 server_tmp.password, server_tmp.nick1,
                                 server_tmp.nick2, server_tmp.nick3,
-                                 NULL, NULL, NULL, 0, server_tmp.autojoin, 1, NULL))
+                                 NULL, NULL, NULL, 0, server_tmp.autojoin, 1, NULL,
+                                 NULL, NULL, NULL))
                    fprintf (stderr, _("%s unable to create server ('%s'), ignored\n"),
                             WEECHAT_WARNING, argv[i]);
                server_destroy (&server_tmp);
@@ -523,13 +604,13 @@ wee_parse_args (int argc, char *argv[])
 }

 /*
- * wee_create_dir: create a directory
- *                 return: 1 if ok (or directory already exists)
- *                         0 if error
+ * weechat_create_dir: create a directory
+ *                     return: 1 if ok (or directory already exists)
+ *                             0 if error
 */

 int
-wee_create_dir (char *directory)
+weechat_create_dir (char *directory)
 {
    if (mkdir (directory, 0755) < 0)
    {
@@ -545,26 +626,21 @@ wee_create_dir (char *directory)
 }

 /*
- * wee_create_home_dirs: create (if not found):
- *                       - WeeChat home directory ("~/.weechat")
- *                       - "perl" directory (and "autoload")
- *                       - "ruby" directory (and "autoload")
- *                       - "python" directory (and "autoload")
+ * weechat_create_home_dirs: create WeeChat directories (if not found)
 */

 void
-wee_create_home_dirs ()
+weechat_create_home_dirs ()
 {
    char *ptr_home, *dir_name;
    int dir_length;
-
-    /* TODO: rewrite this code for Windows version */
+    
    ptr_home = getenv ("HOME");
    if (!ptr_home)
    {
        fprintf (stderr, _("%s unable to get HOME directory\n"),
                 WEECHAT_ERROR);
-        wee_shutdown (EXIT_FAILURE, 0);
+        weechat_shutdown (EXIT_FAILURE, 0);
    }
    dir_length = strlen (ptr_home) + 10;
    weechat_home =
@@ -573,65 +649,26 @@ wee_create_home_dirs ()
    {
        fprintf (stderr, _("%s not enough memory for home directory\n"),
                 WEECHAT_ERROR);
-        wee_shutdown (EXIT_FAILURE, 0);
+        weechat_shutdown (EXIT_FAILURE, 0);
    }
    snprintf (weechat_home, dir_length, "%s%s.weechat", ptr_home,
              DIR_SEPARATOR);
    
    /* create home directory "~/.weechat" ; error is fatal */
-    if (!wee_create_dir (weechat_home))
+    if (!weechat_create_dir (weechat_home))
    {
        fprintf (stderr, _("%s unable to create ~/.weechat directory\n"),
                 WEECHAT_ERROR);
-        wee_shutdown (EXIT_FAILURE, 0);
+        weechat_shutdown (EXIT_FAILURE, 0);
    }
    
    dir_length = strlen (weechat_home) + 64;
    dir_name = (char *) malloc (dir_length * sizeof (char));
    
-    #ifdef PLUGIN_PERL
-    /* create "~/.weechat/perl" */
-    snprintf (dir_name, dir_length, "%s%s%s", weechat_home, DIR_SEPARATOR,
-              "perl");
-    if (wee_create_dir (dir_name))
-    {
-        /* create "~/.weechat/perl/autoload" */
-        snprintf (dir_name, dir_length, "%s%s%s%s%s", weechat_home,
-                 DIR_SEPARATOR, "perl", DIR_SEPARATOR, "autoload");
-        wee_create_dir (dir_name);
-    }
-    #endif
-    
-    #ifdef PLUGIN_PYTHON
-    /* create "~/.weechat/python" */
-    snprintf (dir_name, dir_length, "%s%s%s", weechat_home, DIR_SEPARATOR,
-             "python");
-    if (wee_create_dir (dir_name))
-    {
-        /* create "~/.weechat/python/autoload" */
-        snprintf (dir_name, dir_length, "%s%s%s%s%s", weechat_home,
-                 DIR_SEPARATOR, "python", DIR_SEPARATOR, "autoload");
-        wee_create_dir (dir_name);
-    }
-    #endif
-    
-    #ifdef PLUGIN_RUBY
-    /* create "~/.weechat/ruby" */
-    snprintf (dir_name, dir_length, "%s%s%s", weechat_home, DIR_SEPARATOR,
-             "ruby");
-    if (wee_create_dir (dir_name))
-    {
-        /* create "~/.weechat/ruby/autoload" */
-        snprintf (dir_name, dir_length, "%s%s%s%s%s", weechat_home,
-                 DIR_SEPARATOR, "ruby", DIR_SEPARATOR, "autoload");
-        wee_create_dir (dir_name);
-    }
-    #endif
-    
    /* create "~/.weechat/logs" */
    snprintf (dir_name, dir_length, "%s%s%s", weechat_home, DIR_SEPARATOR,
              "logs");
-    if (!wee_create_dir (dir_name))
+    if (!weechat_create_dir (dir_name))
    {
        fprintf (stderr, _("%s unable to create ~/.weechat/logs directory\n"),
                 WEECHAT_WARNING);
@@ -642,12 +679,15 @@ wee_create_home_dirs ()
 }

 /*
- * wee_init_vars: initialize some variables
+ * weechat_init_vars: initialize some variables
 */

 void
-wee_init_vars ()
+weechat_init_vars ()
 {
+    /* start time, used by /uptime command */
+    weechat_start_time = time (NULL);
+    
    /* init received messages queue */
    recv_msgq = NULL;
    msgq_last_msg = NULL;
@@ -661,11 +701,11 @@ wee_init_vars ()
 }

 /*
- * wee_init_log: initialize log file
+ * weechat_init_log: initialize log file
 */

 void
-wee_init_log ()
+weechat_init_log ()
 {
    int filename_length;
    char *filename;
@@ -681,6 +721,29 @@ wee_init_log ()
    free (filename);
 }

+/*
+ * weechat_config_read: read WeeChat config file
+ */
+
+void
+weechat_config_read ()
+{
+    switch (config_read ())
+    {
+        case 0: /* read ok */
+            break;
+        case -1: /* config file not found */
+            if (config_create_default () < 0)
+                exit (EXIT_FAILURE);
+            if (config_read () != 0)
+                exit (EXIT_FAILURE);
+            break;
+        default: /* other error (fatal) */
+            server_free_all ();
+            exit (EXIT_FAILURE);
+    }
+}
+
 /*
 * weechat_welcome_message: display WeeChat welcome message - yeah!
 */
@@ -690,59 +753,56 @@ weechat_welcome_message ()
 {
    if (cfg_look_startup_logo)
    {
-        gui_printf_color (NULL, COLOR_WIN_CHAT_PREFIX1,
-            "   ___       __         ______________        _____ \n"
-            "   __ |     / /___________  ____/__  /_______ __  /_\n"
-            "   __ | /| / /_  _ \\  _ \\  /    __  __ \\  __ `/  __/\n"
-            "   __ |/ |/ / /  __/  __/ /___  _  / / / /_/ // /_  \n"
-            "   ____/|__/  \\___/\\___/\\____/  /_/ /_/\\__,_/ \\__/  \n");
+        gui_printf (NULL,
+                    "%s   ___       __         ______________        _____ \n"
+                    "%s   __ |     / /___________  ____/__  /_______ __  /_\n"
+                    "%s   __ | /| / /_  _ \\  _ \\  /    __  __ \\  __ `/  __/\n"
+                    "%s   __ |/ |/ / /  __/  __/ /___  _  / / / /_/ // /_  \n"
+                    "%s   ____/|__/  \\___/\\___/\\____/  /_/ /_/\\__,_/ \\__/  \n",
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK));
    }
    if (cfg_look_weechat_slogan && cfg_look_weechat_slogan[0])
    {
-        gui_printf_color (NULL, COLOR_WIN_CHAT, _("%sWelcome to "),
-                          (cfg_look_startup_logo) ? "      " : "");
-        gui_printf_color (NULL, COLOR_WIN_CHAT_PREFIX2, PACKAGE_NAME);
-        gui_printf_color (NULL, COLOR_WIN_CHAT,
-                          ", %s\n", cfg_look_weechat_slogan);
+        gui_printf (NULL, _("%sWelcome to %s%s%s, %s\n"),
+                    (cfg_look_startup_logo) ? "      " : "",
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    PACKAGE_NAME,
+                    GUI_NO_COLOR,
+                    cfg_look_weechat_slogan);
    }
    if (cfg_look_startup_version)
    {
-        gui_printf_color (NULL, COLOR_WIN_CHAT_PREFIX2,
-                          "%s" PACKAGE_STRING,
-                          (cfg_look_startup_logo) ? "    " : "");
-        gui_printf_color (NULL, COLOR_WIN_CHAT,
-                          ", %s %s %s\n",
-                          _("compiled on"), __DATE__, __TIME__);
+        gui_printf (NULL, "%s%s%s%s, %s %s %s\n",
+                    (cfg_look_startup_logo) ? "    " : "",
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    PACKAGE_STRING,
+                    GUI_NO_COLOR,
+                    _("compiled on"), __DATE__, __TIME__);
    }
    if (cfg_look_startup_logo ||
        (cfg_look_weechat_slogan && cfg_look_weechat_slogan[0]) ||
        cfg_look_startup_version)
-        gui_printf_color (NULL, COLOR_WIN_CHAT_PREFIX1,
-            "-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n");
+        gui_printf (NULL,
+                    "%s-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n",
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK));
    
-    wee_log_printf ("%s (%s %s %s)\n",
-                    PACKAGE_STRING, _("compiled on"), __DATE__, __TIME__);
+    weechat_log_printf ("%s (%s %s %s)\n",
+                        PACKAGE_STRING, _("compiled on"), __DATE__, __TIME__);
 }

 /*
- * wee_gui_shutdown: shutdown WeeChat GUI
+ * weechat_shutdown: shutdown WeeChat
 */

 void
-wee_gui_shutdown ()
-{
-    dcc_end ();
-    server_free_all ();
-    gui_end ();
-}
-
-/*
- * wee_shutdown: shutdown WeeChat
- */
-
-void
-wee_shutdown (int return_code, int crash)
+weechat_shutdown (int return_code, int crash)
 {
+    if (weechat_argv0)
+        free (weechat_argv0);
    fifo_remove ();
    if (weechat_home)
        free (weechat_home);
@@ -764,15 +824,16 @@ wee_shutdown (int return_code, int crash)
 }

 /*
- * wee_dump writes dump to WeeChat log file
+ * weechat_dump writes dump to WeeChat log file
 */

 void
-wee_dump (int crash)
+weechat_dump (int crash)
 {
    t_irc_server *ptr_server;
    t_irc_channel *ptr_channel;
    t_irc_nick *ptr_nick;
+    t_irc_dcc *ptr_dcc;
    t_gui_window *ptr_window;
    t_gui_buffer *ptr_buffer;
    
@@ -783,92 +844,100 @@ wee_dump (int crash)
    if (crash)
    {
        sigsegv = 1;
-        wee_log_printf ("Very bad, WeeChat is crashing (SIGSEGV received)...\n");
+        weechat_log_printf ("Very bad, WeeChat is crashing (SIGSEGV received)...\n");
    }
    
-    wee_log_printf ("\n");
+    weechat_log_printf ("\n");
    if (crash)
    {
-        wee_log_printf ("******             WeeChat CRASH DUMP              ******\n");
-        wee_log_printf ("****** Please send this file to WeeChat developers ******\n");
-        wee_log_printf ("******    and explain when this crash happened     ******\n");
+        weechat_log_printf ("******             WeeChat CRASH DUMP              ******\n");
+        weechat_log_printf ("****** Please send this file to WeeChat developers ******\n");
+        weechat_log_printf ("******    and explain when this crash happened     ******\n");
    }
    else
    {
-        wee_log_printf ("******            WeeChat dump request             ******\n");
+        weechat_log_printf ("******            WeeChat dump request             ******\n");
    }
    
    for (ptr_server = irc_servers; ptr_server; ptr_server = ptr_server->next_server)
    {
-        wee_log_printf ("\n");
+        weechat_log_printf ("\n");
        server_print_log (ptr_server);
        
        for (ptr_channel = ptr_server->channels; ptr_channel;
            ptr_channel = ptr_channel->next_channel)
        {
-            wee_log_printf ("\n");
+            weechat_log_printf ("\n");
            channel_print_log (ptr_channel);
            
            for (ptr_nick = ptr_channel->nicks; ptr_nick;
                ptr_nick = ptr_nick->next_nick)
            {
-                wee_log_printf ("\n");
+                weechat_log_printf ("\n");
                nick_print_log (ptr_nick);
            }
            
        }
    }
    
-    wee_log_printf ("\n");
-    wee_log_printf ("[windows/buffers]\n");
-    wee_log_printf ("  => windows:\n");
+    weechat_log_printf ("\n");
+    for (ptr_dcc = dcc_list; ptr_dcc; ptr_dcc = ptr_dcc->next_dcc)
+    {
+        dcc_print_log (ptr_dcc);
+    }
+    
+    weechat_log_printf ("\n");
+    weechat_log_printf ("[windows/buffers]\n");
+    weechat_log_printf ("  => windows:\n");
    for (ptr_window = gui_windows; ptr_window; ptr_window = ptr_window->next_window)
    {
-        wee_log_printf ("       0x%X\n", ptr_window);
+        weechat_log_printf ("       0x%X\n", ptr_window);
    }
-    wee_log_printf ("  => buffers:\n");
+    weechat_log_printf ("  => buffers:\n");
    for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer)
    {
-        wee_log_printf ("       0x%X\n", ptr_buffer);
+        weechat_log_printf ("       0x%X\n", ptr_buffer);
    }
-    wee_log_printf ("  => current window = 0x%X\n", gui_current_window);
+    weechat_log_printf ("  => current window = 0x%X\n", gui_current_window);
    
    for (ptr_window = gui_windows; ptr_window; ptr_window = ptr_window->next_window)
    {
-        wee_log_printf ("\n");
+        weechat_log_printf ("\n");
        gui_window_print_log (ptr_window);
    }
    
    for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer)
    {
-        wee_log_printf ("\n");
+        weechat_log_printf ("\n");
        gui_buffer_print_log (ptr_buffer);
    }

-    wee_log_printf ("\n");
+    weechat_log_printf ("\n");
    ignore_print_log ();
    
-    wee_log_printf ("\n");
-    wee_log_printf ("******                 End of dump                 ******\n");
-    wee_log_printf ("\n");
+    weechat_log_printf ("\n");
+    weechat_log_printf ("******                 End of dump                 ******\n");
+    weechat_log_printf ("\n");
 }

 /*
- * my_sigsegv: SIGSEGV handler: save crash log to ~/.weechat/weechat.log and exit
+ * weechat_sigsegv: SIGSEGV handler: save crash log to ~/.weechat/weechat.log and exit
 */

 void
-my_sigsegv ()
+weechat_sigsegv ()
 {
-    wee_dump (1);
-    wee_gui_shutdown ();
+    weechat_dump (1);
+    dcc_end ();
+    server_free_all ();
+    gui_end ();
    fprintf (stderr, "\n");
    fprintf (stderr, "*** Very bad! WeeChat has crashed (SIGSEGV received)\n");
    fprintf (stderr, "*** Full crash dump was saved to ~/.weechat/weechat.log file\n");
    fprintf (stderr, "*** Please send this file to WeeChat developers.\n");
    fprintf (stderr, "*** (be careful, private info may be in this file since\n");
    fprintf (stderr, "*** part of chats are displayed, so remove lines if needed)\n\n");
-    wee_shutdown (EXIT_FAILURE, 1);
+    weechat_shutdown (EXIT_FAILURE, 1);
 }

 /*
@@ -878,57 +947,53 @@ my_sigsegv ()
 int
 main (int argc, char *argv[])
 {
-    #ifdef ENABLE_NLS
-    setlocale (LC_ALL, "");         /* initialize gettext                   */
+#ifdef ENABLE_NLS
+    setlocale (LC_ALL, "");             /* initialize gettext               */
    bindtextdomain (PACKAGE, LOCALEDIR);
    textdomain (PACKAGE);
-    #endif
+#endif
    
-    #ifdef HAVE_LANGINFO_CODESET
+#ifdef HAVE_LANGINFO_CODESET
    local_charset = strdup (nl_langinfo (CODESET));
-    #endif
+#endif
    
-    signal (SIGINT, SIG_IGN);       /* ignore SIGINT signal                 */
-    signal (SIGQUIT, SIG_IGN);      /* ignore SIGQUIT signal                */
-    signal (SIGSEGV, my_sigsegv);   /* crash dump when SIGSEGV is received  */
-    gui_pre_init (&argc, &argv);    /* pre-initiliaze interface             */
-    wee_init_vars ();               /* initialize some variables            */
-    gui_key_init ();                /* init keyboard (default key bindings) */
-    wee_parse_args (argc, argv);    /* parse command line args              */
-    wee_create_home_dirs ();        /* create WeeChat directories           */
-    wee_init_log ();                /* init log file                        */
-    command_index_build ();         /* build commands index for completion  */
+    signal (SIGINT, SIG_IGN);           /* ignore SIGINT signal             */
+    signal (SIGQUIT, SIG_IGN);          /* ignore SIGQUIT signal            */
+    signal (SIGPIPE, SIG_IGN);          /* ignore SIGPIPE signal            */
+    signal (SIGSEGV, weechat_sigsegv);  /* crash dump when SIGSEGV received */
+    gui_pre_init (&argc, &argv);        /* pre-initiliaze interface         */
+    weechat_init_vars ();               /* initialize some variables        */
+    gui_key_init ();                    /* init keyb. (default key bindings)*/
+    weechat_parse_args (argc, argv);    /* parse command line args          */
+    weechat_create_home_dirs ();        /* create WeeChat directories       */
+    weechat_init_log ();                /* init log file                    */
+    command_index_build ();             /* build cmd index for completion   */
+    weechat_config_read ();             /* read configuration               */
+    utf8_init ();                       /* init UTF-8 in WeeChat            */
+    gui_init ();                        /* init WeeChat interface           */
+    weechat_welcome_message ();         /* display WeeChat welcome message  */
+    fifo_create ();                     /* FIFO pipe for remote control     */
+    if (weechat_session)
+        session_load (weechat_session); /* load previous session if asked   */
+#ifdef PLUGINS
+    plugin_init (auto_load_plugins);    /* init plugin interface(s)         */
+#endif
    
-    switch (config_read ())         /* read configuration                   */
-    {
-        case 0:                     /* config file OK                       */
-            break;
-        case -1:                    /* config file not found                */
-            if (config_create_default () < 0)
-                return EXIT_FAILURE;
-            if (config_read () != 0)
-                return EXIT_FAILURE;
-            break;
-        default:                    /* other error (fatal)                  */
-            server_free_all ();
-            return EXIT_FAILURE;
-    }
+    server_auto_connect (auto_connect,  /* auto-connect to servers          */
+                         server_cmd_line);
    
-    gui_init ();                    /* init WeeChat interface               */
-    weechat_welcome_message ();     /* display WeeChat welcome message      */
-    plugin_init ();                 /* init plugin interface(s)             */    
-                                    /* auto-connect to servers              */
-    server_auto_connect (server_cmd_line);
-    fifo_create ();                 /* create FIFO pipe for remote control  */
+    gui_main_loop ();                   /* WeeChat main loop                */
    
-    gui_main_loop ();               /* WeeChat main loop                    */
+#ifdef PLUGINS    
+    plugin_end ();                      /* end plugin interface(s)          */
+#endif
+    server_disconnect_all ();           /* disconnect from all servers      */
+    (void) config_write (NULL);         /* save config file                 */
+    command_index_free ();              /* free commands index              */
+    dcc_end ();                         /* remove all DCC                   */
+    server_free_all ();                 /* free all servers                 */
+    gui_end ();                         /* shut down WeeChat GUI            */
+    weechat_shutdown (EXIT_SUCCESS, 0); /* quit WeeChat (oh no, why?)       */
    
-    plugin_end ();                  /* end plugin interface(s)              */
-    server_disconnect_all ();       /* disconnect from all servers          */
-    (void) config_write (NULL);     /* save config file                     */
-    command_index_free ();          /* free commands index                  */
-    wee_gui_shutdown ();            /* shut down WeeChat GUI                */
-    wee_shutdown (EXIT_SUCCESS, 0); /* quit WeeChat (oh no, why?)           */
-    
-    return EXIT_SUCCESS;            /* make gcc happy (never executed)      */
+    return EXIT_SUCCESS;                /* make gcc happy (never executed)  */
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */


@@ -52,7 +52,7 @@
 #endif


-#define WEECHAT_COPYRIGHT_DATE "(c) 2003-2005"
+#define WEECHAT_COPYRIGHT_DATE "(c) 2003-2006"
 #define WEECHAT_WEBSITE "http://weechat.flashtux.org"

 #define WEECHAT_ERROR   _("WeeChat Error:")
@@ -65,7 +65,7 @@
 /* license */

 #define WEE_LICENSE \
-    PACKAGE_STRING " (c) Copyright 2003-2005, compiled on " __DATE__ " " __TIME__ \
+    PACKAGE_STRING " (c) Copyright 2003-2006, compiled on " __DATE__ " " __TIME__ \
    "\nDeveloped by FlashCode <flashcode@flashtux.org> - " WEECHAT_WEBSITE "\n\n" \
    "This program is free software; you can redistribute it and/or modify\n" \
    "it under the terms of the GNU General Public License as published by\n" \
@@ -80,24 +80,8 @@
    "\n" \
    "You should have received a copy of the GNU General Public License\n" \
    "along with this program; if not, write to the Free Software\n" \
-    "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n\n"
+    "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n\n"
    
-#define WEE_USAGE1 \
-    PACKAGE_STRING " (c) Copyright 2003-2005, compiled on " __DATE__ " " __TIME__ \
-    "\nDeveloped by FlashCode <flashcode@flashtux.org> - " WEECHAT_WEBSITE "\n\n" \
-    "Usage: %s [options ...]\n" \
-    "   or: %s [irc[6][s]://[nickname[:password]@]irc.example.org[:port][/channel][,channel[...]]\n\n"
-
-#define WEE_USAGE2 \
-    "  -c, --config            display config file options\n" \
-    "  -f, --key-functions     display WeeChat internal functions for keys\n" \
-    "  -h, --help              this help\n" \
-    "  -i, --irc-commands      display IRC commands\n" \
-    "  -k, --keys              display WeeChat default keys\n" \
-    "  -l, --license           display WeeChat license\n" \
-    "  -v, --version           display WeeChat version\n" \
-    "  -w, --weechat-commands  display WeeChat commands\n\n"
-
 /* directory separator, depending on OS */

 #ifdef _WIN32
@@ -110,8 +94,11 @@

 /* global variables and functions */

+extern char *weechat_argv0;
+extern time_t weechat_start_time;
 extern int quit_weechat;
 extern char *weechat_home;
+extern FILE *weechat_log_file;
 extern char *local_charset;

 #ifdef HAVE_GNUTLS
@@ -120,10 +107,10 @@ extern gnutls_certificate_credentials gnutls_xcred;

 extern int ascii_strcasecmp (char *, char *);
 extern int ascii_strncasecmp (char *, char *, int);
-extern void wee_log_printf (char *, ...);
-extern void wee_dump (int);
-extern char *weechat_convert_encoding (char *, char *, char *);
+extern void weechat_log_printf (char *, ...);
+extern void weechat_dump (int);
+extern char *weechat_iconv (char *, char *, char *);
 extern long get_timeval_diff (struct timeval *, struct timeval *);
-extern void wee_shutdown (int, int);
+extern void weechat_shutdown (int, int);

 #endif /* weechat.h */
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */


@@ -33,11 +33,12 @@
 #define CONFIG_SECTION_IRC     4
 #define CONFIG_SECTION_DCC     5
 #define CONFIG_SECTION_PROXY   6
-#define CONFIG_SECTION_KEYS    7
-#define CONFIG_SECTION_ALIAS   8
-#define CONFIG_SECTION_IGNORE  9
-#define CONFIG_SECTION_SERVER  10
-#define CONFIG_NUMBER_SECTIONS 11
+#define CONFIG_SECTION_PLUGINS 7
+#define CONFIG_SECTION_KEYS    8
+#define CONFIG_SECTION_ALIAS   9
+#define CONFIG_SECTION_IGNORE  10
+#define CONFIG_SECTION_SERVER  11
+#define CONFIG_NUMBER_SECTIONS 12

 #define OPTION_TYPE_BOOLEAN         1   /* values: on/off                   */
 #define OPTION_TYPE_INT             2   /* values: from min to max          */
@@ -53,6 +54,10 @@
 #define CFG_LOOK_NICKLIST_TOP    2
 #define CFG_LOOK_NICKLIST_BOTTOM 3

+#define CFG_IRC_DISPLAY_AWAY_OFF     0
+#define CFG_IRC_DISPLAY_AWAY_LOCAL   1
+#define CFG_IRC_DISPLAY_AWAY_CHANNEL 2
+
 typedef struct t_config_section t_config_section;

 struct t_config_section
@@ -82,14 +87,14 @@ extern int cfg_look_set_title;
 extern int cfg_look_startup_logo;
 extern int cfg_look_startup_version;
 extern char *cfg_look_weechat_slogan;
-extern char *cfg_look_charset_decode;
+extern char *cfg_look_charset_decode_iso;
+extern char *cfg_look_charset_decode_utf;
 extern char *cfg_look_charset_encode;
 extern char *cfg_look_charset_internal;
+extern int cfg_look_one_server_buffer;
 extern char *cfg_look_buffer_timestamp;
-extern int cfg_look_color_nicks;
 extern int cfg_look_color_nicks_number;
 extern int cfg_look_color_actions;
-extern int cfg_look_remove_colors_from_msgs;
 extern int cfg_look_nicklist;
 extern int cfg_look_nicklist_position;
 extern int cfg_look_nicklist_min_size;
@@ -98,11 +103,20 @@ extern int cfg_look_nickmode;
 extern int cfg_look_nickmode_empty;
 extern char *cfg_look_no_nickname;
 extern char *cfg_look_completor;
+extern char *cfg_look_nick_completion_ignore;
 extern int cfg_look_infobar;
 extern char *cfg_look_infobar_timestamp;
 extern int cfg_look_infobar_seconds;
 extern int cfg_look_infobar_delay_highlight;
+extern int cfg_look_hotlist_names_count;
+extern int cfg_look_hotlist_names_level;
+extern int cfg_look_hotlist_names_length;
+extern int cfg_look_day_change;
+extern char *cfg_look_day_change_timestamp;
+extern char *cfg_look_read_marker;

+extern int cfg_col_real_white;
+extern int cfg_col_separator;
 extern int cfg_col_title;
 extern int cfg_col_title_bg;
 extern int cfg_col_chat;
@@ -110,6 +124,7 @@ extern int cfg_col_chat_time;
 extern int cfg_col_chat_time_sep;
 extern int cfg_col_chat_prefix1;
 extern int cfg_col_chat_prefix2;
+extern int cfg_col_chat_server;
 extern int cfg_col_chat_join;
 extern int cfg_col_chat_part;
 extern int cfg_col_chat_nick;
@@ -118,8 +133,11 @@ extern int cfg_col_chat_channel;
 extern int cfg_col_chat_dark;
 extern int cfg_col_chat_highlight;
 extern int cfg_col_chat_bg;
+extern int cfg_col_chat_read_marker;
+extern int cfg_col_chat_read_marker_bg;
 extern int cfg_col_status;
 extern int cfg_col_status_delimiters;
+extern int cfg_col_status_channel;
 extern int cfg_col_status_data_msg;
 extern int cfg_col_status_data_private;
 extern int cfg_col_status_data_highlight;
@@ -133,6 +151,7 @@ extern int cfg_col_infobar_bg;
 extern int cfg_col_input;
 extern int cfg_col_input_channel;
 extern int cfg_col_input_nick;
+extern int cfg_col_input_delimiters;
 extern int cfg_col_input_bg;
 extern int cfg_col_nick;
 extern int cfg_col_nick_away;
@@ -157,6 +176,7 @@ extern int cfg_col_dcc_aborted;

 extern int cfg_history_max_lines;
 extern int cfg_history_max_commands;
+extern int cfg_history_display_default;

 extern int cfg_log_auto_server;
 extern int cfg_log_auto_channel;
@@ -167,7 +187,6 @@ extern char *cfg_log_timestamp;
 extern int cfg_log_hide_nickserv_pwd;

 extern int cfg_irc_display_away;
-extern char *cfg_irc_default_msg_away;
 extern char *cfg_irc_default_msg_part;
 extern char *cfg_irc_default_msg_quit;
 extern int cfg_irc_notice_as_pv;
@@ -177,11 +196,15 @@ extern int cfg_irc_lag_min_show;
 extern int cfg_irc_lag_disconnect;
 extern int cfg_irc_fifo_pipe;
 extern char *cfg_irc_highlight;
+extern int cfg_irc_colors_receive;
+extern int cfg_irc_colors_send;

 extern int cfg_dcc_auto_accept_files;
 extern int cfg_dcc_auto_accept_chats;
 extern int cfg_dcc_timeout;
 extern int cfg_dcc_blocksize;
+extern char *cfg_dcc_port_range;
+extern char *cfg_dcc_own_ip;
 extern char *cfg_dcc_download_path;
 extern char *cfg_dcc_upload_path;
 extern int cfg_dcc_convert_spaces;
@@ -197,6 +220,10 @@ extern int cfg_proxy_port;
 extern char *cfg_proxy_username;
 extern char *cfg_proxy_password;

+extern char *cfg_plugins_path;
+extern char *cfg_plugins_autoload;
+extern char *cfg_plugins_extension;
+
 extern t_config_section config_sections [CONFIG_NUMBER_SECTIONS];
 extern t_config_option * weechat_options [CONFIG_NUMBER_SECTIONS];

@@ -205,12 +232,19 @@ extern void config_change_noop ();
 extern void config_change_title ();
 extern void config_change_buffers ();
 extern void config_change_buffer_content ();
+extern void config_change_read_marker ();
+extern void config_change_charset ();
+extern void config_change_one_server_buffer ();
 extern void config_change_color ();
 extern void config_change_nicks_colors ();
 extern void config_change_away_check ();
 extern void config_change_fifo_pipe ();
 extern void config_change_notify_levels ();
+extern void config_change_log ();
 extern int config_option_set_value (t_config_option *, char *);
+extern void config_option_list_remove (char **, char *);
+extern void config_option_list_set (char **, char *, char *);
+extern void config_option_list_get_value (char **, char *, char **, int *);
 extern t_config_option *config_option_search (char *);
 extern void config_option_search_option_value (char *, t_config_option **, void **);
 extern int config_set_value (char *, char *);
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

 /* weelist.c: sorted lists management */
@@ -140,6 +140,9 @@ weelist_remove (t_weelist **weelist, t_weelist **last_weelist, t_weelist *elemen
 {
    t_weelist *new_weelist;
    
+    if (!element)
+        return;
+    
    /* remove element from list */
    if (*last_weelist == element)
        *last_weelist = element->prev_weelist;
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */


@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2005 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2006 FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -12,7 +12,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #

 INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\"
@@ -20,6 +20,7 @@ INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\"
 noinst_LIBRARIES = lib_weechat_gui_common.a

 lib_weechat_gui_common_a_SOURCES = gui-common.c \
+                                   gui-action.c \
                                   gui-keyboard.c \
                                   gui.h

@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2005 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2006 FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -12,19 +12,31 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #

 INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\"

 bin_PROGRAMS = weechat-curses

+if PLUGINS
 weechat_curses_LDADD = ../gui-common.o ../gui-keyboard.o \
+                       ../gui-action.o \
                       ../../common/lib_weechat_main.a \
                       ../../irc/lib_weechat_irc.a \
+                       ../../plugins/lib_weechat_plugins.a \
+                       $(PLUGINS_LIBS) \
                       $(NCURSES_LIBS) \
-                       ../../plugins/lib_weechat_plugins.a $(PLUGINS_LIBS) \
-                       $(GNUTLS_LIBS)
+                       $(GNUTLS_LFLAGS)
+else
+weechat_curses_LDADD = ../gui-common.o ../gui-keyboard.o \
+                       ../gui-action.o \
+                       ../../common/lib_weechat_main.a \
+                       ../../irc/lib_weechat_irc.a \
+                       $(PLUGINS_LIBS) \
+                       $(NCURSES_LIBS) \
+                       $(GNUTLS_LFLAGS)
+endif

 weechat_curses_SOURCES = gui-display.c \
                         gui-input.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

 /* gui-input: user input functions for Curses GUI */
@@ -31,7 +31,12 @@
 #include <signal.h>
 #include <time.h>
 #include <sys/socket.h>
+
+#ifdef HAVE_NCURSESW_CURSES_H
+#include <ncursesw/ncurses.h>
+#else
 #include <ncurses.h>
+#endif

 #include "../../common/weechat.h"
 #include "../gui.h"
@@ -39,6 +44,7 @@
 #include "../../common/command.h"
 #include "../../common/hotlist.h"
 #include "../../common/fifo.h"
+#include "../../common/utf8.h"
 #include "../../irc/irc.h"


@@ -53,70 +59,78 @@ gui_input_default_key_bindings ()
    char key_str[32], command[32];
    
    /* keys binded with internal functions */
-    gui_key_bind ( /* RC      */ "ctrl-M",        "return");
-    gui_key_bind ( /* RC      */ "ctrl-J",        "return");
-    gui_key_bind ( /* tab     */ "ctrl-I",        "tab");
-    gui_key_bind ( /* basckp  */ "ctrl-H",        "backspace");
-    gui_key_bind ( /* basckp  */ "ctrl-?",        "backspace");
-    gui_key_bind ( /* del     */ "meta2-3~",      "delete");
-    gui_key_bind ( /* ^K      */ "ctrl-K",        "delete_end_line");
-    gui_key_bind ( /* ^U      */ "ctrl-U",        "delete_beginning_line");
-    gui_key_bind ( /* ^W      */ "ctrl-W",        "delete_previous_word");
-    gui_key_bind ( /* ^Y      */ "ctrl-Y",        "clipboard_paste");
-    gui_key_bind ( /* ^T      */ "ctrl-T",        "transpose_chars");
-    gui_key_bind ( /* home    */ "meta2-1~",      "home");
-    gui_key_bind ( /* home    */ "meta2-H",       "home");
-    gui_key_bind ( /* home    */ "meta2-7~",      "home");
-    gui_key_bind ( /* ^A      */ "ctrl-A",        "home");
-    gui_key_bind ( /* end     */ "meta2-4~",      "end");
-    gui_key_bind ( /* end     */ "meta2-F",       "end");
-    gui_key_bind ( /* end     */ "meta2-8~",      "end");
-    gui_key_bind ( /* ^E      */ "ctrl-E",        "end");
-    gui_key_bind ( /* left    */ "meta2-D",       "left");
-    gui_key_bind ( /* right   */ "meta2-C",       "right");
-    gui_key_bind ( /* up      */ "meta2-A",       "up");
-    gui_key_bind ( /* ^up     */ "meta-Oa",       "up_global");
-    gui_key_bind ( /* down    */ "meta2-B",       "down");
-    gui_key_bind ( /* ^down   */ "meta-Ob",       "down_global");
-    gui_key_bind ( /* pgup    */ "meta2-5~",      "page_up");
-    gui_key_bind ( /* pgdn    */ "meta2-6~",      "page_down");
-    gui_key_bind ( /* F10     */ "meta2-21~",     "infobar_clear");
-    gui_key_bind ( /* F11     */ "meta2-23~",     "nick_page_up");
-    gui_key_bind ( /* F12     */ "meta2-24~",     "nick_page_down");
-    gui_key_bind ( /* m-F11   */ "meta-meta2-1~", "nick_beginning");
-    gui_key_bind ( /* m-F12   */ "meta-meta2-4~", "nick_end");
-    gui_key_bind ( /* ^L      */ "ctrl-L",        "refresh");
-    gui_key_bind ( /* m-a     */ "meta-a",        "jump_smart");
-    gui_key_bind ( /* m-b     */ "meta-b",        "previous_word");
-    gui_key_bind ( /* ^left   */ "meta-Od",       "previous_word");
-    gui_key_bind ( /* m-d     */ "meta-d",        "delete_next_word");
-    gui_key_bind ( /* m-f     */ "meta-f",        "next_word");
-    gui_key_bind ( /* ^right  */ "meta-Oc",       "next_word");
-    gui_key_bind ( /* m-h     */ "meta-h",        "hotlist_clear");
-    gui_key_bind ( /* m-j,m-d */ "meta-jmeta-d",  "jump_dcc");
-    gui_key_bind ( /* m-j,m-l */ "meta-jmeta-l",  "jump_last_buffer");
-    gui_key_bind ( /* m-j,m-s */ "meta-jmeta-s",  "jump_server");
-    gui_key_bind ( /* m-j,m-x */ "meta-jmeta-x",  "jump_next_server");
-    gui_key_bind ( /* m-k     */ "meta-k",        "grab_key");
-    gui_key_bind ( /* m-r     */ "meta-r",        "delete_line");
+    gui_key_bind ( /* RC          */ "ctrl-M",             "return");
+    gui_key_bind ( /* RC          */ "ctrl-J",             "return");
+    gui_key_bind ( /* tab         */ "ctrl-I",             "tab");
+    gui_key_bind ( /* basckp      */ "ctrl-H",             "backspace");
+    gui_key_bind ( /* basckp      */ "ctrl-?",             "backspace");
+    gui_key_bind ( /* del         */ "meta2-3~",           "delete");
+    gui_key_bind ( /* ^K          */ "ctrl-K",             "delete_end_line");
+    gui_key_bind ( /* ^U          */ "ctrl-U",             "delete_beginning_line");
+    gui_key_bind ( /* ^W          */ "ctrl-W",             "delete_previous_word");
+    gui_key_bind ( /* ^Y          */ "ctrl-Y",             "clipboard_paste");
+    gui_key_bind ( /* ^T          */ "ctrl-T",             "transpose_chars");
+    gui_key_bind ( /* home        */ "meta2-1~",           "home");
+    gui_key_bind ( /* home        */ "meta2-H",            "home");
+    gui_key_bind ( /* home        */ "meta2-7~",           "home");
+    gui_key_bind ( /* ^A          */ "ctrl-A",             "home");
+    gui_key_bind ( /* end         */ "meta2-4~",           "end");
+    gui_key_bind ( /* end         */ "meta2-F",            "end");
+    gui_key_bind ( /* end         */ "meta2-8~",           "end");
+    gui_key_bind ( /* ^E          */ "ctrl-E",             "end");
+    gui_key_bind ( /* left        */ "meta2-D",            "left");
+    gui_key_bind ( /* right       */ "meta2-C",            "right");
+    gui_key_bind ( /* up          */ "meta2-A",            "up");
+    gui_key_bind ( /* ^up         */ "meta-Oa",            "up_global");
+    gui_key_bind ( /* down        */ "meta2-B",            "down");
+    gui_key_bind ( /* ^down       */ "meta-Ob",            "down_global");
+    gui_key_bind ( /* pgup        */ "meta2-5~",           "page_up");
+    gui_key_bind ( /* pgdn        */ "meta2-6~",           "page_down");
+    gui_key_bind ( /* F10         */ "meta2-21~",          "infobar_clear");
+    gui_key_bind ( /* F11         */ "meta2-23~",          "nick_page_up");
+    gui_key_bind ( /* F12         */ "meta2-24~",          "nick_page_down");
+    gui_key_bind ( /* m-F11       */ "meta-meta2-1~",      "nick_beginning");
+    gui_key_bind ( /* m-F12       */ "meta-meta2-4~",      "nick_end");
+    gui_key_bind ( /* ^L          */ "ctrl-L",             "refresh");
+    gui_key_bind ( /* m-a         */ "meta-a",             "jump_smart");
+    gui_key_bind ( /* m-b         */ "meta-b",             "previous_word");
+    gui_key_bind ( /* ^left       */ "meta-Od",            "previous_word");
+    gui_key_bind ( /* m-d         */ "meta-d",             "delete_next_word");
+    gui_key_bind ( /* m-f         */ "meta-f",             "next_word");
+    gui_key_bind ( /* ^right      */ "meta-Oc",            "next_word");
+    gui_key_bind ( /* m-h         */ "meta-h",             "hotlist_clear");
+    gui_key_bind ( /* m-j,m-d     */ "meta-jmeta-d",       "jump_dcc");
+    gui_key_bind ( /* m-j,m-l     */ "meta-jmeta-l",       "jump_last_buffer");
+    gui_key_bind ( /* m-j,m-s     */ "meta-jmeta-s",       "jump_server");
+    gui_key_bind ( /* m-j,m-x     */ "meta-jmeta-x",       "jump_next_server");
+    gui_key_bind ( /* m-k         */ "meta-k",             "grab_key");
+    gui_key_bind ( /* m-n         */ "meta-n",             "scroll_next_highlight");
+    gui_key_bind ( /* m-p         */ "meta-p",             "scroll_previous_highlight");
+    gui_key_bind ( /* m-r         */ "meta-r",             "delete_line");
+    gui_key_bind ( /* m-s         */ "meta-s",             "switch_server");
+    gui_key_bind ( /* m-u         */ "meta-u",             "scroll_unread");
    
    /* keys binded with commands */
-    gui_key_bind ( /* m-left  */ "meta-meta2-D", "/buffer -1");
-    gui_key_bind ( /* F5      */ "meta2-15~",    "/buffer -1");
-    gui_key_bind ( /* m-right */ "meta-meta2-C", "/buffer +1");
-    gui_key_bind ( /* F6      */ "meta2-17~",    "/buffer +1");
-    gui_key_bind ( /* F7      */ "meta2-18~",    "/window -1");
-    gui_key_bind ( /* F8      */ "meta2-19~",    "/window +1");
-    gui_key_bind ( /* m-0     */ "meta-0",       "/buffer 10");
-    gui_key_bind ( /* m-1     */ "meta-1",       "/buffer 1");
-    gui_key_bind ( /* m-2     */ "meta-2",       "/buffer 2");
-    gui_key_bind ( /* m-3     */ "meta-3",       "/buffer 3");
-    gui_key_bind ( /* m-4     */ "meta-4",       "/buffer 4");
-    gui_key_bind ( /* m-5     */ "meta-5",       "/buffer 5");
-    gui_key_bind ( /* m-6     */ "meta-6",       "/buffer 6");
-    gui_key_bind ( /* m-7     */ "meta-7",       "/buffer 7");
-    gui_key_bind ( /* m-8     */ "meta-8",       "/buffer 8");
-    gui_key_bind ( /* m-9     */ "meta-9",       "/buffer 9");
+    gui_key_bind ( /* m-left      */ "meta-meta2-D",       "/buffer -1");
+    gui_key_bind ( /* F5          */ "meta2-15~",          "/buffer -1");
+    gui_key_bind ( /* m-right     */ "meta-meta2-C",       "/buffer +1");
+    gui_key_bind ( /* F6          */ "meta2-17~",          "/buffer +1");
+    gui_key_bind ( /* F7          */ "meta2-18~",          "/window -1");
+    gui_key_bind ( /* F8          */ "meta2-19~",          "/window +1");
+    gui_key_bind ( /* m-w,m-up    */ "meta-wmeta-meta2-A", "/window up");
+    gui_key_bind ( /* m-w,m-down  */ "meta-wmeta-meta2-B", "/window down");
+    gui_key_bind ( /* m-w,m-left  */ "meta-wmeta-meta2-D", "/window left");
+    gui_key_bind ( /* m-w,m-right */ "meta-wmeta-meta2-C", "/window right");
+    gui_key_bind ( /* m-0         */ "meta-0",             "/buffer 10");
+    gui_key_bind ( /* m-1         */ "meta-1",             "/buffer 1");
+    gui_key_bind ( /* m-2         */ "meta-2",             "/buffer 2");
+    gui_key_bind ( /* m-3         */ "meta-3",             "/buffer 3");
+    gui_key_bind ( /* m-4         */ "meta-4",             "/buffer 4");
+    gui_key_bind ( /* m-5         */ "meta-5",             "/buffer 5");
+    gui_key_bind ( /* m-6         */ "meta-6",             "/buffer 6");
+    gui_key_bind ( /* m-7         */ "meta-7",             "/buffer 7");
+    gui_key_bind ( /* m-8         */ "meta-8",             "/buffer 8");
+    gui_key_bind ( /* m-9         */ "meta-9",             "/buffer 9");
    
    /* bind meta-j + {01..99} to switch to buffers # > 10 */
    for (i = 1; i < 100; i++)
@@ -143,8 +157,8 @@ gui_input_grab_end ()
    {
        if (gui_current_window->buffer->has_input)
        {
-            gui_input_insert_string (gui_current_window, expanded_key, -1);
-            gui_current_window->buffer->input_buffer_pos += strlen (expanded_key);
+            gui_insert_string_input (gui_current_window, expanded_key, -1);
+            gui_current_window->buffer->input_buffer_pos += utf8_strlen (expanded_key);
            gui_draw_buffer_input (gui_current_window->buffer, 1);
        }
        free (expanded_key);
@@ -163,7 +177,7 @@ gui_input_grab_end ()
 void
 gui_input_read ()
 {
-    int key, i;
+    int key, i, insert_ok;
    char key_str[32];
    
    i = 0;
@@ -175,6 +189,7 @@ gui_input_read ()
            gui_input_grab_end ();
        
        key = getch ();
+        insert_ok = 1;
        
        if (key == ERR)
        {
@@ -185,12 +200,13 @@ gui_input_read ()
        
        if (key == KEY_RESIZE)
        {
-            gui_curses_resize_handler ();
+            gui_refresh_screen ();
            continue;
        }
                
        if (key < 32)
        {
+            insert_ok = 0;
            key_str[0] = '^';
            key_str[1] = (char) key + '@';
            key_str[2] = '\0';
@@ -203,11 +219,38 @@ gui_input_read ()
        }
        else
        {
-            if (key > 0xff)
+            if (local_utf8)
            {
-                key_str[0] = (char) (key >> 8);
-                key_str[1] = (char) (key & 0xff);
-                key_str[2] = '\0';
+                /* 1 char: 0vvvvvvv */
+                if (key < 0x80)
+                {
+                    key_str[0] = (char) key;
+                    key_str[1] = '\0';
+                }
+                /* 2 chars: 110vvvvv 10vvvvvv */
+                else if ((key & 0xE0) == 0xC0)
+                {
+                    key_str[0] = (char) key;
+                    key_str[1] = (char) (getch ());
+                    key_str[2] = '\0';
+                }
+                 /* 3 chars: 1110vvvv 10vvvvvv 10vvvvvv */
+                else if ((key & 0xF0) == 0xE0)
+                {
+                    key_str[0] = (char) key;
+                    key_str[1] = (char) (getch ());
+                    key_str[2] = (char) (getch ());
+                    key_str[3] = '\0';
+                }
+                /* 4 chars: 11110vvv 10vvvvvv 10vvvvvv 10vvvvvv */
+                else if ((key & 0xF8) == 0xF0)
+                {
+                    key_str[0] = (char) key;
+                    key_str[1] = (char) (getch ());
+                    key_str[2] = (char) (getch ());
+                    key_str[3] = (char) (getch ());
+                    key_str[4] = '\0';
+                }
            }
            else
            {
@@ -224,8 +267,21 @@ gui_input_read ()
        
        /*gui_printf (gui_current_window->buffer, "gui_input_read: key = %s (%d)\n", key_str, key);*/
        
-        if (gui_key_pressed (key_str) != 0)
-            gui_input_insert_char (gui_current_window, key);
+        if ((gui_key_pressed (key_str) != 0) && (insert_ok))
+        {
+            if (strcmp (key_str, "^^") == 0)
+                key_str[1] = '\0';
+            
+            if (gui_current_window->buffer->dcc)
+                gui_exec_action_dcc (gui_current_window, key_str);
+            else
+            {
+                gui_insert_string_input (gui_current_window, key_str, -1);
+                gui_current_window->buffer->input_buffer_pos += utf8_strlen (key_str);
+                gui_draw_buffer_input (gui_current_window->buffer, 0);
+                gui_current_window->buffer->completion.position = -1;
+            }
+        }
        
        i++;
    }
@@ -242,11 +298,18 @@ gui_main_loop ()
    static struct timeval timeout, tv;
    static struct timezone tz;
    t_irc_server *ptr_server;
-    int old_min, old_sec, diff;
+    t_gui_buffer *ptr_buffer;
+    int old_day, old_min, old_sec, diff;
+    char text_time[1024];
    time_t new_time;
    struct tm *local_time;

    quit_weechat = 0;
+
+    new_time = time (NULL);
+    local_time = localtime (&new_time);
+    old_day = local_time->tm_mday;
+    
    old_min = -1;
    old_sec = -1;
    check_away = 0;
@@ -260,6 +323,24 @@ gui_main_loop ()
        {
            old_min = local_time->tm_min;
            gui_draw_buffer_infobar (gui_current_window->buffer, 1);
+            
+            if (cfg_look_day_change
+                && (local_time->tm_mday != old_day))
+            {
+                strftime (text_time, sizeof (text_time),
+                          cfg_look_day_change_timestamp, local_time);
+                gui_add_hotlist = 0;
+                for (ptr_buffer = gui_buffers; ptr_buffer;
+                     ptr_buffer = ptr_buffer->next_buffer)
+                {
+                    if (!ptr_buffer->dcc)
+                        gui_printf_nolog_notime (ptr_buffer,
+                                                 _("Day changed to %s\n"),
+                                                 text_time);
+                }
+                gui_add_hotlist = 1;
+            }
+            old_day = local_time->tm_mday;
        }
        
        /* second has changed ? */
@@ -335,7 +416,7 @@ gui_main_loop ()
                        diff = (int) get_timeval_diff (&(ptr_server->lag_check_time), &tv);
                        if (diff / 1000 > cfg_irc_lag_disconnect * 60)
                        {
-                            irc_display_prefix (ptr_server->buffer, PREFIX_ERROR);
+                            irc_display_prefix (ptr_server, ptr_server->buffer, PREFIX_ERROR);
                            gui_printf (ptr_server->buffer,
                                        _("%s lag is high, disconnecting from server...\n"),
                                        WEECHAT_WARNING);
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2005 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2006 FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -12,7 +12,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #

 INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\" $(GTK_CFLAGS)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

 /* gui-display.c: display functions for Gtk GUI */
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

 /* gui-input: user input functions for Gtk GUI */
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

 /* gui-keyboard: keyboard functions (GUI independant) */
@@ -41,77 +41,85 @@ int gui_key_grab = 0;
 int gui_key_grab_count = 0;

 t_gui_key_function gui_key_functions[] =
-{ { "return",                gui_input_return,
+{ { "return",                    gui_action_return,
    N_("terminate line") },
-  { "tab",                   gui_input_tab,
+  { "tab",                       gui_action_tab,
    N_("complete word") },
-  { "backspace",             gui_input_backspace,
+  { "backspace",                 gui_action_backspace,
    N_("delete previous char") },
-  { "delete",                gui_input_delete,
+  { "delete",                    gui_action_delete,
    N_("delete next char") },
-  { "delete_end_line",       gui_input_delete_end_of_line,
+  { "delete_end_line",           gui_action_delete_end_of_line,
    N_("delete until end of line") },
-  { "delete_beginning_line", gui_input_delete_begin_of_line,
+  { "delete_beginning_line",     gui_action_delete_begin_of_line,
    N_("delete until beginning of line") },
-  { "delete_line",           gui_input_delete_line,
+  { "delete_line",               gui_action_delete_line,
    N_("delete entire line") },
-  { "delete_previous_word",  gui_input_delete_previous_word,
+  { "delete_previous_word",      gui_action_delete_previous_word,
    N_("delete previous word") },
-  { "delete_next_word",      gui_input_delete_next_word,
+  { "delete_next_word",          gui_action_delete_next_word,
    N_("delete next word") },
-  { "clipboard_paste",       gui_input_clipboard_paste,
+  { "clipboard_paste",           gui_action_clipboard_paste,
    N_("paste current clipboard content") },
-  { "transpose_chars",       gui_input_transpose_chars,
+  { "transpose_chars",           gui_action_transpose_chars,
    N_("transpose chars") },
-  { "home",                  gui_input_home,
+  { "home",                      gui_action_home,
    N_("go to beginning of line") },
-  { "end",                   gui_input_end,
+  { "end",                       gui_action_end,
    N_("go to end of line") },
-  { "left",                  gui_input_left,
+  { "left",                      gui_action_left,
    N_("move one char left") },
-  { "previous_word",         gui_input_previous_word,
+  { "previous_word",             gui_action_previous_word,
    N_("move to previous word") },
-  { "right",                 gui_input_right,
+  { "right",                     gui_action_right,
    N_("move one char right") },
-  { "next_word",             gui_input_next_word,
+  { "next_word",                 gui_action_next_word,
    N_("move to next word") },
-  { "up",                    gui_input_up,
+  { "up",                        gui_action_up,
    N_("call previous command in history") },
-  { "up_global",             gui_input_up_global,
+  { "up_global",                 gui_action_up_global,
    N_("call previous command in global history") },
-  { "down",                  gui_input_down,
+  { "down",                      gui_action_down,
    N_("call next command in history") },
-  { "down_global",           gui_input_down_global,
+  { "down_global",               gui_action_down_global,
    N_("call next command in global history") },
-  { "page_up",               gui_input_page_up,
+  { "page_up",                   gui_action_page_up,
    N_("scroll one page up") },
-  { "page_down",             gui_input_page_down,
+  { "page_down",                 gui_action_page_down,
    N_("scroll one page down") },
-  { "infobar_clear",         gui_input_infobar_clear,
-    N_("clear infobar") },
-  { "nick_page_up",          gui_input_nick_page_up,
-    N_("scroll nicklist one page up") },
-  { "nick_page_down",        gui_input_nick_page_down,
-    N_("scroll nicklist one page down") },
-  { "nick_beginning",        gui_input_nick_beginning,
+  { "nick_beginning",            gui_action_nick_beginning,
    N_("display beginning of nicklist") },
-  { "nick_end",              gui_input_nick_end,
+  { "nick_end",                  gui_action_nick_end,
    N_("display end of nicklist") },
-  { "refresh",               gui_curses_resize_handler,
-    N_("refresh screen") },
-  { "jump_smart",            gui_input_jump_smart,
+  { "nick_page_up",              gui_action_nick_page_up,
+    N_("scroll nicklist one page up") },
+  { "nick_page_down",            gui_action_nick_page_down,
+    N_("scroll nicklist one page down") },
+  { "jump_smart",                gui_action_jump_smart,
    N_("jump to buffer with activity") },
-  { "jump_dcc",              gui_input_jump_dcc,
+  { "jump_dcc",                  gui_action_jump_dcc,
    N_("jump to DCC buffer") },
-  { "jump_last_buffer",      gui_input_jump_last_buffer,
+  { "jump_last_buffer",          gui_action_jump_last_buffer,
    N_("jump to last buffer") },
-  { "jump_server",           gui_input_jump_server,
+  { "jump_server",               gui_action_jump_server,
    N_("jump to server buffer") },
-  { "jump_next_server",      gui_input_jump_next_server,
+  { "jump_next_server",          gui_action_jump_next_server,
    N_("jump to next server") },
-  { "hotlist_clear",         gui_input_hotlist_clear,
+  { "switch_server",             gui_action_switch_server,
+    N_("switch active server on servers buffer") },
+  { "scroll_previous_highlight", gui_action_scroll_previous_highlight,
+    N_("scroll to previous highlight in buffer") },
+  { "scroll_next_highlight",     gui_action_scroll_next_highlight,
+    N_("scroll to next highlight in buffer") },
+  { "scroll_unread",             gui_action_scroll_unread,
+    N_("scroll to first unread line in buffer") },
+  { "hotlist_clear",             gui_action_hotlist_clear,
    N_("clear hotlist") },
-  { "grab_key",              gui_input_grab_key,
+  { "infobar_clear",             gui_action_infobar_clear,
+    N_("clear infobar") },
+  { "refresh",                   gui_action_refresh_screen,
+    N_("refresh screen") },
+  { "grab_key",                  gui_action_grab_key,
    N_("grab a key") },
  { NULL, NULL, NULL }
 };
@@ -423,8 +431,8 @@ gui_key_bind (char *key, char *command)
    
    if (!key || !command)
    {
-        wee_log_printf (_("%s unable to bind key \"%s\"\n"),
-                        WEECHAT_ERROR, key);
+        weechat_log_printf (_("%s unable to bind key \"%s\"\n"),
+                            WEECHAT_ERROR, key);
        return NULL;
    }
    
@@ -434,8 +442,8 @@ gui_key_bind (char *key, char *command)
        ptr_function = gui_key_function_search_by_name (command);
        if (!ptr_function)
        {
-            wee_log_printf (_("%s unable to bind key \"%s\" (invalid function name: \"%s\")\n"),
-                            WEECHAT_ERROR, key, command);
+            weechat_log_printf (_("%s unable to bind key \"%s\" (invalid function name: \"%s\")\n"),
+                                WEECHAT_ERROR, key, command);
            return NULL;
        }
    }
@@ -447,8 +455,8 @@ gui_key_bind (char *key, char *command)
                           ptr_function);
    if (!new_key)
    {
-        wee_log_printf (_("%s not enough memory for key binding\n"),
-                        WEECHAT_ERROR);
+        weechat_log_printf (_("%s not enough memory for key binding\n"),
+                            WEECHAT_ERROR);
        return NULL;
    }
    
@@ -509,8 +517,8 @@ gui_key_pressed (char *key_str)
            /* exact combo found => execute function or command */
            gui_key_buffer[0] = '\0';
            if (ptr_key->command)
-                user_command (SERVER(gui_current_window->buffer),
-                              gui_current_window->buffer,
+                user_command (gui_current_window->buffer,
+                              SERVER(gui_current_window->buffer),
                              ptr_key->command);
            else
                (void)(ptr_key->function)(gui_current_window);
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */


@@ -26,61 +26,125 @@

 #define INPUT_BUFFER_BLOCK_SIZE 256

-#define NUM_COLORS                      54
-#define COLOR_WIN_TITLE                 1
-#define COLOR_WIN_CHAT                  2
-#define COLOR_WIN_CHAT_TIME             3
-#define COLOR_WIN_CHAT_TIME_SEP         4
-#define COLOR_WIN_CHAT_PREFIX1          5
-#define COLOR_WIN_CHAT_PREFIX2          6
-#define COLOR_WIN_CHAT_JOIN             7
-#define COLOR_WIN_CHAT_PART             8
-#define COLOR_WIN_CHAT_NICK             9
-#define COLOR_WIN_CHAT_HOST             10
-#define COLOR_WIN_CHAT_CHANNEL          11
-#define COLOR_WIN_CHAT_DARK             12
-#define COLOR_WIN_CHAT_HIGHLIGHT        13
-#define COLOR_WIN_STATUS                14
-#define COLOR_WIN_STATUS_DELIMITERS     15
-#define COLOR_WIN_STATUS_DATA_MSG       16
-#define COLOR_WIN_STATUS_DATA_PRIVATE   17
-#define COLOR_WIN_STATUS_DATA_HIGHLIGHT 18
-#define COLOR_WIN_STATUS_DATA_OTHER     19
-#define COLOR_WIN_STATUS_MORE           20
-#define COLOR_WIN_INFOBAR               21
-#define COLOR_WIN_INFOBAR_DELIMITERS    22
-#define COLOR_WIN_INFOBAR_HIGHLIGHT     23
-#define COLOR_WIN_INPUT                 24
-#define COLOR_WIN_INPUT_CHANNEL         25
-#define COLOR_WIN_INPUT_NICK            26
-#define COLOR_WIN_NICK                  27
-#define COLOR_WIN_NICK_AWAY             28
-#define COLOR_WIN_NICK_CHANOWNER        29
-#define COLOR_WIN_NICK_CHANADMIN        30
-#define COLOR_WIN_NICK_OP               31
-#define COLOR_WIN_NICK_HALFOP           32
-#define COLOR_WIN_NICK_VOICE            33
-#define COLOR_WIN_NICK_MORE             34
-#define COLOR_WIN_NICK_SEP              35
-#define COLOR_WIN_NICK_SELF             36
-#define COLOR_WIN_NICK_PRIVATE          37
-#define COLOR_WIN_NICK_FIRST            38
-#define COLOR_WIN_NICK_LAST             47
-#define COLOR_WIN_NICK_NUMBER           (COLOR_WIN_NICK_LAST - COLOR_WIN_NICK_FIRST + 1)
-#define COLOR_DCC_SELECTED              48
-#define COLOR_DCC_WAITING               49
-#define COLOR_DCC_CONNECTING            50
-#define COLOR_DCC_ACTIVE                51
-#define COLOR_DCC_DONE                  52
-#define COLOR_DCC_FAILED                53
-#define COLOR_DCC_ABORTED               54
+/* shift ncurses colors for compatibility with colors
+   in IRC messages (same as other IRC clients) */
+
+#define WEECHAT_COLOR_BLACK   COLOR_BLACK
+#define WEECHAT_COLOR_RED     COLOR_BLUE
+#define WEECHAT_COLOR_GREEN   COLOR_GREEN
+#define WEECHAT_COLOR_YELLOW  COLOR_CYAN
+#define WEECHAT_COLOR_BLUE    COLOR_RED
+#define WEECHAT_COLOR_MAGENTA COLOR_MAGENTA
+#define WEECHAT_COLOR_CYAN    COLOR_YELLOW
+#define WEECHAT_COLOR_WHITE   COLOR_WHITE
+
+#define COLOR_WIN_NICK_NUMBER 10
+
+typedef enum t_weechat_color t_weechat_color;
+
+enum t_weechat_color
+{
+    COLOR_WIN_SEPARATOR = 0,
+    COLOR_WIN_TITLE,
+    COLOR_WIN_CHAT,
+    COLOR_WIN_CHAT_TIME,
+    COLOR_WIN_CHAT_TIME_SEP,
+    COLOR_WIN_CHAT_PREFIX1,
+    COLOR_WIN_CHAT_PREFIX2,
+    COLOR_WIN_CHAT_SERVER,
+    COLOR_WIN_CHAT_JOIN,
+    COLOR_WIN_CHAT_PART,
+    COLOR_WIN_CHAT_NICK,
+    COLOR_WIN_CHAT_HOST,
+    COLOR_WIN_CHAT_CHANNEL,
+    COLOR_WIN_CHAT_DARK,
+    COLOR_WIN_CHAT_HIGHLIGHT,
+    COLOR_WIN_CHAT_READ_MARKER,
+    COLOR_WIN_STATUS,
+    COLOR_WIN_STATUS_DELIMITERS,
+    COLOR_WIN_STATUS_CHANNEL,
+    COLOR_WIN_STATUS_DATA_MSG,
+    COLOR_WIN_STATUS_DATA_PRIVATE,
+    COLOR_WIN_STATUS_DATA_HIGHLIGHT,
+    COLOR_WIN_STATUS_DATA_OTHER,
+    COLOR_WIN_STATUS_MORE,
+    COLOR_WIN_INFOBAR,
+    COLOR_WIN_INFOBAR_DELIMITERS,
+    COLOR_WIN_INFOBAR_HIGHLIGHT,
+    COLOR_WIN_INPUT,
+    COLOR_WIN_INPUT_CHANNEL,
+    COLOR_WIN_INPUT_NICK,
+    COLOR_WIN_INPUT_DELIMITERS,
+    COLOR_WIN_NICK,
+    COLOR_WIN_NICK_AWAY,
+    COLOR_WIN_NICK_CHANOWNER,
+    COLOR_WIN_NICK_CHANADMIN,
+    COLOR_WIN_NICK_OP,
+    COLOR_WIN_NICK_HALFOP,
+    COLOR_WIN_NICK_VOICE,
+    COLOR_WIN_NICK_MORE,
+    COLOR_WIN_NICK_SEP,
+    COLOR_WIN_NICK_SELF,
+    COLOR_WIN_NICK_PRIVATE,
+    COLOR_WIN_NICK_1,
+    COLOR_WIN_NICK_2,
+    COLOR_WIN_NICK_3,
+    COLOR_WIN_NICK_4,
+    COLOR_WIN_NICK_5,
+    COLOR_WIN_NICK_6,
+    COLOR_WIN_NICK_7,
+    COLOR_WIN_NICK_8,
+    COLOR_WIN_NICK_9,
+    COLOR_WIN_NICK_10,
+    COLOR_DCC_SELECTED,
+    COLOR_DCC_WAITING,
+    COLOR_DCC_CONNECTING,
+    COLOR_DCC_ACTIVE,
+    COLOR_DCC_DONE,
+    COLOR_DCC_FAILED,
+    COLOR_DCC_ABORTED,
+    NUM_COLORS
+};
+
+/* attributes in IRC messages for color & style (bold, ..) */
+
+#define GUI_ATTR_BOLD_CHAR        '\x02'
+#define GUI_ATTR_BOLD_STR         "\x02"
+#define GUI_ATTR_COLOR_CHAR       '\x03'
+#define GUI_ATTR_COLOR_STR        "\x03"
+#define GUI_ATTR_RESET_CHAR       '\x0F'
+#define GUI_ATTR_RESET_STR        "\x0F"
+#define GUI_ATTR_FIXED_CHAR       '\x11'
+#define GUI_ATTR_FIXED_STR        "\x11"
+#define GUI_ATTR_REVERSE_CHAR     '\x12'
+#define GUI_ATTR_REVERSE_STR      "\x12"
+#define GUI_ATTR_REVERSE2_CHAR    '\x16'
+#define GUI_ATTR_REVERSE2_STR     "\x16"
+#define GUI_ATTR_ITALIC_CHAR      '\x1D'
+#define GUI_ATTR_ITALIC_STR       "\x1D"
+#define GUI_ATTR_UNDERLINE_CHAR   '\x1F'
+#define GUI_ATTR_UNDERLINE_STR    "\x1F"
+
+/* WeeChat internal attributes (should never be in IRC messages) */
+
+#define GUI_ATTR_WEECHAT_COLOR_CHAR  '\x19'
+#define GUI_ATTR_WEECHAT_COLOR_STR   "\x19"
+#define GUI_ATTR_WEECHAT_SET_CHAR    '\x1A'
+#define GUI_ATTR_WEECHAT_SET_STR     "\x1A"
+#define GUI_ATTR_WEECHAT_REMOVE_CHAR '\x1B'
+#define GUI_ATTR_WEECHAT_REMOVE_STR  "\x1B"
+
+#define GUI_COLOR(color) ((gui_color[color]) ? gui_color[color]->string : "")
+#define GUI_NO_COLOR     GUI_ATTR_RESET_STR

 #define SERVER(buffer)  ((t_irc_server *)(buffer->server))
 #define CHANNEL(buffer) ((t_irc_channel *)(buffer->channel))

-#define BUFFER_IS_SERVER(buffer)  (SERVER(buffer) && !CHANNEL(buffer))
-#define BUFFER_IS_CHANNEL(buffer) (CHANNEL(buffer) && (CHANNEL(buffer)->type == CHAT_CHANNEL))
-#define BUFFER_IS_PRIVATE(buffer) (CHANNEL(buffer) && (CHANNEL(buffer)->type == CHAT_PRIVATE))
+#define BUFFER_IS_SERVER(buffer)  ((SERVER(buffer) || (buffer->all_servers)) && !CHANNEL(buffer))
+#define BUFFER_IS_CHANNEL(buffer) (CHANNEL(buffer) && (CHANNEL(buffer)->type == CHANNEL_TYPE_CHANNEL))
+#define BUFFER_IS_PRIVATE(buffer) (CHANNEL(buffer) && (CHANNEL(buffer)->type == CHANNEL_TYPE_PRIVATE))
+
+#define BUFFER_HAS_NICKLIST(buffer) (BUFFER_IS_CHANNEL(buffer))

 #define MSG_TYPE_TIME      1
 #define MSG_TYPE_PREFIX    2
@@ -90,17 +154,20 @@
 #define MSG_TYPE_HIGHLIGHT 32
 #define MSG_TYPE_NOLOG     64

-#define gui_printf_color(buffer, color, fmt, argz...) \
-    gui_printf_type_color(buffer, MSG_TYPE_INFO, color, fmt, ##argz)
+#define gui_printf(buffer, fmt, argz...) \
+    gui_printf_internal(buffer, 1, MSG_TYPE_INFO, fmt, ##argz)

 #define gui_printf_type(buffer, type, fmt, argz...) \
-    gui_printf_type_color(buffer, type, -1, fmt, ##argz)
-
-#define gui_printf(buffer, fmt, argz...) \
-    gui_printf_type_color(buffer, MSG_TYPE_INFO, -1, fmt, ##argz)
+    gui_printf_internal(buffer, 1, type, fmt, ##argz)

 #define gui_printf_nolog(buffer, fmt, argz...) \
-    gui_printf_type_color(buffer, MSG_TYPE_INFO | MSG_TYPE_NOLOG, -1, fmt, ##argz)
+    gui_printf_internal(buffer, 1, MSG_TYPE_INFO | MSG_TYPE_NOLOG, fmt, ##argz)
+
+#define gui_printf_nolog_notime(buffer, fmt, argz...) \
+    gui_printf_internal(buffer, 0, MSG_TYPE_NOLOG, fmt, ##argz)
+
+#define WINDOW_MIN_WIDTH        10
+#define WINDOW_MIN_HEIGHT       5

 #define NOTIFY_LEVEL_MIN        0
 #define NOTIFY_LEVEL_MAX        3
@@ -109,38 +176,14 @@
 #define KEY_SHOW_MODE_DISPLAY   1
 #define KEY_SHOW_MODE_BIND      2

-typedef struct t_gui_message t_gui_message;
-
-struct t_gui_message
-{
-    int type;                       /* type of message (time, nick, other)  */
-    int color;                      /* color of message                     */
-    char *message;                  /* message content                      */
-    t_gui_message *prev_message;    /* link to previous message for line    */
-    t_gui_message *next_message;    /* link to next message for line        */
-};
-
-typedef struct t_gui_line t_gui_line;
-
-struct t_gui_line
-{
-    int length;                     /* length of the line (in char)         */
-    int length_align;               /* alignment length (time or time/nick) */
-    int log_write;                  /* = 1 if line will be written to log   */
-    int line_with_message;          /* line contains a message from a user? */
-    int line_with_highlight;        /* line contains highlight              */
-    t_gui_message *messages;        /* messages for the line                */
-    t_gui_message *last_message;    /* last message of the line             */
-    t_gui_line *prev_line;          /* link to previous line                */
-    t_gui_line *next_line;          /* link to next line                    */
-};
-
 typedef struct t_gui_color t_gui_color;

 struct t_gui_color
 {
-    char *name;
-    int color;
+    int foreground;                 /* foreground color                     */
+    int background;                 /* background color                     */
+    int attributes;                 /* attributes (bold, ..)                */
+    char *string;                   /* WeeChat color: "\x19??", ?? is #color*/
 };

 typedef struct t_gui_infobar t_gui_infobar;
@@ -155,6 +198,21 @@ struct t_gui_infobar
    t_gui_infobar *next_infobar;    /* next message for infobar             */
 };

+typedef struct t_gui_line t_gui_line;
+
+struct t_gui_line
+{
+    int length;                     /* length of the line (in char)         */
+    int length_align;               /* alignment length (time or time/nick) */
+    int log_write;                  /* = 1 if line will be written to log   */
+    int line_with_message;          /* line contains a message from a user? */
+    int line_with_highlight;        /* line contains highlight              */
+    char *data;                     /* line content                         */
+    int ofs_after_date;             /* offset to first char after date      */
+    t_gui_line *prev_line;          /* link to previous line                */
+    t_gui_line *next_line;          /* link to next line                    */
+};
+
 typedef struct t_gui_buffer t_gui_buffer;

 struct t_gui_buffer
@@ -165,12 +223,14 @@ struct t_gui_buffer
    
    /* server/channel */
    void *server;                   /* buffer's server                      */
+    int all_servers;                /* =1 if all servers are displayed here */
    void *channel;                  /* buffer's channel                     */
    int dcc;                        /* buffer is dcc status                 */
    
    /* chat content (lines, line is composed by many messages) */
    t_gui_line *lines;              /* lines of chat window                 */
    t_gui_line *last_line;          /* last line of chat window             */
+    t_gui_line *last_read_line;     /* last read line before jump           */
    int num_lines;                  /* number of lines in the window        */
    int line_complete;              /* current line complete ? (\n ending)  */
    
@@ -188,7 +248,8 @@ struct t_gui_buffer
    int has_input;                  /* = 1 if buffer has input (DCC has not)*/
    char *input_buffer;             /* input buffer                         */
    int input_buffer_alloc;         /* input buffer: allocated size in mem  */
-    int input_buffer_size;          /* buffer size (user input length)      */
+    int input_buffer_size;          /* buffer size in bytes                 */
+    int input_buffer_length;        /* number of chars in buffer            */
    int input_buffer_pos;           /* position into buffer                 */
    int input_buffer_1st_display;   /* first char displayed on screen       */
    
@@ -201,14 +262,12 @@ struct t_gui_buffer
    t_history *ptr_history;         /* current command in history           */
    int num_history;                /* number of commands in history        */
    
-    /* channel buffer before jumping to next server */
-    t_gui_buffer *old_channel_buffer; /* only used for server buffer        */
-    
    /* link to previous/next buffer */
    t_gui_buffer *prev_buffer;      /* link to previous buffer              */
    t_gui_buffer *next_buffer;      /* link to next buffer                  */
 };

+typedef struct t_gui_window_tree t_gui_window_tree;
 typedef struct t_gui_window t_gui_window;

 struct t_gui_window
@@ -216,6 +275,11 @@ struct t_gui_window
    /* global position & size */
    int win_x, win_y;               /* position of window                   */
    int win_width, win_height;      /* window geometry                      */
+    int win_width_pct;              /* % of width (compared to term size)   */
+    int win_height_pct;             /* % of height (compared to term size)  */
+    
+    int new_x, new_y;               /* used for computing new position      */
+    int new_width, new_height;      /* used for computing new size          */
    
    /* chat window settings */
    int win_chat_x, win_chat_y;     /* chat window position                 */
@@ -252,6 +316,11 @@ struct t_gui_window
    /* windows for Qt GUI */
    /* TODO: declare Qt window */
    
+    int current_style_fg;;          /* current color used for foreground    */
+    int current_style_bg;;          /* current color used for background    */
+    int current_style_attr;         /* current attributes (bold, ..)        */
+    int current_color_attr;         /* attr sum of last color(s) displayed  */
+    
    /* DCC */
    void *dcc_first;                /* first dcc displayed                  */
    void *dcc_selected;             /* selected dcc                         */
@@ -262,11 +331,27 @@ struct t_gui_window
    int first_line_displayed;       /* = 1 if first line is displayed       */
    t_gui_line *start_line;         /* pointer to line if scrolling         */
    int start_line_pos;             /* position in first line displayed     */
+    int scroll;                     /* = 1 if "MORE" should be displayed    */
+    t_gui_window_tree *ptr_tree;    /* pointer to leaf in windows tree      */
    
    t_gui_window *prev_window;      /* link to previous window              */
    t_gui_window *next_window;      /* link to next window                  */
 };

+struct t_gui_window_tree
+{
+    t_gui_window_tree *parent_node; /* pointer to parent node               */
+    
+    /* node info */
+    int split_horiz;                /* 1 if horizontal, 0 if vertical       */
+    int split_pct;                  /* % of split size (represents child1)  */
+    t_gui_window_tree *child1;      /* first child, NULL if a leaf          */
+    t_gui_window_tree *child2;      /* second child, NULL if a leaf         */
+    
+    /* leaf info */
+    t_gui_window *window;           /* pointer to window, NULL if a node    */
+};
+
 typedef struct t_gui_key t_gui_key;

 struct t_gui_key
@@ -296,6 +381,7 @@ extern int gui_add_hotlist;
 extern t_gui_window *gui_windows;
 extern t_gui_window *last_gui_window;
 extern t_gui_window *gui_current_window;
+extern t_gui_window_tree *gui_windows_tree;
 extern t_gui_buffer *gui_buffers;
 extern t_gui_buffer *last_gui_buffer;
 extern t_gui_buffer *buffer_before_dcc;
@@ -308,9 +394,16 @@ extern int gui_key_grab;
 extern int gui_key_grab_count;
 extern char *gui_input_clipboard;

+extern t_gui_color *gui_color[NUM_COLORS];
+
 /* GUI independent functions: windows & buffers */

-extern t_gui_window *gui_window_new (int, int, int, int);
+extern int gui_window_tree_init (t_gui_window *);
+extern void gui_window_tree_node_to_leaf (t_gui_window_tree *, t_gui_window *);
+extern void gui_window_tree_free (t_gui_window_tree **);
+extern t_gui_window *gui_window_new (t_gui_window *, int, int, int, int, int, int);
+extern t_gui_buffer *gui_buffer_search (char *, char *);
+extern t_gui_window *gui_buffer_find_window (t_gui_buffer *);
 extern t_gui_buffer *gui_buffer_new (t_gui_window *, void *, void *, int, int);
 extern void gui_buffer_clear (t_gui_buffer *);
 extern void gui_buffer_clear_all ();
@@ -318,50 +411,71 @@ extern void gui_infobar_printf (int, int, char *, ...);
 extern void gui_window_free (t_gui_window *);
 extern void gui_infobar_remove ();
 extern void gui_buffer_free (t_gui_buffer *, int);
-extern t_gui_line *gui_new_line (t_gui_buffer *);
-extern t_gui_message *gui_new_message (t_gui_buffer *);
-extern void gui_input_clipboard_copy (char *, int);
-extern void gui_input_clipboard_paste (t_gui_window *);
-extern void gui_input_insert_string (t_gui_window *, char *, int);
-extern void gui_input_insert_char (t_gui_window *, int);
-extern void gui_input_return (t_gui_window *);
-extern void gui_input_tab (t_gui_window *);
-extern void gui_input_backspace (t_gui_window *);
-extern void gui_input_delete (t_gui_window *);
-extern void gui_input_delete_previous_word (t_gui_window *);
-extern void gui_input_delete_next_word (t_gui_window *);
-extern void gui_input_delete_begin_of_line (t_gui_window *);
-extern void gui_input_delete_end_of_line (t_gui_window *);
-extern void gui_input_delete_line (t_gui_window *);
-extern void gui_input_transpose_chars (t_gui_window *);
-extern void gui_input_home (t_gui_window *);
-extern void gui_input_end (t_gui_window *);
-extern void gui_input_left (t_gui_window *);
-extern void gui_input_previous_word (t_gui_window *);
-extern void gui_input_right (t_gui_window *);
-extern void gui_input_next_word (t_gui_window *);
-extern void gui_input_up (t_gui_window *);
-extern void gui_input_up_global (t_gui_window *);
-extern void gui_input_down (t_gui_window *);
-extern void gui_input_down_global (t_gui_window *);
-extern void gui_input_jump_smart (t_gui_window *);
-extern void gui_input_jump_dcc (t_gui_window *);
-extern void gui_input_jump_last_buffer (t_gui_window *);
-extern void gui_input_jump_server (t_gui_window *);
-extern void gui_input_jump_next_server (t_gui_window *);
-extern void gui_input_hotlist_clear (t_gui_window *);
-extern void gui_input_infobar_clear (t_gui_window *);
-extern void gui_input_grab_key (t_gui_window *);
-extern void gui_switch_to_previous_buffer (t_gui_window *);
-extern void gui_switch_to_next_buffer (t_gui_window *);
-extern void gui_switch_to_previous_window (t_gui_window *);
-extern void gui_switch_to_next_window (t_gui_window *);
-extern void gui_switch_to_dcc_buffer (t_gui_window *);
-extern t_gui_buffer *gui_switch_to_buffer_by_number (t_gui_window *, int);
-extern void gui_move_buffer_to_number (t_gui_window *, int);
+extern t_gui_line *gui_line_new (t_gui_buffer *);
+extern int gui_word_strlen (t_gui_window *, char *);
+extern int gui_word_real_pos (t_gui_window *, char *, int);
+extern void gui_printf_internal (t_gui_buffer *, int, int, char *, ...);
+extern void gui_optimize_input_buffer_size (t_gui_buffer *);
+extern void gui_exec_action_dcc (t_gui_window *, char *);
+extern int gui_insert_string_input (t_gui_window *, char *, int);
+extern void gui_merge_servers (t_gui_window *);
+extern void gui_split_server (t_gui_window *);
+extern void gui_window_switch_server (t_gui_window *);
+extern void gui_buffer_switch_previous (t_gui_window *);
+extern void gui_buffer_switch_next (t_gui_window *);
+extern void gui_window_switch_previous (t_gui_window *);
+extern void gui_window_switch_next (t_gui_window *);
+extern void gui_window_switch_by_buffer (t_gui_window *, int);
+extern void gui_buffer_switch_dcc (t_gui_window *);
+extern t_gui_buffer *gui_buffer_switch_by_number (t_gui_window *, int);
+extern void gui_buffer_move_to_number (t_gui_window *, int);
 extern void gui_window_print_log (t_gui_window *);
 extern void gui_buffer_print_log (t_gui_buffer *);

+/* GUI independent functions: actions */
+
+extern void gui_action_clipboard_copy (char *, int);
+extern void gui_action_clipboard_paste (t_gui_window *);
+extern void gui_action_return (t_gui_window *);
+extern void gui_action_tab (t_gui_window *);
+extern void gui_action_backspace (t_gui_window *);
+extern void gui_action_delete (t_gui_window *);
+extern void gui_action_delete_previous_word (t_gui_window *);
+extern void gui_action_delete_next_word (t_gui_window *);
+extern void gui_action_delete_begin_of_line (t_gui_window *);
+extern void gui_action_delete_end_of_line (t_gui_window *);
+extern void gui_action_delete_line (t_gui_window *);
+extern void gui_action_transpose_chars (t_gui_window *);
+extern void gui_action_home (t_gui_window *);
+extern void gui_action_end (t_gui_window *);
+extern void gui_action_left (t_gui_window *);
+extern void gui_action_previous_word (t_gui_window *);
+extern void gui_action_right (t_gui_window *);
+extern void gui_action_next_word (t_gui_window *);
+extern void gui_action_up (t_gui_window *);
+extern void gui_action_up_global (t_gui_window *);
+extern void gui_action_down (t_gui_window *);
+extern void gui_action_down_global (t_gui_window *);
+extern void gui_action_page_up (t_gui_window *);
+extern void gui_action_page_down (t_gui_window *);
+extern void gui_action_nick_beginning (t_gui_window *);
+extern void gui_action_nick_end (t_gui_window *);
+extern void gui_action_nick_page_up (t_gui_window *);
+extern void gui_action_nick_page_down (t_gui_window *);
+extern void gui_action_jump_smart (t_gui_window *);
+extern void gui_action_jump_dcc (t_gui_window *);
+extern void gui_action_jump_last_buffer (t_gui_window *);
+extern void gui_action_jump_server (t_gui_window *);
+extern void gui_action_jump_next_server (t_gui_window *);
+extern void gui_action_switch_server (t_gui_window *);
+extern void gui_action_scroll_previous_highlight (t_gui_window *);
+extern void gui_action_scroll_next_highlight (t_gui_window *);
+extern void gui_action_scroll_unread (t_gui_window *);
+extern void gui_action_hotlist_clear (t_gui_window *);
+extern void gui_action_infobar_clear (t_gui_window *);
+extern void gui_action_refresh_screen ();
+extern void gui_action_grab_key (t_gui_window *);
+
 /* GUI independent functions: keys */

 extern void gui_key_init ();
@@ -379,11 +493,14 @@ extern void gui_key_free_all ();
 /* GUI dependant functions: display */

 extern int gui_assign_color (int *, char *);
-extern int gui_get_color_by_name (char *);
-extern char *gui_get_color_by_value (int);
+extern char *gui_get_color_name (int);
+extern unsigned char *gui_color_decode (unsigned char *, int);
+extern unsigned char *gui_color_decode_for_user_entry (unsigned char *);
+extern unsigned char *gui_color_encode (unsigned char *);
 extern int gui_buffer_has_nicklist (t_gui_buffer *);
 extern void gui_calculate_pos_size (t_gui_window *);
 extern void gui_draw_buffer_title (t_gui_buffer *, int);
+extern char *gui_word_get_next_char (t_gui_window *, unsigned char *, int);
 extern void gui_draw_buffer_chat (t_gui_buffer *, int);
 extern void gui_draw_buffer_nick (t_gui_buffer *, int);
 extern void gui_draw_buffer_status (t_gui_buffer *, int);
@@ -393,28 +510,31 @@ extern void gui_draw_buffer_input (t_gui_buffer *, int);
 extern void gui_redraw_buffer (t_gui_buffer *);
 extern void gui_switch_to_buffer (t_gui_window *, t_gui_buffer *);
 extern t_gui_buffer *gui_get_dcc_buffer (t_gui_window *);
-extern void gui_input_page_up (t_gui_window *);
-extern void gui_input_page_down (t_gui_window *);
-extern void gui_input_nick_beginning (t_gui_window *);
-extern void gui_input_nick_end (t_gui_window *);
-extern void gui_input_nick_page_up (t_gui_window *);
-extern void gui_input_nick_page_down (t_gui_window *);
-extern void gui_curses_resize_handler ();
+extern void gui_window_page_up (t_gui_window *);
+extern void gui_window_page_down (t_gui_window *);
+extern void gui_window_nick_beginning (t_gui_window *);
+extern void gui_window_nick_end (t_gui_window *);
+extern void gui_window_nick_page_up (t_gui_window *);
+extern void gui_window_nick_page_down (t_gui_window *);
 extern void gui_window_init_subwindows (t_gui_window *);
-extern void gui_window_split_horiz (t_gui_window *);
-extern void gui_window_split_vertic (t_gui_window *);
-extern int gui_window_merge_up (t_gui_window *);
-extern int gui_window_merge_down (t_gui_window *);
-extern int gui_window_merge_left (t_gui_window *);
-extern int gui_window_merge_right (t_gui_window *);
-extern void gui_window_merge_auto (t_gui_window *);
+extern void gui_refresh_windows ();
+extern void gui_window_split_horiz (t_gui_window *, int);
+extern void gui_window_split_vertic (t_gui_window *, int);
+extern void gui_window_resize (t_gui_window *, int);
+extern int gui_window_merge (t_gui_window *);
 extern void gui_window_merge_all (t_gui_window *);
+extern void gui_window_switch_up (t_gui_window *);
+extern void gui_window_switch_down (t_gui_window *);
+extern void gui_window_switch_left (t_gui_window *);
+extern void gui_window_switch_right (t_gui_window *);
+extern void gui_refresh_screen ();
 extern void gui_pre_init (int *, char **[]);
-extern void gui_init_colors ();
+extern void gui_init_color_pairs ();
+extern void gui_rebuild_weechat_colors ();
 extern void gui_set_window_title ();
+extern void gui_reset_window_title ();
 extern void gui_init ();
 extern void gui_end ();
-extern void gui_printf_type_color (/*@null@*/ t_gui_buffer *, int, int, char *, ...);
 extern void gui_input_default_key_bindings ();
 extern void gui_main_loop ();

@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2005 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2006 FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -12,5 +12,5 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */


@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */


@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2005 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2006 FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -12,7 +12,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #

 INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\"
@@ -22,7 +22,6 @@ bin_PROGRAMS = weechat-wxwidgets
 weechat_wxwidgets_LDADD = ../lib_weechat_gui_common.a \
                       ../../common/lib_weechat_main.a \
                       ../../irc/lib_weechat_irc.a \
-                       $(WXWIDGETS_LIBS) \
                       ../../plugins/lib_weechat_plugins.a $(PLUGINS_LIBS)

 weechat_wxwidgets_SOURCES = gui-display.c \
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

 /* gui-display.c: display functions for wxWidgets GUI */
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

 /* gui-input: user input functions for wxWidgets GUI */
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2005 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2006 FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -12,10 +12,10 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #

-INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\"
+INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\" $(GNUTLS_CFLAGS)

 noinst_LIBRARIES = lib_weechat_irc.a

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

 /* irc-channel.c: manages a chat (channel or private chat) */
@@ -30,6 +30,8 @@

 #include "../common/weechat.h"
 #include "irc.h"
+#include "../common/utf8.h"
+#include "../common/weeconfig.h"
 #include "../gui/gui.h"


@@ -41,8 +43,7 @@ char *channel_modes = "iklmnst";
 */

 t_irc_channel *
-channel_new (t_irc_server *server, int channel_type, char *channel_name,
-             int switch_to_buffer)
+channel_new (t_irc_server *server, int channel_type, char *channel_name)
 {
    t_irc_channel *new_channel;
    
@@ -58,8 +59,9 @@ channel_new (t_irc_server *server, int channel_type, char *channel_name,
    new_channel->dcc_chat = NULL;
    new_channel->name = strdup (channel_name);
    new_channel->topic = NULL;
-    memset (new_channel->modes, ' ', sizeof (new_channel->modes));
-    new_channel->modes[sizeof (new_channel->modes) - 1] = '\0';
+    new_channel->modes = (char *) malloc (NUM_CHANNEL_MODES + 1);
+    memset (new_channel->modes, ' ', NUM_CHANNEL_MODES);
+    new_channel->modes[NUM_CHANNEL_MODES] = '\0';
    new_channel->limit = 0;
    new_channel->key = NULL;
    new_channel->nicks_count = 0;
@@ -75,8 +77,6 @@ channel_new (t_irc_server *server, int channel_type, char *channel_name,
    else
        server->channels = new_channel;
    server->last_channel = new_channel;
-
-    gui_buffer_new (gui_current_window, server, new_channel, 0, switch_to_buffer);
    
    /* all is ok, return address of new channel */
    return new_channel;
@@ -173,6 +173,143 @@ string_is_channel (char *string)
    return (strpbrk (first_char, CHANNEL_PREFIX)) ? 1 : 0;    
 }

+/*
+ * channel_get_charset_decode_iso: get decode iso value for channel
+ *                                 if not found for channel, look for server
+ *                                 if not found for server, look for global
+ */
+
+char *
+channel_get_charset_decode_iso (t_irc_server *server, t_irc_channel *channel)
+{
+    char *pos, *result;
+    int length;
+    
+    if (!server)
+        return (cfg_look_charset_decode_iso) ?
+            strdup (cfg_look_charset_decode_iso) : strdup ("");
+    
+    if (!channel)
+        return server_get_charset_decode_iso (server);
+    
+    config_option_list_get_value (&(server->charset_decode_iso),
+                                  channel->name, &pos, &length);
+    if (pos && (length > 0))
+    {
+        result = strdup (pos);
+        result[length] = '\0';
+        return result;
+    }
+    
+    return server_get_charset_decode_iso (server);
+}
+
+/*
+ * channel_get_charset_decode_utf: get decode utf value for channel
+ *                                 if not found for channel, look for server
+ *                                 if not found for server, look for global
+ */
+
+char *
+channel_get_charset_decode_utf (t_irc_server *server, t_irc_channel *channel)
+{
+    char *pos, *result;
+    int length;
+    
+    if (!server)
+        return (cfg_look_charset_decode_utf) ?
+            strdup (cfg_look_charset_decode_utf) : strdup ("");
+    
+    if (!channel)
+        return server_get_charset_decode_utf (server);
+    
+    config_option_list_get_value (&(server->charset_decode_utf),
+                                  channel->name, &pos, &length);
+    if (pos && (length > 0))
+    {
+        result = strdup (pos);
+        result[length] = '\0';
+        return result;
+    }
+    
+    return server_get_charset_decode_utf (server);
+}
+
+/*
+ * channel_get_charset_encode: get encode value for channel
+ *                             if not found for channel, look for server
+ *                             if not found for server, look for global
+ */
+
+char *
+channel_get_charset_encode (t_irc_server *server, t_irc_channel *channel)
+{
+    char *pos, *result;
+    int length;
+    
+    if (!server)
+        return (cfg_look_charset_encode) ?
+            strdup (cfg_look_charset_encode) : strdup ("");
+    
+    if (!channel)
+        return server_get_charset_encode (server);
+    
+    config_option_list_get_value (&(server->charset_encode),
+                                  channel->name, &pos, &length);
+    if (pos && (length > 0))
+    {
+        result = strdup (pos);
+        result[length] = '\0';
+        return result;
+    }
+    
+    return server_get_charset_encode (server);
+}
+
+/*
+ * channel_iconv_decode: convert string to local charset
+ */
+
+char *
+channel_iconv_decode (t_irc_server *server, t_irc_channel *channel, char *string)
+{
+    char *from_charset, *string2;
+    
+    if (!local_utf8 || !utf8_is_valid (string))
+    {
+        if (local_utf8)
+            from_charset = channel_get_charset_decode_iso (server, channel);
+        else
+            from_charset = channel_get_charset_decode_utf (server, channel);
+        string2 = weechat_iconv (from_charset,
+                                 (cfg_look_charset_internal && cfg_look_charset_internal[0]) ?
+                                 cfg_look_charset_internal : local_charset,
+                                 string);
+        free (from_charset);
+        return string2;
+    }
+    else
+        return strdup (string);
+}
+
+/*
+ *
+ */
+
+char *
+channel_iconv_encode (t_irc_server *server, t_irc_channel *channel, char *string)
+{
+    char *to_charset, *string2;
+    
+    to_charset = channel_get_charset_encode (server, channel);
+    string2 = weechat_iconv ((cfg_look_charset_internal && cfg_look_charset_internal[0]) ?
+                             cfg_look_charset_internal : local_charset,
+                             to_charset,
+                             string);
+    free (to_charset);
+    return string2;
+}
+
 /*
 * channel_remove_away: remove away for all nicks on a channel
 */
@@ -182,11 +319,11 @@ channel_remove_away (t_irc_channel *channel)
 {
    t_irc_nick *ptr_nick;
    
-    if (channel->type == CHAT_CHANNEL)
+    if (channel->type == CHANNEL_TYPE_CHANNEL)
    {
        for (ptr_nick = channel->nicks; ptr_nick; ptr_nick = ptr_nick->next_nick)
        {
-            ptr_nick->is_away = 0;
+            NICK_SET_FLAG(ptr_nick, 0, NICK_AWAY);
        }
        gui_draw_buffer_nick (channel->buffer, 0);
    }
@@ -199,7 +336,7 @@ channel_remove_away (t_irc_channel *channel)
 void
 channel_check_away (t_irc_server *server, t_irc_channel *channel)
 {
-    if (channel->type == CHAT_CHANNEL)
+    if (channel->type == CHANNEL_TYPE_CHANNEL)
    {
        channel->checking_away++;
        server_sendf (server, "WHO %s\r\n", channel->name);
@@ -215,7 +352,7 @@ channel_set_away (t_irc_channel *channel, char *nick, int is_away)
 {
    t_irc_nick *ptr_nick;
    
-    if (channel->type == CHAT_CHANNEL)
+    if (channel->type == CHANNEL_TYPE_CHANNEL)
    {
        ptr_nick = nick_search (channel, nick);
        if (ptr_nick)
@@ -234,10 +371,11 @@ channel_create_dcc (t_irc_dcc *ptr_dcc)
    
    ptr_channel = channel_search (ptr_dcc->server, ptr_dcc->nick);
    if (!ptr_channel)
-        ptr_channel = channel_new (ptr_dcc->server, CHAT_PRIVATE,
-                                   ptr_dcc->nick, 0);
+        ptr_channel = channel_new (ptr_dcc->server, CHANNEL_TYPE_PRIVATE,
+                                   ptr_dcc->nick);
    if (!ptr_channel)
        return 0;
+    gui_buffer_new (gui_current_window, ptr_dcc->server, ptr_channel, 0, 0);
    
    if (ptr_channel->dcc_chat &&
        (!DCC_ENDED(((t_irc_dcc *)(ptr_channel->dcc_chat))->status)))
@@ -306,44 +444,6 @@ channel_get_notify_level (t_irc_server *server, t_irc_channel *channel)
        return notify;
 }

-/*
- * server_remove_notify_level: remove channel notify from list
- */
-
-void
-channel_remove_notify_level (t_irc_server *server, t_irc_channel *channel)
-{
-    char *name, *pos, *pos2;
-    
-    if ((!server) || (!channel))
-        return;
-    
-    name = (char *) malloc (strlen (channel->name) + 2);
-    strcpy (name, channel->name);
-    strcat (name, ":");
-    pos = strstr (server->notify_levels, name);
-    free (name);
-    if (pos)
-    {
-        pos2 = pos + strlen (channel->name);
-        if (pos2[0] == ':')
-        {
-            pos2++;
-            if (pos2[0])
-            {
-                pos2++;
-                if (pos2[0] == ',')
-                    pos2++;
-                if (!pos2[0] && (pos != server->notify_levels))
-                    pos--;
-                strcpy (pos, pos2);
-                server->notify_levels = (char *) realloc (server->notify_levels,
-                                                          strlen (server->notify_levels) + 1);
-            }
-        }
-    }
-}
-
 /*
 * server_set_notify_level: set channel notify level
 */
@@ -351,52 +451,19 @@ channel_remove_notify_level (t_irc_server *server, t_irc_channel *channel)
 void
 channel_set_notify_level (t_irc_server *server, t_irc_channel *channel, int notify)
 {
-    char *name, *pos, *pos2, level_string[2];
+    char level_string[2];
    
    if ((!server) || (!channel))
        return;
    
    if (notify == NOTIFY_LEVEL_DEFAULT)
-    {
-        channel_remove_notify_level (server, channel);
-        return;
-    }
-    
-    if (!server->notify_levels)
-    {
-        server->notify_levels = (char *) malloc (strlen (channel->name) + 3);
-        server->notify_levels[0] = '\0';
-    }
+        config_option_list_remove (&(server->notify_levels), channel->name);
    else
    {
-        name = (char *) malloc (strlen (channel->name) + 2);
-        strcpy (name, channel->name);
-        strcat (name, ":");
-        pos = strstr (server->notify_levels, name);
-        free (name);
-        if (pos)
-        {
-            pos2 = pos + strlen (channel->name) + 1;
-            if (pos2[0])
-            {
-                pos2[0] = '0' + notify;
-                return;
-            }
-        }
-        /* realloc notify list to add channel */
-        server->notify_levels = (char *) realloc (server->notify_levels,
-                                                  strlen (server->notify_levels) + 1 +
-                                                  strlen (channel->name) + 2 + 1);
+        level_string[0] = notify + '0';
+        level_string[1] = '\0';
+        config_option_list_set (&(server->notify_levels), channel->name, level_string);
    }
-    
-    /* channel not in notify list => add it */
-    if (server->notify_levels[0])
-        strcat (server->notify_levels, ",");
-    strcat (server->notify_levels, channel->name);
-    strcat (server->notify_levels, ":");
-    level_string[0] = notify + '0';
-    level_string[1] = '\0';
-    strcat (server->notify_levels, level_string);
 }

 /*
@@ -406,17 +473,17 @@ channel_set_notify_level (t_irc_server *server, t_irc_channel *channel, int noti
 void
 channel_print_log (t_irc_channel *channel)
 {
-    wee_log_printf ("=> channel %s (addr:0x%X)]\n", channel->name, channel);
-    wee_log_printf ("     type . . . . : %d\n",     channel->type);
-    wee_log_printf ("     dcc_chat . . : 0x%X\n",   channel->dcc_chat);
-    wee_log_printf ("     topic. . . . : '%s'\n",   channel->topic);
-    wee_log_printf ("     modes. . . . : '%s'\n",   channel->modes);
-    wee_log_printf ("     limit. . . . : %d\n",     channel->limit);
-    wee_log_printf ("     key. . . . . : '%s'\n",   channel->key);
-    wee_log_printf ("     checking_away: %d\n",     channel->checking_away);
-    wee_log_printf ("     nicks. . . . : 0x%X\n",   channel->nicks);
-    wee_log_printf ("     last_nick. . : 0x%X\n",   channel->last_nick);
-    wee_log_printf ("     buffer . . . : 0x%X\n",   channel->buffer);
-    wee_log_printf ("     prev_channel : 0x%X\n",   channel->prev_channel);
-    wee_log_printf ("     next_channel : 0x%X\n",   channel->next_channel);
+    weechat_log_printf ("=> channel %s (addr:0x%X)]\n", channel->name, channel);
+    weechat_log_printf ("     type . . . . : %d\n",     channel->type);
+    weechat_log_printf ("     dcc_chat . . : 0x%X\n",   channel->dcc_chat);
+    weechat_log_printf ("     topic. . . . : '%s'\n",   channel->topic);
+    weechat_log_printf ("     modes. . . . : '%s'\n",   channel->modes);
+    weechat_log_printf ("     limit. . . . : %d\n",     channel->limit);
+    weechat_log_printf ("     key. . . . . : '%s'\n",   channel->key);
+    weechat_log_printf ("     checking_away: %d\n",     channel->checking_away);
+    weechat_log_printf ("     nicks. . . . : 0x%X\n",   channel->nicks);
+    weechat_log_printf ("     last_nick. . : 0x%X\n",   channel->last_nick);
+    weechat_log_printf ("     buffer . . . : 0x%X\n",   channel->buffer);
+    weechat_log_printf ("     prev_channel : 0x%X\n",   channel->prev_channel);
+    weechat_log_printf ("     next_channel : 0x%X\n",   channel->next_channel);
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

 /* irc-commands.c: implementation of IRC commands, according to
@@ -34,454 +34,543 @@ t_irc_command irc_commands[] =
 { { "admin", N_("find information about the administrator of the server"),
    N_("[target]"),
    N_("target: server"),
-    0, 1, 1, NULL, irc_cmd_send_admin, NULL },
+    NULL, 0, 1, 1, NULL, irc_cmd_send_admin, NULL },
  { "ame", N_("send a CTCP action to all channels of all connected servers"),
    N_("message"),
    N_("message: message to send"),
-    1, MAX_ARGS, 1, NULL, irc_cmd_send_ame, NULL },
+    "", 1, MAX_ARGS, 1, NULL, irc_cmd_send_ame, NULL },
  { "amsg", N_("send message to all channels of all connected servers"),
    N_("text"),
    N_("text: text to send"),
-    1, MAX_ARGS, 1, NULL, irc_cmd_send_amsg, NULL },
+    "", 1, MAX_ARGS, 1, NULL, irc_cmd_send_amsg, NULL },
  { "away", N_("toggle away status"),
    N_("[-all] [message]"),
-    N_("-all: toggle away status on all connected servers\n"
-    "message: message for away (if no message is given, away status is removed)"),
-    0, MAX_ARGS, 1, NULL, irc_cmd_send_away, NULL },
+    N_("   -all: toggle away status on all connected servers\n"
+       "message: message for away (if no message is given, away status is removed)"),
+    "%y", 0, MAX_ARGS, 1, NULL, irc_cmd_send_away, NULL },
  { "ban", N_("bans nicks or hosts"),
    N_("[channel] [nickname [nickname ...]]"),
-    N_("channel: channel for ban\n"
+    N_(" channel: channel for ban\n"
       "nickname: user or host to ban"),
-    0, MAX_ARGS, 1, NULL, irc_cmd_send_ban, NULL },
+    "", 0, MAX_ARGS, 1, NULL, irc_cmd_send_ban, NULL },
  { "ctcp", N_("send a CTCP message (Client-To-Client Protocol)"),
    N_("nickname type [arguments]"),
-    N_("nickname: user to send CTCP to\n"
-       "type: CTCP type (examples: \"version\", \"ping\", ..)\n"
+    N_(" nickname: user to send CTCP to\n"
+       "     type: CTCP type (examples: \"version\", \"ping\", ..)\n"
       "arguments: arguments for CTCP"),
-    2, MAX_ARGS, 1, NULL, irc_cmd_send_ctcp, NULL },
+    "%n action|ping|version", 2, MAX_ARGS, 1, NULL, irc_cmd_send_ctcp, NULL },
  { "dcc", N_("starts DCC (file or chat) or close chat"),
    N_("action [nickname [file]]"),
-    N_("action: 'send' (file) or 'chat' or 'close' (chat)\n"
-    "nickname: nickname to send file or chat\n"
-    "file: filename (on local host)"),
-    1, MAX_ARGS, 1, NULL, irc_cmd_send_dcc, NULL },
+    N_("  action: 'send' (file) or 'chat' or 'close' (chat)\n"
+       "nickname: nickname to send file or chat\n"
+       "    file: filename (on local host)"),
+    "chat|send|close %n %f", 1, MAX_ARGS, 1, NULL, irc_cmd_send_dcc, NULL },
  { "dehalfop", N_("removes half channel operator status from nickname(s)"),
    N_("[nickname [nickname]]"), "",
-    0, MAX_ARGS, 1, irc_cmd_send_dehalfop, NULL, NULL },
+    "", 0, MAX_ARGS, 1, irc_cmd_send_dehalfop, NULL, NULL },
  { "deop", N_("removes channel operator status from nickname(s)"),
    N_("[nickname [nickname]]"), "",
-    0, MAX_ARGS, 1, irc_cmd_send_deop, NULL, NULL },
+    "", 0, MAX_ARGS, 1, irc_cmd_send_deop, NULL, NULL },
  { "devoice", N_("removes voice from nickname(s)"),
    N_("[nickname [nickname]]"), "",
-    0, MAX_ARGS, 1, irc_cmd_send_devoice, NULL, NULL },
-  { "die", N_("shutdown the server"),
-    "", "",
-    0, 0, 1, NULL, irc_cmd_send_die, NULL },
-  { "error", N_("error received from IRC server"), "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_error },
+    "", 0, MAX_ARGS, 1, irc_cmd_send_devoice, NULL, NULL },
+  { "die", N_("shutdown the server"), "", "",
+    NULL, 0, 0, 1, NULL, irc_cmd_send_die, NULL },
+  { "error", N_("error received from IRC server"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_error },
  { "halfop", N_("gives half channel operator status to nickname(s)"),
    N_("[nickname [nickname]]"), "",
-    0, MAX_ARGS, 1, irc_cmd_send_halfop, NULL, NULL },
+    "", 0, MAX_ARGS, 1, irc_cmd_send_halfop, NULL, NULL },
  { "info", N_("get information describing the server"),
    N_("[target]"),
    N_("target: server name"),
-    0, 1, 1, NULL, irc_cmd_send_info, NULL },
+    NULL, 0, 1, 1, NULL, irc_cmd_send_info, NULL },
  { "invite", N_("invite a nick on a channel"),
    N_("nickname channel"),
    N_("nickname: nick to invite\n"
-       "channel: channel to invite"),
-    1, 2, 1, irc_cmd_send_invite, NULL, irc_cmd_recv_invite },
+       " channel: channel to invite"),
+    "%n %c", 1, 2, 1, irc_cmd_send_invite, NULL, irc_cmd_recv_invite },
  { "ison", N_("check if a nickname is currently on IRC"),
    N_("nickname [nickname ...]"),
    N_("nickname: nickname"),
-    1, MAX_ARGS, 1, NULL, irc_cmd_send_ison, NULL },
+    "", 1, MAX_ARGS, 1, NULL, irc_cmd_send_ison, NULL },
  { "join", N_("join a channel"),
    N_("channel[,channel] [key[,key]]"),
    N_("channel: channel name to join\n"
-       "key: key to join the channel"),
-    1, MAX_ARGS, 1, NULL, irc_cmd_send_join, irc_cmd_recv_join },
+       "    key: key to join the channel"),
+    NULL, 1, MAX_ARGS, 1, NULL, irc_cmd_send_join, irc_cmd_recv_join },
  { "kick", N_("forcibly remove a user from a channel"),
    N_("[channel] nickname [comment]"),
-    N_("channel: channel where user is\n"
+    N_(" channel: channel where user is\n"
       "nickname: nickname to kick\n"
-       "comment: comment for kick"),
-    1, MAX_ARGS, 1, NULL, irc_cmd_send_kick, irc_cmd_recv_kick },
+       " comment: comment for kick"),
+    "%n %-", 1, MAX_ARGS, 1, NULL, irc_cmd_send_kick, irc_cmd_recv_kick },
  { "kickban", N_("kicks and bans a nick from a channel"),
    N_("[channel] nickname [comment]"),
-    N_("channel: channel where user is\n"
+    N_(" channel: channel where user is\n"
       "nickname: nickname to kick and ban\n"
-       "comment: comment for kick"),
-    1, MAX_ARGS, 1, NULL, irc_cmd_send_kickban, NULL },
+       " comment: comment for kick"),
+    "%n %-", 1, MAX_ARGS, 1, NULL, irc_cmd_send_kickban, NULL },
  { "kill", N_("close client-server connection"),
    N_("nickname comment"),
    N_("nickname: nickname\n"
-       "comment: comment for kill"),
-    2, MAX_ARGS, 1, NULL, irc_cmd_send_kill, irc_cmd_recv_kill },
+       " comment: comment for kill"),
+    "%n %-", 2, MAX_ARGS, 1, NULL, irc_cmd_send_kill, irc_cmd_recv_kill },
  { "links", N_("list all servernames which are known by the server answering the query"),
    N_("[[server] server_mask]"),
-    N_("server: this server should answer the query\n"
-    "server_mask: list of servers must match this mask"),
-    0, 2, 1, NULL, irc_cmd_send_links, NULL },
+    N_("     server: this server should answer the query\n"
+       "server_mask: list of servers must match this mask"),
+    NULL, 0, 2, 1, NULL, irc_cmd_send_links, NULL },
  { "list", N_("list channels and their topic"),
    N_("[channel[,channel] [server]]"),
    N_("channel: channel to list\nserver: server name"),
-    0, MAX_ARGS, 1, NULL, irc_cmd_send_list, NULL },
+    NULL, 0, MAX_ARGS, 1, NULL, irc_cmd_send_list, NULL },
  { "lusers", N_("get statistics about the size of the IRC network"),
    N_("[mask [target]]"),
-    N_("mask: servers matching the mask only\n"
-    "target: server for forwarding request"),
-    0, 2, 1, NULL, irc_cmd_send_lusers, NULL },
+    N_("  mask: servers matching the mask only\n"
+       "target: server for forwarding request"),
+    NULL, 0, 2, 1, NULL, irc_cmd_send_lusers, NULL },
  { "me", N_("send a CTCP action to the current channel"),
    N_("message"),
    N_("message: message to send"),
-    0, MAX_ARGS, 1, NULL, irc_cmd_send_me, NULL },
+    "", 0, MAX_ARGS, 1, NULL, irc_cmd_send_me, NULL },
  { "mode", N_("change channel or user mode"),
    N_("{ channel {[+|-]|o|p|s|i|t|n|b|v} [limit] [user] [ban mask] } | "
-    "{ nickname {[+|-]|i|w|s|o} }"),
+       "{ nickname {[+|-]|i|w|s|o} }"),
    N_("channel modes:\n"
-    "  channel: channel name to modify\n"
-    "  o: give/take channel operator privileges\n"
-    "  p: private channel flag\n"
-    "  s: secret channel flag\n"
-    "  i: invite-only channel flag\n"
-    "  t: topic settable by channel operator only flag\n"
-    "  n: no messages to channel from clients on the outside\n"
-    "  m: moderated channel\n"
-    "  l: set the user limit to channel\n"
-    "  b: set a ban mask to keep users out\n"
-    "  v: give/take the ability to speak on a moderated channel\n"
-    "  k: set a channel key (password)\n"
-    "user modes:\n"
-    "  nickname: nickname to modify\n"
-    "  i: mark a user as invisible\n"
-    "  s: mark a user for receive server notices\n"
-    "  w: user receives wallops\n"
-    "  o: operator flag"),
-    1, MAX_ARGS, 1, NULL, irc_cmd_send_mode, irc_cmd_recv_mode },
+       "  channel: channel name to modify\n"
+       "  o: give/take channel operator privileges\n"
+       "  p: private channel flag\n"
+       "  s: secret channel flag\n"
+       "  i: invite-only channel flag\n"
+       "  t: topic settable by channel operator only flag\n"
+       "  n: no messages to channel from clients on the outside\n"
+       "  m: moderated channel\n"
+       "  l: set the user limit to channel\n"
+       "  b: set a ban mask to keep users out\n"
+       "  e: set exception mask\n"
+       "  v: give/take the ability to speak on a moderated channel\n"
+       "  k: set a channel key (password)\n"
+       "user modes:\n"
+       "  nickname: nickname to modify\n"
+       "  i: mark a user as invisible\n"
+       "  s: mark a user for receive server notices\n"
+       "  w: user receives wallops\n"
+       "  o: operator flag"),
+    "", 1, MAX_ARGS, 1, NULL, irc_cmd_send_mode, irc_cmd_recv_mode },
  { "motd", N_("get the \"Message Of The Day\""),
    N_("[target]"),
    N_("target: server name"),
-    0, 1, 1, NULL, irc_cmd_send_motd, NULL },
+    NULL, 0, 1, 1, NULL, irc_cmd_send_motd, NULL },
  { "msg", N_("send message to a nick or channel"),
    N_("receiver[,receiver] text"),
    N_("receiver: nick or channel (may be mask, '*' = current channel)\n"
-    "text: text to send"),
-    2, MAX_ARGS, 1, NULL, irc_cmd_send_msg, NULL },
+       "text: text to send"),
+    "", 2, MAX_ARGS, 1, NULL, irc_cmd_send_msg, NULL },
  { "names", N_("list nicknames on channels"),
-    N_("[channel[,channel]]"), N_("channel: channel name"),
-    0, 1, 1, NULL, irc_cmd_send_names, NULL },
+    N_("[channel[,channel]]"),
+    N_("channel: channel name"),
+    NULL, 0, 1, 1, NULL, irc_cmd_send_names, NULL },
  { "nick", N_("change current nickname"),
    N_("[-all] nickname"),
-    N_("-all: set new nickname for all connected servers\n"
-    "nickname: new nickname"),
-    1, 2, 1, irc_cmd_send_nick, NULL, irc_cmd_recv_nick },
+    N_("    -all: set new nickname for all connected servers\n"
+       "nickname: new nickname"),
+    NULL, 1, 2, 0, irc_cmd_send_nick, NULL, irc_cmd_recv_nick },
  { "notice", N_("send notice message to user"),
-    N_("nickname text"), N_("nickname: user to send notice to\ntext: text to send"),
-    2, MAX_ARGS, 1, NULL, irc_cmd_send_notice, irc_cmd_recv_notice },
+    N_("nickname text"),
+    N_("nickname: user to send notice to\n"
+       "    text: text to send"),
+    "%n %-", 2, MAX_ARGS, 1, NULL, irc_cmd_send_notice, irc_cmd_recv_notice },
  { "op", N_("gives channel operator status to nickname(s)"),
    N_("nickname [nickname]"), "",
-    1, MAX_ARGS, 1, irc_cmd_send_op, NULL, NULL },
+    "", 1, MAX_ARGS, 1, irc_cmd_send_op, NULL, NULL },
  { "oper", N_("get operator privileges"),
    N_("user password"),
    N_("user/password: used to get privileges on current IRC server"),
-    2, 2, 1, NULL, irc_cmd_send_oper, NULL },
+    NULL, 2, 2, 1, NULL, irc_cmd_send_oper, NULL },
  { "part", N_("leave a channel"),
    N_("[channel[,channel]] [part_message]"),
-    N_("channel: channel name to leave\n"
+    N_("     channel: channel name to leave\n"
       "part_message: part message (displayed to other users)"),
-    0, MAX_ARGS, 1, NULL, irc_cmd_send_part, irc_cmd_recv_part },
+    "%p", 0, MAX_ARGS, 1, NULL, irc_cmd_send_part, irc_cmd_recv_part },
  { "ping", N_("ping server"),
    N_("server1 [server2]"),
    N_("server1: server to ping\nserver2: forward ping to this server"),
-    1, 2, 1, NULL, irc_cmd_send_ping, irc_cmd_recv_ping },
+    NULL, 1, 2, 1, NULL, irc_cmd_send_ping, irc_cmd_recv_ping },
  { "pong", N_("answer to a ping message"),
    N_("daemon [daemon2]"),
-    N_("daemon: daemon who has responded to Ping message\n"
+    N_(" daemon: daemon who has responded to Ping message\n"
       "daemon2: forward message to this daemon"),
-    1, 2, 1, NULL, irc_cmd_send_pong, irc_cmd_recv_pong },
-  { "privmsg", N_("message received"),
-    "", "",
-    0, 0, 1, NULL, NULL, irc_cmd_recv_privmsg },
+    NULL, 1, 2, 1, NULL, irc_cmd_send_pong, irc_cmd_recv_pong },
+  { "privmsg", N_("message received"), "", "",
+    "", 0, 0, 1, NULL, NULL, irc_cmd_recv_privmsg },
  { "query", N_("send a private message to a nick"),
    N_("nickname [text]"),
    N_("nickname: nickname for private conversation\n"
-    "text: text to send"),
-    1, MAX_ARGS, 1, NULL, irc_cmd_send_query, NULL },
-  { "quit", N_("close all connections & quit"),
+       "    text: text to send"),
+    "%n %-", 1, MAX_ARGS, 1, NULL, irc_cmd_send_query, NULL },
+  { "quit", N_("close all connections and quit"),
    N_("[quit_message]"),
    N_("quit_message: quit message (displayed to other users)"),
-    0, MAX_ARGS, 0, NULL, irc_cmd_send_quit, irc_cmd_recv_quit },
+    "%q", 0, MAX_ARGS, 0, NULL, irc_cmd_send_quit, irc_cmd_recv_quit },
  { "quote", N_("send raw data to server without parsing"),
    N_("data"),
    N_("data: raw data to send"),
-    1, MAX_ARGS, 1, NULL, irc_cmd_send_quote, NULL },
-  { "rehash", N_("tell the server to reload its config file"),
-    "", "",
-    0, 0, 1, NULL, irc_cmd_send_rehash, NULL },
-  { "restart", N_("tell the server to restart itself"),
-    "", "",
-    0, 0, 1, NULL, irc_cmd_send_restart, NULL },
+    "", 1, MAX_ARGS, 1, NULL, irc_cmd_send_quote, NULL },
+  { "rehash", N_("tell the server to reload its config file"), "", "",
+    NULL, 0, 0, 1, NULL, irc_cmd_send_rehash, NULL },
+  { "restart", N_("tell the server to restart itself"), "", "",
+    NULL, 0, 0, 1, NULL, irc_cmd_send_restart, NULL },
  { "service", N_("register a new service"),
    N_("nickname reserved distribution type reserved info"),
    N_("distribution: visibility of service\n"
-    "type: reserved for future usage"),
-    6, 6, 1, NULL, irc_cmd_send_service, NULL },
+       "        type: reserved for future usage"),
+    NULL, 6, 6, 1, NULL, irc_cmd_send_service, NULL },
  { "servlist", N_("list services currently connected to the network"),
    N_("[mask [type]]"),
    N_("mask: list only services matching this mask\n"
       "type: list only services of this type"),
-    0, 2, 1, NULL, irc_cmd_send_servlist, NULL },
+    NULL, 0, 2, 1, NULL, irc_cmd_send_servlist, NULL },
  { "squery", N_("deliver a message to a service"),
    N_("service text"),
    N_("service: name of service\ntext: text to send"),
-    2, 2, 1, NULL, irc_cmd_send_squery, NULL },
+    NULL, 2, 2, 1, NULL, irc_cmd_send_squery, NULL },
  { "squit", N_("disconnect server links"),
    N_("server comment"),
-    N_("server: server name\ncomment: comment for quit"),
-    2, 2, 1, NULL, irc_cmd_send_squit, NULL },
+    N_( "server: server name\n"
+       "comment: comment for quit"),
+    NULL, 2, 2, 1, NULL, irc_cmd_send_squit, NULL },
  { "stats", N_("query statistics about server"),
    N_("[query [server]]"),
-    N_("query: c/h/i/k/l/m/o/y/u (see RFC1459)\nserver: server name"),
-    0, 2, 1, NULL, irc_cmd_send_stats, NULL },
+    N_(" query: c/h/i/k/l/m/o/y/u (see RFC1459)\n"
+       "server: server name"),
+    NULL, 0, 2, 1, NULL, irc_cmd_send_stats, NULL },
  { "summon", N_("give users who are on a host running an IRC server a message "
    "asking them to please join IRC"),
    N_("user [target [channel]]"),
-    N_("user: username\ntarget: server name\n"
+    N_("   user: username\ntarget: server name\n"
       "channel: channel name"),
-    1, 3, 1, NULL, irc_cmd_send_summon, NULL },
+    NULL, 1, 3, 1, NULL, irc_cmd_send_summon, NULL },
  { "time", N_("query local time from server"),
-    N_("[target]"), N_("target: query time from specified server"),
-    0, 1, 1, NULL, irc_cmd_send_time, NULL },
+    N_("[target]"),
+    N_("target: query time from specified server"),
+    NULL, 0, 1, 1, NULL, irc_cmd_send_time, NULL },
  { "topic", N_("get/set channel topic"),
    N_("[channel] [topic]"),
    N_("channel: channel name\ntopic: new topic for channel "
       "(if topic is \"-delete\" then topic is deleted)"),
-    0, MAX_ARGS, 1, NULL, irc_cmd_send_topic, irc_cmd_recv_topic },
+    "%t", 0, MAX_ARGS, 1, NULL, irc_cmd_send_topic, irc_cmd_recv_topic },
  { "trace", N_("find the route to specific server"),
-    N_("[target]"), N_("target: server"),
-    0, 1, 1, NULL, irc_cmd_send_trace, NULL },
+    N_("[target]"),
+    N_("target: server"),
+    NULL, 0, 1, 1, NULL, irc_cmd_send_trace, NULL },
  { "unban", N_("unbans nicks or hosts"),
    N_("[channel] nickname [nickname ...]"),
-    N_("channel: channel for unban\n"
+    N_(" channel: channel for unban\n"
       "nickname: user or host to unban"),
-    1, MAX_ARGS, 1, NULL, irc_cmd_send_unban, NULL },
+    "", 1, MAX_ARGS, 1, NULL, irc_cmd_send_unban, NULL },
  { "userhost", N_("return a list of information about nicknames"),
-    N_("nickname [nickname ...]"), N_("nickname: nickname"),
-    1, MAX_ARGS, 1, NULL, irc_cmd_send_userhost, NULL },
+    N_("nickname [nickname ...]"),
+    N_("nickname: nickname"),
+    NULL, 1, MAX_ARGS, 1, NULL, irc_cmd_send_userhost, NULL },
  { "users", N_("list of users logged into the server"),
-    N_("[target]"), N_("target: server"),
-    0, 1, 1, NULL, irc_cmd_send_users, NULL },
+    N_("[target]"),
+    N_("target: server"),
+    NULL, 0, 1, 1, NULL, irc_cmd_send_users, NULL },
  { "version", N_("gives the version info of nick or server (current or specified)"),
    N_("[server | nickname]"),
-    N_("server: server name\n"
+    N_("  server: server name\n"
       "nickname: nickname"),
-    0, 1, 1, NULL, irc_cmd_send_version, NULL },
+    NULL, 0, 1, 1, NULL, irc_cmd_send_version, NULL },
  { "voice", N_("gives voice to nickname(s)"),
    N_("[nickname [nickname]]"), "",
-    0, MAX_ARGS, 1, irc_cmd_send_voice, NULL, NULL },
+    "", 0, MAX_ARGS, 1, irc_cmd_send_voice, NULL, NULL },
  { "wallops", N_("send a message to all currently connected users who have "
    "set the 'w' user mode for themselves"),
-    N_("text"), N_("text to send"),
-    1, MAX_ARGS, 1, NULL, irc_cmd_send_wallops, NULL },
+    N_("text"),
+    N_("text to send"),
+    NULL, 1, MAX_ARGS, 1, NULL, irc_cmd_send_wallops, NULL },
  { "who", N_("generate a query which returns a list of information"),
    N_("[mask [\"o\"]]"),
    N_("mask: only information which match this mask\n"
-       "o: only operators are returned according to the mask supplied"),
-    0, 2, 1, NULL, irc_cmd_send_who, NULL },
+       "   o: only operators are returned according to the mask supplied"),
+    "%C", 0, 2, 1, NULL, irc_cmd_send_who, NULL },
  { "whois", N_("query information about user(s)"),
    N_("[server] nickname[,nickname]"),
-    N_("server: server name\n"
+    N_("  server: server name\n"
       "nickname: nickname (may be a mask)"),
-    1, MAX_ARGS, 1, NULL, irc_cmd_send_whois, NULL },
+    "", 1, MAX_ARGS, 1, NULL, irc_cmd_send_whois, NULL },
  { "whowas", N_("ask for information about a nickname which no longer exists"),
    N_("nickname [,nickname [,nickname ...]] [count [target]]"),
    N_("nickname: nickname to search\n"
-       "count: number of replies to return (full search if negative number)\n"
-       "target: reply should match this mask"),
-    1, MAX_ARGS, 1, NULL, irc_cmd_send_whowas, NULL },
-  { "001", N_("a server message"),        "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "002", N_("a server message"),        "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "003", N_("a server message"),        "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "004", N_("a server message"),        "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_004 },
-  { "005", N_("a server message"),        "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "020", N_("a server message"),        "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "042", N_("a server message"),        "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "212", N_("a server message"),        "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "219", N_("a server message"),        "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "221", N_("user mode string"),        "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_221 },
-  { "250", N_("a server message"),        "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "251", N_("a server message"),        "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "252", N_("a server message"),        "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "253", N_("a server message"),        "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "254", N_("a server message"),        "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "255", N_("a server message"),        "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "256", N_("a server message"),        "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "257", N_("a server message"),        "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "258", N_("a server message"),        "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "259", N_("a server message"),        "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "260", N_("a server message"),        "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "261", N_("a server message"),        "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "262", N_("a server message"),        "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "263", N_("a server message"),        "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "264", N_("a server message"),        "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "265", N_("a server message"),        "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "266", N_("a server message"),        "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "267", N_("a server message"),        "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "268", N_("a server message"),        "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "269", N_("a server message"),        "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "301", N_("away message"),            "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_301 },
-  { "302", N_("userhost"),                "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_302 },
-  { "303", N_("ison"),                    "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_303 },
-  { "305", N_("unaway"),                  "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_305 },
-  { "306", N_("now away"),                "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_306 },
-  { "307", N_("whois (registered nick)"), "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_307 },
-  { "311", N_("whois (user)"),            "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_311 },
-  { "312", N_("whois (server)"),          "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_312 },
-  { "313", N_("whois (operator)"),        "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_313 },
-  { "314", N_("whowas"),                  "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_314 },
-  { "315", N_("end of /who list"),        "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_315 },
-  { "317", N_("whois (idle)"),            "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_317 },
-  { "318", N_("whois (end)"),             "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_318 },
-  { "319", N_("whois (channels)"),        "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_319 },
-  { "320", N_("whois (identified user)"), "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_320 },
-  { "321", N_("/list start"),             "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_321 },  
-  { "322", N_("channel (for /list)"),     "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_322 },
-  { "323", N_("/list end"),               "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_323 },
-  { "324", N_("channel mode"),            "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_324 },
-  { "329", "???",                         "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_329 },
-  { "331", N_("no topic for channel"),    "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_331 },
+       "   count: number of replies to return (full search if negative number)\n"
+       "  target: reply should match this mask"),
+    "", 1, MAX_ARGS, 1, NULL, irc_cmd_send_whowas, NULL },
+  { "001", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "002", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "003", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "004", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_004 },
+  { "005", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "008", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "020", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "042", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "212", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "219", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "221", N_("user mode string"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_221 },
+  { "250", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "251", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "252", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "253", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "254", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "255", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "256", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "257", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "258", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "259", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "260", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "261", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "262", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "263", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "264", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "265", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "266", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "267", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "268", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "269", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "301", N_("away message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_301 },
+  { "302", N_("userhost"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_302 },
+  { "303", N_("ison"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_303 },
+  { "305", N_("unaway"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_305 },
+  { "306", N_("now away"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_306 },
+  { "307", N_("whois (registered nick)"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_307 },
+  { "311", N_("whois (user)"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_311 },
+  { "312", N_("whois (server)"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_312 },
+  { "313", N_("whois (operator)"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_313 },
+  { "314", N_("whowas"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_314 },
+  { "315", N_("end of /who list"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_315 },
+  { "317", N_("whois (idle)"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_317 },
+  { "318", N_("whois (end)"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_318 },
+  { "319", N_("whois (channels)"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_319 },
+  { "320", N_("whois (identified user)"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_320 },
+  { "321", N_("/list start"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_321 },  
+  { "322", N_("channel (for /list)"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_322 },
+  { "323", N_("/list end"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_323 },
+  { "324", N_("channel mode"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_324 },
+  { "329", "???", "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_329 },
+  { "331", N_("no topic for channel"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_331 },
  { "332", N_("topic of channel"),
    N_("channel :topic"),
    N_("channel: name of channel\n"
-       "topic: topic of the channel"),
-    2, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_332 },
-  { "333", N_("infos about topic (nick & date changed)"),
-    "", "",
-    0, 0, 1, NULL, NULL, irc_cmd_recv_333 },
-  { "341", N_("inviting"), "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_341 },
-  { "344", N_("channel reop"), "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_344 },
-  { "345", N_("end of channel reop list"),  "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_345 },
-  { "351", N_("server version"), "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_351 },
-  { "352", N_("who"), "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_352 },
+       "  topic: topic of the channel"),
+    NULL, 2, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_332 },
+  { "333", N_("infos about topic (nick and date changed)"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_333 },
+  { "341", N_("inviting"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_341 },
+  { "344", N_("channel reop"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_344 },
+  { "345", N_("end of channel reop list"),  "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_345 },
+  { "348", N_("channel exception list"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_348 },
+  { "349", N_("end of channel exception list"),  "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_349 },
+  { "351", N_("server version"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_351 },
+  { "352", N_("who"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_352 },
  { "353", N_("list of nicks on channel"),
    N_("channel :[[@|+]nick ...]"),
    N_("channel: name of channel\n"
-       "nick: nick on the channel"),
-    2, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_353 },
-  { "364", N_("links"),               "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "365", N_("end of /links list"),  "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "366", N_("end of /names list"),  "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_366 },
-  { "367", N_("banlist"),             "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_367 },
-  { "368", N_("end of banlist"),      "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_368 },
-  { "369", N_("end of /whowas list"), "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "371", N_("a server message"),    "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "372", N_("a server message"),    "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "373", N_("a server message"),    "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "374", N_("a server message"),    "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "375", N_("a server message"),    "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "376", N_("a server message"),    "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "391", N_("server local time"),   "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "401", N_("no such nick/channel"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "402", N_("no such server"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "403", N_("no such channel"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "404", N_("cannot send to channel"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "405", N_("too many channels"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "406", N_("was no such nick"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "407", N_("was no such nick"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "409", N_("no origin"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "410", N_("no services"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "411", N_("no recipient"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "412", N_("no text to send"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "413", N_("no toplevel"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "414", N_("wilcard in toplevel domain"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "421", N_("unknown command"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "422", N_("MOTD is missing"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "423", N_("no administrative info"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "424", N_("file error"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "431", N_("no nickname given"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "432", N_("erroneous nickname"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "433", N_("nickname already in use"),
-    "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_433 },
-  { "436", N_("nickname collision"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "438", N_("not authorized to change nickname"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_438 },
-  { "441", N_("user not in channel"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "442", N_("not on channel"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "443", N_("user already on channel"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "444", N_("user not logged in"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "445", N_("summon has been disabled"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "446", N_("users has been disabled"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "451", N_("you are not registered"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "461", N_("not enough parameters"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "462", N_("you may not register"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "463", N_("your host isn't among the privileged"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "464", N_("password incorrect"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "465", N_("you are banned from this server"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "467", N_("channel key already set"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "471", N_("channel is already full"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "472", N_("unknown mode char to me"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "473", N_("cannot join channel (invite only)"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "474", N_("cannot join channel (banned from channel)"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "475", N_("cannot join channel (bad channel key)"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "476", N_("bad channel mask"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "477", N_("channel doesn't support modes"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "481", N_("you're not an IRC operator"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "482", N_("you're not channel operator"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "483", N_("you can't kill a server!"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "484", N_("your connection is restricted!"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "485", N_("user is immune from kick/deop"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "491", N_("no O-lines for your host"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "501", N_("unknown mode flag"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "502", N_("can't change mode for other users"),
-    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
-  { "505", N_("a server message"), "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
-  { "671", N_("whois (secure connection)"),
-    "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_671 },
-  { NULL, NULL, NULL, NULL, 0, 0, 1, NULL, NULL, NULL }
+       "   nick: nick on the channel"),
+    NULL, 2, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_353 },
+  { "364", N_("links"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "365", N_("end of /links list"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "366", N_("end of /names list"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_366 },
+  { "367", N_("banlist"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_367 },
+  { "368", N_("end of banlist"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_368 },
+  { "369", N_("end of /whowas list"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "371", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "372", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "373", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "374", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "375", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "376", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "381", N_("you are now an IRC operator"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "382", N_("rehashing"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "391", N_("server local time"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "401", N_("no such nick/channel"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "402", N_("no such server"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "403", N_("no such channel"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "404", N_("cannot send to channel"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "405", N_("too many channels"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "406", N_("was no such nick"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "407", N_("was no such nick"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "409", N_("no origin"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "410", N_("no services"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "411", N_("no recipient"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "412", N_("no text to send"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "413", N_("no toplevel"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "414", N_("wilcard in toplevel domain"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "421", N_("unknown command"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "422", N_("MOTD is missing"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "423", N_("no administrative info"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "424", N_("file error"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "431", N_("no nickname given"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "432", N_("erroneous nickname"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "433", N_("nickname already in use"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_433 },
+  { "436", N_("nickname collision"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "438", N_("not authorized to change nickname"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_438 },
+  { "441", N_("user not in channel"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "442", N_("not on channel"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "443", N_("user already on channel"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "444", N_("user not logged in"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "445", N_("summon has been disabled"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "446", N_("users has been disabled"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "451", N_("you are not registered"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "461", N_("not enough parameters"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "462", N_("you may not register"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "463", N_("your host isn't among the privileged"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "464", N_("password incorrect"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "465", N_("you are banned from this server"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "467", N_("channel key already set"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "470", N_("forwarding to another channel"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "471", N_("channel is already full"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "472", N_("unknown mode char to me"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "473", N_("cannot join channel (invite only)"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "474", N_("cannot join channel (banned from channel)"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "475", N_("cannot join channel (bad channel key)"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "476", N_("bad channel mask"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "477", N_("channel doesn't support modes"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "481", N_("you're not an IRC operator"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "482", N_("you're not channel operator"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "483", N_("you can't kill a server!"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "484", N_("your connection is restricted!"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "485", N_("user is immune from kick/deop"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "491", N_("no O-lines for your host"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "501", N_("unknown mode flag"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "502", N_("can't change mode for other users"), "", "",
+    NULL, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "505", N_("a server message"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "671", N_("whois (secure connection)"), "", "",
+    NULL, 0, 0, 1, NULL, NULL, irc_cmd_recv_671 },
+  { NULL, NULL, NULL, NULL, NULL, 0, 0, 1, NULL, NULL, NULL }
 };
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

 /* irc-dcc.c: DCC communications (files & chat) */
@@ -60,7 +60,7 @@ dcc_redraw (int highlight)
    gui_redraw_buffer (gui_get_dcc_buffer (gui_current_window));
    if (highlight)
    {
-        hotlist_add (highlight, gui_get_dcc_buffer (gui_current_window));
+        hotlist_add (highlight, NULL, gui_get_dcc_buffer (gui_current_window));
        gui_draw_buffer_status (gui_current_window->buffer, 0);
    }
 }
@@ -87,6 +87,26 @@ dcc_search (t_irc_server *server, int type, int status, int port)
    return NULL;
 }

+/*
+ * dcc_port_in_use: return 1 if a port is in used (by an active or connecting DCC)
+ */
+
+int
+dcc_port_in_use (int port)
+{
+    t_irc_dcc *ptr_dcc;
+    
+    /* skip any currently used ports */
+    for (ptr_dcc = dcc_list; ptr_dcc; ptr_dcc = ptr_dcc->next_dcc)
+    {
+        if ((ptr_dcc->port == port) && (!DCC_ENDED(ptr_dcc->status)))
+            return 1;
+    }
+    
+    /* port not in use */
+    return 0;
+}
+
 /*
 * dcc_file_is_resumable: check if a file can be used for resuming a download
 */
@@ -128,6 +148,9 @@ dcc_find_filename (t_irc_dcc *ptr_dcc)
 {
    char *ptr_home, *filename2;
    
+    if (!DCC_IS_FILE(ptr_dcc->type))
+        return;
+    
    ptr_home = getenv ("HOME");
    ptr_dcc->local_filename = (char *) malloc (strlen (cfg_dcc_download_path) +
                                               strlen (ptr_dcc->nick) +
@@ -203,20 +226,32 @@ void
 dcc_calculate_speed (t_irc_dcc *ptr_dcc, int ended)
 {
    time_t local_time, elapsed;
+    unsigned long bytes_per_sec_total;
    
    local_time = time (NULL);
    if (ended || local_time > ptr_dcc->last_check_time)
    {
-        
        if (ended)
        {
+            /* calculate bytes per second (global) */
            elapsed = local_time - ptr_dcc->start_transfer;
            if (elapsed == 0)
                elapsed = 1;
            ptr_dcc->bytes_per_sec = (ptr_dcc->pos - ptr_dcc->start_resume) / elapsed;
+            ptr_dcc->eta = 0;
        }
        else
        {
+            /* calculate ETA */
+            elapsed = local_time - ptr_dcc->start_transfer;
+            if (elapsed == 0)
+                elapsed = 1;
+            bytes_per_sec_total = (ptr_dcc->pos - ptr_dcc->start_resume) / elapsed;
+            if (bytes_per_sec_total == 0)
+                bytes_per_sec_total = 1;
+            ptr_dcc->eta = (ptr_dcc->size - ptr_dcc->pos) / bytes_per_sec_total;
+            
+            /* calculate bytes per second (since last check time) */
            elapsed = local_time - ptr_dcc->last_check_time;
            if (elapsed == 0)
                elapsed = 1;
@@ -342,31 +377,28 @@ dcc_close (t_irc_dcc *ptr_dcc, int status)
    {
        if (DCC_IS_FILE(ptr_dcc->type))
        {
-            irc_display_prefix (ptr_dcc->server->buffer, PREFIX_INFO);
-            gui_printf (ptr_dcc->server->buffer, _("DCC: file "));
-            gui_printf_color (ptr_dcc->server->buffer,
-                              COLOR_WIN_CHAT_CHANNEL,
-                              "%s",
-                              ptr_dcc->filename);
+            irc_display_prefix (ptr_dcc->server, ptr_dcc->server->buffer,
+                                PREFIX_INFO);
+            gui_printf (ptr_dcc->server->buffer,
+                        _("DCC: file %s%s%s"),
+                        GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                        ptr_dcc->filename,
+                        GUI_COLOR(COLOR_WIN_CHAT));
            if (ptr_dcc->local_filename)
-            {
-                gui_printf (ptr_dcc->server->buffer, _(" (local filename: "));
-                gui_printf_color (ptr_dcc->server->buffer,
-                                  COLOR_WIN_CHAT_CHANNEL,
-                                  "%s",
-                                  ptr_dcc->local_filename);
-                gui_printf (ptr_dcc->server->buffer, ")");
-            }
+                gui_printf (ptr_dcc->server->buffer,
+                            _(" (local filename: %s%s%s)"),
+                            GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                            ptr_dcc->local_filename,
+                            GUI_COLOR(COLOR_WIN_CHAT));
            if (ptr_dcc->type == DCC_FILE_SEND)
                gui_printf (ptr_dcc->server->buffer, _(" sent to "));
            else
                gui_printf (ptr_dcc->server->buffer, _(" received from "));
-            gui_printf_color (ptr_dcc->server->buffer,
-                              COLOR_WIN_CHAT_NICK,
-                              "%s",
-                              ptr_dcc->nick);
-            gui_printf (ptr_dcc->server->buffer,
-                        (status == DCC_DONE) ? _(": ok!\n") : _(": FAILED\n"));
+            gui_printf (ptr_dcc->server->buffer, "%s%s%s: %s\n",
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        ptr_dcc->nick,
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        (status == DCC_DONE) ? _("OK") : _("FAILED"));
        }
    }
    if (status == DCC_ABORTED)
@@ -377,16 +409,18 @@ dcc_close (t_irc_dcc *ptr_dcc, int status)
                ptr_buffer = ptr_dcc->channel->buffer;
            else
                ptr_buffer = ptr_dcc->server->buffer;
-            irc_display_prefix (ptr_buffer, PREFIX_INFO);
-            gui_printf (ptr_buffer, _("DCC chat closed with "));
-            gui_printf_color (ptr_buffer, COLOR_WIN_CHAT_NICK,
-                              "%s", ptr_dcc->nick);
-            gui_printf_color (ptr_buffer, COLOR_WIN_CHAT_DARK, " (");
-            gui_printf_color (ptr_buffer, COLOR_WIN_CHAT_HOST,
-                              "%d.%d.%d.%d",
-                              ptr_dcc->addr >> 24, (ptr_dcc->addr >> 16) & 0xff,
-                              (ptr_dcc->addr >> 8) & 0xff, ptr_dcc->addr & 0xff);
-            gui_printf_color (ptr_buffer, COLOR_WIN_CHAT_DARK, ")\n");
+            irc_display_prefix (ptr_dcc->server, ptr_buffer, PREFIX_INFO);
+            gui_printf (ptr_buffer,
+                        _("DCC chat closed with %s%s %s(%s%d.%d.%d.%d%s)\n"),
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        ptr_dcc->nick,
+                        GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                        GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                        ptr_dcc->addr >> 24,
+                        (ptr_dcc->addr >> 16) & 0xff,
+                        (ptr_dcc->addr >> 8) & 0xff,
+                        ptr_dcc->addr & 0xff,
+                        GUI_COLOR(COLOR_WIN_CHAT_DARK));
        }
    }
    
@@ -405,6 +439,8 @@ dcc_close (t_irc_dcc *ptr_dcc, int status)
        }
    }
    
+    ptr_dcc->channel = NULL;
+    
    if (DCC_IS_CHAT(ptr_dcc->type))
        channel_remove_dcc (ptr_dcc);
    
@@ -432,7 +468,8 @@ dcc_channel_for_chat (t_irc_dcc *ptr_dcc)
 {
    if (!channel_create_dcc (ptr_dcc))
    {
-        irc_display_prefix (ptr_dcc->server->buffer, PREFIX_ERROR);
+        irc_display_prefix (ptr_dcc->server, ptr_dcc->server->buffer,
+                            PREFIX_ERROR);
        gui_printf (ptr_dcc->server->buffer,
                    _("%s can't associate DCC chat with private buffer "
                    "(maybe private buffer has already DCC CHAT?)\n"),
@@ -442,18 +479,20 @@ dcc_channel_for_chat (t_irc_dcc *ptr_dcc)
        return;
    }
    
-    irc_display_prefix (ptr_dcc->channel->buffer, PREFIX_INFO);
+    irc_display_prefix (ptr_dcc->server, ptr_dcc->channel->buffer,
+                        PREFIX_INFO);
    gui_printf_type (ptr_dcc->channel->buffer, MSG_TYPE_MSG,
-                     _("Connected to "));
-    gui_printf_color (ptr_dcc->channel->buffer, COLOR_WIN_CHAT_NICK,
-                      "%s", ptr_dcc->nick);
-    gui_printf_color (ptr_dcc->channel->buffer, COLOR_WIN_CHAT_DARK, " (");
-    gui_printf_color (ptr_dcc->channel->buffer, COLOR_WIN_CHAT_HOST,
-                      "%d.%d.%d.%d",
-                      ptr_dcc->addr >> 24, (ptr_dcc->addr >> 16) & 0xff,
-                      (ptr_dcc->addr >> 8) & 0xff, ptr_dcc->addr & 0xff);
-    gui_printf_color (ptr_dcc->channel->buffer, COLOR_WIN_CHAT_DARK, ") ");
-    gui_printf (ptr_dcc->channel->buffer, _("via DCC chat\n"));
+                     _("Connected to %s%s %s(%s%d.%d.%d.%d%s)%s via DCC chat\n"),
+                     GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                     ptr_dcc->nick,
+                     GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                     GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                     ptr_dcc->addr >> 24,
+                     (ptr_dcc->addr >> 16) & 0xff,
+                     (ptr_dcc->addr >> 8) & 0xff,
+                     ptr_dcc->addr & 0xff,
+                     GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                     GUI_COLOR(COLOR_WIN_CHAT));
 }

 /*
@@ -540,13 +579,13 @@ dcc_accept_resume (t_irc_server *server, char *filename, int port,
                      ptr_dcc->nick, ptr_dcc->filename,
                      ptr_dcc->port, ptr_dcc->start_resume);
        
-        irc_display_prefix (ptr_dcc->server->buffer, PREFIX_INFO);
-        gui_printf (ptr_dcc->server->buffer, _("DCC: file "));
-        gui_printf_color (ptr_dcc->server->buffer,
-                          COLOR_WIN_CHAT_CHANNEL,
-                          "%s ",
-                          ptr_dcc->filename);
-        gui_printf (ptr_dcc->server->buffer, _("resumed at position %u\n"),
+        irc_display_prefix (ptr_dcc->server, ptr_dcc->server->buffer,
+                            PREFIX_INFO);
+        gui_printf (ptr_dcc->server->buffer,
+                    _("DCC: file %s%s%s resumed at position %u\n"),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    ptr_dcc->filename,
+                    GUI_COLOR(COLOR_WIN_CHAT),
                    ptr_dcc->start_resume);
        dcc_redraw (HOTLIST_MSG);
    }
@@ -581,6 +620,54 @@ dcc_start_resume (t_irc_server *server, char *filename, int port,
                    WEECHAT_ERROR, filename, port, pos_start);
 }

+/*
+ * dcc_alloc: allocate a new DCC file
+ */
+
+t_irc_dcc *
+dcc_alloc ()
+{
+    t_irc_dcc *new_dcc;
+    
+    /* create new DCC struct */
+    if ((new_dcc = (t_irc_dcc *) malloc (sizeof (t_irc_dcc))) == NULL)
+        return NULL;
+    
+    /* default values */
+    new_dcc->server = NULL;
+    new_dcc->channel = NULL;
+    new_dcc->type = 0;
+    new_dcc->status = 0;
+    new_dcc->start_time = 0;
+    new_dcc->start_transfer = 0;
+    new_dcc->addr = 0;
+    new_dcc->port = 0;
+    new_dcc->nick = NULL;
+    new_dcc->sock = -1;
+    new_dcc->unterminated_message = NULL;
+    new_dcc->file = -1;
+    new_dcc->filename = NULL;
+    new_dcc->local_filename = NULL;
+    new_dcc->filename_suffix = -1;
+    new_dcc->size = 0;
+    new_dcc->pos = 0;
+    new_dcc->ack = 0;
+    new_dcc->start_resume = 0;
+    new_dcc->last_check_time = 0;
+    new_dcc->last_check_pos = 0;
+    new_dcc->last_activity = 0;
+    new_dcc->bytes_per_sec = 0;
+    new_dcc->eta = 0;
+    
+    new_dcc->prev_dcc = NULL;
+    new_dcc->next_dcc = dcc_list;
+    if (dcc_list)
+        dcc_list->prev_dcc = new_dcc;
+    dcc_list = new_dcc;
+    
+    return new_dcc;
+}
+
 /*
 * dcc_add: add a DCC file to queue
 */
@@ -591,10 +678,10 @@ dcc_add (t_irc_server *server, int type, unsigned long addr, int port, char *nic
 {
    t_irc_dcc *new_dcc;
    
-    /* create new DCC struct */
-    if ((new_dcc = (t_irc_dcc *) malloc (sizeof (t_irc_dcc))) == NULL)
+    new_dcc = dcc_alloc ();
+    if (!new_dcc)
    {
-        irc_display_prefix (server->buffer, PREFIX_ERROR);
+        irc_display_prefix (server, server->buffer, PREFIX_ERROR);
        gui_printf (server->buffer,
                    _("%s not enough memory for new DCC\n"),
                    WEECHAT_ERROR);
@@ -626,17 +713,13 @@ dcc_add (t_irc_server *server, int type, unsigned long addr, int port, char *nic
    new_dcc->start_resume = 0;
    new_dcc->last_check_time = time (NULL);
    new_dcc->last_check_pos = 0;
-    new_dcc->bytes_per_sec = 0;
    new_dcc->last_activity = time (NULL);
+    new_dcc->bytes_per_sec = 0;
+    new_dcc->eta = 0;
    if (local_filename)
        new_dcc->local_filename = strdup (local_filename);
    else
        dcc_find_filename (new_dcc);
-    new_dcc->prev_dcc = NULL;
-    new_dcc->next_dcc = dcc_list;
-    if (dcc_list)
-        dcc_list->prev_dcc = new_dcc;
-    dcc_list = new_dcc;
    
    gui_current_window->dcc_first = NULL;
    gui_current_window->dcc_selected = NULL;
@@ -644,52 +727,71 @@ dcc_add (t_irc_server *server, int type, unsigned long addr, int port, char *nic
    /* write info message on server buffer */
    if (type == DCC_FILE_RECV)
    {
-        irc_display_prefix (server->buffer, PREFIX_INFO);
-        gui_printf (server->buffer, _("Incoming DCC file from "));
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", nick);
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, " (");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_HOST,
-                          "%d.%d.%d.%d",
-                          addr >> 24, (addr >> 16) & 0xff, (addr >> 8) & 0xff, addr & 0xff);
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, ")");
-        gui_printf (server->buffer, ": ");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "%s", filename);
-        gui_printf (server->buffer, ", ");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "%lu", size);
-        gui_printf (server->buffer, _(" bytes\n"));
+        irc_display_prefix (server, server->buffer, PREFIX_INFO);
+        gui_printf (server->buffer,
+                    _("Incoming DCC file from %s%s%s (%s%d.%d.%d.%d%s)%s: %s%s%s, %s%lu%s bytes\n"),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    nick,
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                    GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                    addr >> 24,
+                    (addr >> 16) & 0xff,
+                    (addr >> 8) & 0xff,
+                    addr & 0xff,
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    filename,
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    size,
+                    GUI_COLOR(COLOR_WIN_CHAT));
        dcc_redraw (HOTLIST_MSG);
    }
    if (type == DCC_FILE_SEND)
    {
-        irc_display_prefix (server->buffer, PREFIX_INFO);
-        gui_printf (server->buffer, _("Sending DCC file to "));
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", nick);
-        gui_printf (server->buffer, ": ");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "%s", filename);
-        gui_printf (server->buffer, _(" (local filename: "));
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "%s", local_filename);
-        gui_printf (server->buffer, "), ");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "%lu", size);
-        gui_printf (server->buffer, _(" bytes\n"));
+        irc_display_prefix (server, server->buffer, PREFIX_INFO);
+        gui_printf (server->buffer,
+                    _("Sending DCC file to %s%s%s: %s%s%s "
+                      "(local filename: %s%s%s), %s%lu%s bytes\n"),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    nick,
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    filename,
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    local_filename,
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    size,
+                    GUI_COLOR(COLOR_WIN_CHAT));
        dcc_redraw (HOTLIST_MSG);
    }
    if (type == DCC_CHAT_RECV)
    {
-        irc_display_prefix (server->buffer, PREFIX_INFO);
-        gui_printf (server->buffer, _("Incoming DCC chat request from "));
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", nick);
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, " (");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_HOST,
-                          "%d.%d.%d.%d",
-                          addr >> 24, (addr >> 16) & 0xff, (addr >> 8) & 0xff, addr & 0xff);
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, ")\n");
+        irc_display_prefix (server, server->buffer, PREFIX_INFO);
+        gui_printf (server->buffer,
+                    _("Incoming DCC chat request from %s%s%s "
+                      "(%s%d.%d.%d.%d%s)\n"),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    nick,
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                    GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                    addr >> 24,
+                    (addr >> 16) & 0xff,
+                    (addr >> 8) & 0xff,
+                    addr & 0xff,
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK));
        dcc_redraw (HOTLIST_MSG);
    }
    if (type == DCC_CHAT_SEND)
    {
-        irc_display_prefix (server->buffer, PREFIX_INFO);
-        gui_printf (server->buffer, _("Sending DCC chat request to "));
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s\n", nick);
+        irc_display_prefix (server, server->buffer, PREFIX_INFO);
+        gui_printf (server->buffer,
+                    _("Sending DCC chat request to %s%s\n"),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    nick);
        dcc_redraw (HOTLIST_MSG);
    }
    
@@ -702,19 +804,17 @@ dcc_add (t_irc_server *server, int type, unsigned long addr, int port, char *nic
    
    if (DCC_IS_FILE(type) && (new_dcc->start_resume > 0))
    {
-        irc_display_prefix (new_dcc->server->buffer, PREFIX_INFO);
-        gui_printf (new_dcc->server->buffer, _("DCC: file "));
-        gui_printf_color (new_dcc->server->buffer,
-                          COLOR_WIN_CHAT_CHANNEL,
-                          "%s",
-                          new_dcc->filename);
-        gui_printf (new_dcc->server->buffer, _(" (local filename: "));
-        gui_printf_color (new_dcc->server->buffer,
-                          COLOR_WIN_CHAT_CHANNEL,
-                          "%s",
-                          new_dcc->local_filename);
-        gui_printf (new_dcc->server->buffer, ") ");
-        gui_printf (new_dcc->server->buffer, _("will be resumed at position %u\n"),
+        irc_display_prefix (new_dcc->server, new_dcc->server->buffer,
+                            PREFIX_INFO);
+        gui_printf (new_dcc->server->buffer,
+                    _("DCC: file %s%s%s (local filename: %s%s%s) "
+                      "will be resumed at position %u\n"),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    new_dcc->filename,
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    new_dcc->local_filename,
+                    GUI_COLOR(COLOR_WIN_CHAT),
                    new_dcc->start_resume);
        dcc_redraw (HOTLIST_MSG);
    }
@@ -748,9 +848,11 @@ void
 dcc_send_request (t_irc_server *server, int type, char *nick, char *filename)
 {
    char *ptr_home, *filename2, *short_filename, *pos;
-    int spaces;
+    int spaces, args, port_start, port_end;
    struct stat st;
    int sock, port;
+    struct hostent *host;
+    struct in_addr tmpaddr;
    struct sockaddr_in addr;
    socklen_t length;
    unsigned long local_addr;
@@ -778,7 +880,7 @@ dcc_send_request (t_irc_server *server, int type, char *nick, char *filename)
                                         4);
            if (!filename2)
            {
-                irc_display_prefix (server->buffer, PREFIX_ERROR);
+                irc_display_prefix (server, server->buffer, PREFIX_ERROR);
                gui_printf (server->buffer,
                            _("%s not enough memory for DCC SEND\n"),
                            WEECHAT_ERROR);
@@ -800,7 +902,7 @@ dcc_send_request (t_irc_server *server, int type, char *nick, char *filename)
        /* check if file exists */
        if (stat (filename2, &st) == -1)
        {
-            irc_display_prefix (server->buffer, PREFIX_ERROR);
+            irc_display_prefix (server, server->buffer, PREFIX_ERROR);
            gui_printf (server->buffer,
                        _("%s cannot access file \"%s\"\n"),
                        WEECHAT_ERROR, filename2);
@@ -811,17 +913,38 @@ dcc_send_request (t_irc_server *server, int type, char *nick, char *filename)
    }
    
    /* get local IP address */
+    
+    /* look up the IP address from dcc_own_ip, if set */
+    local_addr = 0;
+    if (cfg_dcc_own_ip && cfg_dcc_own_ip[0])
+    {
+        host = gethostbyname (cfg_dcc_own_ip);
+        if (host)
+        {
+            memcpy (&tmpaddr, host->h_addr_list[0], sizeof(struct in_addr));
+            local_addr = ntohl (tmpaddr.s_addr);
+        }
+        else
+            gui_printf (server->buffer,
+                        _("%s could not find address for '%s'. Falling back to local IP.\n"),
+                        WEECHAT_WARNING, cfg_dcc_own_ip);
+    }
+    
+    /* use the local interface, from the server socket */
    memset (&addr, 0, sizeof (struct sockaddr_in));
    length = sizeof (addr);
    getsockname (server->sock, (struct sockaddr *) &addr, &length);
    addr.sin_family = AF_INET;
-    local_addr = ntohl (addr.sin_addr.s_addr);
+    
+    /* fallback to the local IP address on the interface, if required */
+    if (local_addr == 0)
+        local_addr = ntohl (addr.sin_addr.s_addr);
    
    /* open socket for DCC */
    sock = socket (AF_INET, SOCK_STREAM, 0);
    if (sock == -1)
    {
-        irc_display_prefix (server->buffer, PREFIX_ERROR);
+        irc_display_prefix (server, server->buffer, PREFIX_ERROR);
        gui_printf (server->buffer,
                    _("%s cannot create socket for DCC\n"),
                    WEECHAT_ERROR);
@@ -830,22 +953,64 @@ dcc_send_request (t_irc_server *server, int type, char *nick, char *filename)
        return;
    }
    
-    /* find port automatically */
-    addr.sin_port = 0;
-    if (bind (sock, (struct sockaddr *) &addr, sizeof (addr)) == -1)
+    /* look for port */
+    
+    port = 0;
+    
+    if (cfg_dcc_port_range && cfg_dcc_port_range[0])
    {
-        irc_display_prefix (server->buffer, PREFIX_ERROR);
+        /* find a free port in the specified range */
+        args = sscanf (cfg_dcc_port_range, "%d-%d", &port_start, &port_end);
+        if (args > 0)
+        {
+            port = port_start;
+            if (args == 1)
+                port_end = port_start;
+            
+            /* loop through the entire allowed port range */
+            while (port <= port_end)
+            {
+                if (!dcc_port_in_use (port))
+                {
+                    /* attempt to bind to the free port */
+                    addr.sin_port = htons (port);
+                    if (bind (sock, (struct sockaddr *) &addr, sizeof (addr)) == 0)
+                        break;
+                }
+                port++;
+            }
+            
+            if (port > port_end)
+                port = -1;
+        }
+    }
+    
+    if (port == 0)
+    {
+        /* find port automatically */
+        addr.sin_port = 0;
+        if (bind (sock, (struct sockaddr *) &addr, sizeof (addr)) == 0)
+        {
+            length = sizeof (addr);
+            getsockname (sock, (struct sockaddr *) &addr, &length);
+            port = ntohs (addr.sin_port);
+        }
+        else
+            port = -1;
+    }
+
+    if (port == -1)
+    {
+        /* Could not find any port to bind */
+        irc_display_prefix (server, server->buffer, PREFIX_ERROR);
        gui_printf (server->buffer,
-                    _("%s cannot find port for DCC\n"),
+                    _("%s cannot find available port for DCC\n"),
                    WEECHAT_ERROR);
        close (sock);
        if (filename2)
            free (filename2);
        return;
    }
-    length = sizeof (addr);
-    getsockname (sock, (struct sockaddr *) &addr, &length);
-    port = ntohs (addr.sin_port);
    
    if (type == DCC_FILE_SEND)
    {
@@ -881,7 +1046,7 @@ dcc_send_request (t_irc_server *server, int type, char *nick, char *filename)
                           short_filename, filename2, st.st_size);
    if (!ptr_dcc)
    {
-        irc_display_prefix (server->buffer, PREFIX_ERROR);
+        irc_display_prefix (server, server->buffer, PREFIX_ERROR);
        gui_printf (server->buffer,
                    _("%s cannot send DCC\n"),
                    WEECHAT_ERROR);
@@ -955,14 +1120,15 @@ dcc_chat_sendf (t_irc_dcc *ptr_dcc, char *fmt, ...)
    gui_printf (ptr_dcc->server->buffer, "[DEBUG] Sending to remote host (DCC CHAT) >>> %s\n", buffer);
    buffer[size_buf - 2] = '\r';
 #endif
-    buf2 = weechat_convert_encoding ((cfg_look_charset_internal && cfg_look_charset_internal[0]) ?
-                                     cfg_look_charset_internal : local_charset,
-                                     cfg_look_charset_encode,
-                                     buffer);
+    buf2 = channel_iconv_encode (ptr_dcc->server,
+                                 ptr_dcc->channel,
+                                 buffer);
    if (dcc_chat_send (ptr_dcc, buf2, strlen (buf2)) <= 0)
    {
-        irc_display_prefix (ptr_dcc->server->buffer, PREFIX_ERROR);
-        gui_printf (ptr_dcc->server->buffer, _("%s error sending data to \"%s\" via DCC CHAT\n"),
+        irc_display_prefix (ptr_dcc->server, ptr_dcc->server->buffer,
+                            PREFIX_ERROR);
+        gui_printf (ptr_dcc->server->buffer,
+                    _("%s error sending data to \"%s\" via DCC CHAT\n"),
                    WEECHAT_ERROR, ptr_dcc->nick);
        dcc_close (ptr_dcc, DCC_FAILED);
    }
@@ -977,7 +1143,8 @@ void
 dcc_chat_recv (t_irc_dcc *ptr_dcc)
 {
    static char buffer[4096 + 2];
-    char *buf2, *pos, *ptr_buf, *next_ptr_buf;
+    char *buf2, *pos, *ptr_buf, *ptr_buf2, *next_ptr_buf;
+    char *ptr_buf_color;
    int num_read;

    num_read = recv (ptr_dcc->sock, buffer, sizeof (buffer) - 2, 0);
@@ -1028,33 +1195,44 @@ dcc_chat_recv (t_irc_dcc *ptr_dcc)
            
            if (ptr_buf)
            {
-                gui_printf_type_color (ptr_dcc->channel->buffer,
-                                       MSG_TYPE_NICK,
-                                       COLOR_WIN_CHAT_DARK, "<");
+                ptr_buf2 = channel_iconv_decode (ptr_dcc->server,
+                                                 ptr_dcc->channel,
+                                                 ptr_buf);
+                ptr_buf_color = (char *)gui_color_decode ((ptr_buf2) ?
+                                                          (unsigned char *)ptr_buf2 : (unsigned char *)ptr_buf,
+                                                          cfg_irc_colors_receive);
+                gui_printf_type (ptr_dcc->channel->buffer, MSG_TYPE_NICK,
+                                 "%s<", GUI_COLOR(COLOR_WIN_CHAT_DARK));
                if (irc_is_highlight (ptr_buf, ptr_dcc->server->nick))
                {
-                    gui_printf_type_color (ptr_dcc->channel->buffer,
-                                           MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT,
-                                           COLOR_WIN_CHAT_HIGHLIGHT,
-                                           "%s", ptr_dcc->nick);
+                    gui_printf_type (ptr_dcc->channel->buffer,
+                                     MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT,
+                                     "%s%s",
+                                     GUI_COLOR(COLOR_WIN_CHAT_HIGHLIGHT),
+                                     ptr_dcc->nick);
                    if ( (cfg_look_infobar_delay_highlight > 0)
                        && (ptr_dcc->channel->buffer != gui_current_window->buffer) )
                        gui_infobar_printf (cfg_look_infobar_delay_highlight,
                                            COLOR_WIN_INFOBAR_HIGHLIGHT,
                                            _("Private %s> %s"),
-                                            ptr_dcc->nick, ptr_buf);
+                                            ptr_dcc->nick,
+                                            (ptr_buf_color) ? ptr_buf_color : ((ptr_buf2) ? ptr_buf2 : ptr_buf));
                }
                else
-                    gui_printf_type_color (ptr_dcc->channel->buffer,
-                                           MSG_TYPE_NICK,
-                                           COLOR_WIN_NICK_PRIVATE,
-                                           "%s", ptr_dcc->nick);
-                gui_printf_type_color (ptr_dcc->channel->buffer,
-                                       MSG_TYPE_NICK,
-                                       COLOR_WIN_CHAT_DARK, "> ");
-                gui_printf_type_color (ptr_dcc->channel->buffer,
-                                       MSG_TYPE_MSG,
-                                       COLOR_WIN_CHAT, "%s\n", ptr_buf);
+                    gui_printf_type (ptr_dcc->channel->buffer, MSG_TYPE_NICK,
+                                     "%s%s",
+                                     GUI_COLOR(COLOR_WIN_NICK_PRIVATE),
+                                     ptr_dcc->nick);
+                gui_printf_type (ptr_dcc->channel->buffer, MSG_TYPE_NICK,
+                                 "%s> ", GUI_COLOR(COLOR_WIN_CHAT_DARK));
+                gui_printf_type (ptr_dcc->channel->buffer, MSG_TYPE_MSG,
+                                 "%s%s\n",
+                                 GUI_COLOR(COLOR_WIN_CHAT),
+                                 (ptr_buf_color) ? ptr_buf_color : ptr_buf);
+                if (ptr_buf_color)
+                    free (ptr_buf_color);
+                if (ptr_buf2)
+                    free (ptr_buf2);
            }
            
            ptr_buf = next_ptr_buf;
@@ -1080,7 +1258,7 @@ dcc_handle ()
    t_irc_dcc *ptr_dcc;
    int num_read, num_sent;
    static char buffer[102400];
-    u_int32_t pos;
+    uint32_t pos;
    fd_set read_fd;
    static struct timeval timeout;
    int sock;
@@ -1234,7 +1412,7 @@ dcc_handle ()
            {
                if (cfg_dcc_blocksize > (int) sizeof (buffer))
                {
-                    irc_display_prefix (NULL, PREFIX_ERROR);
+                    irc_display_prefix (NULL, NULL, PREFIX_ERROR);
                    gui_printf (NULL, _("%s DCC failed because blocksize is too "
                                "big. Check value of \"dcc_blocksize\" option, "
                                "max is %d.\n"),
@@ -1310,9 +1488,45 @@ dcc_end ()
        if (ptr_dcc->sock != -1)
        {
            if (ptr_dcc->status == DCC_ACTIVE)
-                wee_log_printf (_("Aborting active DCC: \"%s\" from %s\n"),
-                                ptr_dcc->filename, ptr_dcc->nick);
+                weechat_log_printf (_("Aborting active DCC: \"%s\" from %s\n"),
+                                    ptr_dcc->filename, ptr_dcc->nick);
            dcc_close (ptr_dcc, DCC_FAILED);
        }
    }
 }
+
+/*
+ * dcc_print_log: print DCC infos in log (usually for crash dump)
+ */
+
+void
+dcc_print_log (t_irc_dcc *dcc)
+{
+    weechat_log_printf ("[DCC (addr:0x%X)]\n", dcc);
+    weechat_log_printf ("  server. . . . . . . : 0x%X\n", dcc->server);
+    weechat_log_printf ("  channel . . . . . . : 0x%X\n", dcc->channel);
+    weechat_log_printf ("  type. . . . . . . . : %d\n",   dcc->type);
+    weechat_log_printf ("  status. . . . . . . : %d\n",   dcc->status);
+    weechat_log_printf ("  start_time. . . . . : %ld\n",  dcc->start_time);
+    weechat_log_printf ("  start_transfer. . . : %ld\n",  dcc->start_transfer);
+    weechat_log_printf ("  addr. . . . . . . . : %lu\n",  dcc->addr);
+    weechat_log_printf ("  port. . . . . . . . : %d\n",   dcc->port);
+    weechat_log_printf ("  nick. . . . . . . . : '%s'\n", dcc->nick);
+    weechat_log_printf ("  sock. . . . . . . . : %d\n",   dcc->sock);
+    weechat_log_printf ("  unterminated_message: '%s'\n", dcc->unterminated_message);
+    weechat_log_printf ("  file. . . . . . . . : %d\n",   dcc->file);
+    weechat_log_printf ("  filename. . . . . . : '%s'\n", dcc->filename);
+    weechat_log_printf ("  local_filename. . . : '%s'\n", dcc->local_filename);
+    weechat_log_printf ("  filename_suffix . . : %d\n",   dcc->filename_suffix);
+    weechat_log_printf ("  size. . . . . . . . : %lu\n",  dcc->size);
+    weechat_log_printf ("  pos . . . . . . . . : %lu\n",  dcc->pos);
+    weechat_log_printf ("  ack . . . . . . . . : %lu\n",  dcc->ack);
+    weechat_log_printf ("  start_resume. . . . : %lu\n",  dcc->start_resume);
+    weechat_log_printf ("  last_check_time . . : %ld\n",  dcc->last_check_time);
+    weechat_log_printf ("  last_check_pos. . . : %lu\n",  dcc->last_check_pos);
+    weechat_log_printf ("  last_activity . . . : %ld\n",  dcc->last_activity);
+    weechat_log_printf ("  bytes_per_sec . . . : %lu\n",  dcc->bytes_per_sec);
+    weechat_log_printf ("  eta . . . . . . . . : %lu\n",  dcc->eta);
+    weechat_log_printf ("  prev_dcc. . . . . . : 0x%X\n", dcc->prev_dcc);
+    weechat_log_printf ("  next_dcc. . . . . . : 0x%X\n", dcc->next_dcc);
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

 /* irc-display.c: display functions for IRC */
@@ -36,12 +36,12 @@


 /*
- * irc_display_prefix: display prefix for action or info message
+ * irc_display_prefix: display a prefix for action/info/error msg
 *                     prefix must be 3 chars length
 */

 void
-irc_display_prefix (t_gui_buffer *buffer, char *prefix)
+irc_display_prefix (t_irc_server *server, t_gui_buffer *buffer, char *prefix)
 {
    int type;
    
@@ -52,19 +52,34 @@ irc_display_prefix (t_gui_buffer *buffer, char *prefix)
    
    if (prefix[0] == prefix[2])
    {
-        gui_printf_type_color (buffer, type, COLOR_WIN_CHAT_PREFIX1, "%c", prefix[0]);
-        gui_printf_type_color (buffer, type, COLOR_WIN_CHAT_PREFIX2, "%c", prefix[1]);
-        gui_printf_type_color (buffer, type, COLOR_WIN_CHAT_PREFIX1, "%c ", prefix[2]);
+        gui_printf_type (buffer, type, "%s%c%s%c%s%c ",
+                         GUI_COLOR(COLOR_WIN_CHAT_PREFIX1),
+                         prefix[0],
+                         GUI_COLOR(COLOR_WIN_CHAT_PREFIX2),
+                         prefix[1],
+                         GUI_COLOR(COLOR_WIN_CHAT_PREFIX1),
+                         prefix[2]);
    }
    else
    {
        if (strcmp (prefix, PREFIX_JOIN) == 0)
-            gui_printf_color (buffer, COLOR_WIN_CHAT_JOIN, "%s ", prefix);
+            gui_printf_type (buffer, type, "%s%s ",
+                             GUI_COLOR(COLOR_WIN_CHAT_JOIN), prefix);
        else if (strcmp (prefix, PREFIX_PART) == 0)
-            gui_printf_color (buffer, COLOR_WIN_CHAT_PART, "%s ", prefix);
+            gui_printf_type (buffer, type, "%s%s ",
+                             GUI_COLOR(COLOR_WIN_CHAT_PART), prefix);
        else
-            gui_printf_color (buffer, COLOR_WIN_CHAT_PREFIX1, "%s ", prefix);
+            gui_printf_type (buffer, type, "%s%s ",
+                             GUI_COLOR(COLOR_WIN_CHAT_PREFIX1), prefix);
    }
+    if (server && (server->buffer == buffer) && buffer->all_servers)
+    {
+        gui_printf_type (buffer, type, "%s[%s%s%s] ",
+                         GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                         GUI_COLOR(COLOR_WIN_CHAT_SERVER), server->name,
+                         GUI_COLOR(COLOR_WIN_CHAT_DARK));
+    }
+    gui_printf_type (buffer, type, GUI_NO_COLOR);
 }

 /*
@@ -74,58 +89,76 @@ irc_display_prefix (t_gui_buffer *buffer, char *prefix)

 void
 irc_display_nick (t_gui_buffer *buffer, t_irc_nick *nick, char *nickname,
-                  int message_type, int display_around, int color_nick, int no_nickmode)
+                  int type, int display_around, int color_nick, int no_nickmode)
 {
    if (display_around)
-        gui_printf_type_color (buffer,
-                               message_type, COLOR_WIN_CHAT_DARK,
-                               (nick) ? "<" : ">");
+        gui_printf_type (buffer, type, "%s%s",
+                         GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                         (nick || BUFFER_IS_PRIVATE(buffer)) ? "<" : ">");
    if (nick && cfg_look_nickmode)
    {
-        if (nick->is_chanowner)
-            gui_printf_type_color (buffer,
-                                   message_type,
-                                   COLOR_WIN_NICK_OP, "~");
-        else if (nick->is_chanadmin)
-            gui_printf_type_color (buffer,
-                                   message_type,
-                                   COLOR_WIN_NICK_OP, "&");
-        else if (nick->is_op)
-            gui_printf_type_color (buffer,
-                                   message_type,
-                                   COLOR_WIN_NICK_OP, "@");
-        else if (nick->is_halfop)
-            gui_printf_type_color (buffer,
-                                   message_type,
-                                   COLOR_WIN_NICK_HALFOP, "%%");
-        else if (nick->has_voice)
-            gui_printf_type_color (buffer,
-                                   message_type,
-                                   COLOR_WIN_NICK_VOICE, "+");
+        if (nick->flags & NICK_CHANOWNER)
+            gui_printf_type (buffer, type, "%s~",
+                             GUI_COLOR(COLOR_WIN_NICK_OP));
+        else if (nick->flags & NICK_CHANADMIN)
+            gui_printf_type (buffer, type, "%s&",
+                             GUI_COLOR(COLOR_WIN_NICK_OP));
+        else if (nick->flags & NICK_OP)
+            gui_printf_type (buffer, type, "%s@",
+                             GUI_COLOR(COLOR_WIN_NICK_OP));
+        else if (nick->flags & NICK_HALFOP)
+            gui_printf_type (buffer, type, "%s%%",
+                             GUI_COLOR(COLOR_WIN_NICK_HALFOP));
+        else if (nick->flags & NICK_VOICE)
+            gui_printf_type (buffer, type, "%s+",
+                             GUI_COLOR(COLOR_WIN_NICK_VOICE));
        else
            if (cfg_look_nickmode_empty && !no_nickmode)
-                gui_printf_type_color (buffer,
-                                       message_type,
-                                       COLOR_WIN_CHAT, " ");
+                gui_printf_type (buffer, type, "%s ",
+                                 GUI_COLOR(COLOR_WIN_CHAT));
    }
    if (color_nick < 0)
-        gui_printf_type_color (buffer,
-                               message_type,
-                               COLOR_WIN_CHAT_HIGHLIGHT,
-                               "%s", (nick) ? nick->nick : nickname);
+        gui_printf_type (buffer, type, "%s%s",
+                         GUI_COLOR(COLOR_WIN_CHAT_HIGHLIGHT),
+                         (nick) ? nick->nick : nickname);
    else
-        gui_printf_type_color (buffer,
-                               message_type,
-                               (nick && color_nick) ?
-                                   ((cfg_look_color_nicks) ?
-                                   nick->color : COLOR_WIN_CHAT) :
-                                   COLOR_WIN_CHAT,
-                               "%s", (nick) ? nick->nick : nickname);
+        gui_printf_type (buffer, type, "%s%s",
+                         GUI_COLOR((nick && color_nick) ?
+                                   nick->color : COLOR_WIN_CHAT),
+                         (nick) ? nick->nick : nickname);
    
    if (display_around)
-        gui_printf_type_color (buffer,
-                               message_type, COLOR_WIN_CHAT_DARK,
-                               (nick) ? "> " : "< ");
+        gui_printf_type (buffer, type, "%s%s",
+                         GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                         (nick || BUFFER_IS_PRIVATE(buffer)) ? "> " : "< ");
+    gui_printf_type (buffer, type, GUI_NO_COLOR);
+}
+
+/*
+ * irc_display_away: display away on all channels of all servers
+ */
+
+void
+irc_display_away (t_irc_server *server, char *string1, char *string2)
+{
+    t_irc_channel *ptr_channel;
+    
+    for (ptr_channel = server->channels; ptr_channel;
+         ptr_channel = ptr_channel->next_channel)
+    {
+        if (ptr_channel->type == CHANNEL_TYPE_CHANNEL)
+        {
+            gui_printf_nolog (ptr_channel->buffer,
+                              "%s[%s%s%s %s: %s%s]\n",
+                              GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                              GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                              server->nick,
+                              GUI_COLOR(COLOR_WIN_CHAT),
+                              string1,
+                              string2,
+                              GUI_COLOR(COLOR_WIN_CHAT_DARK));
+        }
+    }
 }

 /*
@@ -133,23 +166,32 @@ irc_display_nick (t_gui_buffer *buffer, t_irc_nick *nick, char *nickname,
 */

 void
-irc_display_mode (t_gui_buffer *buffer, char *channel_name, char set_flag,
+irc_display_mode (t_irc_server *server, t_gui_buffer *buffer,
+                  char *channel_name, char set_flag,
                  char *symbol, char *nick_host, char *message, char *param)
 {
-    irc_display_prefix (buffer, PREFIX_INFO);
-    gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "[");
-    gui_printf_color (buffer, COLOR_WIN_CHAT_CHANNEL, "%s", channel_name);
-    gui_printf_color (buffer, COLOR_WIN_CHAT, "/");
-    gui_printf_color (buffer, COLOR_WIN_CHAT_CHANNEL, "%c%s", set_flag, symbol);
-    gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "] ");
-    gui_printf_color (buffer, COLOR_WIN_CHAT_NICK, "%s", nick_host);
+    irc_display_prefix (server, buffer, PREFIX_INFO);
+    gui_printf (buffer, "%s[%s%s%s/%s%c%s%s] %s%s",
+                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                channel_name,
+                GUI_COLOR(COLOR_WIN_CHAT),
+                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                set_flag,
+                symbol,
+                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                nick_host);
    if (param)
-    {
-        gui_printf_color (buffer, COLOR_WIN_CHAT, " %s ", message);
-        gui_printf_color (buffer, COLOR_WIN_CHAT_NICK, "%s\n", param);
-    }
+        gui_printf (buffer, " %s%s %s%s\n",
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    message,
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    param);
    else
-        gui_printf_color (buffer, COLOR_WIN_CHAT, " %s\n", message);
+        gui_printf (buffer, " %s%s\n",
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    message);
 }

 /*
@@ -160,65 +202,67 @@ void
 irc_display_server (t_irc_server *server)
 {
    gui_printf (NULL, "\n");
-    gui_printf_color (NULL, COLOR_WIN_CHAT, _("Server: "));
-    gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "%s", server->name);
-    gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, " [");
-    gui_printf_color (NULL, COLOR_WIN_CHAT, "%s",
-                      (server->is_connected) ?
-                          _("connected") : _("not connected"));
-    gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "]\n");
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_autoconnect        : %s%s\n",
-                      (server->autoconnect) ? _("yes") : _("no"),
-                      (server->command_line) ?
-                          _(" (temporary server, will not be saved)") : "");
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_autoreconnect . . .: %s\n",
-                      (server->autoreconnect) ? _("yes") : _("no"));
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_autoreconnect_delay: %d seconds\n",
-                      server->autoreconnect_delay);
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_address . . . . . .: %s\n",
-                      server->address);
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_port  . . . . . . .: %d\n",
-                      server->port);
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_ipv6  . . . . . . .: %s\n",
-                      (server->ipv6) ? _("yes") : _("no"));
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_ssl . . . . . . . .: %s\n",
-                      (server->ssl) ? _("yes") : _("no"));
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_password  . . . . .: %s\n",
-                      (server->password && server->password[0]) ?
-                      _("(hidden)") : "");
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_nick1/2/3 . . . . .: %s", server->nick1);
-    gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, " / ");
-    gui_printf_color (NULL, COLOR_WIN_CHAT, "%s", server->nick2);
-    gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, " / ");
-    gui_printf_color (NULL, COLOR_WIN_CHAT, "%s\n", server->nick3);
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_username  . . . . .: %s\n",
-                      server->username);
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_realname  . . . . .: %s\n",
-                      server->realname);
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_command . . . . . .: %s\n",
-                      (server->command && server->command[0]) ?
-                      server->command : "");
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_command_delay . . .: %d seconds\n",
-                      server->command_delay);
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_autojoin  . . . . .: %s\n",
-                      (server->autojoin && server->autojoin[0]) ?
-                      server->autojoin : "");
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_notify_levels . . .: %s\n",
-                      (server->notify_levels && server->notify_levels[0]) ?
-                      server->notify_levels : "");
+    gui_printf (NULL, _("%sServer: %s%s %s[%s%s%s]\n"),
+                GUI_COLOR(COLOR_WIN_CHAT),
+                GUI_COLOR(COLOR_WIN_CHAT_SERVER),
+                server->name,
+                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                GUI_COLOR(COLOR_WIN_CHAT),
+                (server->is_connected) ?
+                _("connected") : _("not connected"),
+                GUI_COLOR(COLOR_WIN_CHAT_DARK));
+    
+    gui_printf (NULL, "  server_autoconnect . . . . : %s%s\n",
+                (server->autoconnect) ? _("on") : _("off"),
+                (server->command_line) ?
+                _(" (temporary server, will not be saved)") : "");
+    gui_printf (NULL, "  server_autoreconnect . . . : %s\n",
+                (server->autoreconnect) ? _("on") : _("off"));
+    gui_printf (NULL, "  server_autoreconnect_delay : %d %s\n",
+                server->autoreconnect_delay,
+                _("seconds"));
+    gui_printf (NULL, "  server_address . . . . . . : %s\n",
+                server->address);
+    gui_printf (NULL, "  server_port  . . . . . . . : %d\n",
+                server->port);
+    gui_printf (NULL, "  server_ipv6  . . . . . . . : %s\n",
+                (server->ipv6) ? _("on") : _("off"));
+    gui_printf (NULL, "  server_ssl . . . . . . . . : %s\n",
+                (server->ssl) ? _("on") : _("off"));
+    gui_printf (NULL, "  server_password  . . . . . : %s\n",
+                (server->password && server->password[0]) ?
+                _("(hidden)") : "");
+    gui_printf (NULL, "  server_nick1/2/3 . . . . . : %s %s/ %s%s %s/ %s%s\n",
+                server->nick1,
+                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                GUI_COLOR(COLOR_WIN_CHAT),
+                server->nick2,
+                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                GUI_COLOR(COLOR_WIN_CHAT),
+                server->nick3);
+    gui_printf (NULL, "  server_username  . . . . . : %s\n",
+                server->username);
+    gui_printf (NULL, "  server_realname  . . . . . : %s\n",
+               server->realname);
+    gui_printf (NULL, "  server_command . . . . . . : %s\n",
+                (server->command && server->command[0]) ?
+                server->command : "");
+    gui_printf (NULL, "  server_command_delay . . . : %d %s\n",
+                server->command_delay,
+                _("seconds"));
+    gui_printf (NULL, "  server_autojoin  . . . . . : %s\n",
+                (server->autojoin && server->autojoin[0]) ?
+                server->autojoin : "");
+    gui_printf (NULL, "  server_notify_levels . . . : %s\n",
+                (server->notify_levels && server->notify_levels[0]) ?
+                server->notify_levels : "");
+    gui_printf (NULL, "  server_charset_decode_iso. : %s\n",
+                (server->charset_decode_iso && server->charset_decode_iso[0]) ?
+                server->charset_decode_iso : "");
+    gui_printf (NULL, "  server_charset_decode_utf. : %s\n",
+                (server->charset_decode_utf && server->charset_decode_utf[0]) ?
+                server->charset_decode_utf : "");
+    gui_printf (NULL, "  server_charset_encode. . . : %s\n",
+                (server->charset_encode && server->charset_encode[0]) ?
+                server->charset_encode : "");
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

 /* irc-ignore.c: manages IRC ignore list */
@@ -191,6 +191,7 @@ ignore_add (char *mask, char *type, char *channel_name, char *server_name)
    if (!mask || !mask[0] || !type || !type[0] || !channel_name || !channel_name[0]
        || !server_name || !server_name[0])
    {
+        irc_display_prefix (NULL, NULL, PREFIX_ERROR);
        gui_printf (NULL,
                    _("%s too few arguments for ignore\n"),
                    WEECHAT_ERROR);
@@ -207,7 +208,7 @@ ignore_add (char *mask, char *type, char *channel_name, char *server_name)
    
    if ((strcmp (mask, "*") == 0) && (strcmp (type, "*") == 0))
    {
-        irc_display_prefix (NULL, PREFIX_ERROR);
+        irc_display_prefix (NULL, NULL, PREFIX_ERROR);
        gui_printf (NULL,
                    _("%s mask or type/command should be non generic value for ignore\n"),
                    WEECHAT_ERROR);
@@ -216,7 +217,7 @@ ignore_add (char *mask, char *type, char *channel_name, char *server_name)
    
    if (ignore_search (mask, type, channel_name, server_name))
    {
-        irc_display_prefix (NULL, PREFIX_ERROR);
+        irc_display_prefix (NULL, NULL, PREFIX_ERROR);
        gui_printf (NULL,
                    _("%s ignore already exists\n"),
                    WEECHAT_ERROR);
@@ -252,7 +253,7 @@ ignore_add (char *mask, char *type, char *channel_name, char *server_name)
        /* not a pre-defined command and not an IRC command => error */
        if ((type_index < 0) && (!command_ptr))
        {
-            irc_display_prefix (NULL, PREFIX_ERROR);
+            irc_display_prefix (NULL, NULL, PREFIX_ERROR);
            gui_printf (NULL,
                        _("%s unknown type or IRC command \"%s\" for ignore\n"),
                        WEECHAT_ERROR, type);
@@ -280,7 +281,7 @@ ignore_add (char *mask, char *type, char *channel_name, char *server_name)
    }
    else
    {
-        irc_display_prefix (NULL, PREFIX_ERROR);
+        irc_display_prefix (NULL, NULL, PREFIX_ERROR);
        gui_printf (NULL,
                    _("%s not enough memory to create ignore\n"),
                    WEECHAT_ERROR);
@@ -402,7 +403,7 @@ ignore_search_free (char *mask, char *type, char *channel_name, char *server_nam
            found++;
            if (found == 1)
                gui_printf (NULL, "\n");
-            irc_display_prefix (NULL, PREFIX_INFO);
+            irc_display_prefix (NULL, NULL, PREFIX_INFO);
            weechat_cmd_ignore_display (_("Removing ignore:"), ptr_ignore);
            next_ignore = ptr_ignore->next_ignore;
            ignore_free (ptr_ignore);
@@ -438,7 +439,7 @@ ignore_search_free_by_number (int number)
        if (i == number)
        {
            gui_printf (NULL, "\n");
-            irc_display_prefix (NULL, PREFIX_INFO);
+            irc_display_prefix (NULL, NULL, PREFIX_INFO);
            weechat_cmd_ignore_display (_("Removing ignore:"), ptr_ignore);
            ignore_free (ptr_ignore);
            return 1;
@@ -458,18 +459,18 @@ ignore_print_log ()
 {
    t_irc_ignore *ptr_ignore;
    
-    wee_log_printf ("[ignore list]\n");
+    weechat_log_printf ("[ignore list]\n");
    
    for (ptr_ignore = irc_ignore; ptr_ignore;
         ptr_ignore = ptr_ignore->next_ignore)
    {
-        wee_log_printf ("\n");
-        wee_log_printf ("  -> ignore at 0x%X:\n", ptr_ignore);
-        wee_log_printf ("     mask. . . . . . . : %s\n",   ptr_ignore->mask);
-        wee_log_printf ("     type. . . . . . . : %s\n",   ptr_ignore->type);
-        wee_log_printf ("     channel_name. . . : %s\n",   ptr_ignore->channel_name);
-        wee_log_printf ("     server_name . . . : %s\n",   ptr_ignore->server_name);
-        wee_log_printf ("     prev_ignore . . . : 0x%X\n", ptr_ignore->prev_ignore);
-        wee_log_printf ("     next_ignore . . . : 0x%X\n", ptr_ignore->next_ignore);
+        weechat_log_printf ("\n");
+        weechat_log_printf ("  -> ignore at 0x%X:\n", ptr_ignore);
+        weechat_log_printf ("     mask. . . . . . . : %s\n",   ptr_ignore->mask);
+        weechat_log_printf ("     type. . . . . . . : %s\n",   ptr_ignore->type);
+        weechat_log_printf ("     channel_name. . . : %s\n",   ptr_ignore->channel_name);
+        weechat_log_printf ("     server_name . . . : %s\n",   ptr_ignore->server_name);
+        weechat_log_printf ("     prev_ignore . . . : 0x%X\n", ptr_ignore->prev_ignore);
+        weechat_log_printf ("     next_ignore . . . : 0x%X\n", ptr_ignore->next_ignore);
    }
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

 /* irc-nick.c: manages nick list for channels */
@@ -49,7 +49,7 @@ nick_find_color (t_irc_nick *nick)
    }
    color = (color % cfg_look_color_nicks_number);
    
-    return COLOR_WIN_NICK_FIRST + color;
+    return COLOR_WIN_NICK_1 + color;
 }

 /*
@@ -59,15 +59,15 @@ nick_find_color (t_irc_nick *nick)
 int
 nick_score_for_sort (t_irc_nick *nick)
 {
-    if (nick->is_chanowner)
+    if (nick->flags & NICK_CHANOWNER)
        return -32;
-    if (nick->is_chanadmin)
+    if (nick->flags & NICK_CHANADMIN)
        return -16;
-    if (nick->is_op)
+    if (nick->flags & NICK_OP)
        return -8;
-    if (nick->is_halfop)
+    if (nick->flags & NICK_HALFOP)
        return -4;
-    if (nick->has_voice)
+    if (nick->flags & NICK_VOICE)
        return -2;
    return 0;
 }
@@ -168,7 +168,7 @@ nick_insert_sorted (t_irc_channel *channel, t_irc_nick *nick)
 */

 t_irc_nick *
-nick_new (t_irc_channel *channel, char *nick_name,
+nick_new (t_irc_server *server, t_irc_channel *channel, char *nick_name,
          int is_chanowner, int is_chanadmin, int is_op, int is_halfop,
          int has_voice)
 {
@@ -178,35 +178,31 @@ nick_new (t_irc_channel *channel, char *nick_name,
    if ((new_nick = nick_search (channel, nick_name)))
    {
        /* update nick */
-        new_nick->is_chanowner = is_chanowner;
-        new_nick->is_chanadmin = is_chanadmin;
-        new_nick->is_op = is_op;
-        new_nick->is_halfop = is_halfop;
-        new_nick->has_voice = has_voice;
+        NICK_SET_FLAG(new_nick, is_chanowner, NICK_CHANOWNER);
+        NICK_SET_FLAG(new_nick, is_chanadmin, NICK_CHANADMIN);
+        NICK_SET_FLAG(new_nick, is_op, NICK_OP);
+        NICK_SET_FLAG(new_nick, is_halfop, NICK_HALFOP);
+        NICK_SET_FLAG(new_nick, has_voice, NICK_VOICE);
        return new_nick;
    }
    
    /* alloc memory for new nick */
    if ((new_nick = (t_irc_nick *) malloc (sizeof (t_irc_nick))) == NULL)
-    {
-        gui_printf (channel->buffer,
-                    _("%s cannot allocate new nick\n"), WEECHAT_ERROR);
        return NULL;
-    }
-
+    
    /* initialize new nick */
    new_nick->nick = strdup (nick_name);
-    new_nick->is_chanowner = is_chanowner;
-    new_nick->is_chanadmin = is_chanadmin;
-    new_nick->is_op = is_op;
-    new_nick->is_halfop = is_halfop;
-    new_nick->has_voice = has_voice;
-    new_nick->is_away = 0;
-    if (ascii_strcasecmp (new_nick->nick, SERVER(channel->buffer)->nick) == 0)
+    new_nick->flags = 0;
+    NICK_SET_FLAG(new_nick, is_chanowner, NICK_CHANOWNER);
+    NICK_SET_FLAG(new_nick, is_chanadmin, NICK_CHANADMIN);
+    NICK_SET_FLAG(new_nick, is_op, NICK_OP);
+    NICK_SET_FLAG(new_nick, is_halfop, NICK_HALFOP);
+    NICK_SET_FLAG(new_nick, has_voice, NICK_VOICE);
+    if (ascii_strcasecmp (new_nick->nick, server->nick) == 0)
        new_nick->color = COLOR_WIN_NICK_SELF;
    else
        new_nick->color = nick_find_color (new_nick);
-
+    
    nick_insert_sorted (channel, new_nick);
    
    channel->nicks_count++;
@@ -347,15 +343,17 @@ nick_count (t_irc_channel *channel, int *total, int *count_op,
         ptr_nick = ptr_nick->next_nick)
    {
        (*total)++;
-        if ((ptr_nick->is_chanowner) || (ptr_nick->is_chanadmin) || (ptr_nick->is_op))
+        if ((ptr_nick->flags & NICK_CHANOWNER) ||
+            (ptr_nick->flags & NICK_CHANADMIN) ||
+            (ptr_nick->flags & NICK_OP))
            (*count_op)++;
        else
        {
-            if (ptr_nick->is_halfop)
+            if (ptr_nick->flags & NICK_HALFOP)
                (*count_halfop)++;
            else
            {
-                if (ptr_nick->has_voice)
+                if (ptr_nick->flags & NICK_VOICE)
                    (*count_voice)++;
                else
                    (*count_normal)++;
@@ -391,9 +389,10 @@ nick_get_max_length (t_irc_channel *channel)
 void
 nick_set_away (t_irc_channel *channel, t_irc_nick *nick, int is_away)
 {
-    if (nick->is_away != is_away)
+    if (((is_away) && (!(nick->flags & NICK_AWAY))) ||
+        ((!is_away) && (nick->flags & NICK_AWAY)))
    {
-        nick->is_away = is_away;
+        NICK_SET_FLAG(nick, is_away, NICK_AWAY);
        gui_draw_buffer_nick (channel->buffer, 0);
    }
 }
@@ -405,14 +404,9 @@ nick_set_away (t_irc_channel *channel, t_irc_nick *nick, int is_away)
 void
 nick_print_log (t_irc_nick *nick)
 {
-    wee_log_printf ("=> nick %s (addr:0x%X)]\n",    nick->nick, nick);
-    wee_log_printf ("     is_chanowner . : %d\n",   nick->is_chanowner);
-    wee_log_printf ("     is_chanadmin . : %d\n",   nick->is_chanadmin);
-    wee_log_printf ("     is_op. . . . . : %d\n",   nick->is_op);
-    wee_log_printf ("     is_halfop. . . : %d\n",   nick->is_halfop);
-    wee_log_printf ("     has_voice. . . : %d\n",   nick->has_voice);
-    wee_log_printf ("     is_away. . . . : %d\n",   nick->is_away);
-    wee_log_printf ("     color. . . . . : %d\n",   nick->color);
-    wee_log_printf ("     prev_nick. . . : 0x%X\n", nick->prev_nick);
-    wee_log_printf ("     next_nick. . . : 0x%X\n", nick->next_nick);
+    weechat_log_printf ("=> nick %s (addr:0x%X)]\n",    nick->nick, nick);
+    weechat_log_printf ("     flags. . . . . : %d\n",   nick->flags);
+    weechat_log_printf ("     color. . . . . : %d\n",   nick->color);
+    weechat_log_printf ("     prev_nick. . . : 0x%X\n", nick->prev_nick);
+    weechat_log_printf ("     next_nick. . . : 0x%X\n", nick->next_nick);
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

 /* irc-send.c: implementation of IRC commands (client to server),
@@ -57,10 +57,12 @@ irc_login (t_irc_server *server)
    hostname[sizeof (hostname) - 1] = '\0';
    if (!hostname[0])
        strcpy (hostname, _("unknown"));
-    irc_display_prefix (server->buffer, PREFIX_INFO);
+    irc_display_prefix (server, server->buffer, PREFIX_INFO);
    gui_printf (server->buffer,
                _("%s: using local hostname \"%s\"\n"),
                PACKAGE_NAME, hostname);
+    if (!server->nick)
+        server->nick = strdup (server->nick1);
    server_sendf (server,
                  "NICK %s\r\n"
                  "USER %s %s %s :%s\r\n",
@@ -82,6 +84,31 @@ irc_cmd_send_admin (t_irc_server *server, char *arguments)
    return 0;
 }

+/*
+ * irc_send_me: send a ctcp action to a channel
+ */
+
+int
+irc_send_me (t_irc_server *server, t_irc_channel *channel, char *arguments)
+{
+    char *string;
+    
+    server_sendf (server, "PRIVMSG %s :\01ACTION %s\01\r\n",
+                  channel->name,
+                  (arguments && arguments[0]) ? arguments : "");
+    irc_display_prefix (NULL, channel->buffer, PREFIX_ACTION_ME);
+    string = (arguments && arguments[0]) ?
+        (char *)gui_color_decode ((unsigned char *)arguments, 1) : NULL;
+    gui_printf (channel->buffer, "%s%s %s%s\n",
+                GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                server->nick,
+                GUI_COLOR(COLOR_WIN_CHAT),
+                (string) ? string : "");
+    if (string)
+        free (string);
+    return 0;
+}
+
 /*
 * irc_cmd_send_ame: send a ctcp action to all channels of all connected servers
 */
@@ -104,18 +131,8 @@ irc_cmd_send_ame (t_irc_server *server, char *arguments)
            for (ptr_channel = ptr_server->channels; ptr_channel;
                 ptr_channel = ptr_channel->next_channel)
            {
-                if (ptr_channel->type == CHAT_CHANNEL)
-                {
-                    server_sendf (ptr_server, "PRIVMSG %s :\01ACTION %s\01\r\n",
-                                  ptr_channel->name,
-                                  (arguments && arguments[0]) ? arguments : "");
-                    irc_display_prefix (ptr_channel->buffer, PREFIX_ACTION_ME);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_NICK, "%s", ptr_server->nick);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT, " %s\n",
-                                      (arguments && arguments[0]) ? arguments : "");
-                }
+                if (ptr_channel->type == CHANNEL_TYPE_CHANNEL)
+                    irc_send_me (ptr_server, ptr_channel, arguments);
            }
        }
    }
@@ -133,6 +150,7 @@ irc_cmd_send_amsg (t_irc_server *server, char *arguments)
    t_irc_server *ptr_server;
    t_irc_channel *ptr_channel;
    t_irc_nick *ptr_nick;
+    char *string;
    
    /* make gcc happy */
    (void) server;
@@ -148,7 +166,7 @@ irc_cmd_send_amsg (t_irc_server *server, char *arguments)
                for (ptr_channel = ptr_server->channels; ptr_channel;
                     ptr_channel = ptr_channel->next_channel)
                {
-                    if (ptr_channel->type == CHAT_CHANNEL)
+                    if (ptr_channel->type == CHANNEL_TYPE_CHANNEL)
                    {
                        server_sendf (ptr_server, "PRIVMSG %s :%s\r\n",
                                      ptr_channel->name, arguments);
@@ -157,12 +175,14 @@ irc_cmd_send_amsg (t_irc_server *server, char *arguments)
                        {
                            irc_display_nick (ptr_channel->buffer, ptr_nick, NULL,
                                              MSG_TYPE_NICK, 1, 1, 0);
-                            gui_printf_color (ptr_channel->buffer,
-                                              COLOR_WIN_CHAT, "%s\n", arguments);   
+                            string = (char *)gui_color_decode ((unsigned char *)arguments, 1);
+                            gui_printf (ptr_channel->buffer, "%s\n", (string) ? string : arguments);
+                            if (string)
+                                free (string);
                        }
                        else
                        {
-                            irc_display_prefix (ptr_server->buffer, PREFIX_ERROR);
+                            irc_display_prefix (ptr_server, ptr_server->buffer, PREFIX_ERROR);
                            gui_printf (ptr_server->buffer,
                                        _("%s cannot find nick for sending message\n"),
                                        WEECHAT_ERROR);
@@ -178,6 +198,78 @@ irc_cmd_send_amsg (t_irc_server *server, char *arguments)
    return 0;
 }

+/*
+ * irc_send_away: toggle away status for one server
+ */
+
+void
+irc_send_away (t_irc_server *server, char *arguments)
+{
+    char *string, buffer[4096];
+    t_gui_window *ptr_window;
+    time_t elapsed;
+    
+    if (arguments)
+    {
+        server->is_away = 1;
+        server->away_time = time (NULL);
+        server_sendf (server, "AWAY :%s\r\n", arguments);
+        if (cfg_irc_display_away != CFG_IRC_DISPLAY_AWAY_OFF)
+        {
+            string = (char *)gui_color_decode ((unsigned char *)arguments, 1);
+            if (cfg_irc_display_away == CFG_IRC_DISPLAY_AWAY_LOCAL)
+                irc_display_away (server, "away", (string) ? string : arguments);
+            else
+            {
+                snprintf (buffer, sizeof (buffer), "is away: %s", (string) ? string : arguments);
+                irc_send_me_all_channels (server, buffer);
+            }
+            if (string)
+                free (string);
+        }
+        server_set_away (server, server->nick, 1);
+        for (ptr_window = gui_windows; ptr_window;
+             ptr_window = ptr_window->next_window)
+        {
+            if (SERVER(ptr_window->buffer) == server)
+                ptr_window->buffer->last_read_line =
+                    ptr_window->buffer->last_line;
+        }
+    }
+    else
+    {
+        server_sendf (server, "AWAY\r\n");
+        server->is_away = 0;
+        if (server->away_time != 0)
+        {
+            elapsed = time (NULL) - server->away_time;
+            server->away_time = 0;
+            if (cfg_irc_display_away != CFG_IRC_DISPLAY_AWAY_OFF)
+            {
+                if (cfg_irc_display_away == CFG_IRC_DISPLAY_AWAY_LOCAL)
+                {
+                    snprintf (buffer, sizeof (buffer),
+                              "gone %.2ld:%.2ld:%.2ld",
+                              (long int)(elapsed / 3600),
+                              (long int)((elapsed / 60) % 60),
+                              (long int)(elapsed % 60));
+                    irc_display_away (server, "back", buffer);
+                }
+                else
+                {
+                    snprintf (buffer, sizeof (buffer),
+                              "is back (gone %.2ld:%.2ld:%.2ld)",
+                              (long int)(elapsed / 3600),
+                              (long int)((elapsed / 60) % 60),
+                              (long int)(elapsed % 60));
+                    irc_send_me_all_channels (server, buffer);
+                }
+            }
+        }
+        server_set_away (server, server->nick, 0);
+    }
+}
+
 /*
 * irc_cmd_send_away: toggle away status
 */
@@ -185,11 +277,8 @@ irc_cmd_send_amsg (t_irc_server *server, char *arguments)
 int
 irc_cmd_send_away (t_irc_server *server, char *arguments)
 {
-    char *pos, *ptr_away_msg;
-    char *ptr_away_default_msg = "away";
+    char *pos;
    t_irc_server *ptr_server;
-    time_t elapsed;
-    char buffer[4096];
    
    gui_add_hotlist = 0;
    if (arguments && (strncmp (arguments, "-all", 4) == 0))
@@ -204,83 +293,12 @@ irc_cmd_send_away (t_irc_server *server, char *arguments)
             ptr_server = ptr_server->next_server)
        {
            if (ptr_server->is_connected)
-            {
-                if (ptr_server->is_away && (!pos))
-                {
-                    server_sendf (ptr_server, "AWAY\r\n");
-                    ptr_server->is_away = 0;
-                    if (server->away_time != 0)
-                    {
-                        elapsed = time (NULL) - ptr_server->away_time;
-                        ptr_server->away_time = 0;
-                        if (cfg_irc_display_away)
-                        {
-                            snprintf (buffer, sizeof (buffer),
-                                      "is back (gone %.2ld:%.2ld:%.2ld)",
-                                      (long int)(elapsed / 3600),
-                                      (long int)((elapsed / 60) % 60),
-                                      (long int)(elapsed % 60));
-                            irc_send_me_all_channels (ptr_server, buffer);
-                        }
-                    }
-                    server_set_away (ptr_server, ptr_server->nick, 0);
-                }
-                else
-                {
-                    ptr_server->is_away = 1;
-                    ptr_server->away_time = time (NULL);
-                    ptr_away_msg = (pos) ? pos :
-                                   ((cfg_irc_default_msg_away && cfg_irc_default_msg_away[0]) ?
-                                   cfg_irc_default_msg_away : ptr_away_default_msg);
-                    server_sendf (ptr_server, "AWAY :%s\r\n", ptr_away_msg);
-                    if (cfg_irc_display_away)
-                    {
-                        snprintf (buffer, sizeof (buffer), "is away: %s", ptr_away_msg);
-                        irc_send_me_all_channels (ptr_server, buffer);
-                    }
-                    server_set_away (ptr_server, ptr_server->nick, 1);
-                }
-            }
+                irc_send_away (ptr_server, pos);
        }
    }
    else
-    {
-        if (server->is_away && (!arguments))
-        {
-            server_sendf (server, "AWAY\r\n");
-            server->is_away = 0;
-            if (server->away_time != 0)
-            {
-                elapsed = time (NULL) - server->away_time;
-                server->away_time = 0;
-                if (cfg_irc_display_away)
-                {
-                    snprintf (buffer, sizeof (buffer),
-                              "is back (gone %.2ld:%.2ld:%.2ld)",
-                              (long int)(elapsed / 3600),
-                              (long int)((elapsed / 60) % 60),
-                              (long int)(elapsed % 60));
-                    irc_send_me_all_channels (server, buffer);
-                }
-            }
-            server_set_away (server, server->nick, 0);
-        }
-        else
-        {
-            server->is_away = 1;
-            server->away_time = time (NULL);
-            ptr_away_msg = (arguments) ? arguments :
-                                   ((cfg_irc_default_msg_away && cfg_irc_default_msg_away[0]) ?
-                                   cfg_irc_default_msg_away : ptr_away_default_msg);
-            server_sendf (server, "AWAY :%s\r\n", ptr_away_msg);
-            if (cfg_irc_display_away)
-            {
-                snprintf (buffer, sizeof (buffer), "is away: %s", ptr_away_msg);
-                irc_send_me_all_channels (server, buffer);
-            }
-            server_set_away (server, server->nick, 1);
-        }
-    }
+        irc_send_away (server, arguments);
+    
    gui_draw_buffer_status (gui_current_window->buffer, 1);
    gui_add_hotlist = 1;
    return 0;
@@ -324,9 +342,9 @@ irc_cmd_send_ban (t_irc_server *server, char *arguments)
        {
            if (!BUFFER_IS_CHANNEL(gui_current_window->buffer))
            {
-                irc_display_prefix (server->buffer, PREFIX_ERROR);
+                irc_display_prefix (NULL, server->buffer, PREFIX_ERROR);
                gui_printf_nolog (server->buffer,
-                                  _("%s \"%s\" command can only be executed in a channel window\n"),
+                                  _("%s \"%s\" command can only be executed in a channel buffer\n"),
                                  WEECHAT_ERROR, "ban");
                return -1;
            }
@@ -352,9 +370,9 @@ irc_cmd_send_ban (t_irc_server *server, char *arguments)
    {
        if (!BUFFER_IS_CHANNEL(gui_current_window->buffer))
        {
-            irc_display_prefix (server->buffer, PREFIX_ERROR);
+            irc_display_prefix (NULL, server->buffer, PREFIX_ERROR);
            gui_printf_nolog (server->buffer,
-                              _("%s \"%s\" command can only be executed in a channel window\n"),
+                              _("%s \"%s\" command can only be executed in a channel buffer\n"),
                              WEECHAT_ERROR, "ban");
            return -1;
        }
@@ -400,21 +418,24 @@ irc_cmd_send_ctcp (t_irc_server *server, char *arguments)
            pos++;
        }

-        irc_display_prefix (server->buffer, PREFIX_SERVER);
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT, "CTCP");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, "(");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", arguments);
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, ")");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT, ": ");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "%s", pos_type);
+        irc_display_prefix (server, server->buffer, PREFIX_SERVER);
+        gui_printf (server->buffer, "CTCP%s(%s%s%s)%s: %s%s",
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    arguments,
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    pos_type);
        
        if ((ascii_strcasecmp (pos_type, "ping") == 0) && (!pos_args))
        {
            gettimeofday (&tv, &tz);
            server_sendf (server, "PRIVMSG %s :\01PING %d %d\01\r\n",
                          arguments, tv.tv_sec, tv.tv_usec);
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT, " %d %d\n",
-                              tv.tv_sec, tv.tv_usec);
+            gui_printf (server->buffer, " %s%d %d\n",
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        tv.tv_sec, tv.tv_usec);
        }
        else
        {
@@ -422,8 +443,9 @@ irc_cmd_send_ctcp (t_irc_server *server, char *arguments)
            {
                server_sendf (server, "PRIVMSG %s :\01%s %s\01\r\n",
                              arguments, pos_type, pos_args);
-                gui_printf_color (server->buffer, COLOR_WIN_CHAT, " %s\n",
-                                  pos_args);
+                gui_printf (server->buffer, " %s%s\n",
+                            GUI_COLOR(COLOR_WIN_CHAT),
+                            pos_args);
            }
            else
            {
@@ -451,7 +473,7 @@ irc_cmd_send_dcc (t_irc_server *server, char *arguments)
        pos_nick = strchr (arguments, ' ');
        if (!pos_nick)
        {
-            irc_display_prefix (server->buffer, PREFIX_ERROR);
+            irc_display_prefix (NULL, server->buffer, PREFIX_ERROR);
            gui_printf_nolog (server->buffer,
                              _("%s wrong argument count for \"%s\" command\n"),
                              WEECHAT_ERROR, "dcc send");
@@ -463,7 +485,7 @@ irc_cmd_send_dcc (t_irc_server *server, char *arguments)
        pos_file = strchr (pos_nick, ' ');
        if (!pos_file)
        {
-            irc_display_prefix (server->buffer, PREFIX_ERROR);
+            irc_display_prefix (NULL, server->buffer, PREFIX_ERROR);
            gui_printf_nolog (server->buffer,
                              _("%s wrong argument count for \"%s\" command\n"),
                              WEECHAT_ERROR, "dcc send");
@@ -481,7 +503,7 @@ irc_cmd_send_dcc (t_irc_server *server, char *arguments)
        pos_nick = strchr (arguments, ' ');
        if (!pos_nick)
        {
-            irc_display_prefix (server->buffer, PREFIX_ERROR);
+            irc_display_prefix (NULL, server->buffer, PREFIX_ERROR);
            gui_printf_nolog (server->buffer,
                              _("%s wrong argument count for \"%s\" command\n"),
                              WEECHAT_ERROR, "dcc chat");
@@ -504,7 +526,7 @@ irc_cmd_send_dcc (t_irc_server *server, char *arguments)
    }
    else
    {
-        irc_display_prefix (server->buffer, PREFIX_ERROR);
+        irc_display_prefix (NULL, server->buffer, PREFIX_ERROR);
        gui_printf_nolog (server->buffer,
                          _("%s wrong arguments for \"%s\" command\n"),
                          WEECHAT_ERROR, "dcc");
@@ -539,9 +561,9 @@ irc_cmd_send_dehalfop (t_irc_server *server, int argc, char **argv)
    }
    else
    {
-        irc_display_prefix (server->buffer, PREFIX_ERROR);
+        irc_display_prefix (NULL, server->buffer, PREFIX_ERROR);
        gui_printf_nolog (server->buffer,
-                          _("%s \"%s\" command can only be executed in a channel window\n"),
+                          _("%s \"%s\" command can only be executed in a channel buffer\n"),
                          WEECHAT_ERROR, "dehalfop");
    }
    return 0;
@@ -572,9 +594,9 @@ irc_cmd_send_deop (t_irc_server *server, int argc, char **argv)
    }
    else
    {
-        irc_display_prefix (server->buffer, PREFIX_ERROR);
+        irc_display_prefix (NULL, server->buffer, PREFIX_ERROR);
        gui_printf_nolog (server->buffer,
-                          _("%s \"%s\" command can only be executed in a channel window\n"),
+                          _("%s \"%s\" command can only be executed in a channel buffer\n"),
                          WEECHAT_ERROR, "deop");
    }
    return 0;
@@ -605,9 +627,9 @@ irc_cmd_send_devoice (t_irc_server *server, int argc, char **argv)
    }
    else
    {
-        irc_display_prefix (server->buffer, PREFIX_ERROR);
+        irc_display_prefix (NULL, server->buffer, PREFIX_ERROR);
        gui_printf_nolog (server->buffer,
-                          _("%s \"%s\" command can only be executed in a channel window\n"),
+                          _("%s \"%s\" command can only be executed in a channel buffer\n"),
                          WEECHAT_ERROR, "devoice");
        return -1;
    }
@@ -653,9 +675,9 @@ irc_cmd_send_halfop (t_irc_server *server, int argc, char **argv)
    }
    else
    {
-        irc_display_prefix (server->buffer, PREFIX_ERROR);
+        irc_display_prefix (NULL, server->buffer, PREFIX_ERROR);
        gui_printf_nolog (server->buffer,
-                          _("%s \"%s\" command can only be executed in a channel window\n"),
+                          _("%s \"%s\" command can only be executed in a channel buffer\n"),
                          WEECHAT_ERROR, "halfop");
        return -1;
    }
@@ -689,9 +711,9 @@ irc_cmd_send_invite (t_irc_server *server, int argc, char **argv)
    {
        if (!BUFFER_IS_CHANNEL(gui_current_window->buffer))
        {
-            irc_display_prefix (server->buffer, PREFIX_ERROR);
+            irc_display_prefix (NULL, server->buffer, PREFIX_ERROR);
            gui_printf_nolog (server->buffer,
-                              _("%s \"%s\" command can only be executed in a channel window\n"),
+                              _("%s \"%s\" command can only be executed in a channel buffer\n"),
                              WEECHAT_ERROR, "invite");
            return -1;
        }
@@ -741,7 +763,7 @@ irc_cmd_send_kick (t_irc_server *server, char *arguments)
        pos_nick = strchr (arguments, ' ');
        if (!pos_nick)
        {
-            irc_display_prefix (server->buffer, PREFIX_ERROR);
+            irc_display_prefix (NULL, server->buffer, PREFIX_ERROR);
            gui_printf_nolog (server->buffer,
                              _("%s wrong arguments for \"%s\" command\n"),
                              WEECHAT_ERROR, "kick");
@@ -756,9 +778,9 @@ irc_cmd_send_kick (t_irc_server *server, char *arguments)
    {
        if (!BUFFER_IS_CHANNEL(gui_current_window->buffer))
        {
-            irc_display_prefix (server->buffer, PREFIX_ERROR);
+            irc_display_prefix (NULL, server->buffer, PREFIX_ERROR);
            gui_printf_nolog (server->buffer,
-                              _("%s \"%s\" command can only be executed in a channel window\n"),
+                              _("%s \"%s\" command can only be executed in a channel buffer\n"),
                              WEECHAT_ERROR, "kick");
            return -1;
        }
@@ -798,7 +820,7 @@ irc_cmd_send_kickban (t_irc_server *server, char *arguments)
        pos_nick = strchr (arguments, ' ');
        if (!pos_nick)
        {
-            irc_display_prefix (server->buffer, PREFIX_ERROR);
+            irc_display_prefix (NULL, server->buffer, PREFIX_ERROR);
            gui_printf_nolog (server->buffer,
                              _("%s wrong arguments for \"%s\" command\n"),
                              WEECHAT_ERROR, "kickban");
@@ -813,9 +835,9 @@ irc_cmd_send_kickban (t_irc_server *server, char *arguments)
    {
        if (!BUFFER_IS_CHANNEL(gui_current_window->buffer))
        {
-            irc_display_prefix (server->buffer, PREFIX_ERROR);
+            irc_display_prefix (NULL, server->buffer, PREFIX_ERROR);
            gui_printf_nolog (server->buffer,
-                              _("%s \"%s\" command can only be executed in a channel window\n"),
+                              _("%s \"%s\" command can only be executed in a channel buffer\n"),
                              WEECHAT_ERROR, "kickban");
            return -1;
        }
@@ -895,25 +917,6 @@ irc_cmd_send_lusers (t_irc_server *server, char *arguments)
    return 0;
 }

-/*
- * irc_send_me: send a ctcp action to a channel
- */
-
-int
-irc_send_me (t_irc_server *server, t_irc_channel *channel, char *arguments)
-{
-    server_sendf (server, "PRIVMSG %s :\01ACTION %s\01\r\n",
-                  channel->name,
-                  (arguments && arguments[0]) ? arguments : "");
-    irc_display_prefix (channel->buffer, PREFIX_ACTION_ME);
-    gui_printf_color (channel->buffer,
-                      COLOR_WIN_CHAT_NICK, "%s", server->nick);
-    gui_printf_color (channel->buffer,
-                      COLOR_WIN_CHAT, " %s\n",
-                      (arguments && arguments[0]) ? arguments : "");
-    return 0;
-}
-
 /*
 * irc_send_me_all_channels: send a ctcp action to all channels of a server
 */
@@ -926,7 +929,7 @@ irc_send_me_all_channels (t_irc_server *server, char *arguments)
    for (ptr_channel = server->channels; ptr_channel;
         ptr_channel = ptr_channel->next_channel)
    {
-        if (ptr_channel->type == CHAT_CHANNEL)
+        if (ptr_channel->type == CHANNEL_TYPE_CHANNEL)
            irc_send_me (server, ptr_channel, arguments);
    }
    return 0;
@@ -941,9 +944,9 @@ irc_cmd_send_me (t_irc_server *server, char *arguments)
 {
    if (BUFFER_IS_SERVER(gui_current_window->buffer))
    {
-        irc_display_prefix (server->buffer, PREFIX_ERROR);
+        irc_display_prefix (NULL, server->buffer, PREFIX_ERROR);
        gui_printf_nolog (server->buffer,
-                          _("%s \"%s\" command can not be executed on a server window\n"),
+                          _("%s \"%s\" command can not be executed on a server buffer\n"),
                          WEECHAT_ERROR, "me");
        return -1;
    }
@@ -987,6 +990,7 @@ irc_cmd_send_msg (t_irc_server *server, char *arguments)
    char *msg_pwd_hidden, *pos_pwd;
    t_irc_channel *ptr_channel;
    t_irc_nick *ptr_nick;
+    char *string;
    
    pos = strchr (arguments, ' ');
    if (pos)
@@ -1006,31 +1010,29 @@ irc_cmd_send_msg (t_irc_server *server, char *arguments)
            }
            if (strcmp (arguments, "*") == 0)
            {
-                if (BUFFER_IS_SERVER(gui_current_window->buffer))
+                if (!BUFFER_IS_CHANNEL(gui_current_window->buffer) &&
+                    !BUFFER_IS_PRIVATE(gui_current_window->buffer))
                {
-                    irc_display_prefix (server->buffer, PREFIX_ERROR);
+                    irc_display_prefix (NULL, server->buffer, PREFIX_ERROR);
                    gui_printf_nolog (server->buffer,
-                                      _("%s \"%s\" command can not be executed on a server window\n"),
+                                      _("%s \"%s\" command can only be executed in a channel or private buffer\n"),
                                      WEECHAT_ERROR, "msg *");
                    return -1;
                }
                ptr_channel = CHANNEL(gui_current_window->buffer);
-                ptr_nick = nick_search (ptr_channel, server->nick);
-                if (ptr_nick)
-                {
-                    irc_display_nick (ptr_channel->buffer, ptr_nick, NULL,
-                                      MSG_TYPE_NICK, 1, 1, 0);
-                    gui_printf_type_color (ptr_channel->buffer,
-                                           MSG_TYPE_MSG,
-                                           COLOR_WIN_CHAT, "%s\n", pos);
-                }
+                if (BUFFER_IS_CHANNEL(gui_current_window->buffer))
+                    ptr_nick = nick_search (ptr_channel, server->nick);
                else
-                {
-                    irc_display_prefix (server->buffer, PREFIX_ERROR);
-                    gui_printf_nolog (server->buffer,
-                                      _("%s nick \"%s\" not found for \"%s\" command\n"),
-                                      WEECHAT_ERROR, server->nick, "msg");
-                }
+                    ptr_nick = NULL;
+                irc_display_nick (gui_current_window->buffer, ptr_nick,
+                                  (ptr_nick) ? NULL : server->nick,
+                                  MSG_TYPE_NICK, 1, 1, 0);
+                string = (char *)gui_color_decode ((unsigned char *)pos, 1);
+                gui_printf_type (gui_current_window->buffer, MSG_TYPE_MSG, "%s\n",
+                                 (string) ? string : "");
+                if (string)
+                    free (string);
+                
                server_sendf (server, "PRIVMSG %s :%s\r\n", ptr_channel->name, pos);
            }
            else
@@ -1045,13 +1047,15 @@ irc_cmd_send_msg (t_irc_server *server, char *arguments)
                        {
                            irc_display_nick (ptr_channel->buffer, ptr_nick, NULL,
                                              MSG_TYPE_NICK, 1, 1, 0);
-                            gui_printf_type_color (ptr_channel->buffer,
-                                                   MSG_TYPE_MSG,
-                                                   COLOR_WIN_CHAT, "%s\n", pos);
+                            string = (char *)gui_color_decode ((unsigned char *)pos, 1);
+                            gui_printf_type (ptr_channel->buffer, MSG_TYPE_MSG, "%s\n",
+                                             (string) ? string : "");
+                            if (string)
+                                free (string);
                        }
                        else
                        {
-                            irc_display_prefix (server->buffer, PREFIX_ERROR);
+                            irc_display_prefix (server, server->buffer, PREFIX_ERROR);
                            gui_printf_nolog (server->buffer,
                                              _("%s nick \"%s\" not found for \"%s\" command\n"),
                                              WEECHAT_ERROR, server->nick, "msg");
@@ -1080,18 +1084,19 @@ irc_cmd_send_msg (t_irc_server *server, char *arguments)
                                }
                            }
                        }
-                        irc_display_prefix (server->buffer, PREFIX_SERVER);
-                        gui_printf_type_color (server->buffer,
-                                               MSG_TYPE_NICK,
-                                               COLOR_WIN_CHAT_DARK, "-");
-                        gui_printf_type_color (server->buffer,
-                                               MSG_TYPE_NICK,
-                                               COLOR_WIN_CHAT_NICK, "%s", arguments);
-                        gui_printf_type_color (server->buffer,
-                                               MSG_TYPE_NICK,
-                                               COLOR_WIN_CHAT_DARK, "-");
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT, " %s\n", msg_pwd_hidden);
+                        irc_display_prefix (server, server->buffer, PREFIX_SERVER);
+                        gui_printf_type (server->buffer, MSG_TYPE_NICK,
+                                         "%s-%s%s%s- ",
+                                         GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                         GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                         arguments,
+                                         GUI_COLOR(COLOR_WIN_CHAT_DARK));
+                        string = (char *)gui_color_decode ((unsigned char *)msg_pwd_hidden, 1);
+                        gui_printf (server->buffer, "%s%s\n",
+                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                    (string) ? string : "");
+                        if (string)
+                            free (string);
                        server_sendf (server, "PRIVMSG %s :%s\r\n", arguments, pos);
                        free (msg_pwd_hidden);
                        return 0;
@@ -1100,31 +1105,32 @@ irc_cmd_send_msg (t_irc_server *server, char *arguments)
                    ptr_channel = channel_search (server, arguments);
                    if (!ptr_channel)
                    {
-                        ptr_channel = channel_new (server, CHAT_PRIVATE, arguments, 1);
+                        ptr_channel = channel_new (server, CHANNEL_TYPE_PRIVATE, arguments);
                        if (!ptr_channel)
                        {
-                            irc_display_prefix (server->buffer, PREFIX_ERROR);
+                            irc_display_prefix (NULL, server->buffer, PREFIX_ERROR);
                            gui_printf_nolog (server->buffer,
-                                              _("%s cannot create new private window \"%s\"\n"),
+                                              _("%s cannot create new private buffer \"%s\"\n"),
                                              WEECHAT_ERROR, arguments);
                            return -1;
                        }
+                        gui_buffer_new (gui_current_window, server, ptr_channel, 0, 1);
                        gui_draw_buffer_title (ptr_channel->buffer, 1);
                    }
                        
-                    gui_printf_type_color (ptr_channel->buffer,
-                                           MSG_TYPE_NICK,
-                                           COLOR_WIN_CHAT_DARK, "<");
-                    gui_printf_type_color (ptr_channel->buffer,
-                                           MSG_TYPE_NICK,
-                                           COLOR_WIN_NICK_SELF,
-                                           "%s", server->nick);
-                    gui_printf_type_color (ptr_channel->buffer,
-                                           MSG_TYPE_NICK,
-                                           COLOR_WIN_CHAT_DARK, "> ");
-                    gui_printf_type_color (ptr_channel->buffer,
-                                           MSG_TYPE_MSG,
-                                           COLOR_WIN_CHAT, "%s\n", pos);
+                    gui_printf_type (ptr_channel->buffer, MSG_TYPE_NICK,
+                                     "%s<%s%s%s> ",
+                                     GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                     GUI_COLOR(COLOR_WIN_NICK_SELF),
+                                     server->nick,
+                                     GUI_COLOR(COLOR_WIN_CHAT_DARK));
+                    string = (char *)gui_color_decode ((unsigned char *)pos, 1);
+                    gui_printf_type (ptr_channel->buffer, MSG_TYPE_MSG,
+                                     "%s%s\n",
+                                     GUI_COLOR(COLOR_WIN_CHAT),
+                                     (string) ? string : "");
+                    if (string)
+                        free (string);
                    server_sendf (server, "PRIVMSG %s :%s\r\n", arguments, pos);
                }
            }
@@ -1133,7 +1139,7 @@ irc_cmd_send_msg (t_irc_server *server, char *arguments)
    }
    else
    {
-        irc_display_prefix (server->buffer, PREFIX_ERROR);
+        irc_display_prefix (NULL, server->buffer, PREFIX_ERROR);
        gui_printf_nolog (server->buffer,
                          _("%s wrong argument count for \"%s\" command\n"),
                          WEECHAT_ERROR, "msg");
@@ -1155,9 +1161,9 @@ irc_cmd_send_names (t_irc_server *server, char *arguments)
    {
        if (!BUFFER_IS_CHANNEL(gui_current_window->buffer))
        {
-            irc_display_prefix (server->buffer, PREFIX_ERROR);
+            irc_display_prefix (NULL, server->buffer, PREFIX_ERROR);
            gui_printf_nolog (server->buffer,
-                              _("%s \"%s\" command can only be executed in a channel window\n"),
+                              _("%s \"%s\" command can only be executed in a channel buffer\n"),
                              WEECHAT_ERROR, "names");
            return -1;
        }
@@ -1168,6 +1174,31 @@ irc_cmd_send_names (t_irc_server *server, char *arguments)
    return 0;
 }

+/*
+ * irc_cmd_send_nick_server: change nickname on a server
+ */
+
+void
+irc_cmd_send_nick_server (t_irc_server *server, char *nickname)
+{
+    t_irc_channel *ptr_channel;
+    
+    if (server->is_connected)
+        server_sendf (server, "NICK %s\r\n", nickname);
+    else
+    {
+        if (server->nick)
+            free (server->nick);
+        server->nick = strdup (nickname);
+        gui_draw_buffer_input (server->buffer, 1);
+        for (ptr_channel = server->channels; ptr_channel;
+             ptr_channel = ptr_channel->next_channel)
+        {
+            gui_draw_buffer_input (ptr_channel->buffer, 1);
+        }
+    }
+}
+
 /*
 * irc_cmd_send_nick: change nickname
 */
@@ -1177,6 +1208,9 @@ irc_cmd_send_nick (t_irc_server *server, int argc, char **argv)
 {
    t_irc_server *ptr_server;
    
+    if (!server)
+        return 0;
+    
    if (argc == 2)
    {
        if (strncmp (argv[0], "-all", 4) != 0)
@@ -1185,14 +1219,13 @@ irc_cmd_send_nick (t_irc_server *server, int argc, char **argv)
        for (ptr_server = irc_servers; ptr_server;
             ptr_server = ptr_server->next_server)
        {
-            if (ptr_server->is_connected)
-                server_sendf (ptr_server, "NICK %s\r\n", argv[1]);
+            irc_cmd_send_nick_server (ptr_server, argv[1]);
        }
    }
    else
    {
        if (argc == 1)
-            server_sendf (server, "NICK %s\r\n", argv[0]);
+            irc_cmd_send_nick_server (server, argv[0]);
        else
            return -1;
    }
@@ -1207,7 +1240,7 @@ irc_cmd_send_nick (t_irc_server *server, int argc, char **argv)
 int
 irc_cmd_send_notice (t_irc_server *server, char *arguments)
 {
-    char *pos;
+    char *pos, *string;
    
    pos = strchr (arguments, ' ');
    if (pos)
@@ -1216,17 +1249,22 @@ irc_cmd_send_notice (t_irc_server *server, char *arguments)
        pos++;
        while (pos[0] == ' ')
            pos++;
-        irc_display_prefix (server->buffer, PREFIX_SERVER);
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT, "notice");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, "(");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", arguments);
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, ")");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT, ": %s\n", pos);
+        irc_display_prefix (server, server->buffer, PREFIX_SERVER);
+        string = (char *)gui_color_decode ((unsigned char *)pos, 1);
+        gui_printf (server->buffer, "notice%s(%s%s%s)%s: %s\n",
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    arguments,
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    (string) ? string : "");
+        if (string)
+            free (string);
        server_sendf (server, "NOTICE %s :%s\r\n", arguments, pos);
    }
    else
    {
-        irc_display_prefix (server->buffer, PREFIX_ERROR);
+        irc_display_prefix (NULL, server->buffer, PREFIX_ERROR);
        gui_printf_nolog (server->buffer,
                          _("%s wrong argument count for \"%s\" command\n"),
                          WEECHAT_ERROR, "notice");
@@ -1253,9 +1291,9 @@ irc_cmd_send_op (t_irc_server *server, int argc, char **argv)
    }
    else
    {
-        irc_display_prefix (server->buffer, PREFIX_ERROR);
+        irc_display_prefix (NULL, server->buffer, PREFIX_ERROR);
        gui_printf_nolog (server->buffer,
-                          _("%s \"%s\" command can only be executed in a channel window\n"),
+                          _("%s \"%s\" command can only be executed in a channel buffer\n"),
                          WEECHAT_ERROR, "op");
        return -1;
    }
@@ -1301,9 +1339,9 @@ irc_cmd_send_part (t_irc_server *server, char *arguments)
        {
            if (BUFFER_IS_SERVER(gui_current_window->buffer))
            {
-                irc_display_prefix (server->buffer, PREFIX_ERROR);
+                irc_display_prefix (NULL, server->buffer, PREFIX_ERROR);
                gui_printf_nolog (server->buffer,
-                                  _("%s \"%s\" command can not be executed on a server window\n"),
+                                  _("%s \"%s\" command can not be executed on a server buffer\n"),
                                  WEECHAT_ERROR, "part");
                return -1;
            }
@@ -1315,9 +1353,9 @@ irc_cmd_send_part (t_irc_server *server, char *arguments)
    {
        if (BUFFER_IS_SERVER(gui_current_window->buffer))
        {
-            irc_display_prefix (server->buffer, PREFIX_ERROR);
+            irc_display_prefix (NULL, server->buffer, PREFIX_ERROR);
            gui_printf_nolog (server->buffer,
-                              _("%s \"%s\" command can not be executed on a server window\n"),
+                              _("%s \"%s\" command can not be executed on a server buffer\n"),
                              WEECHAT_ERROR, "part");
            return -1;
        }
@@ -1389,7 +1427,7 @@ irc_cmd_send_pong (t_irc_server *server, char *arguments)
 int
 irc_cmd_send_query (t_irc_server *server, char *arguments)
 {
-    char *pos;
+    char *pos, *string;
    t_irc_channel *ptr_channel;
    t_gui_buffer *ptr_buffer;
    
@@ -1408,15 +1446,16 @@ irc_cmd_send_query (t_irc_server *server, char *arguments)
    ptr_channel = channel_search (server, arguments);
    if (!ptr_channel)
    {
-        ptr_channel = channel_new (server, CHAT_PRIVATE, arguments, 1);
+        ptr_channel = channel_new (server, CHANNEL_TYPE_PRIVATE, arguments);
        if (!ptr_channel)
        {
-            irc_display_prefix (server->buffer, PREFIX_ERROR);
+            irc_display_prefix (NULL, server->buffer, PREFIX_ERROR);
            gui_printf_nolog (server->buffer,
-                              _("%s cannot create new private window \"%s\"\n"),
+                              _("%s cannot create new private buffer \"%s\"\n"),
                              WEECHAT_ERROR, arguments);
            return -1;
        }
+        gui_buffer_new (gui_current_window, server, ptr_channel, 0, 1);
        gui_draw_buffer_title (ptr_channel->buffer, 1);
    }
    else
@@ -1435,19 +1474,19 @@ irc_cmd_send_query (t_irc_server *server, char *arguments)
    /* display text if given */
    if (pos)
    {        
-        gui_printf_type_color (ptr_channel->buffer,
-                               MSG_TYPE_NICK,
-                               COLOR_WIN_CHAT_DARK, "<");
-        gui_printf_type_color (ptr_channel->buffer,
-                                MSG_TYPE_NICK,
-                                COLOR_WIN_NICK_SELF,
-                                "%s", server->nick);
-        gui_printf_type_color (ptr_channel->buffer,
-                                MSG_TYPE_NICK,
-                                COLOR_WIN_CHAT_DARK, "> ");
-        gui_printf_type_color (ptr_channel->buffer,
-                                MSG_TYPE_MSG,
-                                COLOR_WIN_CHAT, "%s\n", pos);
+        gui_printf_type (ptr_channel->buffer, MSG_TYPE_NICK,
+                         "%s<%s%s%s> ",
+                         GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                         GUI_COLOR(COLOR_WIN_NICK_SELF),
+                         server->nick,
+                         GUI_COLOR(COLOR_WIN_CHAT_DARK));
+        string = (char *)gui_color_decode ((unsigned char *)pos, 1);
+        gui_printf_type (ptr_channel->buffer, MSG_TYPE_MSG,
+                         "%s%s\n",
+                         GUI_COLOR(COLOR_WIN_CHAT),
+                         (string) ? string : "");
+        if (string)
+            free (string);
        server_sendf (server, "PRIVMSG %s :%s\r\n", arguments, pos);
    }
    return 0;
@@ -1659,9 +1698,9 @@ irc_cmd_send_topic (t_irc_server *server, char *arguments)
    {
        if (BUFFER_IS_SERVER(gui_current_window->buffer))
        {
-            irc_display_prefix (server->buffer, PREFIX_ERROR);
+            irc_display_prefix (NULL, server->buffer, PREFIX_ERROR);
            gui_printf_nolog (server->buffer,
-                              _("%s \"%s\" command can not be executed on a server window\n"),
+                              _("%s \"%s\" command can not be executed on a server buffer\n"),
                              WEECHAT_ERROR, "topic");
            return -1;
        }
@@ -1732,9 +1771,9 @@ irc_cmd_send_unban (t_irc_server *server, char *arguments)
        {
            if (!BUFFER_IS_CHANNEL(gui_current_window->buffer))
            {
-                irc_display_prefix (server->buffer, PREFIX_ERROR);
+                irc_display_prefix (NULL, server->buffer, PREFIX_ERROR);
                gui_printf_nolog (server->buffer,
-                                  _("%s \"%s\" command can only be executed in a channel window\n"),
+                                  _("%s \"%s\" command can only be executed in a channel buffer\n"),
                                  WEECHAT_ERROR, "unban");
                return -1;
            }
@@ -1758,7 +1797,7 @@ irc_cmd_send_unban (t_irc_server *server, char *arguments)
    }
    else
    {
-        irc_display_prefix (server->buffer, PREFIX_ERROR);
+        irc_display_prefix (NULL, server->buffer, PREFIX_ERROR);
        gui_printf_nolog (server->buffer,
                          _("%s wrong argument count for \"%s\" command\n"),
                          WEECHAT_ERROR, "unban");
@@ -1812,7 +1851,7 @@ irc_cmd_send_version (t_irc_server *server, char *arguments)
    }
    else
    {
-        irc_display_prefix (server->buffer, PREFIX_INFO);
+        irc_display_prefix (NULL, server->buffer, PREFIX_INFO);
        gui_printf (server->buffer, _("%s, compiled on %s %s\n"),
                    PACKAGE_STRING,
                    __DATE__, __TIME__);
@@ -1846,9 +1885,9 @@ irc_cmd_send_voice (t_irc_server *server, int argc, char **argv)
    }
    else
    {
-        irc_display_prefix (server->buffer, PREFIX_ERROR);
+        irc_display_prefix (NULL, server->buffer, PREFIX_ERROR);
        gui_printf_nolog (server->buffer,
-                          _("%s \"%s\" command can only be executed in a channel window\n"),
+                          _("%s \"%s\" command can only be executed in a channel buffer\n"),
                          WEECHAT_ERROR, "voice");
        return -1;
    }
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

 /* irc-server.c: connection and communication with IRC server */
@@ -84,6 +84,9 @@ server_init (t_irc_server *server)
    server->autojoin = NULL;
    server->autorejoin = 0;
    server->notify_levels = NULL;
+    server->charset_decode_iso = NULL;
+    server->charset_decode_utf = NULL;
+    server->charset_encode = NULL;
    
    /* internal vars */
    server->child_pid = 0;
@@ -91,9 +94,7 @@ server_init (t_irc_server *server)
    server->child_write = -1;
    server->sock = -1;
    server->is_connected = 0;
-#ifdef HAVE_GNUTLS
    server->ssl_connected = 0;
-#endif
    server->unterminated_message = NULL;
    server->nick = NULL;
    server->reconnect_start = 0;
@@ -105,6 +106,7 @@ server_init (t_irc_server *server)
    server->lag_check_time.tv_usec = 0;
    server->lag_next_check = time (NULL) + cfg_irc_lag_check;
    server->buffer = NULL;
+    server->saved_buffer = NULL;
    server->channels = NULL;
    server->last_channel = NULL;
 }
@@ -295,6 +297,12 @@ server_destroy (t_irc_server *server)
        free (server->autojoin);
    if (server->notify_levels)
        free (server->notify_levels);
+    if (server->charset_decode_iso)
+        free (server->charset_decode_iso);
+    if (server->charset_decode_utf)
+        free (server->charset_decode_utf);
+    if (server->charset_encode)
+        free (server->charset_encode);
    if (server->unterminated_message)
        free (server->unterminated_message);
    if (server->nick)
@@ -356,7 +364,8 @@ server_new (char *name, int autoconnect, int autoreconnect, int autoreconnect_de
            int command_line, char *address, int port, int ipv6, int ssl, char *password,
            char *nick1, char *nick2, char *nick3, char *username,
            char *realname, char *command, int command_delay, char *autojoin,
-            int autorejoin, char *notify_levels)
+            int autorejoin, char *notify_levels, char *charset_decode_iso,
+            char *charset_decode_utf, char *charset_encode)
 {
    t_irc_server *new_server;
    
@@ -364,14 +373,18 @@ server_new (char *name, int autoconnect, int autoreconnect, int autoreconnect_de
        return NULL;
    
 #ifdef DEBUG
-    wee_log_printf ("Creating new server (name:%s, address:%s, port:%d, pwd:%s, "
-                    "nick1:%s, nick2:%s, nick3:%s, username:%s, realname:%s, "
-                    "command:%s, autojoin:%s, autorejoin:%s, notify_levels:%s)\n",
-                    name, address, port, (password) ? password : "",
-                    (nick1) ? nick1 : "", (nick2) ? nick2 : "", (nick3) ? nick3 : "",
-                    (username) ? username : "", (realname) ? realname : "",
-                    (command) ? command : "", (autojoin) ? autojoin : "",
-                    (autorejoin) ? "on" : "off", (notify_levels) ? notify_levels : "");
+    weechat_log_printf ("Creating new server (name:%s, address:%s, port:%d, pwd:%s, "
+                        "nick1:%s, nick2:%s, nick3:%s, username:%s, realname:%s, "
+                        "command:%s, autojoin:%s, autorejoin:%s, notify_levels:%s, "
+                        "decode_iso:%s, decode_utf:%s, encode:%s)\n",
+                        name, address, port, (password) ? password : "",
+                        (nick1) ? nick1 : "", (nick2) ? nick2 : "", (nick3) ? nick3 : "",
+                        (username) ? username : "", (realname) ? realname : "",
+                        (command) ? command : "", (autojoin) ? autojoin : "",
+                        (autorejoin) ? "on" : "off", (notify_levels) ? notify_levels : "",
+                        (charset_decode_iso) ? charset_decode_iso : "",
+                        (charset_decode_utf) ? charset_decode_utf : "",
+                        (charset_encode) ? charset_encode : "");
 #endif
    
    if ((new_server = server_alloc ()))
@@ -399,15 +412,104 @@ server_new (char *name, int autoconnect, int autoreconnect, int autoreconnect_de
        new_server->autojoin =
            (autojoin) ? strdup (autojoin) : NULL;
        new_server->autorejoin = autorejoin;
-        new_server->nick = strdup (new_server->nick1);
        new_server->notify_levels =
            (notify_levels) ? strdup (notify_levels) : NULL;
+        new_server->charset_decode_iso =
+            (charset_decode_iso) ? strdup (charset_decode_iso) : NULL;
+        new_server->charset_decode_utf =
+            (charset_decode_utf) ? strdup (charset_decode_utf) : NULL;
+        new_server->charset_encode =
+            (charset_encode) ? strdup (charset_encode) : NULL;
    }
    else
        return NULL;
    return new_server;
 }

+/*
+ * server_get_charset_decode_iso: get decode iso value for server
+ *                                if not found for server, look for global
+ */
+
+char *
+server_get_charset_decode_iso (t_irc_server *server)
+{
+    char *pos, *result;
+    int length;
+    
+    if (!server)
+        return (cfg_look_charset_decode_iso) ?
+            strdup (cfg_look_charset_decode_iso) : strdup ("");
+    
+    config_option_list_get_value (&(server->charset_decode_iso),
+                                  "server", &pos, &length);
+    if (pos && (length > 0))
+    {
+        result = strdup (pos);
+        result[length] = '\0';
+        return result;
+    }
+    
+    return (cfg_look_charset_decode_iso) ?
+        strdup (cfg_look_charset_decode_iso) : strdup ("");
+}
+
+/*
+ * server_get_charset_decode_utf: get decode utf value for server
+ *                                if not found for server, look for global
+ */
+
+char *
+server_get_charset_decode_utf (t_irc_server *server)
+{
+    char *pos, *result;
+    int length;
+    
+    if (!server)
+        return (cfg_look_charset_decode_utf) ?
+            strdup (cfg_look_charset_decode_utf) : strdup ("");
+    
+    config_option_list_get_value (&(server->charset_decode_utf),
+                                  "server", &pos, &length);
+    if (pos && (length > 0))
+    {
+        result = strdup (pos);
+        result[length] = '\0';
+        return result;
+    }
+    
+    return (cfg_look_charset_decode_utf) ?
+        strdup (cfg_look_charset_decode_utf) : strdup ("");
+}
+
+/*
+ * server_get_charset_encode: get encode value for server
+ *                            if not found for server, look for global
+ */
+
+char *
+server_get_charset_encode (t_irc_server *server)
+{
+    char *pos, *result;
+    int length;
+    
+    if (!server)
+        return (cfg_look_charset_encode) ?
+            strdup (cfg_look_charset_encode) : strdup ("");
+    
+    config_option_list_get_value (&(server->charset_encode),
+                                  "server", &pos, &length);
+    if (pos && (length > 0))
+    {
+        result = strdup (pos);
+        result[length] = '\0';
+        return result;
+    }
+    
+    return (cfg_look_charset_encode) ?
+        strdup (cfg_look_charset_encode) : strdup ("");
+}
+
 /*
 * server_send: send data to IRC server
 */
@@ -435,7 +537,6 @@ server_sendf (t_irc_server *server, char *fmt, ...)
 {
    va_list args;
    static char buffer[4096];
-    char *buf2;
    int size_buf;
    
    if (!server)
@@ -456,17 +557,12 @@ server_sendf (t_irc_server *server, char *fmt, ...)
    gui_printf (server->buffer, "[DEBUG] Sending to server >>> %s\n", buffer);
    buffer[size_buf - 2] = '\r';
 #endif
-    buf2 = weechat_convert_encoding ((cfg_look_charset_internal && cfg_look_charset_internal[0]) ?
-                                     cfg_look_charset_internal : local_charset,
-                                     cfg_look_charset_encode,
-                                     buffer);
-    if (server_send (server, buf2, strlen (buf2)) <= 0)
+    if (server_send (server, buffer, strlen (buffer)) <= 0)
    {
-        irc_display_prefix (server->buffer, PREFIX_ERROR);
+        irc_display_prefix (server, server->buffer, PREFIX_ERROR);
        gui_printf (server->buffer, _("%s error sending data to IRC server\n"),
                    WEECHAT_ERROR);
    }
-    free (buf2);
 }

 /*
@@ -477,11 +573,14 @@ void
 server_msgq_add_msg (t_irc_server *server, char *msg)
 {
    t_irc_message *message;
-
+    
+    if (!server->unterminated_message && !msg[0])
+        return;
+    
    message = (t_irc_message *) malloc (sizeof (t_irc_message));
    if (!message)
    {
-        irc_display_prefix (server->buffer, PREFIX_ERROR);
+        irc_display_prefix (server, server->buffer, PREFIX_ERROR);
        gui_printf (server->buffer,
                    _("%s not enough memory for received IRC message\n"),
                    WEECHAT_ERROR);
@@ -494,7 +593,7 @@ server_msgq_add_msg (t_irc_server *server, char *msg)
                                         strlen (msg) + 1);
        if (!message->data)
        {
-            irc_display_prefix (server->buffer, PREFIX_ERROR);
+            irc_display_prefix (server, server->buffer, PREFIX_ERROR);
            gui_printf (server->buffer,
                        _("%s not enough memory for received IRC message\n"),
                        WEECHAT_ERROR);
@@ -530,6 +629,9 @@ server_msgq_add_msg (t_irc_server *server, char *msg)
 void
 server_msgq_add_unterminated (t_irc_server *server, char *string)
 {
+    if (!string[0])
+        return;
+    
    if (server->unterminated_message)
    {
        server->unterminated_message =
@@ -538,7 +640,7 @@ server_msgq_add_unterminated (t_irc_server *server, char *string)
                              strlen (string) + 1);
        if (!server->unterminated_message)
        {
-            irc_display_prefix (server->buffer, PREFIX_ERROR);
+            irc_display_prefix (server, server->buffer, PREFIX_ERROR);
            gui_printf (server->buffer,
                        _("%s not enough memory for received IRC message\n"),
                        WEECHAT_ERROR);
@@ -551,7 +653,7 @@ server_msgq_add_unterminated (t_irc_server *server, char *string)
        server->unterminated_message = strdup (string);
        if (!server->unterminated_message)
        {
-            irc_display_prefix (server->buffer, PREFIX_ERROR);
+            irc_display_prefix (server, server->buffer, PREFIX_ERROR);
            gui_printf (server->buffer,
                        _("%s not enough memory for received IRC message\n"),
                        WEECHAT_ERROR);
@@ -566,41 +668,33 @@ server_msgq_add_unterminated (t_irc_server *server, char *string)
 void
 server_msgq_add_buffer (t_irc_server *server, char *buffer)
 {
-    char *pos;
+    char *pos_cr, *pos_lf;

    while (buffer[0])
    {
-        pos = strstr (buffer, "\r\n");
-        if (pos)
+        pos_cr = strchr (buffer, '\r');
+        pos_lf = strchr (buffer, '\n');
+        
+        if (!pos_cr && !pos_lf)
        {
-            pos[0] = '\0';
-            server_msgq_add_msg (server, buffer);
-            buffer = pos + 2;
+            /* no CR/LF found => add to unterminated and return */
+            server_msgq_add_unterminated (server, buffer);
+            return;
+        }
+        
+        if (pos_cr && ((!pos_lf) || (pos_lf > pos_cr)))
+        {
+            /* found '\r' first => ignore this char */
+            pos_cr[0] = '\0';
+            server_msgq_add_unterminated (server, buffer);
+            buffer = pos_cr + 1;
        }
        else
        {
-            pos = strstr (buffer, "\r");
-            if (pos && !pos[1])
-            {
-                pos[0] = '\0';
-                server_msgq_add_unterminated (server, buffer);
-                return;
-            }
-            else
-            {
-                pos = strstr (buffer, "\n");
-                if (pos)
-                {
-                    pos[0] = '\0';
-                    server_msgq_add_msg (server, buffer);
-                    buffer = pos + 1;
-                }
-                else
-                {
-                    server_msgq_add_unterminated (server, buffer);
-                    return;
-                }
-            }
+            /* found: '\n' first => terminate message */
+            pos_lf[0] = '\0';
+            server_msgq_add_msg (server, buffer);
+            buffer = pos_lf + 1;
        }
    }
 }
@@ -630,7 +724,7 @@ server_msgq_flush ()
            while (ptr_data[0] == ' ')
                ptr_data++;
            
-            if (ptr_data)
+            if (ptr_data && ptr_data[0])
            {
 #ifdef DEBUG
                gui_printf (NULL, "[DEBUG] data received from server: %s\n", ptr_data);
@@ -650,12 +744,12 @@ server_msgq_flush ()
                else
                    pos = ptr_data;
                
-                if (pos != NULL)
+                if (pos && pos[0])
                {
                    while (pos[0] == ' ')
                        pos++;
                    pos2 = strchr (pos, ' ');
-                    if (pos2 != NULL)
+                    if (pos2)
                    {
                        pos2[0] = '\0';
                        command = strdup (pos);
@@ -670,19 +764,22 @@ server_msgq_flush ()
                                          command, args))
                {
                    case -1:
-                        irc_display_prefix (recv_msgq->server->buffer, PREFIX_ERROR);
+                        irc_display_prefix (recv_msgq->server,
+                                            recv_msgq->server->buffer, PREFIX_ERROR);
                        gui_printf (recv_msgq->server->buffer,
-                                    _("%s Command '%s' failed!\n"), WEECHAT_ERROR, command);
+                                    _("%s Command \"%s\" failed!\n"), WEECHAT_ERROR, command);
                        break;
                    case -2:
-                        irc_display_prefix (recv_msgq->server->buffer, PREFIX_ERROR);
+                        irc_display_prefix (recv_msgq->server,
+                                            recv_msgq->server->buffer, PREFIX_ERROR);
                        gui_printf (recv_msgq->server->buffer,
                                    _("%s No command to execute!\n"), WEECHAT_ERROR);
                        break;
                    case -3:
-                        irc_display_prefix (recv_msgq->server->buffer, PREFIX_ERROR);
+                        irc_display_prefix (recv_msgq->server,
+                                            recv_msgq->server->buffer, PREFIX_ERROR);
                        gui_printf (recv_msgq->server->buffer,
-                                    _("%s Unknown command: cmd=%s, host=%s, args=%s\n"),
+                                    _("%s Unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\"\n"),
                                    WEECHAT_WARNING, command, host, args);
                        break;
                }
@@ -731,7 +828,7 @@ server_recv (t_irc_server *server)
    }
    else
    {
-        irc_display_prefix (server->buffer, PREFIX_ERROR);
+        irc_display_prefix (server, server->buffer, PREFIX_ERROR);
        gui_printf (server->buffer,
                    _("%s cannot read data from socket, disconnecting from server...\n"),
                    WEECHAT_ERROR);
@@ -800,9 +897,7 @@ server_close_connection (t_irc_server *server)
    
    /* server is now disconnected */
    server->is_connected = 0;
-#ifdef HAVE_GNUTLS
    server->ssl_connected = 0;
-#endif
 }

 /*
@@ -815,7 +910,7 @@ server_reconnect_schedule (t_irc_server *server)
    if (server->autoreconnect)
    {
        server->reconnect_start = time (NULL);
-        irc_display_prefix (server->buffer, PREFIX_INFO);
+        irc_display_prefix (server, server->buffer, PREFIX_INFO);
        gui_printf (server->buffer, _("%s: Reconnecting to server in %d seconds\n"),
                    PACKAGE_NAME, server->autoreconnect_delay);
    }
@@ -844,10 +939,11 @@ server_child_read (t_irc_server *server)
 #ifdef HAVE_GNUTLS
                if (server->ssl_connected)
                {
-                    gnutls_transport_set_ptr (server->gnutls_sess, (gnutls_transport_ptr) server->sock);
+                    gnutls_transport_set_ptr (server->gnutls_sess,
+                                              (gnutls_transport_ptr) server->sock);
                    if (gnutls_handshake (server->gnutls_sess) < 0)
                    {
-                        irc_display_prefix (server->buffer, PREFIX_ERROR);
+                        irc_display_prefix (server, server->buffer, PREFIX_ERROR);
                        gui_printf (server->buffer,
                                    _("%s gnutls handshake failed\n"),
                                    WEECHAT_ERROR);
@@ -863,7 +959,7 @@ server_child_read (t_irc_server *server)
                break;
            /* adress not found */
            case '1':
-                irc_display_prefix (server->buffer, PREFIX_ERROR);
+                irc_display_prefix (server, server->buffer, PREFIX_ERROR);
 		if (cfg_proxy_use)
 		  gui_printf (server->buffer,
 			      _("%s proxy address \"%s\" not found\n"),
@@ -877,7 +973,7 @@ server_child_read (t_irc_server *server)
                break;
            /* IP address not found */
            case '2':
-                irc_display_prefix (server->buffer, PREFIX_ERROR);
+                irc_display_prefix (server, server->buffer, PREFIX_ERROR);
 		if (cfg_proxy_use)
 		  gui_printf (server->buffer,
 			      _("%s proxy IP address not found\n"), WEECHAT_ERROR);
@@ -889,7 +985,7 @@ server_child_read (t_irc_server *server)
                break;
 	     /* connection refused */
            case '3':
-                irc_display_prefix (server->buffer, PREFIX_ERROR);
+                irc_display_prefix (server, server->buffer, PREFIX_ERROR);
 		if (cfg_proxy_use)
 		  gui_printf (server->buffer,
 			      _("%s proxy connection refused\n"), WEECHAT_ERROR);
@@ -901,9 +997,11 @@ server_child_read (t_irc_server *server)
                break;
 	    /* proxy fails to connect to server */
            case '4':
-                irc_display_prefix (server->buffer, PREFIX_ERROR);
+                irc_display_prefix (server, server->buffer, PREFIX_ERROR);
 		gui_printf (server->buffer,
-			    _("%s proxy fails to establish connection to server (check username/password if used)\n"), WEECHAT_ERROR);
+			    _("%s proxy fails to establish connection to "
+                              "server (check username/password if used)\n"),
+                            WEECHAT_ERROR);
                server_close_connection (server);
                server_reconnect_schedule (server);
                break;
@@ -1378,14 +1476,14 @@ server_connect (t_irc_server *server)
 #ifndef HAVE_GNUTLS
    if (server->ssl)
    {
-        irc_display_prefix (server->buffer, PREFIX_ERROR);
+        irc_display_prefix (server, server->buffer, PREFIX_ERROR);
        gui_printf (server->buffer,
                    _("%s cannot connect with SSL since WeeChat was not built "
                    "with GNUtls support\n"), WEECHAT_ERROR);
        return 0;
    }
 #endif
-    irc_display_prefix (server->buffer, PREFIX_INFO);
+    irc_display_prefix (server, server->buffer, PREFIX_INFO);
    if (cfg_proxy_use)
      {
 	gui_printf (server->buffer,
@@ -1395,12 +1493,12 @@ server_connect (t_irc_server *server)
 		    (server->ssl) ? " (SSL)" : "",
 		    cfg_proxy_type_values[cfg_proxy_type], cfg_proxy_address, cfg_proxy_port,
 		    (cfg_proxy_ipv6) ? " (IPv6)" : "");
-	wee_log_printf (_("Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"),
-			server->address, server->port,
-			(server->ipv6) ? " (IPv6)" : "",
-			(server->ssl) ? " (SSL)" : "",
-			cfg_proxy_type_values[cfg_proxy_type], cfg_proxy_address, cfg_proxy_port,
-			(cfg_proxy_ipv6) ? " (IPv6)" : "");
+	weechat_log_printf (_("Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"),
+                            server->address, server->port,
+                            (server->ipv6) ? " (IPv6)" : "",
+                            (server->ssl) ? " (SSL)" : "",
+                            cfg_proxy_type_values[cfg_proxy_type], cfg_proxy_address, cfg_proxy_port,
+                            (cfg_proxy_ipv6) ? " (IPv6)" : "");
      }
    else
      {
@@ -1409,23 +1507,23 @@ server_connect (t_irc_server *server)
 		    PACKAGE_NAME, server->address, server->port,
 		    (server->ipv6) ? " (IPv6)" : "",
 		    (server->ssl) ? " (SSL)" : "");
-	wee_log_printf (_("Connecting to server %s:%d%s%s...\n"),
-			server->address, server->port,
-			(server->ipv6) ? " (IPv6)" : "",
-			(server->ssl) ? " (SSL)" : "");
+	weechat_log_printf (_("Connecting to server %s:%d%s%s...\n"),
+                            server->address, server->port,
+                            (server->ipv6) ? " (IPv6)" : "",
+                            (server->ssl) ? " (SSL)" : "");
      }
    
    /* close any opened connection and kill child process if running */
    server_close_connection (server);
    
    /* init SSL if asked */
-#ifdef HAVE_GNUTLS
    server->ssl_connected = 0;
+#ifdef HAVE_GNUTLS
    if (server->ssl)
    {
        if (gnutls_init (&server->gnutls_sess, GNUTLS_CLIENT) != 0)
        {
-            irc_display_prefix (server->buffer, PREFIX_ERROR);
+            irc_display_prefix (server, server->buffer, PREFIX_ERROR);
            gui_printf (server->buffer,
                        _("%s gnutls init error\n"), WEECHAT_ERROR);
            return 0;
@@ -1440,7 +1538,7 @@ server_connect (t_irc_server *server)
    /* create pipe for child process */
    if (pipe (child_pipe) < 0)
    {
-        irc_display_prefix (server->buffer, PREFIX_ERROR);
+        irc_display_prefix (server, server->buffer, PREFIX_ERROR);
        gui_printf (server->buffer,
                    _("%s cannot create pipe\n"), WEECHAT_ERROR);
        return 0;
@@ -1455,7 +1553,7 @@ server_connect (t_irc_server *server)
      server->sock = socket ((server->ipv6) ? AF_INET6 : AF_INET, SOCK_STREAM, 0);
    if (server->sock == -1)
    {
-        irc_display_prefix (server->buffer, PREFIX_ERROR);
+        irc_display_prefix (server, server->buffer, PREFIX_ERROR);
        gui_printf (server->buffer,
                    _("%s cannot create socket\n"), WEECHAT_ERROR);
        return 0;
@@ -1466,7 +1564,7 @@ server_connect (t_irc_server *server)
    if (setsockopt (server->sock, SOL_SOCKET, SO_REUSEADDR,
        (void *) &set, sizeof (set)) == -1)
    {
-        irc_display_prefix (server->buffer, PREFIX_ERROR);
+        irc_display_prefix (server, server->buffer, PREFIX_ERROR);
        gui_printf (server->buffer,
                    _("%s cannot set socket option \"SO_REUSEADDR\"\n"),
                    WEECHAT_WARNING);
@@ -1477,7 +1575,7 @@ server_connect (t_irc_server *server)
    if (setsockopt (server->sock, SOL_SOCKET, SO_KEEPALIVE,
        (void *) &set, sizeof (set)) == -1)
    {
-        irc_display_prefix (server->buffer, PREFIX_ERROR);
+        irc_display_prefix (server, server->buffer, PREFIX_ERROR);
        gui_printf (server->buffer,
                    _("%s cannot set socket option \"SO_KEEPALIVE\"\n"),
                    WEECHAT_WARNING);
@@ -1509,7 +1607,7 @@ server_connect (t_irc_server *server)
 void
 server_reconnect (t_irc_server *server)
 {
-    irc_display_prefix (server->buffer, PREFIX_INFO);
+    irc_display_prefix (server, server->buffer, PREFIX_INFO);
    gui_printf (server->buffer, _("%s: Reconnecting to server...\n"),
                PACKAGE_NAME);
    server->reconnect_start = 0;
@@ -1525,7 +1623,7 @@ server_reconnect (t_irc_server *server)
 */

 void
-server_auto_connect (int command_line)
+server_auto_connect (int auto_connect, int command_line)
 {
    t_irc_server *ptr_server;
    
@@ -1533,7 +1631,7 @@ server_auto_connect (int command_line)
         ptr_server = ptr_server->next_server)
    {
        if ( ((command_line) && (ptr_server->command_line))
-            || ((!command_line) && (ptr_server->autoconnect)) )
+            || ((!command_line) && (auto_connect) && (ptr_server->autoconnect)) )
        {
            (void) gui_buffer_new (gui_current_window, ptr_server, NULL, 0, 1);
            gui_redraw_buffer (gui_current_window->buffer);
@@ -1559,7 +1657,7 @@ server_disconnect (t_irc_server *server, int reconnect)
             ptr_channel = ptr_channel->next_channel)
        {
            nick_free_all (ptr_channel);
-            irc_display_prefix (ptr_channel->buffer, PREFIX_INFO);
+            irc_display_prefix (NULL, ptr_channel->buffer, PREFIX_INFO);
            gui_printf (ptr_channel->buffer, _("Disconnected from server!\n"));
        }
    }
@@ -1568,7 +1666,7 @@ server_disconnect (t_irc_server *server, int reconnect)
    
    if (server->buffer)
    {
-        irc_display_prefix (server->buffer, PREFIX_INFO);
+        irc_display_prefix (server, server->buffer, PREFIX_INFO);
        gui_printf (server->buffer, _("Disconnected from server!\n"));
    }
    
@@ -1640,6 +1738,31 @@ server_get_number_connected ()
    return number;
 }

+/*
+ * server_get_number_buffer: returns position of a server and total number of
+ *                           buffers with a buffer
+ */
+
+void
+server_get_number_buffer (t_irc_server *server,
+                          int *server_pos, int *server_total)
+{
+    t_irc_server *ptr_server;
+    
+    *server_pos = 0;
+    *server_total = 0;
+    for (ptr_server = irc_servers; ptr_server;
+         ptr_server = ptr_server->next_server)
+    {
+        if (ptr_server->buffer)
+        {
+            (*server_total)++;
+            if (ptr_server == server)
+                *server_pos = *server_total;
+        }
+    }
+}
+
 /*
 * server_name_already_exists: return 1 if server name already exists
 *                             otherwise return 0
@@ -1677,7 +1800,7 @@ server_remove_away ()
        {
            for (ptr_channel = ptr_server->channels; ptr_channel; ptr_channel = ptr_channel->next_channel)
            {
-                if (ptr_channel->type == CHAT_CHANNEL)
+                if (ptr_channel->type == CHANNEL_TYPE_CHANNEL)
                    channel_remove_away (ptr_channel);
            }
        }
@@ -1700,7 +1823,7 @@ server_check_away ()
        {
            for (ptr_channel = ptr_server->channels; ptr_channel; ptr_channel = ptr_channel->next_channel)
            {
-                if (ptr_channel->type == CHAT_CHANNEL)
+                if (ptr_channel->type == CHANNEL_TYPE_CHANNEL)
                    channel_check_away (ptr_server, ptr_channel);
            }
        }
@@ -1720,7 +1843,7 @@ server_set_away (t_irc_server *server, char *nick, int is_away)
    {
        if (server->is_connected)
        {
-            if (ptr_channel->type == CHAT_CHANNEL)
+            if (ptr_channel->type == CHANNEL_TYPE_CHANNEL)
                channel_set_away (ptr_channel, nick, is_away);
        }
    }
@@ -1733,49 +1856,53 @@ server_set_away (t_irc_server *server, char *nick, int is_away)
 void
 server_print_log (t_irc_server *server)
 {
-    wee_log_printf ("[server %s (addr:0x%X)]\n", server->name, server);
-    wee_log_printf ("  autoconnect . . . . : %d\n",    server->autoconnect);
-    wee_log_printf ("  autoreconnect . . . : %d\n",    server->autoreconnect);
-    wee_log_printf ("  autoreconnect_delay : %d\n",    server->autoreconnect_delay);
-    wee_log_printf ("  command_line. . . . : %d\n",    server->command_line);
-    wee_log_printf ("  address . . . . . . : '%s'\n",  server->address);
-    wee_log_printf ("  port. . . . . . . . : %d\n",    server->port);
-    wee_log_printf ("  ipv6. . . . . . . . : %d\n",    server->ipv6);
-    wee_log_printf ("  ssl . . . . . . . . : %d\n",    server->ssl);
-    wee_log_printf ("  password. . . . . . : '%s'\n",
-        (server->password && server->password[0]) ? "(hidden)" : server->password);
-    wee_log_printf ("  nick1 . . . . . . . : '%s'\n",  server->nick1);
-    wee_log_printf ("  nick2 . . . . . . . : '%s'\n",  server->nick2);
-    wee_log_printf ("  nick3 . . . . . . . : '%s'\n",  server->nick3);
-    wee_log_printf ("  username. . . . . . : '%s'\n",  server->username);
-    wee_log_printf ("  realname. . . . . . : '%s'\n",  server->realname);
-    wee_log_printf ("  command . . . . . . : '%s'\n",
-        (server->command && server->command[0]) ? "(hidden)" : server->command);
-    wee_log_printf ("  command_delay . . . : %d\n",    server->command_delay);
-    wee_log_printf ("  autojoin. . . . . . : '%s'\n",  server->autojoin);
-    wee_log_printf ("  autorejoin. . . . . : %d\n",    server->autorejoin);
-    wee_log_printf ("  notify_levels . . . : %s\n",    server->notify_levels);
-    wee_log_printf ("  child_pid . . . . . : %d\n",    server->child_pid);
-    wee_log_printf ("  child_read  . . . . : %d\n",    server->child_read);
-    wee_log_printf ("  child_write . . . . : %d\n",    server->child_write);
-    wee_log_printf ("  sock. . . . . . . . : %d\n",    server->sock);
-    wee_log_printf ("  is_connected. . . . : %d\n",    server->is_connected);
-#ifdef HAVE_GNUTLS
-    wee_log_printf("   ssl_connected . . . : %d\n",    server->ssl_connected);
-#endif
-    wee_log_printf ("  unterminated_message: '%s'\n",  server->unterminated_message);
-    wee_log_printf ("  nick. . . . . . . . : '%s'\n",  server->nick);
-    wee_log_printf ("  reconnect_start . . : %ld\n",   server->reconnect_start);
-    wee_log_printf ("  reconnect_join. . . : %d\n",    server->reconnect_join);
-    wee_log_printf ("  is_away . . . . . . : %d\n",    server->is_away);
-    wee_log_printf ("  away_time . . . . . : %ld\n",   server->away_time);
-    wee_log_printf ("  lag . . . . . . . . : %d\n",    server->lag);
-    wee_log_printf ("  lag_check_time. . . : tv_sec:%d, tv_usec:%d\n",
-        server->lag_check_time.tv_sec, server->lag_check_time.tv_usec);
-    wee_log_printf ("  lag_next_check. . . : %ld\n",   server->lag_next_check);
-    wee_log_printf ("  buffer. . . . . . . : 0x%X\n",  server->buffer);
-    wee_log_printf ("  channels. . . . . . : 0x%X\n",  server->channels);
-    wee_log_printf ("  last_channel. . . . : 0x%X\n",  server->last_channel);
-    wee_log_printf ("  prev_server . . . . : 0x%X\n",  server->prev_server);
-    wee_log_printf ("  next_server . . . . : 0x%X\n",  server->next_server);
+    weechat_log_printf ("[server %s (addr:0x%X)]\n",      server->name, server);
+    weechat_log_printf ("  autoconnect . . . . : %d\n",   server->autoconnect);
+    weechat_log_printf ("  autoreconnect . . . : %d\n",   server->autoreconnect);
+    weechat_log_printf ("  autoreconnect_delay : %d\n",   server->autoreconnect_delay);
+    weechat_log_printf ("  command_line. . . . : %d\n",   server->command_line);
+    weechat_log_printf ("  address . . . . . . : '%s'\n", server->address);
+    weechat_log_printf ("  port. . . . . . . . : %d\n",   server->port);
+    weechat_log_printf ("  ipv6. . . . . . . . : %d\n",   server->ipv6);
+    weechat_log_printf ("  ssl . . . . . . . . : %d\n",   server->ssl);
+    weechat_log_printf ("  password. . . . . . : '%s'\n",
+                        (server->password && server->password[0]) ?
+                        "(hidden)" : server->password);
+    weechat_log_printf ("  nick1 . . . . . . . : '%s'\n", server->nick1);
+    weechat_log_printf ("  nick2 . . . . . . . : '%s'\n", server->nick2);
+    weechat_log_printf ("  nick3 . . . . . . . : '%s'\n", server->nick3);
+    weechat_log_printf ("  username. . . . . . : '%s'\n", server->username);
+    weechat_log_printf ("  realname. . . . . . : '%s'\n", server->realname);
+    weechat_log_printf ("  command . . . . . . : '%s'\n",
+                        (server->command && server->command[0]) ?
+                        "(hidden)" : server->command);
+    weechat_log_printf ("  command_delay . . . : %d\n",   server->command_delay);
+    weechat_log_printf ("  autojoin. . . . . . : '%s'\n", server->autojoin);
+    weechat_log_printf ("  autorejoin. . . . . : %d\n",   server->autorejoin);
+    weechat_log_printf ("  notify_levels . . . : %s\n",   server->notify_levels);
+    weechat_log_printf ("  charset_decode_iso. : %s\n",   server->charset_decode_iso);
+    weechat_log_printf ("  charset_decode_utf. : %s\n",   server->charset_decode_utf);
+    weechat_log_printf ("  charset_encode. . . : %s\n",   server->charset_encode);
+    weechat_log_printf ("  child_pid . . . . . : %d\n",   server->child_pid);
+    weechat_log_printf ("  child_read  . . . . : %d\n",   server->child_read);
+    weechat_log_printf ("  child_write . . . . : %d\n",   server->child_write);
+    weechat_log_printf ("  sock. . . . . . . . : %d\n",   server->sock);
+    weechat_log_printf ("  is_connected. . . . : %d\n",   server->is_connected);
+    weechat_log_printf ("  ssl_connected . . . : %d\n",   server->ssl_connected);
+    weechat_log_printf ("  unterminated_message: '%s'\n", server->unterminated_message);
+    weechat_log_printf ("  nick. . . . . . . . : '%s'\n", server->nick);
+    weechat_log_printf ("  reconnect_start . . : %ld\n",  server->reconnect_start);
+    weechat_log_printf ("  reconnect_join. . . : %d\n",   server->reconnect_join);
+    weechat_log_printf ("  is_away . . . . . . : %d\n",   server->is_away);
+    weechat_log_printf ("  away_time . . . . . : %ld\n",  server->away_time);
+    weechat_log_printf ("  lag . . . . . . . . : %d\n",   server->lag);
+    weechat_log_printf ("  lag_check_time. . . : tv_sec:%d, tv_usec:%d\n",
+                        server->lag_check_time.tv_sec,
+                        server->lag_check_time.tv_usec);
+    weechat_log_printf ("  lag_next_check. . . : %ld\n",  server->lag_next_check);
+    weechat_log_printf ("  buffer. . . . . . . : 0x%X\n", server->buffer);
+    weechat_log_printf ("  channels. . . . . . : 0x%X\n", server->channels);
+    weechat_log_printf ("  last_channel. . . . : 0x%X\n", server->last_channel);
+    weechat_log_printf ("  prev_server . . . . : 0x%X\n", server->prev_server);
+    weechat_log_printf ("  next_server . . . . : 0x%X\n", server->next_server);
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */


@@ -45,10 +45,43 @@
 #define PREFIX_QUIT      "<--"
 #define PREFIX_ERROR     "=!="
 #define PREFIX_PLUGIN    "-P-"
+#define PREFIX_AWAY      "-A-"
+
+#define DEFAULT_IRC_PORT 6667
+
+/* nick types */
+
+#define NICK_CHANOWNER 1
+#define NICK_CHANADMIN 2
+#define NICK_OP        4
+#define NICK_HALFOP    8
+#define NICK_VOICE     16
+#define NICK_AWAY      32
+#define NICK_SET_FLAG(nick, set, flag) \
+    if (set) \
+        nick->flags |= flag; \
+    else \
+        nick->flags &= 0xFFFF - flag;
+
+typedef struct t_irc_nick t_irc_nick;
+
+struct t_irc_nick
+{
+    char *nick;                     /* nickname                               */
+    int flags;                      /* chanowner/chanadmin (unrealircd),      */
+                                    /* op, halfop, voice, away                */
+    int color;                      /* color for nickname in chat window      */
+    t_irc_nick *prev_nick;          /* link to previous nick on the channel   */
+    t_irc_nick *next_nick;          /* link to next nick on the channel       */
+};
+
+/* channel types */

 #define CHANNEL_PREFIX "#&+!"

-/* channel modes */
+#define CHANNEL_TYPE_UNKNOWN -1
+#define CHANNEL_TYPE_CHANNEL 0
+#define CHANNEL_TYPE_PRIVATE 1

 #define NUM_CHANNEL_MODES       7
 #define CHANNEL_MODE_INVITE     0
@@ -58,78 +91,30 @@
 #define CHANNEL_MODE_NO_MSG_OUT 4
 #define CHANNEL_MODE_SECRET     5
 #define CHANNEL_MODE_TOPIC      6
-#define SET_CHANNEL_MODE(channel, set, mode) \
+#define CHANNEL_SET_MODE(channel, set, mode) \
    if (set) \
        channel->modes[mode] = channel_modes[mode]; \
    else \
        channel->modes[mode] = ' ';

-#define DEFAULT_IRC_PORT 6667
-
-/* DCC types & status */
-
-#define DCC_CHAT_RECV           0   /* receiving DCC chat                   */
-#define DCC_CHAT_SEND           1   /* sending DCC chat                     */
-#define DCC_FILE_RECV           2   /* incoming DCC file                    */
-#define DCC_FILE_SEND           3   /* sending DCC file                     */
-
-#define DCC_WAITING             0   /* waiting for host answer              */
-#define DCC_CONNECTING          1   /* connecting to host                   */
-#define DCC_ACTIVE              2   /* sending/receiving data               */
-#define DCC_DONE                3   /* transfer done                        */
-#define DCC_FAILED              4   /* DCC failed                           */
-#define DCC_ABORTED             5   /* DCC aborted by user                  */
-
-#define DCC_IS_CHAT(type) ((type == DCC_CHAT_RECV) || (type == DCC_CHAT_SEND))
-#define DCC_IS_FILE(type) ((type == DCC_FILE_RECV) || (type == DCC_FILE_SEND))
-#define DCC_IS_RECV(type) ((type == DCC_CHAT_RECV) || (type == DCC_FILE_RECV))
-#define DCC_IS_SEND(type) ((type == DCC_CHAT_SEND) || (type == DCC_FILE_SEND))
-
-#define DCC_ENDED(status) ((status == DCC_DONE) || (status == DCC_FAILED) || \
-                          (status == DCC_ABORTED))
-
-/* nick types */
-
-typedef struct t_irc_nick t_irc_nick;
-
-struct t_irc_nick
-{
-    char *nick;                     /* nickname                             */
-    int is_chanowner;               /* chan owner? (specific to unrealircd) */
-    int is_chanadmin;               /* chan admin? (specific to unrealircd) */
-    int is_op;                      /* operator privileges?                 */
-    int is_halfop;                  /* half operator privileges?            */
-    int has_voice;                  /* nick has voice?                      */
-    int is_away;                    /* = 1 if nick is away, otherwise 0     */
-    int color;                      /* color for nickname in chat window    */
-    t_irc_nick *prev_nick;          /* link to previous nick on the channel */
-    t_irc_nick *next_nick;          /* link to next nick on the channel     */
-};
-
-/* channel types */
-
 typedef struct t_irc_channel t_irc_channel;

-#define CHAT_UNKNOWN -1
-#define CHAT_CHANNEL 0
-#define CHAT_PRIVATE 1
-
 struct t_irc_channel
 {
-    int type;                       /* channel type                         */
-    void *dcc_chat;                 /* DCC CHAT pointer (NULL if not DCC)   */
-    char *name;                     /* name of channel (exemple: "#abc")    */
-    char *topic;                    /* topic of channel (host for private)  */
-    char modes[NUM_CHANNEL_MODES+1];/* channel modes                        */
-    int limit;                      /* user limit (0 is limit not set)      */
-    char *key;                      /* channel key (NULL if no key is set)  */
-    int nicks_count;                /* # nicks on channel (0 if dcc/pv)     */
-    int checking_away;              /* = 1 if checking away with WHO cmd    */
-    t_irc_nick *nicks;              /* nicks on the channel                 */
-    t_irc_nick *last_nick;          /* last nick on the channel             */
-    t_gui_buffer *buffer;           /* GUI buffer allocated for channel     */
-    t_irc_channel *prev_channel;    /* link to previous channel             */
-    t_irc_channel *next_channel;    /* link to next channel                 */
+    int type;                       /* channel type                           */
+    void *dcc_chat;                 /* DCC CHAT pointer (NULL if not DCC)     */
+    char *name;                     /* name of channel (exemple: "#abc")      */
+    char *topic;                    /* topic of channel (host for private)    */
+    char *modes;                    /* channel modes                          */
+    int limit;                      /* user limit (0 is limit not set)        */
+    char *key;                      /* channel key (NULL if no key is set)    */
+    int nicks_count;                /* # nicks on channel (0 if dcc/pv)       */
+    int checking_away;              /* = 1 if checking away with WHO cmd      */
+    t_irc_nick *nicks;              /* nicks on the channel                   */
+    t_irc_nick *last_nick;          /* last nick on the channel               */
+    t_gui_buffer *buffer;           /* GUI buffer allocated for channel       */
+    t_irc_channel *prev_channel;    /* link to previous channel               */
+    t_irc_channel *next_channel;    /* link to next channel                   */
 };

 /* server types */
@@ -139,52 +124,55 @@ typedef struct t_irc_server t_irc_server;
 struct t_irc_server
 {
    /* user choices */
-    char *name;                     /* name of server (only for display)    */
-    int autoconnect;                /* = 1 if auto connect at startup       */
-    int autoreconnect;              /* = 1 if auto reco when disconnected   */
-    int autoreconnect_delay;        /* delay before trying again reconnect  */
-    int command_line;               /* server was given on command line     */
-    char *address;                  /* address of server (IP or name)       */
-    int port;                       /* port for server (6667 by default)    */
-    int ipv6;                       /* use IPv6 protocol                    */
-    int ssl;                        /* SSL protocol                         */
-    char *password;                 /* password for server                  */
-    char *nick1;                    /* first nickname for the server        */
-    char *nick2;                    /* alternate nickname                   */
-    char *nick3;                    /* 2nd alternate nickname               */
-    char *username;                 /* user name                            */
-    char *realname;                 /* real name                            */
-    char *command;                  /* command to run once connected        */
-    int command_delay;              /* delay after execution of command     */
-    char *autojoin;                 /* channels to automatically join       */
-    int autorejoin;                 /* auto rejoin channels when kicked     */
-    char *notify_levels;            /* channels notify levels               */
+    char *name;                     /* name of server (only for display)      */
+    int autoconnect;                /* = 1 if auto connect at startup         */
+    int autoreconnect;              /* = 1 if auto reco when disconnected     */
+    int autoreconnect_delay;        /* delay before trying again reconnect    */
+    int command_line;               /* server was given on command line       */
+    char *address;                  /* address of server (IP or name)         */
+    int port;                       /* port for server (6667 by default)      */
+    int ipv6;                       /* use IPv6 protocol                      */
+    int ssl;                        /* SSL protocol                           */
+    char *password;                 /* password for server                    */
+    char *nick1;                    /* first nickname for the server          */
+    char *nick2;                    /* alternate nickname                     */
+    char *nick3;                    /* 2nd alternate nickname                 */
+    char *username;                 /* user name                              */
+    char *realname;                 /* real name                              */
+    char *command;                  /* command to run once connected          */
+    int command_delay;              /* delay after execution of command       */
+    char *autojoin;                 /* channels to automatically join         */
+    int autorejoin;                 /* auto rejoin channels when kicked       */
+    char *notify_levels;            /* channels notify levels                 */
+    char *charset_decode_iso;       /* channels charsets for decoding ISO     */
+    char *charset_decode_utf;       /* channels charsets for decoding UTF     */
+    char *charset_encode;           /* channels charsets for encoding msgs    */
    
    /* internal vars */
-    pid_t child_pid;                /* pid of child process (connecting)    */
-    int child_read;                 /* to read into child pipe              */
-    int child_write;                /* to write into child pipe             */
-    int sock;                       /* socket for server (IPv4 or IPv6)     */
-    int is_connected;               /* 1 if WeeChat is connected to server  */
+    pid_t child_pid;                /* pid of child process (connecting)      */
+    int child_read;                 /* to read into child pipe                */
+    int child_write;                /* to write into child pipe               */
+    int sock;                       /* socket for server (IPv4 or IPv6)       */
+    int is_connected;               /* 1 if WeeChat is connected to server    */
+    int ssl_connected;              /* = 1 if connected with SSL              */
 #ifdef HAVE_GNUTLS
-    int ssl_connected;              /* = 1 if connected with SSL            */
-    gnutls_session gnutls_sess;     /* gnutls session (only if SSL is used) */
+    gnutls_session gnutls_sess;     /* gnutls session (only if SSL is used)   */
 #endif
-
-    char *unterminated_message;     /* beginning of a message in input buf  */
-    char *nick;                     /* current nickname                     */
-    time_t reconnect_start;         /* this time + delay = reconnect time   */
-    int reconnect_join;             /* 1 if channels opened to rejoin       */
-    int is_away;                    /* 1 is user is marker as away          */
-    time_t away_time;               /* time() when user marking as away     */
-    int lag;                        /* lag (in milliseconds)                */
-    struct timeval lag_check_time;  /* last time lag was checked (ping sent)*/
-    time_t lag_next_check;          /* time for next check                  */
-    t_gui_buffer *buffer;           /* GUI buffer allocated for server      */
-    t_irc_channel *channels;        /* opened channels on server            */
-    t_irc_channel *last_channel;    /* last opened channal on server        */
-    t_irc_server *prev_server;      /* link to previous server              */
-    t_irc_server *next_server;      /* link to next server                  */
+    char *unterminated_message;     /* beginning of a message in input buf    */
+    char *nick;                     /* current nickname                       */
+    time_t reconnect_start;         /* this time + delay = reconnect time     */
+    int reconnect_join;             /* 1 if channels opened to rejoin         */
+    int is_away;                    /* 1 is user is marker as away            */
+    time_t away_time;               /* time() when user marking as away       */
+    int lag;                        /* lag (in milliseconds)                  */
+    struct timeval lag_check_time;  /* last time lag was checked (ping sent)  */
+    time_t lag_next_check;          /* time for next check                    */
+    t_gui_buffer *buffer;           /* GUI buffer allocated for server        */
+    t_gui_buffer *saved_buffer;     /* channel before jumping to next server  */
+    t_irc_channel *channels;        /* opened channels on server              */
+    t_irc_channel *last_channel;    /* last opened channal on server          */
+    t_irc_server *prev_server;      /* link to previous server                */
+    t_irc_server *next_server;      /* link to next server                    */
 };

 /* irc commands */
@@ -193,18 +181,20 @@ typedef struct t_irc_command t_irc_command;

 struct t_irc_command
 {
-    char *command_name;             /* command name (internal or IRC cmd)   */
-    char *command_description;      /* command description                  */
-    char *arguments;                /* command parameters                   */
-    char *arguments_description;    /* parameters description               */
-    int min_arg, max_arg;           /* min & max number of parameters       */
-    int need_connection;            /* = 1 if cmd needs server connection   */
+    char *command_name;             /* IRC command name                       */
+    char *command_description;      /* command description (for /help)        */
+    char *arguments;                /* command arguments (for /help)          */
+    char *arguments_description;    /* arguments description (for /help)      */
+    char *completion_template;      /* template for completion                */
+                                    /* NULL=no completion, ""=default (nick)  */
+    int min_arg, max_arg;           /* min & max number of arguments          */
+    int need_connection;            /* = 1 if cmd needs server connection     */
    int (*cmd_function_args)(t_irc_server *, int, char **);
-                                    /* function called when user enters cmd */
+                                    /* function called when user enters cmd   */
    int (*cmd_function_1arg)(t_irc_server *, char *);
-                                    /* function called when user enters cmd */
+                                    /* function called when user enters cmd   */
    int (*recv_function)(t_irc_server *, char *, char *, char *);
-                                    /* function called when cmd is received */
+                                    /* function called when cmd is received   */
 };

 /* irc messages */
@@ -213,48 +203,69 @@ typedef struct t_irc_message t_irc_message;

 struct t_irc_message
 {
-    t_irc_server *server;           /* server pointer for received msg      */
-    char *data;                     /* message content                      */
-    t_irc_message *next_message;    /* link to next message                 */
+    t_irc_server *server;           /* server pointer for received msg        */
+    char *data;                     /* message content                        */
+    t_irc_message *next_message;    /* link to next message                   */
 };

 /* DCC types */

+#define DCC_CHAT_RECV           0   /* receiving DCC chat                     */
+#define DCC_CHAT_SEND           1   /* sending DCC chat                       */
+#define DCC_FILE_RECV           2   /* incoming DCC file                      */
+#define DCC_FILE_SEND           3   /* sending DCC file                       */
+
+#define DCC_WAITING             0   /* waiting for host answer                */
+#define DCC_CONNECTING          1   /* connecting to host                     */
+#define DCC_ACTIVE              2   /* sending/receiving data                 */
+#define DCC_DONE                3   /* transfer done                          */
+#define DCC_FAILED              4   /* DCC failed                             */
+#define DCC_ABORTED             5   /* DCC aborted by user                    */
+
+#define DCC_IS_CHAT(type) ((type == DCC_CHAT_RECV) || (type == DCC_CHAT_SEND))
+#define DCC_IS_FILE(type) ((type == DCC_FILE_RECV) || (type == DCC_FILE_SEND))
+#define DCC_IS_RECV(type) ((type == DCC_CHAT_RECV) || (type == DCC_FILE_RECV))
+#define DCC_IS_SEND(type) ((type == DCC_CHAT_SEND) || (type == DCC_FILE_SEND))
+
+#define DCC_ENDED(status) ((status == DCC_DONE) || (status == DCC_FAILED) || \
+                          (status == DCC_ABORTED))
+
 typedef struct t_irc_dcc t_irc_dcc;

 struct t_irc_dcc
 {
-    t_irc_server *server;           /* irc server                           */
-    t_irc_channel *channel;         /* irc channel (for DCC chat only)      */
-    int type;                       /* DCC type (send or receive)           */
-    int status;                     /* DCC status (waiting, sending, ..)    */
-    time_t start_time;              /* the time when DCC started            */
-    time_t start_transfer;          /* the time when DCC transfer started   */
-    unsigned long addr;             /* IP address                           */
-    int port;                       /* port                                 */
-    char *nick;                     /* remote nick                          */
-    int sock;                       /* socket for connection                */
-    char *unterminated_message;     /* beginning of a message in input buf  */
-    int file;                       /* local file (for reading or writing)  */
-    char *filename;                 /* filename (given by sender)           */
-    char *local_filename;           /* local filename (with path)           */
-    int filename_suffix;            /* suffix (.1 for ex) if renaming file  */
-    unsigned long size;             /* file size                            */
-    unsigned long pos;              /* number of bytes received/sent        */
-    unsigned long ack;              /* number of bytes received OK          */
-    unsigned long start_resume;     /* start of resume (in bytes)           */
-    time_t last_check_time;         /* last time we looked at bytes sent/rcv*/
-    unsigned long last_check_pos;   /* bytes sent/recv at last check        */
-    unsigned long bytes_per_sec;    /* bytes per second                     */
-    time_t last_activity;           /* time of last byte received/sent      */
-    t_irc_dcc *prev_dcc;            /* link to previous dcc file/chat       */
-    t_irc_dcc *next_dcc;            /* link to next dcc file/chat           */
+    t_irc_server *server;           /* irc server                             */
+    t_irc_channel *channel;         /* irc channel (for DCC chat only)        */
+    int type;                       /* DCC type (send or receive)             */
+    int status;                     /* DCC status (waiting, sending, ..)      */
+    time_t start_time;              /* the time when DCC started              */
+    time_t start_transfer;          /* the time when DCC transfer started     */
+    unsigned long addr;             /* IP address                             */
+    int port;                       /* port                                   */
+    char *nick;                     /* remote nick                            */
+    int sock;                       /* socket for connection                  */
+    char *unterminated_message;     /* beginning of a message in input buf    */
+    int file;                       /* local file (for reading or writing)    */
+    char *filename;                 /* filename (given by sender)             */
+    char *local_filename;           /* local filename (with path)             */
+    int filename_suffix;            /* suffix (.1 for ex) if renaming file    */
+    unsigned long size;             /* file size                              */
+    unsigned long pos;              /* number of bytes received/sent          */
+    unsigned long ack;              /* number of bytes received OK            */
+    unsigned long start_resume;     /* start of resume (in bytes)             */
+    time_t last_check_time;         /* last time we looked at bytes sent/recv */
+    unsigned long last_check_pos;   /* bytes sent/recv at last check          */
+    time_t last_activity;           /* time of last byte received/sent        */
+    unsigned long bytes_per_sec;    /* bytes per second                       */
+    unsigned long eta;              /* estimated time of arrival              */
+    t_irc_dcc *prev_dcc;            /* link to previous dcc file/chat         */
+    t_irc_dcc *next_dcc;            /* link to next dcc file/chat             */
 };

 /* ignore types */

-/* pre-defined ignore types, all other types are made with IRC commands     */
-/* for example:  part  join  quit  notice  invite  ...                      */
+/* pre-defined ignore types, all other types are made with IRC commands */
+/* for example:  part  join  quit  notice  invite  ...                  */

 #define IGNORE_ACTION  "action"
 #define IGNORE_CTCP    "ctcp"
@@ -265,12 +276,12 @@ typedef struct t_irc_ignore t_irc_ignore;

 struct t_irc_ignore
 {
-    char *mask;                     /* nickname or mask                     */
-    char *type;                     /* type of ignore                       */
-    char *channel_name;             /* name of channel, "*" == all          */
-    char *server_name;              /* name of server, "*" == all           */
-    t_irc_ignore *prev_ignore;      /* pointer to previous ignore           */
-    t_irc_ignore *next_ignore;      /* pointer to next ignore               */
+    char *mask;                     /* nickname or mask                       */
+    char *type;                     /* type of ignore                         */
+    char *channel_name;             /* name of channel, "*" == all            */
+    char *server_name;              /* name of server, "*" == all             */
+    t_irc_ignore *prev_ignore;      /* pointer to previous ignore             */
+    t_irc_ignore *next_ignore;      /* pointer to next ignore                 */
 };

 /* variables */
@@ -296,18 +307,23 @@ extern void server_free (t_irc_server *);
 extern void server_free_all ();
 extern t_irc_server *server_new (char *, int, int, int, int, char *, int, int, int,
                                 char *, char *, char *, char *, char *, char *,
-                                 char *, int, char *, int, char *);
+                                 char *, int, char *, int, char *, char *, char *,
+                                 char *);
+extern char *server_get_charset_decode_iso (t_irc_server *);
+extern char *server_get_charset_decode_utf (t_irc_server *);
+extern char *server_get_charset_encode (t_irc_server *);
 extern int server_send (t_irc_server *, char *, int);
 extern void server_sendf (t_irc_server *, char *, ...);
 extern void server_recv (t_irc_server *);
 extern void server_child_read (t_irc_server *);
 extern int server_connect (t_irc_server *);
 extern void server_reconnect (t_irc_server *);
-extern void server_auto_connect (int);
+extern void server_auto_connect (int, int);
 extern void server_disconnect (t_irc_server *, int);
 extern void server_disconnect_all ();
 extern t_irc_server *server_search (char *);
 extern int server_get_number_connected ();
+extern void server_get_number_buffer (t_irc_server *, int *, int *);
 extern int server_name_already_exists (char *);
 extern void server_remove_away ();
 extern void server_check_away ();
@@ -325,25 +341,30 @@ extern int pass_proxy(int, char*, int, char*);

 /* channel functions (irc-channel.c) */

-extern t_irc_channel *channel_new (t_irc_server *, int, char *, int);
+extern t_irc_channel *channel_new (t_irc_server *, int, char *);
 extern void channel_free (t_irc_server *, t_irc_channel *);
 extern void channel_free_all (t_irc_server *);
 extern t_irc_channel *channel_search (t_irc_server *, char *);
 extern int string_is_channel (char *);
+extern char *channel_get_charset_decode_iso (t_irc_server *, t_irc_channel *);
+extern char *channel_get_charset_decode_utf (t_irc_server *, t_irc_channel *);
+extern char *channel_get_charset_encode (t_irc_server *, t_irc_channel *);
+extern char *channel_iconv_decode (t_irc_server *, t_irc_channel *, char *);
+extern char *channel_iconv_encode (t_irc_server *, t_irc_channel *, char *);
 extern void channel_remove_away (t_irc_channel *);
 extern void channel_check_away (t_irc_server *, t_irc_channel *);
 extern void channel_set_away (t_irc_channel *, char *, int);
 extern int channel_create_dcc (t_irc_dcc *);
 extern void channel_remove_dcc (t_irc_dcc *);
 extern int channel_get_notify_level (t_irc_server *, t_irc_channel *);
-extern void channel_remove_notify_level (t_irc_server *, t_irc_channel *);
 extern void channel_set_notify_level (t_irc_server *, t_irc_channel *, int);
 extern void channel_print_log (t_irc_channel *);

 /* nick functions (irc-nick.c) */

 extern int nick_find_color (t_irc_nick *);
-extern t_irc_nick *nick_new (t_irc_channel *, char *, int, int, int, int, int);
+extern t_irc_nick *nick_new (t_irc_server *, t_irc_channel *, char *,
+                             int, int, int, int, int);
 extern void nick_resort (t_irc_channel *, t_irc_nick *);
 extern void nick_change (t_irc_channel *, t_irc_nick *, char *);
 extern void nick_free (t_irc_channel *, t_irc_nick *);
@@ -362,27 +383,28 @@ extern void dcc_close (t_irc_dcc *, int);
 extern void dcc_accept (t_irc_dcc *);
 extern void dcc_accept_resume (t_irc_server *, char *, int, unsigned long);
 extern void dcc_start_resume (t_irc_server *, char *, int, unsigned long);
+extern t_irc_dcc *dcc_alloc ();
 extern t_irc_dcc *dcc_add (t_irc_server *, int, unsigned long, int, char *, int,
                           char *, char *, unsigned long);
 extern void dcc_send_request (t_irc_server *, int, char *, char *);
 extern void dcc_chat_sendf (t_irc_dcc *, char *, ...);
 extern void dcc_handle ();
 extern void dcc_end ();
+extern void dcc_print_log (t_irc_dcc *);

 /* IRC display (irc-diplay.c) */

-extern void irc_display_prefix (/*@null@*/ t_gui_buffer *, char *);
-extern void irc_display_nick (t_gui_buffer *, t_irc_nick *, char *, int, int, int, int);
-extern void irc_display_mode (t_gui_buffer *, char *, char, char *, char *,
-                              char *, char *);
+extern void irc_display_prefix (t_irc_server *, t_gui_buffer *, char *);
+extern void irc_display_nick (t_gui_buffer *, t_irc_nick *, char *, int,
+                              int, int, int);
+extern void irc_display_away (t_irc_server *, char *, char *);
+extern void irc_display_mode (t_irc_server *, t_gui_buffer *, char *, char,
+                              char *, char *, char *, char *);
 extern void irc_display_server (t_irc_server *ptr_server);

-/* IRC protocol (irc-commands.c) */
+/* IRC commands issued by user (irc-send.c) */

-extern int irc_is_highlight (char *, char *);
-extern int irc_recv_command (t_irc_server *, char *, char *, char *, char *);
 extern void irc_login (t_irc_server *);
-/* IRC commands issued by user */
 extern int irc_cmd_send_admin (t_irc_server *, char *);
 extern int irc_cmd_send_ame (t_irc_server *, char *);
 extern int irc_cmd_send_amsg (t_irc_server *, char *);
@@ -442,7 +464,11 @@ extern int irc_cmd_send_wallops (t_irc_server *, char *);
 extern int irc_cmd_send_who (t_irc_server *, char *);
 extern int irc_cmd_send_whois (t_irc_server *, char *);
 extern int irc_cmd_send_whowas (t_irc_server *, char *);
-/* IRC commands executed when received from server */
+
+/* IRC commands executed when received from server (irc-recv.c) */
+
+extern int irc_is_highlight (char *, char *);
+extern int irc_recv_command (t_irc_server *, char *, char *, char *, char *);
 extern int irc_cmd_recv_error (t_irc_server *, char *, char *, char *);
 extern int irc_cmd_recv_invite (t_irc_server *, char *, char *, char *);
 extern int irc_cmd_recv_join (t_irc_server *, char *, char *, char *);
@@ -488,6 +514,8 @@ extern int irc_cmd_recv_333 (t_irc_server *, char *, char *, char *);
 extern int irc_cmd_recv_341 (t_irc_server *, char *, char *, char *);
 extern int irc_cmd_recv_344 (t_irc_server *, char *, char *, char *);
 extern int irc_cmd_recv_345 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_348 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_349 (t_irc_server *, char *, char *, char *);
 extern int irc_cmd_recv_351 (t_irc_server *, char *, char *, char *);
 extern int irc_cmd_recv_352 (t_irc_server *, char *, char *, char *);
 extern int irc_cmd_recv_353 (t_irc_server *, char *, char *, char *);
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2005 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2006 FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -12,26 +12,30 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #

 INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\"

 if PLUGIN_PERL
-perl_dir = perl
+script_dir = scripts
 endif

 if PLUGIN_PYTHON
-python_dir = python
+script_dir = scripts
 endif

 if PLUGIN_RUBY
-ruby_dir = ruby
+script_dir = scripts
 endif

-SUBDIRS = $(perl_dir) $(python_dir) $(ruby_dir)
+SUBDIRS = $(script_dir)

 noinst_LIBRARIES = lib_weechat_plugins.a

-lib_weechat_plugins_a_SOURCES = plugins.h \
-                                plugins.c
+lib_weechat_plugins_a_SOURCES = weechat-plugin.h \
+				plugins.h \
+                                plugins.c \
+                                plugins-interface.c \
+                                plugins-config.h \
+                                plugins-config.c
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`usr/share/doc/weechat-common usr/share/doc/weechat-curses`