Add support for -proxy to /SERVER and /CONNECT.

.clang-format

@@ -1,38 +0,0 @@
-# IndentPPDirectives: AfterHash
-# SpaceInParentheses: false
-AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: false
-AlignConsecutiveDeclarations: false
-AlignOperands: true
-AlignTrailingComments: true
-AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: false
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: Empty
-AllowShortIfStatementsOnASingleLine: false
-AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: false
-BinPackArguments: true
-BinPackParameters: true
-BreakBeforeBinaryOperators: None
-BreakBeforeBraces: Linux
-BreakBeforeTernaryOperators: false
-ColumnLimit: 100
-IndentCaseLabels: false
-IndentWidth: 8
-IndentWrappedFunctionNames: true
-KeepEmptyLinesAtTheStartOfBlocks: false
-Language: Cpp
-Cpp11BracedListStyle: false
-MaxEmptyLinesToKeep: 1
-PointerAlignment: Right
-SortIncludes: false
-SpaceAfterCStyleCast: true
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeParens: ControlStatements
-SpaceInEmptyParentheses: false
-SpacesInCStyleCastParentheses: false
-SpacesInSquareBrackets: false
-TabWidth: 8
-UseTab: ForIndentation

.github/workflows/abicheck.yml

@@ -1,127 +0,0 @@
-on: [pull_request]
-name: abicheck
-env:
-  build_options: -Dbuildtype=debug -Denable-true-color=yes -Dwith-proxy=yes -Dc_args=-DPERL_EUPXS_ALWAYS_EXPORT
-  prefix: /usr/local
-  apt_build_deps: ninja-build libutf8proc-dev libperl-dev libotr5-dev
-  get_pip_build_deps: pip3 install setuptools; pip3 install wheel; pip3 install 'meson<0.59.0'
-  getabidef_def: getabidef() { awk '$1=="#define" && $2=="IRSSI_ABI_VERSION" { print $3 }' "$1"/include/irssi/src/common.h; }
-jobs:
-  build-base-ref:
-    runs-on: ubuntu-latest
-    outputs:
-      base_abi: ${{ steps.out.outputs.base_abi }}
-    steps:
-      - name: set PATH
-        run: |
-          echo "$HOME/.local/bin" >> $GITHUB_PATH
-      - name: prepare required software
-        run: |
-          sudo apt install $apt_build_deps
-          eval "$get_pip_build_deps"
-      - name: checkout base ref
-        uses: actions/checkout@main
-        with:
-          path: base.src
-          ref: ${{ github.base_ref }}
-      - name: build base ref
-        run: |
-          meson Build.base base.src $build_options
-          ninja -C Build.base
-          DESTDIR=$PWD/base ninja -C Build.base install
-      - id: out
-        run: |
-          # print versions and abi versions
-          eval "$getabidef_def"
-          base_abi=$(getabidef base$prefix)
-          echo base abi : $base_abi
-          ./base$prefix/bin/irssi --version
-          echo "::set-output name=base_abi::$base_abi"
-      - uses: actions/upload-artifact@v2
-        with:
-          name: base.inst
-          path: base
-          retention-days: 1
-  build-merge-ref:
-    runs-on: ubuntu-latest
-    outputs:
-      merge_abi: ${{ steps.out.outputs.merge_abi }}
-    steps:
-      - name: set PATH
-        run: |
-          echo "$HOME/.local/bin" >> $GITHUB_PATH
-      - name: prepare required software
-        run: |
-          sudo apt install $apt_build_deps
-          eval "$get_pip_build_deps"
-      - name: checkout merge ref
-        uses: actions/checkout@main
-        with:
-          path: merge.src
-      - name: build merge ref
-        run: |
-          meson Build.merge merge.src $build_options
-          ninja -C Build.merge
-          DESTDIR=$PWD/merge ninja -C Build.merge install
-      - id: out
-        run: |
-          # print versions and abi versions
-          eval "$getabidef_def"
-          merge_abi=$(getabidef merge$prefix)
-          echo merge abi : $merge_abi
-          ./merge$prefix/bin/irssi --version
-          echo "::set-output name=merge_abi::$merge_abi"
-      - uses: actions/upload-artifact@v2
-        with:
-          name: merge.inst
-          path: merge
-          retention-days: 1
-  check-abi-diff:
-    runs-on: ubuntu-latest
-    needs:
-      - build-merge-ref
-      - build-base-ref
-    env:
-      base_abi: ${{ needs.build-base-ref.outputs.base_abi }}
-      merge_abi: ${{ needs.build-merge-ref.outputs.merge_abi }}
-    steps:
-      - name: prepare required software
-        run: |
-          sudo apt install abigail-tools
-      - name: fetch base build
-        uses: actions/download-artifact@v2
-        with:
-          name: base.inst
-          path: base
-      - name: fetch merge build
-        uses: actions/download-artifact@v2
-        with:
-          name: merge.inst
-          path: merge
-      - run: |
-          # abipkgdiff
-          abipkgdiff -l base merge >abipkgdiff.out && diff_ret=0 || diff_ret=$?
-          echo "diff_ret=$diff_ret" >> $GITHUB_ENV
-          cat abipkgdiff.out
-      - uses: actions/upload-artifact@v2
-        with:
-          path: abipkgdiff.out
-      - run: |
-          # Check if no changes are needed
-          if [ "$diff_ret" -ne 0 ]; then
-              if [ "$base_abi" -lt "$merge_abi" ]; then
-                  echo "::warning ::abigail found changes and ABI changed from $base_abi to $merge_abi"
-                  exit 0
-              else
-                  echo "::error ::Looks like the ABI changed but the IRSSI_ABI_VERSION did not"
-                  exit $diff_ret
-              fi
-          else
-              if [ "$base_abi" -ne "$merge_abi" ]; then
-                  echo "::error ::abigail found no changes yet the IRSSI_ABI_VERSION changed. Is this correct?"
-                  exit 1
-              else
-                  : "No changes detected and IRSSI_ABI_VERSION untouched"
-                  exit 0
-              fi
-          fi

.github/workflows/check.yml

@@ -1,101 +0,0 @@
-on:
-  push:
-    branches:
-     - master
-  pull_request:
-name: Check Irssi
-env:
-  apt_build_deps: libutf8proc-dev libperl-dev libotr5-dev
-  apt_build_deps_meson: ninja-build
-  get_pip_build_deps_meson: pip3 install setuptools${setuptools_ver}; pip3 install wheel; pip3 install meson${meson_ver}
-  build_options_meson: -Dwith-proxy=yes -Dwith-bot=yes -Dwith-perl=yes -Dwith-otr=yes
-  prefix: ~/irssi-build
-jobs:
-  dist:
-    runs-on: ubuntu-latest
-    steps:
-      - name: prepare required software
-        run: |
-          sudo apt update && sudo apt install $apt_build_deps
-      - uses: actions/checkout@main
-      - name: make dist
-        run: |
-          ./utils/make-dist.sh
-      - uses: actions/upload-artifact@v2
-        with:
-          path: irssi-*.tar.gz
-          retention-days: 1
-  install:
-    runs-on: ${{ matrix.os }}
-    env:
-      CC: ${{ matrix.compiler }}
-    needs: dist
-    continue-on-error: ${{ contains(matrix.flags, 'FAILURE-OK') }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-18.04, ubuntu-latest]
-        builder: [meson]
-        compiler: [clang, gcc]
-        flags: [regular]
-        include:
-          - os: ubuntu-18.04
-            builder: meson
-            meson_ver: ==0.53.2
-            setuptools_ver: <51
-          - os: ubuntu-latest
-            builder: meson
-            meson_ver: <0.63.0
-          - os: ubuntu-latest
-            builder: meson
-            flags: meson-latest FAILURE-OK
-    steps:
-      - name: fetch dist
-        uses: actions/download-artifact@v2
-      - name: set PATH
-        run: |
-          echo "$HOME/.local/bin" >> $GITHUB_PATH
-      - name: prepare required software
-        env:
-          meson_ver: ${{ matrix.meson_ver }}
-          setuptools_ver: ${{ matrix.setuptools_ver }}
-        run: |
-          sudo apt update && sudo apt install $apt_build_deps $apt_build_deps_${{ matrix.builder }}
-          eval "$get_pip_build_deps_${{ matrix.builder }}"
-          curl -SLf https://github.com/irssi-import/actions-irssi/raw/master/check-irssi/render.pl -o ~/render.pl && chmod +x ~/render.pl
-      - name: unpack archive
-        run: tar xaf artifact/irssi-*.tar.gz
-      - name: build and install with meson
-        run: |
-          # ninja install
-          cd irssi-*/
-          meson Build $build_options_meson --prefix=${prefix/\~/~}
-          ninja -C Build
-          ninja -C Build install
-        if: ${{ matrix.builder == 'meson' }}
-      - name: run tests with Meson
-        run: |
-          # ninja test
-          cd irssi-*/
-          ninja -C Build test
-          find -name testlog.txt -exec sed -i -e '/Inherited environment:.* GITHUB/d' {} + -exec cat {} +
-        if: ${{ matrix.builder == 'meson' }}
-      - name: run launch test
-        env:
-          TERM: xterm
-        run: |
-          # automated irssi launch test
-          cd
-          mkdir irssi-test
-          echo 'echo automated irssi launch test
-          ^set settings_autosave off
-          ^set -clear log_close_string
-          ^set -clear log_day_changed
-          ^set -clear log_open_string
-          ^set log_timestamp * 
-          ^window log on' > irssi-test/startup
-          echo load perl >> irssi-test/startup
-          echo load proxy >> irssi-test/startup
-          echo ^quit >> irssi-test/startup
-          irssi-build/bin/irssi --home irssi-test | perl -Mutf8 -C ~/render.pl
-          cat irc.log.*

.github/workflows/cifuzz.yml

@@ -1,51 +0,0 @@
-name: CIFuzz
-on:
-  pull_request:
-    paths:
-    - 'src/core/**/*.c'
-    - 'src/fe-common/core/**/*.c'
-    - 'src/fe-text/gui-*.c'
-    - 'src/irc/**/*.c'
-    - 'src/fe-common/irc/**/*.c'
-    - 'src/lib-config/**/*.c'
-    - 'src/fe-fuzz/**/*.c'
-    - 'tests/**/*.c'
-    - '.github/workflows/cifuzz.yml'
-jobs:
-  Fuzzing:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sanitizer: [address, undefined, memory]
-    steps:
-    - uses: actions/checkout@main
-      with:
-        path: irssi
-    - name: Docker build build_fuzzers container
-      run: |
-        # google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
-        docker build -t build_fuzzers:actions -f "/home/runner/work/_actions/google/oss-fuzz/master/infra/build_fuzzers.Dockerfile" "/home/runner/work/_actions/google/oss-fuzz/master/infra"
-    - name: Build Fuzzers (${{ matrix.sanitizer }})
-      id: build
-      env:
-        OSS_FUZZ_PROJECT_NAME: 'irssi'
-        DRY_RUN: false
-        SANITIZER: ${{ matrix.sanitizer }}
-        PROJECT_SRC_PATH: /github/workspace/irssi
-        REPOSITORY: 'irssi'
-      run: |
-        docker run --workdir /github/workspace --rm -e OSS_FUZZ_PROJECT_NAME -e DRY_RUN -e SANITIZER -e PROJECT_SRC_PATH -e REPOSITORY -e WORKSPACE=/github/workspace -e CI=true -v "/var/run/docker.sock":"/var/run/docker.sock" -v "$GITHUB_WORKSPACE":"/github/workspace" build_fuzzers:actions
-    - name: Run Fuzzers (${{ matrix.sanitizer }})
-      uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
-      with:
-        oss-fuzz-project-name: 'irssi'
-        fuzz-seconds: 600
-        dry-run: false
-        sanitizer: ${{ matrix.sanitizer }}
-    - name: Upload Crash
-      uses: actions/upload-artifact@v1
-      if: failure() && steps.build.outcome == 'success'
-      with:
-        name: ${{ matrix.sanitizer }}-artifacts
-        path: ./out/artifacts

.github/workflows/clangformat.yml

@@ -1,29 +0,0 @@
-on: [pull_request]
-name: clang-format
-jobs:
-  check-clang-format:
-    runs-on: ubuntu-22.04
-    steps:
-      - name: install clang-format
-        run: sudo apt install clang-format-14
-      - uses: actions/checkout@main
-      - name: fetch target ref
-        run:
-          |
-            refs=($(git log -1 --format=%s))
-            git fetch --depth=1 origin "${refs[3]}"
-      - name: configure clang-format
-        run:
-          |
-            git config clangformat.binary $PWD/utils/clang-format-xs/clang-format-xs
-            git config clangformat.extensions c,h,xs
-      - name: run git-clang-format and Check if no changes are needed
-        run:
-          |
-            CLANG_FORMAT=clang-format-14 git-clang-format-14 --diff FETCH_HEAD HEAD | tee git-clang-format.diff
-            cmp -s <(echo no modified files to format) git-clang-format.diff || cmp -s <(echo -n) git-clang-format.diff
-      - uses: actions/upload-artifact@v1
-        if: failure()
-        with:
-          name: git-clang-format.diff
-          path: git-clang-format.diff

.github/workflows/termuxpkg.yml

@@ -1,79 +0,0 @@
-on:
-  push:
-    branches:
-     - master
-  pull_request:
-name: Build Irssi Termux package
-jobs:
-  termux-package:
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout termux-packages
-        uses: actions/checkout@main
-        with:
-          repository: termux/termux-packages
-      - name: checkout irssi
-        uses: actions/checkout@main
-        with:
-          path: src.irssi.git
-      - name: download termux docker container
-        uses: docker://termux/package-builder:latest
-      - name: create irssi build receipe
-        run: |
-          mkdir packages/irssi-an
-          cat << 'BUILD_SH' > packages/irssi-an/build.sh
-          TERMUX_PKG_HOMEPAGE=https://irssi.org/
-          TERMUX_PKG_DESCRIPTION="Terminal based IRC client"
-          TERMUX_PKG_LICENSE="GPL-2.0"
-          TERMUX_PKG_MAINTAINER="@irssi"
-          TERMUX_PKG_VERSION=@VERSION@
-          TERMUX_PKG_REVISION=@REVISION@
-          TERMUX_PKG_SRCURL=file:///home/builder/termux-packages/src.irssi.git
-          TERMUX_PKG_AUTO_UPDATE=true
-          TERMUX_PKG_DEPENDS="glib, libandroid-glob, libiconv, libotr, ncurses, openssl, perl, utf8proc"
-          TERMUX_PKG_BREAKS="irssi"
-          TERMUX_PKG_REPLACES="irssi"
-          TERMUX_MESON_PERL_CROSS_FILE=$TERMUX_PKG_TMPDIR/meson-perl-cross-$TERMUX_ARCH.txt
-          TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-          -Dfhs-prefix=$TERMUX_PREFIX
-          --cross-file $TERMUX_MESON_PERL_CROSS_FILE
-          "
-
-          termux_step_pre_configure() {
-              LDFLAGS+=" -landroid-glob"
-
-              # Make build log less noisy.
-              CFLAGS+=" -Wno-compound-token-split-by-macro"
-
-              local perl_version=$(. $TERMUX_SCRIPTDIR/packages/perl/build.sh; echo $TERMUX_PKG_VERSION)
-
-              cat << MESON_PERL_CROSS >$TERMUX_MESON_PERL_CROSS_FILE
-          [properties]
-          perl_version = '$perl_version'
-          perl_ccopts = ['-I$TERMUX_PREFIX/include', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-I$TERMUX_PREFIX/lib/perl5/$perl_version/${TERMUX_ARCH}-android/CORE']
-          perl_ldopts = ['-Wl,-E', '-I$TERMUX_PREFIX/include', '-L$TERMUX_PREFIX/lib/perl5/$perl_version/${TERMUX_ARCH}-android/CORE', '-lperl', '-lm', '-ldl']
-          perl_archname = '${TERMUX_ARCH}-android'
-          perl_installsitearch = '$TERMUX_PREFIX/lib/perl5/site_perl/$perl_version/${TERMUX_ARCH}-android'
-          perl_installvendorarch = ''
-          perl_inc = ['$TERMUX_PREFIX/lib/perl5/site_perl/$perl_version/${TERMUX_ARCH}-android', '$TERMUX_PREFIX/lib/perl5/site_perl/$perl_version', '$TERMUX_PREFIX/lib/perl5/$perl_version/${TERMUX_ARCH}-android', '$TERMUX_PREFIX/lib/perl5/$perl_version']
-          MESON_PERL_CROSS
-          }
-
-          BUILD_SH
-          version=$(awk '/^v/ { $0=$1; gsub(/^v/,""); gsub(/-head/,"dev"); gsub(/-/,""); print; exit }' src.irssi.git/NEWS)
-          version=$version+g$(git -C src.irssi.git rev-parse --short HEAD)
-          sed -i \
-              -e "s:@VERSION@:$version:" \
-              -e "s:@REVISION@:$GITHUB_RUN_NUMBER:" \
-              packages/irssi-an/build.sh
-          git -C src.irssi.git tag v$version
-      - name: prepare output folder
-        run: |
-          install -m a+rwx -d output
-      - name: build irssi package
-        run: |
-          sudo ./scripts/run-docker.sh ./build-package.sh -I irssi-an
-      - uses: actions/upload-artifact@v2
-        with:
-          name: irssi-termux-pkg
-          path: output/irssi-an*.deb

.github/workflows/trigger-pages.yml

@@ -1,20 +0,0 @@
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  rebuild-pages:
-    if: github.repository == 'irssi/irssi'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/github-script@v6
-        with:
-          github-token: ${{ secrets.PAT_TOKEN }}
-          script: |
-            await github.rest.actions.createWorkflowDispatch({
-              owner: context.repo.owner,
-              repo: 'irssi.github.io',
-              workflow_id: 'pages.yml',
-              ref: 'main'
-            })

.gitignore

@@ -11,6 +11,7 @@ config.status
 configure
 default-config.h
 default-theme.h
+faq.txt
 irssi-config
 irssi-config.h
 irssi-config.h.in
@@ -27,14 +28,13 @@ MYMETA.*
 
 docs/help/Makefile.am
 docs/help/[a-z]*
-!docs/help/meson.build
 !docs/help/in
 docs/help/in/Makefile.am
 
 src/fe-text/irssi
-src/fe-fuzz/irssi-fuzz
-src/fe-fuzz/irc/core/event-get-params-fuzz
-src/fe-fuzz/fe-common/core/theme-load-fuzz
+
+src/fe-common/irc/irc-modules.c
+src/irc/irc.c
 
 src/perl/perl-signals-list.h
 src/perl/irssi-core.pl.h
@@ -46,35 +46,11 @@ src/perl/ui/*.c
 src/perl/*/MYMETA.*
 src/perl/*/Makefile.old
 
-src/fe-fuzz/crash-*
-src/fe-fuzz/oom-*
-
-/core
-/irssi-1.pc
-/irssi/
-/tests/fe-common/core/test-formats
-/tests/fe-common/core/test-formats.log
-/tests/fe-common/core/test-formats.trs
-/tests/fe-common/core/test-suite.log
-/tests/irc/core/core
-/tests/irc/core/test-channel-events
-/tests/irc/core/test-channel-events.log
-/tests/irc/core/test-channel-events.trs
-/tests/irc/core/test-irc
-/tests/irc/core/test-irc.log
-/tests/irc/core/test-irc.trs
-/tests/irc/core/test-suite.log
-/tests/irc/flood/test-796
-/tests/irc/flood/test-796.log
-/tests/irc/flood/test-796.trs
-/tests/irc/flood/test-suite.log
-
 *.a
 *.bs
 *.la
 *.lo
 *.o
-*.swp
 *~
 
 *.tar.bz2
@@ -82,10 +58,3 @@ src/fe-fuzz/oom-*
 
 .deps
 .libs
-
-Build
-subprojects/*
-!subprojects/*.wrap
-Irssi-Dist
-setup.cfg
-*.egg-info

.obs/workflows.yml

@@ -1,13 +0,0 @@
-workflow:
-  steps:
-    - branch_package:
-        source_project: home:ailin_nemui:irssi-git-an
-        source_package: irssi-git-an
-        target_project: home:ailin_nemui:CI
-    - set_flags:
-        flags:
-          - type: publish
-            status: enable
-            project: home:ailin_nemui:CI
-  filters:
-    event: pull_request

.travis.yml

@@ -0,0 +1,46 @@
+sudo: false
+language: perl
+perl:
+    - "5.20-shrplib"
+    - "5.18-shrplib"
+    - "system-perl"
+env:
+    - CC=clang
+    - CC=gcc
+
+addons:
+    apt:
+        packages:
+            - libperl-dev
+            - elinks
+
+before_install:
+    - perl -V
+    - ./autogen.sh --with-proxy --with-bot --with-perl=module
+    - make dist
+    - cd ..
+    - tar xaf */irssi-*.tar.*
+    - cd irssi-*
+
+install:
+    - ./configure --with-proxy --with-bot --with-perl=module --prefix=$HOME/irssi-build
+    - make CFLAGS="-Wall -Werror"
+    - make install
+
+before_script:
+    - cd
+    - mkdir irssi-test
+    - echo echo automated irssi launch test > irssi-test/startup;
+      echo ^set settings_autosave off >> irssi-test/startup;
+      echo ^set -clear log_close_string >> irssi-test/startup;
+      echo ^set -clear log_day_changed >> irssi-test/startup;
+      echo ^set -clear log_open_string >> irssi-test/startup;
+      echo ^set log_timestamp '* ' >> irssi-test/startup;
+      echo ^window log on >> irssi-test/startup
+    - echo load perl >> irssi-test/startup
+    - echo load proxy >> irssi-test/startup
+    - echo ^quit >> irssi-test/startup
+    - irssi-build/bin/irssi --home irssi-test
+    - cat irc.log.*
+
+script: true

AUTHORS

@@ -13,7 +13,6 @@ Irssi staff (current maintainers) <staff@irssi.org>:
   Jase Thew (bazerka)
   dequis (dx)
   Ailin Nemui (Nei)
-  Giuseppe (TheLemonMan, lemonboy)
 
 Former developers:
 
@@ -27,8 +26,7 @@ Large feature patches by:
   Heikki Orsila : DCC SEND queueing
   Mark Trumbull : DCC SERVER
   Francesco Fracassi : Passive DCC
-  Uli Meis : OTR support
-  David Goulet : OTR support
+  Giuseppe (The Lemon Man)
 
 Other patches (grep for "patch" in ChangeLog) by:
 

INSTALL

@@ -2,63 +2,68 @@
  Irssi installation instructions
  -------------------------------
 
-To compile Irssi you need:
+To compile irssi you need:
 
-- meson-0.53 build system with ninja-1.8 or greater
-- glib-2.32 or greater
+- glib-2.6 or greater
+- pkg-config
 - openssl (for ssl support)
-- perl-5.6 or greater (for Perl support)
+- perl-5.6 or greater (for perl support)
 - terminfo or ncurses (for text frontend)
 
 For most people, this should work just fine:
 
- meson Build
- ninja -C Build
+ ./autogen.sh     (for people who just cloned the repository)
+ ./configure      (if this script already exists, skip ./autogen.sh)
+ make
  su
- ninja -C Build install
- 
-meson options
+ make install     (not _really_ required except for perl support)
 
-  These options can be given to meson.
-  
-  For a complete list of options, run
-   meson configure
+configure options
 
   --prefix
 
-  Specifies the path where Irssi will be installed.
-  YES, you can install Irssi WITHOUT ROOT permissions
+  Specifies the path where irssi will be installed.
+  YES, you can install irssi WITHOUT ROOT permissions
   by using --prefix=/home/dir
 
-  -Dwith-proxy=yes
+  --with-proxy
 
-  Build the Irssi proxy (see startup-HOWTO).
+  Build the irssi proxy (see startup-HOWTO).
 
-  -Dwith-perl=[yes|no]
+  --disable-ssl
+
+  Disable SSL support.
+
+  --with-perl=[yes|no|module]
 
   Enable Perl support
   yes    enable builtin (default)
   no     disable
+  module enable as module
 
-  -Dwith-perl-lib=[site|vendor|DIR]
+  --with-perl-lib=[site|vendor|DIR]
 
   Specify installation dir for Perl libraries
   site   install in dir for site-specific modules (default)
   vendor install in dir for vendor-specific modules
   DIR    install in DIR
 
-  -Dwith-bot=yes
+  --with-socks
+
+  Build with socks library
+
+  --with-bot
 
   Build irssi-bot
 
-  -Dwithout-textui=yes
+  --without-textui
 
   Build without text frontend
 
 If anything is in non-standard path, you can just give the paths in
-the -Dc_args and -Dc_link_args options variable, eg.:
+CPPFLAGS and LIBS environment variable, eg.:
 
-  meson Build -Dc_args='-I/opt/openssl/include' -Dc_link_args='-L/opt/openssl/lib'
+  CPPFLAGS=-I/opt/openssl/include LDFLAGS=-L/opt/openssl/lib ./configure
 
 
 
@@ -68,43 +73,47 @@ the -Dc_args and -Dc_link_args options variable, eg.:
 Perl support generates most of the problems. There's quite a many
 things that can go wrong:
 
+ - Compiling fails if you compile irssi with GCC in a system that has
+   perl compiled with some other C compiler. Very common problem with
+   non-Linux/BSD systems. You'll need to edit src/perl/*/Makefile files
+   and remove the parameters that gcc doesn't like. Mostly you'll just
+   need to keep the -I and -D parameters and add -fPIC.
  - If there's any weird crashing at startup, you might have older irssi's
    perl libraries installed somewhere, and you should remove those.
- - If meson complains that it doesn't find some perl stuff, you're
+ - Dynamic libraries don't want to work with some systems, so if your
+   system complains about some missing symbol in Irssi.so file, configure
+   irssi with --with-perl-staticlib option (NOT same as --with-perl=static).
+ - If configure complains that it doesn't find some perl stuff, you're
    probably missing libperl.so or libperl.a. In debian, you'll need to do
    apt-get install libperl-dev
+ - For unprivileged home directory installations, you probably do not want 
+   to specify --with-perl-lib=(site|vendor). Instead, you can use the 
+   default perl installation target (below the irssi prefix). If you are
+   using local::lib you can also choose to install there by specifying
+   --with-perl-lib=$PERL_LOCAL_LIB_ROOT/lib/perl5
 
 You can verify that the perl module is loaded and working with "/LOAD"
 command. It should print something like:
 
 Module               Type    Submodules
 ...
-perl                 dynamic fe core
+perl                 static  core fe
 
 
  System specific notes
  ---------------------
 
- Android
-
-When cross compiling Irssi for Android, you can specify the path of
-the cross-perl in the cross file.
-
-You may not have a cross-perl available. In that case, you will have
-to manually supply the required Perl arguments in the cross file. See
-the commented properties in the example cross file.
-
-An example cross file can be found in the docs folder. To use it, you
-would call:
-
-  meson Build --cross-file cross-android-aarch64.txt \
-    --prefix /data/data/com.termux/files/usr \
-    --libdir lib \
-    -Dfhs-prefix=/data/data/com.termux/files/usr \
-
-
  Cygwin
 
 Getting perl scripting to work needs a few things:
 
- - TODO
+ - configure with --with-perl-staticlib
+
+ - libperl.dll is required in linking and running irssi, it's normally
+   located somewhere around /usr/lib/perl5/5.6.1/cygwin/CORE/libperl5_6_1.dll
+   copy it to eg. /usr/bin/libperl.dll
+
+ - -DUSEIMPORTLIB is needed to be defined while compiling src/perl directory.
+   It doesn't hurt to be defined everywhere, so configure irssi with:
+
+     CFLAGS='-DUSEIMPORTLIB' ./configure --with-perl-staticlib

MANIFEST.in

@@ -1,35 +0,0 @@
-global-include meson.build
-
-recursive-include src *.c *.h meson.build
-recursive-include src/perl *.c *.h *.xs *.pm *.pl typemap meson.build
-recursive-include src/fe-fuzz *.c *.h *.txt meson.build
-recursive-include tests *.c meson.build
-
-include meson_options.txt
-
-include subprojects/*.wrap
-# prune subprojects/*
-
-include utils/*.pl utils/*.sh
-exclude utils/make-dist.sh
-
-include irssi.conf
-include themes/*.theme
-include docs/*.1 docs/*.txt docs/*.html
-include docs/help/in/[a-z]*.in
-include scripts/*.pl scripts/examples/*.pl
-include irssi-icon.png
-
-include NEWS
-include INSTALL
-include TODO
-include ChangeLog
-
-include .clang-format
-
-# prune Build
-# prune dist
-prune *.egg-info
-
-# ignore fuzz-support/fuzz.diff
-# ignore utils/clang-format-xs/*

Makefile.am

@@ -0,0 +1,39 @@
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
+# create default-config.h
+BUILT_SOURCES = default-config.h default-theme.h irssi-version.h
+CLEANFILES = default-config.h default-theme.h
+
+@MAINTAINER_MODE_TRUE@.PHONY: irssi-version.h
+
+default-config.h: $(srcdir)/irssi.conf
+	$(srcdir)/file2header.sh $(srcdir)/irssi.conf default_config > default-config.h
+
+default-theme.h: $(srcdir)/default.theme
+	$(srcdir)/file2header.sh $(srcdir)/default.theme default_theme > default-theme.h
+
+irssi-version.h:
+	VERSION="$(VERSION)" $(srcdir)/irssi-version.sh $(srcdir) | \
+		cmp -s - $@ || VERSION="$(VERSION)" $(srcdir)/irssi-version.sh $(srcdir) >$@
+
+SUBDIRS = src docs scripts
+
+confdir = $(sysconfdir)
+conf_DATA = irssi.conf
+
+themedir = $(datadir)/irssi/themes
+theme_DATA = default.theme colorless.theme
+
+pkginclude_HEADERS = irssi-config.h irssi-version.h
+
+EXTRA_DIST = \
+	ChangeLog \
+	autogen.sh \
+	README.md \
+	file2header.sh \
+	$(conf_DATA) \
+	$(theme_DATA) \
+	irssi-config.in \
+	irssi-icon.png \
+	irssi-version.sh \
+	syntax.pl

NEWS

@@ -1,729 +1,22 @@
-v1.5-head 202x-xx-xx  The Irssi team <staff@irssi.org>
-
-v1.4.3 2022-10-31  The Irssi team <staff@irssi.org>
-	- Fix freeze on Alt+arrows (#1416, #1417)
-	- Fix crash on /upgrade (#1399, #1419)
-	- Fix saving of -disallow_starttls (#1401, #1420)
-	- Fix libnv detection on FreeBSD (freebsd#265397, #1407). By
-	  Guido Falsi and Kristof Provost
-	- Minor help and script fixes (#1380, #1393, #1411, #1413,
-	  #1414, #1415)
-
-v1.4.2 2022-07-17  The Irssi team <staff@irssi.org>
-	* Add irssimoduledir to irssi-1.pc in the Meson build (#1383,
-          #1378)
-	- Use -isystem includes, limiting warnings to Irssi
-          code. Fixes compilation with Perl 5.36 (#1381,
-          gentoo#851522, #1384)
-	- Fix missing lines when changing dynamic textbuffer contents
-          (#1382, #1387). Reported by externalserver15
-	- Fix Perl cross compilation with Meson 0.60.0 (#1377)
-	- Fix default channel prefix used for /JOIN to default to `#'
-          (#1385, #1388)
-	- Fix crash in /LASTLOG by getting line texts before printing
-          (#1367, #1398)
-
-v1.4.1 2022-06-12  The Irssi team <staff@irssi.org>
-	! Note: botti no longer compiles; get in touch if you use it
-	* Format the output of /QUOTE HELP (#1371, an#82). By Val
-	  Lorentz. Add /SHELP as default alias (an#83)
-	+ GLib log message filter: /SET glib_log_domains (an#50,
-	  an#59). By Andrej Kacian
-	+ An option to clear the cutbuffer:
-	  /SET empty_kill_clears_cutbuffer (an#58). By Mikael
-	  Magnusson
-	+ Scriptable pastebin (an#60, an#88)
-	+ Configurable actlist separator: /SET actlist_separator
-	  (#1364, an#61)
-	- Fix window left/right not skipping visible windows
-	  (an#57). By Mikael Magnusson
-	- Fix wrong printf-format on OpenBSD (an#66, an#68). Reported
-	  by Aaron Bieber
-	- Fix erroneous output produced by autoload_modules (an#72)
-	- Fix scroll_page_count setting with `.' (#1365, an#76)
-	- Fix memory leak in /IGNORE (#1373, an#84). Found by Jookia
-	- Misc fixes (an#45, an#67, an#70, #1368, an#77)
-
-	- CHANTYPES take precedence over (missing) STATUSMSG in /join
-          (#1358, an#54)
-	- Fix crash in Perl's $view->set_bookmark (freebsd#254237,
-          an#56)
-
-	- Minor help fixes (an#51, an#52)
-	- Fix regression where own channel status was forgotten after
-          /UPGRADE (#1357, an#53)
-
-	* /SET resolve_reverse_lookup setting was removed (#1034,
-          #1135)
-	* Irssi will try to connect on IPv4 if IPv6 connection failed
-	  (#1146). By Shivaram Lingamneni
-
-	* The display system now renders formats on the fly (#1079,
-	  #1188, #1191, #1192, #1204, #1205, #1209, #1349, #1355,
-	  an#13, an#14, an#28, an#29, an#36, an#37, an#49)
-
-	  This major change will break scripts that try to modify
-	  printed text during "print text" signal (#1189). They need
-	  to be ported to modify the text during "print format"
-	  instead. It also breaks the usage of using /FORMAT to add
-	  different colours to a line. Such usage needs to be ported
-	  to using $expando variables instead. Affected scripts
-	  include format_identify.pl, friends_peder.pl, nickcolor.pl,
-	  nm.pl, people.pl
-
-	  The "gui print text finished" and "gui print text after
-	  finished" signals gained a TEXT_DEST_REC *parameter in the
-	  process.
-
-	  A new "gui render line text" signal is available to change
-	  the rendering of a line
-
-	* made the $Z expando (time) dynamic (#1087, #1207, #1208)
-
-	  This change breaks the usage of /SET timestamp_format to
-	  supply a custom displayed time stamp. Affected scripts
-	  include binary_time.pl
-
-	* /HILIGHT -priority now affects which hilight rule gets
-	  applied (#1228, #1232)
-	* The NAMES list is now hidden by default if there are more
-	  than 18 users on the channel (an#7)
-
-	  To revert to the previous behaviour
-
-	      /SET show_names_on_join_limit -1
-
-	* -tls_verify is now enabled by default (#1170, an#18, #1309,
-           an#23, #1343, #1351)
-
-	  This may cause an ugly display of notls_verify in the output
-	  of /SERVER LIST, even on plain-text connection, on old
-	  configs. Kindly remove the "tls_verify = "no";" entries from
-	  your config file manually.
-
-	* Irssi will now attempt STARTTLS if advertised (#1170, #1312,
-	  an#19)
-
-	  Use -disallow_starttls if you absolutely do not want this
-
-	  In order to check for a STARTTLS advertisement, Irssi will
-	  now wait for a response (even an error) to CAP LS 302. If
-	  your bouncer/server does not want to communicate before
-	  receiving USER/PASS at all, use -nocap to disable the CAP
-	  check.
-
-	* Channel sync requests (WHO, MODE) are now sent "later" than
-          user commands. This should improve responsiveness to user
-          commands in the autojoin phase (an#26, an#32, an#33)
-	* Irssi is now using full paths in #include directives and
-          consequently does not add all directories to the include
-          path anymore (#1040)
-	* The Build System was ported to Meson (#1064, #1065, #1068,
-	  #1071, #1072, #1073, #1074, #1075, #1084, #1085, #1118, #1166,
-	  #1223, #1224, #1245, #1313, #1314, an#31)
-	* Scriptassist was changed to use a YAML database (#1163)
-
-	  It will tell you when you need to update your setting
-
-	* /BIND shows all partial matches (#1155)
-	* Cleanup of unused functions (#1017, #1132, #1145, #1182,
-	  #1246, #1264)
-
-	  Functions removed:
-
-	      NET_CALLBACK
-	      NET_HOST_CALLBACK
-	      RESOLVED_NAME_REC
-	      net_gethostbyaddr_nonblock
-	      net_connect_nonblock
-	      [ SIMPLE_THREAD_REC, simple_init, simple_readpipe ]
-	      hash_save_key
-
-	  Functions deprecated:
-
-	      dec2octal
-	      g_timeval_cmp
-	      get_timeval_diff
-
-	  Function names corrected:
-
-	      g_input -> i_input
-	      g_istr -> i_istr
-	      g_io_channel -> i_io_channel
-	      g_hash_free_value -> i_hash_free_value
-	      remove g_free_true
-	      gslist -> i_slist
-	      glog_func -> i_log_func
-	      glist -> i_list
-
-	  If multi-version compatibility is desired, module authors
-	  can find an example of backwards compatible code in
-	  cdidier/irssi-xmpp#55
-
-	+ Add MSGLEVEL_HIDDEN to Perl (#1044)
-	+ Add $view->set_hidden_level and $view->remove_lines_by_level
-	  to Perl (#1026)
-	+ Add a /SET scrollback_max_age setting (#1022). By Heikki
-	  Orsila
-	+ Add /SET actlist_prefer_window_name (#1025)
-	+ Add -window option to /CAT (#1023, #1159)
-	+ Add an option to list specific sections with
-
-	      /SET -section lookandfeel
-
-	  (#1048)
-
-	+ Add support for IRCv3 CAP LS 302 (#1091)
-	+ Add a new "print noformat" signal that goes together with
-	  "print format" (#1088, #1192)
-	+ Add support for IRCv3 extended-join. /SET show_extended_join
-	  to enable (#1097, #1107, #1124)
-
-	  There are two new /FORMATs, join_extended and
-	  join_extended_account, that theme writers need to take into
-	  account if desired.
-
-	+ Add support for IRCv3 setname (#1093, #1104, #1254, GL#33)
-	+ Add support for IRCv3 account-notify (#1100, #1098, GL#33,
-	  #1105, #1131). Credit to oss-fuzz
-	  /SET show_account_notify to enable
-	+ Add support for IRCv3 invite-notify (#1094)
-	+ Add support for receiving IRCv3 message-tags (#576, #1090)
-	+ Add support for sending IRCv3 message-tags (#1092, an#34)
-	+ Enable the znc.in/self-message CAP by default (#1123)
-	+ Add support for IRCv3 away-notify. /SET away_notify_public
-	  to enable (#1099, GL#33, #1105)
-	+ Add support for IRCv3 chghost (#1096, GL#33, #1105)
-
-	  For servers with broken chghost implementation that fill the
-	  status window with host changed messages, one may add "quote
-	  cap req -chghost" to the -autosendcmd or, if the host change
-	  messages are entirely undesired, "/format -delete
-	  host_changed"
-
-	+ Add support for IRCv3 server-time. /SET show_server_time to
-	  enable (#1108)
-	+ Add support for logging IRCv3 server-time.
-	  /SET log_server_time to disable (#1318, an#16)
-	+ Add IRCv3 features to signals.txt (#1111)
-
-	  In particular, "message join" now takes 2 additional
-	  arguments, script and module authors must beware of this
-	  change.
-
-	+ Show the unignore time in /IGNORE output (#1158, #1161)
-	+ Add /SET quit_on_hup to make the behaviour of SIGHUP
-	  configurable (#828, #1169). By Pinguin1234
-	+ Support numeric 489 as ERR_SECUREONLYCHAN (#1193, #1196). By
-	  Michael Hansen
-	+ Improve support for building Irssi in Termux-Android with
-	  Meson (#1199)
-	+ Add usermode key to Irssi::Irc::Chatnet in Perl (#1288). By
-	  Jessica Sophie Porter
-	+ Add format_string_expand and format_string_unexpand
-	  functions to Perl (#1286)
-	+ Add ...->format_create_dest(...)->printformat("format",
-	  args...) and ...->printformat_module("module", "format",
-	  args...) methods to Perl (#1284)
-
-	  You can avoid any CORE::GLOBAL::caller hacks using the
-	  printformat_module method, especially sind that hack was not
-	  safe during signal emissions
-
-	+ Add tracking of user accounts in the channel nicklist using
-	  WHOX on join (#1250)
-	+ Add auto-loading of the Perl and otr module from /SET
-	  autoload_modules (#1295)
-	+ Add /IGNORE ... NOHILIGHT to ignore some hilights (#1260)
-	+ Do not beep on hidden lines with /SET beep_msg_level
-	  ... -HIDDEN (#1259)
-	+ Added /CS, /MS, /NS, and /OS aliases to the default config
-	  (#1316). By Mathis Beer
-	+ Allow -tls_ca{file,path} '' to unset an argument (#730,
-	  #1060, an#30)
-	+ Add a "server outgoing modify" signal to intercept outgoing
-	  messages (#1148, #1151, an#15, an#43). Original by
-	  JustAnotherArchivist
-	- remove some hard-coded 510 byte assumptions (#1086)
-	- Several fixes for error checks in SSL (#944, #1037, #943,
-          #1036). Reported by Chi Li
-	- Wrong variable tested in mask_match (#902, #1035)
-	- Fix bug where irssi-proxy with `?'-port would not reconnect
-          (#1041)
-	- Allow shrinking of /SET rawlog_lines (#957, #1020). By
-          Marcus "Teschi" Prinz
-	- Fix /WINDOW BALANCE warning (#1054)
-	- fix overflow when first command history entry expires
-          (#1070)
-	- begin modularising IRC module (#1067, #1112, #1113)
-	- fix some memory leaks in /DCC RESUME and settings_add
-          (#1077). By Zero King
-	- fix cut-off text with theme_indent module and /SET
-          indent_always OFF (#1078)
-	- fix the cap_queue order (#1095)
-	- add reference counted strings (#1089)
-	- Fix irc_op_public messages not triggering hilights (#354,
-          #891, #1129). By Dan Collins
-	- Fix /IGNORE not setting the right level in irc_op_public
-          messages (#1280). Credit to oss-fuzz
-	- Fix GTimeVal deprecation (#1141, #1144, #1145, #1350, an#44)
-
-	  If multi-version compatibility is desired, module authors
-	  can find an example of backwards compatible code in
-	  cdidier/irssi-xmpp#53
-
-	- Fix /IGNORE ... MODES NO_ACT not working (#1164)
-	- Deprecated -ssl* options are hidden from tab completion
-          (#1171)
-	- Make /SET actlist_sort a choice type (#1198)
-	- Fix crash from self-unloading script (#1206). By Thomas
-          Stagner
-	- Fix crash during Perl signal emission (#1233, #1234)
-	- Fix a case where empty lines or comments inside channels or
-          servers in the config would confuse Irssi (#1062, #1242,
-          #1243)
-	- Fix reported freezing in DCC GET on slow disks (#159, #1271)
-	- Fix message-tags parsing (#1274, #1275). Credit to oss-fuzz
-	- Fail redirects when receiving numeric 263 (RPL_TRYAGAIN) in
-          response to /WHO (#1283)
-	- Some updates to .gitignore (#1302). By Rene Kita
-	- Fix build on operating systems with X/Open Curses, version 2
-	  (#1305, #1308). By Nia Alarie (Regression introduced with
-	  #1290, alternative fix for Irssi 1.2.3 no-term.h.patch)
-	- Fix otr module not using g_strndup, e.g. on Solaris 10
-          (#1315). By Claes Nästén
-	- Fix cursor getting stuck for auto completions that changes
-          case (#1176, #1322, an#8). By ffrogman
-	- Restore operation of tag/* in /SET activity_hide_targets
-	  (#1337, an#11) nb. the ::all syntax was working in Irssi 1.1
-	  and 1.2 (and continues to work)
-	- Fix /SERVER ADD -matrix -network my_matrix_network
-          (an#12). By Andrej Kacian
-	- Fix /SERVER ADD creating duplicated entries in the config
-          file (#1317, an#22, an#41)
-	- Fix critical when SASL user is set and SASL password is
-          empty (#1325, an#21)
-	- Misc fixes (#1106, #1141, #1272, #1297, an#35)
-	- Fuzz fixes (#1116, #1117, #1119, #1125, #1126, an#20)
-	- Build system fixes (#1101, #1102, #1069, #1140, #1181, #1253)
-	- Sync docs and scripts (an#39)
-	- Text and Help updates
-	  - add -tls_* options to manual (#1029, #1030). By Jacob
-            V. Rasmussen
-	  - missing targets in /MSG (#1032)
-	  - wrong parameter in /ECHO (#1024)
-	  - Spelling in OTR (#1047). By David Gall
-	  - Clarify statusbar priority (#1049). By Marius Gedminas
-	  - Document get_irssi_dir in Perl (#1051, #1052). By Alex
-            Shafer
-	  - typo in /HILIGHT help (#1081). By DFrostByte
-	  - improved clarity of your_nick_owned (#1138). By Mike Quin
-	  - Update some URLs to https (#1163)
-	  - Add documentation for escaping some characters (#1329,
-            #1330, an#9). By Guntbert Reiter
-	  - Fix some typos (#1336, an#10). By Francis Mteo
-	  - Document $abiversion and parse_special (an#38). By bw1
-	- Infrastructure updates:
-	  - Support for Github Actions (#1039, #1103, #1160, #1212,
-            #1231, #1252, #1261, an#40)
-	  - Run clang-format on pull requests (#1172, #1173, #1184,
-            #1230, #1247, #1287)
-	  - Run abidiff on pull requests (#1179, #1195)
-	  - Test CI-Fuzz (#1279, #1304, an#17)
-
-v1.2.3 2021-04-11  The Irssi team <staff@irssi.org>
-	- Fix the compilation of utf8proc (#1021)
-	- Fix wrong call to free. By Zero King (#1076)
-	- Fix a colour reset in true colour themes when encountering
-          mIRC colours (#1059)
-	- Fix memory leak on malformed CAP requests (#1120)
-	- Fix an erroneous free of SASL data. Credit to Oss-Fuzz (#1128,
-	  #1130)
-	- Re-set the TLS flag when reconnecting (#1027, #1134)
-	- Fix the scrollback getting stuck after /clear (#1115, #1136)
-	- Fix the input of Ctrl+C as the first character (#1153,  #1154)
-	- Fix crash on quit during unloading of modules on certain
-          platforms (#1167)
-	- Fix Irssi freezing input after Ctrl+Space on GLib >2.62 (#1180,
-	  #1183)
-	- Fix layout of IDCHANs. By Lauri Tirkkonen (#1197)
-	- Fix crash when server got reconnected before it was properly
-          connected (#1210, #1211)
-	- Fix multiple identical active caps (#1249)
-	- Minor help corrections (#1156, #1213, #1214, #1255)
-	- Remove erroneous colour in the colorless theme. Reported and
-          fixed by Nutchanon Wetchasit (#1220, #1221)
-	- Fix invalid bounds calculation when editing the text
-          entry. Found and fixed by Sergey Valentey (#1269)
-	- Fix passing of negative size in buffer writes. Found and
-          fixed by Sergey Valentey (#1270)
-	- Fix Irssi freezing on slow hardware and fast DCC transfers (#159,
-	  #1271)
-	- Fix compilation on Solaris (#1291)
-	- Fix null pointer dereference when receiving broken JOIN
-          record. Credit to Oss-Fuzz (#1292)
-	- Fix crash on /connect to some sockets (#1239, #1298)
-	- Fix Irssi rendering on Apple ARM. By Misty De Méo (#1267,
-	  #1268, #1290)
-	- Fix crash on /lastlog with broken lines (#1281, #1299)
-	- Fix memory leak when receiving bogus SASL authentication
-          data. Found and fixed by Sergey Valentey (#1293)
-
-v1.2.2 2019-08-29  The Irssi team <staff@irssi.org>
-	- Fix a use after free issue when receiving IRCv3 CAP
-          information from the server (GL#34, GL!35)
-	- Fix a crash during startup when windows weren't fully
-          initialised yet (#1114, bdo#935813)
-
-v1.2.1 2019-06-29  The Irssi team <staff@irssi.org>
-	! Contains all changes from 1.1.3
-	- Fix a test on big endian machines (#1014)
-	- Fix the compile time conditionality of wcwidth
-          implementation (#1019, gentoo#677804, #720)
-	- Fix /save no longer working on old Solaris (pre
-          POSIX.1-2008) (#1042, #1043)
-	- Fix regression of #764 where display of 8-bit (legacy
-          encoding) in the input prompt was broken (#1018,
-          #1057). Initial patch by Артём Курашов
-
-v1.1.3 2019-06-29  The Irssi team <staff@irssi.org>
-	! Contains all changes from 1.0.8
-	- Fix regression of #779 where autolog_ignore_targets would
-          not matching itemless windows anymore (#1012, #1013)
-
-v1.0.8 2019-06-29  The Irssi team <staff@irssi.org>
-	- Fix a use after free issue when sending the SASL login on
-          (automatic and manual) reconnects (#1055, #1058). Reported
-          by ilbelkyr
-
-v1.2.0 2019-02-11  The Irssi team <staff@irssi.org>
-	! Contains all changes from 1.1.2
-	* Improved the /STATUSBAR commands (#858)
-	* /SET no longer shows `=' between setting and value (#886)
-	* /CUBES removed from default config (available as script)
-          (#956)
-	* /1 /2 /3 ... removed from default config (available as new
-          setting window_number_commands) (#958)
-	* Always redraw the screen on resize. By David Phillips (#896)
-	* Private notices intended for channels are now displayed on
-	  the channel (new setting notice_channel_context) (#959)
-	+ Imported the "Off-the-record" module into Irssi tree (#854,
-	  #589, #196, #881)
-	+ Initial support for sideways split windows (#697, #431,
-	  #224, #807, FS#310, #947, #955, #989)
-	+ Change the implementation of `wcwidth'. This is used to
-	  calculate the width of emojis on your terminal screen (#917,
-	  #720)
-	+ Make the wcwidth functions available from Perl (#973):
-
-	      string_width(str)
-	      string_chars_for_width(str, width)
-	      wcwidth(char)
-
-	+ Added completion_keep_word setting (#979)
-	+ Allow activity_hide_targets to hide activity in itemless
-	  windows (#967, #997, #1001, #1003)
-	+ Added activity_hide_visible setting (#990)
-	+ Allow hiding of lines through the /IGNORE system (#901,
-	  #900, #892, #890, #884, #937)
-	+ Add window_default_hidelevel setting. By Doug Freed (#941)
-	+ Add activity_hide_window_hidelevel setting, defaulting to ON
-	  (#938)
-	+ Add autolog_only_saved_channels setting, to autolog only
-	  channels that are in the config (#968)
-	+ Add format support for the input line. By Ben Paxton,
-	  originally by Jonas Hurrelmann (#764, FS#621, #1004)
-
-	      use Irssi::TextUI;
-	      gui_input_set_extent(pos, text)
-	      gui_input_set_extents(pos, len, left, right)
-	      gui_input_clear_extents(pos, len)
-	      gui_input_get_extent(pos)
-	      gui_input_get_text_and_extents()
-	      gui_input_set_text_and_extents(...)
-
-	+ Parsing of IRCv3 CAP 3.2 (#775, #869)
-	+ Show CAP-related events in the user interface (#918, #916,
-	  #870, #704)
-	+ Continue using separators when addressing multiple nicks
-	  with tab completion. By Manish Goregaokar (#822)
-	+ Bind Shift-tab by default. By Niklas Luokkala (#830, #829)
-	+ Fuzzing more things (#913, #780, #813)
-	- Disconnect SASL properly in case the SASL module got
-          unloaded from server (#931, #629, #618, #616)
-	- Fix backward completion jumping to the first instead of last
-          word (#979)
-	- Improve empty topic handling (#961, #905, #911, #897, #888)
-	- Prevent config truncation when no space left. By dequis and
-          Lukas Waymann (#922, #925, #910, #909, #906, #871, #817)
-	- Also time-out servers in lookup phase (#866, #130)
-	- Fix build with LibreSSL 2.7. By Dorian Harmans (#865)
-	- Fix a crash when appending to a textbuffer without
-          line. Reported by Jari Matilainen (#862)
-	- Fix segfault on sending large messages (#803, #796, #802)
-	- Fix segfault on invalid statusbar config (#993, #994)
-	- Fix random memory writes on restoring queries of foreign
-          protocols (#999, #1000)
-	- Make default keybinds deletable (#859, #507)
-	- Fix freeze when resizing Irssi very small (#946)
-	- Compare channels case-insensitively, avoiding confusions
-          with the config file (#857, #856)
-	- Fix DCC GET on Android. By Martin Staron (#844)
-	- Improve rawlog performance (#957)
-	- Fix nick escaping erroneously escaping quotes (#978, #974,
-          #709)
-	- Protect against theme recursion, improve padding
-          performance, limit alignment padding. Credit to Oss-Fuzz
-          (#835, #851, #850, #846, #848)
-	- Fix recursive loop in replaces (#833, GL#23)
-	- Fix headers for compilation of C modules (#939)
-	- Documentation. By Zero King (#814). (#852)
-	- Sync NEWS, docs, scripts (#849, #855)
-	- Build system (#868, #867, #985, #988)
-	- Fix build on IBM i and AIX. By Calvin Buckley (#975)
-	- Misc fixes (#840, #839, #843, #953, #962). Tests (#806,
-          #875, #905, #964, #1011). Fuzzing (#929).
-
-v1.1.2 2019-01-09  The Irssi team <staff@irssi.org>
-	- Fix the resetting of window hiddenlevel (#861)
-	- Fix clearing of hidelevel in layout (#951)
-	- Fix accessing unallocated text when checking entry position
-          (#928, #930)
-	- Fix uninitialised memory on empty lines (#873, GL#31, #878,
-          #877, #907, #914)
-	- Fix use-after-free on expiration of hidden lines (#948)
-	- Fix use-after-frees. By Maya Rashish (#919)
-	- Fix out of bounds access in help display when window width
-          is small (#949)
-	- Fix paste_join_multiline (#970, #971)
-	- Correctly check for errno when displaying SSL errors. By
-          Janik Rabe (#895)
-	- Fix wrong signal emission argument count (#965)
-	- Documentation (#920). Sync NEWS, scripts (#849)
-	- Fix Perl detection on MacOS. By Dominyk Tiller (#927)
-	- Misc fixes. By Jaroslav Škarvada (#981, #982)
-
-v1.1.1 2018-02-15  The Irssi team <staff@irssi.org>
-	! Contains all changes from 1.0.7
-	- Restore compatibility with OpenSSL < 1.0.2 (#820, #831)
-	- Fix test compilation on some platforms (#815, #816)
-	- Fix portability and backwards compatibility of test runner
-          (#818, #845)
-
-v1.0.7 2018-02-15  The Irssi team <staff@irssi.org>
-	- Prevent use after free error during the execution of some
-	  commands. Found by Joseph Bisch (GL#17, GL!24).
-	- Revert netsplit print optimisation due to crashes (#465, #809,
-          #812, #819, #824, #832).
-	- Fix use after free when SASL messages are received in
-          unexpected order (GL#26, GL!33).
-	- Fix null pointer dereference in the tab completion when an
-          empty nick is joined (GL#24, GL!31).
-	- Fix use after free when entering oper password (GL#22,
-          GL!32).
-	- Fix null pointer dereference when too many windows are
-          opened (GL#27, #837).
-	- Fix out of bounds access in theme strings when the last
-          escape is incomplete. Credit to Oss-Fuzz (#842).
-	- Fix out of bounds write when using negative counts on window
-          resize (GL#25, GL#29, #836).
-	- Minor help correction. By William Jackson (#834).
-
-v1.1.0 2018-01-15  The Irssi team <staff@irssi.org>
-	! Warning. Irssi is broken and will crash with OpenSSL < 1.0.2
-          due to openssl/openssl commit
-          5b4b9ce976fce09a7a92e2f25b91a1635cb840fe
-	* Colour is now re-set when reaching a comma, matching mIRC
-	  behaviour (#742, #740, #790)
-	* Irssi now shows the initial nick and name on first start
-	  (#785, #786)
-	* lynx is no longer required to run autogen.sh (#81, #781)
-	* The command history no longer permits wrapping around (#686)
-	* /foreach now correctly sends arguments as commands, stopping
-	  you from embarassing AMSGs (#659)
-	* /server does not connect to servers anymore, use /server
-	  connect to change servers (#559, #649).
-	* The net_ip_compare API function is now deprecated, and the
-          previously deprecated net_connect has been removed. By Will
-          Storey (#770).
-	+ Add an option to ignore all channels or ignore all queries
-	  using /set activity_hide_targets. By Jari Matilainen (#612,
-	  #779)
-	+ Add a startup warning if the TERM var is wrong inside
-	  tmux/screen (#726)
-	+ Add option to hide certain levels from the textbuffer using
-	  /window hidelevel (#746, #808)
-	+ Irssi now has its first unit test (for mode parsing). By
-	  Will Storey (#793)
-	+ Added access to global command history when using window
-	  history, and a binding to erase entries from the command
-	  history (erase_history_entry) (#762)
-	+ -alternate_nick is now available as a network specific
-	  property. By Paul Townsend (#120, #771)
-	+ On FreeBSD, Irssi now supports Capsicum sandbox (/capsicum
-	  enter). By Edward Tomasz Napierala (#735, #755, #772)
-	+ Filenames (directories) ending with a / now tab-complete
-	  (#741)
-	+ UTF-8 should now work in regular expressions when using
-	  GRegex (the default) (#636, #653)
-	+ Nicks are now properly escaped on completion. By Oscar
-	  Linderholm (#693, #709)
-	+ /server add -port <num> now works. By Jari Matilainen (#703)
-	+ Add a setting key_timeout to make key sequences
-	  automatically re-set when not finished (#644, #645)
-	+ Warn users about expired client certificates, as servers may
-	  refuse them (#211, #627)
-	+ Add a new net_start_ssl function for StartTLS. This is
-	  available from ABI 8 and can be used by protocol modules
-	  (#615, #622).
-	+ The %# code is now stored in the textbuffer, so for example
-	  web scripts can make use of it (#626)
-	+ Add new setting break_wide which can be used to enable
-	  breaking of wide characters (for east-asian
-	  users). Originally from FreeBSD ports. (#625)
-	+ Add fuzzing code (#610, #620, #701, #713)
-	- Netsplits show properly again (#812)
-	- Do not error on blank lines when using /exec -o. By Fabian
-	  Kurz (FS#902, #805)
-	- Detect used nickname as reported by server. By Alexandre
-	  Morignot (#219, #804)
-	- Prevent use after free error during the execution of some
-	  commands. Found by Joseph Bisch. (GL#17, GL!24)
-	- Fix MODE parameter parsing when colon was used at a place
-	  Irssi didn't expect (#601, #766)
-	- Fixed code to compile with
-	  -Werror=declaration-after-statement (#795)
-	- Clang-format is now supported for git-clang-format (#784)
-	- Fix use after free when changing the network of
-	  hilights. Reported by Rui Mathias. (#787, #788)
-	- Fix positioning error when tab-completing non-ascii
-	  strings. (#752, #754)
-	- In-development issues (#750, #751)
-	- Clarify Alis in /help list (#699, #712)
-	- Improve /lastlog performance from O(N^2) to O(N) (#715)
-	- Fix a segfault on "script destroyed" signal. By Stephen
-	  Oberholtzer (#660, #661).
-	- Fix early ISON error (#596, #647)
-	- Documentation improvements. By Paolo Martini (#639).
-	  By Tristan Pepin (#731).  By Paul Townsend (#684, #736).
-	  By Will Storey (#777)
-	- Minor cleanups (#590). By Edward Tomasz Napierala (#734,
-	  #738)
-	- Fix space issue in glib-2.0.m4 (#621)
-
-v1.0.6 2018-01-07  The Irssi team <staff@irssi.org>
-	! Note: Code and aliases using `$($'-like constructs are no
-          longer supported due to issue GL#18. Sorry about the
-          inconvenience.
-	- Fix invalid memory access when reading hilight configuration
-          (#787, #788).
-	- Fix null pointer dereference when the channel topic is set
-          without specifying a sender (GL#20, GL!25).
-	- Fix return of random memory when using incomplete escape
-          codes (GL#21, GL!26).
-	- Fix heap buffer overflow when completing certain strings
-          (GL#19, GL!27).
-	- Fix return of random memory when using an incomplete
-          variable argument (GL#18, GL!28).
-
-v1.0.5 2017-10-23  The Irssi team <staff@irssi.org>
-	- Fix missing -sasl_method '' in /NETWORK (#718, #719).
-	- Fix incorrect restoration of term state when hitting SUSP
-          inside screen (#737, #733).
-	- Fix out of bounds read when compressing colour
-          sequences. Found by Hanno Böck (GL#12, GL!18).
-	- Fix use after free condition during a race condition when
-          waiting on channel sync during a rejoin (GL#13, GL!19).
-	- Fix null pointer dereference when parsing certain malformed
-          CTCP DCC messages (GL#14, GL!20).
-	- Fix crash due to null pointer dereference when failing to
-          split messages due to overlong nick or target (GL#15, GL!21).
-	- Fix out of bounds read when trying to skip a safe channel ID
-          without verifying that the ID is long enough (GL#16, GL!22).
-	- Fix return of random memory when inet_ntop failed (#769).
-	- Minor statusbar help update. By Robert Bisewski (#758,
-          #763).
-
-v1.0.4 2017-07-07  The Irssi team <staff@irssi.org>
-	- Fix null pointer dereference when parsing invalid timestamp (GL#10,
-	  GL!15). Reported by Brian 'geeknik' Carpenter.
-	- Fix use-after-free condition when removing nicks from the internal
-	  nicklist (GL#11, GL!16). Reported by Brian 'geeknik' Carpenter.
-	- Fix incorrect string comparison in DCC file names (#714).
-	- Fix regression in Irssi 1.0.3 where it would claim "Invalid time '-1'"
-	  (#716, #722).
-	- Fix a bug when using \n to separate lines with expand_escapes (#723).
-	- Retain screen output on improper exit, to better see any error
-	  messages (#287, #721).
-	- Minor help update (#729).
-
-v1.0.3 2017-06-06  The Irssi team <staff@irssi.org>
-	! Regression info in 1.0.3: #716 Warnings on start up: invalid time '-1'
-	- Fix out of bounds read when scanning expandos (GL!11).
-	- Fix invalid memory access with quoted filenames in DCC
-	  (GL#8, GL!12).
-	- Fix null-pointer dereference on DCC without address (GL#9, GL!13).
-	- Improve integer overflow handling. Originally reported by
-          oss-fuzz#525 (#706).
-	- Improve nicklist performance from O(N^2) to O(N) (#705).
-	- Fix initial screen redraw delay. By Stephen Oberholtzer
-	  (#680, bdo#856201).
-	- Fix incorrect reset of true colours when resetting background. (#711).
-	- Fix missing -notls option in /SERVER. By Jari Matilainen (#117, #702).
-	- Fix minor history glitch on overcounter (#462, #685).
-	- Improved OpenSSL detection at compile time. By Rodrigo Rebello (#677).
-	- Improved NetBSD Terminfo detection. By Maya Rashish (#694, #698).
-	- Add missing syntax info for COMPLETION (#687, #688).
-	- Minor typo correction in help. By Michael Hansen (#707).
-
-v1.0.2 2017-03-10  The Irssi team <staff@irssi.org>
-	! Warning. Irssi is broken on GLib 2.46 (bgo#755496)
-	- Prevent some null-pointer crashes (GL!9).
-	- Fix compilation with OpenSSL 1.1.0 (#628, #597).
-	- Correct dereferencing of already freed server objects during
-	  output of netjoins. Found by APic (GL!10, GL#7).
-	- Fix in command arg parser to detect missing arguments in tail place
-	  (#652, #651).
-	- Fix regression that broke incoming DCC file transfers (#667, #656).
-	- Fix issue with escaping \ in evaluated strings (#669, #520).
-
-v1.0.1 2017-02-03  The Irssi team <staff@irssi.org>
-	- Fix Perl compilation in object dir. By Martijn Dekker (#602, #623).
-	- Disable EC cryptography on Solaris to fix build (#604, #598).
-	- Fix incorrect HELP SERVER example (#606, #519).
-	- Correct memory leak in /OP and /VOICE. By Tim Konick (#608).
-	- Fix regression that broke second level completion (#613, #609).
-	- Correct missing NULL termination in perl_parse. By Hanno Böck (#619).
-	- Sync broken mail.pl script (#624, #607).
-	- Prevent a memory leak during the processing of the SASL
-	  response (GL!8, GL#5)
-
-v1.0.0 2017-01-03  The Irssi team <staff@irssi.org>
-	* Removed --disable-ipv6 (#408).
+v0.8.21-head 2016-xx-xx  The Irssi team <staff@irssi.org>
+	* Removed --disable-ipv6
 	* /connect Network now aborts with an error if no servers have been
-	  added to that network (#443).
+	  added to that network.
 	* /dcc commands now use quotes around spaces consistently.
-	* bell_beeps was removed (#524, #565).
-	* Switch to GRegex instead of regex.h (#412).
-	+ irssiproxy can now forward all tags through a single
-	  port. By Lukas Mai (mauke, #425).
-	+ irssiproxy can also listen on unix sockets. By Lukas Mai (#427).
-	+ send channel -botcmds immediately when no mask is specified (#175, #399).
+	+ irssiproxy can now forward all tags through a single port.
+	+ irssiproxy can also listen on unix sockets.
+	+ send channel -botcmds immediately when no mask is specified (#175).
 	+ the kill buffer now remembers consecutive kills.
 	  New bindings were added: yank_next_cutbuffer and append_next_kill
-	  By Todd A. Pratt (#353, #414, #455)
 	+ connections will avoid looking up IPv6 addresses if the machine does
 	  not have an IPv6 address assigned (exact behaviour is implementation
-	  defined, #410).
+	  defined).
 	+ Fix potential crash if scripts insert undef values into the completion
-	  list (#413).
-	+ Paste warning is now also shown on pasting overlong
-	  lines. By Manish Goregaokar (#426).
+	  list.
+	+ Paste warning is now also shown on pasting overlong lines.
 	+ autolog_ignore_targets and activity_hide_targets learn a new syntax
 	      tag/* and * to ignore whole networks or everything.
-	  By Jari Matilainen (vague666, #437)
-	+ /hilight got a -matchcase flag to hilight case
-	  sensitively. By Thibault B (isundil, #421, #476).
+	+ /hilight got a -matchcase flag to hilight case sensitively (#421).
 	+ Always build irssi with TLS support.
 	+ Rename SSL to TLS in the code and add -tls_* versions of the -ssl_*
 	  options to /CONNECT and /SERVER, but make sure the -ssl_* options continue
@@ -739,16 +32,16 @@ v1.0.0 2017-01-03  The Irssi team <staff@irssi.org>
 	  values like this: Start by downloading the certificate from a given IRC
 	  server:
 
-	      $ openssl s_client -connect irc.example.net:6697 < /dev/null 2>/dev/null | \
-	        openssl x509 > example.cert
+	      $ openssl s_client -connect chat.freenode.net:6697 < /dev/null 2>/dev/null | \
+	        openssl x509 > freenode.cert
 
 	  Find the value for -tls_pinned_cert:
 
-	      $ openssl x509 -in example.cert -fingerprint -sha256 -noout
+	      $ openssl x509 -in freenode.cert -fingerprint -sha256 -noout
 
 	  Find the value for -tls_pinned_pubkey:
 
-	      $ openssl x509 -in example.cert -pubkey -noout | \
+	      $ openssl x509 -in freenode.cert -pubkey -noout | \
 	        openssl pkey -pubin -outform der | \
 	        openssl dgst -sha256 -c | \
 	        tr a-z A-Z
@@ -761,87 +54,45 @@ v1.0.0 2017-01-03  The Irssi team <staff@irssi.org>
 	  does not rely on the libval library. It is causing a lot of troubles for
 	  our downstream maintainers.
 
-	+ /names and $[...] now uses utf8 string operations. By Xavier
-          G. (#40, #411, #471, #480).
-	+ New setting completion_nicks_match_case (#488).
-	+ /channel /server /network now support modify subcommand. By
-	  Jari Matilainen (#338, #498).
-	+ Irssi::signal_remove now works with coderefs. By Tom Feist (shabble, #512).
-	+ /script reset got an -autorun switch (#540, #538).
-	+ cap_toggle can now be called from Perl, and fields
-	  cap_active and cap_supported can be inspected (#542).
-	+ Make it possible to disable empty line completion. By Lauri
-	  Tirkkonen (lotheac, #574).
-	+ New option sasl_disconnect_on_failure to disconnect when
-	  SASL log-in failed (#514).
 	- IP addresses are no longer stored when resolve_reverse_lookup is
 	  used.
-	- Removed broken support for curses (#521).
-	- Removed broken dummy mode (#526).
-	- Fix terminal state after suspend (#450, #452).
-	- Improve Perl library path detection (#479, #132).
-	- Reconnect now works on unix connections (#493).
-	- Fix completion warnings (#125, #496, FS#124).
-	- Fix a crash in the --more-- item (#501).
-	- Fix a display issue in /unignore (#517, bdo#577202).
-	- Fix a crash in some netsplits (#529, #500).
-	- Fix crashes with some invalid config (#550, #551, #563, #564, #587, #581, #570).
-	- Add support for SASL Fragmentation. By Kenny Root (kruton, #506).
-	- Improve netsplit dumping (#420, #465).
-	- Improve responsibility under DCC I/O strain (#578, #159).
-	- Fix query nick change on open (#580, #586).
-	- Correct a few help texts.
-
-v0.8.21 2017-01-03  The Irssi team <staff@irssi.org>
-	- Correct a NULL pointer dereference in the nickcmp function found by
-	  Joseph Bisch (GL#1)
-	- Correct an out of bounds read in certain incomplete control codes
-	  found by Joseph Bisch (GL#2)
-	- Correct an out of bounds read in certain incomplete character
-	  sequences found by Hanno Böck and independently by J. Bisch (GL#3)
-	- Correct an error when receiving invalid nick message (GL#4, #466)
+	- /names and $[...] now uses utf8 string operations (#40, #411).
+	- Removed broken support for curses.
 
 v0.8.20 2016-09-16  The Irssi team <staff@irssi.org>
 	- Correct the name of an emitted sasl signal (#484)
 	- Correct the prototype for the 'message private' signal (#515)
 	- Corrections in away and hilight help text (#477, #518)
-	- /squery and /servlist commands have been restored (#461).
+	- /squery and /servlist commands have been restored.
 	- Where Irssi would previously only report "System error" on connect,
-	  it will now try harder to retrieve the system error message (#467).
+	  it will now try harder to retrieve the system error message.
 	- Fixed issue with +channels not working properly (#533)
-	- Fixed crash in optchan when item has no server (#485, bdo#826525)
+	- Fixed crash in optchan when item has no server (#485)
 	- Fixed random remote crash in the nicklist handling (#529)
 	- Fixed remote crash due to incorrect bounds checking on
 	  formats, reported by Gabriel Campana and Adrien Guinet from
 	  Quarkslab.
 
 v0.8.19 2016-03-23  The Irssi team <staff@irssi.org>
-	! If your cursor keys stopped working, try this first: `/bind
-          meta-O key meta2'
 	- Fixed regression when joining and parting channels on IRCnet (#435)
-	- Fixed SASL EXTERNAL. By Mantas Mikulėnas (grawity, #432)
+	- Fixed SASL EXTERNAL (#432)
 	- Fixed regression when not using SASL (#438)
-	- Fixed incorrect SSL disconnects when using SSL from modules/scripts.
-	  By Will Storey (horgh, #439)
+	- Fixed incorrect SSL disconnects when using SSL from modules/scripts
+	  (#439)
 	- Fixed regression where proxy_string could not be configured or
-	  certain file transfers could not be accepted (#445, #446)
-	- Fixed storing layout of !channels (#183, #405)
-	- Fixed restoration of bracketed paste mode on quit (#449, #457)
+	  certain file transfers could not be accepted (#445)
+	- Fixed storing layout of !channels (#183)
+	- Fixed restoration of bracketed paste mode on quit (#449)
 	- Make the usage of meta-O for cursor keys configurable with
 	      /set term_appkey_mode off
-	  (#430, #459)
 
 v0.8.18 2016-02-13  The Irssi team <staff@irssi.org>
 	* Modules will now require to define a
-
 	      void MODULENAME ## _abicheck(int *version)
-
 	  method to ensure that they are compiled against the correct Irssi
 	  version.
 	* The signature of "message private" has been changed to
-
 	      5: server, message, nick, address, target
-
 	  in order to support "self messages". Module authors should
 	  implement this change if they are using this signal.
 	* Removing networks will now remove all attached servers and channels
@@ -854,14 +105,12 @@ v0.8.18 2016-02-13  The Irssi team <staff@irssi.org>
 	  effect for anyone given that it has been unsupported for several years.
 	+ CAP SASL PLAIN login is now supported natively.
 	+ Paste bracket markers can be requested from terminal with
-
 	      /set paste_use_bracketed_mode on
-
 	+ "Self messages" generated by some bouncers can now be received in the
 	  proper window.
 	+ Try to split long lines on spaces to avoid words being splitted. Adds
-	  a new option: `split_line_on_space' which defaults to on.
-	+ Add setting `hilight_nick_matches_everywhere' (#56).
+	  a new option: 'split_line_on_space' which defaults to on.
+	+ Add setting hilight_nick_matches_everywhere (#56).
 	+ The config parser is more robust and prints out better diagnostics on
 	  incorrect config files.
 	+ Ctrl+^ (FS#721) and Ctrl+J can now be bound.

README.md

@@ -1,74 +1,109 @@
-# [Irssi](https://irssi.org)
+# Irssi
 
-![Build Status](https://github.com/irssi/irssi/workflows/Check%20Irssi/badge.svg?branch=master)
+[![Build Status](https://travis-ci.org/irssi/irssi.svg?branch=master)](https://travis-ci.org/irssi/irssi)
 
-Irssi is a modular text mode chat client. It comes with IRC support
-built in, and there are third party
-[ICB](https://github.com/jperkin/irssi-icb),
+Irssi is a modular chat client that is most commonly known for its
+text mode user interface, but 80% of the code isn't text mode
+specific. We have a working but currently unmaintained GTK2 frontend
+called xirssi. Irssi comes with IRC support built in, and there are
+third party [ICB](https://github.com/jperkin/irssi-icb),
 [SILC](http://www.silcnet.org/),
 [XMPP](http://cybione.org/~irssi-xmpp/) (Jabber),
-[PSYC](http://about.psyc.eu/Irssyc) and
+[PSYC](https://github.com/electric-blue/irssyc) and
 [Quassel](https://github.com/phhusson/quassel-irssi) protocol modules
 available.
 
-![irssi](https://user-images.githubusercontent.com/5665186/32180643-cf127f60-bd92-11e7-8aa2-882313ce1d8e.png)
+## Installation
 
-## [Download information](https://irssi.org/download/)
+See the `INSTALL` file.
 
-#### Development source installation
+## Features
 
-[Ninja](https://ninja-build.org/) 1.8 and [Meson](https://mesonbuild.com/) 0.53
+So what's so great about Irssi? Here's a list of some features I can
+think of currently:
 
-```
-git clone https://github.com/irssi/irssi
-cd irssi
-meson Build
-ninja -C Build && sudo ninja -C Build install
-```
+ - **Optional automation** - There's lots of things Irssi does for you
+   automatically that some people like and others just hate. Things like:
+   nick completion, creating new window for newly joined channel, creating
+   queries when msgs/notices are received or when you send a msg, closing
+   queries when it's been idle for some time, etc.
 
-#### Release source installation
+ - **Multiserver friendy** - I think Irssi has clearly the best support
+   for handling multiple server connections. You can have as many as you
+   want in as many ircnets as you want. Having several connections in one
+   server works too, for example when you hit the (ircnet's) 10
+   channels/connection limit you can just create another connection and
+   you hardly notice it. If connection to server is lost, Irssi tries to
+   connect back until it's successful. Also channels you were joined
+   before disconnection are restored, even if they're "temporarily
+   unavailable" because of netsplits, Irssi keeps rejoining back to them.
+   Also worth noticing - there's not that stupid "server is bound to this
+   window, if this window gets closed the connection closes" thing that
+   ircII based clients have.
 
-* Download [release](https://github.com/irssi/irssi/releases)
-* Verify signature
-```
-tar xJf irssi-*.tar.xz
-cd irssi-*
-meson Build
-ninja -C Build && sudo ninja -C Build install
-```
+ - **Channel automation** - You can specify what channels to join to
+   immediately after connected to some server or IRC network. After joined
+   to channel, Irssi can automatically request ops for you (or do
+   anything, actually) from channel's bots.
 
-### Requirements
+ - **Window content saving** - Say /LAYOUT SAVE when you've put all the
+   channels and queries to their correct place, and after restarting
+   Irssi, the channels will be joined back into windows where they were
+   saved.
 
-- [glib-2.32](https://wiki.gnome.org/Projects/GLib) or greater
-- [openssl](https://www.openssl.org/)
-- [perl-5.6](https://www.perl.org/) or greater (for perl support)
-- terminfo or ncurses (for text frontend)
+ - **Tab completing anything** - You can complete lots of things with tab:
+   nicks, commands, command -options, file names, settings, text format
+   names, channels and server names. There's also an excellent /msg
+   completion that works transparently with multiple IRC networks.
+   Completing channel nicks is also pretty intelligent, it first goes
+   through the people who have talked to you recently, then the people who
+   have talked to anyone recently and only then it fallbacks to rest of
+   the nicks. You can also complete a set of words you've specified, for
+   example homepage<tab> changes it to your actual home page URL.
 
-#### See the [INSTALL](INSTALL) file for details
+ - **Excellent logging** - You can log any way you want and as easily or
+   hard as you want. With autologging Irssi logs everything to specified
+   directory, one file per channel/nick. ircII style /WINDOW LOG ON is
+   also supported. There's also the "hard way" of logging - /LOG command
+   which lets you specify exactly what you wish to log and where. Log
+   rotating is supported with all the different logging methods, you can
+   specify how often you want it to rotate and what kind of time stamp to
+   use.
 
-## [Documentation](https://irssi.org/documentation/)
+ - **Excellent ignoring** - You can most probably ignore anything any way
+   you want. Nick masks, words, regular expressions. You can add
+   exceptions to ignores. You can ignore other people's replies in
+   channels to nicks you have ignored. You can also specify that the
+   specific ignores work only in specific channel(s).
 
-* [New users guide](https://irssi.org/New-users/)
-* [Questions and Answers](https://irssi.org/documentation/qna/)
-* Check the built-in `/HELP`, it has all the details on command syntax
+ - **Lastlog and scrollback handling** - /LASTLOG command has some new
+   features: -new option checks only lines that came since you last did
+   /LASTLOG command, -away option checks new lines since you last went
+   away. Regular expression matches work also, of course. Going to some
+   wanted place at scrollback has always been hard with non-GUI clients. A
+   search command that jumps around in scrollback in GUI-style is still
+   missing from Irssi, but there's something that's almost as good as it.
+   /LASTLOG always shows timestamps when the line was printed, even if you
+   didn't have timestamps on. Now doing /SB GOTO <timestamp> jumps
+   directly to the position in scrollback you wanted. Great feature when
+   you want to browse a bit of the discussion what happened when someone
+   said your name (as seen in awaylog) or topic was changed (/last
+   -topics)
 
-## [Themes](https://irssi-import.github.io/themes/)
+## Files
 
-## [Scripts](https://scripts.irssi.org/)
+ - The `docs/` directory contains several documents:
+    - `startup-HOWTO.txt` - new users should read this
+    - `manual.txt` - manual I started writing but didn't get it very far :)
+    - `perl.txt` - Perl scripting help
+    - `formats.txt` - How to use colors, etc. with irssi
+    - `faq.txt` - Frequently Asked Questions
+    - `special_vars.txt` - some predefined $variables you can use with irssi
 
-## [Modules](https://irssi.org/modules/)
+## Bugs / Suggestions
 
-## [Security information](https://irssi.org/security/)
+See the `TODO` file, http://bugs.irssi.org and the GitHub issues if it is
+already listed in there; if not, open an issue on GitHub or send a mail to
+[staff@irssi.org](mailto:staff@irssi.org).
 
-Please report security issues to staff@irssi.org. Thanks!
-
-## [Bugs](https://github.com/irssi/irssi/issues) / Suggestions / Contributing
-
-Check the GitHub issues if it is already listed in there; if not, open
-an issue on GitHub or send a mail to [staff@irssi.org](mailto:staff@irssi.org).
-
-Irssi is always looking for developers. Feel free to submit patches through
-GitHub pull requests.
-
-You can also contact the Irssi developers in
-[#irssi](https://irssi.org/support/irc/) on irc.libera.chat.
+You can also contact the Irssi developers in #irssi on freenode.

autogen.sh

@@ -0,0 +1,67 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+PKG_NAME="Irssi"
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+if test ! -f $srcdir/configure.ac; then
+    echo -n "**Error**: Directory \`$srcdir\' does not look like the"
+    echo " top-level $PKG_NAME directory"
+    exit 1
+fi
+
+# create help files
+echo "Creating help files..."
+perl syntax.pl
+
+echo "Creating ChangeLog..."
+git log > $srcdir/ChangeLog
+if test "$?" -ne 0; then
+    echo "**Error**: ${PKG_NAME} Autogen must be run in a git clone, cannot proceed."
+    exit 1
+fi
+
+files=`echo docs/help/in/*.in|sed -e 's,docs/help/in/Makefile.in ,,' -e 's,docs/help/in/,!,g' -e 's/\.in /.in ?/g'`
+cat docs/help/in/Makefile.am.gen|sed "s/@HELPFILES@/$files/g"|sed 's/?/\\?/g'|tr '!?' '\t\n' > docs/help/in/Makefile.am
+
+files=`echo $files|sed 's/\.in//g'`
+cat docs/help/Makefile.am.gen|sed "s/@HELPFILES@/$files/g"|sed 's/?/\\?/g'|tr '!?' '\t\n' > docs/help/Makefile.am
+
+# .html -> .txt with lynx or elinks
+echo "Documentation: html -> txt..."
+if type lynx >/dev/null 2>&1 ; then
+  LC_ALL=en_IE.utf8 lynx -dump docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = "   $_"; };' > docs/faq.txt
+elif type elinks >/dev/null 2>&1 ; then
+  elinks -dump docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = "   $_"; };' > docs/faq.txt
+elif type links >/dev/null 2>&1 ; then
+  links -dump docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = "   $_"; };' > docs/faq.txt
+else
+  echo "**Error**: No lynx or elinks present"
+  exit 1
+fi
+
+if test x$NOCONFIGURE = x && test -z "$*"; then
+  echo "**Warning**: I am going to run \`configure' with no arguments."
+  echo "If you wish to pass any to it, please specify them on the"
+  echo \`$0\'" command line."
+  echo
+fi
+
+rm -f aclocal.m4
+echo "Running autoreconf ..."
+autoreconf -i || exit 1
+
+conf_flags="--enable-maintainer-mode"
+
+if test x$NOCONFIGURE = x; then
+  echo Running $srcdir/configure $conf_flags "$@" ...
+  $srcdir/configure $conf_flags "$@" \
+  && echo Now type \`make\' to compile $PKG_NAME || exit 1
+else
+  echo Skipping configure process.
+fi
+
+# make sure perl hashes have correct length
+find src/perl -name *.c -o -name *.xs | xargs grep -n hv_store | perl -ne 'if (/"(\w+)",\s*(\d+)/) { print unless $2 == length $1 }'

colorless.theme

@@ -251,7 +251,6 @@ abstracts = {
   # default background for all statusbars. You can also give
   # the default foreground color for statusbar items.
   sb_background = "%8";
-  window_border = "%8";
 
   # default backround for "default" statusbar group
   #sb_default_bg = "%8";
@@ -262,8 +261,8 @@ abstracts = {
   # background for topicbar (same default)
   #sb_topic_bg = "%8";
 
-  # text at the beginning of statusbars. "sb" already puts a space there,
-  # so we don't use anything by default.
+  # text at the beginning of statusbars. sb-item already puts
+  # space there,so we don't use anything by default.
   sbstart = "";
   # text at the end of statusbars. Use space so that it's never
   # used for anything.

configure.ac

@@ -0,0 +1,626 @@
+AC_INIT(irssi, 0.8.21-head)
+AC_CONFIG_SRCDIR([src])
+AC_CONFIG_AUX_DIR(build-aux)
+AC_PREREQ(2.50)
+
+AC_CONFIG_HEADERS([irssi-config.h])
+AC_CONFIG_MACRO_DIR([m4])
+AM_INIT_AUTOMAKE([1.9 no-define foreign])
+
+AM_SILENT_RULES([yes])
+
+AM_MAINTAINER_MODE
+
+AC_PROG_CC
+AC_PROG_CPP
+AM_PROG_LIBTOOL
+
+AC_PATH_PROG(sedpath, sed)
+AC_PATH_PROG(perlpath, perl)
+
+AC_CHECK_HEADERS(unistd.h dirent.h sys/ioctl.h sys/resource.h)
+
+# check posix headers..
+AC_CHECK_HEADERS(sys/socket.h sys/time.h sys/utsname.h regex.h)
+
+AC_SYS_LARGEFILE
+
+AC_ARG_WITH(textui,
+[  --without-textui        Build without text frontend],
+	if test x$withval = xno; then
+		want_textui=no
+	else
+		want_textui=yes
+	fi,
+	want_textui=yes)
+
+AC_ARG_WITH(bot,
+[  --with-bot              Build irssi-bot],
+	if test x$withval = xno; then
+		want_irssibot=no
+	else
+		want_irssibot=yes
+	fi,
+	want_irssibot=no)
+
+AC_ARG_WITH(proxy,
+[  --with-proxy            Build irssi-proxy],
+	if test x$withval = xno; then
+		want_irssiproxy=no
+	else
+		want_irssiproxy=yes
+	fi,
+	want_irssiproxy=no)
+
+AC_ARG_WITH(modules,
+[  --with-modules          Specify what modules to build in binary],
+	if test x$withval != xyes -a x$withval != xno; then
+		build_modules="$withval"
+	fi)
+
+if test "x$prefix" != "xNONE"; then
+	prefix=`eval echo $prefix`
+	PERL_MM_PARAMS="INSTALLDIRS=perl INSTALL_BASE=$prefix"
+	perl_set_use_lib=yes
+
+	perl_prefix_note=yes
+fi
+
+AC_ARG_WITH(perl-staticlib,
+[  --with-perl-staticlib   Specify that we want to link perl libraries
+                          statically in irssi, default is no],
+	if test x$withval = xno; then
+		want_staticperllib=no
+	else
+		want_staticperllib=yes
+	fi,
+	want_staticperllib=no)
+
+
+AC_ARG_WITH(perl-lib,
+[  --with-perl-lib=[perl|site|vendor|DIR]  Specify where to install the
+                          Perl libraries for irssi, default is site],
+	if test "x$withval" = xyes; then
+		want_perl=yes
+	elif test "x$withval" = xno; then
+		want_perl=no
+	elif test "x$withval" = xperl; then
+		want_perl=yes
+		perl_prefix_note=no
+		PERL_MM_PARAMS="INSTALLDIRS=perl"
+		perl_set_use_lib=no
+	elif test "x$withval" = xsite; then
+		want_perl=yes
+		perl_prefix_note=no
+		PERL_MM_PARAMS=""
+		perl_set_use_lib=no
+	elif test "x$withval" = xvendor; then
+		want_perl=yes
+		perl_prefix_note=no
+		if test -z "`$perlpath -v|grep '5\.0'`"; then
+			PERL_MM_PARAMS="INSTALLDIRS=vendor"
+		else
+			PERL_MM_PARAMS="INSTALLDIRS=perl PREFIX=`$perlpath -e 'use Config; print $Config{prefix}'`"
+		fi
+		perl_set_use_lib=no
+	else
+		want_perl=yes
+		perl_prefix_note=no
+		PERL_MM_PARAMS="INSTALLDIRS=perl LIB=$withval"
+		perl_set_use_lib=yes
+	fi,
+	want_perl=yes)
+
+AC_ARG_WITH(perl,
+[  --with-perl[=yes|no|module]  Build with Perl support - also specifies
+                          if it should be built into main irssi binary
+                          (static, default) or as module],
+	if test x$withval = xyes; then
+		want_perl=static
+	elif test x$withval = xstatic; then
+		want_perl=static
+	elif test x$withval = xmodule; then
+		want_perl=module
+	else
+		want_perl=no
+	fi,
+	want_perl=static)
+
+AC_ARG_ENABLE(true-color,
+[  --enable-true-color     Build with true color support in terminal],
+	if test x$enableval = xno ; then
+		want_truecolor=no
+	else
+		want_truecolor=yes
+	fi,
+	want_truecolor=no)
+
+dnl **
+dnl ** just some generic stuff...
+dnl **
+
+dnl * OS specific options
+case "$host_os" in
+  hpux*)
+    CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
+    ;;
+  *)
+    ;;
+esac
+
+
+AC_SEARCH_LIBS([socket], [network socket])
+
+AC_SEARCH_LIBS([inet_addr], [nsl])
+
+dnl * gcc specific options
+if test "x$ac_cv_prog_gcc" = "xyes"; then
+  CFLAGS="$CFLAGS -Wall"
+fi
+
+AC_CHECK_TYPE(socklen_t, ,
+	[AC_DEFINE([socklen_t], [int], [Define to 'int' if <sys/socket.h> doesn't define.])], [
+AC_INCLUDES_DEFAULT
+#ifdef HAVE_SYS_SOCKET_H
+#  include <sys/socket.h>
+#endif
+])
+
+AC_CHECK_SIZEOF(int)
+AC_CHECK_SIZEOF(long)
+AC_CHECK_SIZEOF(long long)
+AC_CHECK_SIZEOF(off_t)
+
+if test $ac_cv_sizeof_off_t = 8; then
+  offt_64bit=yes
+else
+  offt_64bit=no
+fi
+
+if test x$ac_cv_sizeof_off_t = x$ac_cv_sizeof_long; then
+  # try to use unsigned long always first
+  AC_DEFINE_UNQUOTED(PRIuUOFF_T, "lu")
+  AC_DEFINE(UOFF_T_LONG)
+elif test x$ac_cv_sizeof_off_t = x$ac_cv_sizeof_int; then
+  # next try int
+  AC_DEFINE_UNQUOTED(PRIuUOFF_T, "u")
+  AC_DEFINE(UOFF_T_INT)
+elif test x$ac_cv_sizeof_off_t = x$ac_cv_sizeof_long_long; then
+  # and finally long long
+  AC_DEFINE_UNQUOTED(PRIuUOFF_T, "llu")
+  AC_DEFINE(UOFF_T_LONG_LONG)
+else
+  AC_ERROR([Couldn't find integer type for off_t])
+fi
+
+
+dnl **
+dnl ** OpenSSL checks
+dnl **
+AC_CHECK_LIB([ssl], [SSL_library_init])
+
+dnl **
+dnl ** fe-text checks
+dnl **
+
+for try in 1 2; do
+  if test $try = 1; then
+    glib_modules=gmodule
+  else
+    echo "*** trying without -lgmodule"
+    glib_modules=
+  fi
+  AM_PATH_GLIB_2_0(2.16.0,,, $glib_modules)
+  if test "$GLIB_LIBS"; then
+    if test $glib_modules = gmodule; then
+      AC_DEFINE(HAVE_GMODULE)
+      have_gmodule=yes
+    fi
+    break
+  fi
+done
+
+if test -z "$GLIB_LIBS"; then
+  echo
+  echo "*** If you don't have GLIB, you can get it from ftp://ftp.gtk.org/pub/glib/"
+  echo "*** We recommend you get the latest stable GLIB 2 version."
+  echo "*** Compile and install it, and make sure pkg-config finds it,"
+  echo "*** by adding the path where the .pc file is located to PKG_CONFIG_PATH"
+  echo -n "*** Or alternatively install your distribution's package"
+  if test -f /etc/debian_version; then
+    echo :
+    echo "*** sudo apt-get install libglib2.0-dev"
+  elif test -f /etc/redhat-release; then
+    echo " (glib2-devel)"
+  else
+    echo .
+  fi
+  echo
+
+  AC_ERROR([GLIB is required to build irssi.])
+fi
+
+LIBS="$LIBS $GLIB_LIBS -lssl -lcrypto"
+
+dnl **
+dnl ** curses checks
+dnl **
+
+if test "x$want_textui" != "xno"; then
+
+	TEXTUI_NO_LIBS="$LIBS"
+	LIBS=
+	AC_SEARCH_LIBS([setupterm], [tinfo ncursesw ncurses], [want_textui=yes], [
+		AC_ERROR(Terminfo not found - install libncurses-dev or ncurses-devel package)
+		want_textui="no, Terminfo not found"
+	])
+
+	TEXTUI_LIBS="$LIBS"
+	AC_SUBST(TEXTUI_LIBS)
+	LIBS="$TEXTUI_NO_LIBS"
+
+fi
+
+dnl **
+dnl ** perl checks
+dnl **
+
+if test "$want_perl" != "no"; then
+	AC_MSG_CHECKING(for working Perl support)
+
+	if test -z "$perlpath"; then
+		perl_check_error="perl binary not found"
+	else
+		PERL_CFLAGS=`$perlpath -MExtUtils::Embed -e ccopts 2>/dev/null`
+	fi
+
+	if test "x$ac_cv_prog_gcc" = "xyes" -a -z "`echo $host_os|grep 'bsd\|linux'`"; then
+		dnl * several systems have Perl compiled with native compiler
+		dnl * but irssi is being compiled with GCC. Here we try to
+		dnl * fix those command line options a bit so GCC won't
+		dnl * complain about them. Normally there's only few options
+		dnl * that we want to keep:
+		dnl * -Ddefine -Uundef -I/path -fopt -mopt
+		PERL_CFLAGS=`echo $PERL_CFLAGS | $perlpath -pe 's/^(.* )?-@<:@^DUIfm@:>@@<:@^ @:>@+/\1/g; s/^(.* )?\+@<:@^ @:>@+/\1/g'`
+
+		PERL_EXTRA_OPTS="CCCDLFLAGS=\"-fPIC\""
+		AC_SUBST(PERL_EXTRA_OPTS)
+	fi
+
+	if test -z "$PERL_CFLAGS"; then
+		if test -n "$perl_check_error"; then
+			perl_check_error="Error getting perl CFLAGS"
+		fi
+		AC_MSG_RESULT([not found, building without Perl])
+		want_perl=no
+	else
+		PERL_LDFLAGS=`$perlpath -MExtUtils::Embed -e ldopts 2>/dev/null`
+
+		dnl * remove all database stuffs
+		dnl * nsl is already in ldflags
+		dnl * libc is of course linked without needing -lc
+		dnl * -rdynamic must not be in LIBADD line
+		for word in -ldb -ldbm -lndbm -lgdbm -lc -rdynamic; do
+		  PERL_LDFLAGS=`echo $PERL_LDFLAGS | $sedpath -e "s/$word //" -e "s/$word$//"`
+		done
+
+		case "$host_os" in
+		  linux*)
+		    PERL_LDFLAGS=`echo $PERL_LDFLAGS | $sedpath -e 's/-lposix //' -e 's/-lposix$//'`
+		    ;;
+		  hpux*)
+		    if test "x$ac_cv_prog_gcc" = "xyes"; then
+		      PERL_CFLAGS=`echo $PERL_CFLAGS | $sedpath -e 's/-Ae //' -e 's/-Ae$//'`
+		      PERL_LDFLAGS=`echo $PERL_LDFLAGS | $sedpath -e 's/-Ae //' -e 's/-Ae$//'`
+		    fi
+		    ;;
+		  *)
+		    ;;
+		esac
+
+		dnl * check that perl's ldflags actually work
+		echo "#include <EXTERN.h>" > conftest.c
+		echo "#include <perl.h>" >> conftest.c
+		echo "int main(){perl_alloc(); return 0;}" >> conftest.c
+		$CC $CFLAGS $PERL_CFLAGS conftest.c -o conftest $LDFLAGS $PERL_LDFLAGS 2> perl.error.tmp > /dev/null
+		if test ! -s conftest -a "x$ignore_perl_errors" = "x"; then
+			perl_check_error="Error linking with perl libraries: $PERL_LDFLAGS: `cat perl.error.tmp`"
+			AC_MSG_RESULT([error linking with perl libraries, building without Perl])
+			want_perl=no
+		fi
+
+		rm -f perl.error.tmp
+	fi
+
+	if test "x$want_perl" != "xno"; then
+		AC_MSG_RESULT(ok)
+
+		if test "x$want_perl" = "xstatic"; then
+			dnl * building with static perl support
+			dnl * all PERL_LDFLAGS linking is done in fe-text
+			PERL_LINK_FLAGS="$PERL_LDFLAGS"
+			PERL_LINK_LIBS="../perl/libperl_core_static.la"
+			PERL_FE_LINK_LIBS="../perl/libfe_perl_static.la"
+			PERL_LDFLAGS=
+			AC_DEFINE(HAVE_STATIC_PERL)
+
+			dnl * build only static library of perl module
+			perl_module_lib=
+			perl_module_fe_lib=
+			perl_static_lib=libperl_core_static.la
+			perl_static_fe_lib=libfe_perl_static.la
+		else
+			dnl * build dynamic library of perl module
+			perl_module_lib=libperl_core.la
+			perl_module_fe_lib=libfe_perl.la
+			perl_static_lib=
+			perl_static_fe_lib=
+		fi
+
+		if test "x$want_staticperllib" = "xyes"; then
+			PERL_MM_PARAMS="$PERL_MM_PARAMS LINKTYPE=static"
+			PERL_LINK_LIBS="$PERL_LINK_LIBS ../perl/common/blib/arch/auto/Irssi/Irssi.a ../perl/irc/blib/arch/auto/Irssi/Irc/Irc.a ../perl/ui/blib/arch/auto/Irssi/UI/UI.a ../perl/textui/blib/arch/auto/Irssi/TextUI/TextUI.a"
+			PERL_STATIC_LIBS=1
+		else
+			PERL_STATIC_LIBS=0
+		fi
+
+		# remove any prefix from PERL_MM_OPT
+		PERL_MM_OPT=`perl -MText::ParseWords -e 'sub qu{$_=shift;s{^(.*?)=(.*)$}{($a,$b)=($1,$2);$b=~s/"/\\\\"/g;qq{$a="$b"}}ge if /@<:@\s"@:>@/;$_} local $,=" "; print map qu($_), grep !/^(INSTALL_BASE|PREFIX)=/, shellwords(@ARGV)' "$PERL_MM_OPT"`
+		# figure out the correct @INC path - we'll need to do this
+		# through MakeMaker since it's difficult to get it right
+		# otherwise.
+		$perlpath -MExtUtils::MakeMaker -e 'WriteMakefile(NAME => "test", MAKEFILE => "Makefile.test", FIRST_MAKEFILE => "/dev/null", NO_META => 1, NO_MYMETA => 1);' $PERL_MM_PARAMS >/dev/null
+		echo 'show-INSTALLDIRS:' >> Makefile.test
+		echo '	@echo $(INSTALLDIRS)' >> Makefile.test
+		perl_INSTALLDIRS=`$am_make -s -f Makefile.test show-INSTALLDIRS`
+		if test "x$perl_INSTALLDIRS" = "xsite"; then
+			perl_library_dir="site default"
+			perl_INSTALL_VAR=INSTALLSITEARCH
+		elif test "x$perl_INSTALLDIRS" = "xvendor"; then
+			perl_library_dir="vendor default"
+			perl_INSTALL_VAR=INSTALLVENDORARCH
+		else
+			perl_library_dir="module default"
+			perl_INSTALL_VAR=INSTALLARCHLIB
+		fi
+		echo 'show-ARCHLIB:' >> Makefile.test
+		echo '	@echo $('"$perl_INSTALL_VAR"')' >> Makefile.test
+		perl_use_lib=`$am_make -s -f Makefile.test show-ARCHLIB`
+		rm -f Makefile.test
+		if test "x$perl_set_use_lib" = "xyes"; then
+			if $perlpath -e 'exit ! grep $_ eq $ARGV@<:@0@:>@, grep /^\//, @INC' "$perl_use_lib"; then
+				perl_library_dir="other path in @INC"
+				perl_set_use_lib=no
+			else
+				perl_library_dir="prepends to @INC with /set perl_use_lib"
+				PERL_USE_LIB="$perl_use_lib"
+			fi
+		fi
+
+		AC_SUBST(perl_module_lib)
+		AC_SUBST(perl_static_lib)
+		AC_SUBST(perl_module_fe_lib)
+		AC_SUBST(perl_static_fe_lib)
+
+		AC_SUBST(PERL_LINK_FLAGS)
+		AC_SUBST(PERL_LINK_LIBS)
+		AC_SUBST(PERL_FE_LINK_LIBS)
+
+		AC_SUBST(PERL_LDFLAGS)
+		AC_SUBST(PERL_CFLAGS)
+
+		AC_SUBST(PERL_USE_LIB)
+		AC_SUBST(PERL_MM_OPT)
+		AC_SUBST(PERL_MM_PARAMS)
+		AC_SUBST(PERL_STATIC_LIBS)
+	fi
+fi
+
+dnl ** check what we want to build
+AM_CONDITIONAL(BUILD_TEXTUI, test "$want_textui" = "yes")
+AM_CONDITIONAL(BUILD_IRSSIBOT, test "$want_irssibot" = "yes")
+AM_CONDITIONAL(BUILD_IRSSIPROXY, test "$want_irssiproxy" = "yes")
+AM_CONDITIONAL(HAVE_PERL, test "$want_perl" != "no")
+
+# move LIBS to PROG_LIBS so they're not tried to be used when linking eg. perl libraries
+PROG_LIBS=$LIBS
+LIBS=
+AC_SUBST(PROG_LIBS)
+
+dnl **
+dnl ** Keep all the libraries here so each frontend doesn't need to
+dnl ** keep track of them all
+dnl **
+dnl ** (these could be made configurable)
+
+CHAT_MODULES="irc"
+irc_MODULES="dcc flood notifylist"
+if test -n "$build_modules"; then
+	irc_MODULES="$irc_MODULES $build_modules"
+fi
+
+dnl ****************************************
+
+AC_SUBST(CHAT_MODULES)
+AC_SUBST(irc_MODULES)
+
+CORE_LIBS="../core/libcore.a ../lib-config/libirssi_config.a"
+FE_COMMON_LIBS=""
+
+CHAT_LIBS=""
+for c in $CHAT_MODULES; do
+	module_inits=""
+	module_deinits=""
+	fe_module_inits=""
+	fe_module_deinits=""
+	CHAT_LIBS="$CHAT_LIBS ../$c/lib$c.a ../$c/core/lib${c}_core.a"
+	if test -f $srcdir/src/fe-common/$c/module.h; then
+		FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/$c/libfe_common_$c.a "
+	fi
+	for s in `eval echo \\$${c}_MODULES`; do
+		CHAT_LIBS="$CHAT_LIBS ../$c/$s/lib${c}_$s.a"
+		module_inits="$module_inits ${c}_${s}_init();"
+		module_deinits="${c}_${s}_deinit(); $module_deinits"
+		if test -f $srcdir/src/fe-common/$c/$s/module.h; then
+			FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/$c/$s/libfe_${c}_$s.a "
+			fe_module_inits="$fe_module_inits fe_${c}_${s}_init();"
+			fe_module_deinits="fe_${c}_${s}_deinit(); $fe_module_deinits"
+		fi
+	done
+
+	mkdir -p src/$c
+	file="src/$c/$c.c"
+	echo "/* this file is automatically generated by configure - don't change */" > $file
+	echo "void ${c}_core_init(void); void ${c}_core_deinit(void);" >> $file
+	if test -n "$module_inits"; then
+		echo "$module_inits" | $sedpath -e 's/()/(void)/g' -e 's/ /void /g' >> $file
+		echo "$module_deinits" | $sedpath -e 's/ *$//' -e 's/()/(void)/g' -e 's/ /void /g' -e 's/^/void /' >> $file
+	fi
+	echo "void ${c}_init(void) { ${c}_core_init(); $module_inits }" >> $file
+	echo "void ${c}_deinit(void) { $module_deinits ${c}_core_deinit(); }" >> $file
+
+	if test -f $srcdir/src/fe-common/$c/module.h; then
+		mkdir -p src/fe-common/$c
+		file="src/fe-common/$c/${c}-modules.c"
+		echo "/* this file is automatically generated by configure - don't change */" > $file
+		if test -n "$fe_module_inits"; then
+			echo "$fe_module_inits" | $sedpath -e 's/()/(void)/g' -e 's/ /void /g' >> $file
+			echo "$fe_module_deinits" | $sedpath -e 's/ *$//' -e 's/()/(void)/g' -e 's/ /void /g' -e 's/^/void /' >> $file
+		fi
+		echo "void fe_${c}_modules_init(void) { $fe_module_inits }" >> $file
+		echo "void fe_${c}_modules_deinit(void) { $fe_module_deinits }" >> $file
+	fi
+done
+
+FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/core/libfe_common_core.a"
+
+dnl ** common libraries needed by frontends
+COMMON_NOUI_LIBS="$CHAT_LIBS $CORE_LIBS"
+COMMON_LIBS="$FE_COMMON_LIBS $COMMON_NOUI_LIBS"
+AC_SUBST(COMMON_NOUI_LIBS)
+AC_SUBST(COMMON_LIBS)
+
+if test "x$want_truecolor" = "xyes"; then
+	AC_DEFINE([TERM_TRUECOLOR], [], [true color support in terminal])
+else
+	want_truecolor=no
+fi
+
+AH_TEMPLATE(HAVE_GMODULE)
+AH_TEMPLATE(HAVE_SOCKS_H, [misc..])
+AH_TEMPLATE(HAVE_STATIC_PERL)
+AH_TEMPLATE(PRIuUOFF_T, [printf()-format for uoff_t, eg. "u" or "lu" or "llu"])
+AH_TEMPLATE(UOFF_T_INT, [What type should be used for uoff_t])
+AH_TEMPLATE(UOFF_T_LONG)
+AH_TEMPLATE(UOFF_T_LONG_LONG)
+
+AC_CONFIG_FILES([
+Makefile
+src/Makefile
+src/core/Makefile
+src/irc/Makefile
+src/irc/core/Makefile
+src/irc/dcc/Makefile
+src/irc/notifylist/Makefile
+src/irc/proxy/Makefile
+src/irc/flood/Makefile
+src/fe-common/Makefile
+src/fe-common/core/Makefile
+src/fe-common/irc/Makefile
+src/fe-common/irc/dcc/Makefile
+src/fe-common/irc/notifylist/Makefile
+src/fe-none/Makefile
+src/fe-text/Makefile
+src/lib-config/Makefile
+src/perl/Makefile
+src/perl/common/Makefile.PL
+src/perl/irc/Makefile.PL
+src/perl/ui/Makefile.PL
+src/perl/textui/Makefile.PL
+scripts/Makefile
+scripts/examples/Makefile
+docs/Makefile
+docs/help/Makefile
+docs/help/in/Makefile
+irssi-config
+])
+
+AC_OUTPUT
+
+dnl ** for building from objdir
+old_dir=`pwd` && cd $srcdir && whole_dir=`pwd` && cd $old_dir
+if test "x$old_dir" != "x$whole_dir"; then
+	$LN_S $srcdir/irssi-version.h irssi-version.h
+	if test "x$want_perl" != "xno"; then
+		subdirfiles=""
+		for i in $whole_dir/src/perl/common $whole_dir/src/perl/irc $whole_dir/src/perl/ui $whole_dir/src/perl/textui; do
+			subdirfiles=`echo $subdirfiles $i/typemap $i/module.h $i/*.pm $i/*.xs`
+		done
+		for file in $whole_dir/src/perl/module.h $subdirfiles; do
+			link=`echo $file|$sedpath "s?$whole_dir/??"`
+			rm -f $link
+			$LN_S $file $link
+		done
+	fi
+fi
+
+echo
+
+echo "Building text frontend ........... : $want_textui"
+echo "Building irssi bot ............... : $want_irssibot"
+echo "Building irssi proxy ............. : $want_irssiproxy"
+if test "x$have_gmodule" = "xyes"; then
+	echo "Building with module support ..... : yes"
+else
+	echo "Building with module support : NO!! /LOAD will not work!"
+	echo " - You're missing gmodule (comes with glib) for some reason,"
+	echo "   or it doesn't work in your system."
+fi
+
+if test "x$want_perl" = "xstatic"; then
+	echo "Building with Perl support ....... : static (in irssi binary)"
+elif test "x$want_perl" = "xmodule"; then
+	echo "Building with Perl support ....... : module"
+else
+	if test -z "$perl_check_error"; then
+		echo "Building with Perl support ....... : no"
+	else
+		echo "Building with Perl support ....... : NO!"
+		echo " - $perl_check_error"
+                if test -f /etc/debian_version; then
+                  echo " - Try: sudo apt-get install libperl-dev"
+                elif test -f /etc/redhat-release; then
+                  echo " - Try installing perl-devel"
+                fi
+	fi
+fi
+
+if test "x$want_perl" != "xno" -a "x$perl_mod_error" != "x"; then
+	echo " - NOTE: Perl support will be compiled statically to irssi, not as"
+	echo "   a module as requested. Reason:"
+	echo "   $perl_mod_error"
+
+	if test -f /etc/debian_version; then
+		echo " - Try: sudo apt-get install libperl-dev"
+	fi
+fi
+
+if test "x$want_perl" != "xno"; then
+	echo "Perl library directory ........... : ($perl_library_dir - $perl_use_lib)"
+	if test "x$perl_prefix_note" = "xyes"; then
+		echo "  - NOTE: This was automatically set to the same directory you gave with"
+		echo "  --prefix. If you want the perl libraries to install to their 'correct'"
+		echo "  path, you'll need to give --with-perl-lib=site option to configure."
+		echo "  Anyway, installing perl to this directory should work just as well."
+	fi
+fi
+echo "Install prefix ................... : $prefix"
+
+echo
+
+echo "Building with 64bit DCC support .. : $offt_64bit"
+echo "Building with true color support.. : $want_truecolor"
+
+echo
+echo "If there are any problems, read the INSTALL file."

default.theme

@@ -202,7 +202,6 @@ abstracts = {
   # notices
   ownnotice = "[%r$0%K(%R$1-%K)]%n ";
   notice = "%K-%M$*%K-%n ";
-  pubnotice = "%K-%M$0$1-%K-%n %|";
   pubnotice_channel = "%K:%m$*";
   pvtnotice_host = "%K(%m$*%K)";
   servernotice = "%g!$*%n ";
@@ -252,7 +251,6 @@ abstracts = {
   # default background for all statusbars. You can also give
   # the default foreground color for statusbar items.
   sb_background = "%4%w";
-  window_border = "%4%w";
 
   # default backround for "default" statusbar group
   #sb_default_bg = "%4";
@@ -263,8 +261,8 @@ abstracts = {
   # background for topicbar (same default)
   #sb_topic_bg = "%4";
 
-  # text at the beginning of statusbars. "sb" already puts a space there,
-  # so we don't use anything by default.
+  # text at the beginning of statusbars. sb-item already puts
+  # space there,so we don't use anything by default.
   sbstart = "";
   # text at the end of statusbars. Use space so that it's never
   # used for anything.

docs/Makefile.am

@@ -0,0 +1,17 @@
+man_MANS = \
+	irssi.1
+
+doc_DATA = \
+	design.txt \
+	formats.txt \
+	manual.txt \
+	faq.html \
+	faq.txt \
+	perl.txt \
+	signals.txt \
+	special_vars.txt \
+	startup-HOWTO.html
+
+EXTRA_DIST = $(doc_DATA) $(man_MANS)
+
+SUBDIRS = help

docs/capsicum.txt

@@ -1,31 +0,0 @@
-Capsicum is a lightweight OS capability and sandbox framework provided
-by FreeBSD.  When built with Capsicum support - which is the default under
-FreeBSD - Irssi can enter a Capsicum capability mode (a sandbox), greatly
-limiting possible consequences of a potential security hole in Irssi
-or the libraries it depends on.
-
-To make Irssi enter capability mode on startup, add
-
-capsicum = "yes";
-awaylog_file = "~/irclogs/away.log";
-
-to your ~/.irssi/config and restart the client.  Alternatively you can
-enter it "by hand", using the "/capsicum enter" command.  From the security
-point of view it's strongly preferable to use the former method, to avoid
-establishing connections without the sandbox protection; the "/capsicum"
-command is only intended for experimentation, and in cases where you need
-to do something that's not possible in capability mode - run scripts,
-for example - before continuing.
-
-There is no way to leave the capability mode, apart from exiting Irssi.
-When running in capability mode, there are certain restrictions - Irssi
-won't be able to access any files outside the directory pointed to by
-capsicum_irclogs_path (which defaults to ~/irclogs/).  If you change
-the path when already in capability mode it won't be effective until
-you restart Irssi.  Capability mode also makes it impossible to use
-the "/save" command.
-
-Currently there is no way to use custom SSL certificates.  As a workaround
-you can establish connections and enter the capability mode afterwards
-using the "/capsicum enter" command.
-

docs/design.html

@@ -1,165 +0,0 @@
-<base href='https://irssi.org/documentation/design/'>
-<h1>Design</h1>
-    <p>Irssi’s hierarchy is something like this:</p>
-
-<pre class="repl" id="fig1"><code class="language-ascidia">
-        sub1 sub2
-           \ /
-      xxx  IRC       COMMON ICQ  yyy
-       |    |           |    |    |
-       '----+-----:-----+----+----'
-                  |
-                 GUI (gtk/gnome, qt/kde, text, none)
-                  |
-        sub1 sub2 |
-           \ /    |
-      xxx  IRC    |  COMMON ICQ  yyy
-       '----+-----+-----+----+----'
-                  |
-              COMMON UI
-                  |
-        sub1 sub2 |
-           \ /    |
-      xxx  IRC    |    ICQ  yyy
-       |    |     |     |    |
-       '----+-----+-----+----'
-                  |
-                CORE
-                /
-       lib-config
-
-</code></pre>
-
-<p>(IRC, ICQ, xxx and yyy are chat protocols ..)</p>
-
-<p>(sub1 and sub2 are submodules of IRC module, like DCC and flood protect)</p>
-
-<p>Chat protocols and frontends are kept in separate modules. Common UI
-and GUI modules also have the common parts which don’t know anything
-about the chat protocols. This should allow implementing modules to
-whatever chat protocols and with whatever frontends easily.</p>
-
-<h2 id="signals">Signals</h2>
-
-<p>Communication between different modules are done with “signals”. They are
-not related to UNIX signals in any way, you could more like think of them
-as “events” - which might be a better name for them, but I don’t really
-want to change it anymore :)</p>
-
-<p>So, you send signal with <code>signal_emit()</code> and it’s sent to all modules that
-have grabbed it by calling <code>signal_add()</code> in their init function. For
-example:</p>
-
-<div><div><pre><code>signal_emit("mysignal", 1, "hello");
-</code></pre></div></div>
-
-<p>Sends a “mysignal” function with one argument “hello” - before that, you
-should have grabbed the signal somewhere else with:</p>
-
-<div><div><pre><code>static void sig_mysignal(const char *arg1)
-{
-  /* arg1 contains "hello" */
-}
-
-signal_add("mysignal", (SIGNAL_FUNC) sig_mysignal);
-</code></pre></div></div>
-
-<p>There are three different <code>signal_add()</code> functions which you can use to
-specify if you want to grab the signal first, “normally” or last. You can
-also stop the signal from going any further.</p>
-
-<p>Emitting signal with it’s name creates a small overhead since it has to
-look up the signal’s numeric ID first, after which it looks up the signal
-structure. This is done because if you call a signal <em>really</em> often,
-it’s faster to find it with it’s numeric ID instead of the string. You
-can use <code>signal_get_uniq_id()</code> macro to convert the signal name into ID -
-you’ll have to do this only once! - and use <code>signal_emit_id()</code> to emit the
-signal. Don’t bother to do this unless your signal is sent (or could be
-sent) several times in a second.</p>
-
-<p>See <code>src/core/signals.h</code> for definition of the signal function, and
-signals.txt for a list of signals.</p>
-
-<h2 id="lib-config">lib-config</h2>
-
-<p>Irssi depends on this for reading and saving configuration.
-(created by me for irssi)</p>
-
-<h2 id="core-module">CORE module</h2>
-
-<p>Provides some functionality that all other modules can use:</p>
-<ul>
-  <li>signal handling</li>
-  <li>keeping list of settings</li>
-  <li>keeping list of /commands</li>
-  <li>keeping track of loaded modules</li>
-  <li>networking functions (with nonblocking connects, IPv6 support)</li>
-  <li>handles connecting to servers</li>
-  <li>raw logging of server’s input/output data</li>
-  <li>/EVAL support</li>
-  <li>fgets() like function line_split() without any maximum line limits</li>
-  <li>command line parameter handling</li>
-  <li>miscellaneous useful little functions</li>
-  <li>handles logging</li>
-</ul>
-
-<h2 id="common-ui-module">COMMON UI module</h2>
-
-<ul>
-  <li>knows basics about windows and window items (=channels, queries, ..)</li>
-  <li>printtext() - parsing texts and feeding it for GUI to print.</li>
-  <li>themes</li>
-  <li>translation tables</li>
-  <li>text hilighting</li>
-  <li>command history</li>
-  <li>user interface (/commands) for CORE’s functionality</li>
-</ul>
-
-<h2 id="gui-modules">GUI modules</h2>
-
-<ul>
-  <li>all the rest of the functionality needed for a working client.</li>
-</ul>
-
-<h2 id="irc-module">IRC module</h2>
-
-<ul>
-  <li>CORE
-    <ul>
-      <li>IRC specific /commands</li>
-      <li>flood protecting commands sent to server</li>
-      <li>creating IRC masks based on nick/address for bans, ignores, etc.</li>
-      <li>keeps list of channels, nicks, channel modes, bans, etc.</li>
-      <li>keeps list of servers, server settings, irc networks,
-server reconnections and irc network splits</li>
-      <li>redirection of commands’ replies</li>
-      <li>lag detection</li>
-      <li>ctcp support and flood protection</li>
-      <li>Handles ignoring people</li>
-    </ul>
-  </li>
-  <li>DCC
-    <ul>
-      <li>DCC chat, send and get</li>
-    </ul>
-  </li>
-  <li>FLOOD
-    <ul>
-      <li>detects private or channel flooding and sends “flood” signal</li>
-      <li>automatic ignoring when flooding</li>
-    </ul>
-  </li>
-  <li>NOTIFYLIST
-    <ul>
-      <li>handles notifylist</li>
-    </ul>
-  </li>
-</ul>
-
-<h2 id="irc-ui-module">IRC UI module</h2>
-
-<ul>
-  <li>placing channels and queries in windows</li>
-  <li>nick completion</li>
-  <li>printing infomation of some events</li>
-</ul>

docs/design.txt

@@ -1,139 +1,150 @@
-Design
 
-Irssi’s hierarchy is something like this:
-
-        sub1 sub2
-           \ /
-      xxx  IRC       COMMON ICQ  yyy
-       |    |           |    |    |
-       '----+-----:-----+----+----'
-                  |
-                 GUI (gtk/gnome, qt/kde, text, none)
-                  |
-        sub1 sub2 |
-           \ /    |
-      xxx  IRC    |  COMMON ICQ  yyy
-       '----+-----+-----+----+----'
-                  |
-              COMMON UI
-                  |
-        sub1 sub2 |
-           \ /    |
-      xxx  IRC    |    ICQ  yyy
-       |    |     |     |    |
-       '----+-----+-----+----'
-                  |
-                CORE
-                /
-       lib-config
+ Irssi's hierarchy is something like this:
 
 
-(IRC, ICQ, xxx and yyy are chat protocols ..)
+         sub1 sub2
+            \ /
+       xxx  IRC       COMMON ICQ  yyy
+        |____|___________|____|____|
+                   |
+                  GUI (gtk/gnome, qt/kde, text, none)
+                   |
+         sub1 sub2 |
+            \ /    |
+       xxx  IRC    |  COMMON ICQ  yyy
+        |____|_____|_____|____|____|
+                   |
+               COMMON UI
+                   |
+         sub1 sub2 |
+            \ /    |
+       xxx  IRC    |    ICQ  yyy
+        |____|_____|_____|____|
+                   |
+                 CORE
+                 /
+        lib-config
 
-(sub1 and sub2 are submodules of IRC module, like DCC and flood protect)
 
-Chat protocols and frontends are kept in separate modules. Common UI and GUI
-modules also have the common parts which don’t know anything about the chat
-protocols. This should allow implementing modules to whatever chat protocols
-and with whatever frontends easily.
+ (IRC, ICQ, xxx and yyy are chat protocols ..)
+ (sub1 and sub2 are submodules of IRC module, like DCC and flood protect)
 
-Signals
 
-Communication between different modules are done with “signals”. They are not
-related to UNIX signals in any way, you could more like think of them as
-“events” - which might be a better name for them, but I don’t really want to
-change it anymore :)
+ Chat protocols and frontends are kept in separate modules. Common UI
+ and GUI modules also have the common parts which don't know anything
+ about the chat protocols. This should allow implementing modules to
+ whatever chat protocols and with whatever frontends easily.
 
-So, you send signal with signal_emit() and it’s sent to all modules that have
-grabbed it by calling signal_add() in their init function. For example:
+ ** Signals
 
-signal_emit("mysignal", 1, "hello");
+ Communication between different modules are done with "signals". They are
+ not related to UNIX signals in any way, you could more like think of them
+ as "events" - which might be a better name for them, but I don't really
+ want to change it anymore :)
 
-Sends a “mysignal” function with one argument “hello” - before that, you should
-have grabbed the signal somewhere else with:
+ So, you send signal with signal_emit() and it's sent to all modules that
+ have grabbed it by calling signal_add() in their init function. For
+ example:
 
-static void sig_mysignal(const char *arg1)
-{
-  /* arg1 contains "hello" */
-}
+   signal_emit("mysignal", 1, "hello");
 
-signal_add("mysignal", (SIGNAL_FUNC) sig_mysignal);
+ Sends a "mysignal" function with one argument "hello" - before that, you
+ should have grabbed the signal somewhere else with:
 
-There are three different signal_add() functions which you can use to specify
-if you want to grab the signal first, “normally” or last. You can also stop the
-signal from going any further.
+   static void sig_mysignal(const char *arg1)
+   {
+     /* arg1 contains "hello" */
+   }
 
-Emitting signal with it’s name creates a small overhead since it has to look up
-the signal’s numeric ID first, after which it looks up the signal structure.
-This is done because if you call a signal really often, it’s faster to find it
-with it’s numeric ID instead of the string. You can use signal_get_uniq_id()
-macro to convert the signal name into ID - you’ll have to do this only once! -
-and use signal_emit_id() to emit the signal. Don’t bother to do this unless
-your signal is sent (or could be sent) several times in a second.
+   signal_add("mysignal", (SIGNAL_FUNC) sig_mysignal);
 
-See src/core/signals.h for definition of the signal function, and signals.txt
-for a list of signals.
+ There are three different signal_add() functions which you can use to
+ specify if you want to grab the signal first, "normally" or last. You can
+ also stop the signal from going any further.
 
-lib-config
+ Emitting signal with it's name creates a small overhead since it has to
+ look up the signal's numeric ID first, after which it looks up the signal
+ structure. This is done because if you call a signal _really_ often,
+ it's faster to find it with it's numeric ID instead of the string. You
+ can use signal_get_uniq_id() macro to convert the signal name into ID -
+ you'll have to do this only once! - and use signal_emit_id() to emit the
+ signal. Don't bother to do this unless your signal is sent (or could be
+ sent) several times in a second.
 
-Irssi depends on this for reading and saving configuration. (created by me for
-irssi)
+ See src/core/signals.h for definition of the signal function, and
+ signals.txt for a list of signals.
 
-CORE module
 
-Provides some functionality that all other modules can use:
+ ** lib-config
 
-  • signal handling
-  • keeping list of settings
-  • keeping list of /commands
-  • keeping track of loaded modules
-  • networking functions (with nonblocking connects, IPv6 support)
-  • handles connecting to servers
-  • raw logging of server’s input/output data
-  • /EVAL support
-  • fgets() like function line_split() without any maximum line limits
-  • command line parameter handling
-  • miscellaneous useful little functions
-  • handles logging
+   Irssi depends on this for reading and saving configuration.
+   (created by me for irssi)
 
-COMMON UI module
 
-  • knows basics about windows and window items (=channels, queries, ..)
-  • printtext() - parsing texts and feeding it for GUI to print.
-  • themes
-  • translation tables
-  • text hilighting
-  • command history
-  • user interface (/commands) for CORE’s functionality
+ ** CORE module
 
-GUI modules
+ Provides some functionality that all other modules can use:
+   - signal handling
+   - keeping list of settings
+   - keeping list of /commands
+   - keeping track of loaded modules
+   - networking functions (with nonblocking connects, IPv6 support)
+   - handles connecting to servers
+   - raw logging of server's input/output data
+   - /EVAL support
+   - fgets() like function line_split() without any maximum line limits
+   - command line parameter handling
+   - miscellaneous useful little functions
+   - handles logging
 
-  • all the rest of the functionality needed for a working client.
 
-IRC module
+ ** COMMON UI module
 
-  • CORE
-      □ IRC specific /commands
-      □ flood protecting commands sent to server
-      □ creating IRC masks based on nick/address for bans, ignores, etc.
-      □ keeps list of channels, nicks, channel modes, bans, etc.
-      □ keeps list of servers, server settings, irc networks, server
-        reconnections and irc network splits
-      □ redirection of commands’ replies
-      □ lag detection
-      □ ctcp support and flood protection
-      □ Handles ignoring people
-  • DCC
-      □ DCC chat, send and get
-  • FLOOD
-      □ detects private or channel flooding and sends “flood” signal
-      □ automatic ignoring when flooding
-  • NOTIFYLIST
-      □ handles notifylist
+   - knows basics about windows and window items (=channels, queries, ..)
+   - printtext() - parsing texts and feeding it for GUI to print.
+   - themes
+   - translation tables
+   - text hilighting
+   - command history
+   - user interface (/commands) for CORE's functionality
 
-IRC UI module
 
-  • placing channels and queries in windows
-  • nick completion
-  • printing infomation of some events
+ ** GUI modules
 
+   - all the rest of the functionality needed for a working client.
+
+
+ ** IRC module
+
+   * CORE
+
+     - IRC specific /commands
+     - flood protecting commands sent to server
+     - creating IRC masks based on nick/address for bans, ignores, etc.
+     - keeps list of channels, nicks, channel modes, bans, etc.
+     - keeps list of servers, server settings, irc networks,
+       server reconnections and irc network splits
+     - redirection of commands' replies
+     - lag detection
+     - ctcp support and flood protection
+     - Handles ignoring people
+
+   * DCC
+
+     - DCC chat, send and get
+
+   * FLOOD
+
+     - detects private or channel flooding and sends "flood" signal
+     - automatic ignoring when flooding
+
+   * NOTIFYLIST
+
+     - handles notifylist
+
+
+ ** IRC UI module
+
+   - placing channels and queries in windows
+   - nick completion
+   - printing infomation of some events

docs/example-cross-android-aarch64.txt

@@ -1,47 +0,0 @@
-[binaries]
-ar = 'aarch64-linux-android-ar'
-c = 'aarch64-linux-android-clang'
-cpp = 'aarch64-linux-android-clang++'
-ld = 'aarch64-linux-android-ld'
-pkgconfig = '/home/builder/.termux-build/_cache/android-r20-api-24-v3/bin/aarch64-linux-android-pkg-config'
-strip = 'aarch64-linux-android-strip'
-
-;; you have to substitute 5.30.2 with the Perl version, that can be
-;; obtained by running ` miniperl -e 'print substr $^V, 1' `
-
-perl = ['/home/builder/.termux-build/perl/src/miniperl', '-I/data/data/com.termux/files/usr/lib/perl5/5.30.2/aarch64-android', '-I/data/data/com.termux/files/usr/lib/perl5/5.30.2']
-
-[properties]
-needs_exe_wrapper = true
-c_args = ['-fstack-protector-strong', '-Oz', '-I/data/data/com.termux/files/usr/include']
-cpp_args = ['-fstack-protector-strong', '-Oz', '-I/data/data/com.termux/files/usr/include']
-c_link_args = ['-L/data/data/com.termux/files/usr/lib', '-Wl,-rpath=/data/data/com.termux/files/usr/lib', '-Wl,--enable-new-dtags', '-Wl,--as-needed', '-Wl,-z,relro,-z,now', '-landroid-glob']
-cpp_link_args = ['-L/data/data/com.termux/files/usr/lib', '-Wl,-rpath=/data/data/com.termux/files/usr/lib', '-Wl,--enable-new-dtags', '-Wl,--as-needed', '-Wl,-z,relro,-z,now', '-landroid-glob']
-
-;; if you do not have a cross-perl like miniperl available, you have
-;; to specify the required options by uncommenting the following
-;; properties
-
-;; you can get the proper values by running the commands on your
-;; Android device:
-
-;; ` perl -V::version: `
-; perl_version = '5.30.2'
-;; ` perl -MExtUtils::Embed -o ccopts `
-; perl_ccopts = ['-I/data/data/com.termux/files/usr/include', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-I/data/data/com.termux/files/usr/lib/perl5/5.30.2/aarch64-android/CORE']
-;; ` perl -MExtUtils::Embed -o ldopts `
-; perl_ldopts = ['-Wl,-E', '-I/data/data/com.termux/files/usr/include', '-L/data/data/com.termux/files/usr/lib/perl5/5.30.2/aarch64-android/CORE', '-lperl', '-lm', '-ldl']
-;; ` perl -V::archname: `
-; perl_archname = 'aarch64-android'
-;; ` perl -V::installsitearch: `
-; perl_installsitearch = '/data/data/com.termux/files/usr/lib/perl5/site_perl/5.30.2/aarch64-android'
-;; ` perl -V::installvendorarch: `
-; perl_installvendorarch = ''
-;; ` perl -E 'say for @INC' `
-; perl_inc = ['/data/data/com.termux/files/usr/lib/perl5/site_perl/5.30.2/aarch64-android', '/data/data/com.termux/files/usr/lib/perl5/site_perl/5.30.2', '/data/data/com.termux/files/usr/lib/perl5/5.30.2/aarch64-android', '/data/data/com.termux/files/usr/lib/perl5/5.30.2']
-
-[host_machine]
-cpu_family = 'arm'
-cpu = 'aarch64'
-endian = 'little'
-system = 'android'

docs/faq.html

@@ -1,8 +1,7 @@
-<base href='https://irssi.org/documentation/faq/'>
 <h1>Frequently Asked Questions</h1>
-    <h3 id="q-why-doesnt-irssi-display-colors-even-when-ircii-etc-displays-them">Q: Why doesn’t irssi display colors even when ircii etc. displays them?</h3>
+<h3 id="q-why-doesnt-irssi-display-colors-even-when-ircii-etc-displays-them">Q: Why doesn’t irssi display colors even when ircii etc. displays them?</h3>
 
-<p>A: They force ANSI colors even if terminal doesn’t support them. By default, irssi uses colors only if terminfo/termcap so says. The correct way to fix this would be to change your TERM environment to a value where colors work, like xterm-256color or color_xterm (eg. <code>TERM=xterm-256color irssi</code>). If this doesn’t help, then use the evil way of <code>/SET term_force_colors ON</code>.</p>
+<p>A: They force ANSI colors even if terminal doesn’t support them. By default, irssi uses colors only if terminfo/termcap so says. The correct way to fix this would be to change your TERM environment to a value where colors work, like xterm-color or color_xterm (eg. <code>TERM=xterm-color irssi</code>). If this doesn’t help, then use the evil way of <code>/SET term_force_colors ON</code>.</p>
 
 <h3 id="q-how-do-i-easily-write-text-to-channel-that-starts-with--character">Q: How do I easily write text to channel that starts with ‘/’ character?</h3>
 
@@ -54,7 +53,7 @@
 
 <h3 id="q-will-there-be-detach-like-feature">Q: Will there be /DETACH-like feature?</h3>
 
-<p>A: <a href="https://tmux.github.io/">tmux</a>, <a href="https://www.gnu.org/software/screen/screen.html">screen</a> and <a href="https://sourceforge.net/projects/dtach/">dtach</a> can be used to do it just fine.</p>
+<p>A: <a href="http://tmux.github.io/">tmux</a>, <a href="http://www.gnu.org/software/screen/screen.html">screen</a> and <a href="http://dtach.sf.net/">dtach</a> can be used to do it just fine.</p>
 
 <h3 id="q-how-do-i-run-scripts-automatically-at-startup">Q: How do I run scripts automatically at startup?</h3>
 
@@ -70,7 +69,7 @@
 
 <h3 id="q-how-can-i-have-whois-replies-to-active-window">Q: How can I have /WHOIS replies to active window?</h3>
 
-<p>A: You can disable the status window, or do <code>/WINDOW LEVEL -CRAP</code> in it which would also make several other messages show up in active window. You can also use a <a href="https://dgl.cx/irssi/hack-whois-in-current-window.pl">script</a>.</p>
+<p>A: You can disable the status window, or do <code>/WINDOW LEVEL -CRAP</code> in it which would also make several other messages show up in active window. You can also use a <a href="http://dgl.cx/irssi/hack-whois-in-current-window.pl">script</a>.</p>
 
 <h3 id="q-how-do-i-add-the-active-network-to-the-statusbar">Q: How do I add the active network to the statusbar</h3>
 
@@ -78,4 +77,4 @@
 
 <h3 id="q-how-to-pronounce-irssi">Q: How to pronounce Irssi?</h3>
 
-<p>A: Check <a href="/assets/irssi.wav">here</a></p>
+<p>A: Check <a href="https://irssi.org/assets/irssi.wav">here</a></p>

docs/faq.txt

@@ -1,124 +0,0 @@
-   Frequently Asked Questions
-
-Q: Why doesn’t irssi display colors even when ircii etc. displays them?
-A: They force ANSI colors even if terminal doesn’t support them. By default,
-   irssi uses colors only if terminfo/termcap so says. The correct way to fix this
-   would be to change your TERM environment to a value where colors work, like
-   xterm-256color or color_xterm (eg. TERM=xterm-256color irssi). If this doesn’t
-   help, then use the evil way of /SET term_force_colors ON.
-
-Q: How do I easily write text to channel that starts with ‘/’ character?
-A: / /text
-
-Q: Why doesn’t irssi update my realname (or whatever) after I change it with /
-   SET realname and reconnect with /RECONNECT or /SERVER?
-A: Irssi is trying to be too smart. This will be fixed in future, but for now
-   you should use /DISCONNECT and /CONNECT.
-
-Q: I connected to some server which isn’t responding but now irssi tries to
-   connect back to it all the time! How can I stop it?
-A: Two ways. The “good way” to do it is with /DISCONNECT. Check the server tags
-   first with /SERVER without giving it any parameters, reconnections are those
-   that have tag starting with “recon” text. So most probably you’re going to do /
-   DISCONNECT recon-1. The other way is to remove all the reconnections with /
-   RMRECONNS, easier but may remove some connections you actually wanted to
-   reconnect (if you used multiple servers..).
-
-Q: How do I add seconds to timestamp?
-A: /FORMAT timestamp {timestamp %%H:%%M:%%S} - and remember to add the trailing
-   space :)
-
-Q: Why does irssi say “Irssi: Channel not fully synchronized yet, try again
-   after a while” when I try to use /BAN etc?
-A: Possibly a bug in irssi, or ircd you’re using does something that irssi
-   didn’t really notice. The new code should make this happen far less often than
-   before, but one known reason for this is when irssi doesn’t notice that you
-   were unable to join some channel. Currently however I don’t know of any such
-   events irssi doesn’t know about.
-
-   Anyway, if this does happen, do /RAWLOG SAVE ~/rawlog soon after joining to
-   channel, and either try to figure out yourself why irssi didn’t get reply to
-   WHO request, or open a Github issue with the full log included. Note that the
-   rawlog is by default only 200 lines and it may not be enough to show all needed
-   information, so you might want to do /SET rawlog_lines 1000 or so.
-
-   MODE +b still works fine though.
-
-Q: Where’s the GUI version?
-A: There was one on [1]irssi-import/xirssi but it has not been maintained for a
-   long time.
-
-Q: How do I autorejoin channels after being kicked?
-A: That’s evil and you shouldn’t do it. If you get kicked, you should stay out,
-   at least until the channel forgot you existed :) Most channels I’ve joined just
-   ban you if you autorejoin after kick. If you’re joined to channels who kick
-   people for fun, try changing channels or something.
-
-   Anyway, if you REALLY want to do that, and you understand that you’re doing
-   evilness, you can use the autorejoin.pl script that comes with irssi. You’ll
-   still need to specify the channels you wish to rejoin with /SET
-   autorejoin_channels #chan1 #chan2 ...
-
-Q: How do I announce that I’m away/back in all channels I’ve joined? Or how do
-   I change my nick when setting myself away/back?
-A: That’s even worse than autorejoin. Who could possibly care every time you
-   come and go? Many channels will kick you for using this, and I for example have
-   added several ignores so I’d never need to see these messages. Learn to use /
-   AWAY command properly and tell its existence to people who don’t know about it.
-   /WII yournick shows your away reason much better for people who actually want
-   to know if you’re there or not.
-
-Q: Why does irssi autojoin on invite by default?
-A: The setting is /SET join_auto_chans_on_invite - it’s not the same as regular
-   autojoin-on-invite, which irssi doesn’t even have. The only channels that are
-   joined on invite, are the ones you’ve added to config with /CHANNEL ADD -auto.
-   This is very useful with +i channels when you need to first send an invite
-   request to bot, or if you get accidentally kicked from channel, the kicker can
-   invite you back immediately.
-
-   I don’t see any bad side effects with this feature, so it’s ON by default. I
-   guess someone could start kicking/inviting you all the time but server
-   connection shouldn’t drop because of that, and you shouldn’t join channels
-   whose operators are that evil.
-
-Q: How to make UTF-8 support work with irssi?
-A: Make sure your terminal supports UTF-8 (for example, xterm -u8). If you use
-   screen, you may have to do screen -U. And in Irssi do /SET term_charset utf-8.
-   (for 0.8.9 and older: /SET term_type utf-8)
-
-Q: Will there be /DETACH-like feature?
-A: [2]tmux, [3]screen and [4]dtach can be used to do it just fine.
-
-Q: How do I run scripts automatically at startup?
-A: Put them into ~/.irssi/scripts/autorun/ directory. Or better would be if you
-   placed them in ~/.irssi/scripts/ and created symlinks to autorun directory (eg.
-   cd ~/.irssi/scripts/autorun/ ; ln -s ../script.pl .)
-
-Q: How do I execute commands automatically at startup?
-A: Put them into ~/.irssi/startup file, each command on its own line. The
-   preceding slash (/) is not necessary.
-
-Q: How do I easily edit existing topic?
-A: /TOPIC <tab>
-
-Q: How can I have /WHOIS replies to active window?
-A: You can disable the status window, or do /WINDOW LEVEL -CRAP in it which
-   would also make several other messages show up in active window. You can also
-   use a [5]script.
-
-Q: How do I add the active network to the statusbar
-A: Modify the window-line in statusbar section in config file to window = "{sb
-   $winref:$tag/$T{sbmode $M}}";
-
-Q: How to pronounce Irssi?
-A: Check [6]here
-
-
-   References:
-
-   [1] https://github.com/irssi-import/xirssi
-   [2] https://tmux.github.io/
-   [3] https://www.gnu.org/software/screen/screen.html
-   [4] https://sourceforge.net/projects/dtach/
-   [5] https://dgl.cx/irssi/hack-whois-in-current-window.pl
-   [6] https://irssi.org/assets/irssi.wav

docs/help/Makefile.am.gen

@@ -0,0 +1,12 @@
+# Makefile.am is autogenerated by autogen.sh from Makefile.am.gen
+
+helpdir = $(datadir)/irssi/help
+
+help_DATA = \
+@HELPFILES@
+
+EXTRA_DIST = \
+	Makefile.am.gen \
+	$(help_DATA)
+
+SUBDIRS = in

docs/help/in/Makefile.am.gen

@@ -0,0 +1,5 @@
+# Makefile.am is autogenerated by autogen.sh from Makefile.am.gen
+
+EXTRA_DIST = \
+	Makefile.am.gen \
+@HELPFILES@

docs/help/in/admin.in

@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /ADMIN
-    /ADMIN irc.libera.chat
+    /ADMIN orwell.freenode.net
     /ADMIN mike
 
 %9See also:%9 INFO

docs/help/in/bind.in

@@ -6,8 +6,7 @@
 %9Parameters:%9
 
     -list:      Displays a list of all the bindable commands.
-    -delete:    Removes the binding.
-    -reset:     Reset a key to its default binding.
+    -delete:    Removes the binding,
 
     A name of the binding and the command to perform; if no parameter is given,
     the list of bindings will be displayed.

docs/help/in/cat.in

@@ -5,22 +5,15 @@
 
 %9Parameters:%9
 
-    -window:            Displays the output in the active window.
-
-    The file to display and optionally a position to seek in the file,
-    in bytes.
+    The file to display.
 
 %9Description:%9
 
-    Displays the contents of the specified file in the active window if -window
-    is specified, otherwise to the closest matching window depending on levels.
-
-    The seek position parameter is used internally to display away logs, if
-    omitted the whole file is shown.
+    Displays the contents of the specified file into the active window.
 
 %9Examples:%9
 
-    /CAT -window /etc/network/interfaces
+    /CAT /etc/network/interfaces
     /CAT /home/mike/resume.txt
     /CAT contact_details.txt
 

docs/help/in/channel.in

@@ -33,12 +33,12 @@
 
     /CHANNEL
     /CHANNEL LIST
-    /CHANNEL ADD -auto #irssi liberachat
+    /CHANNEL ADD -auto #irssi Freenode
     /CHANNEL ADD -auto #basementcat Quakenet secret_lair
-    /CHANNEL ADD -auto -bots '*!@*.irssi.org *!bot@irssi.org' -botcmd 'msg $0 op WzerTrzq' #hideout liberachat
+    /CHANNEL ADD -auto -bots '*!@*.irssi.org *!bot@irssi.org' -botcmd 'msg $0 op WzerTrzq' #hideout Freenode
     /CHANNEL ADD -auto -bots 'Q!TheQBot@CServe.quakenet.org' -botcmd '^MSG Q op #irssi' #irssi Quakenet
-    /CHANNEL MODIFY -noauto #irssi liberachat
-    /CHANNEL REMOVE #hideout liberachat
+    /CHANNEL MODIFY -noauto #irssi Freenode
+    /CHANNEL REMOVE #hideout Freenode
 
 %9Special Example:%9
 

docs/help/in/clear.in

@@ -12,8 +12,8 @@
 
 %9Description:%9
 
-    Scrolls up the text in the window and fills the window with blank lines; you
-    may want to use this to make new text start at the top of the window again.
+    Clears the window of all text; you may use this to clear a windows that
+    contains sensitive information or has rendered improperly.
 
-%9See also:%9 REDRAW, SCROLLBACK CLEAR
+%9See also:%9 REDRAW
 

docs/help/in/connect.in

@@ -17,8 +17,6 @@
     -tls_ciphers:       TLS cipher suite preference lists.
     -tls_pinned_cert:   Pinned x509 certificate fingerprint.
     -tls_pinned_pubkey: Pinned public key fingerprint.
-    -nocap:             Disable CAPREQ during connect
-    -noproxy:           Ignores the global proxy configuration.
     -network:           The network this connection belongs to.
     -host:              The hostname you would like to connect from.
     -rawlog:            Immediately open rawlog after connecting.
@@ -35,9 +33,9 @@
 
 %9Examples:%9
 
-    /CONNECT liberachat
-    /CONNECT -6 liberachat
-    /CONNECT -4 -! -host staff.irssi.org -network liberachat irc.libera.chat
+    /CONNECT Freenode
+    /CONNECT -6 Freenode
+    /CONNECT -4 -! -host staff.irssi.org -network Freenode orwell.freenode.net
     /CONNECT irc.irssi.org 6667 WzerT8zq mike
 
 %9See also:%9 DISCONNECT, RMRECONNS, SERVER

docs/help/in/dcc.in

@@ -27,7 +27,7 @@
     and file transfers.
 
     If you are behind NAT, or if the firewall is too restrictive, you might
-    want to try if using the passive parameter resolves your connection
+    want to try if using the passive parameter resolved your connection
     problem.
 
     You can send files which contain special character or spaces by enclosing

docs/help/in/disconnect.in

@@ -18,7 +18,7 @@
 
 %9Examples:%9
 
-    /DISCONNECT liberachat I'm off for today, take care!
+    /DISCONNECT Freenode I'm off for today, take care!
     /DISCONNECT * Vacation time :D
     /DISCONNECT
 

docs/help/in/echo.in

@@ -5,6 +5,7 @@
 
 %9Parameters:%9
 
+    -current:    Displays the output in the active window.
     -window:     Displays the output in the target window.
     -level:      Displays the output with a given message level.
 
@@ -17,7 +18,7 @@
 %9Examples:%9
 
     /ECHO 1 + 1 = 2 :D
-    /ECHO Testing the ECHO command
+    /ECHO -current Testing the ECHO command
     /ECHO -window #irssi Special variables such as ${N} will not be expanded.
 
 %9See also:%9 CAT, EVAL, EXEC, LEVELS

docs/help/in/eval.in

@@ -10,23 +10,13 @@
 %9Description:%9
 
     Evaluates the given commands and executes them; you can use internal
-    variables and separate multiple commands by using the `;' character.
-    If the command contains a string with `$', `\' or `;' those characters
-    need to be escaped:
-
-        `$' -> `$$'
-        `\' -> `\\' (or even `\\\\', depending on where they are used)
-        `;' -> `\;'
+    variables and separate multiple commands by using the ';' character.
 
 %9Examples:%9
 
     /EVAL echo I am connected to ${S} on ${chatnet} as ${N}
     /EVAL echo My user privileges are +${usermode}; echo Let's party!
 
-    to print `1;2$3\4':
-
-    /EVAL echo 1\;2$$3\\4
-
 %9References:%9
 
     https://github.com/irssi/irssi/blob/master/docs/special_vars.txt

docs/help/in/hash.in

@@ -15,7 +15,7 @@
 
 %9References:%9
 
-    https://irssi.org
+    http://www.irssi.org
     https://github.com/irssi
 
 %9See also:%9 DIE, KILL, OPER

docs/help/in/help.in

@@ -20,7 +20,7 @@
 
 %9References:%9
 
-    https://irssi.org
+    http://www.irssi.org
     https://github.com/irssi
 
 %9See also:%9 CONNECT, MSG, NETWORK, SERVER

docs/help/in/hilight.in

@@ -12,7 +12,7 @@
     -full:        The text must match the full word.
     -matchcase:   The text must match case.
     -regexp:      The text is a regular expression.
-    -color:       The color to display the highlight in.
+    -color:       The color the display the highlight in.
     -actcolor:    The color to mark the highlight activity in the statusbar.
     -level:       Matches only on the given message level.
     -network:     Matches only on the given network.

docs/help/in/ignore.in

@@ -14,8 +14,6 @@
     -network:     Ignores only on a specific network.
     -channels:    Ignores only on specific channels.
     -time:        The timeout to automatically remove the ignore.
-                  Accepts units specified in days, hours, minutes, seconds,
-                  milliseconds, or no unit for seconds.
 
     The mask, channels and levels to ignore; if no argument is provided, the
     list of ignores will be displayed.
@@ -27,8 +25,6 @@
     The special level 'NO_ACT' can be used to ignore activity in the statusbar
     without actually ignoring the message; this behavior is somewhat special
     because it is allowed in addition to other ignores for the same target.
-    The special level 'HIDDEN' can be used to hide matching messages that can
-    later be revealed using /WINDOW HIDELEVEL -HIDDEN
 
 %9Examples:%9
 
@@ -39,15 +35,12 @@
     /IGNORE #irssi ALL -PUBLIC -ACTIONS
     /IGNORE -replies *!*@*.irssi.org ALL
     /IGNORE -regexp -pattern (away|gone|back|playing|returned) * ACTIONS
-    /IGNORE -regexp -pattern (away|gone|back|playing|returned) #channel ACTIONS
     /IGNORE *zzz* NICKS
     /IGNORE *afk* NICKS
     /IGNORE *away* NICKS
     /IGNORE #irssi NO_ACT JOINS PARTS QUITS
     /IGNORE mike NO_ACT -MSGS
-    /IGNORE mike HIDDEN PUBLIC JOINS PARTS QUITS
-    /IGNORE -time 5days christmas PUBLICS
-    /IGNORE -time 300 mike PUBLICS
+    /IGNORE -regexp -pattern
 
 %9See also:%9 ACCEPT, SILENCE, UNIGNORE
 

docs/help/in/info.in

@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /INFO
-    /INFO irc.libera.chat
+    /INFO orwell.freenode.net
 
 %9See also:%9 ADMIN
 

docs/help/in/ison.in

@@ -16,5 +16,5 @@
     /ISON mike
     /ISON sarah bob
 
-%9See also:%9 NOTIFY, WHOWAS, WHOIS
+%9See also:%9 NOTIFY, WHOAS, WHOIS
 

docs/help/in/join.in

@@ -20,7 +20,7 @@
     /JOIN #irssi
     /JOIN #basementcat secret_lair
     /JOIN -invite
-    /JOIN -liberachat #github,#libera,#irssi
+    /JOIN -freenode #github,#freenode,#irssi
 
 %9See also:%9 KICK, PART
 

docs/help/in/knock.in

@@ -23,7 +23,7 @@
 %9Examples:%9
 
     /KNOCK #irssi
-    /KNOCK #libera
+    /KNOCK #freenode
     /KNOCK #github
 
 %9See also:%9 INVITE, JOIN

docs/help/in/levels.in

@@ -20,10 +20,9 @@
         MODES           A channel mode is modified.
         MSGS            Private messages.
         NICKS           A nickname changes to another nickname.
-        NOTICES         Private notices.
+        NOTICES         Notices sent from a nickname.
         PARTS           A nickname leaves a channel.
         PUBLIC          Public messages in a channel.
-        PUBNOTICES      Public notices in a channel.
         QUITS           A nickname disconnects from IRC.
         SNOTES          Notices sent from a server.
         TOPICS          A channel topic is modified.
@@ -33,7 +32,6 @@
 
         HILIGHT         The text is highlighted.
         NEVER           Never ignores or logs the message.
-        HIDDEN          Hides the message when window HIDELEVEL includes HIDDEN.
         NO_ACT          Doesn't trigger any activity in the statusbar.
         NOHILIGHT       The text is not highlighted.
 

docs/help/in/list.in

@@ -24,15 +24,11 @@
 
 %9Remarks:%9
 
-    Not all networks support server-side filtering. Some provide a network
+    Not all networks support server-side filtering and may provide a network
     service or service bot instead; on IRCnet, you may use the List service:
 
-    /SQUERY Alis HELP
-
-    Other networks with service bots (like ChanServ) may also provide a list
-    service bot (confirm with /WHOIS ALIS):
-
-    /MSG Alis HELP
+    /SQUERY List HELP
+    /MSG ALIS HELP
 
 %9See also:%9 STATS, SQUERY, WHOIS
 

docs/help/in/log.in

@@ -33,10 +33,10 @@
 %9Examples:%9
 
     /LOG OPEN -targets mike ~/irclogs/mike.log MSGS
-    /LOG OPEN -targets #irssi ~/irclogs/liberachat/irssi-%%Y-%%m-%%d
-    /LOG CLOSE ~/irclogs/liberachat/irssi-%%Y-%%m-%%d
-    /LOG STOP ~/irclogs/liberachat/irssi-%%Y-%%m-%%d
-    /LOG START ~/irclogs/liberachat/irssi-%%Y-%%m-%%d
+    /LOG OPEN -targets #irssi-freenode ~/irclogs/freenode/irssi-%%Y-%%m-%%d
+    /LOG CLOSE ~/irclogs/freenode/irssi-%%Y-%%m-%%d
+    /LOG STOP ~/irclogs/freenode/irssi-%%Y-%%m-%%d
+    /LOG START ~/irclogs/freenode/irssi-%%Y-%%m-%%d
 
     /SET autolog ON
 

docs/help/in/meson.build

@@ -1 +0,0 @@
-# don't forget to add new help files to ../meson.build

docs/help/in/motd.in

@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /MOTD
-    /MOTD irc.libera.chat
+    /MOTD orwel.freenode.org
     /MOTD bob
 
 %9See also:%9 ADMIN, INFO, LINKS, MAP

docs/help/in/msg.in

@@ -11,13 +11,8 @@
 
     The target nickname or channel and the message to send.
 
-    The target can be a comma delimited list of targets, ie
-    nick1,nick2 or #chan1,#chan2
-
-    Or one of the following special targets:
-      * : Use the active nickname or channel
-      , : Last person who sent you a /msg
-      . : Last person you sent a /msg to
+    Use the wildcard character '*' if you want to use the active nickname or
+    channel.
 
 %9Description:%9
 

docs/help/in/names.in

@@ -21,7 +21,7 @@
 %9Examples:%9
 
     /NAMES -ops
-    /NAMES -voices #irssi,#libera
+    /NAMES -voices #irssi,#freenode
 
 %9See also:%9 JOIN, PART, WHO, WHOIS
 

docs/help/in/nctcp.in

@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /NCTCP #irssi VERSION King of the Jungle v1.0
-    /NCTCP bob,#libera USERINFO I am bob :p
+    /NCTCP bob,#freenode USERINFO I am bob :p
 
 %9See also:%9 CTCP
 

docs/help/in/network.in

@@ -11,15 +11,13 @@
     REMOVE:          Removes a network from your configuration.
 
     -nick:           Specifies the nickname to use.
-    -alternate_nick  Specifies the alternate nickname to use.
     -user:           Specifies the user identity to use.
     -realname:       Specifies the real name to use.
     -host:           Specifies the hostname to use.
     -usermode:       Specifies the user modes to set on yourself.
     -autosendcmd:    Specifies the commands, separated by the ';' character,
                      and enclosed within two "'" characters, to perform after
-                     connecting. 
-                     (Some characters need to be escaped - see /help eval)
+                     connecting.
     -querychans:     Specifies the maximum number of channels to put in one MODE
                      or WHO command when synchronizing.
     -whois:          Specifies the maximum number of nicknames in one WHOIS
@@ -38,7 +36,6 @@
     -sasl_mechanism  Specifies the mechanism to use for the SASL authentication.
                      At the moment irssi only supports the 'plain' and the
                      'external' mechanisms.
-                     Use '' to disable the authentication.
     -sasl_username   Specifies the username to use during the SASL authentication.
     -sasl_password   Specifies the password to use during the SASL authentication.
 
@@ -60,11 +57,11 @@
 %9Examples:%9
 
     /NETWORK ADD -usermode +giw EFnet
-    /NETWORK ADD -usermode +iw -nick mike -realname 'The one and only mike!' -host staff.irssi.org liberachat
-    /NETWORK ADD -autosendcmd '^MSG NickServ identify WzerT8zq' liberachat
+    /NETWORK ADD -usermode +iw -nick mike -realname 'The one and only mike!' -host staff.irssi.org Freenode
+    /NETWORK ADD -autosendcmd '^MSG NickServ identify WzerT8zq' Freenode
     /NETWORK ADD -autosendcmd '^MSG Q@CServe.quakenet.org AUTH mike WzerT8zq; WAIT 2000; OPER mike WzerT8zq; WAIT 2000; MODE mike +kXP' Quakenet
     /NETWORK MODIFY -usermode +gi EFnet
-    /NETWORK REMOVE liberachat
+    /NETWORK REMOVE Freenode
 
 %9See also:%9 CHANNEL, CONNECT, SERVER
 

docs/help/in/otr.in

@@ -1,111 +0,0 @@
-
-OTR %|[OPTION]
-
-Command to control the OTR module. Without an option, /OTR INFO is printed.
-
-This help contains three sections which are %9options, quickstart and files.%n
-
-To add the OTR status bar (highly recommended):
-
-%9/statusbar window add otr%n
-
-%9Options:%n
-
-AUTH <secret>
-    Start or respond to an authentication process.
-
-AUTHQ <question> <secret>
-    Start a SMP authentication process.
-
-    Example: %9/otr authq "My question is" "this is the secret"%n
-
-AUTHABORT
-    Abort an ongoing authentication process.
-
-CONTEXTS
-    List known contexts which basically list the known fingerprints and their
-    state.
-
-DEBUG
-    Turn on debugging.
-
-DISTRUST <fingerprint>
-    Distrust a specific fingerprint. This command can be done inside a private
-    window for which the current fingerprint of the other person will be used
-    or else set fp to a human readable OTR fingerprint available with the above
-    contexts command.
-
-    Examples: %9/otr distrust 487FFADA 5073FEDD C5AB5C14 5BB6C1FF 6D40D48A%n
-
-FINISH
-    End the OTR session. This MUST be done inside a private conversation
-    window.
-
-FORGET <fingerprint>
-    Forget a specific fingerprint (deleted from the known fingerprints). The
-    behavior is the same as the distrust command explained above.
-
-GENKEY <name>
-    Generate OTR keys for a given account name. This is done automatically
-    if someone tries to establish a secure session.
-
-    This process is done in a background worker and can take an arbitrary
-    amount of time. The completion is checked when another irssi event is
-    caught.
-
-HELP
-    Print this help.
-
-INFO
-    Display the OTR fingerprint(s) of all your account(s).
-
-INIT
-    Initialize an OTR conversation within a private conversation window.
-
-TRUST <fingerprint>
-    Trust a specific fingerprint. The behavior is the same as the forget and
-    distrust commands explained above.
-
-VERSION
-    Print the version of the OTR module.
-
-%9Quickstart:%n
-
-Start a private conversation with the person you want to initiate a secure
-session. Once in the private message window:
-
-%9/otr init%n
-
-Key generation should start if no key is found for your account name. Once the
-process is done, either type a message which should automatically start the
-session or redo the init command.
-
-Time to authenticate the person. Either use a shared secret exchange through
-phone or GPG-signed email or use the socialist millionaire problem mechanism
-(SMP) which is basically to ask a question for which the answer can only be
-known by the other person.
-
-%9/otr auth <shared-secret>%n OR %9/otr authq "A question" <shared-secret>%n
-
-Or to respond to an authentication:
-
-%9/otr auth <secret>%n
-
-%9Files:%n
-
-This otr modules creates a directory in %9$HOME/.irssi/otr%n and creates three
-files:
-
-* %9otr.key%n
-    Contains your OTR private key(s). NEVER shared this directory with someone
-    else unless you know what you are doing.
-
-* %9otr.fp%n
-    The known fingerprints with their _trust_ status.
-
-* %9otr.instag
-    Instance tag of the libotr. This should NEVER be copied to an other
-    computer. If unsure, just ignore this file.
-
-For more information on OTR, see https://otr.cypherpunks.ca/
-

docs/help/in/part.in

@@ -14,7 +14,7 @@
 %9Examples:%9
 
     /PART #irssi
-    /PART #libera,#irssi
+    /PART #freenode,#irssi
 
 %9See also:%9 JOIN, KICK
 

docs/help/in/query.in

@@ -17,8 +17,8 @@
 %9Examples:%9
 
     /QUERY mike
-    /QUERY -liberachat bob
-    /QUERY -liberachat -window sarah
+    /QUERY -freenode bob
+    /QUERY -freenode -window sarah
 
 %9See also:%9 MSG, UNQUERY, WINDOW
 

docs/help/in/recode.in

@@ -22,7 +22,7 @@
 %9Examples:%9
 
     /RECODE
-    /RECODE ADD liberachat/mike utf-8
+    /RECODE ADD Freenode/mike utf-8
     /RECODE ADD #korea euc-kr
     /RECODE REMOVE #korea
 

docs/help/in/reconnect.in

@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /RECONNECT
-    /RECONNECT liberachat
+    /RECONNECT Freenode
     /RECONNECT EFnet BRB :)
 
 %9See also:%9 CONNECT, DISCONNECT, NETWORK, RMRECONNS, SERVER

docs/help/in/server.in

@@ -5,7 +5,7 @@
 
 %9Parameters:%9
 
-    LIST:               Displays the list of servers you have configured.
+    LIST:               Displays the list of servers you are connected to.
     CONNECT:            Connects to the given server.
     ADD:                Adds a server to your configuration.
     MODIFY:             Modifies a server in your configuration.
@@ -28,8 +28,6 @@
     -tls_pinned_pubkey: Pinned public key fingerprint.
     -auto:              Automatically connects to the server on startup.
     -noauto:            Doesn't connect to the server on startup.
-    -cap:               Enable CAPREQ for server.
-    -nocap:             Disable CAPREQ for server.
     -network:           The network the server belongs to.
     -host:              The hostname you would like to connect from.
     -cmdspeed:          Specifies the minimum amount of time, expressed in
@@ -38,7 +36,6 @@
     -cmdmax:            Specifies the maximum number of commands to perform
                         before starting the internal flood protection.
     -port:              Specifies the port to connect to the server.
-    -noproxy:           Ignores the global proxy configuration.
     -rawlog:            Immediately open rawlog after connecting.
     -noautosendcmd:     Doesn't execute autosendcmd.
 
@@ -53,24 +50,24 @@
     When using the ADD parameter on a server that already exists, the
     configuration will be merged with each other.
 
-    When using the CONNECT parameter, it will connect to the specified
-    server; the server in the active window will be disconnected
-    unless you prepend the server with the '+' character.
-
-    Specify '-' as password to remove a server password
+    When using the command without any of the given parameters, it will
+    connect to the specified server; the server in the active window will be
+    disconnected unless you prepend the server with the '+' character; the same
+    method is applicable to the CONNECT parameter.
 
 %9Examples:%9
 
     /SERVER
-    /SERVER CONNECT irc.libera.chat
-    /SERVER CONNECT +irc.libera.chat
-    /SERVER ADD -network liberachat -noautosendcmd irc.libera.chat
-    /SERVER ADD -! -auto -host staff.irssi.org -4 -network liberachat -noproxy irc.libera.chat 6667
-    /SERVER MODIFY -network liberachat -noauto irc.libera.chat
-    /SERVER MODIFY -network liberachat irc.libera.chat 6697 -
-    /SERVER REMOVE irc.libera.chat 6667 liberachat
+    /SERVER chat.freenode.net
+    /SERVER +chat.freenode.net
+    /SERVER CONNECT chat.freenode.net
+    /SERVER CONNECT +chat.freenode.net
+    /SERVER ADD -network Freenode -noautosendcmd orwell.freenode.net
+    /SERVER ADD -! -auto -host staff.irssi.org -port 6667 -4 -network Freenode orwell.freenode.net
+    /SERVER MODIFY -network Freenode -noauto orwell.freenode.net
+    /SERVER REMOVE orwell.freenode.net 6667 Freenode
     /SERVER PURGE
-    /SERVER PURGE irc.libera.chat
+    /SERVER PURGE orwell.freenode.net
 
 %9See also:%9 CHANNEL, CONNECT, DISCONNECT, NETWORK, RECONNECT, RMRECONNS
 

docs/help/in/set.in

@@ -7,7 +7,6 @@
 
     -clear:      Removes the setting's value from the configuration.
     -default:    Restore the setting to its default value.
-    -section:    Print settings under the specified section
 
     The setting and the value; if no value is given, the list of settings that
     matched will be returned. If no arguments are given, all the settings will
@@ -28,7 +27,6 @@
     /SET -clear nick
     /SET log_timestamp %%H:%%H:%%S
     /SET -default log_timestamp
-    /SET -section lookandfeel
     /SET close
 
 %9See also:%9 SAVE, TOGGLE

docs/help/in/statusbar.in

@@ -5,58 +5,32 @@
 
 %9Parameters:%9
 
-    ADD:          Adds a statusbar to the list of statusbars.
-    MODIFY:       Modifies the configuration of a statusbar.
+    ENABLE:       Enables the statusbar.
+    DISABLE:      Disabled the statusbar.
     RESET:        Restores the default statusbar configuration.
-    ADDITEM:      Adds an item to the specified statusbar. It can be set to
-                  appear before/after another item and left/right aligned
-                  to a specified position on the screen.
-    MODIFYITEM:   Changes an item position inside a bar.
-    REMOVEITEM:   Removes an item from the specified statusbar.
-    INFO:         List the current details and items of the specified
-                  statusbar.
+    TYPE:         Identifies the type of statusbar.
+    PLACEMENT:    Identifies the placement of the statusbar.
+    POSITION:     Identifies the position of the statusbar.
+    VISIBLE:      Identifies the visibility of the statusbar.
+    ADD:          Adds a statusbar into the configuration.
+    REMOVE:       Removes a statusbar from the configuration.
 
-    -disable:     Removes a statusbar from the list.
-    -type:        Sets the type of statusbar, for each split window or only
-                  for the current root screen.
-    -placement:   Sets the placement of the statusbar, either at the top or
-                  the bottom of the screen.
-    -position:    Sets the position of the statusbar. Represented as a
-                  number, with 0 implying the first position.
-    -visible:     Sets the visibility of the statusbar or item. If set to
-                  always it is visible on all screens, otherwise if set to
-                  inactive or active then it is only visible on inactive
-                  or active screens, respectively.
-    -before:      This item is added before the other item.
-    -after:       This item is added after the other item.
-    -priority:    When the statusbar items overflow, the item with the
-                  lowest priority is removed or truncated first.
-                  Priority can be negative, in which case it'll have to be
-                  quoted (e.g. -priority "-1")
-    -alignment:   Display the item on the right side.
-
-    Where statusbar refers to the name of the statusbar; if no argument is
-    given, the entire list of statusbars will be displayed.
+    The name of the statusbar; if no argument is given, the list of statusbars
+    will be displayed.
 
 %9Description:%9
 
-    Allows adjustment of the attributes and items of a statusbar, as well
-    as where it is located and whether or not it is currently visible.
+    Modified the attributes of the statusbar.
 
 %9Examples:%9
 
     /STATUSBAR
-    /STATUSBAR INFO window
-    /STATUSBAR REMOVEITEM time window
-    /STATUSBAR ADDITEM time window
-    /STATUSBAR RESET window
-    /STATUSBAR MODIFY -disable topic
-    /STATUSBAR MODIFY -nodisable topic
-
-%9Remarks:%9
-
-    Statusbar syntax was changed in Irssi 1.2. The old syntax is still
-    accepted for backward compatibility, but no longer documented.
+    /STATUSBAR window
+    /STATUSBAR window REMOVE time
+    /STATUSBAR window ADD time
+    /STATUSBAR window RESET
+    /STATUSBAR topic DISABLE
+    /STATUSBAR topic ENABLE
 
 %9See also:%9 WINDOW
 

docs/help/in/window.in

@@ -33,22 +33,19 @@
     THEME:        %|Applies or removes a per-window theme.
     GROW:         %|Increase the size of the active split window by the specified number of lines.
     SHRINK:       %|Decrease the size of the active split window by the specified number of lines.
-    SIZE:         %|Set the current split window size to the specified number of lines.
+    SIZE:         %|Set the current split window size to the specified numer of lines.
     BALANCE:      %|Balance the heights of all split windows.
     HIDE:         %|Hides the current split window, or the split window specified by number or item name.
     SHOW:         %|Show the window specified by number or item name as a new split windows. It is made sticky when autostick_split_windows is turned on.
-    UP:           %|Set the split window left or above the current one active. At the top, wraps to the bottom.
-    DOWN:         %|Set the split window right or below the current one active. At the bottom, wraps left.
+    UP:           %|Set the split window above the current one active. At the top, wraps to the bottom.
+    DOWN:         %|Set the split window below the current one active. At the bottom, wraps to the top.
     LEFT:         %|Go to the previous window numerically that is part of the current sticky group (or not part of any sticky group).
     RIGHT:        %|Go to the next window numerically that is part of the current sticky group (or not part of any sticky group).
     STICK:        %|Make the currently active window sticky, or stick the window specified by number to the currently visible split window. Or turn off stickyness of the currently active window or the window specified by number.
     MOVE LEFT:    %|Move the window to the numerically previous location inside the current sticky group.
     MOVE RIGHT:   %|Move the window to the numerically next location inside the current sticky group.
-    MOVE UP:      %|Move the current window to the sticky group of the previous split window. If no sticky group remains, the split window collapses.
-    MOVE DOWN:    %|Move the current window to the sticky group of the next split window. If no sticky group remains, the split window collapses.
-
-    -right:       %|Makes the command work on the width instead of height, or create the split window to the right instead of top.
-    -directional: %|Set the split window in the given direction to the current one active, or move the current window to the sticky group of the split window in the given direction. (If no sticky group remains, the split window collapses.)
+    MOVE UP:      %|Move the current window to the sticky group of the split window above. If no sticky group remains, the split window collapses.
+    MOVE DOWN:    %|Move the current window to the sticky group of the split window below. If no sticky group remains, the split window collapses.
 
    %|Add the required arguments for the given command. Without arguments, the details (size, immortality, levels, server, name and sticky group) of the currently active window are displayed. If used with a number as argument, same as WINDOW REFNUM.
 

docs/help/meson.build

@@ -1,121 +0,0 @@
-install_data(
-  files(
-    'accept',
-    'action',
-    'admin',
-    'alias',
-    'away',
-    'ban',
-    'beep',
-    'bind',
-    'cat',
-    'cd',
-    'channel',
-    'clear',
-    'completion',
-    'connect',
-    'ctcp',
-    'cycle',
-    'dcc',
-    'dehilight',
-    'deop',
-    'devoice',
-    'die',
-    'disconnect',
-    'echo',
-    'eval',
-    'exec',
-    'flushbuffer',
-    'format',
-    'hash',
-    'help',
-    'hilight',
-    'ignore',
-    'info',
-    'invite',
-    'irssiproxy',
-    'ison',
-    'join',
-    'kick',
-    'kickban',
-    'kill',
-    'knock',
-    'knockout',
-    'lastlog',
-    'layout',
-    'levels',
-    'links',
-    'list',
-    'load',
-    'log',
-    'lusers',
-    'map',
-    'me',
-    'mircdcc',
-    'mode',
-    'motd',
-    'msg',
-    'names',
-    'nctcp',
-    'netsplit',
-    'network',
-    'nick',
-    'notice',
-    'notify',
-    'op',
-    'oper',
-    'otr',
-    'part',
-    'ping',
-    'query',
-    'quit',
-    'quote',
-    'rawlog',
-    'recode',
-    'reconnect',
-    'rehash',
-    'reload',
-    'restart',
-    'rmreconns',
-    'rmrejoins',
-    'save',
-    'sconnect',
-    'script',
-    'scrollback',
-    'server',
-    'servlist',
-    'set',
-    'silence',
-    'squery',
-    'squit',
-    'stats',
-    'statusbar',
-    'time',
-    'toggle',
-    'topic',
-    'trace',
-    'ts',
-    'unalias',
-    'unban',
-    'unignore',
-    'unload',
-    'unnotify',
-    'unquery',
-    'unsilence',
-    'upgrade',
-    'uptime',
-    'userhost',
-    'ver',
-    'version',
-    'voice',
-    'wait',
-    'wall',
-    'wallops',
-    'who',
-    'whois',
-    'whowas',
-    'window',
-  ),
-  install_dir : helpdir)
-
-# subdir('in')

docs/irssi.1

@@ -59,7 +59,7 @@ show a help message
 .SH SEE ALSO
 .B Irssi
 has a solid amount of documentation available; check /HELP or look online
-at https://irssi.org
+at http://www.irssi.org
 .SH FILES
 .TP
 .I ~/.irssi/config

docs/manual.txt

@@ -1,5 +1,5 @@
 
- Irssi 0.8 documentation - https://irssi.org/
+ Irssi 0.8 documentation - http://www.irssi.org/
 
  Copyright(c) 2000 Timo Sirainen <cras@irssi.org>
 
@@ -349,7 +349,7 @@
 	after connecting to the network. This is useful for automatically 
 	identifying yourself to NickServ, for example
 
-	/NETWORK ADD -autosendcmd "/^msg NickServ identify secret" liberachat
+	/NETWORK ADD -autosendcmd "/^msg NickServ identify secret" freenode
 
 	/NETWORK REMOVE <name>
 
@@ -394,26 +394,10 @@
 
  5.4 Server settings
 
-	/SERVER ADD [-tls] [-tls_cert <cert>] [-tls_pkey <pkey>]
-		    [-tls_pass <password>] [-tls_verify] [-tls_cafile <cafile>]
-		    [-tls_capath <capath>] [-tls_ciphers <list>] 
-		    [-tls_pinned_cert <fingerprint>] [-tls_pinned_pubkey <fingerprint>] 
-		    [-auto | -noauto] [-network <network>] [-host <hostname>]
+	/SERVER ADD [-auto | -noauto] [-network <network>] [-host <hostname>]
 	            [-cmdspeed <ms>] [-cmdmax <count>] [-port <port>]
 	            <address> [<port> [<password>]]
 
-	    -tls: Connects using TLS encryption.
-	    -tls_cert: The TLS client certificate file.
-	    -tls_pkey: The TLS client private key, if not included in the 
-	               certificate file.
-	    -tls_pass: The password for the TLS client private key or 
-	    	       certificate.
-	    -tls_verify: Verifies the TLS certificate of the server.
-	    -tls_cafile: The file with the list of CA certificates.
-	    -tls_capath: The directory which contains the CA certificates.
-	    -tls_ciphers: TLS cipher suite preference lists.
-	    -tls_pinned_cert: Pinned x509 certificate fingerprint.
-	    -tls_pinned_pubkey: Pinned public key fingerprint.
 	    -auto: Automatically connect to server at startup
 	    -noauto: Don't connect to server at startup (default)
 	    -network: Specify what IRC network this server belongs to

docs/meson.build

@@ -1,18 +0,0 @@
-install_data(
-  files(
-    'capsicum.txt',
-    'design.html',
-    'design.txt',
-    'faq.html',
-    'faq.txt',
-    'formats.txt',
-    'manual.txt',
-    'perl.txt',
-    'signals.txt',
-    'special_vars.txt',
-    'startup-HOWTO.html',
-    'startup-HOWTO.txt',
-  ),
-  install_dir : docdir)
-
-subdir('help')

docs/perl.txt

@@ -178,9 +178,6 @@ listed after the generic ones.
 Window active_win() - return active window
 Server active_server() - return server in active window
 
-get_irssi_dir() - returns the absolute path to the user configuration
-  directory - either the value passed to --home at startup, or ~/.irssi
-
 windows() - return list of all windows
 servers() - return list of all servers
 reconnects() - return list of all server reconnections
@@ -205,12 +202,6 @@ Window::command(cmd)
 Windowitem::command(cmd)
   Send a command `cmd' (in current channel). The '/' char isn't needed.
 
-version() - return client release date and time (format YYYYMMDD.hhmm)
-
-parse_special(cmd, data="", flags=0)
-Server::parse_special(cmd, data="", flags=0)
-Windowitem::parse_special(cmd, data="", flags=0)
-  evaluate a string with special vars
 
  *** Themes
 
@@ -1201,7 +1192,6 @@ Client->{}
  Bugs and Limitations
  --------------------
 * Calling die in 'script error' handler causes segfault (#101)
-* Calling "script unload" from your own script causes segfault
 * Storing and later using any Irssi object may result in use-after-free related crash
   - Workaround: always acquire fresh objects
 * Calling $dcc->close from the "dcc created" signal will cause unstable behaviour and crashes (#386)

docs/proxy.txt

@@ -24,7 +24,7 @@ You really should set some password for the proxy with:
 Then you'll need to configure the ports/ircnets the proxy listens in,
 something like:
 
-  /SET irssiproxy_ports IRCnet=2777 EFNet=2778 liberachat=2779
+  /SET irssiproxy_ports ircnet=2777 efnet=2778 freenode=2779
 
 There we have 3 different irc networks answering in 3 ports. Note that
 you'll have to make the correct /IRCNET ADD and /SERVER ADD commands to

docs/signals.txt

@@ -63,7 +63,6 @@ nicklist.c:
  "nicklist remove", CHANNEL_REC, NICK_REC
  "nicklist changed", CHANNEL_REC, NICK_REC, char *old_nick
  "nicklist host changed", CHANNEL_REC, NICK_REC
- "nicklist account changed", CHANNEL_REC, NICK_REC, char *account
  "nicklist gone changed", CHANNEL_REC, NICK_REC
  "nicklist serverop changed", CHANNEL_REC, NICK_REC
 
@@ -133,10 +132,7 @@ irc-servers.c:
 irc-cap.c
  "server cap ack "<cmd>, SERVER_REC
  "server cap nak "<cmd>, SERVER_REC
- "server cap new "<cmd>, SERVER_REC
- "server cap delete "<cmd>, SERVER_REC
  "server cap end", SERVER_REC
- "server cap req", SERVER_REC, char *caps
 
 sasl.c
  "server sasl failure", SERVER_REC, char *reason
@@ -145,13 +141,11 @@ sasl.c
 irc.c:
 
  "server event", SERVER_REC, char *data, char *sender_nick, char *sender_address
- "server event tags", SERVER_REC, char *data, char *sender_nick, char *sender_address, char *tags
  "event "<cmd>, SERVER_REC, char *args, char *sender_nick, char *sender_address
  "default event", SERVER_REC, char *data, char *sender_nick, char *sender_address
  "whois default event", SERVER_REC, char *args, char *sender_nick, char *sender_address
 
  "server incoming", SERVER_REC, char *data
- "server outgoing modify", SERVER_REC, GString *data, int crlf
 
 (for perl parser..)
  "redir "<cmd>, SERVER_REC, char *args, char *sender_nick, char *sender_address
@@ -247,12 +241,12 @@ FE common
  "gui print text", WINDOW_REC, int fg, int bg, int flags, char *text, TEXT_DEST_REC
 
 (Can be used to determine when all "gui print text"s are sent (not required))
- "gui print text finished", WINDOW_REC, TEXT_DEST_REC
+ "gui print text finished", WINDOW_REC
 
 * Provides signals:
 
 completion.c:
- "complete word", GList * of char *s, WINDOW_REC, char *word, char *linestart, int *want_space
+ "complete word", GList * of char*, WINDOW_REC, char *word, char *linestart, int *want_space
 
 fe-common-core.c:
  "irssi init read settings"
@@ -267,18 +261,14 @@ fe-messages.c:
  "message private", SERVER_REC, char *msg, char *nick, char *address, char *target
  "message own_public", SERVER_REC, char *msg, char *target
  "message own_private", SERVER_REC, char *msg, char *target, char *orig_target
- "message join", SERVER_REC, char *channel, char *nick, char *address, char *account, char *realname
+ "message join", SERVER_REC, char *channel, char *nick, char *address
  "message part", SERVER_REC, char *channel, char *nick, char *address, char *reason
  "message quit", SERVER_REC, char *nick, char *address, char *reason
  "message kick", SERVER_REC, char *channel, char *nick, char *kicker, char *address, char *reason
  "message nick", SERVER_REC, char *newnick, char *oldnick, char *address
  "message own_nick", SERVER_REC, char *newnick, char *oldnick, char *address
  "message invite", SERVER_REC, char *channel, char *nick, char *address
- "message invite_other", SERVER_REC, char *channel, char *invited, char *nick, char *address
  "message topic", SERVER_REC, char *channel, char *topic, char *nick, char *address
- "message host_changed", SERVER_REC, char *nick, char *newaddress, char *oldaddress
- "message account_changed", SERVER_REC, char *nick, char *address, char *account
- "message away_notify", SERVER_REC, char *nick, char *address, char *awaymsg
 
 keyboard.c:
  "keyinfo created", KEYINFO_REC
@@ -286,8 +276,6 @@ keyboard.c:
 
 printtext.c:
  "print text", TEXT_DEST_REC *dest, char *text, char *stripped
- "print format", THEME_REC *theme, char *module, TEXT_DEST_REC *dest, formatnum_args
- "print noformat", TEXT_DEST_REC *dest, char *text
 
 themes.c:
  "theme created", THEME_REC
@@ -295,7 +283,6 @@ themes.c:
 
 window-activity.c:
  "window hilight", WINDOW_REC
- "window hilight check", TEXT_DEST_REC, char *msg, int *data_level, int *should_ignore
  "window dehilight", WINDOW_REC
  "window activity", WINDOW_REC, int old_level
  "window item hilight", WI_ITEM_REC
@@ -351,25 +338,15 @@ Text FE
 
 gui-readline.c:
  "gui key pressed", int key
- "paste event", char *paste, char *arg
 
 gui-printtext.c:
  "beep"
- "gui print text after finished", WINDOW_REC, LINE_REC *line, LINE_REC *prev_line, TEXT_DEST_REC
+ "gui print text after finished", WINDOW_REC, LINE_REC *line, LINE_REC *prev_line
 
 textbuffer-view.c
  "gui textbuffer line removed", TEXTBUFFER_VIEW_REC *view, LINE_REC *line, LINE_REC *prev_line
 
-textbuffer-formats.c
- "gui render line text", TEXT_DEST_REC, GString *str, LINE_INFO_META_REC
-
 Perl
 ----
 
 "script error", PERL_SCRIPT_REC, char *errormsg
-
-OTR Core
---------
-
-otr.c:
- "otr event", SERVER_REC, char *nick, char *status

docs/special_vars.txt

@@ -94,8 +94,6 @@ $A .. $Z is important.
    $winname             window name
    $itemname            like $T, but use item's visible_name which may be
                         different (eg. $T = !12345chan, $itemname = !chan)
-   $abiversion          IRSSI_ABI_VERSION
-                         https://github.com/irssi/irssi/wiki/irssi_abi_version
 
 For example, assume you have the following alias:
 

docs/startup-HOWTO.html

@@ -1,13 +1,16 @@
-<base href='https://irssi.org/documentation/startup/'>
-<h1>Startup How-To</h1>
-    <h3 id="to-new-irssi-users-not-to-new-irc-users-">To new Irssi users (not to new IRC users ..)</h3>
+                    <h1>Startup How-To</h1>
+<h3 id="to-new-irssi-users-not-to-new-irc-users-">To new Irssi users (not to new IRC users ..)</h3>
 
-<p>Copyright (c) 2000-2002 by Timo Sirainen, release under <a href="https://www.gnu.org/licenses/fdl.html">GNU FDL</a> 1.1 license.</p>
+<p>Copyright (c) 2000-2002 by Timo Sirainen, release under <a href="http://www.gnu.org/licenses/fdl.html">GNU FDL</a> 1.1 license.</p>
 
 <p>Index with some FAQ questions that are answered in the chapter:</p>
 
 <ol>
-  <li><a href="#first-steps">First steps</a></li>
+  <li><a href="#for-all-the-ircii-people">For all the ircII people</a>
+    <ul>
+      <li>This window management is just weird, I want it exactly like ircII</li>
+    </ul>
+  </li>
   <li><a href="#basic-user-interface-usage">Basic user interface usage</a>
     <ul>
       <li>Split windows work in weird way</li>
@@ -47,11 +50,7 @@
     </ul>
   </li>
   <li><a href="#proxies-and-irc-bouncers">Proxies and IRC bouncers</a></li>
-  <li><a href="#irssis-settings">Irssi’s settings</a>
-    <ul>
-      <li><a href="#for-all-the-ircii-people">For all the ircII people</a></li>
-    </ul>
-  </li>
+  <li><a href="#irssis-settings">Irssi’s settings</a></li>
   <li><a href="#statusbar">Statusbar</a>
     <ul>
       <li>I loaded a statusbar script but it’s not visible anywhere!</li>
@@ -59,176 +58,169 @@
   </li>
 </ol>
 
-<h2 id="first-steps">1. First steps</h2>
+<h2 id="for-all-the-ircii-people">1. For all the ircII people</h2>
 
-<p>IRC Networks are made of servers, and servers have channels. The default config has a few predefined networks, to list them:</p>
+<p>These settings should give you pretty good defaults (the ones I use):</p>
 
-<div><div><pre><code>/NETWORK LIST
-</code></pre></div></div>
+<p>If colors don’t work, and you know you’re not going to use some weird non-VT compatible terminal (you most probably aren’t), just say:</p>
 
-<p>And to connect to one of those networks and join a channel:</p>
+<pre><code> /SET term_force_colors ON
+</code></pre>
 
-<div><div><pre><code>/CONNECT liberachat
-/JOIN #irssi
-</code></pre></div></div>
+<p>I don’t like automatic query windows, I don’t like status window, I do like msgs window where all messages go:</p>
 
-<p>To add more networks:</p>
+<pre><code> /SET autocreate_own_query OFF
+ /SET autocreate_query_level DCCMSGS
+ /SET use_status_window OFF
+ /SET use_msgs_window ON
+</code></pre>
 
-<div><div><pre><code>/NETWORK ADD ExampleNet
-</code></pre></div></div>
+<p>Disable automatic window closing when <code>/PART</code>ing channel or <code>/UNQUERY</code>ing query:</p>
 
-<p>Then add some servers (with -auto to automatically connect):</p>
+<pre><code> /SET autoclose_windows OFF
+ /SET reuse_unused_windows ON
+</code></pre>
 
-<div><div><pre><code>/SERVER ADD -auto -network ExampleNet irc.example.net
-</code></pre></div></div>
+<p>Here’s the settings that make irssi work exactly like ircII in window management (send me a note if you can think of more):</p>
 
-<p>Automatically join to channels after connected to server:</p>
+<pre><code> /SET autocreate_own_query OFF
+ /SET autocreate_query_level NONE
+ /SET use_status_window OFF
+ /SET use_msgs_window OFF
+ /SET reuse_unused_windows ON
+ /SET windows_auto_renumber OFF
 
-<div><div><pre><code>/CHANNEL ADD -auto #lounge ExampleNet
-</code></pre></div></div>
+ /SET autostick_split_windows OFF
+ /SET autoclose_windows OFF
+ /SET print_active_channel ON
+</code></pre>
 
-<p>To modify existing networks (or servers, or channels) just ADD again using the same name as before. This configures a network to identify with nickserv and wait for 2 seconds before joining channels:</p>
+<p>And example how to add servers:</p>
 
-<div><div><pre><code>/NETWORK ADD -autosendcmd "/^msg nickserv ident pass;wait 2000" ExampleNet
-</code></pre></div></div>
+<p>(OFTC network, identify with nickserv and wait for 2 seconds before joining channels)</p>
 
-<p>If you have irssi 0.8.18 or higher and the irc network supports it, you can use SASL instead of nickserv, which is more reliable:</p>
+<pre><code> /NETWORK ADD -autosendcmd "/^msg nickserv ident pass;wait 2000" OFTC
+</code></pre>
 
-<div><div><pre><code>/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN liberachat
-</code></pre></div></div>
+<p>(NOTE: use /IRCNET with 0.8.9 and older)</p>
 
-<p>These commands have many more options, see their help for details:</p>
+<p>Then add some servers to different networks (network is already set up for them), irc.kpnqwest.fi is used by default for IRCNet but if it fails, irc.funet.fi is tried next:</p>
 
-<div><div><pre><code>/HELP NETWORK
-/HELP SERVER
-/HELP CHANNEL
-/HELP
-</code></pre></div></div>
+<pre><code> /SERVER ADD -auto -network IRCnet irc.kpnqwest.fi 6667
+ /SERVER ADD -network IRCnet irc.funet.fi 6667
+ /SERVER ADD -auto -network efnet efnet.cs.hut.fi 6667
+</code></pre>
+
+<p>Automatically join to channels after connected to server, send op request to bot after joined to efnet/#irssi:</p>
+
+<pre><code> /CHANNEL ADD -auto #irssi IRCnet
+ /CHANNEL ADD -auto -bots *!*bot@host.org -botcmd "/^msg $0 op pass" #irssi efnet
+</code></pre>
 
 <p>If you want lines containing your nick to hilight:</p>
 
-<div><div><pre><code>/HILIGHT nick
-</code></pre></div></div>
-
-<p>Or, for irssi 0.8.18 or higher:</p>
-
-<div><div><pre><code>/SET hilight_nick_matches_everywhere ON
-</code></pre></div></div>
-
-<p>To get beeps on private messages or highlights:</p>
-
-<div><div><pre><code>/SET beep_msg_level MSGS HILIGHT DCCMSGS
-</code></pre></div></div>
-
-<p>No other irssi settings are needed (don’t enable bell_beeps), but there may be settings to change in your terminal multiplexer (screen/tmux), your terminal, or your desktop environment.</p>
+<pre><code> /HILIGHT nick
+</code></pre>
 
 <h2 id="basic-user-interface-usage">2. Basic user interface usage</h2>
 
 <p>Windows can be scrolled up/down with PgUp and PgDown keys. If they don’t work for you, use Meta-p and Meta-n keys. For jumping to beginning or end of the buffer, use <code>/SB HOME</code> and <code>/SB END</code> commands.</p>
 
-<p>By default, irssi uses “hidden windows” for everything. Hidden windows are created every time you <code>/JOIN</code> a channel or <code>/QUERY</code> someone. There’s several ways you can change between these windows:</p>
+<p>By default, irssi uses “hidden windows” for everything. Hidden window is created every time you <code>/JOIN</code> a channel or <code>/QUERY</code> someone. There’s several ways you can change between these windows:</p>
 
-<div><div><pre><code>Meta-1, Meta-2, .. Meta-0 - Jump directly between windows 1-10
-Meta-q .. Meta-o          - Jump directly between windows 11-19
-/WINDOW &lt;number&gt;          - Jump to any window with specified number
-Ctrl-P, Ctrl-N            - Jump to previous / next window
-</code></pre></div></div>
+<pre><code> Meta-1, Meta-2, .. Meta-0 - Jump directly between windows 1-10
+ Meta-q .. Meta-o          - Jump directly between windows 11-19
+ /WINDOW &lt;number&gt;          - Jump to any window with specified number
+ Ctrl-P, Ctrl-N            - Jump to previous / next window
+</code></pre>
 
-<p>Clearly the easiest way is to use Meta-number keys. Meta usually means the ALT key, but if that doesn’t work, you can use ESC.</p>
+<p>Clearly the easiest way is to use Meta-number keys. And what is the Meta key? ESC key always works as Meta, but there’s also easier ways. ALT could work as Meta, or if you have Windows keyboard, left Windows key might work as Meta. If they don’t work directly, you’ll need to set a few X resources (NOTE: these work with both xterm and rxvt):</p>
 
-<p>Mac OS X users with ALT key issues might prefer using <a href="https://www.iterm2.com/">iTerm2</a> instead of the default terminal emulator.</p>
-
-<h3 id="alt-key-as-meta-for-xtermrxvt-users">Alt key as meta, for xterm/rxvt users</h3>
-
-<p>If you use xterm or rxvt, you may need to set a few X resources:</p>
-
-<div><div><pre><code> XTerm*eightBitInput:   false
+<pre><code> XTerm*eightBitInput:   false
  XTerm*metaSendsEscape: true
-</code></pre></div></div>
+</code></pre>
 
 <p>With rxvt, you can also specify which key acts as Meta key. So if you want to use ALT instead of Windows key for it, use:</p>
 
-<div><div><pre><code> rxvt*modifier: alt
-</code></pre></div></div>
+<pre><code> rxvt*modifier: alt
+</code></pre>
 
 <p>You could do this by changing the X key mappings:</p>
 
-<div><div><pre><code> xmodmap -e "keysym Alt_L = Meta_L Alt_L"
-</code></pre></div></div>
+<pre><code> xmodmap -e "keysym Alt_L = Meta_L Alt_L"
+</code></pre>
 
 <p>And how exactly do you set these X resources? For Debian, there’s <code>/etc/X11/Xresources/xterm</code> file where you can put them and it’s read automatically when X starts. <code>~/.Xresources</code> and <code>~/.Xdefaults</code> files might also work. If you can’t get anything else to work, just copy and paste those lines to <code>~/.Xresources</code> and directly call <code>xrdb -merge ~/.Xresources</code> in some xterm. The resources affect only the new xterms you start, not existing ones.</p>
 
-<h3 id="split-windows-and-window-items">Split windows and window items</h3>
-
-<p><em>Note: <a href="https://quadpoint.org/articles/irssisplit/">this guide</a> might be a better introduction to window splits</em></p>
+<p>Many windows SSH clients also don’t allow usage of ALT. One excellent client that does allow is putty, you can download it from <a href="http://www.chiark.greenend.org.uk/~sgtatham/putty/"> http://www.chiark.greenend.org.uk/~sgtatham/putty/</a>.</p>
 
 <p>Irssi also supports split windows, they’ve had some problems in past but I think they should work pretty well now :) Here’s some commands related to them:</p>
 
-<div><div><pre><code>/WINDOW NEW                    - Create new split window
-/WINDOW NEW HIDE               - Create new hidden window
-/WINDOW CLOSE                  - Close split or hidden window
+<pre><code> /WINDOW NEW                    - Create new split window
+ /WINDOW NEW HIDE               - Create new hidden window
+ /WINDOW CLOSE                  - Close split or hidden window
 
-/WINDOW HIDE [&lt;number&gt;|&lt;name&gt;] - Make the split window hidden window
-/WINDOW SHOW &lt;number&gt;|&lt;name&gt;   - Make the hidden window a split window
+ /WINDOW HIDE [&lt;number&gt;|&lt;name&gt;] - Make the split window hidden window
+ /WINDOW SHOW &lt;number&gt;|&lt;name&gt;   - Make the hidden window a split window
 
-/WINDOW SHRINK [&lt;lines&gt;]       - Shrink the split window
-/WINDOW GROW [&lt;lines&gt;]         - Grow the split window
-/WINDOW BALANCE                - Balance the sizes of all split windows
-</code></pre></div></div>
+ /WINDOW SHRINK [&lt;lines&gt;]       - Shrink the split window
+ /WINDOW GROW [&lt;lines&gt;]         - Grow the split window
+ /WINDOW BALANCE                - Balance the sizes of all split windows
+</code></pre>
 
 <p>By default, irssi uses “sticky windowing” for split windows. This means that windows created inside one split window cannot be moved to another split window without some effort. For example you could have following window layout:</p>
 
-<div><div><pre><code> Split window 1: win#1 - Status window, win#2 - Messages window
+<pre><code> Split window 1: win#1 - Status window, win#2 - Messages window
  Split window 2: win#3 - IRCnet/#channel1, win#4 - IRCnet/#channel2
  Split window 3: win#5 - efnet/#channel1, win#6 - efnet/#channel2
-</code></pre></div></div>
+</code></pre>
 
 <p>When you are in win#1 and press ALT-6, irssi jumps to split window #3 and moves the efnet/#channel2 the active window.</p>
 
 <p>With non-sticky windowing the windows don’t have any relationship with split windows, pressing ALT-6 in win#1 moves win#6 to split window 1 and sets it active, except if win#6 was already visible in some other split window irssi just changes to that split window. This it the way windows work with ircii, if you prefer it you can set it with</p>
 
-<div><div><pre><code>/SET autostick_split_windows OFF
-</code></pre></div></div>
+<pre><code> /SET autostick_split_windows OFF
+</code></pre>
 
 <p>Each window can have multiple channels, queries and other “window items” inside them. If you don’t like windows at all, you disable automatic creating of them with</p>
 
-<div><div><pre><code>/SET autocreate_windows OFF
-</code></pre></div></div>
+<pre><code> /SET autocreate_windows OFF
+</code></pre>
 
 <p>And if you keep all channels in one window, you most probably want the channel name printed in each line:</p>
 
-<div><div><pre><code>/SET print_active_channel ON
-</code></pre></div></div>
+<pre><code> /SET print_active_channel ON
+</code></pre>
 
 <p>If you want to group only some channels or queries in one window, use</p>
 
-<div><div><pre><code>/JOIN -window #channel
-/QUERY -window nick
-</code></pre></div></div>
+<pre><code> /JOIN -window #channel
+ /QUERY -window nick
+</code></pre>
 
 <h2 id="server-and-channel-automation">3. Server and channel automation</h2>
 
 <p>Irssi’s multiple IRC network support is IMHO very good - at least compared to other clients :) Even if you’re only in one IRC network you should group all your servers to be in the same IRC network as this helps with reconnecting if your primary server breaks and is probably useful in some other ways too :) For information how to actually use irssi correctly with multiple servers see the chapter 6.</p>
 
-<p>First you need to have your IRC network set, use <code>/NETWORK</code> command to see if it’s already there. If it isn’t, use <code>/NETWORK ADD yournetwork</code>. If you want to execute some commands automatically when you’re connected to some network, use <code>-autosendcmd</code> option. Here’s some examples:</p>
+<p>First you need to have your IRC network set, use <code>/NETWORK</code> command to see if it’s already there. If it isn’t, use <code>/NETWORK ADD yournetwork</code>. If you want to execute some commands automatically when you’re connected to some network, use <code>-autosendcmd</code> option. (NOTE: use /IRCNET with 0.8.9 and older.) Here’s some examples:</p>
 
-<div><div><pre><code>/NETWORK ADD -autosendcmd '^msg bot invite' IRCnet
-/NETWORK ADD -autosendcmd "/^msg nickserv ident pass;wait 2000" OFTC
-</code></pre></div></div>
+<pre><code> /NETWORK ADD -autosendcmd '^msg bot invite' IRCnet
+ /NETWORK ADD -autosendcmd "/^msg nickserv ident pass;wait 2000" OFTC
+</code></pre>
 
 <p>After that you need to add your servers. For example:</p>
 
-<div><div><pre><code>/SERVER ADD -auto -network IRCnet irc.kpnqwest.fi 6667
-/SERVER ADD -auto -network worknet irc.mycompany.com 6667 password
-</code></pre></div></div>
+<pre><code> /SERVER ADD -auto -network IRCnet irc.kpnqwest.fi 6667
+ /SERVER ADD -auto -network worknet irc.mycompany.com 6667 password
+</code></pre>
 
 <p>The <code>-auto</code> option specifies that this server is automatically connected at startup. You don’t need to make more than one server with <code>-auto</code> option to one IRC network, other servers are automatically connected in same network if the <code>-auto</code> server fails.</p>
 
 <p>And finally channels:</p>
 
-<div><div><pre><code>/CHANNEL ADD -auto -bots *!*bot@host.org -botcmd "/^msg $0 op pass" #irssi efnet
-/CHANNEL ADD -auto #secret IRCnet password
-</code></pre></div></div>
+<pre><code> /CHANNEL ADD -auto -bots *!*bot@host.org -botcmd "/^msg $0 op pass" #irssi efnet
+ /CHANNEL ADD -auto #secret IRCnet password
+</code></pre>
 
 <p><code>-bots</code> and <code>-botcmd</code> should be the only ones needing a bit of explaining. They’re used to send commands automatically to bot when channel is joined, usually to get ops automatically. You can specify multiple bot masks with <code>-bots</code> option separated with spaces (and remember to quote the string then). The $0 in <code>-botcmd</code> specifies the first found bot in the list. If you don’t need the bot masks (ie. the bot is always with the same nick, like chanserv) you can give only the <code>-botcmd</code> option and the command is always sent.</p>
 
@@ -236,9 +228,9 @@ Ctrl-P, Ctrl-N            - Jump to previous / next window
 
 <p>First connect to all the servers, join the channels and create the queries you want. If you want to move the windows or channels around use commands:</p>
 
-<div><div><pre><code>/WINDOW MOVE LEFT/RIGHT/number    - move window elsewhere
-/WINDOW ITEM MOVE &lt;number&gt;|&lt;name&gt; - move channel/query to another window
-</code></pre></div></div>
+<pre><code> /WINDOW MOVE LEFT/RIGHT/number    - move window elsewhere
+ /WINDOW ITEM MOVE &lt;number&gt;|&lt;name&gt; - move channel/query to another window
+</code></pre>
 
 <p>When everything looks the way you like, use <code>/LAYOUT SAVE</code> command (and <code>/SAVE</code>, if you don’t have autosaving enabled) and when you start irssi next time, irssi remembers the positions of the channels, queries and everything. This “remembering” doesn’t mean that simply using <code>/LAYOUT SAVE</code> would automatically make irssi reconnect to all servers and join all channels, you’ll need the <code>/SERVER ADD -auto</code> and <code>/CHANNEL ADD -auto</code> commands to do that.</p>
 
@@ -248,32 +240,32 @@ Ctrl-P, Ctrl-N            - Jump to previous / next window
 
 <p>By default, all the “extra messages” go to status window. This means pretty much all messages that don’t clearly belong to some channel or query. Some people like it, some don’t. If you want to remove it, use</p>
 
-<div><div><pre><code>/SET use_status_window OFF
-</code></pre></div></div>
+<pre><code> /SET use_status_window OFF
+</code></pre>
 
 <p>This doesn’t have any effect until you restart irssi. If you want to remove it immediately, just <code>/WINDOW CLOSE</code> it.</p>
 
 <p>Another common window is “messages window”, where all private messages go. By default it’s disabled and query windows are created instead. To make all private messages go to msgs window, say:</p>
 
-<div><div><pre><code>/SET use_msgs_window ON
-/SET autocreate_query_level DCCMSGS  (or if you don't want queries to
+<pre><code> /SET use_msgs_window ON
+ /SET autocreate_query_level DCCMSGS  (or if you don't want queries to
  				      dcc chats either, say NONE)
-</code></pre></div></div>
+</code></pre>
 
 <p>use_msgs_window either doesn’t have any effect until restarting irssi. To create it immediately say:</p>
 
-<div><div><pre><code>/WINDOW NEW HIDE     - create the window
-/WINDOW NAME (msgs)  - name it to "(msgs)"
-/WINDOW LEVEL MSGS   - make all private messages go to this window
-/WINDOW MOVE 1       - move it to first window
-</code></pre></div></div>
+<pre><code> /WINDOW NEW HIDE     - create the window
+ /WINDOW NAME (msgs)  - name it to "(msgs)"
+ /WINDOW LEVEL MSGS   - make all private messages go to this window
+ /WINDOW MOVE 1       - move it to first window
+</code></pre>
 
 <p>Note that neither use_msgs_window nor use_status_window have any effect at all if <code>/LAYOUT SAVE</code> has been used.</p>
 
 <p>This brings us to message levels.. What are they? All messages that irssi prints have one or more “message levels”. Most common are PUBLIC for public messages in channels, MSGS for private messages and CRAP for all sorts of messages with no real classification. You can get a whole list of levels with</p>
 
-<div><div><pre><code>/HELP levels
-</code></pre></div></div>
+<pre><code> /HELP levels
+</code></pre>
 
 <p>Status window has message level <code>ALL -MSGS</code>, meaning that all messages, except private messages, without more specific place go to status window. The <code>-MSGS</code> is there so it doesn’t conflict with messages window.</p>
 
@@ -281,15 +273,15 @@ Ctrl-P, Ctrl-N            - Jump to previous / next window
 
 <p>ircii and several other clients support multiple servers by placing the connection into some window. IRSSI DOES NOT. There is no required relationship between window and server. You can connect to 10 servers and manage them all in just one window, or join channel in each one of them to one single window if you really want to. That being said, here’s how you do connect to new server without closing the old connection:</p>
 
-<div><div><pre><code>/CONNECT irc.server.org
-</code></pre></div></div>
+<pre><code> /CONNECT irc.server.org
+</code></pre>
 
 <p>Instead of the <code>/SERVER</code> which disconnects the existing connection. To see list of all active connections, use <code>/SERVER</code> without any parameters. You should see a list of something like:</p>
 
-<div><div><pre><code> -!- IRCNet: irc.song.fi:6667 (IRCNet)
+<pre><code> -!- IRCNet: irc.song.fi:6667 (IRCNet)
  -!- OFTC: irc.oftc.net:6667 (OFTC)
  -!- RECON-1: 192.168.0.1:6667 () (02:59 left before reconnecting)
-</code></pre></div></div>
+</code></pre>
 
 <p>Here you see that we’re connected to IRCNet and OFTC networks. The IRCNet at the beginning is called the “server tag” while the (IRCnet) at the end shows the IRC network. Server tag specifies unique tag to refer to the server, usually it’s the same as the IRC network. When the IRC network isn’t known it’s some part of the server name. When there’s multiple connections to same IRC network or server, irssi adds a number after the tag so there could be network, network2, network3 etc.</p>
 
@@ -297,63 +289,63 @@ Ctrl-P, Ctrl-N            - Jump to previous / next window
 
 <p>To disconnect one of the servers, or to stop irssi from reconnecting, use</p>
 
-<div><div><pre><code>/DISCONNECT network   - disconnect server with tag "network"
-/DISCONNECT recon-1  - stop trying to reconnect to RECON-1 server
-/RMRECONNS           - stop all server reconnections
+<pre><code> /DISCONNECT network   - disconnect server with tag "network"
+ /DISCONNECT recon-1  - stop trying to reconnect to RECON-1 server
+ /RMRECONNS           - stop all server reconnections
 
-/RECONNECT recon-1   - immediately try reconnecting back to RECON-1
-/RECONNECT ALL       - immediately try reconnecting back to all
+ /RECONNECT recon-1   - immediately try reconnecting back to RECON-1
+ /RECONNECT ALL       - immediately try reconnecting back to all
  		       servers in reconnection queue
-</code></pre></div></div>
+</code></pre>
 
 <p>Now that you’re connected to all your servers, you’ll have to know how to specify which one of them you want to use. One way is to have an empty window, like status or msgs window. In it, you can specify which server to set active with</p>
 
-<div><div><pre><code>/WINDOW SERVER tag    - set server "tag" active
-Ctrl-X                - set the next server in list active
-</code></pre></div></div>
+<pre><code> /WINDOW SERVER tag    - set server "tag" active
+ Ctrl-X                - set the next server in list active
+</code></pre>
 
 <p>When the server is active, you can use it normally. When there’s multiple connected servers, irssi adds [servertag] prefix to all messages in non-channel/query messages so you’ll know where it came from.</p>
 
 <p>Several commands also accept <code>-servertag</code> option to specify which server it should use:</p>
 
-<div><div><pre><code>/MSG -tag nick message
-/JOIN -tag #channel
-/QUERY -tag nick
-</code></pre></div></div>
+<pre><code> /MSG -tag nick message
+ /JOIN -tag #channel
+ /QUERY -tag nick
+</code></pre>
 
 <p><code>/MSG</code> tab completion also automatically adds the <code>-tag</code> option when nick isn’t in active server.</p>
 
 <p>Window’s server can be made sticky. When sticky, it will never automatically change to anything else, and if server gets disconnected, the window won’t have any active server. When the server gets connected again, it is automatically set active in the window. To set the window’s server sticky use</p>
 
-<div><div><pre><code>/WINDOW SERVER -sticky tag
-</code></pre></div></div>
+<pre><code> /WINDOW SERVER -sticky tag
+</code></pre>
 
 <p>This is useful if you wish to have multiple status or msgs windows, one for each server. Here’s how to do them (repeat for each server)</p>
 
-<div><div><pre><code>/WINDOW NEW HIDE
-/WINDOW NAME (status)
-/WINDOW LEVEL ALL -MSGS
-/WINDOW SERVER -sticky network
+<pre><code> /WINDOW NEW HIDE
+ /WINDOW NAME (status)
+ /WINDOW LEVEL ALL -MSGS
+ /WINDOW SERVER -sticky network
 
-/WINDOW NEW HIDE
-/WINDOW NAME (msgs)
-/WINDOW LEVEL MSGS
-/WINDOW SERVER -sticky network
-</code></pre></div></div>
+ /WINDOW NEW HIDE
+ /WINDOW NAME (msgs)
+ /WINDOW LEVEL MSGS
+ /WINDOW SERVER -sticky network
+</code></pre>
 
 <h2 id="lastlog-and-jumping-around-in-scrollback">7. /LASTLOG and jumping around in scrollback</h2>
 
 <p><code>/LASTLOG</code> command can be used for searching texts in scrollback buffer. Simplest usages are</p>
 
-<div><div><pre><code>/LASTLOG word     - print all lines with "word" in them
-/LASTLOG word 10  - print last 10 occurances of "word"
-/LASTLOG -topics  - print all topic changes
-</code></pre></div></div>
+<pre><code> /LASTLOG word     - print all lines with "word" in them
+ /LASTLOG word 10  - print last 10 occurances of "word"
+ /LASTLOG -topics  - print all topic changes
+</code></pre>
 
 <p>If there’s more than 1000 lines to be printed, irssi thinks that you probably made some mistake and won’t print them without <code>-force</code> option. If you want to save the full lastlog to file, use</p>
 
-<div><div><pre><code>/LASTLOG -file ~/irc.log
-</code></pre></div></div>
+<pre><code> /LASTLOG -file ~/irc.log
+</code></pre>
 
 <p>With <code>-file</code> option you don’t need <code>-force</code> even if there’s more than 1000 lines. <code>/LASTLOG</code> has a lot of other options too, see <code>/HELP lastlog</code> for details.</p>
 
@@ -363,29 +355,29 @@ Ctrl-X                - set the next server in list active
 
 <p>Irssi can automatically log important messages when you’re set away (<code>/AWAY reason</code>). When you set yourself unaway (<code>/AWAY</code>), the new messages in away log are printed to screen. You can configure it with:</p>
 
-<div><div><pre><code>/SET awaylog_level MSGS HILIGHT     - Specifies what messages to log
-/SET awaylog_file ~/.irssi/away.log - Specifies the file to use
-</code></pre></div></div>
+<pre><code> /SET awaylog_level MSGS HILIGHT     - Specifies what messages to log
+ /SET awaylog_file ~/.irssi/away.log - Specifies the file to use
+</code></pre>
 
 <p>Easiest way to start logging with Irssi is to use autologging. With it Irssi logs all channels and private messages to specified directory. You can turn it on with</p>
 
-<div><div><pre><code>/SET autolog ON
-</code></pre></div></div>
+<pre><code> /SET autolog ON
+</code></pre>
 
 <p>By default it logs pretty much everything execept CTCPS or CRAP (<code>/WHOIS</code> requests, etc). You can specify the logging level yourself with</p>
 
-<div><div><pre><code>/SET autolog_level ALL -CRAP -CLIENTCRAP -CTCPS (this is the default)
-</code></pre></div></div>
+<pre><code> /SET autolog_level ALL -CRAP -CLIENTCRAP -CTCPS (this is the default)
+</code></pre>
 
-<p>By default irssi logs to ~/irclogs/&lt;servertag&gt;/&lt;target&gt;.log. You can change this with</p>
+<p>By default irssi logs to ~/irclogs/<servertag>/<target>.log. You can change this with</target></servertag></p>
 
-<div><div><pre><code>/SET autolog_path ~/irclogs/$tag/$0.log (this is the default)
-</code></pre></div></div>
+<pre><code> /SET autolog_path ~/irclogs/$tag/$0.log (this is the default)
+</code></pre>
 
 <p>The path is automatically created if it doesn’t exist. $0 specifies the target (channel/nick). You can make irssi automatically rotate the logs by adding date/time formats to the file name. The formats are in “man strftime” format. For example</p>
 
-<div><div><pre><code>/SET autolog_path ~/irclogs/%Y/$tag/$0.%m-%d.log
-</code></pre></div></div>
+<pre><code> /SET autolog_path ~/irclogs/%Y/$tag/$0.%m-%d.log
+</code></pre>
 
 <p>For logging only some specific channels or nicks, see <code>/HELP log</code></p>
 
@@ -395,37 +387,37 @@ Ctrl-X                - set the next server in list active
 
 <p><code>/HELP bind</code> tells pretty much everything there is to know about keyboard bindings. However, there’s the problem of how to bind some non-standard keys. They might differ a bit with each terminal, so you’ll need to find out what exactly the keypress produces. Easiest way to check that would be to see what it prints in <code>cat</code>. Here’s an example for pressing F1 key:</p>
 
-<div><div><pre><code> [cras@hurina] ~% cat
+<pre><code> [cras@hurina] ~% cat
  ^[OP
-</code></pre></div></div>
+</code></pre>
 
 <p>So in irssi you would use <code>/BIND ^[OP /ECHO F1 pressed</code>. If you use multiple terminals which have different bindings for the key, it would be better to use eg.:</p>
 
-<div><div><pre><code>/BIND ^[OP key F1
-/BIND ^[11~ key F1
-/BIND F1 /ECHO F1 pressed.
-</code></pre></div></div>
+<pre><code> /BIND ^[OP key F1
+ /BIND ^[11~ key F1
+ /BIND F1 /ECHO F1 pressed.
+</code></pre>
 
 <h2 id="proxies-and-irc-bouncers">10. Proxies and IRC bouncers</h2>
 
 <p>Irssi supports connecting to IRC servers via a proxy. All server connections are then made through it, and if you’ve set up everything properly, you don’t need to do any <code>/QUOTE SERVER</code> commands manually.</p>
 
-<p>Here’s an example: You have your bouncer (lets say, BNC or BNC-like) listening in irc.bouncer.org port 5000. You want to use it to connect to servers irc.dal.net and irc.efnet.org. First you’d need to setup the bouncer:</p>
+<p>Here’s an example: You have your bouncer (lets say, BNC or BNC-like) listening in irc.bouncer.org port 5000. You want to use it to connect to servers irc.dalnet and irc.efnet.org. First you’d need to setup the bouncer:</p>
 
-<div><div><pre><code>/SET use_proxy ON
-/SET proxy_address irc.bouncer.org
-/SET proxy_port 5000
+<pre><code> /SET use_proxy ON
+ /SET proxy_address irc.bouncer.org
+ /SET proxy_port 5000
 
-/SET proxy_password YOUR_BNC_PASSWORD_HERE
-/SET -clear proxy_string
-/SET proxy_string_after conn %s %d
-</code></pre></div></div>
+ /SET proxy_password YOUR_BNC_PASSWORD_HERE
+ /SET -clear proxy_string
+ /SET proxy_string_after conn %s %d
+</code></pre>
 
 <p>Then you’ll need to add the server connections. These are done exactly as if you’d want to connect directly to them. Nothing special about them:</p>
 
-<div><div><pre><code>/SERVER ADD -auto -network dalnet irc.dal.net
-/SERVER ADD -auto -network efnet irc.efnet.org
-</code></pre></div></div>
+<pre><code> /SERVER ADD -auto -network dalnet irc.dal.net
+ /SERVER ADD -auto -network efnet irc.efnet.org
+</code></pre>
 
 <p>With the proxy <code>/SET</code>s however, irssi now connects to those servers through your BNC. All server connections are made through them so you can just forget that your bouncer even exists.</p>
 
@@ -433,38 +425,38 @@ Ctrl-X                - set the next server in list active
 
 <p><strong>Proxy specific settings:</strong></p>
 
-<p>All proxies except irssi proxy and socks proxy have these settings in common:</p>
+<p>All proxies have these settings in common:</p>
 
-<div><div><pre><code>/SET use_proxy ON
-/SET proxy_address &lt;Proxy host address&gt;
-/SET proxy_port &lt;Proxy port&gt;
-</code></pre></div></div>
+<pre><code> /SET use_proxy ON
+ /SET proxy_address &lt;Proxy host address&gt;
+ /SET proxy_port &lt;Proxy port&gt;
+</code></pre>
 
 <p><strong>HTTP proxy</strong></p>
 
 <p>Use these settings with HTTP proxies:</p>
 
-<div><div><pre><code>/SET -clear proxy_password
-/EVAL SET proxy_string CONNECT %s:%d HTTP/1.0\n\n
-</code></pre></div></div>
+<pre><code> /SET -clear proxy_password
+ /EVAL SET proxy_string CONNECT %s:%d HTTP/1.0\n\n
+</code></pre>
 
 <p><strong>BNC</strong></p>
 
-<div><div><pre><code>/SET proxy_password your_pass
-/SET -clear proxy_string
-/SET proxy_string_after conn %s %d
-</code></pre></div></div>
+<pre><code> /SET proxy_password your_pass
+ /SET -clear proxy_string
+ /SET proxy_string_after conn %s %d
+</code></pre>
 
 <p><strong>dircproxy</strong></p>
 
 <p>dircproxy separates the server connections by passwords. So, if you for example have network connection with password ircpass and OFTC connection with oftcpass, you would do something like this:</p>
 
-<div><div><pre><code>/SET -clear proxy_password
-/SET -clear proxy_string
+<pre><code> /SET -clear proxy_password
+ /SET -clear proxy_string
 
-/SERVER ADD -auto -network IRCnet fake.network 6667 ircpass
-/SERVER ADD -auto -network OFTC fake.oftc 6667 oftcpass
-</code></pre></div></div>
+ /SERVER ADD -auto -network IRCnet fake.network 6667 ircpass
+ /SERVER ADD -auto -network OFTC fake.oftc 6667 oftcpass
+</code></pre>
 
 <p>The server name and port you give isn’t used anywhere, so you can put anything you want in there.</p>
 
@@ -472,73 +464,88 @@ Ctrl-X                - set the next server in list active
 
 <p>psyBNC has internal support for multiple servers. However, it could be a bit annoying to use, and some people just use different users for connecting to different servers. You can manage this in a bit same way as with dircproxy, by creating fake connections:</p>
 
-<div><div><pre><code>/SET -clear proxy_password
-/SET -clear proxy_string
+<pre><code> /SET -clear proxy_password
+ /SET -clear proxy_string
 
-/NETWORK ADD -user networkuser IRCnet
-/SERVER ADD -auto -network IRCnet fake.network 6667 ircpass
-/NETWORK ADD -user oftcuser OFTC
-/SERVER ADD -auto -network OFTC fake.oftc 6667 oftcpass
-</code></pre></div></div>
+ /NETWORK ADD -user networkuser IRCnet
+ /SERVER ADD -auto -network IRCnet fake.network 6667 ircpass
+ /NETWORK ADD -user oftcuser OFTC
+ /SERVER ADD -auto -network OFTC fake.oftc 6667 oftcpass
+</code></pre>
 
 <p>So, you’ll specify the usernames with <code>/NETWORK ADD</code> command, and the user’s password with <code>/SERVER ADD</code>.</p>
 
+<p>(NOTE: use /IRCNET with 0.8.9 and older.)</p>
+
 <p><strong>Irssi proxy</strong></p>
 
 <p>Irssi contains it’s own proxy which you can build giving <code>\--with-proxy</code> option to configure. You’ll still need to run irssi in a screen to use it though.</p>
 
-<p>Irssi proxy is a bit different than most proxies, normally proxies create a new connection to IRC server when a new client connects to it, but <strong>irssi proxy shares your existing IRC connection(s) to multiple clients</strong>. And even more clearly: <strong>You can use only one IRC server connection of the irssi proxy to IRC with as many clients as you want</strong>. Can anyone figure out even more easier ways to say this, so I wouldn’t need to try to explain this thing for minutes every time? :)</p>
+<p>Irssi proxy is a bit different than most proxies, normally proxies create a new connection to IRC server when you connect to it, but <strong>irssi proxy shares your existing IRC connection(s) to multiple clients</strong>. And even more clearly: <strong>You can use only one IRC server connection to IRC with as many clients as you want</strong>. Can anyone figure out even more easier ways to say this, so I wouldn’t need to try to explain this thing for minutes every time? :)</p>
 
 <p>Irssi proxy supports sharing multiple server connections in different ports, like you can share network in port 2777 and efnet in port 2778.</p>
 
 <p>Usage in proxy side:</p>
 
-<div><div><pre><code>/LOAD proxy
-/SET irssiproxy_password &lt;password&gt;
-/SET irssiproxy_ports &lt;network&gt;=&lt;port&gt; ... (eg. IRCnet=2777 efnet=2778)
-</code></pre></div></div>
+<pre><code> /LOAD proxy
+ /SET irssiproxy_password &lt;password&gt;
+ /SET irssiproxy_ports &lt;network&gt;=&lt;port&gt; ... (eg. IRCnet=2777 efnet=2778)
+</code></pre>
 
 <p><strong>NOTE</strong>: you <strong>MUST</strong> add all the servers you are using to server and network lists with <code>/SERVER ADD</code> and <code>/NETWORK ADD</code>. ..Except if you really don’t want to for some reason, and you only use one server connection, you may simply set:</p>
 
-<div><div><pre><code>/SET irssiproxy_ports *=2777
-</code></pre></div></div>
+<pre><code> /SET irssiproxy_ports *=2777
+</code></pre>
+
+<p>The special network name <code>?</code> allows the client to select the
+network dynamically on connect (see below):</p>
+
+<pre>
+/SET irssiproxy_ports ?=2777
+</pre>
 
 <p>Usage in client side:</p>
 
 <p>Just connect to the irssi proxy like it is a normal server with password specified in <code>/SET irssiproxy_password</code>. For example:</p>
 
-<div><div><pre><code>/SERVER ADD -network IRCnet my.irssi-proxy.org 2777 secret
-/SERVER ADD -network efnet my.irssi-proxy.org 2778 secret
-</code></pre></div></div>
+<pre><code> /SERVER ADD -network IRCnet my.irssi-proxy.org 2777 secret
+ /SERVER ADD -network efnet my.irssi-proxy.org 2778 secret
+</code></pre>
+
+<p>Or, if you used <code>?</code> in <code>irssiproxy_ports</code>:</p>
+
+<pre>
+/SERVER ADD -network IRCnet my.irssi-proxy.org 2777 IRCnet:secret
+/SERVER ADD -network efnet my.irssi-proxy.org 2777 efnet:secret
+</pre>
+
+<p>I.e. the network to connect to is specified as part of the password,
+separated by <code>:</code> from the actual proxy password.</p>
 
 <p>Irssi proxy works fine with other IRC clients as well.</p>
 
 <p><strong>SOCKS</strong></p>
 
-<p>Using <a href="https://github.com/rofl0r/proxychains-ng">proxychains-ng</a> is recommended for using irssi with a socks proxy.</p>
-
-<p>Irssi does not support socks proxy natively.</p>
-
-<p>Note that <code>/SET proxy</code> settings don’t have anything to do with socks.</p>
+<p>Irssi can be compiled with socks support (<code>\--with-socks</code> option to configure), but I don’t really know how it works, if at all. <code>/SET proxy</code> settings don’t have anything to do with socks however.</p>
 
 <p><strong>Others</strong></p>
 
 <p>IRC bouncers usually work like IRC servers, and want a password. You can give it with:</p>
 
-<div><div><pre><code>/SET proxy_password &lt;password&gt;
-</code></pre></div></div>
+<pre><code> /SET proxy_password &lt;password&gt;
+</code></pre>
 
 <p>Irssi’s defaults for connect strings are</p>
 
-<div><div><pre><code>/SET proxy_string CONNECT %s %d
-/SET proxy_string_after
-</code></pre></div></div>
+<pre><code> /SET proxy_string CONNECT %s %d
+ /SET proxy_string_after
+</code></pre>
 
 <p>The proxy_string is sent before NICK/USER commands, the proxy_string_after is sent after them. %s and %d can be used with both of them.</p>
 
 <h2 id="irssis-settings">11. Irssi’s settings</h2>
 
-<p>Here’s some settings you might want to change (the default value is shown): Also check the <a href="/documentation/settings/">Settings Documentation</a></p>
+<p>You probably don’t like Irssi’s default settings. I don’t like them. But I’m still convinced that they’re pretty good defaults. Here’s some of them you might want to change (the default value is shown): Also check the <a href="/documentation/settings/">Settings Documentation</a></p>
 
 <p><strong>Queries</strong></p>
 
@@ -626,61 +633,31 @@ Ctrl-X                - set the next server in list active
   <dd>Completion character to use.</dd>
 </dl>
 
-<h3 id="for-all-the-ircii-people">For all the ircII people</h3>
-
-<p>I don’t like automatic query windows, I don’t like status window, I do like msgs window where all messages go:</p>
-
-<div><div><pre><code>/SET autocreate_own_query OFF
-/SET autocreate_query_level DCCMSGS
-/SET use_status_window OFF
-/SET use_msgs_window ON
-</code></pre></div></div>
-
-<p>Disable automatic window closing when <code>/PART</code>ing channel or <code>/UNQUERY</code>ing query:</p>
-
-<div><div><pre><code>/SET autoclose_windows OFF
-/SET reuse_unused_windows ON
-</code></pre></div></div>
-
-<p>Here’s the settings that make irssi work exactly like ircII in window management (send me a note if you can think of more):</p>
-
-<div><div><pre><code>/SET autocreate_own_query OFF
-/SET autocreate_query_level NONE
-/SET use_status_window OFF
-/SET use_msgs_window OFF
-/SET reuse_unused_windows ON
-/SET windows_auto_renumber OFF
-
-/SET autostick_split_windows OFF
-/SET autoclose_windows OFF
-/SET print_active_channel ON
-</code></pre></div></div>
-
 <h2 id="statusbar">12. Statusbar</h2>
 
-<p><code>/STATUSBAR</code> displays a list of the current statusbars, along with their position and visibility:</p>
+<p><code>/STATUSBAR</code> displays a list of statusbars:</p>
 
-<div><div><pre><code> Name                           Type   Placement Position Visible
+<pre><code> Name                           Type   Placement Position Visible
  window                         window bottom    0        always
  window_inact                   window bottom    1        inactive
  prompt                         root   bottom    100      always
  topic                          root   top       1        always
-</code></pre></div></div>
+</code></pre>
 
-<p><code>/STATUSBAR &lt;name&gt;</code> prints the statusbar settings (type, placement, position, visibility) as well as its items. <code>/STATUSBAR &lt;name&gt; ENABLE|DISABLE</code> enables/disables the statusbar. <code>/STATUSBAR &lt;name&gt; RESET</code> resets the statusbar to its default settings, or if the statusbar was created by you, it will be removed.</p>
+<p><code>/STATUSBAR &lt;name&gt;</code> prints the statusbar settings and it’s items. <code>/STATUSBAR &lt;name&gt; ENABLE|DISABLE</code> enables/disables the statusbar. <code>/STATUSBAR &lt;name&gt; RESET</code> resets the statusbar to it’s default settings, or if the statusbar was created by you, it will be removed.</p>
 
-<p>The statusbar type can be either window or root. If the type is window, then a statusbar will be created for each split window, otherwise it will be created only once. Placement can be top or bottom, which refers to the top or bottom of the screen. Position is a number, the higher the value the lower it will appear in-screen. Visible can be always, active or inactive. Active/inactive is useful only with split windows; one split window is active and the rest are inactive. To adjust these settings, the following commands are available:</p>
+<p>Type can be window or root, meaning if the statusbar should be created for each split window, or just once. Placement can be top or bottom. Position is a number, the higher the value the lower in screen it is. Visible can be always, active or inactive. Active/inactive is useful only with split windows, one split window is active and the rest are inactive. These settings can be changed with:</p>
 
-<div><div><pre><code>/STATUSBAR &lt;name&gt; TYPE window|root
-/STATUSBAR &lt;name&gt; PLACEMENT top|bottom
-/STATUSBAR &lt;name&gt; POSITION &lt;num&gt;
-/STATUSBAR &lt;name&gt; VISIBLE always|active|inactive
-</code></pre></div></div>
+<pre><code> /STATUSBAR &lt;name&gt; TYPE window|root
+ /STATUSBAR &lt;name&gt; PLACEMENT top|bottom
+ /STATUSBAR &lt;name&gt; POSITION &lt;num&gt;
+ /STATUSBAR &lt;name&gt; VISIBLE always|active|inactive
+</code></pre>
 
-<p>Statusbar items can also be added or removed via command. Note that when loading new statusbar scripts that add items, you will need to specify where you want to show the item and how it is aligned. This can be accomplished using the below commands:</p>
+<p>When loading a new statusbar scripts, you’ll need to also specify where you want to show it. Statusbar items can be modified with:</p>
 
-<div><div><pre><code>/STATUSBAR &lt;name&gt; ADD [-before | -after &lt;item&gt;] [-priority #] [-alignment left|right] &lt;item&gt;
-/STATUSBAR &lt;name&gt; REMOVE &lt;item&gt;
-</code></pre></div></div>
+<pre><code> /STATUSBAR &lt;name&gt; ADD [-before | -after &lt;item&gt;] [-priority #] [-alignment left|right] &lt;item&gt;
+ /STATUSBAR &lt;name&gt; REMOVE &lt;item&gt;
+</code></pre>
 
-<p>For statusbar scripts, the item name is usually equivalent to the script name. The documentation of the script ought to tell you if this is not the case. For example, to add mail.pl before the window activity item, use: <code>/STATUSBAR window ADD -before act mail</code>.</p>
+<p>The item name with statusbar scripts is usually same as the script’s name. Script’s documentation should tell if this isn’t the case. So, to add mail.pl before the window activity item (see the list with <code>/STATUSBAR</code> window), use: <code>/STATUSBAR window ADD -before act mail</code>.</p>

docs/startup-HOWTO.txt

@@ -1,796 +0,0 @@
-Startup How-To
-
-To new Irssi users (not to new IRC users ..)
-
-Copyright (c) 2000-2002 by Timo Sirainen, release under [1]GNU FDL 1.1 license.
-
-Index with some FAQ questions that are answered in the chapter:
-
- 1. First steps
- 2. Basic user interface usage
-      □ Split windows work in weird way
-      □ How can I easily switch between windows?
-      □ But alt-1 etc. don’t work!
- 3. Server and channel automation
-      □ How do I automatically connect to servers at startup?
-      □ How do I automatically join to channels at startup?
-      □ How do I automatically send commands to server at connect?
- 4. Setting up windows and automatically restoring them at startup
- 5. Status and msgs windows & message levels
-      □ I want /WHOIS to print reply to current window
-      □ I want all messages to go to one window, not create new windows
- 6. How support for multiple servers works in irssi
-      □ I connected to some server that doesn’t respond and now irssi keeps
-        trying to reconnect to it again and again, how can I stop it??
-      □ I want to have own status and/or msgs window for each servers
- 7. /LASTLOG and jumping around in scrollback
-      □ How can I save all texts in a window to file?
- 8. Logging
- 9. Changing keyboard bindings
-      □ How do I make F1 key do something?
-10. Proxies and IRC bouncers
-11. Irssi’s settings
-      □ For all the ircII people
-12. Statusbar
-      □ I loaded a statusbar script but it’s not visible anywhere!
-
-1. First steps
-
-IRC Networks are made of servers, and servers have channels. The default config
-has a few predefined networks, to list them:
-
-/NETWORK LIST
-
-And to connect to one of those networks and join a channel:
-
-/CONNECT liberachat
-/JOIN #irssi
-
-To add more networks:
-
-/NETWORK ADD ExampleNet
-
-Then add some servers (with -auto to automatically connect):
-
-/SERVER ADD -auto -network ExampleNet irc.example.net
-
-Automatically join to channels after connected to server:
-
-/CHANNEL ADD -auto #lounge ExampleNet
-
-To modify existing networks (or servers, or channels) just ADD again using the
-same name as before. This configures a network to identify with nickserv and
-wait for 2 seconds before joining channels:
-
-/NETWORK ADD -autosendcmd "/^msg nickserv ident pass;wait 2000" ExampleNet
-
-If you have irssi 0.8.18 or higher and the irc network supports it, you can use
-SASL instead of nickserv, which is more reliable:
-
-/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN liberachat
-
-These commands have many more options, see their help for details:
-
-/HELP NETWORK
-/HELP SERVER
-/HELP CHANNEL
-/HELP
-
-If you want lines containing your nick to hilight:
-
-/HILIGHT nick
-
-Or, for irssi 0.8.18 or higher:
-
-/SET hilight_nick_matches_everywhere ON
-
-To get beeps on private messages or highlights:
-
-/SET beep_msg_level MSGS HILIGHT DCCMSGS
-
-No other irssi settings are needed (don’t enable bell_beeps), but there may be
-settings to change in your terminal multiplexer (screen/tmux), your terminal,
-or your desktop environment.
-
-2. Basic user interface usage
-
-Windows can be scrolled up/down with PgUp and PgDown keys. If they don’t work
-for you, use Meta-p and Meta-n keys. For jumping to beginning or end of the
-buffer, use /SB HOME and /SB END commands.
-
-By default, irssi uses “hidden windows” for everything. Hidden windows are
-created every time you /JOIN a channel or /QUERY someone. There’s several ways
-you can change between these windows:
-
-Meta-1, Meta-2, .. Meta-0 - Jump directly between windows 1-10
-Meta-q .. Meta-o          - Jump directly between windows 11-19
-/WINDOW <number>          - Jump to any window with specified number
-Ctrl-P, Ctrl-N            - Jump to previous / next window
-
-Clearly the easiest way is to use Meta-number keys. Meta usually means the ALT
-key, but if that doesn’t work, you can use ESC.
-
-Mac OS X users with ALT key issues might prefer using [2]iTerm2 instead of the
-default terminal emulator.
-
-Alt key as meta, for xterm/rxvt users
-
-If you use xterm or rxvt, you may need to set a few X resources:
-
- XTerm*eightBitInput:   false
- XTerm*metaSendsEscape: true
-
-With rxvt, you can also specify which key acts as Meta key. So if you want to
-use ALT instead of Windows key for it, use:
-
- rxvt*modifier: alt
-
-You could do this by changing the X key mappings:
-
- xmodmap -e "keysym Alt_L = Meta_L Alt_L"
-
-And how exactly do you set these X resources? For Debian, there’s /etc/X11/
-Xresources/xterm file where you can put them and it’s read automatically when X
-starts. ~/.Xresources and ~/.Xdefaults files might also work. If you can’t get
-anything else to work, just copy and paste those lines to ~/.Xresources and
-directly call xrdb -merge ~/.Xresources in some xterm. The resources affect
-only the new xterms you start, not existing ones.
-
-Split windows and window items
-
-Note: [3]this guide might be a better introduction to window splits
-
-Irssi also supports split windows, they’ve had some problems in past but I
-think they should work pretty well now :) Here’s some commands related to them:
-
-/WINDOW NEW                    - Create new split window
-/WINDOW NEW HIDE               - Create new hidden window
-/WINDOW CLOSE                  - Close split or hidden window
-
-/WINDOW HIDE [<number>|<name>] - Make the split window hidden window
-/WINDOW SHOW <number>|<name>   - Make the hidden window a split window
-
-/WINDOW SHRINK [<lines>]       - Shrink the split window
-/WINDOW GROW [<lines>]         - Grow the split window
-/WINDOW BALANCE                - Balance the sizes of all split windows
-
-By default, irssi uses “sticky windowing” for split windows. This means that
-windows created inside one split window cannot be moved to another split window
-without some effort. For example you could have following window layout:
-
- Split window 1: win#1 - Status window, win#2 - Messages window
- Split window 2: win#3 - IRCnet/#channel1, win#4 - IRCnet/#channel2
- Split window 3: win#5 - efnet/#channel1, win#6 - efnet/#channel2
-
-When you are in win#1 and press ALT-6, irssi jumps to split window #3 and moves
-the efnet/#channel2 the active window.
-
-With non-sticky windowing the windows don’t have any relationship with split
-windows, pressing ALT-6 in win#1 moves win#6 to split window 1 and sets it
-active, except if win#6 was already visible in some other split window irssi
-just changes to that split window. This it the way windows work with ircii, if
-you prefer it you can set it with
-
-/SET autostick_split_windows OFF
-
-Each window can have multiple channels, queries and other “window items” inside
-them. If you don’t like windows at all, you disable automatic creating of them
-with
-
-/SET autocreate_windows OFF
-
-And if you keep all channels in one window, you most probably want the channel
-name printed in each line:
-
-/SET print_active_channel ON
-
-If you want to group only some channels or queries in one window, use
-
-/JOIN -window #channel
-/QUERY -window nick
-
-3. Server and channel automation
-
-Irssi’s multiple IRC network support is IMHO very good - at least compared to
-other clients :) Even if you’re only in one IRC network you should group all
-your servers to be in the same IRC network as this helps with reconnecting if
-your primary server breaks and is probably useful in some other ways too :) For
-information how to actually use irssi correctly with multiple servers see the
-chapter 6.
-
-First you need to have your IRC network set, use /NETWORK command to see if
-it’s already there. If it isn’t, use /NETWORK ADD yournetwork. If you want to
-execute some commands automatically when you’re connected to some network, use
--autosendcmd option. Here’s some examples:
-
-/NETWORK ADD -autosendcmd '^msg bot invite' IRCnet
-/NETWORK ADD -autosendcmd "/^msg nickserv ident pass;wait 2000" OFTC
-
-After that you need to add your servers. For example:
-
-/SERVER ADD -auto -network IRCnet irc.kpnqwest.fi 6667
-/SERVER ADD -auto -network worknet irc.mycompany.com 6667 password
-
-The -auto option specifies that this server is automatically connected at
-startup. You don’t need to make more than one server with -auto option to one
-IRC network, other servers are automatically connected in same network if the
--auto server fails.
-
-And finally channels:
-
-/CHANNEL ADD -auto -bots *!*bot@host.org -botcmd "/^msg $0 op pass" #irssi efnet
-/CHANNEL ADD -auto #secret IRCnet password
-
--bots and -botcmd should be the only ones needing a bit of explaining. They’re
-used to send commands automatically to bot when channel is joined, usually to
-get ops automatically. You can specify multiple bot masks with -bots option
-separated with spaces (and remember to quote the string then). The $0 in
--botcmd specifies the first found bot in the list. If you don’t need the bot
-masks (ie. the bot is always with the same nick, like chanserv) you can give
-only the -botcmd option and the command is always sent.
-
-4. Setting up windows and automatically restoring them at startup
-
-First connect to all the servers, join the channels and create the queries you
-want. If you want to move the windows or channels around use commands:
-
-/WINDOW MOVE LEFT/RIGHT/number    - move window elsewhere
-/WINDOW ITEM MOVE <number>|<name> - move channel/query to another window
-
-When everything looks the way you like, use /LAYOUT SAVE command (and /SAVE, if
-you don’t have autosaving enabled) and when you start irssi next time, irssi
-remembers the positions of the channels, queries and everything. This
-“remembering” doesn’t mean that simply using /LAYOUT SAVE would automatically
-make irssi reconnect to all servers and join all channels, you’ll need the /
-SERVER ADD -auto and /CHANNEL ADD -auto commands to do that.
-
-If you want to change the layout, you just rearrange the layout like you want
-it and use /LAYOUT SAVE again. If you want to remove the layout for some
-reason, use /LAYOUT RESET.
-
-5. Status and msgs windows & message levels
-
-By default, all the “extra messages” go to status window. This means pretty
-much all messages that don’t clearly belong to some channel or query. Some
-people like it, some don’t. If you want to remove it, use
-
-/SET use_status_window OFF
-
-This doesn’t have any effect until you restart irssi. If you want to remove it
-immediately, just /WINDOW CLOSE it.
-
-Another common window is “messages window”, where all private messages go. By
-default it’s disabled and query windows are created instead. To make all
-private messages go to msgs window, say:
-
-/SET use_msgs_window ON
-/SET autocreate_query_level DCCMSGS  (or if you don't want queries to
-                                      dcc chats either, say NONE)
-
-use_msgs_window either doesn’t have any effect until restarting irssi. To
-create it immediately say:
-
-/WINDOW NEW HIDE     - create the window
-/WINDOW NAME (msgs)  - name it to "(msgs)"
-/WINDOW LEVEL MSGS   - make all private messages go to this window
-/WINDOW MOVE 1       - move it to first window
-
-Note that neither use_msgs_window nor use_status_window have any effect at all
-if /LAYOUT SAVE has been used.
-
-This brings us to message levels.. What are they? All messages that irssi
-prints have one or more “message levels”. Most common are PUBLIC for public
-messages in channels, MSGS for private messages and CRAP for all sorts of
-messages with no real classification. You can get a whole list of levels with
-
-/HELP levels
-
-Status window has message level ALL -MSGS, meaning that all messages, except
-private messages, without more specific place go to status window. The -MSGS is
-there so it doesn’t conflict with messages window.
-
-6. How support for multiple servers works in irssi
-
-ircii and several other clients support multiple servers by placing the
-connection into some window. IRSSI DOES NOT. There is no required relationship
-between window and server. You can connect to 10 servers and manage them all in
-just one window, or join channel in each one of them to one single window if
-you really want to. That being said, here’s how you do connect to new server
-without closing the old connection:
-
-/CONNECT irc.server.org
-
-Instead of the /SERVER which disconnects the existing connection. To see list
-of all active connections, use /SERVER without any parameters. You should see a
-list of something like:
-
- -!- IRCNet: irc.song.fi:6667 (IRCNet)
- -!- OFTC: irc.oftc.net:6667 (OFTC)
- -!- RECON-1: 192.168.0.1:6667 () (02:59 left before reconnecting)
-
-Here you see that we’re connected to IRCNet and OFTC networks. The IRCNet at
-the beginning is called the “server tag” while the (IRCnet) at the end shows
-the IRC network. Server tag specifies unique tag to refer to the server,
-usually it’s the same as the IRC network. When the IRC network isn’t known it’s
-some part of the server name. When there’s multiple connections to same IRC
-network or server, irssi adds a number after the tag so there could be network,
-network2, network3 etc.
-
-Server tags beginning with RECON- mean server reconnections. Above we see that
-connection to server at 192.168.0.1 wasn’t successful and irssi will try to
-connect it again in 3 minutes.
-
-To disconnect one of the servers, or to stop irssi from reconnecting, use
-
-/DISCONNECT network   - disconnect server with tag "network"
-/DISCONNECT recon-1  - stop trying to reconnect to RECON-1 server
-/RMRECONNS           - stop all server reconnections
-
-/RECONNECT recon-1   - immediately try reconnecting back to RECON-1
-/RECONNECT ALL       - immediately try reconnecting back to all
-                       servers in reconnection queue
-
-Now that you’re connected to all your servers, you’ll have to know how to
-specify which one of them you want to use. One way is to have an empty window,
-like status or msgs window. In it, you can specify which server to set active
-with
-
-/WINDOW SERVER tag    - set server "tag" active
-Ctrl-X                - set the next server in list active
-
-When the server is active, you can use it normally. When there’s multiple
-connected servers, irssi adds [servertag] prefix to all messages in non-channel
-/query messages so you’ll know where it came from.
-
-Several commands also accept -servertag option to specify which server it
-should use:
-
-/MSG -tag nick message
-/JOIN -tag #channel
-/QUERY -tag nick
-
-/MSG tab completion also automatically adds the -tag option when nick isn’t in
-active server.
-
-Window’s server can be made sticky. When sticky, it will never automatically
-change to anything else, and if server gets disconnected, the window won’t have
-any active server. When the server gets connected again, it is automatically
-set active in the window. To set the window’s server sticky use
-
-/WINDOW SERVER -sticky tag
-
-This is useful if you wish to have multiple status or msgs windows, one for
-each server. Here’s how to do them (repeat for each server)
-
-/WINDOW NEW HIDE
-/WINDOW NAME (status)
-/WINDOW LEVEL ALL -MSGS
-/WINDOW SERVER -sticky network
-
-/WINDOW NEW HIDE
-/WINDOW NAME (msgs)
-/WINDOW LEVEL MSGS
-/WINDOW SERVER -sticky network
-
-7. /LASTLOG and jumping around in scrollback
-
-/LASTLOG command can be used for searching texts in scrollback buffer. Simplest
-usages are
-
-/LASTLOG word     - print all lines with "word" in them
-/LASTLOG word 10  - print last 10 occurances of "word"
-/LASTLOG -topics  - print all topic changes
-
-If there’s more than 1000 lines to be printed, irssi thinks that you probably
-made some mistake and won’t print them without -force option. If you want to
-save the full lastlog to file, use
-
-/LASTLOG -file ~/irc.log
-
-With -file option you don’t need -force even if there’s more than 1000 lines. /
-LASTLOG has a lot of other options too, see /HELP lastlog for details.
-
-Once you’ve found the lines you were interested in, you might want to check the
-discussion around them. Irssi has /SCROLLBACK (or alias /SB) command for
-jumping around in scrollback buffer. Since /LASTLOG prints the timestamp when
-the message was originally printed, you can use /SB GOTO hh:mm to jump directly
-there. To get back to the bottom of scrollback, use /SB END command.
-
-8. Logging
-
-Irssi can automatically log important messages when you’re set away (/AWAY
-reason). When you set yourself unaway (/AWAY), the new messages in away log are
-printed to screen. You can configure it with:
-
-/SET awaylog_level MSGS HILIGHT     - Specifies what messages to log
-/SET awaylog_file ~/.irssi/away.log - Specifies the file to use
-
-Easiest way to start logging with Irssi is to use autologging. With it Irssi
-logs all channels and private messages to specified directory. You can turn it
-on with
-
-/SET autolog ON
-
-By default it logs pretty much everything execept CTCPS or CRAP (/WHOIS
-requests, etc). You can specify the logging level yourself with
-
-/SET autolog_level ALL -CRAP -CLIENTCRAP -CTCPS (this is the default)
-
-By default irssi logs to ~/irclogs/<servertag>/<target>.log. You can change
-this with
-
-/SET autolog_path ~/irclogs/$tag/$0.log (this is the default)
-
-The path is automatically created if it doesn’t exist. $0 specifies the target
-(channel/nick). You can make irssi automatically rotate the logs by adding date
-/time formats to the file name. The formats are in “man strftime” format. For
-example
-
-/SET autolog_path ~/irclogs/%Y/$tag/$0.%m-%d.log
-
-For logging only some specific channels or nicks, see /HELP log
-
-9. Changing keyboard bindings
-
-You can change any keyboard binding that terminal lets irssi know about. It
-doesn’t let irssi know everything, so for example shift-backspace can’t be
-bound unless you modify xterm resources somehow.
-
-/HELP bind tells pretty much everything there is to know about keyboard
-bindings. However, there’s the problem of how to bind some non-standard keys.
-They might differ a bit with each terminal, so you’ll need to find out what
-exactly the keypress produces. Easiest way to check that would be to see what
-it prints in cat. Here’s an example for pressing F1 key:
-
- [cras@hurina] ~% cat
- ^[OP
-
-So in irssi you would use /BIND ^[OP /ECHO F1 pressed. If you use multiple
-terminals which have different bindings for the key, it would be better to use
-eg.:
-
-/BIND ^[OP key F1
-/BIND ^[11~ key F1
-/BIND F1 /ECHO F1 pressed.
-
-10. Proxies and IRC bouncers
-
-Irssi supports connecting to IRC servers via a proxy. All server connections
-are then made through it, and if you’ve set up everything properly, you don’t
-need to do any /QUOTE SERVER commands manually.
-
-Here’s an example: You have your bouncer (lets say, BNC or BNC-like) listening
-in irc.bouncer.org port 5000. You want to use it to connect to servers
-irc.dal.net and irc.efnet.org. First you’d need to setup the bouncer:
-
-/SET use_proxy ON
-/SET proxy_address irc.bouncer.org
-/SET proxy_port 5000
-
-/SET proxy_password YOUR_BNC_PASSWORD_HERE
-/SET -clear proxy_string
-/SET proxy_string_after conn %s %d
-
-Then you’ll need to add the server connections. These are done exactly as if
-you’d want to connect directly to them. Nothing special about them:
-
-/SERVER ADD -auto -network dalnet irc.dal.net
-/SERVER ADD -auto -network efnet irc.efnet.org
-
-With the proxy /SETs however, irssi now connects to those servers through your
-BNC. All server connections are made through them so you can just forget that
-your bouncer even exists.
-
-If you don’t want to use the proxy for some reason, there’s -noproxy option
-which you can give to /SERVER and /SERVER ADD commands.
-
-Proxy specific settings:
-
-All proxies except irssi proxy and socks proxy have these settings in common:
-
-/SET use_proxy ON
-/SET proxy_address <Proxy host address>
-/SET proxy_port <Proxy port>
-
-HTTP proxy
-
-Use these settings with HTTP proxies:
-
-/SET -clear proxy_password
-/EVAL SET proxy_string CONNECT %s:%d HTTP/1.0\n\n
-
-BNC
-
-/SET proxy_password your_pass
-/SET -clear proxy_string
-/SET proxy_string_after conn %s %d
-
-dircproxy
-
-dircproxy separates the server connections by passwords. So, if you for example
-have network connection with password ircpass and OFTC connection with
-oftcpass, you would do something like this:
-
-/SET -clear proxy_password
-/SET -clear proxy_string
-
-/SERVER ADD -auto -network IRCnet fake.network 6667 ircpass
-/SERVER ADD -auto -network OFTC fake.oftc 6667 oftcpass
-
-The server name and port you give isn’t used anywhere, so you can put anything
-you want in there.
-
-psyBNC
-
-psyBNC has internal support for multiple servers. However, it could be a bit
-annoying to use, and some people just use different users for connecting to
-different servers. You can manage this in a bit same way as with dircproxy, by
-creating fake connections:
-
-/SET -clear proxy_password
-/SET -clear proxy_string
-
-/NETWORK ADD -user networkuser IRCnet
-/SERVER ADD -auto -network IRCnet fake.network 6667 ircpass
-/NETWORK ADD -user oftcuser OFTC
-/SERVER ADD -auto -network OFTC fake.oftc 6667 oftcpass
-
-So, you’ll specify the usernames with /NETWORK ADD command, and the user’s
-password with /SERVER ADD.
-
-Irssi proxy
-
-Irssi contains it’s own proxy which you can build giving \--with-proxy option
-to configure. You’ll still need to run irssi in a screen to use it though.
-
-Irssi proxy is a bit different than most proxies, normally proxies create a new
-connection to IRC server when a new client connects to it, but irssi proxy
-shares your existing IRC connection(s) to multiple clients. And even more
-clearly: You can use only one IRC server connection of the irssi proxy to IRC
-with as many clients as you want. Can anyone figure out even more easier ways
-to say this, so I wouldn’t need to try to explain this thing for minutes every
-time? :)
-
-Irssi proxy supports sharing multiple server connections in different ports,
-like you can share network in port 2777 and efnet in port 2778.
-
-Usage in proxy side:
-
-/LOAD proxy
-/SET irssiproxy_password <password>
-/SET irssiproxy_ports <network>=<port> ... (eg. IRCnet=2777 efnet=2778)
-
-NOTE: you MUST add all the servers you are using to server and network lists
-with /SERVER ADD and /NETWORK ADD. ..Except if you really don’t want to for
-some reason, and you only use one server connection, you may simply set:
-
-/SET irssiproxy_ports *=2777
-
-Usage in client side:
-
-Just connect to the irssi proxy like it is a normal server with password
-specified in /SET irssiproxy_password. For example:
-
-/SERVER ADD -network IRCnet my.irssi-proxy.org 2777 secret
-/SERVER ADD -network efnet my.irssi-proxy.org 2778 secret
-
-Irssi proxy works fine with other IRC clients as well.
-
-SOCKS
-
-Using [4]proxychains-ng is recommended for using irssi with a socks proxy.
-
-Irssi does not support socks proxy natively.
-
-Note that /SET proxy settings don’t have anything to do with socks.
-
-Others
-
-IRC bouncers usually work like IRC servers, and want a password. You can give
-it with:
-
-/SET proxy_password <password>
-
-Irssi’s defaults for connect strings are
-
-/SET proxy_string CONNECT %s %d
-/SET proxy_string_after
-
-The proxy_string is sent before NICK/USER commands, the proxy_string_after is
-sent after them. %s and %d can be used with both of them.
-
-11. Irssi’s settings
-
-Here’s some settings you might want to change (the default value is shown):
-Also check the [5]Settings Documentation
-
-Queries
-
-/SET autocreate_own_query ON
-    Should new query window be created when you send message to someone (with /
-    MSG).
-/SET autocreate_query_level MSGS
-    New query window should be created when receiving messages with this level.
-    MSGS, DCCMSGS and NOTICES levels work currently. You can disable this with
-    /SET -clear autocreate_query_level.
-/SET autoclose_query 0
-    Query windows can be automatically closed after certain time of inactivity.
-    Queries with unread messages aren’t closed and active window is neither
-    never closed. The value is given in seconds.
-
-Windows
-
-/SET use_msgs_window OFF
-    Create messages window at startup. All private messages go to this window.
-    This only makes sense if you’ve disabled automatic query windows. Message
-    window can also be created manually with /WINDOW LEVEL MSGS, /WINDOW NAME
-    (msgs).
-/SET use_status_window ON
-    Create status window at startup. All messages that don’t really have better
-    place go here, like all /WHOIS replies etc. Status window can also be
-    created manually with /WINDOW LEVEL ALL -MSGS, /WINDOW NAME (status).
-/SET autocreate_windows ON
-    Should we create new windows for new window items or just place everything
-    in one window
-/SET autoclose_windows ON
-    Should window be automatically closed when the last item in them is removed
-    (ie. /PART, /UNQUERY).
-/SET reuse_unused_windows OFF
-    When finding where to place new window item (channel, query) Irssi first
-    tries to use already existing empty windows. If this is set ON, new window
-    will always be created for all window items. This setting is ignored if
-    autoclose_windows is set ON.
-/SET window_auto_change OFF
-    Should Irssi automatically change to automatically created windows -
-    usually queries when someone sends you a message. To prevent accidentally
-    sending text meant to some other channel/nick, Irssi clears the input
-    buffer when changing the window. The text is still in scrollback buffer,
-    you can get it back with pressing arrow up key.
-/SET print_active_channel OFF
-    When you keep more than one channel in same window, Irssi prints the
-    messages coming to active channel as <nick> text and other channels as
-    <nick:channel> text. If this setting is set ON, the messages to active
-    channels are also printed in the latter way.
-/SET window_history OFF
-    Should command history be kept separate for each window.
-
-User information
-
-/SET nick
-    Your nick name
-/SET alternate_nick
-    Your alternate nick.
-/SET user_name
-    Your username, if you have ident enabled this doesn’t affect anything
-/SET real_name
-    Your real name.
-
-Server information
-
-/SET skip_motd OFF
-    Should we hide server’s MOTD (Message Of The Day).
-/SET server_reconnect_time 300
-    Seconds to wait before connecting to same server again. Don’t set this too
-    low since it usually doesn’t help at all - if the host is down, the few
-    extra minutes of waiting won’t hurt much.
-/SET lag_max_before_disconnect 300
-    Maximum server lag in seconds before disconnecting and trying to reconnect.
-    This happens mostly only when network breaks between you and IRC server.
-
-Appearance
-
-/SET timestamps ON
-    Show timestamps before each message.
-/SET hide_text_style OFF
-    Hide all bolds, underlines, MIRC colors, etc.
-/SET show_nickmode ON
-    Show the nick’s mode before nick in channels, ie. ops have <@nick>, voices
-    <+nick> and others < nick>
-/SET show_nickmode_empty ON
-    If the nick doesn’t have a mode, use one space. ie. ON: < nick>, OFF:
-    <nick>
-/SET show_quit_once OFF
-    Show quit message only once in some of the channel windows the nick was in
-    instead of in all windows.
-/SET lag_min_show 100
-    Show the server lag in status bar if it’s bigger than this, the unit is 1/
-    100 of seconds (ie. the default value of 100 = 1 second).
-/SET indent 10
-    When lines are longer than screen width they have to be split to multiple
-    lines. This specifies how much space to put at the beginning of the line
-    before the text begins. This can be overridden in text formats with %|
-    format.
-/SET activity_hide_targets
-    If you don’t want to see window activity in some certain channels or
-    queries, list them here. For example #boringchannel =bot1 =bot2. If any
-    highlighted text or message for you appears in that window, this setting is
-    ignored and the activity is shown.
-
-Nick completion
-
-/SET completion_auto OFF
-    Automatically complete the nick if line begins with start of nick and the
-    completion character. Learn to use the tab-completion instead, it’s a lot
-    better ;)
-/SET completion_char :
-    Completion character to use.
-
-For all the ircII people
-
-I don’t like automatic query windows, I don’t like status window, I do like
-msgs window where all messages go:
-
-/SET autocreate_own_query OFF
-/SET autocreate_query_level DCCMSGS
-/SET use_status_window OFF
-/SET use_msgs_window ON
-
-Disable automatic window closing when /PARTing channel or /UNQUERYing query:
-
-/SET autoclose_windows OFF
-/SET reuse_unused_windows ON
-
-Here’s the settings that make irssi work exactly like ircII in window
-management (send me a note if you can think of more):
-
-/SET autocreate_own_query OFF
-/SET autocreate_query_level NONE
-/SET use_status_window OFF
-/SET use_msgs_window OFF
-/SET reuse_unused_windows ON
-/SET windows_auto_renumber OFF
-
-/SET autostick_split_windows OFF
-/SET autoclose_windows OFF
-/SET print_active_channel ON
-
-12. Statusbar
-
-/STATUSBAR displays a list of the current statusbars, along with their position
-and visibility:
-
- Name                           Type   Placement Position Visible
- window                         window bottom    0        always
- window_inact                   window bottom    1        inactive
- prompt                         root   bottom    100      always
- topic                          root   top       1        always
-
-/STATUSBAR <name> prints the statusbar settings (type, placement, position,
-visibility) as well as its items. /STATUSBAR <name> ENABLE|DISABLE enables/
-disables the statusbar. /STATUSBAR <name> RESET resets the statusbar to its
-default settings, or if the statusbar was created by you, it will be removed.
-
-The statusbar type can be either window or root. If the type is window, then a
-statusbar will be created for each split window, otherwise it will be created
-only once. Placement can be top or bottom, which refers to the top or bottom of
-the screen. Position is a number, the higher the value the lower it will appear
-in-screen. Visible can be always, active or inactive. Active/inactive is useful
-only with split windows; one split window is active and the rest are inactive.
-To adjust these settings, the following commands are available:
-
-/STATUSBAR <name> TYPE window|root
-/STATUSBAR <name> PLACEMENT top|bottom
-/STATUSBAR <name> POSITION <num>
-/STATUSBAR <name> VISIBLE always|active|inactive
-
-Statusbar items can also be added or removed via command. Note that when
-loading new statusbar scripts that add items, you will need to specify where
-you want to show the item and how it is aligned. This can be accomplished using
-the below commands:
-
-/STATUSBAR <name> ADD [-before | -after <item>] [-priority #] [-alignment left|right] <item>
-/STATUSBAR <name> REMOVE <item>
-
-For statusbar scripts, the item name is usually equivalent to the script name.
-The documentation of the script ought to tell you if this is not the case. For
-example, to add mail.pl before the window activity item, use: /STATUSBAR window
-ADD -before act mail.
-
-
-References:
-
-[1] https://www.gnu.org/licenses/fdl.html
-[2] https://www.iterm2.com/
-[3] https://quadpoint.org/articles/irssisplit/
-[4] https://github.com/rofl0r/proxychains-ng
-[5] https://irssi.org/documentation/settings/

file2header.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+echo "const char *$2 ="
+cat $1|sed 's/\\/\\\\/g'|sed 's/"/\\"/g'|sed 's/^/\"/'|sed 's/$/\\n\"/'
+echo ";"

fuzz-support/fuzz.diff

@@ -1,269 +0,0 @@
-diff --git a/src/core/network.c b/src/core/network.c
-index 3e1b7c7..1e5324a 100644
---- a/src/core/network.c
-+++ b/src/core/network.c
-@@ -199,6 +199,10 @@ GIOChannel *net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip)
- /* Connect to named UNIX socket */
- GIOChannel *net_connect_unix(const char *path)
- {
-+	if (strcmp(path, "/dev/stdin") == 0) {
-+		return g_io_channel_new(0);
-+	}
-+
- 	struct sockaddr_un sa;
- 	int handle, ret;
- 
-@@ -336,6 +340,8 @@ int net_receive(GIOChannel *handle, char *buf, int len)
- /* Transmit data, return number of bytes sent, -1 = error */
- int net_transmit(GIOChannel *handle, const char *data, int len)
- {
-+	return write(1, data, len);
-+
-         gsize ret;
- 	GIOStatus status;
- 	GError *err = NULL;
-@@ -495,6 +501,7 @@ int net_host2ip(const char *host, IPADDR *ip)
- /* Get socket error */
- int net_geterror(GIOChannel *handle)
- {
-+	return 0;
- 	int data;
- 	socklen_t len = sizeof(data);
- 
-diff --git a/src/core/servers-reconnect.c b/src/core/servers-reconnect.c
-index 58c9dd0..0c6ec1b 100644
---- a/src/core/servers-reconnect.c
-+++ b/src/core/servers-reconnect.c
-@@ -484,7 +484,8 @@ void servers_reconnect_init(void)
- 	reconnects = NULL;
- 	last_reconnect_tag = 0;
- 
--	reconnect_timeout_tag = g_timeout_add(1000, (GSourceFunc) server_reconnect_timeout, NULL);
-+	(void) server_reconnect_timeout;
-+
- 	read_settings();
- 
- 	signal_add("server connect failed", (SIGNAL_FUNC) sig_reconnect);
-diff --git a/src/core/settings.c b/src/core/settings.c
-index e65ceb2..f9dc678 100644
---- a/src/core/settings.c
-+++ b/src/core/settings.c
-@@ -704,7 +704,10 @@ int irssi_config_is_changed(const char *fname)
- 
- static CONFIG_REC *parse_configfile(const char *fname)
- {
--	CONFIG_REC *config;
-+	CONFIG_REC *config = config_open(NULL, -1);
-+	config_parse_data(config, default_config, "internal");
-+	return config;
-+
- 	struct stat statbuf;
-         const char *path;
- 	char *str;
-@@ -871,8 +874,6 @@ void settings_init(void)
- 	init_configfile();
- 
- 	settings_add_bool("misc", "settings_autosave", TRUE);
--	timeout_tag = g_timeout_add(SETTINGS_AUTOSAVE_TIMEOUT,
--				    (GSourceFunc) sig_autosave, NULL);
- 	signal_add("irssi init finished", (SIGNAL_FUNC) sig_init_finished);
- 	signal_add("gui exit", (SIGNAL_FUNC) sig_autosave);
- }
-diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
-index 1b2ab1e..4344cd9 100644
---- a/src/fe-common/core/fe-common-core.c
-+++ b/src/fe-common/core/fe-common-core.c
-@@ -320,6 +320,8 @@ static void autoconnect_servers(void)
- 	GSList *tmp, *chatnets;
- 	char *str;
- 
-+	return;
-+
- 	if (autocon_server != NULL) {
- 		/* connect to specified server */
- 		if (autocon_password == NULL)
-@@ -390,6 +392,7 @@ static void sig_setup_changed(void)
- 
- static void autorun_startup(void)
- {
-+	return;
- 	char *path;
- 	GIOChannel *handle;
- 	GString *buf;
-diff --git a/src/fe-common/core/themes.c b/src/fe-common/core/themes.c
-index 2b1459b..2e518a1 100644
---- a/src/fe-common/core/themes.c
-+++ b/src/fe-common/core/themes.c
-@@ -790,9 +790,8 @@ static void theme_read_module(THEME_REC *theme, const char *module)
- {
- 	CONFIG_REC *config;
- 
--	config = config_open(theme->path, -1);
--	if (config != NULL)
--		config_parse(config);
-+	config = config_open(NULL, -1);
-+	config_parse_data(config, default_theme, "internal");
- 
- 	theme_init_module(theme, module, config);
- 
-@@ -987,7 +986,7 @@ static int theme_read(THEME_REC *theme, const char *path)
- 	THEME_READ_REC rec;
-         char *str;
- 
--	config = config_open(path, -1) ;
-+	config = config_open(NULL, -1) ;
- 	if (config == NULL) {
- 		/* didn't exist or no access? */
- 		str = g_strdup_printf("Error reading theme file %s: %s",
-@@ -997,7 +996,7 @@ static int theme_read(THEME_REC *theme, const char *path)
- 		return FALSE;
- 	}
- 
--	if (path == NULL)
-+	if (1)
- 		config_parse_data(config, default_theme, "internal");
-         else
- 		config_parse(config);
-@@ -1200,6 +1199,7 @@ static void module_save(const char *module, MODULE_THEME_REC *rec,
- 
- static void theme_save(THEME_REC *theme, int save_all)
- {
-+	return;
- 	CONFIG_REC *config;
- 	THEME_SAVE_REC data;
- 	char *path;
-diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
-index 7c71edd..6bf2177 100644
---- a/src/fe-text/gui-readline.c
-+++ b/src/fe-text/gui-readline.c
-@@ -1126,7 +1126,6 @@ void gui_readline_init(void)
- 	paste_timeout_id = -1;
- 	paste_bracketed_mode = FALSE;
- 	g_get_current_time(&last_keypress);
--        input_listen_init(STDIN_FILENO);
- 
- 	settings_add_bool("lookandfeel", "term_appkey_mode", TRUE);
- 	settings_add_str("history", "scroll_page_count", "/2");
-diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
-index ad79e0c..84d0c5c 100644
---- a/src/fe-text/irssi.c
-+++ b/src/fe-text/irssi.c
-@@ -314,20 +314,16 @@ int main(int argc, char **argv)
- 	textui_finish_init();
- 	main_loop = g_main_loop_new(NULL, TRUE);
- 
-+#ifdef __AFL_HAVE_MANUAL_CONTROL
-+	__AFL_INIT();
-+#endif
-+
-+	signal_emit("command connect", 1, "/dev/stdin 6667");
-+
- 	/* Does the same as g_main_run(main_loop), except we
- 	   can call our dirty-checker after each iteration */
- 	while (!quitting) {
--		term_refresh_freeze();
- 		g_main_context_iteration(NULL, TRUE);
--                term_refresh_thaw();
--
--		if (reload_config) {
--                        /* SIGHUP received, do /RELOAD */
--			reload_config = FALSE;
--                        signal_emit("command reload", 1, "");
--		}
--
--		dirty_check();
- 	}
- 
- 	g_main_loop_unref(main_loop);
-diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
-index b2478c6..cebe260 100644
---- a/src/fe-text/term-terminfo.c
-+++ b/src/fe-text/term-terminfo.c
-@@ -29,6 +29,10 @@
- #include <termios.h>
- #include <stdio.h>
- 
-+#undef putc
-+#define putc(x, y) (void) (x)
-+#define fputc(x, y) (void) (x), 0
-+
- /* returns number of characters in the beginning of the buffer being a
-    a single character, or -1 if more input is needed. The character will be
-    saved in result */
-@@ -113,7 +117,8 @@ int term_init(void)
- 	vcmove = FALSE; cforcemove = TRUE;
-         curs_visible = TRUE;
- 
--	current_term = terminfo_core_init(stdin, stdout);
-+	FILE *devnull = fopen("/dev/null", "r+");
-+	current_term = terminfo_core_init(devnull, devnull);
- 	if (current_term == NULL)
- 		return FALSE;
- 
-@@ -670,6 +675,7 @@ void term_set_input_type(int type)
- 
- void term_gets(GArray *buffer, int *line_count)
- {
-+	return;
- 	int ret, i, char_len;
- 
-         /* fread() doesn't work */
-diff --git a/src/fe-text/terminfo-core.c b/src/fe-text/terminfo-core.c
-index 9c9179a..6349935 100644
---- a/src/fe-text/terminfo-core.c
-+++ b/src/fe-text/terminfo-core.c
-@@ -6,6 +6,10 @@
- #  define _POSIX_VDISABLE 0
- #endif
- 
-+#undef putc
-+#define putc(x, y) (void) (x)
-+#define fputc(x, y) (void) (x), 0
-+
- #define tput(s) tputs(s, 0, term_putchar)
- inline static int term_putchar(int c)
- {
-diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c
-index 4dce3fc..25fbb34 100644
---- a/src/irc/core/irc.c
-+++ b/src/irc/core/irc.c
-@@ -383,12 +383,13 @@ static void irc_parse_incoming(SERVER_REC *server)
- 		signal_emit_id(signal_server_incoming, 2, server, str);
- 
- 		if (server->connection_lost)
--			server_disconnect(server);
-+			exit(0);
- 
- 		count++;
- 	}
- 	if (ret == -1) {
- 		/* connection lost */
-+		exit(0);
- 		server->connection_lost = TRUE;
- 		server_disconnect(server);
- 	}
-diff --git a/src/lib-config/write.c b/src/lib-config/write.c
-index 37e51f0..ee82726 100644
---- a/src/lib-config/write.c
-+++ b/src/lib-config/write.c
-@@ -299,6 +299,8 @@ static int config_write_block(CONFIG_REC *rec, CONFIG_NODE *node, int list, int
- 
- int config_write(CONFIG_REC *rec, const char *fname, int create_mode)
- {
-+	return 0;
-+
- 	int ret;
- 	int fd;
- 
-diff --git a/src/perl/perl-core.c b/src/perl/perl-core.c
-index 2c61df7..485fe25 100644
---- a/src/perl/perl-core.c
-+++ b/src/perl/perl-core.c
-@@ -395,6 +395,7 @@ int perl_get_api_version(void)
- 
- void perl_scripts_autorun(void)
- {
-+	return;
- 	DIR *dirp;
- 	struct dirent *dp;
- 	struct stat statbuf;

irssi-config.in

@@ -0,0 +1,9 @@
+PROG_LIBS="@PROG_LIBS@"
+COMMON_LIBS="@COMMON_LIBS@"
+
+PERL_LINK_LIBS="@PERL_LINK_LIBS@"
+PERL_FE_LINK_LIBS="@PERL_FE_LINK_LIBS@"
+PERL_LINK_FLAGS="@PERL_LINK_FLAGS@"
+
+CHAT_MODULES="@CHAT_MODULES@"
+irc_MODULES="@irc_MODULES@"

irssi-version.sh

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+DATE=`GIT_DIR=$1/.git git log -1 --pretty=format:%ai HEAD`
+
+VERSION_DATE=`echo $DATE | cut -f 1 -d ' ' | tr -d -`
+VERSION_TIME=`echo $DATE | cut -f 2 -d ' ' | awk -F: '{printf "%d", $1$2}'`
+
+if test -z "$VERSION_DATE"; then
+    exec>&2
+    echo "**Error**: `basename "$0"` must be run in a git clone, cannot proceed."
+    exit 1
+fi
+
+echo "#define IRSSI_VERSION_DATE $VERSION_DATE"
+echo "#define IRSSI_VERSION_TIME $VERSION_TIME"
+
+if echo "${VERSION}" | grep -q -- -head; then
+  # -head version, get extra details from git if we can
+  git_version=$(GIT_DIR=$1/.git git describe --dirty --long --always --tags)
+  if [ $? = 0 ]; then
+    new_version="$(echo "${VERSION}" | sed 's/-head//')"
+    # Because the git tag won't yet include the next release we modify the git
+    # describe output using the version defined from configure.ac.
+    version="${new_version}-$(echo "${git_version}" | sed 's/^.*-[0-9]\+-//')"
+    echo "#undef PACKAGE_VERSION"
+    echo "#define PACKAGE_VERSION \"${version}\""
+  fi
+fi

irssi.conf

@@ -1,10 +1,10 @@
 servers = (
   { address = "irc.dal.net";       chatnet = "DALnet";    port = "6667"; },
-  { address = "ssl.efnet.org";     chatnet = "EFNet";     port = "9999"; use_tls = "yes"; tls_verify = "no"; },
+  { address = "ssl.efnet.org";     chatnet = "EFNet";     port = "9999"; use_tls = "yes"; },
   { address = "irc.esper.net";     chatnet = "EsperNet";  port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "irc.libera.chat";   chatnet = "liberachat";port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "chat.freenode.net"; chatnet = "Freenode";  port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
   { address = "irc.gamesurge.net"; chatnet = "GameSurge"; port = "6667"; },
-  { address = "ssl.ircnet.ovh";    chatnet = "IRCnet";    port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "eu.irc6.net";       chatnet = "IRCnet";    port = "6667"; use_tls = "yes"; },
   { address = "open.ircnet.net";   chatnet = "IRCnet";    port = "6667"; },
   { address = "irc.ircsource.net"; chatnet = "IRCSource"; port = "6667"; },
   { address = "irc.netfuze.net";   chatnet = "NetFuze";   port = "6667"; },
@@ -34,7 +34,7 @@ chatnets = {
     max_msgs  = "4";
     max_whois = "1";
   };
-  liberachat = {
+  Freenode = {
     type      = "IRC";
     max_kicks = "1";
     max_msgs  = "4";
@@ -95,8 +95,8 @@ chatnets = {
 
 channels = (
   { name = "#lobby";     chatnet = "EsperNet";  autojoin = "No"; },
-  { name = "#libera";    chatnet = "liberachat";autojoin = "No"; },
-  { name = "#irssi";     chatnet = "liberachat";autojoin = "No"; },
+  { name = "#freenode";  chatnet = "Freenode";  autojoin = "No"; },
+  { name = "#irssi";     chatnet = "Freenode";  autojoin = "No"; },
   { name = "#gamesurge"; chatnet = "GameSurge"; autojoin = "No"; },
   { name = "#irssi";     chatnet = "IRCNet";    autojoin = "No"; },
   { name = "#ircsource"; chatnet = "IRCSource"; autojoin = "No"; },
@@ -107,7 +107,7 @@ channels = (
 
 aliases = {
   ATAG        = "WINDOW SERVER";
-  ADDALLCHANS = "SCRIPT EXEC foreach my \\$channel (Irssi::channels()) { Irssi::command(\"CHANNEL ADD -auto \\$channel->{visible_name} \\$channel->{server}->{tag} \\$channel->{key}\")\\;}";
+  ADDALLCHANS = "SCRIPT EXEC foreach my \\$channel (Irssi::channels()) { Irssi::command(\"CHANNEL ADD -auto \\$channel->{name} \\$channel->{server}->{tag} \\$channel->{key}\")\\;}";
   B           = "BAN";
   BACK        = "AWAY";
   BANS        = "BAN";
@@ -115,7 +115,7 @@ aliases = {
   C           = "CLEAR";
   CALC        = "EXEC - if command -v bc >/dev/null 2>&1\\; then printf '%s=' '$*'\\; echo '$*' | bc -l\\; else echo bc was not found\\; fi";
   CHAT        = "DCC CHAT";
-  CS          = "QUOTE CS";
+  CUBES       = "SCRIPT EXEC Irssi::active_win->print(\"%_bases\", MSGLEVEL_CLIENTCRAP) \\; Irssi::active_win->print( do { join '', map { \"%x0\\${_}0\\$_\" } '0'..'9','A'..'F' }, MSGLEVEL_NEVER | MSGLEVEL_CLIENTCRAP) \\; Irssi::active_win->print(\"%_cubes\", MSGLEVEL_CLIENTCRAP) \\; Irssi::active_win->print( do { my \\$y = \\$_*6 \\; join '', map { my \\$x = \\$_ \\; map { \"%x\\$x\\$_\\$x\\$_\" } @{['0'..'9','A'..'Z']}[\\$y .. \\$y+5] } 1..6 }, MSGLEVEL_NEVER | MSGLEVEL_CLIENTCRAP) for 0..5 \\; Irssi::active_win->print(\"%_grays\", MSGLEVEL_CLIENTCRAP) \\; Irssi::active_win->print( do { join '', map { \"%x7\\${_}7\\$_\" } 'A'..'X' }, MSGLEVEL_NEVER | MSGLEVEL_CLIENTCRAP) \\; Irssi::active_win->print(\"%_mIRC extended colours\", MSGLEVEL_CLIENTCRAP) \\; my \\$x \\; \\$x .= sprintf \"\00399,%02d%02d\",\\$_,\\$_ for 0..15 \\; Irssi::active_win->print(\\$x, MSGLEVEL_NEVER | MSGLEVEL_CLIENTCRAP) \\; for my \\$z (0..6) { my \\$x \\; \\$x .= sprintf \"\00399,%02d%02d\",\\$_,\\$_ for 16+(\\$z*12)..16+(\\$z*12)+11 \\; Irssi::active_win->print(\\$x, MSGLEVEL_NEVER | MSGLEVEL_CLIENTCRAP) }";
   DATE        = "TIME";
   DEHIGHLIGHT = "DEHILIGHT";
   DESCRIBE    = "ACTION";
@@ -134,12 +134,9 @@ aliases = {
   LAST        = "LASTLOG";
   LEAVE       = "PART";
   M           = "MSG";
-  MS          = "QUOTE MS";
   MUB         = "UNBAN *";
   N           = "NAMES";
   NMSG        = "^MSG";
-  NS          = "QUOTE NS";
-  OS          = "QUOTE OS";
   P           = "PART";
   Q           = "QUERY";
   RESET       = "SET -default";
@@ -147,9 +144,8 @@ aliases = {
   SAY         = "MSG *";
   SB          = "SCROLLBACK";
   SBAR        = "STATUSBAR";
-  SHELP       = "QUOTE HELP";
   SIGNOFF     = "QUIT";
-  SV          = "MSG * Irssi $J ($V) - https://irssi.org";
+  SV          = "MSG * Irssi $J ($V) - http://www.irssi.org";
   T           = "TOPIC"; 
   UB          = "UNBAN";
   UMODE       = "MODE $N";
@@ -164,6 +160,105 @@ aliases = {
   WN          = "WINDOW NEW HIDDEN";
   WQUERY      = "QUERY -window";
   WW          = "WHOWAS";
+  1           = "WINDOW GOTO 1";
+  2           = "WINDOW GOTO 2";
+  3           = "WINDOW GOTO 3";
+  4           = "WINDOW GOTO 4";
+  5           = "WINDOW GOTO 5";
+  6           = "WINDOW GOTO 6";
+  7           = "WINDOW GOTO 7";
+  8           = "WINDOW GOTO 8";
+  9           = "WINDOW GOTO 9";
+  10          = "WINDOW GOTO 10";
+  11          = "WINDOW GOTO 11";
+  12          = "WINDOW GOTO 12";
+  13          = "WINDOW GOTO 13";
+  14          = "WINDOW GOTO 14";
+  15          = "WINDOW GOTO 15";
+  16          = "WINDOW GOTO 16";
+  17          = "WINDOW GOTO 17";
+  18          = "WINDOW GOTO 18";
+  19          = "WINDOW GOTO 19";
+  20          = "WINDOW GOTO 20";
+  21          = "WINDOW GOTO 21";
+  22          = "WINDOW GOTO 22";
+  23          = "WINDOW GOTO 23";
+  24          = "WINDOW GOTO 24";
+  25          = "WINDOW GOTO 25";
+  26          = "WINDOW GOTO 26";
+  27          = "WINDOW GOTO 27";
+  28          = "WINDOW GOTO 28";
+  29          = "WINDOW GOTO 29";
+  30          = "WINDOW GOTO 30";
+  31          = "WINDOW GOTO 31";
+  32          = "WINDOW GOTO 32";
+  33          = "WINDOW GOTO 33";
+  34          = "WINDOW GOTO 34";
+  35          = "WINDOW GOTO 35";
+  36          = "WINDOW GOTO 36";
+  37          = "WINDOW GOTO 37";
+  38          = "WINDOW GOTO 38";
+  39          = "WINDOW GOTO 39";
+  40          = "WINDOW GOTO 40";
+  41          = "WINDOW GOTO 41";
+  42          = "WINDOW GOTO 42";
+  43          = "WINDOW GOTO 43";
+  44          = "WINDOW GOTO 44";
+  45          = "WINDOW GOTO 45";
+  46          = "WINDOW GOTO 46";
+  47          = "WINDOW GOTO 47";
+  48          = "WINDOW GOTO 48";
+  49          = "WINDOW GOTO 49";
+  50          = "WINDOW GOTO 50";
+  51          = "WINDOW GOTO 51";
+  52          = "WINDOW GOTO 52";
+  53          = "WINDOW GOTO 53";
+  54          = "WINDOW GOTO 54";
+  55          = "WINDOW GOTO 55";
+  56          = "WINDOW GOTO 56";
+  57          = "WINDOW GOTO 57";
+  58          = "WINDOW GOTO 58";
+  59          = "WINDOW GOTO 59";
+  60          = "WINDOW GOTO 60";
+  61          = "WINDOW GOTO 61";
+  62          = "WINDOW GOTO 62";
+  63          = "WINDOW GOTO 63";
+  64          = "WINDOW GOTO 64";
+  65          = "WINDOW GOTO 65";
+  66          = "WINDOW GOTO 66";
+  67          = "WINDOW GOTO 67";
+  68          = "WINDOW GOTO 68";
+  69          = "WINDOW GOTO 69";
+  70          = "WINDOW GOTO 70";
+  71          = "WINDOW GOTO 71";
+  72          = "WINDOW GOTO 72";
+  73          = "WINDOW GOTO 73";
+  74          = "WINDOW GOTO 74";
+  75          = "WINDOW GOTO 75";
+  76          = "WINDOW GOTO 76";
+  77          = "WINDOW GOTO 77";
+  78          = "WINDOW GOTO 78";
+  79          = "WINDOW GOTO 79";
+  80          = "WINDOW GOTO 80";
+  81          = "WINDOW GOTO 81";
+  82          = "WINDOW GOTO 82";
+  83          = "WINDOW GOTO 83";
+  84          = "WINDOW GOTO 84";
+  85          = "WINDOW GOTO 85";
+  86          = "WINDOW GOTO 86";
+  87          = "WINDOW GOTO 87";
+  88          = "WINDOW GOTO 88";
+  89          = "WINDOW GOTO 89";
+  90          = "WINDOW GOTO 90";
+  91          = "WINDOW GOTO 91";
+  92          = "WINDOW GOTO 92";
+  93          = "WINDOW GOTO 93";
+  94          = "WINDOW GOTO 94";
+  95          = "WINDOW GOTO 95";
+  96          = "WINDOW GOTO 96";
+  97          = "WINDOW GOTO 97";
+  98          = "WINDOW GOTO 98";
+  99          = "WINDOW GOTO 99";
 };
 
 statusbar = {
@@ -186,7 +281,7 @@ statusbar = {
     prompt_empty = "{prompt $winname}";
     
     topic       = " $topic";
-    topic_empty = " Irssi v$J - https://irssi.org";
+    topic_empty = " Irssi v$J - http://www.irssi.org";
 
     lag  = "{sb Lag: $0-}";
     act  = "{sb Act: $0-}";

m4/glib-2.0.m4

@@ -0,0 +1,208 @@
+# Configure paths for GLIB
+# Owen Taylor     1997-2001
+
+dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or 
+dnl gthread is specified in MODULES, pass to pkg-config
+dnl
+AC_DEFUN([AM_PATH_GLIB_2_0],
+[dnl 
+dnl Get the cflags and libraries from pkg-config
+dnl
+AC_ARG_ENABLE(glibtest, [  --disable-glibtest      do not try to compile and run a test GLIB program],
+		    , enable_glibtest=yes)
+
+  pkg_config_args=glib-2.0
+  for module in . $4
+  do
+      case "$module" in
+         gmodule) 
+             pkg_config_args="$pkg_config_args gmodule-2.0"
+         ;;
+         gmodule-no-export) 
+             pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
+         ;;
+         gobject) 
+             pkg_config_args="$pkg_config_args gobject-2.0"
+         ;;
+         gthread) 
+             pkg_config_args="$pkg_config_args gthread-2.0"
+         ;;
+      esac
+  done
+
+  PKG_PROG_PKG_CONFIG([0.7])
+
+  no_glib=""
+
+  if test "x$PKG_CONFIG" = x ; then
+    no_glib=yes
+    PKG_CONFIG=no
+  fi
+
+  min_glib_version=ifelse([$1], ,2.0.0,$1)
+  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
+
+  if test x$PKG_CONFIG != xno ; then
+    ## don't try to run the test against uninstalled libtool libs
+    if $PKG_CONFIG --uninstalled $pkg_config_args; then
+	  echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
+	  enable_glibtest=no
+    fi
+
+    if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
+	  :
+    else
+	  no_glib=yes
+    fi
+  fi
+
+  if test x"$no_glib" = x ; then
+    GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
+    GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
+    GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
+
+    GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
+    GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
+    glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    if test "x$enable_glibtest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $GLIB_CFLAGS"
+      LIBS="$GLIB_LIBS $LIBS"
+dnl
+dnl Now check if the installed GLIB is sufficiently new. (Also sanity
+dnl checks the results of pkg-config to some extent)
+dnl
+      rm -f conf.glibtest
+      AC_TRY_RUN([
+#include <glib.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int 
+main ()
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  system ("touch conf.glibtest");
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = g_strdup("$min_glib_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_glib_version");
+     exit(1);
+   }
+
+  if ((glib_major_version != $glib_config_major_version) ||
+      (glib_minor_version != $glib_config_minor_version) ||
+      (glib_micro_version != $glib_config_micro_version))
+    {
+      printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 
+             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
+             glib_major_version, glib_minor_version, glib_micro_version);
+      printf ("*** was found! If pkg-config was correct, then it is best\n");
+      printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\n");
+      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
+      printf("*** to point to the correct configuration files\n");
+    } 
+  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
+	   (glib_minor_version != GLIB_MINOR_VERSION) ||
+           (glib_micro_version != GLIB_MICRO_VERSION))
+    {
+      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
+	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+	     glib_major_version, glib_minor_version, glib_micro_version);
+    }
+  else
+    {
+      if ((glib_major_version > major) ||
+        ((glib_major_version == major) && (glib_minor_version > minor)) ||
+        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
+               glib_major_version, glib_minor_version, glib_micro_version);
+        printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
+	       major, minor, micro);
+        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
+        printf("***\n");
+        printf("*** If you have already installed a sufficiently new version, this error\n");
+        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
+        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_glib" = x ; then
+     AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
+     ifelse([$2], , :, [$2])     
+  else
+     AC_MSG_RESULT(no)
+     if test "$PKG_CONFIG" = "no" ; then
+       echo "*** A new enough version of pkg-config was not found."
+       echo "*** See http://www.freedesktop.org/software/pkgconfig/"
+     else
+       if test -f conf.glibtest ; then
+        :
+       else
+          echo "*** Could not run GLIB test program, checking why..."
+          ac_save_CFLAGS="$CFLAGS"
+          ac_save_LIBS="$LIBS"
+          CFLAGS="$CFLAGS $GLIB_CFLAGS"
+          LIBS="$LIBS $GLIB_LIBS"
+          AC_TRY_LINK([
+#include <glib.h>
+#include <stdio.h>
+],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
+          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+	  echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occurred. This usually means GLIB is incorrectly installed."])
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     GLIB_CFLAGS=""
+     GLIB_LIBS=""
+     GLIB_GENMARSHAL=""
+     GOBJECT_QUERY=""
+     GLIB_MKENUMS=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(GLIB_CFLAGS)
+  AC_SUBST(GLIB_LIBS)
+  AC_SUBST(GLIB_GENMARSHAL)
+  AC_SUBST(GOBJECT_QUERY)
+  AC_SUBST(GLIB_MKENUMS)
+  rm -f conf.glibtest
+])

meson.build

@@ -1,648 +0,0 @@
-project('irssi', 'c',
-  version : '1.5-head',
-  meson_version : '>=0.53',
-  default_options : ['warning_level=1'])
-
-############################
-############################
-
-glib_internal_version = 'glib-2.58.3' # keep this in sync with subprojects/glib.wrap
-cc = meson.get_compiler('c')
-rootinc = include_directories('.')
-dep = []
-textui_dep = []
-need_dl_cross_link = false
-# The Android environment requires that all modules are linked to each other.
-# See https://github.com/android/ndk/issues/201
-if host_machine.system() == 'android'
-  need_dl_cross_link = true
-endif
-
-includedir          = get_option('includedir')
-incdir              = 'irssi'
-moduledir           = get_option('libdir') / incdir / 'modules'
-helpdir             = get_option('datadir') / incdir / 'help'
-themedir            = get_option('datadir') / incdir / 'themes'
-scriptdir           = get_option('datadir') / incdir / 'scripts'
-docdir              = get_option('docdir') != '' ? get_option('docdir') : (get_option('datadir') / 'doc' / incdir)
-
-want_textui         = get_option('without-textui') != 'yes'
-want_bot            = get_option('with-bot') == 'yes'
-want_fuzzer         = get_option('with-fuzzer') == 'yes'
-fuzzer_lib          = get_option('with-fuzzer-lib')
-fuzzer_link_language = get_option('fuzzer-link-language')
-want_proxy          = get_option('with-proxy') == 'yes'
-
-require_capsicum    = get_option('with-capsicum') == 'yes'
-want_capsicum       = get_option('with-capsicum') != 'no'
-
-require_libutf8proc = get_option('disable-utf8proc') == 'no'
-want_libutf8proc    = get_option('disable-utf8proc') != 'yes'
-
-require_perl        = get_option('with-perl') == 'yes'
-want_perl           = get_option('with-perl') != 'no'
-with_perl_lib       = get_option('with-perl-lib')
-
-require_otr         = get_option('with-otr') == 'yes'
-want_otr            = get_option('with-otr') != 'no'
-
-want_glib_internal  = get_option('install-glib') != 'no'
-require_glib_internal = get_option('install-glib') == 'force'
-
-want_static_dependency = get_option('static-dependency') == 'yes'
-
-package_version     = get_option('PACKAGE_VERSION') != '' ? get_option('PACKAGE_VERSION') : meson.project_version()
-
-fs = import('fs')
-if fs.exists('config.status') or fs.exists('irssi-version.h') or fs.exists('default-config.h') or fs.exists('default-theme.h') or fs.exists('src/perl/irssi-core.pl.h') or fs.exists('src/perl/perl-signals-list.h') or fs.exists('irssi-config.h')
-  error('this tree has been configured with autotools, cannot proceed')
-endif
-
-UNSET = '=INVALID='
-UNSET_ARR = [UNSET]
-
-chat_modules = ['irc']
-
-run_command('mkdir', meson.current_build_dir() / incdir, check : false)
-run_command('ln', '-s', meson.current_source_dir() / 'src', meson.current_build_dir() / incdir, check : false)
-run_command('ln', '-s', meson.current_build_dir() / 'irssi-config.h', meson.current_build_dir() / incdir, check : false)
-run_command('ln', '-s', meson.current_build_dir() / 'irssi-version.h', meson.current_build_dir() / incdir, check : false)
-
-def_moduledir  = '-D' + 'MODULEDIR'  + '="' + (get_option('prefix') / moduledir) + '"'
-def_sysconfdir = '-D' + 'SYSCONFDIR' + '="' + (get_option('prefix') / get_option('sysconfdir')) + '"'
-def_helpdir    = '-D' + 'HELPDIR'    + '="' + (get_option('prefix') / helpdir) + '"'
-def_themesdir  = '-D' + 'THEMESDIR'  + '="' + (get_option('prefix') / themedir) + '"'
-def_scriptdir  = '-D' + 'SCRIPTDIR'  + '="' + (get_option('prefix') / scriptdir) + '"'
-
-def_suppress_printf_fallback = '-D' + 'SUPPRESS_PRINTF_FALLBACK'
-
-##############
-# Help files #
-##############
-
-build_perl = find_program('perl', native : true)
-if meson.is_cross_build()
-  cross_perl = find_program('perl')
-else
-  cross_perl = build_perl
-endif
-run_command(build_perl, files('utils/syntax.pl'), check : true)
-
-###################
-# irssi-version.h #
-###################
-
-env = find_program('env')
-irssi_version_sh = find_program('utils/irssi-version.sh')
-irssi_version_h = custom_target('irssi-version.h',
-  build_by_default : true,
-  build_always_stale : true,
-  capture : true,
-  command : [env, 'VERSION=' + meson.project_version(),
-    irssi_version_sh, meson.current_source_dir()],
-  output : 'irssi-version.h',
-  install : true,
-  install_dir : includedir / incdir,
-)
-
-####################
-# default-config.h #
-####################
-
-file2header = find_program('utils/file2header.sh')
-default_config_h = custom_target('default-config.h',
-  input : files('irssi.conf'),
-  output : 'default-config.h',
-  capture : true,
-  command : [file2header, '@INPUT@', 'default_config'],
-)
-
-###################
-# default-theme.h #
-###################
-
-default_theme_h = custom_target('default-theme.h',
-  input : files('themes/default.theme'),
-  output : 'default-theme.h',
-  capture : true,
-  command : [file2header, '@INPUT@', 'default_theme'],
-)
-
-################
-# Dependencies #
-################
-
-#### inet_addr ####
-inet_addr_found = false
-foreach inet_addr_provider : ['', 'nsl']
-  prov_lib = []
-  if inet_addr_provider != ''
-    prov_lib += cc.find_library(inet_addr_provider, required : false)
-  endif
-  if (prov_lib.length() == 0 or prov_lib[0].found()) and cc.has_function('inet_addr', dependencies : prov_lib)
-    dep += prov_lib
-    inet_addr_found = true
-    break
-  endif
-endforeach
-if not inet_addr_found
-  error('inet_addr not found')
-endif
-
-#### socket ####
-socket_found = false
-foreach socket_provider : ['', 'socket', 'network']
-  prov_lib = []
-  if socket_provider != ''
-    prov_lib += cc.find_library(socket_provider, required : false)
-  endif
-  if (prov_lib.length() == 0 or prov_lib[0].found()) and cc.has_function('socket', dependencies : prov_lib)
-    dep += prov_lib
-    socket_found = true
-    break
-  endif
-endforeach
-if not socket_found
-  error('socket not found')
-endif
-
-built_src = []
-glib_internal = false
-message('*** If you don\'t have GLib, you can run meson ... -Dinstall-glib=yes')
-message('*** to download and build it automatically')
-message('*** Or alternatively install your distribution\'s package')
-message('*** On Debian: sudo apt-get install libglib2.0-dev')
-message('*** On Redhat: dnf install glib2-devel')
-if not require_glib_internal
-  glib_dep = dependency('glib-2.0', version : '>=2.32', required : not want_glib_internal, static : want_static_dependency, include_type : 'system')
-else
-  glib_dep = dependency('', required : false)
-endif
-if not glib_dep.found()
-  glib_internal = true
-  meson_cmd = find_program('meson')
-  ninja = find_program('ninja')
-
-  glib_internal_download_t = custom_target('glib-internal-download',
-    command : [ meson_cmd, 'subprojects', 'download', 'glib', '--sourcedir', meson.current_source_dir() ],
-    console : true,
-    output : ['glib-internal-download'],
-  )
-
-  glib_internal_dependencies = [
-    dependency('threads'),
-  ]
-  glib_internal_configure_args = []
-
-  glib_internal_usr_local = false
-  if not cc.has_function('iconv_open')
-    prov_lib = cc.find_library('iconv', required : false)
-    if not prov_lib.found()
-      prov_lib = cc.find_library('iconv', dirs : '/usr/local/lib')
-      glib_internal_usr_local = true
-    endif
-    if cc.has_function('libiconv_open', dependencies : prov_lib)
-      glib_internal_configure_args += '-Diconv=gnu'
-    else
-      glib_internal_configure_args += '-Diconv=native'
-    endif
-    glib_internal_dependencies += prov_lib
-  endif
-
-  if not cc.has_function('ngettext')
-    prov_lib = cc.find_library('intl', required : false)
-    if not prov_lib.found()
-      prov_lib = cc.find_library('intl', dirs : '/usr/local/lib')
-      glib_internal_usr_local = true
-    endif
-    glib_internal_dependencies += prov_lib
-  endif
-
-  if glib_internal_usr_local
-    glib_internal_configure_args += ['-Dc_args=-I/usr/local/include', '-Dc_link_args=-L/usr/local/lib']
-  endif
-
-  if not cc.has_function('getxattr') or not cc.has_header('sys/xattr.h')
-    if cc.has_header_symbol('attr/xattr.h', 'getxattr')
-      prov_lib = cc.find_library('xattr', required : false)
-    else
-      prov_lib = dependency('', required : false)
-    endif
-    if prov_lib.found()
-      glib_internal_dependencies += prov_lib
-    else
-      glib_internal_configure_args += '-Dxattr=false'
-    endif
-  endif
-
-  glib_internal_configure_t = custom_target('glib-internal-configure',
-    command : [ meson_cmd, 'setup', '--prefix=/irssi-glib-internal',
-      '--buildtype=' + get_option('buildtype'),
-      '-Dlibmount=false', '-Dselinux=false', '-Ddefault_library=static', '-Dinternal_pcre=true',
-      glib_internal_configure_args,
-      (meson.current_build_dir() / 'build-subprojects' / 'glib'),
-      (meson.current_source_dir() / 'subprojects' / glib_internal_version) ],
-    console : true,
-    output : ['glib-internal-configure'],
-    depends : glib_internal_download_t,)
-  glib_internal_build_t = custom_target('glib-internal-build',
-    command : [ ninja, '-C', meson.current_build_dir() / 'build-subprojects' / 'glib',
-      'glib' / 'libglib-2.0.a',
-      'gmodule' / 'libgmodule-2.0.a'],
-    console : true,
-    output : ['glib-internal-build'],
-    depends : glib_internal_configure_t,)
-  glib_dep = declare_dependency(
-    dependencies : glib_internal_dependencies,
-    sources : glib_internal_build_t,
-    compile_args : [
-      '-isystem' + (meson.current_source_dir() / 'subprojects' / glib_internal_version / 'glib'),
-      '-isystem' + (meson.current_source_dir() / 'subprojects' / glib_internal_version),
-      '-isystem' + (meson.current_build_dir() / 'build-subprojects' / 'glib' / 'glib'),
-    ],
-    link_args : [ meson.current_build_dir() / 'build-subprojects' / 'glib' / 'glib' / 'libglib-2.0.a' ],
-  )
-  built_src += glib_internal_build_t
-  libdl_dep = []
-  prov_lib = cc.find_library('dl', required : false)
-  if prov_lib.found() and cc.has_function('dlopen', dependencies : prov_lib)
-    libdl_dep += prov_lib
-  endif
-  gmodule_dep = declare_dependency(sources : glib_internal_build_t,
-    dependencies : libdl_dep,
-    compile_args : [
-      '-isystem' + (meson.current_source_dir() / 'subprojects' / glib_internal_version / 'gmodule'),
-    ],
-    link_args : [ meson.current_build_dir() / 'build-subprojects' / 'glib' / 'gmodule' / 'libgmodule-2.0.a' ],
-  )
-else
-  gmodule_dep = dependency('gmodule-2.0', static : want_static_dependency, include_type : 'system')
-endif
-dep += glib_dep
-dep += gmodule_dep
-
-if glib_internal and want_static_dependency and want_fuzzer
-  openssl_proj = subproject('openssl', default_options : ['default_library=static', 'asm=disabled'])
-  openssl_dep = openssl_proj.get_variable('openssl_dep')
-else
-  openssl_dep = dependency('openssl', static : want_static_dependency, include_type : 'system')
-endif
-dep += openssl_dep
-
-############
-# utf8proc #
-############
-
-have_libutf8proc = false
-libutf8proc = []
-if want_libutf8proc
-  libutf8proc = cc.find_library('utf8proc', required : require_libutf8proc)
-  have_libutf8proc = cc.has_function('utf8proc_version', dependencies : libutf8proc)
-  if have_libutf8proc
-    dep += libutf8proc
-  endif
-endif
-
-############################
-############################
-
-############
-# terminfo #
-############
-
-if want_textui
-  setupterm_found = false
-  foreach setupterm_provider : ['tinfo', 'ncursesw', 'ncurses', 'terminfo']
-    prov_lib = cc.find_library(setupterm_provider, required : false)
-    if prov_lib.found() and cc.has_function('setupterm', dependencies : prov_lib)
-      textui_dep += prov_lib
-      setupterm_found = true
-      break
-    endif
-  endforeach
-  if not setupterm_found
-    error('Terminfo not found')
-  endif
-endif
-
-########
-# perl #
-########
-
-have_perl = false
-if want_perl
-  perl_cflags = []
-  perl_ldflags = []
-  perl_rpath_flags = []
-  perl_rpath = ''
-
-  #### ccopts ####
-  perl_ccopts = meson.get_cross_property('perl_ccopts', UNSET_ARR)
-  if perl_ccopts == UNSET_ARR
-    res = run_command(cross_perl, '-MExtUtils::Embed', '-e', 'ccopts', check : true)
-    perl_ccopts = res.stdout().strip().split()
-  endif
-  foreach fl : perl_ccopts
-    if fl.startswith('-D') or fl.startswith('-U') or fl.startswith('-I') or fl.startswith('-i') or fl.startswith('-f') or fl.startswith('-m')
-      if fl.startswith('-I')
-        fl = '-isystem' + fl.split('-I')[1]
-      endif
-      perl_cflags += fl
-    endif
-  endforeach
-
-  perl_cflags += cc.get_supported_arguments('-fPIC')
-
-  #### ldopts ####
-  perl_ldopts = meson.get_cross_property('perl_ldopts', UNSET_ARR)
-  if perl_ldopts == UNSET_ARR
-    res = run_command(cross_perl, '-MExtUtils::Embed', '-e', 'ldopts', check : true)
-    perl_ldopts = res.stdout().strip().split()
-  endif
-  skip_libs = ['-ldb', '-ldbm', '-lndbm', '-lgdbm', '-lc', '-lposix', '-rdynamic']
-  foreach fl : perl_ldopts
-    if not fl.startswith('-A') and not skip_libs.contains(fl)
-      if fl.startswith('-Wl,-rpath,')
-        perl_rpath = fl.split(',')[2]
-        perl_rpath_flags += fl
-      else
-        perl_ldflags += fl
-      endif
-    endif
-  endforeach
-
-  perl_version = meson.get_cross_property('perl_version', UNSET)
-  if perl_version == UNSET
-    perl_version = run_command(cross_perl, '-V::version:', check : true).stdout().split('\'')[1]
-  endif
-  perl_dep = declare_dependency(compile_args : perl_cflags, link_args : perl_ldflags,
-    version : perl_version)
-
-  ####
-  if not cc.links('''
-#include <EXTERN.h>
-#include <perl.h>
-int main()
-{
-  perl_alloc();
-  return 0;
-}
-''', args : perl_cflags + perl_ldflags + perl_rpath_flags,
-     name : 'working Perl support')
-    if require_perl
-      error('error linking with perl libraries')
-    else
-      warning('error linking with perl libraries')
-    endif
-  else
-    xsubpp_file_c = meson.get_cross_property('perl_xsubpp', UNSET)
-    if xsubpp_file_c == UNSET
-      xsubpp_file_c = run_command(build_perl, '-MExtUtils::ParseXS', '-Eprint $INC{"ExtUtils/ParseXS.pm"} =~ s{ParseXS\\.pm$}{xsubpp}r', check : true).stdout()
-    endif
-    xsubpp = generator(build_perl,
-      output : '@BASENAME@.c',
-      capture : true,
-      arguments : [ xsubpp_file_c, '@EXTRA_ARGS@', '@INPUT@' ],
-    )
-    xsubpp_file = files(xsubpp_file_c)
-
-    if with_perl_lib == 'module'
-      perl_install_base = run_command(build_perl, '-MText::ParseWords=shellwords', '-e', 'grep { s/^INSTALL_BASE=// && print && exit } shellwords $ENV{PERL_MM_OPT}', check : true).stdout()
-      if perl_install_base == ''
-        with_perl_lib = ''
-      endif
-    endif
-    if with_perl_lib == ''
-      if get_option('prefix') in ['/usr/local', 'C:/']
-        with_perl_lib = 'site'
-      elif get_option('prefix') in ['/usr']
-        with_perl_lib = 'vendor'
-      endif
-    endif
-    perlmoddir = ''
-    if with_perl_lib in ['site', 'vendor', 'module']
-      set_perl_use_lib = false
-      perl_library_dir = with_perl_lib + ' default'
-      if with_perl_lib in ['site', 'vendor']
-        perlmoddir = meson.get_cross_property('perl_install' + with_perl_lib + 'arch', UNSET)
-        if perlmoddir == UNSET
-          perlmoddir = run_command(cross_perl, '-V::install' + with_perl_lib + 'arch:', check : true).stdout().split('\'')[1]
-        endif
-      elif with_perl_lib == 'module'
-        perl_archname = meson.get_cross_property('perl_archname', UNSET)
-        if perl_archname == UNSET
-          perl_archname = run_command(cross_perl, '-V::archname:', check : true).stdout().split('\'')[1]
-        endif
-        perlmoddir = perl_install_base / 'lib' / 'perl5' / perl_archname
-      endif
-    elif with_perl_lib == ''
-      set_perl_use_lib = true
-      perl_library_dir = 'in prefix'
-      perlmoddir = get_option('libdir') / incdir / 'perl'
-    elif with_perl_lib.startswith('/')
-      set_perl_use_lib = true
-      perl_library_dir = 'custom'
-      perlmoddir = with_perl_lib
-    endif
-    if perlmoddir == ''
-      error('Unrecognised with-perl-lib value: ' + with_perl_lib)
-    endif
-
-    perl_use_lib = get_option('prefix') / perlmoddir
-    if set_perl_use_lib
-      perl_inc = meson.get_cross_property('perl_inc', UNSET_ARR)
-      if perl_inc == UNSET_ARR
-        set_perl_use_lib = run_command(cross_perl, '-e', 'exit ! grep $_ eq $ARGV[0], grep /^\\//, @INC', perl_use_lib, check : false).returncode() != 0
-      else
-        set_perl_use_lib = not perl_inc.contains(perl_use_lib)
-      endif
-      if not set_perl_use_lib
-        perl_library_dir += ' - other path in @INC'
-      else
-        perl_library_dir += ' - prepends to @INC with /set perl_use_lib'
-      endif
-    endif
-    def_perl_use_lib = '-D' + 'PERL_USE_LIB' + '="'
-    if set_perl_use_lib
-      def_perl_use_lib += perl_use_lib
-    endif
-    def_perl_use_lib += '"'
-
-    have_perl = true
-  endif
-endif
-
-#######
-# OTR #
-#######
-
-have_otr = false
-if want_otr
-  libgcrypt = dependency('libgcrypt', version : '>=1.2.0', required : require_otr, static : want_static_dependency, include_type : 'system')
-  libotr = dependency('libotr', version : '>=4.1.0', required : require_otr, static : want_static_dependency, include_type : 'system')
-  if libgcrypt.found() and libotr.found()
-    dep += libgcrypt
-    dep += libotr
-    have_otr = true
-  endif
-endif
-
-############
-# capsicum #
-############
-
-have_capsicum = false
-if want_capsicum
-  if cc.has_function('cap_enter', dependencies : cc.find_library('c'))
-    libnv = cc.find_library('nv', required : require_capsicum)
-    nvlist_create_found = libnv.found() and cc.has_function('nvlist_create', dependencies : libnv, prefix : '#include <sys/nv.h>')
-    if nvlist_create_found
-      dep += libnv
-      have_capsicum = true
-    else
-      if require_capsicum
-        error('nvlist_create not found')
-      endif
-    endif
-  else
-    if require_capsicum
-      error('cap_enter not found')
-    endif
-  endif
-endif
-
-# dependency helper sets
-dep_cflagsonly = []
-foreach d : dep
-  dep_cflagsonly += d.partial_dependency(includes : true, compile_args : true)
-endforeach
-dl_cross_dep = []
-if need_dl_cross_link
-  dl_cross_dep = dep
-endif
-
-##################
-# irssi-config.h #
-##################
-
-conf = configuration_data()
-
-conf.set('HAVE_CAPSICUM', have_capsicum, description : 'Build with Capsicum support')
-conf.set('HAVE_GMODULE', true)
-conf.set('TERM_TRUECOLOR', true)
-conf.set('USE_GREGEX', true)
-conf.set10('_DARWIN_USE_64_BIT_INODE', true, description : 'Enable large inode numbers on Mac OS X 10.5.')
-conf.set_quoted('FHS_PREFIX', get_option('fhs-prefix'))
-
-headers = [
-  'sys/ioctl.h',
-  'sys/resource.h',
-  'sys/time.h',
-  'sys/utsname.h',
-  'dirent.h',
-  'term.h',
-  'unistd.h',
-]
-foreach h : headers
-  if cc.has_header(h)
-    conf.set('HAVE_' + h.underscorify().to_upper(), 1, description : 'Define to 1 if you have the <' + h + '> header file.')
-  endif
-endforeach
-
-conf.set('HAVE_LIBUTF8PROC', have_libutf8proc)
-conf.set_quoted('PACKAGE_VERSION', package_version)
-conf.set_quoted('PACKAGE_TARNAME', meson.project_name())
-
-configure_file(output : 'irssi-config.h',
-  configuration : conf,
-  install_dir : includedir / incdir)
-
-##########
-# CFLAGS #
-##########
-
-#### warnings ####
-add_project_arguments(cc.get_supported_arguments('-Werror=declaration-after-statement'), language : 'c')
-
-#### personality ####
-add_project_arguments(cc.get_supported_arguments('-fno-strict-aliasing'), language : 'c')
-if get_option('buildtype').contains('debug')
-  add_project_arguments(cc.get_supported_arguments('-fno-omit-frame-pointer'), language : 'c')
-endif
-
-if want_fuzzer
-  if fuzzer_lib.startswith('-fsanitize=fuzzer')
-    if not cc.has_argument('-fsanitize=fuzzer-no-link')
-      error('compiler does not support -fsanitize=fuzzer-no-link, try clang?')
-    endif
-    add_project_arguments('-fsanitize=fuzzer-no-link', language : 'c')
-  endif
-  if fuzzer_link_language != 'c'
-    add_languages(fuzzer_link_language)
-  endif
-endif
-
-##############
-# irssi-1.pc #
-##############
-
-pc = import('pkgconfig')
-pc_requires = []
-if not glib_internal
-  pc_requires += glib_dep
-endif
-pc.generate(filebase : 'irssi-1',
-  name : 'Irssi',
-  description : 'Irssi chat client',
-  version : package_version,
-  requires : pc_requires,
-  variables : ['irssimoduledir=${libdir}' / incdir / 'modules'])
-
-###########
-# irssi.1 #
-###########
-
-install_man('docs/irssi.1')
-
-###########
-# subdirs #
-###########
-
-subdir('src')
-subdir('tests')
-subdir('docs')
-subdir('scripts')
-subdir('themes')
-# subdir('utils')
-
-############################
-############################
-
-message('*** Irssi configured ***')
-message('')
-message('Building text frontend ........... : ' + want_textui.to_string('yes', 'no'))
-message('Building irssi bot ............... : ' + want_bot.to_string('yes', 'no'))
-message('Building irssi proxy ............. : ' + want_proxy.to_string('yes', 'no'))
-if want_perl and not have_perl
-  message('Building with Perl support ....... : NO!')
-  message(' - Try: sudo apt-get install libperl-dev')
-  message(' -  Or: dnf install perl-devel')
-else
-  message('Building with Perl support ....... : ' + have_perl.to_string('yes', 'no'))
-endif
-if have_perl
-  message('Perl library directory ........... : ' + perl_use_lib)
-  message('                                     ' + perl_library_dir)
-endif
-message('Install prefix ................... : ' + get_option('prefix'))
-message('')
-message('Building with Capsicum ........... : ' + have_capsicum.to_string('yes', 'no'))
-message('Building with utf8proc ........... : ' + have_libutf8proc.to_string('yes', 'no'))
-message('Building with OTR support ........ : ' + have_otr.to_string('yes', 'no'))
-message('')
-message('If there are any problems, read the INSTALL file.')
-message('Now type ninja -C ' + meson.current_build_dir() + ' to build Irssi')
-message('')
-
-############################
-############################

meson_options.txt

@@ -1,16 +0,0 @@
-option('without-textui',    type : 'combo',  description : 'Build without text frontend',             	  choices : ['no', 'yes'])
-option('with-bot',          type : 'combo',  description : 'Build irssi-bot',                         	  choices : ['no', 'yes'])
-option('with-fuzzer',       type : 'combo',  description : 'Build irssi-fuzzer',                      	  choices : ['no', 'yes'])
-option('with-fuzzer-lib',   type : 'string', description : 'Specify path to fuzzer library', value : '-fsanitize=fuzzer')
-option('fuzzer-link-language', type : 'string', description : 'The linker to use for the fuzz targets [c, cpp]', value : 'c')
-option('with-proxy',        type : 'combo',  description : 'Build irssi-proxy',                       	  choices : ['no', 'yes'])
-option('with-perl-lib',     type : 'string', description : 'Specify where to install the Perl libraries for Irssi')
-option('with-perl',         type : 'combo',  description : 'Build with Perl support',                     choices : ['auto', 'yes', 'no'])
-option('with-otr',          type : 'combo',  description : 'Build with OTR support',                      choices : ['auto', 'yes', 'no'])
-option('disable-utf8proc',  type : 'combo',  description : 'Build without Julia\'s utf8proc',             choices : ['auto', 'yes', 'no'])
-option('with-capsicum',     type : 'combo',  description : 'Build with Capsicum support',                 choices : ['auto', 'yes', 'no'])
-option('static-dependency', type : 'combo',  description : 'Request static dependencies',                 choices : ['no', 'yes'])
-option('install-glib',      type : 'combo',  description : 'Download and install GLib for you',           choices : ['no', 'yes', 'force'])
-option('docdir',            type : 'string', description : 'Documentation directory')
-option('fhs-prefix',        type : 'string', description : 'System prefix for Termux')
-option('PACKAGE_VERSION',   type : 'string', description : 'Override PACKAGE_VERSION in tarballs')

redhat/.rpmmacros

@@ -1,16 +0,0 @@
-%_topdir      %(echo $HOME)/rpmbuild
-%_smp_mflags  -j3
-#%__arch_install_post   /usr/lib/rpm/check-rpaths   /usr/lib/rpm/check-buildroot
-%dist .psychotic
-%_dist .psychotic
-%releasetagsuffix psychotic
-%_vendor psychotic
-%vendor psychotic
-%_host_vendor %{_vendor}
-%_packager Psychotic Build System <builder@psychotic.ninja>
-%packager Psychotic Build System <builder@psychotic.ninja>
-%_signature gpg
-%_gpg_name Psychotic Build System
-%_binary_filedigest_algorithm 1
-%_source_filedigest_algorithm 1
-%_binary_payload w9.gzdio

redhat/irssi.spec

@@ -1,160 +0,0 @@
-%define		perl_vendorarch	%(eval "`perl -V:installvendorarch`"; echo $installvendorarch)
-
-Summary:	Modular text mode IRC client with Perl scripting
-Name:		irssi
-Version:	1.4.3
-Release:	0%{?dist}
-
-License:	GPLv2+
-Group:		Applications/Communications
-URL:		http://irssi.org/
-#Source0:	http://irssi.org/files/irssi-%{version}.tar.gz
-Source0:	https://github.com/irssi/irssi/releases/download/%{version}/irssi-%{version}.tar.gz
-Source1:	irssi-config.h
-#Patch0:		00-freenode-to-libera.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	ncurses-devel openssl-devel zlib-devel
-BuildRequires:	pkgconfig glib2-devel perl-devel perl(ExtUtils::Embed)
-BuildRequires:	autoconf automake libtool
-Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-
-%package devel
-Summary:	Development package for irssi
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-
-%description
-Irssi is a modular IRC client with Perl scripting. Only text-mode
-frontend is currently supported. The GTK/GNOME frontend is no longer
-being maintained.
-
-%description devel
-This package contains headers needed to develop irssi plugins.
-
-Irssi is a modular IRC client with Perl scripting. Only text-mode
-frontend is currently supported. The GTK/GNOME frontend is no longer
-being maintained.
-
-
-%prep
-%setup -q
-#%patch0 -p1
-
-%build
-autoreconf -i
-#	--with-bot			\
-%configure --enable-ipv6 --with-textui	\
-	--with-proxy			\
-	--with-perl=yes			\
-	--with-perl-lib=vendor          \
-	--enable-true-color
-
-make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-mv irssi-config.h irssi-config-$(getconf LONG_BIT).h
-cp -p %{SOURCE1} irssi-config.h
-
-
-%install
-rm -rf $RPM_BUILD_ROOT
-%makeinstall PERL_INSTALL_ROOT=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
-install -p irssi-config-$(getconf LONG_BIT).h $RPM_BUILD_ROOT%{_includedir}/%{name}/irssi-config-$(getconf LONG_BIT).h
-
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/lib*.*a
-rm -Rf $RPM_BUILD_ROOT/%{_docdir}/%{name}
-find $RPM_BUILD_ROOT%{perl_vendorarch} -type f -a -name '*.bs' -a -empty -exec rm -f {} ';'
-find $RPM_BUILD_ROOT%{perl_vendorarch} -type f -a -name .packlist -exec rm {} ';'
-chmod -R u+w $RPM_BUILD_ROOT%{perl_vendorarch}
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%files
-%defattr(-,root,root,-)
-%doc docs/*.txt docs/*.html AUTHORS COPYING NEWS README.md TODO
-%config(noreplace) %{_sysconfdir}/%{name}.conf
-%{_bindir}/%{name}
-#%{_bindir}/botti
-%{_datadir}/%{name}
-%{_libdir}/%{name}
-%{_libdir}/pkgconfig/irssi-1.pc
-%{_mandir}/man1/%{name}.1*
-%{perl_vendorarch}/Irssi*
-%{perl_vendorarch}/auto/Irssi
-
-
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/irssi/
-
-
-%changelog
-* Wed Nov 09 2022 Psychotic Build System <builder@psychotic.ninja> - 1.4.3-0
-- Upgrade to upstream 1.4.3
-
-* Wed Jul 13 2022 Psychotic Build System <builder@psychotic.ninja> - 1.4.2-0
-- Update to upstreram 1.4.2
-
-* Sat Jun 11 2022 Psychotic Build System <builder@psychotic.ninja> - 1.4.1-0
-- Upgrade to upstream 1.4.1
-
-* Tue Jun 15 2021 Psychotic Build System <builder@psychotic.ninja> - 1.2.3-2
-- Change references of freenode to libera
-
-* Fri Jun 04 2021 Psychotic Build System <builder@psychotic.ninja> - 1.2.3-1
-- Updated to upstream 1.2.3
-
-* Fri Nov 01 2019 Psychotic Build System <builder@psychotic.ninja> - 1.2.2-1
-- Upgrade to upstream 1.2.2 which is stability and security update addressing
-  CVE-2019-15717 (Use after free when receiving duplicate CAP)
-
-* Mon Jul 01 2019 Psychotic Build System <builder@psychotic.ninja> - 1.2.1-1
-- Upgrade to upstream 1.2.1
-
-* Mon Jul 01 2019 Psychotic Build System <builder@psychotic.ninja> - 1.1.3-1
-- Upgrade to upstream 1.1.3 which is a stability and security update addressing
-  CVE-2019-13045 (use after free if SASL is enabled)
-
-* Mon Jan 14 2019 Psychotic Build System <builder@psychotic.ninja> - 1.1.2-1
-- Upgrade to upstream 1.1.2 which is a stability and security update addressing
-  CVE-2019-5882 (use-after-free).
-
-* Fri Mar 09 2018 Psychotic Build System <builder@psychotic.ninja> - 1.1.1-2
-- Bump to upstream 1.1.1
-
-* Fri Jan 19 2018 Psychotic Build System <builder@psychotic.ninja> - 1.1.0-2
-- Upgraded to upstream 1.1.0.  Sourced from GhettoForge
-
-* Tue Jan 16 2018 Bryan Seitz <seitz@ghettoforge.org> - 1.1.0-1
-- New upstream version 1.1.0
-
-* Sat Jan 06 2018 Bryan Seitz <seitz@ghettoforge.org> - 1.0.6-1
-- New upstream version 1.0.6
-
-* Mon Oct 23 2017 Bryan Seitz <seitz@ghettoforge.org> - 1.0.5-1
-- New upstream version 1.0.5
-
-* Sat Jul 08 2017 Bryan Seitz <seitz@ghettoforge.org> - 1.0.4-1
-- New upstream version 1.0.4
-
-* Sun Mar 19 2017 Psychotic Build System <builder@psychotic.ninja> - 1.0.2-1
-- Updated to upstream 1.0.2
-
-* Fri Mar 17 2017 Psychotic Build System <builder@psychotic.ninja> - 1.0.1-2
-- Initial build for Psychotic Ninja; sourced from GhettoForge
-
-* Mon Feb 06 2017 Bryan Seitz <seitz@ghettoforge.org> - 1.0.1-1
-- New upstream version 1.0.1
-
-* Tue Jan 10 2017 Bryan Seitz <seitz@ghettoforge.org> - 1.0.0-1
-- New upstream version 1.0.0
-
-* Fri Sep 23 2016 Bryan Seitz <seitz@ghettoforge.org> - 0.8.20-1
-- New upstream version 0.8.20
-
-* Fri May 06 2016 Bryan Seitz <seitz@ghettoforge.org> - 0.8.19-1
-- New upstream version 0.8.19
-
-* Mon May 11 2015 Bryan Seitz <seitz@ghettoforge.org> - 0.8.17-2
-- Import into GhettoForge

scripts/Makefile.am

@@ -0,0 +1,17 @@
+SUBDIRS = examples
+
+scriptdir = $(datadir)/irssi/scripts
+
+script_DATA = \
+	autoop.pl \
+	autorejoin.pl \
+	buf.pl \
+	dns.pl \
+	kills.pl \
+	mail.pl \
+	mlock.pl \
+	quitmsg.pl \
+	scriptassist.pl \
+	usercount.pl
+
+EXTRA_DIST = $(script_DATA)

scripts/autorejoin.pl

@@ -1,9 +1,6 @@
-# automatically rejoin to channel after kicked
+# automatically rejoin to channel after kick
 # delayed rejoin: Lam 28.10.2001 (lam@lac.pl)
 
-# /SET autorejoin_channels #channel1 #channel2 ...
-# /SET autorejoin_delay 5
-
 # NOTE: I personally don't like this feature, in most channels I'm in it
 # will just result as ban. You've probably misunderstood the idea of /KICK
 # if you kick/get kicked all the time "just for fun" ...
@@ -12,22 +9,31 @@ use Irssi;
 use Irssi::Irc;
 use strict;
 use vars qw($VERSION %IRSSI);
-$VERSION = "1.1.0";
+$VERSION = "1.0.0";
 %IRSSI = (
 	authors => "Timo 'cras' Sirainen, Leszek Matok",
 	contact => "lam\@lac.pl",
 	name => "autorejoin",
-	description => "Automatically rejoin to channel after being kicked, after a (short) user-defined delay",
+	description => "Automatically rejoin to channel after being kick, after a (short) user-defined delay",
 	license => "GPLv2",
 	changed => "10.3.2002 14:00"
 );
 
+
+# How many seconds to wait before the rejoin?
+# TODO: make this a /setting
+my $delay = 5;
+
+my @tags;
+my $acttag = 0;
+
 sub rejoin {
 	my ( $data ) = @_;
-	my ( $servtag, $channel, $pass ) = @{$data};
+	my ( $tag, $servtag, $channel, $pass ) = split( / +/, $data );
 
 	my $server = Irssi::server_find_tag( $servtag );
 	$server->send_raw( "JOIN $channel $pass" ) if ( $server );
+	Irssi::timeout_remove( $tags[$tag] );
 }
 
 sub event_rejoin_kick {
@@ -42,31 +48,10 @@ sub event_rejoin_kick {
 	my $rejoinchan = $chanrec->{ name } if ( $chanrec );
 	my $servtag = $server->{ tag };
 
-	# check if we want to autorejoin this channel
-	my $chans = Irssi::settings_get_str( 'autorejoin_channels' );
-
-	if ( $chans ) {
-		my $found = 0;
-		foreach my $chan ( split( /[ ,]/, $chans ) ) {
-			if ( lc( $chan ) eq lc( $channel ) ) {
-				$found = 1;
-				last;
-			}
-		}
-		return unless $found;
-	}
-
-	my @args = ($servtag, $rejoinchan, $password);
-	my $delay = Irssi::settings_get_int( "autorejoin_delay" );
-
-	if ($delay) {
-		Irssi::print "Rejoining $rejoinchan in $delay seconds.";
-		Irssi::timeout_add_once( $delay * 1000, "rejoin", \@args );
-	} else {
-		rejoin( \@args );
-	}
+	Irssi::print "Rejoining $rejoinchan in $delay seconds.";
+	$tags[$acttag] = Irssi::timeout_add( $delay * 1000, "rejoin", "$acttag $servtag $rejoinchan $password" );
+	$acttag++;
+	$acttag = 0 if ( $acttag > 60 );
 }
 
-Irssi::settings_add_int('misc', 'autorejoin_delay', 5);
-Irssi::settings_add_str('misc', 'autorejoin_channels', '');
 Irssi::signal_add( 'event kick', 'event_rejoin_kick' );

scripts/buf.pl

@@ -1,24 +1,22 @@
 use strict;
 use vars qw($VERSION %IRSSI);
-use Storable;
-use 5.014000;
 
 use Irssi qw(command signal_add signal_add_first active_win
              settings_get_str settings_get_bool channels windows
-             settings_add_str settings_add_bool get_irssi_dir
-             window_find_refnum signal_stop);
-$VERSION = '3.00';
+	     settings_add_str settings_add_bool get_irssi_dir
+	     window_find_refnum signal_stop);
+$VERSION = '2.20';
 %IRSSI = (
-    authors     => 'Juerd',
-    contact     => 'juerd@juerd.nl',
-    name        => 'Scroll buffer restorer',
-    description => 'Saves the buffer for /upgrade, so that no information is lost',
-    license     => 'Public Domain',
-    url         => 'http://juerd.nl/irssi/',
-    changed     => 'Thu Mar 29 10:00 CEST 2018',
-    changes     => 'Fixed file permissions (leaked everything via filesystem), rewritten to use Storable and print to correct levels',
-    note1       => 'This script HAS TO BE in your scripts/autorun!',
-    note2       => 'Perl support must be static or in startup',
+    authors	=> 'Juerd',
+    contact	=> 'juerd@juerd.nl',
+    name	=> 'Scroll buffer restorer',
+    description	=> 'Saves the buffer for /upgrade, so that no information is lost',
+    license	=> 'Public Domain',
+    url		=> 'http://juerd.nl/irssi/',
+    changed	=> 'Thu Sep 22 01:37 CEST 2016',
+    changes	=> 'Fixed file permissions (leaked everything via filesystem)',
+    note1	=> 'This script HAS TO BE in your scripts/autorun!',
+    note2	=> 'Perl support must be static or in startup',
 );
 
 # Q: How can I get a very smooth and clean upgrade?
@@ -42,28 +40,30 @@ my %suppress;
 sub _filename { sprintf '%s/scrollbuffer', get_irssi_dir }
 
 sub upgrade {
-    my $out = { suppress => [ map $_->{server}->{address} . $_->{name}, channels ] };
-    for my $window (windows) {
-        next unless defined $window;
-        next if $window->{name} eq 'status';
-        my $view = $window->view;
-        my $line = $view->get_lines;
-        my $lines  = 0;
-        my $buf = '';
-        my $output;
-        if (defined $line) {
-            {
-              push @$output, { level => $line->{info}{level}, data => $line->get_text(1) };
-              $line = $line->next;
-              redo if defined $line;
-            }
-        }
-        push @{$out->{windows}}, { refnum => $window->{refnum}, lines => $output };
-    }
-    my $old_umask = umask 0077;
     my $fn = _filename;
-    store($out, $fn) or die "Could not store data to $fn";
+    my $old_umask = umask 0077;
+    open my $fh, q{>}, $fn or die "open $fn: $!";
     umask $old_umask;
+
+    print $fh join("\0", map $_->{server}->{address} . $_->{name}, channels), "\n";
+    for my $window (windows) {
+	next unless defined $window;
+	next if $window->{name} eq 'status';
+	my $view = $window->view;
+	my $line = $view->get_lines;
+	my $lines  = 0;
+	my $buf = '';
+	if (defined $line){
+	    {
+		$buf .= $line->get_text(1) . "\n";
+		$line = $line->next;
+		$lines++;
+		redo if defined $line;
+	    }
+	}
+	printf $fh "%s:%s\n%s", $window->{refnum}, $lines, $buf;
+    }
+    close $fh;
     unlink sprintf("%s/sessionconfig", get_irssi_dir);
     command 'layout save';
     command 'save';
@@ -71,30 +71,33 @@ sub upgrade {
 
 sub restore {
     my $fn = _filename;
-    my $in = retrieve($fn) or die "Could not retrieve data from $fn";
+    open my $fh, q{<}, $fn or die "open $fn: $!";
     unlink $fn or warn "unlink $fn: $!";
-  
-    my @suppress = @{$in->{suppress}};
-    @suppress{@suppress} = (2) x @suppress if (settings_get_bool 'upgrade_suppress_join');
-  
+
+    my @suppress = split /\0/, readline $fh;
+    if (settings_get_bool 'upgrade_suppress_join') {
+	chomp $suppress[-1];
+	@suppress{@suppress} = (2) x @suppress;
+    }
     active_win->command('^window scroll off');
-    for my $win (@{$in->{windows}}) {
-        my $window = window_find_refnum $win->{refnum};
-        next unless $window;
-        my @lines  = @{ $win->{lines} || [] };
-        next unless @lines;
-    
-        my $view = $window->view;
-        $view->remove_all_lines();
-        $view->redraw();
-        for my $line (@lines) {
-            my $level = $line->{level};
-            my $data  = $line->{data};
-            $window->gui_printtext_after($window->last_line_insert, $level, "$data\n");
-        }
-        my $sep = settings_get_str 'upgrade_separator';
-        $window->gui_printtext_after($window->last_line_insert, MSGLEVEL_CLIENTNOTICE, "\cO$sep\n") if $sep ne '';
-        $view->redraw();
+    while (my $bla = readline $fh){
+	chomp $bla;
+	my ($refnum, $lines) = split /:/, $bla;
+	next unless $lines;
+	my $window = window_find_refnum $refnum;
+	unless (defined $window){
+	    readline $fh for 1..$lines;
+	    next;
+	}
+	my $view = $window->view;
+	$view->remove_all_lines();
+	$view->redraw();
+	my $buf = '';
+	$buf .= readline $fh for 1..$lines;
+	my $sep = settings_get_str 'upgrade_separator';
+	$sep .= "\n" if $sep ne '';
+	$window->gui_printtext_after(undef, MSGLEVEL_CLIENTNOTICE, "$buf\cO$sep");
+	$view->redraw();
     }
     active_win->command('^window scroll on');
     active_win->command('^scrollback end');
@@ -107,7 +110,7 @@ sub suppress {
     $key_part =~ s/^://;
     my $key = $first->{address} . $key_part;
     if (exists $suppress{$key} and $suppress{$key}--) {
-        signal_stop();
+    	signal_stop();
         delete $suppress{$key} unless $suppress{$key};
     }
 }

scripts/dns.pl

@@ -1,18 +1,16 @@
 # /DNS <nick>|<host>|<ip> ...
-#
-# v2.2
-#   add ipv6 support
-# v2.1.1
-#   updated the script to fix a bug where the script would let
-#   a trailing whitespace go through (ex: tab completion)
-#   - inch <inch@stmpd.net>
+# version 2.1.1
+# 
+# updated the script to fix a bug where the script would let
+# a trailing whitespace go through (ex: tab completion)
+# - inch <inch@stmpd.net>
 
 use strict;
 use Socket;
 use POSIX;
 
 use vars qw($VERSION %IRSSI); 
-$VERSION = "2.2";
+$VERSION = "2.1.1";
 %IRSSI = (
     authors	=> "Timo \'cras\' Sirainen",
     contact	=> "tss\@iki.fi", 
@@ -20,7 +18,7 @@ $VERSION = "2.2";
     description	=> "/DNS <nick>|<host>|<ip> ...",
     license	=> "Public Domain",
     url		=> "http://irssi.org/",
-    changed	=> "2019-01-24"
+    changed	=> "2002-03-04T22:47+0100"
 );
 
 my (%resolve_hosts, %resolve_nicks, %resolve_print); # resolve queues
@@ -104,42 +102,6 @@ sub sig_userhost {
   host_lookup() if (!$lookup_waiting);
 }
 
-sub dns {
-  my ($host) =@_;
-  my %hints = (socktype => SOCK_STREAM);
-  my ($err, @res) = Socket::getaddrinfo($host, "http", \%hints);
-  my @res1;
-  if ($err ==0 ) {
-    foreach(@res) {
-      if ($_->{family}==AF_INET) {
-	my ($proto,$ip)=unpack_sockaddr_in($_->{addr});
-	push @res1, Socket::inet_ntop(AF_INET,$ip);
-      }
-      if ($_->{family}==AF_INET6) {
-	my ($proto,$ip)=unpack_sockaddr_in6($_->{addr});
-	push @res1, Socket::inet_ntop(AF_INET6,$ip);
-      }
-    }
-    return join(' ',@res1);
-  }
-}
-
-sub rdns {
-  my ($host) =@_;
-  my %hints = (socktype => SOCK_STREAM);
-  my ($err, @res) = Socket::getaddrinfo($host, "http", \%hints);
-  my @res1;
-  if ($err ==0 ) {
-    foreach(@res) {
-      my ($err, $hostname, $servicename) = Socket::getnameinfo $_->{addr};
-      if ($err ==0) {
-	push @res1, $hostname;
-      }
-    }
-    return join(' ',@res1);
-  }
-}
-
 sub host_lookup {
   return if (!%resolve_hosts);
 
@@ -183,13 +145,16 @@ sub host_lookup {
   eval {
     # child, do the lookup
     my $name = "";
-    if ($host =~ /^[0-9\.]*$/ || $host =~ m/^[0-9a-f:]*$/) {
+    if ($host =~ /^[0-9\.]*$/) {
       # ip -> host
-      #$name = gethostbyaddr(inet_aton($host), AF_INET);
-      $name = rdns($host);
+      $name = gethostbyaddr(inet_aton($host), AF_INET);
     } else {
       # host -> ip
-      $name = dns($host);
+      my @addrs = gethostbyname($host);
+      if (@addrs) {
+	@addrs = map { inet_ntoa($_) } @addrs[4 .. $#addrs];
+	$name = join (" ", @addrs);
+      }
     }
 
     $print_name = $input_query if !$print_name;
@@ -232,5 +197,3 @@ Irssi::command_bind('dns', 'cmd_dns');
 Irssi::signal_add( {
         'redir dns failure' => \&sig_failure,
         'redir dns host' => \&sig_userhost } );
-
-# vim:set sw=2 ts=8:

scripts/examples/Makefile.am

@@ -0,0 +1,8 @@
+scriptdir = $(datadir)/irssi/scripts
+
+script_DATA = \
+	command.pl \
+	msg-event.pl \
+	redirect.pl
+
+EXTRA_DIST = $(script_DATA)

scripts/mail.pl

@@ -6,7 +6,6 @@ $VERSION = "2.92";
     contact     => "tss\@iki.fi, matti\@hiljanen.com, joost\@carnique.nl, bart\@dreamflow.nl",
     name        => "mail",
     description => "Fully customizable mail counter statusbar item with multiple mailbox and multiple Maildir support",
-    sbitems     => "mail",
     license     => "Public Domain",
     url         => "http://irssi.org, http://scripts.irssi.de",
 );
@@ -31,7 +30,6 @@ $VERSION = "2.92";
 # Check /mailbox help for help.
 
 use Irssi::TextUI;
-use Irssi;
 
 my $maildirmode = 0; # maildir=1, file(spools)=0
 my $old_is_not_new = 0; 
@@ -39,7 +37,7 @@ my $extprog;
 my ($last_refresh_time, $refresh_tag);
 
 # for mbox caching
-my ($last_size, $last_mtime, $last_mailcount, $last_mode);
+my $last_size, $last_mtime, $last_mailcount, $last_mode;
 
 # list of mailboxes
 my %mailboxes = (); 
@@ -103,9 +101,8 @@ sub mbox_count {
   my $old_is_not_new=Irssi::settings_get_bool('mail_oldnotnew');
 
   if ($extprog ne "") {
-     my $total = `$extprog`;
-     chomp $total;
-     ($read, $unread) = split ' ', $total, 2;
+     $total = `$extprog`;
+     chomp $unread;
   } else {
     if (!$maildirmode) {
       if (-f $mailfile) {
@@ -118,7 +115,8 @@ sub mbox_count {
 	$last_size = $size;
 	$last_mtime = $mtime;
 
-	return 0 if (!open(my $f, "<", $mailfile));
+	my $f = gensym;
+	return 0 if (!open($f, "<", $mailfile));
 
 	# count new mails only
 	my $internal_removed = 0;
@@ -207,7 +205,7 @@ sub mail {
   my $total = 0;
 
   # check all mailboxes for new email
-  foreach my $name (keys(%mailboxes)) {
+  foreach $name (keys(%mailboxes)) {
     my $box = $mailboxes{$name};
     # replace "~/" at the beginning by the user's home dir
     $box =~ s/^~\//$ENV{'HOME'}\//;
@@ -235,7 +233,7 @@ sub mail {
     # Show this only if there are any new, unread messages.
     if (Irssi::settings_get_bool('mail_show_message') &&
         $unread > $new_mails_in_box{$name}) {
-      my $new_mails = $unread - $new_mails_in_box{$name};
+      $new_mails = $unread - $new_mails_in_box{$name};
       if ($nummailboxes == 1) {
         Irssi::print("You have $new_mails new message" . ($new_mails != 1 ? "s." : "."), MSGLEVEL_CRAP);
       } else {
@@ -265,9 +263,11 @@ sub add_mailboxes {
   my $boxstring = $_[0];
   my @boxes = split(/,/, $boxstring);
 
-  foreach my $dbox(@boxes) {
-    my $name = substr($dbox, 0, index($dbox, '='));
-    my $box = substr($dbox, index($dbox, '=') + 1, length($dbox));
+  foreach $dbox(@boxes) {
+    my $name = $dbox;
+    $name = substr($dbox, 0, index($dbox, '='));
+    my $box = $dbox;
+    $box = substr($dbox, index($dbox, '=') + 1, length($dbox));
     addmailbox($name, $box);
   }
 }
@@ -306,7 +306,7 @@ sub delmailbox {
 sub update_settings_string {
   my $setting;
 
-  foreach my $name (keys(%mailboxes)) {
+  foreach $name (keys(%mailboxes)) {
     $setting .= $name . "=" . $mailboxes{$name} . ",";
   }
 
@@ -345,7 +345,7 @@ sub cmd_showmailboxes {
     return;
   }
   Irssi::print("Mailboxes:", MSGLEVEL_CRAP);
-  foreach my $box (keys(%mailboxes)) {
+  foreach $box (keys(%mailboxes)) {
     Irssi::print("$box: " . $mailboxes{$box}, MSGLEVEL_CRAP);
   }
 }

scripts/meson.build

@@ -1,14 +0,0 @@
-install_data(
-  files(
-    'autoop.pl',
-    'autorejoin.pl',
-    'buf.pl',
-    'dns.pl',
-    'kills.pl',
-    'mail.pl',
-    'mlock.pl',
-    'quitmsg.pl',
-    'scriptassist.pl',
-    'usercount.pl',
-  ),
-  install_dir : scriptdir)

scripts/quitmsg.pl

@@ -6,27 +6,36 @@ use Irssi::Irc;
 use strict;
 use vars qw($VERSION %IRSSI);
 
-$VERSION = "1.01";
+$VERSION = "1.00";
 %IRSSI = (
     authors     => 'Timo Sirainen',
     name        => 'quitmsg',
     description => 'Random quit messages',
     license     => 'Public Domain',
-    changed	=> 'Mon Jul 22 20:00 EET 2020'
+    changed	=> 'Sun Mar 10 23:18 EET 2002'
 );
 
-my $quitfile = Irssi::get_irssi_dir() . "/irssi.quit";
+my $quitfile = glob "~/.irssi/irssi.quit";
 
 sub cmd_quit {
 	my ($data, $server, $channel) = @_;
 	return if ($data ne "");
-	
-	open (my $fh, "<", $quitfile) || return;
-	my @lines = <$fh>;
 
-	my $quitmsg = $lines[int(rand(@lines))];
-	chomp($quitmsg);
-	close($fh);
+	open (f, "<", $quitfile) || return;
+	my $lines = 0; while(<f>) { $lines++; };
+
+	my $line = int(rand($lines))+1;
+
+	my $quitmsg;
+	seek(f, 0, 0); $. = 0;
+	while(<f>) {
+		next if ($. != $line);
+
+		chomp;
+		$quitmsg = $_;
+		last;
+	}
+	close(f);
 
 	foreach my $server (Irssi::servers) {
 		$server->command("/disconnect ".$server->{tag}." $quitmsg");

scripts/scriptassist.pl

@@ -5,33 +5,30 @@
 
 use strict;
 
-our $VERSION = '2022053100';
+our $VERSION = '2003020804';
 our %IRSSI = (
     authors     => 'Stefan \'tommie\' Tomanek',
     contact     => 'stefan@pico.ruhr.de',
     name        => 'scriptassist',
     description => 'keeps your scripts on the cutting edge',
     license     => 'GPLv2',
-    url         => 'https://scripts.irssi.org/',
-    modules     => 'CPAN::Meta::YAML LWP::Protocol::https (GnuPG)',
+    url         => 'http://irssi.org/scripts/',
+    modules     => 'Data::Dumper LWP::UserAgent (GnuPG)',
     commands	=> "scriptassist"
 );
 
 our ($forked, %remote_db, $have_gpg, @complist);
 
 use Irssi 20020324;
-use CPAN::Meta::YAML;
+use Data::Dumper;
 use LWP::UserAgent;
 use POSIX;
-use version;
 
 # GnuPG is not always needed
 $have_gpg = 0;
 eval "use GnuPG qw(:algo :trust);";
 $have_gpg = 1 if not ($@);
 
-my $irssi_version = qv('v'.Irssi::parse_special('$J') =~ s/[^.\d].*//r);
-
 sub show_help {
     my $help = "scriptassist $VERSION
 /scriptassist check
@@ -42,15 +39,15 @@ sub show_help {
     Search the script database
 /scriptassist info <scripts>
     Display information about <scripts>
-/scriptassist ratings <scripts|all>
-    Retrieve the average ratings of the the scripts
-/scriptassist top <num>
-    Retrieve the first <num> top rated scripts
-/scriptassist new <num>
+".#/scriptassist ratings <scripts>
+#    Retrieve the average ratings of the the scripts
+#/scriptassist top <num>
+#    Retrieve the first <num> top rated scripts
+"/scriptassist new <num>
     Display the newest <num> scripts
-/scriptassist rate <script>
-    Rate the script if you like it
-/scriptassist contact <script>
+".#/scriptassist rate <script> <stars>
+#    Rate the script with a number of stars ranging from 0-5
+"/scriptassist contact <script>
     Write an email to the author of the script
     (Requires OpenURL)
 /scriptassist cpan <module>
@@ -98,7 +95,6 @@ sub call_openurl {
 	$code->($url);
     } else {
         print CLIENTCRAP "%R>>%n Please install openurl.pl";
-        print CLIENTCRAP "%R>>%n    or open < $url > manually";
     }
 }
 
@@ -174,13 +170,14 @@ sub bg_do {
 		my $cmd = $items[1];
 		$result{data}{unknown}{$cmd} = get_unknown($cmd, $xml);
 	    }
-	    my $yaml = CPAN::Meta::YAML->new(\%result);
-	    my $data = $yaml->write_string();
+	    my $dumper = Data::Dumper->new([\%result]);
+	    $dumper->Purity(1)->Deepcopy(1)->Indent(0);
+	    my $data = $dumper->Dump;
 	    print($wh $data);
 	};
 	if ($@) {
-	    print($wh CPAN::Meta::YAML->new(+{data=>+{error=>$@}})
-		      ->write_string());
+	    print($wh Data::Dumper->new([+{data=>+{error=>$@}}])
+		      ->Purity(1)->Deepcopy(1)->Indent(0)->Dump);
 	}
 	close($wh);
 	POSIX::_exit(1);
@@ -192,7 +189,7 @@ sub get_unknown {
     foreach (keys %$db) {
 	next unless defined $db->{$_}{commands};
 	foreach my $item (split / /, $db->{$_}{commands}) {
-	    return { $_ => +{%{$db->{$_}}} } if ($item =~ /^$cmd$/i);
+	    return { $_ => $db->{$_} } if ($item =~ /^$cmd$/i);
 	}
     }
     return undef;
@@ -268,80 +265,47 @@ sub script_info {
 		$result{$sname}{modules}{$mod}{installed} = module_exist($mod);
 	    }
 	}
-	# if (defined $xml->{$plname}{depends}) {
-	#     my $depends = $xml->{$plname}{depends};
-	#     foreach my $dep (split(/ /, $depends)) {
-	# 	$result{$sname}{depends}{$dep}{installed} = 1; #(defined ${ 'Irssi::Script::'.$dep });
-	#     }
-	# }
+	if (defined $xml->{$plname}{depends}) {
+	    my $depends = $xml->{$plname}{depends};
+	    foreach my $dep (split(/ /, $depends)) {
+		$result{$sname}{depends}{$dep}{installed} = 1;
+	    }
+	}
     }
     return \%result;
 }
 
-sub get_rate_url {
-    my ($src) = @_;
-    my $ua = LWP::UserAgent->new(env_proxy=>1, keep_alive=>1, timeout=>30);
-    $ua->agent('ScriptAssist/'.$VERSION);
-    my $request = HTTP::Request->new('GET', $src);
-    my $response = $ua->request($request);
-    unless ($response->is_success) {
-	my $error = join "\n", $response->status_line(), (grep / at .* line \d+/, split "\n", $response->content()), '';
-	die("Fetching ratings location failed: $error");
-    }
-    my $votes_url;
-    for my $tag ($response->content() =~ /<script([^>]*)>/g) {
-	my $attr = " $tag ";
-	($votes_url = $1) =~ s/\.\w+$/.yml/
-	    if $attr =~ /\sasync\s/ && $attr =~ m{\ssrc="(https?://.*?/votes\.\w+)"\s};
-    }
-    unless ($votes_url) {
-	die("Fetching ratings failed: Could not find votes script\n");
-    }
-    $request = HTTP::Request->new('GET', $votes_url);
-    $response = $ua->request($request);
-    if (!$response->is_success) {
-	my $error = join "\n", $response->status_line(), (grep / at .* line \d+/, split "\n", $response->content()), '';
-	die("Fetching ratings failed: $error");
-    }
-    my $data = $response->content();
-    utf8::decode($data);
-    CPAN::Meta::YAML->read_string($data)->[0];
-}
-
 sub rate_script {
     my ($script, $stars) = @_;
-    my $xml = get_scripts();
-    my $votes = get_rate_url(map { $_->{source} } values %$xml);
-    my ($sname, $plname, $pname) = get_names($script, $xml);
-    die "Script $script not found\n" unless $votes->{$plname};
-    return $votes->{$plname}{u}
+    my $ua = LWP::UserAgent->new(env_proxy=>1, keep_alive=>1, timeout=>30);
+    $ua->agent('ScriptAssist/'.2003020803);
+    my $request = HTTP::Request->new('GET', 'http://ratings.irssi.de/irssirate.pl?&stars='.$stars.'&mode=rate&script='.$script);
+    my $response = $ua->request($request);
+    unless ($response->is_success() && $response->content() =~ /You already rated this script/) {
+	return 1;
+    } else {
+	return 0;
+    }
 }
 
 sub get_ratings {
     my ($scripts, $limit) = @_;
-    my $xml = get_scripts();
-    my $votes = get_rate_url(map { $_->{source} } values %$xml);
-    foreach (keys %{$votes}) {
-	if ($xml->{$_}) {
-	    $xml->{$_}{votes} = $votes->{$_}{v};
-	}
-    }
+    my $ua = LWP::UserAgent->new(env_proxy=>1, keep_alive=>1, timeout=>30);
+    $ua->agent('ScriptAssist/'.2003020803);
+    my $script = join(',', @{$scripts});
+    my $request = HTTP::Request->new('GET', 'http://ratings.irssi.de/irssirate.pl?script='.$script.'&sort=rating&limit='.$limit);
+    my $response = $ua->request($request);
     my %result;
-    if (@{$scripts}) {
-	foreach (@{$scripts}) {
-	    my ($sname, $plname, $pname) = get_names($_, $xml);
-	    next unless (defined $xml->{$plname} || ( exists $Irssi::Script::{$pname} && exists $Irssi::Script::{$pname}{IRSSI} ));
-	    $result{$plname} = [$xml->{$plname}{votes}];
-	}
-    } else {
-	my @keys = sort { $xml->{$b}{votes} <=> $xml->{$a}{votes}
-		  || $xml->{$b}{modified} cmp $xml->{$a}{modified} }
-	    grep { !$xml->{$_}{HIDDEN} && $xml->{$_}{votes} ne '' } keys %$xml;
-	foreach (splice @keys, 0, $limit) {
-	    $result{$_} = [$xml->{$_}{votes}];
+    if ($response->is_success()) {
+	foreach (split /\n/, $response->content()) {
+	    if (/<tr><td><a href=".*?">(.*?)<\/a>/) {
+		my $entry = $1;
+		if (/"><\/td><td>([0-9.]+)<\/td><td>(.*?)<\/td><td>/) {
+		    $result{$entry} = [$1, $2];
+		}
+	    }
 	}
     }
-    die "No such script found\n" unless keys %result;
     return \%result;
 }
 
@@ -349,9 +313,8 @@ sub get_new {
     my ($num) = @_;
     my $result;
     my $xml = get_scripts();
-    foreach (sort {$xml->{$b}{modified} cmp $xml->{$a}{modified}} keys %$xml) {
+    foreach (sort {$xml->{$b}{last_modified} cmp $xml->{$a}{last_modified}} keys %$xml) {
 	my %entry = %{ $xml->{$_} };
-	next if $entry{HIDDEN};
 	$result->{$_} = \%entry;
 	$num--;
 	last unless $num;
@@ -427,7 +390,6 @@ sub search_scripts {
     my %result;
     foreach (sort keys %{$database}) {
 	my %entry = %{$database->{$_}};
-	next if $entry{HIDDEN};
 	my $string = $_." ";
 	$string .= $entry{description} if defined $entry{description};
 	if ($string =~ /$query/i) {
@@ -463,8 +425,8 @@ sub pipe_input {
 	print CLIENTCRAP "%R<<%n Something weird happend (no text)";
 	return();
     }
-    utf8::decode($text);
-    my $incoming = CPAN::Meta::YAML->read_string($text)->[0];
+    local our $VAR1;
+    my $incoming = eval($text);
     if ($incoming->{db} && $incoming->{timestamp}) {
     	$remote_db{db} = $incoming->{db};
     	$remote_db{timestamp} = $incoming->{timestamp};
@@ -634,8 +596,13 @@ sub print_rate {
     my (%data) = @_;
     my $line;
     foreach my $script (sort keys(%data)) {
-	call_openurl($data{$script});
+	if ($data{$script}) {
+            $line .= "%go%n %9".$script."%9 has been rated";
+        } else {
+            $line .= "%ro%n %9".$script."%9 : Already rated this script";
+        }
     }
+    print CLIENTCRAP draw_box('ScriptAssist', $line, 'rating', 1) ;
 }
 
 sub print_ratings {
@@ -649,7 +616,8 @@ sub print_ratings {
 	    push @line, "%yo%n";
 	}
         push @line, "%9".$script."%9";
-	push @line, "[".(length $data{$script}{rating} ? $data{$script}{rating} : 'no')." votes]";
+	push @line, $data{$script}{rating};
+	push @line, "[".$data{$script}{votes}." votes]";
 	push @table, \@line;
     }
     print CLIENTCRAP draw_box('ScriptAssist', array2table(@table), 'ratings', 1) ;
@@ -658,7 +626,7 @@ sub print_ratings {
 sub print_new {
     my ($list) = @_;
     my @table;
-    foreach (sort {$list->{$b}{modified} cmp $list->{$a}{modified}} keys %$list) {
+    foreach (sort {$list->{$b}{last_modified} cmp $list->{$a}{last_modified}} keys %$list) {
 	my @line;
 	my ($name) = get_names($_);
         if (get_local_version($name)) {
@@ -667,7 +635,7 @@ sub print_new {
             push @line, "%yo%n";
         }
 	push @line, "%9".$name."%9";
-	push @line, $list->{$_}{modified};
+	push @line, $list->{$_}{last_modified};
 	push @table, \@line;
     }
     print CLIENTCRAP draw_box('ScriptAssist', array2table(@table), 'new scripts', 1) ;
@@ -852,7 +820,7 @@ sub contact_author {
 
 sub get_scripts {
     my $ua = LWP::UserAgent->new(env_proxy=>1, keep_alive=>1, timeout=>30);
-    $ua->agent('ScriptAssist/'.$VERSION);
+    $ua->agent('ScriptAssist/'.2003020803);
     $ua->env_proxy();
     my @mirrors = split(/ /, Irssi::settings_get_str('scriptassist_script_sources'));
     my %sites_db;
@@ -876,32 +844,28 @@ sub get_scripts {
 	}
 	$fetched = 1;
 	my $data = $response->content();
-	my $src = $site;
-	my $type = '';
+	my ($src, $type);
 	if ($site =~ /(.*\/).+\.(.+)/) {
 	    $src = $1;
 	    $type = $2;
 	}
 	push @sources, $src;
-	#my @header = ('name', 'contact', 'authors', 'description', 'version', 'modules', 'modified');
+	#my @header = ('name', 'contact', 'authors', 'description', 'version', 'modules', 'last_modified');
 	if ($type eq 'dmp') {
-	    die("Support for $type script database has been removed. Please /set scriptassist_script_sources and change $type -> yml.\n");
-	} elsif ($type eq 'yml') {
-	    utf8::decode($data);
-	    my $new_db = CPAN::Meta::YAML->read_string($data);
-	    foreach (@{$new_db->[0]}) {
-		my $K = $_->{filename};
-		if (defined $sites_db{script}{$K}) {
-		    my $old = $sites_db{$K}{version};
-		    my $new = $_->{version};
+	    no strict 'vars';
+	    my $new_db = eval "$data";
+	    foreach (keys %$new_db) {
+		if (defined $sites_db{script}{$_}) {
+		    my $old = $sites_db{$_}{version};
+		    my $new = $new_db->{$_}{version};
 		    next if (compare_versions($old, $new) eq 'newer');
 		}
 		#foreach my $key (@header) {
-		foreach my $key (keys %$_) {
-		    next unless defined $_->{$key};
-		    $sites_db{$K}{$key} = $_->{$key};
+		foreach my $key (keys %{ $new_db->{$_} }) {
+		    next unless defined $new_db->{$_}{$key};
+		    $sites_db{$_}{$key} = $new_db->{$_}{$key};
 		}
-		$sites_db{$K}{source} = $src;
+		$sites_db{$_}{source} = $src;
 	    }
 	} else {
 	    die("Unknown script database type ($type).\n");
@@ -1087,7 +1051,7 @@ sub toggle_autorun {
     my $dir = Irssi::get_irssi_dir()."/scripts/";
     mkdir $dir."autorun/" unless (-e $dir."autorun/");
     return unless (-e $dir.$plname);
-    if (-e $dir."/autorun/".$plname) {
+    if (check_autorun($sname)) {
 	if (readlink($dir."/autorun/".$plname) eq "../".$plname) {
 	    if (unlink($dir."/autorun/".$plname)) {
 		print CLIENTCRAP "%R>>%n Autorun of ".$sname." disabled";
@@ -1098,11 +1062,8 @@ sub toggle_autorun {
 	    print CLIENTCRAP "%R>>%n ".$dir."/autorun/".$plname." is not a correct link";
 	}
     } else {
-	if (symlink("../".$plname, $dir."/autorun/".$plname)) {
-    	    print CLIENTCRAP "%R>>%n Autorun of ".$sname." enabled";
-	} else {
-	    print CLIENTCRAP "%R>>%n Unable to create autorun link";
-	}
+	symlink("../".$plname, $dir."/autorun/".$plname);
+    	print CLIENTCRAP "%R>>%n Autorun of ".$sname." enabled";
     }
 }
 
@@ -1127,7 +1088,6 @@ sub missing_module {
 
 sub cmd_scripassist {
     my ($arg, $server, $witem) = @_;
-    utf8::decode($arg);
     my @args = split(/ /, $arg);
     if ($args[0] eq 'help' || $args[0] eq '-h') {
 	show_help();
@@ -1147,9 +1107,9 @@ sub cmd_scripassist {
     } elsif ($args[0] eq 'ratings' && defined $args[1]) {
 	shift @args;
 	bg_do("ratings ".join(' ', @args));
-    } elsif ($args[0] eq 'rate' && defined $args[1]) {
+    } elsif ($args[0] eq 'rate' && defined $args[1] && defined $args[2]) {
 	shift @args;
-	bg_do("rate ".join(' ', @args));
+	bg_do("rate ".join(' ', @args)) if ($args[2] >= 0 && $args[2] < 6);
     } elsif ($args[0] eq 'info' && defined $args[1]) {
 	shift @args;
 	bg_do("info ".join(' ', @args));
@@ -1190,7 +1150,6 @@ sub sig_command_script_load {
 sub sig_default_command {
     my ($cmd, $server) = @_;
     return unless Irssi::settings_get_bool("scriptassist_check_unknown_commands");
-    return if ($cmd =~ /^\d+$/ && $irssi_version >= v1.2.0 && Irssi::settings_get_bool("window_number_commands"));
     bg_do('unknown '.$cmd);
 }
 
@@ -1212,7 +1171,7 @@ sub sig_complete {
 }
 
 
-Irssi::settings_add_str($IRSSI{name}, 'scriptassist_script_sources', 'https://scripts.irssi.org/scripts.yml');
+Irssi::settings_add_str($IRSSI{name}, 'scriptassist_script_sources', 'https://scripts.irssi.org/scripts.dmp');
 Irssi::settings_add_bool($IRSSI{name}, 'scriptassist_cache_sources', 1);
 Irssi::settings_add_bool($IRSSI{name}, 'scriptassist_update_verbose', 1);
 Irssi::settings_add_bool($IRSSI{name}, 'scriptassist_check_verbose', 1);
@@ -1246,11 +1205,11 @@ foreach my $cmd ( ( 'check',
 		    'search',
 #		    '-h',
 		    'help',
-		    'ratings',
-		    'rate',
+#		    'ratings',
+#		    'rate',
 		    'info',
 #		    'echo',
-		    'top',
+#		    'top',
 		    'cpan',
 		    'autorun',
 		    'new' ) ) {

scripts/usercount.pl

@@ -1,13 +1,12 @@
 use strict;
 use Irssi 20040119.2359 ();
 use vars qw($VERSION %IRSSI);
-$VERSION = "1.20";
+$VERSION = "1.19";
 %IRSSI = (
     authors     => 'David Leadbeater, Timo Sirainen, Georg Lukas',
     contact     => 'dgl@dgl.cx, tss@iki.fi, georg@boerde.de',
     name        => 'usercount',
     description => 'Adds a usercount for a channel as a statusbar item',
-    sbitems     => 'usercount',
     license     => 'GNU GPLv2 or later',
     url         => 'http://irssi.dgl.cx/',
     changes     => 'Only show halfops if server supports them',
@@ -128,7 +127,7 @@ sub calc_users() {
   }
 
   # Server doesn't support halfops? 
-  if($server->can('isupport') && $server->isupport("PREFIX") !~ /\%/) {
+  if($server->isupport("PREFIX") !~ /\%/) {
      $halfops = undef;
   } else {
      $halfops = undef unless Irssi::settings_get_bool('usercount_show_halfops');

src/Makefile.am

@@ -0,0 +1,17 @@
+if BUILD_TEXTUI
+TEXTUI=fe-text
+endif
+
+if BUILD_IRSSIBOT
+BOTUI=fe-none
+endif
+
+if HAVE_PERL
+PERLDIR=perl
+endif
+
+pkginc_srcdir=$(pkgincludedir)/src
+pkginc_src_HEADERS = \
+	common.h
+
+SUBDIRS = lib-config core irc fe-common $(PERLDIR) $(TEXTUI) $(BOTUI)

src/common.h

@@ -1,17 +1,18 @@
-#ifndef IRSSI_COMMON_H
-#define IRSSI_COMMON_H
+#ifndef __COMMON_H
+#define __COMMON_H
 
 #define IRSSI_DIR_FULL "%s/.irssi" /* %s == g_get_home_dir() */
 
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 50
+#define IRSSI_ABI_VERSION 6
 
 #define DEFAULT_SERVER_ADD_PORT 6667
-#define DEFAULT_SERVER_ADD_TLS_PORT 6697
 
-#include <irssi/irssi-config.h>
+#ifdef HAVE_CONFIG_H
+#include "irssi-config.h"
+#endif
 
 #include <stdio.h>
 #include <stddef.h>
@@ -37,20 +38,30 @@
 #include <fcntl.h>
 
 #include <glib.h>
-#include <gmodule.h>
+#ifdef HAVE_GMODULE
+#  include <gmodule.h>
+#endif
 
-typedef guint64 uoff_t;
-#define PRIuUOFF_T G_GUINT64_FORMAT
+#if defined (UOFF_T_INT)
+typedef unsigned int uoff_t;
+#elif defined (UOFF_T_LONG)
+typedef unsigned long uoff_t;
+#elif defined (UOFF_T_LONG_LONG)
+typedef unsigned long long uoff_t;
+#else
+#  error uoff_t size not set
+#endif
 
 /* input functions */
-#define I_INPUT_READ (1 << 0)
-#define I_INPUT_WRITE (1 << 1)
+#define G_INPUT_READ	(1 << 0)
+#define G_INPUT_WRITE	(1 << 1)
 
 typedef void (*GInputFunction) (void *data, GIOChannel *source, int condition);
 
-int i_input_add(GIOChannel *source, int condition, GInputFunction function, void *data);
-int i_input_add_full(GIOChannel *source, int priority, int condition, GInputFunction function,
-                     void *data);
+int g_input_add(GIOChannel *source, int condition,
+		GInputFunction function, void *data);
+int g_input_add_full(GIOChannel *source, int priority, int condition,
+		     GInputFunction function, void *data);
 
 /* return full path for ~/.irssi */
 const char *get_irssi_dir(void);
@@ -92,6 +103,8 @@ typedef struct _RAWLOG_REC RAWLOG_REC;
 
 typedef struct _CHAT_PROTOCOL_REC CHAT_PROTOCOL_REC;
 typedef struct _CHATNET_REC CHATNET_REC;
+typedef struct _PROXY_REC PROXY_REC;
+typedef struct _PROXY_PROTOCOL_REC PROXY_PROTOCOL_REC;
 typedef struct _SERVER_REC SERVER_REC;
 typedef struct _WI_ITEM_REC WI_ITEM_REC;
 typedef struct _CHANNEL_REC CHANNEL_REC;

src/core/Makefile.am

@@ -0,0 +1,108 @@
+noinst_LIBRARIES = libcore.a
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/core \
+	$(GLIB_CFLAGS) \
+	-DSYSCONFDIR=\""$(sysconfdir)"\" \
+	-DMODULEDIR=\""$(libdir)/irssi/modules"\"
+
+libcore_a_SOURCES = \
+	args.c \
+	channels.c \
+	channels-setup.c \
+	commands.c \
+	chat-commands.c \
+	chat-protocols.c \
+	chatnets.c \
+	core.c \
+	expandos.c \
+        ignore.c \
+        levels.c \
+	line-split.c \
+	log.c \
+	log-away.c \
+	masks.c \
+	misc.c \
+	modules.c \
+	modules-load.c \
+	net-disconnect.c \
+	net-nonblock.c \
+	net-sendbuffer.c \
+	network.c \
+	network-openssl.c \
+	nicklist.c \
+	nickmatch-cache.c \
+	pidwait.c \
+	proxy.c \
+	proxy-protocols.c \
+	queries.c \
+	rawlog.c \
+	recode.c \
+	servers.c \
+	servers-reconnect.c \
+	servers-setup.c \
+	session.c \
+	settings.c \
+	signals.c \
+	special-vars.c \
+	utf8.c \
+	wcwidth.c \
+	tls.c \
+	write-buffer.c
+
+structure_headers = \
+	channel-rec.h \
+	channel-setup-rec.h \
+	chatnet-rec.h \
+	proxy-rec.h \
+	query-rec.h \
+	server-rec.h \
+	server-setup-rec.h \
+	server-connect-rec.h \
+	window-item-rec.h
+
+pkginc_coredir=$(pkgincludedir)/src/core
+pkginc_core_HEADERS = \
+	args.h \
+	channels.h \
+	channels-setup.h \
+	commands.h \
+	chat-protocols.h \
+	chatnets.h \
+	core.h \
+	expandos.h \
+        ignore.h \
+        levels.h \
+	line-split.h \
+	log.h \
+	masks.h \
+	misc.h \
+	module.h \
+	modules.h \
+	modules-load.h \
+	net-disconnect.h \
+	net-nonblock.h \
+	net-sendbuffer.h \
+	network.h \
+	nick-rec.h \
+	nicklist.h \
+	nickmatch-cache.h \
+	pidwait.h \
+	proxy.h \
+	proxy-protocols.h \
+	queries.h \
+	rawlog.h \
+	recode.h \
+	servers.h \
+	servers-reconnect.h \
+	servers-setup.h \
+	session.h \
+	settings.h \
+	signals.h \
+	special-vars.h \
+	utf8.h \
+	window-item-def.h \
+	tls.h \
+	write-buffer.h \
+	$(structure_headers)

src/core/args.c

@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/args.h>
+#include "args.h"
 
 static GOptionContext *context = NULL;
 

src/core/args.h

@@ -1,5 +1,5 @@
-#ifndef IRSSI_CORE_ARGS_H
-#define IRSSI_CORE_ARGS_H
+#ifndef __ARGS_H
+#define __ARGS_H
 
 void args_register(GOptionEntry *options);
 void args_execute(int argc, char *argv[]);