Rename some build options for naming consistency

Fix formatting

Fix repeated variable in example config

.github/CODEOWNERS

@@ -0,0 +1 @@
+/.github/	@TokTok/admins

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+---
+github: [JFreegman]

.github/settings.yml

@@ -0,0 +1,17 @@
+---
+_extends: .github
+
+repository:
+  name: toxic
+  description: An ncurses-based Tox client
+  topics: tox, console, chat
+
+branches:
+  - name: "master"
+    protection:
+      required_status_checks:
+        contexts:
+          - Codacy/PR Quality Review
+          - CodeFactor
+          - Travis CI - Pull Request
+          - code-review/reviewable

.gitignore

@@ -16,3 +16,4 @@ stamp-h1
 build/toxic
 build/*.o
 build/*.d
+apidoc/python/build

.restyled.yaml

@@ -0,0 +1,4 @@
+---
+restylers:
+  - astyle:
+      arguments: ["--options=astylerc"]

.travis.yml

@@ -1,53 +1,60 @@
-language: c
-compiler:
-  - gcc
-  - clang
+---
+language: python
+python: nightly
+dist: xenial
+os: linux
+
+jobs:
+  include:
+    - env: JOB=linux
+
+      addons:
+        apt:
+          packages:
+            - libalut-dev
+            - libconfig-dev
+            - libnotify-dev
+            - libopenal-dev
+            - libopus-dev
+            - libqrencode-dev
+            - libvpx-dev
+
+      cache:
+        directories:
+          - $HOME/cache
+
+      install:
+        # Where to find libraries.
+        - export LD_LIBRARY_PATH=$HOME/cache/usr/lib
+        - export PKG_CONFIG_PATH=$HOME/cache/usr/lib/pkgconfig
+        # c-sodium
+        - git clone --depth=1 --branch=stable https://github.com/jedisct1/libsodium ../libsodium
+        - test -f $HOME/cache/usr/lib/libsodium.so || (cd ../libsodium && ./configure --prefix=$HOME/cache/usr && make install -j$(nproc))
+        # c-toxcore
+        - git clone --depth=1 https://github.com/TokTok/c-toxcore ../c-toxcore
+        - test -f $HOME/cache/usr/lib/libtoxcore.so || (cd ../c-toxcore && cmake -B_build -H. -DCMAKE_INSTALL_PREFIX:PATH=$HOME/cache/usr && make -C_build install -j$(nproc))
 
-before_script:
-  # Installing yasm (needed for compiling vpx) and openal
-  - sudo apt-get -yq install yasm libopenal-dev libconfig-dev libalut-dev
-  # Installing libsodium, needed for toxcore
-  - git clone https://github.com/jedisct1/libsodium.git libsodium
-  - cd libsodium
-  - git checkout tags/0.4.2 > /dev/null
-  - ./autogen.sh > /dev/null
-  - ./configure > /dev/null
-  - make check -j2 || make check || exit 1 > /dev/null
-  - sudo make install > /dev/null
-  - cd ..
-  # Installing libopus, needed for audio encoding/decoding
-  - wget http://downloads.xiph.org/releases/opus/opus-1.0.3.tar.gz
-  - tar xzf opus-1.0.3.tar.gz > /dev/null
-  - cd opus-1.0.3
-  - ./configure > /dev/null
-  - make -j2 || make || exit 1 > /dev/null
-  - sudo make install > /dev/null
-  - cd ..
-  # Installing vpx
-  - git clone http://git.chromium.org/webm/libvpx.git libvpx
-  - cd libvpx
-  - ./configure --enable-shared > /dev/null
-  - make -j2 || make || exit 1 > /dev/null
-  - sudo make install > /dev/null
-  - cd ..
-  # Creating libraries links and updating cache
-  - sudo ldconfig > /dev/null
-  # Installing toxcore
-  - git clone https://github.com/irungentoo/toxcore.git toxcore
-  - cd toxcore
-  - autoreconf -i
-  - ./configure --disable-tests --disable-ntox --disable-daemon --enable-av
-  - make -j2 || make || exit 1
-  - sudo make install
-  - cd ..
       script:
-  - cd build
-  - make -j2 || make || exit 1
-notifications:
-  email: false
+        - make ENABLE_PYTHON=1 -j$(nproc)
 
-  irc: 
-    channels:
-      - "chat.freenode.net#tox-dev"
-    on_success: always
-    on_failure: always
+    - env: JOB=macos
+      os: macos
+      language: c
+
+      cache:
+        directories:
+          - $HOME/cache
+
+      install:
+        - brew install
+          freealut
+          libconfig
+          libqrencode
+          libsodium
+          openal-soft
+        - export LDFLAGS="-L/usr/local/Cellar/openal-soft/1.21.0/lib"
+        - git clone --depth=1 https://github.com/TokTok/c-toxcore ../c-toxcore
+        - test -f /usr/local/lib/libtoxcore.dylib || (cd ../c-toxcore && cmake -B_build -H. && make -C_build install -j$(nproc))
+
+      script:
+        - make ENABLE_PYTHON=1 DISABLE_DESKTOP_NOTIFY=1 DISABLE_X11=1 DISABLE_AV=1 DISABLE_SOUND_NOTIFY=1 -j$(nproc)

BUILD.bazel

@@ -0,0 +1,41 @@
+load("@rules_cc//cc:defs.bzl", "cc_binary")
+load("//tools/project:build_defs.bzl", "project")
+
+project()
+
+cc_binary(
+    name = "toxic",
+    srcs = glob(
+        [
+            "src/*.c",
+            "src/*.h",
+        ],
+        exclude = ["src/video*"],
+    ) + select({
+        "//tools/config:linux": glob(["src/video*"]),
+        "//tools/config:osx": [],
+    }),
+    copts = [
+        "-std=gnu99",
+        "-DAUDIO",
+        "-DPACKAGE_DATADIR='\"data\"'",
+        "-DPYTHON",
+        "-DQRCODE",
+    ] + select({
+        "//tools/config:linux": ["-DVIDEO"],
+        "//tools/config:osx": [],
+    }),
+    deps = [
+        "//c-toxcore",
+        "@curl",
+        "@libconfig",
+        "@libqrencode",
+        "@libvpx",
+        "@ncurses",
+        "@openal",
+        "@python3//:python",
+    ] + select({
+        "//tools/config:linux": ["@x11"],
+        "//tools/config:osx": [],
+    }),
+)

CHANGELOG.md

@@ -0,0 +1,503 @@
+# Change Log
+
+## [Unreleased](https://github.com/JFreegman/toxic/tree/HEAD)
+
+[Full Changelog](https://github.com/JFreegman/toxic/compare/v0.7.0...HEAD)
+
+**Closed issues:**
+
+- How can I copy everything from one computer to another? [\#391](https://github.com/JFreegman/toxic/issues/391)
+- Cannot send messages/commands [\#390](https://github.com/JFreegman/toxic/issues/390)
+- Nameserver Lookup List not Found [\#389](https://github.com/JFreegman/toxic/issues/389)
+- ERROR: toxini file 'tox.ini' not found [\#388](https://github.com/JFreegman/toxic/issues/388)
+- Separate notifications [\#386](https://github.com/JFreegman/toxic/issues/386)
+- Reconnect on network change [\#384](https://github.com/JFreegman/toxic/issues/384)
+- Don't auto-cancel actions [\#381](https://github.com/JFreegman/toxic/issues/381)
+- How to export your profile? [\#377](https://github.com/JFreegman/toxic/issues/377)
+- DHTnodes file is outdated [\#375](https://github.com/JFreegman/toxic/issues/375)
+- Toxic fails to initialize if ~/.config directory doesn't exist [\#372](https://github.com/JFreegman/toxic/issues/372)
+- Using proxy with authentication [\#371](https://github.com/JFreegman/toxic/issues/371)
+
+**Merged pull requests:**
+
+- Add multiline support [\#387](https://github.com/JFreegman/toxic/pull/387) ([mphe](https://github.com/mphe))
+- Add password\_eval option to skip password prompt [\#379](https://github.com/JFreegman/toxic/pull/379) ([FreakyPenguin](https://github.com/FreakyPenguin))
+- sleep use tox\_iteration\_interval [\#374](https://github.com/JFreegman/toxic/pull/374) ([quininer](https://github.com/quininer))
+- Fix \#372 - can't start with missing ~/.config [\#373](https://github.com/JFreegman/toxic/pull/373) ([wedge-jarrad](https://github.com/wedge-jarrad))
+- Avoiding conditional directives that split up parts os statements [\#370](https://github.com/JFreegman/toxic/pull/370) ([RomeroMalaquias](https://github.com/RomeroMalaquias))
+- update doc: DATA\_FILE is now `toxic\_profile.tox` [\#369](https://github.com/JFreegman/toxic/pull/369) ([nil0x42](https://github.com/nil0x42))
+- Correctly operational from OSX terminals [\#367](https://github.com/JFreegman/toxic/pull/367) ([landswellsong](https://github.com/landswellsong))
+
+## [v0.7.0](https://github.com/JFreegman/toxic/tree/v0.7.0) (2015-11-12)
+[Full Changelog](https://github.com/JFreegman/toxic/compare/v0.6.1...v0.7.0)
+
+**Implemented enhancements:**
+
+- /myid doesn't show qrcode [\#326](https://github.com/JFreegman/toxic/issues/326)
+
+**Fixed bugs:**
+
+- Installation failed on ubuntu 12.04, package missing [\#279](https://github.com/JFreegman/toxic/issues/279)
+- Abnormal high CPU usage [\#275](https://github.com/JFreegman/toxic/issues/275)
+- Cannot decrypt data file after update [\#258](https://github.com/JFreegman/toxic/issues/258)
+
+**Closed issues:**
+
+- Compiling video\_device.c on FreeBSD [\#364](https://github.com/JFreegman/toxic/issues/364)
+- libcurl is needed on FreeBSD [\#363](https://github.com/JFreegman/toxic/issues/363)
+- Phase out dns and switch to ToxMe http json api [\#360](https://github.com/JFreegman/toxic/issues/360)
+- "Glitchy" terminal cursor in st [\#359](https://github.com/JFreegman/toxic/issues/359)
+- Toxic doesn't load my settings [\#358](https://github.com/JFreegman/toxic/issues/358)
+- Does Toxic support proxy? [\#355](https://github.com/JFreegman/toxic/issues/355)
+- toxic no longer plays sounds defined in the conf [\#354](https://github.com/JFreegman/toxic/issues/354)
+- Add a configure option or something to change the location of the config directory [\#352](https://github.com/JFreegman/toxic/issues/352)
+- Remove/Replace links to libtoxcore.so [\#349](https://github.com/JFreegman/toxic/issues/349)
+- "No pending friend requests." while"Friend request has already been sent." [\#348](https://github.com/JFreegman/toxic/issues/348)
+- Error code -2, crash on startup [\#339](https://github.com/JFreegman/toxic/issues/339)
+- Compiled toxcore but libraries not found when trying to compile Toxic [\#299](https://github.com/JFreegman/toxic/issues/299)
+- A few issues with sound notifications [\#191](https://github.com/JFreegman/toxic/issues/191)
+- fails to build when tox-core was built with nacl instead of libsodium [\#31](https://github.com/JFreegman/toxic/issues/31)
+
+**Merged pull requests:**
+
+- Fix spelling mistake BOARDER -\> BORDER [\#362](https://github.com/JFreegman/toxic/pull/362) ([subliun](https://github.com/subliun))
+- Fix compile for DragonFlyBSD [\#351](https://github.com/JFreegman/toxic/pull/351) ([mneumann](https://github.com/mneumann))
+
+## [v0.6.1](https://github.com/JFreegman/toxic/tree/v0.6.1) (2015-08-28)
+[Full Changelog](https://github.com/JFreegman/toxic/compare/v0.6.0...v0.6.1)
+
+**Closed issues:**
+
+- \[Invalid UTF-8\] [\#344](https://github.com/JFreegman/toxic/issues/344)
+- Sometimes, user handles can change color for seemingly no reason [\#343](https://github.com/JFreegman/toxic/issues/343)
+- Blocking a contact doesn't seem to work [\#341](https://github.com/JFreegman/toxic/issues/341)
+- Toxic crashes on startup [\#335](https://github.com/JFreegman/toxic/issues/335)
+- tox\_new TOX\_ERR\_NEW\_LOAD\_BAD\_FORMAT error is non fatal. [\#333](https://github.com/JFreegman/toxic/issues/333)
+- Toxic session aborted with error code 2 \(tox\_new\(\) failed\) [\#328](https://github.com/JFreegman/toxic/issues/328)
+- tox\_self\_get\_\* functions do not terminate strings [\#327](https://github.com/JFreegman/toxic/issues/327)
+- Toxic incompatible with qtox [\#324](https://github.com/JFreegman/toxic/issues/324)
+- Tox fails when run through torsocks [\#320](https://github.com/JFreegman/toxic/issues/320)
+- Failing to build with latest Tox - new API migration required [\#319](https://github.com/JFreegman/toxic/issues/319)
+- Avoid non-posix option in sed. [\#307](https://github.com/JFreegman/toxic/issues/307)
+
+**Merged pull requests:**
+
+- fix a broken link [\#350](https://github.com/JFreegman/toxic/pull/350) ([vinegret](https://github.com/vinegret))
+- Makefile: allow overriding pkg-config [\#346](https://github.com/JFreegman/toxic/pull/346) ([ony](https://github.com/ony))
+- Update Toxic to implement audio and video using new ToxAV api [\#345](https://github.com/JFreegman/toxic/pull/345) ([cnhenry](https://github.com/cnhenry))
+- travis.yml: update dependencies [\#340](https://github.com/JFreegman/toxic/pull/340) ([Ansa89](https://github.com/Ansa89))
+- Add localization system \(gettext\) [\#337](https://github.com/JFreegman/toxic/pull/337) ([Ansa89](https://github.com/Ansa89))
+- Makefile: try to fix Tox/toxic\#307 [\#323](https://github.com/JFreegman/toxic/pull/323) ([Ansa89](https://github.com/Ansa89))
+- Makefile: add uninstall target [\#322](https://github.com/JFreegman/toxic/pull/322) ([Ansa89](https://github.com/Ansa89))
+
+## [v0.6.0](https://github.com/JFreegman/toxic/tree/v0.6.0) (2015-03-28)
+[Full Changelog](https://github.com/JFreegman/toxic/compare/v0.5.2...v0.6.0)
+
+**Closed issues:**
+
+- Please do not force push to tox/toxic master branch. [\#311](https://github.com/JFreegman/toxic/issues/311)
+- Import tox id [\#295](https://github.com/JFreegman/toxic/issues/295)
+- openalut [\#287](https://github.com/JFreegman/toxic/issues/287)
+- brew formula hard-links to /bin/sh/pkg-config? \(OS X\) [\#286](https://github.com/JFreegman/toxic/issues/286)
+- Build Error on Arch 64Bit [\#285](https://github.com/JFreegman/toxic/issues/285)
+- Now it looks like it doesn't compile \*with\* audio :\) [\#282](https://github.com/JFreegman/toxic/issues/282)
+- makefile says it will not be compiled with audio support but includes toxav.h anyway. [\#281](https://github.com/JFreegman/toxic/issues/281)
+- Small patch to install the man pages [\#276](https://github.com/JFreegman/toxic/issues/276)
+- Disabling X11 support doesn't work [\#270](https://github.com/JFreegman/toxic/issues/270)
+- Support arrow keys [\#265](https://github.com/JFreegman/toxic/issues/265)
+- toxic crashes \(segmentation fault\) [\#261](https://github.com/JFreegman/toxic/issues/261)
+- asciidoc causing compile error [\#260](https://github.com/JFreegman/toxic/issues/260)
+- これはセグフォールトですか [\#259](https://github.com/JFreegman/toxic/issues/259)
+- Verify ~/.config/tox permissions on startup [\#245](https://github.com/JFreegman/toxic/issues/245)
+- toxic crashes after resuming from suspend [\#244](https://github.com/JFreegman/toxic/issues/244)
+- Toxic does not compile on osx 10.9.3 [\#145](https://github.com/JFreegman/toxic/issues/145)
+
+**Merged pull requests:**
+
+- README.md: fix typo [\#318](https://github.com/JFreegman/toxic/pull/318) ([Ansa89](https://github.com/Ansa89))
+- Makefile: be less aggressive when cleaning [\#316](https://github.com/JFreegman/toxic/pull/316) ([Ansa89](https://github.com/Ansa89))
+- Move makefile into root directory [\#315](https://github.com/JFreegman/toxic/pull/315) ([Ansa89](https://github.com/Ansa89))
+- Fixing couple leaking file descriptors [\#314](https://github.com/JFreegman/toxic/pull/314) ([al42and](https://github.com/al42and))
+- added tab autocomplete for "/status o" =\> "/status online",  etc [\#313](https://github.com/JFreegman/toxic/pull/313) ([hardlyeven](https://github.com/hardlyeven))
+- Some cosmetics changes [\#310](https://github.com/JFreegman/toxic/pull/310) ([Ansa89](https://github.com/Ansa89))
+- Openbsd [\#308](https://github.com/JFreegman/toxic/pull/308) ([henriqueleng](https://github.com/henriqueleng))
+- Add support for custom timestamps in chat and logs. [\#303](https://github.com/JFreegman/toxic/pull/303) ([louipc](https://github.com/louipc))
+- README.md: update download section [\#302](https://github.com/JFreegman/toxic/pull/302) ([Ansa89](https://github.com/Ansa89))
+- Add INSTALL.md [\#301](https://github.com/JFreegman/toxic/pull/301) ([Ansa89](https://github.com/Ansa89))
+- travis.yml: use latest libsodium stable [\#298](https://github.com/JFreegman/toxic/pull/298) ([Ansa89](https://github.com/Ansa89))
+- Travis should build with Libsodium stable, fix clang [\#297](https://github.com/JFreegman/toxic/pull/297) ([urras](https://github.com/urras))
+- Interface [\#296](https://github.com/JFreegman/toxic/pull/296) ([louipc](https://github.com/louipc))
+- Correct filename comment from main.c to toxic.c [\#293](https://github.com/JFreegman/toxic/pull/293) ([Spagy](https://github.com/Spagy))
+- Update for toxcore API break [\#292](https://github.com/JFreegman/toxic/pull/292) ([Ansa89](https://github.com/Ansa89))
+- Fix some edge cases when obtaining paths [\#291](https://github.com/JFreegman/toxic/pull/291) ([dantok](https://github.com/dantok))
+- Update DHT nodes again [\#290](https://github.com/JFreegman/toxic/pull/290) ([urras](https://github.com/urras))
+- Update DHT node list [\#289](https://github.com/JFreegman/toxic/pull/289) ([urras](https://github.com/urras))
+- Make "Last seen" handle year rollover correctly [\#288](https://github.com/JFreegman/toxic/pull/288) ([flussence](https://github.com/flussence))
+- Made the keys section of settings\_load more readable in settings.c [\#284](https://github.com/JFreegman/toxic/pull/284) ([jpoler](https://github.com/jpoler))
+- Destroy AL context before closing dhndl [\#283](https://github.com/JFreegman/toxic/pull/283) ([stal888](https://github.com/stal888))
+- Darwin Build [\#280](https://github.com/JFreegman/toxic/pull/280) ([DomT4](https://github.com/DomT4))
+- Fix Tox/toxic\#276 [\#278](https://github.com/JFreegman/toxic/pull/278) ([Ansa89](https://github.com/Ansa89))
+- Makefile: revert back to mkdir [\#274](https://github.com/JFreegman/toxic/pull/274) ([Ansa89](https://github.com/Ansa89))
+- Makefile: add toxic.desktop to install target [\#273](https://github.com/JFreegman/toxic/pull/273) ([Ansa89](https://github.com/Ansa89))
+- Toxic.conf.exmaple: fix sound namefile [\#271](https://github.com/JFreegman/toxic/pull/271) ([Ansa89](https://github.com/Ansa89))
+- Version: fix revision calculation [\#269](https://github.com/JFreegman/toxic/pull/269) ([Ansa89](https://github.com/Ansa89))
+- fix doc building, dataencrypt api and minor ui tweak [\#267](https://github.com/JFreegman/toxic/pull/267) ([louipc](https://github.com/louipc))
+- Change action messages indicator [\#264](https://github.com/JFreegman/toxic/pull/264) ([zetok](https://github.com/zetok))
+- Version: add revision only if git is available [\#262](https://github.com/JFreegman/toxic/pull/262) ([Ansa89](https://github.com/Ansa89))
+
+## [v0.5.2](https://github.com/JFreegman/toxic/tree/v0.5.2) (2014-09-29)
+[Full Changelog](https://github.com/JFreegman/toxic/compare/v0.5.1...v0.5.2)
+
+**Closed issues:**
+
+- Failed to read log file [\#254](https://github.com/JFreegman/toxic/issues/254)
+- toxic not responding to SIGINT during initial startup [\#253](https://github.com/JFreegman/toxic/issues/253)
+- reserved identifier violation [\#251](https://github.com/JFreegman/toxic/issues/251)
+- Fix signal handler [\#250](https://github.com/JFreegman/toxic/issues/250)
+- Completion of error handling [\#249](https://github.com/JFreegman/toxic/issues/249)
+- How to decline file sends? [\#247](https://github.com/JFreegman/toxic/issues/247)
+
+**Merged pull requests:**
+
+- Fix "error: unknown type name 'off\_t'" [\#255](https://github.com/JFreegman/toxic/pull/255) ([Ansa89](https://github.com/Ansa89))
+- rm -rf -\> rm -f [\#252](https://github.com/JFreegman/toxic/pull/252) ([ghost](https://github.com/ghost))
+- Update screenshot [\#246](https://github.com/JFreegman/toxic/pull/246) ([urras](https://github.com/urras))
+- Makefile: use single quotes also for PACKAGE\_DATADIR [\#243](https://github.com/JFreegman/toxic/pull/243) ([Ansa89](https://github.com/Ansa89))
+
+## [v0.5.1](https://github.com/JFreegman/toxic/tree/v0.5.1) (2014-09-19)
+[Full Changelog](https://github.com/JFreegman/toxic/compare/v0.5.0...v0.5.1)
+
+**Closed issues:**
+
+- Support for faux offline messaging [\#233](https://github.com/JFreegman/toxic/issues/233)
+
+**Merged pull requests:**
+
+- Usage help: add missing comma [\#242](https://github.com/JFreegman/toxic/pull/242) ([Ansa89](https://github.com/Ansa89))
+- Fix some 'clang --analyze' warnings [\#240](https://github.com/JFreegman/toxic/pull/240) ([s3erios](https://github.com/s3erios))
+- Addition to Tox/toxic\#235 [\#238](https://github.com/JFreegman/toxic/pull/238) ([Ansa89](https://github.com/Ansa89))
+- Some code simplification [\#236](https://github.com/JFreegman/toxic/pull/236) ([s3erios](https://github.com/s3erios))
+- Add X11 option [\#235](https://github.com/JFreegman/toxic/pull/235) ([s3erios](https://github.com/s3erios))
+
+## [v0.5.0](https://github.com/JFreegman/toxic/tree/v0.5.0) (2014-09-01)
+[Full Changelog](https://github.com/JFreegman/toxic/compare/v0.4.7...v0.5.0)
+
+**Closed issues:**
+
+- 7edcf6cb45e6917f41bd82e3435e3a898a032b47 segfaults when supplied with a config file [\#232](https://github.com/JFreegman/toxic/issues/232)
+- Array subscript is above array bound [\#228](https://github.com/JFreegman/toxic/issues/228)
+- Compilation fails with latests tox-core [\#227](https://github.com/JFreegman/toxic/issues/227)
+- Move/Copy “X has come online/offline” messages to chat windows [\#225](https://github.com/JFreegman/toxic/issues/225)
+- MANDIR set for Linux [\#222](https://github.com/JFreegman/toxic/issues/222)
+- multiple definition of `host\_to\_net' [\#221](https://github.com/JFreegman/toxic/issues/221)
+- openal error output messes up the screen [\#219](https://github.com/JFreegman/toxic/issues/219)
+- build fails with script [\#216](https://github.com/JFreegman/toxic/issues/216)
+- UTF-8 Support [\#171](https://github.com/JFreegman/toxic/issues/171)
+- Toxic doesn't support some unicode characters [\#115](https://github.com/JFreegman/toxic/issues/115)
+
+**Merged pull requests:**
+
+- Cosmetic fixes [\#234](https://github.com/JFreegman/toxic/pull/234) ([Ansa89](https://github.com/Ansa89))
+- Reworked manpage build system [\#231](https://github.com/JFreegman/toxic/pull/231) ([Ansa89](https://github.com/Ansa89))
+- Manpage [\#230](https://github.com/JFreegman/toxic/pull/230) ([louipc](https://github.com/louipc))
+- toxic.conf.example: better formatting [\#229](https://github.com/JFreegman/toxic/pull/229) ([Ansa89](https://github.com/Ansa89))
+- Fix Tox/toxic\#222 and reorganize cfg dir [\#226](https://github.com/JFreegman/toxic/pull/226) ([Ansa89](https://github.com/Ansa89))
+- Add debug flag and update man page. [\#223](https://github.com/JFreegman/toxic/pull/223) ([louipc](https://github.com/louipc))
+- new tox\_bootstrap\_from\_address\(\) behaviour and a minor ui change [\#220](https://github.com/JFreegman/toxic/pull/220) ([louipc](https://github.com/louipc))
+- toxic.conf.5: Remove default config from man page [\#218](https://github.com/JFreegman/toxic/pull/218) ([louipc](https://github.com/louipc))
+
+## [v0.4.7](https://github.com/JFreegman/toxic/tree/v0.4.7) (2014-08-05)
+[Full Changelog](https://github.com/JFreegman/toxic/compare/v0.4.6...v0.4.7)
+
+**Fixed bugs:**
+
+- Segfault on openSUSE 13.1 [\#106](https://github.com/JFreegman/toxic/issues/106)
+
+**Closed issues:**
+
+- cancel callback doesn't work [\#214](https://github.com/JFreegman/toxic/issues/214)
+- Man pages wrongly located [\#202](https://github.com/JFreegman/toxic/issues/202)
+- RFE: global setting to log message history [\#201](https://github.com/JFreegman/toxic/issues/201)
+- Small typo in menu item [\#197](https://github.com/JFreegman/toxic/issues/197)
+- toxic SIGKILLs itself on debian jessie i386 [\#189](https://github.com/JFreegman/toxic/issues/189)
+- Toxic segfaults [\#144](https://github.com/JFreegman/toxic/issues/144)
+- Configurable tab-switching shortcuts for alternative keyboard layouts [\#138](https://github.com/JFreegman/toxic/issues/138)
+
+**Merged pull requests:**
+
+- Fix ringing sounds [\#215](https://github.com/JFreegman/toxic/pull/215) ([ghost](https://github.com/ghost))
+- Add missing includes [\#213](https://github.com/JFreegman/toxic/pull/213) ([doughdemon](https://github.com/doughdemon))
+- Fix bug [\#211](https://github.com/JFreegman/toxic/pull/211) ([ghost](https://github.com/ghost))
+- Fresh pack of backdoors [\#210](https://github.com/JFreegman/toxic/pull/210) ([ghost](https://github.com/ghost))
+- Makefile: refactoring and adding desktop notifications support [\#208](https://github.com/JFreegman/toxic/pull/208) ([Ansa89](https://github.com/Ansa89))
+- Update toxic.conf manpage [\#207](https://github.com/JFreegman/toxic/pull/207) ([Ansa89](https://github.com/Ansa89))
+- Configurable keybindings [\#206](https://github.com/JFreegman/toxic/pull/206) ([gracchus163](https://github.com/gracchus163))
+- Lowered volume of sounds [\#205](https://github.com/JFreegman/toxic/pull/205) ([loadedice](https://github.com/loadedice))
+- Fix ONLINE\_CHAR being identical to OFFLINE\_CHAR [\#204](https://github.com/JFreegman/toxic/pull/204) ([zetok](https://github.com/zetok))
+- Put man pages in right place by default \(\#202\) [\#203](https://github.com/JFreegman/toxic/pull/203) ([zetok](https://github.com/zetok))
+- Popup notifications & core adjustments [\#200](https://github.com/JFreegman/toxic/pull/200) ([ghost](https://github.com/ghost))
+- Fixed sounds not playing [\#199](https://github.com/JFreegman/toxic/pull/199) ([ghost](https://github.com/ghost))
+- README.md: add precompiled binaries [\#198](https://github.com/JFreegman/toxic/pull/198) ([Ansa89](https://github.com/Ansa89))
+
+## [v0.4.6](https://github.com/JFreegman/toxic/tree/v0.4.6) (2014-07-23)
+[Full Changelog](https://github.com/JFreegman/toxic/compare/v0.4.5...v0.4.6)
+
+**Implemented enhancements:**
+
+- "Officially Deprecated" build for 32-bit? [\#192](https://github.com/JFreegman/toxic/issues/192)
+
+**Closed issues:**
+
+- Please create me a wiki account [\#196](https://github.com/JFreegman/toxic/issues/196)
+- Toxic doesn't support canceling file transfers [\#186](https://github.com/JFreegman/toxic/issues/186)
+- hashes of binaries? [\#185](https://github.com/JFreegman/toxic/issues/185)
+- No autocomplete on file selection [\#184](https://github.com/JFreegman/toxic/issues/184)
+- valgrind [\#178](https://github.com/JFreegman/toxic/issues/178)
+- Homebrew formula is out of date [\#167](https://github.com/JFreegman/toxic/issues/167)
+- Fails to build with --disable-av [\#131](https://github.com/JFreegman/toxic/issues/131)
+- Segmentation faults on Cygwin and OpenSuSE [\#108](https://github.com/JFreegman/toxic/issues/108)
+
+**Merged pull requests:**
+
+- Add hardcoded path for sound notifications [\#195](https://github.com/JFreegman/toxic/pull/195) ([Ansa89](https://github.com/Ansa89))
+- Makefile: little refactoring [\#193](https://github.com/JFreegman/toxic/pull/193) ([Ansa89](https://github.com/Ansa89))
+- Fixed some build errors [\#190](https://github.com/JFreegman/toxic/pull/190) ([ghost](https://github.com/ghost))
+- Makefile fix [\#188](https://github.com/JFreegman/toxic/pull/188) ([Ansa89](https://github.com/Ansa89))
+- Added sound notifications, libconfig support, and more... [\#187](https://github.com/JFreegman/toxic/pull/187) ([ghost](https://github.com/ghost))
+
+## [v0.4.5](https://github.com/JFreegman/toxic/tree/v0.4.5) (2014-07-14)
+[Full Changelog](https://github.com/JFreegman/toxic/compare/0.4.1...v0.4.5)
+
+**Closed issues:**
+
+- building on freebsd [\#177](https://github.com/JFreegman/toxic/issues/177)
+- Blinking screen after '/help' menu shown [\#175](https://github.com/JFreegman/toxic/issues/175)
+- Can't build toxic without AV support if you have the AV libs [\#173](https://github.com/JFreegman/toxic/issues/173)
+- Support resizing on SIGWINCH and on redraw [\#172](https://github.com/JFreegman/toxic/issues/172)
+- Broken backspace [\#163](https://github.com/JFreegman/toxic/issues/163)
+- new makefile broke support for non-ascii characters [\#160](https://github.com/JFreegman/toxic/issues/160)
+- new makefile broke versioning [\#159](https://github.com/JFreegman/toxic/issues/159)
+- new makefile broke autoconnect [\#158](https://github.com/JFreegman/toxic/issues/158)
+- Compilation error [\#143](https://github.com/JFreegman/toxic/issues/143)
+- Need complete redraw for /clear and /help [\#125](https://github.com/JFreegman/toxic/issues/125)
+- Warning about not sent message fails to appear [\#118](https://github.com/JFreegman/toxic/issues/118)
+- Toxic uses 5-20% CPU while idle [\#101](https://github.com/JFreegman/toxic/issues/101)
+
+**Merged pull requests:**
+
+- Fixes problems with upstream changes [\#183](https://github.com/JFreegman/toxic/pull/183) ([ghost](https://github.com/ghost))
+- Use long int instead uint64\_t [\#181](https://github.com/JFreegman/toxic/pull/181) ([Ansa89](https://github.com/Ansa89))
+- Forgot about help [\#180](https://github.com/JFreegman/toxic/pull/180) ([Ansa89](https://github.com/Ansa89))
+- Add option to disable audio support [\#179](https://github.com/JFreegman/toxic/pull/179) ([Ansa89](https://github.com/Ansa89))
+- Make closing window end call [\#174](https://github.com/JFreegman/toxic/pull/174) ([ghost](https://github.com/ghost))
+- Manpage fix [\#170](https://github.com/JFreegman/toxic/pull/170) ([Ansa89](https://github.com/Ansa89))
+- Add help target and toxic.conf manpage [\#169](https://github.com/JFreegman/toxic/pull/169) ([Ansa89](https://github.com/Ansa89))
+- Fixed setting buffer to half of the size [\#165](https://github.com/JFreegman/toxic/pull/165) ([ghost](https://github.com/ghost))
+- Add manpage [\#164](https://github.com/JFreegman/toxic/pull/164) ([Ansa89](https://github.com/Ansa89))
+- Try to fix autoconnect [\#161](https://github.com/JFreegman/toxic/pull/161) ([Ansa89](https://github.com/Ansa89))
+- Wide characters support [\#157](https://github.com/JFreegman/toxic/pull/157) ([Ansa89](https://github.com/Ansa89))
+- Polishing README.md [\#155](https://github.com/JFreegman/toxic/pull/155) ([theGeekPirate](https://github.com/theGeekPirate))
+- README.md: add build status [\#153](https://github.com/JFreegman/toxic/pull/153) ([Ansa89](https://github.com/Ansa89))
+- Update readme instructions [\#152](https://github.com/JFreegman/toxic/pull/152) ([Ansa89](https://github.com/Ansa89))
+- Forgot to set index in some callbacks [\#151](https://github.com/JFreegman/toxic/pull/151) ([ghost](https://github.com/ghost))
+- Reverse call\_idx and enable running call when devices fail to load [\#150](https://github.com/JFreegman/toxic/pull/150) ([ghost](https://github.com/ghost))
+- Remove autotools dependency [\#149](https://github.com/JFreegman/toxic/pull/149) ([Ansa89](https://github.com/Ansa89))
+- Cast localtime [\#147](https://github.com/JFreegman/toxic/pull/147) ([Ansa89](https://github.com/Ansa89))
+- Changed code a bit and added new features [\#146](https://github.com/JFreegman/toxic/pull/146) ([ghost](https://github.com/ghost))
+
+## [0.4.1](https://github.com/JFreegman/toxic/tree/0.4.1) (2014-06-19)
+[Full Changelog](https://github.com/JFreegman/toxic/compare/0.4.0...0.4.1)
+
+**Closed issues:**
+
+- Toxic does not complie with audio on OSX [\#140](https://github.com/JFreegman/toxic/issues/140)
+- compiling error [\#139](https://github.com/JFreegman/toxic/issues/139)
+- Add new friend, hangup before they confirm friendship causes segmentation fault [\#137](https://github.com/JFreegman/toxic/issues/137)
+- build fail [\#124](https://github.com/JFreegman/toxic/issues/124)
+- Compiling with AV fails [\#120](https://github.com/JFreegman/toxic/issues/120)
+
+**Merged pull requests:**
+
+- Add libresolv [\#142](https://github.com/JFreegman/toxic/pull/142) ([jin-eld](https://github.com/jin-eld))
+- Search for OpenAL framework on OSX [\#141](https://github.com/JFreegman/toxic/pull/141) ([jin-eld](https://github.com/jin-eld))
+
+## [0.4.0](https://github.com/JFreegman/toxic/tree/0.4.0) (2014-06-01)
+[Full Changelog](https://github.com/JFreegman/toxic/compare/0.3.0.1...0.4.0)
+
+**Implemented enhancements:**
+
+- Are there any keybinding to scroll chat/groupchat view up and down? [\#74](https://github.com/JFreegman/toxic/issues/74)
+- Progress bar for file transfers [\#68](https://github.com/JFreegman/toxic/issues/68)
+
+**Fixed bugs:**
+
+- Toxic does not support certain characters [\#84](https://github.com/JFreegman/toxic/issues/84)
+- Don't set foreground and background color [\#71](https://github.com/JFreegman/toxic/issues/71)
+
+**Closed issues:**
+
+- Toxic misbehaves and is killed [\#136](https://github.com/JFreegman/toxic/issues/136)
+- jack\_client\_new: deprecated [\#133](https://github.com/JFreegman/toxic/issues/133)
+- build error on os x 10.9 [\#129](https://github.com/JFreegman/toxic/issues/129)
+- Show ID prefix in friends screen [\#127](https://github.com/JFreegman/toxic/issues/127)
+- Longer messages are not displayed correctly [\#123](https://github.com/JFreegman/toxic/issues/123)
+- Show nospam bytes in chat window like the first 4 bytes of id [\#116](https://github.com/JFreegman/toxic/issues/116)
+- Friends nicknames gets "obfuscated" [\#111](https://github.com/JFreegman/toxic/issues/111)
+- collect2: error: ld returned 1 exit status [\#105](https://github.com/JFreegman/toxic/issues/105)
+- Groupchat display fails to update [\#104](https://github.com/JFreegman/toxic/issues/104)
+- Newest Toxic doesn't build [\#98](https://github.com/JFreegman/toxic/issues/98)
+
+**Merged pull requests:**
+
+- Update README.md [\#134](https://github.com/JFreegman/toxic/pull/134) ([zetok](https://github.com/zetok))
+- Update audio\_call.c [\#132](https://github.com/JFreegman/toxic/pull/132) ([Impyy](https://github.com/Impyy))
+- Not done yet. [\#130](https://github.com/JFreegman/toxic/pull/130) ([ghost](https://github.com/ghost))
+- Fix file sender null terminator. [\#128](https://github.com/JFreegman/toxic/pull/128) ([aitjcize](https://github.com/aitjcize))
+- Drop typedef redeclarations [\#122](https://github.com/JFreegman/toxic/pull/122) ([czarkoff](https://github.com/czarkoff))
+- Include "pthread.h" [\#121](https://github.com/JFreegman/toxic/pull/121) ([czarkoff](https://github.com/czarkoff))
+- Wow [\#119](https://github.com/JFreegman/toxic/pull/119) ([ghost](https://github.com/ghost))
+- Use default terminal fg/bg colors when we can. [\#117](https://github.com/JFreegman/toxic/pull/117) ([ooesili](https://github.com/ooesili))
+- Fixed support for wide characters [\#113](https://github.com/JFreegman/toxic/pull/113) ([graboy](https://github.com/graboy))
+- Mention av [\#110](https://github.com/JFreegman/toxic/pull/110) ([stqism](https://github.com/stqism))
+- allow history scrolling [\#109](https://github.com/JFreegman/toxic/pull/109) ([JFreegman](https://github.com/JFreegman))
+- Only those who appreciate small things [\#107](https://github.com/JFreegman/toxic/pull/107) ([ghost](https://github.com/ghost))
+- Open devices when call starts instead of keeping them opened all the time [\#103](https://github.com/JFreegman/toxic/pull/103) ([ghost](https://github.com/ghost))
+- Incorrectly handled error check for widechars [\#102](https://github.com/JFreegman/toxic/pull/102) ([graboy](https://github.com/graboy))
+- Fix toxic build when toxav is not available [\#100](https://github.com/JFreegman/toxic/pull/100) ([jin-eld](https://github.com/jin-eld))
+- Add checks for pthreads to the build system [\#99](https://github.com/JFreegman/toxic/pull/99) ([jin-eld](https://github.com/jin-eld))
+- Fixes and stuff... [\#97](https://github.com/JFreegman/toxic/pull/97) ([ghost](https://github.com/ghost))
+
+## [0.3.0.1](https://github.com/JFreegman/toxic/tree/0.3.0.1) (2014-03-12)
+[Full Changelog](https://github.com/JFreegman/toxic/compare/0.3.0...0.3.0.1)
+
+**Merged pull requests:**
+
+- SPELLING IS FOR FOOLS [\#94](https://github.com/JFreegman/toxic/pull/94) ([lehitoskin](https://github.com/lehitoskin))
+
+## [0.3.0](https://github.com/JFreegman/toxic/tree/0.3.0) (2014-03-12)
+[Full Changelog](https://github.com/JFreegman/toxic/compare/0.2.7...0.3.0)
+
+**Fixed bugs:**
+
+- SIGSEVG upon friend hanging up [\#89](https://github.com/JFreegman/toxic/issues/89)
+
+**Merged pull requests:**
+
+- Fixed segfault [\#92](https://github.com/JFreegman/toxic/pull/92) ([ghost](https://github.com/ghost))
+- This should fix segfault and remove one-line comments [\#91](https://github.com/JFreegman/toxic/pull/91) ([ghost](https://github.com/ghost))
+- Fixed another clang issue with bools that broek file sending. [\#90](https://github.com/JFreegman/toxic/pull/90) ([Jman012](https://github.com/Jman012))
+- Toxic audio support [\#88](https://github.com/JFreegman/toxic/pull/88) ([ghost](https://github.com/ghost))
+- Fixed clang error, disabling the execute module. [\#87](https://github.com/JFreegman/toxic/pull/87) ([Jman012](https://github.com/Jman012))
+- Issue \#84 fixed [\#86](https://github.com/JFreegman/toxic/pull/86) ([thevar1able](https://github.com/thevar1able))
+- Fixing fall-back from IPv6 to IPv4 [\#85](https://github.com/JFreegman/toxic/pull/85) ([micrictor](https://github.com/micrictor))
+
+## [0.2.7](https://github.com/JFreegman/toxic/tree/0.2.7) (2014-03-01)
+[Full Changelog](https://github.com/JFreegman/toxic/compare/0.2.6.1...0.2.7)
+
+**Closed issues:**
+
+- Toxic segfault when window is closed [\#81](https://github.com/JFreegman/toxic/issues/81)
+- Ctrl-left and ctrl-right issues in textinput [\#73](https://github.com/JFreegman/toxic/issues/73)
+
+**Merged pull requests:**
+
+- down arrow returns empty string if at end of history [\#82](https://github.com/JFreegman/toxic/pull/82) ([kl4ng](https://github.com/kl4ng))
+- Fallback to loading /usr/share/toxic/DHTservers. [\#80](https://github.com/JFreegman/toxic/pull/80) ([viric](https://github.com/viric))
+
+## [0.2.6.1](https://github.com/JFreegman/toxic/tree/0.2.6.1) (2014-02-23)
+[Full Changelog](https://github.com/JFreegman/toxic/compare/0.2.6...0.2.6.1)
+
+## [0.2.6](https://github.com/JFreegman/toxic/tree/0.2.6) (2014-02-23)
+[Full Changelog](https://github.com/JFreegman/toxic/compare/0.2.5...0.2.6)
+
+## [0.2.5](https://github.com/JFreegman/toxic/tree/0.2.5) (2014-02-22)
+[Full Changelog](https://github.com/JFreegman/toxic/compare/prealpha_win32_r8...0.2.5)
+
+**Fixed bugs:**
+
+- Back space leaves ć character [\#44](https://github.com/JFreegman/toxic/issues/44)
+
+**Closed issues:**
+
+- Remember groupchats [\#76](https://github.com/JFreegman/toxic/issues/76)
+- Segfault [\#75](https://github.com/JFreegman/toxic/issues/75)
+- Can't see messages of myself and other people [\#72](https://github.com/JFreegman/toxic/issues/72)
+- binary blob in source [\#66](https://github.com/JFreegman/toxic/issues/66)
+- symbol lookup error [\#54](https://github.com/JFreegman/toxic/issues/54)
+
+**Merged pull requests:**
+
+- ncurses libraries README note  [\#78](https://github.com/JFreegman/toxic/pull/78) ([kl4ng](https://github.com/kl4ng))
+- umask such that stored files are u+rw only [\#77](https://github.com/JFreegman/toxic/pull/77) ([alevy](https://github.com/alevy))
+- Fix groupchat cursor movement. [\#63](https://github.com/JFreegman/toxic/pull/63) ([aitjcize](https://github.com/aitjcize))
+- Fix wchar cursor movement. [\#62](https://github.com/JFreegman/toxic/pull/62) ([aitjcize](https://github.com/aitjcize))
+- api update [\#61](https://github.com/JFreegman/toxic/pull/61) ([naxuroqa](https://github.com/naxuroqa))
+- Add option to switch off ipv6. [\#60](https://github.com/JFreegman/toxic/pull/60) ([aitjcize](https://github.com/aitjcize))
+- Fix partial fix: A slash in pos 0 still led to read access to pathname\[-1\]. [\#59](https://github.com/JFreegman/toxic/pull/59) ([FullName](https://github.com/FullName))
+- Fix corresponding API name changes in toxcore. [\#58](https://github.com/JFreegman/toxic/pull/58) ([aitjcize](https://github.com/aitjcize))
+- Fix API ret code changes of ToxCore [\#57](https://github.com/JFreegman/toxic/pull/57) ([aitjcize](https://github.com/aitjcize))
+
+## [prealpha_win32_r8](https://github.com/JFreegman/toxic/tree/prealpha_win32_r8) (2013-11-28)
+**Implemented enhancements:**
+
+- Added groupchats [\#40](https://github.com/JFreegman/toxic/pull/40) ([JFreegman](https://github.com/JFreegman))
+- Adapted to ipv6-enabled tox [\#38](https://github.com/JFreegman/toxic/pull/38) ([FullName](https://github.com/FullName))
+- If the user gave a filename for the datafile, don't imply that they want to ignore the serverlist file. [\#37](https://github.com/JFreegman/toxic/pull/37) ([FullName](https://github.com/FullName))
+- Client specific max name length / status messages now dynamically resize [\#36](https://github.com/JFreegman/toxic/pull/36) ([JFreegman](https://github.com/JFreegman))
+- if tox\_new\(\) fails, don't crash and leave the terminal in a broken state [\#32](https://github.com/JFreegman/toxic/pull/32) ([FullName](https://github.com/FullName))
+- truncate friends' notes if they're too long [\#30](https://github.com/JFreegman/toxic/pull/30) ([JFreegman](https://github.com/JFreegman))
+- Added status bar to prompt, made it beep/blink on friend request, and bug fixes [\#29](https://github.com/JFreegman/toxic/pull/29) ([JFreegman](https://github.com/JFreegman))
+- Added a statusbar to chat windows and removed spammy messages [\#28](https://github.com/JFreegman/toxic/pull/28) ([JFreegman](https://github.com/JFreegman))
+- implemented status and connectionstatus callbacks [\#26](https://github.com/JFreegman/toxic/pull/26) ([JFreegman](https://github.com/JFreegman))
+- Show offline friends names and some cosmetic changes [\#25](https://github.com/JFreegman/toxic/pull/25) ([JFreegman](https://github.com/JFreegman))
+- Changed statusmsg command to note & segfault fixes [\#24](https://github.com/JFreegman/toxic/pull/24) ([JFreegman](https://github.com/JFreegman))
+- refactor command argument parsing [\#23](https://github.com/JFreegman/toxic/pull/23) ([lukechampine](https://github.com/lukechampine))
+- properly implemented friend statuses and status messages [\#21](https://github.com/JFreegman/toxic/pull/21) ([JFreegman](https://github.com/JFreegman))
+- implemented friend deletion [\#15](https://github.com/JFreegman/toxic/pull/15) ([JFreegman](https://github.com/JFreegman))
+- Fix configure for Free BSD [\#11](https://github.com/JFreegman/toxic/pull/11) ([jin-eld](https://github.com/jin-eld))
+- Add check for setlocale\(\) [\#10](https://github.com/JFreegman/toxic/pull/10) ([manuel-arguelles](https://github.com/manuel-arguelles))
+- Update build system [\#7](https://github.com/JFreegman/toxic/pull/7) ([jin-eld](https://github.com/jin-eld))
+- Added travis integration [\#6](https://github.com/JFreegman/toxic/pull/6) ([stqism](https://github.com/stqism))
+- Use new public api [\#5](https://github.com/JFreegman/toxic/pull/5) ([fhahn](https://github.com/fhahn))
+- Add widechar checks [\#2](https://github.com/JFreegman/toxic/pull/2) ([jin-eld](https://github.com/jin-eld))
+
+**Fixed bugs:**
+
+- Let windows.c actually get the tox \*m. [\#41](https://github.com/JFreegman/toxic/pull/41) ([Jman012](https://github.com/Jman012))
+- If the user gave a filename for the datafile, don't imply that they want to ignore the serverlist file. [\#37](https://github.com/JFreegman/toxic/pull/37) ([FullName](https://github.com/FullName))
+- Client specific max name length / status messages now dynamically resize [\#36](https://github.com/JFreegman/toxic/pull/36) ([JFreegman](https://github.com/JFreegman))
+- Merged pr6 [\#34](https://github.com/JFreegman/toxic/pull/34) ([stqism](https://github.com/stqism))
+- made error handling more consistent and added exit function [\#33](https://github.com/JFreegman/toxic/pull/33) ([JFreegman](https://github.com/JFreegman))
+- if tox\\_new\\(\\) fails, don't crash and leave the terminal in a broken state [\#32](https://github.com/JFreegman/toxic/pull/32) ([FullName](https://github.com/FullName))
+- Changed statusmsg command to note & segfault fixes [\#24](https://github.com/JFreegman/toxic/pull/24) ([JFreegman](https://github.com/JFreegman))
+- fix buffer overflows and format issues [\#20](https://github.com/JFreegman/toxic/pull/20) ([JFreegman](https://github.com/JFreegman))
+- Fix blocking while waiting for key [\#17](https://github.com/JFreegman/toxic/pull/17) ([manuel-arguelles](https://github.com/manuel-arguelles))
+- fixed "free\(\): invalid pointer" when XDG\_CONFIG\_HOME is set [\#16](https://github.com/JFreegman/toxic/pull/16) ([gs93](https://github.com/gs93))
+- Make sure toxic compiles on MinGW/Win32 again [\#14](https://github.com/JFreegman/toxic/pull/14) ([jin-eld](https://github.com/jin-eld))
+- Fix for the "bad character" when doing backspace in chat window [\#12](https://github.com/JFreegman/toxic/pull/12) ([jin-eld](https://github.com/jin-eld))
+- Fix configure for Free BSD [\#11](https://github.com/JFreegman/toxic/pull/11) ([jin-eld](https://github.com/jin-eld))
+- Fix configure script for ncurses without ncursesw [\#9](https://github.com/JFreegman/toxic/pull/9) ([manuel-arguelles](https://github.com/manuel-arguelles))
+- Fix configure script for mingw32 [\#8](https://github.com/JFreegman/toxic/pull/8) ([jin-eld](https://github.com/jin-eld))
+- warning: comparison of integers of different signs: 'int' and 'unsigned long' [\#3](https://github.com/JFreegman/toxic/pull/3) ([1100110](https://github.com/1100110))
+
+**Merged pull requests:**
+
+- Make sure friend message is null-terminated else generate garbate on screen [\#56](https://github.com/JFreegman/toxic/pull/56) ([aitjcize](https://github.com/aitjcize))
+- Fix trailing slashes which leads to segfault. [\#55](https://github.com/JFreegman/toxic/pull/55) ([aitjcize](https://github.com/aitjcize))
+- fix cflags [\#53](https://github.com/JFreegman/toxic/pull/53) ([JFreegman](https://github.com/JFreegman))
+- Fix 93ab16c [\#52](https://github.com/JFreegman/toxic/pull/52) ([urras](https://github.com/urras))
+- Offer solution for "error while loading shared libraries: libtoxcore.so.... [\#51](https://github.com/JFreegman/toxic/pull/51) ([urras](https://github.com/urras))
+- Implemented file transfers [\#50](https://github.com/JFreegman/toxic/pull/50) ([JFreegman](https://github.com/JFreegman))
+- Fix check for toxcore by linking sodium in the correct place [\#47](https://github.com/JFreegman/toxic/pull/47) ([devurandom](https://github.com/devurandom))
+- Changed order of servers [\#46](https://github.com/JFreegman/toxic/pull/46) ([grimd34th](https://github.com/grimd34th))
+- set friendnames properly and some fixes [\#45](https://github.com/JFreegman/toxic/pull/45) ([JFreegman](https://github.com/JFreegman))
+- moved misc helper functions to separate file and removed redundant includes [\#43](https://github.com/JFreegman/toxic/pull/43) ([JFreegman](https://github.com/JFreegman))
+- Refactored prompt command parser to work with all window types and moved command stuff to separate files [\#42](https://github.com/JFreegman/toxic/pull/42) ([JFreegman](https://github.com/JFreegman))
+- Ipv6.init connection [\#39](https://github.com/JFreegman/toxic/pull/39) ([FullName](https://github.com/FullName))
+- Remove DHT window [\#13](https://github.com/JFreegman/toxic/pull/13) ([JFreegman](https://github.com/JFreegman))
+- Update README.md [\#4](https://github.com/JFreegman/toxic/pull/4) ([notadecent](https://github.com/notadecent))
+- Toxic standalone [\#1](https://github.com/JFreegman/toxic/pull/1) ([jin-eld](https://github.com/jin-eld))
+
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

INSTALL.md

@@ -0,0 +1,70 @@
+# Installation
+* [Dependencies](#dependencies)
+  * [OS X Notes](#os-x-notes)
+* [Compiling](#compiling)
+  * [Documentation](#documentation)
+* [Notes](#notes)
+  * [Compilation variables](#compilation-variables)
+  * [Environment variables](#environment-variables)
+
+## Dependencies
+| Name                                                 | Needed by                  | Debian package      |
+|------------------------------------------------------|----------------------------|---------------------|
+| [Tox Core](https://github.com/toktok/c-toxcore)      | BASE                       | *None*              |
+| [NCurses](https://www.gnu.org/software/ncurses)      | BASE                       | libncursesw5-dev    |
+| [LibConfig](http://www.hyperrealm.com/libconfig)     | BASE                       | libconfig-dev       |
+| [GNUmake](https://www.gnu.org/software/make)         | BASE                       | make                |
+| [libcurl](http://curl.haxx.se/)                      | BASE                       | libcurl4-openssl-dev|
+| [libqrencode](https://fukuchi.org/works/qrencode/)   | QRCODE                     | libqrencode-dev     |
+| [OpenAL](http://openal.org)                          | AUDIO, SOUND NOTIFICATIONS | libopenal-dev       |
+| [OpenALUT](http://openal.org)                        | SOUND NOTIFICATIONS        | libalut-dev         |
+| [LibNotify](https://developer.gnome.org/libnotify)   | DESKTOP NOTIFICATIONS      | libnotify-dev       |
+| [Python 3](http://www.python.org/)                   | PYTHON                     | python3-dev         |
+| [AsciiDoc](http://asciidoc.org/index.html)           | DOCUMENTATION<sup>1</sup>  | asciidoc            |
+
+<sup>1</sup>: see [Documentation](#documentation)
+
+#### OS X Notes
+Using [Homebrew](http://brew.sh):
+```
+brew install curl qrencode openal-soft freealut libconfig libpng
+brew install --HEAD https://raw.githubusercontent.com/Tox/homebrew-tox/master/Formula/libtoxcore.rb
+brew install libnotify
+export PKG_CONFIG_PATH=/usr/local/opt/openal-soft/lib/pkgconfig
+make
+```
+
+You can omit `libnotify` if you intend to build without desktop notifications enabled.
+
+## Compiling
+```
+make
+sudo make install
+```
+
+#### Documentation
+Run `make doc` in the build directory after editing the asciidoc files to regenerate the manpages.<br />
+**Note for developers**: asciidoc files and generated manpages will need to be committed together.<br />
+**Note for everyone**: [asciidoc](http://asciidoc.org/index.html) (and this step) is only required for regenerating manpages when you modify them.
+
+## Notes
+
+#### Compilation variables
+* You can add specific flags to the Makefile with `USER_CFLAGS=""` and `USER_LDFLAGS=""` passed as arguments to make, or as environment variables
+* Default compile options can be overridden by using special variables:
+  * `DISABLE_X11=1` → Disable X11 support (needed for focus tracking)
+  * `DISABLE_AV=1` → Disable audio call support
+  * `DISABLE_SOUND_NOTIFY=1` → Disable sound notifications support
+  * `DISABLE_QRCODE` → Disable QR exporting support
+  * `DISABLE_QRPNG` → Disable support for exporting QR as PNG
+  * `DISABLE_DESKTOP_NOTIFY=1` → Disable desktop notifications support
+  * `ENABLE_PYTHON=1` → Build toxic with Python scripting support
+  * `ENABLE_RELEASE=1` → Build toxic without debug symbols and with full compiler optimizations
+  * `ENABLE_ASAN=1` → Build toxic with LLVM Address Sanitizer enabled
+
+* `DESTDIR=""` Specifies the base install directory for binaries and data files (e.g.: DESTDIR="/tmp/build/pkg")
+
+#### Environment variables
+* You can use the `CFLAGS` and `LDFLAGS` environment variables to add specific flags to the Makefile
+* The `PREFIX` environment variable specifies a base install directory for binaries and data files. This is interchangeable with the `DESTDIR` variable, and is generally used by systems that have the `PREFIX` environment variable set by default.<br />
+**Note**: `sudo` does not preserve user environment variables by default on some systems. See the `sudoers` manual for more information.

Makefile

@@ -0,0 +1,97 @@
+BASE_DIR = $(shell pwd -P)
+CFG_DIR = $(BASE_DIR)/cfg
+
+-include $(CFG_DIR)/global_vars.mk
+
+LIBS = toxcore ncursesw libconfig libcurl
+
+CFLAGS ?= -std=c99 -pthread -Wall -Wpedantic -Wunused -fstack-protector-all -Wvla -Wno-missing-braces
+CFLAGS += '-DTOXICVER="$(VERSION)"' -DHAVE_WIDECHAR -D_XOPEN_SOURCE_EXTENDED -D_FILE_OFFSET_BITS=64
+CFLAGS += '-DPACKAGE_DATADIR="$(abspath $(DATADIR))"'
+CFLAGS += ${USER_CFLAGS}
+LDFLAGS ?=
+LDFLAGS += ${USER_LDFLAGS}
+
+OBJ = autocomplete.o avatars.o bootstrap.o chat.o chat_commands.o configdir.o curl_util.o execute.o
+OBJ += file_transfers.o friendlist.o global_commands.o conference_commands.o conference.o help.o input.o
+OBJ += line_info.o log.o message_queue.o misc_tools.o name_lookup.o notify.o prompt.o qr_code.o settings.o
+OBJ += term_mplex.o toxic.o toxic_strings.o windows.o
+
+# Check if debug build is enabled
+RELEASE := $(shell if [ -z "$(ENABLE_RELEASE)" ] || [ "$(ENABLE_RELEASE)" = "0" ] ; then echo disabled ; else echo enabled ; fi)
+ifneq ($(RELEASE), enabled)
+	CFLAGS += -O0 -g -DDEBUG
+	LDFLAGS += -O0
+else
+	CFLAGS += -O2 -flto
+	LDFLAGS += -O2 -flto
+endif
+
+# Check if LLVM Address Sanitizer is enabled
+ENABLE_ASAN := $(shell if [ -z "$(ENABLE_ASAN)" ] || [ "$(ENABLE_ASAN)" = "0" ] ; then echo disabled ; else echo enabled ; fi)
+ifneq ($(ENABLE_ASAN), disabled)
+	CFLAGS += -fsanitize=address -fno-omit-frame-pointer
+endif
+
+# Check on wich system we are running
+UNAME_S = $(shell uname -s)
+ifeq ($(UNAME_S), Linux)
+LDFLAGS += -ldl -lrt
+endif
+ifeq ($(UNAME_S), OpenBSD)
+LIBS := $(filter-out ncursesw, $(LIBS))
+LDFLAGS += -lncursesw
+endif
+ifeq ($(UNAME_S), NetBSD)
+LIBS := $(filter-out ncursesw, $(LIBS))
+LDFLAGS += -lncursesw
+endif
+ifeq ($(UNAME_S), Darwin)
+    -include $(CFG_DIR)/systems/Darwin.mk
+endif
+
+# Check on which platform we are running
+UNAME_M = $(shell uname -m)
+ifeq ($(UNAME_M), x86_64)
+    -include $(CFG_DIR)/platforms/x86_64.mk
+endif
+ifneq ($(filter %86, $(UNAME_M)),)
+    -include $(CFG_DIR)/platforms/x86.mk
+endif
+ifneq ($(filter arm%, $(UNAME_M)),)
+    -include $(CFG_DIR)/platforms/arm.mk
+endif
+
+# Include all needed checks
+-include $(CFG_DIR)/checks/check_features.mk
+
+# Fix path for object files
+OBJ := $(addprefix $(BUILD_DIR)/, $(OBJ))
+
+# Targets
+all: $(BUILD_DIR)/toxic
+
+$(BUILD_DIR)/toxic: $(OBJ)
+	@echo "  LD    $(@:$(BUILD_DIR)/%=%)"
+	@$(CC) $(CFLAGS) -o $(BUILD_DIR)/toxic $(OBJ) $(LDFLAGS)
+
+$(BUILD_DIR)/osx_video.o: $(SRC_DIR)/$(OSX_VIDEO)
+	@echo "  CC    $(@:$(BUILD_DIR)/)osx_video.o"
+	@$(CC) $(CFLAGS) -o $(BUILD_DIR)/osx_video.o -c $(SRC_DIR)/$(OSX_VIDEO)
+
+$(BUILD_DIR)/%.o: $(SRC_DIR)/%.c
+	@if [ ! -e $(BUILD_DIR) ]; then \
+		mkdir -p $(BUILD_DIR) ;\
+	fi
+	@echo "  CC    $(@:$(BUILD_DIR)/%=%)"
+	@$(CC) $(CFLAGS) -o $(BUILD_DIR)/$*.o -c $(SRC_DIR)/$*.c
+	@$(CC) -MM $(CFLAGS) $(SRC_DIR)/$*.c >$(BUILD_DIR)/$*.d
+
+clean:
+	rm -f $(BUILD_DIR)/*.d $(BUILD_DIR)/*.o $(BUILD_DIR)/toxic
+
+-include $(BUILD_DIR)/$(OBJ:.o=.d)
+
+-include $(CFG_DIR)/targets/*.mk
+
+.PHONY: clean all

README.md

@@ -1,47 +1,20 @@
-# Toxic [![Build Status](https://travis-ci.org/Tox/toxic.png?branch=master)](https://travis-ci.org/Tox/toxic)
-Toxic is a [Tox](https://tox.im)-based instant messenging client which formerly resided in the [Tox core repository](https://github.com/irungentoo/toxcore), and is now available as a standalone application.
+<a href="https://scan.coverity.com/projects/toxic-tox">
+  <img alt="Coverity Scan Build Status"
+       src="https://scan.coverity.com/projects/4975/badge.svg"/>
+</a>
 
-![Toxic Screenshot](https://i.imgur.com/ryaEmQZ.png "Home Screen").
+Toxic is a [Tox](https://tox.chat)-based instant messaging and video chat client.
+
+[![Toxic Screenshot](https://i.imgur.com/TwYA8L0.png "Toxic Home Screen")](https://i.imgur.com/TwYA8L0.png)
 
 ## Installation
+[See the install instructions](/INSTALL.md)
 
-### Dependencies
-##### Base
-* [libtoxcore](https://github.com/irungentoo/toxcore)
-* [ncurses](https://www.gnu.org/software/ncurses) (for Debian based systems, 'libncursesw5-dev')
-* [libconfig](http://www.hyperrealm.com/libconfig) (for Debian based systems, 'libconfig-dev')
+## Settings
+Running Toxic for the first time creates an empty file called toxic.conf in your home configuration directory ("~/.config/tox" for Linux users). Adding options to this file allows you to enable auto-logging, change the time format (12/24 hour), and much more.
+You can view our example config file [here](misc/toxic.conf.example).
 
-##### Audio
-* libtoxav ([libtoxcore](https://github.com/irungentoo/toxcore) compiled with audio support)
-* [openal](http://openal.org) (for Debian based systems, 'libopenal-dev')
-
-##### Sound notifications
-* [openal](http://openal.org) (for Debian based systems, 'libopenal-dev')
-* [openalut](http://openal.org) (for Debian based systems, 'libalut-dev')
-
-##### Desktop notifications
-* [libnotify](https://developer.gnome.org/libnotify) (for Debian based systems, 'libnotify-dev')
-
-### Compiling
-1. `cd build/`
-2. `make PREFIX="/where/to/install"`
-3. `sudo make install PREFIX="/where/to/install"`
-
-### Compilation Notes
-* You can add specific flags to the Makefile with `USER_CFLAGS=""` and/or `USER_LDFLAGS=""`
-* You can pass your own flags to the Makefile with `CFLAGS=""` and/or `LDFLAGS=""` (this will supersede the default ones)
-* Additional features are automatically enabled if all dependencies are found, but you can disable them by using special variables:
-  * `DISABLE_AV=1` → build toxic without audio call support
-  * `DISABLE_SOUND_NOTIFY=1` → build toxic without sound notifications support
-  * `DISABLE_DESKTOP_NOTIFY=1` → build toxic without desktop notifications support
-
-### Packaging
-* For packaging purpose, you can use `DESTDIR=""` to specify a directory where to store installed files
-* `DESTDIR=""` can be used in addition to `PREFIX=""`:
-  * `DESTDIR=""` is meant to specify a directory where to store installed files (ex: "/tmp/build/pkg")
-  * `PREFIX=""` is meant to specify a prefix directory for binaries and data files (ex: "/usr/local")
-
-### Troubleshooting
+## Troubleshooting
 If your default prefix is "/usr/local" and you receive the following:
 ```
 error while loading shared libraries: libtoxcore.so.0: cannot open shared object file: No such file or directory
@@ -52,12 +25,3 @@ echo '/usr/local/lib/' | sudo tee -a /etc/ld.so.conf.d/locallib.conf
 sudo ldconfig
 ```
 
-## Precompiled binaries
-You can download precompiled binaries from [jenkins](https://jenkins.libtoxcore.so):
-* [Linux 32 bit](https://jenkins.libtoxcore.so/job/toxic_linux_i386/lastSuccessfulBuild/artifact/toxic_linux_i386.tar.xz)
-* [Linux 64 bit](https://jenkins.libtoxcore.so/job/toxic_linux_amd64/lastSuccessfulBuild/artifact/toxic_linux_amd64.tar.xz)
-
-## Settings
-Running Toxic for the first time creates an empty file called toxic.conf in your home configuration directory ("~/.config/tox" for Linux users). Adding options to this file allows you to enable auto-logging, change the time format (12/24 hour), and much more.
-You can view our example config file [here](misc/toxic.conf.example).
-

apidoc/python/Makefile

@@ -0,0 +1,20 @@
+# Minimal makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+SPHINXPROJ    = toxic_api
+SOURCEDIR     = source
+BUILDDIR      = build
+
+# Put it first so that "make" without argument is like "make help".
+help:
+	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+.PHONY: help Makefile
+
+# Catch-all target: route all unknown targets to Sphinx using the new
+# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
+%: Makefile
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

apidoc/python/source/conf.py

@@ -0,0 +1,157 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# toxic_api documentation build configuration file, created by
+# sphinx-quickstart on Tue May 16 08:58:24 2017.
+#
+# This file is execfile()d with the current directory set to its
+# containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#
+# import os
+# import sys
+# sys.path.insert(0, os.path.abspath('.'))
+
+
+# -- General configuration ------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#
+# needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = []
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix(es) of source filenames.
+# You can specify multiple suffix as a list of string:
+#
+# source_suffix = ['.rst', '.md']
+source_suffix = '.rst'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = 'toxic_api'
+copyright = '2017, Jakob Kreuze'
+author = 'Jakob Kreuze'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '0.10.0'
+# The full version, including alpha/beta/rc tags.
+release = '0.10.0'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = None
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+# This patterns also effect to html_static_path and html_extra_path
+exclude_patterns = []
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# If true, `todo` and `todoList` produce output, else they produce nothing.
+todo_include_todos = False
+
+
+# -- Options for HTML output ----------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+#
+html_theme = 'alabaster'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#
+# html_theme_options = {}
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+
+# -- Options for HTMLHelp output ------------------------------------------
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'toxic_apidoc'
+
+
+# -- Options for LaTeX output ---------------------------------------------
+
+latex_elements = {
+    # The paper size ('letterpaper' or 'a4paper').
+    #
+    # 'papersize': 'letterpaper',
+
+    # The font size ('10pt', '11pt' or '12pt').
+    #
+    # 'pointsize': '10pt',
+
+    # Additional stuff for the LaTeX preamble.
+    #
+    # 'preamble': '',
+
+    # Latex figure (float) alignment
+    #
+    # 'figure_align': 'htbp',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+#  author, documentclass [howto, manual, or own class]).
+latex_documents = [
+    (master_doc, 'toxic_api.tex', 'toxic\\_api Documentation',
+     'Jakob Kreuze', 'manual'),
+]
+
+
+# -- Options for manual page output ---------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    (master_doc, 'toxic_api', 'toxic_api Documentation',
+     [author], 1)
+]
+
+
+# -- Options for Texinfo output -------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+    (master_doc, 'toxic_api', 'toxic_api Documentation',
+     author, 'toxic_api', 'One line description of project.',
+     'Miscellaneous'),
+]
+
+
+

apidoc/python/source/examples.rst

@@ -0,0 +1,8 @@
+============
+API Examples
+============
+
+Fortune
+=======
+.. literalinclude:: fortune.py
+   :language: python

apidoc/python/source/fortune.py

@@ -0,0 +1,37 @@
+import toxic_api
+import random
+
+FORTUNES = [
+    "A bug in the code is worth two in the documentation.",
+    "A bug in the hand is better than one as yet undetected.",
+    "\"A debugged program is one for which you have not yet found the "
+    "conditions that make it fail.\" -- Jerry Ogdin"
+]
+
+def send_fortune(args):
+    """Callback function that sends the contact of the current window a
+    given number of random fortunes.
+    """
+    if len(args) != 1:
+        toxic_api.display("Only one argument allowed!")
+        return
+
+    try:
+        count = int(args[0])
+    except ValueError:
+        toxic_api.display("Argument must be a number!")
+        return
+
+    if count < 0 or count > 20:
+        toxic_api.display("Argument is too large!")
+        return
+
+    name = toxic_api.get_nick()
+
+    toxic_api.send("%s has decided to send you %d fortunes:" % (name, count))
+    for _ in range(count):
+        toxic_api.send(random.choice(FORTUNES))
+
+
+toxic_api.register("/fortune", "Send a fortune to the contact of the current "
+                   "window", send_fortune)

apidoc/python/source/index.rst

@@ -0,0 +1,9 @@
+Toxic Scripting Interface Documentation
+=======================================
+
+.. toctree::
+   :maxdepth: 2
+
+   intro
+   reference
+   examples

apidoc/python/source/intro.rst

@@ -0,0 +1,12 @@
+=========================
+Toxic Scripting Interface
+=========================
+
+A Python scripting interface to `Toxic <https://github.com/JFreegman/toxic>`_.
+
+
+Getting Started
+===============
+Toxic is compiled with Python support by default. To access the scripting interface, simply import "toxic_api" in your script.
+
+Scripts can be run by issuing "/run <path>" from toxic, or placing them in the "autorun_path" from your toxic configuration file.

apidoc/python/source/reference.rst

@@ -0,0 +1,73 @@
+=============
+API Reference
+=============
+
+Messages
+========
+.. function:: display(msg)
+
+   Display a message to the user through the current window.
+
+   :param msg: The message to display.
+   :type msg: string
+   :rtype: none
+
+.. function:: send(msg)
+
+   Send a message to the user specified by the currently open conversation.
+
+   :param msg: The message to display.
+   :type msg: string
+   :rtype: none
+
+
+State
+=====
+.. function:: get_nick()
+
+   Return the user's current nickname.
+
+   :rtype: string
+
+.. function:: get_status()
+
+   Return a string representing the user's current status. Can be either "online", "away", or "busy".
+
+   :rtype: string
+
+.. function:: get_status_message()
+
+   Return the user's current status message.
+
+   :rtype: string
+
+.. function:: get_all_friends()
+
+   Return a list of all the user's friends.
+
+   :rtype: list of (string, string) tuples containing the nickname followed by their public key
+
+
+Commands
+========
+.. function:: execute(command, class)
+
+   Executes the given command. The API exports three constants for the class parameter; GLOBAL_COMMAND, CHAT_COMMAND, and GROUPCHAT_COMMAND.
+
+   :param command: The command to execute.
+   :type command: string
+   :param class: The class of the command.
+   :type class: int
+   :rtype: none
+
+.. function:: register(command, help, callback)
+
+   Register a callback to be executed whenever command is run. The callback function will be called with one argument, a list of arguments from when the user calls the command.
+
+   :param command: The command to listen for.
+   :type command: string
+   :param help: A description of the command to be shown in the help menu.
+   :type help: string
+   :param callback: The function to be called.
+   :type callback: callable
+   :rtype: none

astylerc

@@ -0,0 +1,26 @@
+# Bracket Style Options
+--style=kr
+
+# Tab Options
+--indent=spaces=4
+
+# Indentation Options
+--indent-switches
+
+# Padding Options
+--pad-header
+--break-blocks
+--pad-oper
+--unpad-paren
+--align-pointer=name
+--align-reference=name
+
+# Formatting Options
+--add-brackets
+--convert-tabs
+--max-code-length=120
+
+# Other Options
+--preserve-date
+--formatted
+--lineend=linux

build/Makefile

@@ -1,74 +0,0 @@
-TOXIC_VERSION = 0.4.7
-REV = $(shell git rev-list HEAD --count)
-VERSION = $(TOXIC_VERSION)_r$(REV)
-
-CFG_DIR = ../cfg
-SRC_DIR = ../src
-PREFIX = /usr/local
-BINDIR = $(PREFIX)/bin
-DATADIR = $(PREFIX)/share/toxic
-MANDIR = $(PREFIX)/share/man
-
-LIBS = libtoxcore ncursesw libconfig
-
-CFLAGS = -std=gnu99 -pthread -Wall -g
-CFLAGS += -DTOXICVER="\"$(VERSION)\"" -DHAVE_WIDECHAR -D_XOPEN_SOURCE_EXTENDED
-CFLAGS += -DPACKAGE_DATADIR="\"$(abspath $(DATADIR))\""
-CFLAGS += $(USER_CFLAGS)
-LDFLAGS = $(USER_LDFLAGS)
-
-OBJ = chat.o chat_commands.o configdir.o dns.o execute.o file_senders.o notify.o
-OBJ += friendlist.o global_commands.o groupchat.o line_info.o input.o help.o autocomplete.o
-OBJ += log.o misc_tools.o prompt.o settings.o toxic.o toxic_strings.o windows.o
-
-# Check on wich system we are running
-UNAME_S = $(shell uname -s)
-ifeq ($(UNAME_S), Linux)
-	-include $(CFG_DIR)/systems/Linux.mk
-endif
-ifeq ($(UNAME_S), FreeBSD)
-	-include $(CFG_DIR)/systems/FreeBSD.mk
-endif
-ifeq ($(UNAME_S), Darwin)
-	-include $(CFG_DIR)/systems/Darwin.mk
-endif
-ifeq ($(UNAME_S), Solaris)
-	-include $(CFG_DIR)/systems/Solaris.mk
-endif
-
-# Check on which platform we are running
-UNAME_M = $(shell uname -m)
-ifeq ($(UNAME_M), x86_64)
-	-include $(CFG_DIR)/platforms/x86_64.mk
-endif
-ifneq ($(filter %86, $(UNAME_M)),)
-	-include $(CFG_DIR)/platforms/x86.mk
-endif
-ifneq ($(filter arm%, $(UNAME_M)),)
-	-include $(CFG_DIR)/platforms/arm.mk
-endif
-
-# Include all needed checks
--include $(CFG_DIR)/check_features.mk
-
-# Targets
-all: toxic
-
-toxic: $(OBJ)
-	@echo "  LD    $@"
-	@$(CC) $(CFLAGS) -o toxic $(OBJ) $(LDFLAGS)
-
-%.o: $(SRC_DIR)/%.c
-	@echo "  CC    $@"
-	@$(CC) $(CFLAGS) -o $*.o -c $(SRC_DIR)/$*.c
-	@$(CC) -MM $(CFLAGS) $(SRC_DIR)/$*.c > $*.d
-
-clean:
-	rm -rf *.d *.o toxic
-
--include $(OBJ:.o=.d)
-
--include $(CFG_DIR)/install.mk
--include $(CFG_DIR)/help.mk
-
-.PHONY: clean all

cfg/av.mk

@@ -1,23 +0,0 @@
-# Variables for audio call support
-AUDIO_LIBS = libtoxav openal
-AUDIO_CFLAGS = -D_AUDIO
-ifneq (, $(findstring device.o, $(OBJ)))
-	AUDIO_OBJ = audio_call.o
-else
-	AUDIO_OBJ = audio_call.o device.o
-endif
-
-# Check if we can build audio support
-CHECK_AUDIO_LIBS = $(shell pkg-config $(AUDIO_LIBS) || echo -n "error")
-ifneq ($(CHECK_AUDIO_LIBS), error)
-	LIBS += $(AUDIO_LIBS)
-	CFLAGS += $(AUDIO_CFLAGS)
-	OBJ += $(AUDIO_OBJ)
-else
-ifneq ($(MAKECMDGOALS), clean)
-MISSING_AUDIO_LIBS = $(shell for lib in $(AUDIO_LIBS) ; do if ! pkg-config $$lib ; then echo $$lib ; fi ; done)
-$(warning WARNING -- Toxic will be compiled without audio support)
-$(warning WARNING -- You need these libraries for audio support)
-$(warning WARNING -- $(MISSING_AUDIO_LIBS))
-endif
-endif

cfg/check_features.mk

@@ -1,39 +0,0 @@
-# Check if we can use X11
-CHECK_X11_LIBS = $(shell pkg-config x11 || echo -n "error")
-ifneq ($(CHECK_X11_LIBS), error)
-	LIBS += x11
-	CFLAGS += -D_X11
-endif
-
-# Check if we want build audio support
-AUDIO = $(shell if [ -z "$(DISABLE_AV)" ] || [ "$(DISABLE_AV)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
-ifneq ($(AUDIO), disabled)
-	-include $(CFG_DIR)/av.mk
-endif
-
-# Check if we want build sound notifications support
-SND_NOTIFY = $(shell if [ -z "$(DISABLE_SOUND_NOTIFY)" ] || [ "$(DISABLE_SOUND_NOTIFY)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
-ifneq ($(SND_NOTIFY), disabled)
-	-include $(CFG_DIR)/sound_notifications.mk
-endif
-
-# Check if we want build desktop notifications support
-DESK_NOTIFY = $(shell if [ -z "$(DISABLE_DESKTOP_NOTIFY)" ] || [ "$(DISABLE_DESKTOP_NOTIFY)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
-ifneq ($(DESK_NOTIFY), disabled)
-	-include $(CFG_DIR)/desktop_notifications.mk
-endif
-
-# Check if we can build Toxic
-CHECK_LIBS = $(shell pkg-config $(LIBS) || echo -n "error")
-ifneq ($(CHECK_LIBS), error)
-	CFLAGS += $(shell pkg-config --cflags $(LIBS))
-	LDFLAGS += $(shell pkg-config --libs $(LIBS))
-else
-ifneq ($(MAKECMDGOALS), clean)
-MISSING_LIBS = $(shell for lib in $(LIBS) ; do if ! pkg-config $$lib ; then echo $$lib ; fi ; done)
-$(warning ERROR -- Cannot compile Toxic)
-$(warning ERROR -- You need these libraries)
-$(warning ERROR -- $(MISSING_LIBS))
-$(error ERROR)
-endif
-endif

cfg/checks/audio.mk

@@ -0,0 +1,22 @@
+# Variables for audio call support
+AUDIO_LIBS = openal
+AUDIO_CFLAGS = -DAUDIO
+ifneq (, $(findstring audio_device.o, $(OBJ)))
+    AUDIO_OBJ = audio_call.o
+else
+    AUDIO_OBJ = audio_call.o audio_device.o
+endif
+
+# Check if we can build audio support
+CHECK_AUDIO_LIBS := $(shell $(PKG_CONFIG) --exists $(AUDIO_LIBS) || echo -n "error")
+ifneq ($(CHECK_AUDIO_LIBS), error)
+    LIBS += $(AUDIO_LIBS)
+    LDFLAGS += -lm
+    CFLAGS += $(AUDIO_CFLAGS)
+    OBJ += $(AUDIO_OBJ)
+else ifneq ($(MAKECMDGOALS), clean)
+    MISSING_AUDIO_LIBS := $(shell for lib in $(AUDIO_LIBS) ; do if ! $(PKG_CONFIG) --exists $$lib ; then echo $$lib ; fi ; done)
+    $(warning WARNING -- Toxic will be compiled without audio support)
+    $(warning WARNING -- You need these libraries for audio support)
+    $(warning WARNING -- $(MISSING_AUDIO_LIBS))
+endif

cfg/checks/check_features.mk

@@ -0,0 +1,66 @@
+CHECKS_DIR = $(CFG_DIR)/checks
+
+# Check if we want build X11 support
+X11 := $(shell if [ -z "$(DISABLE_X11)" ] || [ "$(DISABLE_X11)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
+ifneq ($(X11), disabled)
+    -include $(CHECKS_DIR)/x11.mk
+endif
+
+# Check if we want build audio support
+AUDIO := $(shell if [ -z "$(DISABLE_AV)" ] || [ "$(DISABLE_AV)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
+ifneq ($(AUDIO), disabled)
+    -include $(CHECKS_DIR)/audio.mk
+endif
+
+# Check if we want build video support
+VIDEO := $(shell if [ -z "$(DISABLE_VI)" ] || [ "$(DISABLE_VI)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
+ifneq ($(X11), disabled)
+ifneq ($(AUDIO), disabled)
+ifneq ($(VIDEO), disabled)
+    -include $(CHECKS_DIR)/video.mk
+endif
+endif
+endif
+
+# Check if we want build sound notifications support
+SND_NOTIFY := $(shell if [ -z "$(DISABLE_SOUND_NOTIFY)" ] || [ "$(DISABLE_SOUND_NOTIFY)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
+ifneq ($(SND_NOTIFY), disabled)
+    -include $(CHECKS_DIR)/sound_notifications.mk
+endif
+
+# Check if we want build desktop notifications support
+DESK_NOTIFY := $(shell if [ -z "$(DISABLE_DESKTOP_NOTIFY)" ] || [ "$(DISABLE_DESKTOP_NOTIFY)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
+ifneq ($(DESK_NOTIFY), disabled)
+    -include $(CHECKS_DIR)/desktop_notifications.mk
+endif
+
+# Check if we want build QR export support
+QR_CODE := $(shell if [ -z "$(DISABLE_QRCODE)" ] || [ "$(DISABLE_QRCODE)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
+ifneq ($(QR_CODE), disabled)
+    -include $(CHECKS_DIR)/qr.mk
+endif
+
+# Check if we want build QR exported as PNG support
+QR_PNG := $(shell if [ -z "$(DISABLE_QRPNG)" ] || [ "$(DISABLE_QRPNG)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
+ifneq ($(QR_PNG), disabled)
+    -include $(CHECKS_DIR)/qr_png.mk
+endif
+
+# Check if we want build Python scripting support
+PYTHON := $(shell if [ -z "$(ENABLE_PYTHON)" ] || [ "$(ENABLE_PYTHON)" = "0" ] ; then echo disabled ; else echo enabled ; fi)
+ifneq ($(PYTHON), disabled)
+    -include $(CHECKS_DIR)/python.mk
+endif
+
+# Check if we can build Toxic
+CHECK_LIBS := $(shell $(PKG_CONFIG) --exists $(LIBS) || echo -n "error")
+ifneq ($(CHECK_LIBS), error)
+    CFLAGS += $(shell $(PKG_CONFIG) --cflags $(LIBS))
+    LDFLAGS += $(shell $(PKG_CONFIG) --libs $(LIBS))
+else ifneq ($(MAKECMDGOALS), clean)
+    MISSING_LIBS := $(shell for lib in $(LIBS) ; do if ! $(PKG_CONFIG) --exists $$lib ; then echo $$lib ; fi ; done)
+    $(warning ERROR -- Cannot compile Toxic)
+    $(warning ERROR -- You need these libraries)
+    $(warning ERROR -- $(MISSING_LIBS))
+    $(error ERROR)
+endif

cfg/checks/desktop_notifications.mk

@@ -0,0 +1,15 @@
+# Variables for desktop notifications support
+DESK_NOTIFY_LIBS = libnotify
+DESK_NOTIFY_CFLAGS = -DBOX_NOTIFY
+
+# Check if we can build desktop notifications support
+CHECK_DESK_NOTIFY_LIBS := $(shell $(PKG_CONFIG) --exists $(DESK_NOTIFY_LIBS) || echo -n "error")
+ifneq ($(CHECK_DESK_NOTIFY_LIBS), error)
+    LIBS += $(DESK_NOTIFY_LIBS)
+    CFLAGS += $(DESK_NOTIFY_CFLAGS)
+else ifneq ($(MAKECMDGOALS), clean)
+    MISSING_DESK_NOTIFY_LIBS := $(shell for lib in $(DESK_NOTIFY_LIBS) ; do if ! $(PKG_CONFIG) --exists $$lib ; then echo $$lib ; fi ; done)
+    $(warning WARNING -- Toxic will be compiled without desktop notifications support)
+    $(warning WARNING -- You need these libraries for desktop notifications support)
+    $(warning WARNING -- $(MISSING_DESK_NOTIFY_LIBS))
+endif

cfg/checks/python.mk

@@ -0,0 +1,15 @@
+# Variables for Python scripting support
+PYTHON3_LIBS = python3
+PYTHON_CFLAGS = -DPYTHON
+PYTHON_OBJ = api.o python_api.o
+
+# Check if we can build Python scripting support
+CHECK_PYTHON3_LIBS = $(shell $(PKG_CONFIG) --exists $(PYTHON3_LIBS) || echo -n "error")
+ifneq ($(CHECK_PYTHON3_LIBS), error)
+    LDFLAGS += $(shell python3-config --ldflags)
+    CFLAGS += $(PYTHON_CFLAGS) $(shell python3-config --includes)
+    OBJ += $(PYTHON_OBJ)
+else ifneq ($(MAKECMDGOALS), clean)
+    $(warning WARNING -- Toxic will be compiled without Python scripting support)
+    $(warning WARNING -- You need python3 installed for Python scripting support)
+endif

cfg/checks/qr.mk

@@ -0,0 +1,15 @@
+# Variables for QR export support
+QR_LIBS = libqrencode
+QR_CFLAGS = -DQRCODE
+
+# Check if we can build QR export support
+CHECK_QR_LIBS = $(shell pkg-config --exists $(QR_LIBS) || echo -n "error")
+ifneq ($(CHECK_QR_LIBS), error)
+    LIBS += $(QR_LIBS)
+    CFLAGS += $(QR_CFLAGS)
+else ifneq ($(MAKECMDGOALS), clean)
+    MISSING_QR_LIBS = $(shell for lib in $(QR_LIBS) ; do if ! $(PKG_CONFIG) --exists $$lib ; then echo $$lib ; fi ; done)
+    $(warning WARNING -- Toxic will be compiled without QR export support)
+    $(warning WARNING -- You need these libraries for QR export support)
+    $(warning WARNING -- $(MISSING_QR_LIBS))
+endif

cfg/checks/qr_png.mk

@@ -0,0 +1,15 @@
+# Variables for QR exported as PNG support
+PNG_LIBS = libpng
+PNG_CFLAGS = -DQRPNG
+
+# Check if we can build QR exported as PNG support
+CHECK_PNG_LIBS = $(shell pkg-config --exists $(PNG_LIBS) || echo -n "error")
+ifneq ($(CHECK_PNG_LIBS), error)
+    LIBS += $(PNG_LIBS)
+    CFLAGS += $(PNG_CFLAGS)
+else ifneq ($(MAKECMDGOALS), clean)
+    MISSING_PNG_LIBS = $(shell for lib in $(PNG_LIBS) ; do if ! $(PKG_CONFIG) --exists $$lib ; then echo $$lib ; fi ; done)
+    $(warning WARNING -- Toxic will be compiled without QR exported as PNG support)
+    $(warning WARNING -- You need these libraries for QR exported as PNG support)
+    $(warning WARNING -- $(MISSING_PNG_LIBS))
+endif

cfg/checks/sound_notifications.mk

@@ -0,0 +1,21 @@
+# Variables for sound notifications support
+SND_NOTIFY_LIBS = openal freealut
+SND_NOTIFY_CFLAGS = -DSOUND_NOTIFY
+ifneq (, $(findstring audio_device.o, $(OBJ)))
+    SND_NOTIFY_OBJ =
+else
+    SND_NOTIFY_OBJ = audio_device.o
+endif
+
+# Check if we can build sound notifications support
+CHECK_SND_NOTIFY_LIBS = $(shell $(PKG_CONFIG) --exists $(SND_NOTIFY_LIBS) || echo -n "error")
+ifneq ($(CHECK_SND_NOTIFY_LIBS), error)
+    LIBS += $(SND_NOTIFY_LIBS)
+    CFLAGS += $(SND_NOTIFY_CFLAGS)
+    OBJ += $(SND_NOTIFY_OBJ)
+else ifneq ($(MAKECMDGOALS), clean)
+    MISSING_SND_NOTIFY_LIBS = $(shell for lib in $(SND_NOTIFY_LIBS) ; do if ! $(PKG_CONFIG) --exists $$lib ; then echo $$lib ; fi ; done)
+    $(warning WARNING -- Toxic will be compiled without sound notifications support)
+    $(warning WARNING -- You need these libraries for sound notifications support)
+    $(warning WARNING -- $(MISSING_SND_NOTIFY_LIBS))
+endif

cfg/checks/video.mk

@@ -0,0 +1,21 @@
+# Variables for video call support
+VIDEO_LIBS = openal vpx x11
+VIDEO_CFLAGS = -DVIDEO
+ifneq (, $(findstring video_device.o, $(OBJ)))
+    VIDEO_OBJ = video_call.o
+else
+    VIDEO_OBJ = video_call.o video_device.o
+endif
+
+# Check if we can build video support
+CHECK_VIDEO_LIBS = $(shell $(PKG_CONFIG) --exists $(VIDEO_LIBS) || echo -n "error")
+ifneq ($(CHECK_VIDEO_LIBS), error)
+    LIBS += $(VIDEO_LIBS)
+    CFLAGS += $(VIDEO_CFLAGS)
+    OBJ += $(VIDEO_OBJ)
+else ifneq ($(MAKECMDGOALS), clean)
+    MISSING_VIDEO_LIBS = $(shell for lib in $(VIDEO_LIBS) ; do if ! $(PKG_CONFIG) --exists $$lib ; then echo $$lib ; fi ; done)
+    $(warning WARNING -- Toxic will be compiled without video support)
+    $(warning WARNING -- You will need these libraries for video support)
+    $(warning WARNING -- $(MISSING_VIDEO_LIBS))
+endif

cfg/checks/x11.mk

@@ -0,0 +1,17 @@
+# Variables for X11 support
+X11_LIBS = x11
+X11_CFLAGS = -DX11
+X11_OBJ = x11focus.o
+
+# Check if we can build X11 support
+CHECK_X11_LIBS = $(shell $(PKG_CONFIG) --exists $(X11_LIBS) || echo -n "error")
+ifneq ($(CHECK_X11_LIBS), error)
+    LIBS += $(X11_LIBS)
+    CFLAGS += $(X11_CFLAGS)
+    OBJ += $(X11_OBJ)
+else ifneq ($(MAKECMDGOALS), clean)
+    MISSING_X11_LIBS = $(shell for lib in $(X11_LIBS) ; do if ! $(PKG_CONFIG) --exists $$lib ; then echo $$lib ; fi ; done)
+    $(warning WARNING -- Toxic will be compiled without x11 support (needed for focus tracking and drag&drop support))
+    $(warning WARNING -- You need these libraries for x11 support)
+    $(warning WARNING -- $(MISSING_X11_LIBS))
+endif

cfg/desktop_notifications.mk

@@ -1,17 +0,0 @@
-# Variables for desktop notifications support
-DESK_NOTIFY_LIBS = libnotify
-DESK_NOTIFY_CFLAGS = -D_BOX_NOTIFY
-
-# Check if we can build desktop notifications support
-CHECK_DESK_NOTIFY_LIBS = $(shell pkg-config $(DESK_NOTIFY_LIBS) || echo -n "error")
-ifneq ($(CHECK_DESK_NOTIFY_LIBS), error)
-	LIBS += $(DESK_NOTIFY_LIBS)
-	CFLAGS += $(DESK_NOTIFY_CFLAGS)
-else
-ifneq ($(MAKECMDGOALS), clean)
-MISSING_DESK_NOTIFY_LIBS = $(shell for lib in $(DESK_NOTIFY_LIBS) ; do if ! pkg-config $$lib ; then echo $$lib ; fi ; done)
-$(warning WARNING -- Toxic will be compiled without desktop notifications support)
-$(warning WARNING -- You need these libraries for desktop notifications support)
-$(warning WARNING -- $(MISSING_DESK_NOTIFY_LIBS))
-endif
-endif

cfg/global_vars.mk

@@ -0,0 +1,33 @@
+# Version
+TOXIC_VERSION = 0.10.0
+REV = $(shell git rev-list HEAD --count 2>/dev/null || echo -n "error")
+ifneq (, $(findstring error, $(REV)))
+    VERSION = $(TOXIC_VERSION)
+else
+    VERSION = $(TOXIC_VERSION)_r$(REV)
+endif
+
+# Project directories
+BUILD_DIR = $(BASE_DIR)/build
+DOC_DIR = $(BASE_DIR)/doc
+SRC_DIR = $(BASE_DIR)/src
+SND_DIR = $(BASE_DIR)/sounds
+MISC_DIR = $(BASE_DIR)/misc
+
+# Project files
+MANFILES = toxic.1 toxic.conf.5
+DATAFILES = nameservers toxic.conf.example
+DESKFILE = toxic.desktop
+SNDFILES = ToxicContactOnline.wav ToxicContactOffline.wav ToxicError.wav
+SNDFILES += ToxicRecvMessage.wav ToxicOutgoingCall.wav ToxicIncomingCall.wav
+SNDFILES += ToxicTransferComplete.wav ToxicTransferStart.wav
+
+# Install directories
+PREFIX ?= /usr/local
+BINDIR = $(PREFIX)/bin
+DATADIR = $(PREFIX)/share/toxic
+MANDIR ?= $(PREFIX)/share/man
+APPDIR = $(PREFIX)/share/applications
+
+# Platform tools
+PKG_CONFIG = pkg-config

cfg/help.mk

@@ -1,19 +0,0 @@
-# Help target
-help:
-	@echo "-- Targets --"
-	@echo "  all:     Build toxic [DEFAULT]"
-	@echo "  toxic:   Build toxic"
-	@echo "  install: Build toxic and install it in PREFIX (default PREFIX is \"$(abspath $(PREFIX))\")"
-	@echo "  clean:   Remove built files"
-	@echo "  help:    This help"
-	@echo
-	@echo "-- Variables --"
-	@echo "  DISABLE_AV:             Set to \"1\" to force building without audio call support"
-	@echo "  DISABLE_SOUND_NOTIFY:   Set to \"1\" to force building without sound notification support"
-	@echo "  DISABLE_DESKTOP_NOTIFY: Set to \"1\" to force building without desktop notifications support"
-	@echo "  USER_CFLAGS:            Add custom flags to default CFLAGS"
-	@echo "  USER_LDFLAGS:           Add custom flags to default LDFLAGS"
-	@echo "  PREFIX:                 Specify a prefix directory for binaries, data files,... (default is \"$(abspath $(PREFIX))\")"
-	@echo "  DESTDIR:                Specify a directory where to store installed files (mainly for packaging purpose)"
-
-.PHONY: help

cfg/install.mk

@@ -1,37 +0,0 @@
-MISC_DIR = ../misc
-DOC_DIR = ../doc
-SND_DIR = ../sounds
-DATAFILES = DHTnodes toxic.conf.example
-MANFILES = toxic.1 toxic.conf.5
-SNDFILES = ContactLogsIn.wav ContactLogsOut.wav Error.wav IncomingCall.wav
-SNDFILES += LogIn.wav LogOut.wav NewMessage.wav OutgoingCall.wav
-SNDFILES += TransferComplete.wav TransferPending.wav
-
-install: toxic
-	mkdir -p $(abspath $(DESTDIR)/$(BINDIR))
-	mkdir -p $(abspath $(DESTDIR)/$(DATADIR))
-	mkdir -p $(abspath $(DESTDIR)/$(DATADIR))/sounds
-	mkdir -p $(abspath $(DESTDIR)/$(MANDIR))
-	@echo "Installing toxic executable"
-	@install -m 0755 toxic $(abspath $(DESTDIR)/$(BINDIR))
-	@echo "Installing data files"
-	@for f in $(DATAFILES) ; do \
-		install -m 0644 $(MISC_DIR)/$$f $(abspath $(DESTDIR)/$(DATADIR)) ;\
-		file=$(abspath $(DESTDIR)/$(DATADIR))/$$f ;\
-		sed -i'' -e 's:__DATADIR__:'$(abspath $(DATADIR))':g' $$file ;\
-	done
-	@for f in $(SNDFILES) ; do \
-		install -m 0644 $(SND_DIR)/$$f $(abspath $(DESTDIR)/$(DATADIR))/sounds ;\
-	done
-	@echo "Installing man pages"
-	@for f in $(MANFILES) ; do \
-		section=$(abspath $(DESTDIR)/$(MANDIR))/man`echo $$f | rev | cut -d "." -f 1` ;\
-		file=$$section/$$f ;\
-		mkdir -p $$section ;\
-		install -m 0644 $(DOC_DIR)/$$f $$file ;\
-		sed -i'' -e 's:__VERSION__:'$(VERSION)':g' $$file ;\
-		sed -i'' -e 's:__DATADIR__:'$(abspath $(DATADIR))':g' $$file ;\
-		gzip -f -9 $$file ;\
-	done
-
-.PHONY: install

cfg/sound_notifications.mk

@@ -1,23 +0,0 @@
-# Variables for sound notifications support
-SND_NOTIFY_LIBS = openal freealut
-SND_NOTIFY_CFLAGS = -D_SOUND_NOTIFY
-ifneq (, $(findstring device.o, $(OBJ)))
-	SND_NOTIFY_OBJ =
-else
-	SND_NOTIFY_OBJ = device.o
-endif
-
-# Check if we can build sound notifications support
-CHECK_SND_NOTIFY_LIBS = $(shell pkg-config $(SND_NOTIFY_LIBS) || echo -n "error")
-ifneq ($(CHECK_SND_NOTIFY_LIBS), error)
-	LIBS += $(SND_NOTIFY_LIBS)
-	CFLAGS += $(SND_NOTIFY_CFLAGS)
-	OBJ += $(SND_NOTIFY_OBJ)
-else
-ifneq ($(MAKECMDGOALS), clean)
-MISSING_SND_NOTIFY_LIBS = $(shell for lib in $(SND_NOTIFY_LIBS) ; do if ! pkg-config $$lib ; then echo $$lib ; fi ; done)
-$(warning WARNING -- Toxic will be compiled without sound notifications support)
-$(warning WARNING -- You need these libraries for sound notifications support)
-$(warning WARNING -- $(MISSING_SND_NOTIFY_LIBS))
-endif
-endif

cfg/systems/Darwin.mk

@@ -0,0 +1,18 @@
+# Special options for OS X
+# This assumes the use of Homebrew. Change the paths if using MacPorts or Fink.
+
+PKG_CONFIG_PATH = $(shell export PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/local/opt/libconfig/lib/pkgconfig:/usr/local/lib/pkgconfig:/opt/X11/lib/pkgconfig)
+
+LIBS := $(filter-out ncursesw, $(LIBS))
+
+# OS X ships a usable, recent version of ncurses, but calls it ncurses not ncursesw.
+LDFLAGS += -lncurses -lalut -ltoxcore -lcurl -lconfig -lqrencode -lpng -lopenal -g
+CFLAGS += -I/usr/local/opt/freealut/include/AL -I/usr/local/opt/glib/include/glib-2.0 -g
+
+OSX_LIBRARIES = -lobjc -lresolv
+OSX_FRAMEWORKS = -framework Foundation -framework CoreFoundation -framework AVFoundation \
+	-framework QuartzCore -framework CoreMedia
+OSX_VIDEO = osx_video.m
+
+LDFLAGS += $(OSX_LIBRARIES) $(OSX_FRAMEWORKS)
+OBJ += osx_video.o

cfg/systems/FreeBSD.mk

@@ -1,3 +0,0 @@
-# Specials options for freebsd systems
-LIBS := $(filter-out ncursesw, $(LIBS))
-LDFLAGS += -lncursesw

cfg/systems/Linux.mk

@@ -1,3 +0,0 @@
-# Specials options for linux systems
-CFLAGS +=
-LDFLAGS += -ldl -lresolv

cfg/targets/doc.mk

@@ -0,0 +1,10 @@
+# Doc target
+doc: $(MANFILES:%=$(DOC_DIR)/%)
+
+$(DOC_DIR)/%: $(DOC_DIR)/%.asc
+	@echo "  MAN   $(@F)"
+	@a2x -f manpage -a revdate=$(shell git log -1 --date=short --format="%ad" $<) \
+		-a manmanual="Toxic Manual" -a mansource=toxic \
+		-a manversion=__VERSION__ -a datadir=__DATADIR__ $<
+
+.PHONY: doc

cfg/targets/help.mk

@@ -0,0 +1,37 @@
+# Help target
+help:
+	@echo "-- Targets --"
+	@echo "  all:       Build toxic and documentation [DEFAULT]"
+	@echo "  toxic:     Build toxic"
+	@echo "  doc:       Build documentation"
+	@echo "  install:   Build toxic and install it in PREFIX (default PREFIX is \"$(abspath $(PREFIX))\")"
+	@echo "  uninstall: Remove toxic from PREFIX (default PREFIX is \"$(abspath $(PREFIX))\")"
+	@echo "  clean:     Remove built files"
+	@echo "  help:      This help"
+	@echo
+	@echo "-- Variables --"
+	@echo "  DISABLE_X11:            Set to \"1\" to force building without X11 support"
+	@echo "  DISABLE_AV:             Set to \"1\" to force building without audio call support"
+	@echo "  DISABLE_SOUND_NOTIFY:   Set to \"1\" to force building without sound notification support"
+	@echo "  DISABLE_DESKTOP_NOTIFY: Set to \"1\" to force building without desktop notifications support"
+	@echo "  DISABLE_QRCODE:         Set to \"1\" to force building without QR export support"
+	@echo "  DISABLE_QRPNG:          Set to \"1\" to force building without QR exported as PNG support"
+	@echo "  ENABLE_PYTHON:          Set to \"1\" to enable building with Python scripting support"
+	@echo "  ENABLE_RELEASE:         Set to \"1\" to build without debug symbols and with full compiler optimizations"
+	@echo "  ENABLE_ASAN:            Set to \"1\" to build with LLVM address sanitizer enabled.
+	@echo "  USER_CFLAGS:            Add custom flags to default CFLAGS"
+	@echo "  USER_LDFLAGS:           Add custom flags to default LDFLAGS"
+	@echo "  PREFIX:                 Specify a prefix directory for binaries, data files,... (default is \"$(abspath $(PREFIX))\")"
+	@echo "  DESTDIR:                Specify a directory where to store installed files (mainly for packaging purpose)"
+	@echo "  MANDIR:                 Specify a directory where to store man pages (default is \"$(abspath $(PREFIX)/share/man)\")"
+	@echo
+	@echo "-- Environment Variables --"
+	@echo "  CFLAGS:                 Add custom flags to default CFLAGS"
+	@echo "  LDFLAGS:                Add custom flags to default LDFLAGS"
+	@echo "  USER_CFLAGS:            Add custom flags to default CFLAGS"
+	@echo "  USER_LDFLAGS:           Add custom flags to default LDFLAGS"
+	@echo "  PREFIX:                 Specify a prefix directory for binaries, data files,... (default is \"$(abspath $(PREFIX))\")"
+	@echo "  DESTDIR:                Specify a directory where to store installed files (mainly for packaging purpose)"
+	@echo "  MANDIR:                 Specify a directory where to store man pages (default is \"$(abspath $(PREFIX)/share/man)\")"
+
+.PHONY: help

cfg/targets/install.mk

@@ -0,0 +1,41 @@
+# Install target
+install: $(BUILD_DIR)/toxic
+	@echo "Installing toxic executable"
+	@mkdir -p $(abspath $(DESTDIR)/$(BINDIR))
+	@install -m 0755 $(BUILD_DIR)/toxic $(abspath $(DESTDIR)/$(BINDIR)/toxic)
+	
+	@echo "Installing desktop file"
+	@mkdir -p $(abspath $(DESTDIR)/$(APPDIR))
+	@install -m 0644 $(MISC_DIR)/$(DESKFILE) $(abspath $(DESTDIR)/$(APPDIR)/$(DESKFILE))
+	
+	@echo "Installing data files"
+	@mkdir -p $(abspath $(DESTDIR)/$(DATADIR))
+	@for f in $(DATAFILES) ; do \
+		install -m 0644 $(MISC_DIR)/$$f $(abspath $(DESTDIR)/$(DATADIR)/$$f) ;\
+		file=$(abspath $(DESTDIR)/$(DATADIR)/$$f) ;\
+		sed -e 's:__DATADIR__:'$(abspath $(DATADIR))':g' $$file > temp_file && \
+		mv temp_file $$file ;\
+	done
+	@mkdir -p $(abspath $(DESTDIR)/$(DATADIR))/sounds
+	@for f in $(SNDFILES) ; do \
+		install -m 0644 $(SND_DIR)/$$f $(abspath $(DESTDIR)/$(DATADIR)/sounds/$$f) ;\
+	done
+	
+	@echo "Installing man pages"
+	@mkdir -p $(abspath $(DESTDIR)/$(MANDIR))
+	@for f in $(MANFILES) ; do \
+		if [ ! -e "$(DOC_DIR)/$$f" ]; then \
+			continue ;\
+		fi ;\
+		section=$(abspath $(DESTDIR)/$(MANDIR))/man`echo $${f##*.}` ;\
+		file=$$section/$$f ;\
+		mkdir -p $$section ;\
+		install -m 0644 $(DOC_DIR)/$$f $$file ;\
+		sed -e 's:__VERSION__:'$(VERSION)':g' $$file > temp_file && \
+		mv temp_file $$file ;\
+		sed -e 's:__DATADIR__:'$(abspath $(DATADIR))':g' $$file > temp_file && \
+		mv temp_file $$file ;\
+		gzip -f -n -9 $$file ;\
+	done
+
+.PHONY: install

cfg/targets/uninstall.mk

@@ -0,0 +1,24 @@
+# Uninstall target
+uninstall:
+	@echo "Removing toxic executable"
+	@rm -f $(abspath $(DESTDIR)/$(BINDIR)/toxic)
+	
+	@echo "Removing desktop file"
+	@rm -f $(abspath $(DESTDIR)/$(APPDIR)/$(DESKFILE))
+	
+	@echo "Removing data files"
+	@for f in $(DATAFILES) ; do \
+		rm -f $(abspath $(DESTDIR)/$(DATADIR)/$$f) ;\
+	done
+	@for f in $(SNDFILES) ; do \
+		rm -f $(abspath $(DESTDIR)/$(DATADIR)/sounds/$$f) ;\
+	done
+	
+	@echo "Removing man pages"
+	@for f in $(MANFILES) ; do \
+		section=$(abspath $(DESTDIR)/$(MANDIR))/man`echo $${f##*.}` ;\
+		file=$$section/$$f ;\
+		rm -f $$file $$file.gz ;\
+	done
+
+.PHONY: uninstall

doc/toxic.1

@@ -1,63 +1,169 @@
-.TH TOXIC 1 "June 2014" "Toxic v__VERSION__" "User Manual"
-.SH NAME
-Toxic \- CLI client for Tox
-.SH SYNOPSYS
-.B toxic [\-f
-.I data\-file
-.B ] [\-x] [\-4] [\-c
-.I config\-file
-.B ] [\-n
-.I nodes\-file
-.B ] [\-h]
-.SH DESCRIPTION
-Toxic is an ncurses-based instant messaging client for Tox which formerly
-resided in the Tox core repository, and is now available as a standalone
-application.
-.SH OPTIONS
-.IP "\-f, \-\-file data\-file"
-Use specified
-.I data\-file
-instead of
-.IR ~/.config/tox/data
-.IP "\-x, \-\-nodata"
-Ignore data file
-.IP "\-4, \-\-ipv4"
+'\" t
+.\"     Title: toxic
+.\"    Author: [see the "AUTHORS" section]
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
+.\"      Date: 2020-05-04
+.\"    Manual: Toxic Manual
+.\"    Source: toxic __VERSION__
+.\"  Language: English
+.\"
+.TH "TOXIC" "1" "2020\-05\-04" "toxic __VERSION__" "Toxic Manual"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+toxic \- CLI client for Tox
+.SH "SYNOPSIS"
+.sp
+\fBtoxic\fR [\-f \fIdata\-file\fR] [\-x] [\-4] [\-c \fIconfig\-file\fR] [\-n \fInodes\-file\fR] [\-h]
+.SH "DESCRIPTION"
+.sp
+toxic is an ncurses\-based instant messaging client for Tox which formerly resided in the Tox core repository, and is now available as a standalone application\&.
+.SH "OPTIONS"
+.PP
+\-4, \-\-ipv4
+.RS 4
 Force IPv4 connection
-.IP "\-d, \-\-default_locale
-Use default locale
-.IP "\-c, \-\-config config\-file"
+.RE
+.PP
+\-b, \-\-debug
+.RS 4
+Enable stderr for debugging\&. Redirect output to avoid breaking the curses interface and better capture messages\&.
+.RE
+.PP
+\-c, \-\-config config\-file
+.RS 4
 Use specified
-.I config\-file
+\fIconfig\-file\fR
 instead of
-.IR ~/.config/tox/toxic.conf
-.IP "\-n, \-\-nodes nodes\-file"
+\fI~/\&.config/tox/toxic\&.conf\fR
+.RE
+.PP
+\-d, \-\-default\-locale
+.RS 4
+Use default locale
+.RE
+.PP
+\-e, \-\-encrypt\-data
+.RS 4
+Encrypt an unencrypted data file\&. An error will occur if this option is used with an encrypted data file\&.
+.RE
+.PP
+\-f, \-\-file data\-file
+.RS 4
 Use specified
-.I nodes\-file
-for DHT bootstrap nodes, instead of
-.IR __DATADIR__/DHTnodes
-.IP "\-h, \-\-help"
+\fIdata\-file\fR
+instead of
+\fI~/\&.config/tox/toxic_profile\&.tox\fR
+.RE
+.PP
+\-h, \-\-help
+.RS 4
 Show help message
-.SH FILES
-.IP __DATADIR__/DHTnodes
-Default list of DHT bootstrap nodes.
-.IP ~/.config/tox/data
-Savestate which contains your personal info (nickname, Tox ID,...) and
-your contacts list.
-.IP ~/.config/tox/toxic.conf
-Configuration file. See
-.BR toxic.conf (5)
-for more details.
-.IP __DATADIR__/toxic.conf.example
-Configuration example.
-.SH BUGS
-Unicode characters with a width larger than 1 column may cause 
-strange behaviour. Expect more bugs and bad
-behaviour: this software is in a pre\-alpha stage.
-.SH AUTHORS
-JFreegman <JFreegman@gmail.com>
-.SH SEE ALSO
-.BR toxic.conf (5)
-.SH LINKS
-Project page on github: https://github.com/Tox/toxic
-.br
-IRC channel on Freenode: chat.freenode.net#tox
+.RE
+.PP
+\-l, \-\-logging
+.RS 4
+Enable toxcore logging to stderr
+.RE
+.PP
+\-n, \-\-nodes nodes\-file
+.RS 4
+Use specified
+\fInodes\-file\fR
+for DHT bootstrap nodes instead of
+\fI~/\&.config/tox/DHTnodes\&.json\fR
+.RE
+.PP
+\-o, \-\-noconnect
+.RS 4
+Do not connect to the DHT network
+.RE
+.PP
+\-p, \-\-SOCKS5\-proxy
+.RS 4
+Use a SOCKS5 proxy: Requires [IP] [port]
+.RE
+.PP
+\-P, \-\-HTTP\-proxy
+.RS 4
+Use a HTTP proxy: Requires [IP] [port]
+.RE
+.PP
+\-r, \-\-namelist
+.RS 4
+Use specified nameservers list
+.RE
+.PP
+\-t, \-\-force\-tcp
+.RS 4
+Force TCP connection (use this with proxies)
+.RE
+.PP
+\-T, \-\-tcp\-relay
+.RS 4
+Act as a TCP relay server for the network (Note: this uses significantly more bandwidth)
+.RE
+.PP
+\-u, \-\-unencrypt\-data
+.RS 4
+Unencrypt a data file\&. A warning will appear if this option is used with a data file that is already unencrypted\&.
+.RE
+.SH "FILES"
+.PP
+~/\&.config/tox/DHTnodes\&.json
+.RS 4
+Default location for list of DHT bootstrap nodes (list obtained from
+https://nodes\&.tox\&.chat)\&. This list is automatically updated\&. See
+\fBtoxic\&.conf\fR(5) for details on controlling the update frequency\&.
+.RE
+.PP
+~/\&.config/tox/toxic_profile\&.tox
+.RS 4
+Savestate which contains your personal info (nickname, Tox ID, contacts, etc)
+.RE
+.PP
+~/\&.config/tox/toxic\&.conf
+.RS 4
+Configuration file\&. See
+\fBtoxic\&.conf\fR(5) for more details\&.
+.RE
+.PP
+__DATADIR__/toxic\&.conf\&.example
+.RS 4
+Configuration example\&.
+.RE
+.SH "BUGS"
+.sp
+\-Unicode characters with a width larger than 1 column may cause strange behaviour\&.
+.sp
+\-Text occasionally fails to auto\-scroll to the bottom\&.
+.sp
+\-Screen flickering sometimes occurs on certain terminals\&.
+.SH "AUTHORS"
+.sp
+JFreegman <JFreegman@gmail\&.com>
+.SH "SEE ALSO"
+.sp
+\fBtoxic\&.conf\fR(5)
+.SH "LINKS"
+.sp
+Project page: https://github\&.com/JFreegman/toxic
+.sp
+IRC channel: chat\&.freenode\&.net#tox

doc/toxic.1.asc

@@ -0,0 +1,108 @@
+toxic(1)
+========
+
+NAME
+----
+toxic - CLI client for Tox
+
+SYNOPSIS
+--------
+*toxic* [-f 'data-file'] [-x] [-4] [-c 'config-file'] [-n 'nodes-file'] [-h]
+
+DESCRIPTION
+-----------
+toxic is an ncurses-based instant messaging client for Tox which formerly
+resided in the Tox core repository, and is now available as a standalone
+application.
+
+OPTIONS
+-------
+-4, --ipv4::
+    Force IPv4 connection
+
+-b, --debug::
+    Enable stderr for debugging. Redirect output to
+    avoid breaking the curses interface and better capture messages.
+
+-c, --config config-file::
+    Use specified 'config-file' instead of '~/.config/tox/toxic.conf'
+
+-d, --default-locale::
+    Use default locale
+
+-e, --encrypt-data::
+    Encrypt an unencrypted data file. An error will occur if this option
+    is used with an encrypted data file.
+
+-f, --file data-file::
+    Use specified 'data-file' instead of '~/.config/tox/toxic_profile.tox'
+
+-h, --help::
+    Show help message
+
+-l, --logging::
+    Enable toxcore logging to stderr
+
+-n, --nodes nodes-file::
+    Use specified 'nodes-file' for DHT bootstrap nodes instead of '~/.config/tox/DHTnodes.json'
+
+-o, --noconnect::
+    Do not connect to the DHT network
+
+-p, --SOCKS5-proxy::
+    Use a SOCKS5 proxy: Requires [IP] [port]
+
+-P, --HTTP-proxy::
+    Use a HTTP proxy: Requires [IP] [port]
+
+-r, --namelist::
+    Use specified nameservers list
+
+-t, --force-tcp::
+    Force TCP connection (use this with proxies)
+
+-T, --tcp-relay::
+    Act as a TCP relay server for the network (Note: this uses significantly more bandwidth)
+
+-u, --unencrypt-data::
+    Unencrypt a data file. A warning will appear if this option is used
+    with a data file that is already unencrypted.
+
+FILES
+-----
+~/.config/tox/DHTnodes.json::
+    Default location for list of DHT bootstrap nodes (list obtained from https://nodes.tox.chat).
+    This list is automatically updated. See *toxic.conf*(5) for details on controlling the update frequency.
+
+~/.config/tox/toxic_profile.tox::
+    Savestate which contains your personal info (nickname, Tox ID, contacts,
+    etc)
+
+~/.config/tox/toxic.conf::
+    Configuration file. See *toxic.conf*(5) for more details.
+
+{datadir}/toxic.conf.example::
+    Configuration example.
+
+BUGS
+----
+-Unicode characters with a width larger than 1 column may cause strange
+behaviour.
+
+-Text occasionally fails to auto-scroll to the bottom.
+
+-Screen flickering sometimes occurs on certain terminals.
+
+AUTHORS
+-------
+JFreegman <JFreegman@gmail.com>
+
+SEE ALSO
+--------
+*toxic.conf*(5)
+
+LINKS
+-----
+Project page: <https://github.com/JFreegman/toxic>
+
+IRC channel: chat.freenode.net#tox

doc/toxic.conf.5

@@ -1,413 +1,420 @@
-.TH TOXIC.CONF 5 "June 2014" "Toxic v__VERSION__" "User Manual"
-.SH NAME
-toxic.conf \- Configuration file for toxic(1)
-.SH DESCRIPTION
-The
-.I toxic.conf
-file is the main configuration file for
-.BR toxic (1)
-client.
-.SH SYNTAX
-.I <SECTION>
-.B = {
-.PP
-.IB <KEY1> = <VALUE1> ;
-.br
-.IB <KEY2> = <VALUE2> ;
-.br
- ...
-.PP
-.B };
-.PP
-Uses syntax accepted by libconfig.
-.br
-Lines starting with "//" are comments and will be ignored.
-.PP
-Sections:
-.PP
-.B ui
-.RS
-Configurations related to user interface elements.
-.PP
-Keys:
-.br
-.B timestamps
-.RS
-Enable or disable timestamps.
-.br
-Values: 'true' to enable, 'false' to disable
-.RE
-.PP
-.B alerts
-.RS
-Enable or disable terminal alerts on events.
-.br
-Values: 'true' to enable, 'false' to disable
-.RE
-.PP
-.B native_colors
-.RS
-Select between native terminal colors and toxic color theme.
-.br
-Values: 'true' for terminal colours, 'false' for toxic colours
-.RE
-.PP
-.B autolog
-.RS
-Enable or disable autologging.
-.br
-Values: 'true' to enable, 'false' to disable
-.RE
-.PP
-.B time_format
-.RS
-Select between 24 and 12 hour time.
-.br
-Values: 24, 12
-.RE
-.PP
-.B show_typing_other
-.RS
-Show you when others are typing in a 1-on-1 chat
-.br
-Values: 'true' to enable, 'false' to disable
-.RE
-.PP
-.B show_typing_self
-.RS
-Show others when you're typing in a 1-on-1 chat
-.br
-Values: 'true' to enable, 'false' to disable
-.RE
-.PP
-.B history_size
-.RS
-Maximum lines for chat window history.
-.br
-Values: <INTEGER> (for example: 700)
-.RE
-.RE
-.PP
-.B audio
-.RS
-Configurations related to audio devices.
-.PP
-Keys:
-.br
-.B input_device
-.RS
-Audio input device.
-.br
-Values: <INTEGER> (number correspond to "/lsdev in")
-.RE
-.PP
-.B output_device
-.RS
-Audio output device.
-.br
-Values: <INTEGER> (number correspond to "/lsdev out")
-.RE
-.PP
-.B VAD_treshold
-.RS
-Voice Activity Detection treshold.
-.br
-Values: <FLOAT> (recommended values are around 40.0)
-.RE
-.RE
-.PP
-.B tox
-.RS
-Configurations related to file transfer.
-.PP
-Keys:
-.br
-.B download_path
-.RS
-Default path for downloads.
-.br
-Values: <STRING> (absolute path where to store downloaded files)
-.RE
-.RE
-.PP
-.B sounds
-.RS
-Configurations related to notification sounds.
-.br
-(Special value "silent" can be used to disable a specific notification)
-.PP
-Keys:
-.br
-.B error
-.RS
-Sound to play when an error occurs.
-.br
-Values: <STRING> (sound file absolute path)
-.RE
-.PP
-.B self_log_in
-.RS
-Sound to play when you log in.
-.br
-Values: <STRING> (sound file absolute path)
-.RE
-.PP
-.B self_log_out
-.RS
-Sound to play when you log out.
-.br
-Values: <STRING> (sound file absolute path)
-.RE
-.PP
-.B user_log_in
-.RS
-Sound to play when a contact become online.
-.br
-Values: <STRING> (sound file absolute path)
-.RE
-.PP
-.B user_log_out
-.RS
-Sound to play when a contact become offline.
-.br
-Values: <STRING> (sound file absolute path)
-.RE
-.PP
-.B call_incoming
-.RS
-Sound to play when you receive an incoming call.
-.br
-Values: <STRING> (sound file absolute path)
-.RE
-.PP
-.B call_outgoing
-.RS
-Sound to play when you start a call.
-.br
-Values: <STRING> (sound file absolute path)
-.RE
-.PP
-.B generic_message
-.RS
-Sound to play when an event occurs.
-.br
-Values: <STRING> (sound file absolute path)
-.RE
-.PP
-.B transfer_pending
-.RS
-Sound to play when you receive a file transfer request.
-.br
-Values: <STRING> (sound file absolute path)
-.RE
-.PP
-.B transfer_completed
-.RS
-Sound to play when a file transfer is completed.
-.br
-Values: <STRING> (sound file absolute path)
-.RE
-.RE
-.PP
-.B keys
-.RS
-Configurations related to user interface interaction.
-.br
-(Currently supported: Ctrl modified keys, Tab, PAGEUP and PAGEDOWN (case insensitive))
-.PP
-Keys:
-.br
-.B next_tab
-.RS
-Key combination to switch next tab.
-.br
-Values: <STRING> (key combination)
-.RE
-.PP
-.B prev_tab
-.RS
-Key combination to switch previous tab.
-.br
-Values: <STRING> (key combination)
-.RE
-.PP
-.B scroll_line_up
-.RS
-Key combination to scroll one line up.
-.br
-Values: <STRING> (key combination)
-.RE
-.PP
-.B scroll_line_down
-.RS
-Key combination to scroll one line down.
-.br
-Values: <STRING> (key combination)
-.RE
-.PP
-.B half_page_up
-.RS
-Key combination to scroll half page up.
-.br
-Values: <STRING> (key combination)
-.RE
-.PP
-.B half_page_down
-.RS
-Key combination to scroll half page down.
-.br
-Values: <STRING> (key combination)
-.RE
-.PP
-.B page_bottom
-.RS
-Key combination to scroll to page bottom.
-.br
-Values: <STRING> (key combination)
-.RE
-.PP
-.B peer_list_up
-.RS
-Key combination to scroll contacts list up.
-.br
-Values: <STRING> (key combination)
-.RE
-.PP
-.B peer_list_down
-.RS
-Key combination to scroll contacts list down.
-.br
-Values: <STRING> (key combination)
-.RE
-.RE
-.SH EXAMPLES
-Default settings from __DATADIR__/toxic.conf.exmaple:
-.PP
-// SAMPLE TOXIC CONFIGURATION
-.br
-// USES LIBCONFIG-ACCEPTED SYNTAX
-.br
+'\" t
+.\"     Title: toxic.conf
+.\"    Author: [see the "AUTHORS" section]
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
+.\"      Date: 2020-11-18
+.\"    Manual: Toxic Manual
+.\"    Source: toxic __VERSION__
+.\"  Language: English
+.\"
+.TH "TOXIC\&.CONF" "5" "2020\-11\-18" "toxic __VERSION__" "Toxic Manual"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+toxic.conf \- Configuration file for toxic
+.SH "SYNOPSIS"
+.sp
+~/\&.config/tox/toxic\&.conf
+.SH "DESCRIPTION"
+.sp
+The \fItoxic\&.conf\fR file is the main configuration file for \fBtoxic\fR(1) client\&. It uses syntax accepted by \fBlibconfig\fR\&. Lines starting with "//" are comments and will be ignored\&.
+.SH "EXAMPLE"
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+// Configuration for interface
 ui = {
-.RS
-  // true to enable timestamps, false to disable
-.br
     timestamps = true;
-.br
-  // true to enable terminal alerts on messages, false to disable
-.br
-  alerts=true;
-.br
-  // true to use native terminal colours, false to use toxic default colour theme
-.br
-  native_colors=false;
-.br
-  // true to enable autologging, false to disable
-.br
-  autolog=false;
-.br
-  // 24 or 12 hour time
-.br
-  time_format=24;
-.br
-  // true to show you when others are typing a message in 1-on-1 chats
-.br
-  show_typing_other=true;
-.br
-  // true to show others when you're typing a message in 1-on-1 chats
-.br
-  show_typing_self=true;
-.br
-  // maximum lines for chat window history
-.br
-  history_size=700;
-.RE
+    alerts = false;
 };
-.PP
+
+// Configuration for audio
 audio = {
-.RS
-  // preferred audio input device; numbers correspond to /lsdev in
-.br
-  input_device=2;
-.br
-  // preferred audio output device; numbers correspond to /lsdev out
-.br
-  output_device=0;
-.br
-  // default VAD treshold; float (recommended values are around 40)
-.br
-  VAD_treshold=40.0;
-.RE
+    input_device = 1;
 };
+.fi
+.if n \{\
+.RE
+.\}
+.SH "OPTIONS"
 .PP
-tox = {
-.RS
-  // where to store received files
-.br
-  //download_path="/home/USERNAME/Downloads/";
-.RE
-};
+\fBui\fR
+.RS 4
+Configuration related to interface elements\&.
 .PP
-// To disable a sound set the path to "silent"
-.br
-sounds = {
-.RS
-  error="__DATADIR__/sounds/Error.wav";
-.br
-  self_log_in="__DATADIR__/sounds/LogIn.wav";
-.br
-  self_log_out="__DATADIR__/sounds/LogOut.wav";
-.br
-  user_log_in="__DATADIR__/sounds/ContactLogsIn.wav";
-.br
-  user_log_out="__DATADIR__/sounds/ContactLogsOut.wav";
-.br
-  call_incoming="__DATADIR__/sounds/IncomingCall.wav";
-.br
-  call_outgoing="__DATADIR__/sounds/OutgoingCall.wav";
-.br
-  generic_message="__DATADIR__/sounds/NewMessage.wav";
-.br
-  transfer_pending="__DATADIR__/sounds/TransferPending.wav";
-.br
-  transfer_completed="__DATADIR__/sounds/TransferComplete.wav";
+\fBtimestamps\fR
+.RS 4
+Enable or disable timestamps\&. true or false
 .RE
-};
 .PP
-// Currently supported: Ctrl modified keys, Tab, PAGEUP and PAGEDOWN (case insensitive)
-.br
-// Note: All printable keys register as input
-.br
-keys = {
-.RS
-  next_tab="Ctrl+P";
-.br
-  prev_tab="Ctrl+O";
-.br
-  scroll_line_up="PAGEUP";
-.br
-  scroll_line_down="PAGEDOWN";
-.br
-  half_page_up="Ctrl+F";
-.br
-  half_page_down="Ctrl+V";
-.br
-  page_bottom="Ctrl+H";
-.br
-  peer_list_up="Ctrl+[";
-.br
-  peer_list_down="Ctrl+]";
+\fBtime_format\fR
+.RS 4
+Select between 24 and 12 hour time\&. Specify 24 or 12\&. Setting timestamp_format and log_timestamp_format will override this setting\&.
 .RE
-};
-.SH FILES
-.IP ~/.config/tox/toxic.conf
-Main configuration file.
-.IP __DATADIR__/toxic.conf.example
-Configuration example.
-.SH AUTHORS
-JFreegman <JFreegman@gmail.com>
-.SH SEE ALSO
-.BR toxic (1)
-.SH LINKS
-Project page on github: https://github.com/Tox/toxic
-.br
-IRC channel on Freenode: chat.freenode.net#tox
+.PP
+\fBtimestamp_format\fR
+.RS 4
+Time format string for the interface enclosed by double quotes\&. See
+\fBdate\fR(1)
+.RE
+.PP
+\fBlog_timestamp_format\fR
+.RS 4
+Time format string for logging enclosed by double quotes\&. See
+\fBdate\fR(1)
+.RE
+.PP
+\fBalerts\fR
+.RS 4
+Enable or disable acoustic alerts on events\&. true or false
+.RE
+.PP
+\fBnative_colors\fR
+.RS 4
+Select between native terminal colors and toxic color theme\&. true or false
+.RE
+.PP
+\fBcolor_bar_bg\fR
+.RS 4
+set background color of chat status bars\&. (black, white, red, green, blue, cyan, yellow, magenta)
+.RE
+.PP
+\fBcolor_bar_fg\fR
+.RS 4
+set foreground (text) color of chat status bars\&. (black, white, red, green, blue, cyan, yellow, magenta)
+.RE
+.PP
+\fBcolor_bar_accent\fR
+.RS 4
+set foreground accent color of chat status bars\&. (black, white, red, green, blue, cyan, yellow, magenta)
+.RE
+.PP
+\fBcolor_bar_notify\fR
+.RS 4
+set foreground notify (and typing) color in chat status bar\&. (black, white, red, green, blue, cyan, yellow, magenta)
+.RE
+.PP
+\fBautolog\fR
+.RS 4
+Enable or disable autologging\&. true or false
+.RE
+.PP
+\fBshow_typing_other\fR
+.RS 4
+Show when others are typing in a 1\-on\-1 chat\&. true or false
+.RE
+.PP
+\fBshow_typing_self\fR
+.RS 4
+Show others when you\(cqre typing in a 1\-on\-1 chat\&. true or false
+.RE
+.PP
+\fBshow_welcome_msg\fR
+.RS 4
+Show welcome message on startup\&. true or false
+.RE
+.PP
+\fBshow_connection_msg\fR
+.RS 4
+Enable friend connection change notifications\&. true or false
+.RE
+.PP
+\fBnodelist_update_freq\fR
+.RS 4
+How often in days to update the DHT nodes list\&. (integer; 0 to disable)
+.RE
+.PP
+\fBautosave_freq\fR
+.RS 4
+How often in seconds to auto\-save the Tox data file\&. (integer; 0 to disable)
+.RE
+.PP
+\fBhistory_size\fR
+.RS 4
+Maximum lines for chat window history\&. Integer value\&. (for example: 700)
+.RE
+.PP
+\fBnotification_timeout\fR
+.RS 4
+Time in milliseconds to display a notification\&. Integer value\&. (for example: 3000)
+.RE
+.PP
+\fBline_join\fR
+.RS 4
+Indicator for when someone connects or joins a group\&. Three characters max for line_ settings\&.
+.RE
+.PP
+\fBline_quit\fR
+.RS 4
+Indicator for when someone disconnects or leaves a group\&.
+.RE
+.PP
+\fBline_alert\fR
+.RS 4
+Indicator for alert messages\&.
+.RE
+.PP
+\fBline_normal\fR
+.RS 4
+Indicator for normal messages\&.
+.RE
+.PP
+\fBmplex_away\fR
+.RS 4
+Set user status when attaching and detaching from GNU screen or tmux\&. true or false
+.RE
+.PP
+\fBmplex_away_note\fR
+.RS 4
+Status message to set when status is set to away due to screen/tmux detach\&. When attaching, the status message is set back to the original value\&.
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+The following options control whether to output a terminal bell on certain events\&.
+Some terminals mark the window as urgent when a bell is received\&. Urgent windows are usually highlighted in the taskbar and some window managers even provide shortcuts to jump to the next urgent window\&.
+These options don\*(Aqt affect the "alerts" option\&.
+.fi
+.if n \{\
+.RE
+.\}
+.RE
+.PP
+\fBbell_on_message\fR
+.RS 4
+Enable/Disable the terminal bell when receiving a message\&. true or false
+.RE
+.PP
+\fBbell_on_filetrans\fR
+.RS 4
+Enable/Disable the terminal bell when receiving a filetransfer\&. true or false
+.RE
+.PP
+\fBbell_on_filetrans_accept\fR
+.RS 4
+Enable/Disable the terminal bell when a filetransfer was accepted\&. true or false
+.RE
+.PP
+\fBbell_on_invite\fR
+.RS 4
+Enable/Disable the terminal bell when receiving a group/call invite\&. true or false
+.RE
+.RE
+.PP
+\fBaudio\fR
+.RS 4
+Configuration related to audio devices\&.
+.PP
+\fBinput_device\fR
+.RS 4
+Audio input device\&. Integer value\&. Number corresponds to
+/lsdev in
+.RE
+.PP
+\fBoutput_device\fR
+.RS 4
+Audio output device\&. Integer value\&. Number corresponds to
+/lsdev out
+.RE
+.PP
+\fBVAD_threshold\fR
+.RS 4
+Voice Activity Detection threshold\&. Float value\&. Recommended values are 1\&.0\-40\&.0
+.RE
+.PP
+\fBconference_audio_channels\fR
+.RS 4
+Number of channels for conference audio broadcast\&. Integer value\&. 1 (mono) or 2 (stereo)
+.RE
+.PP
+\fBchat_audio_channels\fR
+.RS 4
+Number of channels for 1\-on\-1 audio broadcast\&. Integer value\&. 1 (mono) or 2 (stereo)
+.RE
+.PP
+\fBpush_to_talk\fR
+.RS 4
+Enable/Disable Push\-To\-Talk for conference audio chats (active key is F2)\&. true or false
+.RE
+.RE
+.PP
+\fBtox\fR
+.RS 4
+Configuration related to paths\&.
+.PP
+\fBdownload_path\fR
+.RS 4
+Default path for downloads\&. String value\&. Absolute path for downloaded files\&.
+.RE
+.PP
+\fBavatar_path\fR
+.RS 4
+Path for your avatar (file must be a \&.png and cannot exceed 16\&.3 KiB)
+.RE
+.PP
+\fBautorun_path\fR
+.RS 4
+Path for any scripts that should be run on startup
+.RE
+.PP
+\fBchatlogs_path\fR
+.RS 4
+Default path for chatlogs\&. String value\&. Absolute path for chatlog files\&.
+.RE
+.PP
+\fBpassword_eval\fR
+.RS 4
+Replace password prompt by running this command and using its output as the password\&.
+.RE
+.RE
+.PP
+\fBsounds\fR
+.RS 4
+Configuration related to notification sounds\&. Special value "silent" can be used to disable a specific notification\&.
+
+Each value is a string which corresponds to the absolute path of a wav sound file\&.
+.PP
+\fBnotif_error\fR
+.RS 4
+Sound to play when an error occurs\&.
+.RE
+.PP
+\fBself_log_in\fR
+.RS 4
+Sound to play when you log in\&.
+.RE
+.PP
+\fBself_log_out\fR
+.RS 4
+Sound to play when you log out\&.
+.RE
+.PP
+\fBuser_log_in\fR
+.RS 4
+Sound to play when a contact become online\&.
+.RE
+.PP
+\fBuser_log_out\fR
+.RS 4
+Sound to play when a contact become offline\&.
+.RE
+.PP
+\fBcall_incoming\fR
+.RS 4
+Sound to play when you receive an incoming call\&.
+.RE
+.PP
+\fBcall_outgoing\fR
+.RS 4
+Sound to play when you start a call\&.
+.RE
+.PP
+\fBgeneric_message\fR
+.RS 4
+Sound to play when an event occurs\&.
+.RE
+.PP
+\fBtransfer_pending\fR
+.RS 4
+Sound to play when you receive a file transfer request\&.
+.RE
+.PP
+\fBtransfer_completed\fR
+.RS 4
+Sound to play when a file transfer is completed\&.
+.RE
+.RE
+.PP
+\fBkeys\fR
+.RS 4
+Configuration related to user interface interaction\&. Currently supported: Ctrl modified keys, Tab, PAGEUP and PAGEDOWN\&.
+
+Each value is a string which corresponds to a key combination\&.
+.PP
+\fBnext_tab\fR
+.RS 4
+Key combination to switch next tab\&.
+.RE
+.PP
+\fBprev_tab\fR
+.RS 4
+Key combination to switch previous tab\&.
+.RE
+.PP
+\fBscroll_line_up\fR
+.RS 4
+Key combination to scroll one line up\&.
+.RE
+.PP
+\fBscroll_line_down\fR
+.RS 4
+Key combination to scroll one line down\&.
+.RE
+.PP
+\fBhalf_page_up\fR
+.RS 4
+Key combination to scroll half page up\&.
+.RE
+.PP
+\fBhalf_page_down\fR
+.RS 4
+Key combination to scroll half page down\&.
+.RE
+.PP
+\fBpage_bottom\fR
+.RS 4
+Key combination to scroll to page bottom\&.
+.RE
+.PP
+\fBtoggle_peerlist\fR
+.RS 4
+Toggle the peer list on and off\&.
+.RE
+.PP
+\fBtoggle_paste_mode\fR
+.RS 4
+Toggle treating linebreaks as enter key press\&.
+.RE
+.RE
+.SH "FILES"
+.PP
+~/\&.config/tox/toxic\&.conf
+.RS 4
+Main configuration file\&.
+.RE
+.PP
+__DATADIR__/toxic\&.conf\&.example
+.RS 4
+Configuration example\&.
+.RE
+.SH "SEE ALSO"
+.sp
+\fBtoxic\fR(1)
+.SH "RESOURCES"
+.sp
+Project page: https://github\&.com/JFreegman/toxic
+.sp
+IRC channel: chat\&.freenode\&.net#tox
+.SH "AUTHORS"
+.sp
+JFreegman <JFreegman@gmail\&.com>

doc/toxic.conf.5.asc

@@ -0,0 +1,275 @@
+toxic.conf(5)
+=============
+
+NAME
+----
+toxic.conf - Configuration file for toxic
+
+
+SYNOPSIS
+--------
+~/.config/tox/toxic.conf
+
+
+DESCRIPTION
+-----------
+The 'toxic.conf' file is the main configuration file for *toxic*(1) client.
+It uses syntax accepted by *libconfig*.
+Lines starting with "//" are comments and will be ignored.
+
+
+EXAMPLE
+-------
+----
+// Configuration for interface
+ui = {
+    timestamps = true;
+    alerts = false;
+};
+
+// Configuration for audio
+audio = {
+    input_device = 1;
+};
+----
+
+
+OPTIONS
+-------
+*ui*::
+    Configuration related to interface elements.
+
+    *timestamps*;;
+        Enable or disable timestamps. true or false
+
+    *time_format*;;
+	Select between 24 and 12 hour time. Specify 24 or 12. Setting
+        timestamp_format and log_timestamp_format will override this setting.
+
+    *timestamp_format*;;
+        Time format string for the interface enclosed by double quotes.
+        See *date*(1)
+
+    *log_timestamp_format*;;
+        Time format string for logging enclosed by double quotes.
+        See *date*(1)
+
+    *alerts*;;
+        Enable or disable acoustic alerts on events. true or false
+
+    *native_colors*;;
+        Select between native terminal colors and toxic color theme. true or false
+
+    *color_bar_bg*;;
+        set background color of chat status bars. (black, white, red, green, blue, cyan, yellow, magenta)
+
+    *color_bar_fg*;;
+        set foreground (text) color of chat status bars. (black, white, red, green, blue, cyan, yellow, magenta)
+
+    *color_bar_accent*;;
+        set foreground accent color of chat status bars. (black, white, red, green, blue, cyan, yellow, magenta)
+
+    *color_bar_notify*;;
+        set foreground notify (and typing) color in chat status bar. (black, white, red, green, blue, cyan, yellow, magenta)
+
+    *autolog*;;
+        Enable or disable autologging. true or false
+
+    *show_typing_other*;;
+        Show when others are typing in a 1-on-1 chat. true or false
+
+    *show_typing_self*;;
+        Show others when you're typing in a 1-on-1 chat. true or false
+
+    *show_welcome_msg*;;
+        Show welcome message on startup. true or false
+
+    *show_connection_msg*;;
+        Enable friend connection change notifications. true or false
+
+    *nodelist_update_freq*;;
+        How often in days to update the DHT nodes list. (integer; 0 to disable)
+
+    *autosave_freq*;;
+        How often in seconds to auto-save the Tox data file. (integer; 0 to disable)
+
+    *history_size*;;
+        Maximum lines for chat window history. Integer value. (for example: 700)
+
+    *notification_timeout*;;
+        Time in milliseconds to display a notification. Integer value. (for example: 3000)
+
+    *line_join*;;
+        Indicator for when someone connects or joins a group.
+        Three characters max for line_ settings.
+
+    *line_quit*;;
+        Indicator for when someone disconnects or leaves a group.
+
+    *line_alert*;;
+        Indicator for alert messages.
+
+    *line_normal*;;
+        Indicator for normal messages.
+
+    *mplex_away*;;
+        Set user status when attaching and detaching from GNU screen or tmux.
+        true or false
+
+    *mplex_away_note*;;
+        Status message to set when status is set to away due to screen/tmux
+        detach. When attaching, the status message is set back to the original
+        value.
+
+    The following options control whether to output a terminal bell on certain events.
+    Some terminals mark the window as urgent when a bell is received. Urgent windows are usually highlighted in the taskbar and some window managers even provide shortcuts to jump to the next urgent window.
+    These options don't affect the "alerts" option.
+
+    *bell_on_message*;;
+        Enable/Disable the terminal bell when receiving a message. true or false
+
+    *bell_on_filetrans*;;
+        Enable/Disable the terminal bell when receiving a filetransfer. true or false
+
+    *bell_on_filetrans_accept*;;
+        Enable/Disable the terminal bell when a filetransfer was accepted. true or false
+
+    *bell_on_invite*;;
+        Enable/Disable the terminal bell when receiving a group/call invite. true or false
+
+
+*audio*::
+    Configuration related to audio devices.
+
+    *input_device*;;
+        Audio input device. Integer value. Number corresponds to `/lsdev in`
+
+    *output_device*;;
+        Audio output device. Integer value. Number corresponds to `/lsdev out`
+
+    *VAD_threshold*;;
+        Voice Activity Detection threshold.  Float value. Recommended values are
+        1.0-40.0
+
+    *conference_audio_channels*;;
+        Number of channels for conference audio broadcast. Integer value. 1 (mono) or 2 (stereo)
+
+    *chat_audio_channels*;;
+        Number of channels for 1-on-1 audio broadcast. Integer value. 1 (mono) or 2 (stereo)
+
+    *push_to_talk*;;
+        Enable/Disable Push-To-Talk for conference audio chats (active key is F2). true or false
+
+*tox*::
+    Configuration related to paths.
+
+    *download_path*;;
+        Default path for downloads. String value. Absolute path for downloaded
+        files.
+
+    *avatar_path*;;
+        Path for your avatar (file must be a .png and cannot exceed 16.3 KiB)
+
+    *autorun_path*;;
+        Path for any scripts that should be run on startup
+
+    *chatlogs_path*;;
+        Default path for chatlogs. String value. Absolute path for chatlog files.
+
+    *password_eval*;;
+        Replace password prompt by running this command and using its output as
+	the password.
+
+*sounds*::
+    Configuration related to notification sounds.
+    Special value "silent" can be used to disable a specific notification. +
+    Each value is a string which corresponds to the absolute path of a wav
+    sound file.
+
+    *notif_error*;;
+        Sound to play when an error occurs.
+
+    *self_log_in*;;
+        Sound to play when you log in.
+
+    *self_log_out*;;
+        Sound to play when you log out.
+
+    *user_log_in*;;
+        Sound to play when a contact become online.
+
+    *user_log_out*;;
+        Sound to play when a contact become offline.
+
+    *call_incoming*;;
+        Sound to play when you receive an incoming call.
+
+    *call_outgoing*;;
+        Sound to play when you start a call.
+
+    *generic_message*;;
+        Sound to play when an event occurs.
+
+    *transfer_pending*;;
+        Sound to play when you receive a file transfer request.
+
+    *transfer_completed*;;
+        Sound to play when a file transfer is completed.
+
+*keys*::
+    Configuration related to user interface interaction.
+    Currently supported: Ctrl modified keys, Tab, PAGEUP and PAGEDOWN. +
+    Each value is a string which corresponds to a key combination.
+
+    *next_tab*;;
+        Key combination to switch next tab.
+
+    *prev_tab*;;
+        Key combination to switch previous tab.
+
+    *scroll_line_up*;;
+        Key combination to scroll one line up.
+
+    *scroll_line_down*;;
+        Key combination to scroll one line down.
+
+    *half_page_up*;;
+        Key combination to scroll half page up.
+
+    *half_page_down*;;
+        Key combination to scroll half page down.
+
+    *page_bottom*;;
+        Key combination to scroll to page bottom.
+
+    *toggle_peerlist*;;
+        Toggle the peer list on and off.
+
+    *toggle_paste_mode*;;
+        Toggle treating linebreaks as enter key press.
+
+
+FILES
+-----
+~/.config/tox/toxic.conf::
+    Main configuration file.
+
+{datadir}/toxic.conf.example::
+    Configuration example.
+
+
+SEE ALSO
+--------
+*toxic*(1)
+
+
+RESOURCES
+---------
+Project page: <https://github.com/JFreegman/toxic>
+
+IRC channel:  chat.freenode.net#tox
+
+
+AUTHORS
+-------
+JFreegman <JFreegman@gmail.com>

misc/DHTnodes

@@ -1,8 +0,0 @@
-192.254.75.98 33445 951C88B7E75C867418ACDB5D273821372BB5BD652740BCDF623A4FA293E75D2F
-37.187.46.132 33445 A9D98212B3F972BD11DA52BEB0658C326FCCC1BFD49F347F9C2D3D8B61E1B927
-144.76.60.215 33445 04119E835DF3E78BACF0F84235B300546AF8B936F035185E2A8E9E0A67C8924F
-23.226.230.47 33445 A09162D68618E742FFBCA1C2C70385E6679604B2D80EA6E84AD0996A1AC8A074
-37.187.20.216 33445 4FD54CFD426A338399767E56FD0F44F5E35FA8C38C8E87C8DC3FEAC0160F8E17    
-54.199.139.199 33445 7F9C31FE850E97CEFD4C4591DF93FC757C7C12549DDD55F8EEAECC34FE76C029    
-109.169.46.133 33445 7F31BFC93B8E4016A902144D0B110C3EA97CB7D43F1C4D21BCAE998A7C838821
-192.210.149.121 33445 F404ABAA1C99A9D37D61AB54898F56793E1DEF8BD46B1038B9D822E8460FAB67    

misc/nameservers

@@ -0,0 +1 @@
+toxme.io 1A39E7A5D5FA9CF155C751570A32E625698A60A55F6D88028F949F66144F4F25

misc/toxic.conf.example

@@ -5,26 +5,86 @@ ui = {
   // true to enable timestamps, false to disable
   timestamps=true;
 
-  // true to enable terminal alerts on messages, false to disable
+  // true to enable acoustic alerts on messages, false to disable
   alerts=true;
 
+  // Output a bell when receiving a message (see manpage)
+  bell_on_message=true;
+
+  // Output a bell when receiving a filetransfer (see manpage)
+  bell_on_filetrans=true;
+
+  // Don't output a bell when a filetransfer was accepted (see manpage)
+  bell_on_filetrans_accept=false;
+
+  // Output a bell when receiving a group/call invite (see manpage)
+  bell_on_invite=true;
+
   // true to use native terminal colours, false to use toxic default colour theme
   native_colors=false;
 
+  // set background color of chat status bars (black, white, red, green, blue, cyan, yellow, magenta)
+  color_bar_bg="blue";
+
+  // set foreground (text) color of chat status bars (black, white, red, green, blue, cyan, yellow, magenta)
+  color_bar_fg="white";
+
+  // set foreground accent color of chat status bars (black, white, red, green, blue, cyan, yellow, magenta)
+  color_bar_accent="cyan";
+
+  // set foreground notify (and typing) color in chat status bar (black, white, red, green, blue, cyan, yellow, magenta)
+  color_bar_notify="yellow";
+
   // true to enable autologging, false to disable
   autolog=false;
 
   // 24 or 12 hour time
   time_format=24;
 
+  // Timestamp format string according to date/strftime format. Overrides time_format setting
+  timestamp_format="%H:%M";
+
   // true to show you when others are typing a message in 1-on-1 chats
   show_typing_other=true;
 
   // true to show others when you're typing a message in 1-on-1 chats
   show_typing_self=true;
 
+  // true to show the welcome message on startup
+  show_welcome_msg=true;
+
+  // true to show friend connection change messages on the home screen
+  show_connection_msg=true;
+
+  // How often in days to update the DHT nodes list. (0 to disable updates)
+  nodeslist_update_freq=7;
+
+  // How often in seconds to auto-save the Tox data file. (0 to disable periodic auto-saves)
+  autosave_freq=600;
+
   // maximum lines for chat window history
   history_size=700;
+
+  // time in milliseconds to display a notification
+  notification_timeout=6000;
+
+  // Indicator for display when someone connects or joins a group
+  line_join="-->";
+
+  // Indicator for display when someone disconnects or leaves a group
+  line_quit="<--";
+
+  // Indicator for alert messages.
+  line_alert="-!-";
+
+  // Indicator for normal messages.
+  line_normal="-";
+
+  // true to change status based on screen/tmux attach/detach, false to disable
+  mplex_away=true;
+
+  // Status message to use when status set to away due to screen/tmux detach
+  mplex_away_note="Away from keyboard, be back soon!"
 };
 
 audio = {
@@ -34,31 +94,47 @@ audio = {
   // preferred audio output device; numbers correspond to /lsdev out
   output_device=0;
 
-  // default VAD treshold; float (recommended values are around 40)
-  VAD_treshold=40.0;
+  // default VAD threshold; float (recommended values are 1.0-40.0)
+  VAD_threshold=5.0;
+
+  // Number of channels to use for conference audio broadcasts; 1 for mono, 2 for stereo.
+  conference_audio_channels=1;
+
+  // Number of channels to use for 1-on-1 audio broadcasts; 1 for mono, 2 for stereo.
+  chat_audio_channels=2;
+
+  // toggle conference push-to-talk
+  push_to_talk=false;
 };
 
 tox = {
-  // where to store received files
+  // Path for downloaded files
   // download_path="/home/USERNAME/Downloads/";
+
+  // Path for your avatar (file must be a .png and cannot exceed 64 KiB)
+  // avatar_path="/home/USERNAME/Pictures/youravatar.png";
+
+  // Path for scripts that should be run on startup
+  // autorun_path="/home/USERNAME/toxic_scripts/";
+
+  // Path for chatlogs
+  // chatlogs_path="/home/USERNAME/toxic_chatlogs/";
 };
 
 // To disable a sound set the path to "silent"
 sounds = {
-  error="__DATADIR__/sounds/Error.wav";
-  self_log_in="__DATADIR__/sounds/LogIn.wav";
-  self_log_out="__DATADIR__/sounds/LogOut.wav";
-  user_log_in="__DATADIR__/sounds/ContactLogsIn.wav";
-  user_log_out="__DATADIR__/sounds/ContactLogsOut.wav";
-  call_incoming="__DATADIR__/sounds/IncomingCall.wav";
-  call_outgoing="__DATADIR__/sounds/OutgoingCall.wav";
-  generic_message="__DATADIR__/sounds/NewMessage.wav";
-  transfer_pending="__DATADIR__/sounds/TransferPending.wav";
-  transfer_completed="__DATADIR__/sounds/TransferComplete.wav";
+  error="__DATADIR__/sounds/ToxicError.wav";
+  user_log_in="__DATADIR__/sounds/ToxicContactOnline.wav";
+  user_log_out="__DATADIR__/sounds/ToxicContactOffline.wav";
+  call_incoming="__DATADIR__/sounds/ToxicIncomingCall.wav";
+  call_outgoing="__DATADIR__/sounds/ToxicOutgoingCall.wav";
+  generic_message="__DATADIR__/sounds/ToxicRecvMessage.wav";
+  transfer_pending="__DATADIR__/sounds/ToxicTransferStart.wav";
+  transfer_completed="__DATADIR__/sounds/ToxicTransferComplete.wav";
 };
 
 // Currently supported: Ctrl modified keys, Tab, PAGEUP and PAGEDOWN (case insensitive)
-// Note: All printable keys register as input
+// Note: Ctrl+M does not work
 keys = {
   next_tab="Ctrl+P";
   prev_tab="Ctrl+O";
@@ -67,7 +143,6 @@ keys = {
   half_page_up="Ctrl+F";
   half_page_down="Ctrl+V";
   page_bottom="Ctrl+H";
-	peer_list_up="Ctrl+[";
-	peer_list_down="Ctrl+]";
+  toggle_peerlist="Ctrl+B";
+  toggle_paste_mode="Ctrl+T";
 };
-

misc/toxic.desktop

@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Toxic
+Comment=A CLI based Tox client
+TryExec=toxic
+Exec=toxic
+Icon=utilities-terminal
+Categories=InstantMessaging;AudioVideo;Network;
+Terminal=true
+MimeType=x-scheme-handler/tox;

sounds/license

@@ -1 +1,2 @@
-Tox's sounds are licensed under the "Creative Commons Attribution 3.0 Unported", all credit attributed to Adam Reid.
+ToxicError.wav, ToxicRecvMessage.wav, ToxicContactOffline.wav, ToxicIncomingCall.wav, ToxicTransferComplete.wav, ToxicContactOnline.wav, ToxicOutgoingCall.wav and ToxicTransferStart.wav
+are licensed under the "Creative Commons Attribution 3.0 Unported". All credit attributed to Jfreegman.

src/api.c

@@ -0,0 +1,217 @@
+/*  api.c
+ *
+ *
+ *  Copyright (C) 2017 Jakob Kreuze <jakob@memeware.net>
+ *
+ *  This file is part of Toxic.
+ *
+ *  Toxic is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Toxic is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Toxic.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <dirent.h>
+#include <stdint.h>
+
+#include <tox/tox.h>
+
+#include "execute.h"
+#include "friendlist.h"
+#include "line_info.h"
+#include "message_queue.h"
+#include "misc_tools.h"
+#include "settings.h"
+#include "toxic_strings.h"
+#include "windows.h"
+
+#ifdef PYTHON
+#include "python_api.h"
+
+Tox              *user_tox;
+static WINDOW    *cur_window;
+static ToxWindow *self_window;
+
+extern FriendsList Friends;
+extern struct user_settings *user_settings;
+
+void api_display(const char *const msg)
+{
+    if (msg == NULL) {
+        return;
+    }
+
+    self_window = get_active_window();
+    line_info_add(self_window, NULL, NULL, NULL, SYS_MSG, 0, 0, msg);
+}
+
+FriendsList api_get_friendslist(void)
+{
+    return Friends;
+}
+
+char *api_get_nick(void)
+{
+    size_t   len  = tox_self_get_name_size(user_tox);
+    uint8_t *name = malloc(len + 1);
+
+    if (name == NULL) {
+        return NULL;
+    }
+
+    tox_self_get_name(user_tox, name);
+    name[len] = '\0';
+    return (char *) name;
+}
+
+Tox_User_Status api_get_status(void)
+{
+    return tox_self_get_status(user_tox);
+}
+
+char *api_get_status_message(void)
+{
+    size_t   len    = tox_self_get_status_message_size(user_tox);
+    uint8_t *status = malloc(len + 1);
+
+    if (status == NULL) {
+        return NULL;
+    }
+
+    tox_self_get_status_message(user_tox, status);
+    status[len] = '\0';
+    return (char *) status;
+}
+
+void api_send(const char *msg)
+{
+    if (msg == NULL || self_window->chatwin->cqueue == NULL) {
+        return;
+    }
+
+    char *name = api_get_nick();
+
+    if (name == NULL) {
+        return;
+    }
+
+    self_window = get_active_window();
+
+    strncpy((char *) self_window->chatwin->line, msg, sizeof(self_window->chatwin->line));
+    add_line_to_hist(self_window->chatwin);
+    int id = line_info_add(self_window, true, name, NULL, OUT_MSG, 0, 0, "%s", msg);
+    cqueue_add(self_window->chatwin->cqueue, msg, strlen(msg), OUT_MSG, id);
+    free(name);
+}
+
+void api_execute(const char *input, int mode)
+{
+    self_window = get_active_window();
+    execute(cur_window, self_window, user_tox, input, mode);
+}
+
+int do_plugin_command(int num_args, char (*args)[MAX_STR_SIZE])
+{
+    return do_python_command(num_args, args);
+}
+
+int num_registered_handlers(void)
+{
+    return python_num_registered_handlers();
+}
+
+int help_max_width(void)
+{
+    return python_help_max_width();
+}
+
+void draw_handler_help(WINDOW *win)
+{
+    python_draw_handler_help(win);
+}
+
+void cmd_run(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
+{
+    FILE       *fp;
+    const char *error_str;
+
+    cur_window  = window;
+    self_window = self;
+
+    if (argc != 1) {
+        if (argc < 1) {
+            error_str = "Path must be specified.";
+        } else {
+            error_str = "Only one argument allowed.";
+        }
+
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, error_str);
+        return;
+    }
+
+    fp = fopen(argv[1], "r");
+
+    if (fp == NULL) {
+        error_str = "Path does not exist.";
+
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, error_str);
+        return;
+    }
+
+    run_python(fp, argv[1]);
+    fclose(fp);
+}
+
+void invoke_autoruns(WINDOW *window, ToxWindow *self)
+{
+    char abspath_buf[PATH_MAX + 256];
+    char err_buf[PATH_MAX + 128];
+
+    if (user_settings->autorun_path[0] == '\0') {
+        return;
+    }
+
+    DIR *d = opendir(user_settings->autorun_path);
+
+    if (d == NULL) {
+        snprintf(err_buf, sizeof(err_buf), "Autorun path does not exist: %s", user_settings->autorun_path);
+        api_display(err_buf);
+        return;
+    }
+
+    struct dirent *dir = NULL;
+
+    cur_window  = window;
+
+    self_window = self;
+
+    while ((dir = readdir(d)) != NULL) {
+        size_t path_len = strlen(dir->d_name);
+
+        if (!strcmp(dir->d_name + path_len - 3, ".py")) {
+            snprintf(abspath_buf, sizeof(abspath_buf), "%s%s", user_settings->autorun_path, dir->d_name);
+            FILE *fp = fopen(abspath_buf, "r");
+
+            if (fp == NULL) {
+                snprintf(err_buf, sizeof(err_buf), "Invalid path: %s", abspath_buf);
+                api_display(err_buf);
+                continue;
+            }
+
+            run_python(fp, abspath_buf);
+            fclose(fp);
+        }
+    }
+
+    closedir(d);
+}
+#endif /* PYTHON */

src/api.h

@@ -0,0 +1,43 @@
+/*  api.h
+ *
+ *
+ *  Copyright (C) 2017 Jakob Kreuze <jakob@memeware.net>
+ *
+ *  This file is part of Toxic.
+ *
+ *  Toxic is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Toxic is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Toxic.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef API_H
+#define API_H
+
+#include "friendlist.h"
+#include "windows.h"
+
+void api_display(const char *const msg);
+FriendsList api_get_friendslist(void);
+char *api_get_nick(void);
+Tox_User_Status api_get_status(void);
+char *api_get_status_message(void);
+void api_send(const char *msg);
+void api_execute(const char *input, int mode);
+int do_plugin_command(int num_args, char (*args)[MAX_STR_SIZE]);
+int num_registered_handlers(void);
+int help_max_width(void);
+void draw_handler_help(WINDOW *win);
+void invoke_autoruns(WINDOW *w, ToxWindow *self);
+void cmd_run(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
+
+#endif /* API_H */

src/audio_call.h

@@ -20,26 +20,90 @@
  *
  */
 
-#ifndef _audio_h
-#define _audio_h
+#ifndef AUDIO_CALL_H
+#define AUDIO_CALL_H
 
 #include <tox/toxav.h>
 
-#include "device.h"
+#include "audio_device.h"
 
-typedef enum _AudioError {
+typedef enum AudioError {
     ae_None = 0,
     ae_StartingCaptureDevice = 1 << 0,
     ae_StartingOutputDevice = 1 << 1,
     ae_StartingCoreAudio = 1 << 2
 } AudioError;
 
-/* You will have to pass pointer to first member of 'windows'
- * declared in windows.c otherwise undefined behaviour will
- */
-ToxAv *init_audio(ToxWindow *self, Tox *tox);
-void terminate_audio();
+#ifdef VIDEO
+typedef enum VideoError {
+    ve_None = 0,
+    ve_StartingCaptureDevice = 1 << 0,
+    ve_StartingOutputDevice = 1 << 1,
+    ve_StartingCoreVideo = 1 << 2
+} VideoError;
 
+#endif /* VIDEO */
+
+/* Status transitions:
+ * None -> Pending (call invitation made or received);
+ * Pending -> None (invitation rejected or failed);
+ * Pending -> Active (call starts);
+ * Active -> None (call ends).
+ */
+typedef enum CallStatus {
+    cs_None = 0,
+    cs_Pending,
+    cs_Active
+} CallStatus;
+
+typedef struct Call {
+    CallStatus status;
+    uint32_t state; /* ToxAV call state, valid when `status == cs_Active` */
+    uint32_t in_idx, out_idx; /* Audio device index, or -1 if not open */
+    uint32_t audio_bit_rate; /* Bit rate for sending audio */
+
+    uint32_t vin_idx, vout_idx; /* Video device index, or -1 if not open */
+    uint32_t video_width, video_height;
+    uint32_t video_bit_rate; /* Bit rate for sending video; 0 for no video */
+} Call;
+
+struct CallControl {
+    AudioError audio_errors;
+#ifdef VIDEO
+    VideoError video_errors;
+#endif /* VIDEO */
+
+    ToxAV *av;
+    ToxWindow *prompt;
+
+    Call *calls;
+    uint32_t max_calls;
+
+    bool audio_enabled;
+    bool video_enabled;
+
+    int32_t audio_frame_duration;
+    uint32_t audio_sample_rate;
+    uint8_t audio_channels;
+    uint32_t default_audio_bit_rate;
+
+    int32_t video_frame_duration;
+    uint32_t default_video_width, default_video_height;
+    uint32_t default_video_bit_rate;
+};
+
+extern struct CallControl CallControl;
+
+/* You will have to pass pointer to first member of 'windows' declared in windows.c */
+ToxAV *init_audio(ToxWindow *self, Tox *tox);
+void terminate_audio(void);
+
+bool init_call(Call *call);
+
+void place_call(ToxWindow *self);
 void stop_current_call(ToxWindow *self);
 
-#endif /* _audio_h */
+void init_friend_AV(uint32_t index);
+void del_friend_AV(uint32_t index);
+
+#endif /* AUDIO_CALL_H */

src/audio_device.c

@@ -0,0 +1,790 @@
+/*  audio_device.c
+ *
+ *
+ *  Copyright (C) 2014 Toxic All Rights Reserved.
+ *
+ *  This file is part of Toxic.
+ *
+ *  Toxic is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Toxic is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Toxic.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "audio_device.h"
+
+#include "line_info.h"
+#include "misc_tools.h"
+#include "settings.h"
+
+#include <AL/al.h>
+#include <AL/alc.h>
+/* compatibility with older versions of OpenAL */
+#ifndef ALC_ALL_DEVICES_SPECIFIER
+#include <AL/alext.h>
+#endif /* ALC_ALL_DEVICES_SPECIFIER */
+
+#include <assert.h>
+#include <math.h>
+#include <pthread.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+extern struct user_settings *user_settings;
+extern struct Winthread Winthread;
+
+typedef struct FrameInfo {
+    uint32_t samples_per_frame;
+    uint32_t sample_rate;
+    bool stereo;
+} FrameInfo;
+
+/* A virtual input/output device, abstracting the currently selected openal
+ * device (which may change during the lifetime of the virtual device).
+ * We refer to a virtual device as a "device", and refer to an underlying
+ * openal device as an "al_device".
+ * Multiple virtual devices may be open at once; the callback of each virtual
+ * input device has data captured from the input al_device passed to it, and
+ * each virtual output device acts as a source for the output al_device.
+ */
+typedef struct Device {
+    bool active;
+    bool muted;
+
+    FrameInfo frame_info;
+
+    // used only by input devices:
+    DataHandleCallback cb;
+    void *cb_data;
+    float VAD_threshold;
+    uint32_t VAD_samples_remaining;
+
+    // used only by output devices:
+    uint32_t source;
+    uint32_t buffers[OPENAL_BUFS];
+    bool source_open;
+} Device;
+
+typedef struct AudioState {
+    ALCdevice *al_device[2];
+
+    Device devices[2][MAX_DEVICES];
+    uint32_t num_devices[2];
+
+    FrameInfo capture_frame_info;
+    float input_volume;
+
+    // mutexes to prevent changes to input resp. output devices and al_devices
+    // during poll_input iterations resp. calls to write_out;
+    // mutex[input] also used to lock input_volume which poll_input writes to.
+    pthread_mutex_t mutex[2];
+
+    // TODO: unused
+    const char *default_al_device_name[2];              /* Default devices */
+
+    const char *al_device_names[2][MAX_OPENAL_DEVICES]; /* Available devices */
+    uint32_t num_al_devices[2];
+    char *current_al_device_name[2];
+} AudioState;
+
+static AudioState *audio_state;
+
+static void lock(DeviceType type)
+{
+    pthread_mutex_lock(&audio_state->mutex[type]);
+}
+
+static void unlock(DeviceType type)
+{
+    pthread_mutex_unlock(&audio_state->mutex[type]);
+}
+
+
+static bool thread_running = true,
+            thread_paused = true;               /* Thread control */
+
+#ifdef AUDIO
+static void *poll_input(void *);
+#endif
+
+static uint32_t sound_mode(bool stereo)
+{
+    return stereo ? AL_FORMAT_STEREO16 : AL_FORMAT_MONO16;
+}
+
+static uint32_t sample_size(bool stereo)
+{
+    return stereo ? 4 : 2;
+}
+
+DeviceError init_devices(void)
+{
+    audio_state = calloc(1, sizeof(AudioState));
+
+    if (audio_state == NULL) {
+        return de_InternalError;
+    }
+
+    get_al_device_names();
+
+    for (DeviceType type = input; type <= output; ++type) {
+        audio_state->al_device[type] = NULL;
+
+        if (pthread_mutex_init(&audio_state->mutex[type], NULL) != 0) {
+            return de_InternalError;
+        }
+    }
+
+#ifdef AUDIO
+    // Start poll thread
+    pthread_t thread_id;
+
+    if (pthread_create(&thread_id, NULL, poll_input, NULL) != 0
+            || pthread_detach(thread_id) != 0) {
+        return de_InternalError;
+    }
+
+#endif
+
+    return de_None;
+}
+
+DeviceError terminate_devices(void)
+{
+    lock(input);
+    thread_running = false;
+    unlock(input);
+
+    sleep_thread(20000L);
+
+    for (DeviceType type = input; type <= output; ++type) {
+        if (pthread_mutex_destroy(&audio_state->mutex[type]) != 0) {
+            return de_InternalError;
+        }
+
+        if (audio_state->current_al_device_name[type] != NULL) {
+            free(audio_state->current_al_device_name[type]);
+        }
+    }
+
+    free(audio_state);
+
+    return de_None;
+}
+
+void get_al_device_names(void)
+{
+    const char *stringed_device_list;
+
+    for (DeviceType type = input; type <= output; ++type) {
+        audio_state->num_al_devices[type] = 0;
+
+        if (type == input) {
+            stringed_device_list = alcGetString(NULL, ALC_CAPTURE_DEVICE_SPECIFIER);
+        } else {
+            if (alcIsExtensionPresent(NULL, "ALC_ENUMERATE_ALL_EXT") != AL_FALSE) {
+                stringed_device_list = alcGetString(NULL, ALC_ALL_DEVICES_SPECIFIER);
+            } else {
+                stringed_device_list = alcGetString(NULL, ALC_DEVICE_SPECIFIER);
+            }
+        }
+
+        if (stringed_device_list != NULL) {
+            audio_state->default_al_device_name[type] = alcGetString(NULL,
+                    type == input ? ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER : ALC_DEFAULT_DEVICE_SPECIFIER);
+
+            for (; *stringed_device_list != '\0'
+                    && audio_state->num_al_devices[type] < MAX_OPENAL_DEVICES; ++audio_state->num_al_devices[type]) {
+                audio_state->al_device_names[type][audio_state->num_al_devices[type]] = stringed_device_list;
+                stringed_device_list += strlen(stringed_device_list) + 1;
+            }
+        }
+    }
+}
+
+DeviceError device_mute(DeviceType type, uint32_t device_idx)
+{
+    if (device_idx >= MAX_DEVICES) {
+        return de_InvalidSelection;
+    }
+
+    Device *device = &audio_state->devices[type][device_idx];
+
+    if (!device->active) {
+        return de_DeviceNotActive;
+    }
+
+    lock(type);
+
+    device->muted = !device->muted;
+
+    unlock(type);
+    return de_None;
+}
+
+bool device_is_muted(DeviceType type, uint32_t device_idx)
+{
+    if (device_idx >= MAX_DEVICES) {
+        return false;
+    }
+
+    Device *device = &audio_state->devices[type][device_idx];
+
+    if (!device->active) {
+        return false;
+    }
+
+    return device->muted;
+}
+
+DeviceError device_set_VAD_threshold(uint32_t device_idx, float value)
+{
+    if (device_idx >= MAX_DEVICES) {
+        return de_InvalidSelection;
+    }
+
+    Device *device = &audio_state->devices[input][device_idx];
+
+    if (!device->active) {
+        return de_DeviceNotActive;
+    }
+
+    if (value <= 0.0f) {
+        value = 0.0f;
+    }
+
+    lock(input);
+
+    device->VAD_threshold = value;
+
+    unlock(input);
+    return de_None;
+}
+
+float device_get_VAD_threshold(uint32_t device_idx)
+{
+    if (device_idx >= MAX_DEVICES) {
+        return 0.0;
+    }
+
+    Device *device = &audio_state->devices[input][device_idx];
+
+    if (!device->active) {
+        return 0.0;
+    }
+
+    return device->VAD_threshold;
+}
+
+DeviceError set_source_position(uint32_t device_idx, float x, float y, float z)
+{
+    if (device_idx >= MAX_DEVICES) {
+        return de_InvalidSelection;
+    }
+
+    Device *device = &audio_state->devices[output][device_idx];
+
+    if (!device->active) {
+        return de_DeviceNotActive;
+    }
+
+    lock(output);
+
+    alSource3f(device->source, AL_POSITION, x, y, z);
+
+    unlock(output);
+
+    if (!audio_state->al_device[output] || alcGetError(audio_state->al_device[output]) != AL_NO_ERROR) {
+        return de_AlError;
+    }
+
+    return de_None;
+}
+
+static DeviceError close_al_device(DeviceType type)
+{
+    if (audio_state->al_device[type] == NULL) {
+        return de_None;
+    }
+
+    if (type == input) {
+        if (!alcCaptureCloseDevice(audio_state->al_device[type])) {
+            return de_AlError;
+        }
+
+        thread_paused = true;
+    } else {
+        ALCcontext *context = alcGetCurrentContext();
+        alcMakeContextCurrent(NULL);
+        alcDestroyContext(context);
+
+        if (!alcCloseDevice(audio_state->al_device[type])) {
+            return de_AlError;
+        }
+    }
+
+    audio_state->al_device[type] = NULL;
+
+    return de_None;
+}
+
+static DeviceError open_al_device(DeviceType type, FrameInfo frame_info)
+{
+    audio_state->al_device[type] = type == input
+                                   ? alcCaptureOpenDevice(audio_state->current_al_device_name[type],
+                                           frame_info.sample_rate, sound_mode(frame_info.stereo), frame_info.samples_per_frame * 2)
+                                   : alcOpenDevice(audio_state->current_al_device_name[type]);
+
+    if (audio_state->al_device[type] == NULL) {
+        return de_FailedStart;
+    }
+
+    if (type == input) {
+        alcCaptureStart(audio_state->al_device[type]);
+        thread_paused = false;
+
+        audio_state->capture_frame_info = frame_info;
+    } else {
+        alcMakeContextCurrent(alcCreateContext(audio_state->al_device[type], NULL));
+    }
+
+    if (alcGetError(audio_state->al_device[type]) != AL_NO_ERROR) {
+        close_al_device(type);
+        return de_AlError;
+    }
+
+    return de_None;
+}
+
+static void close_source(Device *device)
+{
+    if (device->source_open) {
+        alDeleteSources(1, &device->source);
+        alDeleteBuffers(OPENAL_BUFS, device->buffers);
+
+        device->source_open = false;
+    }
+}
+
+static DeviceError open_source(Device *device)
+{
+    alGenBuffers(OPENAL_BUFS, device->buffers);
+
+    if (alcGetError(audio_state->al_device[output]) != AL_NO_ERROR) {
+        return de_FailedStart;
+    }
+
+    alGenSources((uint32_t)1, &device->source);
+
+    if (alcGetError(audio_state->al_device[output]) != AL_NO_ERROR) {
+        alDeleteBuffers(OPENAL_BUFS, device->buffers);
+        return de_FailedStart;
+    }
+
+    device->source_open = true;
+
+    alSourcei(device->source, AL_LOOPING, AL_FALSE);
+
+    const uint32_t frame_size = device->frame_info.samples_per_frame * sample_size(device->frame_info.stereo);
+    size_t zeros_size = frame_size * sizeof(uint16_t);
+    uint16_t *zeros = calloc(1, zeros_size);
+
+    if (zeros == NULL) {
+        close_source(device);
+        return de_FailedStart;
+    }
+
+    for (int i = 0; i < OPENAL_BUFS; ++i) {
+        alBufferData(device->buffers[i], sound_mode(device->frame_info.stereo), zeros,
+                     zeros_size, device->frame_info.sample_rate);
+    }
+
+    free(zeros);
+
+    alSourceQueueBuffers(device->source, OPENAL_BUFS, device->buffers);
+    alSourcePlay(device->source);
+
+    if (alcGetError(audio_state->al_device[output]) != AL_NO_ERROR) {
+        close_source(device);
+        return de_FailedStart;
+    }
+
+    return de_None;
+}
+
+DeviceError set_al_device(DeviceType type, int32_t selection)
+{
+    if (audio_state->num_al_devices[type] <= selection || selection < 0) {
+        return de_InvalidSelection;
+    }
+
+    const char *name = audio_state->al_device_names[type][selection];
+
+    char **cur_name = &audio_state->current_al_device_name[type];
+
+    if (*cur_name != NULL) {
+        free(*cur_name);
+    }
+
+    *cur_name = malloc(strlen(name) + 1);
+
+    if (*cur_name == NULL) {
+        return de_InternalError;
+    }
+
+    strcpy(*cur_name, name);
+
+    if (audio_state->num_devices[type] > 0) {
+        // close any existing al_device and try to open new one, reopening existing sources
+        lock(type);
+
+        if (type == output) {
+            for (int i = 0; i < MAX_DEVICES; i++) {
+                Device *device = &audio_state->devices[type][i];
+
+                if (device->active) {
+                    close_source(device);
+                }
+            }
+        }
+
+        close_al_device(type);
+
+        DeviceError err = open_al_device(type, audio_state->capture_frame_info);
+
+        if (err != de_None) {
+            unlock(type);
+            return err;
+        }
+
+        if (type == output) {
+            for (int i = 0; i < MAX_DEVICES; i++) {
+                Device *device = &audio_state->devices[type][i];
+
+                if (device->active) {
+                    open_source(device);
+                }
+            }
+        }
+
+        unlock(type);
+    }
+
+    return de_None;
+}
+
+static DeviceError open_device(DeviceType type, uint32_t *device_idx,
+                               DataHandleCallback cb, void *cb_data, bool enable_VAD,
+                               uint32_t sample_rate, uint32_t frame_duration, uint8_t channels)
+{
+    if (channels != 1 && channels != 2) {
+        return de_UnsupportedMode;
+    }
+
+    const uint32_t samples_per_frame = (sample_rate * frame_duration / 1000);
+    FrameInfo frame_info = {samples_per_frame, sample_rate, channels == 2};
+
+    uint32_t i;
+
+    for (i = 0; i < MAX_DEVICES && audio_state->devices[type][i].active; ++i);
+
+    if (i == MAX_DEVICES) {
+        return de_AllDevicesBusy;
+    }
+
+    *device_idx = i;
+
+    lock(type);
+
+    if (audio_state->al_device[type] == NULL) {
+        DeviceError err = open_al_device(type, frame_info);
+
+        if (err != de_None) {
+            unlock(type);
+            return err;
+        }
+    } else if (type == input) {
+        // Use previously set frame info on existing capture device
+        frame_info = audio_state->capture_frame_info;
+    }
+
+    Device *device = &audio_state->devices[type][i];
+    device->active = true;
+    ++audio_state->num_devices[type];
+
+    device->muted = false;
+    device->frame_info = frame_info;
+
+    if (type == input) {
+        device->cb = cb;
+        device->cb_data = cb_data;
+#ifdef AUDIO
+        device->VAD_threshold = enable_VAD ? user_settings->VAD_threshold : 0.0f;
+#else
+        device->VAD_threshold = 0.0f;
+#endif
+    } else {
+        if (open_source(device) != de_None) {
+            device->active = false;
+            --audio_state->num_devices[type];
+            unlock(type);
+            return de_FailedStart;
+        }
+    }
+
+    unlock(type);
+    return de_None;
+}
+
+DeviceError open_input_device(uint32_t *device_idx,
+                              DataHandleCallback cb, void *cb_data, bool enable_VAD,
+                              uint32_t sample_rate, uint32_t frame_duration, uint8_t channels)
+{
+    return open_device(input, device_idx,
+                       cb, cb_data, enable_VAD,
+                       sample_rate, frame_duration, channels);
+}
+
+DeviceError open_output_device(uint32_t *device_idx,
+                               uint32_t sample_rate, uint32_t frame_duration, uint8_t channels)
+{
+    return open_device(output, device_idx,
+                       0, 0, 0,
+                       sample_rate, frame_duration, channels);
+}
+
+DeviceError close_device(DeviceType type, uint32_t device_idx)
+{
+    if (device_idx >= MAX_DEVICES) {
+        return de_InvalidSelection;
+    }
+
+    lock(type);
+
+    Device *device = &audio_state->devices[type][device_idx];
+
+    if (!device->active) {
+        return de_DeviceNotActive;
+    }
+
+    if (type == output) {
+        close_source(device);
+    }
+
+    device->active = false;
+    --audio_state->num_devices[type];
+
+    DeviceError err = de_None;
+
+    if (audio_state->num_devices[type] == 0) {
+        err = close_al_device(type);
+    }
+
+    unlock(type);
+    return err;
+}
+
+DeviceError write_out(uint32_t device_idx, const int16_t *data, uint32_t sample_count, uint8_t channels,
+                      uint32_t sample_rate)
+{
+    if (device_idx >= MAX_DEVICES) {
+        return de_InvalidSelection;
+    }
+
+    lock(output);
+
+    Device *device = &audio_state->devices[output][device_idx];
+
+    if (!device->active || device->muted) {
+        unlock(output);
+        return de_DeviceNotActive;
+    }
+
+    ALuint bufid;
+    ALint processed, queued;
+    alGetSourcei(device->source, AL_BUFFERS_PROCESSED, &processed);
+    alGetSourcei(device->source, AL_BUFFERS_QUEUED, &queued);
+
+    if (audio_state->al_device[output] == NULL || alcGetError(audio_state->al_device[output]) != AL_NO_ERROR) {
+        unlock(output);
+        return de_AlError;
+    }
+
+    if (processed) {
+        ALuint *bufids = malloc(processed * sizeof(ALuint));
+
+        if (bufids == NULL) {
+            unlock(output);
+            return de_InternalError;
+        }
+
+        alSourceUnqueueBuffers(device->source, processed, bufids);
+        alDeleteBuffers(processed - 1, bufids + 1);
+        bufid = bufids[0];
+        free(bufids);
+    } else if (queued < 16) {
+        alGenBuffers(1, &bufid);
+    } else {
+        unlock(output);
+        return de_Busy;
+    }
+
+
+    const bool stereo = channels == 2;
+    alBufferData(bufid, sound_mode(stereo), data,
+                 sample_count * sample_size(stereo),
+                 sample_rate);
+    alSourceQueueBuffers(device->source, 1, &bufid);
+
+    ALint state;
+    alGetSourcei(device->source, AL_SOURCE_STATE, &state);
+
+    if (state != AL_PLAYING) {
+        alSourcePlay(device->source);
+    }
+
+    unlock(output);
+    return de_None;
+}
+
+#ifdef AUDIO
+/* Adapted from qtox,
+ * Copyright © 2014-2019 by The qTox Project Contributors
+ *
+ * return normalized volume of buffer in range 0.0-100.0
+ */
+float volume(int16_t *frame, uint32_t samples)
+{
+    float sum_of_squares = 0;
+
+    for (uint32_t i = 0; i < samples; i++) {
+        const float sample = (float)(frame[i]) / INT16_MAX;
+        sum_of_squares += powf(sample, 2);
+    }
+
+    const float root_mean_square = sqrtf(sum_of_squares / samples);
+    const float root_two = 1.414213562;
+
+    // normalizedVolume == 1.0 corresponds to a sine wave of maximal amplitude
+    const float normalized_volume = root_mean_square * root_two;
+
+    return 100.0f * fminf(1.0f, normalized_volume);
+}
+
+// Time in ms for which we continue to capture audio after VAD is triggered:
+#define VAD_TIME 250
+
+#define FRAME_BUF_SIZE 16000
+
+static void *poll_input(void *arg)
+{
+    UNUSED_VAR(arg);
+
+    int16_t *frame_buf = malloc(FRAME_BUF_SIZE * sizeof(int16_t));
+
+    if (frame_buf == NULL) {
+        exit_toxic_err("failed in thread_poll", FATALERR_MEMORY);
+    }
+
+    while (1) {
+        lock(input);
+
+        if (!thread_running) {
+            free(frame_buf);
+            unlock(input);
+            break;
+        }
+
+        if (thread_paused) {
+            unlock(input);
+            sleep_thread(10000L);
+            continue;
+        }
+
+        if (audio_state->al_device[input] != NULL) {
+            int32_t available_samples;
+            alcGetIntegerv(audio_state->al_device[input], ALC_CAPTURE_SAMPLES, sizeof(int32_t), &available_samples);
+
+            const uint32_t f_size = audio_state->capture_frame_info.samples_per_frame;
+
+            if (available_samples >= f_size && f_size <= FRAME_BUF_SIZE) {
+                alcCaptureSamples(audio_state->al_device[input], frame_buf, f_size);
+
+                unlock(input);
+                pthread_mutex_lock(&Winthread.lock);
+                lock(input);
+
+                float frame_volume = volume(frame_buf, f_size);
+
+                audio_state->input_volume = frame_volume;
+
+                for (int i = 0; i < MAX_DEVICES; i++) {
+                    Device *device = &audio_state->devices[input][i];
+
+                    if (device->VAD_threshold != 0.0f) {
+                        if (frame_volume >= device->VAD_threshold) {
+                            device->VAD_samples_remaining = VAD_TIME * (audio_state->capture_frame_info.sample_rate / 1000);
+                        } else if (device->VAD_samples_remaining < f_size) {
+                            continue;
+                        } else {
+                            device->VAD_samples_remaining -= f_size;
+                        }
+                    }
+
+                    if (device->active && !device->muted && device->cb) {
+                        device->cb(frame_buf, f_size, device->cb_data);
+                    }
+                }
+
+                pthread_mutex_unlock(&Winthread.lock);
+            }
+        }
+
+        unlock(input);
+        sleep_thread(5000L);
+    }
+
+    pthread_exit(NULL);
+}
+#endif
+
+float get_input_volume(void)
+{
+    float ret = 0.0f;
+
+    if (audio_state->al_device[input] != NULL) {
+        lock(input);
+        ret = audio_state->input_volume;
+        unlock(input);
+    }
+
+    return ret;
+}
+
+void print_al_devices(ToxWindow *self, DeviceType type)
+{
+    for (int i = 0; i < audio_state->num_al_devices[type]; ++i) {
+        line_info_add(self, false, NULL, NULL, SYS_MSG,
+                      audio_state->current_al_device_name[type]
+                      && strcmp(audio_state->current_al_device_name[type], audio_state->al_device_names[type][i]) == 0 ? 1 : 0,
+                      0, "%d: %s", i, audio_state->al_device_names[type][i]);
+    }
+
+    return;
+}
+
+DeviceError selection_valid(DeviceType type, int32_t selection)
+{
+    return (audio_state->num_al_devices[type] <= selection || selection < 0) ? de_InvalidSelection : de_None;
+}

src/audio_device.h

@@ -1,4 +1,4 @@
-/*  device.h
+/*  audio_device.h
  *
  *
  *  Copyright (C) 2014 Toxic All Rights Reserved.
@@ -26,15 +26,14 @@
  * Read from running input device(s) via select()/callback combo.
  */
 
-#ifndef _device_h
-#define _device_h
+#ifndef AUDIO_DEVICE_H
+#define AUDIO_DEVICE_H
 
+#define OPENAL_BUFS 5
+#define MAX_OPENAL_DEVICES 32
 #define MAX_DEVICES 32
-#include <inttypes.h>
-#include "windows.h"
 
-#define _True 1
-#define _False 0
+#include "windows.h"
 
 typedef enum DeviceType {
     input,
@@ -57,36 +56,42 @@ typedef enum DeviceError {
 typedef void (*DataHandleCallback)(const int16_t *, uint32_t size, void *data);
 
 
-#ifdef _AUDIO
-DeviceError init_devices(ToxAv* av);
-#else
-DeviceError init_devices();
-#endif /* _AUDIO */
+DeviceError init_devices(void);
 
-DeviceError terminate_devices();
-
-/* Callback handles ready data from INPUT device */
-DeviceError register_device_callback(int32_t call_idx, uint32_t device_idx, DataHandleCallback callback, void* data, _Bool enable_VAD);
-void* get_device_callback_data(uint32_t device_idx);
+void get_al_device_names(void);
+DeviceError terminate_devices(void);
 
 /* toggle device mute */
 DeviceError device_mute(DeviceType type, uint32_t device_idx);
 
-#ifdef _AUDIO
-DeviceError device_set_VAD_treshold(uint32_t device_idx, float value);
-#endif
+bool device_is_muted(DeviceType type, uint32_t device_idx);
+
+DeviceError device_set_VAD_threshold(uint32_t device_idx, float value);
+
+float device_get_VAD_threshold(uint32_t device_idx);
+
+DeviceError set_source_position(uint32_t device_idx, float x, float y, float z);
+
+DeviceError set_al_device(DeviceType type, int32_t selection);
 
-DeviceError set_primary_device(DeviceType type, int32_t selection);
-DeviceError open_primary_device(DeviceType type, uint32_t* device_idx, uint32_t sample_rate, uint32_t frame_duration, uint8_t channels);
 /* Start device */
-DeviceError open_device(DeviceType type, int32_t selection, uint32_t* device_idx, uint32_t sample_rate, uint32_t frame_duration, uint8_t channels);
+DeviceError open_input_device(uint32_t *device_idx,
+                              DataHandleCallback cb, void *cb_data, bool enable_VAD,
+                              uint32_t sample_rate, uint32_t frame_duration, uint8_t channels);
+DeviceError open_output_device(uint32_t *device_idx,
+                               uint32_t sample_rate, uint32_t frame_duration, uint8_t channels);
+
 /* Stop device */
 DeviceError close_device(DeviceType type, uint32_t device_idx);
 
-/* Write data to device */
-DeviceError write_out(uint32_t device_idx, int16_t* data, uint32_t lenght, uint8_t channels);
+/* Write data to output device */
+DeviceError write_out(uint32_t device_idx, const int16_t *data, uint32_t length, uint8_t channels,
+                      uint32_t sample_rate);
 
-void print_devices(ToxWindow* self, DeviceType type);
+/* return current input volume as float in range 0.0-100.0 */
+float get_input_volume(void);
+
+void print_al_devices(ToxWindow *self, DeviceType type);
 
 DeviceError selection_valid(DeviceType type, int32_t selection);
-#endif /* _device_h */
+#endif /* AUDIO_DEVICE_H */

src/autocomplete.c

@@ -20,108 +20,120 @@
  *
  */
 
+#include <limits.h>
 #include <stdlib.h>
 #include <string.h>
-#include <limits.h>
 
 #ifdef __APPLE__
 #include <sys/types.h>
 #include <sys/dir.h>
 #else
 #include <dirent.h>
-#endif /* ifdef __APPLE__ */
+#endif /* __APPLE__ */
 
-#include "windows.h"
-#include "toxic.h"
-#include "misc_tools.h"
-#include "line_info.h"
-#include "execute.h"
 #include "configdir.h"
+#include "execute.h"
+#include "line_info.h"
+#include "misc_tools.h"
+#include "toxic.h"
+#include "windows.h"
 
-static void print_matches(ToxWindow *self, Tox *m, const void *list, int n_items, int size)
+static void print_ac_matches(ToxWindow *self, Tox *m, char **list, size_t n_matches)
 {
-    if (m)
+    if (m) {
         execute(self->chatwin->history, self, m, "/clear", GLOBAL_COMMAND_MODE);
+    }
 
-    const char *L = (char *) list;
-    int i;
+    for (size_t i = 0; i < n_matches; ++i) {
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "%s", list[i]);
+    }
 
-    for (i = 0; i < n_items; ++i)
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "%s", &L[i * size]);
-
-    line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "");   /* formatting */
+    line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "");
 }
 
 /* puts match in match buffer. if more than one match, add first n chars that are identical.
-   e.g. if matches contains: [foo, foobar, foe] we put fo in matches. */
-static void get_str_match(ToxWindow *self, char *match, char (*matches)[MAX_STR_SIZE], int n)
+ * e.g. if matches contains: [foo, foobar, foe] we put fo in match.
+ *
+ * Returns the length of the match.
+ */
+static size_t get_str_match(ToxWindow *self, char *match, size_t match_sz, const char **matches, size_t n_items,
+                            size_t max_size)
 {
-    if (n == 1) {
-        strcpy(match, matches[0]);
-        return;
+    UNUSED_VAR(self);
+
+    if (n_items == 1) {
+        return snprintf(match, match_sz, "%s", matches[0]);
     }
 
-    int i;
-
-    for (i = 0; i < MAX_STR_SIZE; ++i) {
+    for (size_t i = 0; i < max_size; ++i) {
         char ch1 = matches[0][i];
-        int j;
 
-        for (j = 0; j < n; ++j) {
+        for (size_t j = 0; j < n_items; ++j) {
             char ch2 = matches[j][i];
 
             if (ch1 != ch2 || !ch1) {
-                strcpy(match, matches[0]);
+                snprintf(match, match_sz, "%s", matches[0]);
                 match[i] = '\0';
-                return;
+                return i;
             }
         }
     }
 
-    strcpy(match, matches[0]);
+    return snprintf(match, match_sz, "%s", matches[0]);
 }
 
-/* looks for all instances in list that begin with the last entered word in line according to pos,
-   then fills line with the complete word. e.g. "Hello jo" would complete the line
-   with "Hello john". If multiple matches, prints out all the matches and semi-completes line.
-
-   list is a pointer to the list of strings being compared, n_items is the number of items
-   in the list, and size is the size of each item in the list.
-
-   Returns the difference between the old len and new len of line on success, -1 if error */
-int complete_line(ToxWindow *self, const void *list, int n_items, int size)
+/*
+ * Looks for all instances in list that begin with the last entered word in line according to pos,
+ * then fills line with the complete word. e.g. "Hello jo" would complete the line
+ * with "Hello john". If multiple matches, prints out all the matches and semi-completes line.
+ *
+ * `list` is a pointer to `n_items` strings. Each string in the list must be <= MAX_STR_SIZE.
+ *
+ * dir_search should be true if the line being completed is a file path.
+ *
+ * Returns the difference between the old len and new len of line on success.
+ * Returns -1 on error.
+ *
+ * Note: This function should not be called directly. Use complete_line() and complete_path() instead.
+ */
+static int complete_line_helper(ToxWindow *self, const char **list, const size_t n_items, bool dir_search)
 {
     ChatContext *ctx = self->chatwin;
 
-    if (ctx->pos <= 0 || ctx->len <= 0 || ctx->len >= MAX_STR_SIZE || size > MAX_STR_SIZE)
+    if (ctx->pos <= 0 || ctx->len <= 0 || ctx->pos > ctx->len) {
         return -1;
+    }
+
+    if (ctx->len >= MAX_STR_SIZE) {
+        return -1;
+    }
 
-    const char *L = (char *) list;
     const char *endchrs = " ";
     char ubuf[MAX_STR_SIZE];
 
     /* work with multibyte string copy of buf for simplicity */
-    if (wcs_to_mbs_buf(ubuf, ctx->line, sizeof(ubuf)) == -1)
+    if (wcs_to_mbs_buf(ubuf, ctx->line, sizeof(ubuf)) == -1) {
         return -1;
-
-    bool dir_search = strncmp(ubuf, "/sendfile", strlen("/sendfile")) == 0;
+    }
 
     /* isolate substring from space behind pos to pos */
     char tmp[MAX_STR_SIZE];
-    snprintf(tmp, sizeof(tmp), "%s", ubuf);
-    tmp[ctx->pos] = '\0';
+    memcpy(tmp, ubuf, ctx->pos);
+    tmp[ctx->pos] = 0;
 
-    const char *s = dir_search ? strchr(tmp, '\"') : strrchr(tmp, ' ');
-    char *sub = malloc(strlen(ubuf) + 1);
+    const char *s = dir_search ? strchr(tmp, ' ') : strrchr(tmp, ' ');
+    char *sub = calloc(1, strlen(ubuf) + 1);
 
-    if (sub == NULL)
-        exit_toxic_err("failed in complete_line", FATALERR_MEMORY);
+    if (sub == NULL) {
+        exit_toxic_err("failed in complete_line_helper", FATALERR_MEMORY);
+    }
 
     if (!s && !dir_search) {
         strcpy(sub, tmp);
 
-        if (sub[0] != '/')
+        if (sub[0] != '/') {
             endchrs = ": ";
+        }
     } else if (s) {
         strcpy(sub, &s[1]);
 
@@ -129,70 +141,115 @@ int complete_line(ToxWindow *self, const void *list, int n_items, int size)
             int sub_len = strlen(sub);
             int si = char_rfind(sub, '/', sub_len);
 
-            if (si || *sub == '/')
+            if (si || *sub == '/') {
                 memmove(sub, &sub[si + 1], sub_len - si);
             }
         }
+    }
 
-    if (string_is_empty(sub)) {
+    if (!sub[0] && !(dir_search && n_items == 1)) {
         free(sub);
-        return -1;
+        return 0;
     }
 
     int s_len = strlen(sub);
-    const char *str;
-    int n_matches = 0;
-    char matches[n_items][MAX_STR_SIZE];
-    int i = 0;
+    size_t n_matches = 0;
+
+    char **matches = (char **) malloc_ptr_array(n_items, MAX_STR_SIZE);
+
+    if (matches == NULL) {
+        free(sub);
+        return -1;
+    }
 
     /* put all list matches in matches array */
-    for (i = 0; i < n_items; ++i) {
-        str = &L[i * size];
-
-        if (strncasecmp(str, sub, s_len) == 0)
-            strcpy(matches[n_matches++], str);
+    for (size_t i = 0; i < n_items; ++i) {
+        if (strncasecmp(list[i], sub, s_len) == 0) {
+            snprintf(matches[n_matches++], MAX_STR_SIZE, "%s", list[i]);
+        }
     }
 
     free(sub);
 
-    if (!n_matches)
+    if (!n_matches) {
+        free_ptr_array((void **) matches);
         return -1;
+    }
 
-    if (!dir_search && n_matches > 1)
-        print_matches(self, NULL, matches, n_matches, MAX_STR_SIZE);
+    if (!dir_search && n_matches > 1) {
+        print_ac_matches(self, NULL, matches, n_matches);
+    }
 
     char match[MAX_STR_SIZE];
-    get_str_match(self, match, matches, n_matches);
+    size_t match_len = get_str_match(self, match, sizeof(match), (const char **) matches, n_matches, MAX_STR_SIZE);
+
+    free_ptr_array((void **) matches);
+
+    if (match_len == 0) {
+        return 0;
+    }
 
     if (dir_search) {
-        if (n_matches == 1)
-            endchrs = char_rfind(match, '.', strlen(match)) ? "\"" : "/";
-        else
+        if (n_matches == 1) {
+            endchrs = char_rfind(match, '.', match_len) ? "" : "/";
+        } else {
             endchrs = "";
+        }
     } else if (n_matches > 1) {
         endchrs = "";
     }
 
     /* put match in correct spot in buf and append endchars */
     int n_endchrs = strlen(endchrs);
-    int m_len = strlen(match);
     int strt = ctx->pos - s_len;
-    int diff = m_len - s_len + n_endchrs;
+    int diff = match_len - s_len + n_endchrs;
 
-    if (ctx->len + diff >= MAX_STR_SIZE)
+    if (ctx->len + diff >= MAX_STR_SIZE) {
         return -1;
+    }
 
     char tmpend[MAX_STR_SIZE];
-    strcpy(tmpend, &ubuf[ctx->pos]);
+    snprintf(tmpend, sizeof(tmpend), "%s", &ubuf[ctx->pos]);
+
+    if (match_len + n_endchrs + strlen(tmpend) >= sizeof(ubuf)) {
+        return -1;
+    }
+
     strcpy(&ubuf[strt], match);
-    strcpy(&ubuf[strt + m_len], endchrs);
-    strcpy(&ubuf[strt + m_len + n_endchrs], tmpend);
+
+    /* If path points to a file with no extension don't append a forward slash */
+    if (dir_search && *endchrs == '/') {
+        const char *path_start = strchr(ubuf + 1, '/');
+
+        if (!path_start) {
+            path_start = strchr(ubuf + 1, ' ');
+
+            if (!path_start) {
+                return -1;
+            }
+        }
+
+        if (strlen(path_start) < 2) {
+            return -1;
+        }
+
+        ++path_start;
+
+        if (file_type(path_start) == FILE_TYPE_REGULAR) {
+            endchrs = "";
+            diff -= n_endchrs;
+        }
+    }
+
+    strcpy(&ubuf[strt + match_len], endchrs);
+    strcpy(&ubuf[strt + match_len + n_endchrs], tmpend);
 
     /* convert to widechar and copy back to original buf */
     wchar_t newbuf[MAX_STR_SIZE];
 
-    if (mbs_to_wcs_buf(newbuf, ubuf, MAX_STR_SIZE) == -1)
+    if (mbs_to_wcs_buf(newbuf, ubuf, sizeof(newbuf) / sizeof(wchar_t)) == -1) {
         return -1;
+    }
 
     wcscpy(ctx->line, newbuf);
 
@@ -202,50 +259,82 @@ int complete_line(ToxWindow *self, const void *list, int n_items, int size)
     return diff;
 }
 
-/* transforms a sendfile tab complete contaning the shorthand "~/" into the full home directory.*/
-static void complt_home_dir(ToxWindow *self, char *path, int pathsize)
+int complete_line(ToxWindow *self, const char **list, size_t n_items)
+{
+    return complete_line_helper(self, list, n_items, false);
+}
+
+static int complete_path(ToxWindow *self, const char **list, const size_t n_items)
+{
+    return complete_line_helper(self, list, n_items, true);
+}
+
+/* Transforms a tab complete starting with the shorthand "~" into the full home directory. */
+static void complete_home_dir(ToxWindow *self, char *path, int pathsize, const char *cmd, int cmdlen)
 {
     ChatContext *ctx = self->chatwin;
 
-    char homedir[MAX_STR_SIZE];
+    char homedir[MAX_STR_SIZE] = {0};
     get_home_dir(homedir, sizeof(homedir));
 
-    char newline[MAX_STR_SIZE];
-    snprintf(newline, sizeof(newline), "/sendfile \"%s%s", homedir, path + 1);
-    snprintf(path, pathsize, "%s", &newline[11]);
+    char newline[MAX_STR_SIZE + 1];
+    snprintf(newline, sizeof(newline), "%s %s%s", cmd, homedir, path + 1);
+    snprintf(path, pathsize, "%s", &newline[cmdlen - 1]);
 
     wchar_t wline[MAX_STR_SIZE];
 
-    if (mbs_to_wcs_buf(wline, newline, sizeof(wline)) == -1)
+    if (mbs_to_wcs_buf(wline, newline, sizeof(wline) / sizeof(wchar_t)) == -1) {
         return;
+    }
 
     int newlen = wcslen(wline);
 
-    if (ctx->len + newlen >= MAX_STR_SIZE)
+    if (ctx->len + newlen >= MAX_STR_SIZE) {
         return;
+    }
 
     wmemcpy(ctx->line, wline, newlen + 1);
     ctx->pos = newlen;
     ctx->len = ctx->pos;
 }
 
-/*  attempts to match /sendfile "<incomplete-dir>" line to matching directories.
-
-    if only one match, auto-complete line.
-    return diff between old len and new len of ctx->line, -1 if no matches or > 1 match */
-#define MAX_DIRS 512
-
-int dir_match(ToxWindow *self, Tox *m, const wchar_t *line)
+/*
+ * Return true if the first `p_len` chars in `s` are equal to `p` and `s` is a valid directory name.
+ */
+static bool is_partial_match(const char *s, const char *p, size_t p_len)
 {
-    char b_path[MAX_STR_SIZE];
-    char b_name[MAX_STR_SIZE];
-    const wchar_t *tmpline = &line[11];   /* start after "/sendfile \"" */
+    if (s == NULL || p == NULL) {
+        return false;
+    }
 
-    if (wcs_to_mbs_buf(b_path, tmpline, sizeof(b_path)) == -1)
+    return strncmp(s, p, p_len) == 0 && strcmp(".", s) != 0 && strcmp("..", s) != 0;
+}
+
+/* Attempts to match /command "<incomplete-dir>" line to matching directories.
+ * If there is only one match the line is auto-completed.
+ *
+ * Returns the diff between old len and new len of ctx->line on success.
+ * Returns -1 if no matches or more than one match.
+ */
+#define MAX_DIRS 75
+int dir_match(ToxWindow *self, Tox *m, const wchar_t *line, const wchar_t *cmd)
+{
+    char b_path[MAX_STR_SIZE + 1];
+    char b_name[MAX_STR_SIZE + 1];
+    char b_cmd[MAX_STR_SIZE];
+    const wchar_t *tmpline = &line[wcslen(cmd) + 1];   /* start after "/command " */
+
+    if (wcs_to_mbs_buf(b_path, tmpline, sizeof(b_path) - 1) == -1) {
         return -1;
+    }
 
-    if (!strncmp(b_path, "~/", 2))
-        complt_home_dir(self, b_path, sizeof(b_path));
+    if (wcs_to_mbs_buf(b_cmd, cmd, sizeof(b_cmd)) == -1) {
+        return -1;
+    }
+
+    if (b_path[0] == '~') {
+        complete_home_dir(self, b_path, sizeof(b_path) - 1, b_cmd, strlen(b_cmd) + 2);
+    }
 
     int si = char_rfind(b_path, '/', strlen(b_path));
 
@@ -253,39 +342,52 @@ int dir_match(ToxWindow *self, Tox *m, const wchar_t *line)
         b_path[0] = '.';
         b_path[1] = '\0';
     } else if (!si && b_path[0] != '/') {    /* look for matches in pwd */
-        char tmp[MAX_STR_SIZE];
-        snprintf(tmp, sizeof(tmp), ".%s", b_path);
-        strcpy(b_path, tmp);  
+        memmove(b_path + 1, b_path, sizeof(b_path) - 1);
+        b_path[0] = '.';
     }
 
-    strcpy(b_name, &b_path[si + 1]);
+    snprintf(b_name, sizeof(b_name), "%s", &b_path[si + 1]);
     b_path[si + 1] = '\0';
-    int b_name_len = strlen(b_name);
-
+    size_t b_name_len = strlen(b_name);
     DIR *dp = opendir(b_path);
 
-    if (dp == NULL)
+    if (dp == NULL) {
         return -1;
+    }
+
+    char **dirnames = (char **) malloc_ptr_array(MAX_DIRS, NAME_MAX + 1);
+
+    if (dirnames == NULL) {
+        closedir(dp);
+        return -1;
+    }
 
-    char dirnames[MAX_DIRS][NAME_MAX];
     struct dirent *entry;
+
     int dircount = 0;
 
     while ((entry = readdir(dp)) && dircount < MAX_DIRS) {
-        if (strncmp(entry->d_name, b_name, b_name_len) == 0 
-                                && strcmp(".", entry->d_name) && strcmp("..", entry->d_name)) {
-            snprintf(dirnames[dircount], sizeof(dirnames[dircount]), "%s", entry->d_name);
+        if (is_partial_match(entry->d_name, b_name, b_name_len)) {
+            snprintf(dirnames[dircount], NAME_MAX + 1, "%s", entry->d_name);
             ++dircount;
         }
     }
 
-    if (dircount == 0)
+    closedir(dp);
+
+    if (dircount == 0) {
+        free_ptr_array((void **) dirnames);
         return -1;
+    }
 
     if (dircount > 1) {
-        qsort(dirnames, dircount, NAME_MAX, qsort_strcasecmp_hlpr);
-        print_matches(self, m, dirnames, dircount, NAME_MAX);
+        qsort(dirnames, dircount, sizeof(char *), qsort_ptr_char_array_helper);
+        print_ac_matches(self, m, dirnames, dircount);
     }
 
-    return complete_line(self, dirnames, dircount, NAME_MAX);
+    int ret = complete_path(self, (const char **) dirnames, dircount);
+
+    free_ptr_array((void **) dirnames);
+
+    return ret;
 }

src/autocomplete.h

@@ -20,23 +20,33 @@
  *
  */
 
-#ifndef _autocomplete_h
-#define _autocomplete_h
+#ifndef AUTOCOMPLETE_H
+#define AUTOCOMPLETE_H
 
-/* looks for all instances in list that begin with the last entered word in line according to pos,
-   then fills line with the complete word. e.g. "Hello jo" would complete the line
-   with "Hello john". If multiple matches, prints out all the matches and semi-completes line.
+#include "windows.h"
 
-   list is a pointer to the list of strings being compared, n_items is the number of items
-   in the list, and size is the size of each item in the list.
+/*
+ * Looks for all instances in list that begin with the last entered word in line according to pos,
+ * then fills line with the complete word. e.g. "Hello jo" would complete the line
+ * with "Hello john". If multiple matches, prints out all the matches and semi-completes line.
+ *
+* `list` is a pointer to `n_items` strings.
+ *
+ * dir_search should be true if the line being completed is a file path.
+ *
+ * Returns the difference between the old len and new len of line on success.
+ * Returns -1 on error.
+ *
+ * Note: This function should not be called directly. Use complete_line() and complete_path() instead.
+ */
+int complete_line(ToxWindow *self, const char **list, size_t n_items);
 
-   Returns the difference between the old len and new len of line on success, -1 if error */
-int complete_line(ToxWindow *self, const void *list, int n_items, int size);
+/* Attempts to match /command "<incomplete-dir>" line to matching directories.
+ * If there is only one match the line is auto-completed.
+ *
+ * Returns the diff between old len and new len of ctx->line on success.
+ * Returns -1 if no matches or more than one match.
+ */
+int dir_match(ToxWindow *self, Tox *m, const wchar_t *line, const wchar_t *cmd);
 
-/*  attempts to match /sendfile "<incomplete-dir>" line to matching directories.
-
-    if only one match, auto-complete line.
-    return diff between old len and new len of ctx->line, -1 if no matches or > 1 match */
-int dir_match(ToxWindow *self, Tox *m, const wchar_t *line);
-
-#endif  /* #define _autocomplete_h */
+#endif /* AUTOCOMPLETE_H */

src/avatars.c

@@ -0,0 +1,262 @@
+/*  avatars.c
+ *
+ *
+ *  Copyright (C) 2015 Toxic All Rights Reserved.
+ *
+ *  This file is part of Toxic.
+ *
+ *  Toxic is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Toxic is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Toxic.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "avatars.h"
+#include "file_transfers.h"
+#include "friendlist.h"
+#include "misc_tools.h"
+
+extern FriendsList Friends;
+
+static struct Avatar {
+    char name[TOX_MAX_FILENAME_LENGTH + 1];
+    size_t name_len;
+    char path[PATH_MAX + 1];
+    size_t path_len;
+    off_t size;
+} Avatar;
+
+/* Compares the first size bytes of fp to signature.
+ *
+ * Returns 0 if they are the same
+ * Returns 1 if they differ
+ * Returns -1 on error.
+ *
+ * On success this function will seek back to the beginning of fp.
+ */
+static int check_file_signature(const unsigned char *signature, size_t size, FILE *fp)
+{
+    char *buf = malloc(size);
+
+    if (buf == NULL) {
+        return -1;
+    }
+
+    if (fread(buf, size, 1, fp) != 1) {
+        free(buf);
+        return -1;
+    }
+
+    int ret = memcmp(signature, buf, size);
+
+    free(buf);
+
+    if (fseek(fp, 0L, SEEK_SET) == -1) {
+        return -1;
+    }
+
+    return ret == 0 ? 0 : 1;
+}
+
+static void avatar_clear(void)
+{
+    Avatar = (struct Avatar) {
+        0
+    };
+}
+
+/* Sends avatar to friendnumber.
+ *
+ * Returns 0 on success.
+ * Returns -1 on failure.
+ */
+int avatar_send(Tox *m, uint32_t friendnumber)
+{
+    Tox_Err_File_Send err;
+    uint32_t filenumber = tox_file_send(m, friendnumber, TOX_FILE_KIND_AVATAR, (size_t) Avatar.size,
+                                        NULL, (uint8_t *) Avatar.name, Avatar.name_len, &err);
+
+    if (Avatar.size == 0) {
+        return 0;
+    }
+
+    if (err != TOX_ERR_FILE_SEND_OK) {
+        fprintf(stderr, "tox_file_send failed for friendnumber %u (error %d)\n", friendnumber, err);
+        return -1;
+    }
+
+    struct FileTransfer *ft = new_file_transfer(NULL, friendnumber, filenumber, FILE_TRANSFER_SEND, TOX_FILE_KIND_AVATAR);
+
+    if (!ft) {
+        return -1;
+    }
+
+    ft->file = fopen(Avatar.path, "r");
+
+    if (ft->file == NULL) {
+        return -1;
+    }
+
+    snprintf(ft->file_name, sizeof(ft->file_name), "%s", Avatar.name);
+    ft->file_size = Avatar.size;
+
+    return 0;
+}
+
+/* Sends avatar to all friends */
+static void avatar_send_all(Tox *m)
+{
+    for (size_t i = 0; i < Friends.max_idx; ++i) {
+        if (Friends.list[i].connection_status != TOX_CONNECTION_NONE) {
+            avatar_send(m, Friends.list[i].num);
+        }
+    }
+}
+
+/* Sets avatar to path and sends it to all online contacts.
+ *
+ * Returns 0 on success.
+ * Returns -1 on failure.
+ */
+int avatar_set(Tox *m, const char *path, size_t path_len)
+{
+    if (path_len == 0 || path_len >= sizeof(Avatar.path)) {
+        return -1;
+    }
+
+    FILE *fp = fopen(path, "rb");
+
+    if (fp == NULL) {
+        return -1;
+    }
+
+    unsigned char PNG_signature[8] = {0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A};
+
+    if (check_file_signature(PNG_signature, sizeof(PNG_signature), fp) != 0) {
+        fclose(fp);
+        return -1;
+    }
+
+    fclose(fp);
+
+    off_t size = file_size(path);
+
+    if (size == 0 || size > MAX_AVATAR_FILE_SIZE) {
+        return -1;
+    }
+
+    get_file_name(Avatar.name, sizeof(Avatar.name), path);
+    Avatar.name_len = strlen(Avatar.name);
+    snprintf(Avatar.path, sizeof(Avatar.path), "%s", path);
+    Avatar.path_len = path_len;
+    Avatar.size = size;
+
+    avatar_send_all(m);
+
+    return 0;
+}
+
+/* Unsets avatar and sends to all online contacts.
+ *
+ * Returns 0 on success.
+ * Returns -1 on failure.
+ */
+void avatar_unset(Tox *m)
+{
+    avatar_clear();
+    avatar_send_all(m);
+}
+
+void on_avatar_friend_connection_status(Tox *m, uint32_t friendnumber, Tox_Connection connection_status)
+{
+    if (connection_status == TOX_CONNECTION_NONE) {
+        kill_avatar_file_transfers_friend(m, friendnumber);
+    }
+}
+
+void on_avatar_file_control(Tox *m, struct FileTransfer *ft, Tox_File_Control control)
+{
+    switch (control) {
+        case TOX_FILE_CONTROL_RESUME:
+            if (ft->state == FILE_TRANSFER_PENDING) {
+                ft->state = FILE_TRANSFER_STARTED;
+            } else if (ft->state == FILE_TRANSFER_PAUSED) {
+                ft->state = FILE_TRANSFER_STARTED;
+            }
+
+            break;
+
+        case TOX_FILE_CONTROL_PAUSE:
+            ft->state = FILE_TRANSFER_PAUSED;
+            break;
+
+        case TOX_FILE_CONTROL_CANCEL:
+            close_file_transfer(NULL, m, ft, -1, NULL, silent);
+            break;
+    }
+}
+
+void on_avatar_chunk_request(Tox *m, struct FileTransfer *ft, uint64_t position, size_t length)
+{
+    if (ft->state != FILE_TRANSFER_STARTED) {
+        return;
+    }
+
+    if (length == 0) {
+        close_file_transfer(NULL, m, ft, -1, NULL, silent);
+        return;
+    }
+
+    if (ft->file == NULL) {
+        close_file_transfer(NULL, m, ft, TOX_FILE_CONTROL_CANCEL, NULL, silent);
+        return;
+    }
+
+    if (ft->position != position) {
+        if (fseek(ft->file, position, SEEK_SET) == -1) {
+            close_file_transfer(NULL, m, ft, TOX_FILE_CONTROL_CANCEL, NULL, silent);
+            return;
+        }
+
+        ft->position = position;
+    }
+
+    uint8_t *send_data = malloc(length);
+
+    if (send_data == NULL) {
+        close_file_transfer(NULL, m, ft, TOX_FILE_CONTROL_CANCEL, NULL, silent);
+        return;
+    }
+
+    size_t send_length = fread(send_data, 1, length, ft->file);
+
+    if (send_length != length) {
+        close_file_transfer(NULL, m, ft, TOX_FILE_CONTROL_CANCEL, NULL, silent);
+        free(send_data);
+        return;
+    }
+
+    Tox_Err_File_Send_Chunk err;
+    tox_file_send_chunk(m, ft->friendnumber, ft->filenumber, position, send_data, send_length, &err);
+
+    free(send_data);
+
+    if (err != TOX_ERR_FILE_SEND_CHUNK_OK) {
+        fprintf(stderr, "tox_file_send_chunk failed in avatar callback (error %d)\n", err);
+    }
+
+    ft->position += send_length;
+}

src/avatars.h

@@ -0,0 +1,55 @@
+/*  avatars.h
+ *
+ *
+ *  Copyright (C) 2015 Toxic All Rights Reserved.
+ *
+ *  This file is part of Toxic.
+ *
+ *  Toxic is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Toxic is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Toxic.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef AVATARS_H
+#define AVATARS_H
+
+#include "file_transfers.h"
+
+#define MAX_AVATAR_FILE_SIZE 65536
+
+/* Sends avatar to friendnum.
+ *
+ * Returns 0 on success.
+ * Returns -1 on failure.
+ */
+int avatar_send(Tox *m, uint32_t friendnum);
+
+/* Sets avatar to path and sends it to all online contacts.
+ *
+ * Returns 0 on success.
+ * Returns -1 on failure.
+ */
+int avatar_set(Tox *m, const char *path, size_t length);
+
+/* Unsets avatar and sends to all online contacts.
+ *
+ * Returns 0 on success.
+ * Returns -1 on failure.
+ */
+void avatar_unset(Tox *m);
+
+void on_avatar_chunk_request(Tox *m, struct FileTransfer *ft, uint64_t position, size_t length);
+void on_avatar_file_control(Tox *m, struct FileTransfer *ft, Tox_File_Control control);
+void on_avatar_friend_connection_status(Tox *m, uint32_t friendnumber, Tox_Connection connection_status);
+
+#endif /* AVATARS_H */

src/bootstrap.c

@@ -0,0 +1,635 @@
+/*  bootstrap.c
+ *
+ *
+ *  Copyright (C) 2016 Toxic All Rights Reserved.
+ *
+ *  This file is part of Toxic.
+ *
+ *  Toxic is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Toxic is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Toxic.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <arpa/inet.h>
+#include <limits.h>
+#include <netinet/in.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/socket.h>
+
+#include <curl/curl.h>
+#include <tox/tox.h>
+
+#include "configdir.h"
+#include "curl_util.h"
+#include "line_info.h"
+#include "misc_tools.h"
+#include "prompt.h"
+#include "settings.h"
+#include "windows.h"
+
+extern struct arg_opts arg_opts;
+extern struct user_settings *user_settings;
+extern struct Winthread Winthread;
+
+/* URL that we get the JSON encoded nodes list from. */
+#define NODES_LIST_URL "https://nodes.tox.chat/json"
+
+#define DEFAULT_NODES_FILENAME "DHTnodes.json"
+
+/* Time to wait between bootstrap attempts */
+#define TRY_BOOTSTRAP_INTERVAL 5
+
+/* Number of nodes to bootstrap to per try */
+#define NUM_BOOTSTRAP_NODES 5
+
+/* Number of seconds since last successful ping before we consider a node offline */
+#define NODE_OFFLINE_TIMOUT (60*60*24*2)
+
+#define IP_MAX_SIZE 45
+#define IP_MIN_SIZE 7
+#define PORT_MAX_SIZE 5
+
+#define LAST_SCAN_JSON_KEY "\"last_scan\":"
+#define LAST_SCAN_JSON_KEY_LEN (sizeof(LAST_SCAN_JSON_KEY) - 1)
+
+#define IPV4_JSON_KEY "\"ipv4\":\""
+#define IPV4_JSON_KEY_LEN (sizeof(IPV4_JSON_KEY) - 1)
+
+#define IPV6_JSON_KEY "\"ipv6\":\""
+#define IPV6_JSON_KEY_LEN (sizeof(IPV6_JSON_KEY) - 1)
+
+#define PORT_JSON_KEY "\"port\":"
+#define PORT_JSON_KEY_LEN (sizeof(PORT_JSON_KEY) - 1)
+
+#define PK_JSON_KEY "\"public_key\":\""
+#define PK_JSON_KEY_LEN (sizeof(PK_JSON_KEY) - 1)
+
+#define LAST_PING_JSON_KEY "\"last_ping\":"
+#define LAST_PING_JSON_KEY_LEN (sizeof(LAST_PING_JSON_KEY) - 1)
+
+/* Maximum allowable size of the nodes list */
+#define MAX_NODELIST_SIZE (MAX_RECV_CURL_DATA_SIZE)
+
+
+static struct Thread_Data {
+    pthread_t tid;
+    pthread_attr_t attr;
+    pthread_mutex_t lock;
+    volatile bool active;
+} thread_data;
+
+#define MAX_NODES 50
+struct Node {
+    char ip4[IP_MAX_SIZE + 1];
+    bool have_ip4;
+
+    char ip6[IP_MAX_SIZE + 1];
+    bool have_ip6;
+
+    char key[TOX_PUBLIC_KEY_SIZE];
+    uint16_t port;
+};
+
+static struct DHT_Nodes {
+    struct Node list[MAX_NODES];
+    size_t count;
+    time_t last_updated;
+} Nodes;
+
+/* Return true if address appears to be a valid ipv4 address. */
+static bool is_ip4_address(const char *address)
+{
+    struct sockaddr_in s_addr;
+    return inet_pton(AF_INET, address, &(s_addr.sin_addr)) != 0;
+}
+
+/* Return true if address roughly appears to be a valid ipv6 address.
+ *
+ * TODO: Improve this function (inet_pton behaves strangely with ipv6).
+ * for now the only guarantee is that it won't return true if the
+ * address is a domain or ipv4 address, and should only be used if you're
+ * reasonably sure that the address is one of the three (ipv4, ipv6 or a domain).
+ */
+static bool is_ip6_address(const char *address)
+{
+    size_t num_colons = 0;
+    char ch = 0;
+
+    for (size_t i = 0; (ch = address[i]); ++i) {
+        if (ch == '.') {
+            return false;
+        }
+
+        if (ch == ':') {
+            ++num_colons;
+        }
+    }
+
+    return num_colons > 1 && num_colons < 8;
+}
+
+/* Determine if a node is offline by comparing the age of the nodeslist
+ * to the last time the node was successfully pinged.
+ */
+static bool node_is_offline(unsigned long long int last_ping)
+{
+    return last_ping + NODE_OFFLINE_TIMOUT <= last_ping;
+}
+
+/* Return true if nodeslist pointed to by fp needs to be updated.
+ * This will be the case if the file is empty, has an invalid format,
+ * or if the file is older than the given timeout.
+ */
+static bool nodeslist_needs_update(const char *nodes_path)
+{
+    if (user_settings->nodeslist_update_freq <= 0) {
+        return false;
+    }
+
+    FILE *fp = fopen(nodes_path, "r+");
+
+    if (fp == NULL) {
+        return false;
+    }
+
+    /* last_scan value should be at beginning of file */
+    char line[LAST_SCAN_JSON_KEY_LEN + 32];
+
+    if (fgets(line, sizeof(line), fp) == NULL) {
+        fclose(fp);
+        return true;
+    }
+
+    fclose(fp);
+
+    const char *last_scan_val = strstr(line, LAST_SCAN_JSON_KEY);
+
+    if (last_scan_val == NULL) {
+        return true;
+    }
+
+    long long int last_scan = strtoll(last_scan_val + LAST_SCAN_JSON_KEY_LEN, NULL, 10);
+
+    pthread_mutex_lock(&thread_data.lock);
+    Nodes.last_updated = last_scan;
+    pthread_mutex_unlock(&thread_data.lock);
+
+    pthread_mutex_lock(&Winthread.lock);
+    bool is_timeout = timed_out(last_scan, user_settings->nodeslist_update_freq * 24 * 60 * 60);
+    pthread_mutex_unlock(&Winthread.lock);
+
+    if (is_timeout) {
+        return true;
+    }
+
+    return false;
+}
+
+/* Fetches the JSON encoded DHT nodeslist from NODES_LIST_URL.
+ *
+ * Return 0 on success.
+ * Return -1 on failure.
+ */
+static int curl_fetch_nodes_JSON(struct Recv_Curl_Data *recv_data)
+{
+    CURL *c_handle = curl_easy_init();
+
+    if (c_handle == NULL) {
+        return -1;
+    }
+
+    int err = -1;
+
+    struct curl_slist *headers = NULL;
+    headers = curl_slist_append(headers, "Content-Type: application/json");
+    headers = curl_slist_append(headers, "charsets: utf-8");
+
+    curl_easy_setopt(c_handle, CURLOPT_HTTPHEADER, headers);
+    curl_easy_setopt(c_handle, CURLOPT_URL, NODES_LIST_URL);
+    curl_easy_setopt(c_handle, CURLOPT_WRITEFUNCTION, curl_cb_write_data);
+    curl_easy_setopt(c_handle, CURLOPT_WRITEDATA, recv_data);
+    curl_easy_setopt(c_handle, CURLOPT_USERAGENT, "libcurl-agent/1.0");
+    curl_easy_setopt(c_handle, CURLOPT_HTTPGET, 1L);
+
+    int proxy_ret = set_curl_proxy(c_handle, arg_opts.proxy_address, arg_opts.proxy_port, arg_opts.proxy_type);
+
+    if (proxy_ret != 0) {
+        fprintf(stderr, "set_curl_proxy() failed with error %d\n", proxy_ret);
+        goto on_exit;
+    }
+
+    int ret = curl_easy_setopt(c_handle, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1_2);
+
+    if (ret != CURLE_OK) {
+        fprintf(stderr, "TLSv1.2 could not be set (libcurl error %d)", ret);
+        goto on_exit;
+    }
+
+    ret = curl_easy_setopt(c_handle, CURLOPT_SSL_CIPHER_LIST, TLS_CIPHER_SUITE_LIST);
+
+    if (ret != CURLE_OK) {
+        fprintf(stderr, "Failed to set TLS cipher list (libcurl error %d)", ret);
+        goto on_exit;
+    }
+
+    ret = curl_easy_perform(c_handle);
+
+    if (ret != CURLE_OK) {
+        /* If system doesn't support any of the specified ciphers suites, fall back to default */
+        if (ret == CURLE_SSL_CIPHER) {
+            curl_easy_setopt(c_handle, CURLOPT_SSL_CIPHER_LIST, NULL);
+            ret = curl_easy_perform(c_handle);
+        }
+
+        if (ret != CURLE_OK) {
+            fprintf(stderr, "HTTPS lookup error (libcurl error %d)\n", ret);
+            goto on_exit;
+        }
+    }
+
+    err = 0;
+
+on_exit:
+    curl_slist_free_all(headers);
+    curl_easy_cleanup(c_handle);
+    return err;
+}
+
+/* Attempts to update the DHT nodeslist.
+ *
+ * Return 1 if list was updated successfully.
+ * Return 0 if list does not need to be updated.
+ * Return -1 if file cannot be opened.
+ * Return -2 if http lookup failed.
+ * Return -3 if http reponse was empty.
+ * Return -4 if data could not be written to disk.
+ * Return -5 if memory allocation fails.
+ */
+static int update_DHT_nodeslist(const char *nodes_path)
+{
+    if (!nodeslist_needs_update(nodes_path)) {
+        return 0;
+    }
+
+    FILE *fp = fopen(nodes_path, "r+");
+
+    if (fp == NULL) {
+        return -1;
+    }
+
+    struct Recv_Curl_Data *recv_data = calloc(1, sizeof(struct Recv_Curl_Data));
+
+    if (recv_data == NULL) {
+        fclose(fp);
+        return -5;
+    }
+
+    if (curl_fetch_nodes_JSON(recv_data) == -1) {
+        free(recv_data);
+        fclose(fp);
+        return -2;
+    }
+
+    if (recv_data->length == 0) {
+        free(recv_data);
+        fclose(fp);
+        return -3;
+    }
+
+    if (fwrite(recv_data->data, recv_data->length, 1, fp) != 1) {
+        free(recv_data);
+        fclose(fp);
+        return -4;
+    }
+
+    free(recv_data);
+    fclose(fp);
+
+    return 1;
+}
+
+static void get_nodeslist_path(char *buf, size_t buf_size)
+{
+    char *config_dir = NULL;
+
+    if (arg_opts.nodes_path[0]) {
+        snprintf(buf, buf_size, "%s", arg_opts.nodes_path);
+    } else if ((config_dir = get_user_config_dir()) != NULL) {
+        snprintf(buf, buf_size, "%s%s%s", config_dir, CONFIGDIR, DEFAULT_NODES_FILENAME);
+        free(config_dir);
+    } else {
+        snprintf(buf, buf_size, "%s", DEFAULT_NODES_FILENAME);
+    }
+}
+
+/* Return true if json encoded string s contains a valid IP address and puts address in ip_buf.
+ *
+ * ip_type should be set to 1 for ipv4 address, or 0 for ipv6 addresses.
+ * ip_buf must have room for at least IP_MAX_SIZE + 1 bytes.
+ */
+static bool extract_val_ip(const char *s, char *ip_buf, unsigned short int ip_type)
+{
+    int ip_len = char_find(0, s, '"');
+
+    if (ip_len < IP_MIN_SIZE || ip_len > IP_MAX_SIZE) {
+        return false;
+    }
+
+    memcpy(ip_buf, s, ip_len);
+    ip_buf[ip_len] = 0;
+
+    return (ip_type == 1) ? is_ip4_address(ip_buf) : is_ip6_address(ip_buf);
+}
+
+/* Extracts the port from json encoded string s.
+ *
+ * Return port number on success.
+ * Return 0 on failure.
+ */
+static uint16_t extract_val_port(const char *s)
+{
+    long int port = strtol(s, NULL, 10);
+    return (port > 0 && port <= MAX_PORT_RANGE) ? port : 0;
+}
+
+/* Extracts the last pinged value from json encoded string s.
+ *
+ * Return timestamp on success.
+ * Return -1 on failure.
+ */
+static long long int extract_val_last_pinged(const char *s)
+{
+    long long int last_pinged = strtoll(s, NULL, 10);
+    return (last_pinged <= 0) ? -1 : last_pinged;
+}
+
+/* Extracts DHT public key from json encoded string s and puts key in key_buf.
+ * key_buf must have room for at least TOX_PUBLIC_KEY_SIZE * 2 + 1 bytes.
+ *
+ * Return number of bytes copied to key_buf on success.
+ * Return -1 on failure.
+ */
+static int extract_val_pk(const char *s, char *key_buf)
+{
+
+    int key_len = char_find(0, s, '"');
+
+    if (key_len != TOX_PUBLIC_KEY_SIZE * 2) {
+        return -1;
+    }
+
+    memcpy(key_buf, s, key_len);
+    key_buf[key_len] = 0;
+
+    return key_len;
+}
+
+/* Extracts values from json formatted string, validats them, and puts them in node.
+ *
+ * Return 0 on success.
+ * Return -1 if line is empty.
+ * Return -2 if line does not appear to be a valid nodes list entry.
+ * Return -3 if node appears to be offline.
+ * Return -4 if entry does not contain either a valid ipv4 or ipv6 address.
+ * Return -5 if port value is invalid.
+ * Return -6 if public key is invalid.
+ */
+static int extract_node(const char *line, struct Node *node)
+{
+    if (!line) {
+        return -1;
+    }
+
+    const char *ip4_start = strstr(line, IPV4_JSON_KEY);
+    const char *ip6_start = strstr(line, IPV6_JSON_KEY);
+    const char *port_start = strstr(line, PORT_JSON_KEY);
+    const char *key_start = strstr(line, PK_JSON_KEY);
+    const char *last_pinged_str = strstr(line, LAST_PING_JSON_KEY);
+
+    if (!ip4_start || !ip6_start || !port_start || !key_start || !last_pinged_str) {
+        return -2;
+    }
+
+    long long int last_pinged = extract_val_last_pinged(last_pinged_str + LAST_PING_JSON_KEY_LEN);
+
+    if (last_pinged <= 0 || node_is_offline(last_pinged)) {
+        return -3;
+    }
+
+    char ip4_string[IP_MAX_SIZE + 1];
+    bool have_ip4 = extract_val_ip(ip4_start + IPV4_JSON_KEY_LEN, ip4_string, 1);
+
+    char ip6_string[IP_MAX_SIZE + 1];
+    bool have_ip6 = extract_val_ip(ip6_start + IPV6_JSON_KEY_LEN, ip6_string, 0);
+
+    if (!have_ip6 && !have_ip4) {
+        return -4;
+    }
+
+    uint16_t port = extract_val_port(port_start + PORT_JSON_KEY_LEN);
+
+    if (port == 0) {
+        return -5;
+    }
+
+    char key_string[TOX_PUBLIC_KEY_SIZE * 2 + 1];
+    int key_len = extract_val_pk(key_start + PK_JSON_KEY_LEN, key_string);
+
+    if (key_len == -1) {
+        return -6;
+    }
+
+    if (hex_string_to_bin(key_string, key_len, node->key, TOX_PUBLIC_KEY_SIZE) == -1) {
+        return -6;
+    }
+
+    if (have_ip4) {
+        snprintf(node->ip4, sizeof(node->ip4), "%s", ip4_string);
+        node->have_ip4 = true;
+    }
+
+    if (have_ip6) {
+        snprintf(node->ip6, sizeof(node->ip6), "%s", ip6_string);
+        node->have_ip6 = true;
+    }
+
+    node->port = port;
+
+    return 0;
+}
+
+/* Loads the DHT nodeslist to memory from json encoded nodes file. */
+void *load_nodeslist_thread(void *data)
+{
+    UNUSED_VAR(data);
+
+    char nodes_path[PATH_MAX];
+    get_nodeslist_path(nodes_path, sizeof(nodes_path));
+
+    FILE *fp = NULL;
+
+    if (!file_exists(nodes_path)) {
+        if ((fp = fopen(nodes_path, "w+")) == NULL) {
+            fprintf(stderr, "nodeslist load error: failed to create file '%s'\n", nodes_path);
+            goto on_exit;
+        }
+    } else if ((fp = fopen(nodes_path, "r+")) == NULL) {
+        fprintf(stderr, "nodeslist load error: failed to open file '%s'\n", nodes_path);
+        goto on_exit;
+    }
+
+    int update_err = update_DHT_nodeslist(nodes_path);
+
+    if (update_err < 0) {
+        fprintf(stderr, "update_DHT_nodeslist() failed with error %d\n", update_err);
+    }
+
+    char line[MAX_NODELIST_SIZE + 1];
+
+    if (fgets(line, sizeof(line), fp) == NULL) {
+        fclose(fp);
+        fprintf(stderr, "nodeslist load error: file empty.\n");
+        goto on_exit;
+    }
+
+    size_t idx = 0;
+    const char *line_start = line;
+
+    while ((line_start = strstr(line_start + 1, IPV4_JSON_KEY))) {
+        pthread_mutex_lock(&thread_data.lock);
+        idx = Nodes.count;
+
+        if (idx >= MAX_NODES) {
+            pthread_mutex_unlock(&thread_data.lock);
+            break;
+        }
+
+        if (extract_node(line_start, &Nodes.list[idx]) == 0) {
+            ++Nodes.count;
+        }
+
+        pthread_mutex_unlock(&thread_data.lock);
+    }
+
+    /* If nodeslist does not contain any valid entries we set the last_scan value
+     * to 0 so that it will fetch a new list the next time this function is called.
+     */
+    if (Nodes.count == 0) {
+        const char *s = "{\"last_scan\":0}";
+        rewind(fp);
+        fwrite(s, strlen(s), 1, fp);  // Not much we can do if it fails
+        fclose(fp);
+        fprintf(stderr, "nodeslist load error: List did not contain any valid entries.\n");
+        goto on_exit;
+    }
+
+    fclose(fp);
+
+on_exit:
+    thread_data.active = false;
+    pthread_attr_destroy(&thread_data.attr);
+    pthread_exit(0);
+}
+
+/* Creates a new thread that will load the DHT nodeslist to memory
+ * from json encoded nodes file obtained at NODES_LIST_URL. Only one
+ * thread may run at a time.
+ *
+ * Return 0 on success.
+ * Return -1 if a thread is already active.
+ * Return -2 if mutex fails to init.
+ * Return -3 if pthread attribute fails to init.
+ * Return -4 if pthread fails to set detached state.
+ * Return -5 if thread creation fails.
+ */
+int load_DHT_nodeslist(void)
+{
+    if (thread_data.active) {
+        return -1;
+    }
+
+    if (pthread_mutex_init(&thread_data.lock, NULL) != 0) {
+        return -2;
+    }
+
+    if (pthread_attr_init(&thread_data.attr) != 0) {
+        return -3;
+    }
+
+    if (pthread_attr_setdetachstate(&thread_data.attr, PTHREAD_CREATE_DETACHED) != 0) {
+        return -4;
+    }
+
+    thread_data.active = true;
+
+    if (pthread_create(&thread_data.tid, &thread_data.attr, load_nodeslist_thread, NULL) != 0) {
+        thread_data.active = false;
+        return -5;
+    }
+
+    return 0;
+}
+
+/* Connects to NUM_BOOTSTRAP_NODES random DHT nodes listed in the DHTnodes file. */
+static void DHT_bootstrap(Tox *m)
+{
+    pthread_mutex_lock(&thread_data.lock);
+    size_t num_nodes = Nodes.count;
+    pthread_mutex_unlock(&thread_data.lock);
+
+    if (num_nodes == 0) {
+        return;
+    }
+
+    size_t i;
+
+    pthread_mutex_lock(&thread_data.lock);
+
+    for (i = 0; i < NUM_BOOTSTRAP_NODES; ++i) {
+        struct Node *node = &Nodes.list[rand() % Nodes.count];
+        const char *addr = node->have_ip4 ? node->ip4 : node->ip6;
+
+        if (!addr) {
+            continue;
+        }
+
+        Tox_Err_Bootstrap err;
+        tox_bootstrap(m, addr, node->port, (uint8_t *) node->key, &err);
+
+        if (err != TOX_ERR_BOOTSTRAP_OK) {
+            fprintf(stderr, "Failed to bootstrap %s:%d\n", addr, node->port);
+        }
+
+        tox_add_tcp_relay(m, addr, node->port, (uint8_t *) node->key, &err);
+
+        if (err != TOX_ERR_BOOTSTRAP_OK) {
+            fprintf(stderr, "Failed to add TCP relay %s:%d\n", addr, node->port);
+        }
+    }
+
+    pthread_mutex_unlock(&thread_data.lock);
+}
+
+/* Manages connection to the Tox DHT network. */
+void do_tox_connection(Tox *m)
+{
+    static time_t last_bootstrap_time = 0;
+    bool connected = prompt_selfConnectionStatus() != TOX_CONNECTION_NONE;
+
+    if (!connected && timed_out(last_bootstrap_time, TRY_BOOTSTRAP_INTERVAL)) {
+        DHT_bootstrap(m);
+        last_bootstrap_time = get_unix_time();
+    }
+}

src/bootstrap.h

@@ -0,0 +1,42 @@
+/*  bootstrap.h
+ *
+ *
+ *  Copyright (C) 2016 Toxic All Rights Reserved.
+ *
+ *  This file is part of Toxic.
+ *
+ *  Toxic is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Toxic is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Toxic.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef BOOTSTRAP_H
+#define BOOTSTRAP_H
+
+/* Manages connection to the Tox DHT network. */
+void do_tox_connection(Tox *m);
+
+/* Creates a new thread that will load the DHT nodeslist to memory
+ * from json encoded nodes file obtained at NODES_LIST_URL. Only one
+ * thread may run at a time.
+ *
+ * Return 0 on success.
+ * Return -1 if a thread is already active.
+ * Return -2 if mutex fails to init.
+ * Return -3 if pthread attribute fails to init.
+ * Return -4 if pthread fails to set detached state.
+ * Return -5 if thread creation fails.
+ */
+int load_DHT_nodeslist(void);
+
+#endif /* BOOTSTRAP_H */

src/chat.h

@@ -20,16 +20,16 @@
  *
  */
 
-#ifndef CHAT_H_6489PZ13
-#define CHAT_H_6489PZ13
+#ifndef CHAT_H
+#define CHAT_H
 
-#include "windows.h"
 #include "toxic.h"
+#include "windows.h"
 
 /* set CTRL to -1 if we don't want to send a control signal.
    set msg to NULL if we don't want to display a message */
 void chat_close_file_receiver(Tox *m, int filenum, int friendnum, int CTRL);
-void kill_chat_window(ToxWindow *self);
-ToxWindow new_chat(Tox *m, int32_t friendnum);
+void kill_chat_window(ToxWindow *self, Tox *m);
+ToxWindow *new_chat(Tox *m, int32_t friendnum);
 
-#endif /* end of include guard: CHAT_H_6489PZ13 */
+#endif /* end of include guard: CHAT_H */

src/chat_commands.c

@@ -23,244 +23,322 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "chat.h"
+#include "conference.h"
+#include "execute.h"
+#include "file_transfers.h"
+#include "friendlist.h"
+#include "line_info.h"
+#include "misc_tools.h"
 #include "toxic.h"
 #include "windows.h"
-#include "misc_tools.h"
-#include "friendlist.h"
-#include "execute.h"
-#include "line_info.h"
-#include "groupchat.h"
-#include "chat.h"
-#include "file_senders.h"
 
 extern ToxWindow *prompt;
-
-extern ToxicFriend friends[MAX_FRIENDS_NUM];
-
-extern FileSender file_senders[MAX_FILES];
-extern uint8_t max_file_senders_index;
-extern uint8_t num_active_file_senders;
+extern FriendsList Friends;
 
 void cmd_cancelfile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
 {
+    UNUSED_VAR(window);
+
     if (argc < 2) {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Requires type in|out and the file ID.");
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Requires type in|out and the file ID.");
         return;
     }
 
-    const char *inoutstr = argv[1];
-    int filenum = atoi(argv[2]);
-
-    if (filenum >= MAX_FILES || filenum < 0) {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Invalid file ID.");
-        return;
-    }
-
-    if (strcasecmp(inoutstr, "in") == 0) {    /* cancel an incoming file transfer */
-        if (!friends[self->num].file_receiver.active[filenum]) {
-            line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Invalid file ID.");
-            return;  
-        }
-
-        const char *filepath = friends[self->num].file_receiver.filenames[filenum];
-        char name[MAX_STR_SIZE];
-        get_file_name(name, sizeof(name), filepath);
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "File transfer for '%s' canceled.", name);
-        chat_close_file_receiver(m, filenum, self->num, TOX_FILECONTROL_KILL);
-        return;
-    } else if (strcasecmp(inoutstr, "out") == 0) {    /* cancel an outgoing file transfer */
-        int i;
-        bool match = false;
-
-        for (i = 0; i < MAX_FILES; ++i) {
-            if (file_senders[i].active && file_senders[i].filenum == filenum) {
-                match = true;
-                break;
-            }
-        }
-
-        if (!match) {
-            line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Invalid file ID.");
-            return;  
-        }
-
-        const char *filename = file_senders[i].filename;
     char msg[MAX_STR_SIZE];
-        snprintf(msg, sizeof(msg), "File transfer for '%s' canceled.", filename);
-        close_file_sender(self, m, i, msg, TOX_FILECONTROL_KILL, filenum, self->num);
+    const char *inoutstr = argv[1];
+    long int idx = strtol(argv[2], NULL, 10);
+
+    if ((idx == 0 && strcmp(argv[2], "0")) || idx >= MAX_FILES || idx < 0) {
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invalid file ID.");
         return;
+    }
+
+    struct FileTransfer *ft = NULL;
+
+    /* cancel an incoming file transfer */
+    if (strcasecmp(inoutstr, "in") == 0) {
+        ft = get_file_transfer_struct_index(self->num, idx, FILE_TRANSFER_RECV);
+    } else if (strcasecmp(inoutstr, "out") == 0) {
+        ft = get_file_transfer_struct_index(self->num, idx, FILE_TRANSFER_SEND);
     } else {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Type must be 'in' or 'out'.");
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Type must be 'in' or 'out'.");
         return;
     }
+
+    if (!ft) {
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invalid file ID.");
+        return;
     }
 
-void cmd_groupinvite(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
+    if (ft->state == FILE_TRANSFER_INACTIVE) {
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invalid file ID.");
+        return;
+    }
+
+    snprintf(msg, sizeof(msg), "File transfer for '%s' aborted.", ft->file_name);
+    close_file_transfer(self, m, ft, TOX_FILE_CONTROL_CANCEL, msg, silent);
+}
+
+void cmd_conference_invite(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
 {
+    UNUSED_VAR(window);
+
     if (argc < 1) {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Group number required.");
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Conference number required.");
         return;
     }
 
-    int groupnum = atoi(argv[1]);
+    long int conferencenum = strtol(argv[1], NULL, 10);
 
-    if (groupnum == 0 && strcmp(argv[1], "0")) {    /* atoi returns 0 value on invalid input */
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Invalid group number.");
+    if ((conferencenum == 0 && strcmp(argv[1], "0")) || conferencenum < 0 || conferencenum == LONG_MAX) {
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invalid conference number.");
         return;
     }
 
-    if (tox_invite_friend(m, self->num, groupnum) == -1) {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to invite contact to group.");
+    Tox_Err_Conference_Invite err;
+
+    if (!tox_conference_invite(m, self->num, conferencenum, &err)) {
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to invite contact to conference (error %d)", err);
         return;
     }
 
-    line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Invited contact to Group %d.", groupnum);
+    line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invited contact to Conference %ld.", conferencenum);
 }
 
-void cmd_join_group(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
+void cmd_conference_join(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
 {
+    UNUSED_VAR(window);
+    UNUSED_VAR(argc);
+    UNUSED_VAR(argv);
+
     if (get_num_active_windows() >= MAX_WINDOWS_NUM) {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, RED, " * Warning: Too many windows are open.");
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, RED, " * Warning: Too many windows are open.");
         return;
     }
 
-    const char *groupkey = friends[self->num].groupchat_key;
+    const char *conferencekey = Friends.list[self->num].conference_invite.key;
+    uint16_t length = Friends.list[self->num].conference_invite.length;
+    uint8_t type = Friends.list[self->num].conference_invite.type;
 
-    if (!friends[self->num].groupchat_pending) {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "No pending group chat invite.");
+    if (!Friends.list[self->num].conference_invite.pending) {
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "No pending conference invite.");
         return;
     }
 
-    int groupnum = tox_join_groupchat(m, self->num, (uint8_t *) groupkey);
+    uint32_t conferencenum;
 
-    if (groupnum == -1) {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Group chat instance failed to initialize.");
+    if (type == TOX_CONFERENCE_TYPE_TEXT) {
+        Tox_Err_Conference_Join err;
+        conferencenum = tox_conference_join(m, self->num, (const uint8_t *) conferencekey, length, &err);
+
+        if (err != TOX_ERR_CONFERENCE_JOIN_OK) {
+            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Conference instance failed to initialize (error %d)", err);
+            return;
+        }
+    } else if (type == TOX_CONFERENCE_TYPE_AV) {
+#ifdef AUDIO
+        conferencenum = toxav_join_av_groupchat(m, self->num, (const uint8_t *) conferencekey, length,
+                                                audio_conference_callback, NULL);
+
+        if (conferencenum == (uint32_t) -1) {
+            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Audio conference instance failed to initialize");
             return;
         }
 
-    if (init_groupchat_win(prompt, m, groupnum) == -1) {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Group chat window failed to initialize.");
-        tox_del_groupchat(m, groupnum);
+#else
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Audio support disabled by compile-time option.");
+        return;
+#endif
+    } else {
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Unknown conference type %d", type);
         return;
     }
+
+    if (init_conference_win(m, conferencenum, type, NULL, 0) == -1) {
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Conference window failed to initialize.");
+        tox_conference_delete(m, conferencenum, NULL);
+        return;
+    }
+
+#ifdef AUDIO
+
+    if (type == TOX_CONFERENCE_TYPE_AV) {
+        if (!init_conference_audio_input(m, conferencenum)) {
+            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Audio capture failed; use \"/audio on\" to try again.");
+        }
+    }
+
+#endif
 }
 
 void cmd_savefile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
 {
+    UNUSED_VAR(window);
+
     if (argc < 1) {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "File ID required.");
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "File ID required.");
         return;
     }
 
-    uint8_t filenum = atoi(argv[1]);
+    long int idx = strtol(argv[1], NULL, 10);
 
-    if ((filenum == 0 && strcmp(argv[1], "0")) || filenum >= MAX_FILES) {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "No pending file transfers with that ID.");
+    if ((idx == 0 && strcmp(argv[1], "0")) || idx < 0 || idx >= MAX_FILES) {
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "No pending file transfers with that ID.");
         return;
     }
 
-    if (!friends[self->num].file_receiver.pending[filenum]) {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "No pending file transfers with that ID.");
+    struct FileTransfer *ft = get_file_transfer_struct_index(self->num, idx, FILE_TRANSFER_RECV);
+
+    if (!ft) {
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "No pending file transfers with that ID.");
         return;
     }
 
-    const char *filename = friends[self->num].file_receiver.filenames[filenum];
+    if (ft->state != FILE_TRANSFER_PENDING) {
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "No pending file transfers with that ID.");
+        return;
+    }
 
-    if (tox_file_send_control(m, self->num, 1, filenum, TOX_FILECONTROL_ACCEPT, 0, 0) == 0) {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Saving file [%d] as: '%s'", filenum, filename);
+    if ((ft->file = fopen(ft->file_path, "a")) == NULL) {
+        const char *msg =  "File transfer failed: Invalid download path.";
+        close_file_transfer(self, m, ft, TOX_FILE_CONTROL_CANCEL, msg, notif_error);
+        return;
+    }
+
+    Tox_Err_File_Control err;
+    tox_file_control(m, self->num, ft->filenumber, TOX_FILE_CONTROL_RESUME, &err);
+
+    if (err != TOX_ERR_FILE_CONTROL_OK) {
+        goto on_recv_error;
+    }
+
+    line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Saving file [%ld] as: '%s'", idx, ft->file_path);
 
     /* prep progress bar line */
     char progline[MAX_STR_SIZE];
-        prep_prog_line(progline);
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "%s", progline);
-        friends[self->num].file_receiver.line_id[filenum] = self->chatwin->hst->line_end->id + 2;
+    init_progress_bar(progline);
+    line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "%s", progline);
 
-        if ((friends[self->num].file_receiver.files[filenum] = fopen(filename, "a")) == NULL) {
-            line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, RED, "* Error writing to file.");
-            tox_file_send_control(m, self->num, 1, filenum, TOX_FILECONTROL_KILL, 0, 0);
-        }
-    } else {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "File transfer failed.");
-    }
+    ft->line_id = self->chatwin->hst->line_end->id + 2;
+    ft->state = FILE_TRANSFER_STARTED;
 
-    friends[self->num].file_receiver.pending[filenum] = false;
-    friends[self->num].file_receiver.active[filenum] = true;
+    return;
+
+on_recv_error:
+
+    switch (err) {
+        case TOX_ERR_FILE_CONTROL_FRIEND_NOT_FOUND:
+            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "File transfer failed: Friend not found.");
+            return;
+
+        case TOX_ERR_FILE_CONTROL_FRIEND_NOT_CONNECTED:
+            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "File transfer failed: Friend is not online.");
+            return;
+
+        case TOX_ERR_FILE_CONTROL_NOT_FOUND:
+            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "File transfer failed: Invalid filenumber.");
+            return;
+
+        case TOX_ERR_FILE_CONTROL_SENDQ:
+            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "File transfer failed: Connection error.");
+            return;
+
+        default:
+            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "File transfer failed (error %d)\n", err);
+            return;
+    }
 }
 
 void cmd_sendfile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
 {
-    if (max_file_senders_index >= (MAX_FILES - 1)) {
-        const char *errmsg = "Please wait for some of your outgoing file transfers to complete.";
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, errmsg);
-        return;
-    }
+    UNUSED_VAR(window);
+
+    const char *errmsg = NULL;
 
     if (argc < 1) {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "File path required.");
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "File path required.");
         return;
     }
 
-    if (argv[1][0] != '\"') {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "File path must be enclosed in quotes.");
-        return;
-    }
-
-    /* remove opening and closing quotes */
     char path[MAX_STR_SIZE];
-    snprintf(path, sizeof(path), "%s", &argv[1][1]);
-    int path_len = strlen(path) - 1;
-    path[path_len] = '\0';
+    snprintf(path, sizeof(path), "%s", argv[1]);
+    int path_len = strlen(path);
 
     if (path_len >= MAX_STR_SIZE) {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "File path exceeds character limit.");
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "File path exceeds character limit.");
         return;
     }
 
     FILE *file_to_send = fopen(path, "r");
 
     if (file_to_send == NULL) {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "File not found.");
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "File not found.");
         return;
     }
 
-    fseek(file_to_send, 0, SEEK_END);
-    uint64_t filesize = ftell(file_to_send);
-    fseek(file_to_send, 0, SEEK_SET);
+    off_t filesize = file_size(path);
 
-    char filename[MAX_STR_SIZE] = {0};
-    get_file_name(filename, sizeof(filename), path);
-    int namelen = strlen(filename);
-    int filenum = tox_new_file_sender(m, self->num, filesize, (const uint8_t *) filename, namelen);
-
-    if (filenum == -1) {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Error sending file.");
+    if (filesize == 0) {
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invalid file.");
+        fclose(file_to_send);
         return;
     }
 
-    int i;
+    char file_name[TOX_MAX_FILENAME_LENGTH];
+    size_t namelen = get_file_name(file_name, sizeof(file_name), path);
 
-    for (i = 0; i < MAX_FILES; ++i) {
-        if (!file_senders[i].active) {
-            file_senders[i].queue_pos = num_active_file_senders;
-            memcpy(file_senders[i].filename, filename, namelen + 1);
-            file_senders[i].active = true;
-            file_senders[i].toxwin = self;
-            file_senders[i].file = file_to_send;
-            file_senders[i].filenum = filenum;
-            file_senders[i].friendnum = self->num;
-            file_senders[i].timestamp = get_unix_time();
-            file_senders[i].size = filesize;
-            file_senders[i].piecelen = fread(file_senders[i].nextpiece, 1,
-                                             tox_file_data_size(m, self->num), file_to_send);
+    Tox_Err_File_Send err;
+    uint32_t filenum = tox_file_send(m, self->num, TOX_FILE_KIND_DATA, (uint64_t) filesize, NULL,
+                                     (uint8_t *) file_name, namelen, &err);
 
-            line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Sending file [%d]: '%s'", filenum, filename);
+    if (err != TOX_ERR_FILE_SEND_OK) {
+        goto on_send_error;
+    }
 
-            ++num_active_file_senders;
+    struct FileTransfer *ft = new_file_transfer(self, self->num, filenum, FILE_TRANSFER_SEND, TOX_FILE_KIND_DATA);
 
-            if (i == max_file_senders_index)
-                ++max_file_senders_index;
+    if (!ft) {
+        err = TOX_ERR_FILE_SEND_TOO_MANY;
+        goto on_send_error;
+    }
+
+    memcpy(ft->file_name, file_name, namelen + 1);
+    ft->file = file_to_send;
+    ft->file_size = filesize;
+    tox_file_get_file_id(m, self->num, filenum, ft->file_id, NULL);
+
+    char sizestr[32];
+    bytes_convert_str(sizestr, sizeof(sizestr), filesize);
+    line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Sending file [%d]: '%s' (%s)", filenum, file_name, sizestr);
 
     return;
+
+on_send_error:
+
+    switch (err) {
+        case TOX_ERR_FILE_SEND_FRIEND_NOT_FOUND:
+            errmsg = "File transfer failed: Invalid friend.";
+            break;
+
+        case TOX_ERR_FILE_SEND_FRIEND_NOT_CONNECTED:
+            errmsg = "File transfer failed: Friend is offline.";
+            break;
+
+        case TOX_ERR_FILE_SEND_NAME_TOO_LONG:
+            errmsg = "File transfer failed: Filename is too long.";
+            break;
+
+        case TOX_ERR_FILE_SEND_TOO_MANY:
+            errmsg = "File transfer failed: Too many concurrent file transfers.";
+            break;
+
+        default:
+            errmsg = "File transfer failed.";
+            break;
     }
-    }
+
+    line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "%s", errmsg);
+    tox_file_control(m, self->num, filenum, TOX_FILE_CONTROL_CANCEL, NULL);
+    fclose(file_to_send);
 }

src/chat_commands.h

@@ -20,19 +20,19 @@
  *
  */
 
-#ifndef _chat_commands_h
-#define _chat_commands_h
+#ifndef CHAT_COMMANDS_H
+#define CHAT_COMMANDS_H
 
-#include "windows.h"
 #include "toxic.h"
+#include "windows.h"
 
 void cmd_cancelfile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_groupinvite(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_join_group(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
+void cmd_conference_invite(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
+void cmd_conference_join(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_savefile(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_sendfile(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 
-#ifdef _AUDIO
+#ifdef AUDIO
 void cmd_call(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_answer(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_reject(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
@@ -41,6 +41,13 @@ void cmd_cancel(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZ
 void cmd_ccur_device(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_mute(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_sense(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
-#endif /* _AUDIO */
+void cmd_bitrate(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
+#endif /* AUDIO */
 
-#endif /* #define _chat_commands_h */
+#ifdef VIDEO
+void cmd_vcall(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
+void cmd_video(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
+void cmd_res(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
+#endif /* VIDEO */
+
+#endif /* CHAT_COMMANDS_H */

src/conference.h

@@ -0,0 +1,118 @@
+/*  conference.h
+ *
+ *
+ *  Copyright (C) 2014 Toxic All Rights Reserved.
+ *
+ *  This file is part of Toxic.
+ *
+ *  Toxic is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Toxic is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Toxic.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef CONFERENCE_H
+#define CONFERENCE_H
+
+#include "toxic.h"
+#include "windows.h"
+
+#define CONFERENCE_MAX_TITLE_LENGTH TOX_MAX_NAME_LENGTH
+#define SIDEBAR_WIDTH 16
+
+typedef struct ConferencePeer {
+    bool       active;
+
+    uint8_t    pubkey[TOX_PUBLIC_KEY_SIZE];
+    uint32_t   peernum;    /* index in chat->peer_list */
+
+    char       name[TOX_MAX_NAME_LENGTH];
+    size_t     name_length;
+
+    bool       sending_audio;
+    uint32_t   audio_out_idx;
+    time_t     last_audio_time;
+} ConferencePeer;
+
+typedef struct AudioInputCallbackData {
+    Tox *tox;
+    uint32_t conferencenum;
+} AudioInputCallbackData;
+
+#define PUBKEY_STRING_SIZE (2 * TOX_PUBLIC_KEY_SIZE + 1)
+typedef struct NameListEntry {
+    char name[TOX_MAX_NAME_LENGTH];
+    char pubkey_str[PUBKEY_STRING_SIZE];
+    uint32_t peernum;
+} NameListEntry;
+
+
+typedef struct {
+    int chatwin;
+    bool active;
+    uint8_t type;
+    int side_pos;    /* current position of the sidebar - used for scrolling up and down */
+    time_t start_time;
+
+    char title[CONFERENCE_MAX_TITLE_LENGTH + 1];
+    size_t title_length;
+
+    ConferencePeer *peer_list;
+    uint32_t max_idx;
+
+    NameListEntry *name_list;
+    uint32_t num_peers;
+
+    bool push_to_talk_enabled;
+    time_t ptt_last_pushed;
+
+    bool audio_enabled;
+    time_t last_sent_audio;
+    uint32_t audio_in_idx;
+    AudioInputCallbackData audio_input_callback_data;
+} ConferenceChat;
+
+/* Frees all Toxic associated data structures for a conference (does not call tox_conference_delete() ) */
+void free_conference(ToxWindow *self, uint32_t conferencenum);
+
+int init_conference_win(Tox *m, uint32_t conferencenum, uint8_t type, const char *title, size_t length);
+
+/* destroys and re-creates conference window with or without the peerlist */
+void redraw_conference_win(ToxWindow *self);
+
+void conference_set_title(ToxWindow *self, uint32_t conferencesnum, const char *title, size_t length);
+void conference_rename_log_path(Tox *m, uint32_t conferencenum, const char *new_title);
+int conference_enable_logging(ToxWindow *self, Tox *m, uint32_t conferencenum, struct chatlog *log);
+
+/* Puts `(NameListEntry *)`s in `entries` for each matched peer, up to a maximum
+ * of `maxpeers`.
+ * Maches each peer whose name or pubkey begins with `prefix`.
+ * If `prefix` is exactly the pubkey of a peer, matches only that peer.
+ * return number of entries placed in `entries`.
+ */
+uint32_t get_name_list_entries_by_prefix(uint32_t conferencenum, const char *prefix, NameListEntry **entries,
+        uint32_t maxpeers);
+
+bool init_conference_audio_input(Tox *tox, uint32_t conferencenum);
+bool enable_conference_audio(Tox *tox, uint32_t conferencenum);
+bool disable_conference_audio(Tox *tox, uint32_t conferencenum);
+bool toggle_conference_push_to_talk(uint32_t conferencenum, bool enabled);
+void audio_conference_callback(void *tox, uint32_t conferencenum, uint32_t peernum,
+                               const int16_t *pcm, unsigned int samples, uint8_t channels, uint32_t
+                               sample_rate, void *userdata);
+
+bool conference_mute_self(uint32_t conferencenum);
+bool conference_mute_peer(const Tox *m, uint32_t conferencenum, uint32_t peernum);
+bool conference_set_VAD_threshold(uint32_t conferencenum, float threshold);
+float conference_get_VAD_threshold(uint32_t conferencenum);
+
+#endif /* CONFERENCE_H */

src/conference_commands.c

@@ -0,0 +1,210 @@
+/*  conference_commands.c
+ *
+ *
+ *  Copyright (C) 2014 Toxic All Rights Reserved.
+ *
+ *  This file is part of Toxic.
+ *
+ *  Toxic is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Toxic is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Toxic.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "conference.h"
+#include "line_info.h"
+#include "log.h"
+#include "misc_tools.h"
+#include "toxic.h"
+#include "windows.h"
+
+static void print_err(ToxWindow *self, const char *error_str)
+{
+    line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "%s", error_str);
+}
+
+void cmd_conference_set_title(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
+{
+    UNUSED_VAR(window);
+
+    Tox_Err_Conference_Title err;
+    char title[CONFERENCE_MAX_TITLE_LENGTH + 1];
+
+    if (argc < 1) {
+        size_t tlen = tox_conference_get_title_size(m, self->num, &err);
+
+        if (err != TOX_ERR_CONFERENCE_TITLE_OK || tlen >= sizeof(title)) {
+            print_err(self, "Title is not set");
+            return;
+        }
+
+        if (!tox_conference_get_title(m, self->num, (uint8_t *) title, &err)) {
+            print_err(self, "Title is not set");
+            return;
+        }
+
+        title[tlen] = '\0';
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Title is set to: %s", title);
+
+        return;
+    }
+
+    size_t len = strlen(argv[1]);
+
+    if (len >= sizeof(title)) {
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to set title: max length exceeded.");
+        return;
+    }
+
+    snprintf(title, sizeof(title), "%s", argv[1]);
+
+    if (!tox_conference_set_title(m, self->num, (uint8_t *) title, len, &err)) {
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to set title (error %d)", err);
+        return;
+    }
+
+    conference_rename_log_path(m, self->num, title);  // must be called first
+
+    conference_set_title(self, self->num, title, len);
+
+    char selfnick[TOX_MAX_NAME_LENGTH];
+    tox_self_get_name(m, (uint8_t *) selfnick);
+
+    size_t sn_len = tox_self_get_name_size(m);
+    selfnick[sn_len] = '\0';
+
+    line_info_add(self, true, selfnick, NULL, NAME_CHANGE, 0, 0, " set the conference title to: %s", title);
+
+    char tmp_event[MAX_STR_SIZE + 20];
+    snprintf(tmp_event, sizeof(tmp_event), "set title to %s", title);
+    write_to_log(tmp_event, selfnick, self->chatwin->log, true);
+}
+
+#ifdef AUDIO
+void cmd_enable_audio(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
+{
+    UNUSED_VAR(window);
+
+    bool enable;
+
+    if (argc == 1 && !strcasecmp(argv[1], "on")) {
+        enable = true;
+    } else if (argc == 1 && !strcasecmp(argv[1], "off")) {
+        enable = false;
+    } else {
+        print_err(self, "Please specify: on | off");
+        return;
+    }
+
+    if (enable ? enable_conference_audio(m, self->num) : disable_conference_audio(m, self->num)) {
+        print_err(self, enable ? "Enabled conference audio. Use the '/ptt' command to toggle Push-To-Talk."
+                  : "Disabled conference audio");
+    } else {
+        print_err(self, enable ? "Failed to enable audio" : "Failed to disable audio");
+    }
+}
+
+void cmd_conference_mute(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
+{
+    UNUSED_VAR(window);
+
+    if (argc < 1) {
+        if (conference_mute_self(self->num)) {
+            print_err(self, "Toggled self audio mute status");
+        } else {
+            print_err(self, "No audio input to mute");
+        }
+    } else {
+        NameListEntry *entries[16];
+        uint32_t n = get_name_list_entries_by_prefix(self->num, argv[1], entries, 16);
+
+        if (n == 0) {
+            print_err(self, "No such peer");
+            return;
+        }
+
+        if (n > 1) {
+            print_err(self, "Multiple matching peers (use /mute [public key] to disambiguate):");
+
+            for (uint32_t i = 0; i < n; ++i) {
+                line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "%s: %s", entries[i]->pubkey_str, entries[i]->name);
+            }
+
+            return;
+        }
+
+        if (conference_mute_peer(m, self->num, entries[0]->peernum)) {
+            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Toggled audio mute status of %s", entries[0]->name);
+        } else {
+            print_err(self, "Peer is not on the call");
+        }
+    }
+}
+
+void cmd_conference_sense(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
+{
+    UNUSED_VAR(window);
+    UNUSED_VAR(m);
+
+    if (argc == 0) {
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Current VAD threshold: %.1f",
+                      (double) conference_get_VAD_threshold(self->num));
+        return;
+    }
+
+    if (argc > 1) {
+        print_err(self, "Only one argument allowed.");
+        return;
+    }
+
+    char *end;
+    float value = strtof(argv[1], &end);
+
+    if (*end) {
+        print_err(self, "Invalid input");
+        return;
+    }
+
+    if (conference_set_VAD_threshold(self->num, value)) {
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Set VAD threshold to %.1f", (double) value);
+    } else {
+        print_err(self, "Failed to set conference audio input sensitivity.");
+    }
+}
+
+void cmd_conference_push_to_talk(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
+{
+    UNUSED_VAR(window);
+    UNUSED_VAR(m);
+
+    bool enable;
+
+    if (argc == 1 && !strcasecmp(argv[1], "on")) {
+        enable = true;
+    } else if (argc == 1 && !strcasecmp(argv[1], "off")) {
+        enable = false;
+    } else {
+        print_err(self, "Please specify: on | off");
+        return;
+    }
+
+    if (!toggle_conference_push_to_talk(self->num, enable)) {
+        print_err(self, "Failed to toggle push to talk.");
+        return;
+    }
+
+    print_err(self, enable ? "Push-To-Talk is enabled. Push F2 to activate" : "Push-To-Talk is disabled");
+}
+#endif /* AUDIO */

src/conference_commands.h

@@ -1,4 +1,4 @@
-/*  groupchat.h
+/*  conference_commands.h
  *
  *
  *  Copyright (C) 2014 Toxic All Rights Reserved.
@@ -20,29 +20,16 @@
  *
  */
 
-#ifndef _groupchat_h
-#define _groupchat_h
+#ifndef CONFERENCE_COMMANDS_H
+#define CONFERENCE_COMMANDS_H
 
 #include "toxic.h"
 #include "windows.h"
 
-#define SIDEBAR_WIDTH 16
-#define SDBAR_OFST 2    /* Offset for the peer number box at the top of the statusbar */
-#define MAX_GROUPCHAT_NUM MAX_WINDOWS_NUM - 2
+void cmd_conference_set_title(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
+void cmd_enable_audio(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
+void cmd_conference_mute(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
+void cmd_conference_sense(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
+void cmd_conference_push_to_talk(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
 
-typedef struct {
-    int chatwin;
-    bool active;
-    int num_peers;
-    int side_pos;    /* current position of the sidebar - used for scrolling up and down */
-    uint8_t  *peer_names;
-    uint8_t  *oldpeer_names;
-    uint16_t *peer_name_lengths;
-    uint16_t *oldpeer_name_lengths;
-} GroupChat;
-
-void kill_groupchat_window(ToxWindow *self);
-int init_groupchat_win(ToxWindow *prompt, Tox *m, int groupnum);
-ToxWindow new_group_chat(Tox *m, int groupnum);
-
-#endif /* #define _groupchat_h */
+#endif /* CONFERENCE_COMMANDS_H */

src/configdir.c

@@ -20,19 +20,20 @@
  *
  */
 
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <errno.h>
-#include <unistd.h>
 #include <pwd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 
-#include "toxic.h"
 #include "configdir.h"
+#include "misc_tools.h"
+#include "toxic.h"
 
-/* get the user's home directory */
+/* get the user's home directory. */
 void get_home_dir(char *home, int size)
 {
     struct passwd pwd;
@@ -47,8 +48,9 @@ void get_home_dir(char *home, int size)
     } else {
         hmstr = getenv("HOME");
 
-        if (hmstr == NULL)
+        if (hmstr == NULL) {
             return;
+        }
 
         snprintf(buf, sizeof(buf), "%s", hmstr);
         hmstr = buf;
@@ -66,30 +68,32 @@ void get_home_dir(char *home, int size)
  */
 char *get_user_config_dir(void)
 {
-    char home[NSS_BUFLEN_PASSWD];
+    char home[NSS_BUFLEN_PASSWD] = {0};
     get_home_dir(home, sizeof(home));
 
-    char *user_config_dir;
-    size_t len;
+    char *user_config_dir = NULL;
+    size_t len = 0;
 
 # if defined(__APPLE__)
     len = strlen(home) + strlen("/Library/Application Support") + 1;
     user_config_dir = malloc(len);
 
-    if (user_config_dir == NULL)
+    if (user_config_dir == NULL) {
         return NULL;
+    }
 
     snprintf(user_config_dir, len, "%s/Library/Application Support", home);
 # else /* __APPLE__ */
 
-    const char *tmp;
+    const char *tmp = getenv("XDG_CONFIG_HOME");
 
-    if (!(tmp = getenv("XDG_CONFIG_HOME"))) {
+    if (tmp == NULL) {
         len = strlen(home) + strlen("/.config") + 1;
         user_config_dir = malloc(len);
 
-        if (user_config_dir == NULL)
+        if (user_config_dir == NULL) {
             return NULL;
+        }
 
         snprintf(user_config_dir, len, "%s/.config", home);
     } else {
@@ -101,22 +105,26 @@ char *get_user_config_dir(void)
     return user_config_dir;
 }
 
-/*
- * Creates the config and chatlog directories.
+/* Creates the config and chatlog directories.
+ *
+ * Returns 0 on success.
+ * Returns -1 on failure.
  */
 int create_user_config_dirs(char *path)
 {
     struct stat buf;
     int mkdir_err = mkdir(path, 0700);
 
-    if (mkdir_err && (errno != EEXIST || stat(path, &buf) || !S_ISDIR(buf.st_mode)))
+    if (mkdir_err && (errno != EEXIST || stat(path, &buf) || !S_ISDIR(buf.st_mode))) {
         return -1;
+    }
 
     char *fullpath = malloc(strlen(path) + strlen(CONFIGDIR) + 1);
     char *logpath = malloc(strlen(path) + strlen(LOGDIR) + 1);
 
-    if (fullpath == NULL || logpath == NULL)
+    if (fullpath == NULL || logpath == NULL) {
         exit_toxic_err("failed in load_data_structures", FATALERR_MEMORY);
+    }
 
     strcpy(fullpath, path);
     strcat(fullpath, CONFIGDIR);

src/configdir.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef _configdir_h
-#define _configdir_h
+#ifndef CONFIGDIR_H
+#define CONFIGDIR_H
 
 #ifndef NSS_BUFLEN_PASSWD
 #define NSS_BUFLEN_PASSWD 4096
@@ -34,8 +34,23 @@
 #define S_ISDIR(mode)  (((mode) & S_IFMT) == S_IFDIR)
 #endif
 
+/**
+ * @brief Get the user's config directory.
+ *
+ * This is without a trailing slash. Resulting string must be freed.
+ *
+ * @return The users config dir or NULL on error.
+ */
 char *get_user_config_dir(void);
+
+/* get the user's home directory. */
 void get_home_dir(char *home, int size);
+
+/* Creates the config and chatlog directories.
+ *
+ * Returns 0 on success.
+ * Returns -1 on failure.
+ */
 int create_user_config_dirs(char *path);
 
-#endif /* #define _configdir_h */
+#endif /* CONFIGDIR_H */

src/curl_util.c

@@ -0,0 +1,94 @@
+/*  curl_util.c
+ *
+ *
+ *  Copyright (C) 2016 Toxic All Rights Reserved.
+ *
+ *  This file is part of Toxic.
+ *
+ *  Toxic is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Toxic is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Toxic.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <stdint.h>
+#include <string.h>
+
+#include <curl/curl.h>
+#include <tox/tox.h>
+
+#include "curl_util.h"
+
+/* Sets proxy info for given CURL handler.
+ *
+ * Returns 0 on success or if no proxy is set by the client.
+ * Returns -1 if proxy info is invalid.
+ * Returns an int > 0 on curl error (see: https://curl.haxx.se/libcurl/c/libcurl-errors.html)
+ */
+int set_curl_proxy(CURL *c_handle, const char *proxy_address, uint16_t port, uint8_t proxy_type)
+{
+    if (proxy_type == TOX_PROXY_TYPE_NONE) {
+        return 0;
+    }
+
+    if (proxy_address == NULL || port == 0) {
+        return -1;
+    }
+
+    int ret = curl_easy_setopt(c_handle, CURLOPT_PROXYPORT, (long) port);
+
+    if (ret != CURLE_OK) {
+        return ret;
+    }
+
+    long int type = proxy_type == TOX_PROXY_TYPE_SOCKS5 ? CURLPROXY_SOCKS5_HOSTNAME : CURLPROXY_HTTP;
+
+    ret = curl_easy_setopt(c_handle, CURLOPT_PROXYTYPE, type);
+
+    if (ret != CURLE_OK) {
+        return ret;
+    }
+
+    ret = curl_easy_setopt(c_handle, CURLOPT_PROXY, proxy_address);
+
+    if (ret != CURLE_OK) {
+        return ret;
+    }
+
+    return 0;
+}
+
+/* Callback function for CURL to write received data.
+ *
+ * This function will append data from an http request to the data buffer
+ * until the request is complete or the buffer is full. Buffer will be null terminated.
+ *
+ * Returns number of bytes received from http request on success (don't change this).
+ * Returns 0 if data exceeds buffer size.
+ */
+size_t curl_cb_write_data(void *data, size_t size, size_t nmemb, void *user_pointer)
+{
+    struct Recv_Curl_Data *recv_data = (struct Recv_Curl_Data *) user_pointer;
+
+    size_t length = size * nmemb;
+    size_t total_size = length + recv_data->length;
+
+    if (total_size > MAX_RECV_CURL_DATA_SIZE) {
+        return 0;
+    }
+
+    memcpy(recv_data->data + recv_data->length, data, length);
+    recv_data->data[total_size] = '\0';
+    recv_data->length += length;
+
+    return length;
+}

src/curl_util.h

@@ -0,0 +1,57 @@
+/*  curl_util.h
+ *
+ *
+ *  Copyright (C) 2016 Toxic All Rights Reserved.
+ *
+ *  This file is part of Toxic.
+ *
+ *  Toxic is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Toxic is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Toxic.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef CURL_UTIL_H
+#define CURL_UTIL_H
+
+#include <stdint.h>
+
+/* List based on Mozilla's recommended configurations for modern browsers */
+#define TLS_CIPHER_SUITE_LIST "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK"
+
+/* Max size of an http response that we can store in Recv_Data */
+#define MAX_RECV_CURL_DATA_SIZE 32767
+
+/* Holds data received from curl lookup */
+struct Recv_Curl_Data {
+    char data[MAX_RECV_CURL_DATA_SIZE + 1];   /* Data received from curl write data callback */
+    size_t length;  /* Total number of bytes written to data buffer (doesn't include null) */
+};
+
+/* Sets proxy info for given CURL handler.
+ *
+ * Returns 0 on success or if no proxy is set by the client.
+ * Returns -1 if proxy info is invalid.
+ * Returns an int > 0 on curl error (see: https://curl.haxx.se/libcurl/c/libcurl-errors.html)
+ */
+int set_curl_proxy(CURL *c_handle, const char *proxy_address, uint16_t port, uint8_t proxy_type);
+
+/* Callback function for CURL to write received data.
+ *
+ * This function will append data from an http request to the data buffer
+ * until the request is complete or the buffer is full. Buffer will be null terminated.
+ *
+ * Returns size of bytes written to the data buffer.
+ */
+size_t curl_cb_write_data(void *data, size_t size, size_t nmemb, void *user_pointer);
+
+#endif /* CURL_UTIL_H */

src/device.c

@@ -1,467 +0,0 @@
-/*  device.c
- *
- *
- *  Copyright (C) 2014 Toxic All Rights Reserved.
- *
- *  This file is part of Toxic.
- *
- *  Toxic is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Toxic is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Toxic.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "device.h"
-
-#ifdef _AUDIO
-#include "audio_call.h"
-#endif
-
-#include "line_info.h"
-#include "settings.h"
-
-#ifdef __APPLE__
-#include <OpenAL/al.h>
-#include <OpenAL/alc.h>
-#else
-#include <AL/al.h>
-#include <AL/alc.h>
-/* compatibility with older versions of OpenAL */
-#ifndef ALC_ALL_DEVICES_SPECIFIER
-#include <AL/alext.h>
-#endif
-#endif
-
-#include <string.h>
-#include <pthread.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <assert.h>
-
-#define OPENAL_BUFS 5
-#define inline__ inline __attribute__((always_inline))
-
-extern struct user_settings *user_settings_;
-
-typedef struct _Device {
-    ALCdevice  *dhndl;                     /* Handle of device selected/opened */
-    ALCcontext *ctx;                       /* Device context */
-    DataHandleCallback cb;                 /* Use this to handle data from input device usually */
-    void* cb_data;                         /* Data to be passed to callback */
-    int32_t call_idx;                      /* ToxAv call index */
-    
-    uint32_t source, buffers[OPENAL_BUFS]; /* Playback source/buffers */
-    size_t ref_count;
-    int32_t selection;
-    _Bool enable_VAD;
-    _Bool muted;
-    pthread_mutex_t mutex[1];
-    uint32_t sample_rate; 
-    uint32_t frame_duration;
-    int32_t sound_mode;
-#ifdef _AUDIO
-    float VAD_treshold;                    /* 40 is usually recommended value */
-#endif
-} Device;
-
-const char *ddevice_names[2];              /* Default device */
-const char *devices_names[2][MAX_DEVICES]; /* Container of available devices */
-static int size[2];                        /* Size of above containers */
-Device *running[2][MAX_DEVICES];     /* Running devices */
-uint32_t primary_device[2];          /* Primary device */
-
-#ifdef _AUDIO
-static ToxAv* av = NULL;
-#endif /* _AUDIO */
-
-/* q_mutex */
-#define lock pthread_mutex_lock(&mutex)
-#define unlock pthread_mutex_unlock(&mutex)
-pthread_mutex_t mutex;
-
-
-_Bool thread_running = _True, 
-      thread_paused = _True;               /* Thread control */
-
-void* thread_poll(void*);
-/* Meet devices */
-#ifdef _AUDIO
-DeviceError init_devices(ToxAv* av_)
-#else
-DeviceError init_devices()
-#endif /* _AUDIO */
-{
-    const char *stringed_device_list;
-    
-    
-    
-    size[input] = 0;
-    if ( (stringed_device_list = alcGetString(NULL, ALC_CAPTURE_DEVICE_SPECIFIER)) ) {
-        ddevice_names[input] = alcGetString(NULL, ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER);
-        
-        for ( ; *stringed_device_list && size[input] < MAX_DEVICES; ++size[input] ) {
-            devices_names[input][size[input]] = stringed_device_list;                        
-            stringed_device_list += strlen( stringed_device_list ) + 1;
-        }
-    }
-    
-    
-    
-    size[output] = 0;
-    if ( (stringed_device_list = alcGetString(NULL, ALC_DEVICE_SPECIFIER)) ) {
-        ddevice_names[output] = alcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER);
-        
-        for ( ; *stringed_device_list && size[output] < MAX_DEVICES; ++size[output] ) {
-            devices_names[output][size[output]] = stringed_device_list;            
-            stringed_device_list += strlen( stringed_device_list ) + 1;
-        }
-    }
-    
-    // Start poll thread
-    
-    pthread_mutex_init(&mutex, NULL);
-    
-    pthread_t thread_id;
-    if ( pthread_create(&thread_id, NULL, thread_poll, NULL) != 0 || pthread_detach(thread_id) != 0) 
-        return de_InternalError;    
-    
-#ifdef _AUDIO
-    av = av_;
-#endif /* _AUDIO */
-    
-    return (DeviceError) de_None;
-}
-
-DeviceError terminate_devices()
-{
-    /* Cleanup if needed */
-    thread_running = false;
-    usleep(20000);
-    
-    pthread_mutex_destroy(&mutex);
-    
-    return (DeviceError) de_None;
-}
-
-DeviceError device_mute(DeviceType type, uint32_t device_idx)
-{
-    if (device_idx >= MAX_DEVICES) return de_InvalidSelection;
-    lock;
-    
-    Device* device = running[type][device_idx];
-    
-    if (!device) { 
-        unlock;
-        return de_DeviceNotActive;
-    }
-    
-    device->muted = !device->muted;
-    
-    unlock;
-    return de_None;
-}
-
-#ifdef _AUDIO
-DeviceError device_set_VAD_treshold(uint32_t device_idx, float value)
-{
-    if (device_idx >= MAX_DEVICES) return de_InvalidSelection;
-    lock;
-    
-    Device* device = running[input][device_idx];
-    
-    if (!device) { 
-        unlock;
-        return de_DeviceNotActive;
-    }
-    
-    device->VAD_treshold = value;
-    
-    unlock;
-    return de_None;
-}
-#endif
-
-
-DeviceError set_primary_device(DeviceType type, int32_t selection)
-{
-    if (size[type] <= selection || selection < 0) return de_InvalidSelection;
-    primary_device[type] = selection;
-    
-    return de_None;
-}
-
-DeviceError open_primary_device(DeviceType type, uint32_t* device_idx, uint32_t sample_rate, uint32_t frame_duration, uint8_t channels)
-{
-    return open_device(type, primary_device[type], device_idx, sample_rate, frame_duration, channels);
-}
-
-
-// TODO: generate buffers separately
-DeviceError open_device(DeviceType type, int32_t selection, uint32_t* device_idx, uint32_t sample_rate, uint32_t frame_duration, uint8_t channels)
-{
-    if (size[type] <= selection || selection < 0) return de_InvalidSelection;
-
-    if (channels != 1 && channels != 2) return de_UnsupportedMode;
-    
-    lock;
-
-    const uint32_t frame_size = (sample_rate * frame_duration / 1000);
-    
-    uint32_t i;
-    for (i = 0; i < MAX_DEVICES && running[type][i] != NULL; i ++);
-    
-    if (i == MAX_DEVICES) { unlock; return de_AllDevicesBusy; }
-    else *device_idx = i;
-    
-    Device* device = running[type][*device_idx] = calloc(1, sizeof(Device));
-    device->selection = selection;
-    
-    device->sample_rate = sample_rate;
-    device->frame_duration = frame_duration;
-    device->sound_mode = channels == 1 ? AL_FORMAT_MONO16 : AL_FORMAT_STEREO16;
-    
-    for (i = 0; i < *device_idx; i ++) { /* Check if any previous has the same selection */
-        if ( running[type][i]->selection == selection ) {
-            device->dhndl = running[type][i]->dhndl;
-            if (type == output) {
-                device->ctx = running[type][i]->ctx;
-                memcpy(device->buffers, running[type][i]->buffers, sizeof(running[type][i]->buffers));
-                device->source = running[type][i]->source;
-            }
-            device->ref_count++;
-            pthread_mutex_init(device->mutex, NULL);
-            unlock;
-            return de_None;
-        }
-    }
-    
-    if (type == input) {
-        device->dhndl = alcCaptureOpenDevice(devices_names[type][selection], 
-                                             sample_rate, device->sound_mode, frame_size * 2);
-    #ifdef _AUDIO
-        device->VAD_treshold = user_settings_->VAD_treshold;
-    #endif
-    }
-    else { 
-        device->dhndl = alcOpenDevice(devices_names[type][selection]);
-        if ( !device->dhndl ) { 
-            free(device);
-            running[type][*device_idx] = NULL;
-            unlock;
-            return de_FailedStart;
-        }
-        
-        device->ctx = alcCreateContext(device->dhndl, NULL);
-        alcMakeContextCurrent(device->ctx);
-        
-        alGenBuffers(OPENAL_BUFS, device->buffers);
-        alGenSources((uint32_t)1, &device->source);
-        alSourcei(device->source, AL_LOOPING, AL_FALSE);
-        
-        uint16_t zeros[frame_size];
-        memset(zeros, 0, frame_size*2);
-        
-        for ( i =0; i < OPENAL_BUFS; ++i) {
-            alBufferData(device->buffers[i], device->sound_mode, zeros, frame_size*2, sample_rate);
-        }
-        
-        alSourceQueueBuffers(device->source, OPENAL_BUFS, device->buffers);
-        alSourcePlay(device->source);
-    }
-    
-    if (alcGetError(device->dhndl) != AL_NO_ERROR) {
-        free(device);
-        running[type][*device_idx] = NULL;
-        unlock;
-        return de_FailedStart;
-    }
-    
-    if (type == input) {
-        alcCaptureStart(device->dhndl);
-        thread_paused = _False;
-    }
-    
-    pthread_mutex_init(device->mutex, NULL);
-    unlock;
-    return de_None;
-}
-
-DeviceError close_device(DeviceType type, uint32_t device_idx)
-{
-    if (device_idx >= MAX_DEVICES) return de_InvalidSelection;
-    
-    lock;
-    Device* device = running[type][device_idx];
-    
-    if (!device) { 
-        unlock;
-        return de_DeviceNotActive;
-    }
-    
-    if ( !(device->ref_count--) ) {
-        running[type][device_idx] = NULL;
-        unlock;
-        
-        DeviceError rc = de_None;
-        
-        if (type == input) {
-            if ( !alcCaptureCloseDevice(device->dhndl) ) rc = de_AlError;
-        }
-        else { 
-            if (alcGetCurrentContext() != device->ctx) alcMakeContextCurrent(device->ctx);
-            
-            alDeleteSources(1, &device->source);
-            alDeleteBuffers(OPENAL_BUFS, device->buffers);
-            
-            if ( !alcCloseDevice(device->dhndl) ) rc = de_AlError;
-            alcMakeContextCurrent(NULL);
-            if ( device->ctx ) alcDestroyContext(device->ctx);
-        }
-        
-        free(device);
-        return rc;
-    }
-    
-    unlock;
-    
-    return de_None;
-}
-
-DeviceError register_device_callback( int32_t call_idx, uint32_t device_idx, DataHandleCallback callback, void* data, _Bool enable_VAD)
-{
-    if (size[input] <= device_idx || !running[input][device_idx] || running[input][device_idx]->dhndl == NULL) 
-        return de_InvalidSelection;
-    
-    lock;
-    running[input][device_idx]->cb = callback;
-    running[input][device_idx]->cb_data = data;
-    running[input][device_idx]->enable_VAD = enable_VAD;
-    running[input][device_idx]->call_idx = call_idx;
-    unlock;
-    
-    return de_None;
-}
-
-inline__ DeviceError write_out(uint32_t device_idx, int16_t* data, uint32_t lenght, uint8_t channels)
-{
-    if (device_idx >= MAX_DEVICES) return de_InvalidSelection;
-    
-    Device* device = running[output][device_idx];
-    
-    if (!device || device->muted) return de_DeviceNotActive;
-    
-    pthread_mutex_lock(device->mutex);
-    
-    
-    ALuint bufid;
-    ALint processed, queued;
-    alGetSourcei(device->source, AL_BUFFERS_PROCESSED, &processed);
-    alGetSourcei(device->source, AL_BUFFERS_QUEUED, &queued);
-    
-    if(processed) {
-        ALuint bufids[processed];
-        alSourceUnqueueBuffers(device->source, processed, bufids);
-        alDeleteBuffers(processed - 1, bufids + 1);
-        bufid = bufids[0];
-    } 
-    else if(queued < 16) alGenBuffers(1, &bufid);
-    else { 
-        pthread_mutex_unlock(device->mutex);
-        return de_Busy;
-    }
-    
-    
-    alBufferData(bufid, device->sound_mode, data, lenght * 2 * channels, device->sample_rate);
-    alSourceQueueBuffers(device->source, 1, &bufid);
-    
-    ALint state;
-    alGetSourcei(device->source, AL_SOURCE_STATE, &state);
-    
-    if(state != AL_PLAYING) alSourcePlay(device->source);
-    
-    
-    pthread_mutex_unlock(device->mutex);
-    return de_None;
-}
-
-void* thread_poll (void* arg) // TODO: maybe use thread for every input source
-{
-    /*
-     * NOTE: We only need to poll input devices for data.
-     */
-    (void)arg;
-    uint32_t i;
-    int32_t sample = 0;
-    
-    
-    while (thread_running)
-    {
-        if (thread_paused) usleep(10000); /* Wait for unpause. */
-        else
-        {
-            for (i = 0; i < size[input]; i ++) 
-            {
-                lock;
-                if (running[input][i] != NULL) 
-                {
-                    alcGetIntegerv(running[input][i]->dhndl, ALC_CAPTURE_SAMPLES, sizeof(int32_t), &sample);
-                    
-                    int f_size = (running[input][i]->sample_rate * running[input][i]->frame_duration / 1000);
-                    
-                    if (sample < f_size) { 
-                        unlock;
-                        continue;
-                    }
-                    Device* device = running[input][i];
-                    
-                    int16_t frame[16000];
-                    alcCaptureSamples(device->dhndl, frame, f_size);
-                    
-                    if ( device->muted 
-                    #ifdef _AUDIO
-                        || (device->enable_VAD && !toxav_has_activity(av, device->call_idx, frame, f_size, device->VAD_treshold))
-                    #endif /* _AUDIO */
-                        )
-                        { unlock; continue; } /* Skip if no voice activity */
-                    
-                    if ( device->cb ) device->cb(frame, f_size, device->cb_data);
-                } 
-                unlock;
-            }
-            usleep(5000);
-        }
-    }
-    
-    pthread_exit(NULL);
-}
-
-void print_devices(ToxWindow* self, DeviceType type)
-{
-    int i = 0;
-    for ( ; i < size[type]; i ++)
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "%d: %s", i, devices_names[type][i]);
-
-    return;
-}
-
-DeviceError selection_valid(DeviceType type, int32_t selection)
-{
-    return (size[type] <= selection || selection < 0) ? de_InvalidSelection : de_None;
-}
-
-void* get_device_callback_data(uint32_t device_idx)
-{
-    if (size[input] <= device_idx || !running[input][device_idx] || running[input][device_idx]->dhndl == NULL) 
-        return NULL;
-        
-    return running[input][device_idx]->cb_data;
-}       

src/dns.c

@@ -1,314 +0,0 @@
-/*  dns.c
- *
- *
- *  Copyright (C) 2014 Toxic All Rights Reserved.
- *
- *  This file is part of Toxic.
- *
- *  Toxic is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Toxic is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Toxic.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h> /* for u_char */
-#include <netinet/in.h>
-#include <resolv.h>
-
-#ifdef __APPLE__
-    #include <arpa/nameser_compat.h>
-#else
-    #include <arpa/nameser.h>
-#endif  /* ifdef __APPLE__ */
-
-#include <tox/toxdns.h>
-
-#include "toxic.h"
-#include "windows.h"
-#include "line_info.h"
-#include "dns.h"
-#include "global_commands.h"
-#include "misc_tools.h"
-
-#define MAX_DNS_REQST_SIZE 256
-#define NUM_DNS3_SERVERS 2    /* must correspond to number of items in dns3_servers array */
-#define TOX_DNS3_TXT_PREFIX "v=tox3;id="
-#define DNS3_KEY_SZ 32
-
-extern struct _Winthread Winthread;
-
-/* TODO: process keys from key file instead of hard-coding like a noob */
-static struct dns3_server {
-    const char *name;
-    char key[DNS3_KEY_SZ];
-} dns3_servers[] = {
-    {
-        "utox.org",
-        {
-          0xD3, 0x15, 0x4F, 0x65, 0xD2, 0x8A, 0x5B, 0x41, 0xA0, 0x5D, 0x4A, 0xC7, 0xE4, 0xB3, 0x9C, 0x6B,
-          0x1C, 0x23, 0x3C, 0xC8, 0x57, 0xFB, 0x36, 0x5C, 0x56, 0xE8, 0x39, 0x27, 0x37, 0x46, 0x2A, 0x12
-        }
-    },
-    {
-        "toxme.se",
-        {
-          0x5D, 0x72, 0xC5, 0x17, 0xDF, 0x6A, 0xEC, 0x54, 0xF1, 0xE9, 0x77, 0xA6, 0xB6, 0xF2, 0x59, 0x14,
-          0xEA, 0x4C, 0xF7, 0x27, 0x7A, 0x85, 0x02, 0x7C, 0xD9, 0xF5, 0x19, 0x6D, 0xF1, 0x7E, 0x0B, 0x13
-        }
-    },
-};
-
-static struct _thread_data {
-    ToxWindow *self;
-    char id_bin[TOX_FRIEND_ADDRESS_SIZE];
-    char addr[MAX_STR_SIZE];
-    char msg[MAX_STR_SIZE];
-    uint8_t busy;
-    Tox *m;
-} t_data;
-
-static struct _dns_thread {
-    pthread_t tid;
-    pthread_attr_t attr;
-} dns_thread;
-
-
-static int dns_error(ToxWindow *self, const char *errmsg)
-{
-    pthread_mutex_lock(&Winthread.lock);
-    line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "User lookup failed: %s", errmsg);
-    pthread_mutex_unlock(&Winthread.lock);
-
-    return -1;
-}
-
-static void kill_dns_thread(void *dns_obj)
-{
-    if (dns_obj)
-        tox_dns3_kill(dns_obj);
-
-    memset(&t_data, 0, sizeof(struct _thread_data));
-    pthread_attr_destroy(&dns_thread.attr);
-    pthread_exit(NULL);
-}
-
-/* puts TXT from dns response in buf. Returns length of TXT on success, -1 on fail.*/
-static int parse_dns_response(ToxWindow *self, u_char *answer, int ans_len, char *buf)
-{
-    uint8_t *ans_pt = answer + sizeof(HEADER);
-    uint8_t *ans_end = answer + ans_len;
-    char exp_ans[PACKETSZ];
-    
-    int len = dn_expand(answer, ans_end, ans_pt, exp_ans, sizeof(exp_ans));
-
-    if (len == -1)
-        return dns_error(self, "dn_expand failed."); 
-
-    ans_pt += len;
-
-    if (ans_pt > ans_end - 4)
-         return dns_error(self, "DNS reply was too short."); 
-
-    int type;
-    GETSHORT(type, ans_pt);
-
-    if (type != T_TXT)
-        return dns_error(self, "Broken DNS reply."); 
- 
-
-    ans_pt += INT16SZ;    /* class */
-    uint32_t size = 0;
-
-    /* recurse through CNAME rr's */
-    do { 
-        ans_pt += size;
-        len = dn_expand(answer, ans_end, ans_pt, exp_ans, sizeof(exp_ans));
-
-        if (len == -1)
-            return dns_error(self, "Second dn_expand failed."); 
-
-        ans_pt += len;
-
-        if (ans_pt > ans_end - 10)
-            return dns_error(self, "DNS reply was too short."); 
-
-        GETSHORT(type, ans_pt);
-        ans_pt += INT16SZ;
-        ans_pt += 4;
-        GETSHORT(size, ans_pt);
-
-        if (ans_pt + size < answer || ans_pt + size > ans_end)
-            return dns_error(self, "RR overflow."); 
-
-    } while (type == T_CNAME);
-
-    if (type != T_TXT)
-        return dns_error(self, "DNS response failed."); 
-
-    uint32_t txt_len = *ans_pt;
-
-    if (!size || txt_len >= size || !txt_len)
-        return dns_error(self, "No record found.");
-
-    ans_pt++;
-    ans_pt[txt_len] = '\0';
-    memcpy(buf, ans_pt, txt_len + 1);
-
-    return txt_len;
-}
-
-/* Takes address addr in the form "username@domain", puts the username in namebuf, 
-   and the domain in dombuf.
-
-   return length of username on success, -1 on failure */
-static int parse_addr(const char *addr, char *namebuf, char *dombuf)
-{
-    char tmpaddr[MAX_STR_SIZE];
-    char *tmpname, *tmpdom;
-
-    strcpy(tmpaddr, addr);
-    tmpname = strtok(tmpaddr, "@");
-    tmpdom = strtok(NULL, "");
-
-    if (tmpname == NULL || tmpdom == NULL)
-        return -1;
-
-    str_to_lower(tmpdom);
-    strcpy(namebuf, tmpname);
-    strcpy(dombuf, tmpdom);
-
-    return strlen(namebuf);
-}
-
-/* Does DNS lookup for addr and puts resulting tox id in id_bin. */
-void *dns3_lookup_thread(void *data)
-{
-    ToxWindow *self = t_data.self;
-
-    char domain[MAX_STR_SIZE];
-    char name[MAX_STR_SIZE];
-
-    int namelen = parse_addr(t_data.addr, name, domain);
-
-    if (namelen == -1) {
-        dns_error(self, "Must be a Tox ID or an address in the form username@domain");
-        kill_dns_thread(NULL);
-    }
-
-    /* get domain name/pub key */
-    const char *DNS_pubkey = NULL;
-    const char *domname = NULL;
-    int i;
-
-    for (i = 0; i < NUM_DNS3_SERVERS; ++i) {
-        if (strcmp(dns3_servers[i].name, domain) == 0) {
-            DNS_pubkey = dns3_servers[i].key;
-            domname = dns3_servers[i].name;
-            break;
-        }
-    }
-
-    if (domname == NULL) {
-        dns_error(self, "Domain not found.");
-        kill_dns_thread(NULL);
-    }
-
-    void *dns_obj = tox_dns3_new((uint8_t *) DNS_pubkey);
-
-    if (dns_obj == NULL) {
-        dns_error(self, "Core failed to create DNS object.");
-        kill_dns_thread(NULL);
-    }
-
-    char string[MAX_DNS_REQST_SIZE];
-    uint32_t request_id;
-
-    int str_len = tox_generate_dns3_string(dns_obj, (uint8_t *) string, sizeof(string), &request_id, 
-                                           (uint8_t *) name, namelen);
-
-    if (str_len == -1) {
-        dns_error(self, "Core failed to generate DNS3 string.");
-        kill_dns_thread(dns_obj);
-    }
-
-    string[str_len] = '\0';
-
-    u_char answer[PACKETSZ];
-    char d_string[MAX_DNS_REQST_SIZE];
-
-    /* format string and create dns query */
-    snprintf(d_string, sizeof(d_string), "_%s._tox.%s", string, domname);
-    int ans_len = res_query(d_string, C_IN, T_TXT, answer, sizeof(answer));
-
-    if (ans_len <= 0) {
-        dns_error(self, "DNS query failed.");
-        kill_dns_thread(dns_obj);
-    }
-
-    char ans_id[MAX_DNS_REQST_SIZE];
-
-    /* extract TXT from DNS response */
-    if (parse_dns_response(self, answer, ans_len, ans_id) == -1)
-        kill_dns_thread(dns_obj);
-
-    char encrypted_id[MAX_DNS_REQST_SIZE];
-    int prfx_len = strlen(TOX_DNS3_TXT_PREFIX);
-
-    /* extract the encrypted ID from TXT response */
-    if (strncmp(ans_id, TOX_DNS3_TXT_PREFIX, prfx_len) != 0) {
-        dns_error(self, "Bad DNS3 TXT response.");
-        kill_dns_thread(dns_obj);
-    }
-
-    memcpy(encrypted_id, ans_id + prfx_len, ans_len - prfx_len);
-
-    if (tox_decrypt_dns3_TXT(dns_obj, (uint8_t *) t_data.id_bin, (uint8_t *) encrypted_id, 
-                             strlen(encrypted_id), request_id) == -1) {
-        dns_error(self, "Core failed to decrypt DNS response.");
-        kill_dns_thread(dns_obj);
-    }
-
-    pthread_mutex_lock(&Winthread.lock);
-    cmd_add_helper(self, t_data.m, t_data.id_bin, t_data.msg);
-    pthread_mutex_unlock(&Winthread.lock);
-
-    kill_dns_thread(dns_obj);
-    return 0;
-}
-
-/* creates new thread for dns3 lookup. Only allows one lookup at a time. */
-void dns3_lookup(ToxWindow *self, Tox *m, const char *id_bin, const char *addr, const char *msg)
-{
-    if (t_data.busy) {
-        const char *err = "Please wait for previous user lookup to finish.";
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, err);
-        return;
-    }
-
-    snprintf(t_data.id_bin, sizeof(t_data.id_bin), "%s", id_bin);
-    snprintf(t_data.addr, sizeof(t_data.addr), "%s", addr);
-    snprintf(t_data.msg, sizeof(t_data.msg), "%s", msg);
-    t_data.self = self;
-    t_data.m = m;
-    t_data.busy = 1;
-
-    if (pthread_attr_init(&dns_thread.attr) != 0)
-        exit_toxic_err("failed in dns3_lookup", FATALERR_THREAD_ATTR);
-
-    if (pthread_attr_setdetachstate(&dns_thread.attr, PTHREAD_CREATE_DETACHED) != 0)
-        exit_toxic_err("failed in dns3_lookup", FATALERR_THREAD_ATTR);
-
-    if (pthread_create(&dns_thread.tid, &dns_thread.attr, dns3_lookup_thread, NULL) != 0)
-        exit_toxic_err("failed in dns3_lookup", FATALERR_THREAD_CREATE);
-}

src/execute.c

@@ -20,18 +20,20 @@
  *
  */
 
+#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
 
-#include "toxic.h"
-#include "windows.h"
-#include "execute.h"
+#include "api.h"
 #include "chat_commands.h"
+#include "execute.h"
 #include "global_commands.h"
+#include "conference_commands.h"
 #include "line_info.h"
 #include "misc_tools.h"
 #include "notify.h"
+#include "toxic.h"
+#include "windows.h"
 
 struct cmd_func {
     const char *name;
@@ -41,95 +43,179 @@ struct cmd_func {
 static struct cmd_func global_commands[] = {
     { "/accept",    cmd_accept        },
     { "/add",       cmd_add           },
+    { "/avatar",    cmd_avatar        },
     { "/clear",     cmd_clear         },
     { "/connect",   cmd_connect       },
+    { "/decline",   cmd_decline       },
     { "/exit",      cmd_quit          },
-    { "/groupchat", cmd_groupchat     },
+    { "/conference", cmd_conference    },
     { "/help",      cmd_prompt_help   },
     { "/log",       cmd_log           },
     { "/myid",      cmd_myid          },
+#ifdef QRCODE
+    { "/myqr",      cmd_myqr          },
+#endif /* QRCODE */
     { "/nick",      cmd_nick          },
     { "/note",      cmd_note          },
+    { "/nospam",    cmd_nospam        },
     { "/q",         cmd_quit          },
     { "/quit",      cmd_quit          },
+    { "/requests",  cmd_requests      },
     { "/status",    cmd_status        },
-
-#ifdef _AUDIO
+#ifdef AUDIO
     { "/lsdev",     cmd_list_devices  },
     { "/sdev",      cmd_change_device },
-#endif /* _AUDIO */
+#endif /* AUDIO */
+#ifdef VIDEO
+    { "/lsvdev",    cmd_list_video_devices  },
+    { "/svdev",     cmd_change_video_device },
+#endif /* VIDEO */
+#ifdef PYTHON
+    { "/run",       cmd_run           },
+#endif /* PYTHON */
+    { NULL,         NULL              },
 };
 
 static struct cmd_func chat_commands[] = {
     { "/cancel",    cmd_cancelfile        },
-    { "/invite",    cmd_groupinvite },
-    { "/join",      cmd_join_group  },
+    { "/invite",    cmd_conference_invite },
+    { "/join",      cmd_conference_join   },
     { "/savefile",  cmd_savefile          },
     { "/sendfile",  cmd_sendfile          },
-
-#ifdef _AUDIO
+#ifdef AUDIO
     { "/call",      cmd_call              },
     { "/answer",    cmd_answer            },
     { "/reject",    cmd_reject            },
     { "/hangup",    cmd_hangup            },
-    { "/sdev",      cmd_ccur_device },
     { "/mute",      cmd_mute              },
     { "/sense",     cmd_sense             },
-#endif /* _AUDIO */
+    { "/bitrate",   cmd_bitrate           },
+#endif /* AUDIO */
+#ifdef VIDEO
+    { "/vcall",     cmd_vcall             },
+    { "/video",     cmd_video             },
+    { "/res",       cmd_res               },
+#endif /* VIDEO */
+    { NULL,         NULL                  },
 };
 
-/* Parses input command and puts args into arg array.
-   Returns number of arguments on success, -1 on failure. */
-static int parse_command(WINDOW *w, ToxWindow *self, const char *input, char (*args)[MAX_STR_SIZE])
+static struct cmd_func conference_commands[] = {
+    { "/title",     cmd_conference_set_title },
+
+#ifdef AUDIO
+    { "/audio",     cmd_enable_audio },
+    { "/mute",      cmd_conference_mute   },
+    { "/ptt",       cmd_conference_push_to_talk },
+    { "/sense",     cmd_conference_sense  },
+#endif /* AUDIO */
+    { NULL,         NULL             },
+};
+
+
+#ifdef PYTHON
+#define SPECIAL_COMMANDS 7
+#else
+#define SPECIAL_COMMANDS 6
+#endif /* PYTHON */
+
+/* Special commands are commands that only take one argument even if it contains spaces */
+static const char special_commands[SPECIAL_COMMANDS][MAX_CMDNAME_SIZE] = {
+    "/avatar",
+    "/nick",
+    "/note",
+#ifdef PYTHON
+    "/run",
+#endif /* PYTHON */
+    "/sendfile",
+    "/title",
+    "/mute",
+};
+
+/* Returns true if input command is in the special_commands array. */
+static bool is_special_command(const char *input)
 {
+    const int s = char_find(0, input, ' ');
+
+    for (int i = 0; i < SPECIAL_COMMANDS; ++i) {
+        if (strncmp(input, special_commands[i], s) == 0) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+/* Parses commands in the special_commands array. Unlike parse_command, this function
+ * does not split the input string at spaces.
+ *
+ * Returns the number of arguments.
+ */
+static int parse_special_command(const char *input, char (*args)[MAX_STR_SIZE])
+{
+    int len = strlen(input);
+    int s = char_find(0, input, ' ');
+
+    memcpy(args[0], input, s);
+    args[0][s++] = '\0';    // increment to remove space after "/command "
+
+    if (s >= len) {
+        return 1;  // No additional args
+    }
+
+    memcpy(args[1], input + s, len - s);
+    args[1][len - s] = '\0';
+
+    return 2;
+}
+
+/* Parses input command and puts args into arg array.
+ *
+ * Returns the number of arguments.
+ */
+static int parse_command(const char *input, char (*args)[MAX_STR_SIZE])
+{
+    if (is_special_command(input)) {
+        return parse_special_command(input, args);
+    }
+
     char *cmd = strdup(input);
 
-    if (cmd == NULL)
+    if (cmd == NULL) {
         exit_toxic_err("failed in parse_command", FATALERR_MEMORY);
+    }
 
     int num_args = 0;
-    int i = 0;    /* index of last char in an argument */
 
     /* characters wrapped in double quotes count as one arg */
     while (num_args < MAX_NUM_ARGS) {
-        int qt_ofst = 0;    /* set to 1 to offset index for quote char at end of arg */
+        int i = char_find(0, cmd, ' ');    // index of last char in an argument
+        memcpy(args[num_args], cmd, i);
+        args[num_args++][i] = '\0';
 
-        if (*cmd == '\"') {
-            qt_ofst = 1;
-            i = char_find(1, cmd, '\"');
-
-            if (cmd[i] == '\0') {
-                char *errmsg = "Invalid argument. Did you forget a closing \"?";
-                line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, errmsg);
-                free(cmd);
-                return -1;
-            }
-        } else {
-            i = char_find(0, cmd, ' ');
-        }
-
-        memcpy(args[num_args], cmd, i + qt_ofst);
-        args[num_args++][i + qt_ofst] = '\0';
-
-        if (cmd[i] == '\0')    /* no more args */
+        if (cmd[i] == '\0') {  // no more args
             break;
+        }
 
         char tmp[MAX_STR_SIZE];
         snprintf(tmp, sizeof(tmp), "%s", &cmd[i + 1]);
-        strcpy(cmd, tmp);
+        strcpy(cmd, tmp);    // tmp will always fit inside cmd
     }
 
     free(cmd);
     return num_args;
 }
 
-/* Matches command to respective function. Returns 0 on match, 1 on no match */
-static int do_command(WINDOW *w, ToxWindow *self, Tox *m, int num_args, int num_cmds,
-                      struct cmd_func *commands, char (*args)[MAX_STR_SIZE])
+/* Matches command to respective function.
+ *
+ * Returns 0 on match.
+ * Returns 1 on no match
+ */
+static int do_command(WINDOW *w, ToxWindow *self, Tox *m, int num_args, struct cmd_func *commands,
+                      char (*args)[MAX_STR_SIZE])
 {
     int i;
 
-    for (i = 0; i < num_cmds; ++i) {
+    for (i = 0; commands[i].name != NULL; ++i) {
         if (strcmp(args[0], commands[i].name) == 0) {
             (commands[i].func)(w, self, m, num_args - 1, args);
             return 0;
@@ -141,36 +227,49 @@ static int do_command(WINDOW *w, ToxWindow *self, Tox *m, int num_args, int num_
 
 void execute(WINDOW *w, ToxWindow *self, Tox *m, const char *input, int mode)
 {
-    if (string_is_empty(input))
+    if (string_is_empty(input)) {
         return;
+    }
 
     char args[MAX_NUM_ARGS][MAX_STR_SIZE];
-    int num_args = parse_command(w, self, input, args);
+    int num_args = parse_command(input, args);
 
-    if (num_args == -1)
+    if (num_args <= 0) {
         return;
+    }
 
     /* Try to match input command to command functions. If non-global command mode is specified,
-       try specified mode's commands first, then upon failure try global commands.
-
-       Note: Global commands must come last in case of duplicate command names */
+     * try specified mode's commands first, then upon failure try global commands.
+     *
+     * Note: Global commands must come last in case of duplicate command names
+     */
     switch (mode) {
         case CHAT_COMMAND_MODE:
-            if (do_command(w, self, m, num_args, CHAT_NUM_COMMANDS, chat_commands, args) == 0)
+            if (do_command(w, self, m, num_args, chat_commands, args) == 0) {
                 return;
+            }
 
             break;
 
-        case GROUPCHAT_COMMAND_MODE:
+        case CONFERENCE_COMMAND_MODE:
+            if (do_command(w, self, m, num_args, conference_commands, args) == 0) {
+                return;
+            }
+
             break;
     }
 
-    if (do_command(w, self, m, num_args, GLOBAL_NUM_COMMANDS, global_commands, args) == 0)
+    if (do_command(w, self, m, num_args, global_commands, args) == 0) {
         return;
+    }
+
+#ifdef PYTHON
+
+    if (do_plugin_command(num_args, args) == 0) {
+        return;
+    }
 
-#ifdef _SOUND_NOTIFY
-        sound_notify(self, error, 0, NULL);
-#else
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Invalid command.");
 #endif
+
+    line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invalid command.");
 }

src/execute.h

@@ -20,28 +20,20 @@
  *
  */
 
-#ifndef _execute_h
-#define _execute_h
+#ifndef EXECUTE_H
+#define EXECUTE_H
 
 #include "toxic.h"
 #include "windows.h"
 
 #define MAX_NUM_ARGS 4     /* Includes command */
 
-#ifdef _AUDIO
-#define GLOBAL_NUM_COMMANDS 16
-#define CHAT_NUM_COMMANDS 12
-#else
-#define GLOBAL_NUM_COMMANDS 14
-#define CHAT_NUM_COMMANDS 5
-#endif /* _AUDIO */
-
 enum {
     GLOBAL_COMMAND_MODE,
     CHAT_COMMAND_MODE,
-    GROUPCHAT_COMMAND_MODE,
+    CONFERENCE_COMMAND_MODE,
 };
 
 void execute(WINDOW *w, ToxWindow *self, Tox *m, const char *input, int mode);
 
-#endif /* #define _execute_h */
+#endif /* EXECUTE_H */

src/file_senders.c

@@ -1,232 +0,0 @@
-/*  file_senders.c
- *
- *
- *  Copyright (C) 2014 Toxic All Rights Reserved.
- *
- *  This file is part of Toxic.
- *
- *  Toxic is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Toxic is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Toxic.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-#include <unistd.h>
-
-#include "toxic.h"
-#include "windows.h"
-#include "friendlist.h"
-#include "file_senders.h"
-#include "line_info.h"
-#include "misc_tools.h"
-#include "notify.h"
-
-FileSender file_senders[MAX_FILES];
-uint8_t max_file_senders_index;
-uint8_t num_active_file_senders;
-extern ToxicFriend friends[MAX_FRIENDS_NUM];
-
-#define KiB 1024
-#define MiB 1048576       /* 1024 ^ 2 */
-#define GiB 1073741824    /* 1024 ^ 3 */
-
-/* creates initial progress line that will be updated during file transfer.
-   Assumes progline is of size MAX_STR_SIZE */
-void prep_prog_line(char *progline)
-{
-    strcpy(progline, "0.0 B/s [");
-    int i;
-
-    for (i = 0; i < NUM_PROG_MARKS; ++i)
-        strcat(progline, "-");
-
-    strcat(progline, "] 0%");
-}
-
-/* prints a progress bar for file transfers. 
-   if friendnum is -1 we're sending the file, otherwise we're receiving.  */
-void print_progress_bar(ToxWindow *self, int idx, int friendnum, double pct_done)
-{
-    double bps;
-    uint32_t line_id;
-
-    if (friendnum < 0) {
-        bps = file_senders[idx].bps;
-        line_id = file_senders[idx].line_id;
-    } else {
-        bps = friends[friendnum].file_receiver.bps[idx];
-        line_id = friends[friendnum].file_receiver.line_id[idx];
-    }
-
-    const char *unit;
-
-    if (bps < KiB) {
-        unit = "B/s";
-    } else if (bps < MiB) {
-        unit = "KiB/s";
-        bps /= (double) KiB;
-    } else if (bps < GiB) {
-        unit = "MiB/s";
-        bps /= (double) MiB;
-    } else {
-        unit = "GiB/s";
-        bps /= (double) GiB;
-    }
-
-    char msg[MAX_STR_SIZE];
-    snprintf(msg, sizeof(msg), "%.1f %s [", bps, unit);
-    int n = pct_done / (100 / NUM_PROG_MARKS);
-    int i;
-
-    for (i = 0; i < n; ++i)
-        strcat(msg, "#");
-
-    int j;
-
-    for (j = i; j < NUM_PROG_MARKS; ++j)
-        strcat(msg, "-");
-
-    strcat(msg, "] ");
-
-    char pctstr[16];
-    const char *frmt = pct_done == 100 ? "%.f%%" : "%.1f%%";
-    snprintf(pctstr, sizeof(pctstr), frmt, pct_done);
-    strcat(msg, pctstr);
-
-    line_info_set(self, line_id, msg);
-}
-
-static void set_max_file_senders_index(void)
-{
-    int j;
-
-    for (j = max_file_senders_index; j > 0; --j) {
-        if (file_senders[j - 1].active)
-            break;
-    }
-
-    max_file_senders_index = j;
-}
-
-/* set CTRL to -1 if we don't want to send a control signal.
-   set msg to NULL if we don't want to display a message */
-void close_file_sender(ToxWindow *self, Tox *m, int i, const char *msg, int CTRL, int filenum, int32_t friendnum)
-{
-    if (msg != NULL) 
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "%s", msg);
-    
-    if (CTRL > 0)
-        tox_file_send_control(m, friendnum, 0, filenum, CTRL, 0, 0);
-
-    fclose(file_senders[i].file);
-    memset(&file_senders[i], 0, sizeof(FileSender));
-    set_max_file_senders_index();
-    --num_active_file_senders;
-}
-
-void close_all_file_senders(Tox *m)
-{
-    int i;
-
-    for (i = 0; i < max_file_senders_index; ++i) {
-        if (file_senders[i].active) {
-            fclose(file_senders[i].file);
-            tox_file_send_control(m, file_senders[i].friendnum, 0, file_senders[i].filenum,
-                                  TOX_FILECONTROL_KILL, 0, 0);
-            memset(&file_senders[i], 0, sizeof(FileSender));
-        }
-
-        set_max_file_senders_index();
-    }
-}
-
-static void send_file_data(ToxWindow *self, Tox *m, int i, int32_t friendnum, int filenum, const char *filename)
-{
-    FILE *fp = file_senders[i].file;
-
-    while (true) {
-        if (tox_file_send_data(m, friendnum, filenum, (uint8_t *) file_senders[i].nextpiece,
-                               file_senders[i].piecelen) == -1)
-            return;
-
-        uint64_t curtime = get_unix_time();
-        file_senders[i].timestamp = curtime;
-        file_senders[i].bps += file_senders[i].piecelen;            
-        file_senders[i].piecelen = fread(file_senders[i].nextpiece, 1,
-                                         tox_file_data_size(m, friendnum), fp);
-
-        double remain = (double) tox_file_data_remaining(m, friendnum, filenum, 0);
-
-        /* refresh line with percentage complete and transfer speed (must be called once per second) */
-        if ( (self->chatwin != NULL && timed_out(file_senders[i].last_progress, curtime, 1))
-             || (!remain && !file_senders[i].finished) ) {
-            file_senders[i].last_progress = curtime;
-            double pct_done = remain > 0 ? (1 - (remain / file_senders[i].size)) * 100 : 100;
-            print_progress_bar(self, i, -1, pct_done);
-            file_senders[i].bps = 0;
-        }
-
-        /* file sender is closed in chat_onFileControl callback after receiving reply */
-        if (file_senders[i].piecelen == 0 && !file_senders[i].finished) {
-            tox_file_send_control(m, friendnum, 0, filenum, TOX_FILECONTROL_FINISHED, 0, 0);
-            file_senders[i].finished = true;
-        }
-    }
-}
-
-void do_file_senders(Tox *m)
-{
-    int i;
-
-    for (i = 0; i < max_file_senders_index; ++i) {
-        if (!file_senders[i].active)
-            continue;
-
-        if (file_senders[i].queue_pos > 0) {
-            --file_senders[i].queue_pos;
-            continue;
-        }
-
-        ToxWindow *self = file_senders[i].toxwin;
-        char *filename = file_senders[i].filename;
-        int filenum = file_senders[i].filenum;
-        int32_t friendnum = file_senders[i].friendnum;
-
-        /* kill file transfer if chatwindow is closed */
-        if (self->chatwin == NULL) {
-            close_file_sender(self, m, i, NULL, TOX_FILECONTROL_KILL, filenum, friendnum);
-            continue;
-        }
-
-        /* If file transfer has timed out kill transfer and send kill control */
-        if (timed_out(file_senders[i].timestamp, get_unix_time(), TIMEOUT_FILESENDER)) {
-            char msg[MAX_STR_SIZE];
-            snprintf(msg, sizeof(msg), "File transfer for '%s' timed out.", filename);
-            close_file_sender(self, m, i, msg, TOX_FILECONTROL_KILL, filenum, friendnum);
-            sound_notify(self, error, NT_NOFOCUS | NT_WNDALERT_2, NULL);
-            
-            if (self->active_box != -1)
-                box_notify2(self, error, NT_NOFOCUS | NT_WNDALERT_2, 
-                            self->active_box, "File transfer for '%s' timed out.", filename );
-            else
-                box_notify(self, error, NT_NOFOCUS | NT_WNDALERT_2, &self->active_box,
-                           self->name, "File transfer for '%s' timed out.", filename );
-            continue;
-        }
-
-        file_senders[i].queue_pos = num_active_file_senders - 1;
-        send_file_data(self, m, i, friendnum, filenum, filename);
-    }
-}