Version 0.1.7

Reverse order for unloading plugins (fixes crash on FreeBSD)
Fixed charset decoding bug when displaying topic of a channel
2026-06-21 02:16:38 +02:00 · 2006-01-14 12:09:38 +00:00 · 2006-01-14 12:09:04 +00:00 · 2006-01-14 08:26:10 +00:00 · 2006-01-12 15:05:35 +00:00 · 2006-01-10 08:52:09 +00:00
254 changed files with 105444 additions and 34698 deletions
@@ -0,0 +1,996 @@
+1 Notes on the Free Translation Project
+***************************************
+
+Free software is going international!  The Free Translation Project is
+a way to get maintainers of free software, translators, and users all
+together, so that free software will gradually become able to speak many
+languages.  A few packages already provide translations for their
+messages.
+
+   If you found this `ABOUT-NLS' file inside a distribution, you may
+assume that the distributed package does use GNU `gettext' internally,
+itself available at your nearest GNU archive site.  But you do _not_
+need to install GNU `gettext' prior to configuring, installing or using
+this package with messages translated.
+
+   Installers will find here some useful hints.  These notes also
+explain how users should proceed for getting the programs to use the
+available translations.  They tell how people wanting to contribute and
+work on translations can contact the appropriate team.
+
+   When reporting bugs in the `intl/' directory or bugs which may be
+related to internationalization, you should tell about the version of
+`gettext' which is used.  The information can be found in the
+`intl/VERSION' file, in internationalized packages.
+
+1.1 Quick configuration advice
+==============================
+
+If you want to exploit the full power of internationalization, you
+should configure it using
+
+     ./configure --with-included-gettext
+
+to force usage of internationalizing routines provided within this
+package, despite the existence of internationalizing capabilities in the
+operating system where this package is being installed.  So far, only
+the `gettext' implementation in the GNU C library version 2 provides as
+many features (such as locale alias, message inheritance, automatic
+charset conversion or plural form handling) as the implementation here.
+It is also not possible to offer this additional functionality on top
+of a `catgets' implementation.  Future versions of GNU `gettext' will
+very likely convey even more functionality.  So it might be a good idea
+to change to GNU `gettext' as soon as possible.
+
+   So you need _not_ provide this option if you are using GNU libc 2 or
+you have installed a recent copy of the GNU gettext package with the
+included `libintl'.
+
+1.2 INSTALL Matters
+===================
+
+Some packages are "localizable" when properly installed; the programs
+they contain can be made to speak your own native language.  Most such
+packages use GNU `gettext'.  Other packages have their own ways to
+internationalization, predating GNU `gettext'.
+
+   By default, this package will be installed to allow translation of
+messages.  It will automatically detect whether the system already
+provides the GNU `gettext' functions.  If not, the included GNU
+`gettext' library will be used.  This library is wholly contained
+within this package, usually in the `intl/' subdirectory, so prior
+installation of the GNU `gettext' package is _not_ required.
+Installers may use special options at configuration time for changing
+the default behaviour.  The commands:
+
+     ./configure --with-included-gettext
+     ./configure --disable-nls
+
+will, respectively, bypass any pre-existing `gettext' to use the
+internationalizing routines provided within this package, or else,
+_totally_ disable translation of messages.
+
+   When you already have GNU `gettext' installed on your system and run
+configure without an option for your new package, `configure' will
+probably detect the previously built and installed `libintl.a' file and
+will decide to use this.  This might not be desirable.  You should use
+the more recent version of the GNU `gettext' library.  I.e. if the file
+`intl/VERSION' shows that the library which comes with this package is
+more recent, you should use
+
+     ./configure --with-included-gettext
+
+to prevent auto-detection.
+
+   The configuration process will not test for the `catgets' function
+and therefore it will not be used.  The reason is that even an
+emulation of `gettext' on top of `catgets' could not provide all the
+extensions of the GNU `gettext' library.
+
+   Internationalized packages usually have many `po/LL.po' files, where
+LL gives an ISO 639 two-letter code identifying the language.  Unless
+translations have been forbidden at `configure' time by using the
+`--disable-nls' switch, all available translations are installed
+together with the package.  However, the environment variable `LINGUAS'
+may be set, prior to configuration, to limit the installed set.
+`LINGUAS' should then contain a space separated list of two-letter
+codes, stating which languages are allowed.
+
+1.3 Using This Package
+======================
+
+As a user, if your language has been installed for this package, you
+only have to set the `LANG' environment variable to the appropriate
+`LL_CC' combination.  Here `LL' is an ISO 639 two-letter language code,
+and `CC' is an ISO 3166 two-letter country code.  For example, let's
+suppose that you speak German and live in Germany.  At the shell
+prompt, merely execute `setenv LANG de_DE' (in `csh'),
+`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
+This can be done from your `.login' or `.profile' file, once and for
+all.
+
+   You might think that the country code specification is redundant.
+But in fact, some languages have dialects in different countries.  For
+example, `de_AT' is used for Austria, and `pt_BR' for Brazil.  The
+country code serves to distinguish the dialects.
+
+   The locale naming convention of `LL_CC', with `LL' denoting the
+language and `CC' denoting the country, is the one use on systems based
+on GNU libc.  On other systems, some variations of this scheme are
+used, such as `LL' or `LL_CC.ENCODING'.  You can get the list of
+locales supported by your system for your country by running the command
+`locale -a | grep '^LL''.
+
+   Not all programs have translations for all languages.  By default, an
+English message is shown in place of a nonexistent translation.  If you
+understand other languages, you can set up a priority list of languages.
+This is done through a different environment variable, called
+`LANGUAGE'.  GNU `gettext' gives preference to `LANGUAGE' over `LANG'
+for the purpose of message handling, but you still need to have `LANG'
+set to the primary language; this is required by other parts of the
+system libraries.  For example, some Swedish users who would rather
+read translations in German than English for when Swedish is not
+available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
+
+   Special advice for Norwegian users: The language code for Norwegian
+bokma*l changed from `no' to `nb' recently (in 2003).  During the
+transition period, while some message catalogs for this language are
+installed under `nb' and some older ones under `no', it's recommended
+for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and
+older translations are used.
+
+   In the `LANGUAGE' environment variable, but not in the `LANG'
+environment variable, `LL_CC' combinations can be abbreviated as `LL'
+to denote the language's main dialect.  For example, `de' is equivalent
+to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
+(Portuguese as spoken in Portugal) in this context.
+
+1.4 Translating Teams
+=====================
+
+For the Free Translation Project to be a success, we need interested
+people who like their own language and write it well, and who are also
+able to synergize with other translators speaking the same language.
+Each translation team has its own mailing list.  The up-to-date list of
+teams can be found at the Free Translation Project's homepage,
+`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams"
+area.
+
+   If you'd like to volunteer to _work_ at translating messages, you
+should become a member of the translating team for your own language.
+The subscribing address is _not_ the same as the list itself, it has
+`-request' appended.  For example, speakers of Swedish can send a
+message to `sv-request@li.org', having this message body:
+
+     subscribe
+
+   Keep in mind that team members are expected to participate
+_actively_ in translations, or at solving translational difficulties,
+rather than merely lurking around.  If your team does not exist yet and
+you want to start one, or if you are unsure about what to do or how to
+get started, please write to `translation@iro.umontreal.ca' to reach the
+coordinator for all translator teams.
+
+   The English team is special.  It works at improving and uniformizing
+the terminology in use.  Proven linguistic skill are praised more than
+programming skill, here.
+
+1.5 Available Packages
+======================
+
+Languages are not equally supported in all packages.  The following
+matrix shows the current state of internationalization, as of May 2005.
+The matrix shows, in regard of each package, for which languages PO
+files have been submitted to translation coordination, with a
+translation percentage of at least 50%.
+
+     Ready PO files       af am ar az be bg bs ca cs cy da de el en en_GB
+                        +-------------------------------------------------+
+     GNUnet             |                                                 |
+     a2ps               |             []                [] [] []     []   |
+     aegis              |                                  ()             |
+     ant-phone          |                                  ()             |
+     anubis             |                                  []             |
+     ap-utils           |                                                 |
+     aspell             |                         []    [] []        []   |
+     bash               |                      []          []             |
+     batchelor          |                                  []             |
+     bfd                |                                                 |
+     bibshelf           |                                  []             |
+     binutils           |                               []                |
+     bison              |                               [] []             |
+     bluez-pin          | []                      []       [] []          |
+     clisp              |                                  []    []       |
+     console-tools      |                         []       []             |
+     coreutils          |                []    []       [] []             |
+     cpio               |                                                 |
+     cpplib             |                      []       [] []             |
+     darkstat           |                []             () []             |
+     dialog             |                      [] [] [] [] [] []          |
+     diffutils          |                      [] []    [] [] []          |
+     doodle             |                                  []             |
+     e2fsprogs          |                         []       []             |
+     enscript           |                      []       [] []        []   |
+     error              |                      []       [] []        []   |
+     fetchmail          |                      []       [] () []          |
+     fileutils          |                               [] []             |
+     findutils          |                      []       []    []          |
+     flex               |                      []       [] []             |
+     fslint             |                                  []             |
+     gas                |                                                 |
+     gawk               |                      []       [] []             |
+     gbiff              |                                  []             |
+     gcal               |                      []                         |
+     gcc                |                                  []             |
+     gettext-examples   | []                   []          [] []          |
+     gettext-runtime    |             []       []       [] []             |
+     gettext-tools      |                      []          []             |
+     gimp-print         |                         []    [] []        []   |
+     gip                |                                                 |
+     gliv               |                                  []             |
+     glunarclock        |                                                 |
+     gmult              | []                               []             |
+     gnubiff            |                                  ()             |
+     gnucash            |                         []       () ()     []   |
+     gnucash-glossary   |                               [] ()             |
+     gpe-aerial         |                         []       []             |
+     gpe-beam           |                         []       []             |
+     gpe-calendar       |                         []       []             |
+     gpe-clock          |                         []       []             |
+     gpe-conf           |                         []       []             |
+     gpe-contacts       |                                                 |
+     gpe-edit           |                         []                      |
+     gpe-go             |                         []                      |
+     gpe-login          |                         []       []             |
+     gpe-ownerinfo      |                         []       []             |
+     gpe-sketchbook     |                         []       []             |
+     gpe-su             |                         []       []             |
+     gpe-taskmanager    |                         []       []             |
+     gpe-timesheet      |                         []                      |
+     gpe-today          |                         []       []             |
+     gpe-todo           |                         []       []             |
+     gphoto2            |                         []    [] []        []   |
+     gprof              |                               [] []             |
+     gpsdrive           |                                  ()    ()       |
+     gramadoir          | []                               []             |
+     grep               | []          [] []    []          [] []          |
+     gretl              |                                                 |
+     gsasl              |                                  []             |
+     gss                |                                                 |
+     gst-plugins        | []       []          [] []       []        []   |
+     gstreamer          | []                   [] []       []        []   |
+     gtick              | []                               ()             |
+     gtkspell           |             []                   [] []          |
+     hello              |                      []       [] [] []          |
+     id-utils           |                               [] []             |
+     impost             |                                                 |
+     indent             |                      []          []             |
+     iso_3166           |                                                 |
+     iso_3166_1         |                      [] []    [] [] []          |
+     iso_3166_2         |                                                 |
+     iso_3166_3         |                                  []             |
+     iso_4217           |                                                 |
+     iso_639            |                                                 |
+     jpilot             |                         []                      |
+     jtag               |                                                 |
+     jwhois             |                                                 |
+     kbd                |                         []    [] [] []          |
+     latrine            |                                  ()             |
+     ld                 |                               []                |
+     libc               |                      [] []    [] [] []          |
+     libextractor       |                                                 |
+     libgpewidget       |                         []    [] []             |
+     libgphoto2         |                                  []             |
+     libgphoto2_port    |                                  []             |
+     libgsasl           |                                                 |
+     libiconv           | []                   []       [] [] []          |
+     libidn             |                                                 |
+     lifelines          |                               [] ()             |
+     lilypond           |                                  []             |
+     lingoteach         |                                                 |
+     lynx               |                      [] []    [] []             |
+     m4                 |                         []    [] [] []          |
+     mailutils          |                      []                         |
+     make               |                               [] []             |
+     man-db             |                      [] ()    [] []             |
+     minicom            |                         []       []             |
+     mysecretdiary      |                               [] []             |
+     nano               |                      [] ()       []             |
+     nano_1_0           |                      [] ()    [] []             |
+     opcodes            |                                  []             |
+     parted             |                      [] []    [] []             |
+     psmisc             |                                                 |
+     ptx                |                      []       [] []             |
+     pwdutils           |                                                 |
+     python             |                                                 |
+     radius             |                      []                         |
+     recode             |             []       []       [] [] []          |
+     rpm                |                         []    []                |
+     screem             |                                                 |
+     scrollkeeper       |          [] []       [] [] [] [] []        []   |
+     sed                |                      []          []             |
+     sh-utils           |                               [] []             |
+     shared-mime-info   |                []       []                      |
+     sharutils          |                      [] []    [] [] []          |
+     silky              |                                                 |
+     skencil            |                               [] ()             |
+     sketch             |                               [] ()             |
+     solfege            |                                  []             |
+     soundtracker       |                               [] []             |
+     sp                 |                                  []             |
+     stardict           |                         []                      |
+     tar                |                                                 |
+     texinfo            |                               [] []             |
+     textutils          |                      []       [] []             |
+     tin                |                                  ()        ()   |
+     tp-robot           |                                  []             |
+     tuxpaint           | []                   [] []    [] [] []     []   |
+     unicode-han-tra... |                                                 |
+     unicode-transla... |                                                 |
+     util-linux         |                      [] []    [] []             |
+     vorbis-tools       |             []          []    []           []   |
+     wastesedge         |                                  ()             |
+     wdiff              |                      []       [] []        []   |
+     wget               |                                                 |
+     xchat              |                []    []          [] []     []   |
+     xkeyboard-config   |                                                 |
+     xpad               |                                                 |
+                        +-------------------------------------------------+
+                          af am ar az be bg bs ca cs cy da de el en en_GB
+                          10  0  0  2  7  5  0 40 43  2 51 91 19  1  14
+
+                          eo es et eu fa fi fr  ga gl he hi hr hu id is
+                        +-----------------------------------------------+
+     GNUnet             |                                               |
+     a2ps               |       []       [] []                          |
+     aegis              |                                               |
+     ant-phone          |                   []                          |
+     anubis             |                   []                          |
+     ap-utils           |                   []                          |
+     aspell             |                   []  []                      |
+     bash               | [] []             []                 []       |
+     batchelor          |                   []  []                      |
+     bfd                |    []                                         |
+     bibshelf           |    []                 []                      |
+     binutils           |    []             []                          |
+     bison              |    [] []          []  []                []    |
+     bluez-pin          | []             [] []  []             [] []    |
+     clisp              |    []             []                          |
+     console-tools      |                                               |
+     coreutils          |    [] []       [] []  []                      |
+     cpio               |    []             []                          |
+     cpplib             |    []             []                          |
+     darkstat           |    []             ()  []             [] []    |
+     dialog             |    [] [] []    [] []  []             []       |
+     diffutils          | [] []          [] []  [] [] []       [] []    |
+     doodle             |                       []                      |
+     e2fsprogs          |    []             []                          |
+     enscript           |                   []              []          |
+     error              |    []          [] []  []             []       |
+     fetchmail          |    []                                         |
+     fileutils          |    [] []          []  []             []       |
+     findutils          |    [] []          []  []                      |
+     flex               |    []             []  []                      |
+     fslint             |                   []                          |
+     gas                |    []             []                          |
+     gawk               |    []             []  []    []                |
+     gbiff              |                   []                          |
+     gcal               |    []             []                          |
+     gcc                |    []                                         |
+     gettext-examples   |    []             []  []                      |
+     gettext-runtime    |    []          [] []  []                []    |
+     gettext-tools      |    []             []                          |
+     gimp-print         |    []             []                          |
+     gip                |    []    []       []                          |
+     gliv               |                   ()                          |
+     glunarclock        |                []     []             []       |
+     gmult              |          []       []                          |
+     gnubiff            |                   ()                          |
+     gnucash            |    []                                ()       |
+     gnucash-glossary   |    []                                         |
+     gpe-aerial         |    []             []                          |
+     gpe-beam           |    []             []                          |
+     gpe-calendar       |    []             []                 [] []    |
+     gpe-clock          |    []          [] []                          |
+     gpe-conf           |                   []                          |
+     gpe-contacts       |                   []                          |
+     gpe-edit           |                   []                    []    |
+     gpe-go             |    []             []                          |
+     gpe-login          |    []             []                 []       |
+     gpe-ownerinfo      |    []          [] []                 [] []    |
+     gpe-sketchbook     |    []             []                          |
+     gpe-su             |    []          [] []                          |
+     gpe-taskmanager    |    []          [] []                          |
+     gpe-timesheet      |    []             []  []                []    |
+     gpe-today          |    []          [] []  []                      |
+     gpe-todo           |    []             []                    []    |
+     gphoto2            |    []          [] []                 []       |
+     gprof              |    []             []                    []    |
+     gpsdrive           |    ()             ()                 []       |
+     gramadoir          |                   []  []                      |
+     grep               |    [] [] []    [] []  [] [] []    [] [] []    |
+     gretl              |    []             []                          |
+     gsasl              |          []       []  []                      |
+     gss                |                   []                          |
+     gst-plugins        |                   []                 []       |
+     gstreamer          |                                               |
+     gtick              |          []    [] []  []                      |
+     gtkspell           | [] []    []       []  []                      |
+     hello              | [] [] [] [] [] [] []  [] [] []    [] [] []    |
+     id-utils           |                   []                 [] []    |
+     impost             |                   []  []                      |
+     indent             | [] [] [] []    [] []  [] []          [] []    |
+     iso_3166           | []             [] []                          |
+     iso_3166_1         |    []    []    [] []  []             [] []    |
+     iso_3166_2         |                   []                          |
+     iso_3166_3         |                   []                          |
+     iso_4217           |       []       []        []                   |
+     iso_639            | []          [] [] []                          |
+     jpilot             |    []             []                          |
+     jtag               |                   []                          |
+     jwhois             |    []             []                 [] []    |
+     kbd                |    []             []                          |
+     latrine            |                   []  []                      |
+     ld                 |    []             []                          |
+     libc               |    []          [] []     []          []       |
+     libextractor       |                                               |
+     libgpewidget       |    []             []  []             [] []    |
+     libgphoto2         |    []             []                 []       |
+     libgphoto2_port    |                   []                          |
+     libgsasl           |                   []  []                      |
+     libiconv           | [] [] []       [] []  [] []       [] [] []    |
+     libidn             | []                []                          |
+     lifelines          |                   ()                          |
+     lilypond           |                                               |
+     lingoteach         |                   []                    []    |
+     lynx               |       []                             []       |
+     m4                 |                   []  [] []             []    |
+     mailutils          |    []             []                          |
+     make               |    []          [] []  [] [] []    []          |
+     man-db             |    ()                                         |
+     minicom            |    []          [] []                 []       |
+     mysecretdiary      |    []             []                    []    |
+     nano               |    []    []    () []                          |
+     nano_1_0           |    []             []     []             []    |
+     opcodes            |    []          [] []                          |
+     parted             |    []             []     []                   |
+     psmisc             |          []                                   |
+     ptx                | [] [] []       [] []  [] []          [] []    |
+     pwdutils           |                                               |
+     python             |                                               |
+     radius             |    []             []                          |
+     recode             | [] []             []     [] []       [] []    |
+     rpm                |                   []                          |
+     screem             |                                               |
+     scrollkeeper       |    []          []                    []       |
+     sed                | [] [] []          []  []             []       |
+     sh-utils           |    [] []       [] []  []             []       |
+     shared-mime-info   | [] []    []    [] []                 []       |
+     sharutils          |    [] []       [] []     []          []       |
+     silky              |                   []                          |
+     skencil            |    []             []                          |
+     sketch             |    []             []                          |
+     solfege            |                                               |
+     soundtracker       |    []             []                          |
+     sp                 |                   []                          |
+     stardict           |                                      []       |
+     tar                |    [] []          []  []                      |
+     texinfo            | []                []        []                |
+     textutils          |    []             []  [] []          []       |
+     tin                |       []          ()                          |
+     tp-robot           |                   []                 []       |
+     tuxpaint           |    []          [] []  []    []       [] [] [] |
+     unicode-han-tra... |                                               |
+     unicode-transla... |                   []  []                      |
+     util-linux         |    [] []       [] []                 []       |
+     vorbis-tools       |    []             []                          |
+     wastesedge         |                   ()                          |
+     wdiff              |    [] []          []  [] []          [] []    |
+     wget               |       [] []           []          []          |
+     xchat              |    []    []    [] []           []             |
+     xkeyboard-config   |                                               |
+     xpad               |    []                 []             []       |
+                        +-----------------------------------------------+
+                          eo es et eu fa fi fr  ga gl he hi hr hu id is
+                          15 85 21 15  2 35 115 45 16  8  1  6 40 27  1
+
+                          it ja ko ku lg lt lv mk mn ms mt nb nl nn no nso
+                        +--------------------------------------------------+
+     GNUnet             |                                                  |
+     a2ps               | ()    ()                   []       []    ()     |
+     aegis              |                                     ()           |
+     ant-phone          |                                     []           |
+     anubis             |                            []    [] []           |
+     ap-utils           |                                                  |
+     aspell             |                         []          []           |
+     bash               |                                     []           |
+     batchelor          |                                     []           |
+     bfd                |                                                  |
+     bibshelf           | []                                               |
+     binutils           |                                                  |
+     bison              | []                         []    [] []           |
+     bluez-pin          |          []                         []           |
+     clisp              |                                     []           |
+     console-tools      |                                                  |
+     coreutils          |    []                               []           |
+     cpio               |                                                  |
+     cpplib             |                                     []           |
+     darkstat           |                            []       []           |
+     dialog             | []                                  []           |
+     diffutils          | [] []                      []       []           |
+     doodle             | []                                               |
+     e2fsprogs          | []                                               |
+     enscript           |                                     []           |
+     error              |                                     []           |
+     fetchmail          |    []                               []           |
+     fileutils          | [] []       []                                   |
+     findutils          | []                                  []           |
+     flex               |       []                            []           |
+     fslint             |                                     []           |
+     gas                |                                                  |
+     gawk               |    []                               []           |
+     gbiff              |                                     []           |
+     gcal               |                                                  |
+     gcc                |                                                  |
+     gettext-examples   | [] []                               []           |
+     gettext-runtime    | [] [] []                            []           |
+     gettext-tools      | [] [] []                                         |
+     gimp-print         |    []                               []           |
+     gip                |                                     []           |
+     gliv               |                                     []           |
+     glunarclock        |                            []       []           |
+     gmult              | [] []                                            |
+     gnubiff            | ()                                               |
+     gnucash            | [] ()                            () []           |
+     gnucash-glossary   | []                                  []           |
+     gpe-aerial         |                                     []           |
+     gpe-beam           |                                     []           |
+     gpe-calendar       |                                     []           |
+     gpe-clock          |                                     []           |
+     gpe-conf           |                                     []           |
+     gpe-contacts       |                                                  |
+     gpe-edit           |                                     []           |
+     gpe-go             |                                     []           |
+     gpe-login          |                                     []           |
+     gpe-ownerinfo      |                                     []           |
+     gpe-sketchbook     |                                     []           |
+     gpe-su             |                                     []           |
+     gpe-taskmanager    |          []                         []           |
+     gpe-timesheet      |                                     []           |
+     gpe-today          |                                     []           |
+     gpe-todo           |                                     []           |
+     gphoto2            | [] []                               []           |
+     gprof              |                                                  |
+     gpsdrive           | () ()                               ()    ()     |
+     gramadoir          |                                     ()           |
+     grep               | [] []                            [] []           |
+     gretl              | []                                               |
+     gsasl              |                                     []           |
+     gss                |                                                  |
+     gst-plugins        | []                                  []           |
+     gstreamer          | []                                  []           |
+     gtick              | []                                  []           |
+     gtkspell           | []                      []          []           |
+     hello              | [] [] []          []       []    [] [] [] []     |
+     id-utils           | []                                  []           |
+     impost             |                                                  |
+     indent             | [] []                               []           |
+     iso_3166           |                                     []           |
+     iso_3166_1         |                                     []    []     |
+     iso_3166_2         |                                     []           |
+     iso_3166_3         |                                     []           |
+     iso_4217           |    []                   []          []           |
+     iso_639            |    []                               [] []        |
+     jpilot             |    ()                               ()    ()     |
+     jtag               |                                                  |
+     jwhois             | []                                  []           |
+     kbd                |                                     []           |
+     latrine            | []                                  []           |
+     ld                 |                                                  |
+     libc               |    [] []                         [] []    []     |
+     libextractor       |                                                  |
+     libgpewidget       |                                     []           |
+     libgphoto2         | [] []                                            |
+     libgphoto2_port    | [] []                                            |
+     libgsasl           |                                     []           |
+     libiconv           | []                                  []           |
+     libidn             | []                                               |
+     lifelines          |                                     []           |
+     lilypond           |                                                  |
+     lingoteach         | []                                  []           |
+     lynx               | [] []                               []           |
+     m4                 |    []                               []           |
+     mailutils          |                                                  |
+     make               |    [] []                            []           |
+     man-db             |    ()                                            |
+     minicom            |    []                                            |
+     mysecretdiary      |                                     []           |
+     nano               | []                         []    []              |
+     nano_1_0           | []                         []    []    []        |
+     opcodes            |                                     []           |
+     parted             | [] []                               [] []        |
+     psmisc             | []                               [] []           |
+     ptx                |                                  [] []    []     |
+     pwdutils           |                                                  |
+     python             |                                                  |
+     radius             |                                                  |
+     recode             | []                                  []           |
+     rpm                |    [] []                                         |
+     screem             |    []                                            |
+     scrollkeeper       |                                  [] [] []        |
+     sed                |    []                               []           |
+     sh-utils           | [] []                            []              |
+     shared-mime-info   |       []                         [] [] []        |
+     sharutils          | [] []                               []           |
+     silky              |                                     []           |
+     skencil            |                                                  |
+     sketch             |                                                  |
+     solfege            | []                                  []    []     |
+     soundtracker       | []                                               |
+     sp                 |    ()                                            |
+     stardict           |                      []             []           |
+     tar                | [] []                               []           |
+     texinfo            |    []                            [] []           |
+     textutils          |    [] []                         []              |
+     tin                |                                                  |
+     tp-robot           |                                     []           |
+     tuxpaint           | [] [] []       []          []       [] []        |
+     unicode-han-tra... |                                                  |
+     unicode-transla... |                                                  |
+     util-linux         | [] []                               []           |
+     vorbis-tools       |                                     []           |
+     wastesedge         |                                     []           |
+     wdiff              | []                         []    []              |
+     wget               |    []                                            |
+     xchat              | []    []          [] []             []           |
+     xkeyboard-config   |                                     []           |
+     xpad               |                                     []           |
+                        +--------------------------------------------------+
+                          it ja ko ku lg lt lv mk mn ms mt nb nl nn no nso
+                          46 35 11  2  1  1  2  2  3 11  0 15 96  7  5  0
+
+                          or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv
+                        +----------------------------------------------+
+     GNUnet             |                                              |
+     a2ps               |       ()     []      [] []       []    [] [] |
+     aegis              |                      () ()                   |
+     ant-phone          |                      []                      |
+     anubis             |       []             [] []                   |
+     ap-utils           |       ()                                     |
+     aspell             |                      [] []                   |
+     bash               |              []      [] []                   |
+     batchelor          |                      []                      |
+     bfd                |                                              |
+     bibshelf           |                                              |
+     binutils           |                         []                [] |
+     bison              |       []     []      [] []                [] |
+     bluez-pin          |       []     []   [] [] []    []       [] [] |
+     clisp              |                         []                   |
+     console-tools      |                         []                   |
+     coreutils          |       []                []       []       [] |
+     cpio               |       []                                  [] |
+     cpplib             |                                              |
+     darkstat           |       []     []      []       []       [] [] |
+     dialog             |       [] []  []   [] [] [] []                |
+     diffutils          |       []     []      [] []             [] [] |
+     doodle             |                                     []       |
+     e2fsprogs          |       []                                  [] |
+     enscript           |              []      [] []                [] |
+     error              |              []      []       []             |
+     fetchmail          |       []                []    []    []       |
+     fileutils          |       []             [] []       []       [] |
+     findutils          |       [] []          []       []       [] [] |
+     flex               |       []     []      [] []                [] |
+     fslint             |              []      []                []    |
+     gas                |                                              |
+     gawk               |       []     []      []                   [] |
+     gbiff              |                      []                      |
+     gcal               |                                           [] |
+     gcc                |                                              |
+     gettext-examples   |       []             [] []    []       [] [] |
+     gettext-runtime    |       []             [] []    [] []    [] [] |
+     gettext-tools      |       []             [] []    [] []    [] [] |
+     gimp-print         |                               []          [] |
+     gip                |                   []          []       []    |
+     gliv               |              []      []       []             |
+     glunarclock        |              []      [] []    []       [] [] |
+     gmult              |              []   [] []                []    |
+     gnubiff            |                      ()                   [] |
+     gnucash            |       () []             []    []          [] |
+     gnucash-glossary   |          []                   []          [] |
+     gpe-aerial         |          []  []      [] []             [] [] |
+     gpe-beam           |          []  []      [] []             [] [] |
+     gpe-calendar       |          []  []      [] []    []       [] [] |
+     gpe-clock          |          []  []      [] []    []       [] [] |
+     gpe-conf           |          []  []      [] []    []          [] |
+     gpe-contacts       |                      [] []             [] [] |
+     gpe-edit           |          []  []      [] []    []       [] [] |
+     gpe-go             |              []      [] []             [] [] |
+     gpe-login          |          []  []      [] []    []       [] [] |
+     gpe-ownerinfo      |          []  []      [] []    []       [] [] |
+     gpe-sketchbook     |          []  []      [] []    []       [] [] |
+     gpe-su             |          []  []      [] []    []       [] [] |
+     gpe-taskmanager    |          []  []      [] []    []       [] [] |
+     gpe-timesheet      |          []  []      [] []    []       [] [] |
+     gpe-today          |          []  []      [] []    []       [] [] |
+     gpe-todo           |    []    []  []      [] []    []       [] [] |
+     gphoto2            |                      []       []       [] [] |
+     gprof              |              []      []                   [] |
+     gpsdrive           |    []                []                      |
+     gramadoir          |                               []             |
+     grep               |       [] []  []      [] []       []    []    |
+     gretl              |       []                                     |
+     gsasl              |       []             []             [] [] [] |
+     gss                |       []             []                   [] |
+     gst-plugins        | []                                  [] [] [] |
+     gstreamer          |                         []          [] [] [] |
+     gtick              |                      [] []                [] |
+     gtkspell           |              []   [] [] []    []       []    |
+     hello              |       []     []      [] []    []       [] [] |
+     id-utils           |              []      [] []                [] |
+     impost             |                                              |
+     indent             |              []      [] []    []       [] [] |
+     iso_3166           |          []                []       [] [] [] |
+     iso_3166_1         |                               [] [] [] []    |
+     iso_3166_2         |                                              |
+     iso_3166_3         |                      []    []          []    |
+     iso_4217           |                            []          []    |
+     iso_639            |                            []          [] [] |
+     jpilot             |                                              |
+     jtag               |                               []             |
+     jwhois             |       []     []      [] ()                () |
+     kbd                |       []             []                   [] |
+     latrine            |                      []                   [] |
+     ld                 |                                           [] |
+     libc               |       []     []         []    []          [] |
+     libextractor       |                      []                      |
+     libgpewidget       |          []  []      []       []       [] [] |
+     libgphoto2         |                         []                [] |
+     libgphoto2_port    |                         []                   |
+     libgsasl           |       []             []                []    |
+     libiconv           |       []     []   [] [] []    [] [] [] [] [] |
+     libidn             |       []                                  () |
+     lifelines          |       []                                  [] |
+     lilypond           |                                              |
+     lingoteach         |              []                              |
+     lynx               |              []         []                [] |
+     m4                 |       []     []      [] []                [] |
+     mailutils          |       []             [] []                   |
+     make               |       []     []         []                [] |
+     man-db             |                      []                   [] |
+     minicom            |       []     []      [] []                   |
+     mysecretdiary      |              []      [] []                [] |
+     nano               |              []      []                   [] |
+     nano_1_0           |       []             [] []                [] |
+     opcodes            |                      []                   [] |
+     parted             |       [] []  []                           [] |
+     psmisc             |       []             []                      |
+     ptx                |       [] []  []      [] []                [] |
+     pwdutils           |       []                                     |
+     python             |                                              |
+     radius             |       []                []                   |
+     recode             |       []     []      [] []       []       [] |
+     rpm                |       [] []             []                [] |
+     screem             |                                              |
+     scrollkeeper       |       []             [] []    []    [] [] [] |
+     sed                |       [] []  []      [] []    []       [] [] |
+     sh-utils           |                         []       []    []    |
+     shared-mime-info   |          []  []         []          [] [] [] |
+     sharutils          |                         []             [] [] |
+     silky              |                               []             |
+     skencil            |          []  []                           [] |
+     sketch             |          []  []                           [] |
+     solfege            |                                              |
+     soundtracker       |                               []          [] |
+     sp                 |                                              |
+     stardict           |                         []    []             |
+     tar                |       []             [] []                [] |
+     texinfo            |       []             [] []                [] |
+     textutils          |                         []       []       [] |
+     tin                |                                              |
+     tp-robot           |                         []                   |
+     tuxpaint           |       [] []  []      []       []    [] [] [] |
+     unicode-han-tra... |                                              |
+     unicode-transla... |                                              |
+     util-linux         |              []         []                [] |
+     vorbis-tools       |                      [] []                   |
+     wastesedge         |                                              |
+     wdiff              |       []     []      [] []    []          [] |
+     wget               |                                              |
+     xchat              |    []                   []    [] [] [] [] [] |
+     xkeyboard-config   |                                              |
+     xpad               |                                              |
+                        +----------------------------------------------+
+                          or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv
+                           1  3 47 29  57    6 78 73  5 44 12 12 50 85
+
+                          ta tg th tk tr uk ven vi wa xh zh_CN zh_TW zu
+                        +-----------------------------------------------+
+     GNUnet             |                                               |  0
+     a2ps               |             [] []     []                      | 19
+     aegis              |                                               |  0
+     ant-phone          |             []        []                      |  5
+     anubis             |             [] []     []                      | 11
+     ap-utils           |                ()     []                      |  2
+     aspell             |                []     [] []                   | 13
+     bash               |                       []                      | 11
+     batchelor          |             []        []                      |  7
+     bfd                |                                               |  1
+     bibshelf           |                       []                      |  5
+     binutils           |             []                                |  6
+     bison              |             []        []                      | 18
+     bluez-pin          |             [] []     [] []     []            | 25
+     clisp              |                                               |  7
+     console-tools      |             []        []                      |  5
+     coreutils          |             []        []                      | 17
+     cpio               |             [] []     []                      |  7
+     cpplib             |             []        []                      |  8
+     darkstat           |                       []        ()    ()      | 15
+     dialog             |             [] []     []                      | 25
+     diffutils          |             []        []        []    []      | 28
+     doodle             |                       []                      |  5
+     e2fsprogs          |             []                                |  8
+     enscript           |             []                                | 12
+     error              |             []        []              []      | 16
+     fetchmail          |             []                                | 12
+     fileutils          |             []                  []    []      | 18
+     findutils          |             []        []                      | 17
+     flex               |             []        []                      | 15
+     fslint             |                       []                      |  7
+     gas                |             []                                |  3
+     gawk               |             []                                | 14
+     gbiff              |                       []                      |  5
+     gcal               |             []                                |  5
+     gcc                |             []                  []            |  4
+     gettext-examples   |             [] []     []        []    []      | 21
+     gettext-runtime    |             [] []     []        []    []      | 25
+     gettext-tools      |             [] []     []        []    []      | 19
+     gimp-print         |                []                             | 11
+     gip                |                       []                      |  8
+     gliv               |             []        []                      |  7
+     glunarclock        |                       [] []                   | 13
+     gmult              |             []        []        []            | 13
+     gnubiff            |                       []                      |  3
+     gnucash            |             ()                        []      | 10
+     gnucash-glossary   |                       []              []      |  9
+     gpe-aerial         |                       []        []            | 13
+     gpe-beam           |                       []        []            | 13
+     gpe-calendar       |                       [] []     []    []      | 18
+     gpe-clock          |             []        [] []     []            | 17
+     gpe-conf           |                       []        []            | 12
+     gpe-contacts       |                       []        []            |  7
+     gpe-edit           |             []        [] []           []      | 15
+     gpe-go             |             []        []                      | 11
+     gpe-login          |             []        [] []     []    []      | 18
+     gpe-ownerinfo      |             []        []        []    []      | 19
+     gpe-sketchbook     |             []        []                      | 14
+     gpe-su             |             []        []        []            | 16
+     gpe-taskmanager    |             []        []        []            | 17
+     gpe-timesheet      |             []        []        []    []      | 17
+     gpe-today          |             []        [] []     []    []      | 19
+     gpe-todo           |                       [] []           []      | 17
+     gphoto2            |                []               []    []      | 18
+     gprof              |             []        []                      | 10
+     gpsdrive           |                                               |  3
+     gramadoir          |                       []                      |  6
+     grep               |             [] []     []              []      | 32
+     gretl              |                                               |  4
+     gsasl              |                       []        []            | 12
+     gss                |                       []                      |  5
+     gst-plugins        |                []     []              []      | 17
+     gstreamer          |             [] []     []              []      | 15
+     gtick              |                       []                      | 11
+     gtkspell           |                       [] []     []    []      | 21
+     hello              |             [] []     []        []            | 37
+     id-utils           |             []        []                      | 13
+     impost             |                       []                      |  3
+     indent             |             []        []        []    []      | 25
+     iso_3166           |          [] []        []                      | 12
+     iso_3166_1         |             []           []                   | 20
+     iso_3166_2         |                                               |  2
+     iso_3166_3         |                          []     []            |  8
+     iso_4217           |             []        []                      | 10
+     iso_639            |                       [] []                   | 12
+     jpilot             |             [] []               []            |  6
+     jtag               |                                               |  2
+     jwhois             |             []        []              []      | 12
+     kbd                |             []        []                      | 12
+     latrine            |             []        []                      |  8
+     ld                 |             []                                |  5
+     libc               |             []                  []            | 22
+     libextractor       |                                               |  1
+     libgpewidget       |                       [] []                   | 17
+     libgphoto2         |                                 []            |  9
+     libgphoto2_port    |                                               |  5
+     libgsasl           |                       []                      |  7
+     libiconv           |             [] []     [] []     []            | 32
+     libidn             |                       []        []            |  6
+     lifelines          |                                               |  4
+     lilypond           |                                               |  1
+     lingoteach         |                       []                      |  6
+     lynx               |             [] []     []                      | 15
+     m4                 |                       []        []            | 17
+     mailutils          |                []                             |  7
+     make               |             []                  []            | 18
+     man-db             |                                               |  5
+     minicom            |                                               | 11
+     mysecretdiary      |             []        []                      | 12
+     nano               |                       []              []      | 13
+     nano_1_0           |             [] []     []                      | 18
+     opcodes            |             []        []                      |  9
+     parted             |             [] []               []            | 18
+     psmisc             |                       []                      |  7
+     ptx                |             []                  []            | 23
+     pwdutils           |                                               |  1
+     python             |                                               |  0
+     radius             |                []                             |  6
+     recode             |             []        []                      | 22
+     rpm                |             [] []                             | 11
+     screem             |                                               |  1
+     scrollkeeper       |             [] []                     []      | 24
+     sed                |             []        []              []      | 21
+     sh-utils           |             []                                | 15
+     shared-mime-info   |                []               []    []      | 21
+     sharutils          |             []        []              []      | 20
+     silky              |                                               |  3
+     skencil            |                                               |  6
+     sketch             |                                               |  6
+     solfege            |                                               |  4
+     soundtracker       |             []                                |  8
+     sp                 |             []                                |  3
+     stardict           |                []     []        []    []      | 10
+     tar                |             [] []     []              []      | 15
+     texinfo            |             []                  []            | 14
+     textutils          |             []                  []    []      | 17
+     tin                |                                               |  1
+     tp-robot           |                       []        []    []      |  8
+     tuxpaint           |             []        [] []     []            | 34
+     unicode-han-tra... |                                               |  0
+     unicode-transla... |                                               |  2
+     util-linux         |             [] []     []                      | 18
+     vorbis-tools       |                []                             | 10
+     wastesedge         |                                               |  1
+     wdiff              |             []        []                      | 22
+     wget               |             []        []                      |  7
+     xchat              |                []     []        []    []      | 26
+     xkeyboard-config   |                       []                      |  2
+     xpad               |                       []                      |  5
+                        +-----------------------------------------------+
+       73 teams           ta tg th tk tr uk ven vi wa xh zh_CN zh_TW zu
+      149 domains          0  0  0  1 77 30  0  92 16  0  42    32    0  1746
+
+   Some counters in the preceding matrix are higher than the number of
+visible blocks let us expect.  This is because a few extra PO files are
+used for implementing regional variants of languages, or language
+dialects.
+
+   For a PO file in the matrix above to be effective, the package to
+which it applies should also have been internationalized and
+distributed as such by its maintainer.  There might be an observable
+lag between the mere existence a PO file and its wide availability in a
+distribution.
+
+   If May 2005 seems to be old, you may fetch a more recent copy of
+this `ABOUT-NLS' file on most GNU archive sites.  The most up-to-date
+matrix with full percentage details can be found at
+`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
+
+1.6 Using `gettext' in new packages
+===================================
+
+If you are writing a freely available program and want to
+internationalize it you are welcome to use GNU `gettext' in your
+package.  Of course you have to respect the GNU Library General Public
+License which covers the use of the GNU `gettext' library.  This means
+in particular that even non-free programs can use `libintl' as a shared
+library, whereas only free software can use `libintl' as a static
+library or use modified versions of `libintl'.
+
+   Once the sources are changed appropriately and the setup can handle
+the use of `gettext' the only thing missing are the translations.  The
+Free Translation Project is also available for packages which are not
+developed inside the GNU project.  Therefore the information given above
+applies also for every other Free Software Project.  Contact
+`translation@iro.umontreal.ca' to make the `.pot' files available to
+the translation teams.
+
@@ -1,29 +1,43 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================

-Developer:
---------
+Developers:
+----------

-FlashCode <flashcode@flashtux.org>
-    Web   : http://weechat.flashtux.org
-    IRC   : nick is "FlashCode" @ irc.freenode.net
-    Jabber: flashcode@jabber.org
-    ICQ   : 160677660
-    AIM   : FlashCode AIM
-    Yahoo : FlashCode_Y
+* General code

-Testers:
-------
+  FlashCode <flashcode@flashtux.org>
+      Web   : http://weechat.flashtux.org
+      IRC   : nick is "FlashCode" @ irc.freenode.net
+      Jabber: flashcode@jabber.org
+      ICQ   : 160677660
+      AIM   : FlashCode AIM
+      Yahoo : FlashCode_Y

-Bounga <bounga@altern.org>
-    Web   : http://bounga.ath.cx
-    IRC   : nick is "Bounga" @ irc.freenode.net
-    Jabber: Bounga@jabber.org
-    ICQ   : 178297842
+* Scripts plugins

-Xahlexx <xahlexx@weeland.org>
-    Web   : http://www.weeland.org
-    IRC   : nick is "xahlexx" @ irc.freenode.net
+  Kolter <kolter@free.fr>
+      Web   : http://kolter.free.fr
+      IRC   : nick is "kolter" @ irc.freenode.net
+      Jabber: kolter@jabber.org
+
+
+Debian packager:
+---------------
+
+Julien Louis <ptitlouis@sysif.net>
+    IRC   : nick is "ptitlouis" @ irc.freenode.net
+    Jabber: ptitlouis@amessage.info
+
+
+Contributors:
+------------
+
+Rudolf Polzer <rpolzer-rp@durchnull.de> (IRC: "divVerent")
+Jiri Golembiovsky <golemj@gmail.com> (IRC: "GolemJ")
+Jim Ramsay <i.am@jimramsay.com> (IRC: "lack")
+Odin <odin@dtdm.org> (IRC: "[Odin]")
+Pistos (IRC: "pistos")


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

-WeeChat known bugs, 2005-02-12
+WeeChat known bugs, 2006-01-14

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

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

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

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


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

-ChangeLog - 2005-03-20
+ChangeLog - 2006-01-14


+Version 0.1.7 (2006-01-14):
+   * fixed msg command (now allowed in private buffer with "*" as target)
+   * removed "irc_default_msg_away" setting, for RFC 2812 conformity
+     (/away command wihtout argument only removes away status),
+     new values for "irc_display_away" (off, local, channel)
+   * fixed refresh bug with Solaris when term size is changed
+   * replaced Texinfo doc by XML Docbook
+   * added color for window separators (when splited)
+   * added completion system for plugins/scripts commands
+   * fixed plugins autoload
+   * added charset by server and channel, new command: /charset
+   * added Ruby script plugin
+   * added /upgrade command
+   * added ETA (Estimated Time of Arrival) for DCC files
+   * /nick command is now allowed when not connected to server
+   * added server/channel arg to /buffer command for jumping to buffer
+   * fixed display bug in chat window when a message length equals to window
+     width
+   * added new keys for switching to other windows: alt-w followed by
+     alt-{arrow}
+   * added new keys for scrolling to previous/next highlight: alt-P / alt-N
+   * added "read marker": an indicator for first unread line in a
+     server or channel buffer (new key alt-U to scroll to marker)
+   * new window maganement: custom size for windows, auto resize when
+     terminal is resized
+   * fixed infinite loop when resizing term to small size
+   * added /history command
+
+Version 0.1.6 (2005-11-11):
+   * new color management system, IRC colors are now correctly
+     displayed and can be removed by new options irc_colors_receive
+     and irc_colors_send
+   * fixed scroll problem when one line is bigger than screen size
+   * added setting for having one server buffer for all servers
+     (look_one_server_buffer)
+   * added setting for ignoring some chars when completing nicks
+   * fixed IRC message parser bug
+   * signal SIGPIPE is now ignored
+   * added partial match for highlights
+   * added dcc_own_ip and dcc_port_range settings
+   * full UTF-8 support, auto-detection of UTF-8 usage (locale)
+   * added "Day changed to [date]" message when day changes
+   * new plugin interface, rewritten from scratch: now loads dynamic C
+     library, and perl/python are script plugins
+   * log options (for server/channel/private) can now be set while
+     WeeChat is running
+   * added channel modes +e and +f
+   * added some missing IRC commands, fixed command 367
+   * added colors for input buffer and current channel of status bar
+   * added online help for config options (with /set full_option_name)
+   * enhanced "smart" hotlist, with names (new options:
+     look_hotlist_names_{count|level|length}) 
+
+Version 0.1.5 (2005-09-24):
+   * added /ame command (send CTCP action to all channels of all
+     connected servers)
+   * added setting "irc_notice_as_pv" to see notices as pv
+   * added nicks colors in setup file
+   * fixed DCC bug: delete failed file only if really empty (on disk)
+   * fixed IRC message parser bug
+   * fixed scroll problem (screen moving when scrolling and new line
+     displayed)
+   * fixed infinite loop when scrolling back and displaying long lines
+   * fixed crash when closing a buffer used by more than one window
+   * added some missing IRC commands
+   * fixed DCC display bug (now decodes string according to charset)
+   * added /ignore and /unignore commands
+   * fixed bug with strings comparison (str[n]casecmp) and some locales
+     (like turkish), now using ASCII comparison (thanks to roktas)
+   * signal SIGQUIT is now ignored
+   * fixed refresh bug when one line is bigger than screen size
+   * fixed look_nicklist_min_size and look_nicklist_max_size options
+   * fixed refresh bug when changing channel modes
+   * jump to next server now saves current channel buffer for each server
+   * ctrl-up/ctrl-down keys added to call previous/next command in global
+     history (common to all buffers)
+
+Version 0.1.4 (2005-07-30):
+   * join and part/quit prefixes (arrows) now displayed with different colors
+   * added "irc_highlight" setting, to get highlight with any word
+   * fixed auto-rejoin for channels with key
+   * fixed /ctcp command (now any command/data allowed)
+   * added /amsg command (send text to all channels of all connected servers)
+   * fixed SIGSEGV handler (now write a core file by aborting program)
+   * fixed statusbar & infobar background refresh problem with some systems
+   * added color for private in hotlist (different than color for highlight)
+   * added DCC resume and timeout
+   * added function for Perl/Python to get DCC list
+   * fixed FIFO pipe (command now authorized on a buffer not connected
+     to an IRC server)
+   * topic completion now decodes UTF-8 string
+   * fixed bug with IRC URL on command line (irc://)
+   * new keyboard management: keys are setup in config file, new command
+     /key was added and some new default keys were added, alt-k key is
+     used to grab key (useful for /key command)
+   * added seconds in infobar time (optional thanks to new setting)
+   * fixed some curses refreshs
+   * channels auto-prefixed by "#" (if no prefix found) for /join command
+
+Version 0.1.3 (2005-07-02):
+   * proxy support (http, socks4, socks5) with authentification (http, socks5)
+     and ipv6 support (client to proxy)
+   * completion added for config option (with /set command)
+   * commands from users outside channel now authorized (if special user or
+     channel without "n" flag)
+   * added IPv6 support
+   * kill command now received and displayed
+   * added SSL support
+   * channel notify levels are saved in config file (new option
+     "server_notify_levels" for server sections)
+   * part message now accepts %v (replaced by WeeChat version), like quit message
+   * errors while loading perl scripts are now displayed in server buffer
+     (instead of current buffer)
+   * in python scripts, all messages written in stdin and stderr are redirected
+     in server buffer
+   * fix a filename error while loading a python script manually
+   * fixed plugins "print" and "prnt" functions: now ok for writing on server
+     buffers
+   * fixed color problem with new libcurses version
+   * fixed crash when using Alt-S or Alt-X on DCC buffer (Alt-D)
+   * fixed startup crash when config file (~/.weechat/weechat.rc) is not found
+   * improved Perl/Python libs detection for ./configure script
+
+Version 0.1.2 (2005-05-21):
+   * added Python plugin support, improved Perl interface (and now Perl/Python
+     libraries are checked by configure script)
+   * added nicklist scroll keys (Alt+{home/end/pgup/pgdn} or F11/F12)
+   * added transfer rate for DCC files
+   * added "-all" option for /nick command
+   * buffers timestamp can now be changed (new option in config file)
+   * WeeChat now ok under *BSD and Mac OS X
+   * fixed nicklist sort
+   * fixed crash when purging old DCC
+   * fixed crash with 64-bits arch (like AMD64) when converting UTF-8
+   * added missing IRC commands (307, 341, 485, 671)
+
 Version 0.1.1 (2005-03-20):
   * added nicks count for channel buffers
   * added FIFO pipe for remote control
@@ -1,4 +1,4 @@
-WeeChat FAQ, 2005-02-06
+WeeChat FAQ, 2006-01-14
 =======================

 Intended audience:
@@ -22,8 +22,10 @@ finding a solution.
 Q:	I heard about many GUI for WeeChat. How can I compile/use them?

 A:	Curses GUI is built by default.
-	To build Gtk or Qt GUI you've to specify extra options to ./configure script:
+	To build Gtk, wxWidgets or Qt GUI you've to specify extra options to
+	./configure script:
 	  --enable-gtk to enable Gtk GUI
+	  --enable-wxwidgets to enable wxWidgets GUI
 	  --enable-qt  to enable Qt QUI
 	Type ./configure --help to see available options.
 	WARNING: only Curses GUI is ok today. Other GUI are under development!
@@ -34,8 +36,8 @@ A:	Curses GUI is built by default.
 Q:	I can't compile WeeChat CVS.

 A:	Check that you have latest version of autoconf and automake.
-	WeeChat has been developed with autoconf version 2.56 and automake
-	version 1.7.
+	WeeChat has been developed with autoconf version 2.59 and automake
+	version 1.9.5.
 	You should have at least these versions in order to compile WeeChat CVS.
 	If you can't or don't want to install these versions, you can download and
 	install "devel package", a package built almost every day, based on CVS.
@@ -48,12 +50,19 @@ Q:	Why using WeeChat ? X-Chat and Irssi are so good...

 A:	Because WeeChat is very light and has new features.
 	Some new features:
-	  * many GUI (Curses, Gtk, Qt),
-	  * extensible with scripts (Perl, Python, Ruby),
+	  * many GUI (Curses, Gtk, wxWidgets, Qt)
+	  * available in many languages
+	  * nicklist available in all GUI
+	  * extensible with scripts (Perl, Python, Ruby)
+	  * horizontal and vertical window split
+	  * infobar highlight
+	  * FIFO pipe for remote control
 	  * developed from scratch (not based on any other IRC client)
 	  * multi-platform
 	  * 100% GPL and free
 	This is the "geekest" IRC client ;)
+	
+	More info on this page: http://weechat.flashtux.org/features.php


 2.2
@@ -61,24 +70,26 @@ A:	Because WeeChat is very light and has new features.
 Q:	I've launched WeeChat, but I'm lost, what can I do?

 A:	For help you can type /help. For help about a command, type /help command.
+	Keys and commands are listed in documentation.


 2.3
 ================================================================================
 Q:	I don't see come chars with accents, what can I do?

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


 2.4
 ================================================================================
 Q:	How can I customize key bindings?

-A:	Today you can't do that. This is planed for a future version.
+A:	Key bindings are customizable with /key command.
+	Default key Meta-k (usually Alt-k) lets you grab key code and insert it
+	in input zone.


 2.5
@@ -86,26 +97,31 @@ A:	Today you can't do that. This is planed for a future version.
 Q:	How can I load Perl scripts?
 	Are Perl scripts compatible with X-chat or/and Irssi ?

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


 2.6
 ================================================================================
 Q:	How can I load Python scripts?
+	Are Python scripts compatible with X-chat or/and Irssi ?

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


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

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


 3.1
@@ -148,13 +164,22 @@ A:	There is 2 ways to submit your feature request:

 3.4
 ================================================================================
-Q:	Will WeeChat be ported to *BSD, QNX, MacOS X, Microsoft Windows ?
+Q:	What is the list of supported platforms for WeeChat?

-A:	Yes. Future versions will be available for these OS.
+A:	Full list is on this page:
+	http://weechat.flashtux.org/download.php?lang=en&view=supported_os


 3.5
 ================================================================================
+Q:	Will WeeChat be ported to QNX or other operating systems?
+
+A:	Yes. Future versions will be available for these OS.
+	We need help for such systems, any help is welcome :)
+
+
+3.6
+================================================================================
 Q:	I want to help WeeChat developers. What can I do?

 A:	There's many tasks to do (code, documentation, ...)
@@ -162,8 +187,9 @@ A:	There's many tasks to do (code, documentation, ...)
 	http://weechat.flashtux.org/support.php


-3.6
+3.7
 ================================================================================
 Q:	Can I give money or other things to WeeChat developers?

-A:	Beer is welcome :)
+A:	You can give us money to help development.
+	Details on http://weechat.flashtux.org/donate.php?lang=en
@@ -1,4 +1,4 @@
-WeeChat FAQ, 2005-02-06
+WeeChat FAQ, 2006-01-14
 =======================

 Public concerné :
@@ -23,9 +23,10 @@ Q:	J'ai entendu parler de plusieurs interfaces pour WeeChat.
 	Comment puis-je les compiler/utiliser ?

 R:	L'interface Curses est construite par défaut.
-	Pour construire l'interface Gtk ou Qt, vous devez spécifier des options
-	pour le script ./configure :
+	Pour construire l'interface Gtk, wxWidgets ou Qt, vous devez spécifier des
+	options pour le script ./configure :
 	  --enable-gtk pour activer l'interface Gtk
+	  --enable-wxwidgets pour activer l'interface wxWidgets
 	  --enable-qt  pour activer l'interface Qt
 	Tapez ./configure --help pour voir les options disponibles.
 	ATTENTION : seule l'interface Curses est ok aujourd'hui.
@@ -37,8 +38,8 @@ R:	L'interface Curses est construite par d
 Q:	Je ne peux pas compiler le CVS WeeChat.

 R:	Vérifiez que vous avez bien la dernière version d'autoconf et automake.
-	WeeChat a été développé avec autoconf version 2.56 et automake
-	version 1.7.
+	WeeChat a été développé avec autoconf version 2.59 et automake
+	version 1.9.5.
 	Vous devez avoir au moins ces versions pour compiler le CVS WeeChat.
 	Si vous n'avez pas ou ne souhaitez pas installer ces versions, vous
 	pouvez télécharger et installer le paquet "devel", un paquet construit
@@ -52,12 +53,19 @@ Q:	Pourquoi utiliser WeeChat ? X-Chat et Irssi sont si bien...

 R:	Parce que WeeChat est très léger et a de nouvelles fonctionnalités.
 	Quelques nouvelles fonctionnalités :
-	  * plusieurs interfaces (Curses, Gtk, Qt),
-	  * extensible par des scripts (Perl, Python, Ruby),
+	  * plusieurs interfaces (Curses, Gtk, wxWidgets, Qt)
+	  * disponible en plusieurs langues
+	  * liste des pseudos disponible dans toutes les interfaces
+	  * extensible par des scripts (Perl, Python, Ruby)
+	  * découpage de la fenêtre horizontalement et verticalement
+	  * highlight dans la barre d'infos
+	  * tube FIFO pour contrôle à distance
 	  * développé à partir de zéro (non basé sur un quelconque client IRC)
 	  * multi-platformes
 	  * 100% GPL et libre
 	C'est le client IRC le plus "geek" ;)
+	
+	Plus d'infos sur cette page: http://weechat.flashtux.org/features.php


 2.2
@@ -66,25 +74,27 @@ Q:	J'ai lanc

 R:	Pour obtenir de l'aide tapez /help. Pour de l'aide sur une commande,
 	tapez /help commande.
+	Les touches et commandes sont listées dans la documentation.


 2.3
 ================================================================================
 Q:	Je ne vois pas bien certains accents dans WeeChat, que faire ?

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


 2.4
 ================================================================================
 Q:	Comment puis-je configurer les raccourcis clavier ?

-R:	Aujourd'hui vous ne pouvez pas le faire. Ce sera possible dans une
-	version future.
+R:	Les raccourcis clavier sont modifiables avec la commande /key.
+	La touche par défaut Meta-k (souvent Alt-k) permet de capturer le code
+	d'une touche et de l'inclure dans la zone de saisie.


 2.5
@@ -92,28 +102,31 @@ R:	Aujourd'hui vous ne pouvez pas le faire. Ce sera possible dans une
 Q:	Comment puis-je charger des scripts Perl ?
 	Les scripts Perl sont-ils compatibles avec X-chat et/ou Irssi ?

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


 2.6
 ================================================================================
 Q:	Comment puis-je charger les scripts Python ?
+	Les scripts Python sont-ils compatibles avec X-chat et/ou Irssi ?

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


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

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


 3.1
@@ -161,13 +174,22 @@ R:	Il y a 2 mani

 3.4
 ================================================================================
-Q:	WeeChat sera-t-il porté sur *BSD, QNX, MacOS X, Microsoft Windows ?
+Q:	Quelle est la liste des plate-formes supportées par WeeChat ?

-R:	Oui. Les futures versions seront disponibles pour ces OS.
+R:	La liste complète est sur cette page :
+	http://weechat.flashtux.org/download.php?lang=fr&view=supported_os


 3.5
 ================================================================================
+Q:	WeeChat sera-t-il porté sur QNX ou d'autres systèmes d'exploitation ?
+
+R:	Oui. Les futures versions seront disponibles pour ces OS.
+	Nous avons besoin d'aide pour ces systèmes, toute aide est la bienvenue :)
+
+
+3.6
+================================================================================
 Q:	Je souhaiterai aider les développeurs WeeChat. Que puis-je faire ?

 R:	Il y a plusieurs choses à faire (code, documentation, ...)
@@ -176,8 +198,9 @@ R:	Il y a plusieurs choses
 	http://weechat.flashtux.org/support.php


-3.6
+3.7
 ================================================================================
 Q:	Puis-je donner de l'argent ou d'autres choses aux développeurs WeeChat ?

-R:	La bière est la bienvenue :)
+R:	Vous pouvez donner de l'argent pour aider le développement.
+	Plus de détails sur http://weechat.flashtux.org/donate.php
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2005 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2006 FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -12,17 +12,18 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #

-SUBDIRS = po intl src
+SUBDIRS = po doc intl src

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

-man_MANS = weechat-curses.1
+ACLOCAL_AMFLAGS = -I m4
@@ -1,6 +1,54 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================

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

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


 Copyright
 ---------

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

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

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


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

-TODO - 2005-03-20
+TODO - 2006-01-14

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


-v0.1.1:
------
-
 * General:
    + Windows version
-    + Solaris version
-    + *BSD version
-
- * IRC protocol:
-    # "/dcc send" command
-    # "/dcc chat" command (and incoming DCC chats)
-    - customizable CTCP version reply
+    # Solaris version

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

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

 * IRC protocol:
+    # customizable CTCP version reply (possible by plugin script)
    - complete "/list" command: add regexp search, display only channels that
      match regexp
-    - "/ignore" and "/unignore" commands: hide all that is write by a given
-      nick/host
    - when we're away, WeeChat should log all the lines begenning by our nick.
      When we come back from our away it should print it to the current window
    - "/notify" and "/unnotify" command to be warn by WeeChat when a given
      nick/host connect to the given irc network
-
- * WeeChat commands:
-    - "/reload" command: reload the WeeChat's config file
-    - "/highlight" command: highlight a given word when it appears on
-      channels/privates
-    - "/completion" command: do shortcuts (for example when we type "u"
-      in the text bar it send it to the server as "you")
-    - "/exec" command: execute a command as if we was in shell
-      and show us the output on the current window. An option to exec
-      like -o could send the output to the server, on the current
-      channel/private
-    - "/last": command to look for text in previous messages
-
- * Interface:
-    - color for nicks (except own nick) when nick colors are disabled
-    - interpret special chars in messages (color & bold for example)
-    - understand incomplete commands if unambigous (for example: /he for /help is ok)
-    ? Qt GUI
-
- * TCP/IP communication:
-    - proxy support
-    - SSL support
-    - IPv6 protocol implementation
-
- * Plugins:
-    - Python plugin
-    - "/python load" and "/python unload" commands to (un)load Python scripts
-    - Ruby plugin
-    - "/ruby load" and "/ruby unload" commands to (un)load Ruby scripts
+    - display one time away message of remote user in private (optional)
+    - add max number of nicks for away check (do not check away nicks on channels with high number of nicks)
+    - add anti-flood mechanism, when pasting more than N lines
+    - add mask for /ban command, and ban types (host, nick)

 * Configuration:
-    - add key bindings to config file
+    - be able to launch more than one command when connecting to server
+    - use ~/.weechat/dcc by default for DCC incoming files (and create
+      directory at startup if not found)
+    - add global username/realname, used if server values are not filled
+    - add command line arg (--dir ?) to choose weechat home dir
+      (~/.weechat by default)
+    - be able to set more than one server address for network
+    - save buffer numbers (order) to config file and restore them when
+      opened, or make it possible by script 
+
+ * Plugins:
+    - allow print function to write on all buffers or all channels of a server
+    - Ruby plugin
+    - "/ruby load" and "/ruby unload" commands to (un)load Ruby scripts
+    - add "outgoing" message event so scripts can edit user-input text before
+      it is sent to the channel
+    - add a timer function so scripts can do things like timeouts, delayed
+      processing, etc.
+    - allow print function to write on all buffers or all channels of a server
+    - allow plugins to perform actions on "highlight" messages
+    - get_servers(), get_channels(server), get_nicks(server,channel)
+    - Lua plugin
+    - Tcl plugin
+    - Php plugin (maybe if possible)
+    ? "fish" plugin (cf http://fish.sekure.us/)
+    - script plugins (perl, python, ruby, ..) should load scripts in system dir,
+      not only ~/.weechat/xxxx/autoload/
+    - allow plugins to get the contents of a specified (or at least the
+      "current") buffer.
@@ -1,55 +1,16 @@
 #!/bin/sh
-rm -f config.cache

-### GETTEXT ###
-
-echo searching for GNU gettext intl directory...
-
-dirs="/usr/share /usr/local/share /opt/share /usr /usr/local /opt /usr/gnu/share"
-found=0
-for try in $dirs; do
-	echo -n " -> $try/gettext/intl... "
-	if test -d $try/gettext/intl; then
-		echo found it
-		found=1
-		break
-	fi
-	echo no
-done
-if test "$found" != 1; then
-	echo ERROR: Cannot find gettext/intl directory.
-	echo ERROR: Install GNU gettext in /usr or /usr/local prefix.
-	exit 7
-fi;
-
-echo copying gettext intl files...
-intldir="$try/gettext/intl"
-if test ! -d intl; then
-	mkdir intl
-fi
-olddir=`pwd`
-cd $intldir
-for file in *; do
-	if test $file != COPYING.LIB-2.0 && test $file != COPYING.LIB-2.1; then
-		rm -f $olddir/intl/$file
-		cp $intldir/$file $olddir/intl/
-	fi
-done
-cp -f $try/gettext/po/Makefile.in.in $olddir/po/
-cd $olddir
-if test -f intl/plural.c; then
-	sleep 2
-	touch intl/plural.c
-fi
-
-### END GETTEXT ###
-
-echo "running aclocal..."
-aclocal -I /usr/share/aclocal
-echo "running autoconf..."
-autoconf
-echo "running autoheader..."
-autoheader
-echo "running automake..."
-automake -a
-echo "autogen.sh ok, now run ./configure script"
+# gettextize updates Makefile.am, configure.in
+cp configure.in configure.in.old
+cp Makefile.am Makefile.am.old
+gettextize --copy --force --intl --no-changelog &&
+mv Makefile.am.old Makefile.am
+mv configure.in.old configure.in
+libtoolize --automake --force --copy &&
+aclocal &&
+# autoheader creates config.h.in needed by autoconf
+autoheader &&
+# autoconf creates configure
+autoconf &&
+# automake creates Makefile.in
+automake --add-missing --copy --gnu
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2005 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2006 FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -12,74 +12,156 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #

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

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

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

 # Gettext
-ALL_LINGUAS="fr es"
+ALL_LINGUAS="fr es cs"
 AM_GNU_GETTEXT

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

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

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

+AC_MSG_CHECKING([for socklen_t])
+AC_CACHE_VAL(ac_cv_type_socklen_t,
+[AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <sys/socket.h>],
+[socklen_t t;],
+ac_cv_type_socklen_t=yes,
+ac_cv_type_socklen_t=no,
+)])
+if test $ac_cv_type_socklen_t = no; then
+AC_DEFINE(socklen_t, int, Define to 'int' if <sys/socket.h> doesn't define.)
+fi
+AC_MSG_RESULT($ac_cv_type_socklen_t)
+
 # Checks for library functions.
 AC_FUNC_SELECT_ARGTYPES
 AC_TYPE_SIGNAL
-AC_CHECK_FUNCS([gethostbyname gethostname gettimeofday inet_ntoa memset mkdir select setlocale socket strcasecmp strchr strdup strncasecmp strpbrk strrchr strstr uname])
+AC_CHECK_FUNCS([gethostbyname gethostname getsockname gettimeofday inet_ntoa memset mkdir select setlocale socket strcasecmp strchr strdup strncasecmp strpbrk strrchr strstr uname])

+# Variables in config.h
+
+AH_VERBATIM([PREFIX], [#undef PREFIX])
+AH_VERBATIM([WEECHAT_LIBDIR], [#undef WEECHAT_LIBDIR])
+AH_VERBATIM([WEECHAT_SHAREDIR], [#undef WEECHAT_SHAREDIR])
 AH_VERBATIM([PLUGINS], [#undef PLUGINS])
 AH_VERBATIM([PLUGIN_PERL], [#undef PLUGIN_PERL])
+AH_VERBATIM([PLUGIN_PYTHON], [#undef PLUGIN_PYTHON])
+AH_VERBATIM([PLUGIN_RUBY], [#undef PLUGIN_RUBY])
+AH_VERBATIM([HAVE_GNUTLS], [#undef HAVE_GNUTLS])
 AH_VERBATIM([DEBUG], [#undef DEBUG])

-AC_ARG_ENABLE(ncurses, [  --disable-ncurses       Turn off ncurses interface (default=auto)],,enable_ncurses=yes)
-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_WITH(debug,     [  --with-debug            Debugging: 0=no debug, 1=debug compilation, 2=debug compilation + verbose msgs (default=0)],debug=$withval,debug=0)
+# Arguments for ./configure

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

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

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

+#if test "x$enable_wxwidgets" = "xyes" ; then
+#    AM_OPTIONS_WXCONFIG
+#    AM_PATH_WXCONFIG(2.3.4, wxWin=1)
+#
+#    if test "$wxWin" != 1; then
+#        AC_MSG_ERROR([
+#*** wxWindows must be installed on your system
+#*** but wx-config script couldn't be found.
+#
+#*** Please check that wx-config is in path, the directory
+#*** where wxWindows libraries are installed (returned by
+#*** 'wx-config --libs' command) is in LD_LIBRARY_PATH or
+#*** equivalent variable and wxWindows version is 2.3.4 or above.
+#        ])
+#    fi
+#
+#    CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
+#    CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
+#    CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
+#    LDFLAGS="$LDFLAGS $WX_LIBS"
+#
+#    WXWIDGETS_CFLAGS=""
+#    WXWIDGETS_LIBS=""
+#fi
+
 if test "x$enable_gtk" = "xyes" ; then
    #if test "$LIBGTK_FOUND" = "0" ; then
    #    AC_MSG_ERROR([Gtk+ library not found! Install Gtk+ (2.0 or higher) library or run ./configure without --enable-gtk parameter.])
@@ -90,22 +172,198 @@ if test "x$enable_gtk" = "xyes" ; then
    AC_SUBST(GTK_LIBS)
 fi

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

 if test "x$enable_perl" = "xyes" ; then
    enable_plugins="yes"
-    PLUGINS_LIBS="$PLUGINS_LIBS ../../plugins/perl/lib_weechat_perl.a `perl -MExtUtils::Embed -e ldopts`"
-    PERL_CFLAGS=`perl -MExtUtils::Embed -e ccopts`
+    
+    AC_PATH_PROGS(PERL, perl perl5)
+    if test -z $PERL ; then
+        AC_MSG_ERROR([
+*** Perl must be installed on your system
+*** but perl interpreter couldn't be found in path.
+
+Please check that perl is in path, or install
+it with your software package manager.])
+    fi
+    
+    AC_MSG_CHECKING(for Perl headers files)
+    
+    PERL_HEADER_TEST=`PT=perltest.c ; echo "#include <EXTERN.h>" > $PT;  echo "#include <perl.h>" >> $PT;  echo "#include <XSUB.h>" >> $PT ;  echo "int main() { return 0; }" >> $PT ; $CC -Wall $PT -o $PT.out $($PERL -MExtUtils::Embed -e ccopts) 1>/dev/null 2>&1; echo $?; rm -f $PT $PT.out 1>/dev/null 2>&1`
+
+    if test "x$PERL_HEADER_TEST" = "x0" ; then
+	PERL_CFLAGS=`$PERL -MExtUtils::Embed -e ccopts`
+    else
+        AC_MSG_ERROR([
+*** Perl headers couldn't be found in your system.
+*** Try to install it with your software package manager.])
+    fi
+    AC_MSG_RESULT(found)
+    
+    AC_MSG_CHECKING(for Perl library)
+
+    PERL_LIB_TEST=`PT=perltest.c ; echo "int main() { return 0; }" > $PT ; $CC -Wall $PT -o $PT.out $($PERL -MExtUtils::Embed -e ldopts) 1>/dev/null 2>&1; echo $?; rm -f $PT $PT.out 1>/dev/null 2>&1`
+
+    if test "x$PERL_LIB_TEST" = "x0" ; then
+        PERL_LFLAGS=`$PERL -MExtUtils::Embed -e ldopts`
+    else
+        AC_MSG_ERROR([
+*** Perl library couldn't be found in your system.
+*** Try to install it with your software package manager.])
+    fi
+    AC_MSG_RESULT(found)
+	    
    AC_SUBST(PERL_CFLAGS)
+    AC_SUBST(PERL_LFLAGS)
    AC_DEFINE(PLUGIN_PERL)
 fi

+if test "x$enable_python" = "xyes" ; then
+    enable_plugins="yes"
+    
+    AC_PATH_PROGS(PYTHON, python python2.4 python2.3 python2.2)
+    if test -z $PYTHON ; then
+        AC_MSG_ERROR([
+*** Python must be installed on your system
+*** but python interpreter couldn't be found in path.
+
+*** Please check that python is in path, or install
+*** it with your software package manager.])
+    fi
+    
+    PYTHON_SYSPREFIX=`$PYTHON -c 'import sys; print "%s" % sys.prefix'`
+    PYTHON_VERSION=`$PYTHON -c 'import sys ; print sys.version[[:3]]'`
+    PYTHON_INCLUDE=`$PYTHON -c "import distutils.sysconfig,string; print distutils.sysconfig.get_config_var('CONFINCLUDEPY')"`
+    
+    AC_MSG_CHECKING(for Python header files)
+    if test -r "$PYTHON_INCLUDE/Python.h"; then
+        PYTHON_CFLAGS="-I$PYTHON_INCLUDE"
+    else
+        AC_MSG_ERROR([
+*** Python header files couldn't be found in your system.
+*** Try to install them with your software package manager.])
+    fi
+    AC_MSG_RESULT(found)
+    
+    PYTHON_LIB=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBPL')"`
+    PYTHON_LFLAGS="-lpython$PYTHON_VERSION "`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBS')+' '+distutils.sysconfig.get_config_var('SYSLIBS')+' '+distutils.sysconfig.get_config_var('LINKFORSHARED')"`
+    
+    AC_MSG_CHECKING(for Python library)
+    if test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.so"; then
+       PYTHON_LFLAGS="-L$PYTHON_LIB $PYTHON_LFLAGS"
+    elif test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.a"; then
+       PYTHON_LFLAGS="-L$PYTHON_LIB $PYTHON_LFLAGS"
+    elif test -r "$PYTHON_SYSPREFIX/lib/libpython$PYTHON_VERSION.so"; then
+       PYTHON_LFLAGS="-L$PYTHON_SYSPREFIX/lib/ $PYTHON_LFLAGS"
+    else
+        AC_MSG_ERROR([
+*** Python library couldn't be found in your system.            
+*** Try to install it with your software package manager.])
+    fi
+    AC_MSG_RESULT(found)
+    
+    AC_SUBST(PYTHON_CFLAGS)
+    AC_SUBST(PYTHON_LFLAGS)
+    AC_DEFINE(PLUGIN_PYTHON)
+fi
+
+if test "x$enable_ruby" = "xyes" ; then
+    enable_plugins="yes"
+
+    AC_PATH_PROGS(RUBY, ruby ruby1.8 ruby1.9)
+    if test -z $RUBY ; then
+        AC_MSG_ERROR([
+*** Ruby must be installed on your system
+*** but ruby interpreter couldn't be found in path.
+
+*** Please check that ruby is in path, or install
+*** it with your software package manager.])
+    fi
+    
+    RUBY_INCLUDE=`$RUBY -rrbconfig -e "puts Config::CONFIG[['archdir']]"`
+
+    AC_MSG_CHECKING(for Ruby header files)
+    if test -r "$RUBY_INCLUDE/ruby.h"; then
+        RUBY_CFLAGS="-I$RUBY_INCLUDE"
+    else
+        AC_MSG_ERROR([
+*** Ruby header files couldn't be found in your system.
+*** Try to install them with your software package manager.])
+    fi
+    AC_MSG_RESULT(found)
+   
+    RUBY_LFLAGS=`$RUBY -rrbconfig -e "puts Config::CONFIG[['LIBRUBYARG_SHARED']]"`
+
+    AC_SUBST(RUBY_CFLAGS)
+    AC_SUBST(RUBY_LFLAGS)
+    AC_DEFINE(PLUGIN_RUBY)
+fi
+
 if test "x$enable_plugins" = "xyes" ; then
+    AC_CHECK_FUNCS(dlopen, LIBDL_FOUND=yes, LIBDL_FOUND=no)
+    if test "$LIBDL_FOUND" != "yes"; then
+        AC_CHECK_LIB(dl, dlopen, LIBDL_FOUND=yes, LIBDL_FOUND=no)
+        if test "$LIBDL_FOUND" = "yes"; then
+            PLUGINS_LIBS="-ldl"
+        else
+            AC_MSG_ERROR([
+*** "dl" library (dynamic library loader) couldn't be found in your system.
+*** Try to install it with your software package manager or disable plugins.])
+        fi
+    fi
    AC_DEFINE(PLUGINS)
 fi

 AC_SUBST(PLUGINS_LIBS)

+# ------------------------------------------------------------------------------
+#                                   gnutls
+# ------------------------------------------------------------------------------
+
+if test "x$enable_gnutls" = "xyes" ; then
+    found_gnutls="no"
+    AM_PATH_LIBGNUTLS( 1.0.0, found_gnutls=yes, AC_MSG_WARN([[
+*** libgnutls was not found. You may want to get it from
+*** ftp://ftp.gnutls.org/pub/gnutls/
+*** WeeChat will be built without GnuTLS support.]]))
+    if test "x$found_gnutls" = "xyes" ; then
+       GNUTLS_CFLAGS=`libgnutls-config --cflags`
+       GNUTLS_LFLAGS=`libgnutls-config --libs`
+       AC_SUBST(GNUTLS_CFLAGS)
+       AC_SUBST(GNUTLS_LFLAGS)
+       AC_DEFINE(HAVE_GNUTLS)
+    else
+        enable_gnutls="no"
+    fi
+fi
+
+# ------------------------------------------------------------------------------
+#                                general vars
+# ------------------------------------------------------------------------------
+
+if test "x$prefix" = "xNONE" ; then
+   prefix="$ac_default_prefix"
+fi
+
+if test "x$exec_prefix" = "xNONE" ; then
+   exec_prefix="$prefix"
+fi
+
+AC_DEFINE_UNQUOTED(PREFIX, "${prefix}")
+
+WEECHAT_LIBDIR=`eval echo ${libdir}/weechat`
+AC_DEFINE_UNQUOTED(WEECHAT_LIBDIR, "$WEECHAT_LIBDIR")
+
+WEECHAT_SHAREDIR=`eval echo ${datadir}/weechat`
+AC_DEFINE_UNQUOTED(WEECHAT_SHAREDIR, "$WEECHAT_SHAREDIR")
+
+weechat_libdir=${libdir}/weechat
+AC_SUBST(weechat_libdir)
+ 
 CFLAGS=`echo $CFLAGS | sed s/-g//g`
 if test "x$CFLAGS" = "x" ; then
    CFLAGS="-O2"
@@ -120,26 +378,59 @@ if test "x$debug" = "x2" ; then
    AC_DEFINE(DEBUG)
 fi

+LIBS="$LIBS $INTLLIBS"
+
+case "$host_os" in
+freebsd* | netbsd*)
+        if test "x$enable_perl" = "xyes" -o "x$enable_python" = "xyes" ; then
+	   CFLAGS="$CFLAGS -pthread"
+        fi
+        CFLAGS="$CFLAGS $CPPFLAGS"
+        ;;
+openbsd*)
+        if test "x$enable_python" = "xyes" ; then
+           CFLAGS="$CFLAGS -pthread"
+        fi
+        ;;
+*)
+        ;;
+esac
+
+# ------------------------------------------------------------------------------
+#                                output Makefiles
+# ------------------------------------------------------------------------------
+
 AC_OUTPUT([Makefile
+           doc/Makefile
+           doc/fr/Makefile
+           doc/en/Makefile
           src/Makefile
           src/common/Makefile
           src/irc/Makefile
           src/plugins/Makefile
-           src/plugins/perl/Makefile
+           src/plugins/scripts/Makefile
+           src/plugins/scripts/perl/Makefile
+           src/plugins/scripts/python/Makefile
+           src/plugins/scripts/ruby/Makefile
           src/gui/Makefile
           src/gui/curses/Makefile
+           src/gui/wxwidgets/Makefile
           src/gui/gtk/Makefile
           src/gui/qt/Makefile
           intl/Makefile
           po/Makefile.in])

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

 listgui=
 if test "x$enable_ncurses" = "xyes" ; then
    listgui="$listgui ncurses"
 fi
+if test "x$enable_wxwidgets" = "xyes"; then
+   listgui="$listgui WxWidgets"
+fi
 if test "x$enable_gtk" = "xyes" ; then
    listgui="$listgui Gtk+"
 fi
@@ -148,7 +439,9 @@ if test "x$enable_qt" = "xyes" ; then
 fi

 if test "x$listgui" = "x" ; then
-    AC_MSG_ERROR([No interface specified... Please specify at least ncurses, Gtk or Qt.])
+    AC_MSG_ERROR([
+*** No interface specified...
+*** Please specify at least ncurses, WxWidgets, Gtk or Qt.])
 fi

 msg_debug_compiler="no"
@@ -160,18 +453,17 @@ if test "x$debug" = "x2" ; then
    msg_debug_verbose="yes"
 fi

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

-  * WeeChat version 0.1.1, see ChangeLog for detail.
+  * WeeChat version 0.1.1, see ChangeLog for detail (closes: #306492)
+  
+ -- Sebastien Helleu <flashcode@flashtux.org>  Sat, 20 Mar 2005 08:00:00 +0200
+
+weechat (0.1.0-1) unstable; urgency=low
+
+  * WeeChat version 0.1.0, see ChangeLog for detail.
+  
+ -- Sebastien Helleu <flashcode@flashtux.org>  Sat, 12 Feb 2005 12:00:00 +0200
+
+weechat (0.0.9-1) unstable; urgency=low
+
+  * WeeChat version 0.0.9, see ChangeLog for detail.
+  
+ -- FlashCode <flashcode@flashtux.org>  Sat, 01 Jan 2005 13:00:00 +0200
+
+weechat (0.0.8-1) unstable; urgency=low
+
+  * WeeChat version 0.0.8, see ChangeLog for detail.
+  
+ -- FlashCode <flashcode@flashtux.org>  Sat, 30 Oct 2004 11:40:00 +0200
+
+weechat (0.0.7-1) unstable; urgency=low
+
+  * WeeChat version 0.0.7, see ChangeLog for detail.
+  
+ -- FlashCode <flashcode@flashtux.org>  Sat, 08 Aug 2004 21:00:00 +0200
+
+weechat (0.0.6-1) unstable; urgency=low
+
+  * WeeChat version 0.0.6, see ChangeLog for detail.
+  
+ -- FlashCode <flashcode@flashtux.org>  Sat, 05 Jun 2004 11:30:00 +0200
+
+weechat (0.0.5-1) unstable; urgency=low
+
+  * WeeChat version 0.0.5, see ChangeLog for detail.
+  
+ -- FlashCode <flashcode@flashtux.org>  Sat, 07 Feb 2004 20:30:00 +0200
+
+weechat (0.0.4-1) unstable; urgency=low
+
+  * WeeChat version 0.0.4, see ChangeLog for detail.
+  
+ -- FlashCode <flashcode@flashtux.org>  Thu, 01 Jan 2004 13:00:00 +0200
+
+weechat (0.0.3-1) unstable; urgency=low
+
+  * WeeChat version 0.0.3, see ChangeLog for detail.
+  
+ -- FlashCode <flashcode@flashtux.org>  Mon, 03 Nov 2003 23:15:00 +0200
+
+weechat (0.0.2-1) unstable; urgency=low
+
+  * WeeChat version 0.0.2, see ChangeLog for detail.
+  
+ -- FlashCode <flashcode@flashtux.org>  Sun, 05 Oct 2003 12:00:00 +0200
+
+weechat (0.0.1-1) unstable; urgency=low
+
+  * First version.
+  
+ -- FlashCode <flashcode@flashtux.org>  Sat, 27 Sep 2003 12:00:00 +0200
+weechat (0.1.5-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Julien Louis <ptitlouis@sysif.net>  Sat, 24 Sep 2005 14:08:55 +0200
+
+weechat (0.1.4-2) unstable; urgency=low
+
+  * Add autotools-dev to Build-Depends.
+  * update autotools stuff automatically to always
+    have up-to-date config.{guess,sub}
+  * Update Build-Depends: libgnutls11-dev -> libgnutls-dev
+
+ -- Julien Louis <ptitlouis@sysif.net>  Mon,  1 Aug 2005 11:46:39 +0200
+
+weechat (0.1.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Julien Louis <ptitlouis@sysif.net>  Sat, 30 Jul 2005 16:26:55 +0200
+
+weechat (0.1.3-2) unstable; urgency=low
+
+  * Update config.{guess,sub} to fix FTBFS on k*BSD (Closes: #316791)
+
+ -- Julien Louis <ptitlouis@sysif.net>  Fri,  8 Jul 2005 21:30:38 +0200
+
+weechat (0.1.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Julien Louis <ptitlouis@sysif.net>  Sat,  2 Jul 2005 20:06:29 +0200
+
+weechat (0.1.2-3) unstable; urgency=low
+
+  * Apply patch against gui-display.c to fix curses color bug.
+  * remove dh_install --sourcedir to allow builds on woody.
+
+ -- Julien Louis <ptitlouis@sysif.net>  Sun, 19 Jun 2005 22:37:11 +0200
+
+weechat (0.1.2-2) unstable; urgency=low
+
+  * Patch src/gui/curse/gui-display.c to fix segfault
+    when config file does not exists (Closes: #310589).
+
+ -- Julien Louis <ptitlouis@sysif.net>  Tue, 24 May 2005 20:55:02 +0200
+
+weechat (0.1.2-1) unstable; urgency=low
+
+  * WeeChat version 0.1.2, see ChangeLog for detail.
+  
+ -- Sebastien Helleu <flashcode@flashtux.org>  Sat, 21 May 2005 08:00:00 +0200
+
+weechat (0.1.1-2) unstable; urgency=low
+
+  * debian/control:
+    - Add myself to uploaders.
+    - Remove unecessary dependency on weechat-gtk (Closes: #308287).
+
+ -- Julien Louis <ptitlouis@sysif.net>  Tue, 10 May 2005 22:38:52 +0200
+
+weechat (0.1.1-1) unstable; urgency=low
+
+  * WeeChat version 0.1.1, see ChangeLog for detail (closes: #306492)
  
 -- Sebastien Helleu <flashcode@flashtux.org>  Sat, 20 Mar 2005 08:00:00 +0200

@@ -0,0 +1 @@
+4
@@ -2,29 +2,56 @@ Source: weechat
 Section: net
 Priority: optional
 Maintainer: Sebastien Helleu <flashcode@flashtux.org>
-Build-Depends: debhelper (>> 4.0.0), libncurses5-dev (>= 5.2.20020112a-7), perl (>= 5.6.0-16), libperl-dev
-Standards-Version: 3.6.1
+Uploaders: Julien Louis <ptitlouis@sysif.net>
+Build-Depends: debhelper (>> 4.0.0), libncursesw5-dev (>= 5.2.20020112a-7), ruby1.8-dev, libperl-dev, python-dev, libgnutls-dev, libtool, texinfo
+Standards-Version: 3.6.2

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

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

 Package: weechat-common
 Architecture: all
 Replaces: weechat
-Recommends: weechat-curses | weechat-gtk
+Recommends: weechat-curses
 Description: Common files for WeeChat
 Documentation, examples, and locale files for WeeChat - fast, light and
- extensible IRC client. It is useless without weechat-curses or weechat-gtk.
+ extensible IRC client. It is useless without weechat-curses.
+
+Package: weechat-plugins
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Plugins for WeeChat
+ This package provides some plugins to enhance weechat with scripting languages
+ such as perl python or ruby.
@@ -1,5 +1,5 @@
 This package was debianized by FlashCode <flashcode@flashtux.org> on
-Sat, 20 Mar 2005 08:00:00 +0200.
+Sat, 21 May 2005 08:00:00 +0200.

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

@@ -15,7 +15,8 @@ configure: configure-stamp
 configure-stamp:
 	dh_testdir
 	./configure --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man \
-	--enable-perl
+	--infodir=\$${prefix}/share/info --enable-perl --enable-python --enable-ruby \
+	--with-debug=0
 	touch configure-stamp


@@ -38,10 +39,11 @@ install: build
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	$(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
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	dh_install
+#	install -o root -g root -m 755 src/gui/curses/weechat-curses $(CURDIR)/debian/weechat-curses/usr/bin
 	# install -o root -g root -m 755 src/gui/gtk/weechat-gtk $(CURDIR)/debian/weechat-gtk/usr/bin
+	install -D -o root -g root -m 644 weechat_icon_32.png $(CURDIR)/debian/weechat-common/usr/share/pixmaps/weechat_icon_32.png


 # Build architecture-independent files here.
@@ -50,6 +52,7 @@ binary-indep: build install
 	dh_testroot -pweechat-common -pweechat
 	dh_installchangelogs ChangeLog -pweechat-common
 	dh_installdocs -pweechat-common
+	dh_installinfo -pweechat-common
 	dh_installexamples -pweechat-common
 	dh_compress -pweechat-common -pweechat
 	dh_link -pweechat usr/share/doc/weechat-common usr/share/doc/weechat
@@ -62,20 +65,21 @@ binary-indep: build install

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

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

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

 .SH OPTIONS
 .TP
+.B \-a, \-\-no\-connect
+.br
+disable auto-connect to servers at startup
+.TP
 .B \-c, \-\-config
 .br
 display config file help (list of options)
 .TP
+.B \-f, \-\-key\-functions
+.br
+display internal functions for keys
+.TP
 .B \-h, \-\-help
 .br
 display summary of options
 .TP
+.B \-i, \-\-irc\-commands
+.br
+display IRC commands
+.TP
+.B \-k, \-\-keys
+.br
+display default keys
+.TP
 .B \-l, \-\-license
 .br
 display program license
 .TP
+.B \-p, \-\-no\-plugin
+.br
+don't load any plugin at startup
+.TP
 .B \-v, \-\-version
 .br
 display WeeChat version
+.TP
+.B \-w, \-\-weechat\-commands
+.br
+display WeeChat commands

 .SH URL
 WeeChat can use an URL (Uniform Resource Locator) to automatically connect
 to an IRC server. These are in the following form:
 .TP
-.B irc://[[nickname][:password]@]server[:port][/[#&+!]channel]
+.B irc[6][s]://[[nickname][:password]@]server[:port][/[#&+!]channel[,channel...]]
 .TP
 Exemple to join WeeChat channel support with nick "FlashCode":
 irc://FlashCode@irc.freenode.net/weechat
@@ -53,11 +77,7 @@ configuration file for WeeChat
 WeeChat log file

 .SH AUTHOR
-WeeChat is written by:
-.br
- - FlashCode <flashcode@flashtux.org>
- - Bounga <bounga@altern.org>
- - Xahlexx <xahlexx@weeland.org>
+WeeChat is written by FlashCode <flashcode@flashtux.org>
 .br
 WeeChat on the web:
 .UR
@@ -0,0 +1,50 @@
+/*
+ * WeeChat doc CSS
+ * (c) 2006 by FlashCode <flashcode@flashtux.org>
+ */
+
+body {
+  font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+  font-size: 12px;
+}
+
+table {
+  font-size: 12px;
+}
+
+.informaltable table {
+  font-size: 11px;
+  font-family: Verdana;
+  border-collapse: collapse;
+}
+
+.informaltable table th {
+  padding: 2px 5px 2px 5px;
+  border: solid 1px #AAAAAA;
+  background-color: #DDDDFF;
+}
+
+.informaltable table td {
+  padding: 2px 5px 2px 5px;
+  border: solid 1px #AAAAAA;
+}
+
+.oddrow {
+  background-color: #F0F0F0;
+}
+
+.synopsis { 
+  font-size: 11px;
+}
+
+.programlisting {
+  font-size: 11px;
+}
+
+pre.screen {
+  font-size: 11px;
+  background-color: #F5F5F5;
+  border: solid 1px #CCCCCC;
+  padding: 4px;
+  margin: 0 40px 0 40px;
+}
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl"/>
+
+<xsl:output indent="yes"/>
+
+<xsl:param name="chunk.section.depth" select="2"/>
+<xsl:param name="chunk.quietly" select="1"/>
+<xsl:param name="chunk.first.sections" select="1"/>
+<xsl:param name="generate.section.toc.level" select="3"/>
+
+<xsl:param name="html.stylesheet">weechat-doc.css</xsl:param>
+
+<xsl:template name="tr.attributes">
+  <xsl:param name="row" select="."/>
+  <xsl:param name="rownum" select="0"/>
+
+  <xsl:if test="not(ancestor::table/@tabstyle = 'unstriped')">
+    <xsl:if test="$rownum mod 2 = 0">
+      <xsl:attribute name="class">oddrow</xsl:attribute>
+    </xsl:if>
+  </xsl:if>
+</xsl:template>
+
+</xsl:stylesheet>
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl"/>
+
+<xsl:output indent="yes"/>
+
+<xsl:param name="chunk.section.depth" select="2"/>
+<xsl:param name="chunk.quietly" select="1"/>
+<xsl:param name="chunk.first.sections" select="1"/>
+<xsl:param name="generate.section.toc.level" select="3"/>
+
+<xsl:param name="html.stylesheet">weechat-doc.css</xsl:param>
+
+<xsl:template name="tr.attributes">
+  <xsl:param name="row" select="."/>
+  <xsl:param name="rownum" select="0"/>
+
+  <xsl:if test="not(ancestor::table/@tabstyle = 'unstriped')">
+    <xsl:if test="$rownum mod 2 = 0">
+      <xsl:attribute name="class">oddrow</xsl:attribute>
+    </xsl:if>
+  </xsl:if>
+</xsl:template>
+
+</xsl:stylesheet>
@@ -1,621 +0,0 @@
-\input texinfo  @c -*-texinfo-*-
-@c %**start of header
-@setfilename weechat_doc_pt.info
-@settitle WeeChat - Um cliente de IRC rapido, leve e extencivel
-@c %**end of header
-
-@c WeeChat documentation (vers@~ao partuguesa)
-@c
-@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
-@c the Free Software Foundation; either version 2 of the License, or
-@c (at your option) any later version.
-@c
-@c This manual is distributed in the hope that it will be useful,
-@c but WITHOUT ANY WARRANTY; without even the implied warranty of
-@c MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-@c GNU General Public License for more details.
-@c
-@c You should have received a copy of the GNU General Public License
-@c along with this program; if not, write to the Free Software
-@c Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-@c pdf : texi2pdf weechat_doc_pt.texi
-@c html: makeinfo --html --no-split --number-sections weechat_doc_pt.texi
-
-@c tex
-@c \overfullrule=0pt
-@c end tex
-
-@documentlanguage pt
-
-@titlepage
-
-@title WeeChat - Guia do Utilizador
-@subtitle Cliente de IRC rapido, leve e extencivel
-@subtitle Documenta@,{c}@~ao do WeeChat v0.1.1 - 20 de Mar@,{c}o de 2005
-
-@image{weechat_image}
-
-@author FlashCode <@email{flashcode@@flashtux.org, flashcode AT flashtux.org}>
-
-@page
-
-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{} 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
-License) vers@~ao 2 ou superior.
-
-@end titlepage
-
-@everyheading @thischapter @| @|
-@everyfooting @thistitle @| @| Pagina @thispage
-
-@contents
-
-@node Top, Introducao, (dir), (dir)
-@menu
-* Introducao:: Descri@,{c}@~ao do WeeChat
-* Instalacao:: Instala@,{c}@~ao do WeeChat
-* Utilizacao:: Utiliza@,{c}@~ao do WeeChat
-* Extencoes:: Exten@,{c}@~oes do Weechat
-* Autores/Suporte:: Contactar os autores e obter suporte
-@end menu
-
-
-@c ******************************* Introducao *******************************
-
-@node Introducao, Instalacao, Top, Top
-@chapter Introdu@,{c}@~ao
-@menu
-* Descricao::
-* Pre-requisitos::
-@end menu
-
-@node Descricao, Pre-requisitos, Introducao, Introducao
-@section Descri@,{c}@~ao
-
-O WeeChat (Wee Enhanced Environment for Chat) @'e um cliente de IRC livre, r@'apido e leve,
-concebido para funcionar em diversos sistemas operativos.@*
-@*
-As suas caracter@'isticas prinicpais s@~ao as seguintes :
-@itemize @minus
-@item
-liga@,{c}@~ao a m@'ultiplos servidores
-@item
-v@'arias interfaces : Curses, Gtk e Qt
-@item
-pequeno r@'apido e leve
-@item
-configuravel e extenc@'ivel com scripts
-@item
-compat@'ivel com RFCs 1459, 2810, 2811, 2812, e 2813
-@item
-multiplataforma (Gnu/Linux, *BSD, Windows e outros)
-@item
-100% GPL, Software Livre
-@end itemize
-
-@*
-A p@'agina Web do Weechat @'e aqui :@*
-@uref{http://weechat.flashtux.org}@*
-
-@node Pre-requisitos, ,Descricao, Introducao
-@section Pr@'e-requisitos
-
-Para instalar o Weechat, vais @b{precisar} de ter :@*
-
-@itemize @bullet
-@item
-Um sistema Gnu/Linux (com um compilador e outros utilit@'arios associados aos pacotes de c@'odigo fonte)
-@item
-Direitos de "root" (para instalar)
-@item
-Consoante a interface escolhida, uma das seguintes bibliotecas :
-@itemize @minus
-@item
-Curses: a biblioteca ncurses,
-@item
-Gtk: *** interface n@~ao desenvolvida ***,
-@item
-Qt: *** interface n@~ao desenvolvida ***,
-@end itemize
-@end itemize
-
-
-@c ******************************* Instalacao *******************************
-
-@node Instalacao, Utilizacao, Introducao, Top
-@chapter Instala@,{c}@~ao
-@menu
-* Binarios::
-* Codigo Fonte::
-* Codigo Fonte via CVS::
-@end menu
-
-@node Binarios, Codigo Fonte, Instalacao, Instalacao
-@section Bin@'arios
-
-Os pacotes bin@'arios est@'ao dispon@'iveis para as seguintes distribui@,{c}@~oes :
-@itemize @bullet
-@item
-Debian (ou compat@'ivel)@*
-Instala@,{c}@~ao : @kbd{dpkg -i /chemin/weechat_x.y.z-1_i386.deb}
-@item
-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 : @kbd{emerge weechat}
-@item
-*BSD (non disponible !)
-@item
-Slackware (n@~ao dispon@'ivel !)
-@item
-Windows (n@~ao dispon@'ivel !)
-@end itemize
-
-Onde x.y.z @'e a vers@~ao (por exemplo 0.0.1)
-@*
-
-@node Codigo Fonte, Codigo Fonte via CVS, Binarios, Instalacao
-@section C@'odigo Fonte
-
-Escreve simplesmente numa consola ou num terminal :@*
-@kbd{./configure}@*
-@kbd{make}@*
-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}@*
-(escreve aqui a palavra-passe do superutilizador)@*
-@kbd{make install}@*
-
-@node Codigo Fonte via CVS, , Codigo Fonte, Instalacao
-@section C@'odigo Fonte via CVS
-
-Aten@,{c}@~ao: o c@'odigo fonte CVS est@'a reservado aos utilizadores avan@,{c}ados : o WeeChat pode n@~ao compilar ou ficar inst@'avel.@*
-Considera-te avisado !@*
-
-Para sacares o c@'odigo fonte via CVS, escreve estes comandos :@*
-@kbd{cvs -d:pserver:anoncvs@@subversions.gnu.org:/cvsroot/weechat login}@*
-@kbd{cvs -z3 -d:pserver:anoncvs@@subversions.gnu.org:/cvsroot/weechat co weechat}@*
-(quando te pedirem a palavra-passe, primen simplesmente Enter)@*
-
-Executa o script :@*
-@kbd{./autogen.sh}@*
-
-Segue agora as instru@,{c}@~oes para compilar o c@'odigo fonte - @xref{Codigo Fonte}.
-
-
-@c ******************************* Utilizacao ********************************
-
-@node Utilizacao, Extencoes, Instalacao, Top
-@chapter Utiliza@,{c}@~ao
-
-@menu
-* Invocar o WeeChat::
-* Recursos de teclado::
-* Comandos do WeeChat::
-* FIFO pipe::
-@end menu
-
-@node Invocar o WeeChat, Recursos de teclado, Utilizacao, Utilizacao
-@section Invocar o WeeChat
-
-@subsection Par@^ametros de linha de comandos
-
-@table @code
-@item -c, --config
-Mostrar da lima dos config da exposi@,{c}@~ao (lista das op@,{c}@~oes)
-@item -h, --help
-Mostrar a ajuda@*
-@item -l, --license
-Mostrar a licen@,{c}a do WeeChat@*
-@item -v, --version
-Mostrar a vers@~ao do WeeChat@*
-@end table
-
-@subsection Invocar o WeeChat
-
-Escreve simplesmente este comando para invoceres o WeeChat :@*
-@kbd{weechat-curses} (para a interface em Curses)@*
-ou @kbd{weechat-gtk} (para a interface em Gtk)@*
-ou @kbd{weechat-qt} (para a interface em Qt)@*
-
-Logo que lan@,{c}ares o WeeChat pela primeira vez, um ficheiro de configura@,{c}@~ao
-por defeito @'e criado, com as configura@,{c}@~oes por defeito.@*
-O ficheiro de configura@,{c}@~ao por defeito @'e : ~/.weechat/weechat.rc@*
-
-Podes editar esse ficheiro para configurar o WeeChat @`a tua maneira, man tamb@'em podes modificar os par@^ametros dentro do WeeChat utilizando o comando @kbd{/set} - @xref{Comandos do WeeChat}.
-
-@node Recursos de teclado, Comandos do WeeChat, Invocar o WeeChat, Utilizacao
-@section Recursos de teclado
-
-@table @kbd
-@item Seta esquerda / Seta direita
-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 / 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 / Ctrl + W
-Apagar a palavra anterior na linha de comando
-@*
-@item Tab
-Completar o comando ou o nick (@kbd{Tab} novamente : encontrar a pr@'oxima sugest@~ao)@*
-@*
-@item Qualquer caractere
-Inserir o caractere na linha de comando, no s@'itio do cursor@*
-@*
-@item Enter
-Executa o comando ou envia a mensagem@*
-@*
-@item Seta para cima / Seta para baixo
-Repetir os ultimos comandos/mensagens@*
-@*
-@item PageUp / PageDown
-Navegar no hist@'orico da janela@*
-@*
-@item F5 / F6
-Comute ao amortecedor anterior / seguinte@*
-@*
-@item F7 / F8
-Comute ao janela anterior / 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 F5 / F6@*
-@*
-@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, FIFO pipe, Recursos de teclado, Utilizacao
-@section Comandos do WeeChat
-
-N@~AO ESCRITO !
-
-@node FIFO pipe, , Comandos do WeeChat, Utilizacao
-@section FIFO pipe
-
-You can remote control WeeChat, by sending commands or text to a FIFO pipe
-(you have to enable option "irc_fifo_pipe", it is disabled by default).@*
-The FIFO pipe is located in ~/.weechat/ and is called "weechat_fifo_xxxxx"
-(where xxxxx is the process ID (PID) of running WeeChat).@*
-So if many WeeChat are running, you have many FIFO pipe, one for each session.@*
-@*
-The syntax for the FIFO pipe commands/text is:@*
-@command{server,channel *text or command here}@*
-where server and channel are optional, but if channel is here, server should be too.@*
-@*
-Some examples:
-@table @asis
-@item @bullet{} change your nick on freenode to "mynick|out":
-@*
-@command{echo "freenode */nick mynick|out" >~/.weechat/weechat_fifo_12345}
-@item @bullet{} display text on #weechat channel:
-@*
-@command{echo "freenode,#weechat *hello everybody!" >~/.weechat/weechat_fifo_12345}
-@item @bullet{} display text on current channel (buffer displayed by WeeChat):
-@*
-@command{echo "*hello!" >~/.weechat/weechat_fifo_12345}@*
-@*
-@b{Warning:} this is dangerous and you should not do that except if you know what you do!
-@item @bullet{} send 2 commands to unload/reload Perl scripts (you have to separate them with \n):
-@command{echo -e "freenode */perl unload\nfreenode */perl autoload" >~/.weechat/weechat_fifo_12345}
-@end table
-@*
-You can write a script to send command to all running WeeChat at same time, for example:@*
-@verbatim
- #!/bin/sh
- if [ $# -eq 1 ]; then
-     for fifo in $(/bin/ls ~/.weechat/weechat_fifo_* 2>/dev/null); do
-         echo -e "$1" >$fifo
-     done
- fi
-@end verbatim
-@*
-If the script is called "auto_weechat_command", you can run it with:@*
-@command{./auto_weechat_command "freenode,#weechat *hello"}
-
-
-@c ******************************* Extencoes *********************************
-
-@node Extencoes, Autores/Suporte, Utilizacao, Top
-@chapter Exten@,{c}@~oes
-
-@menu
-* Scripts Perl::
-* Scripts Python::
-* Scripts Ruby::
-@end menu
-
-@node Scripts Perl, Scripts Python, Extencoes, Extencoes
-@section Scripts Perl
-
-@subsection Carregar/Descarregar Scripts Perl
-
-Os Scripts Perl s@~ao carregados e descarregados com o comando @command{/perl}.
-(escreve @kbd{/help perl} dentro do WeeChat para obteres ajuda acerca do comando).@*
-
-@emph{Exemplos:}@*
-@itemize @bullet
-@item
-Carregar um Script Perl: @kbd{/perl load /tmp/sample.pl}@*
-@item
-Descarregar todos os Scripts Perl: @kbd{/perl unload}@*
-@item
-Listar todos os Scripts Perl: @kbd{/perl}@*
-@end itemize
-
-@subsection Interface WeeChat / Perl
-
-@itemize @bullet
-@item
-@command{IRC::register ( nome, vers@~ao, fun@,{c}@~ao_de_shutdown, descri@,{c}@~ao );}@*
-@*
-Esta @'e a primeira fun@,{c}@~ao a invocar num Script Perl.@*
-Todos os Scripts Perl para o Weechat devem invocar esta fun@,{c}@~ao.@*
-
-@emph{Argumentos:}
-@itemize @minus
-@item @option{nome}: nome @'unico que indentifique o script (cada Script Perl deve ter um @'unico nome)
-@item @option{vers@~ao}: vers@~ao do script
-@item @option{fun@,{c}@~ao_de_shutdown}: fun@,{c}@~ao Perl invocada quando o script é descarregado (par@^ametro opcional, se deixado em branco significa que nada deve ser chamado)
-@item @option{descri@,{c}@~ao}: breve descri@,{c}@~ao do script.
-@end itemize
-@*
-@emph{Exemplo:}@*
-@code{IRC::register ("sample", "1.0", "sample_end", "Sample script!");}@*
-@*
-
-@item
-@command{IRC::print ( mensagem );}@*
-@*
-Imprimne uma mensagem na janela actual (canal ou servidor).@*
-
-@emph{Argumentos:}
-@itemize @minus
-@item @option{mensagem}: mensagem a mostrar
-@end itemize
-@*
-@emph{Exemplo:}@*
-@code{IRC::print ("mensagem");}@*
-@*
-
-@item
-@command{IRC::print_with_channel ( canal, [servidor,] mensagem );}@*
-@*
-Imprimne uma mensagem na canal.@*
-
-@emph{Argumentos:}
-@itemize @minus
-@item @option{canal}: nome da canal
-@item @option{servidor}: nome interno da servidor
-@item @option{mensagem}: mensagem a mostrar
-@end itemize
-@*
-@emph{Exemplos:}@*
-@code{IRC::print_with_channel ("#weechat", "freenode", "mensagem");}@*
-@code{IRC::print_with_channel ("#weechat", "mensagem");}@*
-@*
-
-@item
-@command{IRC::print_infobar ( atrasa, mensagem );}@*
-@*
-Imprimne uma mensagem na barra do info.@*
-
-@emph{Argumentos:}
-@itemize @minus
-@item @option{atrasa}: depois que isto atrasa (nos segundos), a mensagem estar@'a apagada
-(se 0, mensagem n@~ao forem apagados).
-@item @option{mensagem}: mensagem a mostrar
-@end itemize
-@*
-@emph{Exemplo:}@*
-@code{IRC::print_infobar (5, "mensagem");}@*
-@*
-
-@item
-@command{IRC::add_message_handler ( nome, fun@,{c}@~ao );}@*
-@*
-Anexa uma fun@,{c}@~ao Perl a uma mensagem de IRC.@*
-A fun@,{c}@~ao ser@'a invocada de cada vez que a mensagem IRC for recebida.@*
-
-@emph{Argumentos:}
-@itemize @minus
-@item @option{nome}: nome da mensagem IRC@*
-Para conheceres uma lista de mensagens de IRC, por favor lê o RFC 1459 e/ou o 2812:@*
-RFC 1459: @uref{ftp://ftp.rfc-editor.org/in-notes/rfc1459.txt}@*
-RFC 2812: @uref{ftp://ftp.rfc-editor.org/in-notes/rfc2812.txt}
-@item @option{fun@,{c}@~ao}: fun@,{c}@~ao Perl invocada quando a mensagem é recebida
-@end itemize
-@*
-@emph{Exemplo:}@*
-@code{IRC::add_message_handler ("privmsg", my_function);}@*
-@code{sub my_function}@*
-@code{@{ }@*
-@code{@ @ @ @ ($null, $channel, $message) = split ":",@@_[0],3;}@*
-@code{@ @ @ @ ($hostmask, $null, $channel) = split " ", $channel;}@*
-@code{@ @ @ @ IRC::print ("host=$hostmask, chan=$channel, msg=$message\n");}@*
-@code{@} }@*
-@*
-
-@item
-@command{IRC::add_command_handler ( nome, fun@,{c}@~ao );}@*
-@*
-Cria um novo comando do Weechat, ligado a uma fun@,{c}@~ao Perl.@*
-A fun@,{c}@~ao ser@'a chamada quando o utilizador a invocar utilizando @command{/nome}@*
-
-@emph{Argumentos:}
-@itemize @minus
-@item @option{nome}: nome do novo comando@*
-Este nome pode pertencer a um comando já existente, o qual ser@'a sobreposto pela fun@,{c}@~ao Perl. Tem cuidado quando fizeres isto: os comandos originais não estar@~ao acessiveis antes de teres descarregado o Script Perl.
-@item @option{fun@,{c}@~ao}: fun@,{c}@~ao Perl ligada ao comando
-@end itemize
-@*
-@emph{Exemplo:}@*
-@code{IRC::add_command_handler ("command", my_command);}@*
-@code{sub my_command}@*
-@code{@{ }@*
-@code{@ @ @ @ IRC::print("Argumentos: ".@@_[0]);}@*
-@code{@ @ @ @ return 0;}@*
-@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
-@section Scripts Python
-
-N@~AO DESENVOLVIDO!
-
-@node Scripts Ruby, , Scripts Python, Extencoes
-@section Scripts Ruby
-
-N@~AO DESENVOLVIDO!
-
-
-@c **************************** Autores/Suporte *****************************
-
-@node Autores/Suporte, , Extencoes, Top
-@chapter Autores / Suporte
-
-@ifhtml
-@menu
-* Autores::
-* Obter Suporte::
-* Copyright::
-@end menu
-@end ifhtml
-@ifnothtml
-@menu
-* Autores::
-* Obter Suporte::
-@end menu
-@end ifnothtml
-
-@node Autores, Obter Suporte, Autores/Suporte, Autores/Suporte
-@section Autores
-
-O WeeChat @'e desenvolvido por :@*
-
-@itemize @bullet
-@item 
-FlashCode
-<@email{flashcode@@flashtux.org, flashcode AT flashtux.org}>
-
-@end itemize
-
-@ifhtml
-@node Obter Suporte, Copyright, Autores, Autores/Suporte
-@end ifhtml
-@ifnothtml
-@node Obter Suporte, , Autores, Autores/Suporte
-@end ifnothtml
-@section Obter Suporte
-
-Antes de pedires suporte, agradecemos se leres toda a documenta@,{c}@~ao e a FAQ.@*
-(a documenta@,{c}@~ao @'e este documento que est@'as a ler, se n@~ao leste tudo at@'e aqui, est@'a na hora de come@,{c}ares do in@'icio !)@*
-
-@itemize @bullet
-@item
-Suporte por IRC:@*
- servidor : @b{irc.freenode.net}@*
- canal : @b{#weechat}@*@*
-@item
-Forum do WeeChat : @uref{http://forums.flashtux.org}@*@*
-@item
-Suporte por lista de correio-e :@*
- para te inscreveres/desinscreveres :@*@uref{http://mail.nongnu.org/mailman/listinfo/weechat-support}.@*
- para enviares uma mensagem para a lista :@*@email{weechat-support@@nongnu.org}.@*
-
-Os arquivos da lista est@~ao aqui :@*
-@uref{http://mail.nongnu.org/archive/html/weechat-support}@*@*
-@item
-Para mais detalhes, v@^e tamb@'em a p@'agina de suporte do WeeChat :@*
-@uref{http://weechat.flashtux.org/support.php}
-
-@end itemize
-
-@ifhtml
-@node Copyright, , Obter Suporte, Autores/Suporte
-@section Copyright
-
-Este manual documenta o cliente de IRC WeeChat, Ele faz parte do WeeChat.@*
-
-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}>@*
-@*
-A utiliza@,{c}@~ao deste documento @'e regida pela GNU General Public
-License vers@~ao 2 ou posterior.@*
-
-@end ifhtml
-
-@bye
-
@@ -6,16 +6,21 @@
 ./src/irc/irc-send.c
 ./src/irc/irc-recv.c
 ./src/irc/irc-dcc.c
+./src/irc/irc-ignore.c
 ./src/irc/irc.h
-./src/plugins/perl/wee-perl.c
-./src/plugins/perl/wee-perl.h
 ./src/plugins/plugins.c
 ./src/plugins/plugins.h
+./src/plugins/plugins-config.c
+./src/plugins/plugins-config.h
+./src/plugins/plugins-interface.c
+./src/plugins/weechat-plugin.h
 ./src/gui/curses/gui-input.c
 ./src/gui/curses/gui-display.c
 ./src/gui/gtk/gui-display.c
 ./src/gui/gtk/gui-input.c
+./src/gui/gui-action.c
 ./src/gui/gui-common.c
+./src/gui/gui-keyboard.c
 ./src/gui/gui.h
 ./src/common/command.c
 ./src/common/command.h
@@ -29,6 +34,10 @@
 ./src/common/hotlist.h
 ./src/common/log.c
 ./src/common/log.h
+./src/common/session.c
+./src/common/session.h
+./src/common/utf8.c
+./src/common/utf8.h
 ./src/common/weechat.c
 ./src/common/weechat.h
 ./src/common/weeconfig.c
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2005 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2006 FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -12,7 +12,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #

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

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

 noinst_LIBRARIES = lib_weechat_main.a

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


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

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

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

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


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

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

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

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

@@ -112,23 +113,15 @@ fifo_exec (char *text)
    if (text[0] == '*')
    {
        pos_msg = text + 1;
-        ptr_server = SERVER(gui_current_window->buffer);
-        ptr_buffer = gui_current_window->buffer;
-        
-        if (!ptr_server)
-        {
-            irc_display_prefix (NULL, PREFIX_ERROR);
-            gui_printf (NULL, _("%s invalid buffer for displaying text via FIFO pipe\n"),
-                        WEECHAT_WARNING);
-            return;
-        }
+        ptr_buffer = (gui_current_window->buffer->has_input) ? gui_current_window->buffer : gui_buffers;
+        ptr_server = SERVER(ptr_buffer);
    }
    else
    {
        pos_msg = strstr (text, " *");
        if (!pos_msg)
        {
-            irc_display_prefix (NULL, PREFIX_ERROR);
+            irc_display_prefix (NULL, NULL, PREFIX_ERROR);
            gui_printf (NULL, _("%s invalid text received on FIFO pipe\n"),
                        WEECHAT_WARNING);
            return;
@@ -150,45 +143,35 @@ fifo_exec (char *text)
            ptr_server = server_search (text);
            if (!ptr_server || !ptr_server->buffer)
            {
-                irc_display_prefix (NULL, PREFIX_ERROR);
+                irc_display_prefix (NULL, NULL, PREFIX_ERROR);
                gui_printf (NULL, _("%s server \"%s\" not found (FIFO pipe data)\n"),
                            WEECHAT_WARNING, text);
                return;
            }
-            if (ptr_server)
+            if (ptr_server && pos)
            {
-                if (pos)
+                ptr_channel = channel_search (ptr_server, pos + 1);
+                if (!ptr_channel)
                {
-                    ptr_channel = channel_search (ptr_server, pos + 1);
-                    if (!ptr_channel)
-                    {
-                        irc_display_prefix (NULL, PREFIX_ERROR);
-                        gui_printf (NULL, _("%s channel \"%s\" not found (FIFO pipe data)\n"),
-                                    WEECHAT_WARNING, pos + 1);
-                        return;
-                    }
+                    irc_display_prefix (NULL, NULL, PREFIX_ERROR);
+                    gui_printf (NULL,
+                                _("%s channel \"%s\" not found (FIFO pipe data)\n"),
+                                WEECHAT_WARNING, pos + 1);
+                    return;
                }
            }
        }
    }
    
-    if (!ptr_server)
-    {
-        irc_display_prefix (NULL, PREFIX_ERROR);
-        gui_printf (NULL, _("%s invalid text received on FIFO pipe\n"),
-                    WEECHAT_WARNING);
-        return;
-    }
-    
    if (!ptr_buffer)
    {
        if (ptr_channel)
            ptr_buffer = ptr_channel->buffer;
        else
-            ptr_buffer = ptr_server->buffer;
+            ptr_buffer = gui_buffers;
    }
    
-    user_command (ptr_server, ptr_buffer, pos_msg);
+    user_command (ptr_buffer, ptr_server, pos_msg);
 }

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


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

-/* history.c: memorize and call again commands or text */
+/* history.c: memorize commands or text */


 #ifdef HAVE_CONFIG_H
@@ -33,10 +33,10 @@
 #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;
+t_history *history_global = NULL;
+t_history *history_global_last = NULL;
+t_history *history_global_ptr = NULL;
+int num_history_global = 0;


 /*
@@ -66,98 +66,116 @@ history_hide_password (char *string)
 }

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

 void
-history_add (void *buffer, char *string)
+history_buffer_add (void *buffer, char *string)
 {
    t_history *new_history, *ptr_history;
    
-    /* add history to 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);
-        
-        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++;
-        
-        /* 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_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++;
-        }
+    if ( !((t_gui_buffer *)(buffer))->history
+         || ( ((t_gui_buffer *)(buffer))->history
+              && ascii_strcasecmp (((t_gui_buffer *)(buffer))->history->text, string) != 0))
+    {	
+	new_history = (t_history *)malloc (sizeof (t_history));
+	if (new_history)
+	{
+	    new_history->text = strdup (string);
+	    if (cfg_log_hide_nickserv_pwd)
+		history_hide_password (new_history->text);
+	    
+	    if (((t_gui_buffer *)(buffer))->history)
+		((t_gui_buffer *)(buffer))->history->prev_history = new_history;
+	    else
+		((t_gui_buffer *)(buffer))->last_history = new_history;
+	    new_history->next_history = ((t_gui_buffer *)(buffer))->history;
+	    new_history->prev_history = NULL;
+	    ((t_gui_buffer *)buffer)->history = new_history;
+	    ((t_gui_buffer *)buffer)->num_history++;
+	    
+	    /* remove one command if necessary */
+	    if ((cfg_history_max_commands > 0)
+		&& (((t_gui_buffer *)(buffer))->num_history > cfg_history_max_commands))
+	    {
+		ptr_history = ((t_gui_buffer *)buffer)->last_history->prev_history;
+		((t_gui_buffer *)buffer)->last_history->prev_history->next_history = NULL;
+		if (((t_gui_buffer *)buffer)->last_history->text)
+		    free (((t_gui_buffer *)buffer)->last_history->text);
+		free (((t_gui_buffer *)buffer)->last_history);
+		((t_gui_buffer *)buffer)->last_history = ptr_history;
+		((t_gui_buffer *)(buffer))->num_history++;
+	    }
+	}
    }
 }

 /*
- * history_general_free: free general history
+ * history_global_add: add a text/command to buffer's history
 */

 void
-history_general_free ()
+history_global_add (char *string)
+{
+    t_history *new_history, *ptr_history;
+
+    if (!history_global
+        || (history_global
+            && ascii_strcasecmp (history_global->text, string) != 0))
+    {    
+	new_history = (t_history *)malloc (sizeof (t_history));
+	if (new_history)
+	{
+	    new_history->text = strdup (string);
+	    if (cfg_log_hide_nickserv_pwd)
+		history_hide_password (new_history->text);
+	    
+	    if (history_global)
+		history_global->prev_history = new_history;
+	    else
+		history_global_last = new_history;
+	    new_history->next_history = history_global;
+	    new_history->prev_history = NULL;
+	    history_global = new_history;
+	    num_history_global++;
+	    
+	    /* remove one command if necessary */
+	    if ((cfg_history_max_commands > 0)
+		&& (num_history_global > cfg_history_max_commands))
+	    {
+		ptr_history = history_global_last->prev_history;
+		history_global_last->prev_history->next_history = NULL;
+		if (history_global_last->text)
+		    free (history_global_last->text);
+		free (history_global_last);
+		history_global_last = ptr_history;
+		num_history_global--;
+	    }
+	}
+    }
+}
+
+/*
+ * history_global_free: free global history
+ */
+
+void
+history_global_free ()
 {
    t_history *ptr_history;
    
-    while (history_general)
+    while (history_global)
    {
-        ptr_history = history_general->next_history;
-        if (history_general->text)
-            free (history_general->text);
-        free (history_general);
-        history_general = ptr_history;
+        ptr_history = history_global->next_history;
+        if (history_global->text)
+            free (history_global->text);
+        free (history_global);
+        history_global = ptr_history;
    }
-    history_general = NULL;
-    history_general_last = NULL;
-    history_general_ptr = NULL;
-    num_history_general = 0;
+    history_global = NULL;
+    history_global_last = NULL;
+    history_global_ptr = NULL;
+    num_history_global = 0;
 }


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


@@ -30,8 +30,13 @@ struct t_history
    t_history *prev_history;    /* link to previous text/command            */
 };

-extern void history_add (void *, char *);
-extern void history_general_free ();
+extern t_history *history_global;
+extern t_history *history_global_last;
+extern t_history *history_global_ptr;
+
+extern void history_buffer_add (void *, char *);
+extern void history_global_add (char *);
+extern void history_global_free ();
 extern void history_buffer_free (void *);

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

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

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


@@ -23,12 +23,18 @@

 #include "../irc/irc.h"

+#define HOTLIST_LOW       0
+#define HOTLIST_MSG       1
+#define HOTLIST_PRIVATE   2
+#define HOTLIST_HIGHLIGHT 3
+
 typedef struct t_weechat_hotlist t_weechat_hotlist;

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

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

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

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

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


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

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

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


@@ -28,9 +28,17 @@
 #include <stdio.h>
 #include <sys/time.h>

+#ifdef HAVE_GNUTLS
+#include <gnutls/gnutls.h>
+#endif
+
 #if defined(ENABLE_NLS) && !defined(_)
    #include <locale.h>
-    #include <libintl.h>
+    #ifdef HAVE_LIBINTL_H
+        #include <libintl.h>
+    #else
+        #include "../../intl/libintl.h"
+    #endif
    #define _(x) gettext(x)
    #ifdef gettext_noop
        #define N_(string) gettext_noop (string)
@@ -44,7 +52,7 @@
 #endif


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

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

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

 #ifdef _WIN32
@@ -100,14 +94,23 @@

 /* global variables and functions */

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

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

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


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

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

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

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

+extern int cfg_col_real_white;
+extern int cfg_col_separator;
 extern int cfg_col_title;
 extern int cfg_col_title_bg;
 extern int cfg_col_chat;
@@ -105,25 +124,34 @@ extern int cfg_col_chat_time;
 extern int cfg_col_chat_time_sep;
 extern int cfg_col_chat_prefix1;
 extern int cfg_col_chat_prefix2;
+extern int cfg_col_chat_server;
+extern int cfg_col_chat_join;
+extern int cfg_col_chat_part;
 extern int cfg_col_chat_nick;
 extern int cfg_col_chat_host;
 extern int cfg_col_chat_channel;
 extern int cfg_col_chat_dark;
 extern int cfg_col_chat_highlight;
 extern int cfg_col_chat_bg;
+extern int cfg_col_chat_read_marker;
+extern int cfg_col_chat_read_marker_bg;
 extern int cfg_col_status;
 extern int cfg_col_status_delimiters;
+extern int cfg_col_status_channel;
 extern int cfg_col_status_data_msg;
+extern int cfg_col_status_data_private;
 extern int cfg_col_status_data_highlight;
 extern int cfg_col_status_data_other;
 extern int cfg_col_status_more;
 extern int cfg_col_status_bg;
 extern int cfg_col_infobar;
+extern int cfg_col_infobar_delimiters;
 extern int cfg_col_infobar_highlight;
 extern int cfg_col_infobar_bg;
 extern int cfg_col_input;
 extern int cfg_col_input_channel;
 extern int cfg_col_input_nick;
+extern int cfg_col_input_delimiters;
 extern int cfg_col_input_bg;
 extern int cfg_col_nick;
 extern int cfg_col_nick_away;
@@ -132,8 +160,10 @@ extern int cfg_col_nick_chanadmin;
 extern int cfg_col_nick_op;
 extern int cfg_col_nick_halfop;
 extern int cfg_col_nick_voice;
+extern int cfg_col_nick_more;
 extern int cfg_col_nick_sep;
 extern int cfg_col_nick_self;
+extern int cfg_col_nick_colors[COLOR_WIN_NICK_NUMBER];
 extern int cfg_col_nick_private;
 extern int cfg_col_nick_bg;
 extern int cfg_col_dcc_selected;
@@ -146,6 +176,7 @@ extern int cfg_col_dcc_aborted;

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

 extern int cfg_log_auto_server;
 extern int cfg_log_auto_channel;
@@ -156,19 +187,24 @@ extern char *cfg_log_timestamp;
 extern int cfg_log_hide_nickserv_pwd;

 extern int cfg_irc_display_away;
-extern char *cfg_irc_default_msg_away;
 extern char *cfg_irc_default_msg_part;
 extern char *cfg_irc_default_msg_quit;
+extern int cfg_irc_notice_as_pv;
 extern int cfg_irc_away_check;
 extern int cfg_irc_lag_check;
 extern int cfg_irc_lag_min_show;
 extern int cfg_irc_lag_disconnect;
 extern int cfg_irc_fifo_pipe;
+extern char *cfg_irc_highlight;
+extern int cfg_irc_colors_receive;
+extern int cfg_irc_colors_send;

 extern int cfg_dcc_auto_accept_files;
 extern int cfg_dcc_auto_accept_chats;
 extern int cfg_dcc_timeout;
 extern int cfg_dcc_blocksize;
+extern char *cfg_dcc_port_range;
+extern char *cfg_dcc_own_ip;
 extern char *cfg_dcc_download_path;
 extern char *cfg_dcc_upload_path;
 extern int cfg_dcc_convert_spaces;
@@ -176,10 +212,18 @@ extern int cfg_dcc_auto_rename;
 extern int cfg_dcc_auto_resume;

 extern int cfg_proxy_use;
+extern int cfg_proxy_type;
+extern char *cfg_proxy_type_values[];
+extern int cfg_proxy_ipv6;
 extern char *cfg_proxy_address;
 extern int cfg_proxy_port;
+extern char *cfg_proxy_username;
 extern char *cfg_proxy_password;

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

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

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


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

+INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\"
+
+noinst_LIBRARIES = lib_weechat_gui_common.a
+
+lib_weechat_gui_common_a_SOURCES = gui-common.c \
+                                   gui-action.c \
+                                   gui-keyboard.c \
+                                   gui.h
+
 if GUI_NCURSES
 curses_dir=curses
 endif

+if GUI_WXWIDGETS
+wxwidgets_dir=wxwidgets
+endif
+
 if GUI_GTK
 gtk_dir=gtk
 endif
@@ -27,4 +40,4 @@ if GUI_QT
 qt_dir=qt
 endif

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

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

 bin_PROGRAMS = weechat-curses

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

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

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

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

-#define KEY_ESCAPE 27

 /*
- * gui_read_keyb: read keyboard line
+ * gui_input_default_key_bindings: create default key bindings
 */

 void
-gui_read_keyb ()
+gui_input_default_key_bindings ()
 {
-    int key, i;
-    t_gui_buffer *ptr_buffer;
-    t_irc_server *ptr_server;
-    t_irc_dcc *ptr_dcc;
-    char new_char[3], *decoded_string;
-    t_irc_dcc *dcc_selected;
-
-    key = getch ();
-    if (key != ERR)
+    int i;
+    char key_str[32], command[32];
+    
+    /* keys binded with internal functions */
+    gui_key_bind ( /* RC          */ "ctrl-M",             "return");
+    gui_key_bind ( /* RC          */ "ctrl-J",             "return");
+    gui_key_bind ( /* tab         */ "ctrl-I",             "tab");
+    gui_key_bind ( /* basckp      */ "ctrl-H",             "backspace");
+    gui_key_bind ( /* basckp      */ "ctrl-?",             "backspace");
+    gui_key_bind ( /* del         */ "meta2-3~",           "delete");
+    gui_key_bind ( /* ^K          */ "ctrl-K",             "delete_end_line");
+    gui_key_bind ( /* ^U          */ "ctrl-U",             "delete_beginning_line");
+    gui_key_bind ( /* ^W          */ "ctrl-W",             "delete_previous_word");
+    gui_key_bind ( /* ^Y          */ "ctrl-Y",             "clipboard_paste");
+    gui_key_bind ( /* ^T          */ "ctrl-T",             "transpose_chars");
+    gui_key_bind ( /* home        */ "meta2-1~",           "home");
+    gui_key_bind ( /* home        */ "meta2-H",            "home");
+    gui_key_bind ( /* home        */ "meta2-7~",           "home");
+    gui_key_bind ( /* ^A          */ "ctrl-A",             "home");
+    gui_key_bind ( /* end         */ "meta2-4~",           "end");
+    gui_key_bind ( /* end         */ "meta2-F",            "end");
+    gui_key_bind ( /* end         */ "meta2-8~",           "end");
+    gui_key_bind ( /* ^E          */ "ctrl-E",             "end");
+    gui_key_bind ( /* left        */ "meta2-D",            "left");
+    gui_key_bind ( /* right       */ "meta2-C",            "right");
+    gui_key_bind ( /* up          */ "meta2-A",            "up");
+    gui_key_bind ( /* ^up         */ "meta-Oa",            "up_global");
+    gui_key_bind ( /* down        */ "meta2-B",            "down");
+    gui_key_bind ( /* ^down       */ "meta-Ob",            "down_global");
+    gui_key_bind ( /* pgup        */ "meta2-5~",           "page_up");
+    gui_key_bind ( /* pgdn        */ "meta2-6~",           "page_down");
+    gui_key_bind ( /* F10         */ "meta2-21~",          "infobar_clear");
+    gui_key_bind ( /* F11         */ "meta2-23~",          "nick_page_up");
+    gui_key_bind ( /* F12         */ "meta2-24~",          "nick_page_down");
+    gui_key_bind ( /* m-F11       */ "meta-meta2-1~",      "nick_beginning");
+    gui_key_bind ( /* m-F12       */ "meta-meta2-4~",      "nick_end");
+    gui_key_bind ( /* ^L          */ "ctrl-L",             "refresh");
+    gui_key_bind ( /* m-a         */ "meta-a",             "jump_smart");
+    gui_key_bind ( /* m-b         */ "meta-b",             "previous_word");
+    gui_key_bind ( /* ^left       */ "meta-Od",            "previous_word");
+    gui_key_bind ( /* m-d         */ "meta-d",             "delete_next_word");
+    gui_key_bind ( /* m-f         */ "meta-f",             "next_word");
+    gui_key_bind ( /* ^right      */ "meta-Oc",            "next_word");
+    gui_key_bind ( /* m-h         */ "meta-h",             "hotlist_clear");
+    gui_key_bind ( /* m-j,m-d     */ "meta-jmeta-d",       "jump_dcc");
+    gui_key_bind ( /* m-j,m-l     */ "meta-jmeta-l",       "jump_last_buffer");
+    gui_key_bind ( /* m-j,m-s     */ "meta-jmeta-s",       "jump_server");
+    gui_key_bind ( /* m-j,m-x     */ "meta-jmeta-x",       "jump_next_server");
+    gui_key_bind ( /* m-k         */ "meta-k",             "grab_key");
+    gui_key_bind ( /* m-n         */ "meta-n",             "scroll_next_highlight");
+    gui_key_bind ( /* m-p         */ "meta-p",             "scroll_previous_highlight");
+    gui_key_bind ( /* m-r         */ "meta-r",             "delete_line");
+    gui_key_bind ( /* m-s         */ "meta-s",             "switch_server");
+    gui_key_bind ( /* m-u         */ "meta-u",             "scroll_unread");
+    
+    /* keys binded with commands */
+    gui_key_bind ( /* m-left      */ "meta-meta2-D",       "/buffer -1");
+    gui_key_bind ( /* F5          */ "meta2-15~",          "/buffer -1");
+    gui_key_bind ( /* m-right     */ "meta-meta2-C",       "/buffer +1");
+    gui_key_bind ( /* F6          */ "meta2-17~",          "/buffer +1");
+    gui_key_bind ( /* F7          */ "meta2-18~",          "/window -1");
+    gui_key_bind ( /* F8          */ "meta2-19~",          "/window +1");
+    gui_key_bind ( /* m-w,m-up    */ "meta-wmeta-meta2-A", "/window up");
+    gui_key_bind ( /* m-w,m-down  */ "meta-wmeta-meta2-B", "/window down");
+    gui_key_bind ( /* m-w,m-left  */ "meta-wmeta-meta2-D", "/window left");
+    gui_key_bind ( /* m-w,m-right */ "meta-wmeta-meta2-C", "/window right");
+    gui_key_bind ( /* m-0         */ "meta-0",             "/buffer 10");
+    gui_key_bind ( /* m-1         */ "meta-1",             "/buffer 1");
+    gui_key_bind ( /* m-2         */ "meta-2",             "/buffer 2");
+    gui_key_bind ( /* m-3         */ "meta-3",             "/buffer 3");
+    gui_key_bind ( /* m-4         */ "meta-4",             "/buffer 4");
+    gui_key_bind ( /* m-5         */ "meta-5",             "/buffer 5");
+    gui_key_bind ( /* m-6         */ "meta-6",             "/buffer 6");
+    gui_key_bind ( /* m-7         */ "meta-7",             "/buffer 7");
+    gui_key_bind ( /* m-8         */ "meta-8",             "/buffer 8");
+    gui_key_bind ( /* m-9         */ "meta-9",             "/buffer 9");
+    
+    /* bind meta-j + {01..99} to switch to buffers # > 10 */
+    for (i = 1; i < 100; i++)
    {
-        switch (key)
+        sprintf (key_str, "meta-j%02d", i);
+        sprintf (command, "/buffer %d", i);
+        gui_key_bind (key_str, command);
+    }
+}
+
+/*
+ * gui_input_grab_end: insert grabbed key in input buffer
+ */
+
+void
+gui_input_grab_end ()
+{
+    char *expanded_key;
+
+    /* get expanded name (for example: ^U => ctrl-u) */
+    expanded_key = gui_key_get_expanded_name (gui_key_buffer);
+    
+    if (expanded_key)
+    {
+        if (gui_current_window->buffer->has_input)
        {
-            /* resize event */
-            case KEY_RESIZE:
-                gui_curses_resize_handler ();
-                break;
-            /* inactive function keys */
-            case KEY_F(1):
-            case KEY_F(2):
-            case KEY_F(3):
-            case KEY_F(4):
-            case KEY_F(9):
-            case KEY_F(11):
-            case KEY_F(12):
-                break;
-            /* previous buffer in window */
-            case KEY_F(5):
-                gui_switch_to_previous_buffer (gui_current_window);
-                break;
-            /* next buffer in window */
-            case KEY_F(6):
-                gui_switch_to_next_buffer (gui_current_window);
-                break;
-            /* previous window */
-            case KEY_F(7):
-                gui_switch_to_previous_window (gui_current_window);
-                break;
-            /* next window */
-            case KEY_F(8):
-                gui_switch_to_next_window (gui_current_window);
-                break;
-            /* remove last infobar message */
-            case KEY_F(10):
-                gui_infobar_remove ();
-                gui_draw_buffer_infobar (gui_current_window->buffer, 1);
-                break;
-            /* cursor up */
-            case KEY_UP:
-                if (gui_current_window->buffer->dcc)
-                {
-                    if (dcc_list)
-                    {
-                        if (gui_current_window->dcc_selected
-                            && ((t_irc_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_irc_dcc *)(gui_current_window->dcc_first))->prev_dcc;
-                            gui_current_window->dcc_selected =
-                                ((t_irc_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
-                {
-                    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->buffer->dcc)
-                {
-                    if (dcc_list)
-                    {
-                        if (!gui_current_window->dcc_selected
-                            || ((t_irc_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_irc_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_irc_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->buffer->dcc)
-                {
-                    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->buffer->dcc)
-                {
-                    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 or Control + A */
-            case KEY_HOME:
-            case 0x01:
-                if (!gui_current_window->buffer->dcc)
-                {
-                    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 or Control + E */
-            case KEY_END:
-            case 0x05:
-                if (!gui_current_window->buffer->dcc)
-                {
-                    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:
-                if (!gui_current_window->buffer->dcc)
-                    gui_move_page_up (gui_current_window);
-                break;
-            /* page down */
-            case KEY_NPAGE:
-                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->buffer->dcc)
-                {
-                    if (gui_current_window->buffer->input_buffer_pos > 0)
-                    {
-                        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;
-                    }
-                }
-                break;
-            /* Control + Backspace or Control + W */
-            case 0x08:
-            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->buffer->dcc)
-                {
-                    if (gui_current_window->buffer->input_buffer_pos <
-                        gui_current_window->buffer->input_buffer_size)
-                    {
-                        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;
-                    }
-                }
-                break;
-            /* Tab : completion */
-            case '\t':
-                if (!gui_current_window->buffer->dcc)
-                {
-                    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)
-                    {
-                        /* replace word with new completed word into input buffer */
-                        if (gui_current_window->buffer->completion.diff_size > 0)
-                        {
-                            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';
-                            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];
-                            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';
-                        }
-                        
-                        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);
-                        
-                        /* position is < 0 this means only one word was found to complete,
-                           so reinit to stop completion */
-                        if (gui_current_window->buffer->completion.position >= 0)
-                            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.context == COMPLETION_COMMAND)
-                            || (gui_current_window->buffer->completion.context == COMPLETION_COMMAND_ARG))
-                        {
-                            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);
-                            if (gui_current_window->buffer->completion.position >= 0)
-                                gui_current_window->buffer->completion.position++;
-                            gui_current_window->buffer->input_buffer_pos++;
-                        }
-                        else
-                        {
-                            /* add nick completor if position 0 and completing nick */
-                            if ((gui_current_window->buffer->completion.base_word_pos == 0)
-                                && (gui_current_window->buffer->completion.context == COMPLETION_NICK))
-                            {
-                                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);
-                                if (gui_current_window->buffer->completion.position >= 0)
-                                    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);
-                                if (gui_current_window->buffer->completion.position >= 0)
-                                    gui_current_window->buffer->completion.position++;
-                                gui_current_window->buffer->input_buffer_pos++;
-                            }
-                        }
-                        gui_draw_buffer_input (gui_current_window->buffer, 0);
-                    }
-                }
-                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_buffer (gui_current_window);
-                            break;
-                        /* Alt + right arrow */
-                        case KEY_RIGHT:
-                            gui_switch_to_next_buffer (gui_current_window);
-                            break;
-                        case 79:
-                            /* TODO: replace 79 by constant name! */
-                            if (key == 79)
-                            {
-                                if ((key = getch()) != ERR)
-                                {
-                                    switch (key)
-                                    {
-                                        /* Control + Right */
-                                        case 99:
-                                            if (!gui_current_window->buffer->dcc)    
-                                                gui_move_next_word (gui_current_window->buffer);
-                                            break;
-                                        /* Control + Left */
-                                        case 100:
-                                            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->buffer->dcc)    
-                {
-                    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,
-                                      gui_current_window->buffer->input_buffer);
-                        if (ptr_buffer == gui_current_window->buffer)
-                        {
-                            ptr_buffer->input_buffer[0] = '\0';
-                            gui_draw_buffer_input (ptr_buffer, 0);
-                        }
-                    }
-                }
-                break;
-            /* other key => add to input buffer */
-            default:
-                if (gui_current_window->buffer->dcc)
-                {
-                    dcc_selected = (gui_current_window->dcc_selected) ?
-                        (t_irc_dcc *) gui_current_window->dcc_selected : dcc_list;
-                    switch (key)
-                    {
-                        /* accept DCC */
-                        case 'a':
-                        case 'A':
-                            if (dcc_selected
-                                && (DCC_IS_RECV(dcc_selected->status))
-                                && (dcc_selected->status == DCC_WAITING))
-                            {
-                                dcc_accept (dcc_selected);
-                            }
-                            break;
-                        /* cancel DCC */
-                        case 'c':
-                        case 'C':
-                            if (dcc_selected
-                                && (!DCC_ENDED(dcc_selected->status)))
-                            {
-                                dcc_close (dcc_selected, DCC_ABORTED);
-                                gui_redraw_buffer (gui_current_window->buffer);
-                            }
-                            break;
-                        /* purge old DCC */
-                        case 'p':
-                        case 'P':
-                            gui_current_window->dcc_selected = NULL;
-                            for (ptr_dcc = dcc_list; ptr_dcc; ptr_dcc = ptr_dcc->next_dcc)
-                            {
-                                if (DCC_ENDED(ptr_dcc->status))
-                                    dcc_free (ptr_dcc);
-                            }
-                            gui_redraw_buffer (gui_current_window->buffer);
-                            break;
-                        /* close DCC window */
-                        case 'q':
-                        case 'Q':
-                            if (buffer_before_dcc)
-                            {
-                                gui_buffer_free (gui_current_window->buffer, 1);
-                                gui_switch_to_buffer (gui_current_window,
-                                                      buffer_before_dcc);
-                            }
-                            else
-                                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_ENDED(dcc_selected->status)))
-                            {
-                                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';
-                    decoded_string = NULL;
-                    
-                    /* UTF-8 input */
-                    if (key == 0xC3)
-                    {
-                        if ((key = getch()) != ERR)
-                        {
-                            new_char[1] = key;
-                            new_char[2] = '\0';
-                            decoded_string = weechat_convert_encoding (local_charset, cfg_look_charset_internal, new_char);
-                        }
-                    }
-                    
-                    gui_buffer_insert_string (gui_current_window->buffer,
-                                              (decoded_string) ? decoded_string : 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;
-                    
-                    if (decoded_string)
-                        free (decoded_string);
-                }
-                break;
+            gui_insert_string_input (gui_current_window, expanded_key, -1);
+            gui_current_window->buffer->input_buffer_pos += utf8_strlen (expanded_key);
+            gui_draw_buffer_input (gui_current_window->buffer, 1);
        }
+        free (expanded_key);
+    }
+    
+    /* end grab mode */
+    gui_key_grab = 0;
+    gui_key_grab_count = 0;
+    gui_key_buffer[0] = '\0';
+}
+
+/*
+ * gui_input_read: read keyboard chars
+ */
+
+void
+gui_input_read ()
+{
+    int key, i, insert_ok;
+    char key_str[32];
+    
+    i = 0;
+    /* do not loop too much here (for example when big paste was made),
+       to read also socket & co */
+    while (i < 8)
+    {
+        if (gui_key_grab && (gui_key_grab_count > 10))
+            gui_input_grab_end ();
+        
+        key = getch ();
+        insert_ok = 1;
+        
+        if (key == ERR)
+        {
+            if (gui_key_grab && (gui_key_grab_count > 0))
+                gui_input_grab_end ();
+            break;
+        }
+        
+        if (key == KEY_RESIZE)
+        {
+            gui_refresh_screen ();
+            continue;
+        }
+                
+        if (key < 32)
+        {
+            insert_ok = 0;
+            key_str[0] = '^';
+            key_str[1] = (char) key + '@';
+            key_str[2] = '\0';
+        }
+        else if (key == 127)
+        {
+            key_str[0] = '^';
+            key_str[1] = '?';
+            key_str[2] = '\0';
+        }
+        else
+        {
+            if (local_utf8)
+            {
+                /* 1 char: 0vvvvvvv */
+                if (key < 0x80)
+                {
+                    key_str[0] = (char) key;
+                    key_str[1] = '\0';
+                }
+                /* 2 chars: 110vvvvv 10vvvvvv */
+                else if ((key & 0xE0) == 0xC0)
+                {
+                    key_str[0] = (char) key;
+                    key_str[1] = (char) (getch ());
+                    key_str[2] = '\0';
+                }
+                 /* 3 chars: 1110vvvv 10vvvvvv 10vvvvvv */
+                else if ((key & 0xF0) == 0xE0)
+                {
+                    key_str[0] = (char) key;
+                    key_str[1] = (char) (getch ());
+                    key_str[2] = (char) (getch ());
+                    key_str[3] = '\0';
+                }
+                /* 4 chars: 11110vvv 10vvvvvv 10vvvvvv 10vvvvvv */
+                else if ((key & 0xF8) == 0xF0)
+                {
+                    key_str[0] = (char) key;
+                    key_str[1] = (char) (getch ());
+                    key_str[2] = (char) (getch ());
+                    key_str[3] = (char) (getch ());
+                    key_str[4] = '\0';
+                }
+            }
+            else
+            {
+                key_str[0] = (char) key;
+                key_str[1] = '\0';
+            }
+        }
+        
+        if (strcmp (key_str, "^") == 0)
+        {
+            key_str[1] = '^';
+            key_str[2] = '\0';
+        }
+        
+        /*gui_printf (gui_current_window->buffer, "gui_input_read: key = %s (%d)\n", key_str, key);*/
+        
+        if ((gui_key_pressed (key_str) != 0) && (insert_ok))
+        {
+            if (strcmp (key_str, "^^") == 0)
+                key_str[1] = '\0';
+            
+            if (gui_current_window->buffer->dcc)
+                gui_exec_action_dcc (gui_current_window, key_str);
+            else
+            {
+                gui_insert_string_input (gui_current_window, key_str, -1);
+                gui_current_window->buffer->input_buffer_pos += utf8_strlen (key_str);
+                gui_draw_buffer_input (gui_current_window->buffer, 0);
+                gui_current_window->buffer->completion.position = -1;
+            }
+        }
+        
+        i++;
    }
 }

@@ -672,11 +298,18 @@ gui_main_loop ()
    static struct timeval timeout, tv;
    static struct timezone tz;
    t_irc_server *ptr_server;
-    int old_min, old_sec, diff;
+    t_gui_buffer *ptr_buffer;
+    int old_day, old_min, old_sec, diff;
+    char text_time[1024];
    time_t new_time;
    struct tm *local_time;

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

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

 bin_PROGRAMS = weechat-gtk

-weechat_gtk_LDADD = ../../common/lib_weechat_main.a \
+weechat_gtk_LDADD = ../lib_weechat_gui_common.a \
+                    ../../common/lib_weechat_main.a \
                    ../../irc/lib_weechat_irc.a \
                    $(GTK_LIBS) \
                    ../../plugins/lib_weechat_plugins.a $(PLUGINS_LIBS)

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

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

 /* gui-input: user input functions for Gtk GUI */
@@ -0,0 +1,571 @@
+/*
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
+ * See README for License detail, AUTHORS for developers list.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+/* gui-keyboard: keyboard functions (GUI independant) */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "../common/weechat.h"
+#include "gui.h"
+#include "../common/command.h"
+
+
+t_gui_key *gui_keys = NULL;
+t_gui_key *last_gui_key = NULL;
+
+char gui_key_buffer[128];
+int gui_key_grab = 0;
+int gui_key_grab_count = 0;
+
+t_gui_key_function gui_key_functions[] =
+{ { "return",                    gui_action_return,
+    N_("terminate line") },
+  { "tab",                       gui_action_tab,
+    N_("complete word") },
+  { "backspace",                 gui_action_backspace,
+    N_("delete previous char") },
+  { "delete",                    gui_action_delete,
+    N_("delete next char") },
+  { "delete_end_line",           gui_action_delete_end_of_line,
+    N_("delete until end of line") },
+  { "delete_beginning_line",     gui_action_delete_begin_of_line,
+    N_("delete until beginning of line") },
+  { "delete_line",               gui_action_delete_line,
+    N_("delete entire line") },
+  { "delete_previous_word",      gui_action_delete_previous_word,
+    N_("delete previous word") },
+  { "delete_next_word",          gui_action_delete_next_word,
+    N_("delete next word") },
+  { "clipboard_paste",           gui_action_clipboard_paste,
+    N_("paste current clipboard content") },
+  { "transpose_chars",           gui_action_transpose_chars,
+    N_("transpose chars") },
+  { "home",                      gui_action_home,
+    N_("go to beginning of line") },
+  { "end",                       gui_action_end,
+    N_("go to end of line") },
+  { "left",                      gui_action_left,
+    N_("move one char left") },
+  { "previous_word",             gui_action_previous_word,
+    N_("move to previous word") },
+  { "right",                     gui_action_right,
+    N_("move one char right") },
+  { "next_word",                 gui_action_next_word,
+    N_("move to next word") },
+  { "up",                        gui_action_up,
+    N_("call previous command in history") },
+  { "up_global",                 gui_action_up_global,
+    N_("call previous command in global history") },
+  { "down",                      gui_action_down,
+    N_("call next command in history") },
+  { "down_global",               gui_action_down_global,
+    N_("call next command in global history") },
+  { "page_up",                   gui_action_page_up,
+    N_("scroll one page up") },
+  { "page_down",                 gui_action_page_down,
+    N_("scroll one page down") },
+  { "nick_beginning",            gui_action_nick_beginning,
+    N_("display beginning of nicklist") },
+  { "nick_end",                  gui_action_nick_end,
+    N_("display end of nicklist") },
+  { "nick_page_up",              gui_action_nick_page_up,
+    N_("scroll nicklist one page up") },
+  { "nick_page_down",            gui_action_nick_page_down,
+    N_("scroll nicklist one page down") },
+  { "jump_smart",                gui_action_jump_smart,
+    N_("jump to buffer with activity") },
+  { "jump_dcc",                  gui_action_jump_dcc,
+    N_("jump to DCC buffer") },
+  { "jump_last_buffer",          gui_action_jump_last_buffer,
+    N_("jump to last buffer") },
+  { "jump_server",               gui_action_jump_server,
+    N_("jump to server buffer") },
+  { "jump_next_server",          gui_action_jump_next_server,
+    N_("jump to next server") },
+  { "switch_server",             gui_action_switch_server,
+    N_("switch active server on servers buffer") },
+  { "scroll_previous_highlight", gui_action_scroll_previous_highlight,
+    N_("scroll to previous highlight in buffer") },
+  { "scroll_next_highlight",     gui_action_scroll_next_highlight,
+    N_("scroll to next highlight in buffer") },
+  { "scroll_unread",             gui_action_scroll_unread,
+    N_("scroll to first unread line in buffer") },
+  { "hotlist_clear",             gui_action_hotlist_clear,
+    N_("clear hotlist") },
+  { "infobar_clear",             gui_action_infobar_clear,
+    N_("clear infobar") },
+  { "refresh",                   gui_action_refresh_screen,
+    N_("refresh screen") },
+  { "grab_key",                  gui_action_grab_key,
+    N_("grab a key") },
+  { NULL, NULL, NULL }
+};
+
+
+/*
+ * gui_key_init: init keyboard (create default key bindings)
+ */
+
+void
+gui_key_init ()
+{
+    gui_key_buffer[0] = '\0';
+    gui_key_grab = 0;
+    gui_key_grab_count = 0;
+    
+    gui_input_default_key_bindings ();
+}
+
+/*
+ * gui_key_init_show: init "show mode"
+ */
+
+void
+gui_key_init_grab ()
+{
+    gui_key_grab = 1;
+    gui_key_grab_count = 0;
+}
+
+/*
+ * gui_key_get_internal_code: get internal code from user key name
+ *                            for example: return "^R" for "ctrl-R"
+ */
+
+char *
+gui_key_get_internal_code (char *key)
+{
+    char *result;
+    
+    if ((result = (char *) malloc (strlen (key) + 1)))
+    {
+        result[0] = '\0';
+        while (key[0])
+        {
+            if (ascii_strncasecmp (key, "meta2-", 6) == 0)
+            {
+                strcat (result, "^[[");
+                key += 6;
+            }
+            if (ascii_strncasecmp (key, "meta-", 5) == 0)
+            {
+                strcat (result, "^[");
+                key += 5;
+            }
+            else if (ascii_strncasecmp (key, "ctrl-", 5) == 0)
+            {
+                strcat (result, "^");
+                key += 5;
+            }
+            else
+            {
+                strncat (result, key, 1);
+                key++;
+            }
+        }
+    }
+    else
+        return NULL;
+
+    return result;
+}
+
+/*
+ * gui_key_get_expanded_name: get expanded name from internal key code
+ *                            for example: return "ctrl-R" for "^R"
+ */
+
+char *
+gui_key_get_expanded_name (char *key)
+{
+    char *result;
+    
+    if ((result = (char *) malloc ((strlen (key) * 5) + 1)))
+    {
+        result[0] = '\0';
+        while (key[0])
+        {
+            if (ascii_strncasecmp (key, "^[[", 3) == 0)
+            {
+                strcat (result, "meta2-");
+                key += 3;
+            }
+            if (ascii_strncasecmp (key, "^[", 2) == 0)
+            {
+                strcat (result, "meta-");
+                key += 2;
+            }
+            else if ((key[0] == '^') && (key[1]))
+            {
+                strcat (result, "ctrl-");
+                key++;
+            }
+            else
+            {
+                strncat (result, key, 1);
+                key++;
+            }
+        }
+    }
+    else
+        return NULL;
+
+    return result;
+}
+
+/*
+ * gui_key_find_pos: find position for a key (for sorting keys list)
+ */
+
+t_gui_key *
+gui_key_find_pos (t_gui_key *key)
+{
+    t_gui_key *ptr_key;
+    
+    for (ptr_key = gui_keys; ptr_key; ptr_key = ptr_key->next_key)
+    {
+        if (ascii_strcasecmp (key->key, ptr_key->key) < 0)
+            return ptr_key;
+    }
+    return NULL;
+}
+
+/*
+ * gui_key_insert_sorted: insert key into sorted list
+ */
+
+void
+gui_key_insert_sorted (t_gui_key *key)
+{
+    t_gui_key *pos_key;
+    
+    if (gui_keys)
+    {
+        pos_key = gui_key_find_pos (key);
+        
+        if (pos_key)
+        {
+            /* insert key into the list (before key found) */
+            key->prev_key = pos_key->prev_key;
+            key->next_key = pos_key;
+            if (pos_key->prev_key)
+                pos_key->prev_key->next_key = key;
+            else
+                gui_keys = key;
+            pos_key->prev_key = key;
+        }
+        else
+        {
+            /* add key to the end */
+            key->prev_key = last_gui_key;
+            key->next_key = NULL;
+            last_gui_key->next_key = key;
+            last_gui_key = key;
+        }
+    }
+    else
+    {
+        key->prev_key = NULL;
+        key->next_key = NULL;
+        gui_keys = key;
+        last_gui_key = key;
+    }
+}
+
+/*
+ * gui_key_new: add a new key in keys list
+ */
+
+t_gui_key *
+gui_key_new (char *key, char *command, void *function)
+{
+    t_gui_key *new_key;
+    char *internal_code;
+    
+    if ((new_key = (t_gui_key *) malloc (sizeof (t_gui_key))))
+    {
+        internal_code = gui_key_get_internal_code (key);
+        new_key->key = (internal_code) ? strdup (internal_code) : strdup (key);
+        if (internal_code)
+            free (internal_code);
+        new_key->command = (command) ? strdup (command) : NULL;
+        new_key->function = function;
+        gui_key_insert_sorted (new_key);
+    }
+    else
+        return NULL;
+    
+    return new_key;
+}
+
+/*
+ * gui_key_search: search a key
+ */
+
+t_gui_key *
+gui_key_search (char *key)
+{
+    t_gui_key *ptr_key;
+
+    for (ptr_key = gui_keys; ptr_key; ptr_key = ptr_key->next_key)
+    {
+        if (ascii_strcasecmp (ptr_key->key, key) == 0)
+            return ptr_key;
+    }
+    
+    /* key not found */
+    return NULL;
+}
+
+/*
+ * gui_key_cmp: compares 2 keys
+ */
+
+int
+gui_key_cmp (char *key, char *search)
+{
+    while (search[0])
+    {
+        if (toupper(key[0]) != toupper(search[0]))
+            return search[0] - key[0];
+        key++;
+        search++;
+    }
+    
+    return 0;
+}
+
+/*
+ * gui_key_search_part: search a key (maybe part of string)
+ */
+
+t_gui_key *
+gui_key_search_part (char *key)
+{
+    t_gui_key *ptr_key;
+    
+    for (ptr_key = gui_keys; ptr_key; ptr_key = ptr_key->next_key)
+    {
+        if (gui_key_cmp (ptr_key->key, key) == 0)
+            return ptr_key;
+    }
+    
+    /* key not found */
+    return NULL;
+}
+
+/*
+ * gui_key_function_search_by_name: search a function by name
+ */
+
+void *
+gui_key_function_search_by_name (char *name)
+{
+    int i;
+    
+    i = 0;
+    while (gui_key_functions[i].function_name)
+    {
+        if (ascii_strcasecmp (gui_key_functions[i].function_name, name) == 0)
+            return gui_key_functions[i].function;
+        i++;
+    }
+
+    /* function not found */
+    return NULL;
+}
+
+/*
+ * gui_key_function_search_by_ptr: search a function by pointer
+ */
+
+char *
+gui_key_function_search_by_ptr (void *function)
+{
+    int i;
+    
+    i = 0;
+    while (gui_key_functions[i].function_name)
+    {
+        if (gui_key_functions[i].function == function)
+            return gui_key_functions[i].function_name;
+        i++;
+    }
+
+    /* function not found */
+    return NULL;
+}
+
+/*
+ * gui_key_bind: bind a key to a function (command or special function)
+ */
+
+t_gui_key *
+gui_key_bind (char *key, char *command)
+{
+    t_gui_key_function *ptr_function;
+    t_gui_key *new_key;
+    
+    if (!key || !command)
+    {
+        weechat_log_printf (_("%s unable to bind key \"%s\"\n"),
+                            WEECHAT_ERROR, key);
+        return NULL;
+    }
+    
+    ptr_function = NULL;
+    if (command[0] != '/')
+    {
+        ptr_function = gui_key_function_search_by_name (command);
+        if (!ptr_function)
+        {
+            weechat_log_printf (_("%s unable to bind key \"%s\" (invalid function name: \"%s\")\n"),
+                                WEECHAT_ERROR, key, command);
+            return NULL;
+        }
+    }
+    
+    gui_key_unbind (key);
+    
+    new_key = gui_key_new (key,
+                           (ptr_function) ? NULL : command,
+                           ptr_function);
+    if (!new_key)
+    {
+        weechat_log_printf (_("%s not enough memory for key binding\n"),
+                            WEECHAT_ERROR);
+        return NULL;
+    }
+    
+    return new_key;
+}
+
+/*
+ * gui_key_unbind: remove a key binding
+ */
+
+int
+gui_key_unbind (char *key)
+{
+    t_gui_key *ptr_key;
+    char *internal_code;
+    
+    internal_code = gui_key_get_internal_code (key);
+    
+    ptr_key = gui_key_search ((internal_code) ? internal_code : key);
+    if (ptr_key)
+        gui_key_free (ptr_key);
+    
+    if (internal_code)
+        free (internal_code);
+    
+    return (ptr_key != NULL);
+}
+
+/*
+ * gui_key_pressed: treat new key pressed
+ *                  return: 1 if key should be added to input buffer
+ *                          0 otherwise
+ */
+
+int
+gui_key_pressed (char *key_str)
+{
+    int first_key;
+    t_gui_key *ptr_key;
+
+    /* add key to buffer */
+    first_key = (gui_key_buffer[0] == '\0');
+    strcat (gui_key_buffer, key_str);
+    
+    /* if we are in "show mode", increase counter and return */
+    if (gui_key_grab)
+    {
+        gui_key_grab_count++;
+        return 0;
+    }
+    
+    /* look for key combo in key table */
+    ptr_key = gui_key_search_part (gui_key_buffer);
+    if (ptr_key)
+    {
+        if (ascii_strcasecmp (ptr_key->key, gui_key_buffer) == 0)
+        {
+            /* exact combo found => execute function or command */
+            gui_key_buffer[0] = '\0';
+            if (ptr_key->command)
+                user_command (gui_current_window->buffer,
+                              SERVER(gui_current_window->buffer),
+                              ptr_key->command);
+            else
+                (void)(ptr_key->function)(gui_current_window);
+        }
+        return 0;
+    }
+    
+    gui_key_buffer[0] = '\0';
+
+    /* if this is first key and not found (even partial) => return 1
+       else return 0 (= silently discard sequence of bad keys) */
+    return first_key;
+}
+
+/*
+ * key_free: delete a key binding
+ */
+
+void
+gui_key_free (t_gui_key *key)
+{
+    /* free memory */
+    if (key->key)
+        free (key->key);
+    if (key->command)
+        free (key->command);
+    
+    /* remove key from keys list */
+    if (key->prev_key)
+        key->prev_key->next_key = key->next_key;
+    if (key->next_key)
+        key->next_key->prev_key = key->prev_key;
+    if (gui_keys == key)
+        gui_keys = key->next_key;
+    if (last_gui_key == key)
+        last_gui_key = key->prev_key;
+    
+    free (key);
+}
+
+/*
+ * gui_key_free_all: delete all key bindings
+ */
+
+void
+gui_key_free_all ()
+{
+    while (gui_keys)
+        gui_key_free (gui_keys);
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */


@@ -26,56 +26,125 @@

 #define INPUT_BUFFER_BLOCK_SIZE 256

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

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

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

 #define MSG_TYPE_TIME      1
 #define MSG_TYPE_PREFIX    2
@@ -85,50 +154,36 @@
 #define MSG_TYPE_HIGHLIGHT 32
 #define MSG_TYPE_NOLOG     64

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

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

 #define gui_printf_nolog(buffer, fmt, argz...) \
-    gui_printf_type_color(buffer, MSG_TYPE_INFO | MSG_TYPE_NOLOG, -1, fmt, ##argz)
+    gui_printf_internal(buffer, 1, MSG_TYPE_INFO | MSG_TYPE_NOLOG, fmt, ##argz)

-typedef struct t_gui_message t_gui_message;
+#define gui_printf_nolog_notime(buffer, fmt, argz...) \
+    gui_printf_internal(buffer, 0, MSG_TYPE_NOLOG, fmt, ##argz)

-struct t_gui_message
-{
-    int type;                       /* type of message (time, nick, other)  */
-    int color;                      /* color of message                     */
-    char *message;                  /* message content                      */
-    t_gui_message *prev_message;    /* link to previous message for line    */
-    t_gui_message *next_message;    /* link to next message for line        */
-};
+#define WINDOW_MIN_WIDTH        10
+#define WINDOW_MIN_HEIGHT       5

-typedef struct t_gui_line t_gui_line;
+#define NOTIFY_LEVEL_MIN        0
+#define NOTIFY_LEVEL_MAX        3
+#define NOTIFY_LEVEL_DEFAULT    NOTIFY_LEVEL_MAX

-struct t_gui_line
-{
-    int length;                     /* length of the line (in char)         */
-    int length_align;               /* alignment length (time or time/nick) */
-    int log_write;                  /* = 1 if line will be written to log   */
-    int line_with_message;          /* line contains a message from a user? */
-    int line_with_highlight;        /* line contains highlight              */
-    t_gui_message *messages;        /* messages for the line                */
-    t_gui_message *last_message;    /* last message of the line             */
-    t_gui_line *prev_line;          /* link to previous line                */
-    t_gui_line *next_line;          /* link to next line                    */
-};
+#define KEY_SHOW_MODE_DISPLAY   1
+#define KEY_SHOW_MODE_BIND      2

 typedef struct t_gui_color t_gui_color;

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

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

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

 struct t_gui_buffer
@@ -153,12 +223,14 @@ struct t_gui_buffer
    
    /* server/channel */
    void *server;                   /* buffer's server                      */
+    int all_servers;                /* =1 if all servers are displayed here */
    void *channel;                  /* buffer's channel                     */
    int dcc;                        /* buffer is dcc status                 */
    
    /* chat content (lines, line is composed by many messages) */
    t_gui_line *lines;              /* lines of chat window                 */
    t_gui_line *last_line;          /* last line of chat window             */
+    t_gui_line *last_read_line;     /* last read line before jump           */
    int num_lines;                  /* number of lines in the window        */
    int line_complete;              /* current line complete ? (\n ending)  */
    
@@ -173,9 +245,11 @@ struct t_gui_buffer
    FILE *log_file;                 /* for logging buffer to file           */
    
    /* inupt buffer */
+    int has_input;                  /* = 1 if buffer has input (DCC has not)*/
    char *input_buffer;             /* input buffer                         */
    int input_buffer_alloc;         /* input buffer: allocated size in mem  */
-    int input_buffer_size;          /* buffer size (user input length)      */
+    int input_buffer_size;          /* buffer size in bytes                 */
+    int input_buffer_length;        /* number of chars in buffer            */
    int input_buffer_pos;           /* position into buffer                 */
    int input_buffer_1st_display;   /* first char displayed on screen       */
    
@@ -193,6 +267,7 @@ struct t_gui_buffer
    t_gui_buffer *next_buffer;      /* link to next buffer                  */
 };

+typedef struct t_gui_window_tree t_gui_window_tree;
 typedef struct t_gui_window t_gui_window;

 struct t_gui_window
@@ -200,6 +275,11 @@ struct t_gui_window
    /* global position & size */
    int win_x, win_y;               /* position of window                   */
    int win_width, win_height;      /* window geometry                      */
+    int win_width_pct;              /* % of width (compared to term size)   */
+    int win_height_pct;             /* % of height (compared to term size)  */
+    
+    int new_x, new_y;               /* used for computing new position      */
+    int new_width, new_height;      /* used for computing new size          */
    
    /* chat window settings */
    int win_chat_x, win_chat_y;     /* chat window position                 */
@@ -209,9 +289,13 @@ struct t_gui_window
    int win_chat_cursor_y;          /* position of cursor in chat window    */
    
    /* nicklist window settings */
-    int win_nick_x, win_nick_y;     /* chat window position                 */
-    int win_nick_width;             /* width of chat window                 */
-    int win_nick_height;            /* height of chat window                */
+    int win_nick_x, win_nick_y;     /* nick window position                 */
+    int win_nick_width;             /* width of nick window                 */
+    int win_nick_height;            /* height of nick window                */
+    int win_nick_start;             /* # of 1st nick for display (scroll)   */
+    
+    /* input window settings */
+    int win_input_x;                /* position of cursor in input window   */
    
    /* windows for Curses GUI */
    void *win_title;                /* title window                         */
@@ -232,6 +316,11 @@ struct t_gui_window
    /* windows for Qt GUI */
    /* TODO: declare Qt window */
    
+    int current_style_fg;;          /* current color used for foreground    */
+    int current_style_bg;;          /* current color used for background    */
+    int current_style_attr;         /* current attributes (bold, ..)        */
+    int current_color_attr;         /* attr sum of last color(s) displayed  */
+    
    /* DCC */
    void *dcc_first;                /* first dcc displayed                  */
    void *dcc_selected;             /* selected dcc                         */
@@ -240,27 +329,81 @@ struct t_gui_window
    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 */
+    t_gui_line *start_line;         /* pointer to line if scrolling         */
+    int start_line_pos;             /* position in first line displayed     */
+    int scroll;                     /* = 1 if "MORE" should be displayed    */
+    t_gui_window_tree *ptr_tree;    /* pointer to leaf in windows tree      */
    
    t_gui_window *prev_window;      /* link to previous window              */
    t_gui_window *next_window;      /* link to next window                  */
 };

+struct t_gui_window_tree
+{
+    t_gui_window_tree *parent_node; /* pointer to parent node               */
+    
+    /* node info */
+    int split_horiz;                /* 1 if horizontal, 0 if vertical       */
+    int split_pct;                  /* % of split size (represents child1)  */
+    t_gui_window_tree *child1;      /* first child, NULL if a leaf          */
+    t_gui_window_tree *child2;      /* second child, NULL if a leaf         */
+    
+    /* leaf info */
+    t_gui_window *window;           /* pointer to window, NULL if a node    */
+};
+
+typedef struct t_gui_key t_gui_key;
+
+struct t_gui_key
+{
+    char *key;                      /* key combo (ex: a, ^W, ^W^C, meta-a)  */
+    char *command;                  /* associated command (may be NULL)     */
+    void (*function)(t_gui_window *);
+                                    /* associated function (if cmd is NULL) */
+    t_gui_key *prev_key;            /* link to previous key                 */
+    t_gui_key *next_key;            /* link to next key                     */
+};
+
+typedef struct t_gui_key_function t_gui_key_function;
+
+struct t_gui_key_function
+{
+    char *function_name;            /* name of function                     */
+    void (*function)();             /* associated function                  */
+    char *description;              /* description of function              */
+};
+
 /* variables */

 extern int gui_init_ok;
 extern int gui_ok;
+extern int gui_add_hotlist;
 extern t_gui_window *gui_windows;
 extern t_gui_window *last_gui_window;
 extern t_gui_window *gui_current_window;
+extern t_gui_window_tree *gui_windows_tree;
 extern t_gui_buffer *gui_buffers;
 extern t_gui_buffer *last_gui_buffer;
 extern t_gui_buffer *buffer_before_dcc;
 extern t_gui_infobar *gui_infobar;
+extern t_gui_key *gui_keys;
+extern t_gui_key *last_gui_key;
+extern t_gui_key_function gui_key_functions[];
+extern char gui_key_buffer[128];
+extern int gui_key_grab;
+extern int gui_key_grab_count;
+extern char *gui_input_clipboard;

-/* GUI independent functions */
+extern t_gui_color *gui_color[NUM_COLORS];

-extern t_gui_window *gui_window_new (int, int, int, int);
+/* GUI independent functions: windows & buffers */
+
+extern int gui_window_tree_init (t_gui_window *);
+extern void gui_window_tree_node_to_leaf (t_gui_window_tree *, t_gui_window *);
+extern void gui_window_tree_free (t_gui_window_tree **);
+extern t_gui_window *gui_window_new (t_gui_window *, int, int, int, int, int, int);
+extern t_gui_buffer *gui_buffer_search (char *, char *);
+extern t_gui_window *gui_buffer_find_window (t_gui_buffer *);
 extern t_gui_buffer *gui_buffer_new (t_gui_window *, void *, void *, int, int);
 extern void gui_buffer_clear (t_gui_buffer *);
 extern void gui_buffer_clear_all ();
@@ -268,57 +411,131 @@ extern void gui_infobar_printf (int, int, char *, ...);
 extern void gui_window_free (t_gui_window *);
 extern void gui_infobar_remove ();
 extern void gui_buffer_free (t_gui_buffer *, int);
-extern t_gui_line *gui_new_line (t_gui_buffer *);
-extern t_gui_message *gui_new_message (t_gui_buffer *);
+extern t_gui_line *gui_line_new (t_gui_buffer *);
+extern int gui_word_strlen (t_gui_window *, char *);
+extern int gui_word_real_pos (t_gui_window *, char *, int);
+extern void gui_printf_internal (t_gui_buffer *, int, int, char *, ...);
 extern void gui_optimize_input_buffer_size (t_gui_buffer *);
-extern void gui_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);
+extern void gui_exec_action_dcc (t_gui_window *, char *);
+extern int gui_insert_string_input (t_gui_window *, char *, int);
+extern void gui_merge_servers (t_gui_window *);
+extern void gui_split_server (t_gui_window *);
+extern void gui_window_switch_server (t_gui_window *);
+extern void gui_buffer_switch_previous (t_gui_window *);
+extern void gui_buffer_switch_next (t_gui_window *);
+extern void gui_window_switch_previous (t_gui_window *);
+extern void gui_window_switch_next (t_gui_window *);
+extern void gui_window_switch_by_buffer (t_gui_window *, int);
+extern void gui_buffer_switch_dcc (t_gui_window *);
+extern t_gui_buffer *gui_buffer_switch_by_number (t_gui_window *, int);
+extern void gui_buffer_move_to_number (t_gui_window *, int);
 extern void gui_window_print_log (t_gui_window *);
 extern void gui_buffer_print_log (t_gui_buffer *);

-/* GUI dependant functions */
+/* GUI independent functions: actions */
+
+extern void gui_action_clipboard_copy (char *, int);
+extern void gui_action_clipboard_paste (t_gui_window *);
+extern void gui_action_return (t_gui_window *);
+extern void gui_action_tab (t_gui_window *);
+extern void gui_action_backspace (t_gui_window *);
+extern void gui_action_delete (t_gui_window *);
+extern void gui_action_delete_previous_word (t_gui_window *);
+extern void gui_action_delete_next_word (t_gui_window *);
+extern void gui_action_delete_begin_of_line (t_gui_window *);
+extern void gui_action_delete_end_of_line (t_gui_window *);
+extern void gui_action_delete_line (t_gui_window *);
+extern void gui_action_transpose_chars (t_gui_window *);
+extern void gui_action_home (t_gui_window *);
+extern void gui_action_end (t_gui_window *);
+extern void gui_action_left (t_gui_window *);
+extern void gui_action_previous_word (t_gui_window *);
+extern void gui_action_right (t_gui_window *);
+extern void gui_action_next_word (t_gui_window *);
+extern void gui_action_up (t_gui_window *);
+extern void gui_action_up_global (t_gui_window *);
+extern void gui_action_down (t_gui_window *);
+extern void gui_action_down_global (t_gui_window *);
+extern void gui_action_page_up (t_gui_window *);
+extern void gui_action_page_down (t_gui_window *);
+extern void gui_action_nick_beginning (t_gui_window *);
+extern void gui_action_nick_end (t_gui_window *);
+extern void gui_action_nick_page_up (t_gui_window *);
+extern void gui_action_nick_page_down (t_gui_window *);
+extern void gui_action_jump_smart (t_gui_window *);
+extern void gui_action_jump_dcc (t_gui_window *);
+extern void gui_action_jump_last_buffer (t_gui_window *);
+extern void gui_action_jump_server (t_gui_window *);
+extern void gui_action_jump_next_server (t_gui_window *);
+extern void gui_action_switch_server (t_gui_window *);
+extern void gui_action_scroll_previous_highlight (t_gui_window *);
+extern void gui_action_scroll_next_highlight (t_gui_window *);
+extern void gui_action_scroll_unread (t_gui_window *);
+extern void gui_action_hotlist_clear (t_gui_window *);
+extern void gui_action_infobar_clear (t_gui_window *);
+extern void gui_action_refresh_screen ();
+extern void gui_action_grab_key (t_gui_window *);
+
+/* GUI independent functions: keys */
+
+extern void gui_key_init ();
+extern void gui_key_init_grab ();
+extern char *gui_key_get_internal_code (char *);
+extern char *gui_key_get_expanded_name (char *);
+extern void *gui_key_function_search_by_name (char *);
+extern char *gui_key_function_search_by_ptr (void *);
+extern t_gui_key *gui_key_bind (char *, char *);
+extern int gui_key_unbind (char *);
+extern int gui_key_pressed (char *);
+extern void gui_key_free (t_gui_key *);
+extern void gui_key_free_all ();
+
+/* GUI dependant functions: display */

 extern int gui_assign_color (int *, char *);
-extern int gui_get_color_by_name (char *);
-extern char *gui_get_color_by_value (int);
+extern char *gui_get_color_name (int);
+extern unsigned char *gui_color_decode (unsigned char *, int);
+extern unsigned char *gui_color_decode_for_user_entry (unsigned char *);
+extern unsigned char *gui_color_encode (unsigned char *);
 extern int gui_buffer_has_nicklist (t_gui_buffer *);
 extern void gui_calculate_pos_size (t_gui_window *);
 extern void gui_draw_buffer_title (t_gui_buffer *, int);
+extern char *gui_word_get_next_char (t_gui_window *, unsigned char *, int);
 extern void gui_draw_buffer_chat (t_gui_buffer *, int);
 extern void gui_draw_buffer_nick (t_gui_buffer *, int);
 extern void gui_draw_buffer_status (t_gui_buffer *, int);
+extern void gui_draw_buffer_infobar_time (t_gui_buffer *);
 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_previous_window (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 t_gui_buffer *gui_get_dcc_buffer (t_gui_window *);
+extern void gui_window_page_up (t_gui_window *);
+extern void gui_window_page_down (t_gui_window *);
+extern void gui_window_nick_beginning (t_gui_window *);
+extern void gui_window_nick_end (t_gui_window *);
+extern void gui_window_nick_page_up (t_gui_window *);
+extern void gui_window_nick_page_down (t_gui_window *);
 extern void gui_window_init_subwindows (t_gui_window *);
-extern void gui_window_split_horiz (t_gui_window *);
-extern void gui_window_split_vertic (t_gui_window *);
-extern int gui_window_merge_up (t_gui_window *);
-extern int gui_window_merge_down (t_gui_window *);
-extern int gui_window_merge_left (t_gui_window *);
-extern int gui_window_merge_right (t_gui_window *);
-extern void gui_window_merge_auto (t_gui_window *);
+extern void gui_refresh_windows ();
+extern void gui_window_split_horiz (t_gui_window *, int);
+extern void gui_window_split_vertic (t_gui_window *, int);
+extern void gui_window_resize (t_gui_window *, int);
+extern int gui_window_merge (t_gui_window *);
 extern void gui_window_merge_all (t_gui_window *);
+extern void gui_window_switch_up (t_gui_window *);
+extern void gui_window_switch_down (t_gui_window *);
+extern void gui_window_switch_left (t_gui_window *);
+extern void gui_window_switch_right (t_gui_window *);
+extern void gui_refresh_screen ();
 extern void gui_pre_init (int *, char **[]);
-extern void gui_init_colors ();
+extern void gui_init_color_pairs ();
+extern void gui_rebuild_weechat_colors ();
 extern void gui_set_window_title ();
+extern void gui_reset_window_title ();
 extern void gui_init ();
 extern void gui_end ();
-extern void gui_printf_type_color (/*@null@*/ t_gui_buffer *, int, int, char *, ...);
+extern void gui_input_default_key_bindings ();
 extern void gui_main_loop ();

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


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


@@ -0,0 +1,28 @@
+# Copyright (c) 2003-2006 FlashCode <flashcode@flashtux.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+
+INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\"
+
+bin_PROGRAMS = weechat-wxwidgets
+
+weechat_wxwidgets_LDADD = ../lib_weechat_gui_common.a \
+                       ../../common/lib_weechat_main.a \
+                       ../../irc/lib_weechat_irc.a \
+                       ../../plugins/lib_weechat_plugins.a $(PLUGINS_LIBS)
+
+weechat_wxwidgets_SOURCES = gui-display.c \
+			             gui-input.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,21 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

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

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

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

 noinst_LIBRARIES = lib_weechat_irc.a

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

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

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


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

 t_irc_channel *
-channel_new (t_irc_server *server, int channel_type, char *channel_name,
-             int switch_to_buffer)
+channel_new (t_irc_server *server, int channel_type, char *channel_name)
 {
    t_irc_channel *new_channel;
    
@@ -57,8 +59,9 @@ channel_new (t_irc_server *server, int channel_type, char *channel_name,
    new_channel->dcc_chat = NULL;
    new_channel->name = strdup (channel_name);
    new_channel->topic = NULL;
-    memset (new_channel->modes, ' ', sizeof (new_channel->modes));
-    new_channel->modes[sizeof (new_channel->modes) - 1] = '\0';
+    new_channel->modes = (char *) malloc (NUM_CHANNEL_MODES + 1);
+    memset (new_channel->modes, ' ', NUM_CHANNEL_MODES);
+    new_channel->modes[NUM_CHANNEL_MODES] = '\0';
    new_channel->limit = 0;
    new_channel->key = NULL;
    new_channel->nicks_count = 0;
@@ -74,8 +77,6 @@ channel_new (t_irc_server *server, int channel_type, char *channel_name,
    else
        server->channels = new_channel;
    server->last_channel = new_channel;
-
-    gui_buffer_new (gui_current_window, server, new_channel, 0, switch_to_buffer);
    
    /* all is ok, return address of new channel */
    return new_channel;
@@ -89,7 +90,15 @@ void
 channel_free (t_irc_server *server, t_irc_channel *channel)
 {
    t_irc_channel *new_channels;
-
+    
+    /* close DCC CHAT */
+    if ((t_irc_dcc *)(channel->dcc_chat) &&
+        (!DCC_ENDED(((t_irc_dcc *)(channel->dcc_chat))->status)))
+    {
+        dcc_close ((t_irc_dcc *)(channel->dcc_chat), DCC_ABORTED);
+        dcc_redraw (1);
+    }
+    
    /* remove channel from queue */
    if (server->last_channel == channel)
        server->last_channel = channel->prev_channel;
@@ -103,14 +112,6 @@ channel_free (t_irc_server *server, t_irc_channel *channel)
    
    if (channel->next_channel)
        (channel->next_channel)->prev_channel = channel->prev_channel;
-
-    /* close DCC CHAT */
-    if ((t_irc_dcc *)(channel->dcc_chat) &&
-        (!DCC_ENDED(((t_irc_dcc *)(channel->dcc_chat))->status)))
-    {
-        dcc_close ((t_irc_dcc *)(channel->dcc_chat), DCC_ABORTED);
-        dcc_redraw (1);
-    }
    
    /* free data */
    if (channel->name)
@@ -142,11 +143,14 @@ t_irc_channel *
 channel_search (t_irc_server *server, char *channel_name)
 {
    t_irc_channel *ptr_channel;
-                    
+    
+    if (!server || !channel_name)
+        return NULL;
+    
    for (ptr_channel = server->channels; ptr_channel;
         ptr_channel = ptr_channel->next_channel)
    {
-        if (strcasecmp (ptr_channel->name, channel_name) == 0)
+        if (ascii_strcasecmp (ptr_channel->name, channel_name) == 0)
            return ptr_channel;
    }
    return NULL;
@@ -161,11 +165,151 @@ string_is_channel (char *string)
 {
    char first_char[2];
    
+    if (!string)
+        return 0;
+    
    first_char[0] = string[0];
    first_char[1] = '\0';
    return (strpbrk (first_char, CHANNEL_PREFIX)) ? 1 : 0;    
 }

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

+/*
+ * channel_get_notify_level: get channel notify level
+ */
+
+int
+channel_get_notify_level (t_irc_server *server, t_irc_channel *channel)
+{
+    char *name, *pos, *pos2, notify;
+    
+    if ((!server) || (!channel))
+        return NOTIFY_LEVEL_DEFAULT;
+    
+    if ((!server->notify_levels) || (!server->notify_levels[0]))
+        return NOTIFY_LEVEL_DEFAULT;
+    
+    name = (char *) malloc (strlen (channel->name) + 2);
+    strcpy (name, channel->name);
+    strcat (name, ":");
+    pos = strstr (server->notify_levels, name);
+    free (name);
+    if (!pos)
+        return NOTIFY_LEVEL_DEFAULT;
+    
+    pos2 = pos + strlen (channel->name);
+    if (pos2[0] != ':')
+        return NOTIFY_LEVEL_DEFAULT;
+    pos2++;
+    if (!pos2[0])
+        return NOTIFY_LEVEL_DEFAULT;
+    
+    notify = (int)(pos2[0] - '0');
+    if ((notify < NOTIFY_LEVEL_MIN) || (notify > NOTIFY_LEVEL_MAX))
+        return NOTIFY_LEVEL_DEFAULT;
+    else
+        return notify;
+}
+
+/*
+ * server_set_notify_level: set channel notify level
+ */
+
+void
+channel_set_notify_level (t_irc_server *server, t_irc_channel *channel, int notify)
+{
+    char level_string[2];
+    
+    if ((!server) || (!channel))
+        return;
+    
+    if (notify == NOTIFY_LEVEL_DEFAULT)
+        config_option_list_remove (&(server->notify_levels), channel->name);
+    else
+    {
+        level_string[0] = notify + '0';
+        level_string[1] = '\0';
+        config_option_list_set (&(server->notify_levels), channel->name, level_string);
+    }
+}
+
 /*
 * channel_print_log: print channel infos in log (usually for crash dump)
 */
@@ -269,17 +473,17 @@ channel_remove_dcc (t_irc_dcc *ptr_dcc)
 void
 channel_print_log (t_irc_channel *channel)
 {
-    wee_log_printf ("=> channel %s (addr:0x%X)]\n", channel->name, channel);
-    wee_log_printf ("     type . . . . : %d\n",     channel->type);
-    wee_log_printf ("     dcc_chat . . : 0x%X\n",   channel->dcc_chat);
-    wee_log_printf ("     topic. . . . : '%s'\n",   channel->topic);
-    wee_log_printf ("     modes. . . . : '%s'\n",   channel->modes);
-    wee_log_printf ("     limit. . . . : %d\n",     channel->limit);
-    wee_log_printf ("     key. . . . . : '%s'\n",   channel->key);
-    wee_log_printf ("     checking_away: %d\n",     channel->checking_away);
-    wee_log_printf ("     nicks. . . . : 0x%X\n",   channel->nicks);
-    wee_log_printf ("     last_nick. . : 0x%X\n",   channel->last_nick);
-    wee_log_printf ("     buffer . . . : 0x%X\n",   channel->buffer);
-    wee_log_printf ("     prev_channel : 0x%X\n",   channel->prev_channel);
-    wee_log_printf ("     next_channel : 0x%X\n",   channel->next_channel);
+    weechat_log_printf ("=> channel %s (addr:0x%X)]\n", channel->name, channel);
+    weechat_log_printf ("     type . . . . : %d\n",     channel->type);
+    weechat_log_printf ("     dcc_chat . . : 0x%X\n",   channel->dcc_chat);
+    weechat_log_printf ("     topic. . . . : '%s'\n",   channel->topic);
+    weechat_log_printf ("     modes. . . . : '%s'\n",   channel->modes);
+    weechat_log_printf ("     limit. . . . : %d\n",     channel->limit);
+    weechat_log_printf ("     key. . . . . : '%s'\n",   channel->key);
+    weechat_log_printf ("     checking_away: %d\n",     channel->checking_away);
+    weechat_log_printf ("     nicks. . . . : 0x%X\n",   channel->nicks);
+    weechat_log_printf ("     last_nick. . : 0x%X\n",   channel->last_nick);
+    weechat_log_printf ("     buffer . . . : 0x%X\n",   channel->buffer);
+    weechat_log_printf ("     prev_channel : 0x%X\n",   channel->prev_channel);
+    weechat_log_printf ("     next_channel : 0x%X\n",   channel->next_channel);
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2006 by FlashCode <flashcode@flashtux.org>
 * See README for License detail, AUTHORS for developers list.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

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