Version 0.1.2

- function "print_with_channel" was removed
- function "command" now runs weechat command or send text to channel
- Perl functions are now called with weechat::name (instead of IRC::name)
- IRC::xxx functions are still active for compatibility with old scripts

ABOUT-NLS

@@ -0,0 +1,986 @@
+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 April
+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       |                         []    [] []             |
+     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  4  0 41 43  3 52 90 20  1  15
+
+                          eo es et eu fa fi fr  ga gl he hr hu id is it
+                        +-----------------------------------------------+
+     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       |    []             []  []          [] []       |
+     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 hr hu id is it
+                          13 85 21 15  2 35 115 45 17  8  6 40 27  1 45
+
+                          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       |                                  []           |
+     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               |                                  []           |
+                        +-----------------------------------------------+
+                          ja ko ku lg lt lv mk mn ms mt nb nl nn no nso
+                          33 11  1  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 ta
+                        +-------------------------------------------------+
+     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       |          []  []      []       []       [] []    |
+     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 ta
+                           1  0 48 30  58    6 79 71  5 45 13 12 50 86  0
+
+                          tg th tk tr uk ven vi wa xh zh_CN zh_TW zu
+                        +--------------------------------------------+
+     GNUnet             |                                            |  0
+     a2ps               |          [] []     []                      | 19
+     aegis              |                                            |  0
+     ant-phone          |          []                                |  4
+     anubis             |          []                                |  9
+     ap-utils           |             ()                             |  1
+     aspell             |             []     [] []                   | 13
+     bash               |                                            | 10
+     batchelor          |          []        []                      |  7
+     bfd                |                                            |  1
+     bibshelf           |                    []                      |  5
+     binutils           |          []                                |  6
+     bison              |          []                                | 17
+     bluez-pin          |          [] []     [] []     []            | 24
+     clisp              |                                            |  7
+     console-tools      |          []                                |  4
+     coreutils          |          []                                | 16
+     cpio               |          []        []                      |  6
+     cpplib             |          []        []                      |  7
+     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              |                                            |  4
+     gcal               |          []                                |  5
+     gcc                |          []                                |  3
+     gettext-examples   |          [] []     []        []            | 20
+     gettext-runtime    |          [] []     []        []    []      | 25
+     gettext-tools      |          [] []               []            | 17
+     gimp-print         |             []                             | 11
+     gip                |                    []                      |  8
+     gliv               |          []                                |  6
+     glunarclock        |                    [] []                   | 13
+     gmult              |          []        []        []            | 13
+     gnubiff            |                    []                      |  3
+     gnucash            |          ()                        []      | 10
+     gnucash-glossary   |                                    []      |  8
+     gpe-aerial         |                    []        []            | 13
+     gpe-beam           |                    []        []            | 13
+     gpe-calendar       |                    [] []     []    []      | 18
+     gpe-clock          |          []        [] []     []            | 17
+     gpe-conf           |                    []        []            | 12
+     gpe-contacts       |                    []        []            |  6
+     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           |                    [] []           []      | 16
+     gphoto2            |             []               []            | 17
+     gprof              |          []        []                      | 10
+     gpsdrive           |                                            |  2
+     gramadoir          |                    []                      |  6
+     grep               |          [] []     []              []      | 32
+     gretl              |                                            |  4
+     gsasl              |                    []        []            | 12
+     gss                |                    []                      |  5
+     gst-plugins        |             []     []                      | 16
+     gstreamer          |          [] []     []                      | 14
+     gtick              |                    []                      | 11
+     gtkspell           |                    [] []     []            | 20
+     hello              |          [] []     []        []            | 37
+     id-utils           |          []        []                      | 13
+     impost             |                    []                      |  3
+     indent             |          []        []        []            | 24
+     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
+     libgsasl           |                    []                      |  7
+     libiconv           |          [] []     [] []     []            | 32
+     libidn             |                    []        []            |  5
+     lifelines          |                                            |  4
+     lilypond           |          []                                |  5
+     lingoteach         |                                            |  5
+     lynx               |          [] []                             | 14
+     m4                 |                    []        []            | 17
+     mailutils          |             []                             |  7
+     make               |          []                  []            | 18
+     man-db             |                                            |  5
+     minicom            |                                            | 11
+     mysecretdiary      |          []        []                      | 12
+     nano               |                                            | 11
+     nano_1_0           |          [] []                             | 17
+     opcodes            |          []                                |  7
+     parted             |          [] []               []            | 17
+     psmisc             |                    []                      |  7
+     ptx                |          []                  []            | 23
+     pwdutils           |                                            |  1
+     python             |                                            |  0
+     radius             |             []                             |  6
+     recode             |          []        []                      | 22
+     rpm                |          [] []                             | 11
+     screem             |                                            |  1
+     scrollkeeper       |          [] []                             | 23
+     sed                |          []        []                      | 19
+     sh-utils           |          []                                | 15
+     shared-mime-info   |             []               []            | 19
+     sharutils          |          []        []              []      | 20
+     silky              |                                            |  3
+     skencil            |                                            |  6
+     sketch             |                                            |  6
+     solfege            |                                            |  4
+     soundtracker       |          []                                |  8
+     sp                 |          []                                |  3
+     stardict           |             []     []        []    []      | 10
+     tar                |          [] []                             | 13
+     texinfo            |          []                  []            | 14
+     textutils          |          []                  []    []      | 17
+     tin                |                                            |  1
+     tp-robot           |                              []    []      |  7
+     tuxpaint           |          []        [] []     []            | 34
+     unicode-han-tra... |                                            |  0
+     unicode-transla... |                                            |  2
+     util-linux         |          [] []                             | 17
+     vorbis-tools       |             []                             | 10
+     wastesedge         |                                            |  1
+     wdiff              |          []        []                      | 22
+     wget               |          [] []               []    []      | 31
+     xchat              |             []     []        []            | 22
+     xkeyboard-config   |                                            |  1
+     xpad               |                    []                      |  5
+                        +--------------------------------------------+
+       72 teams           tg th tk tr uk ven vi wa xh zh_CN zh_TW zu
+      147 domains          0  0  1 78 29  0  71 16  0  41    20    0  1711
+
+   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 April 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.
+

AUTHORS

@@ -1,29 +1,35 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-Developers:
-----------
-
-All developers are connected to IRC:
-server: irc.freenode.net, channel: #weechat
+Developer:
+---------
 
 FlashCode <flashcode@flashtux.org>
-    Web   : http://www.flashtux.org
-    IRC   : nick is "FlashCode"
+    Web   : http://weechat.flashtux.org
+    IRC   : nick is "FlashCode" @ irc.freenode.net
     Jabber: flashcode@jabber.org
     ICQ   : 160677660
     AIM   : FlashCode AIM
     Yahoo : FlashCode_Y
 
+Testers:
+-------
+
 Bounga <bounga@altern.org>
     Web   : http://bounga.ath.cx
-    IRC   : nick is "Bounga"
+    IRC   : nick is "Bounga" @ irc.freenode.net
     Jabber: Bounga@jabber.org
     ICQ   : 178297842
 
-Xahlexx <xahlexx@tuxisland.org>
-    Web   : http://www.tuxisland.org
-    IRC   : nick is "xahlexx"
+Xahlexx <xahlexx@weeland.org>
+    Web   : http://www.weeland.org
+    IRC   : nick is "xahlexx" @ irc.freenode.net
+
+
+=====
+
+Whole team is connected to IRC:
+server: irc.freenode.net, channel: #weechat
 
 
 See README file for licence detail.

BUGS

@@ -1,20 +1,12 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-WeeChat known bugs, 2004-01-01
+WeeChat known bugs, 2005-05-21
 
-- ./configure does not check that Curses headers are installed
 - ./configure does not check that Gtk 2.0 libraries are installed
-- ./configure does not check that Perl headers & libraries are installed
-- too much nicks in the channel (> height of window) => display bug
-- some IRC commands are marked as 'unknown' when received
-  (IRC protocol is under dev!)
-- too much opened channels => display bug
-- when kicked, channel is not prefixed by '(' and sufixed by ')'
-- when function key (non used by WeeChat) is pressed, prompt is deleted
 - when quitting WeeChat term title is not restored (if look_set_title is ON)
 - command name for /server can not contain spaces
 - wrong alias is not created and not saved when quitting WeeChat
 - when many WeeChat are launched, log file is not properly written (cleared by
   each WeeChat at startup)
-- display problems with Konsole (Kde terminal)
+- display problems with old Konsole versions (Kde terminal) (???)

ChangeLog

@@ -1,9 +1,142 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2004-01-01
+ChangeLog - 2005-05-21
 
 
+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
+   * added crash dump when WeeChat receives SIGSEGV (Segmentation fault)
+   * added new display engine: doesn't cut words at end of lines
+   * added DCC send and DCC chat
+   * added /halfop & /dehalfop commands, fixed halfop display bug in nicklist
+   * added /ban, /unban and /kickban commands
+   * added spanish translation
+   * added --irc-commands and --weechat-commands command line options
+   * connection to IRC server is now made by child process (non blocking)
+   * added support for UnrealIrcd ("~" for chan owner, "&" for chan admin)
+   * new key for window switch (now: F5/F6=switch buffer, F7/F8=switch window)
+   * on server buffer, only server messages are logged
+   * improved /help command output
+   * plugins messages are logged with new config option (log_plugin_msg)
+   * fixed /kick command
+   * fixed /invite command (and now invite requests are displayed)
+   * fixed /buffer close command (now ok when disconnected from server)
+   * fixed display bugs when many windows are opened
+
+Version 0.1.0 (2005-02-12):
+   * improved /window command: now split and merge are ok
+   * away nicks are now displayed with another color (new option: "irc_away_check")
+   * added away indicator in status bar
+   * added lag indicator (and auto-disconnect after a delay if important lag)
+   * improved completion: now completes commands arguments (IRC and internal),
+     when only one completion matches, completion mechanism is stoped (to
+     complete command arg for example)
+   * improved /set command: empty strings are allowed, new colors, server
+     options can be changed while WeeChat is running
+   * added default away/part/quit messages in config file
+   * new [irc] section in config file, option "look_display_away" moved to
+     "irc_display_away"
+   * server messages & errors are all prefixed (by 3 chars, like '-@-')
+   * added new options for charset (UTF-8 support): look_charset_decode,
+     look_charset_encode and look_charset_internal
+   * fixed many memory leaks
+   * fixed colors bug: removed "gray" color (replaced by "default"), colors are
+     ok when terminal has white (or light) background
+   * fixed crash when resizing terminal to small size
+   * fixed crash when multiple servers and big messages received from server
+   * fixed crash when closing some private buffers
+   * fixed crash when unknown section with option(s) in config file
+   * fixed /op, /deop, /voice, /devoice (now ok with many nicks)
+   * fixed /me command (now ok without parameter)
+   * fixed /away command (now ok if not away)
+   * logs are now disabled by default (server/channel/private)
+
+Version 0.0.9 (2005-01-01):
+   * auto-reconnection to server (new options: server_autoreconnect (on/off),
+     server_autoreconnect_delay (in seconds))
+   * major bug fixed when socket is closed by server (100% CPU usage fixed),
+     and disconnections are now ok (all channels are "closed", history is still
+     visible, and buffer will be used again if reconnection to server)
+   * option "look_remove_colors_from_msgs" is now working
+   * fixed display of nick mode changes
+   * new command "/buffer close" (close any server/channel/private buffer)
+   * /notice command fixed (and display when received from server)
+   * new keys: Ctrl+A (=home), Ctrl+E (=end), Ctrl+W (=Ctrl+Backspace),
+     Alt-S (switch to server buffer), Alt-X (switch to first channel of next
+     server)
+   * added new config option: "server_command_delay" (delay in seconds after
+     startup command for each server)
+
+Version 0.0.8 (2004-10-30):
+   * /kick command fixed: now ok with many words as reason
+   * nickserv passwords hidden (new config option: log_hide_nickserv_pwd on/off)
+   * auto-rejoin channels when kicked (new config option: server_autorejoin on/off)
+   * added IRC::command function for Perl scripts
+   * fixed bug when adding alias with same name as other
+   * /buffer command developed (buffers list, move and notify)
+   * logging buffers to disk (server/channel/private according to user prefs)
+   * Away now announced in channels, and config option "look_display_away" added
+     to enable/disable this feature
+   * Fixed crash when resizing terminal to very small size
+   * "-MORE-" message is now erased when switching to another buffer
+   * DCC file receive ok (Alt-D for DCC view)
+   * /query command now reopens private buffer if already opened
+   * added key for redrawing terminal (Ctrl-L)
+   * added key for clearing hotlist (Alt-R)
+
+Version 0.0.7 (2004-08-08):
+   * new "col_status_delimiters" config option
+   * /buffer command added, buffers ordered by number, auto-jump to active
+     buffers (alt-a), jump to buffers by number (alt-number)
+   * /window command added, split terminal horizontally/vertically
+   * unique color for each nick (based on nickname)
+   * action messages are now considered as messages, not crappy joins/parts
+   * fixed display bug when nicklist is displayed at bottom of screen
+   * added history limit (text buffer & commands)
+   * replaced --enable-debug with --with-debug option for ./configure, which is
+     now integer: 1 = compiler debug flag, 2 = same 1 with verbose debug messages
+     in WeeChat (default: 0 = no debug)
+
+Version 0.0.6 (2004-06-05):
+   * improved channel highlight (priority to message vs join/part)
+   * fixed bug when opened private win and remote user changes his nick
+   * /query command added (starts private conversation)
+   * IRC messages 476, 477 added
+   * /mode command is now ok and channel flags are displayed in status bar
+   * fixed display bug (text was blinking when scrolling)
+   * CTCP Version reply is now in english only and doesn't show host (security reason)
+
+Version 0.0.5 (2004-02-07):
+   * /set command to modify config options when WeeChat is running
+   * fixed look_nicklist config option, now enables/disables nicklist
+   * secured code to prevent buffer overflows and memory leaks
+   * fixed QUIT IRC command: now sent to all connected servers (not only current)
+   * URL command line parameter to connect to server(s)
+   * new Perl script function to display message in info bar ("IRC::print_infobar")
+   * info bar highlight notifications
+   * info bar timestamp is added to config ("look_infobar_timestamp")
+   * added info bar (optional, "look_infobar" to enable it, "on" by default)
+   * fixed crash with /oper command
+   * for default config file, nick is now based on un*x username (thanks to Witukind)
+   * fixed crash when config file cannot be written
+   * -c (or --config) command line parameter added to see config file options
+   * highlight action messages
+
 Version 0.0.4 (2004-01-01):
    * Perl plugin, with auto-load
    * when private window is created (another user is talking), WeeChat does not

FAQ

@@ -1,158 +1,193 @@
-WeeChat - Wee Enhanced Environment for Chat
-===========================================
+WeeChat FAQ, 2005-05-21
+=======================
 
-WeeChat FAQ, 2004-01-01
+Intended audience:
+All WeeChat users.
+
+Before reading the following:
+the following Q/A list is *not* exhaustive.
+It is also possible that you won't find any Q/A that matches your problem.
+Please read them anyway, they may provide you help in fixing your problem
+anyway.
+And even if your problem is listed below, it is possible that the answers don't
+help you anymore to solve it. Then, please contact us, we will try to help you
+finding a solution.
+
+1 - Compiling
+2 - Using WeeChat
+3 - Development
+
+1.1
+================================================================================
+Q:	I heard about many GUI for WeeChat. How can I compile/use them?
+
+A:	Curses GUI is built by default.
+	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!
 
 
-1- Compiling
+1.2
+================================================================================
+Q:	I can't compile WeeChat CVS.
 
-    1.1  I heard about many GUI for WeeChat. How can I compile/use them?
-    1.2  I can't compile WeeChat CVS.
-
-2- Using WeeChat
-
-    2.1  Why using WeeChat ? X-Chat and Irssi are so good...
-    2.2  I've launched WeeChat, but I'm lost, what can I do?
-    2.3  How can I customize key bindings?
-    2.4  How can I load Perl scripts?
-         Are Perl scripts compatible with X-chat or/and Irssi ?
-    2.5  How can I load Python scripts?
-    2.6  How can I load Ruby scripts?
-
-3- Development
-
-    3.1  How should I report bugs?
-    3.2  How should I submit patches?
-    3.3  How should I submit new feature request?
-    3.4  Will WeeChat be ported to *BSD, QNX, MacOS X, Microsoft Windows?
-    3.5  I want to help WeeChat developers. What can I do?
-    3.6  Can I give money or other things to WeeChat developers?
+A:	Check that you have latest version of autoconf and automake.
+	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.
+	Note that this package may not correspond exactly to CVS base.
 
 
-/------------------------------------------------------------------------------\
-| 1- Compiling                                                                 |
-\------------------------------------------------------------------------------/
+2.1
+================================================================================
+Q:	Why using WeeChat ? X-Chat and Irssi are so good...
+
+A:	Because WeeChat is very light and has new features.
+	Some new features:
+	  * many GUI (Curses, Gtk, wxWidgets, Qt),
+	  * extensible with scripts (Perl, Python, Ruby),
+	  * 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
 
 
-1.1  I heard about many GUI for WeeChat. How can I compile/use them?
+2.2
+================================================================================
+Q:	I've launched WeeChat, but I'm lost, what can I do?
 
-  Curses GUI is built by default.
-  To build Gtk or Qt GUI you've to specify extra options to ./configure script:
-    --enable-gtk to enable gtk 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!
+A:	For help you can type /help. For help about a command, type /help command.
+	Keys and commands are listed in documentation.
 
 
-1.2  I can't compile WeeChat CVS.
+2.3
+================================================================================
+Q:	I don't see come chars with accents, what can I do?
 
-  Check that you have latest version of autoconf and automake.
-  WeeChat has been developed with autoconf version 2.56 and automake version 1.7.
-  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.
-  Note that this package may not correspond exactly to CVS base.
+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").
 
 
-/------------------------------------------------------------------------------\
-| 2- Using WeeChat                                                             |
-\------------------------------------------------------------------------------/
+2.4
+================================================================================
+Q:	How can I customize key bindings?
+
+A:	Today you can't do that. This is planed for a future version.
 
 
-2.1  Why using WeeChat ? X-Chat and Irssi are so good...
+2.5
+================================================================================
+Q:	How can I load Perl scripts?
+	Are Perl scripts compatible with X-chat or/and Irssi ?
 
-  Because WeeChat is very light and has new features.
-  Some new features:
-    * many GUI (Curses, Gtk, Qt),
-    * extensible with scripts (Perl, Python, Ruby),
-    * developed from scratch (not based on any other IRC client)
-    * multi-platform
-    * 100% GPL and free
-  This is the "geekest Irc client" ;)
+A:	You can use /perl command to load scripts (default path is
+	~/.weechat/perl).
+	Note that scripts in ~/.weechat/perl/autoload are automatically loaded
+	when WeeChat is starting up.
+	WeeChat Perl scripts are 80% compatible with X-Chat, but not with Irssi.
 
 
-2.2  I've launched WeeChat, but I'm lost, what can I do?
+2.6
+================================================================================
+Q:	How can I load Python scripts?
+	Are Python scripts compatible with X-chat or/and Irssi ?
 
-  For help you can type /help. For help about a command, type /help command.
+A:	You can use /python command to load scripts	(default path is
+	~/.weechat/python).
+	Note that scripts in ~/.weechat/python/autoload are automatically loaded
+	when WeeChat is starting up.
+	WeeChat Python scripts are 80% compatible with X-Chat, but not with Irssi.
 
 
-2.3  How can I customize key bindings?
+2.7
+================================================================================
+Q:	How can I load Ruby scripts?
 
-  Today you can't do that. This will be available in a future version.
+A:	Today Ruby interface is not developed, so you can't load any Ruby script.
 
 
-2.4  How can I load Perl scripts?
-     Are Perl scripts compatible with X-chat or/and Irssi ?
+3.1
+================================================================================
+Q:	How should I report bugs?
 
-  Yes, you can use /perl command to launch 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, not with Irssi, sorry ;)
+A:	There is 3 ways to report bugs:
+	  1. you can join us on IRC: irc.freenode.net, channel #weechat
+	  2. you can submit your bug at this url:
+	     http://savannah.nongnu.org/bugs/?func=addbug&group=weechat
+	  3. you can mail your problem, look at support page for developer's mails:
+	     http://weechat.flashtux.org/support.php
+	     (you can subscribe and send to "support" mailing list)
 
 
-2.5  How can I load Python scripts?
+3.2
+================================================================================
+Q:	How should I submit patches?
 
-  Today Python interface is not developed, so can't load any Python script.
+A:	There is 3 ways to submit patches:
+	  1. you can join us on IRC: irc.freenode.net, channel #weechat
+	  2. you can submit your patch at this url:
+	     http://savannah.nongnu.org/patch/?func=addpatch&group=weechat
+	  3. you can mail your patch, look at support page for developer's mails:
+	     http://weechat.flashtux.org/support.php
+	     (you can subscribe and send to "support" mailing list)
 
 
-2.6  How can I load Ruby scripts?
+3.3
+================================================================================
+Q:	How should I submit new feature request?
 
-  Today Ruby interface is not developed, so can't load any Ruby script.
+A:	There is 2 ways to submit your feature request:
+	  1. you can join us on IRC: irc.freenode.net, channel #weechat
+	  2. you can mail your feature request, look at support page for developer's
+	     mails:
+	     http://weechat.flashtux.org/support.php
+	     (you can subscribe and send to "support" mailing list)
 
 
-/------------------------------------------------------------------------------\
-| 3- Development                                                               |
-\------------------------------------------------------------------------------/
+3.4
+================================================================================
+Q:	What is the list of supported platforms for WeeChat?
+
+A:	Today WeeChat was succesfully tested on these platforms:
+	- GNU/Linux (any distribution / i386, AMD64, Sparc)
+	- FreeBSD
+	- NetBSD
+	- OpenBSD
+	- Mac OS X
+	- Microsoft Windows (with Cygwin and some code changes)
 
 
-3.1  How should I report bugs?
+3.5
+================================================================================
+Q:	Will WeeChat be ported to QNX or other operating systems?
 
-  There is 3 ways to report bugs:
-    1. you can join us on IRC: irc.freenode.net, channel #eci
-       If no one can help you (huh?), try another way, see below.
-    2. you can submit your bug at this url:
-       http://savannah.nongnu.org/bugs/?func=addbug&group=weechat
-    3. you can mail your problem, look at support page for developer's mails:
-       http://weechat.flashtux.org/support.php
-       (you can subscribe and send to "support" mailing list)
+A:	Yes. Future versions will be available for these OS.
+	We need help for such systems, any help is welcome :)
 
 
-3.2  How should I submit patches?
+3.6
+================================================================================
+Q:	I want to help WeeChat developers. What can I do?
 
-  There is 3 ways to submit patches:
-    1. you can join us on IRC: irc.freenode.net, channel #eci
-       If no one can help you (huh?), try another way, see below.
-    2. you can submit your patch at this url:
-       http://savannah.nongnu.org/patch/?func=addpatch&group=weechat
-    3. you can mail your patch, look at support page for developer's mails:
-       http://weechat.flashtux.org/support.php
-       (you can subscribe and send to "support" mailing list)
+A:	There's many tasks to do (code, documentation, ...)
+	Please contact us with IRC or mail, look at support page:
+	http://weechat.flashtux.org/support.php
 
 
-3.3  How should I submit new feature request?
+3.7
+================================================================================
+Q:	Can I give money or other things to WeeChat developers?
 
-  There is 2 ways to submit your feature request:
-    1. you can join us on IRC: irc.freenode.net, channel #eci
-       If no one can help you (huh?), try another way, see below.
-    2. you can mail your feature request, look at support page for developer's
-       mails:
-       http://weechat.flashtux.org/support.php
-       (you can subscribe and send to "support" mailing list)
-
-
-3.4  Will WeeChat be ported to *BSD, QNX, MacOS X, Microsoft Windows ?
-
-  Yes. Future versions will be available for these OS.
-
-
-3.5  I want to help WeeChat developers. What can I do?
-
-  There's many tasks to do (code, documentation, ...)
-  Please contact us with IRC or mail, look at support page:
-  http://weechat.flashtux.org/support.php
-
-
-3.6  Can I give money or other things to WeeChat developers?
-
-  No.
+A:	Beer is welcome :)
+	Otherwise Paypal account is: flashcode@free.fr (no limit for gifts :)

FAQ.fr

@@ -0,0 +1,206 @@
+WeeChat FAQ, 2005-05-21
+=======================
+
+Public concerné :
+Tous les utilisateurs de WeeChat.
+
+Avant de lire la suite ceci :
+la liste suivante de questions/réponses n'est *pas* exhaustive.
+Il est donc possible que vous ne trouviez pas de question/réponse correspondant
+à votre problème.
+Lisez les quand même SVP, elles peuvent vous aider à corriger votre problème.
+Et même si votre problème est mentionné ci-dessous, il est possible que la
+réponse ne vous aide pas à corriger le problème. Dans ce cas, contactez-nous,
+nous essaierons de vous aider à trouver une solution.
+
+1 - Compilation
+2 - Utilisation de WeeChat
+3 - Développement
+
+1.1
+================================================================================
+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, 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.
+	Les autres interfaces sont en développement.
+
+
+1.2
+================================================================================
+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.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
+	quasiment tous les jours, basé sur le CVS.
+	Notez que ce paquet peut ne pas correspondre exactement à la base CVS.
+
+
+2.1
+================================================================================
+Q:	Pourquoi utiliser WeeChat ? X-Chat et Irssi sont si bien...
+
+R:	Parce que WeeChat est très léger et a de nouvelles fonctionnalités.
+	Quelques nouvelles fonctionnalités :
+	  * plusieurs interfaces (Curses, Gtk, wxWidgets, Qt),
+	  * extensible par des scripts (Perl, Python, Ruby),
+	  * 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
+================================================================================
+Q:	J'ai lancé WeeChat, mais je suis perdu, que puis-je faire ?
+
+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").
+
+
+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.
+
+
+2.5
+================================================================================
+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).
+	Notez que les scripts dans ~/.weechat/perl/autoload sont automatiquement
+	chargés par WeeChat lorsqu'il démarre.
+	Les scripts Perl WeeChat sont 80% compatibles avec X-Chat, mais pas Irssi.
+
+
+2.6
+================================================================================
+Q:	Comment puis-je charger les scripts Python ?
+	Les scripts Python sont-ils compatibles avec X-chat et/ou Irssi ?
+
+R:	La commande /python permet de charger les scripts Python (le chemin par
+	défaut est ~/.weechat/python).
+	Notez que les scripts dans ~/.weechat/python/autoload sont automatiquement
+	chargés par WeeChat lorsqu'il démarre.
+	Les scripts Python WeeChat sont 80% compatibles avec X-Chat, mais pas Irssi.
+
+
+2.7
+================================================================================
+Q:	Comment puis-je charger des scripts Ruby ?
+
+R:	Aujourd'hui l'interface Ruby n'est pas développée.
+	Vous ne pouvez donc charger aucun script Ruby.
+
+
+3.1
+================================================================================
+Q:	Comment dois-je reporter les bugs ?
+
+R:	Il y a 3 manières de reporter les bugs :
+	  1. vous pouvez nous joindre sur IRC: irc.freenode.net, canal #weechat
+	  2. vous pouvez soumettre votre bug à cette adresse :
+	     http://savannah.nongnu.org/bugs/?func=addbug&group=weechat
+	  3. vous pouvez envoyer votre problem par mail, consultez la page
+	     support pour les mails des développeurs :
+	     http://weechat.flashtux.org/support.php
+	     (vous pouvez souscrire et envoyer à la liste de diffusion
+	     "support")
+
+
+3.2
+================================================================================
+Q:	Comment dois-je soumettre les patches ?
+
+R:	Il y a 3 manières de soumettre les patches :
+	  1. vous pouvez nous joindre sur IRC: irc.freenode.net, canal #weechat
+	  2. vous pouvez soumettre votre patch à cette adresse :
+	     http://savannah.nongnu.org/patch/?func=addpatch&group=weechat
+	  3. vous pouvez envoyer votre patch par mail, consultez la page
+	     support pour les mails des développeurs :
+	     http://weechat.flashtux.org/support.php
+	     (vous pouvez souscrire et envoyer à la liste de diffusion
+	     "support")
+
+
+3.3
+================================================================================
+Q:	Comment dois-je soumettre les demandes de nouvelles fonctionnalités ?
+
+R:	Il y a 2 manières :
+	  1. vous pouvez nous joindre sur IRC: irc.freenode.net, channel #weechat
+	  2. vous pouvez envoyer un mail, consultez la page support pour les
+	     mails des développeurs :
+	     http://weechat.flashtux.org/support.php
+	     (vous pouvez souscrire et envoyer à la liste de diffusion
+	     "support")
+
+
+3.4
+================================================================================
+Q:	Quelle est la liste des plate-formes supportées par WeeChat ?
+
+R:	Aujourd'hui WeeChat a été testé avec succès sur ces plate-formes :
+	- GNU/Linux (toute distribution / i386, AMD64, Sparc)
+	- FreeBSD
+	- NetBSD
+	- OpenBSD
+	- Mac OS X
+	- Microsoft Windows (avec Cygwin et quelques modifications de code)
+
+
+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, ...)
+	Merci de prendre contact avec nous par IRC ou mail, consultez la page
+	support :
+	http://weechat.flashtux.org/support.php
+
+
+3.7
+================================================================================
+Q:	Puis-je donner de l'argent ou d'autres choses aux développeurs WeeChat ?
+
+R:	La bière est la bienvenue :)
+	Sinon le compte Paypal est: flashcode@free.fr (il n'y a pas de limite pour
+	les dons :)

INSTALL

@@ -2,9 +2,11 @@ WeeChat - Installation instructions
 ===================================
 
 1) Run './configure'
-   options: --disable-curses : do not build Curses interface
+   options: --enable-perl    : enable Perl scripts
+            --disable-curses : do not build Curses interface
             --enable-gtk     : build Gtk+ interface (under development!)
             --enable-qt      : build Qt interface (not developed!)
+            --with-debug=X   : X=1 for debug compilation, 2 for debug messages
 
 2) Run 'make'
 
@@ -12,4 +14,4 @@ WeeChat - Installation instructions
 
 4) Enjoy !  :-)
 
-See AUTHORS for any support, feel free to contact us for any problem ;)
+See AUTHORS for support, feel free to contact us for any problem ;)

Makefile.am

@@ -1,4 +1,4 @@
-# Copyright (c) 2004 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2005 FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,6 +17,14 @@
 
 SUBDIRS = po intl src
 
-EXTRA_DIST = weechat.1 BUGS FAQ
+EXTRA_DIST = config.rpath  weechat-curses.1 BUGS FAQ FAQ.fr \
+             debian/changelog debian/control \
+             debian/copyright \
+             debian/rules debian/weechat-common.docs \
+             debian/weechat-common.install debian/weechat-curses.dirs \
+             debian/weechat-curses.install debian/weechat-gtk.dirs \
+             debian/weechat-gtk.install
 
-man_MANS = weechat.1
+man_MANS = weechat-curses.1
+
+ACLOCAL_AMFLAGS = -I m4

NEWS

@@ -1,6 +1,38 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
+* FlashCode, 2005-05-21
+
+    WeeChat 0.1.2 released.
+
+* FlashCode, 2005-03-20
+
+    WeeChat 0.1.1 released.
+
+* FlashCode, 2005-02-12
+
+    WeeChat 0.1.0 released.
+
+* FlashCode, 2005-01-01
+
+    WeeChat 0.0.9 released.
+
+* FlashCode, 2004-10-30
+
+    WeeChat 0.0.8 released.
+
+* FlashCode, 2004-08-08
+
+    WeeChat 0.0.7 released.
+
+* FlashCode, 2004-06-05
+
+    WeeChat 0.0.6 released.
+
+* FlashCode, 2004-02-07
+
+    WeeChat 0.0.5 released.
+
 * FlashCode, 2004-01-01
 
     WeeChat 0.0.4 released.

README

@@ -22,10 +22,7 @@ Features
 Copyright
 ---------
 
-WeeChat (c) Copyright 2004
-  by: FlashCode <flashcode@flashtux.org>
-        Xahlexx <xahlex@tuxisland.org>
-         Bounga <bounga@altern.org>
+WeeChat (c) Copyright 2003-2005 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):
@@ -46,6 +43,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 
 ---
-(1) only curses interface is available today
-(2) plugin interfaces are not yet developed
+(1) only Curses interface is available today
+(2) only Perl interface is available today
 (3) only GNU/Linux version is available today

TODO

@@ -1,7 +1,7 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-TODO - 2004-01-01
+TODO - 2005-05-21
 
 Legend:
   #  done
@@ -10,34 +10,38 @@ Legend:
   ?  is this really necessary?
 
 
-v0.0.4:
+v0.1.2:
 ------
 
  * General:
-    # debug messages can be enabled via ./configure --enbale-debug option
+    + Windows version
+    + Solaris version
+    # *BSD version
+    # Mac OS X version
+
+ * IRC protocol:
+    - customizable CTCP version reply
 
  * Interface:
+    # nicklist scroll keys
+    + Gtk GUI
     + internationalization (traduce WeeChat in many languages)
-    # intercept Ctrl-C
-    # when private window is created (another user is talking), WeeChat does not
-      switch to this window
-    # highlight when our nick is written in a channel/private window
+
+ * TCP/IP communication:
+    - SSL support
+
+ * Configuration:
+    - add key bindings to config file
 
  * Plugins:
-    # Perl plugin
-    # "/perl load" and "/perl unload" commands to (un)load Perl scripts
-    # auto-load Perl scripts at startup
+    # Python plugin
+    # "/python load" and "/python unload" commands to (un)load Python scripts
 
 
 Future versions:
 ---------------
 
- * General:
-    - Windows version
-
  * IRC protocol:
-    + "/mode" command: change the user/channels modes
-    - "/dcc" command (for chat and sending/receiving files)
     - complete "/list" command: add regexp search, display only channels that
       match regexp
     - "/ignore" and "/unignore" commands: hide all that is write by a given
@@ -48,9 +52,6 @@ Future versions:
       nick/host connect to the given irc network
 
  * WeeChat commands:
-    + "/set" command: allow the user to set the WeeChat variables
-      under WeeChat without editing the config file (colours, time
-      format, etc)
     - "/reload" command: reload the WeeChat's config file
     - "/highlight" command: highlight a given word when it appears on
       channels/privates
@@ -60,35 +61,18 @@ Future versions:
       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:
-    + Gtk GUI
-    - display current channel modes (example : #weechat(+nt))
+    - color for nicks (except own nick) when nick colors are disabled
     - interpret special chars in messages (color & bold for example)
-    - many channel windows in one window/term (window split)
-    - add lag indicator
-    - forget some old lines that were displayed long time ago (now all is saved,
-      if WeeChat is running for long time, a lot of memory is used!)
-    - improve completion (for example complete command parameters when possible)
     - understand incomplete commands if unambigous (for example: /he for /help is ok)
-    - add clock (in status bar?)
-    - log chats to file
     ? Qt GUI
 
  * TCP/IP communication:
-    - connect to server with child process (background)
     - proxy support
-    - SSL support
     - IPv6 protocol implementation
 
- * Configuration:
-    - add missing options for config file
-    - add key bindings to config file
-    - load config file after GUI (so init values by default (colors, ...) before
-      loading config)
-
  * Plugins:
-    - Python plugin
-    - "/python load" and "/python unload" commands to (un)load Python scripts
     - Ruby plugin
     - "/ruby load" and "/ruby unload" commands to (un)load Ruby scripts

autogen.sh

@@ -1,55 +1,15 @@
 #!/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
+aclocal &&
+# autoheader creates config.h.in needed by autoconf
+autoheader &&
+# autoconf creates configure
+autoconf &&
+# automake creates Makefile.in
+automake --add-missing --copy --gnu

configure.in

@@ -1,4 +1,4 @@
-# Copyright (c) 2004 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2005 FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,10 +19,10 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.56)
-AC_INIT(WeeChat, 0.0.4, flashcode@flashtux.org)
+AC_INIT(WeeChat, 0.1.2, flashcode@flashtux.org)
 AC_CONFIG_SRCDIR([src/common/weechat.c])
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([weechat], [0.0.4])
+AM_INIT_AUTOMAKE([weechat], [0.1.2])
 
 # Checks for programs.
 AC_PROG_CC
@@ -30,56 +30,97 @@ AC_PROG_MAKE_SET
 AC_PROG_RANLIB
 
 # Gettext
-ALL_LINGUAS="fr"
+ALL_LINGUAS="fr es"
 AM_GNU_GETTEXT
 
 # Checks for libraries.
-AC_CHECK_LIB([curses], [initscr], LIBCURSES_FOUND=1, LIBCURSES_FOUND=0)
+AC_CHECK_LIB([ncurses], [initscr], LIBNCURSES_FOUND=1, LIBNCURSES_FOUND=0)
+
+AM_OPTIONS_WXCONFIG
+AM_PATH_WXCONFIG(2.3.4, wxWin=1)
 
 # 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 unistd.h])
+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.
 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_MALLOC
-AC_FUNC_REALLOC
 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])
 
 AH_VERBATIM([PLUGINS], [#undef PLUGINS])
 AH_VERBATIM([PLUGIN_PERL], [#undef PLUGIN_PERL])
+AH_VERBATIM([PLUGIN_PYTHON], [#undef PLUGIN_PYTHON])
 AH_VERBATIM([DEBUG], [#undef DEBUG])
 
-AC_ARG_ENABLE(curses, [  --disable-curses        Turn off Curses interface (default=auto)],,enable_curses=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_ENABLE(debug,  [  --enable-debug          Turn on debugging messages (default=no)],enable_debug=yes,enable_debug=no)
+AC_ARG_ENABLE(ncurses, [  --disable-ncurses       Turn off ncurses interface (default=auto)],,enable_ncurses=yes)
+AC_ARG_ENABLE(wxwidgets,[  --enable-wxwidgets      Turn on WxWidgets interface (default=no)],enable_wxwidgets=yes,enable_wxwidgets=no)
+AC_ARG_ENABLE(gtk,     [  --enable-gtk            Turn on Gtk+ interface (default=no)],enable_gtk=yes,enable_gtk=no)
+AC_ARG_ENABLE(qt,      [  --enable-qt             Turn on Qt interface (default=no)],enable_qt=yes,enable_qt=no)
+AC_ARG_ENABLE(perl,    [  --enable-perl           Turn on Perl plugins (default=no)],enable_perl=yes,enable_perl=no)
+AC_ARG_ENABLE(python,  [  --enable-python         Turn on Python plugins (default=no)],enable_python=yes,enable_python=no)
+AC_ARG_WITH(debug,     [  --with-debug            Debugging: 0=no debug, 1=debug compilation, 2=debug compilation + verbose msgs (default=0)],debug=$withval,debug=0)
 
 enable_plugins="no"
-enable_python="no"
-PYTHON_CFLAGS=
 enable_ruby="no"
 RUBY_CFLAGS=
 
-AM_CONDITIONAL(GUI_CURSES,    test "$enable_curses" = "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(PLUGIN_PERL,   test "$enable_perl" = "yes")
-# AM_CONDITIONAL(PLUGIN_PYTHON, test "$enable_python" = "yes")
+AM_CONDITIONAL(PLUGIN_PYTHON, test "$enable_python" = "yes")
 # AM_CONDITIONAL(PLUGIN_RUBY,   test "$enable_ruby" = "yes")
 
-if test "x$enable_curses" = "xyes" ; then
-    if test "$LIBCURSES_FOUND" = "0" ; then
-        AC_MSG_ERROR([Curses library not found! Install Curses library or run ./configure with --disable-curses parameter.])
+if test "x$enable_ncurses" = "xyes" ; 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
-    CURSES_LIBS="-lcurses"
-    AC_SUBST(CURSES_LIBS)
+    NCURSES_LIBS="-lncurses"
+    AC_SUBST(NCURSES_LIBS)
+fi
+
+if test "x$enable_wxwidgets" = "xyes" ; then
+    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
@@ -96,23 +137,100 @@ 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`"
+    
+    AC_PATH_PROG(PERL, perl)
+    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 library)
+    PERL_LIB=`$PERL -e 'use Config; print "$Config{installprefix}/lib/$Config{libperl}"'`
+    
+    if test -r "$PERL_LIB"; then
+        PLUGINS_LIBS="$PLUGINS_LIBS ../../plugins/perl/lib_weechat_perl.a `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)
+    
     PERL_CFLAGS=`perl -MExtUtils::Embed -e ccopts`
     AC_SUBST(PERL_CFLAGS)
     AC_DEFINE(PLUGIN_PERL)
 fi
 
+if test "x$enable_python" = "xyes" ; then
+    enable_plugins="yes"
+    
+    AC_PATH_PROG(PYTHON, python)
+    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_INCLUDE=`$PYTHON -c 'import sys ; print "%s/include/python%s" % (sys.prefix, sys.version[[:3]])'`
+    
+    AC_MSG_CHECKING(for Python header files)
+    if test -r "$PYTHON_INCLUDE/Python.h"; then
+        PYTHON_CFLAGS=`$PYTHON -c "import distutils.sysconfig,string; print ' -I' + distutils.sysconfig.get_config_var('CONFINCLUDEPY')"`
+    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 sys; print "%s/lib/python%s/config" % (sys.prefix, sys.version[[:3]])'`
+    PYTHON_VERSION=`$PYTHON -c 'import sys ; print sys.version[[0:3]]'`
+    
+    AC_MSG_CHECKING(for Python library)
+    if test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.so" -a -r "$PYTHON_LIB/libpython$PYTHON_VERSION.a"; then
+        PYTHON_LFLAGS=`$PYTHON -c "import distutils.sysconfig,string; print string.join(distutils.sysconfig.get_config_vars('LINKFORSHARED', 'BLDLIBRARY', 'SHLIBS'))"`
+    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)
+    
+    PLUGINS_LIBS="$PLUGINS_LIBS ../../plugins/python/lib_weechat_python.a $PYTHON_LFLAGS"
+    AC_SUBST(PYTHON_CFLAGS)
+    AC_DEFINE(PLUGIN_PYTHON)
+fi
+
 if test "x$enable_plugins" = "xyes" ; then
     AC_DEFINE(PLUGINS)
 fi
 
 AC_SUBST(PLUGINS_LIBS)
 
-if test "x$enable_debug" = "xyes" ; then
+CFLAGS=`echo $CFLAGS | sed s/-g//g`
+if test "x$CFLAGS" = "x" ; then
+    CFLAGS="-O2"
+fi
+if test "x$debug" = "x1" || test "x$debug" = "x2" ; then
+    CFLAGS="-Wall -W $CFLAGS -pipe -g"
+else
+    CFLAGS="-Wall -W $CFLAGS -pipe"
+fi
+
+if test "x$debug" = "x2" ; then
     AC_DEFINE(DEBUG)
 fi
 
-CFLAGS="-Wall -W -pipe -O2"
+dnl For FreeBSD
+LIBS="$LIBS $INTLLIBS"
+CFLAGS="$CFLAGS $CPPFLAGS"
 
 AC_OUTPUT([Makefile
            src/Makefile
@@ -120,8 +238,10 @@ AC_OUTPUT([Makefile
            src/irc/Makefile
            src/plugins/Makefile
            src/plugins/perl/Makefile
+           src/plugins/python/Makefile
            src/gui/Makefile
            src/gui/curses/Makefile
+           src/gui/wxwidgets/Makefile
            src/gui/gtk/Makefile
            src/gui/qt/Makefile
            intl/Makefile
@@ -131,8 +251,11 @@ echo
 echo $PACKAGE $VERSION
 
 listgui=
-if test "x$enable_curses" = "xyes" ; then
-    listgui="$listgui Curses"
+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+"
@@ -142,7 +265,18 @@ if test "x$enable_qt" = "xyes" ; then
 fi
 
 if test "x$listgui" = "x" ; then
-    AC_MSG_ERROR([No interface specified... Please specify at least Curses, Gtk or Qt.])
+    AC_MSG_ERROR([
+*** No interface specified...
+*** Please specify at least ncurses, WxWidgets, Gtk or Qt.])
+fi
+
+msg_debug_compiler="no"
+msg_debug_verbose="no"
+if test "x$debug" = "x1" || test "x$debug" = "x2" ; then
+    msg_debug_compiler="yes"
+fi
+if test "x$debug" = "x2" ; then
+    msg_debug_verbose="yes"
 fi
 
 echo
@@ -153,7 +287,8 @@ echo Build with Perl support....... : $enable_perl
 echo Build with Python support..... : $enable_python
 echo Build with Ruby support....... : $enable_ruby
 echo
-echo Print debugging messages...... : $enable_debug
+echo Compile with debug info....... : $msg_debug_compiler
+echo Print debugging messages...... : $msg_debug_verbose
 echo
 eval eval echo WeeChat will be installed in $bindir.
 echo

debian/changelog

@@ -1,3 +1,59 @@
+weechat (0.1.2-1) unstable; urgency=low
+
+  * WeeChat version 0.1.2, see ChangeLog for detail.
+  
+ -- Sebastien Helleu <flashcode@flashtux.org>  Sat, 21 May 2005 08:00:00 +0200
+
+weechat (0.1.1-2) unstable; urgency=low
+
+  * debian/control:
+    - Add myself to uploaders.
+    - Remove unecessary dependency on weechat-gtk (Closes: #308287).
+
+ -- Julien Louis <ptitlouis@sysif.net>  Tue, 10 May 2005 22:38:52 +0200
+
+weechat (0.1.1-1) unstable; urgency=low
+
+  * WeeChat version 0.1.1, see ChangeLog for detail (closes: #306492)
+  
+ -- Sebastien Helleu <flashcode@flashtux.org>  Sat, 20 Mar 2005 08:00:00 +0200
+
+weechat (0.1.0-1) unstable; urgency=low
+
+  * WeeChat version 0.1.0, see ChangeLog for detail.
+  
+ -- Sebastien Helleu <flashcode@flashtux.org>  Sat, 12 Feb 2005 12:00:00 +0200
+
+weechat (0.0.9-1) unstable; urgency=low
+
+  * WeeChat version 0.0.9, see ChangeLog for detail.
+  
+ -- FlashCode <flashcode@flashtux.org>  Sat, 01 Jan 2005 13:00:00 +0200
+
+weechat (0.0.8-1) unstable; urgency=low
+
+  * WeeChat version 0.0.8, see ChangeLog for detail.
+  
+ -- FlashCode <flashcode@flashtux.org>  Sat, 30 Oct 2004 11:40:00 +0200
+
+weechat (0.0.7-1) unstable; urgency=low
+
+  * WeeChat version 0.0.7, see ChangeLog for detail.
+  
+ -- FlashCode <flashcode@flashtux.org>  Sat, 08 Aug 2004 21:00:00 +0200
+
+weechat (0.0.6-1) unstable; urgency=low
+
+  * WeeChat version 0.0.6, see ChangeLog for detail.
+  
+ -- FlashCode <flashcode@flashtux.org>  Sat, 05 Jun 2004 11:30:00 +0200
+
+weechat (0.0.5-1) unstable; urgency=low
+
+  * WeeChat version 0.0.5, see ChangeLog for detail.
+  
+ -- FlashCode <flashcode@flashtux.org>  Sat, 07 Feb 2004 20:30:00 +0200
+
 weechat (0.0.4-1) unstable; urgency=low
 
   * WeeChat version 0.0.4, see ChangeLog for detail.

debian/control

@@ -1,13 +1,14 @@
 Source: weechat
 Section: net
 Priority: optional
-Maintainer: FlashCode <flashcode@flashtux.org>
-Build-Depends: debhelper (>> 4.0.0), libncurses5 (>= 5.2.20020112a-7)
-Standards-Version: 3.5.8
+Maintainer: Sebastien Helleu <flashcode@flashtux.org>
+Uploaders: Julien Louis <ptitlouis@sysif.net>
+Build-Depends: debhelper (>> 4.0.0), libncurses5-dev (>= 5.2.20020112a-7), perl (>= 5.6.0-16), libperl-dev, python2.3 (>= 2.3), python-dev
+Standards-Version: 3.6.1
 
 Package: weechat
 Architecture: all
-Depends: ${shlibs: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.
@@ -21,14 +22,6 @@ Description: Fast, light and extensible IRC client
  for many operating systems. Everything can be done with a keyboard.
  It is customizable and extensible with scripts.
 
-Package: weechat-gtk
-Architecture: any
-Depends: ${shlibs:Depends}, weechat-common (= ${Source-Version})
-Description: Fast, light and extensible IRC client
- WeeChat (Wee Enhanced Environment for Chat) is a fast and light IRC client
- for many operating systems. Everything can be done with a keyboard.
- It is customizable and extensible with scripts.
-
 Package: weechat-common
 Architecture: all
 Replaces: weechat

debian/copyright

@@ -1,9 +1,9 @@
 This package was debianized by FlashCode <flashcode@flashtux.org> on
-Thu, 01 Jan 2004 13:00:00 +0200.
+Sat, 21 May 2005 08:00:00 +0200.
 
 It was downloaded from http://weechat.flashtux.org/download
 
-Upstream Author(s): FlashCode <flashcode@flashtux.org>
+Upstream Author: FlashCode <flashcode@flashtux.org>
 
 Copyright:
 

debian/rules

@@ -1,9 +1,6 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
+#export DH_VERBOSE=1
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
@@ -17,7 +14,8 @@ endif
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	./configure --prefix=/usr --sysconfdir=/etc --enable-gtk
+	./configure --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man \
+	--enable-perl --enable-python
 	touch configure-stamp
 
 
@@ -32,7 +30,7 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-	-$(MAKE) clean
+	-$(MAKE) distclean
 	dh_clean
 
 install: build
@@ -43,30 +41,33 @@ install: build
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/weechat
 	dh_install --sourcedir=debian/weechat
 	install -o root -g root -m 755 src/gui/curses/weechat-curses $(CURDIR)/debian/weechat-curses/usr/bin
-	install -o root -g root -m 755 src/gui/gtk/weechat-gtk $(CURDIR)/debian/weechat-gtk/usr/bin
+	# install -o root -g root -m 755 src/gui/gtk/weechat-gtk $(CURDIR)/debian/weechat-gtk/usr/bin
 
 
 # Build architecture-independent files here.
 binary-indep: build install
-	dh_testdir -pweechat-common
-	dh_testroot -pweechat-common
-	dh_installchangelogs -pweechat-common
+	dh_testdir -pweechat-common -pweechat
+	dh_testroot -pweechat-common -pweechat
+	dh_installchangelogs ChangeLog -pweechat-common
 	dh_installdocs -pweechat-common
 	dh_installexamples -pweechat-common
-	dh_installman weechat.1 -pweechat-common
-	dh_compress -pweechat-common
-	dh_fixperms -pweechat-common
-	dh_installdeb -pweechat-common
-	dh_shlibdeps -pweechat-common
-	dh_gencontrol -pweechat-common
-	dh_md5sums -pweechat-common
-	dh_builddeb -pweechat-common
+	dh_compress -pweechat-common -pweechat
+	dh_link -pweechat usr/share/doc/weechat-common usr/share/doc/weechat
+	dh_fixperms -pweechat-common -pweechat
+	dh_installdeb -pweechat-common -pweechat
+	dh_shlibdeps -pweechat-common -pweechat
+	dh_gencontrol -pweechat-common -pweechat
+	dh_md5sums -pweechat-common -pweechat
+	dh_builddeb -pweechat-common -pweechat
 
 # Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir -a
 	dh_testroot -a
-	dh_link -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

debian/weechat-common.docs

@@ -1,9 +1,7 @@
 AUTHORS
 BUGS
-ChangeLog
-COPYING
 FAQ
-INSTALL
+FAQ.fr
 NEWS
 README
 TODO

debian/weechat-common.install

@@ -0,0 +1 @@
+usr/share/locale

doc/Makefile

@@ -1,4 +1,4 @@
-# Copyright (c) 2003 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2005 FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,15 +15,18 @@
 # 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
+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:

doc/weechat_doc_pt.texi

@@ -6,14 +6,21 @@
 
 @c WeeChat documentation (vers@~ao partuguesa)
 @c
-@c Copyright (c) 2003 by FlashCode <flashcode@flashtux.org>
+@c Copyright (c) 2005 by FlashCode <flashcode@flashtux.org>
 @c
-@c Permission is granted to copy, distribute and/or modify this document
-@c under the terms of the GNU Free Documentation License, Version 1.2
-@c or any later version published by the Free Software Foundation;
-@c with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-@c A copy of the license is included in the section entitled "GNU
-@c Free Documentation License".
+@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
@@ -28,7 +35,7 @@
 
 @title WeeChat - Guia do Utilizador
 @subtitle Cliente de IRC rapido, leve e extencivel
-@subtitle Documenta@,{c}@~ao do WeeChat v0.0.3 - 23 de Novembro de 2003
+@subtitle Documenta@,{c}@~ao do WeeChat v0.1.2 - 21 de Maio de 2005
 
 @image{weechat_image}
 
@@ -41,7 +48,7 @@ Este manual documenta o cliente de IRC WeeChat, ele faz parte do WeeChat.@*
 A ultima versão deste documento pode ser descarregada de :@*
 @uref{http://weechat.flashtux.org/doc.php}@*
 @*
-Copyright @copyright{} 2003 FlashCode
+Copyright @copyright{} 2005 FlashCode
 <@email{flashcode@@flashtux.org, flashcode AT flashtux.org}>@*
 @*
 Este documento pode ser utilizado sobre os termos da Licen@,{c}a P@'ublica geral GNU (GNU General Public
@@ -147,7 +154,7 @@ Mandrake/Redhat (ou outra distro compat@'ivel com RPMs)@*
 Instala@,{c}@~ao : @kbd{rpm -i /chemin/weechat-x.y.z-1.i386.rpm}
 @item
 Gentoo@*
-Instala@,{c}@~ao : ver a documenta@,{c}@~ao da Gentoo
+Instala@,{c}@~ao : @kbd{emerge weechat}
 @item
 *BSD (non disponible !)
 @item
@@ -169,7 +176,7 @@ Nota: Para compilar certas interfaces, podes passar par@^ametros
 ao ./configure, escreve @kbd{./configure --help} para veres as op@,{c}@~oes.@*
 
 Obter os direitos do root e instalar o Weechat :@*
-@kbd{su -}@*
+@kbd{su}@*
 (escreve aqui a palavra-passe do superutilizador)@*
 @kbd{make install}@*
 
@@ -199,6 +206,7 @@ Segue agora as instru@,{c}@~oes para compilar o c@'odigo fonte - @xref{Codigo Fo
 * Invocar o WeeChat::
 * Recursos de teclado::
 * Comandos do WeeChat::
+* FIFO pipe::
 @end menu
 
 @node Invocar o WeeChat, Recursos de teclado, Utilizacao, Utilizacao
@@ -207,6 +215,8 @@ Segue agora as instru@,{c}@~oes para compilar o c@'odigo fonte - @xref{Codigo Fo
 @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
@@ -218,7 +228,7 @@ Mostrar a vers@~ao do WeeChat@*
 @subsection Invocar o WeeChat
 
 Escreve simplesmente este comando para invoceres o WeeChat :@*
-@kbd{weechat-curses}@*
+@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)@*
 
@@ -238,13 +248,16 @@ Ir um caractere para traz / para a frente na linha de comando@*
 @item Ctrl + Seta esquerda / Ctrl + Seta Direita
 Ir uma palavra para traz / para a frente na linha de comando@*
 @*
-@item Home / End
-Ir para o in@'icio / para o fim da linha de comando@*
+@item Home / Ctrl + A
+Ir para o in@'icio da linha de comando@*
+@*
+@item End / Ctrl + E
+Ir para o fim da linha de comando@*
 @*
 @item Backspace / Delete
 Apagar o caractere anterior / seguinte na linha de comando@*
 @*
-@item Ctrl + Backspace
+@item Ctrl + Backspace / Ctrl + W
 Apagar a palavra anterior na linha de comando
 @*
 @item Tab
@@ -262,19 +275,95 @@ Repetir os ultimos comandos/mensagens@*
 @item PageUp / PageDown
 Navegar no hist@'orico da janela@*
 @*
-@item F6 / F7
-Ir para a janela anterior/seguinte@*
+@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 F11 / F12
+Scroll nicklist@*
+@*
+@item Ctrl + L
+Redesenhe a janela inteira@*
 @*
 @item Alt + Seta da esquerda / Alt + Seta da direita
-Identico a F6 / F7@*
+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@*
+@*
+@item Alt + PageUp / Alt + PageDown / Alt + Home / Alt + End
+Scroll nicklist@*
 @*
 @end table
 
-@node Comandos do WeeChat, , Recursos de teclado, Utilizacao
+@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 *********************************
 
@@ -309,7 +398,7 @@ Listar todos os Scripts Perl: @kbd{/perl}@*
 
 @itemize @bullet
 @item
-@command{IRC::register ( nome, vers@~ao, fun@,{c}@~ao_de_shutdown, descri@,{c}@~ao );}@*
+@command{weechat::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.@*
@@ -323,25 +412,45 @@ Todos os Scripts Perl para o Weechat devem invocar esta fun@,{c}@~ao.@*
 @end itemize
 @*
 @emph{Exemplo:}@*
-@code{IRC::register ("sample", "1.0", "sample_end", "Sample script!");}@*
+@code{weechat::register ("sample", "1.0", "sample_end", "Sample script!");}@*
 @*
 
 @item
-@command{IRC::print ( mensagem );}@*
+@command{weechat::print ( mensagem, [canal, [servidor]] );}@*
 @*
-Imprimne uma mensagem na janela actual (canal ou servidor).@*
+Imprimne uma mensagem na canal.@*
 
 @emph{Argumentos:}
 @itemize @minus
 @item @option{mensagem}: mensagem a mostrar
+@item @option{canal}: nome da canal
+@item @option{servidor}: nome interno da servidor
 @end itemize
 @*
 @emph{Exemplo:}@*
-@code{IRC::print ("mensagem");}@*
+@code{weechat::print ("mensagem");}@*
+@code{weechat::print ("mensagem", "#weechat");}@*
+@code{weechat::print ("mensagem", "#weechat", "freenode");}@*
 @*
 
 @item
-@command{IRC::add_message_handler ( nome, fun@,{c}@~ao );}@*
+@command{weechat::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{weechat::print_infobar (5, "mensagem");}@*
+@*
+
+@item
+@command{weechat::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.@*
@@ -356,17 +465,17 @@ RFC 2812: @uref{ftp://ftp.rfc-editor.org/in-notes/rfc2812.txt}
 @end itemize
 @*
 @emph{Exemplo:}@*
-@code{IRC::add_message_handler ("privmsg", my_function);}@*
+@code{weechat::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{@ @ @ @ weechat::print ("host=$hostmask, chan=$channel, msg=$message\n");}@*
 @code{@} }@*
 @*
 
 @item
-@command{IRC::add_command_handler ( nome, fun@,{c}@~ao );}@*
+@command{weechat::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}@*
@@ -379,20 +488,221 @@ Este nome pode pertencer a um comando j
 @end itemize
 @*
 @emph{Exemplo:}@*
-@code{IRC::add_command_handler ("command", my_command);}@*
+@code{weechat::add_command_handler ("command", my_command);}@*
 @code{sub my_command}@*
 @code{@{ }@*
-@code{@ @ @ @ IRC::print("Argumentos: ".@@_[0]);}@*
+@code{@ @ @ @ weechat::print("Argumentos: ".@@_[0]);}@*
 @code{@ @ @ @ return 0;}@*
 @code{@} }@*
 @*
 
+@item
+@command{weechat::command ( command, [channel, [server]] );}@*
+@*
+Execute a command or send a message to a channel.@*
+
+@emph{Arguments:}
+@itemize @minus
+@item @option{command}: command to execute (or message to send in a channel)
+@item @option{channel}: name of channel
+@item @option{server}: internal name of server
+@end itemize
+@*
+@emph{Examples:}@*
+@code{weechat::command ("hello world!");}@*
+@code{weechat::command ("/kick toto please leave this chan", "#weechat");}@*
+@code{weechat::command ("/nick newnick", "", "freenode");}@*
+@*
+
+@item
+@command{weechat::get_info ( nome, [servidor] );}@*
+@*
+Comece o v@'ario info sobre WeeChat, servidor ou usu@'ario.@*
+
+@emph{Argumentos:}
+@itemize @minus
+@item @option{nome}: nome do info a recuperar:
+@item @option{servidor}: nome interno da servidor
+@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("nick", "freenode");}@*
+@*
+
 @end itemize
 
 @node Scripts Python, Scripts Ruby, Scripts Perl, Extencoes
 @section Scripts Python
 
-N@~AO DESENVOLVIDO!
+@subsection Carregar/Descarregar Scripts Python
+
+Os Scripts Python s@~ao carregados e descarregados com o comando @command{/python}.
+(escreve @kbd{/help python} dentro do WeeChat para obteres ajuda acerca do comando).@*
+
+@emph{Exemplos:}@*
+@itemize @bullet
+@item
+Carregar um Script Python: @kbd{/python load /tmp/sample.py}@*
+@item
+Descarregar todos os Scripts Python: @kbd{/python unload}@*
+@item
+Listar todos os Scripts Python: @kbd{/python}@*
+@end itemize
+
+@subsection Interface WeeChat / Python
+
+@itemize @bullet
+@item
+@command{weechat.register ( nome, vers@~ao, fun@,{c}@~ao_de_shutdown, descri@,{c}@~ao );}@*
+@*
+Esta @'e a primeira fun@,{c}@~ao a invocar num Script Python.@*
+Todos os Scripts Python para o Weechat devem invocar esta fun@,{c}@~ao.@*
+
+@emph{Argumentos:}
+@itemize @minus
+@item @option{nome}: nome @'unico que indentifique o script (cada Script Python deve ter um @'unico nome)
+@item @option{vers@~ao}: vers@~ao do script
+@item @option{fun@,{c}@~ao_de_shutdown}: fun@,{c}@~ao Python 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{weechat.register ("sample", "1.0", "sample_end", "Sample script!");}@*
+@*
+
+@item
+@command{weechat.prnt ( mensagem, [canal, [servidor]] );}@*
+@*
+Imprimne uma mensagem na canal.@*
+
+@emph{Argumentos:}
+@itemize @minus
+@item @option{mensagem}: mensagem a mostrar
+@item @option{canal}: nome da canal
+@item @option{servidor}: nome interno da servidor
+@end itemize
+@*
+@emph{Exemplo:}@*
+@code{weechat.prnt ("mensagem");}@*
+@code{weechat.prnt ("mensagem", "#weechat");}@*
+@code{weechat.prnt ("mensagem", "#weechat", "freenode");}@*
+@*
+
+@item
+@command{weechat.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{weechat.print_infobar (5, "mensagem");}@*
+@*
+
+@item
+@command{weechat.add_message_handler ( nome, fun@,{c}@~ao );}@*
+@*
+Anexa uma fun@,{c}@~ao Python 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 Python invocada quando a mensagem é recebida
+@end itemize
+@*
+@emph{Exemplo:}@*
+@code{weechat.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{@ @ @ @ weechat.prnt ("host=$hostmask, chan=$channel, msg=$message\n");}@*
+@code{@} }@*
+@*
+
+@item
+@command{weechat.add_command_handler ( nome, fun@,{c}@~ao );}@*
+@*
+Cria um novo comando do Weechat, ligado a uma fun@,{c}@~ao Python.@*
+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 Python. Tem cuidado quando fizeres isto: os comandos originais não estar@~ao acessiveis antes de teres descarregado o Script Python.
+@item @option{fun@,{c}@~ao}: fun@,{c}@~ao Python ligada ao comando
+@end itemize
+@*
+@emph{Exemplo:}@*
+@code{weechat.add_command_handler ("command", my_command);}@*
+@code{sub my_command}@*
+@code{@{ }@*
+@code{@ @ @ @ weechat.prnt("Argumentos: ".@@_[0]);}@*
+@code{@ @ @ @ return 0;}@*
+@code{@} }@*
+@*
+
+@item
+@command{weechat.command ( command, [channel, [server]] );}@*
+@*
+Execute a command or send a message to a channel.@*
+
+@emph{Arguments:}
+@itemize @minus
+@item @option{command}: command to execute (or message to send in a channel)
+@item @option{channel}: name of channel
+@item @option{server}: internal name of server
+@end itemize
+@*
+@emph{Examples:}@*
+@code{weechat.command ("hello world!");}@*
+@code{weechat.command ("/kick toto please leave this chan", "#weechat");}@*
+@code{weechat.command ("/nick newnick", "", "freenode");}@*
+@*
+
+@item
+@command{weechat.get_info ( nome, [servidor] );}@*
+@*
+Comece o v@'ario info sobre WeeChat, servidor ou usu@'ario.@*
+
+@emph{Argumentos:}
+@itemize @minus
+@item @option{nome}: nome do info a recuperar:
+@item @option{servidor}: nome interno da servidor
+@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 = weechat.get_info("version");}@*
+@code{$nick = weechat.get_info("nick", "freenode");}@*
+@*
+
+@end itemize
 
 @node Scripts Ruby, , Scripts Python, Extencoes
 @section Scripts Ruby
@@ -428,15 +738,6 @@ O WeeChat @'e desenvolvido por :@*
 @item 
 FlashCode
 <@email{flashcode@@flashtux.org, flashcode AT flashtux.org}>
-@item
-Bounga
-<@email{bounga@@altern.org, bounga AT altern.org}>
-@item
-Xahlexx
-<@email{xahlexx@@tuxfamily.org, xahlexx AT tuxfamily.org}>
-@item
-Crevetor
-<@email{crevetor@@caramail.com, crevetor AT caramail.com}>
 
 @end itemize
 
@@ -457,7 +758,7 @@ Suporte por IRC:@*
 - servidor : @b{irc.freenode.net}@*
 - canal : @b{#weechat}@*@*
 @item
-Forum do WeeChat : mais tarde !@*@*
+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}.@*
@@ -477,7 +778,7 @@ Para mais detalhes, v@^e tamb@'em a p@'agina de suporte do WeeChat :@*
 
 Este manual documenta o cliente de IRC WeeChat, Ele faz parte do WeeChat.@*
 
-Copyright @copyright{} 2003 FlashCode
+Copyright @copyright{} 2005 FlashCode
 <@email{flashcode@@flashtux.org, flashcode AT flashtux.org}>@*
 Tradu@,{c}@~ao portuguesa de Jo@~ao Jer@'onimo <@email{j_j_b_o@@sapo.pt, j_j_b_o AT sapo.pt}>@*
 @*

po/POTFILES.in

@@ -1,28 +1,39 @@
 ./src/irc/irc-nick.c
 ./src/irc/irc-server.c
 ./src/irc/irc-channel.c
-./src/irc/irc.h
 ./src/irc/irc-commands.c
 ./src/irc/irc-display.c
 ./src/irc/irc-send.c
 ./src/irc/irc-recv.c
+./src/irc/irc-dcc.c
+./src/irc/irc.h
 ./src/plugins/perl/wee-perl.c
 ./src/plugins/perl/wee-perl.h
+./src/plugins/python/wee-python.c
+./src/plugins/python/wee-python.h
 ./src/plugins/plugins.c
 ./src/plugins/plugins.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.h
 ./src/gui/gui-common.c
+./src/gui/gui.h
 ./src/common/command.c
-./src/common/completion.c
-./src/common/history.c
-./src/common/weechat.c
 ./src/common/command.h
+./src/common/completion.c
 ./src/common/completion.h
+./src/common/fifo.c
+./src/common/fifo.h
+./src/common/history.c
 ./src/common/history.h
+./src/common/hotlist.c
+./src/common/hotlist.h
+./src/common/log.c
+./src/common/log.h
+./src/common/weechat.c
 ./src/common/weechat.h
 ./src/common/weeconfig.c
 ./src/common/weeconfig.h
+./src/common/weelist.c
+./src/common/weelist.h

src/Makefile.am

@@ -1,4 +1,4 @@
-# Copyright (c) 2004 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2005 FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/common/Makefile.am

@@ -1,4 +1,4 @@
-# Copyright (c) 2004 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2005 FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -25,7 +25,15 @@ lib_weechat_main_a_SOURCES = weechat.c \
                              command.h \
                              completion.c \
                              completion.h \
+                             weelist.c \
+                             weelist.h \
                              weeconfig.c \
                              weeconfig.h \
                              history.c \
-                             history.h
+                             history.h \
+                             hotlist.c \
+                             hotlist.h \
+                             log.c \
+                             log.h \
+                             fifo.c \
+                             fifo.h

src/common/command.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
  * See README for License detail, AUTHORS for developers list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,7 +21,9 @@
 #ifndef __WEECHAT_COMMAND_H
 #define __WEECHAT_COMMAND_H 1
 
+#include "weelist.h"
 #include "../irc/irc.h"
+#include "../gui/gui.h"
 
 #define MAX_ARGS 8192
 
@@ -48,33 +50,32 @@ struct t_weechat_alias
     t_weechat_alias *next_alias;
 };
 
-typedef struct t_index_command t_index_command;
-
-struct t_index_command
-{
-    char *command_name;
-    t_index_command *prev_index;
-    t_index_command *next_index;
-};
+extern t_weechat_command weechat_commands[];
 
 extern t_weechat_alias *weechat_alias;
-extern t_index_command *index_commands;
+extern t_weelist *index_commands;
+extern t_weelist *last_index_command;
 
-extern t_index_command *index_command_search (char *);
-extern t_index_command *index_command_new (char *);
-extern void index_command_build ();
+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 *, 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_python (int, char **);
 extern int weechat_cmd_save (int, char **);
 extern int weechat_cmd_server (int, char **);
-extern int weechat_cmd_set (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 **);
 
 #endif /* command.h */

src/common/completion.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
  * See README for License detail, AUTHORS for developers list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -29,8 +29,10 @@
 
 #include "weechat.h"
 #include "completion.h"
-#include "../irc/irc.h"
 #include "command.h"
+#include "weelist.h"
+#include "weeconfig.h"
+#include "../irc/irc.h"
 
 
 /*
@@ -40,8 +42,14 @@
 void
 completion_init (t_completion *completion)
 {
+    completion->context = COMPLETION_NULL;
+    completion->base_command = NULL;
+    completion->base_command_arg = 0;
     completion->position = -1;
     completion->base_word = NULL;
+    
+    completion->completion_list = NULL;
+    completion->last_completion = NULL;
 }
 
 /*
@@ -51,8 +59,536 @@ completion_init (t_completion *completion)
 void
 completion_free (t_completion *completion)
 {
+    if (completion->base_command)
+        free (completion->base_command);
+    completion->base_command = NULL;
+    
     if (completion->base_word)
         free (completion->base_word);
+    completion->base_word = NULL;
+    
+    while (completion->completion_list)
+        weelist_remove (&completion->completion_list,
+                        &completion->last_completion,
+                        completion->completion_list);
+    completion->completion_list = NULL;
+    completion->last_completion = NULL;
+}
+
+/*
+ * completion_stop: stop completion (for example after 1 arg of command with 1 arg)
+ */
+
+void
+completion_stop (t_completion *completion)
+{
+    completion->context = COMPLETION_NULL;
+    completion->position = -1;
+}
+
+/*
+ * completion_build_list: build data list according to command and argument #
+ */
+
+void
+completion_build_list (t_completion *completion, void *channel)
+{
+    t_weelist *ptr_list;
+    int i, j;
+    t_irc_server *ptr_server;
+    t_irc_channel *ptr_channel;
+    char option_name[256];
+    t_weechat_alias *ptr_alias;
+    
+    /* WeeChat internal commands */
+    
+    /* no completion for some commands */
+    if ((strcasecmp (completion->base_command, "server") == 0)
+        || (strcasecmp (completion->base_command, "save") == 0))
+    {
+        completion_stop (completion);
+        return;
+    }
+    if ((strcasecmp (completion->base_command, "alias") == 0)
+        && (completion->base_command_arg == 1))
+    {
+        for (ptr_list = index_commands; ptr_list; ptr_list = ptr_list->next_weelist)
+        {
+            weelist_add (&completion->completion_list,
+                         &completion->last_completion,
+                         ptr_list->data);
+        }
+        return;
+    }
+    if ((strcasecmp (completion->base_command, "buffer") == 0)
+        && (completion->base_command_arg == 1))
+    {
+        weelist_add (&completion->completion_list,
+                     &completion->last_completion,
+                     "close");
+        weelist_add (&completion->completion_list,
+                     &completion->last_completion,
+                     "list");
+        weelist_add (&completion->completion_list,
+                     &completion->last_completion,
+                     "move");
+        weelist_add (&completion->completion_list,
+                     &completion->last_completion,
+                     "notify");
+        return;
+    }
+    if ((strcasecmp (completion->base_command, "clear") == 0)
+        && (completion->base_command_arg == 1))
+    {
+        weelist_add (&completion->completion_list,
+                     &completion->last_completion,
+                     "-all");
+        return;
+    }
+    if ((strcasecmp (completion->base_command, "connect") == 0)
+        || (strcasecmp (completion->base_command, "disconnect") == 0))
+    {
+        if (completion->base_command_arg == 1)
+        {
+            for (ptr_server = irc_servers; ptr_server;
+                 ptr_server = ptr_server->next_server)
+            {
+                weelist_add (&completion->completion_list,
+                             &completion->last_completion,
+                             ptr_server->name);
+            }
+            return;
+        }
+        else
+        {
+            completion_stop (completion);
+            return;
+        }
+    }
+    if (strcasecmp (completion->base_command, "debug") == 0)
+    {
+        if (completion->base_command_arg == 1)
+            weelist_add (&completion->completion_list,
+                         &completion->last_completion,
+                         "dump");
+        else
+            completion_stop (completion);
+        return;
+    }
+    if ((strcasecmp (completion->base_command, "help") == 0)
+        && (completion->base_command_arg == 1))
+    {
+        for (i = 0; weechat_commands[i].command_name; i++)
+        {
+            weelist_add (&completion->completion_list,
+                         &completion->last_completion,
+                         weechat_commands[i].command_name);
+        }
+        for (i = 0; irc_commands[i].command_name; i++)
+        {
+            if (irc_commands[i].cmd_function_args || irc_commands[i].cmd_function_1arg)
+                weelist_add (&completion->completion_list,
+                             &completion->last_completion,
+                             irc_commands[i].command_name);
+        }
+        return;
+    }
+    if (((strcasecmp (completion->base_command, "perl") == 0)
+        || (strcasecmp (completion->base_command, "python") == 0))
+        && (completion->base_command_arg == 1))
+    {
+        weelist_add (&completion->completion_list,
+                     &completion->last_completion,
+                     "load");
+        weelist_add (&completion->completion_list,
+                     &completion->last_completion,
+                     "autoload");
+        weelist_add (&completion->completion_list,
+                     &completion->last_completion,
+                     "reload");
+        weelist_add (&completion->completion_list,
+                     &completion->last_completion,
+                     "unload");
+        return;
+    }
+    if ((strcasecmp (completion->base_command, "set") == 0)
+        && (completion->base_command_arg == 1))
+    {
+        for (i = 0; i < CONFIG_NUMBER_SECTIONS; i++)
+        {
+            if ((i != CONFIG_SECTION_ALIAS) && (i != CONFIG_SECTION_SERVER))
+            {
+                for (j = 0; weechat_options[i][j].option_name; j++)
+                {
+                    weelist_add (&completion->completion_list,
+                                 &completion->last_completion,
+                                 weechat_options[i][j].option_name);
+                }
+            }
+        }
+        for (ptr_server = irc_servers; ptr_server;
+             ptr_server = ptr_server->next_server)
+        {
+            for (i = 0; weechat_options[CONFIG_SECTION_SERVER][i].option_name; i++)
+            {
+                snprintf (option_name, sizeof (option_name), "%s.%s",
+                          ptr_server->name, 
+                          weechat_options[CONFIG_SECTION_SERVER][i].option_name);
+                weelist_add (&completion->completion_list,
+                             &completion->last_completion,
+                             option_name);
+            }
+        }
+        return;
+    }
+    if ((strcasecmp (completion->base_command, "unalias") == 0)
+        && (completion->base_command_arg == 1))
+    {
+        for (ptr_alias = weechat_alias; ptr_alias; ptr_alias = ptr_alias->next_alias)
+        {
+            weelist_add (&completion->completion_list,
+                         &completion->last_completion,
+                         ptr_alias->alias_name);
+        }
+        return;
+    }
+    if (strcasecmp (completion->base_command, "window") == 0)
+    {
+        if (completion->base_command_arg == 1)
+        {
+            weelist_add (&completion->completion_list,
+                         &completion->last_completion,
+                         "list");
+            weelist_add (&completion->completion_list,
+                         &completion->last_completion,
+                         "splith");
+            weelist_add (&completion->completion_list,
+                         &completion->last_completion,
+                         "splitv");
+            weelist_add (&completion->completion_list,
+                         &completion->last_completion,
+                         "merge");
+            return;
+        }
+        
+        if (completion->base_command_arg == 2)
+        {
+            weelist_add (&completion->completion_list,
+                         &completion->last_completion,
+                         "down");
+            weelist_add (&completion->completion_list,
+                         &completion->last_completion,
+                         "up");
+            weelist_add (&completion->completion_list,
+                         &completion->last_completion,
+                         "left");
+            weelist_add (&completion->completion_list,
+                         &completion->last_completion,
+                         "right");
+            weelist_add (&completion->completion_list,
+                         &completion->last_completion,
+                         "all");
+            return;
+        }
+        
+        completion_stop (completion);
+        return;
+    }
+    
+    /* IRC commands */
+    
+    /* no completion for some commands */
+    if ((strcasecmp (completion->base_command, "admin") == 0)
+        || (strcasecmp (completion->base_command, "die") == 0)
+        || (strcasecmp (completion->base_command, "info") == 0)
+        || (strcasecmp (completion->base_command, "join") == 0)
+        || (strcasecmp (completion->base_command, "links") == 0)
+        || (strcasecmp (completion->base_command, "list") == 0)
+        || (strcasecmp (completion->base_command, "lusers") == 0)
+        || (strcasecmp (completion->base_command, "motd") == 0)
+        || (strcasecmp (completion->base_command, "oper") == 0)
+        || (strcasecmp (completion->base_command, "rehash") == 0)
+        || (strcasecmp (completion->base_command, "restart") == 0)
+        || (strcasecmp (completion->base_command, "service") == 0)
+        || (strcasecmp (completion->base_command, "servlist") == 0)
+        || (strcasecmp (completion->base_command, "squery") == 0)
+        || (strcasecmp (completion->base_command, "squit") == 0)
+        || (strcasecmp (completion->base_command, "stats") == 0)
+        || (strcasecmp (completion->base_command, "summon") == 0)
+        || (strcasecmp (completion->base_command, "time") == 0)
+        || (strcasecmp (completion->base_command, "trace") == 0)
+        || (strcasecmp (completion->base_command, "users") == 0)
+        || (strcasecmp (completion->base_command, "wallops") == 0)
+        || (strcasecmp (completion->base_command, "who") == 0))
+    {
+        completion_stop (completion);
+        return;
+    }
+    if ((strcasecmp (completion->base_command, "away") == 0)
+        && (completion->base_command_arg == 1))
+    {
+        if (cfg_irc_default_msg_away && cfg_irc_default_msg_away[0])
+            weelist_add (&completion->completion_list,
+                         &completion->last_completion,
+                         cfg_irc_default_msg_away);
+        return;
+    }
+    if ((strcasecmp (completion->base_command, "ctcp") == 0)
+        && (completion->base_command_arg == 2))
+    {
+        weelist_add (&completion->completion_list,
+                     &completion->last_completion,
+                     "action");
+        weelist_add (&completion->completion_list,
+                     &completion->last_completion,
+                     "version");
+        return;
+    }
+    if ((strcasecmp (completion->base_command, "dcc") == 0)
+        && (completion->base_command_arg == 1))
+    {
+        weelist_add (&completion->completion_list,
+                     &completion->last_completion,
+                     "chat");
+        weelist_add (&completion->completion_list,
+                     &completion->last_completion,
+                     "send");
+        weelist_add (&completion->completion_list,
+                     &completion->last_completion,
+                     "close");
+        return;
+    }
+    if (strcasecmp (completion->base_command, "invite") == 0)
+    {
+        /* arg1: nickname */
+        if (completion->base_command_arg == 1)
+            return;
+        
+        /* arg > 2: not allowed */
+        if (completion->base_command_arg > 2)
+        {
+            completion_stop (completion);
+            return;
+        }
+        
+        /* arg2: channel */
+        if (SERVER(gui_current_window->buffer))
+        {
+            for (ptr_channel = SERVER(gui_current_window->buffer)->channels;
+                 ptr_channel; ptr_channel = ptr_channel->next_channel)
+            {
+                weelist_add (&completion->completion_list,
+                             &completion->last_completion,
+                             ptr_channel->name);
+            }
+        }
+        return;
+    }
+    if (strcasecmp (completion->base_command, "kick") == 0)
+    {
+        if (completion->base_command_arg != 1)
+            completion_stop (completion);
+        return;
+    }
+    if (strcasecmp (completion->base_command, "kill") == 0)
+    {
+        if (completion->base_command_arg != 1)
+            completion_stop (completion);
+        return;
+    }
+    if (strcasecmp (completion->base_command, "me") == 0)
+    {
+        completion->context = COMPLETION_NICK;
+        return;
+    }
+    if (strcasecmp (completion->base_command, "notice") == 0)
+    {
+        if (completion->base_command_arg != 1)
+            completion_stop (completion);
+        return;
+    }
+    if ((strcasecmp (completion->base_command, "part") == 0)
+        && (completion->base_command_arg == 1))
+    {
+        if (cfg_irc_default_msg_part && cfg_irc_default_msg_part[0])
+            weelist_add (&completion->completion_list,
+                         &completion->last_completion,
+                         cfg_irc_default_msg_part);
+        return;
+    }
+    if (strcasecmp (completion->base_command, "query") == 0)
+    {
+        if (completion->base_command_arg != 1)
+            completion_stop (completion);
+        return;
+    }
+    if ((strcasecmp (completion->base_command, "quit") == 0)
+        && (completion->base_command_arg == 1))
+    {
+        if (cfg_irc_default_msg_quit && cfg_irc_default_msg_quit[0])
+            weelist_add (&completion->completion_list,
+                         &completion->last_completion,
+                         cfg_irc_default_msg_quit);
+        return;
+    }
+    if (strcasecmp (completion->base_command, "topic") == 0)
+    {
+        if (completion->base_command_arg == 1)
+        {
+            if (!channel || !((t_irc_channel *)channel)->topic
+                || !((t_irc_channel *)channel)->topic[0])
+                completion_stop (completion);
+            else
+                weelist_add (&completion->completion_list,
+                             &completion->last_completion,
+                             ((t_irc_channel *)channel)->topic);
+        }
+        else
+            completion_stop (completion);
+        return;
+    }
+}
+
+/*
+ * completion_find_context: find context for completion
+ */
+
+void
+completion_find_context (t_completion *completion, void *channel, char *buffer,
+                         int size, int pos)
+{
+    int i, command, command_arg, pos_start, pos_end;
+    
+    /* look for context */
+    completion_free (completion);
+    command = (buffer[0] == '/') ? 1 : 0;
+    command_arg = 0;
+    i = 0;
+    while (i < pos)
+    {
+        if (buffer[i] == ' ')
+        {
+            command_arg++;
+            i++;
+            while ((i < pos) && (buffer[i] == ' ')) i++;
+        }
+        else
+            i++;
+    }
+    if (command)
+    {
+        if (command_arg > 0)
+        {
+            completion->context = COMPLETION_COMMAND_ARG;
+            completion->base_command_arg = command_arg;
+        }
+        else
+        {
+            completion->context = COMPLETION_COMMAND;
+            completion->base_command_arg = 0;
+        }
+    }
+    else
+    {
+        if (channel)
+            completion->context = COMPLETION_NICK;
+        else
+            completion->context = COMPLETION_NULL;
+    }
+    
+    /* look for word to complete (base word) */
+    completion->base_word_pos = 0;
+    completion->position_replace = pos;
+    
+    if (size > 0)
+    {
+        i = pos;
+        pos_start = i;
+        if (buffer[i] == ' ')
+        {
+            if ((i > 0) && (buffer[i-1] != ' '))
+            {
+                i--;
+                while ((i >= 0) && (buffer[i] != ' '))
+                    i--;
+                pos_start = i + 1;
+            }
+        }
+        else
+        {
+            while ((i >= 0) && (buffer[i] != ' '))
+                i--;
+            pos_start = i + 1;
+        }
+        i = pos;
+        while ((i < size) && (buffer[i] != ' '))
+            i++;
+        pos_end = i - 1;
+        
+        completion->base_word_pos = pos_start;
+        
+        if (pos_start <= pos_end)
+        {
+            if (completion->context == COMPLETION_COMMAND)
+                completion->position_replace = pos_start + 1;
+            else
+                completion->position_replace = pos_start;
+            
+            completion->base_word = (char *) malloc (pos_end - pos_start + 2);
+            for (i = pos_start; i <= pos_end; i++)
+                completion->base_word[i - pos_start] = buffer[i];
+            completion->base_word[pos_end - pos_start + 1] = '\0';
+        }
+    }
+    
+    if (!completion->base_word)
+        completion->base_word = strdup ("");
+    
+    /* find command (for command argument completion only) */
+    if (completion->context == COMPLETION_COMMAND_ARG)
+    {
+        pos_start = 0;
+        while ((pos_start < size) && (buffer[pos_start] != '/'))
+            pos_start++;
+        if (buffer[pos_start] == '/')
+        {
+            pos_start++;
+            pos_end = pos_start;
+            while ((pos_end < size) && (buffer[pos_end] != ' '))
+                pos_end++;
+            if (buffer[pos_end] == ' ')
+                pos_end--;
+            
+            completion->base_command = (char *) malloc (pos_end - pos_start + 2);
+            for (i = pos_start; i <= pos_end; i++)
+                completion->base_command[i - pos_start] = buffer[i];
+            completion->base_command[pos_end - pos_start + 1] = '\0';
+            completion_build_list (completion, channel);
+        }
+    }
+    
+    /* nick completion with nothing as base word is disabled,
+       in order to prevent completion when pasting messages with [tab] inside */
+    if ((completion->context == COMPLETION_NICK)
+        && ((!completion->base_word) || (!completion->base_word[0])))
+    {
+        completion->context = COMPLETION_NULL;
+        return;
+    }
+    
+    if (!completion->completion_list && channel &&
+        (((t_irc_channel *)channel)->type == CHAT_PRIVATE)
+        && (completion->context == COMPLETION_NICK))
+    {
+        /* nick completion in private (only other nick and self) */
+        completion->context = COMPLETION_NICK;
+        weelist_add (&completion->completion_list,
+                     &completion->last_completion,
+                     ((t_irc_channel *)channel)->name);
+        weelist_add (&completion->completion_list,
+                     &completion->last_completion,
+                     SERVER(gui_current_window->buffer)->nick);
+    }
 }
 
 /*
@@ -62,23 +598,37 @@ completion_free (t_completion *completion)
 void
 completion_command (t_completion *completion)
 {
-    int length, word_found_seen;
-    t_index_command *ptr_index;
+    int length, word_found_seen, other_completion;
+    t_weelist *ptr_weelist, *ptr_weelist2;
     
     length = strlen (completion->base_word) - 1;
     word_found_seen = 0;
-    for (ptr_index = index_commands; ptr_index; ptr_index = ptr_index->next_index)
+    other_completion = 0;
+    for (ptr_weelist = index_commands; ptr_weelist; ptr_weelist = ptr_weelist->next_weelist)
     {
-        if (strncasecmp (ptr_index->command_name, completion->base_word + 1, length) == 0)
+        if (strncasecmp (ptr_weelist->data, completion->base_word + 1, length) == 0)
         {
             if ((!completion->word_found) || word_found_seen)
             {
-                completion->word_found = ptr_index->command_name;
+                completion->word_found = ptr_weelist->data;
+                for (ptr_weelist2 = ptr_weelist->next_weelist; ptr_weelist2;
+                     ptr_weelist2 = ptr_weelist2->next_weelist)
+                {
+                    if (strncasecmp (ptr_weelist2->data,
+                        completion->base_word + 1, length) == 0)
+                        other_completion++;
+                }
+                if (other_completion == 0)
+                    completion->position = -1;
+                else
+                    if (completion->position < 0)
+                        completion->position = 0;
                 return;
             }
+            other_completion++;
         }
         if (completion->word_found &&
-            (strcasecmp (ptr_index->command_name, completion->word_found) == 0))
+            (strcasecmp (ptr_weelist->data, completion->word_found) == 0))
             word_found_seen = 1;
     }
     if (completion->word_found)
@@ -88,6 +638,54 @@ completion_command (t_completion *completion)
     }
 }
 
+/*
+ * completion_command_arg: complete a command argument
+ */
+
+void
+completion_command_arg (t_completion *completion, t_irc_channel *channel)
+{
+    int length, word_found_seen, other_completion;
+    t_weelist *ptr_weelist, *ptr_weelist2;
+    
+    length = strlen (completion->base_word);
+    word_found_seen = 0;
+    other_completion = 0;
+    for (ptr_weelist = completion->completion_list; ptr_weelist;
+         ptr_weelist = ptr_weelist->next_weelist)
+    {
+        if (strncasecmp (ptr_weelist->data, completion->base_word, length) == 0)
+        {
+            if ((!completion->word_found) || word_found_seen)
+            {
+                completion->word_found = ptr_weelist->data;
+                for (ptr_weelist2 = ptr_weelist->next_weelist; ptr_weelist2;
+                     ptr_weelist2 = ptr_weelist2->next_weelist)
+                {
+                    if (strncasecmp (ptr_weelist2->data,
+                        completion->base_word, length) == 0)
+                        other_completion++;
+                }
+                if (other_completion == 0)
+                    completion->position = -1;
+                else
+                    if (completion->position < 0)
+                        completion->position = 0;
+                return;
+            }
+            other_completion++;
+        }
+        if (completion->word_found &&
+            (strcasecmp (ptr_weelist->data, completion->word_found) == 0))
+            word_found_seen = 1;
+    }
+    if (completion->word_found)
+    {
+        completion->word_found = NULL;
+        completion_command_arg (completion, channel);
+    }
+}
+
 /*
  * completion_nick: complete a nick
  */
@@ -95,11 +693,21 @@ completion_command (t_completion *completion)
 void
 completion_nick (t_completion *completion, t_irc_channel *channel)
 {
-    int length, word_found_seen;
-    t_irc_nick *ptr_nick;
+    int length, word_found_seen, other_completion;
+    t_irc_nick *ptr_nick, *ptr_nick2;
 
+    if (!channel)
+        return;
+    
+    if (((t_irc_channel *)channel)->type == CHAT_PRIVATE)
+    {
+        completion_command_arg (completion, channel);
+        return;
+    }
+    
     length = strlen (completion->base_word);
     word_found_seen = 0;
+    other_completion = 0;
     for (ptr_nick = channel->nicks; ptr_nick; ptr_nick = ptr_nick->next_nick)
     {
         if (strncasecmp (ptr_nick->nick, completion->base_word, length) == 0)
@@ -107,8 +715,21 @@ completion_nick (t_completion *completion, t_irc_channel *channel)
             if ((!completion->word_found) || word_found_seen)
             {
                 completion->word_found = ptr_nick->nick;
+                for (ptr_nick2 = ptr_nick->next_nick; ptr_nick2;
+                     ptr_nick2 = ptr_nick2->next_nick)
+                {
+                    if (strncasecmp (ptr_nick2->nick,
+                        completion->base_word, length) == 0)
+                        other_completion++;
+                }
+                if (other_completion == 0)
+                    completion->position = -1;
+                else
+                    if (completion->position < 0)
+                        completion->position = 0;
                 return;
             }
+            other_completion++;
         }
         if (completion->word_found &&
             (strcasecmp (ptr_nick->nick, completion->word_found) == 0))
@@ -129,83 +750,49 @@ void
 completion_search (t_completion *completion, void *channel,
                    char *buffer, int size, int pos)
 {
-    int i, pos_start, pos_end;
     char *old_word_found;
     
-    /* TODO: complete when no word is there with command according to context */
-    if (size == 0)
-    {
-        completion->word_found = NULL;
-        return;
-    }
-    
-    /* if new complation => look for base word */
+    /* if new completion => look for base word */
     if (pos != completion->position)
     {
         completion->word_found = NULL;
-        
-        if ((pos == size) || (buffer[pos-1] != ' '))
-            pos--;
-        if ((pos > 0) && (buffer[pos] == ' '))
-            return;
-        
-        i = pos;
-        while ((i >= 0) && (buffer[i] != ' '))
-            i--;
-        pos_start = i + 1;
-        i = pos;
-        while ((i < size) && (buffer[i] != ' '))
-            i++;
-        pos_end = i - 1;
-        
-        if (pos_start > pos_end)
-            return;
-        
-        completion->base_word_pos = pos_start;
-        
-        if (completion->base_word)
-            free (completion->base_word);
-        completion->base_word = (char *) malloc (pos_end - pos_start + 2);
-        
-        for (i = pos_start; i <= pos_end; i++)
-            completion->base_word[i - pos_start] = buffer[i];
-        completion->base_word[pos_end - pos_start + 1] = '\0';
-        
-        if (completion->base_word[0] == '/')
-            completion->position_replace = pos_start + 1;
-        else
-            completion->position_replace = pos_start;
+        completion_find_context (completion, channel, buffer, size, pos);
     }
     
     /* completion */
     old_word_found = completion->word_found;
-    if (completion->base_word[0] == '/')
+    switch (completion->context)
     {
-        completion_command (completion);
-        if (completion->word_found)
-        {
-            if (old_word_found)
-                completion->diff_size = strlen (completion->word_found) -
-                                        strlen (old_word_found);
+        case COMPLETION_NULL:
+            /* should never be executed */
+            return;
+        case COMPLETION_NICK:
+            if (channel)
+                completion_nick (completion, (t_irc_channel *)channel);
             else
-                completion->diff_size = strlen (completion->word_found) -
-                                        strlen (completion->base_word) + 1;
-        }
+                return;
+            break;
+        case COMPLETION_COMMAND:
+            completion_command (completion);
+            break;
+        case COMPLETION_COMMAND_ARG:
+            if (completion->completion_list)
+                completion_command_arg (completion, (t_irc_channel *)channel);
+            else
+                completion_nick (completion, (t_irc_channel *)channel);
+            break;
     }
-    else
+    if (completion->word_found)
     {
-        if (channel)
+        if (old_word_found)
+            completion->diff_size = strlen (completion->word_found) -
+                                    strlen (old_word_found);
+        else
         {
-            completion_nick (completion, (t_irc_channel *)channel);
-            if (completion->word_found)
-            {
-                if (old_word_found)
-                    completion->diff_size = strlen (completion->word_found) -
-                                            strlen (old_word_found);
-                else
-                    completion->diff_size = strlen (completion->word_found) -
-                                            strlen (completion->base_word);
-            }
+            completion->diff_size = strlen (completion->word_found) -
+                                    strlen (completion->base_word);
+            if (completion->context == COMPLETION_COMMAND)
+                completion->diff_size++;
         }
     }
 }

src/common/completion.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
  * See README for License detail, AUTHORS for developers list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,16 +21,33 @@
 #ifndef __WEECHAT_COMPLETION_H
 #define __WEECHAT_COMPLETION_H 1
 
+#include "weelist.h"
+
+#define COMPLETION_NULL         0
+#define COMPLETION_NICK         1
+#define COMPLETION_COMMAND      2
+#define COMPLETION_COMMAND_ARG  3
+
 typedef struct t_completion t_completion;
 
 struct t_completion
 {
-    char *base_word;            /* word to complete (when Tab was pressed)  */
-    int base_word_pos;          /* beggining of base word                   */
-    int position;               /* position where we shoud complete         */
-    char *word_found;           /* word found (to replace base word)        */
-    int position_replace;       /* position where word should be replaced   */
-    int diff_size;              /* size difference (< 0 = char(s) deleted)  */
+    /* 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               */
+    
+    /* for command argument 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)      */
 };
 
 extern void completion_init (t_completion *);

src/common/fifo.c

@@ -0,0 +1,310 @@
+/*
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * See README for License detail, AUTHORS for developers list.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/* fifo.c: FIFO pipe for WeeChat remote control */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#include "weechat.h"
+#include "fifo.h"
+#include "command.h"
+#include "weeconfig.h"
+#include "../gui/gui.h"
+
+
+int weechat_fifo = -1;
+char *weechat_fifo_filename = NULL;
+char *weechat_fifo_unterminated = NULL;
+
+
+/*
+ * fifo_create: create FIFO pipe for remote control
+ */
+
+void
+fifo_create ()
+{
+    int filename_length;
+    
+    if (cfg_irc_fifo_pipe)
+    {
+        /* build FIFO filename: "~/.weechat/weechat_fifo_" + process PID */
+        if (!weechat_fifo_filename)
+        {
+            filename_length = strlen (weechat_home) + 64;
+            weechat_fifo_filename = (char *) malloc (filename_length * sizeof (char));
+            snprintf (weechat_fifo_filename, filename_length, "%s/weechat_fifo_%d",
+                      weechat_home, (int) getpid());
+        }
+        
+        /* create FIFO pipe, writable for user only */
+        if ((weechat_fifo = mkfifo (weechat_fifo_filename, 0600)) != 0)
+        {
+            weechat_fifo = -1;
+            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);
+            return;
+        }
+        
+        /* open FIFO pipe in read-only (for WeeChat), non nlobking mode */
+        if ((weechat_fifo = open (weechat_fifo_filename, O_RDONLY | O_NONBLOCK)) == -1)
+        {
+            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);
+            return;
+        }
+        
+        wee_log_printf (_("FIFO pipe is open\n"));
+    }
+}
+
+/*
+ * fifo_exec: execute a command/text received by FIFO pipe
+ */
+
+void
+fifo_exec (char *text)
+{
+    char *pos_msg, *pos;
+    t_irc_server *ptr_server;
+    t_irc_channel *ptr_channel;
+    t_gui_buffer *ptr_buffer;
+    
+    pos = NULL;
+    ptr_server = NULL;
+    ptr_channel = NULL;
+    ptr_buffer = NULL;
+    
+    /* look for server/channel at beginning of text */
+    /* text may be: "server,channel *text" or "server *text" or "*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;
+        }
+    }
+    else
+    {
+        pos_msg = strstr (text, " *");
+        if (!pos_msg)
+        {
+            irc_display_prefix (NULL, PREFIX_ERROR);
+            gui_printf (NULL, _("%s invalid text received on FIFO pipe\n"),
+                        WEECHAT_WARNING);
+            return;
+        }
+        pos_msg[0] = '\0';
+        pos = pos_msg - 1;
+        pos_msg += 2;
+        while ((pos >= text) && (pos[0] == ' '))
+        {
+            pos[0] = '\0';
+            pos--;
+        }
+        
+        if (text[0])
+        {
+            pos = strchr (text, ',');
+            if (pos)
+                pos[0] = '\0';
+            ptr_server = server_search (text);
+            if (!ptr_server || !ptr_server->buffer)
+            {
+                irc_display_prefix (NULL, PREFIX_ERROR);
+                gui_printf (NULL, _("%s server \"%s\" not found (FIFO pipe data)\n"),
+                            WEECHAT_WARNING, text);
+                return;
+            }
+            if (ptr_server)
+            {
+                if (pos)
+                {
+                    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;
+                    }
+                }
+            }
+        }
+    }
+    
+    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;
+    }
+    
+    user_command (ptr_server, ptr_buffer, pos_msg);
+}
+
+/*
+ * fifo_read: read data in FIFO pipe
+ */
+
+void
+fifo_read ()
+{
+    static char buffer[4096 + 2];
+    char *buf2, *pos, *ptr_buf, *next_ptr_buf;
+    int num_read;
+    
+    num_read = read (weechat_fifo, buffer, sizeof (buffer) - 2);
+    if (num_read > 0)
+    {
+        buffer[num_read] = '\0';
+        
+        buf2 = NULL;
+        ptr_buf = buffer;
+        if (weechat_fifo_unterminated)
+        {
+            buf2 = (char *) malloc (strlen (weechat_fifo_unterminated) +
+                strlen (buffer) + 1);
+            if (buf2)
+            {
+                strcpy (buf2, weechat_fifo_unterminated);
+                strcat (buf2, buffer);
+            }
+            ptr_buf = buf2;
+            free (weechat_fifo_unterminated);
+            weechat_fifo_unterminated = NULL;
+        }
+        
+        while (ptr_buf && ptr_buf[0])
+        {
+            next_ptr_buf = NULL;
+            pos = strstr (ptr_buf, "\r\n");
+            if (pos)
+            {
+                pos[0] = '\0';
+                next_ptr_buf = pos + 2;
+            }
+            else
+            {
+                pos = strstr (ptr_buf, "\n");
+                if (pos)
+                {
+                    pos[0] = '\0';
+                    next_ptr_buf = pos + 1;
+                }
+                else
+                {
+                    weechat_fifo_unterminated = strdup (ptr_buf);
+                    ptr_buf = NULL;
+                    next_ptr_buf = NULL;
+                }
+            }
+            
+            if (ptr_buf)
+                fifo_exec (ptr_buf);
+            
+            ptr_buf = next_ptr_buf;
+        }
+        
+        if (buf2)
+            free (buf2);
+    }
+    else
+    {
+        if (num_read < 0)
+        {
+            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);
+            fifo_remove ();
+        }
+        else
+        {
+            close (weechat_fifo);
+            weechat_fifo = open (weechat_fifo_filename, O_RDONLY | O_NONBLOCK);
+        }
+    }
+}
+
+/*
+ * fifo_remove: remove FIFO pipe
+ */
+
+void
+fifo_remove ()
+{
+    if (weechat_fifo != -1)
+    {
+        /* close FIFO pipe */
+        close (weechat_fifo);
+        weechat_fifo = -1;
+    }
+    
+    /* remove FIFO from disk */
+    if (weechat_fifo_filename)
+        unlink (weechat_fifo_filename);
+    
+    if (weechat_fifo_unterminated)
+    {
+        free (weechat_fifo_unterminated);
+        weechat_fifo_unterminated = NULL;
+    }
+    
+    if (weechat_fifo_filename)
+    {
+        free (weechat_fifo_filename);
+        weechat_fifo_filename = NULL;
+    }
+    
+    wee_log_printf (_("FIFO pipe is closed\n"));
+}

src/common/fifo.h

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * See README for License detail, AUTHORS for developers list.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+
+#ifndef __WEECHAT_FIFO_H
+#define __WEECHAT_FIFO_H 1
+
+extern int weechat_fifo;
+
+extern void fifo_create ();
+extern void fifo_read ();
+extern void fifo_remove ();
+
+#endif /* fifo.h */

src/common/history.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
  * See README for License detail, AUTHORS for developers list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -29,39 +29,157 @@
 
 #include "weechat.h"
 #include "history.h"
+#include "weeconfig.h"
 #include "../gui/gui.h"
 
 
 t_history *history_general = NULL;
+t_history *history_general_last = NULL;
 t_history *history_general_ptr = NULL;
+int num_history_general = 0;
 
 
+/*
+ * history_hide_password: hide a nickserv password
+ */
+
+void
+history_hide_password (char *string)
+{
+    char *pos_pwd;
+    
+    if (strstr (string, "nickserv "))
+    {
+        pos_pwd = strstr (string, "identify ");
+        if (!pos_pwd)
+            pos_pwd = strstr (string, "register ");
+        if (pos_pwd)
+        {
+            pos_pwd += 9;
+            while (pos_pwd[0])
+            {
+                pos_pwd[0] = '*';
+                pos_pwd++;
+            }
+        }
+    }
+}
+
 /*
  * history_add: add a text/command to history
  */
 
 void
-history_add (void *window, char *string)
+history_add (void *buffer, char *string)
 {
-    t_history *new_history;
+    t_history *new_history, *ptr_history;
     
+    /* add history to general history */
     new_history = (t_history *)malloc (sizeof (t_history));
     if (new_history)
     {
         new_history->text = strdup (string);
+        if (cfg_log_hide_nickserv_pwd)
+            history_hide_password (new_history->text);
         
-        /* add history to general history */
         if (history_general)
             history_general->prev_history = new_history;
+        else
+            history_general_last = new_history;
         new_history->next_history = history_general;
         new_history->prev_history = NULL;
         history_general = new_history;
+        num_history_general++;
         
-        /* add history to local history */
-        if (((t_gui_window *)(window))->history)
-            ((t_gui_window *)(window))->history->prev_history = new_history;
-        new_history->next_history = ((t_gui_window *)(window))->history;
+        /* remove one command if necessary */
+        if ((cfg_history_max_commands > 0)
+            && (num_history_general > cfg_history_max_commands))
+        {
+            ptr_history = history_general_last->prev_history;
+            history_general_last->prev_history->next_history = NULL;
+            if (history_general_last->text)
+                free (history_general_last->text);
+            free (history_general_last);
+            history_general_last = ptr_history;
+            num_history_general--;
+        }
+    }
+    
+    /* add history to local history */
+    new_history = (t_history *)malloc (sizeof (t_history));
+    if (new_history)
+    {
+        new_history->text = strdup (string);
+        if (cfg_log_hide_nickserv_pwd)
+            history_hide_password (new_history->text);
+        
+        if (((t_gui_buffer *)(buffer))->history)
+            ((t_gui_buffer *)(buffer))->history->prev_history = new_history;
+        else
+            ((t_gui_buffer *)(buffer))->last_history = new_history;
+        new_history->next_history = ((t_gui_buffer *)(buffer))->history;
         new_history->prev_history = NULL;
-        ((t_gui_window *)window)->history = new_history;
+        ((t_gui_buffer *)buffer)->history = new_history;
+        ((t_gui_buffer *)(buffer))->num_history++;
+        
+        /* remove one command if necessary */
+        if ((cfg_history_max_commands > 0)
+            && (((t_gui_buffer *)(buffer))->num_history > cfg_history_max_commands))
+        {
+            ptr_history = ((t_gui_buffer *)buffer)->last_history->prev_history;
+            ((t_gui_buffer *)buffer)->last_history->prev_history->next_history = NULL;
+            if (((t_gui_buffer *)buffer)->last_history->text)
+                free (((t_gui_buffer *)buffer)->last_history->text);
+            free (((t_gui_buffer *)buffer)->last_history);
+            ((t_gui_buffer *)buffer)->last_history = ptr_history;
+            ((t_gui_buffer *)(buffer))->num_history++;
+        }
     }
 }
+
+/*
+ * history_general_free: free general history
+ */
+
+void
+history_general_free ()
+{
+    t_history *ptr_history;
+    
+    while (history_general)
+    {
+        ptr_history = history_general->next_history;
+        if (history_general->text)
+            free (history_general->text);
+        free (history_general);
+        history_general = ptr_history;
+    }
+    history_general = NULL;
+    history_general_last = NULL;
+    history_general_ptr = NULL;
+    num_history_general = 0;
+}
+
+
+/*
+ * history_buffer_free: free history for a buffer
+ */
+
+void
+history_buffer_free (void *buffer)
+{
+    t_history *ptr_history;
+    
+    while (((t_gui_buffer *)(buffer))->history)
+    {
+        ptr_history = ((t_gui_buffer *)(buffer))->history->next_history;
+        if (((t_gui_buffer *)(buffer))->history->text)
+            free (((t_gui_buffer *)(buffer))->history->text);
+        free (((t_gui_buffer *)(buffer))->history);
+        ((t_gui_buffer *)(buffer))->history = ptr_history;
+    }
+    ((t_gui_buffer *)(buffer))->history = NULL;
+    ((t_gui_buffer *)(buffer))->last_history = NULL;
+    ((t_gui_buffer *)(buffer))->ptr_history = NULL;
+    ((t_gui_buffer *)(buffer))->num_history = 0;
+}

src/common/history.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
  * See README for License detail, AUTHORS for developers list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -31,5 +31,7 @@ struct t_history
 };
 
 extern void history_add (void *, char *);
+extern void history_general_free ();
+extern void history_buffer_free (void *);
 
 #endif /* history.h */

src/common/hotlist.c

@@ -0,0 +1,193 @@
+/*
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * See README for License detail, AUTHORS for developers list.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/* hotlist.c: WeeChat hotlist (buffers with activity) */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdlib.h>
+
+#include "weechat.h"
+#include "hotlist.h"
+#include "../irc/irc.h"
+#include "../gui/gui.h"
+
+
+t_weechat_hotlist *hotlist = NULL;
+t_weechat_hotlist *last_hotlist = NULL;
+t_gui_buffer *hotlist_initial_buffer = NULL;
+
+
+/*
+ * hotlist_search: find hotlist with buffer pointer
+ */
+
+t_weechat_hotlist *
+hotlist_search (t_gui_buffer *buffer)
+{
+    t_weechat_hotlist *ptr_hotlist;
+    
+    for (ptr_hotlist = hotlist; ptr_hotlist; ptr_hotlist = ptr_hotlist->next_hotlist)
+    {
+        if (ptr_hotlist->buffer == buffer)
+            return ptr_hotlist;
+    }
+    return NULL;
+}
+
+/*
+ * hotlist_find_pos: find position for a inserting in hotlist (for sorting hotlist)
+ */
+
+t_weechat_hotlist *
+hotlist_find_pos (t_weechat_hotlist *new_hotlist)
+{
+    t_weechat_hotlist *ptr_hotlist;
+    
+    for (ptr_hotlist = hotlist; ptr_hotlist; ptr_hotlist = ptr_hotlist->next_hotlist)
+    {
+        if (new_hotlist->priority > ptr_hotlist->priority)
+            return ptr_hotlist;
+    }
+    return NULL;
+}
+
+/*
+ * hotlist_add: add a buffer to hotlist, with priority
+ */
+
+void
+hotlist_add (int priority, t_gui_buffer *buffer)
+{
+    t_weechat_hotlist *new_hotlist, *pos_hotlist;
+    
+    if (!buffer)
+        return;
+    
+    /* do not highlight current buffer */
+    if (buffer == gui_current_window->buffer)
+        return;
+    
+    if ((pos_hotlist = hotlist_search (buffer)))
+    {
+        /* return if priority is greater or equal than the one to add */
+        if (pos_hotlist->priority >= priority)
+            return;
+        /* remove buffer if present with lower priority and go on */
+        hotlist_free (pos_hotlist);
+    }
+    
+    if ((new_hotlist = (t_weechat_hotlist *) malloc (sizeof (t_weechat_hotlist))) == NULL)
+    {
+        gui_printf (NULL,
+                    _("%s cannot add a buffer to hotlist\n"), WEECHAT_ERROR);
+        return;
+    }
+    
+    new_hotlist->priority = priority;
+    new_hotlist->buffer = buffer;
+    
+    if (hotlist)
+    {
+        pos_hotlist = hotlist_find_pos (new_hotlist);
+        
+        if (pos_hotlist)
+        {
+            /* insert hotlist into the hotlist (before hotlist found) */
+            new_hotlist->prev_hotlist = pos_hotlist->prev_hotlist;
+            new_hotlist->next_hotlist = pos_hotlist;
+            if (pos_hotlist->prev_hotlist)
+                pos_hotlist->prev_hotlist->next_hotlist = new_hotlist;
+            else
+                hotlist = new_hotlist;
+            pos_hotlist->prev_hotlist = new_hotlist;
+        }
+        else
+        {
+            /* add hotlist to the end */
+            new_hotlist->prev_hotlist = last_hotlist;
+            new_hotlist->next_hotlist = NULL;
+            last_hotlist->next_hotlist = new_hotlist;
+            last_hotlist = new_hotlist;
+        }
+    }
+    else
+    {
+        new_hotlist->prev_hotlist = NULL;
+        new_hotlist->next_hotlist = NULL;
+        hotlist = new_hotlist;
+        last_hotlist = new_hotlist;
+    }
+}
+
+/*
+ * hotlist_free: free a hotlist and remove it from hotlist queue
+ */
+
+void
+hotlist_free (t_weechat_hotlist *ptr_hotlist)
+{
+    t_weechat_hotlist *new_hotlist;
+
+    /* remove hotlist from queue */
+    if (last_hotlist == ptr_hotlist)
+        last_hotlist = ptr_hotlist->prev_hotlist;
+    if (ptr_hotlist->prev_hotlist)
+    {
+        (ptr_hotlist->prev_hotlist)->next_hotlist = ptr_hotlist->next_hotlist;
+        new_hotlist = hotlist;
+    }
+    else
+        new_hotlist = ptr_hotlist->next_hotlist;
+    
+    if (ptr_hotlist->next_hotlist)
+        (ptr_hotlist->next_hotlist)->prev_hotlist = ptr_hotlist->prev_hotlist;
+    
+    free (ptr_hotlist);
+    hotlist = new_hotlist;
+}
+
+/*
+ * hotlist_free_all: free all hotlists
+ */
+
+void
+hotlist_free_all ()
+{
+    /* remove all hotlists */
+    while (hotlist)
+        hotlist_free (hotlist);
+}
+
+/*
+ * hotlist_remove_buffer: remove a buffer from hotlist
+ */
+
+void
+hotlist_remove_buffer (t_gui_buffer *buffer)
+{
+    t_weechat_hotlist *pos_hotlist;
+
+    pos_hotlist = hotlist_search (buffer);
+    if (pos_hotlist)
+        hotlist_free (pos_hotlist);
+}

src/common/hotlist.h

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * See README for License detail, AUTHORS for developers list.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+
+#ifndef __WEECHAT_HOTLIST_H
+#define __WEECHAT_HOTLIST_H 1
+
+#include "../irc/irc.h"
+
+typedef struct t_weechat_hotlist t_weechat_hotlist;
+
+struct t_weechat_hotlist
+{
+    int priority;                       /* 0=crappy msg (join/part), 1=msg, */
+                                        /* 2=nick highlight                 */
+    t_gui_buffer *buffer;               /* associated buffer                */
+    t_weechat_hotlist *prev_hotlist;    /* link to previous hotlist         */
+    t_weechat_hotlist *next_hotlist;    /* link to next hotlist             */
+};
+
+extern t_weechat_hotlist *hotlist;
+extern t_gui_buffer *hotlist_initial_buffer;
+
+extern void hotlist_add (int, t_gui_buffer *);
+extern void hotlist_free (t_weechat_hotlist *);
+extern void hotlist_free_all ();
+extern void hotlist_remove_buffer (t_gui_buffer *);
+
+#endif /* hotlist.h */

src/common/log.c

@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * See README for License detail, AUTHORS for developers list.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/* log.c: log buffers to files */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "weechat.h"
+#include "log.h"
+#include "weeconfig.h"
+#include "../gui/gui.h"
+
+
+/*
+ * log_write_date: writes date to log file
+ */
+
+void
+log_write_date (t_gui_buffer *buffer)
+{
+    static char buf_time[256];
+    static time_t seconds;
+    struct tm *date_tmp;
+    
+    if (buffer->log_file)
+    {    
+        seconds = time (NULL);
+        date_tmp = localtime (&seconds);
+        if (date_tmp)
+        {
+            strftime (buf_time, sizeof (buf_time) - 1, cfg_log_timestamp, date_tmp);
+            fprintf (buffer->log_file, "%s  ", buf_time);
+            fflush (buffer->log_file);
+        }
+    }
+}
+
+/*
+ * log_write: writes a message to log file
+ */
+
+void
+log_write (t_gui_buffer *buffer, char *message)
+{
+    if (buffer->log_file)
+    {    
+        fprintf (buffer->log_file, "%s", message);
+        fflush (buffer->log_file);
+    }
+}
+
+/*
+ * log_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;
+    
+    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");
+        fflush (buffer->log_file);
+    }
+}
+
+/*
+ * log_start: starts a log
+ */
+
+void
+log_start (t_gui_buffer *buffer)
+{
+    int length;
+    char *ptr_home;
+    
+    ptr_home = getenv ("HOME");
+    length = strlen (cfg_log_path) +
+        ((cfg_log_path[0] == '~') ? strlen (ptr_home) : 0) +
+        64;
+    if (SERVER(buffer))
+        length += strlen (SERVER(buffer)->name);
+    if (CHANNEL(buffer))
+        length += strlen (CHANNEL(buffer)->name);
+    buffer->log_filename = (char *) malloc (length);
+    if (!buffer->log_filename)
+    {
+        wee_log_printf (_("Not enough memory to write log file for a buffer\n"));
+        return;
+    }
+    if (cfg_log_path[0] == '~')
+    {
+        strcpy (buffer->log_filename, ptr_home);
+        strcat (buffer->log_filename, cfg_log_path + 1);
+    }
+    else
+        strcpy (buffer->log_filename, cfg_log_path);
+    if (buffer->log_filename[strlen (buffer->log_filename) - 1] != DIR_SEPARATOR_CHAR)
+        strcat (buffer->log_filename, DIR_SEPARATOR);
+    
+    if (SERVER(buffer))
+    {
+        strcat (buffer->log_filename, SERVER(buffer)->name);
+        strcat (buffer->log_filename, ".");
+    }
+    if (CHANNEL(buffer))
+    {
+        strcat (buffer->log_filename, CHANNEL(buffer)->name);
+        strcat (buffer->log_filename, ".");
+    }
+    strcat (buffer->log_filename, "weechatlog");
+    
+    buffer->log_file = fopen (buffer->log_filename, "a");
+    if (!buffer->log_file)
+    {
+        wee_log_printf (_("Unable to write log file for a buffer\n"));
+        free (buffer->log_filename);
+        return;
+    }
+    log_write (buffer, _("****  Beginning of log  "));
+    log_write_date (buffer);
+    log_write (buffer, "****\n");
+}
+
+/*
+ * log_end: ends a log
+ */
+
+void
+log_end (t_gui_buffer *buffer)
+{
+    if (buffer->log_file)
+    {
+        log_write (buffer, _("****  End of log  "));
+        log_write_date (buffer);
+        log_write (buffer, "****\n");
+        fclose (buffer->log_file);
+        buffer->log_file = NULL;
+    }
+    if (buffer->log_filename)
+        free (buffer->log_filename);
+}

src/common/log.h

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * See README for License detail, AUTHORS for developers list.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+
+#ifndef __WEECHAT_LOG_H
+#define __WEECHAT_LOG_H 1
+
+#include "../irc/irc.h"
+#include "../gui/gui.h"
+
+extern void log_write_date (t_gui_buffer *);
+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 *);
+
+#endif /* log.h */

src/common/weechat.c

@@ -8,15 +8,13 @@
  * ###             WeeChat - Wee Enhanced Environment for Chat              ###
  * ###                 Fast & light environment for Chat                    ###
  * ###                                                                      ###
- * ###               By: FlashCode <flashcode@flashtux.org>                 ###
- * ###                   Bounga <bounga@altern.org>                         ###
- * ###                   Xahlexx <xahlexx@tuxisland.org>                    ###
- * ###                                                                      ###
- * ###                   http://weechat.flashtux.org                        ###
+ * ###                By FlashCode <flashcode@flashtux.org>                 ###
+   ###                                                                      ###
+ * ###                     http://weechat.flashtux.org                      ###
  * ###                                                                      ###
  * ############################################################################
  *
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
  * See README for License detail, AUTHORS for developers list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -50,29 +48,32 @@
 #include <time.h>
 #include <signal.h>
 
+#ifdef HAVE_ICONV
+#include <iconv.h>
+#endif
+
+#ifdef HAVE_LANGINFO_CODESET
+#include <langinfo.h>
+#endif
+
 #include "weechat.h"
 #include "weeconfig.h"
 #include "command.h"
+#include "fifo.h"
 #include "../irc/irc.h"
 #include "../gui/gui.h"
 #include "../plugins/plugins.h"
 
 
-int quit_weechat;       /* = 1 if quit request from user... why ? :'(        */
-char *weechat_home;     /* WeeChat home dir. (example: /home/toto/.weechat)  */
-FILE *log_file;         /* WeeChat log file (~/.weechat/weechat.log)         */
+int quit_weechat;               /* = 1 if quit request from user... why ? :'(       */
+int sigsegv = 0;                /* SIGSEGV received?                                */
+char *weechat_home = NULL;      /* WeeChat home dir. (example: /home/toto/.weechat) */
+FILE *weechat_log_file = NULL;  /* WeeChat log file (~/.weechat/weechat.log)        */
 
+char *local_charset = NULL;     /* local charset, for example: ISO-8859-1    */
 
-/*
- * my_sigint: SIGINT handler, do nothing (just ignore this signal)
- *            Prevents user for exiting with Ctrl-C
- */
+int server_cmd_line;    /* at least one server on WeeChat command line       */
 
-void
-my_sigint ()
-{
-    /* do nothing */
-}
 
 /*
  * wee_log_printf: displays a message in WeeChat log (~/.weechat/weechat.log)
@@ -86,7 +87,7 @@ wee_log_printf (char *message, ...)
     static time_t seconds;
     struct tm *date_tmp;
     
-    if (!log_file)
+    if (!weechat_log_file)
         return;
     
     va_start (argptr, message);
@@ -95,11 +96,213 @@ wee_log_printf (char *message, ...)
     
     seconds = time (NULL);
     date_tmp = localtime (&seconds);
-    fprintf (log_file, "[%04d-%02d-%02d %02d:%02d:%02d] %s",
-             date_tmp->tm_year + 1900, date_tmp->tm_mon + 1, date_tmp->tm_mday,
-             date_tmp->tm_hour, date_tmp->tm_min, date_tmp->tm_sec,
-             buffer);
-    fflush (log_file);
+    if (date_tmp)
+        fprintf (weechat_log_file, "[%04d-%02d-%02d %02d:%02d:%02d] %s",
+                 date_tmp->tm_year + 1900, date_tmp->tm_mon + 1, date_tmp->tm_mday,
+                 date_tmp->tm_hour, date_tmp->tm_min, date_tmp->tm_sec,
+                 buffer);
+    else
+        fprintf (weechat_log_file, "%s", buffer);
+    fflush (weechat_log_file);
+}
+
+/*
+ * weechat_convert_encoding: convert string to another encoding
+ */
+
+char *
+weechat_convert_encoding (char *from_code, char *to_code, char *string)
+{
+    char *outbuf;
+    
+    #ifdef HAVE_ICONV
+    iconv_t cd;
+    char *inbuf;
+    ICONV_CONST char *ptr_inbuf;
+    char *ptr_outbuf;
+    size_t inbytesleft, outbytesleft;
+    
+    if (from_code && from_code[0] && to_code && to_code[0]
+        && (strcasecmp(from_code, to_code) != 0))
+    {
+        cd = iconv_open (to_code, from_code);
+        if (cd == (iconv_t)(-1))
+            outbuf = strdup (string);
+        else
+        {
+            inbuf = strdup (string);
+            ptr_inbuf = inbuf;
+            inbytesleft = strlen (inbuf);
+            outbytesleft = inbytesleft * 4;
+            outbuf = (char *) malloc (outbytesleft + 2);
+            ptr_outbuf = outbuf;
+            iconv (cd, &ptr_inbuf, &inbytesleft, &ptr_outbuf, &outbytesleft);
+            if (inbytesleft != 0)
+            {
+                free (outbuf);
+                outbuf = strdup (string);
+            }
+            else
+                ptr_outbuf[0] = '\0';
+            free (inbuf);
+            iconv_close (cd);
+        }
+    }
+    else
+        outbuf = strdup (string);
+    #else
+    /* make gcc happy */
+    (void) from_code;
+    (void) to_code;
+    outbuf = strdup (string);
+    #endif /* HAVE_ICONV */
+    
+    return outbuf;
+}
+
+/*
+ * get_timeval_diff: calculates difference between two times (return in milliseconds)
+ */
+
+long get_timeval_diff(struct timeval *tv1, struct timeval *tv2)
+{
+    long diff_sec, diff_usec;
+    
+    diff_sec = tv2->tv_sec - tv1->tv_sec;
+    diff_usec = tv2->tv_usec - tv1->tv_usec;
+    
+    if (diff_usec < 0)
+    {
+        diff_usec += 1000000;
+        diff_sec--;
+    }
+    return ((diff_usec / 1000) + (diff_sec * 1000));
+}
+
+/*
+ * wee_display_config_options: display config options
+ */
+
+void wee_display_config_options ()
+{
+    int i, j, k;
+    
+    printf (_("WeeChat configuration options (~/.weechat/weechat.rc):\n\n"));
+    for (i = 0; i < CONFIG_NUMBER_SECTIONS; i++)
+    {
+        if (weechat_options[i])
+        {
+            j = 0;
+            while (weechat_options[i][j].option_name)
+            {
+                printf ("* %s:\n",
+                    weechat_options[i][j].option_name);
+                switch (weechat_options[i][j].option_type)
+                {
+                    case OPTION_TYPE_BOOLEAN:
+                        printf (_("  . type boolean (values: 'on' or 'off')\n"));
+                        printf (_("  . default value: '%s'\n"),
+                            (weechat_options[i][j].default_int == BOOL_TRUE) ?
+                            "on" : "off");
+                        break;
+                    case OPTION_TYPE_INT:
+                        printf (_("  . type integer (values: between %d and %d)\n"),
+                            weechat_options[i][j].min,
+                            weechat_options[i][j].max);
+                        printf (_("  . default value: %d\n"),
+                            weechat_options[i][j].default_int);
+                        break;
+                    case OPTION_TYPE_INT_WITH_STRING:
+                        printf (_("  . type string (values: "));
+                        k = 0;
+                        while (weechat_options[i][j].array_values[k])
+                        {
+                            printf ("'%s'",
+                                weechat_options[i][j].array_values[k]);
+                            if (weechat_options[i][j].array_values[k + 1])
+                                printf (", ");
+                            k++;
+                        }
+                        printf (")\n");
+                        printf (_("  . default value: '%s'\n"),
+                            (weechat_options[i][j].default_string) ?
+                            weechat_options[i][j].default_string : _("empty"));
+                        break;
+                    case OPTION_TYPE_COLOR:
+                        printf (_("  . type color (Curses or Gtk color, look at WeeChat doc)\n"));
+                        printf (_("  . default value: '%s'\n"),
+                            (weechat_options[i][j].default_string) ?
+                            weechat_options[i][j].default_string : _("empty"));
+                        break;
+                    case OPTION_TYPE_STRING:
+                        printf (_("  . type string (any string)\n"));
+                        printf (_("  . default value: '%s'\n"),
+                            (weechat_options[i][j].default_string) ?
+                            weechat_options[i][j].default_string : _("empty"));
+                        break;
+                }
+                printf (_("  . description: %s\n\n"),
+                    gettext (weechat_options[i][j].long_description));
+                j++;
+            }
+        }
+    }
+    printf (_("Moreover, you can define aliases in [alias] section, by adding lines like:\n"));
+    printf ("j=join\n");
+    printf (_("where 'j' is alias name, and 'join' associated command.\n\n"));
+}
+
+/*
+ * wee_display_commands: display WeeChat and/or IRC commands
+ */
+
+void wee_display_commands (int weechat_cmd, int irc_cmd)
+{
+    int i;
+    
+    if (weechat_cmd)
+    {
+        printf (_("%s internal commands:\n"), PACKAGE_NAME);
+        printf ("\n");
+        for (i = 0; weechat_commands[i].command_name; i++)
+        {
+            printf ("* %s", weechat_commands[i].command_name);
+            if (weechat_commands[i].arguments &&
+                weechat_commands[i].arguments[0])
+                printf ("  %s\n\n", _(weechat_commands[i].arguments));
+            else
+                printf ("\n\n");
+            printf ("%s\n\n", _(weechat_commands[i].command_description));
+            if (weechat_commands[i].arguments_description &&
+                weechat_commands[i].arguments_description[0])
+                printf ("%s\n\n",
+                    _(weechat_commands[i].arguments_description));
+        }
+    }
+    
+    if (irc_cmd)
+    {
+        printf (_("IRC commands:\n"));
+        printf ("\n");
+        for (i = 0; irc_commands[i].command_name; i++)
+        {
+            if (irc_commands[i].cmd_function_args ||
+                irc_commands[i].cmd_function_1arg)
+            {
+                printf ("* %s", irc_commands[i].command_name);
+                if (irc_commands[i].arguments &&
+                    irc_commands[i].arguments[0])
+                    printf ("  %s\n\n", _(irc_commands[i].arguments));
+                else
+                    printf ("\n\n");
+                printf ("%s\n\n", _(irc_commands[i].command_description));
+                if (irc_commands[i].arguments_description &&
+                    irc_commands[i].arguments_description[0])
+                    printf ("%s\n\n",
+                        _(irc_commands[i].arguments_description));
+            }
+        }
+    }
 }
 
 /*
@@ -110,26 +313,70 @@ void
 wee_parse_args (int argc, char *argv[])
 {
     int i;
+    t_irc_server server_tmp;
 
+    server_cmd_line = 0;
+    
     for (i = 1; i < argc; i++)
     {
-        if ((strcmp (argv[i], "-h") == 0)
-            || (strcmp (argv[i], "--help") == 0))
+        if ((strcmp (argv[i], "-c") == 0)
+            || (strcmp (argv[i], "--config") == 0))
         {
-            printf ("\n%s%s", WEE_USAGE);
-            exit (0);
+            wee_display_config_options ();
+            wee_shutdown (EXIT_SUCCESS);
+        }
+        else if ((strcmp (argv[i], "-h") == 0)
+                || (strcmp (argv[i], "--help") == 0))
+        {
+            printf ("\n" WEE_USAGE1, argv[0], argv[0]);
+            printf ("%s", WEE_USAGE2);
+            wee_shutdown (EXIT_SUCCESS);
+        }
+        if ((strcmp (argv[i], "-i") == 0)
+            || (strcmp (argv[i], "--irc-commands") == 0))
+        {
+            wee_display_commands (0, 1);
+            wee_shutdown (EXIT_SUCCESS);
         }
         else if ((strcmp (argv[i], "-l") == 0)
                  || (strcmp (argv[i], "--license") == 0))
         {
             printf ("\n%s%s", WEE_LICENSE);
-            exit (0);
+            wee_shutdown (EXIT_SUCCESS);
         }
         else if ((strcmp (argv[i], "-v") == 0)
                  || (strcmp (argv[i], "--version") == 0))
         {
             printf (PACKAGE_VERSION "\n");
-            exit (0);
+            wee_shutdown (EXIT_SUCCESS);
+        }
+        if ((strcmp (argv[i], "-w") == 0)
+            || (strcmp (argv[i], "--weechat-commands") == 0))
+        {
+            wee_display_commands (1, 0);
+            wee_shutdown (EXIT_SUCCESS);
+        }
+        else if ((strncasecmp (argv[i], "irc://", 6) == 0))
+        {
+            if (server_init_with_url (argv[i], &server_tmp) < 0)
+            {
+                fprintf (stderr, _("%s invalid syntax for IRC server ('%s'), ignored\n"),
+                         WEECHAT_WARNING, argv[i]);
+            }
+            else
+            {
+                if (!server_new (server_tmp.name, server_tmp.autoconnect,
+                                 server_tmp.autoreconnect,
+                                 server_tmp.autoreconnect_delay,
+                                 1, server_tmp.address, server_tmp.port,
+                                 server_tmp.password, server_tmp.nick1,
+                                 server_tmp.nick2, server_tmp.nick3,
+                                 NULL, NULL, NULL, 0, server_tmp.autojoin, 1))
+                    fprintf (stderr, _("%s unable to create server ('%s'), ignored\n"),
+                             WEECHAT_WARNING, argv[i]);
+                server_destroy (&server_tmp);
+                server_cmd_line = 1;
+            }
         }
         else
         {
@@ -173,48 +420,88 @@ wee_create_dir (char *directory)
 void
 wee_create_home_dirs ()
 {
-    char *dir_name;
+    char *ptr_home, *dir_name;
+    int dir_length;
 
     /* TODO: rewrite this code for Windows version */
+    ptr_home = getenv ("HOME");
+    if (!ptr_home)
+    {
+        fprintf (stderr, _("%s unable to get HOME directory\n"),
+                 WEECHAT_ERROR);
+        wee_shutdown (EXIT_FAILURE);
+    }
+    dir_length = strlen (ptr_home) + 10;
     weechat_home =
-        (char *) malloc ((strlen (getenv ("HOME")) + 10) * sizeof (char));
-    sprintf (weechat_home, "%s%s.weechat", getenv ("HOME"), DIR_SEPARATOR);
+        (char *) malloc (dir_length * sizeof (char));
+    if (!weechat_home)
+    {
+        fprintf (stderr, _("%s not enough memory for home directory\n"),
+                 WEECHAT_ERROR);
+        wee_shutdown (EXIT_FAILURE);
+    }
+    snprintf (weechat_home, dir_length, "%s%s.weechat", ptr_home,
+              DIR_SEPARATOR);
     
     /* create home directory "~/.weechat" ; error is fatal */
     if (!wee_create_dir (weechat_home))
-        exit (1);
+    {
+        fprintf (stderr, _("%s unable to create ~/.weechat directory\n"),
+                 WEECHAT_ERROR);
+        wee_shutdown (EXIT_FAILURE);
+    }
     
-    dir_name = (char *) malloc ((strlen (weechat_home) + 64) * sizeof (char));
+    dir_length = strlen (weechat_home) + 64;
+    dir_name = (char *) malloc (dir_length * sizeof (char));
     
+    #ifdef PLUGIN_PERL
     /* create "~/.weechat/perl" */
-    sprintf (dir_name, "%s%s%s", weechat_home, DIR_SEPARATOR, "perl");
+    snprintf (dir_name, dir_length, "%s%s%s", weechat_home, DIR_SEPARATOR,
+              "perl");
     if (wee_create_dir (dir_name))
     {
         /* create "~/.weechat/perl/autoload" */
-        sprintf (dir_name, "%s%s%s%s%s", weechat_home, DIR_SEPARATOR, "perl",
-                 DIR_SEPARATOR, "autoload");
+        snprintf (dir_name, dir_length, "%s%s%s%s%s", weechat_home,
+                 DIR_SEPARATOR, "perl", DIR_SEPARATOR, "autoload");
         wee_create_dir (dir_name);
     }
+    #endif
     
+    #ifdef PLUGIN_PYTHON
     /* create "~/.weechat/python" */
-    sprintf (dir_name, "%s%s%s", weechat_home, DIR_SEPARATOR, "python");
+    snprintf (dir_name, dir_length, "%s%s%s", weechat_home, DIR_SEPARATOR,
+             "python");
     if (wee_create_dir (dir_name))
     {
         /* create "~/.weechat/python/autoload" */
-        sprintf (dir_name, "%s%s%s%s%s", weechat_home, DIR_SEPARATOR, "python",
-                 DIR_SEPARATOR, "autoload");
+        snprintf (dir_name, dir_length, "%s%s%s%s%s", weechat_home,
+                 DIR_SEPARATOR, "python", DIR_SEPARATOR, "autoload");
         wee_create_dir (dir_name);
     }
+    #endif
     
+    #ifdef PLUGIN_RUBY
     /* create "~/.weechat/ruby" */
-    sprintf (dir_name, "%s%s%s", weechat_home, DIR_SEPARATOR, "ruby");
+    snprintf (dir_name, dir_length, "%s%s%s", weechat_home, DIR_SEPARATOR,
+             "ruby");
     if (wee_create_dir (dir_name))
     {
         /* create "~/.weechat/ruby/autoload" */
-        sprintf (dir_name, "%s%s%s%s%s", weechat_home, DIR_SEPARATOR, "ruby",
-                 DIR_SEPARATOR, "autoload");
+        snprintf (dir_name, dir_length, "%s%s%s%s%s", weechat_home,
+                 DIR_SEPARATOR, "ruby", DIR_SEPARATOR, "autoload");
         wee_create_dir (dir_name);
     }
+    #endif
+    
+    /* create "~/.weechat/logs" */
+    snprintf (dir_name, dir_length, "%s%s%s", weechat_home, DIR_SEPARATOR,
+              "logs");
+    if (!wee_create_dir (dir_name))
+    {
+        fprintf (stderr, _("%s unable to create ~/.weechat/logs directory\n"),
+                 WEECHAT_WARNING);
+    }
+    chmod (dir_name, 0700);
     
     free (dir_name);
 }
@@ -226,9 +513,6 @@ wee_create_home_dirs ()
 void
 wee_init_vars ()
 {
-    /* GUI not yet initialized */
-    gui_ready = 0;
-
     /* init received messages queue */
     recv_msgq = NULL;
     msgq_last_msg = NULL;
@@ -241,18 +525,17 @@ wee_init_vars ()
 void
 wee_init_log ()
 {
+    int filename_length;
     char *filename;
     
+    filename_length = strlen (weechat_home) + 64;
     filename =
-        (char *) malloc ((strlen (weechat_home) + 64) * sizeof (char));
-    sprintf (filename, "%s/" WEECHAT_LOG_NAME, weechat_home);
-    if ((log_file = fopen (filename, "wt")) == NULL)
-    {
-        free (filename);
+        (char *) malloc (filename_length * sizeof (char));
+    snprintf (filename, filename_length, "%s/" WEECHAT_LOG_NAME, weechat_home);
+    if ((weechat_log_file = fopen (filename, "wt")) == NULL)
         fprintf (stderr,
                  _("%s unable to create/append to log file (~/.weechat/%s)"),
-                 WEECHAT_ERROR, WEECHAT_LOG_NAME);
-    }
+                 WEECHAT_WARNING, WEECHAT_LOG_NAME);
     free (filename);
 }
 
@@ -294,6 +577,21 @@ weechat_welcome_message ()
         cfg_look_startup_version)
         gui_printf_color (NULL, COLOR_WIN_CHAT_PREFIX1,
             "-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n");
+    
+    wee_log_printf ("%s (%s %s %s)\n",
+                    PACKAGE_STRING, _("compiled on"), __DATE__, __TIME__);
+}
+
+/*
+ * wee_gui_shutdown: shutdown WeeChat GUI
+ */
+
+void
+wee_gui_shutdown ()
+{
+    dcc_end ();
+    server_free_all ();
+    gui_end ();
 }
 
 /*
@@ -301,13 +599,133 @@ weechat_welcome_message ()
  */
 
 void
-wee_shutdown ()
+wee_shutdown (int return_code)
 {
-    server_free_all ();
-    gui_end ();
-    if (log_file)
-        fclose (log_file);
-    exit (0);
+    fifo_remove ();
+    if (weechat_home)
+        free (weechat_home);
+    if (weechat_log_file)
+        fclose (weechat_log_file);
+    if (local_charset)
+        free (local_charset);
+    alias_free_all ();
+    exit (return_code);
+}
+
+/*
+ * wee_dump writes dump to WeeChat log file
+ */
+
+void
+wee_dump (int crash)
+{
+    t_irc_server *ptr_server;
+    t_irc_channel *ptr_channel;
+    t_irc_nick *ptr_nick;
+    t_gui_window *ptr_window;
+    t_gui_buffer *ptr_buffer;
+    
+    /* prevent reentrance */
+    if (sigsegv)
+        exit (EXIT_FAILURE);
+    
+    if (crash)
+    {
+        sigsegv = 1;
+        wee_log_printf ("Very bad, WeeChat is crashing (SIGSEGV received)...\n");
+    }
+    
+    wee_log_printf ("\n");
+    if (crash)
+    {
+        wee_log_printf ("******             WeeChat CRASH DUMP              ******\n");
+        wee_log_printf ("****** Please send this file to WeeChat developers ******\n");
+        wee_log_printf ("******    and explain when this crash happened     ******\n");
+    }
+    else
+    {
+        wee_log_printf ("******            WeeChat dump request             ******\n");
+    }
+    
+    for (ptr_server = irc_servers; ptr_server; ptr_server = ptr_server->next_server)
+    {
+        wee_log_printf ("\n");
+        server_print_log (ptr_server);
+        
+        for (ptr_channel = ptr_server->channels; ptr_channel;
+            ptr_channel = ptr_channel->next_channel)
+        {
+            wee_log_printf ("\n");
+            channel_print_log (ptr_channel);
+            
+            for (ptr_nick = ptr_channel->nicks; ptr_nick;
+                ptr_nick = ptr_nick->next_nick)
+            {
+                wee_log_printf ("\n");
+                nick_print_log (ptr_nick);
+            }
+            
+        }
+    }
+    
+    wee_log_printf ("\n");
+    wee_log_printf ("[windows/buffers]\n");
+    wee_log_printf ("  => windows:\n");
+    for (ptr_window = gui_windows; ptr_window; ptr_window = ptr_window->next_window)
+    {
+        wee_log_printf ("       0x%X\n", ptr_window);
+    }
+    wee_log_printf ("  => buffers:\n");
+    for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer)
+    {
+        wee_log_printf ("       0x%X\n", ptr_buffer);
+    }
+    wee_log_printf ("  => current window = 0x%X\n", gui_current_window);
+    
+    for (ptr_window = gui_windows; ptr_window; ptr_window = ptr_window->next_window)
+    {
+        wee_log_printf ("\n");
+        gui_window_print_log (ptr_window);
+    }
+    
+    for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer)
+    {
+        wee_log_printf ("\n");
+        gui_buffer_print_log (ptr_buffer);
+    }
+    
+    wee_log_printf ("\n");
+    wee_log_printf ("******                 End of dump                 ******\n");
+    wee_log_printf ("\n");
+}
+
+/*
+ * my_sigint: SIGINT handler, do nothing (just ignore this signal)
+ *            Prevents user for exiting with Ctrl-C
+ */
+
+void
+my_sigint ()
+{
+    /* do nothing */
+}
+
+/*
+ * my_sigsegv: SIGSEGV handler: save crash log to ~/.weechat/weechat.log and exit
+ */
+
+void
+my_sigsegv ()
+{
+    wee_dump (1);
+    wee_gui_shutdown ();
+    fprintf (stderr, "\n");
+    fprintf (stderr, "*** Very bad! WeeChat has crashed (SIGSEGV received)\n");
+    fprintf (stderr, "*** Full crash dump was saved to ~/.weechat/weechat.log file\n");
+    fprintf (stderr, "*** Please send this file to WeeChat developers.\n");
+    fprintf (stderr, "*** (be careful, private info may be in this file since\n");
+    fprintf (stderr, "*** part of chats are displayed, so remove lines if needed)\n\n");
+    wee_shutdown (EXIT_FAILURE);
 }
 
 /*
@@ -323,38 +741,49 @@ main (int argc, char *argv[])
     textdomain (PACKAGE);
     #endif
     
+    #ifdef HAVE_LANGINFO_CODESET
+    local_charset = strdup (nl_langinfo (CODESET));
+    #endif
+    
     signal (SIGINT, my_sigint);     /* ignore SIGINT signal                 */
+    signal (SIGSEGV, my_sigsegv);   /* crash dump when SIGSEGV is received  */
     gui_pre_init (&argc, &argv);    /* pre-initiliaze interface             */
     wee_init_vars ();               /* initialize some variables            */
     wee_parse_args (argc, argv);    /* parse command line args              */
     wee_create_home_dirs ();        /* create WeeChat directories           */
     wee_init_log ();                /* init log file                        */
-    index_command_build ();         /* build commands index  for completion */
+    command_index_build ();         /* build commands index for completion  */
     
     switch (config_read ())         /* read configuration                   */
     {
         case 0:                     /* config file OK                       */
             break;
         case -1:                    /* config file not found                */
-            config_create_default ();
-            config_read ();
+            if (config_create_default () < 0)
+                return EXIT_FAILURE;
+            if (config_read () != 0)
+                return EXIT_FAILURE;
             break;
         default:                    /* other error (fatal)                  */
             server_free_all ();
-            return 1;
+            return EXIT_FAILURE;
     }
     
     gui_init ();                    /* init WeeChat interface               */
-    plugin_init ();                 /* init plugin interface(s)             */    
     weechat_welcome_message ();     /* display WeeChat welcome message      */
-    server_auto_connect ();         /* auto-connect to servers              */
+    plugin_init ();                 /* init plugin interface(s)             */    
+                                    /* auto-connect to servers              */
+    server_auto_connect (server_cmd_line);
+    fifo_create ();                 /* create FIFO pipe for remote control  */
     
     gui_main_loop ();               /* WeeChat main loop                    */
     
     plugin_end ();                  /* end plugin interface(s)              */
     server_disconnect_all ();       /* disconnect from all servers          */
-    config_write (NULL);            /* save config file                     */
-    wee_shutdown ();                /* quit WeeChat (oh no, why?)           */
+    (void) config_write (NULL);     /* save config file                     */
+    command_index_free ();          /* free commands index                  */
+    wee_gui_shutdown ();            /* shut down WeeChat GUI                */
+    wee_shutdown (EXIT_SUCCESS);    /* quit WeeChat (oh no, why?)           */
     
-    return 0;                       /* make gcc happy (never executed)      */
+    return EXIT_SUCCESS;            /* make gcc happy (never executed)      */
 }

src/common/weechat.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
  * See README for License detail, AUTHORS for developers list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -26,10 +26,15 @@
 #endif
 
 #include <stdio.h>
+#include <sys/time.h>
 
 #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)
@@ -43,11 +48,11 @@
 #endif
 
 
-#define WEECHAT_COPYRIGHT PACKAGE_NAME " (c) 2004 by Wee Team"
+#define WEECHAT_COPYRIGHT_DATE "(c) 2003-2005"
 #define WEECHAT_WEBSITE "http://weechat.flashtux.org"
 
-#define WEECHAT_ERROR   _(PACKAGE_NAME " Error:")
-#define WEECHAT_WARNING _(PACKAGE_NAME " Warning:")
+#define WEECHAT_ERROR   _("WeeChat Error:")
+#define WEECHAT_WARNING _("WeeChat Warning:")
 
 /* log file */
 
@@ -56,10 +61,8 @@
 /* license */
 
 #define WEE_LICENSE \
-    PACKAGE_STRING " (c) Copyright 2004, compiled on " __DATE__ " " __TIME__ \
-    "\nDeveloped by FlashCode <flashcode@flashtux.org>\n" \
-    "             Bounga <bounga@altern.org>\n" \
-    "             Xahlexx <xahlexx@tuxisland.org>\n\n" \
+    PACKAGE_STRING " (c) Copyright 2003-2005, 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" \
     "the Free Software Foundation; either version 2 of the License, or\n" \
@@ -75,29 +78,40 @@
     "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"
     
-#define WEE_USAGE \
-    PACKAGE_STRING " (c) Copyright 2004, compiled on " __DATE__ " " __TIME__ \
-    "\nDeveloped by FlashCode <flashcode@flashtux.org>\n" \
-    "             Bounga <bounga@altern.org>\n" \
-    "             Xahlexx <xahlexx@tuxisland.org>\n\n" \
-    "  -h, --help          this help screen\n", \
-    "  -l, --license       display WeeChat license\n" \
-    "  -v, --version       display WeeChat version\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
-    #define DIR_SEPARATOR "\\"
+    #define DIR_SEPARATOR       "\\"
+    #define DIR_SEPARATOR_CHAR  '\\'
 #else
-    #define DIR_SEPARATOR "/"
+    #define DIR_SEPARATOR       "/"
+    #define DIR_SEPARATOR_CHAR  '/'
 #endif
 
 /* global variables and functions */
 
 extern int quit_weechat;
 extern char *weechat_home;
+extern char *local_charset;
 
 extern void wee_log_printf (char *, ...);
-extern void wee_shutdown ();
+extern void wee_dump (int);
+extern char *weechat_convert_encoding (char *, char *, char *);
+extern long get_timeval_diff (struct timeval *, struct timeval *);
+extern void wee_shutdown (int);
 
 #endif /* weechat.h */

src/common/weeconfig.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
  * See README for License detail, AUTHORS for developers list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,6 +21,8 @@
 #ifndef __WEECHAT_CONFIG_H
 #define __WEECHAT_CONFIG_H 1
 
+#include "../irc/irc.h"
+
 #define WEECHAT_CONFIG_NAME "weechat.rc"
 
 #define CONFIG_SECTION_NONE    -1
@@ -28,11 +30,12 @@
 #define CONFIG_SECTION_COLORS  1
 #define CONFIG_SECTION_HISTORY 2
 #define CONFIG_SECTION_LOG     3
-#define CONFIG_SECTION_DCC     4
-#define CONFIG_SECTION_PROXY   5
-#define CONFIG_SECTION_ALIAS   6
-#define CONFIG_SECTION_SERVER  7
-#define CONFIG_NUMBER_SECTIONS 8
+#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 OPTION_TYPE_BOOLEAN         1   /* values: on/off                   */
 #define OPTION_TYPE_INT             2   /* values: from min to max          */
@@ -70,13 +73,17 @@ struct t_config_option
     char **array_values;
     int *ptr_int;
     char **ptr_string;
-    int (*handler_change)(int *, char **);
+    void (*handler_change)();
 };
 
 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_encode;
+extern char *cfg_look_charset_internal;
+extern char *cfg_look_buffer_timestamp;
 extern int cfg_look_color_nicks;
 extern int cfg_look_color_actions;
 extern int cfg_look_remove_colors_from_msgs;
@@ -88,6 +95,9 @@ extern int cfg_look_nickmode;
 extern int cfg_look_nickmode_empty;
 extern char *cfg_look_no_nickname;
 extern char *cfg_look_completor;
+extern int cfg_look_infobar;
+extern char *cfg_look_infobar_timestamp;
+extern int cfg_look_infobar_delay_highlight;
 
 extern int cfg_col_title;
 extern int cfg_col_title_bg;
@@ -103,41 +113,67 @@ extern int cfg_col_chat_dark;
 extern int cfg_col_chat_highlight;
 extern int cfg_col_chat_bg;
 extern int cfg_col_status;
-extern int cfg_col_status_active;
+extern int cfg_col_status_delimiters;
 extern int cfg_col_status_data_msg;
+extern int cfg_col_status_data_highlight;
 extern int cfg_col_status_data_other;
 extern int cfg_col_status_more;
 extern int cfg_col_status_bg;
+extern int cfg_col_infobar;
+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_bg;
 extern int cfg_col_nick;
+extern int cfg_col_nick_away;
+extern int cfg_col_nick_chanowner;
+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_private;
 extern int cfg_col_nick_bg;
+extern int cfg_col_dcc_selected;
+extern int cfg_col_dcc_waiting;
+extern int cfg_col_dcc_connecting;
+extern int cfg_col_dcc_active;
+extern int cfg_col_dcc_done;
+extern int cfg_col_dcc_failed;
+extern int cfg_col_dcc_aborted;
 
 extern int cfg_history_max_lines;
 extern int cfg_history_max_commands;
 
-extern int cfg_log_auto_channels;
+extern int cfg_log_auto_server;
+extern int cfg_log_auto_channel;
 extern int cfg_log_auto_private;
+extern int cfg_log_plugin_msg;
 extern char *cfg_log_path;
-extern char *cfg_log_name;
 extern char *cfg_log_timestamp;
-extern char *cfg_log_start_string;
-extern char *cfg_log_end_string;
+extern int cfg_log_hide_nickserv_pwd;
+
+extern int cfg_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_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 int cfg_dcc_auto_accept_files;
-extern int cfg_dcc_auto_accept_max_size;
 extern int cfg_dcc_auto_accept_chats;
 extern int cfg_dcc_timeout;
+extern int cfg_dcc_blocksize;
 extern char *cfg_dcc_download_path;
 extern char *cfg_dcc_upload_path;
+extern int cfg_dcc_convert_spaces;
 extern int cfg_dcc_auto_rename;
 extern int cfg_dcc_auto_resume;
 
@@ -149,6 +185,19 @@ extern char *cfg_proxy_password;
 extern t_config_section config_sections [CONFIG_NUMBER_SECTIONS];
 extern t_config_option * weechat_options [CONFIG_NUMBER_SECTIONS];
 
+extern char *config_get_section ();
+extern void config_change_noop ();
+extern void config_change_title ();
+extern void config_change_buffers ();
+extern void config_change_buffer_content ();
+extern void config_change_color ();
+extern void config_change_away_check ();
+extern void config_change_fifo_pipe ();
+extern int config_option_set_value (t_config_option *, char *);
+extern t_config_option *config_option_search (char *);
+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 *);
 extern int config_read ();
 extern int config_create_default ();
 extern int config_write ();

src/common/weelist.c

@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * See README for License detail, AUTHORS for developers list.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/* weelist.c: sorted lists management */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "weechat.h"
+#include "weelist.h"
+
+
+/*
+ * weelist_search: search date in a list
+ */
+
+t_weelist *
+weelist_search (t_weelist *weelist, char *data)
+{
+    t_weelist *ptr_weelist;
+    
+    for (ptr_weelist = weelist; ptr_weelist; ptr_weelist = ptr_weelist->next_weelist)
+    {
+        if (strcasecmp (data, ptr_weelist->data) == 0)
+            return ptr_weelist;
+    }
+    /* word not found in list */
+    return NULL;
+}
+
+/*
+ * weelist_find_pos: find position for data (keeping list sorted)
+ */
+
+t_weelist *
+weelist_find_pos (t_weelist *weelist, char *data)
+{
+    t_weelist *ptr_weelist;
+    
+    for (ptr_weelist = weelist; ptr_weelist; ptr_weelist = ptr_weelist->next_weelist)
+    {
+        if (strcasecmp (data, ptr_weelist->data) < 0)
+            return ptr_weelist;
+    }
+    /* position not found, best position is at the end */
+    return NULL;
+}
+
+/*
+ * weelist_insert: insert an element to the list (at good position)
+ */
+
+void
+weelist_insert (t_weelist **weelist, t_weelist **last_weelist, t_weelist *element)
+{
+    t_weelist *pos_weelist;
+    
+    pos_weelist = weelist_find_pos (*weelist, element->data);
+    
+    if (*weelist)
+    {
+        if (pos_weelist)
+        {
+            /* insert data into the list (before position found) */
+            element->prev_weelist = pos_weelist->prev_weelist;
+            element->next_weelist = pos_weelist;
+            if (pos_weelist->prev_weelist)
+                pos_weelist->prev_weelist->next_weelist = element;
+            else
+                *weelist = element;
+            pos_weelist->prev_weelist = element;
+        }
+        else
+        {
+            /* add data to the end */
+            element->prev_weelist = *last_weelist;
+            element->next_weelist = NULL;
+            (*last_weelist)->next_weelist = element;
+            *last_weelist = element;
+        }
+    }
+    else
+    {
+        element->prev_weelist = NULL;
+        element->next_weelist = NULL;
+        *weelist = element;
+        *last_weelist = element;
+    }
+}
+
+/*
+ * weelist_add: create new data and add it to list
+ */
+
+t_weelist *
+weelist_add (t_weelist **weelist, t_weelist **last_weelist, char *data)
+{
+    t_weelist *new_weelist;
+    
+    if (!data || (!data[0]))
+        return NULL;
+    
+    if ((new_weelist = ((t_weelist *) malloc (sizeof (t_weelist)))))
+    {
+        new_weelist->data = strdup (data);
+        weelist_insert (weelist, last_weelist, new_weelist);
+        return new_weelist;
+    }
+    /* failed to allocate new element */
+    return NULL;
+}
+
+/*
+ * weelist_remove: free an element in a list
+ */
+
+void
+weelist_remove (t_weelist **weelist, t_weelist **last_weelist, t_weelist *element)
+{
+    t_weelist *new_weelist;
+    
+    /* remove element from list */
+    if (*last_weelist == element)
+        *last_weelist = element->prev_weelist;
+    if (element->prev_weelist)
+    {
+        (element->prev_weelist)->next_weelist = element->next_weelist;
+        new_weelist = *weelist;
+    }
+    else
+        new_weelist = element->next_weelist;
+    
+    if (element->next_weelist)
+        (element->next_weelist)->prev_weelist = element->prev_weelist;
+
+    /* free data */
+    if (element->data)
+        free (element->data);
+    free (element);
+    *weelist = new_weelist;
+}

src/common/weelist.h

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * See README for License detail, AUTHORS for developers list.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+
+#ifndef __WEECHAT_LIST_H
+#define __WEECHAT_LIST_H 1
+
+typedef struct t_weelist t_weelist;
+
+struct t_weelist
+{
+    char *data;
+    t_weelist *prev_weelist;
+    t_weelist *next_weelist;
+};
+
+t_weelist *weelist_search (t_weelist *, char *);
+t_weelist *weelist_add (t_weelist **, t_weelist **, char *);
+void weelist_remove (t_weelist **, t_weelist **, t_weelist *);
+
+#endif /* weelist.h */

src/gui/Makefile.am

@@ -1,4 +1,4 @@
-# Copyright (c) 2004 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2005 FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,10 +15,21 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-if GUI_CURSES
+INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\"
+
+noinst_LIBRARIES = lib_weechat_gui_common.a
+
+lib_weechat_gui_common_a_SOURCES = gui-common.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 +38,4 @@ if GUI_QT
 qt_dir=qt
 endif
 
-SUBDIRS = $(curses_dir) $(gtk_dir) $(qt_dir)
+SUBDIRS = . $(curses_dir) $(wxwidgets_dir) $(gtk_dir) $(qt_dir)

src/gui/curses/Makefile.am

@@ -1,4 +1,4 @@
-# Copyright (c) 2004 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2005 FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,14 +15,15 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
+INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\"
+
 bin_PROGRAMS = weechat-curses
 
-weechat_curses_LDADD = ../../common/lib_weechat_main.a \
+weechat_curses_LDADD = ../lib_weechat_gui_common.a \
+                       ../../common/lib_weechat_main.a \
                        ../../irc/lib_weechat_irc.a \
-                       $(CURSES_LIBS) \
+                       $(NCURSES_LIBS) \
                        ../../plugins/lib_weechat_plugins.a $(PLUGINS_LIBS)
 
-weechat_curses_SOURCES = ../gui.h \
-                         ../gui-common.c \
-                         gui-display.c \
+weechat_curses_SOURCES = gui-display.c \
 			             gui-input.c

src/gui/curses/gui-input.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
  * See README for License detail, AUTHORS for developers list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -31,12 +31,14 @@
 #include <signal.h>
 #include <time.h>
 #include <sys/socket.h>
-#include <curses.h>
+#include <ncurses.h>
 
 #include "../../common/weechat.h"
 #include "../gui.h"
 #include "../../common/weeconfig.h"
 #include "../../common/command.h"
+#include "../../common/hotlist.h"
+#include "../../common/fifo.h"
 #include "../../irc/irc.h"
 
 #define KEY_ESCAPE 27
@@ -49,294 +51,631 @@ void
 gui_read_keyb ()
 {
     int key, i;
-    t_gui_window *ptr_window;
-    char new_char[2];
+    t_gui_buffer *ptr_buffer;
+    t_irc_server *ptr_server;
+    t_irc_dcc *ptr_dcc, *ptr_dcc_next;
+    char new_char[3], *decoded_string;
+    t_irc_dcc *dcc_selected;
 
     key = getch ();
     if (key != ERR)
     {
         switch (key)
         {
-            /* resize event: do nothing */
+            /* resize event */
             case KEY_RESIZE:
-                gui_redraw_window (gui_current_window);
+                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):
+                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_previous_window ();
+                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(7):
-                gui_switch_to_next_window ();
+            case KEY_F(8):
+                gui_switch_to_next_window (gui_current_window);
+                break;
+            /* remove last infobar message */
+            case KEY_F(10):
+                gui_infobar_remove ();
+                gui_draw_buffer_infobar (gui_current_window->buffer, 1);
+                break;
+            case KEY_F(11):
+                gui_nick_move_page_up (gui_current_window);
+                break;
+            case KEY_F(12):
+                gui_nick_move_page_down (gui_current_window);
                 break;
             /* cursor up */
             case KEY_UP:
-                if (gui_current_window->ptr_history)
+                if (gui_current_window->buffer->dcc)
                 {
-                    gui_current_window->ptr_history =
-                        gui_current_window->ptr_history->next_history;
-                    if (!gui_current_window->ptr_history)
-                        gui_current_window->ptr_history =
-                            gui_current_window->history;
+                    if (dcc_list)
+                    {
+                        if (gui_current_window->dcc_selected
+                            && ((t_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
-                    gui_current_window->ptr_history =
-                        gui_current_window->history;
-                if (gui_current_window->ptr_history)
                 {
-                    gui_current_window->input_buffer_size =
-                        strlen (gui_current_window->ptr_history->text);
-                    gui_optimize_input_buffer_size (gui_current_window);
-                    gui_current_window->input_buffer_pos =
-                        gui_current_window->input_buffer_size;
-                    strcpy (gui_current_window->input_buffer,
-                        gui_current_window->ptr_history->text);
-                    gui_draw_window_input (gui_current_window);
+                    if (gui_current_window->buffer->ptr_history)
+                    {
+                        gui_current_window->buffer->ptr_history =
+                            gui_current_window->buffer->ptr_history->next_history;
+                        if (!gui_current_window->buffer->ptr_history)
+                            gui_current_window->buffer->ptr_history =
+                                gui_current_window->buffer->history;
+                    }
+                    else
+                        gui_current_window->buffer->ptr_history =
+                            gui_current_window->buffer->history;
+                    if (gui_current_window->buffer->ptr_history)
+                    {
+                        gui_current_window->buffer->input_buffer_size =
+                            strlen (gui_current_window->buffer->ptr_history->text);
+                        gui_optimize_input_buffer_size (gui_current_window->buffer);
+                        gui_current_window->buffer->input_buffer_pos =
+                            gui_current_window->buffer->input_buffer_size;
+                        strcpy (gui_current_window->buffer->input_buffer,
+                            gui_current_window->buffer->ptr_history->text);
+                        gui_draw_buffer_input (gui_current_window->buffer, 0);
+                    }
                 }
                 break;
             /* cursor down */
             case KEY_DOWN:
-                if (gui_current_window->ptr_history)
+                if (gui_current_window->buffer->dcc)
                 {
-                    gui_current_window->ptr_history =
-                        gui_current_window->ptr_history->prev_history;
-                    if (gui_current_window->ptr_history)
-                        gui_current_window->input_buffer_size =
-                            strlen (gui_current_window->ptr_history->text);
-                    else
-                        gui_current_window->input_buffer_size = 0;
-                    gui_optimize_input_buffer_size (gui_current_window);
-                    gui_current_window->input_buffer_pos =
-                        gui_current_window->input_buffer_size;
-                    if (gui_current_window->ptr_history)
-                        strcpy (gui_current_window->input_buffer,
-                            gui_current_window->ptr_history->text);
-                    gui_draw_window_input (gui_current_window);
+                    if (dcc_list)
+                    {
+                        if (!gui_current_window->dcc_selected
+                            || ((t_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->input_buffer_pos > 0)
+                if (!gui_current_window->buffer->dcc)
                 {
-                    gui_current_window->input_buffer_pos--;
-                    gui_draw_window_input (gui_current_window);
+                    if (gui_current_window->buffer->input_buffer_pos > 0)
+                    {
+                        gui_current_window->buffer->input_buffer_pos--;
+                        gui_draw_buffer_input (gui_current_window->buffer, 0);
+                    }
                 }
                 break;
             /* cursor right */
             case KEY_RIGHT:
-                if (gui_current_window->input_buffer_pos <
-                    gui_current_window->input_buffer_size)
+                if (!gui_current_window->buffer->dcc)
                 {
-                    gui_current_window->input_buffer_pos++;
-                    gui_draw_window_input (gui_current_window);
+                    if (gui_current_window->buffer->input_buffer_pos <
+                        gui_current_window->buffer->input_buffer_size)
+                    {
+                        gui_current_window->buffer->input_buffer_pos++;
+                        gui_draw_buffer_input (gui_current_window->buffer, 0);
+                    }
                 }
                 break;
-            /* home key */
+            /* home key or Control + A */
             case KEY_HOME:
-                if (gui_current_window->input_buffer_pos > 0)
+            case 0x01:
+                if (!gui_current_window->buffer->dcc)
                 {
-                    gui_current_window->input_buffer_pos = 0;
-                    gui_draw_window_input (gui_current_window);
+                    if (gui_current_window->buffer->input_buffer_pos > 0)
+                    {
+                        gui_current_window->buffer->input_buffer_pos = 0;
+                        gui_draw_buffer_input (gui_current_window->buffer, 0);
+                    }
                 }
                 break;
-            /* end key */
+            /* end key or Control + E */
             case KEY_END:
-                if (gui_current_window->input_buffer_pos <
-                    gui_current_window->input_buffer_size)
+            case 0x05:
+                if (!gui_current_window->buffer->dcc)
                 {
-                    gui_current_window->input_buffer_pos =
-                        gui_current_window->input_buffer_size;
-                    gui_draw_window_input (gui_current_window);
+                    if (gui_current_window->buffer->input_buffer_pos <
+                        gui_current_window->buffer->input_buffer_size)
+                    {
+                        gui_current_window->buffer->input_buffer_pos =
+                            gui_current_window->buffer->input_buffer_size;
+                        gui_draw_buffer_input (gui_current_window->buffer, 0);
+                    }
                 }
                 break;
             /* page up */
             case KEY_PPAGE:
-                gui_move_page_up ();
+                if (!gui_current_window->buffer->dcc)
+                    gui_move_page_up (gui_current_window);
                 break;
             /* page down */
             case KEY_NPAGE:
-                gui_move_page_down ();
+                if (!gui_current_window->buffer->dcc)
+                    gui_move_page_down (gui_current_window);
                 break;
             /* erase before cursor and move cursor to the left */
             case 127:
             case KEY_BACKSPACE:
-                if (gui_current_window->input_buffer_pos > 0)
+                if (!gui_current_window->buffer->dcc)
                 {
-                    i = gui_current_window->input_buffer_pos-1;
-                    while (gui_current_window->input_buffer[i])
+                    if (gui_current_window->buffer->input_buffer_pos > 0)
                     {
-                        gui_current_window->input_buffer[i] =
-                            gui_current_window->input_buffer[i+1];
-                        i++;
+                        i = gui_current_window->buffer->input_buffer_pos-1;
+                        while (gui_current_window->buffer->input_buffer[i])
+                        {
+                            gui_current_window->buffer->input_buffer[i] =
+                                gui_current_window->buffer->input_buffer[i+1];
+                            i++;
+                        }
+                        gui_current_window->buffer->input_buffer_size--;
+                        gui_current_window->buffer->input_buffer_pos--;
+                        gui_current_window->buffer->input_buffer[gui_current_window->buffer->input_buffer_size] = '\0';
+                        gui_draw_buffer_input (gui_current_window->buffer, 0);
+                        gui_optimize_input_buffer_size (gui_current_window->buffer);
+                        gui_current_window->buffer->completion.position = -1;
                     }
-                    gui_current_window->input_buffer_size--;
-                    gui_current_window->input_buffer_pos--;
-                    gui_current_window->input_buffer[gui_current_window->input_buffer_size] = '\0';
-                    gui_draw_window_input (gui_current_window);
-                    gui_optimize_input_buffer_size (gui_current_window);
-                    gui_current_window->completion.position = -1;
                 }
                 break;
-            /* Control + Backspace */
+            /* Control + Backspace or Control + W */
             case 0x08:
-                gui_delete_previous_word ();
+            case 0x17:
+                if (!gui_current_window->buffer->dcc)    
+                    gui_delete_previous_word (gui_current_window->buffer);
+                break;
+            /* Control + L */
+            case 0x0C:
+                gui_curses_resize_handler ();
                 break;
             /* erase char under cursor */
             case KEY_DC:
-                if (gui_current_window->input_buffer_pos <
-                    gui_current_window->input_buffer_size)
+                if (!gui_current_window->buffer->dcc)
                 {
-                    i = gui_current_window->input_buffer_pos;
-                    while (gui_current_window->input_buffer[i])
+                    if (gui_current_window->buffer->input_buffer_pos <
+                        gui_current_window->buffer->input_buffer_size)
                     {
-                        gui_current_window->input_buffer[i] =
-                            gui_current_window->input_buffer[i+1];
-                        i++;
+                        i = gui_current_window->buffer->input_buffer_pos;
+                        while (gui_current_window->buffer->input_buffer[i])
+                        {
+                            gui_current_window->buffer->input_buffer[i] =
+                                gui_current_window->buffer->input_buffer[i+1];
+                            i++;
+                        }
+                        gui_current_window->buffer->input_buffer_size--;
+                        gui_current_window->buffer->input_buffer[gui_current_window->buffer->input_buffer_size] = '\0';
+                        gui_draw_buffer_input (gui_current_window->buffer, 0);
+                        gui_optimize_input_buffer_size (gui_current_window->buffer);
+                        gui_current_window->buffer->completion.position = -1;
                     }
-                    gui_current_window->input_buffer_size--;
-                    gui_current_window->input_buffer[gui_current_window->input_buffer_size] = '\0';
-                    gui_draw_window_input (gui_current_window);
-                    gui_optimize_input_buffer_size (gui_current_window);
-                    gui_current_window->completion.position = -1;
                 }
                 break;
             /* Tab : completion */
             case '\t':
-                completion_search (&(gui_current_window->completion),
-                                   CHANNEL(gui_current_window),
-                                   gui_current_window->input_buffer,
-                                   gui_current_window->input_buffer_size,
-                                   gui_current_window->input_buffer_pos);
-                if (gui_current_window->completion.word_found)
+                if (!gui_current_window->buffer->dcc)
                 {
-                    // replace word with new completed word into input buffer
-                    gui_current_window->input_buffer_size +=
-                        gui_current_window->completion.diff_size;
-                    gui_optimize_input_buffer_size (gui_current_window);
-                    gui_current_window->input_buffer[gui_current_window->input_buffer_size] = '\0';
+                    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->completion.diff_size > 0)
+                    if (gui_current_window->buffer->completion.word_found)
                     {
-                        for (i = gui_current_window->input_buffer_size - 1;
-                            i >=  gui_current_window->completion.position_replace +
-                            (int)strlen (gui_current_window->completion.word_found); i--)
-                            gui_current_window->input_buffer[i] =
-                                gui_current_window->input_buffer[i -
-                                gui_current_window->completion.diff_size];
-                    }
-                    else
-                    {
-                        for (i = gui_current_window->completion.position_replace +
-                            strlen (gui_current_window->completion.word_found);
-                            i < gui_current_window->input_buffer_size; i++)
-                            gui_current_window->input_buffer[i] =
-                                gui_current_window->input_buffer[i -
-                                gui_current_window->completion.diff_size];
-                    }
-                    
-                    strncpy (gui_current_window->input_buffer + gui_current_window->completion.position_replace,
-                             gui_current_window->completion.word_found,
-                             strlen (gui_current_window->completion.word_found));
-                    gui_current_window->input_buffer_pos =
-                        gui_current_window->completion.position_replace +
-                        strlen (gui_current_window->completion.word_found);
-                    gui_current_window->completion.position =
-                        gui_current_window->input_buffer_pos;
-                    
-                    /* add space or completor to the end of completion, if needed */
-                    if (gui_current_window->completion.base_word[0] == '/')
-                    {
-                        if (gui_current_window->input_buffer[gui_current_window->input_buffer_pos] != ' ')
-                            gui_buffer_insert_string (" ",
-                                                      gui_current_window->input_buffer_pos);
-                        gui_current_window->completion.position++;
-                        gui_current_window->input_buffer_pos++;
-                    }
-                    else
-                    {
-                        if (gui_current_window->completion.base_word_pos == 0)
+                        /* replace word with new completed word into input buffer */
+                        if (gui_current_window->buffer->completion.diff_size > 0)
                         {
-                            if (strncmp (gui_current_window->input_buffer + gui_current_window->input_buffer_pos,
-                                cfg_look_completor, strlen (cfg_look_completor)) != 0)
-                                gui_buffer_insert_string (cfg_look_completor,
-                                                          gui_current_window->input_buffer_pos);
-                            gui_current_window->completion.position += strlen (cfg_look_completor);
-                            gui_current_window->input_buffer_pos += strlen (cfg_look_completor);
-                            if (gui_current_window->input_buffer[gui_current_window->input_buffer_pos] != ' ')
-                                gui_buffer_insert_string (" ",
-                                                          gui_current_window->input_buffer_pos);
-                            gui_current_window->completion.position++;
-                            gui_current_window->input_buffer_pos++;
+                            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);
                     }
-                    gui_draw_window_input (gui_current_window);
                 }
                 break;
             /* escape code (for control-key) */
             case KEY_ESCAPE:
                 if ((key = getch()) != ERR)
                 {
+                    /*gui_printf (gui_current_window->buffer,
+                        "[Debug] key pressed = %d, hex = %02X, octal = %o\n", key, key, key);*/
                     switch (key)
                     {
+                        /* Alt + left arrow */
                         case KEY_LEFT:
-                            gui_switch_to_previous_window ();
+                            gui_switch_to_previous_buffer (gui_current_window);
                             break;
+                        /* Alt + right arrow */
                         case KEY_RIGHT:
-                            gui_switch_to_next_window ();
+                            gui_switch_to_next_buffer (gui_current_window);
+                            break;
+                        /* Alt + home */
+                        case KEY_HOME:
+                            gui_nick_move_beginning (gui_current_window);
+                            break;
+                        /* Alt + end */
+                        case KEY_END:
+                            gui_nick_move_end (gui_current_window);
+                            break;
+                        /* Alt + page up */
+                        case KEY_PPAGE:
+                            gui_nick_move_page_up (gui_current_window);
+                            break;
+                        /* Alt + page down */
+                        case KEY_NPAGE:
+                            gui_nick_move_page_down (gui_current_window);
                             break;
                         case 79:
                             /* TODO: replace 79 by constant name! */
-                            if (key == 79)
+                            if ((key = getch()) != ERR)
                             {
-                                if ((key = getch()) != ERR)
+                                switch (key)
                                 {
-                                    switch (key)
-                                    {
-                                        /* Control + Right */
-                                        case 99:
-                                            gui_move_next_word ();
-                                            break;
-                                        /* Control + Left */
-                                        case 100:
-                                            gui_move_previous_word ();
-                                            break;
-                                    }
+                                    /* 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->input_buffer_size > 0)
+                if (!gui_current_window->buffer->dcc)    
                 {
-                    gui_current_window->input_buffer[gui_current_window->input_buffer_size] = '\0';
-                    history_add (gui_current_window, gui_current_window->input_buffer);
-                    gui_current_window->input_buffer_size = 0;
-                    gui_current_window->input_buffer_pos = 0;
-                    gui_current_window->input_buffer_1st_display = 0;
-                    gui_current_window->completion.position = -1;
-                    gui_current_window->ptr_history = NULL;
-                    ptr_window = gui_current_window;
-                    user_command (SERVER(gui_current_window),
-                                  gui_current_window->input_buffer);
-                    if (ptr_window == gui_current_window)
-                        gui_draw_window_input (ptr_window);
-                    if (ptr_window)
-                        ptr_window->input_buffer[0] = '\0';
+                    if (gui_current_window->buffer->input_buffer_size > 0)
+                    {
+                        gui_current_window->buffer->input_buffer[gui_current_window->buffer->input_buffer_size] = '\0';
+                        history_add (gui_current_window->buffer, gui_current_window->buffer->input_buffer);
+                        gui_current_window->buffer->input_buffer_size = 0;
+                        gui_current_window->buffer->input_buffer_pos = 0;
+                        gui_current_window->buffer->input_buffer_1st_display = 0;
+                        gui_current_window->buffer->completion.position = -1;
+                        gui_current_window->buffer->ptr_history = NULL;
+                        ptr_buffer = gui_current_window->buffer;
+                        user_command (SERVER(gui_current_window->buffer),
+                                      gui_current_window->buffer,
+                                      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:
-                /*gui_printf (gui_current_window,
-                    "[Debug] key pressed = %d, as octal: %o\n", key, key);*/
-                new_char[0] = key;
-                new_char[1] = '\0';
-                gui_buffer_insert_string (new_char,
-                                          gui_current_window->input_buffer_pos);
-                gui_current_window->input_buffer_pos++;
-                gui_draw_window_input (gui_current_window);
-                gui_current_window->completion.position = -1;
+                if (gui_current_window->buffer->dcc)
+                {
+                    dcc_selected = (gui_current_window->dcc_selected) ?
+                        (t_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;
+                            ptr_dcc = dcc_list;
+                            while (ptr_dcc)
+                            {
+                                ptr_dcc_next = ptr_dcc->next_dcc;
+                                if (DCC_ENDED(ptr_dcc->status))
+                                    dcc_free (ptr_dcc);
+                                ptr_dcc = ptr_dcc_next;
+                            }
+                            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;
         }
     }
@@ -350,38 +689,142 @@ void
 gui_main_loop ()
 {
     fd_set read_fd;
-    static struct timeval timeout;
+    static struct timeval timeout, tv;
+    static struct timezone tz;
     t_irc_server *ptr_server;
+    int old_min, old_sec, diff;
+    time_t new_time;
+    struct tm *local_time;
 
     quit_weechat = 0;
+    old_min = -1;
+    old_sec = -1;
+    check_away = 0;
     while (!quit_weechat)
     {
+        new_time = time (NULL);
+        local_time = localtime (&new_time);
+        
+        /* minute has changed ? => redraw infobar */
+        if (local_time->tm_min != old_min)
+        {
+            old_min = local_time->tm_min;
+            gui_draw_buffer_infobar (gui_current_window->buffer, 1);
+        }
+        
+        /* second has changed ? */
+        if (local_time->tm_sec != old_sec)
+        {
+            old_sec = local_time->tm_sec;
+            
+            /* infobar count down */
+            if (gui_infobar && gui_infobar->remaining_time > 0)
+            {
+                gui_infobar->remaining_time--;
+                if (gui_infobar->remaining_time == 0)
+                {
+                    gui_infobar_remove ();
+                    gui_draw_buffer_infobar (gui_current_window->buffer, 1);
+                }
+            }
+            
+            /* away check */
+            if (cfg_irc_away_check != 0)
+            {
+                check_away++;
+                if (check_away >= (cfg_irc_away_check * 60))
+                {
+                    check_away = 0;
+                    server_check_away ();
+                }
+            }
+        }
+        
+        FD_ZERO (&read_fd);
+        
+        FD_SET (STDIN_FILENO, &read_fd);
+        if (weechat_fifo != -1)
+            FD_SET (weechat_fifo, &read_fd);
+        
         timeout.tv_sec = 0;
         timeout.tv_usec = 10000;
-        FD_ZERO (&read_fd);
-        FD_SET (STDIN_FILENO, &read_fd);
+        
         for (ptr_server = irc_servers; ptr_server;
              ptr_server = ptr_server->next_server)
         {
-            if (ptr_server->sock4 >= 0)
-                FD_SET (ptr_server->sock4, &read_fd);
+            /* check if reconnection is pending */
+            if ((!ptr_server->is_connected)
+                && (ptr_server->reconnect_start > 0)
+                && (new_time >= (ptr_server->reconnect_start + ptr_server->autoreconnect_delay)))
+                server_reconnect (ptr_server);
+            else
+            {
+                if (ptr_server->is_connected)
+                {
+                    /* check for lag */
+                    if ((ptr_server->lag_check_time.tv_sec == 0)
+                        && (new_time >= ptr_server->lag_next_check))
+                    {
+                        server_sendf (ptr_server, "PING %s\r\n", ptr_server->address);
+                        gettimeofday (&(ptr_server->lag_check_time), &tz);
+                    }
+                    
+                    /* lag timeout => disconnect */
+                    if ((ptr_server->lag_check_time.tv_sec != 0)
+                        && (cfg_irc_lag_disconnect > 0))
+                    {
+                        gettimeofday (&tv, &tz);
+                        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);
+                            gui_printf (ptr_server->buffer,
+                                        _("%s lag is high, disconnecting from server...\n"),
+                                        WEECHAT_WARNING);
+                            server_disconnect (ptr_server, 1);
+                            continue;
+                        }
+                    }
+                }
+            
+                if (!ptr_server->is_connected && (ptr_server->child_pid > 0))
+                    FD_SET (ptr_server->child_read, &read_fd);
+                else
+                {
+                    if (ptr_server->sock >= 0)
+                        FD_SET (ptr_server->sock, &read_fd);
+                }
+            }
         }
-        if (select (FD_SETSIZE, &read_fd, NULL, NULL, &timeout))
+        
+        if (select (FD_SETSIZE, &read_fd, NULL, NULL, &timeout) > 0)
         {
             if (FD_ISSET (STDIN_FILENO, &read_fd))
             {
                 gui_read_keyb ();
             }
-            else
+            if ((weechat_fifo != -1) && (FD_ISSET (weechat_fifo, &read_fd)))
             {
-                for (ptr_server = irc_servers; ptr_server;
-                     ptr_server = ptr_server->next_server)
+                fifo_read ();
+            }
+            for (ptr_server = irc_servers; ptr_server;
+                 ptr_server = ptr_server->next_server)
+            {
+                if (!ptr_server->is_connected && (ptr_server->child_pid > 0))
                 {
-                    if ((ptr_server->sock4 >= 0) &&
-                        (FD_ISSET (ptr_server->sock4, &read_fd)))
+                    if (FD_ISSET (ptr_server->child_read, &read_fd))
+                        server_child_read (ptr_server);
+                }
+                else
+                {
+                    if ((ptr_server->sock >= 0) &&
+                        (FD_ISSET (ptr_server->sock, &read_fd)))
                         server_recv (ptr_server);
                 }
             }
         }
+        
+        /* manages active DCC */
+        dcc_handle ();
     }
 }

src/gui/gtk/Makefile.am

@@ -1,4 +1,4 @@
-# Copyright (c) 2004 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2005 FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,16 +15,15 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
+INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\" $(GTK_CFLAGS)
+
 bin_PROGRAMS = weechat-gtk
 
-INCLUDES = $(GTK_CFLAGS)
-
-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

src/gui/gtk/gui-display.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
  * See README for License detail, AUTHORS for developers list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -349,6 +349,35 @@ gui_redraw_window_status (t_gui_window *window)
     gui_draw_window_status (window);
 }
 
+/*
+ * gui_draw_window_infobar: draw infobar window
+ */
+
+void
+gui_draw_window_infobar (t_gui_window *window)
+{
+    /* TODO: manage splitted windows! */
+    if (window != gui_current_window)
+        return;
+    
+    /* TODO: draw infobar window! */
+}
+
+/*
+ * gui_redraw_window_infobar: redraw infobar window
+ */
+
+void
+gui_redraw_window_infobar (t_gui_window *window)
+{
+    /* TODO: manage splitted windows! */
+    if (window != gui_current_window)
+        return;
+    
+    /* TODO: first delete window content */
+    gui_draw_window_infobar (window);
+}
+
 /*
  * gui_draw_window_input: draw input window
  */
@@ -570,6 +599,16 @@ gui_init_colors ()
     /* TODO: init colors for Gtk */
 }
 
+/*
+ * gui_set_window_title: set window title
+ */
+
+void
+gui_set_window_title ()
+{
+    /* TODO: set window title for Gtk */
+}
+
 /*
  * gui_init: init GUI
  */

src/gui/gtk/gui-input.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
  * See README for License detail, AUTHORS for developers list.
  *
  * This program is free software; you can redistribute it and/or modify

src/gui/gui.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
  * See README for License detail, AUTHORS for developers list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -26,54 +26,77 @@
 
 #define INPUT_BUFFER_BLOCK_SIZE 256
 
-#define NUM_COLORS                  36
-#define COLOR_WIN_TITLE             1
-#define COLOR_WIN_CHAT              2
-#define COLOR_WIN_CHAT_TIME         3
-#define COLOR_WIN_CHAT_TIME_SEP     4
-#define COLOR_WIN_CHAT_PREFIX1      5
-#define COLOR_WIN_CHAT_PREFIX2      6
-#define COLOR_WIN_CHAT_NICK         7
-#define COLOR_WIN_CHAT_HOST         8
-#define COLOR_WIN_CHAT_CHANNEL      9
-#define COLOR_WIN_CHAT_DARK         10
-#define COLOR_WIN_CHAT_HIGHLIGHT    11
-#define COLOR_WIN_STATUS            12
-#define COLOR_WIN_STATUS_ACTIVE     13
-#define COLOR_WIN_STATUS_DATA_MSG   14
-#define COLOR_WIN_STATUS_DATA_OTHER 15
-#define COLOR_WIN_STATUS_MORE       16
-#define COLOR_WIN_INPUT             17
-#define COLOR_WIN_INPUT_CHANNEL     18
-#define COLOR_WIN_INPUT_NICK        19
-#define COLOR_WIN_NICK              20
-#define COLOR_WIN_NICK_OP           21
-#define COLOR_WIN_NICK_HALFOP       22
-#define COLOR_WIN_NICK_VOICE        23
-#define COLOR_WIN_NICK_SEP          24
-#define COLOR_WIN_NICK_SELF         25
-#define COLOR_WIN_NICK_PRIVATE      26
-#define COLOR_WIN_NICK_FIRST        27
-#define COLOR_WIN_NICK_LAST         36
-#define COLOR_WIN_NICK_NUMBER       (COLOR_WIN_NICK_LAST - COLOR_WIN_NICK_FIRST + 1)
+#define NUM_COLORS                      50
+#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_MORE             30
+#define COLOR_WIN_NICK_SEP              31
+#define COLOR_WIN_NICK_SELF             32
+#define COLOR_WIN_NICK_PRIVATE          33
+#define COLOR_WIN_NICK_FIRST            34
+#define COLOR_WIN_NICK_LAST             43
+#define COLOR_WIN_NICK_NUMBER           (COLOR_WIN_NICK_LAST - COLOR_WIN_NICK_FIRST + 1)
+#define COLOR_DCC_SELECTED              44
+#define COLOR_DCC_WAITING               45
+#define COLOR_DCC_CONNECTING            46
+#define COLOR_DCC_ACTIVE                47
+#define COLOR_DCC_DONE                  48
+#define COLOR_DCC_FAILED                49
+#define COLOR_DCC_ABORTED               50
 
-#define SERVER(window)  ((t_irc_server *)(window->server))
-#define CHANNEL(window) ((t_irc_channel *)(window->channel))
+#define SERVER(buffer)  ((t_irc_server *)(buffer->server))
+#define CHANNEL(buffer) ((t_irc_channel *)(buffer->channel))
 
-#define WIN_IS_SERVER(window)  (SERVER(window) && !CHANNEL(window))
-#define WIN_IS_CHANNEL(window) (CHANNEL(window) && (CHANNEL(window)->type == CHAT_CHANNEL))
-#define WIN_IS_PRIVATE(window) (CHANNEL(window) && (CHANNEL(window)->type == CHAT_PRIVATE))
+#define BUFFER_IS_SERVER(buffer)  (SERVER(buffer) && !CHANNEL(buffer))
+#define BUFFER_IS_CHANNEL(buffer) (CHANNEL(buffer) && (CHANNEL(buffer)->type == CHAT_CHANNEL))
+#define BUFFER_IS_PRIVATE(buffer) (CHANNEL(buffer) && (CHANNEL(buffer)->type == CHAT_PRIVATE))
 
-#define MSG_TYPE_TIME  0
-#define MSG_TYPE_NICK  1
-#define MSG_TYPE_INFO  2
-#define MSG_TYPE_MSG   3
+#define MSG_TYPE_TIME      1
+#define MSG_TYPE_PREFIX    2
+#define MSG_TYPE_NICK      4
+#define MSG_TYPE_INFO      8
+#define MSG_TYPE_MSG       16
+#define MSG_TYPE_HIGHLIGHT 32
+#define MSG_TYPE_NOLOG     64
 
-#define gui_printf_color(window, color, fmt, argz...) \
-    gui_printf_color_type(window, MSG_TYPE_INFO, color, fmt, ##argz)
+#define gui_printf_color(buffer, color, fmt, argz...) \
+    gui_printf_type_color(buffer, MSG_TYPE_INFO, color, fmt, ##argz)
 
-#define gui_printf(window, fmt, argz...) \
-    gui_printf_color_type(window, MSG_TYPE_INFO, -1, fmt, ##argz)
+#define gui_printf_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)
+
+#define gui_printf_nolog(buffer, fmt, argz...) \
+    gui_printf_type_color(buffer, MSG_TYPE_INFO | MSG_TYPE_NOLOG, -1, fmt, ##argz)
 
 typedef struct t_gui_message t_gui_message;
 
@@ -92,7 +115,9 @@ 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                */
@@ -107,56 +132,46 @@ struct t_gui_color
     int color;
 };
 
-typedef struct t_gui_window t_gui_window;
+typedef struct t_gui_infobar t_gui_infobar;
 
-struct t_gui_window
+struct t_gui_infobar
 {
-    int is_displayed;               /* = 1 if window is displayed           */
+    int color;                      /* text color                           */
+    char *text;                     /* infobar text                         */
+    int remaining_time;             /* delay (sec) before erasing this text */
+                                    /* if < 0, text is never erased (except */
+                                    /* by user action to erase it)          */
+    t_gui_infobar *next_infobar;    /* next message for infobar             */
+};
+
+typedef struct t_gui_buffer t_gui_buffer;
+
+struct t_gui_buffer
+{
+    int num_displayed;              /* number of windows displaying buffer  */
+    
+    int number;                     /* buffer number (for jump/switch)      */
     
     /* server/channel */
-    void *server;                   /* window's server                      */
-    void *channel;                  /* window's channel                     */
-    
-    /* global position & size */
-    int win_x, win_y;               /* position of window                   */
-    int win_width, win_height;      /* window geometry                      */
-    
-    /* chat window settings */
-    int win_chat_x, win_chat_y;     /* chat window position                 */
-    int win_chat_width;             /* width of chat window                 */
-    int win_chat_height;            /* height of chat window                */
-    int win_chat_cursor_x;          /* position of cursor in chat 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                */
-    
-    /* windows for Curses GUI */
-    void *win_title;                /* title window                         */
-    void *win_chat;                 /* chat window (exemple: channel)       */
-    void *win_nick;                 /* nick window                          */
-    void *win_status;               /* status window                        */
-    void *win_input;                /* input window                         */
-    
-    /* windows for Curses GUI */
-    void *textview_chat;            /* textview widget for chat             */
-    void *textbuffer_chat;          /* textbuffer widget for chat           */
-    void *texttag_chat;             /* texttag widget for chat              */
-    void *textview_nicklist;        /* textview widget for nicklist         */
-    void *textbuffer_nicklist;      /* textbuffer widget for nicklist       */
-    
-    /* windows for Curses GUI */
-    /* TODO: declare Qt window */
+    void *server;                   /* buffer's server                      */
+    void *channel;                  /* buffer's channel                     */
+    int dcc;                        /* buffer is dcc status                 */
     
     /* chat content (lines, line is composed by many messages) */
     t_gui_line *lines;              /* lines of chat window                 */
     t_gui_line *last_line;          /* last line of chat window             */
-    int first_line_displayed;       /* = 1 if first line is displayed       */
-    int sub_lines;                  /* if > 0 then do not display until end */
+    int num_lines;                  /* number of lines in the window        */
     int line_complete;              /* current line complete ? (\n ending)  */
-    int unread_data;                /* highlight windows with unread data   */
+    
+    /* notify level: when activity should be displayed? default: 3 (always) */
+    int notify_level;               /* 0 = never                            */
+                                    /* 1 = highlight only                   */
+                                    /* 2 = highlight + message              */
+                                    /* 3 = highlight + message + join/part  */
+    
+    /* file to save buffer content */
+    char *log_filename;             /* filename for saving buffer content   */
+    FILE *log_file;                 /* for logging buffer to file           */
     
     /* inupt buffer */
     char *input_buffer;             /* input buffer                         */
@@ -170,62 +185,147 @@ struct t_gui_window
     
     /* history */
     t_history *history;             /* commands history                     */
+    t_history *last_history;        /* last command in history              */
     t_history *ptr_history;         /* current command in history           */
+    int num_history;                /* number of commands in history        */
+    
+    /* link to previous/next buffer */
+    t_gui_buffer *prev_buffer;      /* link to previous buffer              */
+    t_gui_buffer *next_buffer;      /* link to next buffer                  */
+};
+
+typedef struct t_gui_window t_gui_window;
+
+struct t_gui_window
+{
+    /* global position & size */
+    int win_x, win_y;               /* position of window                   */
+    int win_width, win_height;      /* window geometry                      */
+    
+    /* chat window settings */
+    int win_chat_x, win_chat_y;     /* chat window position                 */
+    int win_chat_width;             /* width of chat window                 */
+    int win_chat_height;            /* height of chat window                */
+    int win_chat_cursor_x;          /* position of cursor in chat window    */
+    int win_chat_cursor_y;          /* position of cursor in chat window    */
+    
+    /* nicklist window settings */
+    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)   */
+    
+    /* windows for Curses GUI */
+    void *win_title;                /* title window                         */
+    void *win_chat;                 /* chat window (example: channel)       */
+    void *win_nick;                 /* nick window                          */
+    void *win_status;               /* status window                        */
+    void *win_infobar;              /* info bar window                      */
+    void *win_input;                /* input window                         */
+    void *win_separator;            /* separation between 2 splited (V) win */
+    
+    /* windows for Gtk GUI */
+    void *textview_chat;            /* textview widget for chat             */
+    void *textbuffer_chat;          /* textbuffer widget for chat           */
+    void *texttag_chat;             /* texttag widget for chat              */
+    void *textview_nicklist;        /* textview widget for nicklist         */
+    void *textbuffer_nicklist;      /* textbuffer widget for nicklist       */
+    
+    /* windows for Qt GUI */
+    /* TODO: declare Qt window */
+    
+    /* DCC */
+    void *dcc_first;                /* first dcc displayed                  */
+    void *dcc_selected;             /* selected dcc                         */
+    void *dcc_last_displayed;       /* last dcc displayed (for scroll)      */
+    
+    t_gui_buffer *buffer;           /* buffer currently displayed in window */
+    
+    int first_line_displayed;       /* = 1 if first line is displayed       */
+    int sub_lines;                  /* if > 0 then do not display until end */
     
-    /* link to next window */
     t_gui_window *prev_window;      /* link to previous window              */
     t_gui_window *next_window;      /* link to next window                  */
 };
 
 /* variables */
 
-extern int gui_ready;
+extern int gui_init_ok;
+extern int gui_ok;
+extern int gui_add_hotlist;
 extern t_gui_window *gui_windows;
 extern t_gui_window *last_gui_window;
 extern t_gui_window *gui_current_window;
-
-/* prototypes */
+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;
 
 /* GUI independent functions */
-extern t_gui_window *gui_window_new (void *, void *, int /*int, int, int, int*/); /* TODO: add coordinates and size */
-extern void gui_window_clear (t_gui_window *);
-extern void gui_window_clear_all ();
-extern t_gui_line *gui_new_line (t_gui_window *);
-extern t_gui_message *gui_new_message (t_gui_window *);
-extern void gui_optimize_input_buffer_size (t_gui_window *);
-extern void gui_delete_previous_word ();
-extern void gui_move_previous_word ();
-extern void gui_move_next_word ();
-extern void gui_buffer_insert_string (char *, int);
+
+extern t_gui_window *gui_window_new (int, int, int, int);
+extern t_gui_buffer *gui_buffer_new (t_gui_window *, void *, void *, int, int);
+extern void gui_buffer_clear (t_gui_buffer *);
+extern void gui_buffer_clear_all ();
+extern void gui_infobar_printf (int, int, char *, ...);
+extern void gui_window_free (t_gui_window *);
+extern void gui_infobar_remove ();
+extern void gui_buffer_free (t_gui_buffer *, int);
+extern t_gui_line *gui_new_line (t_gui_buffer *);
+extern t_gui_message *gui_new_message (t_gui_buffer *);
+extern void gui_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_window_print_log (t_gui_window *);
+extern void gui_buffer_print_log (t_gui_buffer *);
+
 /* GUI dependant functions */
+
 extern int gui_assign_color (int *, char *);
 extern int gui_get_color_by_name (char *);
 extern char *gui_get_color_by_value (int);
-extern int gui_window_has_nicklist (t_gui_window *);
+extern int gui_buffer_has_nicklist (t_gui_buffer *);
 extern void gui_calculate_pos_size (t_gui_window *);
-extern void gui_draw_window_title (t_gui_window *);
-extern void gui_redraw_window_title (t_gui_window *);
-extern void gui_draw_window_chat (t_gui_window *);
-extern void gui_redraw_window_chat (t_gui_window *);
-extern void gui_draw_window_nick (t_gui_window *);
-extern void gui_redraw_window_nick (t_gui_window *);
-extern void gui_draw_window_status (t_gui_window *);
-extern void gui_redraw_window_status (t_gui_window *);
-extern void gui_draw_window_input (t_gui_window *);
-extern void gui_redraw_window_input (t_gui_window *);
-extern void gui_redraw_window (t_gui_window *);
-extern void gui_switch_to_window (t_gui_window *);
-extern void gui_switch_to_previous_window ();
-extern void gui_switch_to_next_window ();
-extern void gui_move_page_up ();
-extern void gui_move_page_down ();
+extern void gui_draw_buffer_title (t_gui_buffer *, int);
+extern void gui_draw_buffer_chat (t_gui_buffer *, int);
+extern void gui_draw_buffer_nick (t_gui_buffer *, int);
+extern void gui_draw_buffer_status (t_gui_buffer *, int);
+extern void gui_draw_buffer_infobar (t_gui_buffer *, int);
+extern void gui_draw_buffer_input (t_gui_buffer *, int);
+extern void gui_redraw_buffer (t_gui_buffer *);
+extern void gui_switch_to_buffer (t_gui_window *, t_gui_buffer *);
+extern t_gui_buffer *gui_get_dcc_buffer ();
+extern void gui_switch_to_dcc_buffer ();
+extern void gui_switch_to_previous_buffer (t_gui_window *);
+extern void gui_switch_to_next_buffer (t_gui_window *);
+extern void gui_switch_to_previous_window (t_gui_window *);
+extern void gui_switch_to_next_window (t_gui_window *);
+extern void gui_move_page_up (t_gui_window *);
+extern void gui_move_page_down (t_gui_window *);
+extern void gui_nick_move_beginning (t_gui_window *);
+extern void gui_nick_move_end (t_gui_window *);
+extern void gui_nick_move_page_up (t_gui_window *);
+extern void gui_nick_move_page_down (t_gui_window *);
+extern void gui_curses_resize_handler ();
 extern void gui_window_init_subwindows (t_gui_window *);
+extern void gui_window_split_horiz (t_gui_window *);
+extern void gui_window_split_vertic (t_gui_window *);
+extern 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_window_merge_all (t_gui_window *);
 extern void gui_pre_init (int *, char **[]);
-//extern void gui_init_colors ();
+extern void gui_init_colors ();
+extern void gui_set_window_title ();
 extern void gui_init ();
-extern void gui_window_free (t_gui_window *);
 extern void gui_end ();
-extern void gui_printf_color_type (t_gui_window *, int, int, char *, ...);
+extern void gui_printf_type_color (/*@null@*/ t_gui_buffer *, int, int, char *, ...);
 extern void gui_main_loop ();
 
 #endif /* gui.h */

src/gui/qt/Makefile.am

@@ -1,4 +1,4 @@
-# Copyright (c) 2004 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2005 FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/gui/qt/gui-qt.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
  * See README for License detail, AUTHORS for developers list.
  *
  * This program is free software; you can redistribute it and/or modify

src/gui/qt/gui-qt.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
  * See README for License detail, AUTHORS for developers list.
  *
  * This program is free software; you can redistribute it and/or modify

src/gui/wxwidgets/Makefile.am

@@ -0,0 +1,29 @@
+# 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
+#
+
+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 \
+                       $(WXWIDGETS_LIBS) \
+                       ../../plugins/lib_weechat_plugins.a $(PLUGINS_LIBS)
+
+weechat_wxwidgets_SOURCES = gui-display.c \
+			             gui-input.c

src/gui/wxwidgets/gui-display.c

@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * See README for License detail, AUTHORS for developers list.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/* gui-display.c: display functions for wxWidgets GUI */

src/gui/wxwidgets/gui-input.c

@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * See README for License detail, AUTHORS for developers list.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/* gui-input: user input functions for wxWidgets GUI */

src/irc/Makefile.am

@@ -1,4 +1,4 @@
-# Copyright (c) 2004 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2005 FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,6 +15,8 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
+INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\"
+
 noinst_LIBRARIES = lib_weechat_irc.a
 
 lib_weechat_irc_a_SOURCES = irc.h \
@@ -24,4 +26,5 @@ lib_weechat_irc_a_SOURCES = irc.h \
                             irc-server.c \
                             irc-channel.c \
                             irc-nick.c \
+                            irc-dcc.c \
                             irc-display.c

src/irc/irc-channel.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
  * See README for License detail, AUTHORS for developers list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -25,13 +25,14 @@
 #endif
 
 #include <stdlib.h>
+#include <unistd.h>
 #include <string.h>
 
 #include "../common/weechat.h"
 #include "irc.h"
 
 
-t_irc_channel *current_channel = NULL;
+char *channel_modes = "iklmnst";
 
 
 /*
@@ -40,7 +41,7 @@ t_irc_channel *current_channel = NULL;
 
 t_irc_channel *
 channel_new (t_irc_server *server, int channel_type, char *channel_name,
-             int switch_to_window)
+             int switch_to_buffer)
 {
     t_irc_channel *new_channel;
     
@@ -53,8 +54,15 @@ channel_new (t_irc_server *server, int channel_type, char *channel_name,
 
     /* initialize new channel */
     new_channel->type = channel_type;
+    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->limit = 0;
+    new_channel->key = NULL;
+    new_channel->nicks_count = 0;
+    new_channel->checking_away = 0;
     new_channel->nicks = NULL;
     new_channel->last_nick = NULL;
 
@@ -67,7 +75,7 @@ channel_new (t_irc_server *server, int channel_type, char *channel_name,
         server->channels = new_channel;
     server->last_channel = new_channel;
 
-    gui_window_new (server, new_channel, switch_to_window);
+    gui_buffer_new (gui_current_window, server, new_channel, 0, switch_to_buffer);
     
     /* all is ok, return address of new channel */
     return new_channel;
@@ -96,6 +104,14 @@ 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)
         free (channel->name);
@@ -149,3 +165,121 @@ string_is_channel (char *string)
     first_char[1] = '\0';
     return (strpbrk (first_char, CHANNEL_PREFIX)) ? 1 : 0;    
 }
+
+/*
+ * channel_remove_away: remove away for all nicks on a channel
+ */
+
+void
+channel_remove_away (t_irc_channel *channel)
+{
+    t_irc_nick *ptr_nick;
+    
+    if (channel->type == CHAT_CHANNEL)
+    {
+        for (ptr_nick = channel->nicks; ptr_nick; ptr_nick = ptr_nick->next_nick)
+        {
+            ptr_nick->is_away = 0;
+        }
+        gui_draw_buffer_nick (channel->buffer, 0);
+    }
+}
+
+/*
+ * channel_check_away: check for away on a channel
+ */
+
+void
+channel_check_away (t_irc_server *server, t_irc_channel *channel)
+{
+    if (channel->type == CHAT_CHANNEL)
+    {
+        channel->checking_away++;
+        server_sendf (server, "WHO %s\r\n", channel->name);
+    }
+}
+
+/*
+ * channel_set_away: set/unset away status for a channel
+ */
+
+void
+channel_set_away (t_irc_channel *channel, char *nick, int is_away)
+{
+    t_irc_nick *ptr_nick;
+    
+    if (channel->type == CHAT_CHANNEL)
+    {
+        ptr_nick = nick_search (channel, nick);
+        if (ptr_nick)
+            nick_set_away (channel, ptr_nick, is_away);
+    }
+}
+
+/*
+ * channel_create_dcc: create DCC CHAT channel
+ */
+
+int
+channel_create_dcc (t_irc_dcc *ptr_dcc)
+{
+    t_irc_channel *ptr_channel;
+    
+    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);
+    if (!ptr_channel)
+        return 0;
+    
+    if (ptr_channel->dcc_chat &&
+        (!DCC_ENDED(((t_irc_dcc *)(ptr_channel->dcc_chat))->status)))
+        return 0;
+    
+    ptr_channel->dcc_chat = ptr_dcc;
+    ptr_dcc->channel = ptr_channel;
+    gui_redraw_buffer (ptr_channel->buffer);
+    return 1;
+}
+
+/*
+ * channel_remove_dcc: remove a DCC CHAT
+ */
+
+void
+channel_remove_dcc (t_irc_dcc *ptr_dcc)
+{
+    t_irc_channel *ptr_channel;
+    
+    for (ptr_channel = ptr_dcc->server->channels; ptr_channel;
+        ptr_channel = ptr_channel->next_channel)
+    {
+        if ((t_irc_dcc *)(ptr_channel->dcc_chat) == ptr_dcc)
+        {
+            ptr_channel->dcc_chat = NULL;
+            gui_redraw_buffer (ptr_channel->buffer);
+        }
+    }
+}
+
+/*
+ * channel_print_log: print channel infos in log (usually for crash dump)
+ */
+
+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);
+}

src/irc/irc-commands.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
  * See README for License detail, AUTHORS for developers list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -40,20 +40,36 @@ t_irc_command irc_commands[] =
     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 },
+  { "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 },
+  { "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 },
+  { "dehalfop", N_("removes half channel operator status from nickname(s)"),
+    N_("nickname [nickname]"), "",
+    1, MAX_ARGS, 1, irc_cmd_send_dehalfop, NULL, NULL },
   { "deop", N_("removes channel operator status from nickname(s)"),
     N_("nickname [nickname]"), "",
-    1, 1, 1, irc_cmd_send_deop, NULL, NULL },
+    1, MAX_ARGS, 1, irc_cmd_send_deop, NULL, NULL },
   { "devoice", N_("removes voice from nickname(s)"),
     N_("nickname [nickname]"), "",
-    1, 1, 1, irc_cmd_send_devoice, NULL, NULL },
+    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 },
+  { "halfop", N_("gives half channel operator status to nickname(s)"),
+    N_("nickname [nickname]"), "",
+    1, MAX_ARGS, 1, irc_cmd_send_halfop, NULL, NULL },
   { "info", N_("get information describing the server"),
     N_("[target]"),
     N_("target: server name"),
@@ -61,7 +77,7 @@ t_irc_command irc_commands[] =
   { "invite", N_("invite a nick on a channel"),
     N_("nickname channel"),
     N_("nickname: nick to invite\nchannel: channel to invite"),
-    2, 2, 1, NULL, irc_cmd_send_invite, NULL },
+    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"),
@@ -74,20 +90,24 @@ t_irc_command irc_commands[] =
     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 },
+  { "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 },
   { "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 },
   { "links", N_("list all servernames which are known by the server answering the query"),
-    N_("[[remove_server] server_mask]"),
-    N_("remote_server: this server should answer the query\n"
+    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 },
   { "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 },
-  { "lusers", N_("get statistics about ths size of the IRC network"),
+  { "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"),
@@ -95,10 +115,10 @@ t_irc_command irc_commands[] =
   { "me", N_("send a ctcp action to the current channel"),
     N_("message"),
     N_("message: message to send"),
-    1, 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"
@@ -117,35 +137,38 @@ t_irc_command irc_commands[] =
     "  i: mark a user as invisible\n"
     "  s: mark a user for receive server notices\n"
     "  w: user receives wallops\n"
-    "  o: operator flag\n"),
+    "  o: operator flag"),
     1, MAX_ARGS, 1, NULL, irc_cmd_send_mode, irc_cmd_recv_mode },
-  { "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"),
-    1, MAX_ARGS, 1, NULL, irc_cmd_send_msg, NULL },
   { "motd", N_("get the \"Message Of The Day\""),
     N_("[target]"),
     N_("target: server name"),
     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 },
   { "names", N_("list nicknames on channels"),
     N_("[channel[,channel]]"), N_("channel: channel name"),
-    0, MAX_ARGS, 1, NULL, irc_cmd_send_names, 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"),
+    1, 2, 1, irc_cmd_send_nick, NULL, irc_cmd_recv_nick },
   { "notice", N_("send notice message to user"),
     N_("nickname text"), N_("nickname: user to send notice to\ntext: text to send"),
-    1, MAX_ARGS, 1, NULL, irc_cmd_send_notice, irc_cmd_recv_notice },
+    2, MAX_ARGS, 1, NULL, irc_cmd_send_notice, irc_cmd_recv_notice },
   { "op", N_("gives channel operator status to nickname(s)"),
     N_("nickname [nickname]"), "",
-    1, 1, 1, irc_cmd_send_op, NULL, NULL },
+    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 },
   { "part", N_("leave a channel"),
-    N_("[channel[,channel]]"), N_("channel: channel name to leave"),
+    N_("[channel[,channel]] [part_message]"), N_("channel: channel name to leave\n"
+    "part_message: part message (displayed to other users)"),
     0, MAX_ARGS, 1, NULL, irc_cmd_send_part, irc_cmd_recv_part },
   { "ping", N_("ping server"),
     N_("server1 [server2]"),
@@ -154,11 +177,16 @@ t_irc_command irc_commands[] =
   { "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, 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 },
-  { "quit", N_("close all connections & quit " PACKAGE_NAME),
+  { "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_("[quit_message]"),
     N_("quit_message: quit message (displayed to other users)"),
     0, MAX_ARGS, 0, NULL, irc_cmd_send_quit, irc_cmd_recv_quit },
@@ -185,7 +213,7 @@ t_irc_command irc_commands[] =
     N_("service text"), N_("service: name of service\ntext: text to send"),
     2, 2, 1, NULL, irc_cmd_send_squery, NULL },
   { "squit", N_("disconnect server links"),
-    N_("server commnent"), N_("server: server name\ncomment: comment for quit"),
+    N_("server comment"), N_("server: server name\ncomment: comment for quit"),
     2, 2, 1, NULL, irc_cmd_send_squit, NULL },
   { "stats", N_("query statistics about server"),
     N_("[query [server]]"),
@@ -206,6 +234,10 @@ t_irc_command irc_commands[] =
   { "trace", N_("find the route to specific server"),
     N_("[target]"), N_("target: server"),
     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 },
   { "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 },
@@ -217,14 +249,14 @@ t_irc_command irc_commands[] =
     0, 1, 1, NULL, irc_cmd_send_version, NULL },
   { "voice", N_("gives voice to nickname(s)"),
     N_("nickname [nickname]"), "",
-    1, 1, 1, irc_cmd_send_voice, NULL, NULL },
+    1, 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 },
   { "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\n"),
+    "o: only operators are returned according to the mask supplied"),
     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"
@@ -268,11 +300,12 @@ t_irc_command irc_commands[] =
   { "303", N_("ison"), "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_303 },
   { "305", N_("unaway"), "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_305 },
   { "306", N_("now away"), "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_306 },
+  { "307", N_("whois (registered nick)"), "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_307 },
   { "311", N_("whois (user)"), "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_311 },
   { "312", N_("whois (server)"), "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_312 },
   { "313", N_("whois (operator)"), "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_313 },
   { "314", N_("whowas"), "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_314 },
-  { "315", N_("end of /who list"), "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "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 },
@@ -280,6 +313,8 @@ t_irc_command irc_commands[] =
   { "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 },
   { "332", N_("topic of channel"),
     N_("channel :topic"),
@@ -288,6 +323,7 @@ t_irc_command irc_commands[] =
   { "333", N_("infos about topic (nick & date changed)"),
     "", "",
     0, 0, 1, NULL, NULL, irc_cmd_recv_333 },
+  { "341", N_("inviting"), "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_341 },
   { "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 },
   { "353", N_("list of nicks on channel"),
@@ -297,6 +333,8 @@ t_irc_command irc_commands[] =
   { "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 },
@@ -323,6 +361,8 @@ t_irc_command irc_commands[] =
     "", "", 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"),
@@ -341,12 +381,14 @@ t_irc_command irc_commands[] =
     "", "", 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_("erroneus nickname"),
+  { "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"),
@@ -383,17 +425,24 @@ t_irc_command irc_commands[] =
     "", "", 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 },
+  { "485", N_("user is immune from kick/deop"),
+    "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
   { "491", N_("no O-lines for your host"),
     "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
   { "501", N_("unknown mode flag"),
     "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
   { "502", N_("can't change mode for other users"),
     "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+  { "671", N_("whois (secure connection)"), "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_671 },
   { NULL, NULL, NULL, NULL, 0, 0, 1, NULL, NULL, NULL }
 };

src/irc/irc-display.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
  * See README for License detail, AUTHORS for developers list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -41,16 +41,23 @@
  */
 
 void
-irc_display_prefix (t_gui_window *window, char *prefix)
+irc_display_prefix (t_gui_buffer *buffer, char *prefix)
 {
+    int type;
+    
+    type = MSG_TYPE_INFO | MSG_TYPE_PREFIX;
+    
+    if (!cfg_log_plugin_msg && (prefix == PREFIX_PLUGIN))
+        type |= MSG_TYPE_NOLOG;
+    
     if (prefix[0] == prefix[2])
     {
-        gui_printf_color (window, COLOR_WIN_CHAT_PREFIX1, "%c", prefix[0]);
-        gui_printf_color (window, COLOR_WIN_CHAT_PREFIX2, "%c", prefix[1]);
-        gui_printf_color (window, COLOR_WIN_CHAT_PREFIX1, "%c ", prefix[2]);
+        gui_printf_type_color (buffer, type, COLOR_WIN_CHAT_PREFIX1, "%c", prefix[0]);
+        gui_printf_type_color (buffer, type, COLOR_WIN_CHAT_PREFIX2, "%c", prefix[1]);
+        gui_printf_type_color (buffer, type, COLOR_WIN_CHAT_PREFIX1, "%c ", prefix[2]);
     }
     else
-        gui_printf_color (window, COLOR_WIN_CHAT_PREFIX1, "%s ", prefix);
+        gui_printf_color (buffer, COLOR_WIN_CHAT_PREFIX1, "%s ", prefix);
 }
 
 /*
@@ -59,45 +66,47 @@ irc_display_prefix (t_gui_window *window, char *prefix)
  */
 
 void
-irc_display_nick (t_gui_window *window, t_irc_nick *nick, int message_type,
+irc_display_nick (t_gui_buffer *buffer, t_irc_nick *nick, int message_type,
                   int display_around, int color_nick, int no_nickmode)
 {
     if (display_around)
-        gui_printf_color_type (window,
+        gui_printf_type_color (buffer,
                                message_type, COLOR_WIN_CHAT_DARK, "<");
     if (cfg_look_nickmode)
     {
-        if (nick->is_op)
-            gui_printf_color_type (window,
+        if (nick->is_chanowner)
+            gui_printf_type_color (buffer,
+                                   message_type,
+                                   COLOR_WIN_NICK_OP, "~");
+        else if (nick->is_chanadmin)
+            gui_printf_type_color (buffer,
+                                   message_type,
+                                   COLOR_WIN_NICK_OP, "&");
+        else if (nick->is_op)
+            gui_printf_type_color (buffer,
                                    message_type,
                                    COLOR_WIN_NICK_OP, "@");
+        else if (nick->is_halfop)
+            gui_printf_type_color (buffer,
+                                   message_type,
+                                   COLOR_WIN_NICK_HALFOP, "%%");
+        else if (nick->has_voice)
+            gui_printf_type_color (buffer,
+                                   message_type,
+                                   COLOR_WIN_NICK_VOICE, "+");
         else
-        {
-            if (nick->is_halfop)
-                gui_printf_color_type (window,
+            if (cfg_look_nickmode_empty && !no_nickmode)
+                gui_printf_type_color (buffer,
                                        message_type,
-                                       COLOR_WIN_NICK_HALFOP, "%%");
-            else
-            {
-                if (nick->has_voice)
-                    gui_printf_color_type (window,
-                                           message_type,
-                                           COLOR_WIN_NICK_VOICE, "+");
-                else
-                    if (cfg_look_nickmode_empty && !no_nickmode)
-                        gui_printf_color_type (window,
-                                               message_type,
-                                               COLOR_WIN_CHAT, " ");
-            }
-        }
+                                       COLOR_WIN_CHAT, " ");
     }
     if (color_nick < 0)
-        gui_printf_color_type (window,
+        gui_printf_type_color (buffer,
                                message_type,
                                COLOR_WIN_CHAT_HIGHLIGHT,
                                "%s", nick->nick);
     else
-        gui_printf_color_type (window,
+        gui_printf_type_color (buffer,
                                message_type,
                                (color_nick) ?
                                    ((cfg_look_color_nicks) ?
@@ -106,7 +115,7 @@ irc_display_nick (t_gui_window *window, t_irc_nick *nick, int message_type,
                                "%s", nick->nick);
     
     if (display_around)
-        gui_printf_color_type (window,
+        gui_printf_type_color (buffer,
                                message_type, COLOR_WIN_CHAT_DARK, "> ");
 }
 
@@ -115,21 +124,82 @@ irc_display_nick (t_gui_window *window, t_irc_nick *nick, int message_type,
  */
 
 void
-irc_display_mode (t_gui_window *window, char *channel_name, char set_flag,
+irc_display_mode (t_gui_buffer *buffer, char *channel_name, char set_flag,
                   char *symbol, char *nick_host, char *message, char *param)
 {
-    irc_display_prefix (window, PREFIX_INFO);
-    gui_printf_color (window, COLOR_WIN_CHAT_DARK, "[");
-    gui_printf_color (window, COLOR_WIN_CHAT_CHANNEL, "%s", channel_name);
-    gui_printf_color (window, COLOR_WIN_CHAT, "/");
-    gui_printf_color (window, COLOR_WIN_CHAT_CHANNEL, "%c%s", set_flag, symbol);
-    gui_printf_color (window, COLOR_WIN_CHAT_DARK, "] ");
-    gui_printf_color (window, COLOR_WIN_CHAT_NICK, "%s", nick_host);
+    irc_display_prefix (buffer, PREFIX_INFO);
+    gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "[");
+    gui_printf_color (buffer, COLOR_WIN_CHAT_CHANNEL, "%s", channel_name);
+    gui_printf_color (buffer, COLOR_WIN_CHAT, "/");
+    gui_printf_color (buffer, COLOR_WIN_CHAT_CHANNEL, "%c%s", set_flag, symbol);
+    gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "] ");
+    gui_printf_color (buffer, COLOR_WIN_CHAT_NICK, "%s", nick_host);
     if (param)
     {
-        gui_printf_color (window, COLOR_WIN_CHAT, " %s ", message);
-        gui_printf_color (window, COLOR_WIN_CHAT_NICK, "%s\n", param);
+        gui_printf_color (buffer, COLOR_WIN_CHAT, " %s ", message);
+        gui_printf_color (buffer, COLOR_WIN_CHAT_NICK, "%s\n", param);
     }
     else
-        gui_printf_color (window, COLOR_WIN_CHAT, " %s\n", message);
+        gui_printf_color (buffer, COLOR_WIN_CHAT, " %s\n", message);
+}
+
+/*
+ * irc_display_server: display server description
+ */
+
+void
+irc_display_server (t_irc_server *server)
+{
+    gui_printf (NULL, "\n");
+    gui_printf_color (NULL, COLOR_WIN_CHAT, _("Server: "));
+    gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "%s", server->name);
+    gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, " [");
+    gui_printf_color (NULL, COLOR_WIN_CHAT, "%s",
+                      (server->is_connected) ?
+                          _("connected") : _("not connected"));
+    gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "]\n");
+    gui_printf_color (NULL, COLOR_WIN_CHAT,
+                      "  server_autoconnect        : %s%s\n",
+                      (server->autoconnect) ? _("yes") : _("no"),
+                      (server->command_line) ?
+                          _(" (temporary server, will not be saved)") : "");
+    gui_printf_color (NULL, COLOR_WIN_CHAT,
+                      "  server_autoreconnect . . .: %s\n",
+                      (server->autoreconnect) ? _("yes") : _("no"));
+    gui_printf_color (NULL, COLOR_WIN_CHAT,
+                      "  server_autoreconnect_delay: %d seconds\n",
+                      server->autoreconnect_delay);
+    gui_printf_color (NULL, COLOR_WIN_CHAT,
+                      "  server_address . . . . . .: %s\n",
+                      server->address);
+    gui_printf_color (NULL, COLOR_WIN_CHAT,
+                      "  server_port  . . . . . . .: %d\n",
+                      server->port);
+    gui_printf_color (NULL, COLOR_WIN_CHAT,
+                      "  server_password  . . . . .: %s\n",
+                      (server->password && server->password[0]) ?
+                      _("(hidden)") : "");
+    gui_printf_color (NULL, COLOR_WIN_CHAT,
+                      "  server_nick1/2/3 . . . . .: %s", server->nick1);
+    gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, " / ");
+    gui_printf_color (NULL, COLOR_WIN_CHAT, "%s", server->nick2);
+    gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, " / ");
+    gui_printf_color (NULL, COLOR_WIN_CHAT, "%s\n", server->nick3);
+    gui_printf_color (NULL, COLOR_WIN_CHAT,
+                      "  server_username  . . . . .: %s\n",
+                      server->username);
+    gui_printf_color (NULL, COLOR_WIN_CHAT,
+                      "  server_realname  . . . . .: %s\n",
+                      server->realname);
+    gui_printf_color (NULL, COLOR_WIN_CHAT,
+                      "  server_command . . . . . .: %s\n",
+                      (server->command && server->command[0]) ?
+                      server->command : "");
+    gui_printf_color (NULL, COLOR_WIN_CHAT,
+                      "  server_command_delay . . .: %d seconds\n",
+                      server->command_delay);
+    gui_printf_color (NULL, COLOR_WIN_CHAT,
+                      "  server_autojoin  . . . . .: %s\n",
+                      (server->autojoin && server->autojoin[0]) ?
+                      server->autojoin : "");
 }

src/irc/irc-nick.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
  * See README for License detail, AUTHORS for developers list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -37,34 +37,38 @@
  */
 
 int
-nick_find_color (t_irc_channel *channel)
+nick_find_color (t_irc_nick *nick)
 {
-    int i, color_less_used, min_used;
-    int count_used[COLOR_WIN_NICK_NUMBER];
-    t_irc_nick *ptr_nick;
+    int i, color;
     
-    /* initialize array for counting usage of color */
-    for (i = 0; i < COLOR_WIN_NICK_NUMBER; i++)
-        count_used[i] = 0;
-    
-    /* summarize each color usage */
-    for (ptr_nick = channel->nicks; ptr_nick; ptr_nick = ptr_nick->next_nick)
-        count_used[ptr_nick->color - COLOR_WIN_NICK_FIRST]++;
-    
-    /* look for color less used on channel */
-    color_less_used = -1;
-    min_used = INT_MAX;
-    for (i = 0; i < COLOR_WIN_NICK_NUMBER; i++)
+    color = 0;
+    for (i = strlen (nick->nick) - 1; i >= 0; i--)
     {
-        if (count_used[i] < min_used)
-        {
-            color_less_used = i;
-            min_used = count_used[i];
-        }
+        color += (int)(nick->nick[i]);
     }
+    color = (color % COLOR_WIN_NICK_NUMBER);
     
-    return (color_less_used < 0) ?
-        COLOR_WIN_NICK_FIRST : COLOR_WIN_NICK_FIRST + color_less_used;
+    return COLOR_WIN_NICK_FIRST + color;
+}
+
+/*
+ * nick_score_for_sort: return score for sorting nick, according to privileges
+ */
+
+int
+nick_score_for_sort (t_irc_nick *nick)
+{
+    if (nick->is_chanowner)
+        return -32;
+    if (nick->is_chanadmin)
+        return -16;
+    if (nick->is_op)
+        return -8;
+    if (nick->is_halfop)
+        return -4;
+    if (nick->has_voice)
+        return -2;
+    return 0;
 }
 
 /*
@@ -80,8 +84,8 @@ nick_compare (t_irc_nick *nick1, t_irc_nick *nick2)
 {
     int score1, score2, comp;
     
-    score1 = - ( (nick1->is_op * 8) + (nick1->is_halfop * 4) + (nick1->has_voice * 2));
-    score2 = - ( (nick2->is_op * 8) + (nick2->is_halfop * 4) + (nick2->has_voice * 2));
+    score1 = nick_score_for_sort (nick1);
+    score2 = nick_score_for_sort (nick2);
     
     comp = strcasecmp(nick1->nick, nick2->nick);
     if (comp > 0)
@@ -165,7 +169,8 @@ nick_insert_sorted (t_irc_channel *channel, t_irc_nick *nick)
 
 t_irc_nick *
 nick_new (t_irc_channel *channel, char *nick_name,
-          int is_op, int is_halfop, int has_voice)
+          int is_chanowner, int is_chanadmin, int is_op, int is_halfop,
+          int has_voice)
 {
     t_irc_nick *new_nick;
     
@@ -173,6 +178,8 @@ nick_new (t_irc_channel *channel, char *nick_name,
     if ((new_nick = nick_search (channel, nick_name)))
     {
         /* update nick */
+        new_nick->is_chanowner = is_chanowner;
+        new_nick->is_chanadmin = is_chanadmin;
         new_nick->is_op = is_op;
         new_nick->is_halfop = is_halfop;
         new_nick->has_voice = has_voice;
@@ -182,23 +189,28 @@ nick_new (t_irc_channel *channel, char *nick_name,
     /* alloc memory for new nick */
     if ((new_nick = (t_irc_nick *) malloc (sizeof (t_irc_nick))) == NULL)
     {
-        gui_printf (channel->window,
+        gui_printf (channel->buffer,
                     _("%s cannot allocate new nick\n"), WEECHAT_ERROR);
         return NULL;
     }
 
     /* initialize new nick */
     new_nick->nick = strdup (nick_name);
+    new_nick->is_chanowner = is_chanowner;
+    new_nick->is_chanadmin = is_chanadmin;
     new_nick->is_op = is_op;
     new_nick->is_halfop = is_halfop;
     new_nick->has_voice = has_voice;
-    if (strcasecmp (new_nick->nick, SERVER(channel->window)->nick) == 0)
+    new_nick->is_away = 0;
+    if (strcasecmp (new_nick->nick, SERVER(channel->buffer)->nick) == 0)
         new_nick->color = COLOR_WIN_NICK_SELF;
     else
-        new_nick->color = nick_find_color (channel);
+        new_nick->color = nick_find_color (new_nick);
 
     nick_insert_sorted (channel, new_nick);
     
+    channel->nicks_count++;
+    
     /* all is ok, return address of new nick */
     return new_nick;
 }
@@ -231,10 +243,18 @@ nick_resort (t_irc_channel *channel, t_irc_nick *nick)
 void
 nick_change (t_irc_channel *channel, t_irc_nick *nick, char *new_nick)
 {
+    int nick_is_me;
+    
+    nick_is_me = (strcmp (nick->nick, SERVER(channel->buffer)->nick) == 0) ? 1 : 0;
+    
     /* change nickname */
     if (nick->nick)
         free (nick->nick);
     nick->nick = strdup (new_nick);
+    if (nick_is_me)
+        nick->color = COLOR_WIN_NICK_SELF;
+    else
+        nick->color = nick_find_color (nick);
     
     /* insert again nick into sorted list */
     nick_resort (channel, nick);
@@ -263,6 +283,8 @@ nick_free (t_irc_channel *channel, t_irc_nick *nick)
     if (nick->next_nick)
         (nick->next_nick)->prev_nick = nick->prev_nick;
 
+    channel->nicks_count--;
+    
     /* free data */
     if (nick->nick)
         free (nick->nick);
@@ -280,6 +302,9 @@ nick_free_all (t_irc_channel *channel)
     /* remove all nicks for the channel */
     while (channel->nicks)
         nick_free (channel, channel->nicks);
+    
+    /* sould be zero, but prevent any bug :D */
+    channel->nicks_count = 0;
 }
 
 /*
@@ -319,7 +344,7 @@ nick_count (t_irc_channel *channel, int *total, int *count_op,
          ptr_nick = ptr_nick->next_nick)
     {
         (*total)++;
-        if (ptr_nick->is_op)
+        if ((ptr_nick->is_chanowner) || (ptr_nick->is_chanadmin) || (ptr_nick->is_op))
             (*count_op)++;
         else
         {
@@ -347,8 +372,7 @@ nick_get_max_length (t_irc_channel *channel)
     t_irc_nick *ptr_nick;
     
     max_length = 0;
-    for (ptr_nick = channel->nicks; ptr_nick;
-         ptr_nick = ptr_nick->next_nick)
+    for (ptr_nick = channel->nicks; ptr_nick; ptr_nick = ptr_nick->next_nick)
     {
         length = strlen (ptr_nick->nick);
         if (length > max_length)
@@ -356,3 +380,36 @@ nick_get_max_length (t_irc_channel *channel)
     }
     return max_length;
 }
+
+/*
+ * nick_set_away: set/unset away status for a channel
+ */
+
+void
+nick_set_away (t_irc_channel *channel, t_irc_nick *nick, int is_away)
+{
+    if (nick->is_away != is_away)
+    {
+        nick->is_away = is_away;
+        gui_draw_buffer_nick (channel->buffer, 0);
+    }
+}
+
+/*
+ * nick_print_log: print nick infos in log (usually for crash dump)
+ */
+
+void
+nick_print_log (t_irc_nick *nick)
+{
+    wee_log_printf ("=> nick %s (addr:0x%X)]\n",    nick->nick, nick);
+    wee_log_printf ("     is_chanowner . : %d\n",   nick->is_chanowner);
+    wee_log_printf ("     is_chanadmin . : %d\n",   nick->is_chanadmin);
+    wee_log_printf ("     is_op. . . . . : %d\n",   nick->is_op);
+    wee_log_printf ("     is_halfop. . . : %d\n",   nick->is_halfop);
+    wee_log_printf ("     has_voice. . . : %d\n",   nick->has_voice);
+    wee_log_printf ("     is_away. . . . : %d\n",   nick->is_away);
+    wee_log_printf ("     color. . . . . : %d\n",   nick->color);
+    wee_log_printf ("     prev_nick. . . : 0x%X\n", nick->prev_nick);
+    wee_log_printf ("     next_nick. . . : 0x%X\n", nick->next_nick);
+}

src/irc/irc.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
  * See README for License detail, AUTHORS for developers list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,8 +21,13 @@
 #ifndef __WEECHAT_IRC_H
 #define __WEECHAT_IRC_H 1
 
+#include <time.h>
+#include <sys/time.h>
+#include <sys/types.h>
 #include "../gui/gui.h"
 
+/* prefixes for chat window */
+
 #define PREFIX_SERVER    "-@-"
 #define PREFIX_INFO      "-=-"
 #define PREFIX_ACTION_ME "-*-"
@@ -34,6 +39,46 @@
 
 #define CHANNEL_PREFIX "#&+!"
 
+/* channel modes */
+
+#define NUM_CHANNEL_MODES       7
+#define CHANNEL_MODE_INVITE     0
+#define CHANNEL_MODE_KEY        1
+#define CHANNEL_MODE_LIMIT      2
+#define CHANNEL_MODE_MODERATED  3
+#define CHANNEL_MODE_NO_MSG_OUT 4
+#define CHANNEL_MODE_SECRET     5
+#define CHANNEL_MODE_TOPIC      6
+#define SET_CHANNEL_MODE(channel, set, mode) \
+    if (set) \
+        channel->modes[mode] = channel_modes[mode]; \
+    else \
+        channel->modes[mode] = ' ';
+
+#define DEFAULT_IRC_PORT 6667
+
+/* DCC types & status */
+
+#define DCC_CHAT_RECV           0   /* receiving DCC chat                   */
+#define DCC_CHAT_SEND           1   /* sending DCC chat                     */
+#define DCC_FILE_RECV           2   /* incoming DCC file                    */
+#define DCC_FILE_SEND           3   /* sending DCC file                     */
+
+#define DCC_WAITING             0   /* waiting for host answer              */
+#define DCC_CONNECTING          1   /* connecting to host                   */
+#define DCC_ACTIVE              2   /* sending/receiving data               */
+#define DCC_DONE                3   /* transfer done                        */
+#define DCC_FAILED              4   /* DCC failed                           */
+#define DCC_ABORTED             5   /* DCC aborted by user                  */
+
+#define DCC_IS_CHAT(type) ((type == DCC_CHAT_RECV) || (type == DCC_CHAT_SEND))
+#define DCC_IS_FILE(type) ((type == DCC_FILE_RECV) || (type == DCC_FILE_SEND))
+#define DCC_IS_RECV(type) ((type == DCC_CHAT_RECV) || (type == DCC_FILE_RECV))
+#define DCC_IS_SEND(type) ((type == DCC_CHAT_SEND) || (type == DCC_FILE_SEND))
+
+#define DCC_ENDED(status) ((status == DCC_DONE) || (status == DCC_FAILED) || \
+                          (status == DCC_ABORTED))
+
 /* nick types */
 
 typedef struct t_irc_nick t_irc_nick;
@@ -41,10 +86,13 @@ typedef struct t_irc_nick t_irc_nick;
 struct t_irc_nick
 {
     char *nick;                     /* nickname                             */
+    int is_chanowner;               /* chan owner? (specific to unrealircd) */
+    int is_chanadmin;               /* chan admin? (specific to unrealircd) */
     int is_op;                      /* operator privileges?                 */
     int is_halfop;                  /* half operaor privileges?             */
     int has_voice;                  /* nick has voice?                      */
-    int color;                      /* color for nickname                   */
+    int is_away;                    /* = 1 if nick is away, otherwise 0     */
+    int color;                      /* color for nickname in chat window    */
     t_irc_nick *prev_nick;          /* link to previous nick on the channel */
     t_irc_nick *next_nick;          /* link to next nick on the channel     */
 };
@@ -60,11 +108,17 @@ typedef struct t_irc_channel t_irc_channel;
 struct t_irc_channel
 {
     int type;                       /* channel type                         */
+    void *dcc_chat;                 /* DCC CHAT pointer (NULL if not DCC)   */
     char *name;                     /* name of channel (exemple: "#abc")    */
     char *topic;                    /* topic of channel (host for private)  */
+    char modes[NUM_CHANNEL_MODES+1];/* channel modes                        */
+    int limit;                      /* user limit (0 is limit not set)      */
+    char *key;                      /* channel key (NULL if no key is set)  */
+    int nicks_count;                /* # nicks on channel (0 if dcc/pv)     */
+    int checking_away;              /* = 1 if checking away with WHO cmd    */
     t_irc_nick *nicks;              /* nicks on the channel                 */
     t_irc_nick *last_nick;          /* last nick on the channel             */
-    t_gui_window *window;           /* GUI window allocated for channel     */
+    t_gui_buffer *buffer;           /* GUI buffer allocated for channel     */
     t_irc_channel *prev_channel;    /* link to previous channel             */
     t_irc_channel *next_channel;    /* link to next channel                 */
 };
@@ -78,6 +132,9 @@ struct t_irc_server
     /* user choices */
     char *name;                     /* name of server (only for display)    */
     int autoconnect;                /* = 1 if auto connect at startup       */
+    int autoreconnect;              /* = 1 if auto reco when disconnected   */
+    int autoreconnect_delay;        /* delay before trying again reconnect  */
+    int command_line;               /* server was given on command line     */
     char *address;                  /* address of server (IP or name)       */
     int port;                       /* port for server (6667 by default)    */
     char *password;                 /* password for server                  */
@@ -87,16 +144,26 @@ struct t_irc_server
     char *username;                 /* user name                            */
     char *realname;                 /* real name                            */
     char *command;					/* command to run once connected        */
+    int command_delay;              /* delay after execution of command     */
     char *autojoin;					/* channels to automatically join       */
+    int autorejoin;                 /* auto rejoin channels when kicked     */
     
     /* internal vars */
-    char *nick;                     /* current nickname                     */
+    pid_t child_pid;                /* pid of child process (connecting)    */
+    int child_read;                 /* to read into child pipe              */
+    int child_write;                /* to write into child pipe             */
+    int sock;                       /* socket for server                    */
     int is_connected;               /* 1 if WeeChat is connected to server  */
-    int sock4;                      /* socket for server                    */
+    char *unterminated_message;     /* beginning of a message in input buf  */
+    char *nick;                     /* current nickname                     */
+    time_t reconnect_start;         /* this time + delay = reconnect time   */
+    int reconnect_join;             /* 1 if channels opened to rejoin       */
     int is_away;                    /* 1 is user is marker as away          */
-    int server_read;                /* pipe for reading server data         */
-    int server_write;               /* pipe for sending data to server      */
-    t_gui_window *window;           /* GUI window allocated for server      */
+    time_t away_time;               /* time() when user marking as away     */
+    int lag;                        /* lag (in milliseconds)                */
+    struct timeval lag_check_time;  /* last time lag was checked (ping sent)*/
+    time_t lag_next_check;          /* time for next check                  */
+    t_gui_buffer *buffer;           /* GUI buffer allocated for server      */
     t_irc_channel *channels;        /* opened channels on server            */
     t_irc_channel *last_channel;    /* last opened channal on server        */
     t_irc_server *prev_server;      /* link to previous server              */
@@ -123,6 +190,8 @@ struct t_irc_command
                                     /* function called when cmd is received */
 };
 
+/* irc messages */
+
 typedef struct t_irc_message t_irc_message;
 
 struct t_irc_message
@@ -132,30 +201,72 @@ struct t_irc_message
     t_irc_message *next_message;    /* link to next message                 */
 };
 
+/* DCC */
+
+typedef struct t_irc_dcc t_irc_dcc;
+
+struct t_irc_dcc
+{
+    t_irc_server *server;           /* irc server                           */
+    t_irc_channel *channel;         /* irc channel (for DCC chat only)      */
+    int type;                       /* DCC type (send or receive)           */
+    int status;                     /* DCC status (waiting, sending, ..)    */
+    time_t start_time;              /* the time when DCC started            */
+    time_t start_transfer;          /* the time when DCC transfer started   */
+    unsigned long addr;             /* IP address                           */
+    int port;                       /* port                                 */
+    char *nick;                     /* remote nick                          */
+    int sock;                       /* socket for connection                */
+    char *unterminated_message;     /* beginning of a message in input buf  */
+    int file;                       /* local file (for reading or writing)  */
+    char *filename;                 /* filename (given by sender)           */
+    char *local_filename;           /* local filename (with path)           */
+    int filename_suffix;            /* suffix (.1 for ex) if renaming file  */
+    unsigned long size;             /* file size                            */
+    unsigned long pos;              /* number of bytes received/sent        */
+    unsigned long ack;              /* number of bytes received OK          */
+    time_t last_check_time;         /* last time we looked at bytes sent/rcv*/
+    unsigned long last_check_pos;   /* bytes sent/recv at last check        */
+    unsigned long bytes_per_sec;    /* bytes per second                     */
+    t_irc_dcc *prev_dcc;            /* link to previous dcc file/chat       */
+    t_irc_dcc *next_dcc;            /* link to next dcc file/chat           */
+};
+
 extern t_irc_command irc_commands[];
-extern t_irc_server *irc_servers, *current_irc_server;
+extern t_irc_server *irc_servers;
 extern t_irc_message *recv_msgq, *msgq_last_msg;
-extern t_irc_channel *current_channel;
+extern int check_away;
+extern t_irc_dcc *dcc_list;
+extern char *dcc_status_string[6];
+extern char *channel_modes;
 
 /* server functions (irc-server.c) */
 
 extern void server_init (t_irc_server *);
+extern int server_init_with_url (char *, t_irc_server *);
 extern t_irc_server *server_alloc ();
 extern void server_destroy (t_irc_server *);
 extern void server_free (t_irc_server *);
 extern void server_free_all ();
-extern t_irc_server *server_new (char *, int, char *, int, char *, char *,
-                                 char *, char *, char *, char *, char *, char *);
+extern t_irc_server *server_new (char *, int, int, int, int, char *, int, char *,
+                                 char *, char *, char *, char *, char *, char *,
+                                 int, char *, int);
 extern int server_send (t_irc_server *, char *, int);
-extern int server_sendf (t_irc_server *, char *, ...);
+extern void server_sendf (t_irc_server *, char *, ...);
 extern void server_recv (t_irc_server *);
-extern int server_connect ();
-extern void server_auto_connect ();
-extern void server_disconnect (t_irc_server *);
+extern void server_child_read (t_irc_server *);
+extern int server_connect (t_irc_server *);
+extern void server_reconnect (t_irc_server *);
+extern void server_auto_connect (int);
+extern void server_disconnect (t_irc_server *, int);
 extern void server_disconnect_all ();
 extern t_irc_server *server_search (char *);
 extern int server_get_number_connected ();
 extern int server_name_already_exists (char *);
+extern void server_remove_away ();
+extern void server_check_away ();
+extern void server_set_away (t_irc_server *, char *, int);
+extern void server_print_log (t_irc_server *);
 
 /* channel functions (irc-channel.c) */
 
@@ -164,10 +275,16 @@ extern void channel_free (t_irc_server *, t_irc_channel *);
 extern void channel_free_all (t_irc_server *);
 extern t_irc_channel *channel_search (t_irc_server *, char *);
 extern int string_is_channel (char *);
+extern void channel_remove_away (t_irc_channel *);
+extern void channel_check_away (t_irc_server *, t_irc_channel *);
+extern void channel_set_away (t_irc_channel *, char *, int);
+extern int channel_create_dcc (t_irc_dcc *);
+extern void channel_remove_dcc (t_irc_dcc *);
+extern void channel_print_log (t_irc_channel *);
 
 /* nick functions (irc-nick.c) */
 
-extern t_irc_nick *nick_new (t_irc_channel *, char *, int, int, int);
+extern t_irc_nick *nick_new (t_irc_channel *, char *, int, int, int, int, int);
 extern void nick_resort (t_irc_channel *, t_irc_nick *);
 extern void nick_change (t_irc_channel *, t_irc_nick *, char *);
 extern void nick_free (t_irc_channel *, t_irc_nick *);
@@ -175,13 +292,29 @@ extern void nick_free_all (t_irc_channel *);
 extern t_irc_nick *nick_search (t_irc_channel *, char *);
 extern void nick_count (t_irc_channel *, int *, int *, int *, int *, int *);
 extern int nick_get_max_length (t_irc_channel *);
+extern void nick_set_away (t_irc_channel *, t_irc_nick *, int);
+extern void nick_print_log (t_irc_nick *);
+
+/* DCC functions (irc-dcc.c) */
+
+extern void dcc_redraw (int);
+extern void dcc_free (t_irc_dcc *);
+extern void dcc_close (t_irc_dcc *, int);
+extern void dcc_accept (t_irc_dcc *);
+extern t_irc_dcc *dcc_add (t_irc_server *, int, unsigned long, int, char *, int,
+                           char *, char *, unsigned long);
+extern void dcc_send_request (t_irc_server *, int, char *, char *);
+extern void dcc_chat_sendf (t_irc_dcc *, char *, ...);
+extern void dcc_handle ();
+extern void dcc_end ();
 
 /* IRC display (irc-diplay.c) */
 
-extern void irc_display_prefix (t_gui_window *, char *);
-extern void irc_display_nick (t_gui_window *, t_irc_nick *, int, int, int, int);
-extern void irc_display_mode (t_gui_window *, char *, char, char *, char *,
+extern void irc_display_prefix (/*@null@*/ t_gui_buffer *, char *);
+extern void irc_display_nick (t_gui_buffer *, t_irc_nick *, int, int, int, int);
+extern void irc_display_mode (t_gui_buffer *, char *, char, char *, char *,
                               char *, char *);
+extern void irc_display_server (t_irc_server *ptr_server);
 
 /* IRC protocol (irc-commands.c) */
 
@@ -190,23 +323,30 @@ extern void irc_login (t_irc_server *);
 /* IRC commands issued by user */
 extern int irc_cmd_send_admin (t_irc_server *, char *);
 extern int irc_cmd_send_away (t_irc_server *, char *);
+extern int irc_cmd_send_ban (t_irc_server *, char *);
 extern int irc_cmd_send_ctcp (t_irc_server *, char *);
+extern int irc_cmd_send_dcc (t_irc_server *, char *);
+extern int irc_cmd_send_dehalfop (t_irc_server *, int, char **);
 extern int irc_cmd_send_deop (t_irc_server *, int, char **);
 extern int irc_cmd_send_devoice (t_irc_server *, int, char **);
 extern int irc_cmd_send_die (t_irc_server *, char *);
+extern int irc_cmd_send_halfop (t_irc_server *, int, char **);
 extern int irc_cmd_send_info (t_irc_server *, char *);
-extern int irc_cmd_send_invite (t_irc_server *, char *);
+extern int irc_cmd_send_invite (t_irc_server *, int, char **);
 extern int irc_cmd_send_ison (t_irc_server *, char *);
 extern int irc_cmd_send_join (t_irc_server *, char *);
 extern int irc_cmd_send_kick (t_irc_server *, char *);
+extern int irc_cmd_send_kickban (t_irc_server *, char *);
 extern int irc_cmd_send_kill (t_irc_server *, char *);
 extern int irc_cmd_send_links (t_irc_server *, char *);
 extern int irc_cmd_send_list (t_irc_server *, char *);
 extern int irc_cmd_send_lusers (t_irc_server *, char *);
+extern int irc_send_me (t_irc_server *, t_irc_channel *, char *);
+extern int irc_send_me_all_channels (t_irc_server *, char *);
 extern int irc_cmd_send_me (t_irc_server *, char *);
 extern int irc_cmd_send_mode (t_irc_server *, char *);
-extern int irc_cmd_send_msg (t_irc_server *, char *);
 extern int irc_cmd_send_motd (t_irc_server *, char *);
+extern int irc_cmd_send_msg (t_irc_server *, char *);
 extern int irc_cmd_send_names (t_irc_server *, char *);
 extern int irc_cmd_send_nick (t_irc_server *, int, char **);
 extern int irc_cmd_send_notice (t_irc_server *, char *);
@@ -215,6 +355,7 @@ extern int irc_cmd_send_oper (t_irc_server *, char *);
 extern int irc_cmd_send_part (t_irc_server *, char *);
 extern int irc_cmd_send_ping (t_irc_server *, char *);
 extern int irc_cmd_send_pong (t_irc_server *, char *);
+extern int irc_cmd_send_query (t_irc_server *, char *);
 extern int irc_cmd_send_quit (t_irc_server *, char *);
 extern int irc_cmd_send_quote (t_irc_server *, char *);
 extern int irc_cmd_send_rehash (t_irc_server *, char *);
@@ -228,6 +369,7 @@ extern int irc_cmd_send_summon (t_irc_server *, char *);
 extern int irc_cmd_send_time (t_irc_server *, char *);
 extern int irc_cmd_send_topic (t_irc_server *, char *);
 extern int irc_cmd_send_trace (t_irc_server *, char *);
+extern int irc_cmd_send_unban (t_irc_server *, char *);
 extern int irc_cmd_send_userhost (t_irc_server *, char *);
 extern int irc_cmd_send_users (t_irc_server *, char *);
 extern int irc_cmd_send_version (t_irc_server *, char *);
@@ -238,6 +380,7 @@ extern int irc_cmd_send_whois (t_irc_server *, char *);
 extern int irc_cmd_send_whowas (t_irc_server *, char *);
 /* IRC commands executed when received from server */
 extern int irc_cmd_recv_error (t_irc_server *, char *, char *);
+extern int irc_cmd_recv_invite (t_irc_server *, char *, char *);
 extern int irc_cmd_recv_join (t_irc_server *, char *, char *);
 extern int irc_cmd_recv_kick (t_irc_server *, char *, char *);
 extern int irc_cmd_recv_mode (t_irc_server *, char *, char *);
@@ -245,6 +388,7 @@ extern int irc_cmd_recv_nick (t_irc_server *, char *, char *);
 extern int irc_cmd_recv_notice (t_irc_server *, char *, char *);
 extern int irc_cmd_recv_part (t_irc_server *, char *, char *);
 extern int irc_cmd_recv_ping (t_irc_server *, char *, char *);
+extern int irc_cmd_recv_pong (t_irc_server *, char *, char *);
 extern int irc_cmd_recv_privmsg (t_irc_server *, char *, char *);
 extern int irc_cmd_recv_quit (t_irc_server *, char *, char *);
 extern int irc_cmd_recv_server_msg (t_irc_server *, char *, char *);
@@ -257,10 +401,12 @@ extern int irc_cmd_recv_302 (t_irc_server *, char *, char *);
 extern int irc_cmd_recv_303 (t_irc_server *, char *, char *);
 extern int irc_cmd_recv_305 (t_irc_server *, char *, char *);
 extern int irc_cmd_recv_306 (t_irc_server *, char *, char *);
+extern int irc_cmd_recv_307 (t_irc_server *, char *, char *);
 extern int irc_cmd_recv_311 (t_irc_server *, char *, char *);
 extern int irc_cmd_recv_312 (t_irc_server *, char *, char *);
 extern int irc_cmd_recv_313 (t_irc_server *, char *, char *);
 extern int irc_cmd_recv_314 (t_irc_server *, char *, char *);
+extern int irc_cmd_recv_315 (t_irc_server *, char *, char *);
 extern int irc_cmd_recv_317 (t_irc_server *, char *, char *);
 extern int irc_cmd_recv_318 (t_irc_server *, char *, char *);
 extern int irc_cmd_recv_319 (t_irc_server *, char *, char *);
@@ -268,14 +414,21 @@ extern int irc_cmd_recv_320 (t_irc_server *, char *, char *);
 extern int irc_cmd_recv_321 (t_irc_server *, char *, char *);
 extern int irc_cmd_recv_322 (t_irc_server *, char *, char *);
 extern int irc_cmd_recv_323 (t_irc_server *, char *, char *);
+extern int irc_cmd_recv_324 (t_irc_server *, char *, char *);
+extern int irc_cmd_recv_329 (t_irc_server *, char *, char *);
 extern int irc_cmd_recv_331 (t_irc_server *, char *, char *);
 extern int irc_cmd_recv_332 (t_irc_server *, char *, char *);
 extern int irc_cmd_recv_333 (t_irc_server *, char *, char *);
+extern int irc_cmd_recv_341 (t_irc_server *, char *, char *);
 extern int irc_cmd_recv_351 (t_irc_server *, char *, char *);
 extern int irc_cmd_recv_352 (t_irc_server *, char *, char *);
 extern int irc_cmd_recv_353 (t_irc_server *, char *, char *);
 extern int irc_cmd_recv_365 (t_irc_server *, char *, char *);
 extern int irc_cmd_recv_366 (t_irc_server *, char *, char *);
+extern int irc_cmd_recv_367 (t_irc_server *, char *, char *);
+extern int irc_cmd_recv_368 (t_irc_server *, char *, char *);
 extern int irc_cmd_recv_433 (t_irc_server *, char *, char *);
+extern int irc_cmd_recv_438 (t_irc_server *, char *, char *);
+extern int irc_cmd_recv_671 (t_irc_server *, char *, char *);
 
 #endif /* irc.h */

src/plugins/Makefile.am

@@ -1,4 +1,4 @@
-# Copyright (c) 2004 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2005 FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,20 +15,22 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
+INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\"
+
 if PLUGIN_PERL
 perl_dir = perl
 endif
 
-# if PLUGIN_PYTHON
-# python_dir = python
-# endif
+if PLUGIN_PYTHON
+python_dir = python
+endif
 
 # if PLUGIN_RUBY
 # ruby_dir = ruby
 # endif
 
 # SUBDIRS = $(perl_dir) $(python_dir) $(ruby_dir)
-SUBDIRS = $(perl_dir)
+SUBDIRS = $(perl_dir) $(python_dir)
 
 noinst_LIBRARIES = lib_weechat_plugins.a
 

src/plugins/perl/Makefile.am

@@ -1,4 +1,4 @@
-# Copyright (c) 2004 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2005 FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-INCLUDES = $(PERL_CFLAGS)
+INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\" $(PERL_CFLAGS)
 
 noinst_LIBRARIES = lib_weechat_perl.a
 

src/plugins/perl/wee-perl.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
  * See README for License detail, AUTHORS for developers list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -28,6 +28,7 @@
 #include <EXTERN.h>
 #include <perl.h>
 #include <XSUB.h>
+#undef _
 #include "../../common/weechat.h"
 #include "../plugins.h"
 #include "wee-perl.h"
@@ -44,10 +45,14 @@ t_plugin_script *last_perl_script = NULL;
 extern void boot_DynaLoader (pTHX_ CV* cv);
 
 
+/******************************* Old interface ********************************/
+
 /*
  * IRC::register: startup function for all WeeChat Perl scripts
  */
 
+/*** DEPRECATED function, kept for compatibility only, please don't update! ***/
+
 static XS (XS_IRC_register)
 {
     char *name, *version, *shutdown_func, *description;
@@ -77,12 +82,12 @@ static XS (XS_IRC_register)
     
     if (perl_script_found)
     {
-        /* error: another scripts already exists with this name! */
+        /* error: another script already exists with this name! */
         irc_display_prefix (NULL, PREFIX_ERROR);
         gui_printf (NULL,
-                    _("Perl error: unable to register Perl script \"%s\" (another script "
+                    _("%s error: unable to register \"%s\" script (another script "
                     "already exists with this name)\n"),
-                    name);
+                    "Perl", name);
     }
     else
     {
@@ -104,15 +109,15 @@ static XS (XS_IRC_register)
                 perl_scripts = new_perl_script;
             last_perl_script = new_perl_script;
             
-            wee_log_printf (_("registered Perl script: \"%s\", version %s (%s)\n"),
-                            name, version, description);
+            wee_log_printf (_("Registered %s script: \"%s\", version %s (%s)\n"),
+                            "Perl", name, version, description);
         }
         else
         {
             irc_display_prefix (NULL, PREFIX_ERROR);
             gui_printf (NULL,
-                        _("%s unable to load Perl script \"%s\" (not enough memory)\n"),
-                        WEECHAT_ERROR, name);
+                        _("%s error: unable to load script \"%s\" (not enough memory)\n"),
+                        "Perl", name);
         }
     }
     XST_mPV (0, VERSION);
@@ -120,9 +125,11 @@ static XS (XS_IRC_register)
 }
 
 /*
- * IRC::print: print message to current window
+ * IRC::print: print message to current buffer
  */
 
+/*** DEPRECATED function, kept for compatibility only, please don't update! ***/
+
 static XS (XS_IRC_print)
 {
     int i, integer;
@@ -135,8 +142,8 @@ static XS (XS_IRC_print)
     for (i = 0; i < items; i++)
     {
         message = SvPV (ST (i), integer);
-        irc_display_prefix (gui_current_window, PREFIX_PLUGIN);
-        gui_printf (gui_current_window, "%s", message);
+        irc_display_prefix (gui_current_window->buffer, PREFIX_PLUGIN);
+        gui_printf (gui_current_window->buffer, "%s", message);
     }
     
     XSRETURN_EMPTY;
@@ -147,11 +154,13 @@ static XS (XS_IRC_print)
  *                          (server is optional)
  */
 
+/*** DEPRECATED function, kept for compatibility only, please don't update! ***/
+
 static XS (XS_IRC_print_with_channel)
 {
     int integer;
     char *message, *channel, *server = NULL;
-    t_gui_window *ptr_window;
+    t_gui_buffer *ptr_buffer;
     t_irc_server *ptr_server;
     t_irc_channel *ptr_channel;
     dXSARGS;
@@ -167,9 +176,9 @@ static XS (XS_IRC_print_with_channel)
             server = NULL;
     }
     
-    /* look for window for printing message */
+    /* look for buffer for printing message */
     channel = SvPV (ST (1), integer);
-    ptr_window = NULL;
+    ptr_buffer = NULL;
     for (ptr_server = irc_servers; ptr_server;
          ptr_server = ptr_server->next_server)
     {
@@ -180,32 +189,113 @@ static XS (XS_IRC_print_with_channel)
             {
                 if (strcasecmp (ptr_channel->name, channel) == 0)
                 {
-                    ptr_window = ptr_channel->window;
+                    ptr_buffer = ptr_channel->buffer;
                     break;
                 }
             }
         }
-        if (ptr_window)
+        if (ptr_buffer)
             break;
     }
     
-    /* window found => display message & return 1 */
-    if (ptr_window)
+    /* buffer found => display message & return 1 */
+    if (ptr_buffer)
     {
         message = SvPV (ST (0), integer);
-        irc_display_prefix (ptr_window, PREFIX_PLUGIN);
-        gui_printf (ptr_window, "%s", message);
+        irc_display_prefix (ptr_buffer, PREFIX_PLUGIN);
+        gui_printf (ptr_buffer, "%s", message);
         XSRETURN_YES;
     }
         
-    /* no window found => return 0 */
+    /* no buffer found => return 0 */
     XSRETURN_NO;
 }
 
+/*
+ * IRC::print_infobar: print message to infobar
+ */
+
+/*** DEPRECATED function, kept for compatibility only, please don't update! ***/
+
+static XS (XS_IRC_print_infobar)
+{
+    int integer;
+    dXSARGS;
+    
+    /* make gcc happy */
+    (void) cv;
+    
+    if (items == 2)
+        gui_infobar_printf (SvIV (ST (0)), COLOR_WIN_INFOBAR, SvPV (ST (1), integer));
+    else
+    {
+        irc_display_prefix (NULL, PREFIX_ERROR);
+        gui_printf (NULL,
+                    _("%s error: wrong parameters for \"%s\" function\n"),
+                    "Perl", "print_infobar");
+    }
+    
+    XSRETURN_EMPTY;
+}
+
+/*
+ * IRC::command: send command to server
+ */
+
+/*** DEPRECATED function, kept for compatibility only, please don't update! ***/
+
+static XS (XS_IRC_command)
+{
+    int integer;
+    char *server, *command, *command2;
+    t_irc_server *ptr_server;
+    dXSARGS;
+    
+    /* make gcc happy */
+    (void) cv;
+    
+    if (items == 2)
+    {
+        server = SvPV (ST (0), integer);
+        command = SvPV (ST (1), integer);
+        for (ptr_server = irc_servers; ptr_server; ptr_server = ptr_server->next_server)
+        {
+            if (strcasecmp (ptr_server->name, server) == 0)
+                break;
+        }
+        if (!ptr_server)
+        {
+            irc_display_prefix (NULL, PREFIX_ERROR);
+            gui_printf (NULL,
+                        _("%s error: server not found for \"%s\" function\n"),
+                        "Perl", "command");
+        }
+    }
+    else
+    {
+        ptr_server = SERVER(gui_current_window->buffer);
+        command = SvPV (ST (0), integer);
+    }
+    
+    if (ptr_server)
+    {
+        command2 = (char *) malloc (strlen (command) + 8);
+        strcpy (command2, command);
+        if (!strstr (command2, "\r\n"))
+            strcat (command2, "\r\n");
+        server_sendf (ptr_server, command2);
+        free (command2);
+    }
+    
+    XSRETURN_EMPTY;
+}
+
 /*
  * IRC::add_message_handler: add handler for messages (privmsg, ...)
  */
 
+/*** DEPRECATED function, kept for compatibility only, please don't update! ***/
+
 static XS (XS_IRC_add_message_handler)
 {
     char *name, *function;
@@ -227,6 +317,8 @@ static XS (XS_IRC_add_message_handler)
  * IRC::add_command_handler: add command handler (define/redefine commands)
  */
 
+/*** DEPRECATED function, kept for compatibility only, please don't update! ***/
+
 static XS (XS_IRC_add_command_handler)
 {
     char *name, *function;
@@ -240,8 +332,8 @@ static XS (XS_IRC_add_command_handler)
     
     name = SvPV (ST (0), integer);
     function = SvPV (ST (1), integer);
-    if (!index_command_search (name))
-        index_command_new (name);
+    if (!weelist_search (index_commands, name))
+        weelist_add (&index_commands, &last_index_command, name);
     ptr_plugin_handler = plugin_handler_search (plugin_cmd_handlers, name);
     if (ptr_plugin_handler)
     {
@@ -258,19 +350,42 @@ static XS (XS_IRC_add_command_handler)
  * IRC::get_info: get various infos
  */
 
+/*** DEPRECATED function, kept for compatibility only, please don't update! ***/
+
 static XS (XS_IRC_get_info)
 {
-    char *arg, *info = NULL;
+    char *arg, *info = NULL, *server;
+    t_irc_server *ptr_server;
     int integer;
     dXSARGS;
     
     /* make gcc happy */
-    (void) items;
     (void) cv;
     
-    arg = SvPV (ST (0), integer);
+    if (items == 2)
+    {
+        server = SvPV (ST (0), integer);
+        arg = SvPV (ST (1), integer);
+        for (ptr_server = irc_servers; ptr_server; ptr_server = ptr_server->next_server)
+        {
+            if (strcasecmp (ptr_server->name, server) == 0)
+                break;
+        }
+        if (!ptr_server)
+        {
+            irc_display_prefix (NULL, PREFIX_ERROR);
+            gui_printf (NULL,
+                        _("%s error: server not found for \"%s\" function\n"),
+                        "Perl", "get_info");
+        }
+    }
+    else
+    {
+        ptr_server = SERVER(gui_current_window->buffer);
+        arg = SvPV (ST (0), integer);
+    }
     
-    if (arg)
+    if (ptr_server && arg)
     {
     
         if ( (strcasecmp (arg, "0") == 0) || (strcasecmp (arg, "version") == 0) )
@@ -279,16 +394,18 @@ static XS (XS_IRC_get_info)
         }
         else if ( (strcasecmp (arg, "1") == 0) || (strcasecmp (arg, "nick") == 0) )
         {
-            info = current_irc_server->nick;
+            if (ptr_server->nick)
+                info = ptr_server->nick;
         }
         else if ( (strcasecmp (arg, "2") == 0) || (strcasecmp (arg, "channel") == 0) )
         {
-            if (WIN_IS_CHANNEL (gui_current_window))
-                info = CHANNEL (gui_current_window)->name;
+            if (BUFFER_IS_CHANNEL (gui_current_window->buffer))
+                info = CHANNEL (gui_current_window->buffer)->name;
         }
         else if ( (strcasecmp (arg, "3") == 0) || (strcasecmp (arg, "server") == 0) )
         {
-            info = current_irc_server->name;
+            if (ptr_server->name)
+                info = ptr_server->name;
         }
         else if ( (strcasecmp (arg, "4") == 0) || (strcasecmp (arg, "weechatdir") == 0) )
         {
@@ -296,7 +413,356 @@ static XS (XS_IRC_get_info)
         }
         else if ( (strcasecmp (arg, "5") == 0) || (strcasecmp (arg, "away") == 0) )
         {
-            XST_mIV (0, current_irc_server->is_away);
+            XST_mIV (0, SERVER(gui_current_window->buffer)->is_away);
+            XSRETURN (1);
+            return;
+        }
+        
+        if (info)
+            XST_mPV (0, info);
+        else
+            XST_mPV (0, "");
+    }
+    
+    XSRETURN (1);
+}
+
+/******************************* New interface ********************************/
+
+/*
+ * weechat::register: startup function for all WeeChat Perl scripts
+ */
+
+static XS (XS_weechat_register)
+{
+    char *name, *version, *shutdown_func, *description;
+    int integer;
+    t_plugin_script *ptr_perl_script, *perl_script_found, *new_perl_script;
+    dXSARGS;
+    
+    /* make gcc happy */
+    (void) items;
+    (void) cv;
+    
+    name = SvPV (ST (0), integer);
+    version = SvPV (ST (1), integer);
+    shutdown_func = SvPV (ST (2), integer);
+    description = SvPV (ST (3), integer);
+    
+    perl_script_found = NULL;
+    for (ptr_perl_script = perl_scripts; ptr_perl_script;
+         ptr_perl_script = ptr_perl_script->next_script)
+    {
+        if (strcasecmp (ptr_perl_script->name, name) == 0)
+        {
+            perl_script_found = ptr_perl_script;
+            break;
+        }
+    }
+    
+    if (perl_script_found)
+    {
+        /* error: another script already exists with this name! */
+        irc_display_prefix (NULL, PREFIX_ERROR);
+        gui_printf (NULL,
+                    _("%s error: unable to register \"%s\" script (another script "
+                    "already exists with this name)\n"),
+                    "Perl", name);
+    }
+    else
+    {
+        /* registering script */
+        new_perl_script = (t_plugin_script *)malloc (sizeof (t_plugin_script));
+        if (new_perl_script)
+        {
+            new_perl_script->name = strdup (name);
+            new_perl_script->version = strdup (version);
+            new_perl_script->shutdown_func = strdup (shutdown_func);
+            new_perl_script->description = strdup (description);
+            
+            /* add new script to list */
+            new_perl_script->prev_script = last_perl_script;
+            new_perl_script->next_script = NULL;
+            if (perl_scripts)
+                last_perl_script->next_script = new_perl_script;
+            else
+                perl_scripts = new_perl_script;
+            last_perl_script = new_perl_script;
+            
+            wee_log_printf (_("Registered %s script: \"%s\", version %s (%s)\n"),
+                            "Perl", name, version, description);
+        }
+        else
+        {
+            irc_display_prefix (NULL, PREFIX_ERROR);
+            gui_printf (NULL,
+                        _("%s error: unable to load script \"%s\" (not enough memory)\n"),
+                        "Perl", name);
+        }
+    }
+    XST_mPV (0, VERSION);
+    XSRETURN (1);
+}
+
+/*
+ * weechat::print: print message into a buffer (current or specified one)
+ */
+
+static XS (XS_weechat_print)
+{
+    int integer;
+    char *message, *channel_name, *server_name;
+    t_gui_buffer *ptr_buffer;
+    dXSARGS;
+    
+    /* make gcc happy */
+    (void) cv;
+    
+    if ((items < 1) || (items > 3))
+    {
+        irc_display_prefix (NULL, PREFIX_ERROR);
+        gui_printf (NULL,
+                    _("%s error: wrong parameters for \"%s\" function\n"),
+                    "Perl", "print");
+        XSRETURN_NO;
+        return;
+    }
+    
+    channel_name = NULL;
+    server_name = NULL;
+    
+    if (items > 1)
+    {
+        channel_name = SvPV (ST (1), integer);
+        if (items > 2)
+            server_name = SvPV (ST (2), integer);
+    }
+    
+    ptr_buffer = plugin_find_buffer (server_name, channel_name);
+    if (ptr_buffer)
+    {
+        message = SvPV (ST (0), integer);
+        irc_display_prefix (ptr_buffer, PREFIX_PLUGIN);
+        gui_printf (ptr_buffer, "%s%s",
+                    message,
+                    ((strlen (message) == 0) || (message[strlen (message) - 1] != '\n')) ? "\n" : "");
+                    
+        XSRETURN_YES;
+    }
+    
+    /* buffer not found */
+    XSRETURN_NO;
+}
+
+/*
+ * weechat::print_infobar: print message to infobar
+ */
+
+static XS (XS_weechat_print_infobar)
+{
+    int integer;
+    dXSARGS;
+    
+    /* make gcc happy */
+    (void) cv;
+    
+    if (items != 2)
+    {
+        irc_display_prefix (NULL, PREFIX_ERROR);
+        gui_printf (NULL,
+                    _("%s error: wrong parameters for \"%s\" function\n"),
+                    "Perl", "print_infobar");
+        XSRETURN_NO;
+    }
+    
+    gui_infobar_printf (SvIV (ST (0)), COLOR_WIN_INFOBAR, SvPV (ST (1), integer));
+    XSRETURN_YES;
+}
+
+/*
+ * weechat::command: send command to server
+ */
+
+static XS (XS_weechat_command)
+{
+    int integer;
+    char *command, *channel_name, *server_name;
+    t_gui_buffer *ptr_buffer;
+    dXSARGS;
+    
+    /* make gcc happy */
+    (void) cv;
+    
+    if ((items < 1) || (items > 3))
+    {
+        irc_display_prefix (NULL, PREFIX_ERROR);
+        gui_printf (NULL,
+                    _("%s error: wrong parameters for \"%s\" function\n"),
+                    "Perl", "command");
+        XSRETURN_NO;
+        return;
+    }
+    
+    channel_name = NULL;
+    server_name = NULL;
+    
+    if (items > 1)
+    {
+        channel_name = SvPV (ST (1), integer);
+        if (items > 2)
+            server_name = SvPV (ST (2), integer);
+    }
+    
+    ptr_buffer = plugin_find_buffer (server_name, channel_name);
+    if (ptr_buffer)
+    {
+        command = SvPV (ST (0), integer);
+        user_command (SERVER(ptr_buffer), ptr_buffer, command);
+        XSRETURN_YES;
+    }
+    
+    /* buffer not found */
+    XSRETURN_NO;
+}
+
+/*
+ * weechat::add_message_handler: add handler for messages (privmsg, ...)
+ */
+
+static XS (XS_weechat_add_message_handler)
+{
+    char *name, *function;
+    int integer;
+    dXSARGS;
+    
+    /* make gcc happy */
+    (void) cv;
+    
+    if (items != 2)
+    {
+        irc_display_prefix (NULL, PREFIX_ERROR);
+        gui_printf (NULL,
+                    _("%s error: wrong parameters for \"%s\" function\n"),
+                    "Perl", "add_message_handler");
+        XSRETURN_NO;
+    }
+    
+    name = SvPV (ST (0), integer);
+    function = SvPV (ST (1), integer);
+    plugin_handler_add (&plugin_msg_handlers, &last_plugin_msg_handler,
+                        PLUGIN_TYPE_PERL, name, function);
+    XSRETURN_YES;
+}
+
+/*
+ * weechat::add_command_handler: add command handler (define/redefine commands)
+ */
+
+static XS (XS_weechat_add_command_handler)
+{
+    char *name, *function;
+    int integer;
+    t_plugin_handler *ptr_plugin_handler;
+    dXSARGS;
+    
+    /* make gcc happy */
+    (void) cv;
+    
+    if (items != 2)
+    {
+        irc_display_prefix (NULL, PREFIX_ERROR);
+        gui_printf (NULL,
+                    _("%s error: wrong parameters for \"%s\" function\n"),
+                    "Perl", "add_command_handler");
+        XSRETURN_NO;
+    }
+    
+    name = SvPV (ST (0), integer);
+    function = SvPV (ST (1), integer);
+    if (!weelist_search (index_commands, name))
+        weelist_add (&index_commands, &last_index_command, name);
+    ptr_plugin_handler = plugin_handler_search (plugin_cmd_handlers, name);
+    if (ptr_plugin_handler)
+    {
+        free (ptr_plugin_handler->function_name);
+        ptr_plugin_handler->function_name = strdup (function);
+    }
+    else
+        plugin_handler_add (&plugin_cmd_handlers, &last_plugin_cmd_handler,
+                            PLUGIN_TYPE_PERL, name, function);
+    
+    XSRETURN_YES;
+}
+
+/*
+ * weechat::get_info: get various infos
+ */
+
+static XS (XS_weechat_get_info)
+{
+    char *arg, *info = NULL, *server_name;
+    t_irc_server *ptr_server;
+    int integer;
+    dXSARGS;
+    
+    /* make gcc happy */
+    (void) cv;
+    
+    if ((items < 1) || (items > 2))
+    {
+        irc_display_prefix (NULL, PREFIX_ERROR);
+        gui_printf (NULL,
+                    _("%s error: wrong parameters for \"%s\" function\n"),
+                    "Perl", "get_info");
+        XSRETURN_NO;
+    }
+    
+    if (items == 2)
+    {
+        server_name = SvPV (ST (1), integer);
+        ptr_server = server_search (server_name);
+    }
+    else
+        ptr_server = SERVER(gui_current_window->buffer);
+    
+    if (!ptr_server)
+    {
+        irc_display_prefix (NULL, PREFIX_ERROR);
+        gui_printf (NULL,
+                    _("%s error: server not found for \"%s\" function\n"),
+                    "Perl", "get_info");
+        XSRETURN_NO;
+    }
+    
+    arg = SvPV (ST (0), integer);
+    if (arg)
+    {
+        if ( (strcasecmp (arg, "0") == 0) || (strcasecmp (arg, "version") == 0) )
+        {
+            info = PACKAGE_STRING;
+        }
+        else if ( (strcasecmp (arg, "1") == 0) || (strcasecmp (arg, "nick") == 0) )
+        {
+            if (ptr_server->nick)
+                info = ptr_server->nick;
+        }
+        else if ( (strcasecmp (arg, "2") == 0) || (strcasecmp (arg, "channel") == 0) )
+        {
+            if (BUFFER_IS_CHANNEL (gui_current_window->buffer))
+                info = CHANNEL (gui_current_window->buffer)->name;
+        }
+        else if ( (strcasecmp (arg, "3") == 0) || (strcasecmp (arg, "server") == 0) )
+        {
+            if (ptr_server->name)
+                info = ptr_server->name;
+        }
+        else if ( (strcasecmp (arg, "4") == 0) || (strcasecmp (arg, "weechatdir") == 0) )
+        {
+            info = weechat_home;
+        }
+        else if ( (strcasecmp (arg, "5") == 0) || (strcasecmp (arg, "away") == 0) )
+        {
+            XST_mIV (0, SERVER(gui_current_window->buffer)->is_away);
             XSRETURN (1);
             return;
         }
@@ -318,12 +784,25 @@ void
 xs_init (pTHX)
 {
     newXS ("DynaLoader::boot_DynaLoader", boot_DynaLoader, __FILE__);
+    
+    /* DEPRECATED & old interface (WeeChat <= 0.1.1), kept for compatibility */
     newXS ("IRC::register", XS_IRC_register, "IRC");
     newXS ("IRC::print", XS_IRC_print, "IRC");
     newXS ("IRC::print_with_channel", XS_IRC_print_with_channel, "IRC");
+    newXS ("IRC::print_infobar", XS_IRC_print_infobar, "IRC");
+    newXS ("IRC::command", XS_IRC_command, "IRC");
     newXS ("IRC::add_message_handler", XS_IRC_add_message_handler, "IRC");
     newXS ("IRC::add_command_handler", XS_IRC_add_command_handler, "IRC");
     newXS ("IRC::get_info", XS_IRC_get_info, "IRC");
+    
+    /* new interface (WeeChat >= 0.1.2) */
+    newXS ("weechat::register", XS_weechat_register, "weechat");
+    newXS ("weechat::print", XS_weechat_print, "weechat");
+    newXS ("weechat::print_infobar", XS_weechat_print_infobar, "weechat");
+    newXS ("weechat::command", XS_weechat_command, "weechat");
+    newXS ("weechat::add_message_handler", XS_weechat_add_message_handler, "weechat");
+    newXS ("weechat::add_command_handler", XS_weechat_add_command_handler, "weechat");
+    newXS ("weechat::get_info", XS_weechat_get_info, "weechat");
 }
 
 /*
@@ -335,7 +814,7 @@ wee_perl_init ()
 {
     char *perl_args[] = { "", "-e", "0" };
     /* Following Perl code is extracted/modified from X-Chat IRC client */
-    /* X-Chat is (c) 1998-2002 Peter Zelezny */
+    /* X-Chat is (c) 1998-2005 Peter Zelezny */
     char *weechat_perl_func =
     {
         "sub wee_perl_load_file"
@@ -353,21 +832,22 @@ wee_perl_init ()
         "    my $content = wee_perl_load_file ($filename);"
         "    if ($content eq \"__WEECHAT_ERROR__\")"
         "    {"
-        "        IRC::print \"" WEECHAT_ERROR " Perl script '$filename' not found.\\n\";"
+        "        weechat::print \"WeeChat Error: Perl script '$filename' not found.\\n\";"
         "        return 1;"
         "    }"
         "    eval $content;"
         "    if ($@)"
         "    {"
-        "        IRC::print \"" WEECHAT_ERROR " unable to load Perl script '$filename':\\n\";"
-        "        IRC::print \"$@\\n\";"
+        "        weechat::print \"WeeChat error: unable to load Perl script '$filename':\\n\";"
+        "        weechat::print \"$@\\n\";"
         "        return 2;"
         "    }"
         "    return 0;"
         "}"
-        "$SIG{__WARN__} = sub { IRC::print \"$_[0]\n\"; };"
+        "$SIG{__WARN__} = sub { weechat::print \"$_[0]\n\"; };"
     };
     
+    wee_log_printf (_("Loading %s module \"weechat\"\n"), "Perl");
     my_perl = perl_alloc ();
     perl_construct (my_perl);
     perl_parse (my_perl, xs_init, 3, perl_args, NULL);
@@ -399,9 +879,9 @@ wee_perl_search (char *name)
  */
 
 int
-wee_perl_exec (char *function, char *arguments)
+wee_perl_exec (char *function, char *server, char *arguments)
 {
-    char *argv[2];
+    char *argv[3];
     int count, return_code;
     SV *sv;
     
@@ -410,8 +890,12 @@ wee_perl_exec (char *function, char *arguments)
     ENTER;
     SAVETMPS;
     PUSHMARK(sp);
-    argv[0] = arguments;
-    argv[1] = NULL;
+    if (!server)
+        argv[0] = strdup ("");
+    else
+        argv[0] = server;
+    argv[1] = arguments;
+    argv[2] = NULL;
     count = perl_call_argv (function, G_EVAL | G_SCALAR, argv);
     SPAGAIN;
     
@@ -422,7 +906,7 @@ wee_perl_exec (char *function, char *arguments)
     {
         irc_display_prefix (NULL, PREFIX_ERROR);
         gui_printf (NULL,
-                    _("Perl error: %s\n"),
+                    _("Perl error: %s"),
                     SvPV (sv, count));
         POPs;
     }
@@ -432,8 +916,8 @@ wee_perl_exec (char *function, char *arguments)
         {
             irc_display_prefix (NULL, PREFIX_ERROR);
             gui_printf (NULL,
-                        _("Perl error: too much values from \"%s\" (%d). Expected: 1.\n"),
-                        function, count);
+                        _("%s error: too much values from \"%s\" (%d). Expected: 1.\n"),
+                        "Perl", function, count);
         }
         else
             return_code = POPi;
@@ -454,8 +938,10 @@ int
 wee_perl_load (char *filename)
 {
     /* execute Perl script */
-    wee_log_printf (_("loading Perl script \"%s\"\n"), filename);
-    return wee_perl_exec ("wee_perl_load_eval_file", filename);
+    wee_log_printf (_("Loading %s script \"%s\"\n"), "Perl", filename);
+    irc_display_prefix (NULL, PREFIX_PLUGIN);
+    gui_printf (NULL, _("Loading %s script \"%s\"\n"), "Perl", filename);
+    return wee_perl_exec ("wee_perl_load_eval_file", filename, "");
 }
 
 /*
@@ -503,12 +989,12 @@ wee_perl_unload (t_plugin_script *ptr_perl_script)
 {
     if (ptr_perl_script)
     {
-        wee_log_printf (_("unloading Perl script \"%s\"\n"),
-                        ptr_perl_script->name);
+        wee_log_printf (_("Unloading %s script \"%s\"\n"),
+                        "Perl", ptr_perl_script->name);
         
         /* call shutdown callback function */
         if (ptr_perl_script->shutdown_func[0])
-            wee_perl_exec (ptr_perl_script->shutdown_func, "");
+            wee_perl_exec (ptr_perl_script->shutdown_func, "", "");
         wee_perl_script_free (ptr_perl_script);
     }
 }
@@ -520,9 +1006,12 @@ wee_perl_unload (t_plugin_script *ptr_perl_script)
 void
 wee_perl_unload_all ()
 {
-    wee_log_printf (_("unloading all Perl scripts...\n"));
+    wee_log_printf (_("Unloading all %s scripts...\n"), "Perl");
     while (perl_scripts)
         wee_perl_unload (perl_scripts);
+    
+    irc_display_prefix (NULL, PREFIX_PLUGIN);
+    gui_printf (NULL, _("%s scripts unloaded\n"), "Perl");
 }
 
 /*

src/plugins/perl/wee-perl.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
  * See README for License detail, AUTHORS for developers list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -25,7 +25,7 @@
 
 extern void wee_perl_init ();
 extern t_plugin_script *wee_perl_search (char *);
-extern int wee_perl_exec (char *, char *);
+extern int wee_perl_exec (char *, char *, char *);
 extern int wee_perl_load (char *);
 extern void wee_perl_unload (t_plugin_script *);
 extern void wee_perl_unload_all ();

src/plugins/plugins.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
  * See README for License detail, AUTHORS for developers list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -39,6 +39,10 @@
 #include "perl/wee-perl.h"
 #endif
 
+#ifdef PLUGIN_PYTHON
+#include "python/wee-python.h"
+#endif
+
 
 char *plugin_name[3] = { "Perl", "Python", "Ruby" };
 
@@ -56,15 +60,17 @@ t_plugin_handler *last_plugin_cmd_handler = NULL;
 void
 plugin_auto_load (int plugin_type, char *directory)
 {
+    int dir_length;
     char *dir_name, *current_dir;
     DIR *dir;
     struct dirent *entry;
     struct stat statbuf;
     
     /* build directory, adding WeeChat home */
+    dir_length = strlen (weechat_home) + strlen (directory) + 2;
     dir_name =
-        (char *) malloc ((strlen (weechat_home) + strlen (directory) + 2) * sizeof (char));
-    sprintf (dir_name, "%s%s%s", weechat_home, DIR_SEPARATOR, directory);
+        (char *) malloc (dir_length * sizeof (char));
+    snprintf (dir_name, dir_length, "%s%s%s", weechat_home, DIR_SEPARATOR, directory);
     
     /* save working directory */
     current_dir = (char *) malloc (1024 * sizeof (char));
@@ -84,12 +90,13 @@ plugin_auto_load (int plugin_type, char *directory)
             lstat (entry->d_name, &statbuf);
             if (! S_ISDIR(statbuf.st_mode))
             {
-                wee_log_printf (_("auto-loading %s script: %s%s%s\n"),
+                wee_log_printf (_("Auto-loading %s script: %s%s%s\n"),
                                 plugin_name[plugin_type],
                                 dir_name, DIR_SEPARATOR, entry->d_name);
                 plugin_load (plugin_type, entry->d_name);
             }
         }
+        closedir (dir);
     }
     
     /* restore working directory */
@@ -112,6 +119,11 @@ plugin_init ()
     wee_perl_init();
     plugin_auto_load (PLUGIN_TYPE_PERL, "perl/autoload");
     #endif
+    
+    #ifdef PLUGIN_PYTHON
+    wee_python_init();
+    plugin_auto_load (PLUGIN_TYPE_PYTHON, "python/autoload");
+    #endif
 }
 
 /*
@@ -130,12 +142,18 @@ plugin_load (int plugin_type, char *filename)
             #endif
             break;
         case PLUGIN_TYPE_PYTHON:
-            /* TODO: load Python script */
+            #ifdef PLUGIN_PYTHON
+            wee_python_load (filename);
+            #endif
             break;
         case PLUGIN_TYPE_RUBY:
             /* TODO: load Ruby script */
             break;
     }
+    #else
+    /* make gcc happy */
+    (void) plugin_type;
+    (void) filename;
     #endif
 }
 
@@ -176,6 +194,7 @@ plugin_handler_add (t_plugin_handler **plugin_handlers,
         new_plugin_handler->plugin_type = plugin_type;
         new_plugin_handler->name = strdup (name);
         new_plugin_handler->function_name = strdup (function);
+        new_plugin_handler->running = 0;
         
         /* add new handler to list */
         new_plugin_handler->prev_handler = *last_plugin_handler;
@@ -271,7 +290,7 @@ plugin_handler_free_all_type (t_plugin_handler **plugin_handlers,
  */
 
 void
-plugin_event_msg (char *irc_command, char *arguments)
+plugin_event_msg (char *irc_command, char *server, char *arguments)
 {
     #ifdef PLUGINS
     t_plugin_handler *ptr_plugin_handler;
@@ -283,7 +302,25 @@ plugin_event_msg (char *irc_command, char *arguments)
         {
             #ifdef PLUGIN_PERL
             if (ptr_plugin_handler->plugin_type == PLUGIN_TYPE_PERL)
-                wee_perl_exec (ptr_plugin_handler->function_name, arguments);
+            {
+                if (ptr_plugin_handler->running == 0)
+                {
+                    ptr_plugin_handler->running = 1;
+                    wee_perl_exec (ptr_plugin_handler->function_name, server, arguments);
+                    ptr_plugin_handler->running = 0;
+                }
+            }
+            #endif
+            #ifdef PLUGIN_PYTHON
+            if (ptr_plugin_handler->plugin_type == PLUGIN_TYPE_PYTHON)
+            {
+                if (ptr_plugin_handler->running == 0)
+                {
+                    ptr_plugin_handler->running = 1;
+                    wee_python_exec (ptr_plugin_handler->function_name, server, arguments);
+                    ptr_plugin_handler->running = 0;
+                }
+            }
             #endif
         }
     }
@@ -291,6 +328,7 @@ plugin_event_msg (char *irc_command, char *arguments)
     /* make gcc happy */
     (void) irc_command;
     (void) arguments;
+    (void) server;
     #endif
 }
 
@@ -299,7 +337,7 @@ plugin_event_msg (char *irc_command, char *arguments)
  */
 
 int
-plugin_exec_command (char *user_command, char *arguments)
+plugin_exec_command (char *user_command, char *server, char *arguments)
 {
     #ifdef PLUGINS
     t_plugin_handler *ptr_plugin_handler;
@@ -311,7 +349,25 @@ plugin_exec_command (char *user_command, char *arguments)
         {
             #ifdef PLUGIN_PERL
             if (ptr_plugin_handler->plugin_type == PLUGIN_TYPE_PERL)
-                wee_perl_exec (ptr_plugin_handler->function_name, arguments);
+            {
+                if (ptr_plugin_handler->running == 0)
+                {
+                    ptr_plugin_handler->running = 1;
+                    wee_perl_exec (ptr_plugin_handler->function_name, server, arguments);
+                    ptr_plugin_handler->running = 0;
+                }
+            }
+            #endif
+            #ifdef PLUGIN_PYTHON
+            if (ptr_plugin_handler->plugin_type == PLUGIN_TYPE_PYTHON)
+            {
+                if (ptr_plugin_handler->running == 0)
+                {
+                    ptr_plugin_handler->running = 1;
+                    wee_python_exec (ptr_plugin_handler->function_name, server, arguments);
+                    ptr_plugin_handler->running = 0;
+                }
+            }
             #endif
             
             /* command executed */
@@ -322,12 +378,63 @@ plugin_exec_command (char *user_command, char *arguments)
     /* make gcc happy */
     (void) user_command;
     (void) arguments;
+    (void) server;
     #endif
     
     /* no command executed */
     return 0;
 }
 
+/*
+ * plugin_find_buffer: find a buffer for text display or command execution
+ */
+
+t_gui_buffer *
+plugin_find_buffer (char *server, char *channel)
+{
+    t_irc_server *ptr_server;
+    t_irc_channel *ptr_channel;
+    t_gui_buffer *ptr_buffer;
+    
+    ptr_server = NULL;
+    ptr_channel = NULL;
+    ptr_buffer = NULL;
+    
+    if (server && server[0])
+    {
+        ptr_server = server_search (server);
+        if (!ptr_server)
+            return NULL;
+    }
+    else
+    {
+        ptr_server = SERVER(gui_current_window->buffer);
+        if (!ptr_server)
+            ptr_server = SERVER(gui_buffers);
+    }
+    
+    if (channel && channel[0])
+    {
+        if (ptr_server)
+        {
+            ptr_channel = channel_search (ptr_server, channel);
+            if (ptr_channel)
+                ptr_buffer = ptr_channel->buffer;
+        }
+    }
+    else
+    {
+        ptr_buffer = gui_current_window->buffer;
+        if (ptr_buffer->dcc)
+            ptr_buffer = gui_buffers;
+    }
+    
+    if (!ptr_buffer)
+        return NULL;
+    
+    return (ptr_buffer->dcc) ? NULL : ptr_buffer;
+}
+
 /*
  * plugin_unload: unload all scripts for a plugin type
  */
@@ -335,6 +442,9 @@ plugin_exec_command (char *user_command, char *arguments)
 void
 plugin_unload (int plugin_type, char *scriptname)
 {
+    /* make gcc happy */
+    (void) scriptname;
+    
     #ifdef PLUGINS
     switch (plugin_type)
     {
@@ -346,12 +456,18 @@ plugin_unload (int plugin_type, char *scriptname)
             #endif
             break;
         case PLUGIN_TYPE_PYTHON:
-            /* TODO: unload Python scripts */
+            #ifdef PLUGIN_PYTHON
+            wee_python_end ();
+            wee_python_init ();
+            #endif
             break;
         case PLUGIN_TYPE_RUBY:
             /* TODO: unload Ruby scripts */
             break;
     }
+    #else
+    /* make gcc happy */
+    (void) plugin_type;
     #endif
 }
 
@@ -368,4 +484,8 @@ plugin_end ()
     #ifdef PLUGIN_PERL
     wee_perl_end();
     #endif
+    
+    #ifdef PLUGIN_PYTHON
+    wee_python_end();
+    #endif    
 }

src/plugins/plugins.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 by FlashCode <flashcode@flashtux.org>
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
  * See README for License detail, AUTHORS for developers list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,6 +21,8 @@
 #ifndef __WEECHAT_PLUGINS_H
 #define __WEECHAT_PLUGINS_H 1
 
+#include "../gui/gui.h"
+
 #define PLUGIN_TYPE_PERL    0
 #define PLUGIN_TYPE_PYTHON  1
 #define PLUGIN_TYPE_RUBY    2
@@ -45,6 +47,8 @@ struct t_plugin_handler
     char *name;                     /* name of IRC command (PRIVMSG, ..)
                                        or command (without first '/')       */
     char *function_name;            /* name of function (handler)           */
+    int running;                    /* 1 if currently running               */
+                                    /* (used to prevent circular call)      */
     t_plugin_handler *prev_handler; /* link to previous handler             */
     t_plugin_handler *next_handler; /* link to next handler                 */
 };
@@ -59,6 +63,11 @@ extern t_plugin_handler *last_plugin_cmd_handler;
 extern t_plugin_script *perl_scripts;
 #endif
 
+#ifdef PLUGIN_PYTHON
+extern t_plugin_script *python_scripts;
+#endif
+
+extern void plugin_auto_load (int, char *);
 extern void plugin_init ();
 extern void plugin_load (int, char *);
 extern void plugin_unload (int, char *);
@@ -67,8 +76,9 @@ extern void plugin_handler_add (t_plugin_handler **, t_plugin_handler **,
                                 int, char *, char *);
 extern void plugin_handler_free_all_type (t_plugin_handler **,
                                           t_plugin_handler **, int);
-extern void plugin_event_msg (char *, char *);
-extern int plugin_exec_command (char *, char *);
+extern void plugin_event_msg (char *, char *, char *);
+extern int plugin_exec_command (char *, char *, char *);
+extern t_gui_buffer *plugin_find_buffer (char *, char *);
 extern void plugin_end ();
 
 #endif /* plugins.h */

src/plugins/python/Makefile.am

@@ -0,0 +1,23 @@
+# 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
+#
+
+INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\" $(PYTHON_CFLAGS) 
+
+noinst_LIBRARIES = lib_weechat_python.a
+
+lib_weechat_python_a_SOURCES = wee-python.h \
+                               wee-python.c

src/plugins/python/wee-python.c

@@ -0,0 +1,663 @@
+/*
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * See README for License detail, AUTHORS for developers list.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/* wee-python.c: Python plugin support for WeeChat */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <Python.h>
+#include <stdlib.h>
+#include <string.h>
+#undef _
+#include "../../common/weechat.h"
+#include "../plugins.h"
+#include "wee-python.h"
+#include "../../common/command.h"
+#include "../../irc/irc.h"
+#include "../../gui/gui.h"
+
+
+t_plugin_script *python_scripts = NULL;
+t_plugin_script *last_python_script = NULL;
+
+
+/*
+ * weechat.register: startup function for all WeeChat Python scripts
+ */
+
+static PyObject *
+wee_python_register (PyObject *self, PyObject *args)
+{
+    char *name, *version, *shutdown_func, *description;
+    t_plugin_script *ptr_python_script, *python_script_found, *new_python_script;
+
+    /* make gcc happy */
+    (void) self;
+  
+    if (!PyArg_ParseTuple (args, "ssss", &name, &version, &shutdown_func, &description))
+    {
+        irc_display_prefix (NULL, PREFIX_ERROR);
+        gui_printf (NULL,
+                    _("%s error: wrong parameters for \"%s\" function\n"),
+                    "Python", "print_with_channel");
+        return NULL;
+    } 
+    
+    python_script_found = NULL;
+    for (ptr_python_script = python_scripts; ptr_python_script;
+         ptr_python_script = ptr_python_script->next_script)
+    {
+        if (strcasecmp (ptr_python_script->name, name) == 0)
+        {
+            python_script_found = ptr_python_script;
+            break;
+        }
+    }
+    
+    if (python_script_found)
+    {
+        /* error: another scripts already exists with this name! */
+        irc_display_prefix (NULL, PREFIX_ERROR);
+        gui_printf (NULL,
+                    _("%s error: unable to register \"%s\" script (another script "
+                    "already exists with this name)\n"),
+                    "Python", name);
+    }
+    else
+    {
+        /* registering script */
+        new_python_script = (t_plugin_script *)malloc (sizeof (t_plugin_script));
+        if (new_python_script)
+        {
+            new_python_script->name = strdup (name);
+            new_python_script->version = strdup (version);
+            new_python_script->shutdown_func = strdup (shutdown_func);
+            new_python_script->description = strdup (description);
+            
+            /* add new script to list */
+            new_python_script->prev_script = last_python_script;
+            new_python_script->next_script = NULL;
+            if (python_scripts)
+                last_python_script->next_script = new_python_script;
+            else
+                python_scripts = new_python_script;
+            last_python_script = new_python_script;
+            
+            wee_log_printf (_("Registered %s script: \"%s\", version %s (%s)\n"),
+                            "Python", name, version, description);
+        }
+        else
+        {
+            irc_display_prefix (NULL, PREFIX_ERROR);
+            gui_printf (NULL,
+                        _("%s error: unable to load script \"%s\" (not enough memory)\n"),
+                        "Python", name);
+        }
+    }
+    
+    Py_INCREF (Py_None);
+    return Py_None;
+}
+
+/*
+ * weechat.print: print message into a buffer (current or specified one)
+ */
+
+static PyObject *
+wee_python_print (PyObject *self, PyObject *args)
+{
+    char *message, *channel_name, *server_name;
+    t_gui_buffer *ptr_buffer;
+    
+    /* make gcc happy */
+    (void) self;
+    
+    message = NULL;
+    channel_name = NULL;
+    server_name = NULL;
+    
+    if (!PyArg_ParseTuple (args, "s|ss", &message, &channel_name, &server_name))
+    {
+        irc_display_prefix (NULL, PREFIX_ERROR);
+        gui_printf (NULL,
+                    _("%s error: wrong parameters for \"%s\" function\n"),
+                    "Python", "print");
+        return NULL;
+    }
+    
+    ptr_buffer = plugin_find_buffer (server_name, channel_name);
+    if (ptr_buffer)
+    {
+        irc_display_prefix (ptr_buffer, PREFIX_PLUGIN);
+        gui_printf (ptr_buffer, "%s\n", message);
+        return Py_BuildValue ("i", 1);
+    }
+    
+    /* buffer not found */
+    return Py_BuildValue ("i", 0);
+}
+
+/*
+ * weechat.print_infobar: print message to infobar
+ */
+
+static PyObject *
+wee_python_print_infobar (PyObject *self, PyObject *args)
+{
+    int delay;
+    char *message;
+    
+    /* make gcc happy */
+    (void) self;
+    
+    delay = 1;
+    message = NULL;
+    
+    if (!PyArg_ParseTuple (args, "is", &delay, &message))
+    {
+        irc_display_prefix (NULL, PREFIX_ERROR);
+        gui_printf (NULL,
+                    _("%s error: wrong parameters for \"%s\" function\n"),
+                    "Python", "print_infobar");
+        return NULL;
+    }
+    
+    gui_infobar_printf (delay, COLOR_WIN_INFOBAR, message);
+    
+    Py_INCREF (Py_None);
+    return Py_None;
+}
+
+/*
+ * weechat.command: send command to server
+ */
+
+static PyObject *
+wee_python_command (PyObject *self, PyObject *args)
+{
+    char *command, *channel_name, *server_name;
+    t_gui_buffer *ptr_buffer;
+    
+    /* make gcc happy */
+    (void) self;
+    
+    command = NULL;
+    channel_name = NULL;
+    server_name = NULL;
+    
+    if (!PyArg_ParseTuple (args, "s|ss", &command, &channel_name, &server_name))
+    {
+        irc_display_prefix (NULL, PREFIX_ERROR);
+        gui_printf (NULL,
+                    _("%s error: wrong parameters for \"%s\" function\n"),
+                    "Python", "command");
+        return NULL;
+    }
+    
+    ptr_buffer = plugin_find_buffer (server_name, channel_name);
+    if (ptr_buffer)
+    {
+        user_command (SERVER(ptr_buffer), ptr_buffer, command);
+        return Py_BuildValue ("i", 1);
+    }
+    
+    /* buffer not found */
+    return Py_BuildValue ("i", 0);
+}
+
+/*
+ * weechat.add_message_handler: add handler for messages
+ */
+
+static PyObject *
+wee_python_add_message_handler (PyObject *self, PyObject *args)
+{
+    char *message, *function;
+    
+    /* make gcc happy */
+    (void) self;
+    
+    if (!PyArg_ParseTuple (args, "ss", &message, &function))
+    {
+        irc_display_prefix (NULL, PREFIX_ERROR);
+        gui_printf (NULL,
+                    _("%s error: wrong parameters for \"%s\" function\n"),
+                    "Python", "add_message_handler");
+        return NULL;
+    }
+    
+    plugin_handler_add (&plugin_msg_handlers, &last_plugin_msg_handler,
+                        PLUGIN_TYPE_PYTHON, message, function);
+    
+    Py_INCREF (Py_None);
+    return Py_None;
+}
+
+/*
+ * weechat.add_command_handler: define/redefines commands
+ */
+
+static PyObject *
+wee_python_add_command_handler(PyObject *self, PyObject *args)
+{
+    char *name, *function;
+    t_plugin_handler *ptr_plugin_handler;
+    
+    /* make gcc happy */
+    (void) self;
+    
+    if (!PyArg_ParseTuple (args, "ss", &name, &function))
+    {
+        irc_display_prefix (NULL, PREFIX_ERROR);
+        gui_printf (NULL,
+                    _("%s error: wrong parameters for \"%s\" function\n"),
+                    "Python", "add_command_handler");
+        return NULL; 
+    }
+    
+    if (!weelist_search (index_commands, name))
+        weelist_add (&index_commands, &last_index_command, name);
+    
+    ptr_plugin_handler = plugin_handler_search (plugin_cmd_handlers, name);
+    if (ptr_plugin_handler)
+    {
+        free (ptr_plugin_handler->function_name);
+        ptr_plugin_handler->function_name = strdup (function);
+    }
+    else
+        plugin_handler_add (&plugin_cmd_handlers, &last_plugin_cmd_handler,
+                            PLUGIN_TYPE_PYTHON, name, function);
+    
+    Py_INCREF (Py_None);
+    return Py_None;
+}
+
+/*
+ * weechat.get_info: get various infos
+ */
+
+static PyObject *
+wee_python_get_info (PyObject *self, PyObject *args)
+{
+    char *arg, *info = NULL, *server = NULL;
+    t_irc_server *ptr_server;
+    
+    /* make gcc happy */
+    (void) self;
+    
+    if (!PyArg_ParseTuple (args, "s|s", &arg, &server))
+    {
+        irc_display_prefix (NULL, PREFIX_ERROR);
+        gui_printf (NULL,
+                    _("%s error: wrong parameters for \"%s\" function\n"),
+                    "Python", "get_info");
+        return NULL; 
+    }
+    
+    if (server == NULL)
+    {
+        ptr_server = SERVER(gui_current_window->buffer);
+    }
+    else
+    {
+        for (ptr_server = irc_servers; ptr_server; ptr_server = ptr_server->next_server)
+        {
+            if (strcasecmp (ptr_server->name, server) == 0)
+                break;
+        }
+        if (!ptr_server)
+        {
+            irc_display_prefix (NULL, PREFIX_ERROR);
+            gui_printf (NULL,
+                        _("%s error: server not found for \"%s\" function\n"),
+                        "Python", "get_info");
+        }
+    }
+    
+    if (ptr_server && arg)
+    {
+        if ( (strcasecmp (arg, "0") == 0) || (strcasecmp (arg, "version") == 0) )
+        {
+            info = PACKAGE_STRING;
+        }
+        else if ( (strcasecmp (arg, "1") == 0) || (strcasecmp (arg, "nick") == 0) )
+        {
+            if (ptr_server->nick)
+                info = ptr_server->nick;
+        }
+        else if ( (strcasecmp (arg, "2") == 0) || (strcasecmp (arg, "channel") == 0) )
+        {
+            if (BUFFER_IS_CHANNEL (gui_current_window->buffer))
+                info = CHANNEL (gui_current_window->buffer)->name;
+        }
+        else if ( (strcasecmp (arg, "3") == 0) || (strcasecmp (arg, "server") == 0) )
+        {
+            if (ptr_server->name)
+                info = ptr_server->name;
+        }
+        else if ( (strcasecmp (arg, "4") == 0) || (strcasecmp (arg, "weechatdir") == 0) )
+        {
+            info = weechat_home;
+        }
+        else if ( (strcasecmp (arg, "5") == 0) || (strcasecmp (arg, "away") == 0) )
+        {	 
+            return Py_BuildValue ("i", SERVER(gui_current_window->buffer)->is_away);
+        }
+        
+        if (info)
+            return Py_BuildValue ("s", info);
+        else
+            return Py_BuildValue ("s", "");
+    }
+    
+    return Py_BuildValue ("i", 1);
+}
+
+/*
+ * Python subroutines
+ */
+
+static
+PyMethodDef weechat_funcs[] = {
+    { "register", wee_python_register, METH_VARARGS, "" },
+    { "prnt", wee_python_print, METH_VARARGS, "" },
+    { "print_infobar", wee_python_print_infobar, METH_VARARGS, "" },
+    { "command", wee_python_command, METH_VARARGS, "" },
+    { "add_message_handler", wee_python_add_message_handler, METH_VARARGS, "" },
+    { "add_command_handler", wee_python_add_command_handler, METH_VARARGS, "" },
+    { "get_info", wee_python_get_info, METH_VARARGS, "" },
+    { NULL, NULL, 0, NULL }
+};
+
+/*
+ * wee_python_init: initialize Python interface for WeeChat
+ */
+
+void
+wee_python_init ()
+{
+
+    Py_Initialize ();
+    if (Py_IsInitialized () == 0)
+    {
+        irc_display_prefix (NULL, PREFIX_PLUGIN);
+        gui_printf (NULL, _("%s error: error while launching interpreter\n"),
+                    "Python");
+    }
+    else
+    {
+        wee_log_printf (_("Loading %s module \"weechat\"\n"), "Python");
+        Py_InitModule ("weechat", weechat_funcs);
+    }
+}
+
+/*
+ * wee_python_search: search a (loaded) Python script by name
+ */
+
+t_plugin_script *
+wee_python_search (char *name)
+{
+    t_plugin_script *ptr_python_script;
+    
+    for (ptr_python_script = python_scripts; ptr_python_script;
+         ptr_python_script = ptr_python_script->next_script)
+    {
+        if (strcmp (ptr_python_script->name, name) == 0)
+            return ptr_python_script;
+    }
+    
+    /* script not found */
+    return NULL;
+}
+
+/*
+ * wee_python_exec: execute a Python script
+ */
+
+int
+wee_python_exec (char *function, char *server, char *arguments)
+{  
+    int len, return_code, i, j, alen;
+    char *srv, *args, *runstring;
+    
+    return_code = 1;
+    
+    if (arguments == NULL)
+    {
+        alen = 0;
+        args = strdup ("");
+    }
+    else 
+    {
+        alen = (int) strlen (arguments);
+        args = (char *) malloc ( 2 * alen * sizeof (*args));
+    }
+    
+    if (!args)
+    {
+        irc_display_prefix (NULL, PREFIX_ERROR);
+        gui_printf (NULL,
+                    _("%s error: unable to run function \"%s\" in script (not enough memory)\n"),
+                    "Python", function);
+        return 0;
+    }
+    
+    // copy arguments in args to escape double quotes
+    j = 0;
+    for (i=0; i < alen; ++i)
+    {
+        if (arguments[i] == '"' || arguments[i] == '\\')
+        {
+            args[j] = '\\';
+            ++j;
+        }
+        args[j] = arguments[i];
+        ++j;
+    }
+    args[j] = 0;
+    
+    if (server == NULL)
+        srv = strdup ("");
+    else 
+        srv = strdup (server);
+    
+    if (!srv)
+    {
+        irc_display_prefix (NULL, PREFIX_ERROR);
+        gui_printf (NULL,
+                    _("%s error: unable to run function \"%s\" in script (not enough memory)\n"),
+                    "Python", function);
+        free (args);
+        return 0;
+    }
+    
+    len = (int) strlen (function);
+    len += (int) strlen ("(\"\",\"\")");
+    len += (int) strlen (srv);
+    len += (int) strlen (args);
+    len += 1;
+    
+    runstring = (char *) malloc ( len * sizeof (*runstring));
+    
+    if (runstring)
+    {
+        sprintf (runstring, "%s(\"%s\",\"%s\")", function, srv, args);
+      
+        if (PyRun_SimpleString (runstring) != 0)
+        {
+            irc_display_prefix (NULL, PREFIX_ERROR);
+            gui_printf (NULL,
+                        _("%s error: error while running function \"%s\"\n"),
+                        "Python", function);
+            return_code = 0;
+        }
+        free (runstring);
+    }
+    else
+    {
+        irc_display_prefix (NULL, PREFIX_ERROR);
+        gui_printf (NULL,
+                    _("%s error: unable to run function \"%s\" in script (not enough memory)\n"),
+                    "Python", function);
+        return_code = 0;
+    }
+    
+    free (args);
+    free (srv);
+    
+    return return_code;
+}
+
+/*
+ * wee_python_load: load a Python script
+ */
+
+int
+wee_python_load (char *filename)
+{
+    FILE *fp;
+    
+    /* execute Python script */
+    wee_log_printf (_("Loading %s script \"%s\"\n"), "Python", filename);
+    irc_display_prefix (NULL, PREFIX_PLUGIN);
+    gui_printf (NULL, _("Loading %s script \"%s\"\n"), "Python", filename);
+    
+    if ((fp = fopen (filename, "r")) == NULL)
+    {
+        irc_display_prefix (NULL, PREFIX_ERROR);
+        gui_printf (NULL,
+                    _("%s error: error while opening file \"%s\"\n"),
+                    "Python", filename);
+        return 1;
+    }
+    
+    if (PyRun_SimpleFile (fp, filename) != 0)
+    {
+        irc_display_prefix (NULL, PREFIX_ERROR);
+        gui_printf (NULL,
+                    _("%s error: error while parsing file \"%s\"\n"),
+                    "Python", filename);
+        return 1;
+    }
+    
+    fclose (fp);
+    return 0;
+}
+
+/*
+ * wee_python_script_free: free a Python script
+ */
+
+void
+wee_python_script_free (t_plugin_script *ptr_python_script)
+{
+    t_plugin_script *new_python_scripts;
+
+    /* remove script from list */
+    if (last_python_script == ptr_python_script)
+        last_python_script = ptr_python_script->prev_script;
+    if (ptr_python_script->prev_script)
+    {
+        (ptr_python_script->prev_script)->next_script = ptr_python_script->next_script;
+        new_python_scripts = python_scripts;
+    }
+    else
+        new_python_scripts = ptr_python_script->next_script;
+    
+    if (ptr_python_script->next_script)
+        (ptr_python_script->next_script)->prev_script = ptr_python_script->prev_script;
+
+    /* free data */
+    if (ptr_python_script->name)
+        free (ptr_python_script->name);
+    if (ptr_python_script->version)
+        free (ptr_python_script->version);
+    if (ptr_python_script->shutdown_func)
+        free (ptr_python_script->shutdown_func);
+    if (ptr_python_script->description)
+        free (ptr_python_script->description);
+    free (ptr_python_script);
+    python_scripts = new_python_scripts;
+}
+
+/*
+ * wee_python_unload: unload a Python script
+ */
+
+void
+wee_python_unload (t_plugin_script *ptr_python_script)
+{
+    if (ptr_python_script)
+    {
+        wee_log_printf (_("Unloading %s script \"%s\"\n"),
+                        "Python", ptr_python_script->name);
+        
+        /* call shutdown callback function */
+        if (ptr_python_script->shutdown_func[0])
+            wee_python_exec (ptr_python_script->shutdown_func, "", "");
+        wee_python_script_free (ptr_python_script);
+    }
+}
+
+/*
+ * wee_python_unload_all: unload all Python scripts
+ */
+
+void
+wee_python_unload_all ()
+{
+    wee_log_printf (_("Unloading all %s scripts...\n"), "Python");
+    while (python_scripts)
+        wee_python_unload (python_scripts);
+    
+    irc_display_prefix (NULL, PREFIX_PLUGIN);
+    gui_printf (NULL, _("%s scripts unloaded\n"), "Python");
+}
+
+/*
+ * wee_python_end: shutdown Python interface
+ */
+
+void
+wee_python_end ()
+{
+    /* unload all scripts */
+    wee_python_unload_all ();
+    
+    /* free all handlers */
+    plugin_handler_free_all_type (&plugin_msg_handlers,
+                                  &last_plugin_msg_handler,
+                                  PLUGIN_TYPE_PYTHON);
+    plugin_handler_free_all_type (&plugin_cmd_handlers,
+                                  &last_plugin_cmd_handler,
+                                  PLUGIN_TYPE_PYTHON);
+
+    /* free Python interpreter */
+    Py_Finalize ();
+    if (Py_IsInitialized () != 0)
+    {
+        irc_display_prefix (NULL, PREFIX_PLUGIN);
+        gui_printf (NULL, _("%s error: error while freeing interpreter\n"),
+                    "Python");
+    }
+}

src/plugins/python/wee-python.h

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * See README for License detail, AUTHORS for developers list.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+
+#ifndef __WEECHAT_PYTHON_H
+#define __WEECHAT_PYTHON_H 1
+
+#include "../plugins.h"
+
+extern void wee_python_init ();
+extern t_plugin_script *wee_python_search (char *);
+extern int wee_python_exec (char *, char *, char *);
+extern int wee_python_load (char *);
+extern void wee_python_unload (t_plugin_script *);
+extern void wee_python_unload_all ();
+extern void wee_python_end ();
+
+#endif /* wee-python.h */

weechat-curses.1

@@ -1,11 +1,13 @@
-.TH WEECHAT 1 "January 2004" "FlashCode"
+.TH WEECHAT 1 "May 2005" "FlashCode"
 
 .SH NAME
-weechat \- Wee Enhanced Environment for Chat
+weechat-curses \- Wee Enhanced Environment for Chat (Curses version)
 
 .SH SYNOPSIS
-.B weechat
-.RI [ options ]
+.B weechat-curses
+.RI [ options... ]
+or
+.RI [ url... ]
 .br
 
 .SH DESCRIPTION
@@ -17,6 +19,10 @@ It is compliant with RFCs 1459, 2810, 2811, 2812, and 2813.
 
 .SH OPTIONS
 .TP
+.B \-c, \-\-config
+.br
+display config file help (list of options)
+.TP
 .B \-h, \-\-help
 .br
 display summary of options
@@ -29,6 +35,15 @@ display program license
 .br
 display WeeChat version
 
+.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]
+.TP
+Exemple to join WeeChat channel support with nick "FlashCode":
+irc://FlashCode@irc.freenode.net/weechat
+
 .SH FILES
 .TP
 .B $HOME/.weechat/weechat.rc
@@ -38,11 +53,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@tuxisland.org>
+WeeChat is written by FlashCode <flashcode@flashtux.org>
 .br
 WeeChat on the web:
 .UR

weechat.spec

@@ -1,5 +1,5 @@
 %define name weechat
-%define version 0.0.4
+%define version 0.1.2
 %define release 1
 
 Name:      %{name}
@@ -10,6 +10,7 @@ Source:    http://weechat.flashtux.org/download/%{name}-%{version}.tar.gz
 URL:       http://weechat.flashtux.org
 Group:     Networking/IRC
 BuildRoot: %{_tmppath}/%{name}-buildroot
+Requires:  perl, python
 License:   GPL
 
 %description
@@ -22,7 +23,7 @@ rm -rf $RPM_BUILD_ROOT
 %setup
 
 %build
-./configure
+./configure --enable-perl --enable-python
 make DESTDIR="$RPM_BUILD_ROOT" LOCALRPM="local"
 
 %install 
@@ -35,11 +36,27 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,0755) 
-%doc AUTHORS BUGS ChangeLog COPYING FAQ INSTALL NEWS README TODO
-/usr/local/man/man1/weechat.1*
+%doc AUTHORS BUGS ChangeLog COPYING FAQ FAQ.fr INSTALL NEWS README TODO
+/usr/local/man/man1/weechat-curses.1*
 /usr/local/bin/weechat-curses
 
 %changelog 
+* Sat May 21 2005 FlashCode <flashcode@flashtux.org> 0.1.2-1
+- Released version 0.1.2
+* Sat Mar 20 2005 FlashCode <flashcode@flashtux.org> 0.1.1-1
+- Released version 0.1.1
+* Sat Feb 12 2005 FlashCode <flashcode@flashtux.org> 0.1.0-1
+- Released version 0.1.0
+* Sat Jan 01 2005 FlashCode <flashcode@flashtux.org> 0.0.9-1
+- Released version 0.0.9
+* Sat Oct 30 2004 FlashCode <flashcode@flashtux.org> 0.0.8-1
+- Released version 0.0.8
+* Sat Aug 08 2004 FlashCode <flashcode@flashtux.org> 0.0.7-1
+- Released version 0.0.7
+* Sat Jun 05 2004 FlashCode <flashcode@flashtux.org> 0.0.6-1
+- Released version 0.0.6
+* Thu Feb 02 2004 FlashCode <flashcode@flashtux.org> 0.0.5-1
+- Released version 0.0.5
 * Thu Jan 01 2004 FlashCode <flashcode@flashtux.org> 0.0.4-1
 - Released version 0.0.4
 * Mon Nov 03 2003 FlashCode <flashcode@flashtux.org> 0.0.3-1

weechat/ABOUT-NLS

@@ -0,0 +1,986 @@
+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 April
+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       |                         []    [] []             |
+     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  4  0 41 43  3 52 90 20  1  15
+
+                          eo es et eu fa fi fr  ga gl he hr hu id is it
+                        +-----------------------------------------------+
+     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       |    []             []  []          [] []       |
+     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 hr hu id is it
+                          13 85 21 15  2 35 115 45 17  8  6 40 27  1 45
+
+                          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       |                                  []           |
+     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               |                                  []           |
+                        +-----------------------------------------------+
+                          ja ko ku lg lt lv mk mn ms mt nb nl nn no nso
+                          33 11  1  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 ta
+                        +-------------------------------------------------+
+     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       |          []  []      []       []       [] []    |
+     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 ta
+                           1  0 48 30  58    6 79 71  5 45 13 12 50 86  0
+
+                          tg th tk tr uk ven vi wa xh zh_CN zh_TW zu
+                        +--------------------------------------------+
+     GNUnet             |                                            |  0
+     a2ps               |          [] []     []                      | 19
+     aegis              |                                            |  0
+     ant-phone          |          []                                |  4
+     anubis             |          []                                |  9
+     ap-utils           |             ()                             |  1
+     aspell             |             []     [] []                   | 13
+     bash               |                                            | 10
+     batchelor          |          []        []                      |  7
+     bfd                |                                            |  1
+     bibshelf           |                    []                      |  5
+     binutils           |          []                                |  6
+     bison              |          []                                | 17
+     bluez-pin          |          [] []     [] []     []            | 24
+     clisp              |                                            |  7
+     console-tools      |          []                                |  4
+     coreutils          |          []                                | 16
+     cpio               |          []        []                      |  6
+     cpplib             |          []        []                      |  7
+     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              |                                            |  4
+     gcal               |          []                                |  5
+     gcc                |          []                                |  3
+     gettext-examples   |          [] []     []        []            | 20
+     gettext-runtime    |          [] []     []        []    []      | 25
+     gettext-tools      |          [] []               []            | 17
+     gimp-print         |             []                             | 11
+     gip                |                    []                      |  8
+     gliv               |          []                                |  6
+     glunarclock        |                    [] []                   | 13
+     gmult              |          []        []        []            | 13
+     gnubiff            |                    []                      |  3
+     gnucash            |          ()                        []      | 10
+     gnucash-glossary   |                                    []      |  8
+     gpe-aerial         |                    []        []            | 13
+     gpe-beam           |                    []        []            | 13
+     gpe-calendar       |                    [] []     []    []      | 18
+     gpe-clock          |          []        [] []     []            | 17
+     gpe-conf           |                    []        []            | 12
+     gpe-contacts       |                    []        []            |  6
+     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           |                    [] []           []      | 16
+     gphoto2            |             []               []            | 17
+     gprof              |          []        []                      | 10
+     gpsdrive           |                                            |  2
+     gramadoir          |                    []                      |  6
+     grep               |          [] []     []              []      | 32
+     gretl              |                                            |  4
+     gsasl              |                    []        []            | 12
+     gss                |                    []                      |  5
+     gst-plugins        |             []     []                      | 16
+     gstreamer          |          [] []     []                      | 14
+     gtick              |                    []                      | 11
+     gtkspell           |                    [] []     []            | 20
+     hello              |          [] []     []        []            | 37
+     id-utils           |          []        []                      | 13
+     impost             |                    []                      |  3
+     indent             |          []        []        []            | 24
+     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
+     libgsasl           |                    []                      |  7
+     libiconv           |          [] []     [] []     []            | 32
+     libidn             |                    []        []            |  5
+     lifelines          |                                            |  4
+     lilypond           |          []                                |  5
+     lingoteach         |                                            |  5
+     lynx               |          [] []                             | 14
+     m4                 |                    []        []            | 17
+     mailutils          |             []                             |  7
+     make               |          []                  []            | 18
+     man-db             |                                            |  5
+     minicom            |                                            | 11
+     mysecretdiary      |          []        []                      | 12
+     nano               |                                            | 11
+     nano_1_0           |          [] []                             | 17
+     opcodes            |          []                                |  7
+     parted             |          [] []               []            | 17
+     psmisc             |                    []                      |  7
+     ptx                |          []                  []            | 23
+     pwdutils           |                                            |  1
+     python             |                                            |  0
+     radius             |             []                             |  6
+     recode             |          []        []                      | 22
+     rpm                |          [] []                             | 11
+     screem             |                                            |  1
+     scrollkeeper       |          [] []                             | 23
+     sed                |          []        []                      | 19
+     sh-utils           |          []                                | 15
+     shared-mime-info   |             []               []            | 19
+     sharutils          |          []        []              []      | 20
+     silky              |                                            |  3
+     skencil            |                                            |  6
+     sketch             |                                            |  6
+     solfege            |                                            |  4
+     soundtracker       |          []                                |  8
+     sp                 |          []                                |  3
+     stardict           |             []     []        []    []      | 10
+     tar                |          [] []                             | 13
+     texinfo            |          []                  []            | 14
+     textutils          |          []                  []    []      | 17
+     tin                |                                            |  1
+     tp-robot           |                              []    []      |  7
+     tuxpaint           |          []        [] []     []            | 34
+     unicode-han-tra... |                                            |  0
+     unicode-transla... |                                            |  2
+     util-linux         |          [] []                             | 17
+     vorbis-tools       |             []                             | 10
+     wastesedge         |                                            |  1
+     wdiff              |          []        []                      | 22
+     wget               |          [] []               []    []      | 31
+     xchat              |             []     []        []            | 22
+     xkeyboard-config   |                                            |  1
+     xpad               |                    []                      |  5
+                        +--------------------------------------------+
+       72 teams           tg th tk tr uk ven vi wa xh zh_CN zh_TW zu
+      147 domains          0  0  1 78 29  0  71 16  0  41    20    0  1711
+
+   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 April 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.
+

weechat/AUTHORS

@@ -1,29 +1,35 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-Developers:
-----------
-
-All developers are connected to IRC:
-server: irc.freenode.net, channel: #weechat
+Developer:
+---------
 
 FlashCode <flashcode@flashtux.org>
-    Web   : http://www.flashtux.org
-    IRC   : nick is "FlashCode"
+    Web   : http://weechat.flashtux.org
+    IRC   : nick is "FlashCode" @ irc.freenode.net
     Jabber: flashcode@jabber.org
     ICQ   : 160677660
     AIM   : FlashCode AIM
     Yahoo : FlashCode_Y
 
+Testers:
+-------
+
 Bounga <bounga@altern.org>
     Web   : http://bounga.ath.cx
-    IRC   : nick is "Bounga"
+    IRC   : nick is "Bounga" @ irc.freenode.net
     Jabber: Bounga@jabber.org
     ICQ   : 178297842
 
-Xahlexx <xahlexx@tuxisland.org>
-    Web   : http://www.tuxisland.org
-    IRC   : nick is "xahlexx"
+Xahlexx <xahlexx@weeland.org>
+    Web   : http://www.weeland.org
+    IRC   : nick is "xahlexx" @ irc.freenode.net
+
+
+=====
+
+Whole team is connected to IRC:
+server: irc.freenode.net, channel: #weechat
 
 
 See README file for licence detail.

weechat/BUGS

@@ -1,20 +1,12 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-WeeChat known bugs, 2004-01-01
+WeeChat known bugs, 2005-05-21
 
-- ./configure does not check that Curses headers are installed
 - ./configure does not check that Gtk 2.0 libraries are installed
-- ./configure does not check that Perl headers & libraries are installed
-- too much nicks in the channel (> height of window) => display bug
-- some IRC commands are marked as 'unknown' when received
-  (IRC protocol is under dev!)
-- too much opened channels => display bug
-- when kicked, channel is not prefixed by '(' and sufixed by ')'
-- when function key (non used by WeeChat) is pressed, prompt is deleted
 - when quitting WeeChat term title is not restored (if look_set_title is ON)
 - command name for /server can not contain spaces
 - wrong alias is not created and not saved when quitting WeeChat
 - when many WeeChat are launched, log file is not properly written (cleared by
   each WeeChat at startup)
-- display problems with Konsole (Kde terminal)
+- display problems with old Konsole versions (Kde terminal) (???)

weechat/ChangeLog

@@ -1,9 +1,142 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2004-01-01
+ChangeLog - 2005-05-21
 
 
+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
+   * added crash dump when WeeChat receives SIGSEGV (Segmentation fault)
+   * added new display engine: doesn't cut words at end of lines
+   * added DCC send and DCC chat
+   * added /halfop & /dehalfop commands, fixed halfop display bug in nicklist
+   * added /ban, /unban and /kickban commands
+   * added spanish translation
+   * added --irc-commands and --weechat-commands command line options
+   * connection to IRC server is now made by child process (non blocking)
+   * added support for UnrealIrcd ("~" for chan owner, "&" for chan admin)
+   * new key for window switch (now: F5/F6=switch buffer, F7/F8=switch window)
+   * on server buffer, only server messages are logged
+   * improved /help command output
+   * plugins messages are logged with new config option (log_plugin_msg)
+   * fixed /kick command
+   * fixed /invite command (and now invite requests are displayed)
+   * fixed /buffer close command (now ok when disconnected from server)
+   * fixed display bugs when many windows are opened
+
+Version 0.1.0 (2005-02-12):
+   * improved /window command: now split and merge are ok
+   * away nicks are now displayed with another color (new option: "irc_away_check")
+   * added away indicator in status bar
+   * added lag indicator (and auto-disconnect after a delay if important lag)
+   * improved completion: now completes commands arguments (IRC and internal),
+     when only one completion matches, completion mechanism is stoped (to
+     complete command arg for example)
+   * improved /set command: empty strings are allowed, new colors, server
+     options can be changed while WeeChat is running
+   * added default away/part/quit messages in config file
+   * new [irc] section in config file, option "look_display_away" moved to
+     "irc_display_away"
+   * server messages & errors are all prefixed (by 3 chars, like '-@-')
+   * added new options for charset (UTF-8 support): look_charset_decode,
+     look_charset_encode and look_charset_internal
+   * fixed many memory leaks
+   * fixed colors bug: removed "gray" color (replaced by "default"), colors are
+     ok when terminal has white (or light) background
+   * fixed crash when resizing terminal to small size
+   * fixed crash when multiple servers and big messages received from server
+   * fixed crash when closing some private buffers
+   * fixed crash when unknown section with option(s) in config file
+   * fixed /op, /deop, /voice, /devoice (now ok with many nicks)
+   * fixed /me command (now ok without parameter)
+   * fixed /away command (now ok if not away)
+   * logs are now disabled by default (server/channel/private)
+
+Version 0.0.9 (2005-01-01):
+   * auto-reconnection to server (new options: server_autoreconnect (on/off),
+     server_autoreconnect_delay (in seconds))
+   * major bug fixed when socket is closed by server (100% CPU usage fixed),
+     and disconnections are now ok (all channels are "closed", history is still
+     visible, and buffer will be used again if reconnection to server)
+   * option "look_remove_colors_from_msgs" is now working
+   * fixed display of nick mode changes
+   * new command "/buffer close" (close any server/channel/private buffer)
+   * /notice command fixed (and display when received from server)
+   * new keys: Ctrl+A (=home), Ctrl+E (=end), Ctrl+W (=Ctrl+Backspace),
+     Alt-S (switch to server buffer), Alt-X (switch to first channel of next
+     server)
+   * added new config option: "server_command_delay" (delay in seconds after
+     startup command for each server)
+
+Version 0.0.8 (2004-10-30):
+   * /kick command fixed: now ok with many words as reason
+   * nickserv passwords hidden (new config option: log_hide_nickserv_pwd on/off)
+   * auto-rejoin channels when kicked (new config option: server_autorejoin on/off)
+   * added IRC::command function for Perl scripts
+   * fixed bug when adding alias with same name as other
+   * /buffer command developed (buffers list, move and notify)
+   * logging buffers to disk (server/channel/private according to user prefs)
+   * Away now announced in channels, and config option "look_display_away" added
+     to enable/disable this feature
+   * Fixed crash when resizing terminal to very small size
+   * "-MORE-" message is now erased when switching to another buffer
+   * DCC file receive ok (Alt-D for DCC view)
+   * /query command now reopens private buffer if already opened
+   * added key for redrawing terminal (Ctrl-L)
+   * added key for clearing hotlist (Alt-R)
+
+Version 0.0.7 (2004-08-08):
+   * new "col_status_delimiters" config option
+   * /buffer command added, buffers ordered by number, auto-jump to active
+     buffers (alt-a), jump to buffers by number (alt-number)
+   * /window command added, split terminal horizontally/vertically
+   * unique color for each nick (based on nickname)
+   * action messages are now considered as messages, not crappy joins/parts
+   * fixed display bug when nicklist is displayed at bottom of screen
+   * added history limit (text buffer & commands)
+   * replaced --enable-debug with --with-debug option for ./configure, which is
+     now integer: 1 = compiler debug flag, 2 = same 1 with verbose debug messages
+     in WeeChat (default: 0 = no debug)
+
+Version 0.0.6 (2004-06-05):
+   * improved channel highlight (priority to message vs join/part)
+   * fixed bug when opened private win and remote user changes his nick
+   * /query command added (starts private conversation)
+   * IRC messages 476, 477 added
+   * /mode command is now ok and channel flags are displayed in status bar
+   * fixed display bug (text was blinking when scrolling)
+   * CTCP Version reply is now in english only and doesn't show host (security reason)
+
+Version 0.0.5 (2004-02-07):
+   * /set command to modify config options when WeeChat is running
+   * fixed look_nicklist config option, now enables/disables nicklist
+   * secured code to prevent buffer overflows and memory leaks
+   * fixed QUIT IRC command: now sent to all connected servers (not only current)
+   * URL command line parameter to connect to server(s)
+   * new Perl script function to display message in info bar ("IRC::print_infobar")
+   * info bar highlight notifications
+   * info bar timestamp is added to config ("look_infobar_timestamp")
+   * added info bar (optional, "look_infobar" to enable it, "on" by default)
+   * fixed crash with /oper command
+   * for default config file, nick is now based on un*x username (thanks to Witukind)
+   * fixed crash when config file cannot be written
+   * -c (or --config) command line parameter added to see config file options
+   * highlight action messages
+
 Version 0.0.4 (2004-01-01):
    * Perl plugin, with auto-load
    * when private window is created (another user is talking), WeeChat does not

weechat/FAQ

@@ -1,158 +1,193 @@
-WeeChat - Wee Enhanced Environment for Chat
-===========================================
+WeeChat FAQ, 2005-05-21
+=======================
 
-WeeChat FAQ, 2004-01-01
+Intended audience:
+All WeeChat users.
+
+Before reading the following:
+the following Q/A list is *not* exhaustive.
+It is also possible that you won't find any Q/A that matches your problem.
+Please read them anyway, they may provide you help in fixing your problem
+anyway.
+And even if your problem is listed below, it is possible that the answers don't
+help you anymore to solve it. Then, please contact us, we will try to help you
+finding a solution.
+
+1 - Compiling
+2 - Using WeeChat
+3 - Development
+
+1.1
+================================================================================
+Q:	I heard about many GUI for WeeChat. How can I compile/use them?
+
+A:	Curses GUI is built by default.
+	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!
 
 
-1- Compiling
+1.2
+================================================================================
+Q:	I can't compile WeeChat CVS.
 
-    1.1  I heard about many GUI for WeeChat. How can I compile/use them?
-    1.2  I can't compile WeeChat CVS.
-
-2- Using WeeChat
-
-    2.1  Why using WeeChat ? X-Chat and Irssi are so good...
-    2.2  I've launched WeeChat, but I'm lost, what can I do?
-    2.3  How can I customize key bindings?
-    2.4  How can I load Perl scripts?
-         Are Perl scripts compatible with X-chat or/and Irssi ?
-    2.5  How can I load Python scripts?
-    2.6  How can I load Ruby scripts?
-
-3- Development
-
-    3.1  How should I report bugs?
-    3.2  How should I submit patches?
-    3.3  How should I submit new feature request?
-    3.4  Will WeeChat be ported to *BSD, QNX, MacOS X, Microsoft Windows?
-    3.5  I want to help WeeChat developers. What can I do?
-    3.6  Can I give money or other things to WeeChat developers?
+A:	Check that you have latest version of autoconf and automake.
+	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.
+	Note that this package may not correspond exactly to CVS base.
 
 
-/------------------------------------------------------------------------------\
-| 1- Compiling                                                                 |
-\------------------------------------------------------------------------------/
+2.1
+================================================================================
+Q:	Why using WeeChat ? X-Chat and Irssi are so good...
+
+A:	Because WeeChat is very light and has new features.
+	Some new features:
+	  * many GUI (Curses, Gtk, wxWidgets, Qt),
+	  * extensible with scripts (Perl, Python, Ruby),
+	  * 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
 
 
-1.1  I heard about many GUI for WeeChat. How can I compile/use them?
+2.2
+================================================================================
+Q:	I've launched WeeChat, but I'm lost, what can I do?
 
-  Curses GUI is built by default.
-  To build Gtk or Qt GUI you've to specify extra options to ./configure script:
-    --enable-gtk to enable gtk 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!
+A:	For help you can type /help. For help about a command, type /help command.
+	Keys and commands are listed in documentation.
 
 
-1.2  I can't compile WeeChat CVS.
+2.3
+================================================================================
+Q:	I don't see come chars with accents, what can I do?
 
-  Check that you have latest version of autoconf and automake.
-  WeeChat has been developed with autoconf version 2.56 and automake version 1.7.
-  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.
-  Note that this package may not correspond exactly to CVS base.
+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").
 
 
-/------------------------------------------------------------------------------\
-| 2- Using WeeChat                                                             |
-\------------------------------------------------------------------------------/
+2.4
+================================================================================
+Q:	How can I customize key bindings?
+
+A:	Today you can't do that. This is planed for a future version.
 
 
-2.1  Why using WeeChat ? X-Chat and Irssi are so good...
+2.5
+================================================================================
+Q:	How can I load Perl scripts?
+	Are Perl scripts compatible with X-chat or/and Irssi ?
 
-  Because WeeChat is very light and has new features.
-  Some new features:
-    * many GUI (Curses, Gtk, Qt),
-    * extensible with scripts (Perl, Python, Ruby),
-    * developed from scratch (not based on any other IRC client)
-    * multi-platform
-    * 100% GPL and free
-  This is the "geekest Irc client" ;)
+A:	You can use /perl command to load scripts (default path is
+	~/.weechat/perl).
+	Note that scripts in ~/.weechat/perl/autoload are automatically loaded
+	when WeeChat is starting up.
+	WeeChat Perl scripts are 80% compatible with X-Chat, but not with Irssi.
 
 
-2.2  I've launched WeeChat, but I'm lost, what can I do?
+2.6
+================================================================================
+Q:	How can I load Python scripts?
+	Are Python scripts compatible with X-chat or/and Irssi ?
 
-  For help you can type /help. For help about a command, type /help command.
+A:	You can use /python command to load scripts	(default path is
+	~/.weechat/python).
+	Note that scripts in ~/.weechat/python/autoload are automatically loaded
+	when WeeChat is starting up.
+	WeeChat Python scripts are 80% compatible with X-Chat, but not with Irssi.
 
 
-2.3  How can I customize key bindings?
+2.7
+================================================================================
+Q:	How can I load Ruby scripts?
 
-  Today you can't do that. This will be available in a future version.
+A:	Today Ruby interface is not developed, so you can't load any Ruby script.
 
 
-2.4  How can I load Perl scripts?
-     Are Perl scripts compatible with X-chat or/and Irssi ?
+3.1
+================================================================================
+Q:	How should I report bugs?
 
-  Yes, you can use /perl command to launch 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, not with Irssi, sorry ;)
+A:	There is 3 ways to report bugs:
+	  1. you can join us on IRC: irc.freenode.net, channel #weechat
+	  2. you can submit your bug at this url:
+	     http://savannah.nongnu.org/bugs/?func=addbug&group=weechat
+	  3. you can mail your problem, look at support page for developer's mails:
+	     http://weechat.flashtux.org/support.php
+	     (you can subscribe and send to "support" mailing list)
 
 
-2.5  How can I load Python scripts?
+3.2
+================================================================================
+Q:	How should I submit patches?
 
-  Today Python interface is not developed, so can't load any Python script.
+A:	There is 3 ways to submit patches:
+	  1. you can join us on IRC: irc.freenode.net, channel #weechat
+	  2. you can submit your patch at this url:
+	     http://savannah.nongnu.org/patch/?func=addpatch&group=weechat
+	  3. you can mail your patch, look at support page for developer's mails:
+	     http://weechat.flashtux.org/support.php
+	     (you can subscribe and send to "support" mailing list)
 
 
-2.6  How can I load Ruby scripts?
+3.3
+================================================================================
+Q:	How should I submit new feature request?
 
-  Today Ruby interface is not developed, so can't load any Ruby script.
+A:	There is 2 ways to submit your feature request:
+	  1. you can join us on IRC: irc.freenode.net, channel #weechat
+	  2. you can mail your feature request, look at support page for developer's
+	     mails:
+	     http://weechat.flashtux.org/support.php
+	     (you can subscribe and send to "support" mailing list)
 
 
-/------------------------------------------------------------------------------\
-| 3- Development                                                               |
-\------------------------------------------------------------------------------/
+3.4
+================================================================================
+Q:	What is the list of supported platforms for WeeChat?
+
+A:	Today WeeChat was succesfully tested on these platforms:
+	- GNU/Linux (any distribution / i386, AMD64, Sparc)
+	- FreeBSD
+	- NetBSD
+	- OpenBSD
+	- Mac OS X
+	- Microsoft Windows (with Cygwin and some code changes)
 
 
-3.1  How should I report bugs?
+3.5
+================================================================================
+Q:	Will WeeChat be ported to QNX or other operating systems?
 
-  There is 3 ways to report bugs:
-    1. you can join us on IRC: irc.freenode.net, channel #eci
-       If no one can help you (huh?), try another way, see below.
-    2. you can submit your bug at this url:
-       http://savannah.nongnu.org/bugs/?func=addbug&group=weechat
-    3. you can mail your problem, look at support page for developer's mails:
-       http://weechat.flashtux.org/support.php
-       (you can subscribe and send to "support" mailing list)
+A:	Yes. Future versions will be available for these OS.
+	We need help for such systems, any help is welcome :)
 
 
-3.2  How should I submit patches?
+3.6
+================================================================================
+Q:	I want to help WeeChat developers. What can I do?
 
-  There is 3 ways to submit patches:
-    1. you can join us on IRC: irc.freenode.net, channel #eci
-       If no one can help you (huh?), try another way, see below.
-    2. you can submit your patch at this url:
-       http://savannah.nongnu.org/patch/?func=addpatch&group=weechat
-    3. you can mail your patch, look at support page for developer's mails:
-       http://weechat.flashtux.org/support.php
-       (you can subscribe and send to "support" mailing list)
+A:	There's many tasks to do (code, documentation, ...)
+	Please contact us with IRC or mail, look at support page:
+	http://weechat.flashtux.org/support.php
 
 
-3.3  How should I submit new feature request?
+3.7
+================================================================================
+Q:	Can I give money or other things to WeeChat developers?
 
-  There is 2 ways to submit your feature request:
-    1. you can join us on IRC: irc.freenode.net, channel #eci
-       If no one can help you (huh?), try another way, see below.
-    2. you can mail your feature request, look at support page for developer's
-       mails:
-       http://weechat.flashtux.org/support.php
-       (you can subscribe and send to "support" mailing list)
-
-
-3.4  Will WeeChat be ported to *BSD, QNX, MacOS X, Microsoft Windows ?
-
-  Yes. Future versions will be available for these OS.
-
-
-3.5  I want to help WeeChat developers. What can I do?
-
-  There's many tasks to do (code, documentation, ...)
-  Please contact us with IRC or mail, look at support page:
-  http://weechat.flashtux.org/support.php
-
-
-3.6  Can I give money or other things to WeeChat developers?
-
-  No.
+A:	Beer is welcome :)
+	Otherwise Paypal account is: flashcode@free.fr (no limit for gifts :)

weechat/FAQ.fr

@@ -0,0 +1,206 @@
+WeeChat FAQ, 2005-05-21
+=======================
+
+Public concerné :
+Tous les utilisateurs de WeeChat.
+
+Avant de lire la suite ceci :
+la liste suivante de questions/réponses n'est *pas* exhaustive.
+Il est donc possible que vous ne trouviez pas de question/réponse correspondant
+à votre problème.
+Lisez les quand même SVP, elles peuvent vous aider à corriger votre problème.
+Et même si votre problème est mentionné ci-dessous, il est possible que la
+réponse ne vous aide pas à corriger le problème. Dans ce cas, contactez-nous,
+nous essaierons de vous aider à trouver une solution.
+
+1 - Compilation
+2 - Utilisation de WeeChat
+3 - Développement
+
+1.1
+================================================================================
+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, 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.
+	Les autres interfaces sont en développement.
+
+
+1.2
+================================================================================
+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.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
+	quasiment tous les jours, basé sur le CVS.
+	Notez que ce paquet peut ne pas correspondre exactement à la base CVS.
+
+
+2.1
+================================================================================
+Q:	Pourquoi utiliser WeeChat ? X-Chat et Irssi sont si bien...
+
+R:	Parce que WeeChat est très léger et a de nouvelles fonctionnalités.
+	Quelques nouvelles fonctionnalités :
+	  * plusieurs interfaces (Curses, Gtk, wxWidgets, Qt),
+	  * extensible par des scripts (Perl, Python, Ruby),
+	  * 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
+================================================================================
+Q:	J'ai lancé WeeChat, mais je suis perdu, que puis-je faire ?
+
+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").
+
+
+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.
+
+
+2.5
+================================================================================
+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).
+	Notez que les scripts dans ~/.weechat/perl/autoload sont automatiquement
+	chargés par WeeChat lorsqu'il démarre.
+	Les scripts Perl WeeChat sont 80% compatibles avec X-Chat, mais pas Irssi.
+
+
+2.6
+================================================================================
+Q:	Comment puis-je charger les scripts Python ?
+	Les scripts Python sont-ils compatibles avec X-chat et/ou Irssi ?
+
+R:	La commande /python permet de charger les scripts Python (le chemin par
+	défaut est ~/.weechat/python).
+	Notez que les scripts dans ~/.weechat/python/autoload sont automatiquement
+	chargés par WeeChat lorsqu'il démarre.
+	Les scripts Python WeeChat sont 80% compatibles avec X-Chat, mais pas Irssi.
+
+
+2.7
+================================================================================
+Q:	Comment puis-je charger des scripts Ruby ?
+
+R:	Aujourd'hui l'interface Ruby n'est pas développée.
+	Vous ne pouvez donc charger aucun script Ruby.
+
+
+3.1
+================================================================================
+Q:	Comment dois-je reporter les bugs ?
+
+R:	Il y a 3 manières de reporter les bugs :
+	  1. vous pouvez nous joindre sur IRC: irc.freenode.net, canal #weechat
+	  2. vous pouvez soumettre votre bug à cette adresse :
+	     http://savannah.nongnu.org/bugs/?func=addbug&group=weechat
+	  3. vous pouvez envoyer votre problem par mail, consultez la page
+	     support pour les mails des développeurs :
+	     http://weechat.flashtux.org/support.php
+	     (vous pouvez souscrire et envoyer à la liste de diffusion
+	     "support")
+
+
+3.2
+================================================================================
+Q:	Comment dois-je soumettre les patches ?
+
+R:	Il y a 3 manières de soumettre les patches :
+	  1. vous pouvez nous joindre sur IRC: irc.freenode.net, canal #weechat
+	  2. vous pouvez soumettre votre patch à cette adresse :
+	     http://savannah.nongnu.org/patch/?func=addpatch&group=weechat
+	  3. vous pouvez envoyer votre patch par mail, consultez la page
+	     support pour les mails des développeurs :
+	     http://weechat.flashtux.org/support.php
+	     (vous pouvez souscrire et envoyer à la liste de diffusion
+	     "support")
+
+
+3.3
+================================================================================
+Q:	Comment dois-je soumettre les demandes de nouvelles fonctionnalités ?
+
+R:	Il y a 2 manières :
+	  1. vous pouvez nous joindre sur IRC: irc.freenode.net, channel #weechat
+	  2. vous pouvez envoyer un mail, consultez la page support pour les
+	     mails des développeurs :
+	     http://weechat.flashtux.org/support.php
+	     (vous pouvez souscrire et envoyer à la liste de diffusion
+	     "support")
+
+
+3.4
+================================================================================
+Q:	Quelle est la liste des plate-formes supportées par WeeChat ?
+
+R:	Aujourd'hui WeeChat a été testé avec succès sur ces plate-formes :
+	- GNU/Linux (toute distribution / i386, AMD64, Sparc)
+	- FreeBSD
+	- NetBSD
+	- OpenBSD
+	- Mac OS X
+	- Microsoft Windows (avec Cygwin et quelques modifications de code)
+
+
+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, ...)
+	Merci de prendre contact avec nous par IRC ou mail, consultez la page
+	support :
+	http://weechat.flashtux.org/support.php
+
+
+3.7
+================================================================================
+Q:	Puis-je donner de l'argent ou d'autres choses aux développeurs WeeChat ?
+
+R:	La bière est la bienvenue :)
+	Sinon le compte Paypal est: flashcode@free.fr (il n'y a pas de limite pour
+	les dons :)

weechat/INSTALL

@@ -2,9 +2,11 @@ WeeChat - Installation instructions
 ===================================
 
 1) Run './configure'
-   options: --disable-curses : do not build Curses interface
+   options: --enable-perl    : enable Perl scripts
+            --disable-curses : do not build Curses interface
             --enable-gtk     : build Gtk+ interface (under development!)
             --enable-qt      : build Qt interface (not developed!)
+            --with-debug=X   : X=1 for debug compilation, 2 for debug messages
 
 2) Run 'make'
 
@@ -12,4 +14,4 @@ WeeChat - Installation instructions
 
 4) Enjoy !  :-)
 
-See AUTHORS for any support, feel free to contact us for any problem ;)
+See AUTHORS for support, feel free to contact us for any problem ;)

weechat/Makefile.am

@@ -1,4 +1,4 @@
-# Copyright (c) 2004 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2005 FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,6 +17,14 @@
 
 SUBDIRS = po intl src
 
-EXTRA_DIST = weechat.1 BUGS FAQ
+EXTRA_DIST = config.rpath  weechat-curses.1 BUGS FAQ FAQ.fr \
+             debian/changelog debian/control \
+             debian/copyright \
+             debian/rules debian/weechat-common.docs \
+             debian/weechat-common.install debian/weechat-curses.dirs \
+             debian/weechat-curses.install debian/weechat-gtk.dirs \
+             debian/weechat-gtk.install
 
-man_MANS = weechat.1
+man_MANS = weechat-curses.1
+
+ACLOCAL_AMFLAGS = -I m4

weechat/NEWS

@@ -1,6 +1,38 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
+* FlashCode, 2005-05-21
+
+    WeeChat 0.1.2 released.
+
+* FlashCode, 2005-03-20
+
+    WeeChat 0.1.1 released.
+
+* FlashCode, 2005-02-12
+
+    WeeChat 0.1.0 released.
+
+* FlashCode, 2005-01-01
+
+    WeeChat 0.0.9 released.
+
+* FlashCode, 2004-10-30
+
+    WeeChat 0.0.8 released.
+
+* FlashCode, 2004-08-08
+
+    WeeChat 0.0.7 released.
+
+* FlashCode, 2004-06-05
+
+    WeeChat 0.0.6 released.
+
+* FlashCode, 2004-02-07
+
+    WeeChat 0.0.5 released.
+
 * FlashCode, 2004-01-01
 
     WeeChat 0.0.4 released.

weechat/README

@@ -22,10 +22,7 @@ Features
 Copyright
 ---------
 
-WeeChat (c) Copyright 2004
-  by: FlashCode <flashcode@flashtux.org>
-        Xahlexx <xahlex@tuxisland.org>
-         Bounga <bounga@altern.org>
+WeeChat (c) Copyright 2003-2005 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):
@@ -46,6 +43,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 
 ---
-(1) only curses interface is available today
-(2) plugin interfaces are not yet developed
+(1) only Curses interface is available today
+(2) only Perl interface is available today
 (3) only GNU/Linux version is available today

weechat/TODO

@@ -1,7 +1,7 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-TODO - 2004-01-01
+TODO - 2005-05-21
 
 Legend:
   #  done
@@ -10,34 +10,38 @@ Legend:
   ?  is this really necessary?
 
 
-v0.0.4:
+v0.1.2:
 ------
 
  * General:
-    # debug messages can be enabled via ./configure --enbale-debug option
+    + Windows version
+    + Solaris version
+    # *BSD version
+    # Mac OS X version
+
+ * IRC protocol:
+    - customizable CTCP version reply
 
  * Interface:
+    # nicklist scroll keys
+    + Gtk GUI
     + internationalization (traduce WeeChat in many languages)
-    # intercept Ctrl-C
-    # when private window is created (another user is talking), WeeChat does not
-      switch to this window
-    # highlight when our nick is written in a channel/private window
+
+ * TCP/IP communication:
+    - SSL support
+
+ * Configuration:
+    - add key bindings to config file
 
  * Plugins:
-    # Perl plugin
-    # "/perl load" and "/perl unload" commands to (un)load Perl scripts
-    # auto-load Perl scripts at startup
+    # Python plugin
+    # "/python load" and "/python unload" commands to (un)load Python scripts
 
 
 Future versions:
 ---------------
 
- * General:
-    - Windows version
-
  * IRC protocol:
-    + "/mode" command: change the user/channels modes
-    - "/dcc" command (for chat and sending/receiving files)
     - complete "/list" command: add regexp search, display only channels that
       match regexp
     - "/ignore" and "/unignore" commands: hide all that is write by a given
@@ -48,9 +52,6 @@ Future versions:
       nick/host connect to the given irc network
 
  * WeeChat commands:
-    + "/set" command: allow the user to set the WeeChat variables
-      under WeeChat without editing the config file (colours, time
-      format, etc)
     - "/reload" command: reload the WeeChat's config file
     - "/highlight" command: highlight a given word when it appears on
       channels/privates
@@ -60,35 +61,18 @@ Future versions:
       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:
-    + Gtk GUI
-    - display current channel modes (example : #weechat(+nt))
+    - color for nicks (except own nick) when nick colors are disabled
     - interpret special chars in messages (color & bold for example)
-    - many channel windows in one window/term (window split)
-    - add lag indicator
-    - forget some old lines that were displayed long time ago (now all is saved,
-      if WeeChat is running for long time, a lot of memory is used!)
-    - improve completion (for example complete command parameters when possible)
     - understand incomplete commands if unambigous (for example: /he for /help is ok)
-    - add clock (in status bar?)
-    - log chats to file
     ? Qt GUI
 
  * TCP/IP communication:
-    - connect to server with child process (background)
     - proxy support
-    - SSL support
     - IPv6 protocol implementation
 
- * Configuration:
-    - add missing options for config file
-    - add key bindings to config file
-    - load config file after GUI (so init values by default (colors, ...) before
-      loading config)
-
  * Plugins:
-    - Python plugin
-    - "/python load" and "/python unload" commands to (un)load Python scripts
     - Ruby plugin
     - "/ruby load" and "/ruby unload" commands to (un)load Ruby scripts

weechat/autogen.sh

@@ -1,55 +1,15 @@
 #!/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
+aclocal &&
+# autoheader creates config.h.in needed by autoconf
+autoheader &&
+# autoconf creates configure
+autoconf &&
+# automake creates Makefile.in
+automake --add-missing --copy --gnu

weechat/configure.in

@@ -1,4 +1,4 @@
-# Copyright (c) 2004 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2005 FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,10 +19,10 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.56)
-AC_INIT(WeeChat, 0.0.4, flashcode@flashtux.org)
+AC_INIT(WeeChat, 0.1.2, flashcode@flashtux.org)
 AC_CONFIG_SRCDIR([src/common/weechat.c])
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([weechat], [0.0.4])
+AM_INIT_AUTOMAKE([weechat], [0.1.2])
 
 # Checks for programs.
 AC_PROG_CC
@@ -30,56 +30,97 @@ AC_PROG_MAKE_SET
 AC_PROG_RANLIB
 
 # Gettext
-ALL_LINGUAS="fr"
+ALL_LINGUAS="fr es"
 AM_GNU_GETTEXT
 
 # Checks for libraries.
-AC_CHECK_LIB([curses], [initscr], LIBCURSES_FOUND=1, LIBCURSES_FOUND=0)
+AC_CHECK_LIB([ncurses], [initscr], LIBNCURSES_FOUND=1, LIBNCURSES_FOUND=0)
+
+AM_OPTIONS_WXCONFIG
+AM_PATH_WXCONFIG(2.3.4, wxWin=1)
 
 # 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 unistd.h])
+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.
 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_MALLOC
-AC_FUNC_REALLOC
 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])
 
 AH_VERBATIM([PLUGINS], [#undef PLUGINS])
 AH_VERBATIM([PLUGIN_PERL], [#undef PLUGIN_PERL])
+AH_VERBATIM([PLUGIN_PYTHON], [#undef PLUGIN_PYTHON])
 AH_VERBATIM([DEBUG], [#undef DEBUG])
 
-AC_ARG_ENABLE(curses, [  --disable-curses        Turn off Curses interface (default=auto)],,enable_curses=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_ENABLE(debug,  [  --enable-debug          Turn on debugging messages (default=no)],enable_debug=yes,enable_debug=no)
+AC_ARG_ENABLE(ncurses, [  --disable-ncurses       Turn off ncurses interface (default=auto)],,enable_ncurses=yes)
+AC_ARG_ENABLE(wxwidgets,[  --enable-wxwidgets      Turn on WxWidgets interface (default=no)],enable_wxwidgets=yes,enable_wxwidgets=no)
+AC_ARG_ENABLE(gtk,     [  --enable-gtk            Turn on Gtk+ interface (default=no)],enable_gtk=yes,enable_gtk=no)
+AC_ARG_ENABLE(qt,      [  --enable-qt             Turn on Qt interface (default=no)],enable_qt=yes,enable_qt=no)
+AC_ARG_ENABLE(perl,    [  --enable-perl           Turn on Perl plugins (default=no)],enable_perl=yes,enable_perl=no)
+AC_ARG_ENABLE(python,  [  --enable-python         Turn on Python plugins (default=no)],enable_python=yes,enable_python=no)
+AC_ARG_WITH(debug,     [  --with-debug            Debugging: 0=no debug, 1=debug compilation, 2=debug compilation + verbose msgs (default=0)],debug=$withval,debug=0)
 
 enable_plugins="no"
-enable_python="no"
-PYTHON_CFLAGS=
 enable_ruby="no"
 RUBY_CFLAGS=
 
-AM_CONDITIONAL(GUI_CURSES,    test "$enable_curses" = "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(PLUGIN_PERL,   test "$enable_perl" = "yes")
-# AM_CONDITIONAL(PLUGIN_PYTHON, test "$enable_python" = "yes")
+AM_CONDITIONAL(PLUGIN_PYTHON, test "$enable_python" = "yes")
 # AM_CONDITIONAL(PLUGIN_RUBY,   test "$enable_ruby" = "yes")
 
-if test "x$enable_curses" = "xyes" ; then
-    if test "$LIBCURSES_FOUND" = "0" ; then
-        AC_MSG_ERROR([Curses library not found! Install Curses library or run ./configure with --disable-curses parameter.])
+if test "x$enable_ncurses" = "xyes" ; 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
-    CURSES_LIBS="-lcurses"
-    AC_SUBST(CURSES_LIBS)
+    NCURSES_LIBS="-lncurses"
+    AC_SUBST(NCURSES_LIBS)
+fi
+
+if test "x$enable_wxwidgets" = "xyes" ; then
+    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
@@ -96,23 +137,100 @@ 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`"
+    
+    AC_PATH_PROG(PERL, perl)
+    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 library)
+    PERL_LIB=`$PERL -e 'use Config; print "$Config{installprefix}/lib/$Config{libperl}"'`
+    
+    if test -r "$PERL_LIB"; then
+        PLUGINS_LIBS="$PLUGINS_LIBS ../../plugins/perl/lib_weechat_perl.a `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)
+    
     PERL_CFLAGS=`perl -MExtUtils::Embed -e ccopts`
     AC_SUBST(PERL_CFLAGS)
     AC_DEFINE(PLUGIN_PERL)
 fi
 
+if test "x$enable_python" = "xyes" ; then
+    enable_plugins="yes"
+    
+    AC_PATH_PROG(PYTHON, python)
+    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_INCLUDE=`$PYTHON -c 'import sys ; print "%s/include/python%s" % (sys.prefix, sys.version[[:3]])'`
+    
+    AC_MSG_CHECKING(for Python header files)
+    if test -r "$PYTHON_INCLUDE/Python.h"; then
+        PYTHON_CFLAGS=`$PYTHON -c "import distutils.sysconfig,string; print ' -I' + distutils.sysconfig.get_config_var('CONFINCLUDEPY')"`
+    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 sys; print "%s/lib/python%s/config" % (sys.prefix, sys.version[[:3]])'`
+    PYTHON_VERSION=`$PYTHON -c 'import sys ; print sys.version[[0:3]]'`
+    
+    AC_MSG_CHECKING(for Python library)
+    if test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.so" -a -r "$PYTHON_LIB/libpython$PYTHON_VERSION.a"; then
+        PYTHON_LFLAGS=`$PYTHON -c "import distutils.sysconfig,string; print string.join(distutils.sysconfig.get_config_vars('LINKFORSHARED', 'BLDLIBRARY', 'SHLIBS'))"`
+    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)
+    
+    PLUGINS_LIBS="$PLUGINS_LIBS ../../plugins/python/lib_weechat_python.a $PYTHON_LFLAGS"
+    AC_SUBST(PYTHON_CFLAGS)
+    AC_DEFINE(PLUGIN_PYTHON)
+fi
+
 if test "x$enable_plugins" = "xyes" ; then
     AC_DEFINE(PLUGINS)
 fi
 
 AC_SUBST(PLUGINS_LIBS)
 
-if test "x$enable_debug" = "xyes" ; then
+CFLAGS=`echo $CFLAGS | sed s/-g//g`
+if test "x$CFLAGS" = "x" ; then
+    CFLAGS="-O2"
+fi
+if test "x$debug" = "x1" || test "x$debug" = "x2" ; then
+    CFLAGS="-Wall -W $CFLAGS -pipe -g"
+else
+    CFLAGS="-Wall -W $CFLAGS -pipe"
+fi
+
+if test "x$debug" = "x2" ; then
     AC_DEFINE(DEBUG)
 fi
 
-CFLAGS="-Wall -W -pipe -O2"
+dnl For FreeBSD
+LIBS="$LIBS $INTLLIBS"
+CFLAGS="$CFLAGS $CPPFLAGS"
 
 AC_OUTPUT([Makefile
            src/Makefile
@@ -120,8 +238,10 @@ AC_OUTPUT([Makefile
            src/irc/Makefile
            src/plugins/Makefile
            src/plugins/perl/Makefile
+           src/plugins/python/Makefile
            src/gui/Makefile
            src/gui/curses/Makefile
+           src/gui/wxwidgets/Makefile
            src/gui/gtk/Makefile
            src/gui/qt/Makefile
            intl/Makefile
@@ -131,8 +251,11 @@ echo
 echo $PACKAGE $VERSION
 
 listgui=
-if test "x$enable_curses" = "xyes" ; then
-    listgui="$listgui Curses"
+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+"
@@ -142,7 +265,18 @@ if test "x$enable_qt" = "xyes" ; then
 fi
 
 if test "x$listgui" = "x" ; then
-    AC_MSG_ERROR([No interface specified... Please specify at least Curses, Gtk or Qt.])
+    AC_MSG_ERROR([
+*** No interface specified...
+*** Please specify at least ncurses, WxWidgets, Gtk or Qt.])
+fi
+
+msg_debug_compiler="no"
+msg_debug_verbose="no"
+if test "x$debug" = "x1" || test "x$debug" = "x2" ; then
+    msg_debug_compiler="yes"
+fi
+if test "x$debug" = "x2" ; then
+    msg_debug_verbose="yes"
 fi
 
 echo
@@ -153,7 +287,8 @@ echo Build with Perl support....... : $enable_perl
 echo Build with Python support..... : $enable_python
 echo Build with Ruby support....... : $enable_ruby
 echo
-echo Print debugging messages...... : $enable_debug
+echo Compile with debug info....... : $msg_debug_compiler
+echo Print debugging messages...... : $msg_debug_verbose
 echo
 eval eval echo WeeChat will be installed in $bindir.
 echo

weechat/debian/changelog

@@ -1,3 +1,59 @@
+weechat (0.1.2-1) unstable; urgency=low
+
+  * WeeChat version 0.1.2, see ChangeLog for detail.
+  
+ -- Sebastien Helleu <flashcode@flashtux.org>  Sat, 21 May 2005 08:00:00 +0200
+
+weechat (0.1.1-2) unstable; urgency=low
+
+  * debian/control:
+    - Add myself to uploaders.
+    - Remove unecessary dependency on weechat-gtk (Closes: #308287).
+
+ -- Julien Louis <ptitlouis@sysif.net>  Tue, 10 May 2005 22:38:52 +0200
+
+weechat (0.1.1-1) unstable; urgency=low
+
+  * WeeChat version 0.1.1, see ChangeLog for detail (closes: #306492)
+  
+ -- Sebastien Helleu <flashcode@flashtux.org>  Sat, 20 Mar 2005 08:00:00 +0200
+
+weechat (0.1.0-1) unstable; urgency=low
+
+  * WeeChat version 0.1.0, see ChangeLog for detail.
+  
+ -- Sebastien Helleu <flashcode@flashtux.org>  Sat, 12 Feb 2005 12:00:00 +0200
+
+weechat (0.0.9-1) unstable; urgency=low
+
+  * WeeChat version 0.0.9, see ChangeLog for detail.
+  
+ -- FlashCode <flashcode@flashtux.org>  Sat, 01 Jan 2005 13:00:00 +0200
+
+weechat (0.0.8-1) unstable; urgency=low
+
+  * WeeChat version 0.0.8, see ChangeLog for detail.
+  
+ -- FlashCode <flashcode@flashtux.org>  Sat, 30 Oct 2004 11:40:00 +0200
+
+weechat (0.0.7-1) unstable; urgency=low
+
+  * WeeChat version 0.0.7, see ChangeLog for detail.
+  
+ -- FlashCode <flashcode@flashtux.org>  Sat, 08 Aug 2004 21:00:00 +0200
+
+weechat (0.0.6-1) unstable; urgency=low
+
+  * WeeChat version 0.0.6, see ChangeLog for detail.
+  
+ -- FlashCode <flashcode@flashtux.org>  Sat, 05 Jun 2004 11:30:00 +0200
+
+weechat (0.0.5-1) unstable; urgency=low
+
+  * WeeChat version 0.0.5, see ChangeLog for detail.
+  
+ -- FlashCode <flashcode@flashtux.org>  Sat, 07 Feb 2004 20:30:00 +0200
+
 weechat (0.0.4-1) unstable; urgency=low
 
   * WeeChat version 0.0.4, see ChangeLog for detail.

weechat/debian/control

@@ -1,13 +1,14 @@
 Source: weechat
 Section: net
 Priority: optional
-Maintainer: FlashCode <flashcode@flashtux.org>
-Build-Depends: debhelper (>> 4.0.0), libncurses5 (>= 5.2.20020112a-7)
-Standards-Version: 3.5.8
+Maintainer: Sebastien Helleu <flashcode@flashtux.org>
+Uploaders: Julien Louis <ptitlouis@sysif.net>
+Build-Depends: debhelper (>> 4.0.0), libncurses5-dev (>= 5.2.20020112a-7), perl (>= 5.6.0-16), libperl-dev, python2.3 (>= 2.3), python-dev
+Standards-Version: 3.6.1
 
 Package: weechat
 Architecture: all
-Depends: ${shlibs: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.
@@ -21,14 +22,6 @@ Description: Fast, light and extensible IRC client
  for many operating systems. Everything can be done with a keyboard.
  It is customizable and extensible with scripts.
 
-Package: weechat-gtk
-Architecture: any
-Depends: ${shlibs:Depends}, weechat-common (= ${Source-Version})
-Description: Fast, light and extensible IRC client
- WeeChat (Wee Enhanced Environment for Chat) is a fast and light IRC client
- for many operating systems. Everything can be done with a keyboard.
- It is customizable and extensible with scripts.
-
 Package: weechat-common
 Architecture: all
 Replaces: weechat