Greatly reduce redundant window refreshing

This should substantially reduce CPU usage and possibly fix some issues with interface jittering/flashing
2025-10-31 03:36:51 +01:00 · 2021-11-19 15:03:08 -05:00
49 changed files with 1014 additions and 941 deletions
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,13 +0,0 @@
 ---
 cirrus-ci_task:
  container:
    image: toxchat/toktok-stack:0.0.31-third_party
    cpu: 2
    memory: 2G
  configure_script:
    - /src/workspace/tools/inject-repo toxic
  test_all_script:
    - cd /src/workspace && bazel test -k
        --remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST
        --config=release
        //toxic/...
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -11,8 +11,7 @@ branches:
    protection:
      required_status_checks:
        contexts:
-          - build
+          - Codacy/PR Quality Review
-          - cirrus-ci
+          - CodeFactor
-          - Codacy Static Code Analysis
+          - Travis CI - Pull Request
          - code-review/reviewable
          - infer
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,106 +0,0 @@
 name: ci
 on:
  push:
    branches: [master]
  pull_request:
    branches: [master]
 jobs:
  build:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
      - name: Install dependencies
        run:
          sudo apt-get update &&
          sudo apt-get install -y --no-install-recommends
            libalut-dev
            libconfig-dev
            libcurl4-gnutls-dev
            libnotify-dev
            libopenal-dev
            libopus-dev
            libqrencode-dev
            libsodium-dev
            libvpx-dev
            libx11-dev
            python3-dev
            pkg-config &&
          git clone --depth=1 https://github.com/TokTok/c-toxcore &&
          cd c-toxcore &&
          cmake . -B_build -DBOOTSTRAP_DAEMON=OFF &&
          cd _build &&
          make -j4 &&
          sudo make install
      - name: Build toxic
        run: make -j4
  infer:
    runs-on: ubuntu-latest
    container: toxchat/infer
    steps:
      - name: Install git
        run:
          apt-get update &&
          DEBIAN_FRONTEND=noninteractive
          apt-get install -y --no-install-recommends
            git
      - name: Install dependencies
        run:
          apt-get update &&
          apt-get install -y --no-install-recommends
            cmake
            g++
            libalut-dev
            libconfig-dev
            libcurl4-gnutls-dev
            libncurses-dev
            libnotify-dev
            libopenal-dev
            libopus-dev
            libqrencode-dev
            libsodium-dev
            libvpx-dev
            libx11-dev
            make
            python3-dev
            pkg-config &&
          git clone --depth=1 https://github.com/TokTok/c-toxcore &&
          cd c-toxcore &&
          cmake . -B_build -DBOOTSTRAP_DAEMON=OFF &&
          cd _build &&
          make -j4 &&
          make install
      - uses: actions/checkout@v2
      - name: Run infer
        run:
          infer --no-progress-bar -- cc src/*.c
            -fsyntax-only
            $(python3-config --includes --ldflags)
            $(pkg-config --cflags --libs
              freealut
              libconfig
              libcurl
              libnotify
              libpng
              libqrencode
              ncurses
              openal
              python3
              toxcore
              vpx
              x11)
            -DAUDIO
            -DBOX_NOTIFY
            -DGAMES
            -DPACKAGE_DATADIR='""'
            -DPYTHON
            -DQRCODE
            -DSOUND_NOTIFY
            -DVIDEO
      - name: Print log
        run:
          cat /__w/toxic/toxic/infer-out/report.txt
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,60 @@
 ---
 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))
      script:
        - make ENABLE_PYTHON=1 -j$(nproc)
    - 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)
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -18,7 +18,6 @@ cc_binary(
    copts = [
        "-std=gnu99",
        "-DAUDIO",
        "-DGAMES",
        "-DPACKAGE_DATADIR='\"data\"'",
        "-DPYTHON",
        "-DQRCODE",
@@ -40,10 +39,3 @@ cc_binary(
        "//tools/config:osx": [],
    }),
 )
 sh_test(
    name = "toxic_test",
    size = "small",
    srcs = [":toxic"],
    args = ["--help"],
 )
--- a/CHANGELOG.md
+++ b/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)*
--- a/apidoc/python/source/conf.py
+++ b/apidoc/python/source/conf.py
@@ -55,9 +55,9 @@ author = 'Jakob Kreuze'
 # built documents.
 #
 # The short X.Y version.
-version = '0.11.3'
+version = '0.11.1'
 # The full version, including alpha/beta/rc tags.
-release = '0.11.3'
+release = '0.11.1'
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -151,4 +151,4 @@ texinfo_documents = [
    (master_doc, 'toxic_api', 'toxic_api Documentation',
     author, 'toxic_api', 'One line description of project.',
     'Miscellaneous'),
-]
+]
--- a/cfg/global_vars.mk
+++ b/cfg/global_vars.mk
@@ -1,5 +1,5 @@
 # Version
-TOXIC_VERSION = 0.11.3
+TOXIC_VERSION = 0.11.1
 REV = $(shell git rev-list HEAD --count 2>/dev/null || echo -n "error")
 ifneq (, $(findstring error, $(REV)))
    VERSION = $(TOXIC_VERSION)
--- a/doc/toxic.1
+++ b/doc/toxic.1
@@ -2,12 +2,12 @@
 .\"     Title: toxic
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 2021-05-24
+.\"      Date: 2020-05-04
 .\"    Manual: Toxic Manual
 .\"    Source: toxic __VERSION__
 .\"  Language: English
 .\"
-.TH "TOXIC" "1" "2021\-05\-24" "toxic __VERSION__" "Toxic Manual"
+.TH "TOXIC" "1" "2020\-05\-04" "toxic __VERSION__" "Toxic Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -153,9 +153,9 @@ Configuration example\&.
 .sp
 \-Unicode characters with a width larger than 1 column may cause strange behaviour\&.
 .sp
-\-Screen flickering sometimes occurs on certain terminals\&.
+\-Text occasionally fails to auto\-scroll to the bottom\&.
 .sp
-\-Resizing the terminal window when a game window is open will break things\&.
+\-Screen flickering sometimes occurs on certain terminals\&.
 .SH "AUTHORS"
 .sp
 JFreegman <JFreegman@gmail\&.com>
--- a/doc/toxic.1.asc
+++ b/doc/toxic.1.asc
@@ -89,9 +89,9 @@ BUGS
 -Unicode characters with a width larger than 1 column may cause strange
 behaviour.
-Screen flickering sometimes occurs on certain terminals.
+-Text occasionally fails to auto-scroll to the bottom.
-Resizing the terminal window when a game window is open will break things.
+-Screen flickering sometimes occurs on certain terminals.
 AUTHORS
 -------
--- a/doc/toxic.conf.5
+++ b/doc/toxic.conf.5
@@ -2,12 +2,12 @@
 .\"     Title: toxic.conf
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 2021-05-24
+.\"      Date: 2020-12-05
 .\"    Manual: Toxic Manual
 .\"    Source: toxic __VERSION__
 .\"  Language: English
 .\"
-.TH "TOXIC\&.CONF" "5" "2021\-05\-24" "toxic __VERSION__" "Toxic Manual"
+.TH "TOXIC\&.CONF" "5" "2020\-12\-05" "toxic __VERSION__" "Toxic Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/script/build-minimal-static-toxic.sh
+++ b/script/build-minimal-static-toxic.sh
@@ -132,10 +132,10 @@ mkdir -p "$BUILD_DIR"
 cd "$BUILD_DIR"
 # The git hash of the c-toxcore version we're using
-TOXCORE_VERSION="v0.2.13"
+TOXCORE_VERSION="25a56c354937e9c8c4c50a64c3b4cfc099c34e29"
 # The sha256sum of the c-toxcore tarball for TOXCORE_VERSION
-TOXCORE_HASH="67114fa57504c58b695f5dce8ef85124d555f2c3c353d0d2615e6d4845114ab8"
+TOXCORE_HASH="8448752e6286c747130254571fde2db8e2fc073a8116f9fff489ed53af546c0a"
 TOXCORE_FILENAME="c-toxcore-$TOXCORE_VERSION.tar.gz"
@@ -164,8 +164,8 @@ cmake --build _build --target install
 # location with SSL_CERT_FILE env variable.
 cd "$BUILD_DIR"
-CURL_VERSION="7.80.0"
+CURL_VERSION="7.77.0"
-CURL_HASH="dab997c9b08cb4a636a03f2f7f985eaba33279c1c52692430018fae4a4878dc7"
+CURL_HASH="b0a3428acb60fa59044c4d0baae4e4fc09ae9af1d8a3aa84b2e3fbcd99841f77"
 CURL_FILENAME="curl-$CURL_VERSION.tar.gz"
 wget --timeout=10 -O "$CURL_FILENAME" "https://curl.haxx.se/download/$CURL_FILENAME"
--- a/src/api.c
+++ b/src/api.c
@@ -41,6 +41,9 @@ 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) {
@@ -103,7 +106,7 @@ void api_send(const char *msg)
    self_window = get_active_window();
-    snprintf((char *) self_window->chatwin->line, sizeof(self_window->chatwin->line), "%s", msg);
+    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);
--- a/src/audio_call.c
+++ b/src/audio_call.c
@@ -60,8 +60,14 @@
 #endif /* ALC_ALL_DEVICES_SPECIFIER */
 #endif /* __APPLE__ */
 extern FriendsList Friends;
 extern ToxWindow *windows[MAX_WINDOWS_NUM];
 struct CallControl CallControl;
 extern struct user_settings *user_settings;
 extern struct Winthread Winthread;
 void on_call(ToxAV *av, uint32_t friend_number, bool audio_enabled, bool video_enabled,
             void *user_data);
 void on_call_state(ToxAV *av, uint32_t friend_number, uint32_t state, void *user_data);
@@ -198,7 +204,7 @@ static int start_transmission(ToxWindow *self, Call *call)
        return -1;
    }
-    DeviceError error = open_input_device(&call->in_idx, read_device_callback, &self->num,
+    DeviceError error = open_input_device(&call->in_idx, read_device_callback, &self->num, false,
                                          CallControl.audio_sample_rate, CallControl.audio_frame_duration, CallControl.audio_channels);
    if (error != de_None) {
--- a/src/audio_device.c
+++ b/src/audio_device.c
@@ -484,7 +484,8 @@ DeviceError set_al_device(DeviceType type, int32_t selection)
    return de_None;
 }
-static DeviceError open_device(DeviceType type, uint32_t *device_idx, DataHandleCallback cb, void *cb_data,
+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) {
@@ -529,11 +530,7 @@ static DeviceError open_device(DeviceType type, uint32_t *device_idx, DataHandle
        device->cb = cb;
        device->cb_data = cb_data;
 #ifdef AUDIO
-
+        device->VAD_threshold = enable_VAD ? user_settings->VAD_threshold : 0.0f;
        if (user_settings->VAD_threshold >= 0.0) {
            device->VAD_threshold = user_settings->VAD_threshold;
        }
 #else
        device->VAD_threshold = 0.0f;
 #endif
@@ -550,15 +547,21 @@ static DeviceError open_device(DeviceType type, uint32_t *device_idx, DataHandle
    return de_None;
 }
-DeviceError open_input_device(uint32_t *device_idx, DataHandleCallback cb, void *cb_data, uint32_t sample_rate,
+DeviceError open_input_device(uint32_t *device_idx,
-                              uint32_t frame_duration, uint8_t channels)
+                              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, sample_rate, frame_duration, 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)
+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, sample_rate, frame_duration, channels);
+    return open_device(output, device_idx,
                       0, 0, 0,
                       sample_rate, frame_duration, channels);
 }
 DeviceError close_device(DeviceType type, uint32_t device_idx)
--- a/src/audio_device.h
+++ b/src/audio_device.h
@@ -75,9 +75,11 @@ DeviceError set_source_position(uint32_t device_idx, float x, float y, float z);
 DeviceError set_al_device(DeviceType type, int32_t selection);
 /* Start device */
-DeviceError open_input_device(uint32_t *device_idx, DataHandleCallback cb, void *cb_data,
+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);
+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);
--- a/src/autocomplete.c
+++ b/src/autocomplete.c
@@ -56,7 +56,7 @@ static void print_ac_matches(ToxWindow *self, Tox *m, char **list, size_t n_matc
 *
 * Returns the length of the match.
 */
-static size_t get_str_match(ToxWindow *self, char *match, size_t match_sz, const char *const *matches, size_t n_items,
+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)
 {
    UNUSED_VAR(self);
@@ -96,7 +96,7 @@ static size_t get_str_match(ToxWindow *self, char *match, size_t match_sz, const
 *
 * Note: This function should not be called directly. Use complete_line() and complete_path() instead.
 */
-static int complete_line_helper(ToxWindow *self, const char *const *list, const size_t n_items, bool dir_search)
+static int complete_line_helper(ToxWindow *self, const char **list, const size_t n_items, bool dir_search)
 {
    ChatContext *ctx = self->chatwin;
@@ -164,7 +164,7 @@ static int complete_line_helper(ToxWindow *self, const char *const *list, const
    /* put all list matches in matches array */
    for (size_t i = 0; i < n_items; ++i) {
-        if (strncmp(list[i], sub, s_len) == 0) {
+        if (strncasecmp(list[i], sub, s_len) == 0) {
            snprintf(matches[n_matches++], MAX_STR_SIZE, "%s", list[i]);
        }
    }
@@ -181,7 +181,7 @@ static int complete_line_helper(ToxWindow *self, const char *const *list, const
    }
    char match[MAX_STR_SIZE];
-    size_t match_len = get_str_match(self, match, sizeof(match), (const char *const *) matches, n_matches, MAX_STR_SIZE);
+    size_t match_len = get_str_match(self, match, sizeof(match), (const char **) matches, n_matches, MAX_STR_SIZE);
    free_ptr_array((void **) matches);
@@ -259,12 +259,12 @@ static int complete_line_helper(ToxWindow *self, const char *const *list, const
    return diff;
 }
-int complete_line(ToxWindow *self, const char *const *list, size_t n_items)
+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 *const *list, const size_t n_items)
+static int complete_path(ToxWindow *self, const char **list, const size_t n_items)
 {
    return complete_line_helper(self, list, n_items, true);
 }
@@ -385,7 +385,7 @@ int dir_match(ToxWindow *self, Tox *m, const wchar_t *line, const wchar_t *cmd)
        print_ac_matches(self, m, dirnames, dircount);
    }
-    int ret = complete_path(self, (const char *const *) dirnames, dircount);
+    int ret = complete_path(self, (const char **) dirnames, dircount);
    free_ptr_array((void **) dirnames);
--- a/src/bootstrap.c
+++ b/src/bootstrap.c
@@ -39,7 +39,9 @@
 #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"
@@ -57,6 +59,7 @@ extern struct user_settings *user_settings;
 #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)
@@ -378,11 +381,8 @@ static long long int extract_val_last_pinged(const char *s)
 * 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, size_t buf_length)
+static int extract_val_pk(const char *s, char *key_buf)
 {
    if (buf_length < TOX_PUBLIC_KEY_SIZE * 2 + 1) {
        return -1;
    }
    int key_len = char_find(0, s, '"');
@@ -445,13 +445,13 @@ static int extract_node(const char *line, struct Node *node)
    }
    char key_string[TOX_PUBLIC_KEY_SIZE * 2 + 1];
-    int key_len = extract_val_pk(key_start + PK_JSON_KEY_LEN, key_string, sizeof(key_string));
+    int key_len = extract_val_pk(key_start + PK_JSON_KEY_LEN, key_string);
    if (key_len == -1) {
        return -6;
    }
-    if (tox_pk_string_to_bytes(key_string, key_len, node->key, sizeof(node->key)) == -1) {
+    if (hex_string_to_bin(key_string, key_len, node->key, TOX_PUBLIC_KEY_SIZE) == -1) {
        return -6;
    }
--- a/src/chat.c
+++ b/src/chat.c
@@ -58,6 +58,12 @@
 #endif /* VIDEO */
 #endif /* AUDIO */
 extern char *DATA_FILE;
 extern FriendsList Friends;
 extern struct Winthread Winthread;
 extern struct user_settings *user_settings;
 #ifdef AUDIO
 static void init_infobox(ToxWindow *self);
 static void kill_infobox(ToxWindow *self);
@@ -248,7 +254,6 @@ static void chat_onConnectionChange(ToxWindow *self, Tox *m, uint32_t num, Tox_C
    if (prev_status == TOX_CONNECTION_NONE) {
        chat_resume_file_senders(self, m, num);
        file_send_queue_check(self, m, self->num);
        msg = "has come online";
        line_info_add(self, true, nick, NULL, CONNECTION, 0, GREEN, msg);
@@ -793,7 +798,12 @@ void chat_onGameInvite(ToxWindow *self, Tox *m, uint32_t friend_number, const ui
        return;
    }
    Friends.list[friend_number].game_invite.type = type;
    Friends.list[friend_number].game_invite.id = id;
    Friends.list[friend_number].game_invite.pending = true;
    uint32_t data_length = length - GAME_PACKET_HEADER_SIZE;
    Friends.list[friend_number].game_invite.data_length = data_length;
    if (data_length > 0) {
        free(Friends.list[friend_number].game_invite.data);
@@ -808,11 +818,6 @@ void chat_onGameInvite(ToxWindow *self, Tox *m, uint32_t friend_number, const ui
        Friends.list[friend_number].game_invite.data = buf;
    }
    Friends.list[friend_number].game_invite.type = type;
    Friends.list[friend_number].game_invite.id = id;
    Friends.list[friend_number].game_invite.pending = true;
    Friends.list[friend_number].game_invite.data_length = data_length;
    char name[TOX_MAX_NAME_LENGTH];
    get_nick_truncate(m, name, friend_number);
@@ -1029,7 +1034,7 @@ static void init_infobox(ToxWindow *self)
    ctx->infobox.win = newwin(INFOBOX_HEIGHT, INFOBOX_WIDTH + 1, 1, x2 - INFOBOX_WIDTH);
    ctx->infobox.starttime = get_unix_time();
-    ctx->infobox.vad_lvl = user_settings->VAD_threshold;
+    ctx->infobox.vad_lvl = 0.0f;
    ctx->infobox.active = true;
    strcpy(ctx->infobox.timestr, "00");
 }
@@ -1265,16 +1270,9 @@ static void chat_onDraw(ToxWindow *self, Tox *m)
    }
    ChatContext *ctx = self->chatwin;
    StatusBar *statusbar = self->stb;
    pthread_mutex_lock(&Winthread.lock);
    line_info_print(self);
    Tox_Connection connection = statusbar->connection;
    Tox_User_Status status = statusbar->status;
    const bool is_typing = Friends.list[self->num].is_typing;
    pthread_mutex_unlock(&Winthread.lock);
    wclear(ctx->linewin);
@@ -1285,99 +1283,90 @@ static void chat_onDraw(ToxWindow *self, Tox *m)
    curs_set(1);
    /* Draw status bar */
    StatusBar *statusbar = self->stb;
    wmove(statusbar->topline, 0, 0);
-    wattron(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
+    /* Draw name, status and note in statusbar */
-    wprintw(statusbar->topline, " [");
+    if (statusbar->connection != TOX_CONNECTION_NONE) {
-    wattroff(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
+        int colour = MAGENTA;
        Tox_User_Status status = statusbar->status;
    switch (connection) {
        case TOX_CONNECTION_TCP:
            wattron(statusbar->topline, A_BOLD | COLOR_PAIR(STATUS_ONLINE));
            wprintw(statusbar->topline, "TCP");
            wattroff(statusbar->topline, A_BOLD | COLOR_PAIR(STATUS_ONLINE));
            break;
        case TOX_CONNECTION_UDP:
            wattron(statusbar->topline, A_BOLD | COLOR_PAIR(STATUS_ONLINE));
            wprintw(statusbar->topline, "UDP");
            wattroff(statusbar->topline, A_BOLD | COLOR_PAIR(STATUS_ONLINE));
            break;
        default:
            wattron(statusbar->topline, COLOR_PAIR(BAR_TEXT));
            wprintw(statusbar->topline, "Offline");
            wattroff(statusbar->topline, COLOR_PAIR(BAR_TEXT));
            break;
    }
    wattron(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
    wprintw(statusbar->topline, "] ");
    wattroff(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
    const char *status_text = "ERROR";
    int colour = BAR_TEXT;
    if (connection != TOX_CONNECTION_NONE) {
        switch (status) {
            case TOX_USER_STATUS_NONE:
                colour = STATUS_ONLINE;
                break;
            case TOX_USER_STATUS_AWAY:
                colour = STATUS_AWAY;
                status_text = "Away";
                break;
            case TOX_USER_STATUS_BUSY:
                colour = STATUS_BUSY;
                status_text = "Busy";
                break;
            default:
                break;
        }
    }
-    if (colour != BAR_TEXT) {
+        const char *connection_status_s = statusbar->connection == TOX_CONNECTION_TCP ? "TCP" : "UDP";
        wattron(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
-        wprintw(statusbar->topline, "[");
+        wprintw(statusbar->topline, " [");
        wattroff(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
        wattron(statusbar->topline, COLOR_PAIR(colour) | A_BOLD);
-        wprintw(statusbar->topline, "%s", status_text);
+        wprintw(statusbar->topline, "%s", connection_status_s);
        wattroff(statusbar->topline, COLOR_PAIR(colour) | A_BOLD);
        wattron(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
        wprintw(statusbar->topline, "] ");
        wattroff(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
    }
-    if (is_typing) {
+        pthread_mutex_lock(&Winthread.lock);
-        wattron(statusbar->topline, A_BOLD | COLOR_PAIR(BAR_NOTIFY));
+        const bool is_typing = Friends.list[self->num].is_typing;
        pthread_mutex_unlock(&Winthread.lock);
        if (is_typing) {
            wattron(statusbar->topline, A_BOLD | COLOR_PAIR(BAR_NOTIFY));
        } else {
            wattron(statusbar->topline, COLOR_PAIR(BAR_TEXT));
        }
        wprintw(statusbar->topline, "%s", statusbar->nick);
        if (is_typing) {
            wattroff(statusbar->topline, A_BOLD | COLOR_PAIR(BAR_NOTIFY));
        } else {
            wattroff(statusbar->topline, A_BOLD | COLOR_PAIR(BAR_TEXT));
        }
    } else {
        wattron(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
        wprintw(statusbar->topline, " [");
        wattroff(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
        wattron(statusbar->topline, COLOR_PAIR(BAR_TEXT));
        wprintw(statusbar->topline, "Offline");
        wattroff(statusbar->topline, COLOR_PAIR(BAR_TEXT));
        wattron(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
        wprintw(statusbar->topline, "] ");
        wattroff(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
        wattron(statusbar->topline, COLOR_PAIR(BAR_TEXT));
        wprintw(statusbar->topline, "%s", statusbar->nick);
        wattroff(statusbar->topline, COLOR_PAIR(BAR_TEXT));
    }
    wprintw(statusbar->topline, "%s", statusbar->nick);
    if (is_typing) {
        wattroff(statusbar->topline, A_BOLD | COLOR_PAIR(BAR_NOTIFY));
    } else {
        wattroff(statusbar->topline, A_BOLD | COLOR_PAIR(BAR_TEXT));
    }
    /* Reset statusbar->statusmsg on window resize */
    if (x2 != self->x) {
        char statusmsg[TOX_MAX_STATUS_MESSAGE_LENGTH] = {'\0'};
        pthread_mutex_lock(&Winthread.lock);
        tox_friend_get_status_message(m, self->num, (uint8_t *) statusmsg, NULL);
        size_t s_len = tox_friend_get_status_message_size(m, self->num, NULL);
        pthread_mutex_unlock(&Winthread.lock);
        filter_str(statusmsg, s_len);
        snprintf(statusbar->statusmsg, sizeof(statusbar->statusmsg), "%s", statusmsg);
        statusbar->statusmsg_len = strlen(statusbar->statusmsg);
        pthread_mutex_unlock(&Winthread.lock);
    }
    self->x = x2;
@@ -1385,27 +1374,19 @@ static void chat_onDraw(ToxWindow *self, Tox *m)
    /* Truncate note if it doesn't fit in statusbar */
    size_t maxlen = x2 - getcurx(statusbar->topline) - (KEY_IDENT_DIGITS * 2) - 6;
-    pthread_mutex_lock(&Winthread.lock);
+    if (statusbar->statusmsg_len > maxlen) {
-    size_t statusmsg_len = statusbar->statusmsg_len;
+        statusbar->statusmsg[maxlen - 3] = '\0';
    pthread_mutex_unlock(&Winthread.lock);
    if (statusmsg_len > maxlen) {
        pthread_mutex_lock(&Winthread.lock);
        statusbar->statusmsg[maxlen - 3] = 0;
        strcat(statusbar->statusmsg, "...");
        statusbar->statusmsg_len = maxlen;
        pthread_mutex_unlock(&Winthread.lock);
    }
-    if (statusmsg_len > 0) {
+    if (statusbar->statusmsg[0]) {
        wattron(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
        wprintw(statusbar->topline, " | ");
        wattroff(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
        wattron(statusbar->topline, COLOR_PAIR(BAR_TEXT));
        pthread_mutex_lock(&Winthread.lock);
        wprintw(statusbar->topline, "%s ", statusbar->statusmsg);
        pthread_mutex_unlock(&Winthread.lock);
    } else {
        wattron(statusbar->topline, COLOR_PAIR(BAR_TEXT));
    }
@@ -1461,11 +1442,7 @@ static void chat_onDraw(ToxWindow *self, Tox *m)
    }
    pthread_mutex_lock(&Winthread.lock);
-
+    refresh_file_transfer_progress(self, self->num);
    if (refresh_file_transfer_progress(self, self->num)) {
        flag_interface_refresh();
    }
    pthread_mutex_unlock(&Winthread.lock);
 }
@@ -1508,7 +1485,6 @@ static void chat_onInit(ToxWindow *self, Tox *m)
    /* Init statusbar info */
    StatusBar *statusbar = self->stb;
    statusbar->status = get_friend_status(self->num);
    statusbar->connection = get_friend_connection_status(self->num);
--- a/src/chat_commands.c
+++ b/src/chat_commands.c
@@ -54,13 +54,7 @@ void cmd_cancelfile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*ar
        return;
    }
-    // first check transfer queue
+    struct FileTransfer *ft = NULL;
    if (file_send_queue_remove(self->num, idx) == 0) {
        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Pending file transfer removed from queue");
        return;
    }
    FileTransfer *ft = NULL;
    /* cancel an incoming file transfer */
    if (strcasecmp(inoutstr, "in") == 0) {
@@ -245,7 +239,7 @@ void cmd_savefile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv
        return;
    }
-    FileTransfer *ft = get_file_transfer_struct_index(self->num, idx, FILE_TRANSFER_RECV);
+    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.");
@@ -330,7 +324,7 @@ void cmd_sendfile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv
    FILE *file_to_send = fopen(path, "r");
    if (file_to_send == NULL) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "File `%s` not found.", path);
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "File not found.");
        return;
    }
@@ -353,7 +347,7 @@ void cmd_sendfile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv
        goto on_send_error;
    }
-    FileTransfer *ft = new_file_transfer(self, self->num, filenum, FILE_TRANSFER_SEND, TOX_FILE_KIND_DATA);
+    struct FileTransfer *ft = new_file_transfer(self, self->num, filenum, FILE_TRANSFER_SEND, TOX_FILE_KIND_DATA);
    if (!ft) {
        err = TOX_ERR_FILE_SEND_TOO_MANY;
@@ -373,62 +367,29 @@ void cmd_sendfile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv
 on_send_error:
    fclose(file_to_send);
    switch (err) {
-        case TOX_ERR_FILE_SEND_FRIEND_NOT_FOUND: {
+        case TOX_ERR_FILE_SEND_FRIEND_NOT_FOUND:
            errmsg = "File transfer failed: Invalid friend.";
            break;
        }
-        case TOX_ERR_FILE_SEND_FRIEND_NOT_CONNECTED: {
+        case TOX_ERR_FILE_SEND_FRIEND_NOT_CONNECTED:
-            int queue_idx = file_send_queue_add(self->num, path, path_len);
+            errmsg = "File transfer failed: Friend is offline.";
            break;
-            char msg[MAX_STR_SIZE];
+        case TOX_ERR_FILE_SEND_NAME_TOO_LONG:
            switch (queue_idx) {
                case -1: {
                    snprintf(msg, sizeof(msg), "Invalid file name: path is null or length is zero.");
                    break;
                }
                case -2: {
                    snprintf(msg, sizeof(msg), "File name is too long.");
                    break;
                }
                case -3: {
                    snprintf(msg, sizeof(msg), "File send queue is full.");
                    break;
                }
                default: {
                    snprintf(msg, sizeof(msg), "File transfer queued. Type \"/cancel out %d\" to cancel.", queue_idx);
                    break;
                }
            }
            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "%s", msg);
            return;
        }
        case TOX_ERR_FILE_SEND_NAME_TOO_LONG: {
            errmsg = "File transfer failed: Filename is too long.";
            break;
        }
-        case TOX_ERR_FILE_SEND_TOO_MANY: {
+        case TOX_ERR_FILE_SEND_TOO_MANY:
            errmsg = "File transfer failed: Too many concurrent file transfers.";
            break;
        }
-        default: {
+        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);
 }
--- a/src/conference.c
+++ b/src/conference.c
@@ -63,6 +63,8 @@
 #include "toxic_strings.h"
 #include "windows.h"
 extern char *DATA_FILE;
 #define MAX_CONFERENCE_NUM (MAX_WINDOWS_NUM - 2)
 #define CONFERENCE_EVENT_WAIT 30
@@ -508,7 +510,8 @@ static void conference_update_name_list(uint32_t conferencenum)
        if (peer->active) {
            memcpy(entry->name, peer->name, peer->name_length + 1);
-            tox_pk_bytes_to_str(peer->pubkey, sizeof(peer->pubkey), entry->pubkey_str, sizeof(entry->pubkey_str));
+            bin_pubkey_to_string(peer->pubkey, sizeof(peer->pubkey),
                                 entry->pubkey_str, sizeof(entry->pubkey_str));
            entry->peernum = i;
            ++count;
        }
@@ -1309,7 +1312,7 @@ bool init_conference_audio_input(Tox *tox, uint32_t conferencenum)
    int channels = user_settings->conference_audio_channels;
    bool success = (open_input_device(&chat->audio_in_idx,
-                                      conference_read_device_callback, &chat->audio_input_callback_data,
+                                      conference_read_device_callback, &chat->audio_input_callback_data, true,
                                      CONFAV_SAMPLE_RATE, CONFAV_FRAME_DURATION, channels)
                    == de_None);
@@ -1331,7 +1334,7 @@ bool toggle_conference_push_to_talk(uint32_t conferencenum, bool enabled)
    return true;
 }
-bool enable_conference_audio(ToxWindow *self, Tox *tox, uint32_t conferencenum)
+bool enable_conference_audio(Tox *tox, uint32_t conferencenum)
 {
    if (!toxav_groupchat_av_enabled(tox, conferencenum)) {
        if (toxav_groupchat_enable_av(tox, conferencenum, audio_conference_callback, NULL) != 0) {
@@ -1339,16 +1342,10 @@ bool enable_conference_audio(ToxWindow *self, Tox *tox, uint32_t conferencenum)
        }
    }
-    bool success = init_conference_audio_input(tox, conferencenum);
+    return init_conference_audio_input(tox, conferencenum);
    if (success) {
        self->is_call = true;
    }
    return success;
 }
-bool disable_conference_audio(ToxWindow *self, Tox *tox, uint32_t conferencenum)
+bool disable_conference_audio(Tox *tox, uint32_t conferencenum)
 {
    ConferenceChat *chat = &conferences[conferencenum];
@@ -1361,13 +1358,7 @@ bool disable_conference_audio(ToxWindow *self, Tox *tox, uint32_t conferencenum)
        chat->audio_enabled = false;
    }
-    bool success = toxav_groupchat_disable_av(tox, conferencenum) == 0;
+    return toxav_groupchat_disable_av(tox, conferencenum) == 0;
    if (success) {
        self->is_call = false;
    }
    return success;
 }
 bool conference_mute_self(uint32_t conferencenum)
--- a/src/conference.h
+++ b/src/conference.h
@@ -103,8 +103,8 @@ uint32_t get_name_list_entries_by_prefix(uint32_t conferencenum, const char *pre
        uint32_t maxpeers);
 bool init_conference_audio_input(Tox *tox, uint32_t conferencenum);
-bool enable_conference_audio(ToxWindow *self, Tox *tox, uint32_t conferencenum);
+bool enable_conference_audio(Tox *tox, uint32_t conferencenum);
-bool disable_conference_audio(ToxWindow *self, 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
--- a/src/conference_commands.c
+++ b/src/conference_commands.c
@@ -108,7 +108,7 @@ void cmd_enable_audio(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*
        return;
    }
-    if (enable ? enable_conference_audio(self, m, self->num) : disable_conference_audio(self, m, self->num)) {
+    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 {
--- a/src/execute.c
+++ b/src/execute.c
@@ -117,9 +117,15 @@ static struct cmd_func conference_commands[] = {
    { 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[][MAX_CMDNAME_SIZE] = {
+static const char special_commands[SPECIAL_COMMANDS][MAX_CMDNAME_SIZE] = {
    "/add",
    "/avatar",
    "/nick",
    "/note",
@@ -129,7 +135,6 @@ static const char special_commands[][MAX_CMDNAME_SIZE] = {
    "/sendfile",
    "/title",
    "/mute",
    "",
 };
 /* Returns true if input command is in the special_commands array. */
@@ -137,7 +142,7 @@ static bool is_special_command(const char *input)
 {
    const int s = char_find(0, input, ' ');
-    for (int i = 0; special_commands[i][0] != '\0'; ++i) {
+    for (int i = 0; i < SPECIAL_COMMANDS; ++i) {
        if (strncmp(input, special_commands[i], s) == 0) {
            return true;
        }
@@ -214,7 +219,9 @@ static int parse_command(const char *input, char (*args)[MAX_STR_SIZE])
 static int do_command(WINDOW *w, ToxWindow *self, Tox *m, int num_args, struct cmd_func *commands,
                      char (*args)[MAX_STR_SIZE])
 {
-    for (size_t i = 0; commands[i].name != NULL; ++i) {
+    int 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;
--- a/src/file_transfers.c
+++ b/src/file_transfers.c
@@ -25,7 +25,6 @@
 #include <time.h>
 #include <unistd.h>
 #include "execute.h"
 #include "file_transfers.h"
 #include "friendlist.h"
 #include "line_info.h"
@@ -99,7 +98,7 @@ void print_progress_bar(ToxWindow *self, double bps, double pct_done, uint32_t l
    free(full_line);
 }
-static void refresh_progress_helper(ToxWindow *self, FileTransfer *ft)
+static void refresh_progress_helper(ToxWindow *self, struct FileTransfer *ft)
 {
    if (ft->state == FILE_TRANSFER_INACTIVE) {
        return;
@@ -118,32 +117,18 @@ static void refresh_progress_helper(ToxWindow *self, FileTransfer *ft)
    ft->last_line_progress = get_unix_time();
 }
-/* refreshes active file transfer status bars.
+/* refreshes active file transfer status bars. */
- *
+void refresh_file_transfer_progress(ToxWindow *self, uint32_t friendnumber)
 * Return true if there is at least one active file transfer in either direction.
 */
 bool refresh_file_transfer_progress(ToxWindow *self, uint32_t friendnumber)
 {
    bool active = false;
    for (size_t i = 0; i < MAX_FILES; ++i) {
-        FileTransfer *ft_r = &Friends.list[friendnumber].file_receiver[i];
+        refresh_progress_helper(self, &Friends.list[friendnumber].file_receiver[i]);
-        FileTransfer *ft_s = &Friends.list[friendnumber].file_sender[i];
+        refresh_progress_helper(self, &Friends.list[friendnumber].file_sender[i]);
        refresh_progress_helper(self, ft_r);
        refresh_progress_helper(self, ft_s);
        if (ft_r->state !=  FILE_TRANSFER_INACTIVE || ft_s->state != FILE_TRANSFER_INACTIVE) {
            active = true;
        }
    }
    return active;
 }
-static void clear_file_transfer(FileTransfer *ft)
+static void clear_file_transfer(struct FileTransfer *ft)
 {
-    *ft = (FileTransfer) {
+    *ft = (struct FileTransfer) {
        0
    };
 }
@@ -151,16 +136,16 @@ static void clear_file_transfer(FileTransfer *ft)
 /* Returns a pointer to friendnumber's FileTransfer struct associated with filenumber.
 * Returns NULL if filenumber is invalid.
 */
-FileTransfer *get_file_transfer_struct(uint32_t friendnumber, uint32_t filenumber)
+struct FileTransfer *get_file_transfer_struct(uint32_t friendnumber, uint32_t filenumber)
 {
    for (size_t i = 0; i < MAX_FILES; ++i) {
-        FileTransfer *ft_send = &Friends.list[friendnumber].file_sender[i];
+        struct FileTransfer *ft_send = &Friends.list[friendnumber].file_sender[i];
        if (ft_send->state != FILE_TRANSFER_INACTIVE && ft_send->filenumber == filenumber) {
            return ft_send;
        }
-        FileTransfer *ft_recv = &Friends.list[friendnumber].file_receiver[i];
+        struct FileTransfer *ft_recv = &Friends.list[friendnumber].file_receiver[i];
        if (ft_recv->state != FILE_TRANSFER_INACTIVE && ft_recv->filenumber == filenumber) {
            return ft_recv;
@@ -173,7 +158,7 @@ FileTransfer *get_file_transfer_struct(uint32_t friendnumber, uint32_t filenumbe
 /* Returns a pointer to the FileTransfer struct associated with index with the direction specified.
 * Returns NULL on failure.
 */
-FileTransfer *get_file_transfer_struct_index(uint32_t friendnumber, uint32_t index,
+struct FileTransfer *get_file_transfer_struct_index(uint32_t friendnumber, uint32_t index,
        FILE_TRANSFER_DIRECTION direction)
 {
    if (direction != FILE_TRANSFER_RECV && direction != FILE_TRANSFER_SEND) {
@@ -181,9 +166,9 @@ FileTransfer *get_file_transfer_struct_index(uint32_t friendnumber, uint32_t ind
    }
    for (size_t i = 0; i < MAX_FILES; ++i) {
-        FileTransfer *ft = direction == FILE_TRANSFER_SEND ?
+        struct FileTransfer *ft = direction == FILE_TRANSFER_SEND ?
-                           &Friends.list[friendnumber].file_sender[i] :
+                                      &Friends.list[friendnumber].file_sender[i] :
-                           &Friends.list[friendnumber].file_receiver[i];
+                                      &Friends.list[friendnumber].file_receiver[i];
        if (ft->state != FILE_TRANSFER_INACTIVE && ft->index == index) {
            return ft;
@@ -196,10 +181,10 @@ FileTransfer *get_file_transfer_struct_index(uint32_t friendnumber, uint32_t ind
 /* Returns a pointer to an unused file sender.
 * Returns NULL if all file senders are in use.
 */
-static FileTransfer *new_file_sender(ToxWindow *window, uint32_t friendnumber, uint32_t filenumber, uint8_t type)
+static struct FileTransfer *new_file_sender(ToxWindow *window, uint32_t friendnumber, uint32_t filenumber, uint8_t type)
 {
    for (size_t i = 0; i < MAX_FILES; ++i) {
-        FileTransfer *ft = &Friends.list[friendnumber].file_sender[i];
+        struct FileTransfer *ft = &Friends.list[friendnumber].file_sender[i];
        if (ft->state == FILE_TRANSFER_INACTIVE) {
            clear_file_transfer(ft);
@@ -219,11 +204,11 @@ static FileTransfer *new_file_sender(ToxWindow *window, uint32_t friendnumber, u
 /* Returns a pointer to an unused file receiver.
 * Returns NULL if all file receivers are in use.
 */
-static FileTransfer *new_file_receiver(ToxWindow *window, uint32_t friendnumber, uint32_t filenumber,
+static struct FileTransfer *new_file_receiver(ToxWindow *window, uint32_t friendnumber, uint32_t filenumber,
-                                       uint8_t type)
+        uint8_t type)
 {
    for (size_t i = 0; i < MAX_FILES; ++i) {
-        FileTransfer *ft = &Friends.list[friendnumber].file_receiver[i];
+        struct FileTransfer *ft = &Friends.list[friendnumber].file_receiver[i];
        if (ft->state == FILE_TRANSFER_INACTIVE) {
            clear_file_transfer(ft);
@@ -243,8 +228,8 @@ static FileTransfer *new_file_receiver(ToxWindow *window, uint32_t friendnumber,
 /* Initializes an unused file transfer and returns its pointer.
 * Returns NULL on failure.
 */
-FileTransfer *new_file_transfer(ToxWindow *window, uint32_t friendnumber, uint32_t filenumber,
+struct FileTransfer *new_file_transfer(ToxWindow *window, uint32_t friendnumber, uint32_t filenumber,
-                                FILE_TRANSFER_DIRECTION direction, uint8_t type)
+                                       FILE_TRANSFER_DIRECTION direction, uint8_t type)
 {
    if (direction == FILE_TRANSFER_RECV) {
        return new_file_receiver(window, friendnumber, filenumber, type);
@@ -257,83 +242,13 @@ FileTransfer *new_file_transfer(ToxWindow *window, uint32_t friendnumber, uint32
    return NULL;
 }
 int file_send_queue_add(uint32_t friendnumber, const char *file_path, size_t length)
 {
    if (length == 0 || file_path == NULL) {
        return -1;
    }
    if (length > TOX_MAX_FILENAME_LENGTH) {
        return -2;
    }
    for (size_t i = 0; i < MAX_FILES; ++i) {
        PendingFileTransfer *pending_slot = &Friends.list[friendnumber].file_send_queue[i];
        if (pending_slot->pending) {
            continue;
        }
        pending_slot->pending = true;
        memcpy(pending_slot->file_path, file_path, length);
        pending_slot->file_path[length] = 0;
        pending_slot->length = length;
        return i;
    }
    return -3;
 }
 #define FILE_TRANSFER_SEND_CMD "/sendfile "
 #define FILE_TRANSFER_SEND_LEN (sizeof(FILE_TRANSFER_SEND_CMD) - 1)
 void file_send_queue_check(ToxWindow *self, Tox *m, uint32_t friendnumber)
 {
    for (size_t i = 0; i < MAX_FILES; ++i) {
        PendingFileTransfer *pending_slot = &Friends.list[friendnumber].file_send_queue[i];
        if (!pending_slot->pending) {
            continue;
        }
        char command[TOX_MAX_FILENAME_LENGTH + FILE_TRANSFER_SEND_LEN + 1];
        snprintf(command, sizeof(command), "%s%s", FILE_TRANSFER_SEND_CMD, pending_slot->file_path);
        execute(self->window, self, m, command, CHAT_COMMAND_MODE);
        *pending_slot = (PendingFileTransfer) {
            0,
        };
    }
 }
 int file_send_queue_remove(uint32_t friendnumber, size_t index)
 {
    if (index >= MAX_FILES) {
        return -1;
    }
    PendingFileTransfer *pending_slot = &Friends.list[friendnumber].file_send_queue[index];
    if (!pending_slot->pending) {
        return -1;
    }
    *pending_slot = (PendingFileTransfer) {
        0,
    };
    return 0;
 }
 /* Closes file transfer ft.
 *
 * Set CTRL to -1 if we don't want to send a control signal.
 * Set message or self to NULL if we don't want to display a message.
 */
-void close_file_transfer(ToxWindow *self, Tox *m, FileTransfer *ft, int CTRL, const char *message,
+void close_file_transfer(ToxWindow *self, Tox *m, struct FileTransfer *ft, int CTRL, const char *message,
                         Notification sound_type)
 {
    if (!ft) {
@@ -349,11 +264,7 @@ void close_file_transfer(ToxWindow *self, Tox *m, FileTransfer *ft, int CTRL, co
    }
    if (CTRL >= 0) {
-        Tox_Err_File_Control err;
+        tox_file_control(m, ft->friendnumber, ft->filenumber, (Tox_File_Control) CTRL, NULL);
        if (!tox_file_control(m, ft->friendnumber, ft->filenumber, (Tox_File_Control) CTRL, &err)) {
            fprintf(stderr, "Failed to cancel file transfer: %d\n", err);
        }
    }
    if (message && self) {
@@ -373,7 +284,7 @@ void close_file_transfer(ToxWindow *self, Tox *m, FileTransfer *ft, int CTRL, co
 void kill_avatar_file_transfers_friend(Tox *m, uint32_t friendnumber)
 {
    for (size_t i = 0; i < MAX_FILES; ++i) {
-        FileTransfer *ft = &Friends.list[friendnumber].file_sender[i];
+        struct FileTransfer *ft = &Friends.list[friendnumber].file_sender[i];
        if (ft->file_type == TOX_FILE_KIND_AVATAR) {
            close_file_transfer(NULL, m, ft, TOX_FILE_CONTROL_CANCEL, NULL, silent);
@@ -387,7 +298,6 @@ void kill_all_file_transfers_friend(Tox *m, uint32_t friendnumber)
    for (size_t i = 0; i < MAX_FILES; ++i) {
        close_file_transfer(NULL, m, &Friends.list[friendnumber].file_sender[i], TOX_FILE_CONTROL_CANCEL, NULL, silent);
        close_file_transfer(NULL, m, &Friends.list[friendnumber].file_receiver[i], TOX_FILE_CONTROL_CANCEL, NULL, silent);
        file_send_queue_remove(friendnumber, i);
    }
 }
--- a/src/file_transfers.h
+++ b/src/file_transfers.h
@@ -29,9 +29,9 @@
 #include "toxic.h"
 #include "windows.h"
-#define KiB (uint32_t)  1024
+#define KiB 1024
-#define MiB (uint32_t) (1024 << 10)  /* 1024^2 */
+#define MiB 1048576       /* 1024^2 */
-#define GiB (uint32_t) (1024 << 20)  /* 1024^3 */
+#define GiB 1073741824    /* 1024^3 */
 #define MAX_FILES 32
@@ -47,7 +47,7 @@ typedef enum FILE_TRANSFER_DIRECTION {
    FILE_TRANSFER_RECV
 } FILE_TRANSFER_DIRECTION;
-typedef struct FileTransfer {
+struct FileTransfer {
    ToxWindow *window;
    FILE *file;
    FILE_TRANSFER_STATE state;
@@ -63,15 +63,7 @@ typedef struct FileTransfer {
    time_t   last_line_progress;   /* The last time we updated the progress bar */
    uint32_t line_id;
    uint8_t  file_id[TOX_FILE_ID_LENGTH];
-} FileTransfer;
+};
 typedef struct PendingFileTransfer {
    char      file_path[TOX_MAX_FILENAME_LENGTH + 1];
    size_t    length;
    uint32_t  friendnumber;
    bool      pending;
 } PendingFileTransfer;
 /* creates initial progress line that will be updated during file transfer.
   progline must be at lesat MAX_STR_SIZE bytes */
@@ -80,11 +72,8 @@ void init_progress_bar(char *progline);
 /* prints a progress bar for file transfers */
 void print_progress_bar(ToxWindow *self, double pct_done, double bps, uint32_t line_id);
-/* refreshes active file transfer status bars.
+/* refreshes active file transfer status bars. */
- *
+void refresh_file_transfer_progress(ToxWindow *self, uint32_t friendnumber);
 * Return true if there is at least one active file transfer in either direction.
 */
 bool refresh_file_transfer_progress(ToxWindow *self, uint32_t friendnumber);
 /* Returns a pointer to friendnumber's FileTransfer struct associated with filenumber.
 * Returns NULL if filenumber is invalid.
@@ -104,31 +93,6 @@ struct FileTransfer *get_file_transfer_struct_index(uint32_t friendnumber, uint3
 struct FileTransfer *new_file_transfer(ToxWindow *window, uint32_t friendnumber, uint32_t filenumber,
                                       FILE_TRANSFER_DIRECTION direction, uint8_t type);
 /* Adds a file designated by `file_path` of length `length` to the file transfer queue.
 *
 * Items in this queue will be automatically sent to the contact designated by `friendnumber`
 * as soon as they appear online. The item will then be removed from the queue whether
 * or not the transfer successfully initiates.
 *
 * If the ToxWindow associated with this friend is closed, all queued items will be
 * discarded.
 *
 * Return the queue index on success.
 * Return -1 if the length is invalid.
 * Return -2 if the send queue is full.
 */
 int file_send_queue_add(uint32_t friendnumber, const char *file_path, size_t length);
 /* Initiates all file transfers from the file send queue for friend designated by `friendnumber`. */
 void file_send_queue_check(ToxWindow *self, Tox *m, uint32_t friendnumber);
 /* Removes the `index`-th item from the file send queue for `friendnumber`.
 *
 * Return 0 if a pending transfer was successfully removed
 * Return -1 if index does not designate a pending file transfer.
 */
 int file_send_queue_remove(uint32_t friendnumber, size_t index);
 /* Closes file transfer ft.
 *
 * Set CTRL to -1 if we don't want to send a control signal.
--- a/src/friendlist.c
+++ b/src/friendlist.c
@@ -37,7 +37,6 @@
 #include "log.h"
 #include "misc_tools.h"
 #include "notify.h"
 #include "prompt.h"
 #include "settings.h"
 #include "toxic.h"
 #include "windows.h"
@@ -47,6 +46,13 @@
 #endif
 extern char *DATA_FILE;
 extern char *BLOCK_FILE;
 extern ToxWindow *prompt;
 extern struct Winthread Winthread;
 extern struct user_settings *user_settings;
 extern struct arg_opts arg_opts;
 static uint8_t blocklist_view = 0;   /* 0 if we're in friendlist view, 1 if we're in blocklist view */
 FriendsList Friends;
@@ -315,11 +321,11 @@ int load_blocklist(char *path)
 #define S_WEIGHT 100000
 static int index_name_cmp(const void *n1, const void *n2)
 {
-    int res = qsort_strcasecmp_hlpr(Friends.list[*(const int *) n1].name, Friends.list[*(const int *) n2].name);
+    int res = qsort_strcasecmp_hlpr(Friends.list[*(int *) n1].name, Friends.list[*(int *) n2].name);
    /* Use weight to make qsort always put online friends before offline */
-    res = Friends.list[*(const int *) n1].connection_status ? (res - S_WEIGHT) : (res + S_WEIGHT);
+    res = Friends.list[*(int *) n1].connection_status ? (res - S_WEIGHT) : (res + S_WEIGHT);
-    res = Friends.list[*(const int *) n2].connection_status ? (res + S_WEIGHT) : (res - S_WEIGHT);
+    res = Friends.list[*(int *) n2].connection_status ? (res + S_WEIGHT) : (res - S_WEIGHT);
    return res;
 }
@@ -343,7 +349,7 @@ void sort_friendlist_index(void)
 static int index_name_cmp_block(const void *n1, const void *n2)
 {
-    return qsort_strcasecmp_hlpr(Blocked.list[*(const int *) n1].name, Blocked.list[*(const int *) n2].name);
+    return qsort_strcasecmp_hlpr(Blocked.list[*(int *) n1].name, Blocked.list[*(int *) n2].name);
 }
 static void sort_blocklist_index(void)
@@ -692,9 +698,6 @@ static void select_friend(wint_t key, int *selected, int num)
 static void delete_friend(Tox *m, uint32_t f_num)
 {
    kill_all_file_transfers_friend(m, f_num);
    kill_avatar_file_transfers_friend(m, f_num);
    Tox_Err_Friend_Delete err;
    if (tox_friend_delete(m, f_num, &err) != true) {
@@ -843,7 +846,9 @@ void block_friend(Tox *m, uint32_t fnum)
    realloc_blocklist(Blocked.max_idx + 1);
    clear_blocklist_index(Blocked.max_idx);
-    for (int i = 0; i <= Blocked.max_idx; ++i) {
+    int i;
    for (i = 0; i <= Blocked.max_idx; ++i) {
        if (Blocked.list[i].active) {
            continue;
        }
@@ -1108,14 +1113,14 @@ static void friendlist_onDraw(ToxWindow *self, Tox *m)
    /* Determine which portion of friendlist to draw based on current position */
    pthread_mutex_lock(&Winthread.lock);
-    const int page = Friends.num_selected / (y2 - FLIST_OFST);
+    int page = Friends.num_selected / (y2 - FLIST_OFST);
    pthread_mutex_unlock(&Winthread.lock);
-    const int start = (y2 - FLIST_OFST) * page;
+    int start = (y2 - FLIST_OFST) * page;
-    const int end = y2 - FLIST_OFST + start;
+    int end = y2 - FLIST_OFST + start;
    pthread_mutex_lock(&Winthread.lock);
-    const size_t num_friends = Friends.num_friends;
+    size_t num_friends = Friends.num_friends;
    pthread_mutex_unlock(&Winthread.lock);
    int i;
--- a/src/friendlist.h
+++ b/src/friendlist.h
@@ -79,9 +79,8 @@ typedef struct {
    struct GameInvite game_invite;
 #endif
-    FileTransfer file_receiver[MAX_FILES];
+    struct FileTransfer file_receiver[MAX_FILES];
-    FileTransfer file_sender[MAX_FILES];
+    struct FileTransfer file_sender[MAX_FILES];
    PendingFileTransfer file_send_queue[MAX_FILES];
 } ToxicFriend;
 typedef struct {
@@ -102,8 +101,6 @@ typedef struct {
    ToxicFriend *list;
 } FriendsList;
 extern FriendsList Friends;
 ToxWindow *new_friendlist(void);
 void friendlist_onInit(ToxWindow *self, Tox *m);
 void disable_chatwin(uint32_t f_num);
--- a/src/game_base.c
+++ b/src/game_base.c
@@ -174,10 +174,6 @@ void game_kill(ToxWindow *self)
    kill_notifs(self->active_box);
    del_window(self);
    if (get_num_active_windows_type(WINDOW_TYPE_GAME) == 0) {
        set_window_refresh_rate(NCURSES_DEFAULT_REFRESH_RATE);
    }
 }
 static void game_init_abort(const ToxWindow *parent, ToxWindow *self)
@@ -304,8 +300,6 @@ int game_initialize(const ToxWindow *parent, Tox *m, GameType type, uint32_t id,
    set_active_window_index(window_id);
    set_window_refresh_rate(NCURSES_GAME_REFRESH_RATE);
    return 0;
 }
@@ -517,10 +511,10 @@ static void game_draw_help_bar(const GameData *game, WINDOW *win)
 {
    int max_x;
    int max_y;
    getmaxyx(win, max_y, max_x);
    UNUSED_VAR(max_x);
    getmaxyx(win, max_y, max_x);
    wmove(win, max_y - 1, 1);
    if (!game->is_multiplayer) {
@@ -937,10 +931,10 @@ int game_y_bottom_bound(const GameData *game)
 {
    int max_x;
    int max_y;
    getmaxyx(game->window, max_y, max_x);
    UNUSED_VAR(max_x);
    getmaxyx(game->window, max_y, max_x);
    return ((max_y + game->game_max_y) / 2) - 1;
 }
@@ -948,10 +942,10 @@ int game_y_top_bound(const GameData *game)
 {
    int max_x;
    int max_y;
    getmaxyx(game->window, max_y, max_x);
    UNUSED_VAR(max_x);
    getmaxyx(game->window, max_y, max_x);
    return ((max_y - game->game_max_y) / 2) + 1;
 }
@@ -959,10 +953,10 @@ int game_x_right_bound(const GameData *game)
 {
    int max_x;
    int max_y;
    getmaxyx(game->window, max_y, max_x);
    UNUSED_VAR(max_y);
    getmaxyx(game->window, max_y, max_x);
    return ((max_x + game->game_max_x) / 2) - 1;
 }
@@ -970,10 +964,10 @@ int game_x_left_bound(const GameData *game)
 {
    int max_x;
    int max_y;
    getmaxyx(game->window, max_y, max_x);
    UNUSED_VAR(max_y);
    getmaxyx(game->window, max_y, max_x);
    return ((max_x - game->game_max_x) / 2) + 1;
 }
--- a/src/game_chess.c
+++ b/src/game_chess.c
@@ -436,11 +436,7 @@ static bool chess_path_line_clear(Board *board, const Tile *from, const Tile *to
        return false;
    }
-    ChessCoords chess_coords = (ChessCoords) {
+    ChessCoords chess_coords;
        0,
        0
    };
    size_t start;
    size_t end;
@@ -804,13 +800,11 @@ static bool chess_mock_move_valid(ChessState *state, const Player *player, Tile
 {
    Board *board = &state->board;
    const bool en_passant = player->en_passant_move_number == -1;
    bool in_check = false;
    Tile *ep_tile = NULL;
    Piece ep_piece;
    memset(&ep_piece, 0, sizeof(ep_piece));
-    if (en_passant) {  // remove piece that was captured via en passant
+    if (player->en_passant_move_number == -1) {  // remove piece that was captured via en passant
        ChessCoords ep_coords;
        ep_coords.N = player->colour == White ? to->chess_coords.N - 1 : to->chess_coords.N + 1;
        ep_coords.L = to->chess_coords.L;
@@ -821,7 +815,7 @@ static bool chess_mock_move_valid(ChessState *state, const Player *player, Tile
        }
        chess_copy_piece(&ep_piece, &ep_tile->piece);
-        ep_tile->piece.type = NoPiece;  // temporarily remove piece
+        ep_tile->piece.type = NoPiece;
    }
    Piece from_piece;
@@ -837,8 +831,8 @@ static bool chess_mock_move_valid(ChessState *state, const Player *player, Tile
    from->piece.type = from_piece.type;
    chess_copy_piece(&to->piece, &to_piece);
-    if (en_passant) {
+    if (player->en_passant_move_number == -1) {
-        ep_tile->piece.type = ep_piece.type;  // reset piece to original state
+        ep_tile->piece.type = ep_piece.type;
    }
    return !in_check;
--- a/src/global_commands.c
+++ b/src/global_commands.c
@@ -42,6 +42,11 @@
 #include "game_base.h"
 #endif
 extern char *DATA_FILE;
 extern ToxWindow *prompt;
 extern FriendsList Friends;
 extern FriendRequests FrndRequests;
 /* command functions */
 void cmd_accept(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
 {
@@ -152,15 +157,21 @@ void cmd_add(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX
        return;
    }
    char msg[MAX_STR_SIZE] = {0};
    const char *id = argv[1];
-    const size_t arg_length = strlen(id);
+    char msg[MAX_STR_SIZE];
    const int space_idx = char_find(0, id, ' ');
-    // we have to manually parse the message due to this command being a special case
+    if (argc > 1) {
-    if (space_idx > 0 && space_idx < arg_length - 1) {
+        if (argv[2][0] != '\"') {
-        snprintf(msg, sizeof(msg), "%s", &id[space_idx + 1]);
+            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Message must be enclosed in quotes.");
            return;
        }
        /* remove opening and closing quotes */
        char tmp[MAX_STR_SIZE];
        snprintf(tmp, sizeof(tmp), "%s", &argv[2][1]);
        int len = strlen(tmp) - 1;
        tmp[len] = '\0';
        snprintf(msg, sizeof(msg), "%s", tmp);
    } else {
        char selfname[TOX_MAX_NAME_LENGTH];
        tox_self_get_name(m, (uint8_t *) selfname);
@@ -171,35 +182,36 @@ void cmd_add(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX
    }
    char id_bin[TOX_ADDRESS_SIZE] = {0};
    uint16_t id_len = (uint16_t) strlen(id);
-    const bool is_tox_id = (char_find(0, id, '@') == arg_length) && (arg_length >= TOX_ADDRESS_SIZE * 2);
+    /* try to add tox ID */
    if (id_len == 2 * TOX_ADDRESS_SIZE) {
        size_t i;
        char xx[3];
        uint32_t x;
-    if (!is_tox_id) {
+        for (i = 0; i < TOX_ADDRESS_SIZE; ++i) {
-        name_lookup(self, m, id_bin, id, msg);
+            xx[0] = id[2 * i];
-    }
+            xx[1] = id[2 * i + 1];
            xx[2] = '\0';
-    char xx[3];
+            if (sscanf(xx, "%02x", &x) != 1) {
-    uint32_t x = 0;
+                line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invalid Tox ID.");
                return;
            }
-    for (size_t i = 0; i < TOX_ADDRESS_SIZE; ++i) {
+            id_bin[i] = x;
-        xx[0] = id[2 * i];
+        }
        xx[1] = id[2 * i + 1];
        xx[2] = 0;
-        if (sscanf(xx, "%02x", &x) != 1) {
+        if (friend_is_blocked(id_bin)) {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invalid Tox ID.");
+            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Friend is in your block list.");
            return;
        }
-        id_bin[i] = x;
+        cmd_add_helper(self, m, id_bin, msg);
    } else {    /* assume id is a username@domain address and do http name server lookup */
        name_lookup(self, m, id_bin, id, msg);
    }
    if (friend_is_blocked(id_bin)) {
        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Friend is in your block list.");
        return;
    }
    cmd_add_helper(self, m, id_bin, msg);
 }
 void cmd_avatar(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
@@ -265,9 +277,9 @@ void cmd_connect(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)
        return;
    }
-    char key_binary[TOX_PUBLIC_KEY_SIZE];
+    char key_binary[TOX_PUBLIC_KEY_SIZE * 2 + 1];
-    if (tox_pk_string_to_bytes(ascii_key, strlen(ascii_key), key_binary, sizeof(key_binary)) == -1) {
+    if (hex_string_to_bin(ascii_key, strlen(ascii_key), key_binary, TOX_PUBLIC_KEY_SIZE) == -1) {
        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invalid key.");
        return;
    }
@@ -509,7 +521,7 @@ void cmd_myid(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MA
    char bin_id[TOX_ADDRESS_SIZE];
    tox_self_get_address(m, (uint8_t *) bin_id);
-    if (tox_id_bytes_to_str(bin_id, sizeof(bin_id), id_string, sizeof(id_string)) == -1) {
+    if (bin_id_to_string(bin_id, sizeof(bin_id), id_string, sizeof(id_string)) == -1) {
        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to print ID.");
        return;
    }
@@ -526,7 +538,7 @@ void cmd_myqr(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MA
    char bin_id[TOX_ADDRESS_SIZE];
    tox_self_get_address(m, (uint8_t *) bin_id);
-    if (tox_id_bytes_to_str(bin_id, sizeof(bin_id), id_string, sizeof(id_string)) == -1) {
+    if (bin_id_to_string(bin_id, sizeof(bin_id), id_string, sizeof(id_string)) == -1) {
        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to create QR code.");
        return;
    }
@@ -644,9 +656,12 @@ void cmd_note(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MA
 {
    UNUSED_VAR(window);
-    const char *note = argc >= 1 ? argv[1] : "";
+    if (argc < 1) {
        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Input required.");
        return;
    }
-    prompt_update_statusmessage(prompt, m, note);
+    prompt_update_statusmessage(prompt, m, argv[1]);
 }
 void cmd_nospam(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
--- a/src/input.c
+++ b/src/input.c
@@ -347,7 +347,7 @@ bool input_handle(ToxWindow *self, wint_t key, int x, int mx_x)
    }
    if (match) {
-        flag_interface_refresh();
+        flag_interface_change(1);
    }
    return match;
--- a/src/line_info.c
+++ b/src/line_info.c
@@ -148,9 +148,8 @@ static int print_n_chars(WINDOW *win, const char *s, size_t n, int max_y)
            int x;
            int y;
            getyx(win, y, x);
            UNUSED_VAR(x);
            getyx(win, y, x);
            // make sure cursor will wrap correctly after newline to prevent display bugs
            if (y + 1 >= max_y) {
@@ -325,10 +324,10 @@ static void line_info_init_line(ToxWindow *self, struct line_info *line)
 {
    int y2;
    int x2;
    getmaxyx(self->window, y2, x2);
    UNUSED_VAR(y2);
    getmaxyx(self->window, y2, x2);
    const int max_y = y2 - CHATBOX_HEIGHT - WINDOW_BAR_HEIGHT;
    const int max_x = self->show_peerlist ? x2 - 1 - SIDEBAR_WIDTH : x2;
@@ -441,14 +440,12 @@ int line_info_add(ToxWindow *self, bool show_timestamp, const char *name1, const
    new_line->noread_flag = false;
    new_line->timestamp = get_unix_time();
    if (type == OUT_MSG || type == OUT_ACTION) {
        new_line->noread_flag = self->stb->connection == TOX_CONNECTION_NONE;
    }
    line_info_init_line(self, new_line);
    hst->queue[hst->queue_size++] = new_line;
    flag_interface_change(1);
    return new_line->id;
 }
@@ -459,6 +456,7 @@ static void line_info_check_queue(ToxWindow *self)
    struct line_info *line = line_info_ret_queue(hst);
    if (line == NULL) {
        flag_interface_change(0);
        return;
    }
@@ -474,8 +472,12 @@ static void line_info_check_queue(ToxWindow *self)
    if (!self->scroll_pause) {
        line_info_reset_start(self, hst);
    }
    flag_interface_change(1);
 }
 #define NOREAD_FLAG_TIMEOUT 5    /* seconds before a sent message with no read receipt is flagged as unread */
 void line_info_print(ToxWindow *self)
 {
    ChatContext *ctx = self->chatwin;
@@ -523,10 +525,10 @@ void line_info_print(ToxWindow *self)
    while (line && numlines++ <= max_y && print_ret == 0) {
        int y;
        int x;
        getyx(win, y, x);
        UNUSED_VAR(y);
        getyx(win, y, x);
        if (x > 0) { // Prevents us from printing off the screen
            break;
        }
@@ -576,6 +578,12 @@ void line_info_print(ToxWindow *self)
                    wattroff(win, COLOR_PAIR(RED));
                }
                if (type == OUT_MSG && !line->read_flag) {
                    if (timed_out(line->timestamp, NOREAD_FLAG_TIMEOUT)) {
                        line->noread_flag = true;
                    }
                }
                waddch(win, '\n');
                break;
@@ -595,6 +603,12 @@ void line_info_print(ToxWindow *self)
                print_ret = print_wrap(win, line, max_x, max_y);
                wattroff(win, COLOR_PAIR(YELLOW));
                if (type == OUT_ACTION && !line->read_flag) {
                    if (timed_out(line->timestamp, NOREAD_FLAG_TIMEOUT)) {
                        line->noread_flag = true;
                    }
                }
                waddch(win, '\n');
                break;
@@ -700,8 +714,6 @@ void line_info_print(ToxWindow *self)
        line = line->next;
    }
    flag_interface_refresh();
    /* keep calling until queue is empty */
    if (hst->queue_size > 0) {
        line_info_print(self);
@@ -743,8 +755,6 @@ static bool line_info_screen_fit(ToxWindow *self, struct line_info *line)
 /* puts msg in specified line_info msg buffer */
 void line_info_set(ToxWindow *self, uint32_t id, char *msg)
 {
    flag_interface_refresh();
    struct line_info *line = self->chatwin->hst->line_end;
    while (line) {
@@ -758,24 +768,8 @@ void line_info_set(ToxWindow *self, uint32_t id, char *msg)
        line = line->prev;
    }
 }
-/* Return the line_info object associated with `id`.
+    flag_interface_change(1);
 * Return NULL if id cannot be found
 */
 struct line_info *line_info_get(ToxWindow *self, uint32_t id)
 {
    struct line_info *line = self->chatwin->hst->line_end;
    while (line) {
        if (line->id == id) {
            return line;
        }
        line = line->prev;
    }
    return NULL;
 }
 static void line_info_scroll_up(ToxWindow *self, struct history *hst)
@@ -784,6 +778,8 @@ static void line_info_scroll_up(ToxWindow *self, struct history *hst)
        hst->line_start = hst->line_start->prev;
        self->scroll_pause = true;
    }
    flag_interface_change(1);
 }
 static void line_info_scroll_down(ToxWindow *self, struct history *hst)
@@ -799,6 +795,8 @@ static void line_info_scroll_down(ToxWindow *self, struct history *hst)
    } else {
        line_info_reset_start(self, hst);
    }
    flag_interface_change(1);
 }
 static void line_info_page_up(ToxWindow *self, struct history *hst)
@@ -818,6 +816,8 @@ static void line_info_page_up(ToxWindow *self, struct history *hst)
    }
    self->scroll_pause = true;
    flag_interface_change(1);
 }
 static void line_info_page_down(ToxWindow *self, struct history *hst)
@@ -847,6 +847,8 @@ static void line_info_page_down(ToxWindow *self, struct history *hst)
        hst->line_start = next;
        next = hst->line_start->next;
    }
    flag_interface_change(1);
 }
 bool line_info_onKey(ToxWindow *self, wint_t key)
@@ -869,7 +871,7 @@ bool line_info_onKey(ToxWindow *self, wint_t key)
    }
    if (match) {
-        flag_interface_refresh();
+        flag_interface_change(1);
    }
    return match;
@@ -879,4 +881,6 @@ void line_info_clear(struct history *hst)
 {
    hst->line_start = hst->line_end;
    hst->start_id = hst->line_start->id;
    flag_interface_change(1);
 }
--- a/src/line_info.h
+++ b/src/line_info.h
@@ -96,11 +96,6 @@ void line_info_clear(struct history *hst);
 /* puts msg in specified line_info msg buffer */
 void line_info_set(ToxWindow *self, uint32_t id, char *msg);
 /* Return the line_info object associated with `id`.
 * Return NULL if id cannot be found
 */
 struct line_info *line_info_get(ToxWindow *self, uint32_t id);
 /* resets line_start (moves to end of chat history) */
 void line_info_reset_start(ToxWindow *self, struct history *hst);
--- a/src/message_queue.c
+++ b/src/message_queue.c
@@ -59,7 +59,6 @@ void cqueue_add(struct chat_queue *q, const char *msg, size_t len, uint8_t type,
    new_m->type = type;
    new_m->line_id = line_id;
    new_m->last_send_try = 0;
    new_m->time_added = get_unix_time();
    new_m->receipt = -1;
    new_m->next = NULL;
@@ -77,19 +76,23 @@ void cqueue_add(struct chat_queue *q, const char *msg, size_t len, uint8_t type,
 /* update line to show receipt was received after queue removal */
 static void cqueue_mark_read(ToxWindow *self, struct cqueue_msg *msg)
 {
-    struct line_info *line = line_info_get(self, msg->line_id);
+    struct line_info *line = self->chatwin->hst->line_end;
    while (line) {
        if (line->id != msg->line_id) {
            line = line->prev;
            continue;
        }
        line->type = msg->type == OUT_ACTION ? OUT_ACTION_READ : OUT_MSG_READ;
        if (line->noread_flag) {
            line->noread_flag = false;
            line->read_flag = true;
        }
    if (line == NULL) {
        return;
    }
    line->type = msg->type == OUT_ACTION ? OUT_ACTION_READ : OUT_MSG_READ;
    if (line->noread_flag) {
        line->noread_flag = false;
        line->read_flag = true;
        flag_interface_refresh();
    }
 }
 /* removes message with matching receipt from queue, writes to log and updates line to show the message was received. */
@@ -155,36 +158,6 @@ static void cqueue_check_timeouts(struct cqueue_msg *msg)
    }
 }
 /*
 * Sets the noread flag for messages sent to the peer associated with `self` which have not
 * received a receipt after a period of time.
 */
 #define NOREAD_TIMEOUT 5
 void cqueue_check_unread(ToxWindow *self)
 {
    struct chat_queue *q = self->chatwin->cqueue;
    struct cqueue_msg *msg = q->root;
    while (msg) {
        if (msg->noread_flag) {
            msg = msg->next;
            continue;
        }
        struct line_info *line = line_info_get(self, msg->line_id);
        if (line != NULL) {
            if (timed_out(msg->time_added, NOREAD_TIMEOUT)) {
                line->noread_flag = true;
                msg->noread_flag = true;
                flag_interface_refresh();
            }
        }
        msg = msg->next;
    }
 }
 /*
 * Tries to send all messages in the send queue in sequential order.
 * If a message fails to send the function will immediately return.
--- a/src/message_queue.h
+++ b/src/message_queue.h
@@ -28,10 +28,8 @@ struct cqueue_msg {
    size_t len;
    int line_id;
    time_t last_send_try;
    time_t time_added;
    uint8_t type;
    int64_t receipt;
    bool noread_flag;
    struct cqueue_msg *next;
    struct cqueue_msg *prev;
 };
@@ -50,12 +48,6 @@ void cqueue_add(struct chat_queue *q, const char *msg, size_t len, uint8_t type,
 */
 void cqueue_try_send(ToxWindow *self, Tox *m);
 /*
 * Sets the noread flag for messages sent to the peer associated with `self` which have not
 * received a receipt after a period of time.
 */
 void cqueue_check_unread(ToxWindow *self);
 /* removes message with matching receipt from queue, writes to log and updates line to show the message was received. */
 void cqueue_remove(ToxWindow *self, Tox *m, uint32_t receipt);
--- a/src/misc_tools.c
+++ b/src/misc_tools.c
@@ -137,18 +137,15 @@ void get_elapsed_time_str(char *buf, int bufsize, time_t secs)
 }
 /*
- * Converts a hexidecimal string representation of a Tox public key to binary format and puts
+ * Converts a hexidecimal string of length hex_len to binary format and puts the result in output.
- * the result in output.
+ * output_size must be exactly half of hex_len.
 *
 * `hex_len` must be exactly TOX_PUBLIC_KEY_SIZE * 2, and `output_size` must have room
 * for TOX_PUBLIC_KEY_SIZE bytes.
 *
 * Returns 0 on success.
 * Returns -1 on failure.
 */
-int tox_pk_string_to_bytes(const char *hex_string, size_t hex_len, char *output, size_t output_size)
+int hex_string_to_bin(const char *hex_string, size_t hex_len, char *output, size_t output_size)
 {
-    if (output_size != TOX_PUBLIC_KEY_SIZE || hex_len != output_size * 2) {
+    if (output_size == 0 || hex_len != output_size * 2) {
        return -1;
    }
@@ -160,11 +157,6 @@ int tox_pk_string_to_bytes(const char *hex_string, size_t hex_len, char *output,
    return 0;
 }
 /* Convert a hexadecimcal string of length `size` to bytes and puts the result in `keystr`.
 *
 * Returns 0 on success.
 * Returns -1 on failure.
 */
 int hex_string_to_bytes(char *buf, int size, const char *keystr)
 {
    if (size % 2 != 0) {
@@ -186,14 +178,11 @@ int hex_string_to_bytes(char *buf, int size, const char *keystr)
 }
 /* Converts a binary representation of a Tox ID into a string.
 *
 * `bin_id_size` must be exactly TOX_ADDRESS_SIZE bytes in length, and
 * `output_size` must be at least TOX_ADDRESS_SIZE * 2 + 1.
 *
 * Returns 0 on success.
 * Returns -1 on failure.
 */
-int tox_id_bytes_to_str(const char *bin_id, size_t bin_id_size, char *output, size_t output_size)
+int bin_id_to_string(const char *bin_id, size_t bin_id_size, char *output, size_t output_size)
 {
    if (bin_id_size != TOX_ADDRESS_SIZE || output_size < (TOX_ADDRESS_SIZE * 2 + 1)) {
        return -1;
@@ -207,14 +196,11 @@ int tox_id_bytes_to_str(const char *bin_id, size_t bin_id_size, char *output, si
 }
 /* Converts a binary representation of a Tox public key into a string.
 *
 * `bin_pubkey_size` must be exactly TOX_PUBLIC_KEY_SIZE bytes in size, and
 * `output_size` must be at least TOX_PUBLIC_KEY_SIZE * 2 + 1.
 *
 * Returns 0 on success.
 * Returns -1 on failure.
 */
-int tox_pk_bytes_to_str(const uint8_t *bin_pubkey, size_t bin_pubkey_size, char *output, size_t output_size)
+int bin_pubkey_to_string(const uint8_t *bin_pubkey, size_t bin_pubkey_size, char *output, size_t output_size)
 {
    if (bin_pubkey_size != TOX_PUBLIC_KEY_SIZE || output_size < (TOX_PUBLIC_KEY_SIZE * 2 + 1)) {
        return -1;
@@ -288,7 +274,7 @@ int qsort_strcasecmp_hlpr(const void *str1, const void *str2)
 /* case-insensitive string compare function for use with qsort */
 int qsort_ptr_char_array_helper(const void *str1, const void *str2)
 {
-    return strcasecmp(*(const char *const *)str1, *(const char *const *)str2);
+    return strcasecmp(*(char **)str1, *(char **)str2);
 }
 static const char invalid_chars[] = {'/', '\n', '\t', '\v', '\r', '\0'};
--- a/src/misc_tools.h
+++ b/src/misc_tools.h
@@ -53,43 +53,30 @@ void clear_screen(void);
 void hst_to_net(uint8_t *num, uint16_t numbytes);
 /*
- * Converts a hexidecimal string representation of a Tox public key to binary format and puts
+ * Converts a hexidecimal string of length hex_len to binary format and puts the result in output.
- * the result in output.
+ * output_size must be exactly half of hex_len.
 *
 * `hex_len` must be exactly TOX_PUBLIC_KEY_SIZE * 2, and `output_size` must have room
 * for TOX_PUBLIC_KEY_SIZE bytes.
 *
 * Returns 0 on success.
 * Returns -1 on failure.
 */
-int tox_pk_string_to_bytes(const char *hex_string, size_t hex_len, char *output, size_t output_size);
+int hex_string_to_bin(const char *hex_string, size_t hex_len, char *output, size_t output_size);
-/* Converts a binary representation of a Tox public key into a string.
+/* convert a hex string to bytes. returns 0 on success, -1 on failure */
 *
 * `bin_pubkey_size` must be exactly TOX_PUBLIC_KEY_SIZE bytes in size, and
 * `output_size` must be at least TOX_PUBLIC_KEY_SIZE * 2 + 1.
 *
 * Returns 0 on success.
 * Returns -1 on failure.
 */
 int tox_pk_bytes_to_str(const uint8_t *bin_pubkey, size_t bin_pubkey_size, char *output, size_t output_size);
 /* Convert a hexadecimcal string of length `size` to bytes and puts the result in `keystr`.
 *
 * Returns 0 on success.
 * Returns -1 on failure.
 */
 int hex_string_to_bytes(char *buf, int size, const char *keystr);
 /* Converts a binary representation of a Tox ID into a string.
 *
- * `bin_id_size` must be exactly TOX_ADDRESS_SIZE bytes in length, and
+ * Returns 0 on success.
- * `output_size` must be at least TOX_ADDRESS_SIZE * 2 + 1.
+ * Returns -1 on failure.
 */
 int bin_id_to_string(const char *bin_id, size_t bin_id_size, char *output, size_t output_size);
 /* Converts a binary representation of a Tox public key into a string.
 *
 * Returns 0 on success.
 * Returns -1 on failure.
 */
-int tox_id_bytes_to_str(const char *bin_id, size_t bin_id_size, char *output, size_t output_size);
+int bin_pubkey_to_string(const uint8_t *bin_pubkey, size_t bin_pubkey_size, char *output, size_t output_size);
 /* get the current unix time (not thread safe) */
 time_t get_unix_time(void);
--- a/src/name_lookup.c
+++ b/src/name_lookup.c
@@ -33,6 +33,9 @@
 #include "toxic.h"
 #include "windows.h"
 extern struct arg_opts arg_opts;
 extern struct Winthread Winthread;
 #define NAMESERVER_API_PATH "api"
 #define SERVER_KEY_SIZE 32
 #define MAX_SERVERS 50
@@ -108,15 +111,14 @@ static int load_nameserver_list(const char *path)
    char line[MAX_SERVER_LINE];
    while (fgets(line, sizeof(line), fp) && Nameservers.lines < MAX_SERVERS) {
-        size_t linelen = strlen(line);
+        int linelen = strlen(line);
        if (linelen < SERVER_KEY_SIZE * 2 + 5) {
            continue;
        }
        if (line[linelen - 1] == '\n') {
-            --linelen;
+            line[--linelen] = '\0';
            line[linelen] = '\0';
        }
        const char *name = strtok(line, " ");
@@ -130,10 +132,8 @@ static int load_nameserver_list(const char *path)
            continue;
        }
-        const size_t idx = Nameservers.lines;
+        snprintf(Nameservers.names[Nameservers.lines], sizeof(Nameservers.names[Nameservers.lines]), "%s", name);
-        snprintf(Nameservers.names[idx], sizeof(Nameservers.names[idx]), "%s", name);
+        int res = hex_string_to_bytes(Nameservers.keys[Nameservers.lines], SERVER_KEY_SIZE, keystr);
        int res = hex_string_to_bytes(Nameservers.keys[idx], SERVER_KEY_SIZE, keystr);
        if (res == -1) {
            continue;
@@ -231,7 +231,7 @@ static int process_response(struct Recv_Curl_Data *recv_data)
    memcpy(ID_string, IDstart + prefix_size, TOX_ADDRESS_SIZE * 2);
    ID_string[TOX_ADDRESS_SIZE * 2] = 0;
-    if (tox_pk_string_to_bytes(ID_string, strlen(ID_string), t_data.id_bin, sizeof(t_data.id_bin)) == -1) {
+    if (hex_string_to_bin(ID_string, strlen(ID_string), t_data.id_bin, sizeof(t_data.id_bin)) == -1) {
        return -1;
    }
--- a/src/notify.c
+++ b/src/notify.c
@@ -318,7 +318,7 @@ void *do_playing(void *_p)
        has_looping = false;
        control_unlock();
-        sleep_thread(100000L);
+        sleep_thread(10000L);
    }
    pthread_exit(NULL);
@@ -489,27 +489,16 @@ void terminate_notify(void)
 }
 #ifdef SOUND_NOTIFY
-
+int set_sound(Notification sound, const char *value)
 /*
 * Sets notification sound designated by `sound` to file path `value`.
 *
 * Return true if the sound is successfully set.
 */
 bool set_sound(Notification sound, const char *value)
 {
    if (sound == silent) {
-        return false;
+        return 0;
    }
    free(Control.sounds[sound]);
    size_t len = strlen(value) + 1;
    Control.sounds[sound] = calloc(len, 1);
    if (Control.sounds[sound] == NULL) {
        return false;
    }
    memcpy(Control.sounds[sound], value, len);
    struct stat buf;
--- a/src/notify.h
+++ b/src/notify.h
@@ -77,7 +77,7 @@ int box_silent_notify(ToxWindow *self, uint64_t flags, int *id_indicator, const
 int box_silent_notify2(ToxWindow *self, uint64_t flags, int id, const char *format, ...);
 #ifdef SOUND_NOTIFY
-bool set_sound(Notification sound, const char *value);
+int set_sound(Notification sound, const char *value);
 #endif /* SOUND_NOTIFY */
 #endif /* NOTIFY_H */
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -125,8 +125,6 @@ void on_self_connection_status(Tox *m, Tox_Connection connection_status, void *u
    UNUSED_VAR(userdata);
    StatusBar *statusbar = prompt->stb;
    statusbar->connection = connection_status;
    flag_interface_refresh();
 }
 /* Updates own nick in prompt statusbar */
@@ -340,50 +338,24 @@ static void prompt_onDraw(ToxWindow *self, Tox *m)
    Tox_User_Status status = statusbar->status;
    pthread_mutex_unlock(&Winthread.lock);
-    wattron(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
+    if (connection != TOX_CONNECTION_NONE) {
    wprintw(statusbar->topline, " [");
    wattroff(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
    switch (connection) {
        case TOX_CONNECTION_TCP:
            wattron(statusbar->topline, A_BOLD | COLOR_PAIR(STATUS_ONLINE));
            wprintw(statusbar->topline, "TCP");
            wattroff(statusbar->topline, A_BOLD | COLOR_PAIR(STATUS_ONLINE));
            break;
        case TOX_CONNECTION_UDP:
            wattron(statusbar->topline, A_BOLD | COLOR_PAIR(STATUS_ONLINE));
            wprintw(statusbar->topline, "UDP");
            wattroff(statusbar->topline, A_BOLD | COLOR_PAIR(STATUS_ONLINE));
            break;
        default:
            wattron(statusbar->topline, COLOR_PAIR(BAR_TEXT));
            wprintw(statusbar->topline, "Offline");
            wattroff(statusbar->topline, COLOR_PAIR(BAR_TEXT));
            break;
    }
    wattron(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
    wprintw(statusbar->topline, "]");
    wattroff(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
    if (status != TOX_USER_STATUS_NONE) {
        int colour = MAGENTA;
        const char *status_text = "ERROR";
        switch (status) {
            case TOX_USER_STATUS_NONE:
                status_text = "Online";
                colour = STATUS_ONLINE;
                break;
            case TOX_USER_STATUS_AWAY:
                colour = STATUS_AWAY;
                status_text = "Away";
                colour = STATUS_AWAY;
                break;
            case TOX_USER_STATUS_BUSY:
                colour = STATUS_BUSY;
                status_text = "Busy";
-                break;
+                colour = STATUS_BUSY;
            default:
                break;
        }
@@ -405,6 +377,18 @@ static void prompt_onDraw(ToxWindow *self, Tox *m)
        wprintw(statusbar->topline, " %s", statusbar->nick);
        pthread_mutex_unlock(&Winthread.lock);
    } else {
        wattron(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
        wprintw(statusbar->topline, " [");
        wattroff(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
        wattron(statusbar->topline, COLOR_PAIR(BAR_TEXT));
        wprintw(statusbar->topline, "Offline");
        wattroff(statusbar->topline, COLOR_PAIR(BAR_TEXT));
        wattron(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
        wprintw(statusbar->topline, "]");
        wattroff(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
        wattron(statusbar->topline, COLOR_PAIR(BAR_TEXT));
        pthread_mutex_lock(&Winthread.lock);
@@ -424,14 +408,11 @@ static void prompt_onDraw(ToxWindow *self, Tox *m)
        char statusmsg[TOX_MAX_STATUS_MESSAGE_LENGTH];
        pthread_mutex_lock(&Winthread.lock);
        size_t slen = tox_self_get_status_message_size(m);
        tox_self_get_status_message(m, (uint8_t *) statusmsg);
        statusmsg[slen] = '\0';
        snprintf(statusbar->statusmsg, sizeof(statusbar->statusmsg), "%s", statusmsg);
        statusbar->statusmsg_len = strlen(statusbar->statusmsg);
        pthread_mutex_unlock(&Winthread.lock);
    }
@@ -441,29 +422,25 @@ static void prompt_onDraw(ToxWindow *self, Tox *m)
    uint16_t maxlen = x2 - getcurx(statusbar->topline) - 3;
    pthread_mutex_lock(&Winthread.lock);
    size_t statusmsg_len = statusbar->statusmsg_len;
    pthread_mutex_unlock(&Winthread.lock);
-    if (statusmsg_len > maxlen) {
+    if (statusbar->statusmsg_len > maxlen) {
-        pthread_mutex_lock(&Winthread.lock);
+        statusbar->statusmsg[maxlen - 3] = '\0';
        statusbar->statusmsg[maxlen - 3] = 0;
        strcat(statusbar->statusmsg, "...");
        statusbar->statusmsg_len = maxlen;
        pthread_mutex_unlock(&Winthread.lock);
    }
-    if (statusmsg_len) {
+    if (statusbar->statusmsg[0]) {
        wattron(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
        wprintw(statusbar->topline, " | ");
        wattroff(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
        wattron(statusbar->topline, COLOR_PAIR(BAR_TEXT));
        pthread_mutex_lock(&Winthread.lock);
        wprintw(statusbar->topline, "%s", statusbar->statusmsg);
        pthread_mutex_unlock(&Winthread.lock);
        wattroff(statusbar->topline, COLOR_PAIR(BAR_TEXT));
    }
    pthread_mutex_unlock(&Winthread.lock);
    int y;
    int x;
    getyx(self->window, y, x);
--- a/src/prompt.h
+++ b/src/prompt.h
@@ -40,9 +40,6 @@ typedef struct FriendRequests {
    struct friend_request request[MAX_FRIEND_REQUESTS];
 } FriendRequests;
 extern ToxWindow *prompt;
 extern FriendRequests FrndRequests;
 ToxWindow *new_prompt(void);
 void prep_prompt_win(void);
--- a/src/settings.h
+++ b/src/settings.h
@@ -32,7 +32,7 @@
 #define PASSWORD_EVAL_MAX 512
-/* Holds user setting values defined in the toxic config file. */
+/* holds user setting values */
 struct user_settings {
    int autolog;           /* boolean */
    int alerts;            /* boolean */
@@ -96,8 +96,6 @@ struct user_settings {
 #endif
 };
 extern struct user_settings *user_settings;
 enum settings_values {
    AUTOLOG_OFF = 0,
    AUTOLOG_ON = 1,
--- a/src/toxic.c
+++ b/src/toxic.c
@@ -74,7 +74,7 @@
 #ifdef VIDEO
 #include "video_call.h"
 #endif /* VIDEO */
-static ToxAV *av;
+ToxAV *av;
 #endif /* AUDIO */
 #ifdef PYTHON
@@ -98,15 +98,9 @@ ToxWindow *prompt = NULL;
 #define MAX_PASSWORD_LEN 64
 struct Winthread Winthread;
-static struct cqueue_thread cqueue_thread;
+struct cqueue_thread cqueue_thread;
 struct av_thread av_thread;
 struct arg_opts arg_opts;
 #ifdef AUDIO
 static struct av_thread av_thread;
 #endif
 // This struct is not thread safe. It should only ever be written to from the main thread
 // before any other thread that uses it is initialized.
 struct user_settings *user_settings = NULL;
 static struct user_password {
@@ -245,12 +239,6 @@ void cb_toxcore_logger(Tox *m, TOX_LOG_LEVEL level, const char *file, uint32_t l
    }
 }
 /* Sets ncurses refresh rate. Lower values make it refresh more often. */
 void set_window_refresh_rate(size_t refresh_rate)
 {
    timeout(refresh_rate);
 }
 static void init_term(void)
 {
 #if HAVE_WIDECHAR
@@ -268,7 +256,7 @@ static void init_term(void)
    keypad(stdscr, 1);
    noecho();
    nonl();
-    set_window_refresh_rate(NCURSES_DEFAULT_REFRESH_RATE);
+    timeout(30);
    if (has_colors()) {
        short bg_color = COLOR_BLACK;
@@ -447,7 +435,9 @@ static void cleanup_init_messages(void)
        return;
    }
-    for (int i = 0; i < init_messages.num; ++i) {
+    int i;
    for (i = 0; i < init_messages.num; ++i) {
        free(init_messages.msgs[i]);
    }
@@ -456,16 +446,19 @@ static void cleanup_init_messages(void)
 static void print_init_messages(ToxWindow *toxwin)
 {
-    for (int i = 0; i < init_messages.num; ++i) {
+    int i;
    for (i = 0; i < init_messages.num; ++i) {
        line_info_add(toxwin, NULL, NULL, NULL, SYS_MSG, 0, 0, init_messages.msgs[i]);
    }
 }
 static void load_friendlist(Tox *m)
 {
    size_t i;
    size_t numfriends = tox_self_get_friend_list_size(m);
-    for (size_t i = 0; i < numfriends; ++i) {
+    for (i = 0; i < numfriends; ++i) {
        friendlist_onFriendAdded(NULL, m, i, false);
    }
@@ -1079,45 +1072,29 @@ static void do_toxic(Tox *m)
    pthread_mutex_unlock(&Winthread.lock);
 }
 /* Set interface refresh flag. This should be called whenever the interface changes.
 *
 * This function is not thread safe.
 */
 void flag_interface_refresh(void)
 {
    Winthread.flag_refresh = 1;
    Winthread.last_refresh_flag = get_unix_time();
 }
 /* How long we wait to idle interface refreshing after last flag set. Should be no less than 2. */
 #define ACTIVE_WIN_REFRESH_TIMEOUT 2
 static void poll_interface_refresh_flag(void)
 {
    pthread_mutex_lock(&Winthread.lock);
    bool flag = Winthread.flag_refresh;
    time_t t = Winthread.last_refresh_flag;
    pthread_mutex_unlock(&Winthread.lock);
    if (flag == 1 && timed_out(t, ACTIVE_WIN_REFRESH_TIMEOUT)) {
        pthread_mutex_lock(&Winthread.lock);
        Winthread.flag_refresh = 0;
        pthread_mutex_unlock(&Winthread.lock);
    }
 }
 /* How often we refresh windows that aren't focused */
 #define INACTIVE_WIN_REFRESH_RATE 10
 /* Set interface change flag. This should be called whenever the interface changes.
 *
 * `flag` should be a non-zero value if we need to redraw the window or 0 if we want to idle.
 */
 void flag_interface_change(unsigned int flag)
 {
    if (flag == 0 && timed_out(Winthread.flag_refresh_timeout, 1)) {
        Winthread.flag_refresh = flag;
    } else if (flag != 0) {
        Winthread.flag_refresh = 1;
    }
    Winthread.flag_refresh_timeout = get_unix_time();
 }
 void *thread_winref(void *data)
 {
    Tox *m = (Tox *) data;
    uint8_t draw_count = 0;
    init_signal_catchers();
    while (true) {
@@ -1136,8 +1113,6 @@ void *thread_winref(void *data)
            pthread_mutex_lock(&Winthread.lock);
            exit_toxic_success(m);
        }
        poll_interface_refresh_flag();
    }
 }
@@ -1151,12 +1126,9 @@ void *thread_cqueue(void *data)
        for (size_t i = 2; i < MAX_WINDOWS_NUM; ++i) {
            ToxWindow *toxwin = get_window_ptr(i);
-            if ((toxwin != NULL) && (toxwin->type == WINDOW_TYPE_CHAT)) {
+            if ((toxwin != NULL) && (toxwin->type == WINDOW_TYPE_CHAT)
-                cqueue_check_unread(toxwin);
+                    && (get_friend_connection_status(toxwin->num) != TOX_CONNECTION_NONE)) {
-
+                cqueue_try_send(toxwin, m);
                if (get_friend_connection_status(toxwin->num) != TOX_CONNECTION_NONE) {
                    cqueue_try_send(toxwin, m);
                }
            }
        }
@@ -1514,6 +1486,8 @@ int main(int argc, char **argv)
    /* Make sure all written files are read/writeable only by the current user. */
    umask(S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
    flag_interface_change(1);
    srand(time(NULL)); // We use rand() for trivial/non-security related things
    parse_args(argc, argv);
@@ -1648,7 +1622,6 @@ int main(int argc, char **argv)
    pthread_mutex_lock(&Winthread.lock);
    print_init_messages(prompt);
    flag_interface_refresh();
    pthread_mutex_unlock(&Winthread.lock);
    cleanup_init_messages();
--- a/src/toxic.h
+++ b/src/toxic.h
@@ -50,9 +50,6 @@
 #define TIME_STR_SIZE 32
 #define COLOR_STR_SIZE 10 /* should fit every color option */
 #define NCURSES_DEFAULT_REFRESH_RATE 100
 #define NCURSES_GAME_REFRESH_RATE 25
 #ifndef MAX_PORT_RANGE
 #define MAX_PORT_RANGE 65535
 #endif
@@ -105,10 +102,7 @@ typedef enum _FATAL_ERRS {
 void lock_status(void);
 void unlock_status(void);
-void flag_interface_refresh(void);
+void flag_interface_change(unsigned int flag);
 /* Sets ncurses refresh rate. Lower values make it refresh more often. */
 void set_window_refresh_rate(size_t refresh_rate);
 void exit_toxic_success(Tox *m);
 void exit_toxic_err(const char *errmsg, int errcode);
@@ -145,7 +139,5 @@ void on_friend_typing(Tox *m, uint32_t friendnumber, bool is_typing, void *userd
 void on_friend_read_receipt(Tox *m, uint32_t friendnumber, uint32_t receipt, void *userdata);
 void on_lossless_custom_packet(Tox *m, uint32_t friendnumber, const uint8_t *data, size_t length, void *userdata);
 extern char *DATA_FILE;
 extern char *BLOCK_FILE;
 #endif /* TOXIC_H */
--- a/src/video_device.c
+++ b/src/video_device.c
@@ -92,21 +92,21 @@ typedef struct VideoDevice {
 } VideoDevice;
-static const char *dvideo_device_names[2];        /* Default device */
+const char *dvideo_device_names[2];              /* Default device */
-static char *video_devices_names[2][MAX_DEVICES]; /* Container of available devices */
+const char *video_devices_names[2][MAX_DEVICES]; /* Container of available devices */
-static int size[2];                               /* Size of above containers */
+static int size[2];                        /* Size of above containers */
-static VideoDevice *video_devices_running[2][MAX_DEVICES] = {{NULL}}; /* Running devices */
+VideoDevice *video_devices_running[2][MAX_DEVICES] = {{NULL}};     /* Running devices */
-static uint32_t primary_video_device[2];                              /* Primary device */
+uint32_t primary_video_device[2];          /* Primary device */
 static ToxAV *av = NULL;
 /* q_mutex */
 #define lock pthread_mutex_lock(&video_mutex)
 #define unlock pthread_mutex_unlock(&video_mutex)
-static pthread_mutex_t video_mutex;
+pthread_mutex_t video_mutex;
-static bool video_thread_running = true;
+bool video_thread_running = true,
-static bool video_thread_paused = true;                /* Thread control */
+     video_thread_paused = true;                /* Thread control */
 void *video_thread_poll(void *);
@@ -187,7 +187,7 @@ VideoDeviceError init_video_devices(void)
 #if defined(__OSX__) || defined(__APPLE__)
-    if (osx_video_init(&video_devices_names[vdt_input][0], &size[vdt_input]) != 0) {
+    if (osx_video_init((char **)video_devices_names[vdt_input], &size[vdt_input]) != 0) {
        return vde_InternalError;
    }
@@ -209,24 +209,12 @@ VideoDeviceError init_video_devices(void)
            /* Query V4L for capture capabilities */
            if (-1 != ioctl(fd, VIDIOC_QUERYCAP, &cap)) {
                video_input_name = (char *)malloc(strlen((const char *)cap.card) + strlen(device_address) + 4);
                if (video_input_name == NULL) {
                    close(fd);
                    return vde_InternalError;
                }
                strcpy(video_input_name, (char *)cap.card);
                strcat(video_input_name, " (");
                strcat(video_input_name, (char *)device_address);
                strcat(video_input_name, ")");
            } else {
                video_input_name = (char *)malloc(strlen(device_address) + 3);
                if (video_input_name == NULL) {
                    close(fd);
                    return vde_InternalError;
                }
                strcpy(video_input_name, "(");
                strcat(video_input_name, device_address);
                strcat(video_input_name, ")");
@@ -241,9 +229,6 @@ VideoDeviceError init_video_devices(void)
 #endif
    size[vdt_output] = 1;
    // TODO(iphydf): String literals are const char *. This may need to be
    // copied, or if we're not owning any output device names, it should be
    // const and video_devices_names needs to be split.
    char *video_output_name = "Toxic Video Receiver";
    video_devices_names[vdt_output][0] = video_output_name;
@@ -277,7 +262,7 @@ VideoDeviceError terminate_video_devices(void)
    int i;
    for (i = 0; i < size[vdt_input]; ++i) {
-        free(video_devices_names[vdt_input][i]);
+        free((void *)video_devices_names[vdt_input][i]);
    }
    if (pthread_mutex_destroy(&video_mutex) != 0) {
--- a/src/windows.c
+++ b/src/windows.c
@@ -41,10 +41,16 @@
 #include "game_base.h"
 #endif
 extern char *DATA_FILE;
 extern struct Winthread Winthread;
 ToxWindow *windows[MAX_WINDOWS_NUM];
 static uint8_t active_window_index;
 static int num_active_windows;
 extern ToxWindow *prompt;
 extern struct user_settings *user_settings;
 /* CALLBACKS START */
 void on_friend_request(Tox *m, const uint8_t *public_key, const uint8_t *data, size_t length, void *userdata)
 {
@@ -72,7 +78,7 @@ void on_friend_connection_status(Tox *m, uint32_t friendnumber, Tox_Connection c
        }
    }
-    flag_interface_refresh();
+    flag_interface_change(1);
 }
 void on_friend_typing(Tox *m, uint32_t friendnumber, bool is_typing, void *userdata)
@@ -89,7 +95,7 @@ void on_friend_typing(Tox *m, uint32_t friendnumber, bool is_typing, void *userd
        }
    }
-    flag_interface_refresh();
+    flag_interface_change(1);
 }
 void on_friend_message(Tox *m, uint32_t friendnumber, Tox_Message_Type type, const uint8_t *string, size_t length,
@@ -121,7 +127,7 @@ void on_friend_name(Tox *m, uint32_t friendnumber, const uint8_t *string, size_t
        }
    }
-    flag_interface_refresh();
+    flag_interface_change(1);
    store_data(m, DATA_FILE);
 }
@@ -141,7 +147,7 @@ void on_friend_status_message(Tox *m, uint32_t friendnumber, const uint8_t *stri
        }
    }
-    flag_interface_refresh();
+    flag_interface_change(1);
 }
 void on_friend_status(Tox *m, uint32_t friendnumber, Tox_User_Status status, void *userdata)
@@ -154,7 +160,7 @@ void on_friend_status(Tox *m, uint32_t friendnumber, Tox_User_Status status, voi
        }
    }
-    flag_interface_refresh();
+    flag_interface_change(1);
 }
 void on_friend_added(Tox *m, uint32_t friendnumber, bool sort)
@@ -190,7 +196,7 @@ void on_conference_invite(Tox *m, uint32_t friendnumber, Tox_Conference_Type typ
    for (uint8_t i = 0; i < MAX_WINDOWS_NUM; ++i) {
        if (windows[i] != NULL && windows[i]->onConferenceInvite != NULL) {
-            windows[i]->onConferenceInvite(windows[i], m, friendnumber, type, (const char *) conference_pub_key, length);
+            windows[i]->onConferenceInvite(windows[i], m, friendnumber, type, (char *) conference_pub_key, length);
        }
    }
 }
@@ -205,7 +211,7 @@ void on_conference_peer_list_changed(Tox *m, uint32_t conferencenumber, void *us
        }
    }
-    flag_interface_refresh();
+    flag_interface_change(1);
 }
 void on_conference_peer_name(Tox *m, uint32_t conferencenumber, uint32_t peernumber, const uint8_t *name,
@@ -244,7 +250,7 @@ void on_file_chunk_request(Tox *m, uint32_t friendnumber, uint32_t filenumber, u
 {
    UNUSED_VAR(userdata);
-    FileTransfer *ft = get_file_transfer_struct(friendnumber, filenumber);
+    struct FileTransfer *ft = get_file_transfer_struct(friendnumber, filenumber);
    if (!ft) {
        return;
@@ -267,7 +273,7 @@ void on_file_recv_chunk(Tox *m, uint32_t friendnumber, uint32_t filenumber, uint
 {
    UNUSED_VAR(userdata);
-    FileTransfer *ft = get_file_transfer_struct(friendnumber, filenumber);
+    struct FileTransfer *ft = get_file_transfer_struct(friendnumber, filenumber);
    if (!ft) {
        return;
@@ -275,7 +281,7 @@ void on_file_recv_chunk(Tox *m, uint32_t friendnumber, uint32_t filenumber, uint
    for (uint8_t i = 0; i < MAX_WINDOWS_NUM; ++i) {
        if (windows[i] != NULL && windows[i]->onFileRecvChunk != NULL) {
-            windows[i]->onFileRecvChunk(windows[i], m, friendnumber, filenumber, position, (const char *) data, length);
+            windows[i]->onFileRecvChunk(windows[i], m, friendnumber, filenumber, position, (char *) data, length);
        }
    }
 }
@@ -285,7 +291,7 @@ void on_file_recv_control(Tox *m, uint32_t friendnumber, uint32_t filenumber, To
 {
    UNUSED_VAR(userdata);
-    FileTransfer *ft = get_file_transfer_struct(friendnumber, filenumber);
+    struct FileTransfer *ft = get_file_transfer_struct(friendnumber, filenumber);
    if (!ft) {
        return;
@@ -316,7 +322,7 @@ void on_file_recv(Tox *m, uint32_t friendnumber, uint32_t filenumber, uint32_t k
    for (uint8_t i = 0; i < MAX_WINDOWS_NUM; ++i) {
        if (windows[i] != NULL && windows[i]->onFileRecv != NULL) {
-            windows[i]->onFileRecv(windows[i], m, friendnumber, filenumber, file_size, (const char *) filename,
+            windows[i]->onFileRecv(windows[i], m, friendnumber, filenumber, file_size, (char *) filename,
                                   filename_length);
        }
    }
@@ -427,7 +433,7 @@ void set_active_window_index(uint8_t index)
 /* Displays the next window if `ch` is equal to the next window key binding.
 * Otherwise displays the previous window.
 */
-static void set_next_window(int ch)
+void set_next_window(int ch)
 {
    uint8_t index = 0;
@@ -450,6 +456,8 @@ static void set_next_window(int ch)
    }
    set_active_window_index(index);
    flag_interface_change(1);
 }
 /* Deletes window w and cleans up */
@@ -685,10 +693,10 @@ void draw_window_bar(ToxWindow *self)
    int cur_x;
    int cur_y;
    getyx(win, cur_y, cur_x);
    UNUSED_VAR(cur_y);
    getyx(win, cur_y, cur_x);
    wattron(win, COLOR_PAIR(BAR_TEXT));
    mvwhline(win, 0, cur_x, ' ', COLS - cur_x);
    wattroff(win, COLOR_PAIR(BAR_TEXT));
@@ -795,23 +803,13 @@ void draw_active_window(Tox *m)
    bool flag_refresh = Winthread.flag_refresh;
    pthread_mutex_unlock(&Winthread.lock);
-    if (flag_refresh) {
+    if (flag_refresh || (a->is_call && timed_out(a->chatwin->infobox.lastupdate, 1))) {
        touchwin(a->window);
        a->onDraw(a, m);
        wrefresh(a->window);
    }
 #ifdef AUDIO
    else if (a->is_call && timed_out(a->chatwin->infobox.lastupdate, 1)) {
        touchwin(a->window);
        a->onDraw(a, m);
        wrefresh(a->window);
    }
 #endif  // AUDIO
 #ifdef GAMES
    if (a->type == WINDOW_TYPE_GAME) {
        if (!flag_refresh) {  // we always want to be continously refreshing game windows
            touchwin(a->window);
@@ -826,7 +824,7 @@ void draw_active_window(Tox *m)
        }
        pthread_mutex_lock(&Winthread.lock);
-        flag_interface_refresh();
+        flag_interface_change(1);
        pthread_mutex_unlock(&Winthread.lock);
        if (ch == user_settings->key_next_tab || ch == user_settings->key_prev_tab) {
@@ -848,7 +846,7 @@ void draw_active_window(Tox *m)
    }
    pthread_mutex_lock(&Winthread.lock);
-    flag_interface_refresh();
+    flag_interface_change(1);
    pthread_mutex_unlock(&Winthread.lock);
    if (printable == 0 && (ch == user_settings->key_next_tab || ch == user_settings->key_prev_tab)) {
@@ -926,30 +924,10 @@ int get_num_active_windows(void)
    return num_active_windows;
 }
 /* Returns the number of active windows of given type. */
 size_t get_num_active_windows_type(WINDOW_TYPE type)
 {
    size_t count = 0;
    for (size_t i = 0; i < MAX_WINDOWS_NUM; ++i) {
        ToxWindow *w = windows[i];
        if (w == NULL) {
            continue;
        }
        if (w->type == type) {
            ++count;
        }
    }
    return count;
 }
 /* destroys all chat and conference windows (should only be called on shutdown) */
 void kill_all_windows(Tox *m)
 {
-    for (size_t i = 2; i < MAX_WINDOWS_NUM; ++i) {
+    for (uint8_t i = 2; i < MAX_WINDOWS_NUM; ++i) {
        ToxWindow *w = windows[i];
        if (w == NULL) {
--- a/src/windows.h
+++ b/src/windows.h
@@ -98,24 +98,15 @@ typedef enum {
   Uncomment if necessary */
 /* #define URXVT_FIX */
 /*
 * Used to control access to global variables via a mutex, as well as to handle signals.
 * Any file, variable or data structure that is used by the UI/Window thread and any other thread
 * must be guarded by `lock`.
 *
 * There should only ever be one instance of this struct.
 */
 struct Winthread {
    pthread_t tid;
    pthread_mutex_t lock;
    volatile sig_atomic_t sig_exit_toxic;
    volatile sig_atomic_t flag_resize;
    volatile sig_atomic_t flag_refresh;
-    volatile sig_atomic_t last_refresh_flag;
+    volatile sig_atomic_t flag_refresh_timeout;
 };
 extern struct Winthread Winthread;
 struct cqueue_thread {
    pthread_t tid;
 };
@@ -149,8 +140,6 @@ struct arg_opts {
    uint16_t tcp_port;
 };
 extern struct arg_opts arg_opts;
 typedef struct ToxWindow ToxWindow;
 typedef struct StatusBar StatusBar;
 typedef struct PromptBuf PromptBuf;
@@ -237,8 +226,6 @@ struct ToxWindow {
    WINDOW *window_bar;
 };
 extern ToxWindow *windows[MAX_WINDOWS_NUM];
 /* statusbar info holder */
 struct StatusBar {
    WINDOW *topline;
@@ -322,9 +309,6 @@ ToxWindow *get_window_ptr(size_t i);
 ToxWindow *get_active_window(void);
 void draw_window_bar(ToxWindow *self);
 /* Returns the number of active windows of given type. */
 size_t get_num_active_windows_type(WINDOW_TYPE type);
 /* refresh inactive windows to prevent scrolling bugs.
   call at least once per second */
 void refresh_inactive_windows(void);