Version 0.0.9

Added /buffer close, new keys: Alt-S (switch to server buffer), Alt-X (switch to first channel of next server)
Fixed bug when parsing messages, now looking for for \r\n and \n to cut messages
2026-06-20 18:14:46 +02:00 · 2005-01-01 12:31:19 +00:00 · 2004-12-31 15:59:58 +00:00 · 2004-12-28 08:21:53 +00:00 · 2004-12-28 07:52:56 +00:00 · 2004-12-27 17:15:59 +00:00
134 changed files with 14018 additions and 6936 deletions
@@ -21,8 +21,8 @@ Bounga <bounga@altern.org>
    Jabber: Bounga@jabber.org
    ICQ   : 178297842

-Xahlexx <xahlexx@tuxisland.org>
-    Web   : http://www.tuxisland.org
+Xahlexx <xahlexx@weeland.org>
+    Web   : http://www.weeland.org
    IRC   : nick is "xahlexx"


@@ -1,20 +1,18 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================

-WeeChat known bugs, 2004-06-05
+WeeChat known bugs, 2005-01-01

 - ./configure does not check that Curses headers are installed
 - ./configure does not check that Gtk 2.0 libraries are installed
 - ./configure does not check that Perl headers & libraries are installed
 - too much nicks in the channel (> height of window) => display bug
+- problem when resizing terminal and that some windows are outside new term size
 - some IRC commands are marked as 'unknown' when received
  (IRC protocol is under dev!)
- too much opened channels => display bug
- when kicked, channel is not prefixed by '(' and sufixed by ')'
- when function key (non used by WeeChat) is pressed, prompt is deleted
 - when quitting WeeChat term title is not restored (if look_set_title is ON)
 - command name for /server can not contain spaces
 - wrong alias is not created and not saved when quitting WeeChat
 - 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)
+- display problems with old Konsole versions (Kde terminal) (???)
@@ -1,9 +1,55 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================

-ChangeLog - 2004-06-05
+ChangeLog - 2005-01-01


+Version 0.0.9 (2005-01-01):
+   * auto-reconnection to server (new options: server_autoreconnect (on/off),
+     server_autoreconnect_delay (in seconds))
+   * major bug fixed when socket is closed by server (100% CPU usage fixed),
+     and disconnections are now ok (all channels are "closed", history is still
+     visible, and buffer will be used again if reconnection to server)
+   * option "look_remove_colors_from_msgs" is now working
+   * fixed display of nick mode changes
+   * new command "/buffer close" (close any server/channel/private buffer)
+   * /notice command fixed (and display when received from server)
+   * new keys: Ctrl+A (=home), Ctrl+E (=end), Ctrl+W (=Ctrl+Backspace),
+     Alt-S (switch to server buffer), Alt-X (switch to first channel of next
+     server)
+   * added new config option: "server_command_delay" (delay in seconds after
+     startup command for each server)
+
+Version 0.0.8 (2004-10-30):
+   * /kick command fixed: now ok with many words as reason
+   * nickserv passwords hidden (new config option: log_hide_nickserv_pwd on/off)
+   * auto-rejoin channels when kicked (new config option: server_autorejoin on/off)
+   * added IRC::command function for Perl scripts
+   * fixed bug when adding alias with same name as other
+   * /buffer command developed (buffers list, move and notify)
+   * logging buffers to disk (server/channel/private according to user prefs)
+   * Away now announced in channels, and config option "look_display_away" added
+     to enable/disable this feature
+   * Fixed crash when resizing terminal to very small size
+   * "-MORE-" message is now erased when switching to another buffer
+   * DCC file receive ok (Alt-D for DCC view)
+   * /query command now reopens private buffer if already opened
+   * added key for redrawing terminal (Ctrl-L)
+   * added key for clearing hotlist (Alt-R)
+
+Version 0.0.7 (2004-08-08):
+   * new "col_status_delimiters" config option
+   * /buffer command added, buffers ordered by number, auto-jump to active
+     buffers (alt-a), jump to buffers by number (alt-number)
+   * /window command added, split terminal horizontally/vertically
+   * unique color for each nick (based on nickname)
+   * action messages are now considered as messages, not crappy joins/parts
+   * fixed display bug when nicklist is displayed at bottom of screen
+   * added history limit (text buffer & commands)
+   * replaced --enable-debug with --with-debug option for ./configure, which is
+     now integer: 1 = compiler debug flag, 2 = same 1 with verbose debug messages
+     in WeeChat (default: 0 = no debug)
+
 Version 0.0.6 (2004-06-05):
   * improved channel highlight (priority to message vs join/part)
   * fixed bug when opened private win and remote user changes his nick
@@ -2,9 +2,11 @@ WeeChat - Installation instructions
 ===================================

 1) Run './configure'
-   options: --disable-curses : do not build Curses interface
+   options: --enable-perl    : enable Perl scripts
+            --disable-curses : do not build Curses interface
            --enable-gtk     : build Gtk+ interface (under development!)
            --enable-qt      : build Qt interface (not developed!)
+            --with-debug     : 1 for debug compilation, 2 for debug messages

 2) Run 'make'

@@ -12,4 +14,4 @@ WeeChat - Installation instructions

 4) Enjoy !  :-)

-See AUTHORS for any support, feel free to contact us for any problem ;)
+See AUTHORS for support, feel free to contact us for any problem ;)
@@ -1,4 +1,4 @@
-# Copyright (c) 2004 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2005 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
@@ -17,6 +17,12 @@

 SUBDIRS = po intl src

-EXTRA_DIST = weechat.1 BUGS FAQ FAQ.fr
+EXTRA_DIST = weechat-curses.1 BUGS FAQ FAQ.fr \
+             debian/changelog debian/control \
+             debian/copyright debian/files \
+             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

-man_MANS = weechat.1
+man_MANS = weechat-curses.1
@@ -1,6 +1,22 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================

+* FlashCode, 2005-01-01
+
+    WeeChat 0.0.9 released.
+
+* FlashCode, 2004-10-30
+
+    WeeChat 0.0.8 released.
+
+* FlashCode, 2004-08-08
+
+    WeeChat 0.0.7 released.
+
+* FlashCode, 2004-06-05
+
+    WeeChat 0.0.6 released.
+
 * FlashCode, 2004-02-07

    WeeChat 0.0.5 released.
@@ -24,7 +24,7 @@ Copyright

 WeeChat (c) Copyright 2004
  by: FlashCode <flashcode@flashtux.org>
-        Xahlexx <xahlex@tuxisland.org>
+        Xahlexx <xahlex@weeland.org>
         Bounga <bounga@altern.org>
 (see AUTHORS file if you want to contact authors)

@@ -46,6 +46,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA


 ---
-(1) only curses interface is available today
-(2) plugin interfaces are not yet developed
+(1) only Curses interface is available today
+(2) only Perl interface is available today
 (3) only GNU/Linux version is available today
@@ -1,7 +1,7 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================

-TODO - 2004-06-05
+TODO - 2005-01-01

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


-v0.0.6:
+v0.0.9:
 ------

 * General:
@@ -18,13 +18,12 @@ v0.0.6:
    + Solaris version

 * IRC protocol:
-    # "/mode" command: change the user/channels modes
    + "/dcc" command (for chat and sending/receiving files)
-    # "/query" command: start private conversation

 * Interface:
+    + "/window" command, split terminal in multiple windows
+      (horizontally/vertically)
    + internationalization (traduce WeeChat in many languages)
-    # display current channel modes (example : #weechat(+nt))

 * Configuration:
    + add missing options for config file
@@ -63,14 +62,10 @@ Future versions:
    + Gtk GUI
    - color for nicks (except own nick) when nick colors are disabled
    - interpret special chars in messages (color & bold for example)
-    - many channel windows in one window/term (window split)
    - add lag indicator
-    - forget some old lines that were displayed long time ago (now all is saved,
-      if WeeChat is running for long time, a lot of memory is used!)
    - improve completion (for example complete command parameters when possible)
    - understand incomplete commands if unambigous (for example: /he for /help is ok)
-    - tab key with empty command line should switch to next window (like F7)
-    - log chats to file
+    - tab key with empty command line should switch to next window (like F7) 
    ? Qt GUI

 * TCP/IP communication:
@@ -79,10 +74,6 @@ Future versions:
    - SSL support
    - IPv6 protocol implementation

- * Configuration:
-    - load config file after GUI (so init values by default (colors, ...) before
-      loading config)
-
 * Plugins:
    - Python plugin
    - "/python load" and "/python unload" commands to (un)load Python scripts
@@ -1,4 +1,4 @@
-# Copyright (c) 2004 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2005 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
@@ -19,10 +19,10 @@
 # Process this file with autoconf to produce a configure script.

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

 # Checks for programs.
 AC_PROG_CC
@@ -59,7 +59,7 @@ AC_ARG_ENABLE(curses, [  --disable-curses        Turn off Curses interface (defa
 AC_ARG_ENABLE(gtk,    [  --enable-gtk            Turn on Gtk+ interface (default=no)],enable_gtk=yes,enable_gtk=no)
 AC_ARG_ENABLE(qt,     [  --enable-qt             Turn on Qt interface (default=no)],enable_qt=yes,enable_qt=no)
 AC_ARG_ENABLE(perl,   [  --enable-perl           Turn on Perl plugins (default=no)],enable_perl=yes,enable_perl=no)
-AC_ARG_ENABLE(debug,  [  --enable-debug          Turn on debugging messages (default=no)],enable_debug=yes,enable_debug=no)
+AC_ARG_WITH(debug,  [  --with-debug            Debugging: 0=no debug, 1=debug compilation, 2=debug compilation + verbose msgs (default=0)],debug=$withval,debug=0)

 enable_plugins="no"
 enable_python="no"
@@ -108,11 +108,19 @@ fi

 AC_SUBST(PLUGINS_LIBS)

-if test "x$enable_debug" = "xyes" ; then
-    AC_DEFINE(DEBUG)
+CFLAGS=`echo $CFLAGS | sed s/-g//g`
+if test "x$CFLAGS" = "x" ; then
+    CFLAGS="-O2"
+fi
+if test "x$debug" = "x1" || test "x$debug" = "x2" ; then
+    CFLAGS="-Wall -W $CFLAGS -pipe -g"
+else
+    CFLAGS="-Wall -W $CFLAGS -pipe"
 fi

-CFLAGS="-Wall -W -pipe -O2"
+if test "x$debug" = "x2" ; then
+    AC_DEFINE(DEBUG)
+fi

 AC_OUTPUT([Makefile
           src/Makefile
@@ -145,6 +153,15 @@ if test "x$listgui" = "x" ; then
    AC_MSG_ERROR([No interface specified... Please specify at least Curses, Gtk or Qt.])
 fi

+msg_debug_compiler="No"
+msg_debug_verbose="No"
+if test "x$debug" = "x1" || test "x$debug" = "x2" ; then
+    msg_debug_compiler="Yes"
+fi
+if test "x$debug" = "x2" ; then
+    msg_debug_verbose="Yes"
+fi
+
 echo
 echo Interfaces.................... :$listgui
 echo
@@ -153,7 +170,8 @@ echo Build with Perl support....... : $enable_perl
 echo Build with Python support..... : $enable_python
 echo Build with Ruby support....... : $enable_ruby
 echo
-echo Print debugging messages...... : $enable_debug
+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
@@ -1,3 +1,21 @@
+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.
@@ -21,14 +21,6 @@ Description: Fast, light and extensible IRC client
 for many operating systems. Everything can be done with a keyboard.
 It is customizable and extensible with scripts.

-Package: weechat-gtk
-Architecture: any
-Depends: ${shlibs:Depends}, weechat-common (= ${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.
-
 Package: weechat-common
 Architecture: all
 Replaces: weechat
@@ -1,9 +1,9 @@
 This package was debianized by FlashCode <flashcode@flashtux.org> on
-Sat, 05 Jun 2004 11:30:00 +0200.
+Sat, 01 Jan 2005 13:00:00 +0200.

 It was downloaded from http://weechat.flashtux.org/download

-Upstream Author(s): FlashCode <flashcode@flashtux.org>
+Upstream Author: FlashCode <flashcode@flashtux.org>

 Copyright:

@@ -1,9 +1,6 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.

-# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
+#export DH_VERBOSE=1

 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
@@ -17,7 +14,7 @@ endif
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	./configure --prefix=/usr --sysconfdir=/etc --enable-perl --enable-gtk
+	./configure --prefix=/usr --sysconfdir=/etc --enable-perl
 	touch configure-stamp


@@ -43,17 +40,16 @@ install: build
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/weechat
 	dh_install --sourcedir=debian/weechat
 	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 -o root -g root -m 755 src/gui/gtk/weechat-gtk $(CURDIR)/debian/weechat-gtk/usr/bin


 # Build architecture-independent files here.
 binary-indep: build install
 	dh_testdir -pweechat-common
 	dh_testroot -pweechat-common
-	dh_installchangelogs -pweechat-common
+	dh_installchangelogs ChangeLog -pweechat-common
 	dh_installdocs -pweechat-common
 	dh_installexamples -pweechat-common
-	dh_installman weechat.1 -pweechat-common
 	dh_compress -pweechat-common
 	dh_fixperms -pweechat-common
 	dh_installdeb -pweechat-common
@@ -66,6 +62,9 @@ binary-indep: build install
 binary-arch: build install
 	dh_testdir -a
 	dh_testroot -a
+	dh_installchangelogs -a
+	dh_installdocs -a
+	dh_installman weechat-curses.1 -pweechat-curses
 	dh_link -a
 	dh_strip -a
 	dh_compress -a
@@ -1,10 +1,7 @@
 AUTHORS
 BUGS
-ChangeLog
-COPYING
 FAQ
 FAQ.fr
-INSTALL
 NEWS
 README
 TODO
@@ -0,0 +1 @@
+usr/share/locale
@@ -6,7 +6,7 @@

@c WeeChat documentation (english version)
@c
-@c Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+@c Copyright (c) 2005 by FlashCode <flashcode@flashtux.org>
@c
@c This manual is free software; you can redistribute it and/or modify
@c it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@

@title WeeChat - User guide
@subtitle Fast, light and extensible IRC client
-@subtitle Documentation for WeeChat v0.0.6 - June, 05 2004
+@subtitle Documentation for WeeChat v0.0.9 - January, 01 2005

@image{weechat_image}

@@ -48,7 +48,7 @@ This manual documents WeeChat IRC client, it is part of WeeChat.@*
 Latest version of this document can be found on this page:@*
@uref{http://weechat.flashtux.org/doc.php?lang=en}@*
@*
-Copyright @copyright{} 2004 FlashCode
+Copyright @copyright{} 2005 FlashCode
 <@email{flashcode@@flashtux.org, flashcode AT flashtux.org}>@*
@*
 This document may be used under the terms the GNU General Public License
@@ -156,7 +156,7 @@ Mandrake/Redhat (or any RPM compatible distribution)@*
 To install: @kbd{rpm -i /path/weechat-x.y.z-1.i386.rpm}
@item
 Gentoo@*
-To install: see Gentoo documentation
+To install: @kbd{emerge weechat}
@item
 *BSD (not available!)
@item
@@ -178,7 +178,7 @@ Nota: to build only some interfaces, you can give parameters
 to ./configure, type @kbd{./configure --help} for help about options.@*

 Then get root privileges and install WeeChat:@*
-@kbd{su -}@*
+@kbd{su}@*
 (enter root password)@*
@kbd{make install}@*

@@ -292,6 +292,9 @@ Type: boolean (values: 'on' or 'off'), default value: 'off'@*
@item look_nick_completor
 The string inserted after nick completion@*
 Type: string (any string), default value: ':'@*
+@item look_display_away
+Display message to all channels when (un)marking as away@*
+Type: boolean (values: 'on' or 'off'), default value: 'on'@*
@item look_infobar
 Enable info bar@*
 Type: boolean (values: 'on' or 'off'), default value: 'on'@*
@@ -343,15 +346,18 @@ Type: color (Curses or Gtk color), default value: 'default'@*
@item col_status
 Color for status bar@*
 Type: color (Curses or Gtk color), default value: 'gray'@*
-@item col_status_active
-Color for active window (status bar)@*
-Type: color (Curses or Gtk color), default value: 'yellow'@*
+@item col_status_delimiters
+Color for status bar delimiters@*
+Type: color (Curses or Gtk color), default value: 'cyan'@*
@item col_status_data_msg
 Color for window with new messages (status bar)@*
-Type: color (Curses or Gtk color), default value: 'lightred'@*
+Type: color (Curses or Gtk color), default value: 'yellow'@*
+@item col_status_highlight
+Color for window with highlight (status bar)@*
+Type: color (Curses or Gtk color), default value: 'lightmagenta'@*
@item col_status_data_other
 Color for window with new data (not messages) (status bar)@*
-Type: color (Curses or Gtk color), default value: 'lightmagenta'@*
+Type: color (Curses or Gtk color), default value: 'gray'@*
@item col_status_more
 Color for window with new data (status bar)@*
 Type: color (Curses or Gtk color), default value: 'white'@*
@@ -403,13 +409,37 @@ Type: color (Curses or Gtk color), default value: 'gray'@*
@item col_nick_bg
 Background for nicknames@*
 Type: color (Curses or Gtk color), default value: 'default'@*
+@item col_chat_dcc_selected
+Color for selected DCC (chat window)@*
+Type: color (Curses or Gtk color), default value: 'white'@*
+@item col_dcc_waiting
+Color for "waiting" dcc status@*
+Type: color (Curses or Gtk color), default value: 'white'@*
+@item col_dcc_connecting
+Color for "connecting" dcc status@*
+Type: color (Curses or Gtk color), default value: 'yellow'@*
+@item col_dcc_active
+Color for "active" dcc status@*
+Type: color (Curses or Gtk color), default value: 'lightblue'@*
+@item col_dcc_done
+Color for "done" dcc status@*
+Type: color (Curses or Gtk color), default value: 'lightgreen'@*
+@item col_dcc_failed
+Color for "failed" dcc status@*
+Type: color (Curses or Gtk color), default value: 'lightred'@*
+@item col_dcc_aborted
+Color for "aborted" dcc status@*
+Type: color (Curses or Gtk color), default value: 'lightred'@*
@item history_max_lines
 Maximum number of lines in history for one server/channel/private window (0 = unlimited)@*
 Type: integer (values: between 0 and 2147483647), default value: 4096@*
@item history_max_commands
 Maximum number of user commands in history (0 = unlimited)@*
 Type: integer (values: between 0 and 2147483647), default value: 100@*
-@item log_auto_channels
+@item log_auto_server
+Automatically log server messages@*
+Type: boolean (values: 'on' or 'off'), default value: 'on'@*
+@item log_auto_channel
 Automatically log channel chats@*
 Type: boolean (values: 'on' or 'off'), default value: 'on'@*
@item log_auto_private
@@ -418,30 +448,24 @@ Type: boolean (values: 'on' or 'off'), default value: 'on'@*
@item log_path
 Path for WeeChat log files@*
 Type: string (any string), default value: '~/.weechat/logs/'@*
-@item log_name
-Name for log files (%S == irc server name, %N == channel name (or nickname if private chat)@*
-Type: string (any string), default value: '%S,%N.weechatlog'@*
@item log_timestamp
 Timestamp for log (see man strftime for date/time specifiers)@*
-Type: string (any string), default value: '~'@*
-@item log_start_string
-Text written when starting new log file (see man strftime for date/time specifiers)@*
-Type: string (any string), default value: '--- Log started %a %b %d %Y %H:%M:%s'@*
-@item log_end_string
-Text written when ending log file (see man strftime for date/time specifiers)@*
-Type: string (any string), default value: '--- Log ended %a %b %d %Y %H:%M:%s'@*
+Type: string (any string), default value: '%Y %b %d %H:%M:%S'@*
+@item log_hide_nickserv_pwd
+Hide password displayed by nickserv@*
+Type: boolean (values: 'on' or 'off'), default value: 'on'@*
@item dcc_auto_accept_files
 Automatically accept incoming dcc files@*
-Type: boolean (values: 'on' or 'off'), default value: 'on'@*
-@item dcc_auto_accept_max_size
-Maximum size for incoming file when automatically accepted@*
-Type: integer (values: between 0 and 2147483647), default value: 0@*
+Type: boolean (values: 'on' or 'off'), default value: 'off'@*
@item dcc_auto_accept_chats
 Automatically accept dcc chats (use carefully!)@*
 Type: boolean (values: 'on' or 'off'), default value: 'on'@*
@item dcc_timeout
 Timeout for dcc request (in seconds)@*
 Type: integer (values: between 1 and 2147483647), default value: 300@*
+@item dcc_blocksize
+Block size for dcc packets in bytes (default: 1024)@*
+Type: integer (values: between 1024 and 102400), default value: 1024@*
@item dcc_download_path
 Path for writing incoming files with dcc (default: user home)@*
 Type: string (any string), default value: '~'@*
@@ -472,6 +496,12 @@ Type: string (any string), default value: ''@*
@item server_autoconnect
 Automatically connect to server when WeeChat is starting@*
 Type: boolean (values: 'on' or 'off'), default value: 'on'@*
+@item server_autoreconnect
+Automatically reconnect to server when disconnected@*
+Type: boolean (values: 'on' or 'off'), default value: 'on'@*
+@item server_autoreconnect_delay
+Delay (in deconds) before trying again to reconnect to server@*
+Type: integer (values: between 0 and 65535), default value: 30@*
@item server_address
 IP address or hostname of IRC server@*
 Type: string (any string), default value: ''@*
@@ -499,9 +529,15 @@ Type: string (any string), default value: ''@*
@item server_command
 First command to run when connected to server@*
 Type: string (any string), default value: ''@*
+@item server_command_delay
+Delay (in seconds) after command was executed (example: give some time for authentication)@*
+Type: integer (values: between 0 and 3600), default value: 1@*
@item server_autojoin
 Comma separated list of channels to join when connected to server@*
 Type: string (any string), default value: ''@*
+@item server_autorejoin
+Automatically rejoin channels when kicked@*
+Type: boolean (values: 'on' or 'off'), default value: 'on'@*
@end table

 Colors for Curses GUI are:@*
@@ -550,13 +586,16 @@ Go to previous / next char in command line@*
@item Ctrl + left arrow / Ctrl + right arrow
 Go to previous / next word in command line@*
@*
-@item Home / End
-Go to the beginning / end of command line@*
+@item Home / Ctrl + A
+Go to the beginning of command line@*
+@*
+@item End / Ctrl + E
+Go to the end of command line@*
@*
@item Backspace / Delete
 Erase previous / next char of command line@*
@*
-@item Ctrl + Backspace
+@item Ctrl + Backspace / Ctrl + W
 Erase previous word of command line@*
@*
@item Tab
@@ -572,16 +611,40 @@ Execute command or send message@*
 Call again last commands/messages@*
@*
@item PageUp / PageDown
-Show window history@*
+Show buffer history@*
@*
@item F6 / F7
-Switch to previous / next window@*
+Switch to previous / next buffer@*
+@*
+@item F8
+Switch to next window@*
+@*
+@item F10
+Remove last infobar message@*
+@*
+@item Ctrl + L
+Redraw whole window@*
@*
@item Alt + left arrow / Alt + right arrow
 Same as F6 / F7@*
@*
-@item F10
-Remove last infobar message@*
+@item Alt + A
+Switch to next buffer with activity (with priority: highlight, message, other)@*
+@*
+@item Alt + D
+Display current DCC@*
+@*
+@item Alt + R
+Clear hotlist (activity notification on other buffers)@*
+@*
+@item Alt + S
+Switch to server buffer@*
+@*
+@item Alt + X
+Switch to first channel of next server (or server buffer if no channel is opened)@*
+@*
+@item Alt + digit (1-9)
+Switch to buffer by number@*
@*
@end table

@@ -709,7 +772,8 @@ RFC 2812: @uref{ftp://ftp.rfc-editor.org/in-notes/rfc2812.txt}
@code{IRC::add_message_handler ("privmsg", my_function);}@*
@code{sub my_function}@*
@code{@{ }@*
-@code{@ @ @ @ ($null, $channel, $message) = split ":",@@_[0],3;}@*
+@code{@ @ @ @ IRC::print ("server=$_[0]\n");}@*
+@code{@ @ @ @ ($null, $channel, $message) = split ":",$_[1],3;}@*
@code{@ @ @ @ ($hostmask, $null, $channel) = split " ", $channel;}@*
@code{@ @ @ @ IRC::print ("host=$hostmask, chan=$channel, msg=$message\n");}@*
@code{@} }@*
@@ -734,11 +798,35 @@ available until your Perl script will be unloaded.
@code{IRC::add_command_handler ("command", my_command);}@*
@code{sub my_command}@*
@code{@{ }@*
-@code{@ @ @ @ IRC::print("Arguments: ".@@_[0]);}@*
+@code{@ @ @ @ IRC::print("Server: $_[0], arguments: $_[1]\n");}@*
@code{@ @ @ @ return 0;}@*
@code{@} }@*
@*

+@item
+@command{IRC::get_info ( [server,] name );}@*
+@*
+Get various info about WeeChat, server or user.@*
+
+@emph{Arguments:}
+@itemize @minus
+@item @option{server}: internal name of server
+@item @option{name}: name of info to retrieve:
+@itemize @minus
+@item @option{0 or version}: get WeeChat version
+@item @option{1 or nick}: get nickname
+@item @option{2 or channel}: get channel name
+@item @option{3 or server}: get server name
+@item @option{4 or weechatdir}: get WeeChat home directory
+@item @option{5 or away}: get away flag for server
+@end itemize
+@end itemize
+@*
+@emph{Examples:}@*
+@code{$version = get_info("version");}@*
+@code{$nick = get_info("freenode", "nick");}@*
+@*
+
@end itemize

@node Python scripts, Ruby scripts, Perl scripts, Extensions
@@ -786,9 +874,6 @@ Bounga
@item
 Xahlexx
 <@email{xahlexx@@tuxfamily.org, xahlexx AT tuxfamily.org}>
-@item
-Crevetor
-<@email{crevetor@@caramail.com, crevetor AT caramail.com}>

@end itemize

@@ -831,7 +916,7 @@ Look for WeeChat support page for detail:@*

 This manual documents WeeChat IRC client, it is part of WeeChat.@*

-Copyright @copyright{} 2004 FlashCode
+Copyright @copyright{} 2005 FlashCode
 <@email{flashcode@@flashtux.org, flashcode AT flashtux.org}>@*
@*
 This document may be used under the terms the GNU General Public License
@@ -6,7 +6,7 @@

@c WeeChat documentation (french version)
@c
-@c Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+@c Copyright (c) 2005 by FlashCode <flashcode@flashtux.org>
@c
@c This manual is free software; you can redistribute it and/or modify
@c it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@

@title WeeChat - Guide utilisateur
@subtitle Client IRC rapide, l@'eger et extensible
-@subtitle Documentation pour WeeChat v0.0.6 - 5 juin 2004
+@subtitle Documentation pour WeeChat v0.0.9 - 1er Janvier 2005

@image{weechat_image}

@@ -48,7 +48,7 @@ Ce manuel documente le client IRC WeeChat, il fait partie de WeeChat.@*
 La derni@`ere version de ce document peut @^etre t@'el@'echarg@'ee sur cette page :@*
@uref{http://weechat.flashtux.org/doc.php}@*
@*
-Copyright @copyright{} 2004 FlashCode
+Copyright @copyright{} 2005 FlashCode
 <@email{flashcode@@flashtux.org, flashcode AT flashtux.org}>@*
@*
 Ce document peut @^etre utilis@'e sous les termes de la licence GNU General Public
@@ -155,7 +155,7 @@ Mandrake/Redhat (ou toute distribution compatible avec les RPM)@*
 Pour installer : @kbd{rpm -i /chemin/weechat-x.y.z-1.i386.rpm}
@item
 Gentoo@*
-Pour installer : voir la documentation Gentoo
+Pour installer : @kbd{emerge weechat}
@item
 *BSD (non disponible !)
@item
@@ -177,7 +177,7 @@ Note: pour ne construire que certaines interfaces, vous pouvez passer des param@
@`a ./configure, tapez @kbd{./configure --help} pour de l'aide sur ces options.@*

 Obtenez les droits root et installez WeeChat :@*
-@kbd{su -}@*
+@kbd{su}@*
 (entrez le mot de passe de root)@*
@kbd{make install}@*

@@ -292,6 +292,9 @@ Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'off'@*
@item look_nick_completor
 La cha@^ine affich@'ee apr@`es la compl@'etion des utilisateurs@*
 Type: cha@^ine (toute cha@^ine), valeur par d@'efaut: ':'@*
+@item look_display_away
+Affiche un message sur tous les canaux pour l'absence/le retour@*
+Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
@item look_infobar
 Active la barre d'infos@*
 Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
@@ -343,15 +346,18 @@ Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'default'@*
@item col_status
 Couleur pour la barre de statut@*
 Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'gray'@*
-@item col_status_active
-Couleur pour la fen@^etre active (barre de statut)@*
-Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'yellow'@*
+@item col_status_delimiters
+Couleur pour les d@'elimiteurs de la barre de statut@*
+Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'cyan'@*
@item col_status_data_msg
 Couleur pour une fen@^etre avec de nouvelles infos (barre de statut)@*
-Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'lightred'@*
+Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'yellow'@*
+@item col_status_highlight
+Couleur pour une fen@^etre avec un highlight (barre de statut)@*
+Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'lightmagenta'@*
@item col_status_data_other
 Couleur pour une fen@^etre avec des nouvelles donn@'ees (pas des infos) (barre de statut)@*
-Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'lightmagenta'@*
+Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'gray'@*
@item col_status_more
 Couleur pour une fen@^etre avec des nouvelles donn@'ees (barre de statut)@*
 Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'white'@*
@@ -403,13 +409,37 @@ Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'gray'@*
@item col_nick_bg
 Couleur de fond pour les pseudos@*
 Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'default'@*
+@item col_chat_dcc_selected
+Couleur pour le DCC s@'electionn@'e (fen@^etre de discussion)@*
+Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'white'@*
+@item col_dcc_waiting
+Couleur pour le statut dcc "attente"@*
+Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'white'@*
+@item col_dcc_connecting
+Couleur pour le statut dcc "connexion"@*
+Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'yellow'@*
+@item col_dcc_active
+Couleur pour le statut dcc "actif"@*
+Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'lightblue'@*
+@item col_dcc_done
+Couleur pour le statut dcc "termin@'e"@*
+Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'lightgreen'@*
+@item col_dcc_failed
+Couleur pour le statut dcc "@'echou@'e"@*
+Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'lightred'@*
+@item col_dcc_aborted
+Couleur pour le statut dcc "interrompu"@*
+Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'lightred'@*
@item history_max_lines
 Nombre maximum de lignes dans l'historique pour un serveur/fen@^etre/fen@^etre priv@'ee (0 = sans limite)@*
 Type: entier (valeurs: entre 0 et 2147483647), valeur par d@'efaut: 4096@*
@item history_max_commands
 Nombre maximum de commandes utilisateur dans l'historique (0 = sans limite)@*
 Type: entier (valeurs: entre 0 et 2147483647), valeur par d@'efaut: 100@*
-@item log_auto_channels
+@item log_auto_server
+Enregistrer automatiquement les messages du serveur@*
+Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
+@item log_auto_channel
 Enregistrer automatiquement les conversations des canaux@*
 Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
@item log_auto_private
@@ -418,30 +448,24 @@ Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
@item log_path
 Chemin pour les conversations sauvegard@'ees par WeeChat@*
 Type: cha@^ine (toute cha@^ine), valeur par d@'efaut: '~/.weechat/logs/'@*
-@item log_name
-Nom des conversations saivegard@'ees (%S == nom du serveur irc, %N == nom du canal (ou pseudo si fen@^etre priv@'ee)@*
-Type: cha@^ine (toute cha@^ine), valeur par d@'efaut: '%S,%N.weechatlog'@*
@item log_timestamp
 Horodatage pour les conversations sauvegard@'ees (voir man strftime pour le format de date/heure)@*
-Type: cha@^ine (toute cha@^ine), valeur par d@'efaut: '~'@*
-@item log_start_string
-Texte @'ecrit en d@'emarrant la sauvegarde d'une discussion (voir man strftime pour le format de date/heure)@*
-Type: cha@^ine (toute cha@^ine), valeur par d@'efaut: '--- Log started %a %b %d %Y %H:%M:%s'@*
-@item log_end_string
-Texte @'ecrit @`a la fin d'une discussion sauvegard@'ees (voir man strftime pour le format de date/heure)@*
-Type: cha@^ine (toute cha@^ine), valeur par d@'efaut: '--- Log ended %a %b %d %Y %H:%M:%s'@*
+Type: cha@^ine (toute cha@^ine), valeur par d@'efaut: '%Y %b %d %H:%M:%S'@*
+@item log_hide_nickserv_pwd
+Masquer le mot de passe affich@'e par nickserv@*
+Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
@item dcc_auto_accept_files
 Accepte automatiquement les fichiers dcc entrants@*
-Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
-@item dcc_auto_accept_max_size
-Taille maximum pour un fichier entrant lorsqu'il est accept@'e automatiquement@*
-Type: entier (valeurs: entre 0 et 2147483647), valeur par d@'efaut: 0@*
+Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'off'@*
@item dcc_auto_accept_chats
 Accepte automatiquement les demandes de discussion dcc (@`a utiliser avec pr@'ecaution !)@*
 Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
@item dcc_timeout
 D@'elai d'attente pour les requ@^etes dcc (en secondes)@*
 Type: entier (valeurs: entre 1 et 2147483647), valeur par d@'efaut: 300@*
+@item dcc_blocksize
+Taille de bloc pour les paquets dcc en octets (d@'efaut: 1024)@*
+Type: entier (valeurs: entre 1024 et 102400), valeur par d@'efaut: 1024@*
@item dcc_download_path
 Chemin pour @'ecrire les fichiers re@,{c}us par dcc (par d@'efaut: r@'epertoire de l'utilisateur)@*
 Type: cha@^ine (toute cha@^ine), valeur par d@'efaut: '~'@*
@@ -472,6 +496,12 @@ Type: cha@^ine (toute cha@^ine), valeur par d@'efaut: ''@*
@item server_autoconnect
 Connexion automatique au serveur quand WeeChat d@'emarre@*
 Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
+@item server_autoreconnect
+Reconnexion automatique au serveur apr@`es une d@'econnexion@*
+Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
+@item server_autoreconnect_delay
+D@'elai (en secondes) avant de tenter une reconnexion au serveur@*
+Type: entier (valeurs: entre 0 et 65535), valeur par d@'efaut: 30@*
@item server_address
 Adresse IP ou nom du serveur IRC@*
 Type: cha@^ine (toute cha@^ine), valeur par d@'efaut: ''@*
@@ -499,9 +529,15 @@ Type: cha@^ine (toute cha@^ine), valeur par d@'efaut: ''@*
@item server_command
 Commande @`a ex@'ecuter en premier lorsque connect@'e au serveur@*
 Type: cha@^ine (toute cha@^ine), valeur par d@'efaut: ''@*
+@item server_command_delay
+D@'elai (en secondes) apr@`es ex@'ecution de la commande (exemple: donner du temps pour l'authentification)@*
+Type: entier (valeurs: entre 0 et 3600), valeur par d@'efaut: 1@*
@item server_autojoin
 Liste des canaux (s@'epar@'es par des virgules) @`a rejoindre lorsque connect@'e au serveur@*
 Type: cha@^ine (toute cha@^ine), valeur par d@'efaut: ''@*
+@item server_autorejoin
+Rejoindre automatiquement les canaux quand mis dehors@*
+Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
@end table

 Les couleurs pour l'interface Curses sont :@*
@@ -550,13 +586,16 @@ Aller au caract@`ere pr@'ec@'edent / suivant sur la ligne de commande@*
@item Ctrl + fl@`eche gauche / Ctrl + fl@`eche droite
 Aller au mot pr@'ec@'edent / suivant sur la ligne de commande@*
@*
-@item Home / End
-Aller au d@'ebut / @`a la fin de la ligne de commande@*
+@item Home / Ctrl + A
+Aller au d@'ebut de la ligne de commande@*
+@*
+@item End / Ctrl + E
+Aller @`a la fin de la ligne de commande@*
@*
@item Backspace / Delete
 Effacer le mot pr@'ec@'edent / suivant sur la ligne de commande@*
@*
-@item Ctrl + Backspace
+@item Ctrl + Backspace / Ctrl + W
 Effacer le mot pr@'ec@'edent sur la ligne de commande@*
@*
@item Tab
@@ -572,17 +611,41 @@ Ex@'ecuter la commande ou envoyer le message@*
 Rappeler les derni@`eres commandes/messages@*
@*
@item PageUp / PageDown
-Afficher l'historique de la fen@^etre@*
+Afficher l'historique du tampon@*
@*
@item F6 / F7
-Aller @`a la fen@^etre pr@'ec@'edente / suivante@*
-@*
-@item Alt + fl@`eche gauche / Alt + fl@`eche droite
-Identique @`a F6 / F7@*
+Aller au tampon pr@'ec@'edent@*
+@*
+@item F8
+Aller @`a la fen@^etre suivante@*
@*
@item F10
 Effacer le dernier message de la barre d'infos@*
@*
+@item Ctrl + L
+R@'eaffiche toute la fen@^etre@*
+@*
+@item Alt + fl@`eche gauche / Alt + fl@`eche droite
+Identique @`a F6 / F7@*
+@*
+@item Alt + A
+Sauter au tampon avec activit@'e (avec priorit@'e: highlight, message, autre)@*
+@*
+@item Alt + D
+Afficher les DCC en cours@*
+@*
+@item Alt + R
+Vide la hotlist (notification d'activité sur les autres tampons)@*
+@*
+@item Alt + S
+Sauter au tampon du serveur@*
+@*
+@item Alt + X
+Sauter au premier canal du serveur suivant (ou tampon du serveur si aucun canal ouvert)@*
+@*
+@item Alt + chiffre (1-9)
+Sauter au tampon avec ce num@'ero@*
+@*
@end table

@node Commandes WeeChat, , Raccourcis clavier, Utilisation
@@ -710,7 +773,8 @@ RFC 2812 : @uref{ftp://ftp.rfc-editor.org/in-notes/rfc2812.txt}
@code{IRC::add_message_handler ("privmsg", ma_fonction);}@*
@code{sub ma_fonction}@*
@code{@{ }@*
-@code{@ @ @ @ ($null, $canal, $message) = split ":",@@_[0],3;}@*
+@code{@ @ @ @ IRC::print ("serveur=$_[0]\n");}@*
+@code{@ @ @ @ ($null, $canal, $message) = split ":",$_[1],3;}@*
@code{@ @ @ @ ($masque, $null, $canal) = split " ", $canal;}@*
@code{@ @ @ @ IRC::print ("masque=$masque, canal=$canal, message=$message\n");}@*
@code{@} }@*
@@ -735,11 +799,35 @@ ne seront plus accessibles tant que le script Perl sera charg@'e.
@code{IRC::add_command_handler ("commande", ma_commande);}@*
@code{sub ma_commande}@*
@code{@{ }@*
-@code{@ @ @ @ IRC::print("Param@`etres : ".@@_[0]);}@*
+@code{@ @ @ @ IRC::print("Serveur: $_[0], param@`etres: $_[1]\n");}@*
@code{@ @ @ @ return 0;}@*
@code{@} }@*
@*

+@item
+@command{IRC::get_info ( [serveur,] nom );}@*
+@*
+Obtenir des informations vari@'ees sur WeeChat, le serveur ou l'utilisateur.@*
+
+@emph{Param@`etres :}
+@itemize @minus
+@item @option{serveur}: nom interne du serveur
+@item @option{nom}: nom de l'info @`a obtenir :
+@itemize @minus
+@item @option{0 ou version}: obtenir la version de WeeChat
+@item @option{1 ou nick}: obtenir le pseudo
+@item @option{2 ou channel}: obtenir le nom du canal
+@item @option{3 ou server}: obtenir le nom du serveur
+@item @option{4 ou weechatdir}: obtenir le r@'epertoire maison de WeeChat
+@item @option{5 ou away}: obtenir le drapeau "away" du serveur
+@end itemize
+@end itemize
+@*
+@emph{Exemples :}@*
+@code{$version = get_info("version");}@*
+@code{$nick = get_info("freenode", "nick");}@*
+@*
+
@end itemize

@node Scripts Python, Scripts Ruby, Scripts Perl, Extensions
@@ -786,9 +874,6 @@ Bounga
@item
 Xahlexx
 <@email{xahlexx@@tuxfamily.org, xahlexx AT tuxfamily.org}>
-@item
-Crevetor
-<@email{crevetor@@caramail.com, crevetor AT caramail.com}>

@end itemize

@@ -831,7 +916,7 @@ Voir la page support WeeChat pour plus de d@'etails :@*

 Ce manuel documente le client IRC WeeChat, il fait partie de WeeChat.@*

-Copyright @copyright{} 2004 FlashCode
+Copyright @copyright{} 2005 FlashCode
 <@email{flashcode@@flashtux.org, flashcode AT flashtux.org}>@*
@*
 Ce document peut @^etre utilis@'e sous les termes de la licence GNU General Public
@@ -6,7 +6,7 @@

@c WeeChat documentation (vers@~ao partuguesa)
@c
-@c Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+@c Copyright (c) 2005 by FlashCode <flashcode@flashtux.org>
@c
@c This manual is free software; you can redistribute it and/or modify
@c it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@

@title WeeChat - Guia do Utilizador
@subtitle Cliente de IRC rapido, leve e extencivel
-@subtitle Documenta@,{c}@~ao do WeeChat v0.0.6 - 05 de Junho de 2004
+@subtitle Documenta@,{c}@~ao do WeeChat v0.0.9 - 1 de Janeiro de 2005

@image{weechat_image}

@@ -48,7 +48,7 @@ Este manual documenta o cliente de IRC WeeChat, ele faz parte do WeeChat.@*
 A ultima versão deste documento pode ser descarregada de :@*
@uref{http://weechat.flashtux.org/doc.php}@*
@*
-Copyright @copyright{} 2004 FlashCode
+Copyright @copyright{} 2005 FlashCode
 <@email{flashcode@@flashtux.org, flashcode AT flashtux.org}>@*
@*
 Este documento pode ser utilizado sobre os termos da Licen@,{c}a P@'ublica geral GNU (GNU General Public
@@ -154,7 +154,7 @@ Mandrake/Redhat (ou outra distro compat@'ivel com RPMs)@*
 Instala@,{c}@~ao : @kbd{rpm -i /chemin/weechat-x.y.z-1.i386.rpm}
@item
 Gentoo@*
-Instala@,{c}@~ao : ver a documenta@,{c}@~ao da Gentoo
+Instala@,{c}@~ao : @kbd{emerge weechat}
@item
 *BSD (non disponible !)
@item
@@ -176,7 +176,7 @@ Nota: Para compilar certas interfaces, podes passar par@^ametros
 ao ./configure, escreve @kbd{./configure --help} para veres as op@,{c}@~oes.@*

 Obter os direitos do root e instalar o Weechat :@*
-@kbd{su -}@*
+@kbd{su}@*
 (escreve aqui a palavra-passe do superutilizador)@*
@kbd{make install}@*

@@ -247,13 +247,16 @@ Ir um caractere para traz / para a frente na linha de comando@*
@item Ctrl + Seta esquerda / Ctrl + Seta Direita
 Ir uma palavra para traz / para a frente na linha de comando@*
@*
-@item Home / End
-Ir para o in@'icio / para o fim da linha de comando@*
+@item Home / Ctrl + A
+Ir para o in@'icio da linha de comando@*
+@*
+@item End / Ctrl + E
+Ir para o fim da linha de comando@*
@*
@item Backspace / Delete
 Apagar o caractere anterior / seguinte na linha de comando@*
@*
-@item Ctrl + Backspace
+@item Ctrl + Backspace / Ctrl + W
 Apagar a palavra anterior na linha de comando
@*
@item Tab
@@ -274,12 +277,36 @@ Navegar no hist@'orico da janela@*
@item F6 / F7
 Ir para a janela anterior/seguinte@*
@*
-@item Alt + Seta da esquerda / Alt + Seta da direita
-Identico a F6 / F7@*
+@item F8
+Comute @`a janela seguinte@*
@*
@item F10
 Apagar a @'ultima mensagem da barra do info@*
@*
+@item Ctrl + L
+Redesenhe a janela inteira@*
+@*
+@item Alt + Seta da esquerda / Alt + Seta da direita
+Identico a F6 / F7@*
+@*
+@item Alt + A
+Comute ao amortecedor seguinte com atividade (com prioridade:  destaque, mensagem, outra)@*
+@*
+@item Alt + D
+Exposi@,{c}@~ao DCC atual@*
+@*
+@item Alt + R
+Hotlist desobstru@'ido (notifica@,{c}@~ao da atividade em outros amortecedores)@*
+@*
+@item Alt + S
+Comute ao amortecedor do servidor@*
+@*
+@item Alt + X
+Comute @`a primeira canaleta do servidor seguinte (ou do amortecedor do servidor se nenhuma canaleta for aberta)@*
+@*
+@item Alt + d@'igito (1-9)
+Comute ao amortecedor pelo n@'umero@*
+@*
@end table

@node Comandos do WeeChat, , Recursos de teclado, Utilizacao
@@ -432,6 +459,30 @@ Este nome pode pertencer a um comando j
@code{@} }@*
@*

+@item
+@command{IRC::get_info ( [servidor,] nome );}@*
+@*
+Comece o v@'ario info sobre WeeChat, servidor ou usu@'ario.@*
+
+@emph{Argumentos:}
+@itemize @minus
+@item @option{servidor}: nome interno da servidor
+@item @option{nome}: nome do info a recuperar:
+@itemize @minus
+@item @option{0 ou version}: comece a vers@~ao de WeeChat
+@item @option{1 ou nick}: comece o nickname
+@item @option{2 ou channel}: comece o nome da canal
+@item @option{3 ou server}: comece o nome do servidor
+@item @option{4 ou weechatdir}: comece a WeeChat o diret@'orio home
+@item @option{5 ou away}: comece a bandeira ausente para o servidor
+@end itemize
+@end itemize
+@*
+@emph{Exemplos:}@*
+@code{$version = get_info("version");}@*
+@code{$nick = get_info("freenode", "nick");}@*
+@*
+
@end itemize

@node Scripts Python, Scripts Ruby, Scripts Perl, Extencoes
@@ -479,9 +530,6 @@ Bounga
@item
 Xahlexx
 <@email{xahlexx@@tuxfamily.org, xahlexx AT tuxfamily.org}>
-@item
-Crevetor
-<@email{crevetor@@caramail.com, crevetor AT caramail.com}>

@end itemize

@@ -522,7 +570,7 @@ Para mais detalhes, v@^e tamb@'em a p@'agina de suporte do WeeChat :@*

 Este manual documenta o cliente de IRC WeeChat, Ele faz parte do WeeChat.@*

-Copyright @copyright{} 2004 FlashCode
+Copyright @copyright{} 2005 FlashCode
 <@email{flashcode@@flashtux.org, flashcode AT flashtux.org}>@*
 Tradu@,{c}@~ao portuguesa de Jo@~ao Jer@'onimo <@email{j_j_b_o@@sapo.pt, j_j_b_o AT sapo.pt}>@*
@*
@@ -6,6 +6,7 @@
 ./src/irc/irc-display.c
 ./src/irc/irc-send.c
 ./src/irc/irc-recv.c
+./src/irc/irc-dcc.c
 ./src/plugins/perl/wee-perl.c
 ./src/plugins/perl/wee-perl.h
 ./src/plugins/plugins.c
@@ -23,6 +24,7 @@
 ./src/common/command.h
 ./src/common/completion.h
 ./src/common/history.h
+./src/common/log.c
 ./src/common/weechat.h
 ./src/common/weeconfig.c
 ./src/common/weeconfig.h
@@ -1,4 +1,4 @@
-# Copyright (c) 2004 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2005 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
@@ -1,4 +1,4 @@
-# Copyright (c) 2004 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2005 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
@@ -28,4 +28,8 @@ lib_weechat_main_a_SOURCES = weechat.c \
                             weeconfig.c \
                             weeconfig.h \
                             history.c \
-                             history.h
+                             history.h \
+                             hotlist.c \
+                             hotlist.h \
+                             log.c \
+                             log.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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
@@ -43,6 +43,15 @@ t_weechat_command weechat_commands[] =
    N_("alias_name: name of alias\ncommand: command name (WeeChat "
    "or IRC command, without first '/')\n" "arguments: arguments for command"),
    0, MAX_ARGS, NULL, weechat_cmd_alias },
+  { "buffer", N_("manage buffers"),
+    N_("[action | number]"),
+    N_("action: action to do:\n"
+    "  move    move buffer in the list (may be relative, for example -1)\n"
+    "  close   close buffer (for channel: same as /part without part message)\n"
+    "  list    list opened buffers (no parameter implies this list)\n"
+    "  notify  set notify level for buffer (0=never, 1=highlight, 2=1+msg, 3=2+join/part)\n"
+    "number: jump to buffer by number"),
+    0, MAX_ARGS, weechat_cmd_buffer, NULL },
  { "clear", N_("clear window(s)"),
    N_("[-all]"),
    N_("-all: clear all windows"),
@@ -59,7 +68,7 @@ t_weechat_command weechat_commands[] =
    N_("[command]"), N_("command: name of a WeeChat or IRC command"),
    0, 1, weechat_cmd_help, NULL },
  { "perl", N_("list/load/unload Perl scripts"),
-    N_("[load filename] | [unload]"),
+    N_("[load filename] | [autoload] | [unload]"),
    N_("filename: Perl script (file) to load\n"
    "Without argument, /perl command lists all loaded Perl scripts."),
    0, 2, weechat_cmd_perl, NULL },
@@ -77,7 +86,7 @@ t_weechat_command weechat_commands[] =
    "nick2: alternate nick for server\n"
    "nick3: second alternate nick for server\n"
    "username: user name\n"
-    "realname: real name of user\n"),
+    "realname: real name of user"),
    0, MAX_ARGS, weechat_cmd_server, NULL },
  { "save", N_("save config to disk"),
    N_("[file]"), N_("file: filename for writing config"),
@@ -88,6 +97,14 @@ t_weechat_command weechat_commands[] =
  { "unalias", N_("remove an alias"),
    N_("alias_name"), N_("alias_name: name of alias to remove"),
    1, 1, NULL, weechat_cmd_unalias },
+  { "window", N_("manage windows"),
+    N_("[action]"),
+    N_("action: action to do:\n"
+    "   close  close current window (under development!)\n"
+    "    list  list opened windows (no parameter implies this list)\n"
+    "  splith  split current window horizontally\n"
+    "  splitv  split current window vertically"),
+    0, MAX_ARGS, weechat_cmd_window, NULL },
  { NULL, NULL, NULL, NULL, 0, 0, NULL, NULL }
 };

@@ -524,7 +541,7 @@ exec_weechat_command (t_irc_server *server, char *string)
            ptr_args = NULL;
    }
    
-    if (!plugin_exec_command (command + 1, ptr_args))
+    if (!plugin_exec_command (command + 1, (server) ? server->name : "", ptr_args))
    {
        argv = explode_string (ptr_args, " ", 0, &argc);
        
@@ -707,46 +724,46 @@ user_command (t_irc_server *server, char *command)
    {
        if ((command[0] == '/') && (command[1] == '/'))
            command++;
-        if (server && (!WIN_IS_SERVER(gui_current_window)))
+        if (server && (!BUFFER_IS_SERVER(gui_current_window->buffer)))
        {
            server_sendf (server, "PRIVMSG %s :%s\r\n",
-                          CHANNEL(gui_current_window)->name,
+                          CHANNEL(gui_current_window->buffer)->name,
                          command);

-            if (WIN_IS_PRIVATE(gui_current_window))
+            if (BUFFER_IS_PRIVATE(gui_current_window->buffer))
            {
-                gui_printf_color_type (CHANNEL(gui_current_window)->window,
+                gui_printf_color_type (CHANNEL(gui_current_window->buffer)->buffer,
                                       MSG_TYPE_NICK,
                                       COLOR_WIN_CHAT_DARK, "<");
-                gui_printf_color_type (CHANNEL(gui_current_window)->window,
+                gui_printf_color_type (CHANNEL(gui_current_window->buffer)->buffer,
                                       MSG_TYPE_NICK,
                                       COLOR_WIN_NICK_SELF,
                                       "%s", server->nick);
-                gui_printf_color_type (CHANNEL(gui_current_window)->window,
+                gui_printf_color_type (CHANNEL(gui_current_window->buffer)->buffer,
                                       MSG_TYPE_NICK,
                                       COLOR_WIN_CHAT_DARK, "> ");
-                gui_printf_color_type (CHANNEL(gui_current_window)->window,
+                gui_printf_color_type (CHANNEL(gui_current_window->buffer)->buffer,
                                       MSG_TYPE_MSG,
                                       COLOR_WIN_CHAT, "%s\n", command);
            }
            else
            {
-                ptr_nick = nick_search (CHANNEL(gui_current_window), server->nick);
+                ptr_nick = nick_search (CHANNEL(gui_current_window->buffer), server->nick);
                if (ptr_nick)
                {
-                    irc_display_nick (CHANNEL(gui_current_window)->window, ptr_nick,
+                    irc_display_nick (CHANNEL(gui_current_window->buffer)->buffer, ptr_nick,
                                      MSG_TYPE_NICK, 1, 1, 0);
-                    gui_printf_color (CHANNEL(gui_current_window)->window,
+                    gui_printf_color (CHANNEL(gui_current_window->buffer)->buffer,
                                      COLOR_WIN_CHAT, "%s\n", command);
                }
                else
-                    gui_printf (server->window,
+                    gui_printf (server->buffer,
                                _("%s cannot find nick for sending message\n"),
                                WEECHAT_ERROR);
            }
        }
        else
-            gui_printf ((server) ? server->window : NULL,
+            gui_printf ((server) ? server->buffer : NULL,
                        _("This window is not a channel!\n"));
    }
 }
@@ -810,6 +827,205 @@ weechat_cmd_alias (char *arguments)
    return 0;
 }

+/*
+ * weechat_cmd_buffer: manage buffers
+ */
+
+int
+weechat_cmd_buffer (int argc, char **argv)
+{
+    t_gui_buffer *ptr_buffer;
+    t_irc_server *ptr_server;
+    long number;
+    char *error;
+    
+    if ((argc == 0) || ((argc == 1) && (strcasecmp (argv[0], "list") == 0)))
+    {
+        /* list opened buffers */
+        
+        irc_display_prefix (NULL, PREFIX_INFO);
+        gui_printf (NULL, _("Opened buffers:\n"));
+        
+        for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer)
+        {
+            irc_display_prefix (NULL, PREFIX_INFO);
+            gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "[");
+            gui_printf (NULL, "%d", ptr_buffer->number);
+            gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "] ");
+            
+            if (ptr_buffer->dcc)
+                gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "DCC\n");
+            else if (BUFFER_IS_SERVER (ptr_buffer))
+            {
+                gui_printf (NULL, _("Server: "));
+                gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL,
+                                  "%s\n", SERVER(ptr_buffer)->name);
+            }
+            else if (BUFFER_IS_CHANNEL (ptr_buffer))
+            {
+                gui_printf (NULL, _("Channel: "));
+                gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL,
+                                  "%s", CHANNEL(ptr_buffer)->name);
+                gui_printf (NULL, _(" (server: "));
+                gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL,
+                                  "%s", SERVER(ptr_buffer)->name);
+                gui_printf (NULL, ")\n");
+            }
+            else if (BUFFER_IS_PRIVATE (ptr_buffer))
+            {
+                gui_printf (NULL, _("Private with: "));
+                gui_printf_color (NULL, COLOR_WIN_CHAT_NICK,
+                                  "%s", CHANNEL(ptr_buffer)->name);
+                gui_printf (NULL, _(" (server: "));
+                gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL,
+                                  "%s", SERVER(ptr_buffer)->name);
+                gui_printf (NULL, ")\n");
+            }
+        }
+    }
+    else
+    {
+        if (strcasecmp (argv[0], "move") == 0)
+        {
+            /* move buffer to another number in the list */
+            
+            if (argc < 2)
+            {
+                gui_printf (NULL, _("%s missing arguments for \"%s\" command\n"),
+                            WEECHAT_ERROR, "buffer");
+                return -1;
+            }
+            
+            error = NULL;
+            number = strtol (((argv[1][0] == '+') || (argv[1][0] == '-')) ? argv[1] + 1 : argv[1],
+                             &error, 10);
+            if ((error) && (error[0] == '\0'))
+            {
+                if (argv[1][0] == '+')
+                    gui_move_buffer_to_number (gui_current_window,
+                                               gui_current_window->buffer->number + ((int) number));
+                else if (argv[1][0] == '-')
+                    gui_move_buffer_to_number (gui_current_window,
+                                               gui_current_window->buffer->number - ((int) number));
+                else
+                    gui_move_buffer_to_number (gui_current_window, (int) number);
+            }
+            else
+            {
+                /* invalid number */
+                gui_printf (NULL, _("%s incorrect buffer number\n"),
+                            WEECHAT_ERROR);
+                return -1;
+            }
+        }
+        else if (strcasecmp (argv[0], "close") == 0)
+        {
+            /* close buffer (server or channel/private) */
+            
+            if ((!gui_current_window->buffer->next_buffer)
+                && (gui_current_window->buffer == gui_buffers))
+            {
+                gui_printf (gui_current_window->buffer,
+                            _("%s can not close the single buffer\n"),
+                            WEECHAT_ERROR);
+                return -1;
+            }
+            if (BUFFER_IS_SERVER(gui_current_window->buffer))
+            {
+                if (SERVER(gui_current_window->buffer)->channels)
+                {
+                    gui_printf (gui_current_window->buffer,
+                                _("%s can not close server buffer while channels "
+                                "are opened\n"),
+                                WEECHAT_ERROR);
+                    return -1;
+                }
+                server_disconnect (SERVER(gui_current_window->buffer), 0);
+                ptr_server = SERVER(gui_current_window->buffer);
+                gui_buffer_free (gui_current_window->buffer, 1);
+                ptr_server->buffer = NULL;
+            }
+            else
+                irc_cmd_send_part (SERVER(gui_current_window->buffer), NULL);
+        }
+        else if (strcasecmp (argv[0], "notify") == 0)
+        {
+            /* set notify level for buffer */
+            
+            if (argc < 2)
+            {
+                /* display notify level for all buffers */
+                irc_display_prefix (NULL, PREFIX_INFO);
+                gui_printf (NULL, _("Notify levels:  "));
+                for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer)
+                {
+                    gui_printf (NULL, "%d.%s:",
+                                ptr_buffer->number,
+                                (ptr_buffer->dcc) ? "DCC" :
+                                    ((BUFFER_IS_SERVER(ptr_buffer)) ? SERVER(ptr_buffer)->name :
+                                    CHANNEL(ptr_buffer)->name));
+                    if (ptr_buffer->dcc)
+                        gui_printf (NULL, "-");
+                    else
+                        gui_printf (NULL, "%d", ptr_buffer->notify_level);
+                    if (ptr_buffer->next_buffer)
+                        gui_printf (NULL, "  ");
+                }
+                gui_printf (NULL, "\n");
+            }
+            else
+            {
+                error = NULL;
+                number = strtol (argv[1], &error, 10);
+                if ((error) && (error[0] == '\0'))
+                {
+                    if ((number < 0) || (number > 3))
+                    {
+                        /* invalid highlight level */
+                        gui_printf (NULL, _("%s incorrect notify level (must be between 0 and 3)\n"),
+                                    WEECHAT_ERROR);
+                        return -1;
+                    }
+                    gui_current_window->buffer->notify_level = number;
+                }
+                else
+                {
+                    /* invalid number */
+                    gui_printf (NULL, _("%s incorrect notify level (must be between 0 and 3)\n"),
+                                WEECHAT_ERROR);
+                    return -1;
+                }
+            }
+        }
+        else
+        {
+            /* jump to buffer by number */
+            
+            error = NULL;
+            number = strtol (argv[0], &error, 10);
+            if ((error) && (error[0] == '\0'))
+            {
+                if (!gui_switch_to_buffer_by_number (gui_current_window, (int) number))
+                {
+                    gui_printf (NULL,
+                                _("%s buffer \"%s\" not found for \"%s\" command\n"),
+                                WEECHAT_ERROR, argv[0], "buffer");
+                    return -1;
+                }
+            }
+            else
+            {
+                /* invalid number */
+                gui_printf (NULL, _("%s incorrect buffer number\n"),
+                            WEECHAT_ERROR);
+                return -1;
+            }
+            
+        }
+    }
+    return 0;
+}
+
 /*
 * weechat_cmd_clear: display or create alias
 */
@@ -820,7 +1036,7 @@ weechat_cmd_clear (int argc, char **argv)
    if (argc == 1)
    {
        if (strcmp (argv[0], "-all") == 0)
-            gui_window_clear_all ();
+            gui_buffer_clear_all ();
        else
        {
            gui_printf (NULL,
@@ -830,7 +1046,7 @@ weechat_cmd_clear (int argc, char **argv)
        }
    }
    else
-        gui_window_clear (gui_current_window);
+        gui_buffer_clear (gui_current_window->buffer);
    return 0;
 }

@@ -842,7 +1058,6 @@ int
 weechat_cmd_connect (int argc, char **argv)
 {
    t_irc_server *ptr_server;
-    t_irc_channel *ptr_channel;
    
    /* make gcc happy */
    (void) argc;
@@ -857,20 +1072,16 @@ weechat_cmd_connect (int argc, char **argv)
                        WEECHAT_ERROR, argv[0]);
            return -1;
        }
-        if (!ptr_server->window)
+        if (!ptr_server->buffer)
        {
-            if (!gui_window_new (ptr_server, NULL, 1))
+            if (!gui_buffer_new (gui_current_window, ptr_server, NULL, 0, 1))
                return -1;
        }
        if (server_connect (ptr_server))
        {
+            ptr_server->reconnect_start = 0;
+            ptr_server->reconnect_join = (ptr_server->channels) ? 1 : 0;
            irc_login (ptr_server);
-            for (ptr_channel = ptr_server->channels; ptr_channel;
-                 ptr_channel = ptr_channel->next_channel)
-            {
-                if (ptr_channel->type == CHAT_CHANNEL)
-                    server_sendf (ptr_server, "JOIN %s\r\n", ptr_channel->name);
-            }
        }
    }
    else
@@ -898,15 +1109,18 @@ weechat_cmd_disconnect (int argc, char **argv)
    ptr_server = server_search (argv[0]);
    if (ptr_server)
    {
-        if (!ptr_server->is_connected)
+        if ((!ptr_server->is_connected) && (ptr_server->reconnect_start == 0))
        {
-            gui_printf (NULL,
+            gui_printf (ptr_server->buffer,
                        _("%s not connected to server \"%s\"!\n"),
                        WEECHAT_ERROR, argv[0]);
            return -1;
        }
-        server_disconnect (ptr_server);
-        gui_redraw_window_status (gui_current_window);
+        if (ptr_server->reconnect_start > 0)
+            gui_printf (ptr_server->buffer,
+                        _("Auto-reconnection is cancelled\n"));
+        server_disconnect (ptr_server, 0);
+        gui_draw_buffer_status (gui_current_window->buffer, 1);
    }
    else
    {
@@ -934,13 +1148,13 @@ weechat_cmd_help (int argc, char **argv)
        for (i = 0; weechat_commands[i].command_name; i++)
            gui_printf (NULL, "    %s - %s\n",
                        weechat_commands[i].command_name,
-                        weechat_commands[i].command_description);
+                        _(weechat_commands[i].command_description));
        gui_printf (NULL, _("> List of IRC commands:\n"));
        for (i = 0; irc_commands[i].command_name; i++)
            if (irc_commands[i].cmd_function_args || irc_commands[i].cmd_function_1arg)
                gui_printf (NULL, "    %s - %s\n",
                            irc_commands[i].command_name,
-                            irc_commands[i].command_description);
+                            _(irc_commands[i].command_description));
    }
    if (argc == 1)
    {
@@ -955,14 +1169,12 @@ weechat_cmd_help (int argc, char **argv)
                gui_printf (NULL,
                            _("Syntax: /%s %s\n"),
                            weechat_commands[i].command_name,
-                            (weechat_commands[i].
-                             arguments) ? weechat_commands[i].
-                            arguments : "");
+                            (weechat_commands[i].arguments) ?
+                            _(weechat_commands[i].arguments) : "");
                if (weechat_commands[i].arguments_description)
                {
                    gui_printf (NULL, "%s\n",
-                                weechat_commands[i].
-                                arguments_description);
+                                _(weechat_commands[i].arguments_description));
                }
                return 0;
            }
@@ -977,12 +1189,11 @@ weechat_cmd_help (int argc, char **argv)
                gui_printf (NULL, _("Syntax: /%s %s\n"),
                            irc_commands[i].command_name,
                            (irc_commands[i].arguments) ?
-                            irc_commands[i].arguments : "");
+                            _(irc_commands[i].arguments) : "");
                if (irc_commands[i].arguments_description)
                {
                    gui_printf (NULL, "%s\n",
-                                irc_commands[i].
-                                arguments_description);
+                                _(irc_commands[i].arguments_description));
                }
                return 0;
            }
@@ -1079,6 +1290,8 @@ weechat_cmd_perl (int argc, char **argv)
            
            break;
        case 1:
+            if (strcmp (argv[0], "autoload") == 0)
+                plugin_auto_load (PLUGIN_TYPE_PERL, "perl/autoload");
            if (strcmp (argv[0], "unload") == 0)
            {
                /* unload all Perl scripts */
@@ -1300,7 +1513,7 @@ weechat_cmd_server (int argc, char **argv)
            gui_printf_color (NULL, COLOR_WIN_CHAT, _("has been deleted\n"));
            
            server_free (server_found);
-            gui_redraw_window (gui_current_window);
+            gui_redraw_buffer (gui_current_window->buffer);
            
            return 0;
        }
@@ -1417,11 +1630,13 @@ weechat_cmd_server (int argc, char **argv)
        }
        
        /* create new server */
-        new_server = server_new (server.name, server.autoconnect, 0,
-                                 server.address, server.port, server.password,
+        new_server = server_new (server.name, server.autoconnect,
+                                 server.autoreconnect,
+                                 server.autoreconnect_delay,
+                                 0, server.address, server.port, server.password,
                                 server.nick1, server.nick2, server.nick3,
                                 server.username, server.realname,
-                                 server.command, server.autojoin);
+                                 server.command, 1, server.autojoin, 1);
        if (new_server)
        {
            irc_display_prefix (NULL, PREFIX_INFO);
@@ -1441,7 +1656,7 @@ weechat_cmd_server (int argc, char **argv)
        
        if (new_server->autoconnect)
        {
-            (void) gui_window_new (new_server, NULL, 1);
+            (void) gui_buffer_new (gui_current_window, new_server, NULL, 0, 1);
            if (server_connect (new_server))
                irc_login (new_server);
        }
@@ -1487,7 +1702,7 @@ weechat_cmd_set (char *arguments)
            if (ptr_option->handler_change == NULL)
            {
                gui_printf (NULL,
-                            _("%s option '%s' can not be changed while WeeChat is running\n"),
+                            _("%s option \"%s\" can not be changed while WeeChat is running\n"),
                            WEECHAT_ERROR, option);
            }
            else
@@ -1499,13 +1714,13 @@ weechat_cmd_set (char *arguments)
                    gui_printf (NULL, "  %s = %s\n", option, value);
                }
                else
-                    gui_printf (NULL, _("%s incorrect value for option '%s'\n"),
+                    gui_printf (NULL, _("%s incorrect value for option \"%s\"\n"),
                                WEECHAT_ERROR, option);
            }
        }
        else
        {
-            gui_printf (NULL, _("%s config option '%s' not found\n"),
+            gui_printf (NULL, _("%s config option \"%s\" not found\n"),
                        WEECHAT_ERROR, option);
        }
    }
@@ -1575,15 +1790,15 @@ weechat_cmd_set (char *arguments)
        if (number_found == 0)
        {
            if (value)
-                gui_printf (NULL, _("No config option found with '%s'\n"),
+                gui_printf (NULL, _("No config option found with \"%s\"\n"),
                            value);
            else
-                gui_printf (NULL, _("No config option found with '%s'\n"));
+                gui_printf (NULL, _("No config option found with \"%s\"\n"));
        }
        else
        {
            if (value)
-                gui_printf (NULL, _("%d config option(s) found with '%s'\n"),
+                gui_printf (NULL, _("%d config option(s) found with \"%s\"\n"),
                            number_found, value);
            else
                gui_printf (NULL, _("%d config option(s) found\n"),
@@ -1619,3 +1834,37 @@ weechat_cmd_unalias (char *arguments)
                arguments);
    return 0;
 }
+
+/*
+ * weechat_cmd_window: manage windows
+ */
+
+int
+weechat_cmd_window (int argc, char **argv)
+{
+    if ((argc == 0) || ((argc == 1) && (strcasecmp (argv[0], "list") == 0)))
+    {
+        /* list opened windows */
+        gui_printf (NULL, "window list -- NOT DEVELOPED!\n");
+    }
+    else
+    {
+        if (strcasecmp (argv[0], "splith") == 0)
+        {
+            /* split window horizontally */
+            gui_window_split_horiz (gui_current_window);
+        }
+        else if (strcasecmp (argv[0], "splitv") == 0)
+        {
+            /* split window vertically */
+            gui_window_split_vertic (gui_current_window);
+        }
+        else
+        {
+            gui_printf (NULL,
+                        _("%s unknown option for \"%s\" command\n"),
+                        WEECHAT_ERROR, "window");
+        }
+    }
+    return 0;
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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
@@ -67,6 +67,7 @@ extern t_weechat_alias *alias_new (char *, char *);
 extern int exec_weechat_command (t_irc_server *, char *);
 extern void user_command (t_irc_server *, 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_disconnect (int, char **);
@@ -76,5 +77,6 @@ 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_window (int, char **);

 #endif /* command.h */
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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,39 +29,110 @@

 #include "weechat.h"
 #include "history.h"
+#include "weeconfig.h"
 #include "../gui/gui.h"


 t_history *history_general = NULL;
+t_history *history_general_last = NULL;
 t_history *history_general_ptr = NULL;
+int num_history_general = 0;


+/*
+ * history_hide_password: hide a nickserv password
+ */
+
+void
+history_hide_password (char *string)
+{
+    char *pos_pwd;
+    
+    if (strstr (string, "nickserv "))
+    {
+        pos_pwd = strstr (string, "identify ");
+        if (!pos_pwd)
+            pos_pwd = strstr (string, "register ");
+        if (pos_pwd)
+        {
+            pos_pwd += 9;
+            while (pos_pwd[0])
+            {
+                pos_pwd[0] = '*';
+                pos_pwd++;
+            }
+        }
+    }
+}
+
 /*
 * history_add: add a text/command to history
 */

 void
-history_add (void *window, char *string)
+history_add (void *buffer, char *string)
 {
-    t_history *new_history;
+    t_history *new_history, *ptr_history;
    
+    /* add history to general 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);
        
-        /* add history to general history */
        if (history_general)
            history_general->prev_history = new_history;
+        else
+            history_general_last = new_history;
        new_history->next_history = history_general;
        new_history->prev_history = NULL;
        history_general = new_history;
+        num_history_general++;
        
-        /* add history to local history */
-        if (((t_gui_window *)(window))->history)
-            ((t_gui_window *)(window))->history->prev_history = new_history;
-        new_history->next_history = ((t_gui_window *)(window))->history;
+        /* remove one command if necessary */
+        if ((cfg_history_max_commands > 0)
+            && (num_history_general > cfg_history_max_commands))
+        {
+            ptr_history = history_general_last->prev_history;
+            history_general_last->prev_history->next_history = NULL;
+            if (history_general_last->text)
+                free (history_general_last->text);
+            free (history_general_last);
+            history_general_last = ptr_history;
+            num_history_general--;
+        }
+    }
+    
+    /* 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_window *)window)->history = new_history;
+        ((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++;
+        }
    }
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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
@@ -0,0 +1,193 @@
+/*
+ * Copyright (c) 2003-2005 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/* hotlist.c: WeeChat hotlist (buffers with activity) */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdlib.h>
+
+#include "weechat.h"
+#include "hotlist.h"
+#include "../irc/irc.h"
+#include "../gui/gui.h"
+
+
+t_weechat_hotlist *hotlist = NULL;
+t_weechat_hotlist *last_hotlist = NULL;
+t_gui_buffer *hotlist_initial_buffer = NULL;
+
+
+/*
+ * hotlist_search: find hotlist with buffer pointer
+ */
+
+t_weechat_hotlist *
+hotlist_search (t_gui_buffer *buffer)
+{
+    t_weechat_hotlist *ptr_hotlist;
+    
+    for (ptr_hotlist = hotlist; ptr_hotlist; ptr_hotlist = ptr_hotlist->next_hotlist)
+    {
+        if (ptr_hotlist->buffer == buffer)
+            return ptr_hotlist;
+    }
+    return NULL;
+}
+
+/*
+ * hotlist_find_pos: find position for a inserting in hotlist (for sorting hotlist)
+ */
+
+t_weechat_hotlist *
+hotlist_find_pos (t_weechat_hotlist *new_hotlist)
+{
+    t_weechat_hotlist *ptr_hotlist;
+    
+    for (ptr_hotlist = hotlist; ptr_hotlist; ptr_hotlist = ptr_hotlist->next_hotlist)
+    {
+        if (new_hotlist->priority > ptr_hotlist->priority)
+            return ptr_hotlist;
+    }
+    return NULL;
+}
+
+/*
+ * hotlist_add: add a buffer to hotlist, with priority
+ */
+
+void
+hotlist_add (int priority, t_gui_buffer *buffer)
+{
+    t_weechat_hotlist *new_hotlist, *pos_hotlist;
+    
+    if (!buffer)
+        return;
+    
+    /* do not highlight current buffer */
+    if (buffer == gui_current_window->buffer)
+        return;
+    
+    if ((pos_hotlist = hotlist_search (buffer)))
+    {
+        /* return if priority is greater or equal than the one to add */
+        if (pos_hotlist->priority >= priority)
+            return;
+        /* remove buffer if present with lower priority and go on */
+        hotlist_free (pos_hotlist);
+    }
+    
+    if ((new_hotlist = (t_weechat_hotlist *) malloc (sizeof (t_weechat_hotlist))) == NULL)
+    {
+        gui_printf (NULL,
+                    _("%s cannot add a buffer to hotlist\n"), WEECHAT_ERROR);
+        return;
+    }
+    
+    new_hotlist->priority = priority;
+    new_hotlist->buffer = buffer;
+    
+    if (hotlist)
+    {
+        pos_hotlist = hotlist_find_pos (new_hotlist);
+        
+        if (pos_hotlist)
+        {
+            /* insert hotlist into the hotlist (before hotlist found) */
+            new_hotlist->prev_hotlist = pos_hotlist->prev_hotlist;
+            new_hotlist->next_hotlist = pos_hotlist;
+            if (pos_hotlist->prev_hotlist)
+                pos_hotlist->prev_hotlist->next_hotlist = new_hotlist;
+            else
+                hotlist = new_hotlist;
+            pos_hotlist->prev_hotlist = new_hotlist;
+        }
+        else
+        {
+            /* add hotlist to the end */
+            new_hotlist->prev_hotlist = last_hotlist;
+            new_hotlist->next_hotlist = NULL;
+            last_hotlist->next_hotlist = new_hotlist;
+            last_hotlist = new_hotlist;
+        }
+    }
+    else
+    {
+        new_hotlist->prev_hotlist = NULL;
+        new_hotlist->next_hotlist = NULL;
+        hotlist = new_hotlist;
+        last_hotlist = new_hotlist;
+    }
+}
+
+/*
+ * hotlist_free: free a hotlist and remove it from hotlist queue
+ */
+
+void
+hotlist_free (t_weechat_hotlist *ptr_hotlist)
+{
+    t_weechat_hotlist *new_hotlist;
+
+    /* remove hotlist from queue */
+    if (last_hotlist == ptr_hotlist)
+        last_hotlist = ptr_hotlist->prev_hotlist;
+    if (ptr_hotlist->prev_hotlist)
+    {
+        (ptr_hotlist->prev_hotlist)->next_hotlist = ptr_hotlist->next_hotlist;
+        new_hotlist = hotlist;
+    }
+    else
+        new_hotlist = ptr_hotlist->next_hotlist;
+    
+    if (ptr_hotlist->next_hotlist)
+        (ptr_hotlist->next_hotlist)->prev_hotlist = ptr_hotlist->prev_hotlist;
+    
+    free (ptr_hotlist);
+    hotlist = new_hotlist;
+}
+
+/*
+ * hotlist_free_all: free all hotlists
+ */
+
+void
+hotlist_free_all ()
+{
+    /* remove all hotlists */
+    while (hotlist)
+        hotlist_free (hotlist);
+}
+
+/*
+ * hotlist_remove_buffer: remove a buffer from hotlist
+ */
+
+void
+hotlist_remove_buffer (t_gui_buffer *buffer)
+{
+    t_weechat_hotlist *pos_hotlist;
+
+    pos_hotlist = hotlist_search (buffer);
+    if (pos_hotlist)
+        hotlist_free (pos_hotlist);
+}
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2003-2005 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+
+#ifndef __WEECHAT_HOTLIST_H
+#define __WEECHAT_HOTLIST_H 1
+
+#include "../irc/irc.h"
+
+typedef struct t_weechat_hotlist t_weechat_hotlist;
+
+struct t_weechat_hotlist
+{
+    int priority;                       /* 0=crappy msg (join/part), 1=msg, */
+                                        /* 2=nick highlight                 */
+    t_gui_buffer *buffer;               /* associated buffer                */
+    t_weechat_hotlist *prev_hotlist;    /* link to previous hotlist         */
+    t_weechat_hotlist *next_hotlist;    /* link to next hotlist             */
+};
+
+extern t_weechat_hotlist *hotlist;
+extern t_gui_buffer *hotlist_initial_buffer;
+
+extern void hotlist_add (int, t_gui_buffer *);
+extern void hotlist_free (t_weechat_hotlist *);
+extern void hotlist_free_all ();
+extern void hotlist_remove_buffer (t_gui_buffer *);
+
+#endif /* hotlist.h */
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2003-2005 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/* log.c: log buffers to files */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "weechat.h"
+#include "log.h"
+#include "weeconfig.h"
+
+
+/*
+ * log_write_date: writes date to log file
+ */
+
+void
+log_write_date (t_gui_buffer *buffer)
+{
+    static char buf_time[256];
+    static time_t seconds;
+    struct tm *date_tmp;
+    
+    if (buffer->log_file)
+    {    
+        seconds = time (NULL);
+        date_tmp = localtime (&seconds);
+        if (date_tmp)
+        {
+            strftime (buf_time, sizeof (buf_time) - 1, cfg_log_timestamp, date_tmp);
+            fprintf (buffer->log_file, "%s  ", buf_time);
+            fflush (buffer->log_file);
+        }
+    }
+}
+
+/*
+ * log_write: writes a message to log file
+ */
+
+void
+log_write (t_gui_buffer *buffer, char *message)
+{
+    if (buffer->log_file)
+    {    
+        fprintf (buffer->log_file, "%s", message);
+        fflush (buffer->log_file);
+    }
+}
+
+/*
+ * log_start: starts a log
+ */
+
+void
+log_start (t_gui_buffer *buffer)
+{
+    int length;
+    char *ptr_home;
+    
+    ptr_home = getenv ("HOME");
+    length = strlen (cfg_log_path) +
+        ((cfg_log_path[0] == '~') ? strlen (ptr_home) : 0) +
+        64;
+    if (SERVER(buffer))
+        length += strlen (SERVER(buffer)->name);
+    if (CHANNEL(buffer))
+        length += strlen (CHANNEL(buffer)->name);
+    buffer->log_filename = (char *) malloc (length);
+    if (!buffer->log_filename)
+    {
+        wee_log_printf (_("Not enough memory to write log file for a buffer\n"));
+        return;
+    }
+    if (cfg_log_path[0] == '~')
+    {
+        strcpy (buffer->log_filename, ptr_home);
+        strcat (buffer->log_filename, cfg_log_path + 1);
+    }
+    else
+        strcpy (buffer->log_filename, cfg_log_path);
+    if (buffer->log_filename[strlen (buffer->log_filename) - 1] != DIR_SEPARATOR_CHAR)
+        strcat (buffer->log_filename, DIR_SEPARATOR);
+    
+    if (SERVER(buffer))
+    {
+        strcat (buffer->log_filename, SERVER(buffer)->name);
+        strcat (buffer->log_filename, ".");
+    }
+    if (CHANNEL(buffer))
+    {
+        strcat (buffer->log_filename, CHANNEL(buffer)->name);
+        strcat (buffer->log_filename, ".");
+    }
+    strcat (buffer->log_filename, "weechatlog");
+    
+    buffer->log_file = fopen (buffer->log_filename, "a");
+    if (!buffer->log_file)
+    {
+        wee_log_printf (_("Unable to write log file for a buffer\n"));
+        free (buffer->log_filename);
+        return;
+    }
+    log_write (buffer, _("****  Beginning of log  "));
+    log_write_date (buffer);
+    log_write (buffer, "****\n");
+}
+
+/*
+ * log_end: ends a log
+ */
+
+void
+log_end (t_gui_buffer *buffer)
+{
+    if (buffer->log_file)
+    {
+        log_write (buffer, _("****  End of log  "));
+        log_write_date (buffer);
+        log_write (buffer, "****\n");
+        fclose (buffer->log_file);
+        buffer->log_file = NULL;
+    }
+    if (buffer->log_filename)
+        free (buffer->log_filename);
+}
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2003-2005 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+
+#ifndef __WEECHAT_LOG_H
+#define __WEECHAT_LOG_H 1
+
+#include "../irc/irc.h"
+
+extern void log_write_date (t_gui_buffer *);
+extern void log_write (t_gui_buffer *, char *);
+extern void log_start (t_gui_buffer *);
+extern void log_end (t_gui_buffer *);
+
+#endif /* log.h */
@@ -10,13 +10,13 @@
 * ###                                                                      ###
 * ###               By: FlashCode <flashcode@flashtux.org>                 ###
 * ###                   Bounga <bounga@altern.org>                         ###
- * ###                   Xahlexx <xahlexx@tuxisland.org>                    ###
+ * ###                   Xahlexx <xahlexx@weeland.org>                      ###
 * ###                                                                      ###
 * ###                   http://weechat.flashtux.org                        ###
 * ###                                                                      ###
 * ############################################################################
 *
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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
@@ -60,7 +60,7 @@

 int quit_weechat;       /* = 1 if quit request from user... why ? :'(        */
 char *weechat_home;     /* WeeChat home dir. (example: /home/toto/.weechat)  */
-FILE *log_file;         /* WeeChat log file (~/.weechat/weechat.log)         */
+FILE *weechat_log_file; /* WeeChat log file (~/.weechat/weechat.log)         */

 int server_cmd_line;    /* at least one server on WeeChat command line       */

@@ -88,7 +88,7 @@ wee_log_printf (char *message, ...)
    static time_t seconds;
    struct tm *date_tmp;
    
-    if (!log_file)
+    if (!weechat_log_file)
        return;
    
    va_start (argptr, message);
@@ -98,13 +98,13 @@ wee_log_printf (char *message, ...)
    seconds = time (NULL);
    date_tmp = localtime (&seconds);
    if (date_tmp)
-        fprintf (log_file, "[%04d-%02d-%02d %02d:%02d:%02d] %s",
+        fprintf (weechat_log_file, "[%04d-%02d-%02d %02d:%02d:%02d] %s",
                 date_tmp->tm_year + 1900, date_tmp->tm_mon + 1, date_tmp->tm_mday,
                 date_tmp->tm_hour, date_tmp->tm_min, date_tmp->tm_sec,
                 buffer);
    else
-        fprintf (log_file, "[????-??-?? ??:??:??] %s", buffer);
-    fflush (log_file);
+        fprintf (weechat_log_file, "%s", buffer);
+    fflush (weechat_log_file);
 }

 /*
@@ -228,11 +228,13 @@ wee_parse_args (int argc, char *argv[])
            }
            else
            {
-                if (!server_new (server_tmp.name, 0, 1,
-                                 server_tmp.address, server_tmp.port,
+                if (!server_new (server_tmp.name, server_tmp.autoconnect,
+                                 server_tmp.autoreconnect,
+                                 server_tmp.autoreconnect_delay,
+                                 1, server_tmp.address, server_tmp.port,
                                 server_tmp.password, server_tmp.nick1,
                                 server_tmp.nick2, server_tmp.nick3,
-                                 NULL, NULL, NULL, server_tmp.autojoin))
+                                 NULL, NULL, NULL, 0, server_tmp.autojoin, 1))
                    fprintf (stderr, _("%s unable to create server ('%s'), ignored\n"),
                             WEECHAT_WARNING, argv[i]);
                server_destroy (&server_tmp);
@@ -354,6 +356,15 @@ wee_create_home_dirs ()
    }
    #endif
    
+    /* create "~/.weechat/logs" */
+    snprintf (dir_name, dir_length, "%s%s%s", weechat_home, DIR_SEPARATOR,
+              "logs");
+    if (!wee_create_dir (dir_name))
+    {
+        fprintf (stderr, _("%s unable to create ~/.weechat/logs directory\n"),
+                 WEECHAT_WARNING);
+    }
+    
    free (dir_name);
 }

@@ -364,9 +375,6 @@ wee_create_home_dirs ()
 void
 wee_init_vars ()
 {
-    /* GUI not yet initialized */
-    gui_ready = 0;
-
    /* init received messages queue */
    recv_msgq = NULL;
    msgq_last_msg = NULL;
@@ -386,7 +394,7 @@ wee_init_log ()
    filename =
        (char *) malloc (filename_length * sizeof (char));
    snprintf (filename, filename_length, "%s/" WEECHAT_LOG_NAME, weechat_home);
-    if ((log_file = fopen (filename, "wt")) == NULL)
+    if ((weechat_log_file = fopen (filename, "wt")) == NULL)
        fprintf (stderr,
                 _("%s unable to create/append to log file (~/.weechat/%s)"),
                 WEECHAT_WARNING, WEECHAT_LOG_NAME);
@@ -440,10 +448,11 @@ weechat_welcome_message ()
 void
 wee_shutdown ()
 {
+    dcc_end ();
    server_free_all ();
    gui_end ();
-    if (log_file)
-        fclose (log_file);
+    if (weechat_log_file)
+        fclose (weechat_log_file);
    exit (EXIT_SUCCESS);
 }

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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
@@ -43,7 +43,7 @@
 #endif


-#define WEECHAT_COPYRIGHT PACKAGE_NAME " (c) 2004 by Wee Team"
+#define WEECHAT_COPYRIGHT PACKAGE_NAME " (c) 2003-2005 by Wee Team"
 #define WEECHAT_WEBSITE "http://weechat.flashtux.org"

 #define WEECHAT_ERROR   _(PACKAGE_NAME " Error:")
@@ -56,10 +56,10 @@
 /* license */

 #define WEE_LICENSE \
-    PACKAGE_STRING " (c) Copyright 2004, compiled on " __DATE__ " " __TIME__ \
+    PACKAGE_STRING " (c) Copyright 2003-2005, compiled on " __DATE__ " " __TIME__ \
    "\nDeveloped by FlashCode <flashcode@flashtux.org>\n" \
    "             Bounga <bounga@altern.org>\n" \
-    "             Xahlexx <xahlexx@tuxisland.org>\n" \
+    "             Xahlexx <xahlexx@weeland.org>\n" \
    "Website: " 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" \
@@ -77,7 +77,7 @@
    "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n\n"
    
 #define WEE_USAGE1 \
-    PACKAGE_STRING " (c) Copyright 2004, compiled on " __DATE__ " " __TIME__ \
+    PACKAGE_STRING " (c) Copyright 2003-2005, compiled on " __DATE__ " " __TIME__ \
    "\nDeveloped by FlashCode, Bounga and Xahlexx - " WEECHAT_WEBSITE "\n\n" \
    "Usage: %s [options ...]\n" \
    "   or: %s [irc://[nickname[:password]@]irc.example.org[:port][/channel] ...]\n\n"
@@ -91,9 +91,11 @@
 /* directory separator, depending on OS */

 #ifdef _WIN32
-    #define DIR_SEPARATOR "\\"
+    #define DIR_SEPARATOR       "\\"
+    #define DIR_SEPARATOR_CHAR  '\\'
 #else
-    #define DIR_SEPARATOR "/"
+    #define DIR_SEPARATOR       "/"
+    #define DIR_SEPARATOR_CHAR  '/'
 #endif

 /* global variables and functions */
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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
@@ -73,6 +73,7 @@ int cfg_look_nickmode;
 int cfg_look_nickmode_empty;
 char *cfg_look_no_nickname;
 char *cfg_look_completor;
+int cfg_look_display_away;
 int cfg_look_infobar;
 char *cfg_look_infobar_timestamp;
 int cfg_look_infobar_delay_highlight;
@@ -109,45 +110,49 @@ t_config_option weechat_options_look[] =
  { "look_nicklist", N_("display nicklist window"),
    N_("display nicklist window (for channel windows)"),
    OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
-    NULL, NULL, &cfg_look_nicklist, NULL, config_change_windows },
+    NULL, NULL, &cfg_look_nicklist, NULL, config_change_buffers },
  { "look_nicklist_position", N_("nicklist position"),
    N_("nicklist position (top, left, right (default), bottom)"),
    OPTION_TYPE_INT_WITH_STRING, 0, 0, 0,
-    "right", cfg_look_nicklist_position_values, &cfg_look_nicklist_position, NULL, config_change_windows },
+    "right", cfg_look_nicklist_position_values, &cfg_look_nicklist_position, NULL, config_change_buffers },
  { "look_nicklist_min_size", N_("min size for nicklist"),
    N_("min size for nicklist (width or height, depending on look_nicklist_position "
    "(0 = no min size))"),
    OPTION_TYPE_INT, 0, 100, 0,
-    NULL, NULL, &cfg_look_nicklist_min_size, NULL, config_change_windows },
+    NULL, NULL, &cfg_look_nicklist_min_size, NULL, config_change_buffers },
  { "look_nicklist_max_size", N_("max size for nicklist"),
    N_("max size for nicklist (width or height, depending on look_nicklist_position "
    "(0 = no max size; if min == max and > 0, then size is fixed))"),
    OPTION_TYPE_INT, 0, 100, 0,
-    NULL, NULL, &cfg_look_nicklist_max_size, NULL, config_change_windows },
+    NULL, NULL, &cfg_look_nicklist_max_size, NULL, config_change_buffers },
  { "look_no_nickname", N_("text to display instead of nick when not connected"),
    N_("text to display instead of nick when not connected"),
    OPTION_TYPE_STRING, 0, 0, 0,
-    "-cmd-", NULL, NULL, &cfg_look_no_nickname, config_change_window_content },
+    "-cmd-", NULL, NULL, &cfg_look_no_nickname, config_change_buffer_content },
  { "look_nickmode", N_("display nick mode ((half)op/voice) before each nick"),
    N_("display nick mode ((half)op/voice) before each nick"),
    OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
-    NULL, NULL, &cfg_look_nickmode, NULL, config_change_windows },
+    NULL, NULL, &cfg_look_nickmode, NULL, config_change_buffers },
  { "look_nickmode_empty", N_("display space if nick mode is not (half)op/voice"),
    N_("display space if nick mode is not (half)op/voice"),
    OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_FALSE,
-    NULL, NULL, &cfg_look_nickmode_empty, NULL, config_change_windows },
+    NULL, NULL, &cfg_look_nickmode_empty, NULL, config_change_buffers },
  { "look_nick_completor", N_("the string inserted after nick completion"),
    N_("the string inserted after nick completion"),
    OPTION_TYPE_STRING, 0, 0, 0,
    ":", NULL, NULL, &cfg_look_completor, config_change_noop },
+  { "look_display_away", N_("display message to all channels when away"),
+    N_("display message to all channels when (un)marking as away"),
+    OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
+    NULL, NULL, &cfg_look_display_away, NULL, config_change_noop },
  { "look_infobar", N_("enable info bar"),
    N_("enable info bar"),
    OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
-    NULL, NULL, &cfg_look_infobar, NULL, config_change_windows },
+    NULL, NULL, &cfg_look_infobar, NULL, config_change_buffers },
  { "look_infobar_timestamp", N_("timestamp for time in infobar"),
    N_("timestamp for time in infobar"),
    OPTION_TYPE_STRING, 0, 0, 0,
-    "%B, %A %d %G - %H:%M", NULL, NULL, &cfg_look_infobar_timestamp, config_change_window_content },
+    "%B, %A %d %Y - %H:%M", NULL, NULL, &cfg_look_infobar_timestamp, config_change_buffer_content },
  { "look_infobar_delay_highlight", N_("delay (in seconds) for highlight messages in infobar"),
    N_("delay (in seconds) for highlight messages in infobar "
    "(0 = disable highlight notifications in infobar)"),
@@ -172,8 +177,9 @@ int cfg_col_chat_dark;
 int cfg_col_chat_highlight;
 int cfg_col_chat_bg;
 int cfg_col_status;
-int cfg_col_status_active;
+int cfg_col_status_delimiters;
 int cfg_col_status_data_msg;
+int cfg_col_status_data_highlight;
 int cfg_col_status_data_other;
 int cfg_col_status_more;
 int cfg_col_status_bg;
@@ -192,6 +198,13 @@ int cfg_col_nick_sep;
 int cfg_col_nick_self;
 int cfg_col_nick_private;
 int cfg_col_nick_bg;
+int cfg_col_dcc_selected;
+int cfg_col_dcc_waiting;
+int cfg_col_dcc_connecting;
+int cfg_col_dcc_active;
+int cfg_col_dcc_done;
+int cfg_col_dcc_failed;
+int cfg_col_dcc_aborted;

 t_config_option weechat_options_colors[] =
 { /* title window */
@@ -255,18 +268,22 @@ t_config_option weechat_options_colors[] =
    N_("color for status bar"),
    OPTION_TYPE_COLOR, 0, 0, 0,
    "gray", NULL, &cfg_col_status, NULL, &config_change_color },
-  { "col_status_active", N_("color for active window"),
-    N_("color for active window (status bar)"),
+  { "col_status_delimiters", N_("color for status bar delimiters"),
+    N_("color for status bar delimiters"),
    OPTION_TYPE_COLOR, 0, 0, 0,
-    "yellow", NULL, &cfg_col_status_active, NULL, &config_change_color },
+    "cyan", NULL, &cfg_col_status_delimiters, NULL, &config_change_color },
  { "col_status_data_msg", N_("color for window with new messages"),
    N_("color for window with new messages (status bar)"),
    OPTION_TYPE_COLOR, 0, 0, 0,
-    "lightred", NULL, &cfg_col_status_data_msg, NULL, &config_change_color },
+    "yellow", NULL, &cfg_col_status_data_msg, NULL, &config_change_color },
+  { "col_status_highlight", N_("color for window with highlight"),
+    N_("color for window with highlight (status bar)"),
+    OPTION_TYPE_COLOR, 0, 0, 0,
+    "lightmagenta", NULL, &cfg_col_status_data_highlight, NULL, &config_change_color },
  { "col_status_data_other", N_("color for window with new data (not messages)"),
    N_("color for window with new data (not messages) (status bar)"),
    OPTION_TYPE_COLOR, 0, 0, 0,
-    "lightmagenta", NULL, &cfg_col_status_data_other, NULL, &config_change_color },
+    "gray", NULL, &cfg_col_status_data_other, NULL, &config_change_color },
  { "col_status_more", N_("color for \"*MORE*\" text"),
    N_("color for window with new data (status bar)"),
    OPTION_TYPE_COLOR, 0, 0, 0,
@@ -342,6 +359,36 @@ t_config_option weechat_options_colors[] =
    OPTION_TYPE_COLOR, 0, 0, 0,
    "default", NULL, &cfg_col_nick_bg, NULL, &config_change_color },
  
+  /* DCC */
+  { "col_chat_dcc_selected", N_("color for selected DCC"),
+    N_("color for selected DCC (chat window)"),
+    OPTION_TYPE_COLOR, 0, 0, 0,
+    "white", NULL, &cfg_col_dcc_selected, NULL, &config_change_color },
+  { "col_dcc_waiting", N_("color for \"waiting\" dcc status"),
+    N_("color for \"waiting\" dcc status"),
+    OPTION_TYPE_COLOR, 0, 0, 0,
+    "white", NULL, &cfg_col_dcc_waiting, NULL, &config_change_color },
+  { "col_dcc_connecting", N_("color for \"connecting\" dcc status"),
+    N_("color for \"connecting\" dcc status"),
+    OPTION_TYPE_COLOR, 0, 0, 0,
+    "yellow", NULL, &cfg_col_dcc_connecting, NULL, &config_change_color },
+  { "col_dcc_active", N_("color for \"active\" dcc status"),
+    N_("color for \"active\" dcc status"),
+    OPTION_TYPE_COLOR, 0, 0, 0,
+    "lightblue", NULL, &cfg_col_dcc_active, NULL, &config_change_color },
+  { "col_dcc_done", N_("color for \"done\" dcc status"),
+    N_("color for \"done\" dcc status"),
+    OPTION_TYPE_COLOR, 0, 0, 0,
+    "lightgreen", NULL, &cfg_col_dcc_done, NULL, &config_change_color },
+  { "col_dcc_failed", N_("color for \"failed\" dcc status"),
+    N_("color for \"failed\" dcc status"),
+    OPTION_TYPE_COLOR, 0, 0, 0,
+    "lightred", NULL, &cfg_col_dcc_failed, NULL, &config_change_color },
+  { "col_dcc_aborted", N_("color for \"aborted\" dcc status"),
+    N_("color for \"aborted\" dcc status"),
+    OPTION_TYPE_COLOR, 0, 0, 0,
+    "lightred", NULL, &cfg_col_dcc_aborted, NULL, &config_change_color },
+  
  { NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL }
 };

@@ -365,19 +412,22 @@ t_config_option weechat_options_history[] =

 /* config, log section */

-int cfg_log_auto_channels;
+int cfg_log_auto_server;
+int cfg_log_auto_channel;
 int cfg_log_auto_private;
 char *cfg_log_path;
-char *cfg_log_name;
 char *cfg_log_timestamp;
-char *cfg_log_start_string;
-char *cfg_log_end_string;
+int cfg_log_hide_nickserv_pwd;

 t_config_option weechat_options_log[] =
-{ { "log_auto_channels", N_("automatically log channel chats"),
+{ { "log_auto_server", N_("automatically log server messages"),
+    N_("automatically log server messages"),
+    OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
+    NULL, NULL, &cfg_log_auto_server, NULL, NULL },
+  { "log_auto_channel", N_("automatically log channel chats"),
    N_("automatically log channel chats"),
    OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
-    NULL, NULL, &cfg_log_auto_channels, NULL, NULL },
+    NULL, NULL, &cfg_log_auto_channel, NULL, NULL },
  { "log_auto_private", N_("automatically log private chats"),
    N_("automatically log private chats"),
    OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
@@ -386,34 +436,23 @@ t_config_option weechat_options_log[] =
    N_("path for WeeChat log files"),
    OPTION_TYPE_STRING, 0, 0, 0,
    "~/.weechat/logs/", NULL, NULL, &cfg_log_path, NULL },
-  { "log_name", N_("name for log files"),
-    N_("name for log files (%S == irc server name, "
-    "%N == channel name (or nickname if private chat)"),
-    OPTION_TYPE_STRING, 0, 0, 0,
-    "%S,%N.weechatlog", NULL, NULL, &cfg_log_name, NULL },
  { "log_timestamp", N_("timestamp for log"),
    N_("timestamp for log (see man strftime for date/time specifiers)"),
    OPTION_TYPE_STRING, 0, 0, 0,
-    "~", NULL, NULL, &cfg_log_timestamp, NULL },
-  { "log_start_string", N_("start string for log files"),
-    N_("text written when starting new log file "
-    "(see man strftime for date/time specifiers)"),
-    OPTION_TYPE_STRING, 0, 0, 0,
-    "--- Log started %a %b %d %Y %H:%M:%s", NULL, NULL, &cfg_log_start_string, NULL },
-  { "log_end_string", N_("end string for log files"),
-    N_("text written when ending log file "
-    "(see man strftime for date/time specifiers)"),
-    OPTION_TYPE_STRING, 0, 0, 0,
-    "--- Log ended %a %b %d %Y %H:%M:%s", NULL, NULL, &cfg_log_end_string, NULL },
+    "%Y %b %d %H:%M:%S", NULL, NULL, &cfg_log_timestamp, NULL },
+  { "log_hide_nickserv_pwd", N_("hide password displayed by nickserv"),
+    N_("hide password displayed by nickserv"),
+    OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
+    NULL, NULL, &cfg_log_hide_nickserv_pwd, NULL, NULL },
  { NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL }
 };

 /* config, dcc section */

 int cfg_dcc_auto_accept_files;
-int cfg_dcc_auto_accept_max_size;
 int cfg_dcc_auto_accept_chats;
 int cfg_dcc_timeout;
+int cfg_dcc_blocksize;
 char *cfg_dcc_download_path;
 char *cfg_dcc_upload_path;
 int cfg_dcc_auto_rename;
@@ -422,36 +461,36 @@ int cfg_dcc_auto_resume;
 t_config_option weechat_options_dcc[] =
 { { "dcc_auto_accept_files", N_("automatically accept dcc files"),
    N_("automatically accept incoming dcc files"),
-    OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
-    NULL, NULL, &cfg_dcc_auto_accept_files, NULL, NULL },
-  { "dcc_auto_accept_max_size", N_("max size when auto accepting file"),
-    N_("maximum size for incoming file when automatically accepted"),
-    OPTION_TYPE_INT, 0, INT_MAX, 0,
-    NULL, NULL, &cfg_dcc_auto_accept_max_size, NULL, NULL },
+    OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_FALSE,
+    NULL, NULL, &cfg_dcc_auto_accept_files, NULL, config_change_noop },
  { "dcc_auto_accept_chats", N_("automatically accept dcc chats"),
    N_("automatically accept dcc chats (use carefully!)"),
    OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
-    NULL, NULL, &cfg_dcc_auto_accept_chats, NULL, NULL },
+    NULL, NULL, &cfg_dcc_auto_accept_chats, NULL, config_change_noop },
  { "dcc_timeout", N_("timeout for dcc request"),
    N_("timeout for dcc request (in seconds)"),
    OPTION_TYPE_INT, 1, INT_MAX, 300,
-    NULL, NULL, &cfg_dcc_timeout, NULL, NULL },
+    NULL, NULL, &cfg_dcc_timeout, NULL, config_change_noop },
+  { "dcc_blocksize", N_("block size for dcc packets"),
+    N_("block size for dcc packets in bytes (default: 1024)"),
+    OPTION_TYPE_INT, 1024, 102400, 1024,
+    NULL, NULL, &cfg_dcc_blocksize, NULL, config_change_noop },
  { "dcc_download_path", N_("path for incoming files with dcc"),
    N_("path for writing incoming files with dcc (default: user home)"),
    OPTION_TYPE_STRING, 0, 0, 0,
-    "~", NULL, NULL, &cfg_dcc_download_path, NULL },
+    "~", NULL, NULL, &cfg_dcc_download_path, config_change_noop },
  { "dcc_upload_path", N_("default path for sending files with dcc"),
    N_("path for reading files when sending thru dcc (when no path is specified)"),
    OPTION_TYPE_STRING, 0, 0, 0, "~",
-    NULL, NULL, &cfg_dcc_upload_path, NULL },
+    NULL, NULL, &cfg_dcc_upload_path, config_change_noop },
  { "dcc_auto_rename", N_("automatically rename dcc files if already exists"),
    N_("rename incoming files if already exists (add '.1', '.2', ...)"),
    OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
-    NULL, NULL, &cfg_dcc_auto_rename, NULL, NULL },
+    NULL, NULL, &cfg_dcc_auto_rename, NULL, config_change_noop },
  { "dcc_auto_resume", N_("automatically resume aborted transfers"),
    N_("automatically resume dcc transfer if connection with remote host is loosed"),
    OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
-    NULL, NULL, &cfg_dcc_auto_resume, NULL, NULL },
+    NULL, NULL, &cfg_dcc_auto_resume, NULL, config_change_noop },
  { NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL }
 };

@@ -495,6 +534,14 @@ t_config_option weechat_options_server[] =
    N_("automatically connect to server when WeeChat is starting"),
    OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
    NULL, NULL, &(cfg_server.autoconnect), NULL, NULL },
+  { "server_autoreconnect", N_("automatically reconnect to server"),
+    N_("automatically reconnect to server when disconnected"),
+    OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
+    NULL, NULL, &(cfg_server.autoreconnect), NULL, NULL },
+  { "server_autoreconnect_delay", N_("delay before trying again to reconnect"),
+    N_("delay (in deconds) before trying again to reconnect to server"),
+    OPTION_TYPE_INT, 0, 65535, 30,
+    NULL, NULL, &(cfg_server.autoreconnect_delay), NULL, NULL },
  { "server_address", N_("server address or hostname"),
    N_("IP address or hostname of IRC server"),
    OPTION_TYPE_STRING, 0, 0, 0,
@@ -531,10 +578,18 @@ t_config_option weechat_options_server[] =
    N_("first command to run when connected to server"),
    OPTION_TYPE_STRING, 0, 0, 0,
    "", NULL, NULL, &(cfg_server.command), NULL },
+  { "server_command_delay", N_("delay (in seconds) after command was executed"),
+    N_("delay (in seconds) after command was executed (example: give some time for authentication)"),
+    OPTION_TYPE_INT, 0, 3600, 1,
+    NULL, NULL, &(cfg_server.command_delay), NULL, NULL },
  { "server_autojoin", N_("list of channels to join when connected to server"),
    N_("comma separated list of channels to join when connected to server"),
    OPTION_TYPE_STRING, 0, 0, 0,
    "", NULL, NULL, &(cfg_server.autojoin), NULL },
+  { "server_autorejoin", N_("automatically rejoin channels when kicked"),
+    N_("automatically rejoin channels when kicked"),
+    OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
+    NULL, NULL, &(cfg_server.autorejoin), NULL, NULL },
  { NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL }
 };

@@ -615,24 +670,24 @@ config_change_title ()
 }

 /*
- * config_change_windows: called when windows change (for example nicklist)
+ * config_change_buffers: called when buffers change (for example nicklist)
 */

 void
-config_change_windows ()
+config_change_buffers ()
 {
-    gui_switch_to_window (gui_current_window);
-    gui_redraw_window (gui_current_window);
+    gui_switch_to_buffer (gui_current_window, gui_current_window->buffer);
+    gui_redraw_buffer (gui_current_window->buffer);
 }

 /*
- * config_change_window_content: called when content of a window changes
+ * config_change_buffer_content: called when content of a buffer changes
 */

 void
-config_change_window_content ()
+config_change_buffer_content ()
 {
-    gui_redraw_window (gui_current_window);
+    gui_redraw_buffer (gui_current_window->buffer);
 }

 /*
@@ -768,10 +823,12 @@ config_allocate_server (char *filename, int line_number)
        return 0;
    }
    if (!server_new (cfg_server.name,
-        cfg_server.autoconnect, 0, cfg_server.address, cfg_server.port,
+        cfg_server.autoconnect, cfg_server.autoreconnect,
+        cfg_server.autoreconnect_delay, 0, cfg_server.address, cfg_server.port,
        cfg_server.password, cfg_server.nick1, cfg_server.nick2,
        cfg_server.nick3, cfg_server.username, cfg_server.realname,
-        cfg_server.command, cfg_server.autojoin))
+        cfg_server.command, cfg_server.command_delay, cfg_server.autojoin,
+        cfg_server.autorejoin))
    {
        server_free_all ();
        gui_printf (NULL,
@@ -947,7 +1004,7 @@ config_read ()
                        if (section == CONFIG_SECTION_ALIAS)
                        {
                            if (alias_new (line, pos))
-                                index_command_new (pos);
+                                index_command_new (line);
                        }
                        else
                        {
@@ -1132,6 +1189,7 @@ config_create_default ()
    fprintf (file, "SIGNOFF=quit\n");
    fprintf (file, "C=clear\n");
    fprintf (file, "CL=clear\n");
+    fprintf (file, "CLOSE=buffer close\n");
    fprintf (file, "# CHAT=dcc chat\n");
    fprintf (file, "# GET=dcc get\n");
    fprintf (file, "# IG=ignore\n");
@@ -1201,6 +1259,7 @@ config_create_default ()
    
    fprintf (file, "server_command=\n");
    fprintf (file, "server_autojoin=\n");
+    fprintf (file, "server_autorejoin=on\n");
    
    fclose (file);
    free (filename);
@@ -1258,8 +1317,7 @@ config_write (char *config_name)
        if ((i != CONFIG_SECTION_ALIAS) && (i != CONFIG_SECTION_SERVER))
        {
            fprintf (file, "\n[%s]\n", config_sections[i].section_name);
-            if ((i == CONFIG_SECTION_HISTORY) || (i == CONFIG_SECTION_LOG) ||
-                (i == CONFIG_SECTION_DCC) || (i == CONFIG_SECTION_PROXY))
+            if (i == CONFIG_SECTION_PROXY)
                fprintf (file,
                         "# WARNING!!! Options for section \"%s\" are not developed!\n",
                         config_sections[i].section_name);
@@ -1326,6 +1384,10 @@ config_write (char *config_name)
            fprintf (file, "server_name=%s\n", ptr_server->name);
            fprintf (file, "server_autoconnect=%s\n",
                     (ptr_server->autoconnect) ? "on" : "off");
+            fprintf (file, "server_autoreconnect=%s\n",
+                     (ptr_server->autoreconnect) ? "on" : "off");
+            fprintf (file, "server_autoreconnect_delay=%d\n",
+                     ptr_server->autoreconnect_delay);
            fprintf (file, "server_address=%s\n", ptr_server->address);
            fprintf (file, "server_port=%d\n", ptr_server->port);
            fprintf (file, "server_password=%s\n",
@@ -1337,8 +1399,11 @@ config_write (char *config_name)
            fprintf (file, "server_realname=%s\n", ptr_server->realname);
            fprintf (file, "server_command=%s\n",
                     (ptr_server->command) ? ptr_server->command : "");
+            fprintf (file, "server_command_delay=%d\n", ptr_server->command_delay);
            fprintf (file, "server_autojoin=%s\n",
                     (ptr_server->autojoin) ? ptr_server->autojoin : "");
+            fprintf (file, "server_autorejoin=%s\n",
+                     (ptr_server->autorejoin) ? "on" : "off");
        }
    }
    
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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
@@ -88,6 +88,7 @@ extern int cfg_look_nickmode;
 extern int cfg_look_nickmode_empty;
 extern char *cfg_look_no_nickname;
 extern char *cfg_look_completor;
+extern int cfg_look_display_away;
 extern int cfg_look_infobar;
 extern char *cfg_look_infobar_timestamp;
 extern int cfg_look_infobar_delay_highlight;
@@ -106,8 +107,9 @@ extern int cfg_col_chat_dark;
 extern int cfg_col_chat_highlight;
 extern int cfg_col_chat_bg;
 extern int cfg_col_status;
-extern int cfg_col_status_active;
+extern int cfg_col_status_delimiters;
 extern int cfg_col_status_data_msg;
+extern int cfg_col_status_data_highlight;
 extern int cfg_col_status_data_other;
 extern int cfg_col_status_more;
 extern int cfg_col_status_bg;
@@ -126,22 +128,28 @@ extern int cfg_col_nick_sep;
 extern int cfg_col_nick_self;
 extern int cfg_col_nick_private;
 extern int cfg_col_nick_bg;
+extern int cfg_col_dcc_selected;
+extern int cfg_col_dcc_waiting;
+extern int cfg_col_dcc_connecting;
+extern int cfg_col_dcc_active;
+extern int cfg_col_dcc_done;
+extern int cfg_col_dcc_failed;
+extern int cfg_col_dcc_aborted;

 extern int cfg_history_max_lines;
 extern int cfg_history_max_commands;

-extern int cfg_log_auto_channels;
+extern int cfg_log_auto_server;
+extern int cfg_log_auto_channel;
 extern int cfg_log_auto_private;
 extern char *cfg_log_path;
-extern char *cfg_log_name;
 extern char *cfg_log_timestamp;
-extern char *cfg_log_start_string;
-extern char *cfg_log_end_string;
+extern int cfg_log_hide_nickserv_pwd;

 extern int cfg_dcc_auto_accept_files;
-extern int cfg_dcc_auto_accept_max_size;
 extern int cfg_dcc_auto_accept_chats;
 extern int cfg_dcc_timeout;
+extern int cfg_dcc_blocksize;
 extern char *cfg_dcc_download_path;
 extern char *cfg_dcc_upload_path;
 extern int cfg_dcc_auto_rename;
@@ -158,8 +166,8 @@ extern t_config_option * weechat_options [CONFIG_NUMBER_SECTIONS];
 extern char *config_get_section ();
 extern void config_change_noop ();
 extern void config_change_title ();
-extern void config_change_windows ();
-extern void config_change_window_content ();
+extern void config_change_buffers ();
+extern void config_change_buffer_content ();
 extern void config_change_color ();
 extern int config_option_set_value (t_config_option *, char *);
 extern t_config_option *config_option_search (char *);
@@ -1,4 +1,4 @@
-# Copyright (c) 2004 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2005 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
@@ -1,4 +1,4 @@
-# Copyright (c) 2004 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2005 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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
@@ -37,6 +37,7 @@
 #include "../gui.h"
 #include "../../common/weeconfig.h"
 #include "../../common/command.h"
+#include "../../common/hotlist.h"
 #include "../../irc/irc.h"

 #define KEY_ESCAPE 27
@@ -49,8 +50,10 @@ void
 gui_read_keyb ()
 {
    int key, i;
-    t_gui_window *ptr_window;
+    t_gui_buffer *ptr_buffer;
+    t_irc_server *ptr_server;
    char new_char[2];
+    t_dcc *dcc_selected;

    key = getch ();
    if (key != ERR)
@@ -59,15 +62,29 @@ gui_read_keyb ()
        {
            /* resize event */
            case KEY_RESIZE:
-                gui_redraw_window (gui_current_window);
+                gui_curses_resize_handler ();
                break;
-            /* previous window */
+            /* inactive function keys */
+            case KEY_F(1):
+            case KEY_F(2):
+            case KEY_F(3):
+            case KEY_F(4):
+            case KEY_F(5):
+            case KEY_F(9):
+            case KEY_F(11):
+            case KEY_F(12):
+                break;
+            /* previous buffer in window */
            case KEY_F(6):
-                gui_switch_to_previous_window ();
+                gui_switch_to_previous_buffer (gui_current_window);
+                break;
+            /* next buffer in window */
+            case KEY_F(7):
+                gui_switch_to_next_buffer (gui_current_window);
                break;
            /* next window */
-            case KEY_F(7):
-                gui_switch_to_next_window ();
+            case KEY_F(8):
+                gui_switch_to_next_window (gui_current_window);
                break;
            /* remove last infobar message */
            case KEY_F(10):
@@ -75,218 +92,309 @@ gui_read_keyb ()
                break;
            /* cursor up */
            case KEY_UP:
-                if (gui_current_window->ptr_history)
+                if (gui_current_window->buffer->dcc)
                {
-                    gui_current_window->ptr_history =
-                        gui_current_window->ptr_history->next_history;
-                    if (!gui_current_window->ptr_history)
-                        gui_current_window->ptr_history =
-                            gui_current_window->history;
+                    if (dcc_list)
+                    {
+                        if (gui_current_window->dcc_selected
+                            && ((t_dcc *)(gui_current_window->dcc_selected))->prev_dcc)
+                        {
+                            if (gui_current_window->dcc_selected ==
+                                gui_current_window->dcc_first)
+                                gui_current_window->dcc_first =
+                                    ((t_dcc *)(gui_current_window->dcc_first))->prev_dcc;
+                            gui_current_window->dcc_selected =
+                                ((t_dcc *)(gui_current_window->dcc_selected))->prev_dcc;
+                            gui_draw_buffer_chat (gui_current_window->buffer, 1);
+                            gui_draw_buffer_input (gui_current_window->buffer, 1);
+                        }
+                    }
                }
                else
-                    gui_current_window->ptr_history =
-                        gui_current_window->history;
-                if (gui_current_window->ptr_history)
                {
-                    gui_current_window->input_buffer_size =
-                        strlen (gui_current_window->ptr_history->text);
-                    gui_optimize_input_buffer_size (gui_current_window);
-                    gui_current_window->input_buffer_pos =
-                        gui_current_window->input_buffer_size;
-                    strcpy (gui_current_window->input_buffer,
-                        gui_current_window->ptr_history->text);
-                    gui_draw_window_input (gui_current_window);
+                    if (gui_current_window->buffer->ptr_history)
+                    {
+                        gui_current_window->buffer->ptr_history =
+                            gui_current_window->buffer->ptr_history->next_history;
+                        if (!gui_current_window->buffer->ptr_history)
+                            gui_current_window->buffer->ptr_history =
+                                gui_current_window->buffer->history;
+                    }
+                    else
+                        gui_current_window->buffer->ptr_history =
+                            gui_current_window->buffer->history;
+                    if (gui_current_window->buffer->ptr_history)
+                    {
+                        gui_current_window->buffer->input_buffer_size =
+                            strlen (gui_current_window->buffer->ptr_history->text);
+                        gui_optimize_input_buffer_size (gui_current_window->buffer);
+                        gui_current_window->buffer->input_buffer_pos =
+                            gui_current_window->buffer->input_buffer_size;
+                        strcpy (gui_current_window->buffer->input_buffer,
+                            gui_current_window->buffer->ptr_history->text);
+                        gui_draw_buffer_input (gui_current_window->buffer, 0);
+                    }
                }
                break;
            /* cursor down */
            case KEY_DOWN:
-                if (gui_current_window->ptr_history)
+                if (gui_current_window->buffer->dcc)
                {
-                    gui_current_window->ptr_history =
-                        gui_current_window->ptr_history->prev_history;
-                    if (gui_current_window->ptr_history)
-                        gui_current_window->input_buffer_size =
-                            strlen (gui_current_window->ptr_history->text);
-                    else
-                        gui_current_window->input_buffer_size = 0;
-                    gui_optimize_input_buffer_size (gui_current_window);
-                    gui_current_window->input_buffer_pos =
-                        gui_current_window->input_buffer_size;
-                    if (gui_current_window->ptr_history)
-                        strcpy (gui_current_window->input_buffer,
-                            gui_current_window->ptr_history->text);
-                    gui_draw_window_input (gui_current_window);
+                    if (dcc_list)
+                    {
+                        if (!gui_current_window->dcc_selected
+                            || ((t_dcc *)(gui_current_window->dcc_selected))->next_dcc)
+                        {
+                            if (gui_current_window->dcc_last_displayed
+                                && (gui_current_window->dcc_selected ==
+                                    gui_current_window->dcc_last_displayed))
+                            {
+                                if (gui_current_window->dcc_first)
+                                    gui_current_window->dcc_first =
+                                        ((t_dcc *)(gui_current_window->dcc_first))->next_dcc;
+                                else
+                                    gui_current_window->dcc_first =
+                                        dcc_list->next_dcc;
+                            }
+                            if (gui_current_window->dcc_selected)
+                                gui_current_window->dcc_selected =
+                                    ((t_dcc *)(gui_current_window->dcc_selected))->next_dcc;
+                            else
+                                gui_current_window->dcc_selected =
+                                    dcc_list->next_dcc;
+                            gui_draw_buffer_chat (gui_current_window->buffer, 1);
+                            gui_draw_buffer_input (gui_current_window->buffer, 1);
+                        }
+                    }
+                }
+                else
+                {
+                    if (gui_current_window->buffer->ptr_history)
+                    {
+                        gui_current_window->buffer->ptr_history =
+                            gui_current_window->buffer->ptr_history->prev_history;
+                        if (gui_current_window->buffer->ptr_history)
+                            gui_current_window->buffer->input_buffer_size =
+                                strlen (gui_current_window->buffer->ptr_history->text);
+                        else
+                            gui_current_window->buffer->input_buffer_size = 0;
+                        gui_optimize_input_buffer_size (gui_current_window->buffer);
+                        gui_current_window->buffer->input_buffer_pos =
+                            gui_current_window->buffer->input_buffer_size;
+                        if (gui_current_window->buffer->ptr_history)
+                            strcpy (gui_current_window->buffer->input_buffer,
+                                gui_current_window->buffer->ptr_history->text);
+                        gui_draw_buffer_input (gui_current_window->buffer, 0);
+                    }
                }
                break;
            /* cursor left */
            case KEY_LEFT:
-                if (gui_current_window->input_buffer_pos > 0)
+                if (!gui_current_window->buffer->dcc)
                {
-                    gui_current_window->input_buffer_pos--;
-                    gui_draw_window_input (gui_current_window);
+                    if (gui_current_window->buffer->input_buffer_pos > 0)
+                    {
+                        gui_current_window->buffer->input_buffer_pos--;
+                        gui_draw_buffer_input (gui_current_window->buffer, 0);
+                    }
                }
                break;
            /* cursor right */
            case KEY_RIGHT:
-                if (gui_current_window->input_buffer_pos <
-                    gui_current_window->input_buffer_size)
+                if (!gui_current_window->buffer->dcc)
                {
-                    gui_current_window->input_buffer_pos++;
-                    gui_draw_window_input (gui_current_window);
+                    if (gui_current_window->buffer->input_buffer_pos <
+                        gui_current_window->buffer->input_buffer_size)
+                    {
+                        gui_current_window->buffer->input_buffer_pos++;
+                        gui_draw_buffer_input (gui_current_window->buffer, 0);
+                    }
                }
                break;
-            /* home key */
+            /* home key or Control + A */
            case KEY_HOME:
-                if (gui_current_window->input_buffer_pos > 0)
+            case 0x01:
+                if (!gui_current_window->buffer->dcc)
                {
-                    gui_current_window->input_buffer_pos = 0;
-                    gui_draw_window_input (gui_current_window);
+                    if (gui_current_window->buffer->input_buffer_pos > 0)
+                    {
+                        gui_current_window->buffer->input_buffer_pos = 0;
+                        gui_draw_buffer_input (gui_current_window->buffer, 0);
+                    }
                }
                break;
-            /* end key */
+            /* end key or Control + E */
            case KEY_END:
-                if (gui_current_window->input_buffer_pos <
-                    gui_current_window->input_buffer_size)
+            case 0x05:
+                if (!gui_current_window->buffer->dcc)
                {
-                    gui_current_window->input_buffer_pos =
-                        gui_current_window->input_buffer_size;
-                    gui_draw_window_input (gui_current_window);
+                    if (gui_current_window->buffer->input_buffer_pos <
+                        gui_current_window->buffer->input_buffer_size)
+                    {
+                        gui_current_window->buffer->input_buffer_pos =
+                            gui_current_window->buffer->input_buffer_size;
+                        gui_draw_buffer_input (gui_current_window->buffer, 0);
+                    }
                }
                break;
            /* page up */
            case KEY_PPAGE:
-                gui_move_page_up ();
+                if (!gui_current_window->buffer->dcc)
+                    gui_move_page_up (gui_current_window);
                break;
            /* page down */
            case KEY_NPAGE:
-                gui_move_page_down ();
+                if (!gui_current_window->buffer->dcc)
+                    gui_move_page_down (gui_current_window);
                break;
            /* erase before cursor and move cursor to the left */
            case 127:
            case KEY_BACKSPACE:
-                if (gui_current_window->input_buffer_pos > 0)
+                if (!gui_current_window->buffer->dcc)
                {
-                    i = gui_current_window->input_buffer_pos-1;
-                    while (gui_current_window->input_buffer[i])
+                    if (gui_current_window->buffer->input_buffer_pos > 0)
                    {
-                        gui_current_window->input_buffer[i] =
-                            gui_current_window->input_buffer[i+1];
-                        i++;
+                        i = gui_current_window->buffer->input_buffer_pos-1;
+                        while (gui_current_window->buffer->input_buffer[i])
+                        {
+                            gui_current_window->buffer->input_buffer[i] =
+                                gui_current_window->buffer->input_buffer[i+1];
+                            i++;
+                        }
+                        gui_current_window->buffer->input_buffer_size--;
+                        gui_current_window->buffer->input_buffer_pos--;
+                        gui_current_window->buffer->input_buffer[gui_current_window->buffer->input_buffer_size] = '\0';
+                        gui_draw_buffer_input (gui_current_window->buffer, 0);
+                        gui_optimize_input_buffer_size (gui_current_window->buffer);
+                        gui_current_window->buffer->completion.position = -1;
                    }
-                    gui_current_window->input_buffer_size--;
-                    gui_current_window->input_buffer_pos--;
-                    gui_current_window->input_buffer[gui_current_window->input_buffer_size] = '\0';
-                    gui_draw_window_input (gui_current_window);
-                    gui_optimize_input_buffer_size (gui_current_window);
-                    gui_current_window->completion.position = -1;
                }
                break;
-            /* Control + Backspace */
+            /* Control + Backspace or Control + W */
            case 0x08:
-                gui_delete_previous_word ();
+            case 0x17:
+                if (!gui_current_window->buffer->dcc)    
+                    gui_delete_previous_word (gui_current_window->buffer);
+                break;
+            /* Control + L */
+            case 0x0C:
+                gui_curses_resize_handler ();
                break;
            /* erase char under cursor */
            case KEY_DC:
-                if (gui_current_window->input_buffer_pos <
-                    gui_current_window->input_buffer_size)
+                if (!gui_current_window->buffer->dcc)
                {
-                    i = gui_current_window->input_buffer_pos;
-                    while (gui_current_window->input_buffer[i])
+                    if (gui_current_window->buffer->input_buffer_pos <
+                        gui_current_window->buffer->input_buffer_size)
                    {
-                        gui_current_window->input_buffer[i] =
-                            gui_current_window->input_buffer[i+1];
-                        i++;
+                        i = gui_current_window->buffer->input_buffer_pos;
+                        while (gui_current_window->buffer->input_buffer[i])
+                        {
+                            gui_current_window->buffer->input_buffer[i] =
+                                gui_current_window->buffer->input_buffer[i+1];
+                            i++;
+                        }
+                        gui_current_window->buffer->input_buffer_size--;
+                        gui_current_window->buffer->input_buffer[gui_current_window->buffer->input_buffer_size] = '\0';
+                        gui_draw_buffer_input (gui_current_window->buffer, 0);
+                        gui_optimize_input_buffer_size (gui_current_window->buffer);
+                        gui_current_window->buffer->completion.position = -1;
                    }
-                    gui_current_window->input_buffer_size--;
-                    gui_current_window->input_buffer[gui_current_window->input_buffer_size] = '\0';
-                    gui_draw_window_input (gui_current_window);
-                    gui_optimize_input_buffer_size (gui_current_window);
-                    gui_current_window->completion.position = -1;
                }
                break;
            /* Tab : completion */
            case '\t':
-                completion_search (&(gui_current_window->completion),
-                                   CHANNEL(gui_current_window),
-                                   gui_current_window->input_buffer,
-                                   gui_current_window->input_buffer_size,
-                                   gui_current_window->input_buffer_pos);
-                if (gui_current_window->completion.word_found)
+                if (!gui_current_window->buffer->dcc)
                {
-                    // replace word with new completed word into input buffer
-                    gui_current_window->input_buffer_size +=
-                        gui_current_window->completion.diff_size;
-                    gui_optimize_input_buffer_size (gui_current_window);
-                    gui_current_window->input_buffer[gui_current_window->input_buffer_size] = '\0';
-                    
-                    if (gui_current_window->completion.diff_size > 0)
+                    completion_search (&(gui_current_window->buffer->completion),
+                                       CHANNEL(gui_current_window->buffer),
+                                       gui_current_window->buffer->input_buffer,
+                                       gui_current_window->buffer->input_buffer_size,
+                                       gui_current_window->buffer->input_buffer_pos);
+                    if (gui_current_window->buffer->completion.word_found)
                    {
-                        for (i = gui_current_window->input_buffer_size - 1;
-                            i >=  gui_current_window->completion.position_replace +
-                            (int)strlen (gui_current_window->completion.word_found); i--)
-                            gui_current_window->input_buffer[i] =
-                                gui_current_window->input_buffer[i -
-                                gui_current_window->completion.diff_size];
-                    }
-                    else
-                    {
-                        for (i = gui_current_window->completion.position_replace +
-                            strlen (gui_current_window->completion.word_found);
-                            i < gui_current_window->input_buffer_size; i++)
-                            gui_current_window->input_buffer[i] =
-                                gui_current_window->input_buffer[i -
-                                gui_current_window->completion.diff_size];
-                    }
-                    
-                    strncpy (gui_current_window->input_buffer + gui_current_window->completion.position_replace,
-                             gui_current_window->completion.word_found,
-                             strlen (gui_current_window->completion.word_found));
-                    gui_current_window->input_buffer_pos =
-                        gui_current_window->completion.position_replace +
-                        strlen (gui_current_window->completion.word_found);
-                    gui_current_window->completion.position =
-                        gui_current_window->input_buffer_pos;
-                    
-                    /* add space or completor to the end of completion, if needed */
-                    if (gui_current_window->completion.base_word[0] == '/')
-                    {
-                        if (gui_current_window->input_buffer[gui_current_window->input_buffer_pos] != ' ')
-                            gui_buffer_insert_string (" ",
-                                                      gui_current_window->input_buffer_pos);
-                        gui_current_window->completion.position++;
-                        gui_current_window->input_buffer_pos++;
-                    }
-                    else
-                    {
-                        if (gui_current_window->completion.base_word_pos == 0)
+                        /* replace word with new completed word into input buffer */
+                        gui_current_window->buffer->input_buffer_size +=
+                            gui_current_window->buffer->completion.diff_size;
+                        gui_optimize_input_buffer_size (gui_current_window->buffer);
+                        gui_current_window->buffer->input_buffer[gui_current_window->buffer->input_buffer_size] = '\0';
+                        
+                        if (gui_current_window->buffer->completion.diff_size > 0)
                        {
-                            if (strncmp (gui_current_window->input_buffer + gui_current_window->input_buffer_pos,
-                                cfg_look_completor, strlen (cfg_look_completor)) != 0)
-                                gui_buffer_insert_string (cfg_look_completor,
-                                                          gui_current_window->input_buffer_pos);
-                            gui_current_window->completion.position += strlen (cfg_look_completor);
-                            gui_current_window->input_buffer_pos += strlen (cfg_look_completor);
-                            if (gui_current_window->input_buffer[gui_current_window->input_buffer_pos] != ' ')
-                                gui_buffer_insert_string (" ",
-                                                          gui_current_window->input_buffer_pos);
-                            gui_current_window->completion.position++;
-                            gui_current_window->input_buffer_pos++;
+                            for (i = gui_current_window->buffer->input_buffer_size - 1;
+                                i >=  gui_current_window->buffer->completion.position_replace +
+                                (int)strlen (gui_current_window->buffer->completion.word_found); i--)
+                                gui_current_window->buffer->input_buffer[i] =
+                                    gui_current_window->buffer->input_buffer[i -
+                                    gui_current_window->buffer->completion.diff_size];
                        }
+                        else
+                        {
+                            for (i = gui_current_window->buffer->completion.position_replace +
+                                strlen (gui_current_window->buffer->completion.word_found);
+                                i < gui_current_window->buffer->input_buffer_size; i++)
+                                gui_current_window->buffer->input_buffer[i] =
+                                    gui_current_window->buffer->input_buffer[i -
+                                    gui_current_window->buffer->completion.diff_size];
+                        }
+                        
+                        strncpy (gui_current_window->buffer->input_buffer + gui_current_window->buffer->completion.position_replace,
+                                 gui_current_window->buffer->completion.word_found,
+                                 strlen (gui_current_window->buffer->completion.word_found));
+                        gui_current_window->buffer->input_buffer_pos =
+                            gui_current_window->buffer->completion.position_replace +
+                            strlen (gui_current_window->buffer->completion.word_found);
+                        gui_current_window->buffer->completion.position =
+                            gui_current_window->buffer->input_buffer_pos;
+                        
+                        /* add space or completor to the end of completion, if needed */
+                        if (gui_current_window->buffer->completion.base_word[0] == '/')
+                        {
+                            if (gui_current_window->buffer->input_buffer[gui_current_window->buffer->input_buffer_pos] != ' ')
+                                gui_buffer_insert_string (gui_current_window->buffer,
+                                                          " ",
+                                                          gui_current_window->buffer->input_buffer_pos);
+                            gui_current_window->buffer->completion.position++;
+                            gui_current_window->buffer->input_buffer_pos++;
+                        }
+                        else
+                        {
+                            if (gui_current_window->buffer->completion.base_word_pos == 0)
+                            {
+                                if (strncmp (gui_current_window->buffer->input_buffer + gui_current_window->buffer->input_buffer_pos,
+                                    cfg_look_completor, strlen (cfg_look_completor)) != 0)
+                                    gui_buffer_insert_string (gui_current_window->buffer,
+                                                              cfg_look_completor,
+                                                              gui_current_window->buffer->input_buffer_pos);
+                                gui_current_window->buffer->completion.position += strlen (cfg_look_completor);
+                                gui_current_window->buffer->input_buffer_pos += strlen (cfg_look_completor);
+                                if (gui_current_window->buffer->input_buffer[gui_current_window->buffer->input_buffer_pos] != ' ')
+                                    gui_buffer_insert_string (gui_current_window->buffer,
+                                                              " ",
+                                                              gui_current_window->buffer->input_buffer_pos);
+                                gui_current_window->buffer->completion.position++;
+                                gui_current_window->buffer->input_buffer_pos++;
+                            }
+                        }
+                        gui_draw_buffer_input (gui_current_window->buffer, 0);
                    }
-                    gui_draw_window_input (gui_current_window);
                }
                break;
            /* escape code (for control-key) */
            case KEY_ESCAPE:
                if ((key = getch()) != ERR)
                {
+                    /*gui_printf (gui_current_window->buffer,
+                        "[Debug] key pressed = %d, hex = %02X, octal = %o\n", key, key, key);*/
                    switch (key)
                    {
+                        /* Alt + left arrow */
                        case KEY_LEFT:
-                            gui_switch_to_previous_window ();
+                            gui_switch_to_previous_buffer (gui_current_window);
                            break;
+                        /* Alt + right arrow */
                        case KEY_RIGHT:
-                            gui_switch_to_next_window ();
+                            gui_switch_to_next_buffer (gui_current_window);
                            break;
                        case 79:
                            /* TODO: replace 79 by constant name! */
@@ -298,50 +406,207 @@ gui_read_keyb ()
                                    {
                                        /* Control + Right */
                                        case 99:
-                                            gui_move_next_word ();
+                                            if (!gui_current_window->buffer->dcc)    
+                                                gui_move_next_word (gui_current_window->buffer);
                                            break;
                                        /* Control + Left */
                                        case 100:
-                                            gui_move_previous_word ();
+                                            if (!gui_current_window->buffer->dcc)
+                                                gui_move_previous_word (gui_current_window->buffer);
                                            break;
                                    }
                                }
                            }
                            break;
+                        /* Alt-number: jump to window by number */
+                        case 48: /* Alt-0 */
+                        case 49: /* Alt-1 */
+                        case 50: /* Alt-2 */
+                        case 51: /* Alt-3 */
+                        case 52: /* Alt-4 */
+                        case 53: /* Alt-5 */
+                        case 54: /* Alt-6 */
+                        case 55: /* Alt-7 */
+                        case 56: /* Alt-8 */
+                        case 57: /* Alt-9 */
+                            gui_switch_to_buffer_by_number (gui_current_window, (key == 48) ? 10 : key - 48);
+                            break;
+                        /* Alt-A: jump to buffer with activity */
+                        case 'a':
+                        case 'A':
+                            if (hotlist)
+                            {
+                                if (!hotlist_initial_buffer)
+                                    hotlist_initial_buffer = gui_current_window->buffer;
+                                gui_switch_to_buffer (gui_current_window, hotlist->buffer);
+                                gui_redraw_buffer (gui_current_window->buffer);
+                            }
+                            else
+                            {
+                                if (hotlist_initial_buffer)
+                                {
+                                    gui_switch_to_buffer (gui_current_window, hotlist_initial_buffer);
+                                    gui_redraw_buffer (gui_current_window->buffer);
+                                    hotlist_initial_buffer = NULL;
+                                }
+                            }
+                            break;
+                        /* Alt-D: jump to DCC buffer */
+                        case 'd':
+                        case 'D':
+                            if (gui_current_window->buffer->dcc)
+                            {
+                                if (buffer_before_dcc)
+                                {
+                                    gui_switch_to_buffer (gui_current_window,
+                                                          buffer_before_dcc);
+                                    gui_redraw_buffer (gui_current_window->buffer);
+                                }
+                            }
+                            else
+                            {
+                                buffer_before_dcc = gui_current_window->buffer;
+                                gui_switch_to_dcc_buffer ();
+                            }
+                            break;
+                        /* Alt-R: clear hotlist */
+                        case 'r':
+                        case 'R':
+                            if (hotlist)
+                            {
+                                hotlist_free_all ();
+                                gui_redraw_buffer (gui_current_window->buffer);
+                            }
+                            hotlist_initial_buffer = gui_current_window->buffer;
+                            break;
+                        /* Alt-S: jump to server buffer */
+                        case 's':
+                        case 'S':
+                            if (SERVER(gui_current_window->buffer)->buffer !=
+                                gui_current_window->buffer)
+                            {
+                                gui_switch_to_buffer (gui_current_window,
+                                                      SERVER(gui_current_window->buffer)->buffer);
+                                gui_redraw_buffer (gui_current_window->buffer);
+                            }
+                            break;
+                        /* Alt-X: jump to first channel/private of next server */
+                        case 'x':
+                        case 'X':
+                            ptr_server = SERVER(gui_current_window->buffer)->next_server;
+                            if (!ptr_server)
+                                ptr_server = irc_servers;
+                            while (ptr_server != SERVER(gui_current_window->buffer))
+                            {
+                                if (ptr_server->buffer)
+                                    break;
+                                ptr_server = (ptr_server->next_server) ?
+                                             ptr_server->next_server : irc_servers;
+                            }
+                            if (ptr_server != SERVER(gui_current_window->buffer))
+                            {
+                                ptr_buffer = (ptr_server->channels) ?
+                                             ptr_server->channels->buffer : ptr_server->buffer;
+                                gui_switch_to_buffer (gui_current_window, ptr_buffer);
+                                gui_redraw_buffer (gui_current_window->buffer);
+                            }
+                            break;
                    }
                }
                break;
            /* send command/message */
            case '\n':
-                if (gui_current_window->input_buffer_size > 0)
+                if (!gui_current_window->buffer->dcc)    
                {
-                    gui_current_window->input_buffer[gui_current_window->input_buffer_size] = '\0';
-                    history_add (gui_current_window, gui_current_window->input_buffer);
-                    gui_current_window->input_buffer_size = 0;
-                    gui_current_window->input_buffer_pos = 0;
-                    gui_current_window->input_buffer_1st_display = 0;
-                    gui_current_window->completion.position = -1;
-                    gui_current_window->ptr_history = NULL;
-                    ptr_window = gui_current_window;
-                    user_command (SERVER(gui_current_window),
-                                  gui_current_window->input_buffer);
-                    if (ptr_window == gui_current_window)
-                        gui_draw_window_input (ptr_window);
-                    if (ptr_window)
-                        ptr_window->input_buffer[0] = '\0';
+                    if (gui_current_window->buffer->input_buffer_size > 0)
+                    {
+                        gui_current_window->buffer->input_buffer[gui_current_window->buffer->input_buffer_size] = '\0';
+                        history_add (gui_current_window->buffer, gui_current_window->buffer->input_buffer);
+                        gui_current_window->buffer->input_buffer_size = 0;
+                        gui_current_window->buffer->input_buffer_pos = 0;
+                        gui_current_window->buffer->input_buffer_1st_display = 0;
+                        gui_current_window->buffer->completion.position = -1;
+                        gui_current_window->buffer->ptr_history = NULL;
+                        ptr_buffer = gui_current_window->buffer;
+                        user_command (SERVER(gui_current_window->buffer),
+                                      gui_current_window->buffer->input_buffer);
+                        if (ptr_buffer == gui_current_window->buffer)
+                            gui_draw_buffer_input (ptr_buffer, 0);
+                        if (ptr_buffer)
+                            ptr_buffer->input_buffer[0] = '\0';
+                    }
                }
                break;
            /* other key => add to input buffer */
            default:
-                /*gui_printf (gui_current_window,
-                    "[Debug] key pressed = %d, as octal: %o\n", key, key);*/
-                new_char[0] = key;
-                new_char[1] = '\0';
-                gui_buffer_insert_string (new_char,
-                                          gui_current_window->input_buffer_pos);
-                gui_current_window->input_buffer_pos++;
-                gui_draw_window_input (gui_current_window);
-                gui_current_window->completion.position = -1;
+                if (gui_current_window->buffer->dcc)
+                {
+                    dcc_selected = (gui_current_window->dcc_selected) ?
+                        (t_dcc *) gui_current_window->dcc_selected : dcc_list;
+                    switch (key)
+                    {
+                        /* accept DCC */
+                        case 'a':
+                        case 'A':
+                            if (dcc_selected
+                                && (((dcc_selected->type == DCC_CHAT_RECV)
+                                || (dcc_selected->type == DCC_FILE_RECV))
+                                && (dcc_selected->status == DCC_WAITING)))
+                            {
+                                dcc_accept (dcc_selected);
+                            }
+                            break;
+                        /* cancel DCC */
+                        case 'c':
+                        case 'C':
+                            if (dcc_selected
+                                && ((dcc_selected->status == DCC_WAITING)
+                                || (dcc_selected->status == DCC_CONNECTING)
+                                || (dcc_selected->status == DCC_ACTIVE)))
+                            {
+                                dcc_close (dcc_selected, DCC_ABORTED);
+                                gui_redraw_buffer (gui_current_window->buffer);
+                            }
+                            break;
+                        /* close DCC window */
+                        case 'q':
+                        case 'Q':
+                            gui_buffer_free (gui_current_window->buffer, 1);
+                            gui_redraw_buffer (gui_current_window->buffer);
+                            break;
+                        /* remove from DCC list */
+                        case 'r':
+                        case 'R':
+                            if (dcc_selected
+                                && (((dcc_selected->type == DCC_CHAT_RECV)
+                                || (dcc_selected->type == DCC_FILE_RECV))
+                                && ((dcc_selected->status == DCC_DONE)
+                                || (dcc_selected->status == DCC_FAILED)
+                                || (dcc_selected->status == DCC_ABORTED))))
+                            {
+                                if (dcc_selected->next_dcc)
+                                    gui_current_window->dcc_selected = dcc_selected->next_dcc;
+                                else
+                                    gui_current_window->dcc_selected = NULL;
+                                dcc_free (dcc_selected);
+                                gui_redraw_buffer (gui_current_window->buffer);
+                            }
+                            break;
+                    }
+                }
+                else
+                {
+                    /*gui_printf (gui_current_window->buffer,
+                                "[Debug] key pressed = %d, hex = %02X, octal = %o\n", key, key, key);*/
+                    new_char[0] = key;
+                    new_char[1] = '\0';
+                    gui_buffer_insert_string (gui_current_window->buffer,
+                                              new_char,
+                                              gui_current_window->buffer->input_buffer_pos);
+                    gui_current_window->buffer->input_buffer_pos++;
+                    gui_draw_buffer_input (gui_current_window->buffer, 0);
+                    gui_current_window->buffer->completion.position = -1;
+                }
                break;
        }
    }
@@ -373,14 +638,13 @@ gui_main_loop ()
        if (local_time->tm_min != old_min)
        {
            old_min = local_time->tm_min;
-            gui_redraw_window_infobar (gui_current_window);
+            gui_draw_buffer_infobar (gui_current_window->buffer, 1);
        }
        
        /* second has changed ? => count down time for infobar, if needed */
        if (local_time->tm_sec != old_sec)
        {
            old_sec = local_time->tm_sec;
-            /* TODO: manage splitted windows! */
            if (gui_infobar && gui_infobar->remaining_time > 0)
            {
                gui_infobar->remaining_time--;
@@ -396,8 +660,14 @@ gui_main_loop ()
        for (ptr_server = irc_servers; ptr_server;
             ptr_server = ptr_server->next_server)
        {
-            if (ptr_server->sock4 >= 0)
-                FD_SET (ptr_server->sock4, &read_fd);
+            /* check if reconnection is pending */
+            if ((!ptr_server->is_connected)
+                && (ptr_server->reconnect_start > 0)
+                && (new_time >= (ptr_server->reconnect_start + ptr_server->autoreconnect_delay)))
+                server_reconnect (ptr_server);
+            else
+                if (ptr_server->sock4 >= 0)
+                    FD_SET (ptr_server->sock4, &read_fd);
        }
        if (select (FD_SETSIZE, &read_fd, NULL, NULL, &timeout))
        {
@@ -416,5 +686,8 @@ gui_main_loop ()
                }
            }
        }
+        
+        /* manages active DCC */
+        dcc_handle ();
    }
 }
@@ -1,4 +1,4 @@
-# Copyright (c) 2004 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2005 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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
@@ -34,87 +34,80 @@

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


-int gui_ready;                              /* = 1 if GUI is initialized    */
+int gui_init_ok = 0;                        /* = 1 if GUI is initialized    */
+int gui_ok = 0;                             /* = 1 if GUI is ok             */
+                                            /* (0 when term size too small) */

 t_gui_window *gui_windows = NULL;           /* pointer to first window      */
 t_gui_window *last_gui_window = NULL;       /* pointer to last window       */
 t_gui_window *gui_current_window = NULL;    /* pointer to current window    */
+
+t_gui_buffer *gui_buffers = NULL;           /* pointer to first buffer      */
+t_gui_buffer *last_gui_buffer = NULL;       /* pointer to last buffer       */
+t_gui_buffer *buffer_before_dcc = NULL;     /* buffer before dcc switch     */
 t_gui_infobar *gui_infobar;                 /* pointer to infobar content   */


 /*
 * gui_window_new: create a new window
- *                 (TODO: add coordinates and size, for splited windows)
 */

 t_gui_window *
-gui_window_new (void *server, void *channel, int switch_to_window
-                /*int x, int y, int width, int height*/)
+gui_window_new (int x, int y, int width, int height)
 {
    t_gui_window *new_window;
    
-    if (gui_windows)
-    {
-        /* use first window if no server was assigned to this window */
-        if (!SERVER(gui_windows))
-        {
-            if (server)
-                ((t_irc_server *)(server))->window = gui_windows;
-            if (channel)
-                ((t_irc_channel *)(channel))->window = gui_windows;
-            SERVER(gui_windows) = server;
-            CHANNEL(gui_windows) = channel;
-            return gui_windows;
-        }
-    }
-    
+    #ifdef DEBUG
+    wee_log_printf ("creating new window (x:%d, y:%d, width:%d, height:%d)\n",
+                    x, y, width, height);
+    #endif
    if ((new_window = (t_gui_window *)(malloc (sizeof (t_gui_window)))))
    {
-        new_window->is_displayed = 0;
+        new_window->win_x = x;
+        new_window->win_y = y;
+        new_window->win_width = width;
+        new_window->win_height = height;
        
-        /* assign server and channel to window */
-        SERVER(new_window) = server;
-        CHANNEL(new_window) = channel;
-        /* assign window to server and channel */
-        if (server && !channel)
-            SERVER(new_window)->window = new_window;
-        if (channel)
-            CHANNEL(new_window)->window = new_window;
+        new_window->win_chat_x = 0;
+        new_window->win_chat_y = 0;
+        new_window->win_chat_width = 0;
+        new_window->win_chat_height = 0;
+        new_window->win_chat_cursor_x = 0;
+        new_window->win_chat_cursor_y = 0;
        
-        gui_calculate_pos_size (new_window);
+        new_window->win_nick_x = 0;
+        new_window->win_nick_y = 0;
+        new_window->win_nick_width = 0;
+        new_window->win_nick_height = 0;
        
-        /* init windows */
-        gui_window_init_subwindows(new_window);
+        new_window->win_title = NULL;
+        new_window->win_chat = NULL;
+        new_window->win_nick = NULL;
+        new_window->win_status = NULL;
+        new_window->win_infobar = NULL;
+        new_window->win_input = NULL;
+        new_window->win_separator = NULL;
        
-        /* init lines */
-        new_window->lines = NULL;
-        new_window->last_line = NULL;
-        new_window->first_line_displayed = 1;
+        new_window->textview_chat = NULL;
+        new_window->textbuffer_chat = NULL;
+        new_window->texttag_chat = NULL;
+        new_window->textview_nicklist = NULL;
+        new_window->textbuffer_nicklist = NULL;
+        
+        new_window->dcc_first = NULL;
+        new_window->dcc_selected = NULL;
+        new_window->dcc_last_displayed = NULL;
+        
+        new_window->buffer = NULL;
+        
+        new_window->first_line_displayed = 0;
        new_window->sub_lines = 0;
-        new_window->line_complete = 1;
-        new_window->unread_data = 0;
-        
-        /* init input buffer */
-        new_window->input_buffer_alloc = INPUT_BUFFER_BLOCK_SIZE;
-        new_window->input_buffer = (char *) malloc (INPUT_BUFFER_BLOCK_SIZE);
-        new_window->input_buffer[0] = '\0';
-        new_window->input_buffer_size = 0;
-        new_window->input_buffer_pos = 0;
-        new_window->input_buffer_1st_display = 0;
-        
-        /* init completion */
-        completion_init (&(new_window->completion));
-        
-        /* init history */
-        new_window->history = NULL;
-        new_window->ptr_history = NULL;
-        
-        /* switch to new window */
-        if (switch_to_window)
-            gui_switch_to_window (new_window);
        
        /* add window to windows queue */
        new_window->prev_window = last_gui_window;
@@ -124,9 +117,6 @@ gui_window_new (void *server, void *channel, int switch_to_window
            gui_windows = new_window;
        last_gui_window = new_window;
        new_window->next_window = NULL;
-        
-        /* redraw whole screen */
-        gui_redraw_window (gui_current_window);
    }
    else
        return NULL;
@@ -135,52 +125,168 @@ gui_window_new (void *server, void *channel, int switch_to_window
 }

 /*
- * gui_window_clear: clear window content
+ * gui_buffer_new: create a new buffer in current window
 */

-void
-gui_window_clear (t_gui_window *window)
+t_gui_buffer *
+gui_buffer_new (t_gui_window *window, void *server, void *channel, int dcc,
+                int switch_to_buffer)
 {
-    t_gui_line *ptr_line;
-    t_gui_message *ptr_message;
+    t_gui_buffer *new_buffer;
    
-    while (window->lines)
+    #ifdef DEBUG
+    wee_log_printf ("creating new buffer\n");
+    #endif
+    
+    /* use first buffer if no server was assigned to this buffer */
+    if (!dcc && gui_buffers && (!SERVER(gui_buffers)))
    {
-        ptr_line = window->lines->next_line;
-        while (window->lines->messages)
-        {
-            ptr_message = window->lines->messages->next_message;
-            if (window->lines->messages->message)
-                free (window->lines->messages->message);
-            free (window->lines->messages);
-            window->lines->messages = ptr_message;
-        }
-        free (window->lines);
-        window->lines = ptr_line;
+        if (server)
+            ((t_irc_server *)(server))->buffer = gui_buffers;
+        if (channel)
+            ((t_irc_channel *)(channel))->buffer = gui_buffers;
+        SERVER(gui_buffers) = server;
+        CHANNEL(gui_buffers) = channel;
+        if (cfg_log_auto_server)
+            log_start (gui_buffers);
+        return gui_buffers;
    }
    
-    window->lines = NULL;
-    window->last_line = NULL;
-    window->first_line_displayed = 1;
-    window->sub_lines = 0;
-    window->line_complete = 1;
-    window->unread_data = 0;
+    if ((new_buffer = (t_gui_buffer *)(malloc (sizeof (t_gui_buffer)))))
+    {
+        new_buffer->num_displayed = 0;
+        new_buffer->number = (last_gui_buffer) ? last_gui_buffer->number + 1 : 1;
+        
+        /* assign server and channel to buffer */
+        SERVER(new_buffer) = server;
+        CHANNEL(new_buffer) = channel;
+        new_buffer->dcc = dcc;
+        /* assign buffer to server and channel */
+        if (server && !channel)
+            SERVER(new_buffer)->buffer = new_buffer;
+        if (channel)
+            CHANNEL(new_buffer)->buffer = new_buffer;
+        
+        if (!window->buffer)
+        {
+            window->buffer = new_buffer;
+            window->first_line_displayed = 1;
+            window->sub_lines = 0;
+            gui_calculate_pos_size (window);
+            gui_window_init_subwindows (window);
+        }
+        
+        /* init lines */
+        new_buffer->lines = NULL;
+        new_buffer->last_line = NULL;
+        new_buffer->num_lines = 0;
+        new_buffer->line_complete = 1;
+        
+        /* notify level */
+        new_buffer->notify_level = 3;
+        
+        /* create/append to log file */
+        new_buffer->log_filename = NULL;
+        new_buffer->log_file = NULL;
+        if ((cfg_log_auto_server && BUFFER_IS_SERVER(new_buffer))
+            || (cfg_log_auto_channel && BUFFER_IS_CHANNEL(new_buffer))
+            || (cfg_log_auto_private && BUFFER_IS_PRIVATE(new_buffer)))
+            log_start (new_buffer);
+        
+        /* init input buffer */
+        new_buffer->input_buffer_alloc = INPUT_BUFFER_BLOCK_SIZE;
+        new_buffer->input_buffer = (char *) malloc (INPUT_BUFFER_BLOCK_SIZE);
+        new_buffer->input_buffer[0] = '\0';
+        new_buffer->input_buffer_size = 0;
+        new_buffer->input_buffer_pos = 0;
+        new_buffer->input_buffer_1st_display = 0;
+        
+        /* init completion */
+        completion_init (&(new_buffer->completion));
+        
+        /* init history */
+        new_buffer->history = NULL;
+        new_buffer->last_history = NULL;
+        new_buffer->ptr_history = NULL;
+        new_buffer->num_history = 0;
+        
+        /* add buffer to buffers queue */
+        new_buffer->prev_buffer = last_gui_buffer;
+        if (gui_buffers)
+            last_gui_buffer->next_buffer = new_buffer;
+        else
+            gui_buffers = new_buffer;
+        last_gui_buffer = new_buffer;
+        new_buffer->next_buffer = NULL;
+        
+        /* switch to new buffer */
+        if (switch_to_buffer)
+            gui_switch_to_buffer (window, new_buffer);
+        
+        /* redraw buffer */
+        gui_redraw_buffer (new_buffer);
+    }
+    else
+        return NULL;
    
-    if (window == gui_current_window)
-        gui_redraw_window_chat (window);
+    return new_buffer;
 }

 /*
- * gui_window_clear_all: clear all windows content
+ * gui_buffer_clear: clear buffer content
 */

 void
-gui_window_clear_all ()
+gui_buffer_clear (t_gui_buffer *buffer)
 {
    t_gui_window *ptr_win;
+    t_gui_line *ptr_line;
+    t_gui_message *ptr_message;
+    
+    while (buffer->lines)
+    {
+        ptr_line = buffer->lines->next_line;
+        while (buffer->lines->messages)
+        {
+            ptr_message = buffer->lines->messages->next_message;
+            if (buffer->lines->messages->message)
+                free (buffer->lines->messages->message);
+            free (buffer->lines->messages);
+            buffer->lines->messages = ptr_message;
+        }
+        free (buffer->lines);
+        buffer->lines = ptr_line;
+    }
+    
+    buffer->lines = NULL;
+    buffer->last_line = NULL;
+    buffer->num_lines = 0;
+    buffer->line_complete = 1;
    
    for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
-        gui_window_clear (ptr_win);
+    {
+        if (ptr_win->buffer == buffer)
+        {
+            ptr_win->first_line_displayed = 1;
+            ptr_win->sub_lines = 0;
+        }
+    }
+    
+    if (buffer == gui_current_window->buffer)
+        gui_draw_buffer_chat (buffer, 1);
+}
+
+/*
+ * gui_buffer_clear_all: clear all buffers content
+ */
+
+void
+gui_buffer_clear_all ()
+{
+    t_gui_buffer *ptr_buffer;
+    
+    for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer)
+        gui_buffer_clear (ptr_buffer);
 }

 /* 
@@ -210,8 +316,7 @@ gui_infobar_printf (int time_displayed, int color, char *message, ...)
        ptr_infobar->remaining_time = (time_displayed <= 0) ? -1 : time_displayed;
        ptr_infobar->next_infobar = gui_infobar;
        gui_infobar = ptr_infobar;
-        /* TODO: manage splitted windows! */
-        gui_redraw_window_infobar (gui_current_window);
+        gui_draw_buffer_infobar (gui_current_window->buffer, 1);
    }
    else
        wee_log_printf (_("%s not enough memory for infobar message\n"),
@@ -234,116 +339,166 @@ gui_infobar_remove ()
            free (gui_infobar->text);
        free (gui_infobar);
        gui_infobar = new_infobar;
-        /* TODO: manage splitted windows! */
-        gui_redraw_window_infobar (gui_current_window);
+        gui_draw_buffer_infobar (gui_current_window->buffer, 1);
    }
 }

 /*
- * gui_window_free: delete a window
+ * gui_line_free: delete a line from a buffer
 */

 void
-gui_window_free (t_gui_window *window)
+gui_line_free (t_gui_line *line)
 {
-    t_gui_line *ptr_line;
    t_gui_message *ptr_message;
-    int create_new;
    
-    create_new = (window->server || window->channel);
-    
-    /* TODO: manage splitted windows! */
-    if ((window == gui_current_window) &&
-        ((window->next_window) || (window->prev_window)))
-        gui_switch_to_previous_window ();
-    
-    /* free lines and messages */
-    while (window->lines)
+    while (line->messages)
    {
-        ptr_line = window->lines->next_line;
-        while (window->lines->messages)
-        {
-            ptr_message = window->lines->messages->next_message;
-            if (window->lines->messages->message)
-                free (window->lines->messages->message);
-            free (window->lines->messages);
-            window->lines->messages = ptr_message;
-        }
-        free (window->lines);
-        window->lines = ptr_line;
+        ptr_message = line->messages->next_message;
+        if (line->messages->message)
+            free (line->messages->message);
+        free (line->messages);
+        line->messages = ptr_message;
    }
-    if (window->input_buffer)
-        free (window->input_buffer);
-    
-    completion_free (&(window->completion));
-    
-    /* remove window from windows list */
-    if (window->prev_window)
-        window->prev_window->next_window = window->next_window;
-    if (window->next_window)
-        window->next_window->prev_window = window->prev_window;
-    if (gui_windows == window)
-        gui_windows = window->next_window;
-    if (last_gui_window == window)
-        last_gui_window = window->prev_window;
-    
-    free (window);
-    
-    /* always at least one window */
-    if (!gui_windows && create_new)
-        (void) gui_window_new (NULL, NULL, 1);
+    free (line);
 }

 /*
- * gui_new_line: create new line for a window
+ * gui_buffer_free: delete a buffer
+ */
+
+void
+gui_buffer_free (t_gui_buffer *buffer, int switch_to_another)
+{
+    t_gui_window *ptr_win;
+    t_gui_buffer *ptr_buffer;
+    t_gui_line *ptr_line;
+    int create_new;
+    
+    create_new = (buffer->server || buffer->channel);
+    
+    hotlist_remove_buffer (buffer);
+    if (hotlist_initial_buffer == buffer)
+        hotlist_initial_buffer = NULL;
+    
+    if (switch_to_another)
+    {
+        for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
+        {
+            if ((buffer == ptr_win->buffer) &&
+                ((buffer->next_buffer) || (buffer->prev_buffer)))
+                gui_switch_to_previous_buffer (ptr_win);
+        }
+    }
+    
+    /* decrease buffer number for all next buffers */
+    for (ptr_buffer = buffer->next_buffer; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer)
+    {
+        ptr_buffer->number--;
+    }
+    
+    /* free lines and messages */
+    while (buffer->lines)
+    {
+        ptr_line = buffer->lines->next_line;
+        gui_line_free (buffer->lines);
+        buffer->lines = ptr_line;
+    }
+    
+    /* close log if opened */
+    if (buffer->log_file)
+        log_end (buffer);
+    
+    if (buffer->input_buffer)
+        free (buffer->input_buffer);
+    
+    completion_free (&(buffer->completion));
+    
+    /* remove buffer from buffers list */
+    if (buffer->prev_buffer)
+        buffer->prev_buffer->next_buffer = buffer->next_buffer;
+    if (buffer->next_buffer)
+        buffer->next_buffer->prev_buffer = buffer->prev_buffer;
+    if (gui_buffers == buffer)
+        gui_buffers = buffer->next_buffer;
+    if (last_gui_buffer == buffer)
+        last_gui_buffer = buffer->prev_buffer;
+    
+    free (buffer);
+    
+    /* always at least one buffer */
+    if (!gui_buffers && create_new && switch_to_another)
+        (void) gui_buffer_new (gui_windows, NULL, NULL, 0, 1);
+}
+
+/*
+ * gui_new_line: create new line for a buffer
 */

 t_gui_line *
-gui_new_line (t_gui_window *window)
+gui_new_line (t_gui_buffer *buffer)
 {
-    t_gui_line *new_line;
+    t_gui_line *new_line, *ptr_line;
    
    if ((new_line = (t_gui_line *) malloc (sizeof (struct t_gui_line))))
    {
        new_line->length = 0;
        new_line->length_align = 0;
        new_line->line_with_message = 0;
+        new_line->line_with_highlight = 0;
        new_line->messages = NULL;
        new_line->last_message = NULL;
-        if (!window->lines)
-            window->lines = new_line;
+        if (!buffer->lines)
+            buffer->lines = new_line;
        else
-            window->last_line->next_line = new_line;
-        new_line->prev_line = window->last_line;
+            buffer->last_line->next_line = new_line;
+        new_line->prev_line = buffer->last_line;
        new_line->next_line = NULL;
-        window->last_line = new_line;
+        buffer->last_line = new_line;
+        buffer->num_lines++;
    }
    else
    {
        wee_log_printf (_("%s not enough memory for new line!\n"));
        return NULL;
    }
+    
+    /* remove one line if necessary */
+    if ((cfg_history_max_lines > 0)
+        && (buffer->num_lines > cfg_history_max_lines))
+    {
+        if (buffer->last_line == buffer->lines)
+            buffer->last_line = NULL;
+        ptr_line = buffer->lines->next_line;
+        gui_line_free (buffer->lines);
+        buffer->lines = ptr_line;
+        ptr_line->prev_line = NULL;
+        buffer->num_lines--;
+        //if (buffer->first_line_displayed)
+        gui_draw_buffer_chat (buffer, 1);
+    }
+    
    return new_line;
 }

 /*
- * gui_new_message: create a new message for last line of window
+ * gui_new_message: create a new message for last line of a buffer
 */

 t_gui_message *
-gui_new_message (t_gui_window *window)
+gui_new_message (t_gui_buffer *buffer)
 {
    t_gui_message *new_message;
    
    if ((new_message = (t_gui_message *) malloc (sizeof (struct t_gui_message))))
    {
-        if (!window->last_line->messages)
-            window->last_line->messages = new_message;
+        if (!buffer->last_line->messages)
+            buffer->last_line->messages = new_message;
        else
-            window->last_line->last_message->next_message = new_message;
-        new_message->prev_message = window->last_line->last_message;
+            buffer->last_line->last_message->next_message = new_message;
+        new_message->prev_message = buffer->last_line->last_message;
        new_message->next_message = NULL;
-        window->last_line->last_message = new_message;
+        buffer->last_line->last_message = new_message;
    }
    else
    {
@@ -359,16 +514,16 @@ gui_new_message (t_gui_window *window)
 */

 void
-gui_optimize_input_buffer_size (t_gui_window *window)
+gui_optimize_input_buffer_size (t_gui_buffer *buffer)
 {
    int optimal_size;
    
-    optimal_size = ((window->input_buffer_size / INPUT_BUFFER_BLOCK_SIZE) *
+    optimal_size = ((buffer->input_buffer_size / INPUT_BUFFER_BLOCK_SIZE) *
                   INPUT_BUFFER_BLOCK_SIZE) + INPUT_BUFFER_BLOCK_SIZE;
-    if (window->input_buffer_alloc != optimal_size)
+    if (buffer->input_buffer_alloc != optimal_size)
    {
-        window->input_buffer_alloc = optimal_size;
-        window->input_buffer = realloc (window->input_buffer, optimal_size);
+        buffer->input_buffer_alloc = optimal_size;
+        buffer->input_buffer = realloc (buffer->input_buffer, optimal_size);
    }
 }

@@ -377,25 +532,25 @@ gui_optimize_input_buffer_size (t_gui_window *window)
 */

 void
-gui_delete_previous_word ()
+gui_delete_previous_word (t_gui_buffer *buffer)
 {
    int i, j, num_char_deleted, num_char_end;
    
-    if (gui_current_window->input_buffer_pos > 0)
+    if (buffer->input_buffer_pos > 0)
    {
-        i = gui_current_window->input_buffer_pos - 1;
+        i = buffer->input_buffer_pos - 1;
        while ((i >= 0) &&
-            (gui_current_window->input_buffer[i] == ' '))
+            (buffer->input_buffer[i] == ' '))
            i--;
        if (i >= 0)
        {
            while ((i >= 0) &&
-                (gui_current_window->input_buffer[i] != ' '))
+                (buffer->input_buffer[i] != ' '))
                i--;
            if (i >= 0)
            {
                while ((i >= 0) &&
-                    (gui_current_window->input_buffer[i] == ' '))
+                    (buffer->input_buffer[i] == ' '))
                    i--;
            }
        }
@@ -403,20 +558,20 @@ gui_delete_previous_word ()
        if (i >= 0)
            i++;
        i++;
-        num_char_deleted = gui_current_window->input_buffer_pos - i;
-        num_char_end = gui_current_window->input_buffer_size -
-            gui_current_window->input_buffer_pos;
+        num_char_deleted = buffer->input_buffer_pos - i;
+        num_char_end = buffer->input_buffer_size -
+            buffer->input_buffer_pos;
        
        for (j = 0; j < num_char_end; j++)
-            gui_current_window->input_buffer[i + j] =
-                gui_current_window->input_buffer[gui_current_window->input_buffer_pos + j];
+            buffer->input_buffer[i + j] =
+                buffer->input_buffer[buffer->input_buffer_pos + j];
        
-        gui_current_window->input_buffer_size -= num_char_deleted;
-        gui_current_window->input_buffer[gui_current_window->input_buffer_size] = '\0';
-        gui_current_window->input_buffer_pos = i;
-        gui_draw_window_input (gui_current_window);
-        gui_optimize_input_buffer_size (gui_current_window);
-        gui_current_window->completion.position = -1;
+        buffer->input_buffer_size -= num_char_deleted;
+        buffer->input_buffer[buffer->input_buffer_size] = '\0';
+        buffer->input_buffer_pos = i;
+        gui_draw_buffer_input (buffer, 0);
+        gui_optimize_input_buffer_size (buffer);
+        buffer->completion.position = -1;
    }
 }

@@ -425,26 +580,26 @@ gui_delete_previous_word ()
 */

 void
-gui_move_previous_word ()
+gui_move_previous_word (t_gui_buffer *buffer)
 {
    int i;
    
-    if (gui_current_window->input_buffer_pos > 0)
+    if (buffer->input_buffer_pos > 0)
    {
-        i = gui_current_window->input_buffer_pos - 1;
+        i = buffer->input_buffer_pos - 1;
        while ((i >= 0) &&
-            (gui_current_window->input_buffer[i] == ' '))
+            (buffer->input_buffer[i] == ' '))
            i--;
        if (i < 0)
-            gui_current_window->input_buffer_pos = 0;
+            buffer->input_buffer_pos = 0;
        else
        {
            while ((i >= 0) &&
-                (gui_current_window->input_buffer[i] != ' '))
+                (buffer->input_buffer[i] != ' '))
                i--;
-            gui_current_window->input_buffer_pos = i + 1;
+            buffer->input_buffer_pos = i + 1;
        }
-        gui_draw_window_input (gui_current_window);
+        gui_draw_buffer_input (buffer, 0);
    }
 }

@@ -453,32 +608,32 @@ gui_move_previous_word ()
 */

 void
-gui_move_next_word ()
+gui_move_next_word (t_gui_buffer *buffer)
 {
    int i;
    
-    if (gui_current_window->input_buffer_pos <
-        gui_current_window->input_buffer_size + 1)
+    if (buffer->input_buffer_pos <
+        buffer->input_buffer_size + 1)
    {
-        i = gui_current_window->input_buffer_pos;
-        while ((i <= gui_current_window->input_buffer_size) &&
-            (gui_current_window->input_buffer[i] == ' '))
+        i = buffer->input_buffer_pos;
+        while ((i <= buffer->input_buffer_size) &&
+            (buffer->input_buffer[i] == ' '))
            i++;
-        if (i > gui_current_window->input_buffer_size)
-            gui_current_window->input_buffer_pos = i - 1;
+        if (i > buffer->input_buffer_size)
+            buffer->input_buffer_pos = i - 1;
        else
        {
-            while ((i <= gui_current_window->input_buffer_size) &&
-                (gui_current_window->input_buffer[i] != ' '))
+            while ((i <= buffer->input_buffer_size) &&
+                (buffer->input_buffer[i] != ' '))
                i++;
-            if (i > gui_current_window->input_buffer_size)
-                gui_current_window->input_buffer_pos =
-                    gui_current_window->input_buffer_size;
+            if (i > buffer->input_buffer_size)
+                buffer->input_buffer_pos =
+                    buffer->input_buffer_size;
            else
-                gui_current_window->input_buffer_pos = i;
+                buffer->input_buffer_pos = i;
            
        }
-        gui_draw_window_input (gui_current_window);
+        gui_draw_buffer_input (buffer, 0);
    }
 }

@@ -487,24 +642,137 @@ gui_move_next_word ()
 */

 void
-gui_buffer_insert_string (char *string, int pos)
+gui_buffer_insert_string (t_gui_buffer *buffer, char *string, int pos)
 {
    int i, start, end, length;
    
    length = strlen (string);
    
    /* increase buffer size */
-    gui_current_window->input_buffer_size += length;
-    gui_optimize_input_buffer_size (gui_current_window);
-    gui_current_window->input_buffer[gui_current_window->input_buffer_size] = '\0';
+    buffer->input_buffer_size += length;
+    gui_optimize_input_buffer_size (buffer);
+    buffer->input_buffer[buffer->input_buffer_size] = '\0';
    
    /* move end of string to the right */
    start = pos + length;
-    end = gui_current_window->input_buffer_size - 1;
+    end = buffer->input_buffer_size - 1;
    for (i = end; i >= start; i--)
-         gui_current_window->input_buffer[i] =
-         gui_current_window->input_buffer[i - length];
+         buffer->input_buffer[i] =
+         buffer->input_buffer[i - length];
    
    /* insert new string */
-    strncpy (gui_current_window->input_buffer + pos, string, length);
+    strncpy (buffer->input_buffer + pos, string, length);
+}
+
+/*
+ * gui_switch_to_buffer_by_number: switch to another buffer with number
+ */
+
+t_gui_buffer *
+gui_switch_to_buffer_by_number (t_gui_window *window, int number)
+{
+    t_gui_buffer *ptr_buffer;
+    
+    /* buffer is currently displayed ? */
+    if (number == window->buffer->number)
+        return window->buffer;
+    
+    /* search for buffer in the list */
+    for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer)
+    {
+        if ((ptr_buffer != window->buffer) && (number == ptr_buffer->number))
+        {
+            gui_switch_to_buffer (window, ptr_buffer);
+            gui_redraw_buffer (window->buffer);
+            return ptr_buffer;
+        }
+    }
+    
+    /* buffer not found */
+    return NULL;
+}
+
+/*
+ * gui_switch_to_buffer_by_number: switch to another buffer with number
+ */
+
+void
+gui_move_buffer_to_number (t_gui_window *window, int number)
+{
+    t_gui_buffer *ptr_buffer;
+    int i;
+    
+    /* buffer number is already ok ? */
+    if (number == window->buffer->number)
+        return;
+    
+    if (number < 1)
+        number = 1;
+    
+    /* remove buffer from list */
+    if (window->buffer == gui_buffers)
+    {
+        gui_buffers = window->buffer->next_buffer;
+        gui_buffers->prev_buffer = NULL;
+    }
+    if (window->buffer == last_gui_buffer)
+    {
+        last_gui_buffer = window->buffer->prev_buffer;
+        last_gui_buffer->next_buffer = NULL;
+    }
+    if (window->buffer->prev_buffer)
+        (window->buffer->prev_buffer)->next_buffer = window->buffer->next_buffer;
+    if (window->buffer->next_buffer)
+        (window->buffer->next_buffer)->prev_buffer = window->buffer->prev_buffer;
+    
+    if (number == 1)
+    {
+        gui_buffers->prev_buffer = window->buffer;
+        window->buffer->prev_buffer = NULL;
+        window->buffer->next_buffer = gui_buffers;
+        gui_buffers = window->buffer;
+    }
+    else
+    {
+        /* assign new number to all buffers */
+        i = 1;
+        for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer)
+        {
+            ptr_buffer->number = i++;
+        }
+        
+        /* search for new position in the list */
+        for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer)
+        {
+            if (ptr_buffer->number == number)
+                break;
+        }
+        if (ptr_buffer)
+        {
+            /* insert before buffer found */
+            window->buffer->prev_buffer = ptr_buffer->prev_buffer;
+            window->buffer->next_buffer = ptr_buffer;
+            if (ptr_buffer->prev_buffer)
+                (ptr_buffer->prev_buffer)->next_buffer = window->buffer;
+            ptr_buffer->prev_buffer = window->buffer;
+        }
+        else
+        {
+            /* number not found (too big)? => add to end */
+            window->buffer->prev_buffer = last_gui_buffer;
+            window->buffer->next_buffer = NULL;
+            last_gui_buffer->next_buffer = window->buffer;
+            last_gui_buffer = window->buffer;
+        }
+        
+    }
+    
+    /* assign new number to all buffers */
+    i = 1;
+    for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer)
+    {
+        ptr_buffer->number = i++;
+    }
+    
+    gui_redraw_buffer (window->buffer);
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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
@@ -26,56 +26,65 @@

 #define INPUT_BUFFER_BLOCK_SIZE 256

-#define NUM_COLORS                  38
-#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_NICK         7
-#define COLOR_WIN_CHAT_HOST         8
-#define COLOR_WIN_CHAT_CHANNEL      9
-#define COLOR_WIN_CHAT_DARK         10
-#define COLOR_WIN_CHAT_HIGHLIGHT    11
-#define COLOR_WIN_STATUS            12
-#define COLOR_WIN_STATUS_ACTIVE     13
-#define COLOR_WIN_STATUS_DATA_MSG   14
-#define COLOR_WIN_STATUS_DATA_OTHER 15
-#define COLOR_WIN_STATUS_MORE       16
-#define COLOR_WIN_INFOBAR           17
-#define COLOR_WIN_INFOBAR_HIGHLIGHT 18
-#define COLOR_WIN_INPUT             19
-#define COLOR_WIN_INPUT_CHANNEL     20
-#define COLOR_WIN_INPUT_NICK        21
-#define COLOR_WIN_NICK              22
-#define COLOR_WIN_NICK_OP           23
-#define COLOR_WIN_NICK_HALFOP       24
-#define COLOR_WIN_NICK_VOICE        25
-#define COLOR_WIN_NICK_SEP          26
-#define COLOR_WIN_NICK_SELF         27
-#define COLOR_WIN_NICK_PRIVATE      28
-#define COLOR_WIN_NICK_FIRST        29
-#define COLOR_WIN_NICK_LAST         38
-#define COLOR_WIN_NICK_NUMBER       (COLOR_WIN_NICK_LAST - COLOR_WIN_NICK_FIRST + 1)
+#define NUM_COLORS                      46
+#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_NICK             7
+#define COLOR_WIN_CHAT_HOST             8
+#define COLOR_WIN_CHAT_CHANNEL          9
+#define COLOR_WIN_CHAT_DARK             10
+#define COLOR_WIN_CHAT_HIGHLIGHT        11
+#define COLOR_WIN_STATUS                12
+#define COLOR_WIN_STATUS_DELIMITERS     13
+#define COLOR_WIN_STATUS_DATA_MSG       14
+#define COLOR_WIN_STATUS_DATA_HIGHLIGHT 15
+#define COLOR_WIN_STATUS_DATA_OTHER     16
+#define COLOR_WIN_STATUS_MORE           17
+#define COLOR_WIN_INFOBAR               18
+#define COLOR_WIN_INFOBAR_HIGHLIGHT     19
+#define COLOR_WIN_INPUT                 20
+#define COLOR_WIN_INPUT_CHANNEL         21
+#define COLOR_WIN_INPUT_NICK            22
+#define COLOR_WIN_NICK                  23
+#define COLOR_WIN_NICK_OP               24
+#define COLOR_WIN_NICK_HALFOP           25
+#define COLOR_WIN_NICK_VOICE            26
+#define COLOR_WIN_NICK_SEP              27
+#define COLOR_WIN_NICK_SELF             28
+#define COLOR_WIN_NICK_PRIVATE          29
+#define COLOR_WIN_NICK_FIRST            30
+#define COLOR_WIN_NICK_LAST             39
+#define COLOR_WIN_NICK_NUMBER           (COLOR_WIN_NICK_LAST - COLOR_WIN_NICK_FIRST + 1)
+#define COLOR_DCC_SELECTED              40
+#define COLOR_DCC_WAITING               41
+#define COLOR_DCC_CONNECTING            42
+#define COLOR_DCC_ACTIVE                43
+#define COLOR_DCC_DONE                  44
+#define COLOR_DCC_FAILED                45
+#define COLOR_DCC_ABORTED               46

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

-#define WIN_IS_SERVER(window)  (SERVER(window) && !CHANNEL(window))
-#define WIN_IS_CHANNEL(window) (CHANNEL(window) && (CHANNEL(window)->type == CHAT_CHANNEL))
-#define WIN_IS_PRIVATE(window) (CHANNEL(window) && (CHANNEL(window)->type == CHAT_PRIVATE))
+#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 MSG_TYPE_TIME  0
-#define MSG_TYPE_NICK  1
-#define MSG_TYPE_INFO  2
-#define MSG_TYPE_MSG   3
+#define MSG_TYPE_TIME      1
+#define MSG_TYPE_NICK      2
+#define MSG_TYPE_INFO      4
+#define MSG_TYPE_MSG       8
+#define MSG_TYPE_HIGHLIGHT 16

-#define gui_printf_color(window, color, fmt, argz...) \
-    gui_printf_color_type(window, MSG_TYPE_INFO, color, fmt, ##argz)
+#define gui_printf_color(buffer, color, fmt, argz...) \
+    gui_printf_color_type(buffer, MSG_TYPE_INFO, color, fmt, ##argz)

-#define gui_printf(window, fmt, argz...) \
-    gui_printf_color_type(window, MSG_TYPE_INFO, -1, fmt, ##argz)
+#define gui_printf(buffer, fmt, argz...) \
+    gui_printf_color_type(buffer, MSG_TYPE_INFO, -1, fmt, ##argz)

 typedef struct t_gui_message t_gui_message;

@@ -95,6 +104,7 @@ struct t_gui_line
    int length;                     /* length of the line (in char)         */
    int length_align;               /* alignment length (time or time/nick) */
    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                */
@@ -121,16 +131,60 @@ struct t_gui_infobar
    t_gui_infobar *next_infobar;    /* next message for infobar             */
 };

+typedef struct t_gui_buffer t_gui_buffer;
+
+struct t_gui_buffer
+{
+    int num_displayed;              /* number of windows displaying buffer  */
+    
+    int number;                     /* buffer number (for jump/switch)      */
+    
+    /* server/channel */
+    void *server;                   /* buffer's server                      */
+    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             */
+    int num_lines;                  /* number of lines in the window        */
+    int line_complete;              /* current line complete ? (\n ending)  */
+    
+    /* notify level: when activity should be displayed? default: 3 (always) */
+    int notify_level;               /* 0 = never                            */
+                                    /* 1 = highlight only                   */
+                                    /* 2 = highlight + message              */
+                                    /* 3 = highlight + message + join/part  */
+    
+    /* file to save buffer content */
+    char *log_filename;             /* filename for saving buffer content   */
+    FILE *log_file;                 /* for logging buffer to file           */
+    
+    /* inupt buffer */
+    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_pos;           /* position into buffer                 */
+    int input_buffer_1st_display;   /* first char displayed on screen       */
+    
+    /* completion */
+    t_completion completion;        /* for cmds/nicks completion            */
+    
+    /* history */
+    t_history *history;             /* commands history                     */
+    t_history *last_history;        /* last command in history              */
+    t_history *ptr_history;         /* current command in history           */
+    int num_history;                /* number of commands in history        */
+    
+    /* 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 t_gui_window;

 struct t_gui_window
 {
-    int is_displayed;               /* = 1 if window is displayed           */
-    
-    /* server/channel */
-    void *server;                   /* window's server                      */
-    void *channel;                  /* window's channel                     */
-    
    /* global position & size */
    int win_x, win_y;               /* position of window                   */
    int win_width, win_height;      /* window geometry                      */
@@ -149,11 +203,12 @@ struct t_gui_window
    
    /* windows for Curses GUI */
    void *win_title;                /* title window                         */
-    void *win_chat;                 /* chat window (exemple: channel)       */
+    void *win_chat;                 /* chat window (example: channel)       */
    void *win_nick;                 /* nick window                          */
    void *win_status;               /* status window                        */
    void *win_infobar;              /* info bar window                      */
    void *win_input;                /* input window                         */
+    void *win_separator;            /* separation between 2 splited (V) win */
    
    /* windows for Gtk GUI */
    void *textview_chat;            /* textview widget for chat             */
@@ -165,88 +220,82 @@ struct t_gui_window
    /* windows for Qt GUI */
    /* TODO: declare Qt window */
    
-    /* 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             */
+    /* DCC */
+    void *dcc_first;                /* first dcc displayed                  */
+    void *dcc_selected;             /* selected dcc                         */
+    void *dcc_last_displayed;       /* last dcc displayed (for scroll)      */
+    
+    t_gui_buffer *buffer;           /* buffer currently displayed in window */
+    
    int first_line_displayed;       /* = 1 if first line is displayed       */
    int sub_lines;                  /* if > 0 then do not display until end */
-    int line_complete;              /* current line complete ? (\n ending)  */
-    int unread_data;                /* highlight windows with unread data   */
    
-    /* inupt buffer */
-    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_pos;           /* position into buffer                 */
-    int input_buffer_1st_display;   /* first char displayed on screen       */
-    
-    /* completion */
-    t_completion completion;        /* for cmds/nicks completion            */
-    
-    /* history */
-    t_history *history;             /* commands history                     */
-    t_history *ptr_history;         /* current command in history           */
-    
-    /* link to next window */
    t_gui_window *prev_window;      /* link to previous window              */
    t_gui_window *next_window;      /* link to next window                  */
 };

 /* variables */

-extern int gui_ready;
+extern int gui_init_ok;
+extern int gui_ok;
 extern t_gui_window *gui_windows;
 extern t_gui_window *last_gui_window;
 extern t_gui_window *gui_current_window;
+extern t_gui_buffer *gui_buffers;
+extern t_gui_buffer *last_gui_buffer;
+extern t_gui_buffer *buffer_before_dcc;
 extern t_gui_infobar *gui_infobar;

 /* prototypes */

 /* GUI independent functions */
-extern t_gui_window *gui_window_new (/*@null@*/ void *, /*@null@*/ void *, int /*int, int, int, int*/); /* TODO: add coordinates and size */
-extern void gui_window_clear (t_gui_window *);
-extern void gui_window_clear_all ();
+extern t_gui_window *gui_window_new (int, int, int, int);
+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 ();
 extern void gui_infobar_printf (int, int, char *, ...);
 extern void gui_infobar_remove ();
-extern t_gui_line *gui_new_line (t_gui_window *);
-extern t_gui_message *gui_new_message (t_gui_window *);
-extern void gui_optimize_input_buffer_size (t_gui_window *);
-extern void gui_delete_previous_word ();
-extern void gui_move_previous_word ();
-extern void gui_move_next_word ();
-extern void gui_buffer_insert_string (char *, int);
+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_optimize_input_buffer_size (t_gui_buffer *);
+extern void gui_delete_previous_word (t_gui_buffer *);
+extern void gui_move_previous_word (t_gui_buffer *);
+extern void gui_move_next_word (t_gui_buffer *);
+extern void gui_buffer_insert_string (t_gui_buffer *, char *, int);
+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);
 /* GUI dependant functions */
 extern int gui_assign_color (int *, char *);
 extern int gui_get_color_by_name (char *);
 extern char *gui_get_color_by_value (int);
-extern int gui_window_has_nicklist (t_gui_window *);
+extern int gui_buffer_has_nicklist (t_gui_buffer *);
 extern void gui_calculate_pos_size (t_gui_window *);
-extern void gui_draw_window_title (t_gui_window *);
-extern void gui_redraw_window_title (t_gui_window *);
-extern void gui_draw_window_chat (t_gui_window *);
-extern void gui_redraw_window_chat (t_gui_window *);
-extern void gui_draw_window_nick (t_gui_window *);
-extern void gui_redraw_window_nick (t_gui_window *);
-extern void gui_draw_window_status (t_gui_window *);
-extern void gui_redraw_window_status (t_gui_window *);
-extern void gui_draw_window_infobar (t_gui_window *);
-extern void gui_redraw_window_infobar (t_gui_window *);
-extern void gui_draw_window_input (t_gui_window *);
-extern void gui_redraw_window_input (t_gui_window *);
-extern void gui_redraw_window (t_gui_window *);
-extern void gui_switch_to_window (t_gui_window *);
-extern void gui_switch_to_previous_window ();
-extern void gui_switch_to_next_window ();
+extern void gui_draw_buffer_title (t_gui_buffer *, 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);
+extern void gui_draw_buffer_infobar (t_gui_buffer *, int);
+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 ();
+extern void gui_switch_to_dcc_buffer ();
+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_next_window (t_gui_window *);
 extern void gui_move_page_up ();
 extern void gui_move_page_down ();
+extern void gui_curses_resize_handler ();
 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 void gui_pre_init (int *, char **[]);
 extern void gui_init_colors ();
 extern void gui_set_window_title ();
 extern void gui_init ();
-extern void gui_window_free (t_gui_window *);
 extern void gui_end ();
-extern void gui_printf_color_type (/*@null@*/ t_gui_window *, int, int, char *, ...);
+extern void gui_printf_color_type (/*@null@*/ t_gui_buffer *, int, int, char *, ...);
 extern void gui_main_loop ();

 #endif /* gui.h */
@@ -1,4 +1,4 @@
-# Copyright (c) 2004 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2005 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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
@@ -1,4 +1,4 @@
-# Copyright (c) 2004 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2005 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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
@@ -31,7 +31,6 @@
 #include "irc.h"


-t_irc_channel *current_channel = NULL;
 char *channel_modes = "iklmnst";


@@ -41,7 +40,7 @@ char *channel_modes = "iklmnst";

 t_irc_channel *
 channel_new (t_irc_server *server, int channel_type, char *channel_name,
-             int switch_to_window)
+             int switch_to_buffer)
 {
    t_irc_channel *new_channel;
    
@@ -72,7 +71,7 @@ channel_new (t_irc_server *server, int channel_type, char *channel_name,
        server->channels = new_channel;
    server->last_channel = new_channel;

-    gui_window_new (server, new_channel, switch_to_window);
+    gui_buffer_new (gui_current_window, server, new_channel, 0, switch_to_buffer);
    
    /* all is ok, return address of new channel */
    return new_channel;
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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
@@ -142,7 +142,7 @@ t_irc_command irc_commands[] =
    1, 1, 1, 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"),
-    1, MAX_ARGS, 1, NULL, irc_cmd_send_notice, irc_cmd_recv_notice },
+    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, 1, 1, irc_cmd_send_op, NULL, NULL },
@@ -151,7 +151,8 @@ t_irc_command irc_commands[] =
    N_("user/password: used to get privileges on current IRC server"),
    2, 2, 1, NULL, irc_cmd_send_oper, NULL },
  { "part", N_("leave a channel"),
-    N_("[channel[,channel]]"), N_("channel: channel name to leave"),
+    N_("[channel[,channel]] [part_message]"), 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 },
  { "ping", N_("ping server"),
    N_("server1 [server2]"),
@@ -0,0 +1,387 @@
+/*
+ * Copyright (c) 2003-2005 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/* irc-dcc.c: DCC communications (files & chat) */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+
+#include "../common/weechat.h"
+#include "irc.h"
+#include "../common/weeconfig.h"
+#include "../common/hotlist.h"
+#include "../gui/gui.h"
+
+
+t_dcc *dcc_list = NULL;         /* DCC files & chat list                    */
+char *dcc_status_string[] =     /* strings for DCC status                   */
+{ N_("Waiting"), N_("Connecting"), N_("Active"), N_("Done"), N_("Failed"),
+  N_("Aborted") };
+
+
+/*
+ * dcc_redraw: redraw DCC buffer (and add to hotlist)
+ */
+
+void
+dcc_redraw (int highlight)
+{
+    gui_redraw_buffer (gui_get_dcc_buffer ());
+    if (highlight)
+    {
+        hotlist_add (highlight, gui_get_dcc_buffer ());
+        gui_draw_buffer_status (gui_current_window->buffer, 0);
+    }
+}
+
+/*
+ * dcc_connect: connect to another host
+ */
+
+void
+dcc_connect (t_dcc *ptr_dcc)
+{
+    struct sockaddr_in addr;
+    
+    ptr_dcc->status = DCC_CONNECTING;
+    
+    ptr_dcc->sock = socket (AF_INET, SOCK_STREAM, 0);
+    if (ptr_dcc->sock == -1)
+        return;
+    memset (&addr, 0, sizeof (addr));
+    addr.sin_port = htons (ptr_dcc->port);
+    addr.sin_family = AF_INET;
+    addr.sin_addr.s_addr = htonl (ptr_dcc->addr);
+    fcntl (ptr_dcc->sock, F_SETFL, O_NONBLOCK);
+    connect (ptr_dcc->sock, (struct sockaddr *) &addr, sizeof (addr));
+}
+
+/*
+ * dcc_send: send DCC request (file or chat)
+ */
+
+void
+dcc_send ()
+{
+}
+
+/*
+ * dcc_free: free DCC struct and remove it from list
+ */
+
+void
+dcc_free (t_dcc *ptr_dcc)
+{
+    t_dcc *new_dcc_list;
+    
+    if (ptr_dcc->prev_dcc)
+    {
+        (ptr_dcc->prev_dcc)->next_dcc = ptr_dcc->next_dcc;
+        new_dcc_list = dcc_list;
+    }
+    else
+        new_dcc_list = ptr_dcc->next_dcc;
+    
+    if (ptr_dcc->next_dcc)
+        (ptr_dcc->next_dcc)->prev_dcc = ptr_dcc->prev_dcc;
+    
+    if (ptr_dcc->nick)
+        free (ptr_dcc->nick);
+    if (ptr_dcc->filename)
+        free (ptr_dcc->filename);
+    
+    free (ptr_dcc);
+    dcc_list = new_dcc_list;
+}
+
+/*
+ * dcc_close: close a DCC connection
+ */
+
+void
+dcc_close (t_dcc *ptr_dcc, int status)
+{
+    ptr_dcc->status = status;
+    if (ptr_dcc->sock != -1)
+    {
+        close (ptr_dcc->sock);
+        ptr_dcc->sock = -1;
+    }
+    if (ptr_dcc->file != -1)
+    {
+        close (ptr_dcc->file);
+        ptr_dcc->file = -1;
+    }
+}
+
+/*
+ * dcc_accept: accepts a DCC file or chat request
+ */
+
+void
+dcc_accept (t_dcc *ptr_dcc)
+{
+    char *ptr_home, *filename2;
+    
+    dcc_connect (ptr_dcc);
+    if (ptr_dcc->sock == -1)
+        ptr_dcc->status = DCC_FAILED;
+    else
+    {
+        ptr_dcc->status = DCC_ACTIVE;
+        ptr_home = getenv ("HOME");
+        ptr_dcc->local_filename = (char *) malloc (strlen (cfg_dcc_download_path) +
+                                                   strlen (ptr_dcc->nick) +
+                                                   strlen (ptr_dcc->filename) +
+                                                   ((cfg_dcc_download_path[0] == '~') ?
+                                                       strlen (ptr_home) : 0) +
+                                                   4);
+        if (!ptr_dcc->local_filename)
+        {
+            ptr_dcc->status = DCC_FAILED;
+            dcc_redraw (1);
+            return;
+        }
+        if (cfg_dcc_download_path[0] == '~')
+        {
+            strcpy (ptr_dcc->local_filename, ptr_home);
+            strcat (ptr_dcc->local_filename, cfg_dcc_download_path + 1);
+        }
+        else
+            strcpy (ptr_dcc->local_filename, cfg_dcc_download_path);
+        if (ptr_dcc->local_filename[strlen (ptr_dcc->local_filename) - 1] != DIR_SEPARATOR_CHAR)
+            strcat (ptr_dcc->local_filename, DIR_SEPARATOR);
+        strcat (ptr_dcc->local_filename, ptr_dcc->nick);
+        strcat (ptr_dcc->local_filename, ".");
+        strcat (ptr_dcc->local_filename, ptr_dcc->filename);
+        
+        /* file already exists? */
+        if (access (ptr_dcc->local_filename, F_OK) == 0)
+        {
+            /* if auto rename is not set, then abort DCC */
+            if (!cfg_dcc_auto_rename)
+            {
+                ptr_dcc->status = DCC_FAILED;
+                dcc_redraw (1);
+                return;
+            }
+            
+            filename2 = (char *) malloc (strlen (ptr_dcc->local_filename) + 16);
+            if (!filename2)
+            {
+                ptr_dcc->status = DCC_FAILED;
+                dcc_redraw (1);
+                return;
+            }
+            ptr_dcc->filename_suffix = 0;
+            do
+            {
+                ptr_dcc->filename_suffix++;
+                sprintf (filename2, "%s.%d",
+                         ptr_dcc->local_filename,
+                         ptr_dcc->filename_suffix);
+            }
+            while (access (filename2, F_OK) == 0);
+            
+            free (ptr_dcc->local_filename);
+            ptr_dcc->local_filename = strdup (filename2);
+            free (filename2);
+        }
+        ptr_dcc->file = open (ptr_dcc->local_filename,
+                              O_CREAT | O_TRUNC | O_WRONLY,
+                              0644);
+    }
+    dcc_redraw (1);
+}
+
+/*
+ * dcc_add: add a DCC file to queue
+ */
+
+t_dcc *
+dcc_add (t_irc_server *server, int type, unsigned long addr, int port, char *nick, char *filename,
+         unsigned int size)
+{
+    t_dcc *new_dcc;
+    
+    if ((new_dcc = (t_dcc *) malloc (sizeof (t_dcc))) == NULL)
+    {
+        gui_printf (NULL, _("%s not enough memory for new DCC\n"), WEECHAT_ERROR);
+        return NULL;
+    }
+    new_dcc->server = server;
+    new_dcc->type = type;
+    new_dcc->status = DCC_WAITING;
+    new_dcc->addr = addr;
+    new_dcc->port = port;
+    new_dcc->nick = strdup (nick);
+    new_dcc->sock = -1;
+    new_dcc->file = -1;
+    new_dcc->filename = strdup (filename);
+    new_dcc->local_filename = NULL;
+    new_dcc->filename_suffix = -1;
+    new_dcc->size = size;
+    new_dcc->pos = 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;
+    
+    gui_current_window->dcc_first = NULL;
+    gui_current_window->dcc_selected = NULL;
+    
+    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"));
+    }
+    
+    if ( ( (type == DCC_CHAT_RECV) && (cfg_dcc_auto_accept_chats) )
+        || ( (type == DCC_FILE_RECV) && (cfg_dcc_auto_accept_files) ) )
+        dcc_accept (new_dcc);
+    else
+        dcc_redraw (2);
+    gui_draw_buffer_status (gui_current_window->buffer, 0);
+    
+    return new_dcc;
+}
+
+/*
+ * dcc_handle: receive/send data for each active DCC
+ */
+
+void
+dcc_handle ()
+{
+    t_dcc *ptr_dcc;
+    int num;
+    char buffer[8192];
+    uint32_t pos;
+    
+    for (ptr_dcc = dcc_list; ptr_dcc; ptr_dcc = ptr_dcc->next_dcc)
+    {
+        if (ptr_dcc->status == DCC_ACTIVE)
+        {
+            if (ptr_dcc->type == DCC_FILE_RECV)
+            {
+                num = recv (ptr_dcc->sock, buffer, sizeof (buffer), 0);
+                if (num != -1)
+                {
+                    if (num == 0)
+                    {
+                        dcc_close (ptr_dcc, DCC_FAILED);
+                        dcc_redraw (1);
+                    }
+                    else
+                    {
+                        if (write (ptr_dcc->file, buffer, num) == -1)
+                        {
+                            dcc_close (ptr_dcc, DCC_FAILED);
+                            dcc_redraw (1);
+                            return;
+                        }
+                        ptr_dcc->pos += (unsigned long) num;
+                        pos = htonl (ptr_dcc->pos);
+                        send (ptr_dcc->sock, (char *) &pos, 4, 0);
+                        if (ptr_dcc->pos >= ptr_dcc->size)
+                        {
+                            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, _(" (local filename: "));
+                            gui_printf_color (ptr_dcc->server->buffer,
+                                              COLOR_WIN_CHAT_CHANNEL,
+                                              "%s",
+                                              ptr_dcc->local_filename);
+                            gui_printf (ptr_dcc->server->buffer, _(") from "));
+                            gui_printf_color (ptr_dcc->server->buffer,
+                                              COLOR_WIN_CHAT_NICK,
+                                              "%s",
+                                              ptr_dcc->nick);
+                            gui_printf (ptr_dcc->server->buffer, _(": ok!\n"));
+                            dcc_close (ptr_dcc, DCC_DONE);
+                            dcc_redraw (1);
+                        }
+                        dcc_redraw (0);
+                    }
+                }
+            }
+        }
+    }
+}
+
+/*
+ * dcc_end: close all opened sockets (called when WeeChat is exiting)
+ */
+
+void
+dcc_end ()
+{
+    t_dcc *ptr_dcc;
+    
+    for (ptr_dcc = dcc_list; ptr_dcc; ptr_dcc = ptr_dcc->next_dcc)
+    {
+        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);
+            dcc_close (ptr_dcc, DCC_FAILED);
+        }
+    }
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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
@@ -41,16 +41,16 @@
 */

 void
-irc_display_prefix (t_gui_window *window, char *prefix)
+irc_display_prefix (t_gui_buffer *buffer, char *prefix)
 {
    if (prefix[0] == prefix[2])
    {
-        gui_printf_color (window, COLOR_WIN_CHAT_PREFIX1, "%c", prefix[0]);
-        gui_printf_color (window, COLOR_WIN_CHAT_PREFIX2, "%c", prefix[1]);
-        gui_printf_color (window, COLOR_WIN_CHAT_PREFIX1, "%c ", prefix[2]);
+        gui_printf_color (buffer, COLOR_WIN_CHAT_PREFIX1, "%c", prefix[0]);
+        gui_printf_color (buffer, COLOR_WIN_CHAT_PREFIX2, "%c", prefix[1]);
+        gui_printf_color (buffer, COLOR_WIN_CHAT_PREFIX1, "%c ", prefix[2]);
    }
    else
-        gui_printf_color (window, COLOR_WIN_CHAT_PREFIX1, "%s ", prefix);
+        gui_printf_color (buffer, COLOR_WIN_CHAT_PREFIX1, "%s ", prefix);
 }

 /*
@@ -59,45 +59,45 @@ irc_display_prefix (t_gui_window *window, char *prefix)
 */

 void
-irc_display_nick (t_gui_window *window, t_irc_nick *nick, int message_type,
+irc_display_nick (t_gui_buffer *buffer, t_irc_nick *nick, int message_type,
                  int display_around, int color_nick, int no_nickmode)
 {
    if (display_around)
-        gui_printf_color_type (window,
+        gui_printf_color_type (buffer,
                               message_type, COLOR_WIN_CHAT_DARK, "<");
    if (cfg_look_nickmode)
    {
        if (nick->is_op)
-            gui_printf_color_type (window,
+            gui_printf_color_type (buffer,
                                   message_type,
                                   COLOR_WIN_NICK_OP, "@");
        else
        {
            if (nick->is_halfop)
-                gui_printf_color_type (window,
+                gui_printf_color_type (buffer,
                                       message_type,
                                       COLOR_WIN_NICK_HALFOP, "%%");
            else
            {
                if (nick->has_voice)
-                    gui_printf_color_type (window,
+                    gui_printf_color_type (buffer,
                                           message_type,
                                           COLOR_WIN_NICK_VOICE, "+");
                else
                    if (cfg_look_nickmode_empty && !no_nickmode)
-                        gui_printf_color_type (window,
+                        gui_printf_color_type (buffer,
                                               message_type,
                                               COLOR_WIN_CHAT, " ");
            }
        }
    }
    if (color_nick < 0)
-        gui_printf_color_type (window,
+        gui_printf_color_type (buffer,
                               message_type,
                               COLOR_WIN_CHAT_HIGHLIGHT,
                               "%s", nick->nick);
    else
-        gui_printf_color_type (window,
+        gui_printf_color_type (buffer,
                               message_type,
                               (color_nick) ?
                                   ((cfg_look_color_nicks) ?
@@ -106,7 +106,7 @@ irc_display_nick (t_gui_window *window, t_irc_nick *nick, int message_type,
                               "%s", nick->nick);
    
    if (display_around)
-        gui_printf_color_type (window,
+        gui_printf_color_type (buffer,
                               message_type, COLOR_WIN_CHAT_DARK, "> ");
 }

@@ -115,21 +115,21 @@ irc_display_nick (t_gui_window *window, t_irc_nick *nick, int message_type,
 */

 void
-irc_display_mode (t_gui_window *window, char *channel_name, char set_flag,
+irc_display_mode (t_gui_buffer *buffer, char *channel_name, char set_flag,
                  char *symbol, char *nick_host, char *message, char *param)
 {
-    irc_display_prefix (window, PREFIX_INFO);
-    gui_printf_color (window, COLOR_WIN_CHAT_DARK, "[");
-    gui_printf_color (window, COLOR_WIN_CHAT_CHANNEL, "%s", channel_name);
-    gui_printf_color (window, COLOR_WIN_CHAT, "/");
-    gui_printf_color (window, COLOR_WIN_CHAT_CHANNEL, "%c%s", set_flag, symbol);
-    gui_printf_color (window, COLOR_WIN_CHAT_DARK, "] ");
-    gui_printf_color (window, COLOR_WIN_CHAT_NICK, "%s", nick_host);
+    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);
    if (param)
    {
-        gui_printf_color (window, COLOR_WIN_CHAT, " %s ", message);
-        gui_printf_color (window, COLOR_WIN_CHAT_NICK, "%s\n", param);
+        gui_printf_color (buffer, COLOR_WIN_CHAT, " %s ", message);
+        gui_printf_color (buffer, COLOR_WIN_CHAT_NICK, "%s\n", param);
    }
    else
-        gui_printf_color (window, COLOR_WIN_CHAT, " %s\n", message);
+        gui_printf_color (buffer, COLOR_WIN_CHAT, " %s\n", message);
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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
@@ -37,34 +37,18 @@
 */

 int
-nick_find_color (t_irc_channel *channel)
+nick_find_color (t_irc_nick *nick)
 {
-    int i, color_less_used, min_used;
-    int count_used[COLOR_WIN_NICK_NUMBER];
-    t_irc_nick *ptr_nick;
+    int i, color;
    
-    /* initialize array for counting usage of color */
-    for (i = 0; i < COLOR_WIN_NICK_NUMBER; i++)
-        count_used[i] = 0;
-    
-    /* summarize each color usage */
-    for (ptr_nick = channel->nicks; ptr_nick; ptr_nick = ptr_nick->next_nick)
-        count_used[ptr_nick->color - COLOR_WIN_NICK_FIRST]++;
-    
-    /* look for color less used on channel */
-    color_less_used = -1;
-    min_used = INT_MAX;
-    for (i = 0; i < COLOR_WIN_NICK_NUMBER; i++)
+    color = 0;
+    for (i = strlen (nick->nick) - 1; i >= 0; i--)
    {
-        if (count_used[i] < min_used)
-        {
-            color_less_used = i;
-            min_used = count_used[i];
-        }
+        color += (int)(nick->nick[i]);
    }
+    color = (color % COLOR_WIN_NICK_NUMBER);
    
-    return (color_less_used < 0) ?
-        COLOR_WIN_NICK_FIRST : COLOR_WIN_NICK_FIRST + color_less_used;
+    return COLOR_WIN_NICK_FIRST + color;
 }

 /*
@@ -182,7 +166,7 @@ nick_new (t_irc_channel *channel, char *nick_name,
    /* alloc memory for new nick */
    if ((new_nick = (t_irc_nick *) malloc (sizeof (t_irc_nick))) == NULL)
    {
-        gui_printf (channel->window,
+        gui_printf (channel->buffer,
                    _("%s cannot allocate new nick\n"), WEECHAT_ERROR);
        return NULL;
    }
@@ -192,10 +176,10 @@ nick_new (t_irc_channel *channel, char *nick_name,
    new_nick->is_op = is_op;
    new_nick->is_halfop = is_halfop;
    new_nick->has_voice = has_voice;
-    if (strcasecmp (new_nick->nick, SERVER(channel->window)->nick) == 0)
+    if (strcasecmp (new_nick->nick, SERVER(channel->buffer)->nick) == 0)
        new_nick->color = COLOR_WIN_NICK_SELF;
    else
-        new_nick->color = nick_find_color (channel);
+        new_nick->color = nick_find_color (new_nick);

    nick_insert_sorted (channel, new_nick);
    
@@ -231,10 +215,18 @@ nick_resort (t_irc_channel *channel, t_irc_nick *nick)
 void
 nick_change (t_irc_channel *channel, t_irc_nick *nick, char *new_nick)
 {
+    int nick_is_me;
+    
+    nick_is_me = (strcmp (nick->nick, SERVER(channel->buffer)->nick) == 0) ? 1 : 0;
+    
    /* change nickname */
    if (nick->nick)
        free (nick->nick);
    nick->nick = strdup (new_nick);
+    if (nick_is_me)
+        nick->color = COLOR_WIN_NICK_SELF;
+    else
+        nick->color = nick_find_color (nick);
    
    /* insert again nick into sorted list */
    nick_resort (channel, nick);
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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
@@ -56,7 +56,7 @@ irc_login (t_irc_server *server)
    hostname[sizeof (hostname) - 1] = '\0';
    if (!hostname[0])
        strcpy (hostname, _("unknown"));
-    gui_printf (server->window,
+    gui_printf (server->buffer,
                _("%s: using local hostname \"%s\"\n"),
                PACKAGE_NAME, hostname);
    server_sendf (server,
@@ -89,6 +89,8 @@ irc_cmd_send_away (t_irc_server *server, char *arguments)
 {
    char *pos;
    t_irc_server *ptr_server;
+    time_t elapsed;
+    char buffer[4096];
    
    if (arguments && (strncmp (arguments, "-all", 4) == 0))
    {
@@ -104,18 +106,62 @@ irc_cmd_send_away (t_irc_server *server, char *arguments)
            if (ptr_server->is_connected)
            {
                if (pos)
+                {
+                    ptr_server->is_away = 1;
+                    ptr_server->away_time = time (NULL);
                    server_sendf (ptr_server, "AWAY :%s\r\n", pos);
+                    if (cfg_look_display_away)
+                    {
+                        snprintf (buffer, sizeof (buffer), "is away: %s", pos);
+                        irc_send_me_all_channels (ptr_server, buffer);
+                    }
+                }
                else
+                {
                    server_sendf (ptr_server, "AWAY\r\n");
+                    ptr_server->is_away = 0;
+                    elapsed = time (NULL) - ptr_server->away_time;
+                    if (cfg_look_display_away)
+                    {
+                        snprintf (buffer, sizeof (buffer),
+                                  "is back (gone %.2ld:%.2ld:%.2ld)",
+                                  elapsed / 3600,
+                                  (elapsed / 60) % 60,
+                                  elapsed % 60);
+                        irc_send_me_all_channels (ptr_server, buffer);
+                    }
+                }
            }
        }
    }
    else
    {
        if (arguments)
+        {
+            server->is_away = 1;
+            server->away_time = time (NULL);
            server_sendf (server, "AWAY :%s\r\n", arguments);
+            if (cfg_look_display_away)
+            {
+                snprintf (buffer, sizeof (buffer), "is away: %s", arguments);
+                irc_send_me_all_channels (server, buffer);
+            }
+        }
        else
+        {
            server_sendf (server, "AWAY\r\n");
+            server->is_away = 0;
+            elapsed = time (NULL) - server->away_time;
+            if (cfg_look_display_away)
+            {
+                snprintf (buffer, sizeof (buffer),
+                          "is back (gone %.2ld:%.2ld:%.2ld)",
+                          elapsed / 3600,
+                          (elapsed / 60) % 60,
+                          elapsed % 60);
+                irc_send_me_all_channels (server, buffer);
+            }
+        }
    }
    return 0;
 }
@@ -198,15 +244,15 @@ irc_cmd_send_deop (t_irc_server *server, int argc, char **argv)
 {
    int i;
    
-    if (WIN_IS_CHANNEL(gui_current_window))
+    if (BUFFER_IS_CHANNEL(gui_current_window->buffer))
    {
        for (i = 0; i < argc; i++)
            server_sendf (server, "MODE %s -o %s\r\n",
-                          CHANNEL(gui_current_window)->name,
+                          CHANNEL(gui_current_window->buffer)->name,
                          argv[i]);
    }
    else
-        gui_printf (server->window,
+        gui_printf (server->buffer,
                    _("%s \"%s\" command can only be executed in a channel window\n"),
                    WEECHAT_ERROR, "deop");
    return 0;
@@ -221,16 +267,16 @@ irc_cmd_send_devoice (t_irc_server *server, int argc, char **argv)
 {
    int i;
    
-    if (WIN_IS_CHANNEL(gui_current_window))
+    if (BUFFER_IS_CHANNEL(gui_current_window->buffer))
    {
        for (i = 0; i < argc; i++)
            server_sendf (server, "MODE %s -v %s\r\n",
-                          CHANNEL(gui_current_window)->name,
+                          CHANNEL(gui_current_window->buffer)->name,
                          argv[i]);
    }
    else
    {
-        gui_printf (server->window,
+        gui_printf (server->buffer,
                    _("%s \"%s\" command can only be executed in a channel window\n"),
                    WEECHAT_ERROR, "devoice");
        return -1;
@@ -306,19 +352,31 @@ irc_cmd_send_join (t_irc_server *server, char *arguments)
 int
 irc_cmd_send_kick (t_irc_server *server, char *arguments)
 {
+    char *args, *pos;
+    
    if (string_is_channel (arguments))
        server_sendf (server, "KICK %s\r\n", arguments);
    else
    {
-        if (WIN_IS_CHANNEL (gui_current_window))
+        if (BUFFER_IS_CHANNEL (gui_current_window->buffer))
        {
-            server_sendf (server,
-                          "KICK %s %s\r\n",
-                          CHANNEL(gui_current_window)->name, arguments);
+            args = strdup (arguments);
+            pos = strchr (args, ' ');
+            if (pos)
+                pos[0] = '\0';
+            if (pos)
+                server_sendf (server,
+                              "KICK %s %s :%s\r\n",
+                              CHANNEL(gui_current_window->buffer)->name, args, pos + 1);
+            else
+                server_sendf (server,
+                              "KICK %s %s\r\n",
+                              CHANNEL(gui_current_window->buffer)->name, args);
+            free (args);
        }
        else
        {
-            gui_printf (server->window,
+            gui_printf (server->buffer,
                        _("%s \"%s\" command can only be executed in a channel window\n"),
                        WEECHAT_ERROR, "kick");
            return -1;
@@ -381,6 +439,41 @@ 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);
+    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);
+    return 0;
+}
+
+/*
+ * irc_send_me_all_channels: send a ctcp action to all channels of a server
+ */
+
+int
+irc_send_me_all_channels (t_irc_server *server, char *arguments)
+{
+    t_irc_channel *ptr_channel;
+    
+    for (ptr_channel = server->channels; ptr_channel;
+         ptr_channel = ptr_channel->next_channel)
+    {
+        if (ptr_channel->type == CHAT_CHANNEL)
+            irc_send_me (server, ptr_channel, arguments);
+    }
+    return 0;
+}
+
 /*
 * irc_cmd_send_me: send a ctcp action to the current channel
 */
@@ -388,20 +481,14 @@ irc_cmd_send_lusers (t_irc_server *server, char *arguments)
 int
 irc_cmd_send_me (t_irc_server *server, char *arguments)
 {
-    if (WIN_IS_SERVER(gui_current_window))
+    if (BUFFER_IS_SERVER(gui_current_window->buffer))
    {
-        gui_printf (server->window,
+        gui_printf (server->buffer,
                    _("%s \"%s\" command can not be executed on a server window\n"),
                    WEECHAT_ERROR, "me");
        return -1;
    }
-    server_sendf (server, "PRIVMSG %s :\01ACTION %s\01\r\n",
-                  CHANNEL(gui_current_window)->name, arguments);
-    irc_display_prefix (gui_current_window, PREFIX_ACTION_ME);
-    gui_printf_color (gui_current_window,
-                      COLOR_WIN_CHAT_NICK, "%s", server->nick);
-    gui_printf_color (gui_current_window,
-                      COLOR_WIN_CHAT, " %s\n", arguments);
+    irc_send_me (server, CHANNEL(gui_current_window->buffer), arguments);
    return 0;
 }

@@ -438,6 +525,7 @@ int
 irc_cmd_send_msg (t_irc_server *server, char *arguments)
 {
    char *pos, *pos_comma;
+    char *msg_pwd_hidden, *pos_pwd;
    t_irc_channel *ptr_channel;
    t_irc_nick *ptr_nick;
    
@@ -459,25 +547,25 @@ irc_cmd_send_msg (t_irc_server *server, char *arguments)
            }
            if (strcmp (arguments, "*") == 0)
            {
-                if (WIN_IS_SERVER(gui_current_window))
+                if (BUFFER_IS_SERVER(gui_current_window->buffer))
                {
-                    gui_printf (server->window,
+                    gui_printf (server->buffer,
                                _("%s \"%s\" command can not be executed on a server window\n"),
                                WEECHAT_ERROR, "msg *");
                    return -1;
                }
-                ptr_channel = CHANNEL(gui_current_window);
+                ptr_channel = CHANNEL(gui_current_window->buffer);
                ptr_nick = nick_search (ptr_channel, server->nick);
                if (ptr_nick)
                {
-                    irc_display_nick (ptr_channel->window, ptr_nick,
+                    irc_display_nick (ptr_channel->buffer, ptr_nick,
                                      MSG_TYPE_NICK, 1, 1, 0);
-                    gui_printf_color_type (ptr_channel->window,
+                    gui_printf_color_type (ptr_channel->buffer,
                                           MSG_TYPE_MSG,
                                           COLOR_WIN_CHAT, "%s\n", pos);
                }
                else
-                    gui_printf (server->window,
+                    gui_printf (server->buffer,
                                _("%s nick not found for \"%s\" command\n"),
                                WEECHAT_ERROR, "msg");
                server_sendf (server, "PRIVMSG %s :%s\r\n", ptr_channel->name, pos);
@@ -492,14 +580,14 @@ irc_cmd_send_msg (t_irc_server *server, char *arguments)
                        ptr_nick = nick_search (ptr_channel, server->nick);
                        if (ptr_nick)
                        {
-                            irc_display_nick (ptr_channel->window, ptr_nick,
+                            irc_display_nick (ptr_channel->buffer, ptr_nick,
                                              MSG_TYPE_NICK, 1, 1, 0);
-                            gui_printf_color_type (ptr_channel->window,
+                            gui_printf_color_type (ptr_channel->buffer,
                                                   MSG_TYPE_MSG,
                                                   COLOR_WIN_CHAT, "%s\n", pos);
                        }
                        else
-                            gui_printf (server->window,
+                            gui_printf (server->buffer,
                                        _("%s nick not found for \"%s\" command\n"),
                                        WEECHAT_ERROR, "msg");
                    }
@@ -507,32 +595,67 @@ irc_cmd_send_msg (t_irc_server *server, char *arguments)
                }
                else
                {
+                    /* message to nickserv with identify ? */
+                    if (strcmp (arguments, "nickserv") == 0)
+                    {
+                        msg_pwd_hidden = strdup (pos);
+                        if (cfg_log_hide_nickserv_pwd)
+                        {
+                            pos_pwd = strstr (msg_pwd_hidden, "identify ");
+                            if (!pos_pwd)
+                                pos_pwd = strstr (msg_pwd_hidden, "register ");
+                            if (pos_pwd)
+                            {
+                                pos_pwd += 9;
+                                while (pos_pwd[0])
+                                {
+                                    pos_pwd[0] = '*';
+                                    pos_pwd++;
+                                }
+                            }
+                        }
+                        gui_printf_color_type (server->buffer,
+                                               MSG_TYPE_NICK,
+                                               COLOR_WIN_CHAT_DARK, "-");
+                        gui_printf_color_type (server->buffer,
+                                               MSG_TYPE_NICK,
+                                               COLOR_WIN_CHAT_NICK, "%s", arguments);
+                        gui_printf_color_type (server->buffer,
+                                               MSG_TYPE_NICK,
+                                               COLOR_WIN_CHAT_DARK, "-");
+                        gui_printf_color (server->buffer,
+                                          COLOR_WIN_CHAT, " %s\n", msg_pwd_hidden);
+                        server_sendf (server, "PRIVMSG %s :%s\r\n", arguments, pos);
+                        free (msg_pwd_hidden);
+                        return 0;
+                    }
+                    
                    ptr_channel = channel_search (server, arguments);
                    if (!ptr_channel)
                    {
                        ptr_channel = channel_new (server, CHAT_PRIVATE, arguments, 1);
                        if (!ptr_channel)
                        {
-                            gui_printf (server->window,
+                            gui_printf (server->buffer,
                                        _("%s cannot create new private window \"%s\"\n"),
                                        WEECHAT_ERROR,
                                        arguments);
                            return -1;
                        }
-                        gui_redraw_window_title (ptr_channel->window);
+                        gui_draw_buffer_title (ptr_channel->buffer, 1);
                    }
                        
-                    gui_printf_color_type (ptr_channel->window,
+                    gui_printf_color_type (ptr_channel->buffer,
                                           MSG_TYPE_NICK,
                                           COLOR_WIN_CHAT_DARK, "<");
-                    gui_printf_color_type (ptr_channel->window,
+                    gui_printf_color_type (ptr_channel->buffer,
                                           MSG_TYPE_NICK,
                                           COLOR_WIN_NICK_SELF,
                                           "%s", server->nick);
-                    gui_printf_color_type (ptr_channel->window,
+                    gui_printf_color_type (ptr_channel->buffer,
                                           MSG_TYPE_NICK,
                                           COLOR_WIN_CHAT_DARK, "> ");
-                    gui_printf_color_type (ptr_channel->window,
+                    gui_printf_color_type (ptr_channel->buffer,
                                           MSG_TYPE_MSG,
                                           COLOR_WIN_CHAT, "%s\n", pos);
                    server_sendf (server, "PRIVMSG %s :%s\r\n", arguments, pos);
@@ -543,7 +666,7 @@ irc_cmd_send_msg (t_irc_server *server, char *arguments)
    }
    else
    {
-        gui_printf (server->window,
+        gui_printf (server->buffer,
                    _("%s wrong argument count for \"%s\" command\n"),
                    WEECHAT_ERROR, "msg");
        return -1;
@@ -562,16 +685,16 @@ irc_cmd_send_names (t_irc_server *server, char *arguments)
        server_sendf (server, "NAMES %s\r\n", arguments);
    else
    {
-        if (!WIN_IS_CHANNEL(gui_current_window))
+        if (!BUFFER_IS_CHANNEL(gui_current_window->buffer))
        {
-            gui_printf (server->window,
+            gui_printf (server->buffer,
                        _("%s \"%s\" command can only be executed in a channel window\n"),
                        WEECHAT_ERROR, "names");
            return -1;
        }
        else
            server_sendf (server, "NAMES %s\r\n",
-                          CHANNEL(gui_current_window)->name);
+                          CHANNEL(gui_current_window->buffer)->name);
    }
    return 0;
 }
@@ -596,7 +719,29 @@ irc_cmd_send_nick (t_irc_server *server, int argc, char **argv)
 int
 irc_cmd_send_notice (t_irc_server *server, char *arguments)
 {
-    server_sendf (server, "NOTICE %s\r\n", arguments);
+    char *pos;
+    
+    pos = strchr (arguments, ' ');
+    if (pos)
+    {
+        pos[0] = '\0';
+        pos++;
+        while (pos[0] == ' ')
+            pos++;
+        server_sendf (server, "NOTICE %s :%s\r\n", arguments, pos);
+        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);
+    }
+    else
+    {
+        gui_printf (server->buffer,
+                    _("%s wrong argument count for \"%s\" command\n"),
+                    WEECHAT_ERROR, "notice");
+        return -1;
+    }
    return 0;
 }

@@ -609,16 +754,16 @@ irc_cmd_send_op (t_irc_server *server, int argc, char **argv)
 {
    int i;
    
-    if (WIN_IS_CHANNEL(gui_current_window))
+    if (BUFFER_IS_CHANNEL(gui_current_window->buffer))
    {
        for (i = 0; i < argc; i++)
            server_sendf (server, "MODE %s +o %s\r\n",
-                          CHANNEL(gui_current_window)->name,
+                          CHANNEL(gui_current_window->buffer)->name,
                          argv[i]);
    }
    else
    {
-        gui_printf (server->window,
+        gui_printf (server->buffer,
                    _("%s \"%s\" command can only be executed in a channel window\n"),
                    WEECHAT_ERROR, "op");
        return -1;
@@ -663,36 +808,36 @@ irc_cmd_send_part (t_irc_server *server, char *arguments)
        }
        else
        {
-            if (WIN_IS_SERVER(gui_current_window))
+            if (BUFFER_IS_SERVER(gui_current_window->buffer))
            {
-                gui_printf (server->window,
+                gui_printf (server->buffer,
                            _("%s \"%s\" command can not be executed on a server window\n"),
                            WEECHAT_ERROR, "part");
                return -1;
            }
-            channel_name = CHANNEL(gui_current_window)->name;
+            channel_name = CHANNEL(gui_current_window->buffer)->name;
            pos_args = arguments;
        }
    }
    else
    {
-        if (WIN_IS_SERVER(gui_current_window))
+        if (BUFFER_IS_SERVER(gui_current_window->buffer))
        {
-            gui_printf (server->window,
+            gui_printf (server->buffer,
                        _("%s \"%s\" command can not be executed on a server window\n"),
                        WEECHAT_ERROR, "part");
            return -1;
        }
-        if (WIN_IS_PRIVATE(gui_current_window))
+        if (BUFFER_IS_PRIVATE(gui_current_window->buffer))
        {
-            ptr_channel = CHANNEL(gui_current_window);
-            gui_window_free (ptr_channel->window);
+            ptr_channel = CHANNEL(gui_current_window->buffer);
+            gui_buffer_free (ptr_channel->buffer, 1);
            channel_free (server, ptr_channel);
-            gui_redraw_window_status (gui_current_window);
-            gui_redraw_window_input (gui_current_window);
+            gui_draw_buffer_status (gui_current_window->buffer, 1);
+            gui_draw_buffer_input (gui_current_window->buffer, 1);
            return 0;
        }
-        channel_name = CHANNEL(gui_current_window)->name;
+        channel_name = CHANNEL(gui_current_window->buffer)->name;
        pos_args = NULL;
    }
    
@@ -734,6 +879,7 @@ irc_cmd_send_query (t_irc_server *server, char *arguments)
 {
    char *pos;
    t_irc_channel *ptr_channel;
+    t_gui_buffer *ptr_buffer;
    
    pos = strchr (arguments, ' ');
    if (pos)
@@ -753,29 +899,41 @@ irc_cmd_send_query (t_irc_server *server, char *arguments)
        ptr_channel = channel_new (server, CHAT_PRIVATE, arguments, 1);
        if (!ptr_channel)
        {
-            gui_printf (server->window,
+            gui_printf (server->buffer,
                        _("%s cannot create new private window \"%s\"\n"),
                        WEECHAT_ERROR,
                        arguments);
            return -1;
        }
-        gui_redraw_window_title (ptr_channel->window);
+        gui_draw_buffer_title (ptr_channel->buffer, 1);
+    }
+    else
+    {
+        for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer)
+        {
+            if (ptr_buffer->channel == ptr_channel)
+            {
+                gui_switch_to_buffer (gui_current_window, ptr_buffer);
+                gui_redraw_buffer (ptr_buffer);
+                break;
+            }
+        }
    }
    
    /* display text if given */
    if (pos)
    {        
-        gui_printf_color_type (ptr_channel->window,
+        gui_printf_color_type (ptr_channel->buffer,
                               MSG_TYPE_NICK,
                               COLOR_WIN_CHAT_DARK, "<");
-        gui_printf_color_type (ptr_channel->window,
+        gui_printf_color_type (ptr_channel->buffer,
                                MSG_TYPE_NICK,
                                COLOR_WIN_NICK_SELF,
                                "%s", server->nick);
-        gui_printf_color_type (ptr_channel->window,
+        gui_printf_color_type (ptr_channel->buffer,
                                MSG_TYPE_NICK,
                                COLOR_WIN_CHAT_DARK, "> ");
-        gui_printf_color_type (ptr_channel->window,
+        gui_printf_color_type (ptr_channel->buffer,
                                MSG_TYPE_MSG,
                                COLOR_WIN_CHAT, "%s\n", pos);
        server_sendf (server, "PRIVMSG %s :%s\r\n", arguments, pos);
@@ -970,14 +1128,14 @@ irc_cmd_send_topic (t_irc_server *server, char *arguments)
    /* look for current channel if not specified */
    if (!channel_name)
    {
-        if (WIN_IS_SERVER(gui_current_window))
+        if (BUFFER_IS_SERVER(gui_current_window->buffer))
        {
-            gui_printf (server->window,
+            gui_printf (server->buffer,
                        _("%s \"%s\" command can not be executed on a server window\n"),
                        WEECHAT_ERROR, "topic");
            return -1;
        }
-        channel_name = CHANNEL(gui_current_window)->name;
+        channel_name = CHANNEL(gui_current_window->buffer)->name;
    }
    
    if (new_topic)
@@ -1040,8 +1198,8 @@ irc_cmd_send_version (t_irc_server *server, char *arguments)
 {
    if (arguments)
    {
-        if (WIN_IS_CHANNEL(gui_current_window) &&
-            nick_search (CHANNEL(gui_current_window), arguments))
+        if (BUFFER_IS_CHANNEL(gui_current_window->buffer) &&
+            nick_search (CHANNEL(gui_current_window->buffer), arguments))
            server_sendf (server, "PRIVMSG %s :\01VERSION\01\r\n",
                          arguments);
        else
@@ -1050,8 +1208,8 @@ irc_cmd_send_version (t_irc_server *server, char *arguments)
    }
    else
    {
-        irc_display_prefix (server->window, PREFIX_INFO);
-        gui_printf (server->window, _("%s, compiled on %s %s\n"),
+        irc_display_prefix (server->buffer, PREFIX_INFO);
+        gui_printf (server->buffer, _("%s, compiled on %s %s\n"),
                    PACKAGE_STRING,
                    __DATE__, __TIME__);
        server_sendf (server, "VERSION\r\n");
@@ -1068,16 +1226,16 @@ irc_cmd_send_voice (t_irc_server *server, int argc, char **argv)
 {
    int i;
    
-    if (WIN_IS_CHANNEL(gui_current_window))
+    if (BUFFER_IS_CHANNEL(gui_current_window->buffer))
    {
        for (i = 0; i < argc; i++)
            server_sendf (server, "MODE %s +v %s\r\n",
-                          CHANNEL(gui_current_window)->name,
+                          CHANNEL(gui_current_window->buffer)->name,
                          argv[i]);
    }
    else
    {
-        gui_printf (server->window,
+        gui_printf (server->buffer,
                    _("%s \"%s\" command can only be executed in a channel window\n"),
                    WEECHAT_ERROR, "voice");
        return -1;
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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
@@ -44,7 +44,6 @@

 t_irc_server *irc_servers = NULL;
 t_irc_server *last_irc_server = NULL;
-t_irc_server *current_irc_server = NULL;

 t_irc_message *recv_msgq, *msgq_last_msg;

@@ -60,7 +59,9 @@ void
 server_init (t_irc_server *server)
 {
    server->name = NULL;
-    server->autoconnect = 0;
+    server->autoconnect = 1;
+    server->autoreconnect = 1;
+    server->autoreconnect_delay = 30;
    server->command_line = 0;
    server->address = NULL;
    server->port = -1;
@@ -71,14 +72,17 @@ server_init (t_irc_server *server)
    server->username = NULL;
    server->realname = NULL;
    server->command = NULL;
+    server->command_delay = 1;
    server->autojoin = NULL;
    server->nick = NULL;
    server->is_connected = 0;
+    server->reconnect_start = 0;
+    server->reconnect_join = 0;
    server->sock4 = -1;
    server->is_away = 0;
    server->server_read = -1;
    server->server_write = -1;
-    server->window = NULL;
+    server->buffer = NULL;
    server->channels = NULL;
    server->last_channel = NULL;
 }
@@ -270,8 +274,6 @@ server_free (t_irc_server *server)
        (server->next_server)->prev_server = server->prev_server;
    
    server_destroy (server);
-    if (server->window)
-        gui_window_free (server->window);
    free (server);
    irc_servers = new_irc_servers;
 }
@@ -293,9 +295,11 @@ server_free_all ()
 */

 t_irc_server *
-server_new (char *name, int autoconnect, int command_line, char *address,
-            int port, char *password, char *nick1, char *nick2, char *nick3,
-            char *username, char *realname, char *command, char *autojoin)
+server_new (char *name, int autoconnect, int autoreconnect, int autoreconnect_delay,
+            int command_line, char *address, int port, char *password,
+            char *nick1, char *nick2, char *nick3, char *username,
+            char *realname, char *command, int command_delay, char *autojoin,
+            int autorejoin)
 {
    t_irc_server *new_server;
    
@@ -305,17 +309,20 @@ server_new (char *name, int autoconnect, int command_line, char *address,
    #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)\n",
+                    "command:%s, autojoin:%s, autorejoin:%s)\n",
                    name, address, port, (password) ? password : "",
                    (nick1) ? nick1 : "", (nick2) ? nick2 : "", (nick3) ? nick3 : "",
                    (username) ? username : "", (realname) ? realname : "",
-                    (command) ? command : "", (autojoin) ? autojoin : "");
+                    (command) ? command : "", (autojoin) ? autojoin : "",
+                    (autorejoin) ? "on" : "off");
    #endif
    
    if ((new_server = server_alloc ()))
    {
        new_server->name = strdup (name);
        new_server->autoconnect = autoconnect;
+        new_server->autoreconnect = autoreconnect;
+        new_server->autoreconnect_delay = autoreconnect_delay;
        new_server->command_line = command_line;
        new_server->address = strdup (address);
        new_server->port = port;
@@ -329,8 +336,10 @@ server_new (char *name, int autoconnect, int command_line, char *address,
            (realname) ? strdup (realname) : strdup ("realname");
        new_server->command =
            (command) ? strdup (command) : NULL;
+        new_server->command_delay = command_delay;
        new_server->autojoin =
            (autojoin) ? strdup (autojoin) : NULL;
+        new_server->autorejoin = autorejoin;
        new_server->nick = strdup (new_server->nick1);
    }
    else
@@ -377,11 +386,11 @@ server_sendf (t_irc_server * server, char *fmt, ...)
        size_buf = strlen (buffer);
    buffer[size_buf - 2] = '\0';
    #ifdef DEBUG
-    gui_printf (server->window, "[DEBUG] Sending to server >>> %s\n", buffer);
+    gui_printf (server->buffer, "[DEBUG] Sending to server >>> %s\n", buffer);
    #endif
    buffer[size_buf - 2] = '\r';
    if (server_send (server, buffer, size_buf) <= 0)
-        gui_printf (server->window, _("%s error sending data to IRC server\n"),
+        gui_printf (server->buffer, _("%s error sending data to IRC server\n"),
                    WEECHAT_ERROR);
 }

@@ -397,7 +406,7 @@ server_msgq_add_msg (t_irc_server *server, char *msg)
    message = (t_irc_message *) malloc (sizeof (t_irc_message));
    if (!message)
    {
-        gui_printf (server->window,
+        gui_printf (server->buffer,
                    _("%s not enough memory for received IRC message\n"),
                    WEECHAT_ERROR);
        return;
@@ -408,7 +417,7 @@ server_msgq_add_msg (t_irc_server *server, char *msg)
        message->data = (char *) malloc (strlen (unterminated_message) +
                                         strlen (msg) + 1);
        if (!message->data)
-            gui_printf (server->window,
+            gui_printf (server->buffer,
                        _("%s not enough memory for received IRC message\n"),
                        WEECHAT_ERROR);
        else
@@ -455,23 +464,33 @@ server_msgq_add_buffer (t_irc_server * server, char *buffer)
        }
        else
        {
-            pos = strchr (buffer, '\0');
+            pos = strstr (buffer, "\n");
            if (pos)
            {
-                unterminated_message =
-                    (char *) realloc (unterminated_message,
-                                      strlen (buffer) + 1);
-                if (!unterminated_message)
-                    gui_printf (server->window,
-                                _("%s not enough memory for received IRC message\n"),
-                                WEECHAT_ERROR);
-                else
-                    strcpy (unterminated_message, buffer);
-                return;
+                pos[0] = '\0';
+                server_msgq_add_msg (server, buffer);
+                buffer = pos + 1;
+            }
+            else
+            {
+                pos = strchr (buffer, '\0');
+                if (pos)
+                {
+                    unterminated_message =
+                        (char *) realloc (unterminated_message,
+                                          strlen (buffer) + 1);
+                    if (!unterminated_message)
+                        gui_printf (server->buffer,
+                                    _("%s not enough memory for received IRC message\n"),
+                                    WEECHAT_ERROR);
+                    else
+                        strcpy (unterminated_message, buffer);
+                    return;
+                }
+                gui_printf (server->buffer,
+                            _("%s unable to explode received buffer\n"),
+                            WEECHAT_ERROR);
            }
-            gui_printf (server->window,
-                        _("%s unable to explode received buffer\n"),
-                        WEECHAT_ERROR);
        }
    }
 }
@@ -493,7 +512,7 @@ server_msgq_flush ()
        if (recv_msgq->data)
        {
            #ifdef DEBUG
-            gui_printf (gui_current_window, "[DEBUG] %s\n", recv_msgq->data);
+            gui_printf (gui_current_window->buffer, "[DEBUG] %s\n", recv_msgq->data);
            #endif
            
            ptr_data = recv_msgq->data;
@@ -542,15 +561,15 @@ server_msgq_flush ()
                                          command, args))
                {
                    case -1:
-                        gui_printf (recv_msgq->server->window,
+                        gui_printf (recv_msgq->server->buffer,
                                    _("Command '%s' failed!\n"), command);
                        break;
                    case -2:
-                        gui_printf (recv_msgq->server->window,
+                        gui_printf (recv_msgq->server->buffer,
                                    _("No command to execute!\n"));
                        break;
                    case -3:
-                        gui_printf (recv_msgq->server->window,
+                        gui_printf (recv_msgq->server->buffer,
                                    _("Unknown command: cmd=%s, args=%s\n"),
                                    command, args);
                        break;
@@ -586,6 +605,13 @@ server_recv (t_irc_server *server)
        server_msgq_add_buffer (server, buffer);
        server_msgq_flush ();
    }
+    else
+    {
+        gui_printf (server->buffer,
+                    _("%s cannot read data from socket, disconnecting from server...\n"),
+                    WEECHAT_ERROR);
+        server_disconnect (server, 1);
+    }
 }

 /*
@@ -602,7 +628,7 @@ server_connect (t_irc_server *server)
    int error;
    int server_pipe[2];

-    gui_printf (server->window,
+    gui_printf (server->buffer,
                _("%s: connecting to %s:%d...\n"),
                PACKAGE_NAME, server->address, server->port);
    wee_log_printf (_("connecting to server %s:%d...\n"),
@@ -612,7 +638,7 @@ server_connect (t_irc_server *server)
    /* create pipe */
    if (pipe (server_pipe) < 0)
    {
-        gui_printf (server->window,
+        gui_printf (server->buffer,
                    _("%s cannot create pipe\n"), WEECHAT_ERROR);
        server_free (server);
        return 0;
@@ -626,14 +652,14 @@ server_connect (t_irc_server *server)
    if (setsockopt
        (server->sock4, SOL_SOCKET, SO_REUSEADDR, (char *) &set,
         sizeof (set)) == -1)
-        gui_printf (server->window,
+        gui_printf (server->buffer,
                    _("%s cannot set socket option \"SO_REUSEADDR\"\n"),
                    WEECHAT_ERROR);
    set = 1;
    if (setsockopt
        (server->sock4, SOL_SOCKET, SO_KEEPALIVE, (char *) &set,
         sizeof (set)) == -1)
-        gui_printf (server->window,
+        gui_printf (server->buffer,
                    _("%s cannot set socket option \"SO_KEEPALIVE\"\n"),
                    WEECHAT_ERROR);

@@ -641,7 +667,7 @@ server_connect (t_irc_server *server)
    ip4_hostent = gethostbyname (server->address);
    if (!ip4_hostent)
    {
-        gui_printf (server->window,
+        gui_printf (server->buffer,
                    _("%s address \"%s\" not found\n"),
                    WEECHAT_ERROR, server->address);
        close (server->server_read);
@@ -657,14 +683,14 @@ server_connect (t_irc_server *server)
    /*error = bind(server->sock4, (struct sockaddr *)(&addr), sizeof(addr));
    if (error != 0)
    {
-        gui_printf (server->window,
+        gui_printf (server->buffer,
                    WEECHAT_ERORR "server_connect: can't bind to hostname\n");
        return 0;
    } */
    ip_address = inet_ntoa (addr.sin_addr);
    if (!ip_address)
    {
-        gui_printf (server->window,
+        gui_printf (server->buffer,
                    _("%s IP address not found\n"), WEECHAT_ERROR);
        close (server->server_read);
        close (server->server_write);
@@ -674,13 +700,13 @@ server_connect (t_irc_server *server)
    }

    /* connection to server */
-    gui_printf (server->window,
+    gui_printf (server->buffer,
                _("%s: server IP is: %s\n"), PACKAGE_NAME, ip_address);

    error = connect (server->sock4, (struct sockaddr *) &addr, sizeof (addr));
    if (error != 0)
    {
-        gui_printf (server->window,
+        gui_printf (server->buffer,
                    _("%s cannot connect to irc server\n"), WEECHAT_ERROR);
        close (server->server_read);
        close (server->server_write);
@@ -688,11 +714,34 @@ server_connect (t_irc_server *server)
        server->sock4 = -1;
        return 0;
    }
-
-    current_irc_server = server;
+    
    return 1;
 }

+/*
+ * server_reconnect: reconnect to a server (after disconnection)
+ */
+
+void
+server_reconnect (t_irc_server *server)
+{
+    gui_printf (server->buffer, _("%s: Reconnecting to server...\n"),
+                PACKAGE_NAME);
+    server->reconnect_start = 0;
+    
+    if (server_connect (server))
+    {
+        server->reconnect_join = 1;
+        irc_login (server);
+    }
+    else
+    {
+        server->reconnect_start = time (NULL);
+        gui_printf (server->buffer, _("%s: Reconnecting to server in %d seconds\n"),
+                    PACKAGE_NAME, server->autoreconnect_delay);
+    }
+}
+
 /*
 * server_auto_connect: auto-connect to servers (called at startup)
 */
@@ -708,7 +757,7 @@ server_auto_connect (int command_line)
        if ( ((command_line) && (ptr_server->command_line))
            || ((!command_line) && (ptr_server->autoconnect)) )
        {
-            (void) gui_window_new (ptr_server, NULL, 1);
+            (void) gui_buffer_new (gui_current_window, ptr_server, NULL, 0, 1);
            if (server_connect (ptr_server))
                irc_login (ptr_server);
        }
@@ -720,27 +769,49 @@ server_auto_connect (int command_line)
 */

 void
-server_disconnect (t_irc_server *server)
+server_disconnect (t_irc_server *server, int reconnect)
 {
    t_irc_channel *ptr_channel;
    
    if (server->is_connected)
    {
-        /* write disconnection message on each channel/private window */
+        /* write disconnection message on each channel/private buffer */
        for (ptr_channel = server->channels; ptr_channel;
             ptr_channel = ptr_channel->next_channel)
        {
-            irc_display_prefix (ptr_channel->window, PREFIX_INFO);
-            gui_printf (ptr_channel->window, _("Disconnected from server!\n"));
+            nick_free_all (ptr_channel);
+            irc_display_prefix (ptr_channel->buffer, PREFIX_INFO);
+            gui_printf (ptr_channel->buffer, _("Disconnected from server!\n"));
        }
-        
-        /* close communication with server */
-        close (server->server_read);
-        close (server->server_write);
-        close (server->sock4);
-        server->is_connected = 0;
-        server->sock4 = -1;
+        gui_draw_buffer_nick (gui_current_window->buffer, 1);
+        gui_draw_buffer_status (gui_current_window->buffer, 1);
    }
+    
+    /* close communication with server */
+    if (server->server_read >= 0)
+        close (server->server_read);
+    server->server_read = -1;
+    
+    if (server->server_write >= 0)
+        close (server->server_write);
+    server->server_write = -1;
+    
+    
+    if (server->sock4 >= 0)
+        close (server->sock4);
+    server->sock4 = -1;
+    
+    server->is_connected = 0;
+    server->is_away = 0;
+    
+    if ((reconnect) && (server->autoreconnect))
+    {
+        server->reconnect_start = time (NULL);
+        gui_printf (server->buffer, _("%s: Reconnecting to server in %d seconds\n"),
+                    PACKAGE_NAME, server->autoreconnect_delay);
+    }
+    else
+        server->reconnect_start = 0;
 }

 /*
@@ -753,7 +824,7 @@ server_disconnect_all ()
    t_irc_server *ptr_server;
    
    for (ptr_server = irc_servers; ptr_server; ptr_server = ptr_server->next_server)
-        server_disconnect (ptr_server);
+        server_disconnect (ptr_server, 0);
 }

 /*
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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
@@ -21,8 +21,11 @@
 #ifndef __WEECHAT_IRC_H
 #define __WEECHAT_IRC_H 1

+#include <time.h>
 #include "../gui/gui.h"

+/* prefixes for chat window */
+
 #define PREFIX_SERVER    "-@-"
 #define PREFIX_INFO      "-=-"
 #define PREFIX_ACTION_ME "-*-"
@@ -34,6 +37,8 @@

 #define CHANNEL_PREFIX "#&+!"

+/* channel modes */
+
 #define NUM_CHANNEL_MODES       7
 #define CHANNEL_MODE_INVITE     0
 #define CHANNEL_MODE_KEY        1
@@ -50,6 +55,20 @@

 #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                  */
+
 /* nick types */

 typedef struct t_irc_nick t_irc_nick;
@@ -83,7 +102,7 @@ struct t_irc_channel
    char *key;                      /* channel key (NULL if no key is set)  */
    t_irc_nick *nicks;              /* nicks on the channel                 */
    t_irc_nick *last_nick;          /* last nick on the channel             */
-    t_gui_window *window;           /* GUI window allocated for 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                 */
 };
@@ -97,6 +116,8 @@ 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)    */
@@ -107,16 +128,21 @@ struct t_irc_server
    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     */
    
    /* internal vars */
    char *nick;                     /* current nickname                     */
    int is_connected;               /* 1 if WeeChat is connected to server  */
+    time_t reconnect_start;         /* this time + delay = reconnect time   */
+    int reconnect_join;             /* 1 if channels opened to rejoin       */
    int sock4;                      /* socket for server                    */
    int is_away;                    /* 1 is user is marker as away          */
+    time_t away_time;               /* time() when user marking as away     */
    int server_read;                /* pipe for reading server data         */
    int server_write;               /* pipe for sending data to server      */
-    t_gui_window *window;           /* GUI window allocated for server      */
+    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              */
@@ -143,6 +169,8 @@ struct t_irc_command
                                    /* function called when cmd is received */
 };

+/* irc messages */
+
 typedef struct t_irc_message t_irc_message;

 struct t_irc_message
@@ -152,10 +180,34 @@ struct t_irc_message
    t_irc_message *next_message;    /* link to next message                 */
 };

+/* DCC */
+
+typedef struct t_dcc t_dcc;
+
+struct t_dcc
+{
+    t_irc_server *server;           /* irc server                           */
+    int type;                       /* DCC type (send or receive)           */
+    int status;                     /* DCC status (waiting, sending, ..)    */
+    unsigned long addr;             /* IP address                           */
+    int port;                       /* port                                 */
+    char *nick;                     /* remote nick                          */
+    int sock;                       /* socket for connection                */
+    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        */
+    t_dcc *prev_dcc;                /* link to previous dcc file/chat       */
+    t_dcc *next_dcc;                /* link to next dcc file/chat           */
+};
+
 extern t_irc_command irc_commands[];
-extern t_irc_server *irc_servers, *current_irc_server;
+extern t_irc_server *irc_servers;
 extern t_irc_message *recv_msgq, *msgq_last_msg;
-extern t_irc_channel *current_channel;
+extern t_dcc *dcc_list;
+extern char *dcc_status_string[6];
 extern char *channel_modes;

 /* server functions (irc-server.c) */
@@ -166,14 +218,16 @@ extern t_irc_server *server_alloc ();
 extern void server_destroy (t_irc_server *);
 extern void server_free (t_irc_server *);
 extern void server_free_all ();
-extern t_irc_server *server_new (char *, int, int, char *, int, char *, char *,
-                                 char *, char *, char *, char *, char *, char *);
+extern t_irc_server *server_new (char *, int, int, int, int, char *, int, char *,
+                                 char *, char *, char *, char *, char *, char *,
+                                 int, char *, int);
 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 int server_connect ();
+extern int server_connect (t_irc_server *);
+extern void server_reconnect (t_irc_server *);
 extern void server_auto_connect (int);
-extern void server_disconnect (t_irc_server *);
+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 ();
@@ -201,12 +255,19 @@ extern int nick_get_max_length (t_irc_channel *);
 /* DCC functions (irc-dcc.c) */

 extern void dcc_send ();
+extern void dcc_free (t_dcc *);
+extern void dcc_close (t_dcc *, int);
+extern void dcc_accept (t_dcc *);
+extern t_dcc *dcc_add (t_irc_server *, int, unsigned long, int, char *, char *,
+                       unsigned int);
+extern void dcc_handle ();
+extern void dcc_end ();

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

-extern void irc_display_prefix (/*@null@*/ t_gui_window *, char *);
-extern void irc_display_nick (t_gui_window *, t_irc_nick *, int, int, int, int);
-extern void irc_display_mode (t_gui_window *, char *, char, char *, char *,
+extern void irc_display_prefix (/*@null@*/ t_gui_buffer *, char *);
+extern void irc_display_nick (t_gui_buffer *, t_irc_nick *, int, int, int, int);
+extern void irc_display_mode (t_gui_buffer *, char *, char, char *, char *,
                              char *, char *);

 /* IRC protocol (irc-commands.c) */
@@ -230,6 +291,8 @@ extern int irc_cmd_send_kill (t_irc_server *, char *);
 extern int irc_cmd_send_links (t_irc_server *, char *);
 extern int irc_cmd_send_list (t_irc_server *, char *);
 extern int irc_cmd_send_lusers (t_irc_server *, char *);
+extern int irc_send_me (t_irc_server *, t_irc_channel *, char *);
+extern int irc_send_me_all_channels (t_irc_server *, char *);
 extern int irc_cmd_send_me (t_irc_server *, char *);
 extern int irc_cmd_send_mode (t_irc_server *, char *);
 extern int irc_cmd_send_motd (t_irc_server *, char *);
@@ -1,4 +1,4 @@
-# Copyright (c) 2004 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2005 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
@@ -1,4 +1,4 @@
-# Copyright (c) 2004 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2005 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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
@@ -120,7 +120,7 @@ static XS (XS_IRC_register)
 }

 /*
- * IRC::print: print message to current window
+ * IRC::print: print message to current buffer
 */

 static XS (XS_IRC_print)
@@ -135,8 +135,8 @@ static XS (XS_IRC_print)
    for (i = 0; i < items; i++)
    {
        message = SvPV (ST (i), integer);
-        irc_display_prefix (gui_current_window, PREFIX_PLUGIN);
-        gui_printf (gui_current_window, "%s", message);
+        irc_display_prefix (gui_current_window->buffer, PREFIX_PLUGIN);
+        gui_printf (gui_current_window->buffer, "%s", message);
    }
    
    XSRETURN_EMPTY;
@@ -151,7 +151,7 @@ static XS (XS_IRC_print_with_channel)
 {
    int integer;
    char *message, *channel, *server = NULL;
-    t_gui_window *ptr_window;
+    t_gui_buffer *ptr_buffer;
    t_irc_server *ptr_server;
    t_irc_channel *ptr_channel;
    dXSARGS;
@@ -167,9 +167,9 @@ static XS (XS_IRC_print_with_channel)
            server = NULL;
    }
    
-    /* look for window for printing message */
+    /* look for buffer for printing message */
    channel = SvPV (ST (1), integer);
-    ptr_window = NULL;
+    ptr_buffer = NULL;
    for (ptr_server = irc_servers; ptr_server;
         ptr_server = ptr_server->next_server)
    {
@@ -180,25 +180,25 @@ static XS (XS_IRC_print_with_channel)
            {
                if (strcasecmp (ptr_channel->name, channel) == 0)
                {
-                    ptr_window = ptr_channel->window;
+                    ptr_buffer = ptr_channel->buffer;
                    break;
                }
            }
        }
-        if (ptr_window)
+        if (ptr_buffer)
            break;
    }
    
-    /* window found => display message & return 1 */
-    if (ptr_window)
+    /* buffer found => display message & return 1 */
+    if (ptr_buffer)
    {
        message = SvPV (ST (0), integer);
-        irc_display_prefix (ptr_window, PREFIX_PLUGIN);
-        gui_printf (ptr_window, "%s", message);
+        irc_display_prefix (ptr_buffer, PREFIX_PLUGIN);
+        gui_printf (ptr_buffer, "%s", message);
        XSRETURN_YES;
    }
        
-    /* no window found => return 0 */
+    /* no buffer found => return 0 */
    XSRETURN_NO;
 }

@@ -226,6 +226,55 @@ static XS (XS_IRC_print_infobar)
    XSRETURN_EMPTY;
 }

+/*
+ * IRC::command: send command to server
+ */
+
+static XS (XS_IRC_command)
+{
+    int integer;
+    char *server, *command, *command2;
+    t_irc_server *ptr_server;
+    dXSARGS;
+    
+    /* make gcc happy */
+    (void) cv;
+    
+    if (items == 2)
+    {
+        server = SvPV (ST (0), integer);
+        command = SvPV (ST (1), integer);
+        for (ptr_server = irc_servers; ptr_server; ptr_server = ptr_server->next_server)
+        {
+            if (strcasecmp (ptr_server->name, server) == 0)
+                break;
+        }
+        if (!ptr_server)
+        {
+            irc_display_prefix (NULL, PREFIX_ERROR);
+            gui_printf (NULL,
+                        _("Perl error: server not found for IRC::command Perl function\n"));
+        }
+    }
+    else
+    {
+        ptr_server = SERVER(gui_current_window->buffer);
+        command = SvPV (ST (0), integer);
+    }
+    
+    if (ptr_server)
+    {
+        command2 = (char *) malloc (strlen (command) + 8);
+        strcpy (command2, command);
+        if (!strstr (command2, "\r\n"))
+            strcat (command2, "\r\n");
+        server_sendf (ptr_server, command2);
+        free (command2);
+    }
+    
+    XSRETURN_EMPTY;
+}
+
 /*
 * IRC::add_message_handler: add handler for messages (privmsg, ...)
 */
@@ -284,17 +333,37 @@ static XS (XS_IRC_add_command_handler)

 static XS (XS_IRC_get_info)
 {
-    char *arg, *info = NULL;
+    char *arg, *info = NULL, *server;
+    t_irc_server *ptr_server;
    int integer;
    dXSARGS;
    
    /* make gcc happy */
-    (void) items;
    (void) cv;
    
-    arg = SvPV (ST (0), integer);
+    if (items == 2)
+    {
+        server = SvPV (ST (0), integer);
+        arg = SvPV (ST (1), integer);
+        for (ptr_server = irc_servers; ptr_server; ptr_server = ptr_server->next_server)
+        {
+            if (strcasecmp (ptr_server->name, server) == 0)
+                break;
+        }
+        if (!ptr_server)
+        {
+            irc_display_prefix (NULL, PREFIX_ERROR);
+            gui_printf (NULL,
+                        _("Perl error: server not found for IRC::get_info Perl function\n"));
+        }
+    }
+    else
+    {
+        ptr_server = SERVER(gui_current_window->buffer);
+        arg = SvPV (ST (0), integer);
+    }
    
-    if (arg)
+    if (ptr_server && arg)
    {
    
        if ( (strcasecmp (arg, "0") == 0) || (strcasecmp (arg, "version") == 0) )
@@ -303,16 +372,18 @@ static XS (XS_IRC_get_info)
        }
        else if ( (strcasecmp (arg, "1") == 0) || (strcasecmp (arg, "nick") == 0) )
        {
-            info = current_irc_server->nick;
+            if (ptr_server->nick)
+                info = ptr_server->nick;
        }
        else if ( (strcasecmp (arg, "2") == 0) || (strcasecmp (arg, "channel") == 0) )
        {
-            if (WIN_IS_CHANNEL (gui_current_window))
-                info = CHANNEL (gui_current_window)->name;
+            if (BUFFER_IS_CHANNEL (gui_current_window->buffer))
+                info = CHANNEL (gui_current_window->buffer)->name;
        }
        else if ( (strcasecmp (arg, "3") == 0) || (strcasecmp (arg, "server") == 0) )
        {
-            info = current_irc_server->name;
+            if (ptr_server->name)
+                info = ptr_server->name;
        }
        else if ( (strcasecmp (arg, "4") == 0) || (strcasecmp (arg, "weechatdir") == 0) )
        {
@@ -320,7 +391,7 @@ static XS (XS_IRC_get_info)
        }
        else if ( (strcasecmp (arg, "5") == 0) || (strcasecmp (arg, "away") == 0) )
        {
-            XST_mIV (0, current_irc_server->is_away);
+            XST_mIV (0, SERVER(gui_current_window->buffer)->is_away);
            XSRETURN (1);
            return;
        }
@@ -346,6 +417,7 @@ xs_init (pTHX)
    newXS ("IRC::print", XS_IRC_print, "IRC");
    newXS ("IRC::print_with_channel", XS_IRC_print_with_channel, "IRC");
    newXS ("IRC::print_infobar", XS_IRC_print_infobar, "IRC");
+    newXS ("IRC::command", XS_IRC_command, "IRC");
    newXS ("IRC::add_message_handler", XS_IRC_add_message_handler, "IRC");
    newXS ("IRC::add_command_handler", XS_IRC_add_command_handler, "IRC");
    newXS ("IRC::get_info", XS_IRC_get_info, "IRC");
@@ -424,9 +496,9 @@ wee_perl_search (char *name)
 */

 int
-wee_perl_exec (char *function, char *arguments)
+wee_perl_exec (char *function, char *server, char *arguments)
 {
-    char *argv[2];
+    char *argv[3];
    int count, return_code;
    SV *sv;
    
@@ -435,8 +507,12 @@ wee_perl_exec (char *function, char *arguments)
    ENTER;
    SAVETMPS;
    PUSHMARK(sp);
-    argv[0] = arguments;
-    argv[1] = NULL;
+    if (!server)
+        argv[0] = strdup ("");
+    else
+        argv[0] = server;
+    argv[1] = arguments;
+    argv[2] = NULL;
    count = perl_call_argv (function, G_EVAL | G_SCALAR, argv);
    SPAGAIN;
    
@@ -480,7 +556,9 @@ wee_perl_load (char *filename)
 {
    /* execute Perl script */
    wee_log_printf (_("loading Perl script \"%s\"\n"), filename);
-    return wee_perl_exec ("wee_perl_load_eval_file", filename);
+    irc_display_prefix (NULL, PREFIX_PLUGIN);
+    gui_printf (NULL, _("Loading Perl script \"%s\"\n"), filename);
+    return wee_perl_exec ("wee_perl_load_eval_file", filename, "");
 }

 /*
@@ -533,7 +611,7 @@ wee_perl_unload (t_plugin_script *ptr_perl_script)
        
        /* call shutdown callback function */
        if (ptr_perl_script->shutdown_func[0])
-            wee_perl_exec (ptr_perl_script->shutdown_func, "");
+            wee_perl_exec (ptr_perl_script->shutdown_func, "", "");
        wee_perl_script_free (ptr_perl_script);
    }
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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
@@ -25,7 +25,7 @@

 extern void wee_perl_init ();
 extern t_plugin_script *wee_perl_search (char *);
-extern int wee_perl_exec (char *, char *);
+extern int wee_perl_exec (char *, char *, char *);
 extern int wee_perl_load (char *);
 extern void wee_perl_unload (t_plugin_script *);
 extern void wee_perl_unload_all ();
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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
@@ -273,7 +273,7 @@ plugin_handler_free_all_type (t_plugin_handler **plugin_handlers,
 */

 void
-plugin_event_msg (char *irc_command, char *arguments)
+plugin_event_msg (char *irc_command, char *arguments, char *server)
 {
    #ifdef PLUGINS
    t_plugin_handler *ptr_plugin_handler;
@@ -285,7 +285,7 @@ plugin_event_msg (char *irc_command, char *arguments)
        {
            #ifdef PLUGIN_PERL
            if (ptr_plugin_handler->plugin_type == PLUGIN_TYPE_PERL)
-                wee_perl_exec (ptr_plugin_handler->function_name, arguments);
+                wee_perl_exec (ptr_plugin_handler->function_name, arguments, server);
            #endif
        }
    }
@@ -301,7 +301,7 @@ plugin_event_msg (char *irc_command, char *arguments)
 */

 int
-plugin_exec_command (char *user_command, char *arguments)
+plugin_exec_command (char *user_command, char *arguments, char *server)
 {
    #ifdef PLUGINS
    t_plugin_handler *ptr_plugin_handler;
@@ -313,7 +313,7 @@ plugin_exec_command (char *user_command, char *arguments)
        {
            #ifdef PLUGIN_PERL
            if (ptr_plugin_handler->plugin_type == PLUGIN_TYPE_PERL)
-                wee_perl_exec (ptr_plugin_handler->function_name, arguments);
+                wee_perl_exec (ptr_plugin_handler->function_name, arguments, server);
            #endif
            
            /* command executed */
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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
@@ -59,6 +59,7 @@ extern t_plugin_handler *last_plugin_cmd_handler;
 extern t_plugin_script *perl_scripts;
 #endif

+extern void plugin_auto_load (int, char *);
 extern void plugin_init ();
 extern void plugin_load (int, char *);
 extern void plugin_unload (int, /*@null@*/ char *);
@@ -67,8 +68,8 @@ extern void plugin_handler_add (t_plugin_handler **, t_plugin_handler **,
                                int, char *, char *);
 extern void plugin_handler_free_all_type (t_plugin_handler **,
                                          t_plugin_handler **, int);
-extern void plugin_event_msg (char *, char *);
-extern int plugin_exec_command (char *, /*@null@*/ char *);
+extern void plugin_event_msg (char *, char *, char *);
+extern int plugin_exec_command (char *, /*@null@*/ char *, char *);
 extern void plugin_end ();

 #endif /* plugins.h */
@@ -1,10 +1,10 @@
-.TH WEECHAT 1 "June 2004" "FlashCode"
+.TH WEECHAT 1 "January 2005" "FlashCode"

 .SH NAME
-weechat \- Wee Enhanced Environment for Chat
+weechat-curses \- Wee Enhanced Environment for Chat (Curses version)

 .SH SYNOPSIS
-.B weechat
+.B weechat-curses
 .RI [ options... ]
 or
 .RI [ url... ]
@@ -41,8 +41,8 @@ to an IRC server. These are in the following form:
 .TP
 .B irc://[[nickname][:password]@]server[:port][/[#&+!]channel]
 .TP
-Exemple to join WeeChat channel support:
-irc://irc.freenode.net/weechat
+Exemple to join WeeChat channel support with nick "FlashCode":
+irc://FlashCode@irc.freenode.net/weechat

 .SH FILES
 .TP
@@ -57,7 +57,7 @@ WeeChat is written by:
 .br
 - FlashCode <flashcode@flashtux.org>
 - Bounga <bounga@altern.org>
- - Xahlexx <xahlexx@tuxisland.org>
+ - Xahlexx <xahlexx@weeland.org>
 .br
 WeeChat on the web:
 .UR
@@ -1,5 +1,5 @@
 %define name weechat
-%define version 0.0.6
+%define version 0.0.9
 %define release 1

 Name:      %{name}
@@ -37,10 +37,16 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root,0755) 
 %doc AUTHORS BUGS ChangeLog COPYING FAQ FAQ.fr INSTALL NEWS README TODO
-/usr/local/man/man1/weechat.1*
+/usr/local/man/man1/weechat-curses.1*
 /usr/local/bin/weechat-curses

 %changelog 
+* Sat Jan 01 2005 FlashCode <flashcode@flashtux.org> 0.0.9-1
+- Released version 0.0.9
+* Sat Oct 30 2004 FlashCode <flashcode@flashtux.org> 0.0.8-1
+- Released version 0.0.8
+* Sat Aug 08 2004 FlashCode <flashcode@flashtux.org> 0.0.7-1
+- Released version 0.0.7
 * Sat Jun 05 2004 FlashCode <flashcode@flashtux.org> 0.0.6-1
 - Released version 0.0.6
 * Thu Feb 02 2004 FlashCode <flashcode@flashtux.org> 0.0.5-1
@@ -21,8 +21,8 @@ Bounga <bounga@altern.org>
    Jabber: Bounga@jabber.org
    ICQ   : 178297842

-Xahlexx <xahlexx@tuxisland.org>
-    Web   : http://www.tuxisland.org
+Xahlexx <xahlexx@weeland.org>
+    Web   : http://www.weeland.org
    IRC   : nick is "xahlexx"


@@ -1,20 +1,18 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================

-WeeChat known bugs, 2004-06-05
+WeeChat known bugs, 2005-01-01

 - ./configure does not check that Curses headers are installed
 - ./configure does not check that Gtk 2.0 libraries are installed
 - ./configure does not check that Perl headers & libraries are installed
 - too much nicks in the channel (> height of window) => display bug
+- problem when resizing terminal and that some windows are outside new term size
 - some IRC commands are marked as 'unknown' when received
  (IRC protocol is under dev!)
- too much opened channels => display bug
- when kicked, channel is not prefixed by '(' and sufixed by ')'
- when function key (non used by WeeChat) is pressed, prompt is deleted
 - when quitting WeeChat term title is not restored (if look_set_title is ON)
 - command name for /server can not contain spaces
 - wrong alias is not created and not saved when quitting WeeChat
 - 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)
+- display problems with old Konsole versions (Kde terminal) (???)
@@ -1,9 +1,55 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================

-ChangeLog - 2004-06-05
+ChangeLog - 2005-01-01


+Version 0.0.9 (2005-01-01):
+   * auto-reconnection to server (new options: server_autoreconnect (on/off),
+     server_autoreconnect_delay (in seconds))
+   * major bug fixed when socket is closed by server (100% CPU usage fixed),
+     and disconnections are now ok (all channels are "closed", history is still
+     visible, and buffer will be used again if reconnection to server)
+   * option "look_remove_colors_from_msgs" is now working
+   * fixed display of nick mode changes
+   * new command "/buffer close" (close any server/channel/private buffer)
+   * /notice command fixed (and display when received from server)
+   * new keys: Ctrl+A (=home), Ctrl+E (=end), Ctrl+W (=Ctrl+Backspace),
+     Alt-S (switch to server buffer), Alt-X (switch to first channel of next
+     server)
+   * added new config option: "server_command_delay" (delay in seconds after
+     startup command for each server)
+
+Version 0.0.8 (2004-10-30):
+   * /kick command fixed: now ok with many words as reason
+   * nickserv passwords hidden (new config option: log_hide_nickserv_pwd on/off)
+   * auto-rejoin channels when kicked (new config option: server_autorejoin on/off)
+   * added IRC::command function for Perl scripts
+   * fixed bug when adding alias with same name as other
+   * /buffer command developed (buffers list, move and notify)
+   * logging buffers to disk (server/channel/private according to user prefs)
+   * Away now announced in channels, and config option "look_display_away" added
+     to enable/disable this feature
+   * Fixed crash when resizing terminal to very small size
+   * "-MORE-" message is now erased when switching to another buffer
+   * DCC file receive ok (Alt-D for DCC view)
+   * /query command now reopens private buffer if already opened
+   * added key for redrawing terminal (Ctrl-L)
+   * added key for clearing hotlist (Alt-R)
+
+Version 0.0.7 (2004-08-08):
+   * new "col_status_delimiters" config option
+   * /buffer command added, buffers ordered by number, auto-jump to active
+     buffers (alt-a), jump to buffers by number (alt-number)
+   * /window command added, split terminal horizontally/vertically
+   * unique color for each nick (based on nickname)
+   * action messages are now considered as messages, not crappy joins/parts
+   * fixed display bug when nicklist is displayed at bottom of screen
+   * added history limit (text buffer & commands)
+   * replaced --enable-debug with --with-debug option for ./configure, which is
+     now integer: 1 = compiler debug flag, 2 = same 1 with verbose debug messages
+     in WeeChat (default: 0 = no debug)
+
 Version 0.0.6 (2004-06-05):
   * improved channel highlight (priority to message vs join/part)
   * fixed bug when opened private win and remote user changes his nick
@@ -2,9 +2,11 @@ WeeChat - Installation instructions
 ===================================

 1) Run './configure'
-   options: --disable-curses : do not build Curses interface
+   options: --enable-perl    : enable Perl scripts
+            --disable-curses : do not build Curses interface
            --enable-gtk     : build Gtk+ interface (under development!)
            --enable-qt      : build Qt interface (not developed!)
+            --with-debug     : 1 for debug compilation, 2 for debug messages

 2) Run 'make'

@@ -12,4 +14,4 @@ WeeChat - Installation instructions

 4) Enjoy !  :-)

-See AUTHORS for any support, feel free to contact us for any problem ;)
+See AUTHORS for support, feel free to contact us for any problem ;)
@@ -1,4 +1,4 @@
-# Copyright (c) 2004 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2005 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
@@ -17,6 +17,12 @@

 SUBDIRS = po intl src

-EXTRA_DIST = weechat.1 BUGS FAQ FAQ.fr
+EXTRA_DIST = weechat-curses.1 BUGS FAQ FAQ.fr \
+             debian/changelog debian/control \
+             debian/copyright debian/files \
+             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

-man_MANS = weechat.1
+man_MANS = weechat-curses.1
@@ -1,6 +1,22 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================

+* FlashCode, 2005-01-01
+
+    WeeChat 0.0.9 released.
+
+* FlashCode, 2004-10-30
+
+    WeeChat 0.0.8 released.
+
+* FlashCode, 2004-08-08
+
+    WeeChat 0.0.7 released.
+
+* FlashCode, 2004-06-05
+
+    WeeChat 0.0.6 released.
+
 * FlashCode, 2004-02-07

    WeeChat 0.0.5 released.
@@ -24,7 +24,7 @@ Copyright

 WeeChat (c) Copyright 2004
  by: FlashCode <flashcode@flashtux.org>
-        Xahlexx <xahlex@tuxisland.org>
+        Xahlexx <xahlex@weeland.org>
         Bounga <bounga@altern.org>
 (see AUTHORS file if you want to contact authors)

@@ -46,6 +46,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA


 ---
-(1) only curses interface is available today
-(2) plugin interfaces are not yet developed
+(1) only Curses interface is available today
+(2) only Perl interface is available today
 (3) only GNU/Linux version is available today
@@ -1,7 +1,7 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================

-TODO - 2004-06-05
+TODO - 2005-01-01

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


-v0.0.6:
+v0.0.9:
 ------

 * General:
@@ -18,13 +18,12 @@ v0.0.6:
    + Solaris version

 * IRC protocol:
-    # "/mode" command: change the user/channels modes
    + "/dcc" command (for chat and sending/receiving files)
-    # "/query" command: start private conversation

 * Interface:
+    + "/window" command, split terminal in multiple windows
+      (horizontally/vertically)
    + internationalization (traduce WeeChat in many languages)
-    # display current channel modes (example : #weechat(+nt))

 * Configuration:
    + add missing options for config file
@@ -63,14 +62,10 @@ Future versions:
    + Gtk GUI
    - color for nicks (except own nick) when nick colors are disabled
    - interpret special chars in messages (color & bold for example)
-    - many channel windows in one window/term (window split)
    - add lag indicator
-    - forget some old lines that were displayed long time ago (now all is saved,
-      if WeeChat is running for long time, a lot of memory is used!)
    - improve completion (for example complete command parameters when possible)
    - understand incomplete commands if unambigous (for example: /he for /help is ok)
-    - tab key with empty command line should switch to next window (like F7)
-    - log chats to file
+    - tab key with empty command line should switch to next window (like F7) 
    ? Qt GUI

 * TCP/IP communication:
@@ -79,10 +74,6 @@ Future versions:
    - SSL support
    - IPv6 protocol implementation

- * Configuration:
-    - load config file after GUI (so init values by default (colors, ...) before
-      loading config)
-
 * Plugins:
    - Python plugin
    - "/python load" and "/python unload" commands to (un)load Python scripts
@@ -1,4 +1,4 @@
-# Copyright (c) 2004 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2005 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
@@ -19,10 +19,10 @@
 # Process this file with autoconf to produce a configure script.

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

 # Checks for programs.
 AC_PROG_CC
@@ -59,7 +59,7 @@ AC_ARG_ENABLE(curses, [  --disable-curses        Turn off Curses interface (defa
 AC_ARG_ENABLE(gtk,    [  --enable-gtk            Turn on Gtk+ interface (default=no)],enable_gtk=yes,enable_gtk=no)
 AC_ARG_ENABLE(qt,     [  --enable-qt             Turn on Qt interface (default=no)],enable_qt=yes,enable_qt=no)
 AC_ARG_ENABLE(perl,   [  --enable-perl           Turn on Perl plugins (default=no)],enable_perl=yes,enable_perl=no)
-AC_ARG_ENABLE(debug,  [  --enable-debug          Turn on debugging messages (default=no)],enable_debug=yes,enable_debug=no)
+AC_ARG_WITH(debug,  [  --with-debug            Debugging: 0=no debug, 1=debug compilation, 2=debug compilation + verbose msgs (default=0)],debug=$withval,debug=0)

 enable_plugins="no"
 enable_python="no"
@@ -108,11 +108,19 @@ fi

 AC_SUBST(PLUGINS_LIBS)

-if test "x$enable_debug" = "xyes" ; then
-    AC_DEFINE(DEBUG)
+CFLAGS=`echo $CFLAGS | sed s/-g//g`
+if test "x$CFLAGS" = "x" ; then
+    CFLAGS="-O2"
+fi
+if test "x$debug" = "x1" || test "x$debug" = "x2" ; then
+    CFLAGS="-Wall -W $CFLAGS -pipe -g"
+else
+    CFLAGS="-Wall -W $CFLAGS -pipe"
 fi

-CFLAGS="-Wall -W -pipe -O2"
+if test "x$debug" = "x2" ; then
+    AC_DEFINE(DEBUG)
+fi

 AC_OUTPUT([Makefile
           src/Makefile
@@ -145,6 +153,15 @@ if test "x$listgui" = "x" ; then
    AC_MSG_ERROR([No interface specified... Please specify at least Curses, Gtk or Qt.])
 fi

+msg_debug_compiler="No"
+msg_debug_verbose="No"
+if test "x$debug" = "x1" || test "x$debug" = "x2" ; then
+    msg_debug_compiler="Yes"
+fi
+if test "x$debug" = "x2" ; then
+    msg_debug_verbose="Yes"
+fi
+
 echo
 echo Interfaces.................... :$listgui
 echo
@@ -153,7 +170,8 @@ echo Build with Perl support....... : $enable_perl
 echo Build with Python support..... : $enable_python
 echo Build with Ruby support....... : $enable_ruby
 echo
-echo Print debugging messages...... : $enable_debug
+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
@@ -1,3 +1,21 @@
+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.
@@ -21,14 +21,6 @@ Description: Fast, light and extensible IRC client
 for many operating systems. Everything can be done with a keyboard.
 It is customizable and extensible with scripts.

-Package: weechat-gtk
-Architecture: any
-Depends: ${shlibs:Depends}, weechat-common (= ${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.
-
 Package: weechat-common
 Architecture: all
 Replaces: weechat
@@ -1,9 +1,9 @@
 This package was debianized by FlashCode <flashcode@flashtux.org> on
-Sat, 05 Jun 2004 11:30:00 +0200.
+Sat, 01 Jan 2005 13:00:00 +0200.

 It was downloaded from http://weechat.flashtux.org/download

-Upstream Author(s): FlashCode <flashcode@flashtux.org>
+Upstream Author: FlashCode <flashcode@flashtux.org>

 Copyright:

@@ -1,9 +1,6 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.

-# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
+#export DH_VERBOSE=1

 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
@@ -17,7 +14,7 @@ endif
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	./configure --prefix=/usr --sysconfdir=/etc --enable-perl --enable-gtk
+	./configure --prefix=/usr --sysconfdir=/etc --enable-perl
 	touch configure-stamp


@@ -43,17 +40,16 @@ install: build
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/weechat
 	dh_install --sourcedir=debian/weechat
 	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 -o root -g root -m 755 src/gui/gtk/weechat-gtk $(CURDIR)/debian/weechat-gtk/usr/bin


 # Build architecture-independent files here.
 binary-indep: build install
 	dh_testdir -pweechat-common
 	dh_testroot -pweechat-common
-	dh_installchangelogs -pweechat-common
+	dh_installchangelogs ChangeLog -pweechat-common
 	dh_installdocs -pweechat-common
 	dh_installexamples -pweechat-common
-	dh_installman weechat.1 -pweechat-common
 	dh_compress -pweechat-common
 	dh_fixperms -pweechat-common
 	dh_installdeb -pweechat-common
@@ -66,6 +62,9 @@ binary-indep: build install
 binary-arch: build install
 	dh_testdir -a
 	dh_testroot -a
+	dh_installchangelogs -a
+	dh_installdocs -a
+	dh_installman weechat-curses.1 -pweechat-curses
 	dh_link -a
 	dh_strip -a
 	dh_compress -a
@@ -1,10 +1,7 @@
 AUTHORS
 BUGS
-ChangeLog
-COPYING
 FAQ
 FAQ.fr
-INSTALL
 NEWS
 README
 TODO
@@ -0,0 +1 @@
+usr/share/locale
@@ -6,7 +6,7 @@

@c WeeChat documentation (english version)
@c
-@c Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+@c Copyright (c) 2005 by FlashCode <flashcode@flashtux.org>
@c
@c This manual is free software; you can redistribute it and/or modify
@c it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@

@title WeeChat - User guide
@subtitle Fast, light and extensible IRC client
-@subtitle Documentation for WeeChat v0.0.6 - June, 05 2004
+@subtitle Documentation for WeeChat v0.0.9 - January, 01 2005

@image{weechat_image}

@@ -48,7 +48,7 @@ This manual documents WeeChat IRC client, it is part of WeeChat.@*
 Latest version of this document can be found on this page:@*
@uref{http://weechat.flashtux.org/doc.php?lang=en}@*
@*
-Copyright @copyright{} 2004 FlashCode
+Copyright @copyright{} 2005 FlashCode
 <@email{flashcode@@flashtux.org, flashcode AT flashtux.org}>@*
@*
 This document may be used under the terms the GNU General Public License
@@ -156,7 +156,7 @@ Mandrake/Redhat (or any RPM compatible distribution)@*
 To install: @kbd{rpm -i /path/weechat-x.y.z-1.i386.rpm}
@item
 Gentoo@*
-To install: see Gentoo documentation
+To install: @kbd{emerge weechat}
@item
 *BSD (not available!)
@item
@@ -178,7 +178,7 @@ Nota: to build only some interfaces, you can give parameters
 to ./configure, type @kbd{./configure --help} for help about options.@*

 Then get root privileges and install WeeChat:@*
-@kbd{su -}@*
+@kbd{su}@*
 (enter root password)@*
@kbd{make install}@*

@@ -292,6 +292,9 @@ Type: boolean (values: 'on' or 'off'), default value: 'off'@*
@item look_nick_completor
 The string inserted after nick completion@*
 Type: string (any string), default value: ':'@*
+@item look_display_away
+Display message to all channels when (un)marking as away@*
+Type: boolean (values: 'on' or 'off'), default value: 'on'@*
@item look_infobar
 Enable info bar@*
 Type: boolean (values: 'on' or 'off'), default value: 'on'@*
@@ -343,15 +346,18 @@ Type: color (Curses or Gtk color), default value: 'default'@*
@item col_status
 Color for status bar@*
 Type: color (Curses or Gtk color), default value: 'gray'@*
-@item col_status_active
-Color for active window (status bar)@*
-Type: color (Curses or Gtk color), default value: 'yellow'@*
+@item col_status_delimiters
+Color for status bar delimiters@*
+Type: color (Curses or Gtk color), default value: 'cyan'@*
@item col_status_data_msg
 Color for window with new messages (status bar)@*
-Type: color (Curses or Gtk color), default value: 'lightred'@*
+Type: color (Curses or Gtk color), default value: 'yellow'@*
+@item col_status_highlight
+Color for window with highlight (status bar)@*
+Type: color (Curses or Gtk color), default value: 'lightmagenta'@*
@item col_status_data_other
 Color for window with new data (not messages) (status bar)@*
-Type: color (Curses or Gtk color), default value: 'lightmagenta'@*
+Type: color (Curses or Gtk color), default value: 'gray'@*
@item col_status_more
 Color for window with new data (status bar)@*
 Type: color (Curses or Gtk color), default value: 'white'@*
@@ -403,13 +409,37 @@ Type: color (Curses or Gtk color), default value: 'gray'@*
@item col_nick_bg
 Background for nicknames@*
 Type: color (Curses or Gtk color), default value: 'default'@*
+@item col_chat_dcc_selected
+Color for selected DCC (chat window)@*
+Type: color (Curses or Gtk color), default value: 'white'@*
+@item col_dcc_waiting
+Color for "waiting" dcc status@*
+Type: color (Curses or Gtk color), default value: 'white'@*
+@item col_dcc_connecting
+Color for "connecting" dcc status@*
+Type: color (Curses or Gtk color), default value: 'yellow'@*
+@item col_dcc_active
+Color for "active" dcc status@*
+Type: color (Curses or Gtk color), default value: 'lightblue'@*
+@item col_dcc_done
+Color for "done" dcc status@*
+Type: color (Curses or Gtk color), default value: 'lightgreen'@*
+@item col_dcc_failed
+Color for "failed" dcc status@*
+Type: color (Curses or Gtk color), default value: 'lightred'@*
+@item col_dcc_aborted
+Color for "aborted" dcc status@*
+Type: color (Curses or Gtk color), default value: 'lightred'@*
@item history_max_lines
 Maximum number of lines in history for one server/channel/private window (0 = unlimited)@*
 Type: integer (values: between 0 and 2147483647), default value: 4096@*
@item history_max_commands
 Maximum number of user commands in history (0 = unlimited)@*
 Type: integer (values: between 0 and 2147483647), default value: 100@*
-@item log_auto_channels
+@item log_auto_server
+Automatically log server messages@*
+Type: boolean (values: 'on' or 'off'), default value: 'on'@*
+@item log_auto_channel
 Automatically log channel chats@*
 Type: boolean (values: 'on' or 'off'), default value: 'on'@*
@item log_auto_private
@@ -418,30 +448,24 @@ Type: boolean (values: 'on' or 'off'), default value: 'on'@*
@item log_path
 Path for WeeChat log files@*
 Type: string (any string), default value: '~/.weechat/logs/'@*
-@item log_name
-Name for log files (%S == irc server name, %N == channel name (or nickname if private chat)@*
-Type: string (any string), default value: '%S,%N.weechatlog'@*
@item log_timestamp
 Timestamp for log (see man strftime for date/time specifiers)@*
-Type: string (any string), default value: '~'@*
-@item log_start_string
-Text written when starting new log file (see man strftime for date/time specifiers)@*
-Type: string (any string), default value: '--- Log started %a %b %d %Y %H:%M:%s'@*
-@item log_end_string
-Text written when ending log file (see man strftime for date/time specifiers)@*
-Type: string (any string), default value: '--- Log ended %a %b %d %Y %H:%M:%s'@*
+Type: string (any string), default value: '%Y %b %d %H:%M:%S'@*
+@item log_hide_nickserv_pwd
+Hide password displayed by nickserv@*
+Type: boolean (values: 'on' or 'off'), default value: 'on'@*
@item dcc_auto_accept_files
 Automatically accept incoming dcc files@*
-Type: boolean (values: 'on' or 'off'), default value: 'on'@*
-@item dcc_auto_accept_max_size
-Maximum size for incoming file when automatically accepted@*
-Type: integer (values: between 0 and 2147483647), default value: 0@*
+Type: boolean (values: 'on' or 'off'), default value: 'off'@*
@item dcc_auto_accept_chats
 Automatically accept dcc chats (use carefully!)@*
 Type: boolean (values: 'on' or 'off'), default value: 'on'@*
@item dcc_timeout
 Timeout for dcc request (in seconds)@*
 Type: integer (values: between 1 and 2147483647), default value: 300@*
+@item dcc_blocksize
+Block size for dcc packets in bytes (default: 1024)@*
+Type: integer (values: between 1024 and 102400), default value: 1024@*
@item dcc_download_path
 Path for writing incoming files with dcc (default: user home)@*
 Type: string (any string), default value: '~'@*
@@ -472,6 +496,12 @@ Type: string (any string), default value: ''@*
@item server_autoconnect
 Automatically connect to server when WeeChat is starting@*
 Type: boolean (values: 'on' or 'off'), default value: 'on'@*
+@item server_autoreconnect
+Automatically reconnect to server when disconnected@*
+Type: boolean (values: 'on' or 'off'), default value: 'on'@*
+@item server_autoreconnect_delay
+Delay (in deconds) before trying again to reconnect to server@*
+Type: integer (values: between 0 and 65535), default value: 30@*
@item server_address
 IP address or hostname of IRC server@*
 Type: string (any string), default value: ''@*
@@ -499,9 +529,15 @@ Type: string (any string), default value: ''@*
@item server_command
 First command to run when connected to server@*
 Type: string (any string), default value: ''@*
+@item server_command_delay
+Delay (in seconds) after command was executed (example: give some time for authentication)@*
+Type: integer (values: between 0 and 3600), default value: 1@*
@item server_autojoin
 Comma separated list of channels to join when connected to server@*
 Type: string (any string), default value: ''@*
+@item server_autorejoin
+Automatically rejoin channels when kicked@*
+Type: boolean (values: 'on' or 'off'), default value: 'on'@*
@end table

 Colors for Curses GUI are:@*
@@ -550,13 +586,16 @@ Go to previous / next char in command line@*
@item Ctrl + left arrow / Ctrl + right arrow
 Go to previous / next word in command line@*
@*
-@item Home / End
-Go to the beginning / end of command line@*
+@item Home / Ctrl + A
+Go to the beginning of command line@*
+@*
+@item End / Ctrl + E
+Go to the end of command line@*
@*
@item Backspace / Delete
 Erase previous / next char of command line@*
@*
-@item Ctrl + Backspace
+@item Ctrl + Backspace / Ctrl + W
 Erase previous word of command line@*
@*
@item Tab
@@ -572,16 +611,40 @@ Execute command or send message@*
 Call again last commands/messages@*
@*
@item PageUp / PageDown
-Show window history@*
+Show buffer history@*
@*
@item F6 / F7
-Switch to previous / next window@*
+Switch to previous / next buffer@*
+@*
+@item F8
+Switch to next window@*
+@*
+@item F10
+Remove last infobar message@*
+@*
+@item Ctrl + L
+Redraw whole window@*
@*
@item Alt + left arrow / Alt + right arrow
 Same as F6 / F7@*
@*
-@item F10
-Remove last infobar message@*
+@item Alt + A
+Switch to next buffer with activity (with priority: highlight, message, other)@*
+@*
+@item Alt + D
+Display current DCC@*
+@*
+@item Alt + R
+Clear hotlist (activity notification on other buffers)@*
+@*
+@item Alt + S
+Switch to server buffer@*
+@*
+@item Alt + X
+Switch to first channel of next server (or server buffer if no channel is opened)@*
+@*
+@item Alt + digit (1-9)
+Switch to buffer by number@*
@*
@end table

@@ -709,7 +772,8 @@ RFC 2812: @uref{ftp://ftp.rfc-editor.org/in-notes/rfc2812.txt}
@code{IRC::add_message_handler ("privmsg", my_function);}@*
@code{sub my_function}@*
@code{@{ }@*
-@code{@ @ @ @ ($null, $channel, $message) = split ":",@@_[0],3;}@*
+@code{@ @ @ @ IRC::print ("server=$_[0]\n");}@*
+@code{@ @ @ @ ($null, $channel, $message) = split ":",$_[1],3;}@*
@code{@ @ @ @ ($hostmask, $null, $channel) = split " ", $channel;}@*
@code{@ @ @ @ IRC::print ("host=$hostmask, chan=$channel, msg=$message\n");}@*
@code{@} }@*
@@ -734,11 +798,35 @@ available until your Perl script will be unloaded.
@code{IRC::add_command_handler ("command", my_command);}@*
@code{sub my_command}@*
@code{@{ }@*
-@code{@ @ @ @ IRC::print("Arguments: ".@@_[0]);}@*
+@code{@ @ @ @ IRC::print("Server: $_[0], arguments: $_[1]\n");}@*
@code{@ @ @ @ return 0;}@*
@code{@} }@*
@*

+@item
+@command{IRC::get_info ( [server,] name );}@*
+@*
+Get various info about WeeChat, server or user.@*
+
+@emph{Arguments:}
+@itemize @minus
+@item @option{server}: internal name of server
+@item @option{name}: name of info to retrieve:
+@itemize @minus
+@item @option{0 or version}: get WeeChat version
+@item @option{1 or nick}: get nickname
+@item @option{2 or channel}: get channel name
+@item @option{3 or server}: get server name
+@item @option{4 or weechatdir}: get WeeChat home directory
+@item @option{5 or away}: get away flag for server
+@end itemize
+@end itemize
+@*
+@emph{Examples:}@*
+@code{$version = get_info("version");}@*
+@code{$nick = get_info("freenode", "nick");}@*
+@*
+
@end itemize

@node Python scripts, Ruby scripts, Perl scripts, Extensions
@@ -786,9 +874,6 @@ Bounga
@item
 Xahlexx
 <@email{xahlexx@@tuxfamily.org, xahlexx AT tuxfamily.org}>
-@item
-Crevetor
-<@email{crevetor@@caramail.com, crevetor AT caramail.com}>

@end itemize

@@ -831,7 +916,7 @@ Look for WeeChat support page for detail:@*

 This manual documents WeeChat IRC client, it is part of WeeChat.@*

-Copyright @copyright{} 2004 FlashCode
+Copyright @copyright{} 2005 FlashCode
 <@email{flashcode@@flashtux.org, flashcode AT flashtux.org}>@*
@*
 This document may be used under the terms the GNU General Public License
@@ -6,7 +6,7 @@

@c WeeChat documentation (french version)
@c
-@c Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+@c Copyright (c) 2005 by FlashCode <flashcode@flashtux.org>
@c
@c This manual is free software; you can redistribute it and/or modify
@c it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@

@title WeeChat - Guide utilisateur
@subtitle Client IRC rapide, l@'eger et extensible
-@subtitle Documentation pour WeeChat v0.0.6 - 5 juin 2004
+@subtitle Documentation pour WeeChat v0.0.9 - 1er Janvier 2005

@image{weechat_image}

@@ -48,7 +48,7 @@ Ce manuel documente le client IRC WeeChat, il fait partie de WeeChat.@*
 La derni@`ere version de ce document peut @^etre t@'el@'echarg@'ee sur cette page :@*
@uref{http://weechat.flashtux.org/doc.php}@*
@*
-Copyright @copyright{} 2004 FlashCode
+Copyright @copyright{} 2005 FlashCode
 <@email{flashcode@@flashtux.org, flashcode AT flashtux.org}>@*
@*
 Ce document peut @^etre utilis@'e sous les termes de la licence GNU General Public
@@ -155,7 +155,7 @@ Mandrake/Redhat (ou toute distribution compatible avec les RPM)@*
 Pour installer : @kbd{rpm -i /chemin/weechat-x.y.z-1.i386.rpm}
@item
 Gentoo@*
-Pour installer : voir la documentation Gentoo
+Pour installer : @kbd{emerge weechat}
@item
 *BSD (non disponible !)
@item
@@ -177,7 +177,7 @@ Note: pour ne construire que certaines interfaces, vous pouvez passer des param@
@`a ./configure, tapez @kbd{./configure --help} pour de l'aide sur ces options.@*

 Obtenez les droits root et installez WeeChat :@*
-@kbd{su -}@*
+@kbd{su}@*
 (entrez le mot de passe de root)@*
@kbd{make install}@*

@@ -292,6 +292,9 @@ Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'off'@*
@item look_nick_completor
 La cha@^ine affich@'ee apr@`es la compl@'etion des utilisateurs@*
 Type: cha@^ine (toute cha@^ine), valeur par d@'efaut: ':'@*
+@item look_display_away
+Affiche un message sur tous les canaux pour l'absence/le retour@*
+Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
@item look_infobar
 Active la barre d'infos@*
 Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
@@ -343,15 +346,18 @@ Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'default'@*
@item col_status
 Couleur pour la barre de statut@*
 Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'gray'@*
-@item col_status_active
-Couleur pour la fen@^etre active (barre de statut)@*
-Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'yellow'@*
+@item col_status_delimiters
+Couleur pour les d@'elimiteurs de la barre de statut@*
+Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'cyan'@*
@item col_status_data_msg
 Couleur pour une fen@^etre avec de nouvelles infos (barre de statut)@*
-Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'lightred'@*
+Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'yellow'@*
+@item col_status_highlight
+Couleur pour une fen@^etre avec un highlight (barre de statut)@*
+Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'lightmagenta'@*
@item col_status_data_other
 Couleur pour une fen@^etre avec des nouvelles donn@'ees (pas des infos) (barre de statut)@*
-Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'lightmagenta'@*
+Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'gray'@*
@item col_status_more
 Couleur pour une fen@^etre avec des nouvelles donn@'ees (barre de statut)@*
 Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'white'@*
@@ -403,13 +409,37 @@ Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'gray'@*
@item col_nick_bg
 Couleur de fond pour les pseudos@*
 Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'default'@*
+@item col_chat_dcc_selected
+Couleur pour le DCC s@'electionn@'e (fen@^etre de discussion)@*
+Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'white'@*
+@item col_dcc_waiting
+Couleur pour le statut dcc "attente"@*
+Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'white'@*
+@item col_dcc_connecting
+Couleur pour le statut dcc "connexion"@*
+Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'yellow'@*
+@item col_dcc_active
+Couleur pour le statut dcc "actif"@*
+Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'lightblue'@*
+@item col_dcc_done
+Couleur pour le statut dcc "termin@'e"@*
+Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'lightgreen'@*
+@item col_dcc_failed
+Couleur pour le statut dcc "@'echou@'e"@*
+Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'lightred'@*
+@item col_dcc_aborted
+Couleur pour le statut dcc "interrompu"@*
+Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'lightred'@*
@item history_max_lines
 Nombre maximum de lignes dans l'historique pour un serveur/fen@^etre/fen@^etre priv@'ee (0 = sans limite)@*
 Type: entier (valeurs: entre 0 et 2147483647), valeur par d@'efaut: 4096@*
@item history_max_commands
 Nombre maximum de commandes utilisateur dans l'historique (0 = sans limite)@*
 Type: entier (valeurs: entre 0 et 2147483647), valeur par d@'efaut: 100@*
-@item log_auto_channels
+@item log_auto_server
+Enregistrer automatiquement les messages du serveur@*
+Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
+@item log_auto_channel
 Enregistrer automatiquement les conversations des canaux@*
 Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
@item log_auto_private
@@ -418,30 +448,24 @@ Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
@item log_path
 Chemin pour les conversations sauvegard@'ees par WeeChat@*
 Type: cha@^ine (toute cha@^ine), valeur par d@'efaut: '~/.weechat/logs/'@*
-@item log_name
-Nom des conversations saivegard@'ees (%S == nom du serveur irc, %N == nom du canal (ou pseudo si fen@^etre priv@'ee)@*
-Type: cha@^ine (toute cha@^ine), valeur par d@'efaut: '%S,%N.weechatlog'@*
@item log_timestamp
 Horodatage pour les conversations sauvegard@'ees (voir man strftime pour le format de date/heure)@*
-Type: cha@^ine (toute cha@^ine), valeur par d@'efaut: '~'@*
-@item log_start_string
-Texte @'ecrit en d@'emarrant la sauvegarde d'une discussion (voir man strftime pour le format de date/heure)@*
-Type: cha@^ine (toute cha@^ine), valeur par d@'efaut: '--- Log started %a %b %d %Y %H:%M:%s'@*
-@item log_end_string
-Texte @'ecrit @`a la fin d'une discussion sauvegard@'ees (voir man strftime pour le format de date/heure)@*
-Type: cha@^ine (toute cha@^ine), valeur par d@'efaut: '--- Log ended %a %b %d %Y %H:%M:%s'@*
+Type: cha@^ine (toute cha@^ine), valeur par d@'efaut: '%Y %b %d %H:%M:%S'@*
+@item log_hide_nickserv_pwd
+Masquer le mot de passe affich@'e par nickserv@*
+Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
@item dcc_auto_accept_files
 Accepte automatiquement les fichiers dcc entrants@*
-Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
-@item dcc_auto_accept_max_size
-Taille maximum pour un fichier entrant lorsqu'il est accept@'e automatiquement@*
-Type: entier (valeurs: entre 0 et 2147483647), valeur par d@'efaut: 0@*
+Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'off'@*
@item dcc_auto_accept_chats
 Accepte automatiquement les demandes de discussion dcc (@`a utiliser avec pr@'ecaution !)@*
 Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
@item dcc_timeout
 D@'elai d'attente pour les requ@^etes dcc (en secondes)@*
 Type: entier (valeurs: entre 1 et 2147483647), valeur par d@'efaut: 300@*
+@item dcc_blocksize
+Taille de bloc pour les paquets dcc en octets (d@'efaut: 1024)@*
+Type: entier (valeurs: entre 1024 et 102400), valeur par d@'efaut: 1024@*
@item dcc_download_path
 Chemin pour @'ecrire les fichiers re@,{c}us par dcc (par d@'efaut: r@'epertoire de l'utilisateur)@*
 Type: cha@^ine (toute cha@^ine), valeur par d@'efaut: '~'@*
@@ -472,6 +496,12 @@ Type: cha@^ine (toute cha@^ine), valeur par d@'efaut: ''@*
@item server_autoconnect
 Connexion automatique au serveur quand WeeChat d@'emarre@*
 Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
+@item server_autoreconnect
+Reconnexion automatique au serveur apr@`es une d@'econnexion@*
+Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
+@item server_autoreconnect_delay
+D@'elai (en secondes) avant de tenter une reconnexion au serveur@*
+Type: entier (valeurs: entre 0 et 65535), valeur par d@'efaut: 30@*
@item server_address
 Adresse IP ou nom du serveur IRC@*
 Type: cha@^ine (toute cha@^ine), valeur par d@'efaut: ''@*
@@ -499,9 +529,15 @@ Type: cha@^ine (toute cha@^ine), valeur par d@'efaut: ''@*
@item server_command
 Commande @`a ex@'ecuter en premier lorsque connect@'e au serveur@*
 Type: cha@^ine (toute cha@^ine), valeur par d@'efaut: ''@*
+@item server_command_delay
+D@'elai (en secondes) apr@`es ex@'ecution de la commande (exemple: donner du temps pour l'authentification)@*
+Type: entier (valeurs: entre 0 et 3600), valeur par d@'efaut: 1@*
@item server_autojoin
 Liste des canaux (s@'epar@'es par des virgules) @`a rejoindre lorsque connect@'e au serveur@*
 Type: cha@^ine (toute cha@^ine), valeur par d@'efaut: ''@*
+@item server_autorejoin
+Rejoindre automatiquement les canaux quand mis dehors@*
+Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
@end table

 Les couleurs pour l'interface Curses sont :@*
@@ -550,13 +586,16 @@ Aller au caract@`ere pr@'ec@'edent / suivant sur la ligne de commande@*
@item Ctrl + fl@`eche gauche / Ctrl + fl@`eche droite
 Aller au mot pr@'ec@'edent / suivant sur la ligne de commande@*
@*
-@item Home / End
-Aller au d@'ebut / @`a la fin de la ligne de commande@*
+@item Home / Ctrl + A
+Aller au d@'ebut de la ligne de commande@*
+@*
+@item End / Ctrl + E
+Aller @`a la fin de la ligne de commande@*
@*
@item Backspace / Delete
 Effacer le mot pr@'ec@'edent / suivant sur la ligne de commande@*
@*
-@item Ctrl + Backspace
+@item Ctrl + Backspace / Ctrl + W
 Effacer le mot pr@'ec@'edent sur la ligne de commande@*
@*
@item Tab
@@ -572,17 +611,41 @@ Ex@'ecuter la commande ou envoyer le message@*
 Rappeler les derni@`eres commandes/messages@*
@*
@item PageUp / PageDown
-Afficher l'historique de la fen@^etre@*
+Afficher l'historique du tampon@*
@*
@item F6 / F7
-Aller @`a la fen@^etre pr@'ec@'edente / suivante@*
-@*
-@item Alt + fl@`eche gauche / Alt + fl@`eche droite
-Identique @`a F6 / F7@*
+Aller au tampon pr@'ec@'edent@*
+@*
+@item F8
+Aller @`a la fen@^etre suivante@*
@*
@item F10
 Effacer le dernier message de la barre d'infos@*
@*
+@item Ctrl + L
+R@'eaffiche toute la fen@^etre@*
+@*
+@item Alt + fl@`eche gauche / Alt + fl@`eche droite
+Identique @`a F6 / F7@*
+@*
+@item Alt + A
+Sauter au tampon avec activit@'e (avec priorit@'e: highlight, message, autre)@*
+@*
+@item Alt + D
+Afficher les DCC en cours@*
+@*
+@item Alt + R
+Vide la hotlist (notification d'activité sur les autres tampons)@*
+@*
+@item Alt + S
+Sauter au tampon du serveur@*
+@*
+@item Alt + X
+Sauter au premier canal du serveur suivant (ou tampon du serveur si aucun canal ouvert)@*
+@*
+@item Alt + chiffre (1-9)
+Sauter au tampon avec ce num@'ero@*
+@*
@end table

@node Commandes WeeChat, , Raccourcis clavier, Utilisation
@@ -710,7 +773,8 @@ RFC 2812 : @uref{ftp://ftp.rfc-editor.org/in-notes/rfc2812.txt}
@code{IRC::add_message_handler ("privmsg", ma_fonction);}@*
@code{sub ma_fonction}@*
@code{@{ }@*
-@code{@ @ @ @ ($null, $canal, $message) = split ":",@@_[0],3;}@*
+@code{@ @ @ @ IRC::print ("serveur=$_[0]\n");}@*
+@code{@ @ @ @ ($null, $canal, $message) = split ":",$_[1],3;}@*
@code{@ @ @ @ ($masque, $null, $canal) = split " ", $canal;}@*
@code{@ @ @ @ IRC::print ("masque=$masque, canal=$canal, message=$message\n");}@*
@code{@} }@*
@@ -735,11 +799,35 @@ ne seront plus accessibles tant que le script Perl sera charg@'e.
@code{IRC::add_command_handler ("commande", ma_commande);}@*
@code{sub ma_commande}@*
@code{@{ }@*
-@code{@ @ @ @ IRC::print("Param@`etres : ".@@_[0]);}@*
+@code{@ @ @ @ IRC::print("Serveur: $_[0], param@`etres: $_[1]\n");}@*
@code{@ @ @ @ return 0;}@*
@code{@} }@*
@*

+@item
+@command{IRC::get_info ( [serveur,] nom );}@*
+@*
+Obtenir des informations vari@'ees sur WeeChat, le serveur ou l'utilisateur.@*
+
+@emph{Param@`etres :}
+@itemize @minus
+@item @option{serveur}: nom interne du serveur
+@item @option{nom}: nom de l'info @`a obtenir :
+@itemize @minus
+@item @option{0 ou version}: obtenir la version de WeeChat
+@item @option{1 ou nick}: obtenir le pseudo
+@item @option{2 ou channel}: obtenir le nom du canal
+@item @option{3 ou server}: obtenir le nom du serveur
+@item @option{4 ou weechatdir}: obtenir le r@'epertoire maison de WeeChat
+@item @option{5 ou away}: obtenir le drapeau "away" du serveur
+@end itemize
+@end itemize
+@*
+@emph{Exemples :}@*
+@code{$version = get_info("version");}@*
+@code{$nick = get_info("freenode", "nick");}@*
+@*
+
@end itemize

@node Scripts Python, Scripts Ruby, Scripts Perl, Extensions
@@ -786,9 +874,6 @@ Bounga
@item
 Xahlexx
 <@email{xahlexx@@tuxfamily.org, xahlexx AT tuxfamily.org}>
-@item
-Crevetor
-<@email{crevetor@@caramail.com, crevetor AT caramail.com}>

@end itemize

@@ -831,7 +916,7 @@ Voir la page support WeeChat pour plus de d@'etails :@*

 Ce manuel documente le client IRC WeeChat, il fait partie de WeeChat.@*

-Copyright @copyright{} 2004 FlashCode
+Copyright @copyright{} 2005 FlashCode
 <@email{flashcode@@flashtux.org, flashcode AT flashtux.org}>@*
@*
 Ce document peut @^etre utilis@'e sous les termes de la licence GNU General Public
@@ -6,7 +6,7 @@

@c WeeChat documentation (vers@~ao partuguesa)
@c
-@c Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+@c Copyright (c) 2005 by FlashCode <flashcode@flashtux.org>
@c
@c This manual is free software; you can redistribute it and/or modify
@c it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@

@title WeeChat - Guia do Utilizador
@subtitle Cliente de IRC rapido, leve e extencivel
-@subtitle Documenta@,{c}@~ao do WeeChat v0.0.6 - 05 de Junho de 2004
+@subtitle Documenta@,{c}@~ao do WeeChat v0.0.9 - 1 de Janeiro de 2005

@image{weechat_image}

@@ -48,7 +48,7 @@ Este manual documenta o cliente de IRC WeeChat, ele faz parte do WeeChat.@*
 A ultima versão deste documento pode ser descarregada de :@*
@uref{http://weechat.flashtux.org/doc.php}@*
@*
-Copyright @copyright{} 2004 FlashCode
+Copyright @copyright{} 2005 FlashCode
 <@email{flashcode@@flashtux.org, flashcode AT flashtux.org}>@*
@*
 Este documento pode ser utilizado sobre os termos da Licen@,{c}a P@'ublica geral GNU (GNU General Public
@@ -154,7 +154,7 @@ Mandrake/Redhat (ou outra distro compat@'ivel com RPMs)@*
 Instala@,{c}@~ao : @kbd{rpm -i /chemin/weechat-x.y.z-1.i386.rpm}
@item
 Gentoo@*
-Instala@,{c}@~ao : ver a documenta@,{c}@~ao da Gentoo
+Instala@,{c}@~ao : @kbd{emerge weechat}
@item
 *BSD (non disponible !)
@item
@@ -176,7 +176,7 @@ Nota: Para compilar certas interfaces, podes passar par@^ametros
 ao ./configure, escreve @kbd{./configure --help} para veres as op@,{c}@~oes.@*

 Obter os direitos do root e instalar o Weechat :@*
-@kbd{su -}@*
+@kbd{su}@*
 (escreve aqui a palavra-passe do superutilizador)@*
@kbd{make install}@*

@@ -247,13 +247,16 @@ Ir um caractere para traz / para a frente na linha de comando@*
@item Ctrl + Seta esquerda / Ctrl + Seta Direita
 Ir uma palavra para traz / para a frente na linha de comando@*
@*
-@item Home / End
-Ir para o in@'icio / para o fim da linha de comando@*
+@item Home / Ctrl + A
+Ir para o in@'icio da linha de comando@*
+@*
+@item End / Ctrl + E
+Ir para o fim da linha de comando@*
@*
@item Backspace / Delete
 Apagar o caractere anterior / seguinte na linha de comando@*
@*
-@item Ctrl + Backspace
+@item Ctrl + Backspace / Ctrl + W
 Apagar a palavra anterior na linha de comando
@*
@item Tab
@@ -274,12 +277,36 @@ Navegar no hist@'orico da janela@*
@item F6 / F7
 Ir para a janela anterior/seguinte@*
@*
-@item Alt + Seta da esquerda / Alt + Seta da direita
-Identico a F6 / F7@*
+@item F8
+Comute @`a janela seguinte@*
@*
@item F10
 Apagar a @'ultima mensagem da barra do info@*
@*
+@item Ctrl + L
+Redesenhe a janela inteira@*
+@*
+@item Alt + Seta da esquerda / Alt + Seta da direita
+Identico a F6 / F7@*
+@*
+@item Alt + A
+Comute ao amortecedor seguinte com atividade (com prioridade:  destaque, mensagem, outra)@*
+@*
+@item Alt + D
+Exposi@,{c}@~ao DCC atual@*
+@*
+@item Alt + R
+Hotlist desobstru@'ido (notifica@,{c}@~ao da atividade em outros amortecedores)@*
+@*
+@item Alt + S
+Comute ao amortecedor do servidor@*
+@*
+@item Alt + X
+Comute @`a primeira canaleta do servidor seguinte (ou do amortecedor do servidor se nenhuma canaleta for aberta)@*
+@*
+@item Alt + d@'igito (1-9)
+Comute ao amortecedor pelo n@'umero@*
+@*
@end table

@node Comandos do WeeChat, , Recursos de teclado, Utilizacao
@@ -432,6 +459,30 @@ Este nome pode pertencer a um comando j
@code{@} }@*
@*

+@item
+@command{IRC::get_info ( [servidor,] nome );}@*
+@*
+Comece o v@'ario info sobre WeeChat, servidor ou usu@'ario.@*
+
+@emph{Argumentos:}
+@itemize @minus
+@item @option{servidor}: nome interno da servidor
+@item @option{nome}: nome do info a recuperar:
+@itemize @minus
+@item @option{0 ou version}: comece a vers@~ao de WeeChat
+@item @option{1 ou nick}: comece o nickname
+@item @option{2 ou channel}: comece o nome da canal
+@item @option{3 ou server}: comece o nome do servidor
+@item @option{4 ou weechatdir}: comece a WeeChat o diret@'orio home
+@item @option{5 ou away}: comece a bandeira ausente para o servidor
+@end itemize
+@end itemize
+@*
+@emph{Exemplos:}@*
+@code{$version = get_info("version");}@*
+@code{$nick = get_info("freenode", "nick");}@*
+@*
+
@end itemize

@node Scripts Python, Scripts Ruby, Scripts Perl, Extencoes
@@ -479,9 +530,6 @@ Bounga
@item
 Xahlexx
 <@email{xahlexx@@tuxfamily.org, xahlexx AT tuxfamily.org}>
-@item
-Crevetor
-<@email{crevetor@@caramail.com, crevetor AT caramail.com}>

@end itemize

@@ -522,7 +570,7 @@ Para mais detalhes, v@^e tamb@'em a p@'agina de suporte do WeeChat :@*

 Este manual documenta o cliente de IRC WeeChat, Ele faz parte do WeeChat.@*

-Copyright @copyright{} 2004 FlashCode
+Copyright @copyright{} 2005 FlashCode
 <@email{flashcode@@flashtux.org, flashcode AT flashtux.org}>@*
 Tradu@,{c}@~ao portuguesa de Jo@~ao Jer@'onimo <@email{j_j_b_o@@sapo.pt, j_j_b_o AT sapo.pt}>@*
@*
@@ -6,6 +6,7 @@
 ./src/irc/irc-display.c
 ./src/irc/irc-send.c
 ./src/irc/irc-recv.c
+./src/irc/irc-dcc.c
 ./src/plugins/perl/wee-perl.c
 ./src/plugins/perl/wee-perl.h
 ./src/plugins/plugins.c
@@ -23,6 +24,7 @@
 ./src/common/command.h
 ./src/common/completion.h
 ./src/common/history.h
+./src/common/log.c
 ./src/common/weechat.h
 ./src/common/weeconfig.c
 ./src/common/weeconfig.h
@@ -1,4 +1,4 @@
-# Copyright (c) 2004 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2005 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
@@ -1,4 +1,4 @@
-# Copyright (c) 2004 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2005 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
@@ -28,4 +28,8 @@ lib_weechat_main_a_SOURCES = weechat.c \
                             weeconfig.c \
                             weeconfig.h \
                             history.c \
-                             history.h
+                             history.h \
+                             hotlist.c \
+                             hotlist.h \
+                             log.c \
+                             log.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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
@@ -43,6 +43,15 @@ t_weechat_command weechat_commands[] =
    N_("alias_name: name of alias\ncommand: command name (WeeChat "
    "or IRC command, without first '/')\n" "arguments: arguments for command"),
    0, MAX_ARGS, NULL, weechat_cmd_alias },
+  { "buffer", N_("manage buffers"),
+    N_("[action | number]"),
+    N_("action: action to do:\n"
+    "  move    move buffer in the list (may be relative, for example -1)\n"
+    "  close   close buffer (for channel: same as /part without part message)\n"
+    "  list    list opened buffers (no parameter implies this list)\n"
+    "  notify  set notify level for buffer (0=never, 1=highlight, 2=1+msg, 3=2+join/part)\n"
+    "number: jump to buffer by number"),
+    0, MAX_ARGS, weechat_cmd_buffer, NULL },
  { "clear", N_("clear window(s)"),
    N_("[-all]"),
    N_("-all: clear all windows"),
@@ -59,7 +68,7 @@ t_weechat_command weechat_commands[] =
    N_("[command]"), N_("command: name of a WeeChat or IRC command"),
    0, 1, weechat_cmd_help, NULL },
  { "perl", N_("list/load/unload Perl scripts"),
-    N_("[load filename] | [unload]"),
+    N_("[load filename] | [autoload] | [unload]"),
    N_("filename: Perl script (file) to load\n"
    "Without argument, /perl command lists all loaded Perl scripts."),
    0, 2, weechat_cmd_perl, NULL },
@@ -77,7 +86,7 @@ t_weechat_command weechat_commands[] =
    "nick2: alternate nick for server\n"
    "nick3: second alternate nick for server\n"
    "username: user name\n"
-    "realname: real name of user\n"),
+    "realname: real name of user"),
    0, MAX_ARGS, weechat_cmd_server, NULL },
  { "save", N_("save config to disk"),
    N_("[file]"), N_("file: filename for writing config"),
@@ -88,6 +97,14 @@ t_weechat_command weechat_commands[] =
  { "unalias", N_("remove an alias"),
    N_("alias_name"), N_("alias_name: name of alias to remove"),
    1, 1, NULL, weechat_cmd_unalias },
+  { "window", N_("manage windows"),
+    N_("[action]"),
+    N_("action: action to do:\n"
+    "   close  close current window (under development!)\n"
+    "    list  list opened windows (no parameter implies this list)\n"
+    "  splith  split current window horizontally\n"
+    "  splitv  split current window vertically"),
+    0, MAX_ARGS, weechat_cmd_window, NULL },
  { NULL, NULL, NULL, NULL, 0, 0, NULL, NULL }
 };

@@ -524,7 +541,7 @@ exec_weechat_command (t_irc_server *server, char *string)
            ptr_args = NULL;
    }
    
-    if (!plugin_exec_command (command + 1, ptr_args))
+    if (!plugin_exec_command (command + 1, (server) ? server->name : "", ptr_args))
    {
        argv = explode_string (ptr_args, " ", 0, &argc);
        
@@ -707,46 +724,46 @@ user_command (t_irc_server *server, char *command)
    {
        if ((command[0] == '/') && (command[1] == '/'))
            command++;
-        if (server && (!WIN_IS_SERVER(gui_current_window)))
+        if (server && (!BUFFER_IS_SERVER(gui_current_window->buffer)))
        {
            server_sendf (server, "PRIVMSG %s :%s\r\n",
-                          CHANNEL(gui_current_window)->name,
+                          CHANNEL(gui_current_window->buffer)->name,
                          command);

-            if (WIN_IS_PRIVATE(gui_current_window))
+            if (BUFFER_IS_PRIVATE(gui_current_window->buffer))
            {
-                gui_printf_color_type (CHANNEL(gui_current_window)->window,
+                gui_printf_color_type (CHANNEL(gui_current_window->buffer)->buffer,
                                       MSG_TYPE_NICK,
                                       COLOR_WIN_CHAT_DARK, "<");
-                gui_printf_color_type (CHANNEL(gui_current_window)->window,
+                gui_printf_color_type (CHANNEL(gui_current_window->buffer)->buffer,
                                       MSG_TYPE_NICK,
                                       COLOR_WIN_NICK_SELF,
                                       "%s", server->nick);
-                gui_printf_color_type (CHANNEL(gui_current_window)->window,
+                gui_printf_color_type (CHANNEL(gui_current_window->buffer)->buffer,
                                       MSG_TYPE_NICK,
                                       COLOR_WIN_CHAT_DARK, "> ");
-                gui_printf_color_type (CHANNEL(gui_current_window)->window,
+                gui_printf_color_type (CHANNEL(gui_current_window->buffer)->buffer,
                                       MSG_TYPE_MSG,
                                       COLOR_WIN_CHAT, "%s\n", command);
            }
            else
            {
-                ptr_nick = nick_search (CHANNEL(gui_current_window), server->nick);
+                ptr_nick = nick_search (CHANNEL(gui_current_window->buffer), server->nick);
                if (ptr_nick)
                {
-                    irc_display_nick (CHANNEL(gui_current_window)->window, ptr_nick,
+                    irc_display_nick (CHANNEL(gui_current_window->buffer)->buffer, ptr_nick,
                                      MSG_TYPE_NICK, 1, 1, 0);
-                    gui_printf_color (CHANNEL(gui_current_window)->window,
+                    gui_printf_color (CHANNEL(gui_current_window->buffer)->buffer,
                                      COLOR_WIN_CHAT, "%s\n", command);
                }
                else
-                    gui_printf (server->window,
+                    gui_printf (server->buffer,
                                _("%s cannot find nick for sending message\n"),
                                WEECHAT_ERROR);
            }
        }
        else
-            gui_printf ((server) ? server->window : NULL,
+            gui_printf ((server) ? server->buffer : NULL,
                        _("This window is not a channel!\n"));
    }
 }
@@ -810,6 +827,205 @@ weechat_cmd_alias (char *arguments)
    return 0;
 }

+/*
+ * weechat_cmd_buffer: manage buffers
+ */
+
+int
+weechat_cmd_buffer (int argc, char **argv)
+{
+    t_gui_buffer *ptr_buffer;
+    t_irc_server *ptr_server;
+    long number;
+    char *error;
+    
+    if ((argc == 0) || ((argc == 1) && (strcasecmp (argv[0], "list") == 0)))
+    {
+        /* list opened buffers */
+        
+        irc_display_prefix (NULL, PREFIX_INFO);
+        gui_printf (NULL, _("Opened buffers:\n"));
+        
+        for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer)
+        {
+            irc_display_prefix (NULL, PREFIX_INFO);
+            gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "[");
+            gui_printf (NULL, "%d", ptr_buffer->number);
+            gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "] ");
+            
+            if (ptr_buffer->dcc)
+                gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "DCC\n");
+            else if (BUFFER_IS_SERVER (ptr_buffer))
+            {
+                gui_printf (NULL, _("Server: "));
+                gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL,
+                                  "%s\n", SERVER(ptr_buffer)->name);
+            }
+            else if (BUFFER_IS_CHANNEL (ptr_buffer))
+            {
+                gui_printf (NULL, _("Channel: "));
+                gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL,
+                                  "%s", CHANNEL(ptr_buffer)->name);
+                gui_printf (NULL, _(" (server: "));
+                gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL,
+                                  "%s", SERVER(ptr_buffer)->name);
+                gui_printf (NULL, ")\n");
+            }
+            else if (BUFFER_IS_PRIVATE (ptr_buffer))
+            {
+                gui_printf (NULL, _("Private with: "));
+                gui_printf_color (NULL, COLOR_WIN_CHAT_NICK,
+                                  "%s", CHANNEL(ptr_buffer)->name);
+                gui_printf (NULL, _(" (server: "));
+                gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL,
+                                  "%s", SERVER(ptr_buffer)->name);
+                gui_printf (NULL, ")\n");
+            }
+        }
+    }
+    else
+    {
+        if (strcasecmp (argv[0], "move") == 0)
+        {
+            /* move buffer to another number in the list */
+            
+            if (argc < 2)
+            {
+                gui_printf (NULL, _("%s missing arguments for \"%s\" command\n"),
+                            WEECHAT_ERROR, "buffer");
+                return -1;
+            }
+            
+            error = NULL;
+            number = strtol (((argv[1][0] == '+') || (argv[1][0] == '-')) ? argv[1] + 1 : argv[1],
+                             &error, 10);
+            if ((error) && (error[0] == '\0'))
+            {
+                if (argv[1][0] == '+')
+                    gui_move_buffer_to_number (gui_current_window,
+                                               gui_current_window->buffer->number + ((int) number));
+                else if (argv[1][0] == '-')
+                    gui_move_buffer_to_number (gui_current_window,
+                                               gui_current_window->buffer->number - ((int) number));
+                else
+                    gui_move_buffer_to_number (gui_current_window, (int) number);
+            }
+            else
+            {
+                /* invalid number */
+                gui_printf (NULL, _("%s incorrect buffer number\n"),
+                            WEECHAT_ERROR);
+                return -1;
+            }
+        }
+        else if (strcasecmp (argv[0], "close") == 0)
+        {
+            /* close buffer (server or channel/private) */
+            
+            if ((!gui_current_window->buffer->next_buffer)
+                && (gui_current_window->buffer == gui_buffers))
+            {
+                gui_printf (gui_current_window->buffer,
+                            _("%s can not close the single buffer\n"),
+                            WEECHAT_ERROR);
+                return -1;
+            }
+            if (BUFFER_IS_SERVER(gui_current_window->buffer))
+            {
+                if (SERVER(gui_current_window->buffer)->channels)
+                {
+                    gui_printf (gui_current_window->buffer,
+                                _("%s can not close server buffer while channels "
+                                "are opened\n"),
+                                WEECHAT_ERROR);
+                    return -1;
+                }
+                server_disconnect (SERVER(gui_current_window->buffer), 0);
+                ptr_server = SERVER(gui_current_window->buffer);
+                gui_buffer_free (gui_current_window->buffer, 1);
+                ptr_server->buffer = NULL;
+            }
+            else
+                irc_cmd_send_part (SERVER(gui_current_window->buffer), NULL);
+        }
+        else if (strcasecmp (argv[0], "notify") == 0)
+        {
+            /* set notify level for buffer */
+            
+            if (argc < 2)
+            {
+                /* display notify level for all buffers */
+                irc_display_prefix (NULL, PREFIX_INFO);
+                gui_printf (NULL, _("Notify levels:  "));
+                for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer)
+                {
+                    gui_printf (NULL, "%d.%s:",
+                                ptr_buffer->number,
+                                (ptr_buffer->dcc) ? "DCC" :
+                                    ((BUFFER_IS_SERVER(ptr_buffer)) ? SERVER(ptr_buffer)->name :
+                                    CHANNEL(ptr_buffer)->name));
+                    if (ptr_buffer->dcc)
+                        gui_printf (NULL, "-");
+                    else
+                        gui_printf (NULL, "%d", ptr_buffer->notify_level);
+                    if (ptr_buffer->next_buffer)
+                        gui_printf (NULL, "  ");
+                }
+                gui_printf (NULL, "\n");
+            }
+            else
+            {
+                error = NULL;
+                number = strtol (argv[1], &error, 10);
+                if ((error) && (error[0] == '\0'))
+                {
+                    if ((number < 0) || (number > 3))
+                    {
+                        /* invalid highlight level */
+                        gui_printf (NULL, _("%s incorrect notify level (must be between 0 and 3)\n"),
+                                    WEECHAT_ERROR);
+                        return -1;
+                    }
+                    gui_current_window->buffer->notify_level = number;
+                }
+                else
+                {
+                    /* invalid number */
+                    gui_printf (NULL, _("%s incorrect notify level (must be between 0 and 3)\n"),
+                                WEECHAT_ERROR);
+                    return -1;
+                }
+            }
+        }
+        else
+        {
+            /* jump to buffer by number */
+            
+            error = NULL;
+            number = strtol (argv[0], &error, 10);
+            if ((error) && (error[0] == '\0'))
+            {
+                if (!gui_switch_to_buffer_by_number (gui_current_window, (int) number))
+                {
+                    gui_printf (NULL,
+                                _("%s buffer \"%s\" not found for \"%s\" command\n"),
+                                WEECHAT_ERROR, argv[0], "buffer");
+                    return -1;
+                }
+            }
+            else
+            {
+                /* invalid number */
+                gui_printf (NULL, _("%s incorrect buffer number\n"),
+                            WEECHAT_ERROR);
+                return -1;
+            }
+            
+        }
+    }
+    return 0;
+}
+
 /*
 * weechat_cmd_clear: display or create alias
 */
@@ -820,7 +1036,7 @@ weechat_cmd_clear (int argc, char **argv)
    if (argc == 1)
    {
        if (strcmp (argv[0], "-all") == 0)
-            gui_window_clear_all ();
+            gui_buffer_clear_all ();
        else
        {
            gui_printf (NULL,
@@ -830,7 +1046,7 @@ weechat_cmd_clear (int argc, char **argv)
        }
    }
    else
-        gui_window_clear (gui_current_window);
+        gui_buffer_clear (gui_current_window->buffer);
    return 0;
 }

@@ -842,7 +1058,6 @@ int
 weechat_cmd_connect (int argc, char **argv)
 {
    t_irc_server *ptr_server;
-    t_irc_channel *ptr_channel;
    
    /* make gcc happy */
    (void) argc;
@@ -857,20 +1072,16 @@ weechat_cmd_connect (int argc, char **argv)
                        WEECHAT_ERROR, argv[0]);
            return -1;
        }
-        if (!ptr_server->window)
+        if (!ptr_server->buffer)
        {
-            if (!gui_window_new (ptr_server, NULL, 1))
+            if (!gui_buffer_new (gui_current_window, ptr_server, NULL, 0, 1))
                return -1;
        }
        if (server_connect (ptr_server))
        {
+            ptr_server->reconnect_start = 0;
+            ptr_server->reconnect_join = (ptr_server->channels) ? 1 : 0;
            irc_login (ptr_server);
-            for (ptr_channel = ptr_server->channels; ptr_channel;
-                 ptr_channel = ptr_channel->next_channel)
-            {
-                if (ptr_channel->type == CHAT_CHANNEL)
-                    server_sendf (ptr_server, "JOIN %s\r\n", ptr_channel->name);
-            }
        }
    }
    else
@@ -898,15 +1109,18 @@ weechat_cmd_disconnect (int argc, char **argv)
    ptr_server = server_search (argv[0]);
    if (ptr_server)
    {
-        if (!ptr_server->is_connected)
+        if ((!ptr_server->is_connected) && (ptr_server->reconnect_start == 0))
        {
-            gui_printf (NULL,
+            gui_printf (ptr_server->buffer,
                        _("%s not connected to server \"%s\"!\n"),
                        WEECHAT_ERROR, argv[0]);
            return -1;
        }
-        server_disconnect (ptr_server);
-        gui_redraw_window_status (gui_current_window);
+        if (ptr_server->reconnect_start > 0)
+            gui_printf (ptr_server->buffer,
+                        _("Auto-reconnection is cancelled\n"));
+        server_disconnect (ptr_server, 0);
+        gui_draw_buffer_status (gui_current_window->buffer, 1);
    }
    else
    {
@@ -934,13 +1148,13 @@ weechat_cmd_help (int argc, char **argv)
        for (i = 0; weechat_commands[i].command_name; i++)
            gui_printf (NULL, "    %s - %s\n",
                        weechat_commands[i].command_name,
-                        weechat_commands[i].command_description);
+                        _(weechat_commands[i].command_description));
        gui_printf (NULL, _("> List of IRC commands:\n"));
        for (i = 0; irc_commands[i].command_name; i++)
            if (irc_commands[i].cmd_function_args || irc_commands[i].cmd_function_1arg)
                gui_printf (NULL, "    %s - %s\n",
                            irc_commands[i].command_name,
-                            irc_commands[i].command_description);
+                            _(irc_commands[i].command_description));
    }
    if (argc == 1)
    {
@@ -955,14 +1169,12 @@ weechat_cmd_help (int argc, char **argv)
                gui_printf (NULL,
                            _("Syntax: /%s %s\n"),
                            weechat_commands[i].command_name,
-                            (weechat_commands[i].
-                             arguments) ? weechat_commands[i].
-                            arguments : "");
+                            (weechat_commands[i].arguments) ?
+                            _(weechat_commands[i].arguments) : "");
                if (weechat_commands[i].arguments_description)
                {
                    gui_printf (NULL, "%s\n",
-                                weechat_commands[i].
-                                arguments_description);
+                                _(weechat_commands[i].arguments_description));
                }
                return 0;
            }
@@ -977,12 +1189,11 @@ weechat_cmd_help (int argc, char **argv)
                gui_printf (NULL, _("Syntax: /%s %s\n"),
                            irc_commands[i].command_name,
                            (irc_commands[i].arguments) ?
-                            irc_commands[i].arguments : "");
+                            _(irc_commands[i].arguments) : "");
                if (irc_commands[i].arguments_description)
                {
                    gui_printf (NULL, "%s\n",
-                                irc_commands[i].
-                                arguments_description);
+                                _(irc_commands[i].arguments_description));
                }
                return 0;
            }
@@ -1079,6 +1290,8 @@ weechat_cmd_perl (int argc, char **argv)
            
            break;
        case 1:
+            if (strcmp (argv[0], "autoload") == 0)
+                plugin_auto_load (PLUGIN_TYPE_PERL, "perl/autoload");
            if (strcmp (argv[0], "unload") == 0)
            {
                /* unload all Perl scripts */
@@ -1300,7 +1513,7 @@ weechat_cmd_server (int argc, char **argv)
            gui_printf_color (NULL, COLOR_WIN_CHAT, _("has been deleted\n"));
            
            server_free (server_found);
-            gui_redraw_window (gui_current_window);
+            gui_redraw_buffer (gui_current_window->buffer);
            
            return 0;
        }
@@ -1417,11 +1630,13 @@ weechat_cmd_server (int argc, char **argv)
        }
        
        /* create new server */
-        new_server = server_new (server.name, server.autoconnect, 0,
-                                 server.address, server.port, server.password,
+        new_server = server_new (server.name, server.autoconnect,
+                                 server.autoreconnect,
+                                 server.autoreconnect_delay,
+                                 0, server.address, server.port, server.password,
                                 server.nick1, server.nick2, server.nick3,
                                 server.username, server.realname,
-                                 server.command, server.autojoin);
+                                 server.command, 1, server.autojoin, 1);
        if (new_server)
        {
            irc_display_prefix (NULL, PREFIX_INFO);
@@ -1441,7 +1656,7 @@ weechat_cmd_server (int argc, char **argv)
        
        if (new_server->autoconnect)
        {
-            (void) gui_window_new (new_server, NULL, 1);
+            (void) gui_buffer_new (gui_current_window, new_server, NULL, 0, 1);
            if (server_connect (new_server))
                irc_login (new_server);
        }
@@ -1487,7 +1702,7 @@ weechat_cmd_set (char *arguments)
            if (ptr_option->handler_change == NULL)
            {
                gui_printf (NULL,
-                            _("%s option '%s' can not be changed while WeeChat is running\n"),
+                            _("%s option \"%s\" can not be changed while WeeChat is running\n"),
                            WEECHAT_ERROR, option);
            }
            else
@@ -1499,13 +1714,13 @@ weechat_cmd_set (char *arguments)
                    gui_printf (NULL, "  %s = %s\n", option, value);
                }
                else
-                    gui_printf (NULL, _("%s incorrect value for option '%s'\n"),
+                    gui_printf (NULL, _("%s incorrect value for option \"%s\"\n"),
                                WEECHAT_ERROR, option);
            }
        }
        else
        {
-            gui_printf (NULL, _("%s config option '%s' not found\n"),
+            gui_printf (NULL, _("%s config option \"%s\" not found\n"),
                        WEECHAT_ERROR, option);
        }
    }
@@ -1575,15 +1790,15 @@ weechat_cmd_set (char *arguments)
        if (number_found == 0)
        {
            if (value)
-                gui_printf (NULL, _("No config option found with '%s'\n"),
+                gui_printf (NULL, _("No config option found with \"%s\"\n"),
                            value);
            else
-                gui_printf (NULL, _("No config option found with '%s'\n"));
+                gui_printf (NULL, _("No config option found with \"%s\"\n"));
        }
        else
        {
            if (value)
-                gui_printf (NULL, _("%d config option(s) found with '%s'\n"),
+                gui_printf (NULL, _("%d config option(s) found with \"%s\"\n"),
                            number_found, value);
            else
                gui_printf (NULL, _("%d config option(s) found\n"),
@@ -1619,3 +1834,37 @@ weechat_cmd_unalias (char *arguments)
                arguments);
    return 0;
 }
+
+/*
+ * weechat_cmd_window: manage windows
+ */
+
+int
+weechat_cmd_window (int argc, char **argv)
+{
+    if ((argc == 0) || ((argc == 1) && (strcasecmp (argv[0], "list") == 0)))
+    {
+        /* list opened windows */
+        gui_printf (NULL, "window list -- NOT DEVELOPED!\n");
+    }
+    else
+    {
+        if (strcasecmp (argv[0], "splith") == 0)
+        {
+            /* split window horizontally */
+            gui_window_split_horiz (gui_current_window);
+        }
+        else if (strcasecmp (argv[0], "splitv") == 0)
+        {
+            /* split window vertically */
+            gui_window_split_vertic (gui_current_window);
+        }
+        else
+        {
+            gui_printf (NULL,
+                        _("%s unknown option for \"%s\" command\n"),
+                        WEECHAT_ERROR, "window");
+        }
+    }
+    return 0;
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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
@@ -67,6 +67,7 @@ extern t_weechat_alias *alias_new (char *, char *);
 extern int exec_weechat_command (t_irc_server *, char *);
 extern void user_command (t_irc_server *, 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_disconnect (int, char **);
@@ -76,5 +77,6 @@ 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_window (int, char **);

 #endif /* command.h */
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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,39 +29,110 @@

 #include "weechat.h"
 #include "history.h"
+#include "weeconfig.h"
 #include "../gui/gui.h"


 t_history *history_general = NULL;
+t_history *history_general_last = NULL;
 t_history *history_general_ptr = NULL;
+int num_history_general = 0;


+/*
+ * history_hide_password: hide a nickserv password
+ */
+
+void
+history_hide_password (char *string)
+{
+    char *pos_pwd;
+    
+    if (strstr (string, "nickserv "))
+    {
+        pos_pwd = strstr (string, "identify ");
+        if (!pos_pwd)
+            pos_pwd = strstr (string, "register ");
+        if (pos_pwd)
+        {
+            pos_pwd += 9;
+            while (pos_pwd[0])
+            {
+                pos_pwd[0] = '*';
+                pos_pwd++;
+            }
+        }
+    }
+}
+
 /*
 * history_add: add a text/command to history
 */

 void
-history_add (void *window, char *string)
+history_add (void *buffer, char *string)
 {
-    t_history *new_history;
+    t_history *new_history, *ptr_history;
    
+    /* add history to general 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);
        
-        /* add history to general history */
        if (history_general)
            history_general->prev_history = new_history;
+        else
+            history_general_last = new_history;
        new_history->next_history = history_general;
        new_history->prev_history = NULL;
        history_general = new_history;
+        num_history_general++;
        
-        /* add history to local history */
-        if (((t_gui_window *)(window))->history)
-            ((t_gui_window *)(window))->history->prev_history = new_history;
-        new_history->next_history = ((t_gui_window *)(window))->history;
+        /* remove one command if necessary */
+        if ((cfg_history_max_commands > 0)
+            && (num_history_general > cfg_history_max_commands))
+        {
+            ptr_history = history_general_last->prev_history;
+            history_general_last->prev_history->next_history = NULL;
+            if (history_general_last->text)
+                free (history_general_last->text);
+            free (history_general_last);
+            history_general_last = ptr_history;
+            num_history_general--;
+        }
+    }
+    
+    /* 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_window *)window)->history = new_history;
+        ((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++;
+        }
    }
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 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
@@ -0,0 +1,193 @@
+/*
+ * Copyright (c) 2003-2005 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/* hotlist.c: WeeChat hotlist (buffers with activity) */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdlib.h>
+
+#include "weechat.h"
+#include "hotlist.h"
+#include "../irc/irc.h"
+#include "../gui/gui.h"
+
+
+t_weechat_hotlist *hotlist = NULL;
+t_weechat_hotlist *last_hotlist = NULL;
+t_gui_buffer *hotlist_initial_buffer = NULL;
+
+
+/*
+ * hotlist_search: find hotlist with buffer pointer
+ */
+
+t_weechat_hotlist *
+hotlist_search (t_gui_buffer *buffer)
+{
+    t_weechat_hotlist *ptr_hotlist;
+    
+    for (ptr_hotlist = hotlist; ptr_hotlist; ptr_hotlist = ptr_hotlist->next_hotlist)
+    {
+        if (ptr_hotlist->buffer == buffer)
+            return ptr_hotlist;
+    }
+    return NULL;
+}
+
+/*
+ * hotlist_find_pos: find position for a inserting in hotlist (for sorting hotlist)
+ */
+
+t_weechat_hotlist *
+hotlist_find_pos (t_weechat_hotlist *new_hotlist)
+{
+    t_weechat_hotlist *ptr_hotlist;
+    
+    for (ptr_hotlist = hotlist; ptr_hotlist; ptr_hotlist = ptr_hotlist->next_hotlist)
+    {
+        if (new_hotlist->priority > ptr_hotlist->priority)
+            return ptr_hotlist;
+    }
+    return NULL;
+}
+
+/*
+ * hotlist_add: add a buffer to hotlist, with priority
+ */
+
+void
+hotlist_add (int priority, t_gui_buffer *buffer)
+{
+    t_weechat_hotlist *new_hotlist, *pos_hotlist;
+    
+    if (!buffer)
+        return;
+    
+    /* do not highlight current buffer */
+    if (buffer == gui_current_window->buffer)
+        return;
+    
+    if ((pos_hotlist = hotlist_search (buffer)))
+    {
+        /* return if priority is greater or equal than the one to add */
+        if (pos_hotlist->priority >= priority)
+            return;
+        /* remove buffer if present with lower priority and go on */
+        hotlist_free (pos_hotlist);
+    }
+    
+    if ((new_hotlist = (t_weechat_hotlist *) malloc (sizeof (t_weechat_hotlist))) == NULL)
+    {
+        gui_printf (NULL,
+                    _("%s cannot add a buffer to hotlist\n"), WEECHAT_ERROR);
+        return;
+    }
+    
+    new_hotlist->priority = priority;
+    new_hotlist->buffer = buffer;
+    
+    if (hotlist)
+    {
+        pos_hotlist = hotlist_find_pos (new_hotlist);
+        
+        if (pos_hotlist)
+        {
+            /* insert hotlist into the hotlist (before hotlist found) */
+            new_hotlist->prev_hotlist = pos_hotlist->prev_hotlist;
+            new_hotlist->next_hotlist = pos_hotlist;
+            if (pos_hotlist->prev_hotlist)
+                pos_hotlist->prev_hotlist->next_hotlist = new_hotlist;
+            else
+                hotlist = new_hotlist;
+            pos_hotlist->prev_hotlist = new_hotlist;
+        }
+        else
+        {
+            /* add hotlist to the end */
+            new_hotlist->prev_hotlist = last_hotlist;
+            new_hotlist->next_hotlist = NULL;
+            last_hotlist->next_hotlist = new_hotlist;
+            last_hotlist = new_hotlist;
+        }
+    }
+    else
+    {
+        new_hotlist->prev_hotlist = NULL;
+        new_hotlist->next_hotlist = NULL;
+        hotlist = new_hotlist;
+        last_hotlist = new_hotlist;
+    }
+}
+
+/*
+ * hotlist_free: free a hotlist and remove it from hotlist queue
+ */
+
+void
+hotlist_free (t_weechat_hotlist *ptr_hotlist)
+{
+    t_weechat_hotlist *new_hotlist;
+
+    /* remove hotlist from queue */
+    if (last_hotlist == ptr_hotlist)
+        last_hotlist = ptr_hotlist->prev_hotlist;
+    if (ptr_hotlist->prev_hotlist)
+    {
+        (ptr_hotlist->prev_hotlist)->next_hotlist = ptr_hotlist->next_hotlist;
+        new_hotlist = hotlist;
+    }
+    else
+        new_hotlist = ptr_hotlist->next_hotlist;
+    
+    if (ptr_hotlist->next_hotlist)
+        (ptr_hotlist->next_hotlist)->prev_hotlist = ptr_hotlist->prev_hotlist;
+    
+    free (ptr_hotlist);
+    hotlist = new_hotlist;
+}
+
+/*
+ * hotlist_free_all: free all hotlists
+ */
+
+void
+hotlist_free_all ()
+{
+    /* remove all hotlists */
+    while (hotlist)
+        hotlist_free (hotlist);
+}
+
+/*
+ * hotlist_remove_buffer: remove a buffer from hotlist
+ */
+
+void
+hotlist_remove_buffer (t_gui_buffer *buffer)
+{
+    t_weechat_hotlist *pos_hotlist;
+
+    pos_hotlist = hotlist_search (buffer);
+    if (pos_hotlist)
+        hotlist_free (pos_hotlist);
+}
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2003-2005 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+
+#ifndef __WEECHAT_HOTLIST_H
+#define __WEECHAT_HOTLIST_H 1
+
+#include "../irc/irc.h"
+
+typedef struct t_weechat_hotlist t_weechat_hotlist;
+
+struct t_weechat_hotlist
+{
+    int priority;                       /* 0=crappy msg (join/part), 1=msg, */
+                                        /* 2=nick highlight                 */
+    t_gui_buffer *buffer;               /* associated buffer                */
+    t_weechat_hotlist *prev_hotlist;    /* link to previous hotlist         */
+    t_weechat_hotlist *next_hotlist;    /* link to next hotlist             */
+};
+
+extern t_weechat_hotlist *hotlist;
+extern t_gui_buffer *hotlist_initial_buffer;
+
+extern void hotlist_add (int, t_gui_buffer *);
+extern void hotlist_free (t_weechat_hotlist *);
+extern void hotlist_free_all ();
+extern void hotlist_remove_buffer (t_gui_buffer *);
+
+#endif /* hotlist.h */
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2003-2005 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/* log.c: log buffers to files */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "weechat.h"
+#include "log.h"
+#include "weeconfig.h"
+
+
+/*
+ * log_write_date: writes date to log file
+ */
+
+void
+log_write_date (t_gui_buffer *buffer)
+{
+    static char buf_time[256];
+    static time_t seconds;
+    struct tm *date_tmp;
+    
+    if (buffer->log_file)
+    {    
+        seconds = time (NULL);
+        date_tmp = localtime (&seconds);
+        if (date_tmp)
+        {
+            strftime (buf_time, sizeof (buf_time) - 1, cfg_log_timestamp, date_tmp);
+            fprintf (buffer->log_file, "%s  ", buf_time);
+            fflush (buffer->log_file);
+        }
+    }
+}
+
+/*
+ * log_write: writes a message to log file
+ */
+
+void
+log_write (t_gui_buffer *buffer, char *message)
+{
+    if (buffer->log_file)
+    {    
+        fprintf (buffer->log_file, "%s", message);
+        fflush (buffer->log_file);
+    }
+}
+
+/*
+ * log_start: starts a log
+ */
+
+void
+log_start (t_gui_buffer *buffer)
+{
+    int length;
+    char *ptr_home;
+    
+    ptr_home = getenv ("HOME");
+    length = strlen (cfg_log_path) +
+        ((cfg_log_path[0] == '~') ? strlen (ptr_home) : 0) +
+        64;
+    if (SERVER(buffer))
+        length += strlen (SERVER(buffer)->name);
+    if (CHANNEL(buffer))
+        length += strlen (CHANNEL(buffer)->name);
+    buffer->log_filename = (char *) malloc (length);
+    if (!buffer->log_filename)
+    {
+        wee_log_printf (_("Not enough memory to write log file for a buffer\n"));
+        return;
+    }
+    if (cfg_log_path[0] == '~')
+    {
+        strcpy (buffer->log_filename, ptr_home);
+        strcat (buffer->log_filename, cfg_log_path + 1);
+    }
+    else
+        strcpy (buffer->log_filename, cfg_log_path);
+    if (buffer->log_filename[strlen (buffer->log_filename) - 1] != DIR_SEPARATOR_CHAR)
+        strcat (buffer->log_filename, DIR_SEPARATOR);
+    
+    if (SERVER(buffer))
+    {
+        strcat (buffer->log_filename, SERVER(buffer)->name);
+        strcat (buffer->log_filename, ".");
+    }
+    if (CHANNEL(buffer))
+    {
+        strcat (buffer->log_filename, CHANNEL(buffer)->name);
+        strcat (buffer->log_filename, ".");
+    }
+    strcat (buffer->log_filename, "weechatlog");
+    
+    buffer->log_file = fopen (buffer->log_filename, "a");
+    if (!buffer->log_file)
+    {
+        wee_log_printf (_("Unable to write log file for a buffer\n"));
+        free (buffer->log_filename);
+        return;
+    }
+    log_write (buffer, _("****  Beginning of log  "));
+    log_write_date (buffer);
+    log_write (buffer, "****\n");
+}
+
+/*
+ * log_end: ends a log
+ */
+
+void
+log_end (t_gui_buffer *buffer)
+{
+    if (buffer->log_file)
+    {
+        log_write (buffer, _("****  End of log  "));
+        log_write_date (buffer);
+        log_write (buffer, "****\n");
+        fclose (buffer->log_file);
+        buffer->log_file = NULL;
+    }
+    if (buffer->log_filename)
+        free (buffer->log_filename);
+}
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2003-2005 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+
+#ifndef __WEECHAT_LOG_H
+#define __WEECHAT_LOG_H 1
+
+#include "../irc/irc.h"
+
+extern void log_write_date (t_gui_buffer *);
+extern void log_write (t_gui_buffer *, char *);
+extern void log_start (t_gui_buffer *);
+extern void log_end (t_gui_buffer *);
+
+#endif /* log.h */
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sebastien Helleu	14e833c257	Version 0.0.9	2005-01-01 12:31:19 +00:00
Sebastien Helleu	de5af8a3b1	Added /buffer close, new keys: Alt-S (switch to server buffer), Alt-X (switch to first channel of next server)	2004-12-31 15:59:58 +00:00
Sebastien Helleu	37a2f80fae	Fixed bug when parsing messages, now looking for for \r\n and \n to cut messages	2004-12-28 08:21:53 +00:00
Sebastien Helleu	0f95a48854	Fixed bug in notice display when no '!' is found in host	2004-12-28 07:52:56 +00:00
Sebastien Helleu	39b5f07d6f	Inline help is now translated with gettext	2004-12-27 17:15:59 +00:00
Sebastien Helleu	f4f2ec3668	auto-reconnection to server (new options: server_autoreconnect (on/off), server_autoreconnect_delay (in seconds)), disconnections are now managed without problem by WeeChat	2004-12-27 16:22:39 +00:00
Sebastien Helleu	486e55be02	Updated french translation	2004-12-27 12:53:58 +00:00
Sebastien Helleu	c35f841b58	Major bug fixed when socket is closed by server (100% CPU usage fixed)	2004-12-27 12:50:51 +00:00
Sebastien Helleu	209fe89d27	Fixed bug when resizing window (input not displayed after resize)	2004-12-24 12:46:00 +00:00
Sebastien Helleu	fca4840c4a	Colors suppression in incoming messages is now ok (option look_remove_colors_from_msgs)	2004-12-23 11:31:34 +00:00
Sebastien Helleu	97ef63e2e6	Updated ChangeLog	2004-12-22 13:39:39 +00:00
Sebastien Helleu	17b409afe8	Fixed notice command (to server and display when received), fixed display of nick mode changes	2004-12-22 13:34:24 +00:00
Sebastien Helleu	bf4bcd3b8c	Updated doc for version 0.0.9-pre1	2004-12-22 10:57:45 +00:00
Sebastien Helleu	5233063825	Added keys: Ctrl+A (=home), Ctrl+E (=end), Ctrl+W (=ctrl+backspace)	2004-12-22 09:31:08 +00:00
Sebastien Helleu	9eeece2ccb	Fixed typo	2004-12-22 01:16:27 +00:00
Sebastien Helleu	9e8f42c141	French translation for new config option "server_command_delay"	2004-12-21 19:55:21 +00:00
Sebastien Helleu	996343fc1d	Added server_command_delay config option (delay in seconds after startup command)	2004-12-21 19:35:09 +00:00
Sebastien Helleu	ecafff21ce	Changes in main event loop: treats keyboard input & servers messages at same time	2004-12-21 19:11:38 +00:00
Sebastien Helleu	cf9d394e3a	Modified CFLAGS management (can now be customized)	2004-11-05 21:05:32 +00:00
Sebastien Helleu	0955167b6b	Version 0.0.9-pre1	2004-10-30 12:14:14 +00:00
Sebastien Helleu	2b96cacd51	Version 0.0.8	2004-10-30 09:57:16 +00:00
Sebastien Helleu	45f7cdda18	Added debian dir	2004-10-30 09:53:47 +00:00
Sebastien Helleu	dcf0119264	Removed file	2004-10-30 09:49:22 +00:00
Sebastien Helleu	c98365803d	Renamed man page weechat.1 to weechat-curses.1	2004-10-30 09:47:51 +00:00
Sebastien Helleu	ebcf17c78d	Fixed bug with /kick command (now ok with many words as reason)	2004-10-29 08:02:07 +00:00
Sebastien Helleu	022bf4d070	Fixed bug with /kick command (now ok with many words as reason)	2004-10-24 19:27:02 +00:00
Sebastien Helleu	d37ec4791c	Changed xahlexx mail	2004-10-22 19:45:41 +00:00
Sebastien Helleu	e5038b4119	nickserv passwords hidden (new config option: log_hide_nickserv_pwd on/off)	2004-10-17 11:33:21 +00:00
Sebastien Helleu	482d327562	nickserv passwords hidden (new config option: log_hide_nickserv_pwd on/off)	2004-10-17 11:28:03 +00:00
Sebastien Helleu	cb5269404c	Fixed display bug with channel name and privates when kicked	2004-10-17 09:24:27 +00:00
Sebastien Helleu	76c4d4d427	Auto-rejoin channels when kicked (new config option: server_autorejoin on/off)	2004-10-17 09:13:54 +00:00
Sebastien Helleu	34c6051ffc	Updated doc for version 0.0.8-pre2	2004-10-03 19:51:22 +00:00
Sebastien Helleu	e69afa1401	Fixed call to plugin_exec_command when server is NULL	2004-10-03 16:40:16 +00:00
Sebastien Helleu	2a227141c4	Fixed bug in wee_perl_exec() when server == NULL	2004-10-03 16:37:56 +00:00
Sebastien Helleu	7ef14b95b6	Added IRC::command function for Perl scripts	2004-10-03 16:29:05 +00:00
Sebastien Helleu	4e5f1698ba	Fixed bug when adding alias with same name as other	2004-10-03 12:43:32 +00:00
Sebastien Helleu	0a6945b6ed	Command "/buffer notify"	2004-10-03 01:56:30 +00:00
Sebastien Helleu	046452b7e0	Perl plugin interface available	2004-10-01 12:40:39 +00:00
Sebastien Helleu	d79dc3233a	Fixed display bug: now redraws all DCC view when one or more DCC status are modified	2004-09-28 21:33:54 +00:00
Sebastien Helleu	ce7f24ecc1	Log server/channel/private to file	2004-09-19 20:26:15 +00:00
Sebastien Helleu	0f718bf2c0	Commands "/buffer (list)" and "/buffer move" now ok	2004-09-19 09:46:11 +00:00
Sebastien Helleu	a9e05f57ee	Commands "/buffer (list)" and "/buffer move" now ok	2004-09-19 09:21:50 +00:00
Sebastien Helleu	24508e733c	Fixed path for included .h files	2004-09-19 06:59:18 +00:00
Sebastien Helleu	9f5c71ca98	Fixed typo in french translation	2004-09-18 16:03:20 +00:00
Sebastien Helleu	491dff4238	Redraw status bar when closing DCC view	2004-09-18 16:02:50 +00:00
Sebastien Helleu	7b84ab4b71	Added some options for ./configure script	2004-09-16 22:08:03 +00:00
Sebastien Helleu	c656661812	Added DCC control keys (Accept, Cancel, Remove, Close DCC view)	2004-09-16 20:01:56 +00:00
Sebastien Helleu	6753591f86	New /perl autoload command	2004-09-13 19:48:22 +00:00
Sebastien Helleu	4e8ed66a1e	Updated french translations	2004-09-12 17:33:16 +00:00
Sebastien Helleu	0e47caf091	Away now announced in channels, and config option "look_display_away" added to enable/disable this feature	2004-09-12 17:22:45 +00:00
Sebastien Helleu	6100af949b	Updated french translations	2004-09-12 11:47:36 +00:00
Sebastien Helleu	4b3d25175f	Display DCC progress in realtime, added selected DCC color config option, move into DCC list is ok (scroll)	2004-09-11 14:54:11 +00:00
Sebastien Helleu	b3fd00fc23	Removed debug message	2004-09-09 22:24:08 +00:00
Sebastien Helleu	1484e17ce1	DCC not auto accepted (depending on config), "~" replaced by home in dcc download dir, suffix displayed in filename received (if file is renamed), highlight for DCC buffer	2004-09-09 21:41:54 +00:00
Sebastien Helleu	9759d72d3d	Incoming DCC file	2004-09-08 21:48:45 +00:00
Sebastien Helleu	92eb995917	Receive DCC packets (for DCC file)	2004-09-08 16:56:56 +00:00
Sebastien Helleu	1425ee40f4	Fixed crash when resizing terminal to very small size, "-MORE-" message is now erased when switching to another buffer	2004-09-08 16:41:15 +00:00
Sebastien Helleu	c8eae742b9	Version 0.0.8-pre2: DCC window with Alt-D, /query command now reopens private buffer if already opened	2004-08-31 22:53:33 +00:00
Sebastien Helleu	441dd2313f	Updated doc for v0.0.7 (date)	2004-08-27 20:55:36 +00:00
Sebastien Helleu	aea603b6ed	Added DCC buffer type	2004-08-26 22:20:04 +00:00
Sebastien Helleu	9c6f2fcb8c	Added Ctrl-L key to redraw terminal	2004-08-25 20:51:25 +00:00
Sebastien Helleu	74ee53c102	Added Ctrl-L key to redraw terminal	2004-08-25 20:51:25 +00:00
Sebastien Helleu	649fd216ed	After hotlist clear, initial buffer for loop is current buffer	2004-08-10 18:07:43 +00:00
Sebastien Helleu	9278198964	Added key for clearing hotlist (Alt-R)	2004-08-10 18:02:38 +00:00
Sebastien Helleu	2ff30b15f2	Version 0.0.8-pre1	2004-08-08 21:25:52 +00:00
Sebastien Helleu	c94e1204aa	Version 0.0.7	2004-08-08 19:49:15 +00:00
Sebastien Helleu	2d438492d7	Fixed typo in french translation	2004-07-13 19:32:08 +00:00
Sebastien Helleu	8959ba9759	Fixed bug with hotlist when closing buffer	2004-07-13 18:15:04 +00:00
Sebastien Helleu	b9e5c94032	Free all buffers when exiting from WeeChat	2004-07-10 15:39:39 +00:00
Sebastien Helleu	4c660ad565	Free all buffers when exiting from WeeChat	2004-07-10 12:29:20 +00:00
Sebastien Helleu	ab393805fb	Alt-0 now switches to buffer #10	2004-07-10 07:39:06 +00:00
Sebastien Helleu	dea586e5f1	Fixed crash when opening second server window	2004-07-09 22:26:30 +00:00
Sebastien Helleu	e1afa31563	Fixed bug when closing window (new numbers for next buffers if any)	2004-07-06 19:54:31 +00:00
Sebastien Helleu	750a5cbc6d	Added "col_status_delimiters" config option	2004-07-05 22:31:26 +00:00
Sebastien Helleu	77fab4ae29	Fixed nick color when nick is changed (now uses always same color)	2004-07-05 17:43:42 +00:00
Sebastien Helleu	622a18fb3f	Removed "?" when system date not found	2004-07-04 21:03:39 +00:00
Sebastien Helleu	97b34b36fc	DCC skeleton	2004-07-04 16:04:00 +00:00
Sebastien Helleu	fb21a1c7f9	Hotlist management (buffers with activity)	2004-07-04 15:58:40 +00:00
Sebastien Helleu	f02ba717a0	Added /buffer command, jump to buffer by number (alt-digit), actions now ok in private buffers	2004-07-04 15:39:49 +00:00
Sebastien Helleu	9e6938bdf7	Added auto-switch to active channels (alt-a)	2004-07-03 14:07:09 +00:00
Sebastien Helleu	b9a40bbe21	Buffers ordered by number, unique color for each nick, action messages now like messages (not crappy msgs), --enable-debug replaced by --with-debug for ./configure script	2004-07-02 23:19:36 +00:00
Sebastien Helleu	062e5ea1ae	Window management	2004-07-01 20:43:57 +00:00
Sebastien Helleu	66ff97166f	Version 0.0.7-pre2 - window management	2004-06-22 22:21:22 +00:00
Sebastien Helleu	095f296529	Fixed display bug when nicklist is displayed at bottom of screen	2004-06-17 18:48:01 +00:00
Sebastien Helleu	340176d635	Added history limit (text buffer & commands)	2004-06-13 00:40:30 +00:00
Sebastien Helleu	fed6c36d19	Added Gentoo install command	2004-06-12 14:01:28 +00:00
Sebastien Helleu	3f84a8456a	Version 0.0.7-pre1	2004-06-05 16:56:59 +00:00