Bump to version 0.11.0

.cirrus.yml

@@ -1,12 +0,0 @@
----
-bazel-opt_task:
-  container:
-    image: toxchat/toktok-stack:latest-release
-    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
-        //toxic/...

.github/settings.yml

@@ -11,9 +11,7 @@ branches:
     protection:
       required_status_checks:
         contexts:
-          - build
+          - Codacy/PR Quality Review
-          - build-static
+          - CodeFactor
-          - bazel-opt
+          - Travis CI - Pull Request
-          - Codacy Static Code Analysis
           - code-review/reviewable
-          - infer

.github/workflows/ci.yml

@@ -1,125 +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
-            libmsgpack-dev
-            libnotify-dev
-            libopenal-dev
-            libopus-dev
-            libqrencode-dev
-            libsodium-dev
-            libvpx-dev
-            libx11-dev
-            python3-dev
-            pkg-config &&
-          git clone --depth=1 --recursive 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
-
-  build-static:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Build minimal static toxic binary
-        run: docker run --rm
-          -v /tmp/artifact:/artifact
-          -v $PWD:/toxic
-          amd64/alpine:latest
-          sh -c 'yes | /toxic/script/build-minimal-static-toxic.sh'
-      - name: Display binary checksum
-        run: |
-          tar Jxf /tmp/artifact/toxic-minimal-static-musl_linux_x86-64.tar.xz
-          sha256sum toxic-minimal-static-musl_linux_x86-64/toxic
-
-  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
-            libmsgpack-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 --recursive 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
-              msgpack
-              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

.gitignore

@@ -18,5 +18,3 @@ build/*.o
 build/*.d
 apidoc/python/build
 *.vim
-*.tox
-*.nvim*

.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)

BUILD.bazel

@@ -1,8 +1,6 @@
 load("@rules_cc//cc:defs.bzl", "cc_binary")
 load("//tools/project:build_defs.bzl", "project")
 
-package(features = ["layering_check"])
-
 project()
 
 cc_binary(
@@ -20,8 +18,6 @@ cc_binary(
     copts = [
         "-std=gnu99",
         "-DAUDIO",
-        "-DGAMES",
-        "-DHAVE_WIDECHAR",
         "-DPACKAGE_DATADIR='\"data\"'",
         "-DPYTHON",
         "-DQRCODE",
@@ -43,10 +39,3 @@ cc_binary(
         "//tools/config:osx": [],
     }),
 )
-
-sh_test(
-    name = "toxic_test",
-    size = "small",
-    srcs = [":toxic"],
-    args = ["--help"],
-)

CHANGELOG.md

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

INSTALL.md

@@ -10,7 +10,7 @@
 ## Dependencies
 | Name                                                 | Needed by                  | Debian package      |
 |------------------------------------------------------|----------------------------|---------------------|
-| [Tox Core](https://github.com/toktok/c-toxcore)      | BASE                       | libtoxcore-dev      |
+| [Tox Core](https://github.com/toktok/c-toxcore)      | BASE                       | *None*              |
 | [NCurses](https://www.gnu.org/software/ncurses)      | BASE                       | libncursesw5-dev    |
 | [LibConfig](http://www.hyperrealm.com/libconfig)     | BASE                       | libconfig-dev       |
 | [GNUmake](https://www.gnu.org/software/make)         | BASE                       | make                |
@@ -55,8 +55,8 @@ Run `make doc` in the build directory after editing the asciidoc files to regene
   * `DISABLE_X11=1` → Disable X11 support (needed for focus tracking)
   * `DISABLE_AV=1` → Disable audio call support
   * `DISABLE_SOUND_NOTIFY=1` → Disable sound notifications support
-  * `DISABLE_QRCODE=1` → Disable QR exporting support
+  * `DISABLE_QRCODE` → Disable QR exporting support
-  * `DISABLE_QRPNG=1` → Disable support for exporting QR as PNG
+  * `DISABLE_QRPNG` → Disable support for exporting QR as PNG
   * `DISABLE_DESKTOP_NOTIFY=1` → Disable desktop notifications support
   * `DISABLE_GAMES=1` → Disable support for games
   * `ENABLE_PYTHON=1` → Build toxic with Python scripting support

Makefile

@@ -12,9 +12,9 @@ CFLAGS += ${USER_CFLAGS}
 LDFLAGS ?=
 LDFLAGS += ${USER_LDFLAGS}
 
-OBJ = autocomplete.o avatars.o bootstrap.o chat.o chat_commands.o conference.o configdir.o curl_util.o execute.o
+OBJ = autocomplete.o avatars.o bootstrap.o chat.o chat_commands.o configdir.o curl_util.o execute.o
-OBJ += file_transfers.o friendlist.o global_commands.o conference_commands.o groupchats.o groupchat_commands.o help.o
+OBJ += file_transfers.o friendlist.o global_commands.o conference_commands.o conference.o help.o input.o line_info.o
-OBJ += input.o line_info.o log.o message_queue.o misc_tools.o name_lookup.o notify.o prompt.o qr_code.o settings.o
+OBJ += log.o message_queue.o misc_tools.o name_lookup.o notify.o prompt.o qr_code.o settings.o
 OBJ += term_mplex.o toxic.o toxic_strings.o windows.o
 
 # Check if debug build is enabled

apidoc/python/source/conf.py

@@ -55,9 +55,9 @@ author = 'Jakob Kreuze'
 # built documents.
 #
 # The short X.Y version.
-version = '0.12.0'
+version = '0.11.0'
 # The full version, including alpha/beta/rc tags.
-release = '0.12.0'
+release = '0.11.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -152,3 +152,6 @@ texinfo_documents = [
      author, 'toxic_api', 'One line description of project.',
      'Miscellaneous'),
 ]
+
+
+

cfg/checks/check_features.mk

@@ -19,8 +19,6 @@ ifneq ($(AUDIO), disabled)
 ifneq ($(VIDEO), disabled)
     -include $(CHECKS_DIR)/video.mk
 endif
-endif
-endif
 
 #check if we want to build with game support
 GAMES := $(shell if [ -z "$(DISABLE_GAMES)" ] || [ "$(DISABLE_GAMES)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
@@ -28,6 +26,9 @@ ifneq ($(GAMES), disabled)
     -include $(CHECKS_DIR)/games.mk
 endif
 
+endif
+endif
+
 # Check if we want build sound notifications support
 SND_NOTIFY := $(shell if [ -z "$(DISABLE_SOUND_NOTIFY)" ] || [ "$(DISABLE_SOUND_NOTIFY)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
 ifneq ($(SND_NOTIFY), disabled)

cfg/checks/games.mk

@@ -1,5 +1,5 @@
 # Variables for game support
 GAMES_CFLAGS = -DGAMES
-GAMES_OBJ = game_base.o game_centipede.o game_chess.o game_life.o game_util.o game_snake.o
+GAMES_OBJ = game_base.o game_centipede.o game_chess.o game_util.o game_snake.o
 CFLAGS += $(GAMES_CFLAGS)
 OBJ += $(GAMES_OBJ)

cfg/global_vars.mk

@@ -1,5 +1,5 @@
 # Version
-TOXIC_VERSION = 0.12.0
+TOXIC_VERSION = 0.11.0
 REV = $(shell git rev-list HEAD --count 2>/dev/null || echo -n "error")
 ifneq (, $(findstring error, $(REV)))
     VERSION = $(TOXIC_VERSION)

doc/toxic.1

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: toxic
 .\"    Author: [see the "AUTHORS" section]
-.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 2021-12-05
+.\"      Date: 2020-05-04
 .\"    Manual: Toxic Manual
 .\"    Source: toxic __VERSION__
 .\"  Language: English
 .\"
-.TH "TOXIC" "1" "2021\-12\-05" "toxic __VERSION__" "Toxic Manual"
+.TH "TOXIC" "1" "2020\-05\-04" "toxic __VERSION__" "Toxic Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -153,17 +153,17 @@ Configuration example\&.
 .sp
 \-Unicode characters with a width larger than 1 column may cause strange behaviour\&.
 .sp
+\-Text occasionally fails to auto\-scroll to the bottom\&.
+.sp
 \-Screen flickering sometimes occurs on certain terminals\&.
-.sp
-\-Resizing the terminal window when a game window is open will break things\&.
-.SH "LINKS"
-.sp
-Project page: https://github\&.com/JFreegman/toxic
-.sp
-Tox development group public key: 360497DA684BCE2A500C1AF9B3A5CE949BBB9F6FB1F91589806FB04CA039E313
 .SH "AUTHORS"
 .sp
 JFreegman <JFreegman@gmail\&.com>
 .SH "SEE ALSO"
 .sp
 \fBtoxic\&.conf\fR(5)
+.SH "LINKS"
+.sp
+Project page: https://github\&.com/JFreegman/toxic
+.sp
+IRC channel: chat\&.freenode\&.net#tox

doc/toxic.1.asc

@@ -89,16 +89,10 @@ BUGS
 -Unicode characters with a width larger than 1 column may cause strange
 behaviour.
 
+-Text occasionally fails to auto-scroll to the bottom.
+
 -Screen flickering sometimes occurs on certain terminals.
 
--Resizing the terminal window when a game window is open will break things.
-
-LINKS
------
-Project page: <https://github.com/JFreegman/toxic>
-
-Tox development group public key: 360497DA684BCE2A500C1AF9B3A5CE949BBB9F6FB1F91589806FB04CA039E313
-
 AUTHORS
 -------
 JFreegman <JFreegman@gmail.com>
@@ -106,3 +100,9 @@ JFreegman <JFreegman@gmail.com>
 SEE ALSO
 --------
 *toxic.conf*(5)
+
+LINKS
+-----
+Project page: <https://github.com/JFreegman/toxic>
+
+IRC channel: chat.freenode.net#tox

doc/toxic.conf.5

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: toxic.conf
 .\"    Author: [see the "AUTHORS" section]
-.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 2022-06-27
+.\"      Date: 2020-11-18
 .\"    Manual: Toxic Manual
 .\"    Source: toxic __VERSION__
 .\"  Language: English
 .\"
-.TH "TOXIC\&.CONF" "5" "2022\-06\-27" "toxic __VERSION__" "Toxic Manual"
+.TH "TOXIC\&.CONF" "5" "2020\-11\-18" "toxic __VERSION__" "Toxic Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -138,11 +138,6 @@ Show welcome message on startup\&. true or false
 Enable friend connection change notifications\&. true or false
 .RE
 .PP
-\fBshow_group_connection_msg\fR
-.RS 4
-Enable group connection change notifications (does not include quit messages)\&. true or false
-.RE
-.PP
 \fBnodelist_update_freq\fR
 .RS 4
 How often in days to update the DHT nodes list\&. (integer; 0 to disable)
@@ -191,11 +186,6 @@ Set user status when attaching and detaching from GNU screen or tmux\&. true or
 \fBmplex_away_note\fR
 .RS 4
 Status message to set when status is set to away due to screen/tmux detach\&. When attaching, the status message is set back to the original value\&.
-.RE
-.PP
-\fBgroup_part_message\fR
-.RS 4
-Parting message that will be sent to all groupchat peers when you leave the group\&.
 .sp
 .if n \{\
 .RS 4
@@ -417,14 +407,14 @@ __DATADIR__/toxic\&.conf\&.example
 .RS 4
 Configuration example\&.
 .RE
+.SH "SEE ALSO"
+.sp
+\fBtoxic\fR(1)
 .SH "RESOURCES"
 .sp
 Project page: https://github\&.com/JFreegman/toxic
 .sp
-Tox development group public key: 360497DA684BCE2A500C1AF9B3A5CE949BBB9F6FB1F91589806FB04CA039E313
+IRC channel: chat\&.freenode\&.net#tox
 .SH "AUTHORS"
 .sp
 JFreegman <JFreegman@gmail\&.com>
-.SH "SEE ALSO"
-.sp
-\fBtoxic\fR(1)

doc/toxic.conf.5.asc

@@ -87,9 +87,6 @@ OPTIONS
     *show_connection_msg*;;
         Enable friend connection change notifications. true or false
 
-    *show_group_connection_msg*;;
-        Enable group connection change notifications (does not include quit messages). true or false
-
     *nodelist_update_freq*;;
         How often in days to update the DHT nodes list. (integer; 0 to disable)
 
@@ -124,9 +121,6 @@ OPTIONS
         detach. When attaching, the status message is set back to the original
         value.
 
-    *group_part_message*;;
-	Parting message that will be sent to all groupchat peers when you leave the group.
-
     The following options control whether to output a terminal bell on certain events.
     Some terminals mark the window as urgent when a bell is received. Urgent windows are usually highlighted in the taskbar and some window managers even provide shortcuts to jump to the next urgent window.
     These options don't affect the "alerts" option.
@@ -263,19 +257,19 @@ FILES
 {datadir}/toxic.conf.example::
     Configuration example.
 
-RESOURCES
----------
-Project page: <https://github.com/JFreegman/toxic>
-
-Tox development group public key: 360497DA684BCE2A500C1AF9B3A5CE949BBB9F6FB1F91589806FB04CA039E313
-
-AUTHORS
--------
-JFreegman <JFreegman@gmail.com>
 
 SEE ALSO
 --------
 *toxic*(1)
 
 
+RESOURCES
+---------
+Project page: <https://github.com/JFreegman/toxic>
 
+IRC channel:  chat.freenode.net#tox
+
+
+AUTHORS
+-------
+JFreegman <JFreegman@gmail.com>

misc/nameservers

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

misc/toxic.conf.example

@@ -56,9 +56,6 @@ ui = {
   // true to show friend connection change messages on the home screen
   show_connection_msg=true;
 
-  // true to show peer connection change messages in groups (setting to false does not include user quit messages)
-  show_group_connection_msg=true;
-
   // How often in days to update the DHT nodes list. (0 to disable updates)
   nodeslist_update_freq=7;
 
@@ -83,17 +80,11 @@ ui = {
   // Indicator for normal messages.
   line_normal="-";
 
-  // Indicator for special messages.
-  line_special=">";
-
   // true to change status based on screen/tmux attach/detach, false to disable
   mplex_away=true;
 
   // Status message to use when status set to away due to screen/tmux detach
   mplex_away_note="Away from keyboard, be back soon!"
-
-  // Parting message that will be sent to all groupchat peers when you leave the group
-  group_part_message="Toxic user signing out"
 };
 
 audio = {

script/build-minimal-static-toxic.sh

@@ -2,7 +2,7 @@
 
 # MIT License
 #
-# Copyright (c) 2021-2022 Maxim Biro <nurupo.contributions@gmail.com>
+# Copyright (c) 2021 Maxim Biro <nurupo.contributions@gmail.com>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -36,19 +36,8 @@
 #
 # that would use Toxic code from /home/jfreegman/git/toxic and place the build
 # artifact at /tmp/artifact.
-#
+# You can change between amd64/alpine:latest and i386/alpine:latest, for 64-bit
-# You can change between:
+# and 32-bit builds.
-#   amd64/alpine:latest,
-#   i386/alpine:latest,
-#   arm64v8/alpine:latest,
-#   arm32v7/alpine:latest,
-#   arm32v6/alpine:latest,
-#   ppc64le/alpine:latest,
-#   s390x/alpine:latest,
-#   etc.
-# as long as your system can run foreign architecture binaries, e.g. via qemu
-# static bins and binfmt (install qemu-user-static package on Debian/Ubuntu).
-#
 #
 # To debug, run:
 #
@@ -64,6 +53,13 @@ set -eu
 ARTIFACT_DIR="/artifact"
 TOXIC_SRC_DIR="/toxic"
 
+# Make sure we run in the expected environment
+if ! grep -q 'docker' /proc/1/cgroup
+then
+  echo "Error: This script should be run inside a disposable Docker container as it might modify system files in ways that would break a real system."
+  exit 1
+fi
+
 if [ ! -f /etc/os-release ] || ! grep -qi 'Alpine Linux' /etc/os-release
 then
   echo "Error: This script expects to be run on Alpine Linux."
@@ -135,33 +131,17 @@ mkdir -p "$BUILD_DIR"
 # Build Toxcore
 cd "$BUILD_DIR"
 
-# The git hash of the c-toxcore version we're using
+TOXCORE_VERSION="0.2.12"
-TOXCORE_VERSION="172f279dc0647a538b30e62c96bab8bb1b0c8960"
+TOXCORE_HASH="30ae3263c9b68d3bef06f799ba9d7a67e3fad447030625f0ffa4bb22684228b0"
-
-# The sha256sum of the c-toxcore tarball for TOXCORE_VERSION
-TOXCORE_HASH="9884d4ad9b80917e22495c2ebe7a76c509fb98c61031824562883225e66684ae"
-
 TOXCORE_FILENAME="c-toxcore-$TOXCORE_VERSION.tar.gz"
 
-wget --timeout=10 -O "$TOXCORE_FILENAME" "https://github.com/TokTok/c-toxcore/archive/$TOXCORE_VERSION.tar.gz"
+wget --timeout=10 -O "$TOXCORE_FILENAME" "https://github.com/TokTok/c-toxcore/archive/v$TOXCORE_VERSION.tar.gz"
 check_sha256 "$TOXCORE_HASH" "$TOXCORE_FILENAME"
-
 tar -o -xf "$TOXCORE_FILENAME"
 rm "$TOXCORE_FILENAME"
-
 cd c-toxcore*
-mkdir -p "third_party" && cd "third_party"
-
-CMP_VERSION="074e0df43e8a61ea938c4f77f65d1fbccc0c3bf9"
-CMP_FILENAME="cmp-$CMP_VERSION.tar.gz"
-wget --timeout=10 -O "$CMP_FILENAME" "https://github.com/TokTok/cmp/archive/$CMP_VERSION.tar.gz"
-tar -o -xf "$CMP_FILENAME"
-
-mv cmp-*/* 'cmp/'
-cd ..
 
 cmake -B_build -H. \
-      -DUSE_TEST_NETWORK=OFF \
       -DENABLE_STATIC=ON \
       -DENABLE_SHARED=OFF \
       -DCMAKE_BUILD_TYPE=Release \
@@ -180,8 +160,8 @@ cmake --build _build --target install
 # location with SSL_CERT_FILE env variable.
 cd "$BUILD_DIR"
 
-CURL_VERSION="7.88.1"
+CURL_VERSION="7.74.0"
-CURL_HASH="cdb38b72e36bc5d33d5b8810f8018ece1baa29a8f215b4495e495ded82bbf3c7"
+CURL_HASH="e56b3921eeb7a2951959c02db0912b5fcd5fdba5aca071da819e1accf338bbd7"
 CURL_FILENAME="curl-$CURL_VERSION.tar.gz"
 
 wget --timeout=10 -O "$CURL_FILENAME" "https://curl.haxx.se/download/$CURL_FILENAME"
@@ -198,12 +178,10 @@ cd curl*
   --without-ca-path \
   --with-ca-fallback \
   --with-nghttp2 \
-  --with-brotli \
+  --with-brotli
-  --with-openssl
 make
 make install
-sed -i 's|-lbrotlidec |-lbrotlidec -lbrotlicommon |g' $BUILD_DIR/prefix-curl/lib/pkgconfig/libcurl.pc
+sed -i 's|-lbrotlidec |-lbrotlidec-static -lbrotlicommon-static |g' $BUILD_DIR/prefix-curl/lib/pkgconfig/libcurl.pc
-
 
 # Build Toxic
 cd "$BUILD_DIR"
@@ -236,7 +214,6 @@ CFLAGS="-static" PKG_CONFIG_PATH="$BUILD_DIR/prefix-toxcore/lib64/pkgconfig:$BUI
   ENABLE_PYTHON=0 \
   ENABLE_RELEASE=1 \
   ENABLE_ASAN=0 \
-  DISABLE_GAMES=0 \
   install
 
 

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);

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) {

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)

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);

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);
 

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)
@@ -79,6 +82,7 @@ extern struct user_settings *user_settings;
 /* Maximum allowable size of the nodes list */
 #define MAX_NODELIST_SIZE (MAX_RECV_CURL_DATA_SIZE)
 
+
 static struct Thread_Data {
     pthread_t tid;
     pthread_attr_t attr;
@@ -377,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, '"');
 
@@ -444,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;
     }
 

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);
@@ -69,18 +75,13 @@ static const char *chat_cmd_list[] = {
     "/add",
     "/avatar",
     "/cancel",
-    "/cinvite",
-    "/cjoin",
     "/clear",
     "/close",
     "/connect",
     "/exit",
-    "/gaccept",
     "/conference",
-    "/group",
 #ifdef GAMES
     "/game",
-    "/play",
 #endif
     "/help",
     "/invite",
@@ -93,6 +94,7 @@ static const char *chat_cmd_list[] = {
     "/nick",
     "/note",
     "/nospam",
+    "/play",
     "/quit",
     "/savefile",
     "/sendfile",
@@ -134,7 +136,7 @@ static void set_self_typingstatus(ToxWindow *self, Tox *m, bool is_typing)
 
     ChatContext *ctx = self->chatwin;
 
-    Tox_Err_Set_Typing err;
+    TOX_ERR_SET_TYPING err;
     tox_self_set_typing(m, self->num, is_typing, &err);
 
     if (err != TOX_ERR_SET_TYPING_OK) {
@@ -252,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);
@@ -680,10 +681,8 @@ static void chat_onFileRecv(ToxWindow *self, Tox *m, uint32_t friendnum, uint32_
     FILE *filecheck = NULL;
     int count = 1;
 
-    while ((filecheck = fopen(file_path, "r")) || file_transfer_recv_path_exists(file_path)) {
+    while ((filecheck = fopen(file_path, "r"))) {
-        if (filecheck) {
+        fclose(filecheck);
-            fclose(filecheck);
-        }
 
         file_path[path_len] = '\0';
         char d[5];
@@ -761,46 +760,8 @@ static void chat_onConferenceInvite(ToxWindow *self, Tox *m, int32_t friendnumbe
                    "invites you to join %s", description);
     }
 
-    line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "%s has invited you to a conference.", name);
+    line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "%s has invited you to %s.", name, description);
-    line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Type \"/cjoin\" to join the chat.");
+    line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Type \"/join\" to join the chat.");
-}
-
-static void chat_onGroupInvite(ToxWindow *self, Tox *m, uint32_t friendnumber, const char *invite_data, size_t length,
-                               const char *group_name, size_t group_name_length)
-{
-    UNUSED_VAR(group_name_length);
-
-    if (self->num != friendnumber) {
-        return;
-    }
-
-    if (Friends.list[friendnumber].group_invite.data) {
-        free(Friends.list[friendnumber].group_invite.data);
-    }
-
-    Friends.list[friendnumber].group_invite.data = malloc(length * sizeof(uint8_t));
-
-    if (Friends.list[friendnumber].group_invite.data == NULL) {
-        return;
-    }
-
-    memcpy(Friends.list[friendnumber].group_invite.data, invite_data, length);
-    Friends.list[friendnumber].group_invite.length = length;
-
-    sound_notify(self, generic_message, NT_WNDALERT_2 | user_settings->bell_on_invite, NULL);
-
-    char name[TOX_MAX_NAME_LENGTH];
-    get_nick_truncate(m, name, friendnumber);
-
-    if (self->active_box != -1) {
-        box_silent_notify2(self, NT_WNDALERT_2 | NT_NOFOCUS, self->active_box, "invites you to join group chat");
-    } else {
-        box_silent_notify(self, NT_WNDALERT_2 | NT_NOFOCUS, &self->active_box, name, "invites you to join group chat");
-    }
-
-    line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "%s has invited you to join group chat \"%s\"", name, group_name);
-    line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0,
-                  "Type \"/gaccept <password>\" to join the chat (password is optional).");
 }
 
 #ifdef GAMES
@@ -810,7 +771,7 @@ void chat_onGameInvite(ToxWindow *self, Tox *m, uint32_t friend_number, const ui
         return;
     }
 
-    if (length < GAME_PACKET_HEADER_SIZE || length > GAME_MAX_DATA_SIZE) {
+    if (length < GAME_PACKET_HEADER_SIZE) {
         return;
     }
 
@@ -837,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);
@@ -852,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);
 
@@ -1073,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");
 }
@@ -1111,12 +1072,13 @@ static void draw_infobox(ToxWindow *self)
 
     time_t curtime = get_unix_time();
 
-    /* update interface once per second */
+    /* update elapsed time string once per second */
-    if (timed_out(infobox->lastupdate, 1)) {
+    if (curtime > infobox->lastupdate) {
         get_elapsed_time_str(infobox->timestr, sizeof(infobox->timestr), curtime - infobox->starttime);
-        infobox->lastupdate = curtime;
     }
 
+    infobox->lastupdate = curtime;
+
     const char *in_is_muted = infobox->in_is_muted ? "yes" : "no";
     const char *out_is_muted = infobox->out_is_muted ? "yes" : "no";
 
@@ -1309,16 +1271,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);
@@ -1329,127 +1284,108 @@ 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) {
         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", ONLINE_CHAR);
         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, "%s", OFFLINE_CHAR);
+        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;
 
     /* Truncate note if it doesn't fit in statusbar */
-    size_t maxlen = x2 - getcurx(statusbar->topline) - KEY_IDENT_BYTES - 6;
+    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));
     }
@@ -1458,10 +1394,10 @@ static void chat_onDraw(ToxWindow *self, Tox *m)
     int s_x;
     getyx(statusbar->topline, s_y, s_x);
 
-    mvwhline(statusbar->topline, s_y, s_x, ' ', x2 - s_x - KEY_IDENT_BYTES  - 3);
+    mvwhline(statusbar->topline, s_y, s_x, ' ', x2 - s_x - (KEY_IDENT_DIGITS * 2) - 3);
     wattroff(statusbar->topline, COLOR_PAIR(BAR_TEXT));
 
-    wmove(statusbar->topline, 0, x2 - KEY_IDENT_BYTES  - 3);
+    wmove(statusbar->topline, 0, x2 - (KEY_IDENT_DIGITS * 2) - 3);
 
     wattron(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
     wprintw(statusbar->topline, "{");
@@ -1469,7 +1405,7 @@ static void chat_onDraw(ToxWindow *self, Tox *m)
 
     wattron(statusbar->topline, COLOR_PAIR(BAR_TEXT));
 
-    for (size_t i = 0; i < KEY_IDENT_BYTES / 2; ++i) {
+    for (size_t i = 0; i < KEY_IDENT_DIGITS; ++i) {
         wprintw(statusbar->topline, "%02X", Friends.list[self->num].pub_key[i] & 0xff);
     }
 
@@ -1505,11 +1441,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);
 }
 
@@ -1552,7 +1484,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);
 
@@ -1623,7 +1554,6 @@ ToxWindow *new_chat(Tox *m, uint32_t friendnum)
     ret->onFileControl = &chat_onFileControl;
     ret->onFileRecv = &chat_onFileRecv;
     ret->onReadReceipt = &chat_onReadReceipt;
-    ret->onGroupInvite = &chat_onGroupInvite;
 
 #ifdef AUDIO
     ret->onInvite = &chat_onInvite;

src/chat_commands.c

@@ -29,7 +29,6 @@
 #include "file_transfers.h"
 #include "friendlist.h"
 #include "line_info.h"
-#include "groupchats.h"
 #include "misc_tools.h"
 #include "toxic.h"
 #include "windows.h"
@@ -55,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) {
@@ -179,77 +172,6 @@ void cmd_conference_join(WINDOW *window, ToxWindow *self, Tox *m, int argc, char
 #endif
 }
 
-void cmd_group_accept(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
-{
-    if (get_num_active_windows() >= MAX_WINDOWS_NUM) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, RED, " * Warning: Too many windows are open.");
-        return;
-    }
-
-    if (Friends.list[self->num].group_invite.length == 0) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "No pending group invite");
-        return;
-    }
-
-    const char *passwd = NULL;
-    uint16_t passwd_len = 0;
-
-    if (argc > 0) {
-        passwd = argv[1];
-        passwd_len = strlen(passwd);
-    }
-
-    size_t nick_len = tox_self_get_name_size(m);
-    char self_nick[TOX_MAX_NAME_LENGTH + 1];
-    tox_self_get_name(m, (uint8_t *) self_nick);
-    self_nick[nick_len] = '\0';
-
-    Tox_Err_Group_Invite_Accept err;
-    uint32_t groupnumber = tox_group_invite_accept(m, self->num, Friends.list[self->num].group_invite.data,
-                           Friends.list[self->num].group_invite.length, (const uint8_t *) self_nick, nick_len,
-                           (const uint8_t *) passwd, passwd_len, &err);
-
-    if (err != TOX_ERR_GROUP_INVITE_ACCEPT_OK) {
-        if (err == TOX_ERR_GROUP_INVITE_ACCEPT_TOO_LONG) {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to join group: Password too long.");
-        } else {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to join group (error %d).", err);
-        }
-
-        return;
-    }
-
-    if (init_groupchat_win(m, groupnumber, NULL, 0, Group_Join_Type_Join) == -1) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Group chat window failed to initialize.");
-        tox_group_leave(m, groupnumber, NULL, 0, NULL);
-        return;
-    }
-}
-
-void cmd_group_invite(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
-{
-    if (argc < 1) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Group number required.");
-        return;
-    }
-
-    int groupnumber = atoi(argv[1]);
-
-    if (groupnumber == 0 && strcmp(argv[1], "0")) {    /* atoi returns 0 value on invalid input */
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invalid group number.");
-        return;
-    }
-
-    Tox_Err_Group_Invite_Friend err;
-
-    if (!tox_group_invite_friend(m, groupnumber, self->num, &err)) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to invite contact to group (error %d).", err);
-        return;
-    }
-
-    line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invited contact to Group %d.", groupnumber);
-}
-
 #ifdef GAMES
 
 void cmd_game_join(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
@@ -257,6 +179,12 @@ void cmd_game_join(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*arg
     UNUSED_VAR(window);
     UNUSED_VAR(m);
 
+    bool force_small = false;
+
+    if (argc >= 2) {
+        force_small = strcasecmp(argv[2], "small") == 0;
+    }
+
     if (!Friends.list[self->num].game_invite.pending) {
         line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "No pending game invite.");
         return;
@@ -272,7 +200,7 @@ void cmd_game_join(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*arg
     uint8_t *data = Friends.list[self->num].game_invite.data;
     size_t length = Friends.list[self->num].game_invite.data_length;
 
-    int ret = game_initialize(self, m, type, id, data, length);
+    int ret = game_initialize(self, m, type, id, data, length, force_small);
 
     switch (ret) {
         case 0: {
@@ -317,7 +245,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.");
@@ -402,7 +330,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;
     }
 
@@ -425,7 +353,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;
@@ -445,62 +373,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);
 }

src/chat_commands.h

@@ -29,8 +29,6 @@
 void cmd_cancelfile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_conference_invite(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_conference_join(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_group_accept(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_group_invite(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_game_join(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_savefile(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_sendfile(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);

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
 
@@ -85,13 +87,11 @@ static const char *conference_cmd_list[] = {
     "/connect",
     "/decline",
     "/exit",
-    "/group",
     "/conference",
-#ifdef GAMES
+#ifdef GAME
     "/game",
 #endif
     "/help",
-    "/join",
     "/log",
 #ifdef AUDIO
     "/mute",
@@ -510,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;
         }
@@ -1311,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);
 
@@ -1333,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) {
@@ -1341,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];
 
@@ -1363,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)

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

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 {

src/conference_commands.h

@@ -1,7 +1,7 @@
 /*  conference_commands.h
  *
  *
- *  Copyright (C) 2020 Toxic All Rights Reserved.
+ *  Copyright (C) 2014 Toxic All Rights Reserved.
  *
  *  This file is part of Toxic.
  *
@@ -33,4 +33,3 @@ void cmd_conference_sense(WINDOW *window, ToxWindow *self, Tox *m, int argc, cha
 void cmd_conference_push_to_talk(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
 
 #endif /* CONFERENCE_COMMANDS_H */
-

src/execute.c

@@ -29,7 +29,6 @@
 #include "execute.h"
 #include "global_commands.h"
 #include "conference_commands.h"
-#include "groupchat_commands.h"
 #include "line_info.h"
 #include "misc_tools.h"
 #include "notify.h"
@@ -50,12 +49,10 @@ static struct cmd_func global_commands[] = {
     { "/decline",   cmd_decline       },
     { "/exit",      cmd_quit          },
     { "/conference", cmd_conference    },
-    { "/group",     cmd_groupchat     },
 #ifdef GAMES
     { "/game",      cmd_game          },
 #endif
     { "/help",      cmd_prompt_help   },
-    { "/join",      cmd_join          },
     { "/log",       cmd_log           },
     { "/myid",      cmd_myid          },
 #ifdef QRCODE
@@ -84,10 +81,8 @@ static struct cmd_func global_commands[] = {
 
 static struct cmd_func chat_commands[] = {
     { "/cancel",    cmd_cancelfile        },
-    { "/cinvite",   cmd_conference_invite },
+    { "/invite",    cmd_conference_invite },
-    { "/cjoin",     cmd_conference_join   },
+    { "/join",      cmd_conference_join   },
-    { "/gaccept",   cmd_group_accept      },
-    { "/invite",    cmd_group_invite      },
 #ifdef GAMES
     { "/play",      cmd_game_join         },
 #endif
@@ -122,54 +117,24 @@ static struct cmd_func conference_commands[] = {
     { NULL,         NULL             },
 };
 
-static struct cmd_func groupchat_commands[] = {
+
-    { "/chatid",    cmd_chatid         },
+#ifdef PYTHON
-    { "/disconnect", cmd_disconnect     },
+#define SPECIAL_COMMANDS 7
-    { "/ignore",    cmd_ignore         },
+#else
-    { "/kick",      cmd_kick           },
+#define SPECIAL_COMMANDS 6
-    { "/list",      cmd_list           },
+#endif /* PYTHON */
-    { "/locktopic", cmd_set_topic_lock },
-    { "/mod",       cmd_mod            },
-    { "/nick",      cmd_group_nick     },
-    { "/passwd",    cmd_set_passwd     },
-    { "/peerlimit", cmd_set_peerlimit  },
-    { "/privacy",   cmd_set_privacy    },
-    { "/rejoin",    cmd_rejoin         },
-    { "/silence",   cmd_silence        },
-    { "/topic",     cmd_set_topic      },
-    { "/unignore",  cmd_unignore       },
-    { "/unmod",     cmd_unmod          },
-    { "/unsilence", cmd_unsilence      },
-    { "/voice",     cmd_set_voice      },
-    { "/whois",     cmd_whois          },
-    { NULL,         NULL               },
-};
 
 /* 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",
-    "/gaccept",
-    "/group",
-    "/ignore",
-    "/kick",
-    "/mod",
     "/nick",
     "/note",
-    "/passwd",
-    "/silence",
-    "/topic",
-    "/unignore",
-    "/unmod",
-    "/unsilence",
-    "/whois",
 #ifdef PYTHON
     "/run",
 #endif /* PYTHON */
     "/sendfile",
     "/title",
     "/mute",
-    "",
 };
 
 /* Returns true if input command is in the special_commands array. */
@@ -177,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;
         }
@@ -254,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;
@@ -283,29 +250,19 @@ void execute(WINDOW *w, ToxWindow *self, Tox *m, const char *input, int mode)
      * Note: Global commands must come last in case of duplicate command names
      */
     switch (mode) {
-        case CHAT_COMMAND_MODE: {
+        case CHAT_COMMAND_MODE:
             if (do_command(w, self, m, num_args, chat_commands, args) == 0) {
                 return;
             }
 
             break;
-        }
 
-        case CONFERENCE_COMMAND_MODE: {
+        case CONFERENCE_COMMAND_MODE:
             if (do_command(w, self, m, num_args, conference_commands, args) == 0) {
                 return;
             }
 
             break;
-        }
-
-        case GROUPCHAT_COMMAND_MODE: {
-            if (do_command(w, self, m, num_args, groupchat_commands, args) == 0) {
-                return;
-            }
-
-            break;
-        }
     }
 
     if (do_command(w, self, m, num_args, global_commands, args) == 0) {

src/execute.h

@@ -32,7 +32,6 @@ enum {
     GLOBAL_COMMAND_MODE,
     CHAT_COMMAND_MODE,
     CONFERENCE_COMMAND_MODE,
-    GROUPCHAT_COMMAND_MODE,
 };
 
 void execute(WINDOW *w, ToxWindow *self, Tox *m, const char *input, int mode);

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"
@@ -45,8 +44,9 @@ extern FriendsList Friends;
 void init_progress_bar(char *progline)
 {
     strcpy(progline, "0% [");
+    int i;
 
-    for (size_t i = 0; i < NUM_PROG_MARKS; ++i) {
+    for (i = 0; i < NUM_PROG_MARKS; ++i) {
         strcat(progline, "-");
     }
 
@@ -98,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;
@@ -117,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
     };
 }
@@ -150,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;
@@ -172,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) {
@@ -180,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;
@@ -195,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);
@@ -218,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);
@@ -242,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);
@@ -256,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) {
@@ -348,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) {
@@ -372,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);
@@ -386,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);
     }
 }
 
@@ -396,26 +307,3 @@ void kill_all_file_transfers(Tox *m)
         kill_all_file_transfers_friend(m, Friends.list[i].num);
     }
 }
-
-bool file_transfer_recv_path_exists(const char *path)
-{
-    for (size_t friendnumber = 0; friendnumber < Friends.max_idx; ++friendnumber) {
-        if (!Friends.list[friendnumber].active) {
-            continue;
-        }
-
-        for (size_t i = 0; i < MAX_FILES; ++i) {
-            FileTransfer *ft = &Friends.list[friendnumber].file_receiver[i];
-
-            if (ft->state == FILE_TRANSFER_INACTIVE) {
-                continue;
-            }
-
-            if (strcmp(path, ft->file_path) == 0) {
-                return true;
-            }
-        }
-    }
-
-    return false;
-}

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.
@@ -145,7 +109,4 @@ void kill_all_file_transfers_friend(Tox *m, uint32_t friendnumber);
 
 void kill_all_file_transfers(Tox *m);
 
-/* Return true if any pending or active file receiver has the path `path`. */
-bool file_transfer_recv_path_exists(const char *path);
-
 #endif /* FILE_TRANSFERS_H */

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;
@@ -116,10 +122,6 @@ void kill_friendlist(ToxWindow *self)
             free(Friends.list[i].game_invite.data);
 #endif
         }
-
-        if (Friends.list[i].group_invite.data != NULL) {
-            free(Friends.list[i].group_invite.data);
-        }
     }
 
     realloc_blocklist(0);
@@ -319,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;
 }
@@ -347,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)
@@ -678,35 +680,6 @@ static void friendlist_onConferenceInvite(ToxWindow *self, Tox *m, int32_t num,
     sound_notify(prompt, notif_error, NT_WNDALERT_1, NULL);
 }
 
-static void friendlist_onGroupInvite(ToxWindow *self, Tox *m, uint32_t num, const char *data, size_t length,
-                                     const char *group_name, size_t group_name_length)
-{
-    UNUSED_VAR(self);
-    UNUSED_VAR(data);
-    UNUSED_VAR(length);
-
-    if (num >= Friends.max_idx) {
-        return;
-    }
-
-    if (Friends.list[num].chatwin != -1) {
-        return;
-    }
-
-    if (get_num_active_windows() < MAX_WINDOWS_NUM) {
-        Friends.list[num].chatwin = add_window(m, new_chat(m, Friends.list[num].num));
-        return;
-    }
-
-    char nick[TOX_MAX_NAME_LENGTH];
-    get_nick_truncate(m, nick, num);
-
-    line_info_add(prompt, NULL, NULL, NULL, SYS_MSG, 0, RED,
-                  "* Group chat invite from %s failed: too many windows are open.", nick);
-
-    sound_notify(prompt, notif_error, NT_WNDALERT_1, NULL);
-}
-
 /* move friendlist/blocklist cursor up and down */
 static void select_friend(wint_t key, int *selected, int num)
 {
@@ -725,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) {
@@ -876,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;
         }
@@ -1141,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;
@@ -1431,7 +1403,6 @@ ToxWindow *new_friendlist(void)
     ret->onStatusMessageChange = &friendlist_onStatusMessageChange;
     ret->onFileRecv = &friendlist_onFileRecv;
     ret->onConferenceInvite = &friendlist_onConferenceInvite;
-    ret->onGroupInvite = &friendlist_onGroupInvite;
 
 #ifdef AUDIO
     ret->onInvite = &friendlist_onAV;

src/friendlist.h

@@ -46,11 +46,6 @@ struct ConferenceInvite {
     bool pending;
 };
 
-struct GroupInvite {
-    uint8_t *data;
-    uint16_t length;
-};
-
 #ifdef GAMES
 
 struct GameInvite {
@@ -78,17 +73,14 @@ typedef struct {
     Tox_User_Status status;
 
     struct LastOnline last_online;
+    struct ConferenceInvite conference_invite;
 
 #ifdef GAMES
     struct GameInvite game_invite;
 #endif
 
-    struct ConferenceInvite conference_invite;
-    struct GroupInvite group_invite;
-
     struct FileTransfer file_receiver[MAX_FILES];
     struct FileTransfer file_sender[MAX_FILES];
-    PendingFileTransfer file_send_queue[MAX_FILES];
 } ToxicFriend;
 
 typedef struct {
@@ -109,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);

src/game_base.c

@@ -29,16 +29,12 @@
 #include "game_centipede.h"
 #include "game_base.h"
 #include "game_chess.h"
-#include "game_life.h"
 #include "game_snake.h"
 #include "line_info.h"
 #include "misc_tools.h"
-#include "notify.h"
-#include "settings.h"
 #include "windows.h"
 
 extern struct Winthread Winthread;
-extern struct user_settings *user_settings;
 
 /*
  * Determines the base rate at which game objects should update their state.
@@ -55,20 +51,20 @@ extern struct user_settings *user_settings;
 
 
 /* Determines if window is large enough for a respective window type */
-#define WINDOW_SIZE_SQUARE_VALID(max_x, max_y)((((max_y) - 4) >= (GAME_MAX_SQUARE_Y_DEFAULT))\
+#define WINDOW_SIZE_LARGE_SQUARE_VALID(max_x, max_y)((((max_y) - 4) >= (GAME_MAX_SQUARE_Y))\
-                                             && ((max_x) >= (GAME_MAX_SQUARE_X_DEFAULT)))
+                                                  && ((max_x) >= (GAME_MAX_SQUARE_X)))
 
-#define WINDOW_SIZE_LARGE_SQUARE_VALID(max_x, max_y)((((max_y) - 4) >= (GAME_MAX_SQUARE_Y_LARGE))\
+#define WINDOW_SIZE_SMALL_SQUARE_VALID(max_x, max_y)((((max_y) - 4) >= (GAME_MAX_SQUARE_Y_SMALL))\
-                                                   && ((max_x) >= (GAME_MAX_SQUARE_X_LARGE)))
+                                                  && ((max_x) >= (GAME_MAX_SQUARE_X_SMALL)))
 
-#define WINDOW_SIZE_RECT_VALID(max_x, max_y)((((max_y) - 4) >= (GAME_MAX_RECT_Y_DEFAULT))\
+#define WINDOW_SIZE_LARGE_RECT_VALID(max_x, max_y)((((max_y) - 4) >= (GAME_MAX_RECT_Y))\
-                                           && ((max_x) >= (GAME_MAX_RECT_X_DEFAULT)))
+                                                  && ((max_x) >= (GAME_MAX_RECT_X)))
 
-#define WINDOW_SIZE_LARGE_RECT_VALID(max_x, max_y)((((max_y) - 4) >= (GAME_MAX_RECT_Y_LARGE))\
+#define WINDOW_SIZE_SMALL_RECT_VALID(max_x, max_y)((((max_y) - 4) >= (GAME_MAX_RECT_Y_SMALL))\
-                                                 && ((max_x) >= (GAME_MAX_RECT_X_LARGE)))
+                                                  && ((max_x) >= (GAME_MAX_RECT_X_SMALL)))
 
 
-static ToxWindow *game_new_window(Tox *m, GameType type, uint32_t friendnumber);
+static ToxWindow *game_new_window(GameType type, uint32_t friendnumber);
 
 struct GameList {
     const char *name;
@@ -78,7 +74,6 @@ struct GameList {
 static struct GameList game_list[] = {
     { "centipede", GT_Centipede  },
     { "chess",     GT_Chess      },
-    { "life",      GT_Life       },
     { "snake",     GT_Snake      },
     {  NULL,       GT_Invalid    },
 };
@@ -128,28 +123,6 @@ bool game_type_is_multiplayer(GameType type)
     return type == GT_Chess;
 }
 
-/*
- * Sends a notification to the window associated with `game`.
- *
- * `message` - the notification message that will be displayed.
- */
-void game_window_notify(const GameData *game, const char *message)
-{
-    ToxWindow *self = get_window_ptr(game->window_id);
-
-    if (self == NULL) {
-        return;
-    }
-
-    if (self->active_box != -1) {
-        box_notify2(self, generic_message, NT_WNDALERT_0 | NT_NOFOCUS | user_settings->bell_on_message,
-                    self->active_box, "%s", message);
-    } else {
-        box_notify(self, generic_message, NT_WNDALERT_0 | NT_NOFOCUS | user_settings->bell_on_message,
-                   &self->active_box, self->name, "%s", message);
-    }
-}
-
 /* Returns the current wall time in milliseconds */
 TIME_MS get_time_millis(void)
 {
@@ -162,22 +135,14 @@ void game_kill(ToxWindow *self)
 {
     GameData *game = self->game;
 
-    if (game) {
+    if (game->cb_game_kill) {
-        if (game->cb_game_kill) {
+        game->cb_game_kill(game, game->cb_game_kill_data);
-            game->cb_game_kill(game, game->cb_game_kill_data);
-        }
-
-        delwin(game->window);
-        free(game->messages);
-        free(game);
     }
 
-    kill_notifs(self->active_box);
+    delwin(game->window);
+    free(game->messages);
+    free(game);
     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)
@@ -223,11 +188,6 @@ static int game_initialize_type(GameData *game, const uint8_t *data, size_t leng
             break;
         }
 
-        case GT_Life: {
-            ret = life_initialize(game);
-            break;
-        }
-
         default: {
             break;
         }
@@ -237,7 +197,7 @@ static int game_initialize_type(GameData *game, const uint8_t *data, size_t leng
 }
 
 int game_initialize(const ToxWindow *parent, Tox *m, GameType type, uint32_t id, const uint8_t *multiplayer_data,
-                    size_t length)
+                    size_t length, bool force_small_window)
 {
     int max_x;
     int max_y;
@@ -245,7 +205,23 @@ int game_initialize(const ToxWindow *parent, Tox *m, GameType type, uint32_t id,
 
     max_y -= (CHATBOX_HEIGHT + WINDOW_BAR_HEIGHT);
 
-    ToxWindow *self = game_new_window(m, type, parent->num);
+    int max_game_window_x = GAME_MAX_SQUARE_X;
+    int max_game_window_y = GAME_MAX_SQUARE_Y;
+
+    if (!force_small_window && !WINDOW_SIZE_LARGE_SQUARE_VALID(max_x, max_y)) {
+        return -1;
+    }
+
+    if (force_small_window) {
+        max_game_window_x = GAME_MAX_SQUARE_X_SMALL;
+        max_game_window_y = GAME_MAX_SQUARE_Y_SMALL;
+
+        if (!WINDOW_SIZE_SMALL_SQUARE_VALID(max_x, max_y)) {
+            return -1;
+        }
+    }
+
+    ToxWindow *self = game_new_window(type, parent->num);
 
     if (self == NULL) {
         return -4;
@@ -279,6 +255,8 @@ int game_initialize(const ToxWindow *parent, Tox *m, GameType type, uint32_t id,
 
     game->tox = m;
     game->window_shape = GW_ShapeSquare;
+    game->game_max_x = max_game_window_x;
+    game->game_max_y = max_game_window_y;
     game->parent_max_x = max_x;
     game->parent_max_y = max_y;
     game->update_interval = GAME_DEFAULT_UPDATE_INTERVAL;
@@ -304,8 +282,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;
 }
 
@@ -319,53 +295,28 @@ int game_set_window_shape(GameData *game, GameWindowShape shape)
         return -2;
     }
 
+    if (shape == game->window_shape) {
+        return 0;
+    }
+
+    if (shape == GW_ShapeSquare) {
+        game->game_max_x = GAME_MAX_SQUARE_X;
+        return 0;
+    }
+
     const int max_x = game->parent_max_x;
     const int max_y = game->parent_max_y;
 
-    switch (shape) {
+    if (WINDOW_SIZE_LARGE_RECT_VALID(max_x, max_y)) {
-        case GW_ShapeSquare: {
+        game->game_max_x = GAME_MAX_RECT_X;
-            if (WINDOW_SIZE_SQUARE_VALID(max_x, max_y)) {
+        game->game_max_y = GAME_MAX_RECT_Y;
-                game->game_max_x = GAME_MAX_SQUARE_X_DEFAULT;
+        return 0;
-                game->game_max_y = GAME_MAX_SQUARE_Y_DEFAULT;
+    }
-                return 0;
-            }
 
-            break;
+    if (WINDOW_SIZE_SMALL_RECT_VALID(max_x, max_y)) {
-        }
+        game->game_max_x = GAME_MAX_RECT_X_SMALL;
-
+        game->game_max_y = GAME_MAX_RECT_Y_SMALL;
-        case GW_ShapeSquareLarge: {
+        return 0;
-            if (WINDOW_SIZE_LARGE_SQUARE_VALID(max_x, max_y)) {
-                game->game_max_x = GAME_MAX_SQUARE_X_LARGE;
-                game->game_max_y = GAME_MAX_SQUARE_Y_LARGE;
-                return 0;
-            }
-
-            break;
-        }
-
-        case GW_ShapeRectangle: {
-            if (WINDOW_SIZE_RECT_VALID(max_x, max_y)) {
-                game->game_max_x = GAME_MAX_RECT_X_DEFAULT;
-                game->game_max_y = GAME_MAX_RECT_Y_DEFAULT;
-                return 0;
-            }
-
-            break;
-        }
-
-        case GW_ShapeRectangleLarge: {
-            if (WINDOW_SIZE_LARGE_RECT_VALID(max_x, max_y)) {
-                game->game_max_x = GAME_MAX_RECT_X_LARGE;
-                game->game_max_y = GAME_MAX_RECT_Y_LARGE;
-                return 0;
-            }
-
-            break;
-        }
-
-        default: {
-            return -1;
-        }
     }
 
     return -1;
@@ -517,10 +468,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) {
@@ -546,20 +497,20 @@ static void game_draw_border(const GameData *game, const int max_x, const int ma
     const int x = (max_x - game_max_x) / 2;
     const int y = (max_y - game_max_y) / 2;
 
-    wattron(win, COLOR_PAIR(GAME_BORDER_COLOUR));
+    wattron(win, A_BOLD | COLOR_PAIR(GAME_BORDER_COLOUR));
 
-    mvwaddch(win, y, x, ACS_ULCORNER);
+    mvwaddch(win, y, x, ' ');
-    mvwhline(win, y, x + 1, ACS_HLINE, game_max_x - 1);
+    mvwhline(win, y, x + 1, ' ', game_max_x - 1);
-    mvwvline(win, y + 1, x, ACS_VLINE, game_max_y - 1);
+    mvwvline(win, y + 1, x, ' ', game_max_y - 1);
-    mvwvline(win, y, x - 1, ACS_VLINE, game_max_y + 1);
+    mvwvline(win, y, x - 1, ' ', game_max_y + 1);
-    mvwaddch(win, y, x + game_max_x, ACS_URCORNER);
+    mvwaddch(win, y, x + game_max_x, ' ');
-    mvwvline(win, y + 1, x + game_max_x, ACS_VLINE, game_max_y - 1);
+    mvwvline(win, y + 1, x + game_max_x, ' ', game_max_y - 1);
-    mvwvline(win, y, x + game_max_x + 1, ACS_VLINE, game_max_y + 1);
+    mvwvline(win, y, x + game_max_x + 1, ' ', game_max_y + 1);
-    mvwaddch(win, y + game_max_y, x, ACS_LLCORNER);
+    mvwaddch(win, y + game_max_y, x, ' ');
-    mvwhline(win, y + game_max_y, x + 1, ACS_HLINE, game_max_x - 1);
+    mvwhline(win, y + game_max_y, x + 1, ' ', game_max_x - 1);
-    mvwaddch(win, y + game_max_y, x + game_max_x, ACS_LRCORNER);
+    mvwaddch(win, y + game_max_y, x + game_max_x, ' ');
 
-    wattroff(win, COLOR_PAIR(GAME_BORDER_COLOUR));
+    wattroff(win, A_BOLD | COLOR_PAIR(GAME_BORDER_COLOUR));
 }
 
 static void game_draw_status(const GameData *game, const int max_x, const int max_y)
@@ -567,7 +518,7 @@ static void game_draw_status(const GameData *game, const int max_x, const int ma
     WINDOW *win = game->window;
 
     int x = ((max_x - game->game_max_x) / 2) - 1;
-    const int y = ((max_y - game->game_max_y) / 2) - 1;
+    int y = ((max_y - game->game_max_y) / 2) - 1;
 
     wattron(win, A_BOLD);
 
@@ -756,7 +707,7 @@ bool game_onKey(ToxWindow *self, Tox *m, wint_t key, bool is_printable)
         return true;
     }
 
-    if (key == KEY_F(2) && !game->is_multiplayer) {
+    if (!game->is_multiplayer && key == KEY_F(2)) {
         game_toggle_pause(self->game);
         return true;
     }
@@ -800,10 +751,9 @@ void game_onInit(ToxWindow *self, Tox *m)
 }
 
 /*
- * Byte 0:   Version
+ * Byte 0:   Game type
- * Byte 1:   Game type
+ * Byte 1-4: Game ID
- * Byte 2-5: Game ID
+ * Byte 5-*  Game data
- * Byte 6-*  Game data
  */
 void game_onPacket(ToxWindow *self, Tox *m, uint32_t friendnumber, const uint8_t *data, size_t length)
 {
@@ -824,8 +774,6 @@ void game_onPacket(ToxWindow *self, Tox *m, uint32_t friendnumber, const uint8_t
     }
 
     if (data[0] != GAME_NETWORKING_VERSION) {
-        fprintf(stderr, "Game packet rejected: wrong networking version (got %d, expected %d)\n", data[0],
-                GAME_NETWORKING_VERSION);
         return;
     }
 
@@ -850,7 +798,7 @@ void game_onPacket(ToxWindow *self, Tox *m, uint32_t friendnumber, const uint8_t
     }
 }
 
-static ToxWindow *game_new_window(Tox *m, GameType type, uint32_t friendnumber)
+static ToxWindow *game_new_window(GameType type, uint32_t friendnumber)
 {
     const char *window_name = game_get_name_string(type);
 
@@ -879,16 +827,7 @@ static ToxWindow *game_new_window(Tox *m, GameType type, uint32_t friendnumber)
         return NULL;
     }
 
-    ret->active_box = -1;
+    snprintf(ret->name, sizeof(ret->name), "%s", window_name);
-
-    if (game_type_is_multiplayer(type)) {
-        char nick[TOX_MAX_NAME_LENGTH];
-        get_nick_truncate(m, nick, friendnumber);
-
-        snprintf(ret->name, sizeof(ret->name), "%s (%s)", window_name, nick);
-    } else {
-        snprintf(ret->name, sizeof(ret->name), "%s", window_name);
-    }
 
     return ret;
 }
@@ -937,10 +876,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 +887,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 +898,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 +909,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;
 }
 
@@ -1006,11 +945,6 @@ void game_update_score(GameData *game, long int points)
     }
 }
 
-void game_set_score(GameData *game, long int val)
-{
-    game->score = val;
-}
-
 long int game_get_score(const GameData *game)
 {
     return game->score;
@@ -1093,7 +1027,7 @@ void game_set_cb_on_packet(GameData *game, cb_game_on_packet *func, void *cb_dat
 /*
  * Wraps `packet` in a header comprised of the custom packet type, game type and game id.
  */
-static int game_packet_wrap(const GameData *game, uint8_t *packet, size_t size, GamePacketType packet_type)
+static int game_wrap_packet(const GameData *game, uint8_t *packet, size_t size, GamePacketType packet_type)
 {
     if (size < GAME_PACKET_HEADER_SIZE + 1) {
         return -1;
@@ -1112,7 +1046,7 @@ static int game_packet_wrap(const GameData *game, uint8_t *packet, size_t size,
     return 0;
 }
 
-int game_packet_send(const GameData *game, const uint8_t *data, size_t length, GamePacketType packet_type)
+int game_send_packet(const GameData *game, const uint8_t *data, size_t length, GamePacketType packet_type)
 {
     if (length > GAME_MAX_DATA_SIZE) {
         return -1;
@@ -1120,7 +1054,7 @@ int game_packet_send(const GameData *game, const uint8_t *data, size_t length, G
 
     uint8_t packet[GAME_MAX_PACKET_SIZE];
 
-    if (game_packet_wrap(game, packet, sizeof(packet), packet_type) == -1) {
+    if (game_wrap_packet(game, packet, sizeof(packet), packet_type) == -1) {
         return -1;
     }
 
@@ -1129,12 +1063,12 @@ int game_packet_send(const GameData *game, const uint8_t *data, size_t length, G
     memcpy(packet + 1 + GAME_PACKET_HEADER_SIZE, data, length);
     packet_length += length;
 
-    Tox_Err_Friend_Custom_Packet err;
+    TOX_ERR_FRIEND_CUSTOM_PACKET err;
 
     if (!tox_friend_send_lossless_packet(game->tox, game->friend_number, packet, packet_length, &err)) {
         fprintf(stderr, "failed to send game packet: error %d\n", err);
         return -1;
     }
 
-    return 0;
+    return -0;
 }

src/game_base.h

@@ -31,24 +31,23 @@
 #include "game_util.h"
 #include "windows.h"
 
-#define GAME_BORDER_COLOUR BAR_SOLID
+#define GAME_BORDER_COLOUR BAR_TEXT
 
+/* Max size of a default size square game window */
+#define GAME_MAX_SQUARE_Y 26
+#define GAME_MAX_SQUARE_X (GAME_MAX_SQUARE_Y * 2)
 
-/* Max size of a default square game window */
+/* Max size of a small square game window */
-#define GAME_MAX_SQUARE_Y_DEFAULT 26
+#define GAME_MAX_SQUARE_Y_SMALL 18
-#define GAME_MAX_SQUARE_X_DEFAULT (GAME_MAX_SQUARE_Y_DEFAULT * 2)
+#define GAME_MAX_SQUARE_X_SMALL (GAME_MAX_SQUARE_Y_SMALL * 2)
-
-/* Max size of a large square game window */
-#define GAME_MAX_SQUARE_Y_LARGE 52
-#define GAME_MAX_SQUARE_X_LARGE (GAME_MAX_SQUARE_Y_LARGE * 2)
 
 /* Max size of a default size rectangle game window */
-#define GAME_MAX_RECT_Y_DEFAULT 24
+#define GAME_MAX_RECT_Y 24
-#define GAME_MAX_RECT_X_DEFAULT (GAME_MAX_RECT_Y_DEFAULT * 4)
+#define GAME_MAX_RECT_X (GAME_MAX_RECT_Y * 4)
 
-/* Max size of a large rectangle game window */
+/* Max size of a small rectangle game window */
-#define GAME_MAX_RECT_Y_LARGE 52
+#define GAME_MAX_RECT_Y_SMALL 14
-#define GAME_MAX_RECT_X_LARGE (GAME_MAX_RECT_Y_LARGE * 4)
+#define GAME_MAX_RECT_X_SMALL (GAME_MAX_RECT_Y_SMALL * 4)
 
 /* Maximum length of a game message set with game_set_message() */
 #define GAME_MAX_MESSAGE_SIZE 64
@@ -57,7 +56,7 @@
 #define GAME_MESSAGE_DEFAULT_TIMEOUT 3
 
 
-/***** START NETWORKING CONSTANTS *****/
+/***** NETWORKING DEFINES *****/
 
 /* Header starts after custom packet type byte. Comprised of: NetworkVersion (1b) + GameType (1b) + id (4b) */
 #define GAME_PACKET_HEADER_SIZE (1 + 1 + sizeof(uint32_t))
@@ -71,9 +70,6 @@
 /* Current version of networking protocol */
 #define GAME_NETWORKING_VERSION 0x01
 
-/***** END NETWORKING CONSTANTS *****/
-
-
 typedef void cb_game_update_state(GameData *game, void *cb_data);
 typedef void cb_game_render_window(GameData *game, WINDOW *window, void *cb_data);
 typedef void cb_game_kill(GameData *game, void *cb_data);
@@ -88,9 +84,7 @@ typedef enum GamePacketType {
 
 typedef enum GameWindowShape {
     GW_ShapeSquare = 0u,
-    GW_ShapeSquareLarge,
     GW_ShapeRectangle,
-    GW_ShapeRectangleLarge,
     GW_ShapeInvalid,
 } GameWindowShape;
 
@@ -105,7 +99,6 @@ typedef enum GameStatus {
 typedef enum GameType {
     GT_Centipede = 0u,
     GT_Chess,
-    GT_Life,
     GT_Snake,
     GT_Invalid,
 } GameType;
@@ -216,6 +209,8 @@ void game_set_cb_on_packet(GameData *game, cb_game_on_packet *func, void *cb_dat
  * `id` should be a unique integer to indentify the game instance. If we're being invited to a game
  *   this identifier should be sent via the invite packet.
  *
+ * `force_small_window` will make the game window small.
+ *
  * if `multiplayer_data` is non-null this indicates that we accepted a game invite from a contact.
  *   The data contains any information we need to initialize the game state.
  *
@@ -226,12 +221,12 @@ void game_set_cb_on_packet(GameData *game, cb_game_on_packet *func, void *cb_dat
  * Return -4 on other failure.
  */
 int game_initialize(const ToxWindow *self, Tox *m, GameType type, uint32_t id, const uint8_t *multiplayer_data,
-                    size_t length);
+                    size_t length, bool force_small_window);
 
 /*
- * Sets game window to `shape`.
+ * Sets game window to `shape` and attempts to adjust size for best fit.
  *
- * This must be called on game initialization.
+ * This should be called in the game's initialize function.
  *
  * Return 0 on success.
  * Return -1 if window is too small or shape is invalid.
@@ -290,23 +285,11 @@ void game_show_high_score(GameData *game, bool show_high_score);
 void game_show_lives(GameData *game, bool show_lives);
 void game_show_level(GameData *game, bool show_level);
 
-/*
- * Sends a notification to the window associated with `game`.
- *
- * `message` - the notification message that will be displayed.
- */
-void game_window_notify(const GameData *game, const char *message);
-
 /*
  * Updates game score.
  */
 void game_update_score(GameData *game, long int points);
 
-/*
- * Sets game score to `val`.
- */
-void game_set_score(GameData *game, long int score);
-
 /*
  * Returns the game's current score.
  */
@@ -394,7 +377,7 @@ void game_kill(ToxWindow *self);
  *
  * `packet_type` should be GP_Invite for an invite packet or GP_Data for all other game data.
  */
-int game_packet_send(const GameData *game, const uint8_t *data, size_t length, GamePacketType packet_type);
+int game_send_packet(const GameData *game, const uint8_t *data, size_t length, GamePacketType packet_type);
 
 #endif // GAME_BASE
 

src/game_centipede.c

@@ -33,7 +33,7 @@
 #define CENT_MUSHROOMS_POP_CONSTANT 35000
 
 /* Max number of mushrooms */
-#define CENT_MUSHROOMS_LENGTH (GAME_MAX_SQUARE_X_DEFAULT * GAME_MAX_SQUARE_X_DEFAULT)
+#define CENT_MUSHROOMS_LENGTH (GAME_MAX_SQUARE_X * GAME_MAX_SQUARE_Y)
 
 /* Max number of individual centipedes at any given time */
 #define CENT_MAX_NUM_HEADS    20
@@ -42,7 +42,7 @@
 #define CENT_MAX_NUM_SEGMENTS 12
 
 /* Get a free life every time we get this many points. Needs to be > the most points we can get in a single shot. */
-#define CENT_SCORE_ONE_UP 7000
+#define CENT_SCORE_ONE_UP 5000
 
 /* Max number of lives we can have */
 #define CENT_MAX_LIVES    6
@@ -53,9 +53,6 @@
 /* Max speed of an enemy agent */
 #define CENT_MAX_ENEMY_AGENT_SPEED 8
 
-/* Determines the overall speed of the game per game_set_update_interval() */
-#define CENT_GAME_UPDATE_INTERVAL 14
-
 /* How often a head that reaches the bottom can repdoduce */
 #define CENT_REPRODUCE_TIMEOUT 10
 
@@ -67,7 +64,7 @@
 #define CENT_BULLET_COLOUR    YELLOW
 #define CENT_BULLET_ATTR      A_BOLD
 #define CENT_BULLET_CHAR      '|'
-#define CENT_BULLET_SPEED     300
+#define CENT_BULLET_SPEED     150
 
 #define CENT_BLASTER_ATTR     A_BOLD
 #define CENT_BLASTER_CHAR     'U'
@@ -1596,7 +1593,6 @@ void cent_cb_kill(GameData *game, void *cb_data)
     game_set_cb_update_state(game, NULL, NULL);
     game_set_cb_render_window(game, NULL, NULL);
     game_set_cb_kill(game, NULL, NULL);
-    game_set_cb_on_keypress(game, NULL, NULL);
     game_set_cb_on_pause(game, NULL, NULL);
 }
 
@@ -1717,7 +1713,6 @@ static int cent_init_state(GameData *game, CentState *state)
 
 int centipede_initialize(GameData *game)
 {
-    // note: If this changes we must update CENT_MUSHROOMS_LENGTH
     if (game_set_window_shape(game, GW_ShapeSquare) == -1) {
         return -1;
     }
@@ -1733,7 +1728,7 @@ int centipede_initialize(GameData *game)
     game_show_lives(game, true);
     game_show_high_score(game, true);
     game_increment_level(game);
-    game_set_update_interval(game, CENT_GAME_UPDATE_INTERVAL);
+    game_set_update_interval(game, 10);
 
     if (cent_init_state(game, state) == -1) {
         free(state);

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;
@@ -832,13 +826,15 @@ static bool chess_mock_move_valid(ChessState *state, const Player *player, Tile
     chess_copy_piece(&to->piece, &from->piece);
     from->piece.type = NoPiece;
 
-    in_check = chess_player_in_check(state, player);
+    if (chess_player_in_check(state, player)) {
+        in_check = true;;
+    }
 
     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;
@@ -1083,7 +1079,9 @@ static void chess_update_state(ChessState *state, Player *self, Player *other, c
 
     self->in_check = false;
 
-    other->in_check = chess_player_in_check(state, other);
+    if (chess_player_in_check(state, other)) {
+        other->in_check = true;
+    }
 
     state->message_length = 0;
     state->black_to_move ^= 1;
@@ -1413,7 +1411,7 @@ static void chess_move_curs_left(ChessState *state)
 {
     Board *board = &state->board;
 
-    int new_x = state->curs_x - CHESS_TILE_SIZE_X;
+    size_t new_x = state->curs_x - CHESS_TILE_SIZE_X;
 
     if (new_x < board->x_left_bound) {
         return;
@@ -1426,7 +1424,7 @@ static void chess_move_curs_right(ChessState *state)
 {
     Board *board = &state->board;
 
-    int new_x = state->curs_x + CHESS_TILE_SIZE_X;
+    size_t new_x = state->curs_x + CHESS_TILE_SIZE_X;
 
     if (new_x > board->x_right_bound) {
         return;
@@ -1439,7 +1437,7 @@ static void chess_move_curs_up(ChessState *state)
 {
     Board *board = &state->board;
 
-    int new_y = state->curs_y - CHESS_TILE_SIZE_Y;
+    size_t new_y = state->curs_y - CHESS_TILE_SIZE_Y;
 
     if (new_y < board->y_top_bound) {
         return;
@@ -1452,7 +1450,7 @@ static void chess_move_curs_down(ChessState *state)
 {
     Board *board = &state->board;
 
-    int new_y = state->curs_y + CHESS_TILE_SIZE_Y;
+    size_t new_y = state->curs_y + CHESS_TILE_SIZE_Y;
 
     if (new_y >= board->y_bottom_bound) {
         return;
@@ -1632,11 +1630,11 @@ static void chess_print_status(WINDOW *win, ChessState *state)
     }
 
     int x_mid = (board->x_left_bound + (CHESS_TILE_SIZE_X * (CHESS_BOARD_COLUMNS / 2))) - (strlen(message) / 2);
-    mvwprintw(win, board->y_top_bound  - 2, x_mid, "%s", message);
+    mvwprintw(win, board->y_top_bound  - 2, x_mid, message);
 
     if (state->message_length > 0) {
         x_mid = (board->x_left_bound + (CHESS_TILE_SIZE_X * (CHESS_BOARD_COLUMNS / 2))) - (state->message_length / 2);
-        mvwprintw(win, board->y_bottom_bound + 2, x_mid, "%s", state->status_message);
+        mvwprintw(win, board->y_bottom_bound + 2, x_mid, state->status_message);
     }
 
     wattroff(win, A_BOLD);
@@ -1718,6 +1716,7 @@ void chess_cb_render_window(GameData *game, WINDOW *win, void *cb_data)
 
     move(state->curs_y, state->curs_x);
 
+
     curs_set(1);
 
     chess_draw_board(win, state);
@@ -1774,7 +1773,6 @@ void chess_cb_on_keypress(GameData *game, int key, void *cb_data)
         }
 
         case '\r':
-
         /* Intentional fallthrough */
         case ' ': {
             chess_do_input(game, state);
@@ -1815,7 +1813,7 @@ void chess_cb_kill(GameData *game, void *cb_data)
 static int chess_handle_opponent_move_packet(const GameData *game, ChessState *state, const uint8_t *data,
         size_t length)
 {
-    if (length < CHESS_PACKET_MOVE_SIZE || data == NULL) {
+    if (length != CHESS_PACKET_MOVE_SIZE || data == NULL) {
         return -1;
     }
 
@@ -1847,7 +1845,7 @@ static int chess_handle_opponent_move_packet(const GameData *game, ChessState *s
     }
 
     if (chess_try_move_opponent(state, from_tile, to_tile) != 0) {
-        fprintf(stderr, "Chess opponent tried to make an illegal move: %c%d-%c%d\n", from_l, from_n, to_l, to_n);
+        fprintf(stderr, "opponent tried to make an illegal move: %c%d-%c%d\n", from_l, from_n, to_l, to_n);
         return -1;
     }
 
@@ -1855,41 +1853,13 @@ static int chess_handle_opponent_move_packet(const GameData *game, ChessState *s
 
 }
 
-static void chess_notify(const GameData *game, ChessPacketType type)
-{
-    const char *msg = NULL;
-
-    switch (type) {
-        case CHESS_PACKET_INIT_ACCEPT_INVITE: {
-            msg = "Game on!";
-            break;
-        }
-
-        case CHESS_PACKET_RESIGN: {
-            msg = "Opponent has resigned";
-            break;
-        }
-
-        case CHESS_PACKET_MOVE_PIECE: {
-            msg = "Opponent has moved";
-            break;
-        }
-
-        default: {
-            return;
-        }
-    }
-
-    game_window_notify(game, msg);
-}
-
 static void chess_cb_on_packet(GameData *game, const uint8_t *data, size_t length, void *cb_data)
 {
     if (length == 0 || data == NULL) {
         return;
     }
 
-    if (cb_data == NULL) {
+    if (!cb_data) {
         return;
     }
 
@@ -1930,11 +1900,9 @@ static void chess_cb_on_packet(GameData *game, const uint8_t *data, size_t lengt
 
         default: {
             fprintf(stderr, "Got unknown chess packet type: %d\n", type);
-            return;
+            break;
         }
     }
-
-    chess_notify(game, type);
 }
 
 static int chess_init_board(GameData *game, ChessState *state, bool self_is_white)
@@ -2046,7 +2014,7 @@ static int chess_packet_send_resign(const GameData *game)
     uint8_t data[1];
     data[0] = CHESS_PACKET_RESIGN;
 
-    if (game_packet_send(game, data, 1, GP_Data) == -1) {
+    if (game_send_packet(game, data, 1, GP_Data) == -1) {
         return -1;
     }
 
@@ -2062,7 +2030,7 @@ static int chess_packet_send_move(const GameData *game, const Tile *from, const
     data[3] = to->chess_coords.L;
     data[4] = to->chess_coords.N;
 
-    if (game_packet_send(game, data, 5, GP_Data) == -1) {
+    if (game_send_packet(game, data, 5, GP_Data) == -1) {
         return -1;
     }
 
@@ -2075,7 +2043,7 @@ static int chess_packet_send_invite(const GameData *game, bool self_is_white)
     data[0] = CHESS_PACKET_INIT_SEND_INVITE;
     data[1] = self_is_white ? Black : White;
 
-    if (game_packet_send(game, data, 2, GP_Invite) == -1) {
+    if (game_send_packet(game, data, 2, GP_Invite) == -1) {
         return -1;
     }
 
@@ -2087,7 +2055,7 @@ static int chess_packet_send_accept(const GameData *game)
     uint8_t data[1];
     data[0] = CHESS_PACKET_INIT_ACCEPT_INVITE;
 
-    if (game_packet_send(game, data, 1, GP_Data) == -1) {
+    if (game_send_packet(game, data, 1, GP_Data) == -1) {
         return -1;
     }
 
@@ -2162,3 +2130,4 @@ int chess_initialize(GameData *game, const uint8_t *init_data, size_t length)
 
     return 0;
 }
+

src/game_life.c

@@ -1,676 +0,0 @@
-/*  game_life.c
- *
- *
- *  Copyright (C) 2021 Toxic All Rights Reserved.
- *
- *  This file is part of Toxic.
- *
- *  Toxic is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Toxic is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Toxic.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "game_life.h"
-
-#define LIFE_DEFAULT_CELL_CHAR     'o'
-#define LIFE_CELL_DEFAULT_COLOUR    CYAN
-#define LIFE_DEFAULT_SPEED          25
-#define LIFE_MAX_SPEED              40
-
-/* Determines the additional size of the grid beyond the visible boundaries.
- *
- * This buffer allows cells to continue growing off-screen giving the illusion of an
- * infinite grid to a certain point.
- */
-#define LIFE_BOUNDARY_BUFFER        50
-
-
-typedef struct Cell {
-    Coords     coords;
-    bool       alive;
-    bool       marked;  // true if cell should invert alive status at end of current cycle
-    int        display_char;
-    size_t     age;
-} Cell;
-
-typedef struct LifeState {
-    TIME_MS    time_last_cycle;
-    size_t     speed;
-    size_t     generation;
-    bool       paused;
-
-    Cell       **cells;
-    int        num_columns;
-    int        num_rows;
-
-    int        curs_x;
-    int        curs_y;
-
-    int        x_left_bound;
-    int        x_right_bound;
-    int        y_top_bound;
-    int        y_bottom_bound;
-
-    short      display_candy;
-    int        colour;
-} LifeState;
-
-
-static void life_increase_speed(LifeState *state)
-{
-    if (state->speed < LIFE_MAX_SPEED) {
-        ++state->speed;
-    }
-}
-
-static void life_decrease_speed(LifeState *state)
-{
-    if (state->speed > 1) {
-        --state->speed;
-    }
-}
-
-static int life_get_display_char(const LifeState *state, const Cell *cell)
-{
-    if (state->display_candy == 1) {
-        if (cell->age == 1) {
-            return '.';
-        }
-
-        return '+';
-    }
-
-    if (state->display_candy == 2) {
-        if (cell->age == 1) {
-            return '.';
-        }
-
-        if (cell->age == 2) {
-            return '-';
-        }
-
-        if (cell->age == 3) {
-            return 'o';
-        }
-
-        return 'O';
-    }
-
-    return 'o';
-}
-
-static void life_toggle_display_candy(LifeState *state)
-{
-    state->display_candy = (state->display_candy + 1) % 3;  // magic number depends on life_get_display_char()
-}
-
-static void life_cycle_colour(LifeState *state)
-{
-    switch (state->colour) {
-        case RED: {
-            state->colour = YELLOW;
-            break;
-        }
-
-        case YELLOW: {
-            state->colour = GREEN;
-            break;
-        }
-
-        case GREEN: {
-            state->colour = CYAN;
-            break;
-        }
-
-        case CYAN: {
-            state->colour = BLUE;
-            break;
-        }
-
-        case BLUE: {
-            state->colour = MAGENTA;
-            break;
-        }
-
-        case MAGENTA: {
-            state->colour = RED;
-            break;
-        }
-
-        default: {
-            state->colour = RED;
-            break;
-        }
-    }
-}
-
-static Cell *life_get_cell_at_coords(const LifeState *state, const int x, const int y)
-{
-    const int i = y - (state->y_top_bound - (LIFE_BOUNDARY_BUFFER / 2));
-    const int j = x - (state->x_left_bound - (LIFE_BOUNDARY_BUFFER / 2));
-
-    if (i >= 0 && j >= 0) {
-        return &state->cells[i][j];
-    }
-
-    return NULL;
-}
-
-static void life_draw_cells(const GameData *game, WINDOW *win, LifeState *state)
-{
-    wattron(win, A_BOLD | COLOR_PAIR(state->colour));
-
-    for (int i = LIFE_BOUNDARY_BUFFER / 2; i < state->num_rows - (LIFE_BOUNDARY_BUFFER / 2); ++i) {
-        for (int j = LIFE_BOUNDARY_BUFFER / 2; j < state->num_columns + 1 - (LIFE_BOUNDARY_BUFFER / 2); ++j) {
-            Cell *cell = &state->cells[i][j];
-
-            if (cell->alive) {
-                Coords coords = cell->coords;
-                mvwaddch(win, coords.y, coords.x, cell->display_char);
-            }
-        }
-    }
-
-    wattroff(win, A_BOLD | COLOR_PAIR(state->colour));
-}
-
-static void life_toggle_cell(LifeState *state)
-{
-    Cell *cell = life_get_cell_at_coords(state, state->curs_x, state->curs_y);
-
-    if (cell == NULL) {
-        return;
-    }
-
-    cell->alive ^= 1;
-}
-
-/*
- * Returns the number of live neighbours of cell at `i` `j` position.
- *
- * Returns NULL if cell is touching a border.
- */
-static int life_get_live_neighbours(const LifeState *state, const int i, const int j)
-{
-    Cell *n[8] = {0};
-
-    if (i > 0 && j > 0) {
-        n[0] = &state->cells[i - 1][j - 1];
-    }
-
-    if (i > 0) {
-        n[1] = &state->cells[i - 1][j];
-    }
-
-    if (i > 0 && j < state->num_columns - 1) {
-        n[2] = &state->cells[i - 1][j + 1];
-    }
-
-    if (j > 0) {
-        n[3] = &state->cells[i][j - 1];
-    }
-
-    if (j < state->num_columns - 1) {
-        n[4] = &state->cells[i][j + 1];
-    }
-
-    if (i < state->num_rows - 1 && j > 0) {
-        n[5] = &state->cells[i + 1][j - 1];
-    }
-
-    if (i < state->num_rows - 1) {
-        n[6] = &state->cells[i + 1][j];
-    }
-
-    if (i < state->num_rows - 1 && j < state->num_columns - 1) {
-        n[7] = &state->cells[i + 1][j + 1];
-    }
-
-    int count = 0;
-
-    for (size_t i = 0; i < 8; ++i) {
-        if (n[i] == NULL) {
-            return 0; // If we're at a boundary kill cell
-        }
-
-        if (n[i]->alive) {
-            ++count;
-        }
-    }
-
-    return count;
-}
-
-static void life_restart(GameData *game, LifeState *state)
-{
-    for (int i = 0; i < state->num_rows; ++i) {
-        for (int j = 0; j < state->num_columns; ++j) {
-            Cell *cell = &state->cells[i][j];
-            cell->alive = false;
-            cell->marked = false;
-            cell->display_char = LIFE_DEFAULT_CELL_CHAR;
-            cell->age = 0;
-        }
-    }
-
-    game_set_score(game, 0);
-
-    state->generation = 0;
-}
-
-static void life_do_cells(LifeState *state)
-{
-
-    for (int i = 0; i < state->num_rows; ++i) {
-        for (int j = 0; j < state->num_columns; ++j) {
-            Cell *cell = &state->cells[i][j];
-
-            if (cell->marked) {
-                cell->marked = false;
-                cell->alive ^= 1;
-                cell->age = cell->alive;
-                cell->display_char = life_get_display_char(state, cell);
-            } else if (cell->alive) {
-                ++cell->age;
-                cell->display_char = life_get_display_char(state, cell);
-            }
-        }
-    }
-}
-
-static void life_cycle(GameData *game, LifeState *state)
-{
-    if (state->generation == 0) {
-        return;
-    }
-
-    TIME_MS cur_time = get_time_millis();
-
-    if (!game_do_object_state_update(game, cur_time, state->time_last_cycle, state->speed)) {
-        return;
-    }
-
-    state->time_last_cycle = get_time_millis();
-
-    ++state->generation;
-
-    size_t live_cells = 0;
-
-    for (int i = 0; i < state->num_rows; ++i) {
-        for (int j = 0; j < state->num_columns; ++j) {
-            Cell *cell = &state->cells[i][j];
-
-            int live_neighbours = life_get_live_neighbours(state, i, j);
-
-            if (cell->alive) {
-                if (!(live_neighbours == 2 || live_neighbours == 3)) {
-                    cell->marked = true;
-                } else {
-                    ++live_cells;
-                }
-            } else {
-                if (live_neighbours == 3) {
-                    cell->marked = true;
-                    ++live_cells;
-                }
-            }
-        }
-    }
-
-    if (live_cells == 0) {
-        life_restart(game, state);
-        return;
-    }
-
-    life_do_cells(state);
-
-    game_update_score(game, 1);
-}
-
-static void life_start(GameData *game, LifeState *state)
-{
-    state->generation = 1;
-}
-
-void life_cb_update_game_state(GameData *game, void *cb_data)
-{
-    if (!cb_data) {
-        return;
-    }
-
-    LifeState *state = (LifeState *)cb_data;
-
-    life_cycle(game, state);
-}
-
-void life_cb_render_window(GameData *game, WINDOW *win, void *cb_data)
-{
-    if (!cb_data) {
-        return;
-    }
-
-    LifeState *state = (LifeState *)cb_data;
-
-    move(state->curs_y, state->curs_x);
-
-    if (state->generation == 0 || state->paused) {
-        curs_set(1);
-    }
-
-    life_draw_cells(game, win, state);
-}
-
-static void life_move_curs_left(LifeState *state)
-{
-    int new_x = state->curs_x - 1;
-
-    if (new_x < state->x_left_bound) {
-        return;
-    }
-
-    state->curs_x = new_x;
-}
-
-static void life_move_curs_right(LifeState *state)
-{
-    int new_x = state->curs_x + 1;
-
-    if (new_x > state->x_right_bound) {
-        return;
-    }
-
-    state->curs_x = new_x;
-}
-
-static void life_move_curs_up(LifeState *state)
-{
-    int new_y = state->curs_y - 1;
-
-    if (new_y < state->y_top_bound) {
-        return;
-    }
-
-    state->curs_y = new_y;
-}
-
-static void life_move_curs_down(LifeState *state)
-{
-    int new_y = state->curs_y + 1;
-
-    if (new_y >= state->y_bottom_bound) {
-        return;
-    }
-
-    state->curs_y = new_y;
-}
-
-static void life_move_curs_up_left(LifeState *state)
-{
-    life_move_curs_up(state);
-    life_move_curs_left(state);
-}
-
-static void life_move_curs_up_right(LifeState *state)
-{
-    life_move_curs_up(state);
-    life_move_curs_right(state);
-}
-
-static void life_move_curs_down_right(LifeState *state)
-{
-    life_move_curs_down(state);
-    life_move_curs_right(state);
-}
-
-static void life_move_curs_down_left(LifeState *state)
-{
-    life_move_curs_down(state);
-    life_move_curs_left(state);
-}
-
-void life_cb_on_keypress(GameData *game, int key, void *cb_data)
-{
-    if (!cb_data) {
-        return;
-    }
-
-    LifeState *state = (LifeState *)cb_data;
-
-    switch (key) {
-        case KEY_LEFT: {
-            life_move_curs_left(state);
-            break;
-        }
-
-        case KEY_RIGHT: {
-            life_move_curs_right(state);
-            break;
-        }
-
-        case KEY_DOWN: {
-            life_move_curs_down(state);
-            break;
-        }
-
-        case KEY_UP: {
-            life_move_curs_up(state);
-            break;
-        }
-
-        case KEY_HOME: {
-            life_move_curs_up_left(state);
-            break;
-        }
-
-        case KEY_END: {
-            life_move_curs_down_left(state);
-            break;
-        }
-
-        case KEY_PPAGE: {
-            life_move_curs_up_right(state);
-            break;
-        }
-
-        case KEY_NPAGE: {
-            life_move_curs_down_right(state);
-            break;
-        }
-
-        case '\r': {
-            if (state->generation > 0) {
-                life_restart(game, state);
-            } else {
-                life_start(game, state);
-            }
-
-            break;
-        }
-
-        case ' ': {
-            life_toggle_cell(state);
-            break;
-        }
-
-        case '=':
-
-        /* intentional fallthrough */
-
-        case '+': {
-            life_increase_speed(state);
-            break;
-        }
-
-        case '-':
-
-        /* intentional fallthrough */
-
-        case '_': {
-            life_decrease_speed(state);
-            break;
-        }
-
-        case '\t': {
-            life_toggle_display_candy(state);
-            break;
-        }
-
-        case '`': {
-            life_cycle_colour(state);
-            break;
-        }
-
-        default: {
-            return;
-        }
-    }
-}
-
-static void life_free_cells(LifeState *state)
-{
-    if (state->cells == NULL) {
-        return;
-    }
-
-    for (int i = 0; i < state->num_rows; ++i) {
-        if (state->cells[i]) {
-            free(state->cells[i]);
-        }
-    }
-
-    free(state->cells);
-}
-
-void life_cb_pause(GameData *game, bool is_paused, void *cb_data)
-{
-    if (!cb_data) {
-        return;
-    }
-
-    LifeState *state = (LifeState *)cb_data;
-
-    state->paused = is_paused;
-}
-
-void life_cb_kill(GameData *game, void *cb_data)
-{
-    if (!cb_data) {
-        return;
-    }
-
-    LifeState *state = (LifeState *)cb_data;
-
-    life_free_cells(state);
-    free(state);
-
-    game_set_cb_update_state(game, NULL, NULL);
-    game_set_cb_render_window(game, NULL, NULL);
-    game_set_cb_kill(game, NULL, NULL);
-    game_set_cb_on_keypress(game, NULL, NULL);
-}
-
-static int life_init_state(GameData *game, LifeState *state)
-{
-    const int x_left = game_x_left_bound(game) ;
-    const int x_right = game_x_right_bound(game);
-    const int y_top = game_y_top_bound(game);
-    const int y_bottom = game_y_bottom_bound(game) + 1;
-
-    state->x_left_bound = x_left;
-    state->x_right_bound = x_right;
-    state->y_top_bound = y_top;
-    state->y_bottom_bound = y_bottom;
-
-    const int x_mid = x_left + ((x_right - x_left) / 2);
-    const int y_mid = y_top + ((y_bottom - y_top) / 2);
-
-    state->curs_x = x_mid;
-    state->curs_y = y_mid;
-
-    const int num_rows = (y_bottom - y_top) + LIFE_BOUNDARY_BUFFER;
-    const int num_columns = (x_right - x_left) + LIFE_BOUNDARY_BUFFER;
-
-    if (num_rows <= 0 || num_columns <= 0) {
-        return -1;
-    }
-
-    state->num_columns = num_columns;
-    state->num_rows = num_rows;
-
-    state->cells = calloc(1, num_rows * sizeof(Cell *));
-
-    if (state->cells == NULL) {
-        return -1;
-    }
-
-    for (int i = 0; i < num_rows; ++i) {
-        state->cells[i] = calloc(1, num_columns * sizeof(Cell));
-
-        if (state->cells[i] == NULL) {
-            return -1;
-        }
-
-        for (int j = 0; j < num_columns; ++j) {
-            state->cells[i][j].coords.y = i + (state->y_top_bound - (LIFE_BOUNDARY_BUFFER / 2));
-            state->cells[i][j].coords.x = j + (state->x_left_bound - (LIFE_BOUNDARY_BUFFER / 2));
-        }
-    }
-
-    state->speed = LIFE_DEFAULT_SPEED;
-    state->colour = LIFE_CELL_DEFAULT_COLOUR;
-
-    life_restart(game, state);
-
-    return 0;
-}
-
-int life_initialize(GameData *game)
-{
-    // Try best fit from largest to smallest before giving up
-    if (game_set_window_shape(game, GW_ShapeRectangleLarge) == -1) {
-        if (game_set_window_shape(game, GW_ShapeSquareLarge) == -1) {
-            if (game_set_window_shape(game, GW_ShapeRectangle) == -1) {
-                if (game_set_window_shape(game, GW_ShapeSquare) == -1) {
-                    return -1;
-                }
-            }
-        }
-    }
-
-    LifeState *state = calloc(1, sizeof(LifeState));
-
-    if (state == NULL) {
-        return -1;
-    }
-
-    if (life_init_state(game, state) == -1) {
-        life_free_cells(state);
-        free(state);
-        return -1;
-    }
-
-    game_set_update_interval(game, 40);
-    game_show_score(game, true);
-
-    game_set_cb_update_state(game, life_cb_update_game_state, state);
-    game_set_cb_render_window(game, life_cb_render_window, state);
-    game_set_cb_on_keypress(game, life_cb_on_keypress, state);
-    game_set_cb_on_pause(game, life_cb_pause, state);
-    game_set_cb_kill(game, life_cb_kill, state);
-
-    return 0;
-}

src/game_life.h

@@ -1,31 +0,0 @@
-/*  game_life.h
- *
- *
- *  Copyright (C) 2021 Toxic All Rights Reserved.
- *
- *  This file is part of Toxic.
- *
- *  Toxic is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Toxic is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Toxic.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef GAME_LIFE
-#define GAME_LIFE
-
-#include "game_base.h"
-
-int life_initialize(GameData *game);
-
-#endif // GAME_LIFE
-

src/game_snake.c

@@ -29,8 +29,8 @@
 #include "game_snake.h"
 #include "misc_tools.h"
 
-#define SNAKE_MAX_SNAKE_LENGTH     (GAME_MAX_SQUARE_X_DEFAULT * GAME_MAX_SQUARE_Y_DEFAULT)
+#define SNAKE_MAX_SNAKE_LENGTH     (GAME_MAX_SQUARE_X * GAME_MAX_SQUARE_Y)
-#define SNAKE_AGENT_MAX_LIST_SIZE  (GAME_MAX_SQUARE_X_DEFAULT * GAME_MAX_SQUARE_Y_DEFAULT)
+#define SNAKE_AGENT_MAX_LIST_SIZE  (GAME_MAX_SQUARE_X * GAME_MAX_SQUARE_Y)
 
 #define SNAKE_DEFAULT_SNAKE_SPEED 6
 #define SNAKE_DEFAULT_AGENT_SPEED 1
@@ -801,7 +801,6 @@ void snake_cb_kill(GameData *game, void *cb_data)
     game_set_cb_update_state(game, NULL, NULL);
     game_set_cb_render_window(game, NULL, NULL);
     game_set_cb_kill(game, NULL, NULL);
-    game_set_cb_on_keypress(game, NULL, NULL);
     game_set_cb_on_pause(game, NULL, NULL);
 }
 
@@ -850,7 +849,6 @@ static void snake_initialize_snake_head(const GameData *game, Snake *snake)
 
 int snake_initialize(GameData *game)
 {
-    // note: if this changes we must update SNAKE_MAX_SNAKE_LENGTH and SNAKE_AGENT_MAX_LIST_SIZE
     if (game_set_window_shape(game, GW_ShapeSquare) == -1) {
         return -1;
     }

src/game_util.c

@@ -104,28 +104,22 @@ void game_util_move_coords(Direction direction, Coords *coords)
 {
     switch (direction) {
         case NORTH: {
-            if (coords->y > 0) {
+            --(coords->y);
-                --(coords->y);
-            }
-
             break;
         }
 
         case SOUTH: {
-            ++(coords->y);  // Will rollover if you do something stupid
+            ++(coords->y);
             break;
         }
 
         case EAST: {
-            ++(coords->x);  // Will rollover if you do something stupid
+            ++(coords->x);
             break;
         }
 
         case WEST: {
-            if (coords->x > 0) {
+            --(coords->x);
-                --(coords->x);
-            }
-
             break;
         }
 

src/game_util.h

@@ -24,7 +24,6 @@
 #define GAME_UTIL
 
 #include <stdbool.h>
-#include <time.h>
 
 typedef struct Coords {
     int x;
@@ -101,3 +100,4 @@ size_t game_util_pack_u32(uint8_t *bytes, uint32_t v);
 size_t game_util_unpack_u32(const uint8_t *bytes, uint32_t *v);
 
 #endif  // GAME_UTIL
+

src/global_commands.c

@@ -26,7 +26,6 @@
 #include "avatars.h"
 #include "conference.h"
 #include "friendlist.h"
-#include "groupchats.h"
 #include "help.h"
 #include "line_info.h"
 #include "log.h"
@@ -43,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])
 {
@@ -153,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);
@@ -172,41 +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_domain = char_find(0, id, '@') != arg_length;
+    /* try to add tox ID */
-    const bool valid_id_size = arg_length >= TOX_ADDRESS_SIZE * 2;  // arg_length may include invite message
+    if (id_len == 2 * TOX_ADDRESS_SIZE) {
+        size_t i;
+        char xx[3];
+        uint32_t x;
 
-    if (is_domain) {
+        for (i = 0; i < TOX_ADDRESS_SIZE; ++i) {
-        if (!name_lookup(self, m, id_bin, id, msg)) {
+            xx[0] = id[2 * i];
-            return;
+            xx[1] = id[2 * i + 1];
+            xx[2] = '\0';
+
+            if (sscanf(xx, "%02x", &x) != 1) {
+                line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invalid Tox ID.");
+                return;
+            }
+
+            id_bin[i] = x;
         }
-    } else if (!valid_id_size) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invalid Tox ID.");
-        return;
-    }
 
-    char xx[3];
+        if (friend_is_blocked(id_bin)) {
-    uint32_t x = 0;
+            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Friend is in your block list.");
-
-    for (size_t i = 0; i < TOX_ADDRESS_SIZE; ++i) {
-        xx[0] = id[2 * i];
-        xx[1] = id[2 * i + 1];
-        xx[2] = 0;
-
-        if (sscanf(xx, "%02x", &x) != 1) {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invalid Tox ID.");
             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])
@@ -272,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;
     }
@@ -362,8 +367,19 @@ void cmd_game(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MA
         return;
     }
 
+    bool force_small = false;
+
+    if (argc >= 2) {
+        force_small = strcasecmp(argv[2], "small") == 0;
+
+        if (!force_small) {
+            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Unknown argument.");
+            return;
+        }
+    }
+
     uint32_t id = rand();
-    int ret = game_initialize(self, m, type, id, NULL, 0);
+    int ret = game_initialize(self, m, type, id, NULL, 0, force_small);
 
     switch (ret) {
         case 0: {
@@ -371,7 +387,8 @@ void cmd_game(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MA
         }
 
         case -1: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Window is too small.");
+            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0,
+                          "Window is too small. Try enlarging your window or re-running the command with the 'small' argument.");
             return;
         }
 
@@ -466,146 +483,6 @@ void cmd_conference(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*ar
     line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Conference [%d] created.", conferencenum);
 }
 
-void cmd_groupchat(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
-{
-    if (get_num_active_windows() >= MAX_WINDOWS_NUM) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, RED, " * Warning: Too many windows are open.");
-        return;
-    }
-
-    if (argc < 1) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Group name required");
-        return;
-    }
-
-    const char *tmp_name = argv[1];
-    int len = strlen(tmp_name);
-
-    if (len == 0 || len > TOX_GROUP_MAX_GROUP_NAME_LENGTH) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invalid group name.");
-        return;
-    }
-
-    char name[TOX_GROUP_MAX_GROUP_NAME_LENGTH];
-
-    snprintf(name, sizeof(name), "%s", argv[1]);
-
-    size_t nick_length = tox_self_get_name_size(m);
-    char self_nick[TOX_MAX_NAME_LENGTH + 1];
-    tox_self_get_name(m, (uint8_t *) self_nick);
-    self_nick[nick_length] = '\0';
-
-    Tox_Err_Group_New err;
-    uint32_t groupnumber = tox_group_new(m, TOX_GROUP_PRIVACY_STATE_PUBLIC, (const uint8_t *) name, len,
-                                         (const uint8_t *) self_nick, nick_length, &err);
-
-    if (err != TOX_ERR_GROUP_NEW_OK) {
-        switch (err) {
-            case TOX_ERR_GROUP_NEW_TOO_LONG: {
-                line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Group name length cannot exceed %d.",
-                              TOX_GROUP_MAX_GROUP_NAME_LENGTH);
-                break;
-            }
-
-            case TOX_ERR_GROUP_NEW_EMPTY: {
-                line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Group name cannot be empty.");
-                break;
-            }
-
-            default: {
-                line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Group chat instance failed to initialize (error %d).", err);
-                break;
-            }
-        }
-
-        return;
-    }
-
-    int init = init_groupchat_win(m, groupnumber, name, len, Group_Join_Type_Create);
-
-    if (init == -1) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Group chat window failed to initialize.");
-        tox_group_leave(m, groupnumber, NULL, 0, NULL);
-    } else if (init == -2) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0,
-                      "You have been kicked from a group. Close the window and try again.");
-        tox_group_leave(m, groupnumber, NULL, 0, NULL);
-    }
-}
-
-void cmd_join(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
-{
-    if (get_num_active_windows() >= MAX_WINDOWS_NUM) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, RED, " * Warning: Too many windows are open.");
-        return;
-    }
-
-    if (argc < 1) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Chat ID is required.");
-        return;
-    }
-
-    const char *chat_id = argv[1];
-
-    if (strlen(chat_id) != TOX_GROUP_CHAT_ID_SIZE * 2) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invalid chat ID");
-        return;
-    }
-
-    char id_bin[TOX_GROUP_CHAT_ID_SIZE] = {0};
-
-    size_t i;
-    char xch[3];
-    uint32_t x;
-
-    for (i = 0; i < TOX_GROUP_CHAT_ID_SIZE; ++i) {
-        xch[0] = chat_id[2 * i];
-        xch[1] = chat_id[2 * i + 1];
-        xch[2] = '\0';
-
-        if (sscanf(xch, "%02x", &x) != 1) {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invalid chat ID.");
-            return;
-        }
-
-        id_bin[i] = x;
-    }
-
-    const char *passwd = NULL;
-    uint16_t passwd_len = 0;
-
-    if (argc > 1) {
-        passwd = argv[2];
-        passwd_len = strlen(passwd);
-    }
-
-    size_t nick_length = tox_self_get_name_size(m);
-    char self_nick[TOX_MAX_NAME_LENGTH + 1];
-    tox_self_get_name(m, (uint8_t *) self_nick);
-    self_nick[nick_length] = '\0';
-
-    Tox_Err_Group_Join err;
-    uint32_t groupnumber = tox_group_join(m, (uint8_t *) id_bin, (const uint8_t *) self_nick, nick_length,
-                                          (const uint8_t *) passwd, passwd_len, &err);
-
-    if (err != TOX_ERR_GROUP_JOIN_OK) {
-        if (err == TOX_ERR_GROUP_JOIN_TOO_LONG) {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Password length cannot exceed %d.", TOX_GROUP_MAX_PASSWORD_SIZE);
-        } else {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to join group (error %d).", err);
-        }
-
-        return;
-    }
-
-    int init = init_groupchat_win(m, groupnumber, NULL, 0, Group_Join_Type_Join);
-
-    if (init == -1) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Group chat window failed to initialize.");
-        tox_group_leave(m, groupnumber, NULL, 0, NULL);
-    }
-}
-
 void cmd_log(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
 {
     UNUSED_VAR(window);
@@ -656,7 +533,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;
     }
@@ -673,7 +550,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;
     }
@@ -791,9 +668,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])
@@ -909,8 +789,6 @@ void cmd_status(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[
 
     tox_self_set_status(m, status);
     prompt_update_status(prompt, status);
-    set_status_all_groups(m, status);
-
     line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Your status has been changed to %s.", status_str);
 
 

src/global_commands.h

@@ -30,11 +30,9 @@ void cmd_accept(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZ
 void cmd_add(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_avatar(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_clear(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_conference(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_connect(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_decline(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_groupchat(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
+void cmd_conference(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_join(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_log(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_myid(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 #ifdef QRCODE

src/groupchat_commands.c

@@ -1,942 +0,0 @@
-/*  groupchat_commands.c
- *
- *
- *  Copyright (C) 2020 Toxic All Rights Reserved.
- *
- *  This file is part of Toxic.
- *
- *  Toxic is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Toxic is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Toxic.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <string.h>
-#include <stdlib.h>
-
-#include "toxic.h"
-#include "windows.h"
-#include "line_info.h"
-#include "misc_tools.h"
-#include "log.h"
-#include "groupchats.h"
-
-extern GroupChat groupchats[MAX_GROUPCHAT_NUM];
-
-void cmd_chatid(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
-{
-    char chatid[TOX_GROUP_CHAT_ID_SIZE * 2 + 1] = {0};
-    char chat_public_key[TOX_GROUP_CHAT_ID_SIZE];
-
-    Tox_Err_Group_State_Queries err;
-
-    if (!tox_group_get_chat_id(m, self->num, (uint8_t *) chat_public_key, &err)) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to retrieve the Chat ID (error %d).", err);
-        return;
-    }
-
-    for (size_t i = 0; i < TOX_GROUP_CHAT_ID_SIZE; ++i) {
-        char xx[3];
-        snprintf(xx, sizeof(xx), "%02X", chat_public_key[i] & 0xff);
-        strcat(chatid, xx);
-    }
-
-    line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "%s", chatid);
-}
-
-void cmd_disconnect(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
-{
-    Tox_Err_Group_Disconnect err;
-    tox_group_disconnect(m, self->num, &err);
-
-    switch (err) {
-        case TOX_ERR_GROUP_DISCONNECT_OK: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0,  "Disconnected from group. Type '/rejoin' to reconnect.");
-            return;
-        }
-
-        case TOX_ERR_GROUP_DISCONNECT_ALREADY_DISCONNECTED: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0,  "Already disconnected. Type '/rejoin' to connect.");
-            return;
-        }
-
-        default: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0,  "Failed to disconnect from group. Error: %d", err);
-            return;
-        }
-    }
-}
-
-void cmd_group_nick(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
-{
-    UNUSED_VAR(window);
-
-    if (argc < 1) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Input required.");
-        return;
-    }
-
-    char nick[MAX_STR_SIZE];
-    snprintf(nick, sizeof(nick), "%s", argv[1]);
-    size_t len = strlen(nick);
-
-    if (!valid_nick(nick)) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invalid name.");
-        return;
-    }
-
-    len = MIN(len, TOXIC_MAX_NAME_LENGTH - 1);
-    nick[len] = '\0';
-
-    set_nick_this_group(self, m, nick, len);
-
-    store_data(m, DATA_FILE);
-}
-
-void cmd_ignore(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
-{
-    if (argc < 1) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Peer name or public key must be specified.");
-        return;
-    }
-
-    const char *nick = argv[1];
-    uint32_t peer_id;
-
-    if (group_get_peer_id_of_identifier(self, nick, &peer_id) != 0) {
-        return;
-    }
-
-    Tox_Err_Group_Set_Ignore err;
-    tox_group_set_ignore(m, self->num, peer_id, true, &err);
-
-    switch (err) {
-        case TOX_ERR_GROUP_SET_IGNORE_OK: {
-            break;
-        }
-
-        case TOX_ERR_GROUP_SET_IGNORE_SELF: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "You cannot ignore yourself.");
-            return;
-        }
-
-        case TOX_ERR_GROUP_SET_IGNORE_PEER_NOT_FOUND: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "The specified nick or public key is invalid.");
-            return;
-        }
-
-        default: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to toggle ignore on %s (error %d).", nick, err);
-            return;
-        }
-    }
-
-    line_info_add(self, true, NULL, NULL, SYS_MSG, 1, BLUE, "-!- Ignoring %s", nick);
-
-    group_toggle_peer_ignore(self->num, peer_id, true);
-}
-
-void cmd_kick(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
-{
-    if (argc < 1) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Peer name or public key must be specified.");
-        return;
-    }
-
-    const char *nick = argv[1];
-
-    uint32_t target_peer_id;
-
-    if (group_get_peer_id_of_identifier(self, nick, &target_peer_id) != 0) {
-        return;
-    }
-
-    Tox_Err_Group_Mod_Kick_Peer err;
-    tox_group_mod_kick_peer(m, self->num, target_peer_id, &err);
-
-    switch (err) {
-        case TOX_ERR_GROUP_MOD_KICK_PEER_OK: {
-            char self_nick[TOX_MAX_NAME_LENGTH + 1];
-            get_group_self_nick_truncate(m, self_nick, self->num);
-
-            line_info_add(self, true, NULL, NULL, SYS_MSG, 1, RED, "-!- %s has been kicked by %s", nick, self_nick);
-            groupchat_onGroupPeerExit(self, m, self->num, target_peer_id, TOX_GROUP_EXIT_TYPE_KICK, nick, strlen(nick), NULL, 0);
-            return;
-        }
-
-        case TOX_ERR_GROUP_MOD_KICK_PEER_PERMISSIONS: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0,  "You do not have permission to kick %s.", nick);
-            return;
-        }
-
-        case TOX_ERR_GROUP_MOD_KICK_PEER_SELF: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0,  "You cannot kick yourself.");
-            return;
-        }
-
-        case TOX_ERR_GROUP_MOD_KICK_PEER_PEER_NOT_FOUND: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0,  "Specified nick or public key is invalid.");
-            return;
-        }
-
-        default: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0,  "Failed to kick %s from the group (error %d).", nick,
-                          err);
-            return;
-        }
-    }
-}
-
-void cmd_list(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
-{
-    GroupChat *chat = get_groupchat(self->num);
-
-    if (!chat) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to fetch GroupChat object.");
-        return;
-    }
-
-    for (size_t i = 0; i < chat->max_idx; ++i) {
-        GroupPeer *peer = &chat->peer_list[i];
-
-        if (!peer->active) {
-            continue;
-        }
-
-        char pk_string[TOX_GROUP_PEER_PUBLIC_KEY_SIZE * 2 + 1] = {0};
-
-        for (size_t j = 0; j < TOX_GROUP_PEER_PUBLIC_KEY_SIZE; ++j) {
-            char d[3];
-            snprintf(d, sizeof(d), "%02X", peer->public_key[j] & 0xff);
-            strcat(pk_string, d);
-        }
-
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0,  "%s : %s", pk_string, peer->name);
-    }
-}
-
-void cmd_mod(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
-{
-    if (argc < 1) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Peer name or public key must be specified.");
-        return;
-    }
-
-    const char *nick = argv[1];
-    uint32_t target_peer_id;
-
-    if (group_get_peer_id_of_identifier(self, nick, &target_peer_id) != 0) {
-        return;
-    }
-
-    Tox_Err_Group_Self_Query s_err;
-    uint32_t self_peer_id = tox_group_self_get_peer_id(m, self->num, &s_err);
-
-    if (s_err != TOX_ERR_GROUP_SELF_QUERY_OK) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0,  "Failed to fetch self peer_id.");
-        return;
-    }
-
-    Tox_Err_Group_Mod_Set_Role err;
-    tox_group_mod_set_role(m, self->num, target_peer_id, TOX_GROUP_ROLE_MODERATOR, &err);
-
-    switch (err) {
-        case TOX_ERR_GROUP_MOD_SET_ROLE_OK: {
-            groupchat_onGroupModeration(self, m, self->num, self_peer_id, target_peer_id, TOX_GROUP_MOD_EVENT_MODERATOR);
-            return;
-        }
-
-        case TOX_ERR_GROUP_MOD_SET_ROLE_PERMISSIONS: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0,  "You do not have permission to promote moderators.");
-            return;
-        }
-
-        case TOX_ERR_GROUP_MOD_SET_ROLE_ASSIGNMENT: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0,  "%s is already a moderator.", nick);
-            return;
-        }
-
-        case TOX_ERR_GROUP_MOD_SET_ROLE_SELF: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "You cannot make yourself a moderator.");
-            return;
-        }
-
-        case TOX_ERR_GROUP_MOD_SET_ROLE_PEER_NOT_FOUND: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "The specified nick or public key is invalid.");
-            return;
-        }
-
-        default: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0,  "Failed to promote peer to moderator (error %d).", err);
-            return;
-        }
-    }
-}
-
-void cmd_unmod(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
-{
-    if (argc < 1) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Peer name or public key must be specified.");
-        return;
-    }
-
-    const char *nick = argv[1];
-    uint32_t target_peer_id;
-
-    if (group_get_peer_id_of_identifier(self, nick, &target_peer_id) != 0) {
-        return;
-    }
-
-    Tox_Err_Group_Self_Query s_err;
-    uint32_t self_peer_id = tox_group_self_get_peer_id(m, self->num, &s_err);
-
-    if (s_err != TOX_ERR_GROUP_SELF_QUERY_OK) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0,  "Failed to fetch self peer_id.");
-        return;
-    }
-
-    if (tox_group_peer_get_role(m, self->num, target_peer_id, NULL) != TOX_GROUP_ROLE_MODERATOR) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "%s is not a moderator.", nick);
-        return;
-    }
-
-    Tox_Err_Group_Mod_Set_Role err;
-    tox_group_mod_set_role(m, self->num, target_peer_id, TOX_GROUP_ROLE_USER, &err);
-
-    switch (err) {
-        case TOX_ERR_GROUP_MOD_SET_ROLE_OK: {
-            groupchat_onGroupModeration(self, m, self->num, self_peer_id, target_peer_id, TOX_GROUP_MOD_EVENT_USER);
-            return;
-        }
-
-        case TOX_ERR_GROUP_MOD_SET_ROLE_PERMISSIONS: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0,  "You do not have permission to unmod %s.", nick);
-            return;
-        }
-
-        case TOX_ERR_GROUP_MOD_SET_ROLE_SELF: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "You cannot remove your own moderator status.");
-            return;
-        }
-
-        case TOX_ERR_GROUP_MOD_SET_ROLE_PEER_NOT_FOUND: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "The specified nick or public key is invalid.");
-            return;
-        }
-
-        default: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0,  "Failed to revoke moderator powers from %s (error %d).", nick,
-                          err);
-            return;
-        }
-    }
-}
-
-void cmd_set_passwd(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
-{
-    const char *passwd = NULL;
-    size_t len = 0;
-
-    if (argc > 0) {
-        passwd = argv[1];
-        len = strlen(passwd);
-    }
-
-    Tox_Err_Group_Founder_Set_Password err;
-    tox_group_founder_set_password(m, self->num, (uint8_t *) passwd, len, &err);
-
-    switch (err) {
-        case TOX_ERR_GROUP_FOUNDER_SET_PASSWORD_OK: {
-            if (len > 0) {
-                line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Password has been set to %s.", passwd);
-            } else {
-                line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Password has been unset.");
-            }
-
-            return;
-        }
-
-        case TOX_ERR_GROUP_FOUNDER_SET_PASSWORD_TOO_LONG: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Password length must not exceed %d.",
-                          TOX_GROUP_MAX_PASSWORD_SIZE);
-            return;
-        }
-
-        case TOX_ERR_GROUP_FOUNDER_SET_PASSWORD_PERMISSIONS: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "You do not have permission to set the password.");
-            return;
-        }
-
-        default: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to set password (error %d).", err);
-            return;
-        }
-    }
-}
-
-void cmd_set_peerlimit(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
-{
-    int maxpeers = 0;
-
-    if (argc < 1) {
-        Tox_Err_Group_State_Queries err;
-        uint32_t maxpeers = tox_group_get_peer_limit(m, self->num, &err);
-
-        if (err != TOX_ERR_GROUP_STATE_QUERIES_OK) {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to retrieve peer limit (error %d).", err);
-            return;
-        }
-
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Peer limit is set to %d", maxpeers);
-        return;
-    }
-
-    maxpeers = atoi(argv[1]);
-
-    if (maxpeers <= 0) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Peer limit must be a value greater than 0.");
-        return;
-    }
-
-    Tox_Err_Group_Founder_Set_Peer_Limit err;
-    tox_group_founder_set_peer_limit(m, self->num, maxpeers, &err);
-
-    switch (err) {
-        case TOX_ERR_GROUP_FOUNDER_SET_PEER_LIMIT_OK: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Peer limit has been set to %d.", maxpeers);
-            return;
-        }
-
-        case TOX_ERR_GROUP_FOUNDER_SET_PEER_LIMIT_PERMISSIONS: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "You do not have permission to set the peer limit.");
-            return;
-        }
-
-        default: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to set the peer limit (error %d).", err);
-            return;
-        }
-    }
-}
-
-void cmd_set_voice(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
-{
-    Tox_Group_Voice_State voice_state;
-
-    if (argc < 1) {
-        Tox_Err_Group_State_Queries err;
-        voice_state = tox_group_get_voice_state(m, self->num, &err);
-
-        if (err != TOX_ERR_GROUP_STATE_QUERIES_OK) {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to retrieve voice state (error %d).", err);
-            return;
-        }
-
-        switch (voice_state) {
-            case TOX_GROUP_VOICE_STATE_ALL: {
-                line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Voice state is set to ALL");
-                break;
-            }
-
-            case TOX_GROUP_VOICE_STATE_MODERATOR: {
-                line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Voice state is set to MODERATOR");
-                break;
-            }
-
-            case TOX_GROUP_VOICE_STATE_FOUNDER: {
-                line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Voice state is set to FOUNDER");
-                break;
-            }
-
-            default:
-                line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Error: Unknown voice state: %d", voice_state);
-                return;
-        }
-
-        return;
-    }
-
-    const char *vstate_str = argv[1];
-
-    if (strcasecmp(vstate_str, "mod") == 0) {
-        voice_state = TOX_GROUP_VOICE_STATE_MODERATOR;
-    } else if (strcasecmp(vstate_str, "founder") == 0) {
-        voice_state = TOX_GROUP_VOICE_STATE_FOUNDER;
-    } else if (strcasecmp(vstate_str, "all") == 0) {
-        voice_state = TOX_GROUP_VOICE_STATE_ALL;
-    } else {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0,
-                      "voice state must be \"all\", \"mod\", or \"founder\".");
-        return;
-    }
-
-    Tox_Err_Group_Founder_Set_Voice_State err;
-    tox_group_founder_set_voice_state(m, self->num, voice_state, &err);
-
-    switch (err) {
-        case TOX_ERR_GROUP_FOUNDER_SET_VOICE_STATE_OK: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Voice state has been set to %s.", vstate_str);
-            return;
-        }
-
-        case TOX_ERR_GROUP_FOUNDER_SET_VOICE_STATE_PERMISSIONS: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "You do not have permission to set the voice state.");
-            return;
-        }
-
-        default: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Error setting voice state (error %d).", err);
-            return;
-        }
-    }
-}
-
-void cmd_set_privacy(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
-{
-    const char *pstate_str = NULL;
-    Tox_Group_Privacy_State privacy_state;
-
-    if (argc < 1) {
-        Tox_Err_Group_State_Queries err;
-        privacy_state = tox_group_get_privacy_state(m, self->num, &err);
-
-        if (err != TOX_ERR_GROUP_STATE_QUERIES_OK) {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to retrieve privacy state (error %d).", err);
-            return;
-        }
-
-        pstate_str = privacy_state == TOX_GROUP_PRIVACY_STATE_PRIVATE ? "private" : "public";
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Privacy state is set to %s.", pstate_str);
-        return;
-    }
-
-    pstate_str = argv[1];
-
-    if (strcasecmp(pstate_str, "private") != 0 && strcasecmp(pstate_str, "public") != 0) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Privacy state must be \"private\" or \"public\".");
-        return;
-    }
-
-    privacy_state = strcasecmp(pstate_str,
-                               "private") == 0 ? TOX_GROUP_PRIVACY_STATE_PRIVATE : TOX_GROUP_PRIVACY_STATE_PUBLIC;
-
-    Tox_Err_Group_Founder_Set_Privacy_State err;
-    tox_group_founder_set_privacy_state(m, self->num, privacy_state, &err);
-
-    switch (err) {
-        case TOX_ERR_GROUP_FOUNDER_SET_PRIVACY_STATE_OK: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Privacy state has been set to %s.", pstate_str);
-            return;
-        }
-
-        case TOX_ERR_GROUP_FOUNDER_SET_PRIVACY_STATE_PERMISSIONS: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "You do not have permission to set the privacy state.");
-            return;
-        }
-
-        default: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Error setting privacy state (error %d).", err);
-            return;
-        }
-    }
-}
-
-void cmd_set_topic_lock(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
-{
-    Tox_Group_Topic_Lock topic_lock;
-    const char *tlock_str = NULL;
-
-    if (argc < 1) {
-        Tox_Err_Group_State_Queries err;
-        topic_lock = tox_group_get_topic_lock(m, self->num, &err);
-
-        if (err != TOX_ERR_GROUP_STATE_QUERIES_OK) {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to retrieve topic lock (error %d).", err);
-            return;
-        }
-
-        tlock_str = topic_lock == TOX_GROUP_TOPIC_LOCK_ENABLED ? "Enabled" : "Disabled";
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Topic lock is %s.", tlock_str);
-        return;
-    }
-
-    tlock_str = argv[1];
-
-    if (strcasecmp(tlock_str, "on") != 0 && strcasecmp(tlock_str, "off") != 0) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Topic lock must be \"on\" or \"off\".");
-        return;
-    }
-
-    topic_lock = strcasecmp(tlock_str, "on") == 0 ? TOX_GROUP_TOPIC_LOCK_ENABLED : TOX_GROUP_TOPIC_LOCK_DISABLED;
-    const char *display_str = (topic_lock ==  TOX_GROUP_TOPIC_LOCK_ENABLED) ? "enabled" : "disabled";
-
-    Tox_Err_Group_Founder_Set_Topic_Lock err;
-    tox_group_founder_set_topic_lock(m, self->num, topic_lock, &err);
-
-    switch (err) {
-        case TOX_ERR_GROUP_FOUNDER_SET_TOPIC_LOCK_OK: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Topic lock has been %s.", display_str);
-            return;
-        }
-
-        case TOX_ERR_GROUP_FOUNDER_SET_TOPIC_LOCK_PERMISSIONS: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "You do not have permission to set the topic lock.");
-            return;
-        }
-
-        default: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Error setting topic lock (%d).", err);
-            return;
-        }
-    }
-}
-
-void cmd_silence(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
-{
-    if (argc < 1) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Peer name or public key must be specified.");
-        return;
-    }
-
-    const char *nick = argv[1];
-    uint32_t target_peer_id;
-
-    if (group_get_peer_id_of_identifier(self, nick, &target_peer_id) != 0) {
-        return;
-    }
-
-    Tox_Err_Group_Self_Query s_err;
-    uint32_t self_peer_id = tox_group_self_get_peer_id(m, self->num, &s_err);
-
-    if (s_err != TOX_ERR_GROUP_SELF_QUERY_OK) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0,  "Failed to fetch self peer_id.");
-        return;
-    }
-
-    Tox_Err_Group_Mod_Set_Role err;
-    tox_group_mod_set_role(m, self->num, target_peer_id, TOX_GROUP_ROLE_OBSERVER, &err);
-
-    switch (err) {
-        case TOX_ERR_GROUP_MOD_SET_ROLE_OK: {
-            groupchat_onGroupModeration(self, m, self->num, self_peer_id, target_peer_id, TOX_GROUP_MOD_EVENT_OBSERVER);
-            return;
-        }
-
-        case TOX_ERR_GROUP_MOD_SET_ROLE_PERMISSIONS: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "You do not have permission to silence %s.", nick);
-            return;
-        }
-
-        case TOX_ERR_GROUP_MOD_SET_ROLE_ASSIGNMENT: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "%s is already silenced.", nick);
-            return;
-        }
-
-        case TOX_ERR_GROUP_MOD_SET_ROLE_SELF: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "You cannot silence yourself.");
-            return;
-        }
-
-        case TOX_ERR_GROUP_MOD_SET_ROLE_PEER_NOT_FOUND: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "The specified nick or public key is invalid.");
-            return;
-        }
-
-        default: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to silence %s (error %d).", nick, err);
-            return;
-        }
-    }
-}
-
-void cmd_unsilence(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
-{
-    if (argc < 1) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Peer name or public key must be specified.");
-        return;
-    }
-
-    const char *nick = argv[1];
-    uint32_t target_peer_id;
-
-    if (group_get_peer_id_of_identifier(self, nick, &target_peer_id) != 0) {
-        return;
-    }
-
-    if (tox_group_peer_get_role(m, self->num, target_peer_id, NULL) != TOX_GROUP_ROLE_OBSERVER) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "%s is not silenced.", nick);
-        return;
-    }
-
-    Tox_Err_Group_Self_Query s_err;
-    uint32_t self_peer_id = tox_group_self_get_peer_id(m, self->num, &s_err);
-
-    if (s_err != TOX_ERR_GROUP_SELF_QUERY_OK) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0,  "Failed to fetch self peer_id.");
-        return;
-    }
-
-    Tox_Err_Group_Mod_Set_Role err;
-    tox_group_mod_set_role(m, self->num, target_peer_id, TOX_GROUP_ROLE_USER, &err);
-
-    switch (err) {
-        case TOX_ERR_GROUP_MOD_SET_ROLE_OK: {
-            groupchat_onGroupModeration(self, m, self->num, self_peer_id, target_peer_id, TOX_GROUP_MOD_EVENT_USER);
-            return;
-        }
-
-        case TOX_ERR_GROUP_MOD_SET_ROLE_PERMISSIONS: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "You do not have permission to unsilence %s.", nick);
-            return;
-        }
-
-        case TOX_ERR_GROUP_MOD_SET_ROLE_ASSIGNMENT: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "%s is not silenced.", nick);
-            return;
-        }
-
-        case TOX_ERR_GROUP_MOD_SET_ROLE_SELF: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "You cannot unsilence yourself.");
-            return;
-        }
-
-        case TOX_ERR_GROUP_MOD_SET_ROLE_PEER_NOT_FOUND: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "The specified nick or public key is invalid.");
-            return;
-        }
-
-        default: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to unsilence %s (error %d).", nick, err);
-            return;
-        }
-    }
-}
-
-void cmd_rejoin(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
-{
-    Tox_Err_Group_Reconnect err;
-
-    if (!tox_group_reconnect(m, self->num, &err)) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to rejoin group (error %d).", err);
-        return;
-    }
-
-    line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Reconnecting to group...");
-
-    groupchat_rejoin(self, m);
-}
-
-void cmd_set_topic(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
-{
-    if (argc < 1) {
-        Tox_Err_Group_State_Queries err;
-        size_t tlen = tox_group_get_topic_size(m, self->num, &err);
-
-        if (err != TOX_ERR_GROUP_STATE_QUERIES_OK) {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to retrieve topic length (error %d).", err);
-            return;
-        }
-
-        if (tlen > 0) {
-            char cur_topic[TOX_GROUP_MAX_TOPIC_LENGTH + 1];
-
-            if (!tox_group_get_topic(m, self->num, (uint8_t *) cur_topic, &err)) {
-                line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to retrieve topic (error %d).", err);
-                return;
-            }
-
-            cur_topic[tlen] = 0;
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Topic is set to: %s", cur_topic);
-        } else {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Topic is not set.");
-        }
-
-        return;
-    }
-
-    const char *topic = argv[1];
-
-    Tox_Err_Group_Topic_Set err;
-    tox_group_set_topic(m, self->num, (uint8_t *) topic, strlen(topic), &err);
-
-    switch (err) {
-        case TOX_ERR_GROUP_TOPIC_SET_OK: {
-            /* handled below switch */
-            break;
-        }
-
-        case TOX_ERR_GROUP_TOPIC_SET_TOO_LONG: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Topic length must not exceed %d.", TOX_GROUP_MAX_TOPIC_LENGTH);
-            return;
-        }
-
-        case TOX_ERR_GROUP_TOPIC_SET_PERMISSIONS: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "You do not have permission to set the topic.");
-            return;
-        }
-
-        case TOX_ERR_GROUP_TOPIC_SET_DISCONNECTED: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "You are disconnected from the group.");
-            return;
-        }
-
-        default: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to set the topic (error %d).", err);
-            return;
-        }
-    }
-
-    char self_nick[TOX_MAX_NAME_LENGTH + 1];
-    get_group_self_nick_truncate(m, self_nick, self->num);
-
-    line_info_add(self, true, NULL, NULL, SYS_MSG, 1, MAGENTA, "-!- You set the topic to: %s", topic);
-
-    char tmp_event[MAX_STR_SIZE];
-    snprintf(tmp_event, sizeof(tmp_event), "set topic to %s", topic);
-    write_to_log(tmp_event, self_nick, self->chatwin->log, true);
-}
-
-void cmd_unignore(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
-{
-    if (argc < 1) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Peer must be specified.");
-        return;
-    }
-
-    const char *nick = argv[1];
-    uint32_t peer_id;
-
-    if (group_get_peer_id_of_identifier(self, nick, &peer_id) != 0) {
-        return;
-    }
-
-    Tox_Err_Group_Set_Ignore err;
-    tox_group_set_ignore(m, self->num, peer_id, false, &err);
-
-    switch (err) {
-        case TOX_ERR_GROUP_SET_IGNORE_OK: {
-            break;
-        }
-
-        case TOX_ERR_GROUP_SET_IGNORE_SELF: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "You cannot unignore yourself.");
-            return;
-        }
-
-        case TOX_ERR_GROUP_SET_IGNORE_PEER_NOT_FOUND: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "The specified nick or public key is invalid.");
-            return;
-        }
-
-        default: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to toggle ignore on %s (error %d).", nick, err);
-            return;
-        }
-    }
-
-    line_info_add(self, true, NULL, NULL, SYS_MSG, 1, BLUE, "-!- You are no longer ignoring %s", nick);
-
-    group_toggle_peer_ignore(self->num, peer_id, false);
-}
-
-void cmd_whois(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
-{
-    if (argc < 1) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Peer must be specified.");
-        return;
-    }
-
-    GroupChat *chat = get_groupchat(self->num);
-
-    if (!chat) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to fetch GroupChat object.");
-        return;
-    }
-
-    const char *identifier = argv[1];
-    bool is_public_key = false;
-
-    for (size_t i = 0; i < chat->max_idx && !is_public_key; ++i) {
-        uint32_t peer_id;
-
-        if (group_get_public_key_peer_id(self->num, identifier, &peer_id) == 0) {
-            is_public_key = true;
-        } else {
-            GroupPeer *peer = &chat->peer_list[i];
-
-            if (!peer->active) {
-                continue;
-            }
-
-            if (strcmp(identifier, peer->name) != 0) {
-                continue;
-            }
-
-            peer_id = peer->peer_id;
-        }
-
-        int peer_index = get_peer_index(self->num, peer_id);
-
-        if (peer_index < 0) {
-            continue;
-        }
-
-        GroupPeer *peer = &chat->peer_list[peer_index];
-
-        const char *status_str = "Online";
-
-        if (peer->status == TOX_USER_STATUS_BUSY) {
-            status_str = "Busy";
-        } else if (peer->status == TOX_USER_STATUS_AWAY) {
-            status_str = "Away";
-        }
-
-        const char *role_str = "User";
-
-        if (peer->role == TOX_GROUP_ROLE_FOUNDER) {
-            role_str = "Founder";
-        } else if (peer->role == TOX_GROUP_ROLE_MODERATOR) {
-            role_str = "Moderator";
-        } else if (peer->role == TOX_GROUP_ROLE_OBSERVER) {
-            role_str = "Observer";
-        }
-
-        char last_seen_str[128];
-        get_elapsed_time_str_alt(last_seen_str, sizeof(last_seen_str),
-                                 get_unix_time() - peer->last_active);
-
-        char pk_string[TOX_GROUP_PEER_PUBLIC_KEY_SIZE * 2 + 1] = {0};
-
-        for (size_t i = 0; i < TOX_GROUP_PEER_PUBLIC_KEY_SIZE; ++i) {
-            char d[3];
-            snprintf(d, sizeof(d), "%02X", peer->public_key[i] & 0xff);
-            strcat(pk_string, d);
-        }
-
-        Tox_Err_Group_Peer_Query conn_err;
-        Tox_Connection connection_type = tox_group_peer_get_connection_status(m, self->num, peer_id, &conn_err);
-
-        const char *connection_type_str = "Unknown";
-
-        if (conn_err == TOX_ERR_GROUP_PEER_QUERY_OK || connection_type != TOX_CONNECTION_NONE) {
-            connection_type_str = connection_type == TOX_CONNECTION_UDP ? "UDP" : "TCP";
-        }
-
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Public key: %s", pk_string);
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Name: %s", peer->name);
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Role: %s", role_str);
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Status: %s", status_str);
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Connection: %s", connection_type_str);
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Last active: %s", last_seen_str);
-    }
-}
-

src/groupchat_commands.h

@@ -1,51 +0,0 @@
-/*  groupchat_commands.h
- *
- *
- *  Copyright (C) 2020 Toxic All Rights Reserved.
- *
- *  This file is part of Toxic.
- *
- *  Toxic is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Toxic is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Toxic.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef GROUPCHAT_COMMANDS_H
-#define GROUPCHAT_COMMANDS_H
-
-#include "windows.h"
-#include "toxic.h"
-
-void cmd_chatid(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_disconnect(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_group_nick(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_ignore(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_kick(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_list(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_mod(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_prune(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_set_passwd(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_set_peerlimit(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_set_privacy(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_set_voice(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_set_topic_lock(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_rejoin(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_set_topic(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_silence(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_unsilence(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_unignore(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_unmod(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_whois(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
-
-#endif  /* GROUPCHAT_COMMANDS_H */
-

src/groupchats.h

@@ -1,120 +0,0 @@
-/*  groupchats.h
- *
- *
- *  Copyright (C) 2020 Toxic All Rights Reserved.
- *
- *  This file is part of Toxic.
- *
- *  Toxic is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Toxic is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Toxic.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef GROUPCHATS_H
-#define GROUPCHATS_H
-
-#include "toxic.h"
-#include "windows.h"
-
-#ifndef SIDEWAR_WIDTH
-#define SIDEBAR_WIDTH 16
-#endif
-
-#define MAX_GROUPCHAT_NUM (MAX_WINDOWS_NUM - 2)
-
-typedef enum Group_Join_Type {
-    Group_Join_Type_Create,
-    Group_Join_Type_Join,
-    Group_Join_Type_Load,
-} Group_Join_Type;
-
-typedef struct GroupPeer {
-    bool             active;
-    char             name[TOX_MAX_NAME_LENGTH];
-    size_t           name_length;
-    char             prev_name[TOX_MAX_NAME_LENGTH];
-    uint32_t         peer_id;
-    uint8_t          public_key[TOX_GROUP_PEER_PUBLIC_KEY_SIZE];
-    TOX_USER_STATUS  status;
-    Tox_Group_Role   role;
-    bool             is_ignored;
-    uint64_t         last_active;
-} GroupPeer;
-
-typedef struct {
-    GroupPeer  *peer_list;
-    char       **name_list;   /* List of peer names, needed for tab completion */
-    uint32_t   num_peers;     /* Number of peers in the chat/name_list array */
-    uint32_t   max_idx;       /* Maximum peer list index - 1 */
-
-    uint8_t    **ignored_list; /* List of keys of peers that we're ignoring */
-    uint16_t   num_ignored;
-
-    char       group_name[TOX_GROUP_MAX_GROUP_NAME_LENGTH + 1];
-    size_t     group_name_length;
-    uint32_t   groupnumber;
-    bool       active;
-    uint64_t   time_connected;    /* The time we successfully connected to the group */
-
-    int        chatwin;
-    int        side_pos;     /* current position of the sidebar - used for scrolling up and down */
-} GroupChat;
-
-void exit_groupchat(ToxWindow *self, Tox *m, uint32_t groupnumber, const char *partmessage, size_t length);
-int init_groupchat_win(Tox *m, uint32_t groupnumber, const char *groupname, size_t length, Group_Join_Type join_type);
-void set_nick_this_group(ToxWindow *self, Tox *m, const char *new_nick, size_t length);
-void set_status_all_groups(Tox *m, uint8_t status);
-int get_peer_index(uint32_t groupnumber, uint32_t peer_id);
-void groupchat_onGroupPeerExit(ToxWindow *self, Tox *m, uint32_t groupnumber, uint32_t peer_id,
-                               Tox_Group_Exit_Type exit_type,
-                               const char *name, size_t name_len, const char *partmessage, size_t len);
-void groupchat_onGroupModeration(ToxWindow *self, Tox *m, uint32_t groupnumber, uint32_t src_peer_id,
-                                 uint32_t tgt_peer_id, Tox_Group_Mod_Event type);
-
-void groupchat_rejoin(ToxWindow *self, Tox *m);
-
-/* Puts the peer_id associated with `identifier` in `peer_id`. The string may be
- * either a nick or a public key.
- *
- * On failure, `peer_id` is set to (uint32_t)-1.
- *
- * This function is intended to be a helper for groupchat_commands.c and will print
- * error messages to `self`.
- * Return 0 on success.
- * Return -1 if the identifier does not correspond with a peer in the group.
- * Return -2 if the identifier is a nick and the nick is in use by multiple peers.
- */
-int group_get_peer_id_of_identifier(ToxWindow *self, const char *identifier, uint32_t *peer_id);
-
-/* Gets the peer_id associated with `public_key`.
- *
- * Returns 0 on success.
- * Returns -1 on failure or if `public_key` is invalid.
- */
-int group_get_public_key_peer_id(uint32_t groupnumber, const char *public_key, uint32_t *peer_id);
-
-/* destroys and re-creates groupchat window */
-void redraw_groupchat_win(ToxWindow *self);
-
-/*
- * Return a GroupChat pointer associated with groupnumber.
- * Return NULL if groupnumber is invalid.
- */
-GroupChat *get_groupchat(uint32_t groupnumber);
-
-/**
- * Toggles the ignore status of the peer associated with `peer_id`.
- */
-void group_toggle_peer_ignore(uint32_t groupnumber, int peer_id, bool ignore);
-
-#endif /* #define GROUPCHATS_H */

src/help.c

@@ -110,12 +110,6 @@ static void help_draw_menu(ToxWindow *self)
     wattroff(win, A_BOLD | COLOR_PAIR(BLUE));
     wprintw(win, "nference commands\n");
 
-    wprintw(win, " g");
-    wattron(win, A_BOLD | COLOR_PAIR(BLUE));
-    wprintw(win, "r");
-    wattroff(win, A_BOLD | COLOR_PAIR(BLUE));
-    wprintw(win, "oupchat commands\n");
-
 #ifdef PYTHON
     wattron(win, A_BOLD | COLOR_PAIR(BLUE));
     wprintw(win, " p");
@@ -177,18 +171,16 @@ static void help_draw_global(ToxWindow *self)
     wprintw(win, "  /add <addr> <msg>          : Add contact with optional message\n");
     wprintw(win, "  /accept <id>               : Accept friend request\n");
     wprintw(win, "  /avatar <path>             : Set an avatar (leave path empty to unset)\n");
-    wprintw(win, "  /conference <type>         : Create a conference where type: text | audio\n");
-    wprintw(win, "  /connect <ip> <port> <key> : Manually connect to a DHT node\n");
     wprintw(win, "  /decline <id>              : Decline friend request\n");
     wprintw(win, "  /requests                  : List pending friend requests\n");
-    wprintw(win, "  /status <type>             : Set status (Online, Busy, Away)\n");
+    wprintw(win, "  /connect <ip> <port> <key> : Manually connect to a DHT node\n");
+    wprintw(win, "  /status <type> <msg>       : Set status with optional note\n");
     wprintw(win, "  /note <msg>                : Set a personal note\n");
-    wprintw(win, "  /nick <name>               : Set your global name (doesn't affect groups)\n");
+    wprintw(win, "  /nick <nick>               : Set your nickname\n");
     wprintw(win, "  /nospam <value>            : Change part of your Tox ID to stop spam\n");
     wprintw(win, "  /log <on> or <off>         : Enable/disable logging\n");
+    wprintw(win, "  /conference <type>         : Create a conference where type: text | audio\n");
     wprintw(win, "  /myid                      : Print your Tox ID\n");
-    wprintw(win, "  /group <name>              : Create a new group chat\n");
-    wprintw(win, "  /join <chatid>             : Join a groupchat using a Chat ID\n");
 #ifdef GAMES
     wprintw(win, "  /game                      : Play a game\n");
 #endif /* GAMES */
@@ -246,10 +238,8 @@ static void help_draw_chat(ToxWindow *self)
     wprintw(win, "Chat Commands:\n");
     wattroff(win, A_BOLD | COLOR_PAIR(RED));
 
-    wprintw(win, "  /cinvite <n>               : Invite contact to a conference \n");
+    wprintw(win, "  /invite <n>                : Invite contact to a conference \n");
-    wprintw(win, "  /cjoin                     : Join a pending conference\n");
+    wprintw(win, "  /join                      : Join a pending conference\n");
-    wprintw(win, "  /invite <n>                : Invite contact to a groupchat \n");
-    wprintw(win, "  /gaccept <password>        : Accept a pending groupchat invite\n");
     wprintw(win, "  /sendfile <path>           : Send a file\n");
     wprintw(win, "  /savefile <id>             : Receive a file\n");
     wprintw(win, "  /cancel <type> <id>        : Cancel file transfer where type: in|out\n");
@@ -288,45 +278,6 @@ static void help_draw_chat(ToxWindow *self)
     wnoutrefresh(win);
 }
 
-static void help_draw_groupchats(ToxWindow *self)
-{
-    WINDOW *win = self->help->win;
-
-    wmove(win, 1, 1);
-
-    wattron(win, A_BOLD | COLOR_PAIR(RED));
-    wprintw(win, "Groupchat commands:\n");
-    wattroff(win, A_BOLD | COLOR_PAIR(RED));
-
-    wprintw(win, "  /chatid                   : Print this group's ID\n");
-    wprintw(win, "  /close <m>                : Leave the group with an optional part message\n");
-    wprintw(win, "  /disconnect               : Disconnect from the group (credentials retained)\n");
-    wprintw(win, "  /ignore <name>            : Ignore a peer\n");
-    wprintw(win, "  /unignore <name>          : Unignore an ignored peer\n");
-    wprintw(win, "  /kick <name>              : Remove a peer from the group\n");
-    wprintw(win, "  /list                     : Print a list of peers currently in the group\n");
-    wprintw(win, "  /locktopic                : Set the topic lock: on | off\n");
-    wprintw(win, "  /mod <name>               : Promote a peer to moderator\n");
-    wprintw(win, "  /nick <name>              : Set your name for this group only\n");
-    wprintw(win, "  /passwd <s>               : Set a password needed to join the group\n");
-    wprintw(win, "  /peerlimit <n>            : Set the maximum number of peers that can join\n");
-    wprintw(win, "  /privacy <state>          : Set the privacy state: private | public\n");
-    wprintw(win, "  /rejoin                   : Reconnect to the groupchat\n");
-    wprintw(win, "  /silence <name>           : Silence a peer for the entire group\n");
-    wprintw(win, "  /unsilence <name>         : Unsilence a silenced peer\n");
-    wprintw(win, "  /status <type>            : Set your status\n");
-    wprintw(win, "  /topic <m>                : Set the group topic\n");
-    wprintw(win, "  /unmod <name>             : Demote a moderator\n");
-    wprintw(win, "  /voice <state>            : Set the voice state: all | mod | founder\n");
-    wprintw(win, "  /whisper <name> <m>       : Send a private message to a peer\n");
-    wprintw(win, "  /whois <name>             : Print whois info for a peer\n");
-
-    help_draw_bottom_menu(win);
-
-    box(win, ACS_VLINE, ACS_HLINE);
-    wnoutrefresh(win);
-}
-
 static void help_draw_keys(ToxWindow *self)
 {
     WINDOW *win = self->help->win;
@@ -434,21 +385,18 @@ void help_onKey(ToxWindow *self, wint_t key)
             break;
 
         case L'c':
-            height = 12;
 #ifdef VIDEO
-            height += 15;
+            help_init_window(self, 26, 80);
 #elif AUDIO
-            height += 5;
+            help_init_window(self, 21, 80);
+#else
+            help_init_window(self, 11, 80);
 #endif
-#ifdef GAMES
-            height += 1;
-#endif
-            help_init_window(self, height, 80);
             self->help->type = HELP_CHAT;
             break;
 
         case L'g':
-            height = 24;
+            height = 22;
 #ifdef VIDEO
             height += 8;
 #elif AUDIO
@@ -495,11 +443,6 @@ void help_onKey(ToxWindow *self, wint_t key)
             help_init_menu(self);
             self->help->type = HELP_MENU;
             break;
-
-        case L'r':
-            help_init_window(self, 27, 80);
-            self->help->type = HELP_GROUP;
-            break;
     }
 }
 
@@ -536,9 +479,5 @@ void help_onDraw(ToxWindow *self)
             help_draw_plugin(self);
             break;
 #endif /* PYTHON */
-
-        case HELP_GROUP:
-            help_draw_groupchats(self);
-            break;
     }
 }

src/help.h

@@ -29,7 +29,6 @@
 typedef enum {
     HELP_MENU,
     HELP_GLOBAL,
-    HELP_GROUP,
     HELP_CHAT,
     HELP_CONFERENCE,
     HELP_KEYS,

src/input.c

@@ -30,7 +30,6 @@
 #include "line_info.h"
 #include "misc_tools.h"
 #include "notify.h"
-#include "groupchats.h"
 #include "settings.h"
 #include "toxic.h"
 #include "toxic_strings.h"
@@ -338,9 +337,6 @@ bool input_handle(ToxWindow *self, wint_t key, int x, int mx_x)
             if (self->type == WINDOW_TYPE_CONFERENCE) {
                 self->show_peerlist ^= 1;
                 redraw_conference_win(self);
-            } else if (self->type == WINDOW_TYPE_GROUPCHAT) {
-                self->show_peerlist ^= 1;
-                redraw_groupchat_win(self);
             }
 
             match = true;
@@ -350,9 +346,5 @@ bool input_handle(ToxWindow *self, wint_t key, int x, int mx_x)
         }
     }
 
-    if (match) {
-        flag_interface_refresh();
-    }
-
     return match;
 }

src/line_info.c

@@ -20,17 +20,12 @@
  *
  */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE    /* needed for wcswidth() */
-#endif
-
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "conference.h"
-#include "groupchats.h"
 #include "line_info.h"
 #include "message_queue.h"
 #include "misc_tools.h"
@@ -142,23 +137,19 @@ static struct line_info *line_info_ret_queue(struct history *hst)
  * Return 0 if string does not contain a newline byte.
  * Return -1 if printing was aborted.
  */
-static int print_n_chars(WINDOW *win, const wchar_t *s, size_t n, int max_y)
+static int print_n_chars(WINDOW *win, const char *s, size_t n, int max_y)
 {
-    // we use an array to represent a single wchar in order to get around an ncurses
-    // bug with waddnwstr() that overreads the memory address by one byte when
-    // supplied with a single wchar.
-    wchar_t ch[2] = {0};
     bool newline = false;
+    char ch;
 
-    for (size_t i = 0; i < n && (ch[0] = s[i]); ++i) {
+    for (size_t i = 0; i < n && (ch = s[i]); ++i) {
-        if (ch[0] == L'\n') {
+        if (ch == '\n') {
             newline = true;
 
             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) {
@@ -167,17 +158,7 @@ static int print_n_chars(WINDOW *win, const wchar_t *s, size_t n, int max_y)
         }
 
         if (win) {
-#ifdef HAVE_WIDECHAR
+            wprintw(win, "%c", ch);
-            waddnwstr(win, ch, 1);
-#else
-            char b;
-
-            if (wcstombs(&b, ch, sizeof(char)) != 1) {
-                continue;
-            }
-
-            wprintw(win, "%c", b);
-#endif  // HAVE_WIDECHAR
         }
     }
 
@@ -187,10 +168,10 @@ static int print_n_chars(WINDOW *win, const wchar_t *s, size_t n, int max_y)
 /* Returns the index of the last space character in `s` found before `limit`.
  * Returns -1 if no space is found.
  */
-static int rspace_index(const wchar_t *s, int limit)
+static int rspace_index(const char *s, int limit)
 {
     for (int i = limit; i >= 0; --i) {
-        if (s[i] == L' ') {
+        if (s[i] == ' ') {
             return i;
         }
     }
@@ -201,12 +182,12 @@ static int rspace_index(const wchar_t *s, int limit)
 /* Returns the first index in `s` containing a newline byte found before `limit`.
  * Returns -1 if no newline  is found.
  */
-static int newline_index(const wchar_t *s, int limit)
+static int newline_index(const char *s, int limit)
 {
-    wchar_t ch;
+    char ch;
 
     for (int i = 0; i < limit && (ch = s[i]); ++i) {
-        if (ch == L'\n') {
+        if (ch == '\n') {
             return i;
         }
     }
@@ -215,13 +196,13 @@ static int newline_index(const wchar_t *s, int limit)
 }
 
 /* Returns the number of newline bytes in `s` */
-static unsigned int newline_count(const wchar_t *s)
+static unsigned int newline_count(const char *s)
 {
-    wchar_t ch;
+    char ch;
     unsigned int count = 0;
 
     for (size_t i = 0; (ch = s[i]); ++i) {
-        if (ch == L'\n') {
+        if (ch == '\n') {
             ++count;
         }
     }
@@ -244,10 +225,10 @@ static int print_wrap(WINDOW *win, struct line_info *line, int max_x, int max_y)
     int y;
     UNUSED_VAR(y);
 
-    const wchar_t *msg = line->msg;
+    const char *msg = line->msg;
-    uint16_t length = line->msg_width;
+    uint16_t length = line->msg_len;
     uint16_t lines = 0;
-    const int x_start = line->len - line->msg_width - 1;  // manually keep track of x position because ncurses sucks
+    const int x_start = line->len - line->msg_len - 1;  // manually keep track of x position because ncurses sucks
     int x_limit = max_x - x_start;
 
     if (x_limit <= 1) {
@@ -264,7 +245,7 @@ static int print_wrap(WINDOW *win, struct line_info *line, int max_x, int max_y)
         }
 
         if (length < x_limit) {
-            const int p_ret = print_n_chars(win, msg, length, max_y);
+            int p_ret = print_n_chars(win, msg, length, max_y);
 
             if (p_ret == 1) {
                 lines += newline_count(msg);
@@ -276,7 +257,7 @@ static int print_wrap(WINDOW *win, struct line_info *line, int max_x, int max_y)
             break;
         }
 
-        const int newline_idx = newline_index(msg, x_limit - 1);
+        int newline_idx = newline_index(msg, x_limit - 1);
 
         if (newline_idx >= 0) {
             if (print_n_chars(win, msg, newline_idx + 1, max_y) == -1) {
@@ -290,7 +271,7 @@ static int print_wrap(WINDOW *win, struct line_info *line, int max_x, int max_y)
             continue;
         }
 
-        const int space_idx = rspace_index(msg, x_limit - 1);
+        int space_idx = rspace_index(msg, x_limit - 1);
 
         if (space_idx >= 1) {
             if (print_n_chars(win, msg, space_idx, max_y) == -1) {
@@ -339,45 +320,14 @@ static int print_wrap(WINDOW *win, struct line_info *line, int max_x, int max_y)
     return 0;
 }
 
-/* Converts `msg` into a widechar string and puts the result in `buf`.
- *
- * Returns the widechar width of the string.
- */
-static uint16_t line_info_add_msg(wchar_t *buf, size_t buf_size, const char *msg)
-{
-    if (msg == NULL || msg[0] == '\0') {
-        return 0;
-    }
-
-    const wint_t wc_msg_len = mbs_to_wcs_buf(buf, msg, buf_size);
-
-    if (wc_msg_len > 0 && wc_msg_len < buf_size) {
-        buf[wc_msg_len] = L'\0';
-        int width = wcswidth(buf, wc_msg_len);
-
-        if (width == -1) {  // the best we can do on failure is to fall back to strlen
-            width = strlen(msg);
-        }
-
-        return (uint16_t)width;
-    } else {
-        fprintf(stderr, "Failed to convert string '%s' to widechar\n", msg);
-        const wchar_t *err = L"Failed to parse message";
-        uint16_t width = (uint16_t)wcslen(err);
-        wmemcpy(buf, err, width);
-        buf[width] = L'\0';
-        return width;
-    }
-}
-
 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;
 
@@ -422,29 +372,18 @@ int line_info_add(ToxWindow *self, bool show_timestamp, const char *name1, const
     switch (type) {
         case IN_ACTION:
 
-        /* fallthrough */
-        case OUT_ACTION_READ:
-
         /* fallthrough */
         case OUT_ACTION:
             len += strlen(user_settings->line_normal) + 2; // two spaces
             break;
 
         case IN_MSG:
-        case OUT_MSG_READ:
 
         /* fallthrough */
         case OUT_MSG:
             len += strlen(user_settings->line_normal) + 3; // two spaces and a ':' char
             break;
 
-        case IN_PRVT_MSG:
-
-        /* fallthrough */
-        case OUT_PRVT_MSG:
-            len += strlen(user_settings->line_special) + 3;
-            break;
-
         case CONNECTION:
             len += strlen(user_settings->line_join) + 2;  // two spaces
             break;
@@ -469,8 +408,13 @@ int line_info_add(ToxWindow *self, bool show_timestamp, const char *name1, const
             break;
     }
 
-    const uint16_t msg_width = line_info_add_msg(new_line->msg, sizeof(new_line->msg), frmt_msg);
+    uint16_t msg_len = 0;
-    len += msg_width;
+
+    if (frmt_msg[0]) {
+        snprintf(new_line->msg, sizeof(new_line->msg), "%s", frmt_msg);
+        msg_len = strlen(new_line->msg);
+        len += msg_len;
+    }
 
     if (show_timestamp) {
         get_time_str(new_line->timestr, sizeof(new_line->timestr));
@@ -489,17 +433,13 @@ int line_info_add(ToxWindow *self, bool show_timestamp, const char *name1, const
 
     new_line->id = (hst->line_end->id + 1 + hst->queue_size) % INT_MAX;
     new_line->len = len;
-    new_line->msg_width = msg_width;
+    new_line->msg_len = msg_len;
     new_line->type = type;
     new_line->bold = bold;
     new_line->colour = colour;
     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;
@@ -531,6 +471,8 @@ static void line_info_check_queue(ToxWindow *self)
     }
 }
 
+#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;
@@ -558,7 +500,7 @@ void line_info_print(ToxWindow *self)
         return;
     }
 
-    if (self->type == WINDOW_TYPE_CONFERENCE || self->type == WINDOW_TYPE_GROUPCHAT) {
+    if (self->type == WINDOW_TYPE_CONFERENCE) {
         wmove(win, 0, 0);
     } else {
         wmove(win, TOP_BAR_HEIGHT, 0);
@@ -573,14 +515,15 @@ void line_info_print(ToxWindow *self)
     const int max_y = y2 - CHATBOX_HEIGHT - WINDOW_BAR_HEIGHT;
     const int max_x = self->show_peerlist ? x2 - 1 - SIDEBAR_WIDTH : x2;
     uint16_t numlines = line->format_lines;
+    int print_ret = 0;
 
-    while (line && numlines++ <= max_y) {
+    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;
         }
@@ -594,7 +537,7 @@ void line_info_print(ToxWindow *self)
             case OUT_MSG_READ:
 
             /* fallthrough */
-            case IN_MSG: {
+            case IN_MSG:
                 wattron(win, COLOR_PAIR(BLUE));
                 wprintw(win, "%s ", line->timestr);
                 wattroff(win, COLOR_PAIR(BLUE));
@@ -611,60 +554,18 @@ void line_info_print(ToxWindow *self)
                 wprintw(win, "%s %s: ", user_settings->line_normal, line->name1);
                 wattroff(win, COLOR_PAIR(nameclr));
 
-                if (line->msg[0] == L'\0') {
+                if (line->msg[0] == 0) {
                     waddch(win, '\n');
                     break;
                 }
 
-                if (line->msg[0] == L'>') {
-                    wattron(win, COLOR_PAIR(GREEN));
-                } else if (line->msg[0] == L'<') {
-                    wattron(win, COLOR_PAIR(RED));
-                }
-
-                print_wrap(win, line, max_x, max_y);
-
-                if (line->msg[0] == L'>') {
-                    wattroff(win, COLOR_PAIR(GREEN));
-                } else if (line->msg[0] == L'<') {
-                    wattroff(win, COLOR_PAIR(RED));
-                }
-
-                waddch(win, '\n');
-                break;
-            }
-
-            case IN_PRVT_MSG:
-
-            /* fallthrough */
-
-            case OUT_PRVT_MSG: {
-                wattron(win, COLOR_PAIR(BLUE));
-                wprintw(win, "%s ", line->timestr);
-                wattroff(win, COLOR_PAIR(BLUE));
-
-                int nameclr = GREEN;
-
-                if (line->colour) {
-                    nameclr = line->colour;
-                } else if (type == IN_MSG) {
-                    nameclr = CYAN;
-                }
-
-                wattron(win, COLOR_PAIR(nameclr));
-                wprintw(win, "%s %s: ", (type != OUT_PRVT_MSG && type != IN_PRVT_MSG) ?
-                        user_settings->line_normal :
-                        user_settings->line_special,
-                        line->name1);
-                wattroff(win, COLOR_PAIR(nameclr));
-
                 if (line->msg[0] == '>') {
                     wattron(win, COLOR_PAIR(GREEN));
                 } else if (line->msg[0] == '<') {
                     wattron(win, COLOR_PAIR(RED));
                 }
 
-                print_wrap(win, line, max_x, max_y);
+                print_ret = print_wrap(win, line, max_x, max_y);
 
                 if (line->msg[0] == '>') {
                     wattroff(win, COLOR_PAIR(GREEN));
@@ -672,9 +573,14 @@ 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;
-            }
 
             case OUT_ACTION_READ:
 
@@ -682,21 +588,26 @@ void line_info_print(ToxWindow *self)
             case OUT_ACTION:
 
             /* fallthrough */
-            case IN_ACTION: {
+            case IN_ACTION:
                 wattron(win, COLOR_PAIR(BLUE));
                 wprintw(win, "%s ", line->timestr);
                 wattroff(win, COLOR_PAIR(BLUE));
 
                 wattron(win, COLOR_PAIR(YELLOW));
                 wprintw(win, "%s %s ", user_settings->line_normal, line->name1);
-                print_wrap(win, line, max_x, max_y);
+                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;
-            }
 
-            case SYS_MSG: {
+            case SYS_MSG:
                 if (line->timestr[0]) {
                     wattron(win, COLOR_PAIR(BLUE));
                     wprintw(win, "%s ", line->timestr);
@@ -711,7 +622,7 @@ void line_info_print(ToxWindow *self)
                     wattron(win, COLOR_PAIR(line->colour));
                 }
 
-                print_wrap(win, line, max_x, max_y);
+                print_ret = print_wrap(win, line, max_x, max_y);
                 waddch(win, '\n');
 
                 if (line->bold) {
@@ -723,22 +634,20 @@ void line_info_print(ToxWindow *self)
                 }
 
                 break;
-            }
 
-            case PROMPT: {
+            case PROMPT:
                 wattron(win, COLOR_PAIR(GREEN));
                 wprintw(win, "$ ");
                 wattroff(win, COLOR_PAIR(GREEN));
 
-                if (line->msg[0] != L'\0') {
+                if (line->msg[0]) {
-                    print_wrap(win, line, max_x, max_y);
+                    print_ret = print_wrap(win, line, max_x, max_y);
                 }
 
                 waddch(win, '\n');
                 break;
-            }
 
-            case CONNECTION: {
+            case CONNECTION:
                 wattron(win, COLOR_PAIR(BLUE));
                 wprintw(win, "%s ", line->timestr);
                 wattroff(win, COLOR_PAIR(BLUE));
@@ -750,15 +659,14 @@ void line_info_print(ToxWindow *self)
                 wprintw(win, "%s ", line->name1);
                 wattroff(win, A_BOLD);
 
-                print_wrap(win, line, max_x, max_y);
+                print_ret = print_wrap(win, line, max_x, max_y);
                 waddch(win, '\n');
 
                 wattroff(win, COLOR_PAIR(line->colour));
 
                 break;
-            }
 
-            case DISCONNECTION: {
+            case DISCONNECTION:
                 wattron(win, COLOR_PAIR(BLUE));
                 wprintw(win, "%s ", line->timestr);
                 wattroff(win, COLOR_PAIR(BLUE));
@@ -770,15 +678,14 @@ void line_info_print(ToxWindow *self)
                 wprintw(win, "%s ", line->name1);
                 wattroff(win, A_BOLD);
 
-                print_wrap(win, line, max_x, max_y);
+                print_ret = print_wrap(win, line, max_x, max_y);
                 waddch(win, '\n');
 
                 wattroff(win, COLOR_PAIR(line->colour));
 
                 break;
-            }
 
-            case NAME_CHANGE: {
+            case NAME_CHANGE:
                 wattron(win, COLOR_PAIR(BLUE));
                 wprintw(win, "%s ", line->timestr);
                 wattroff(win, COLOR_PAIR(BLUE));
@@ -789,7 +696,7 @@ void line_info_print(ToxWindow *self)
                 wprintw(win, "%s", line->name1);
                 wattroff(win, A_BOLD);
 
-                print_wrap(win, line, max_x, max_y);
+                print_ret = print_wrap(win, line, max_x, max_y);
 
                 wattron(win, A_BOLD);
                 wprintw(win, "%s\n", line->name2);
@@ -797,14 +704,11 @@ void line_info_print(ToxWindow *self)
                 wattroff(win, COLOR_PAIR(MAGENTA));
 
                 break;
-            }
         }
 
         line = line->next;
     }
 
-    flag_interface_refresh();
-
     /* keep calling until queue is empty */
     if (hst->queue_size > 0) {
         line_info_print(self);
@@ -846,15 +750,14 @@ 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) {
         if (line->id == id) {
-            const uint16_t new_width = line_info_add_msg(line->msg, sizeof(line->msg), msg);
+            size_t new_len = strlen(msg);
-            line->len = line->len - line->msg_width + new_width;
+            line->len = line->len - line->msg_len + new_len;
-            line->msg_width = new_width;
+            line->msg_len = new_len;
+            snprintf(line->msg, sizeof(line->msg), "%s", msg);
             return;
         }
 
@@ -862,24 +765,6 @@ 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)
-{
-    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)
 {
     if (hst->line_start->prev) {
@@ -970,10 +855,6 @@ bool line_info_onKey(ToxWindow *self, wint_t key)
         match = false;
     }
 
-    if (match) {
-        flag_interface_refresh();
-    }
-
     return match;
 }
 

src/line_info.h

@@ -39,8 +39,6 @@ typedef enum LINE_TYPE {
     IN_ACTION,
     OUT_ACTION,
     OUT_ACTION_READ,     /* same as OUT_MSG_READ but for actions */
-    IN_PRVT_MSG,   /* PRVT should only be used for groups */
-    OUT_PRVT_MSG,
     PROMPT,
     CONNECTION,
     DISCONNECTION,
@@ -48,11 +46,11 @@ typedef enum LINE_TYPE {
 } LINE_TYPE;
 
 struct line_info {
-    char    timestr[TIME_STR_SIZE];
+    char timestr[TIME_STR_SIZE];
-    char    name1[TOXIC_MAX_NAME_LENGTH + 1];
+    char name1[TOXIC_MAX_NAME_LENGTH + 1];
-    char    name2[TOXIC_MAX_NAME_LENGTH + 1];
+    char name2[TOXIC_MAX_NAME_LENGTH + 1];
-    wchar_t msg[MAX_LINE_INFO_MSG_SIZE];
+    char msg[MAX_LINE_INFO_MSG_SIZE];
-    time_t  timestamp;
+    time_t timestamp;
     uint8_t type;
     uint8_t bold;
     uint8_t colour;
@@ -60,7 +58,7 @@ struct line_info {
     bool    read_flag;     /* true if a message has been flagged as read */
     uint32_t id;
     uint16_t len;        /* combined length of entire line */
-    uint16_t msg_width;    /* width of the message */
+    uint16_t msg_len;    /* length of the message */
     uint16_t format_lines;  /* number of lines the combined string takes up (dynamically set) */
 
     struct line_info *prev;
@@ -98,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);
 

src/log.c

@@ -62,21 +62,21 @@ static int get_log_path(char *dest, int destsize, const char *name, const char *
 
     /* first 6 bytes of selfkey */
     char self_id[32] = {0};
-    path_len += KEY_IDENT_BYTES;
+    path_len += KEY_IDENT_DIGITS * 2;
     sprintf(&self_id[0], "%02X", selfkey[0] & 0xff);
     sprintf(&self_id[2], "%02X", selfkey[1] & 0xff);
     sprintf(&self_id[4], "%02X", selfkey[2] & 0xff);
-    self_id[KEY_IDENT_BYTES] = '\0';
+    self_id[KEY_IDENT_DIGITS * 2] = '\0';
 
     char other_id[32] = {0};
 
     if (otherkey) {
         /* first 6 bytes of otherkey */
-        path_len += KEY_IDENT_BYTES;
+        path_len += KEY_IDENT_DIGITS * 2;
         sprintf(&other_id[0], "%02X", otherkey[0] & 0xff);
         sprintf(&other_id[2], "%02X", otherkey[1] & 0xff);
         sprintf(&other_id[4], "%02X", otherkey[2] & 0xff);
-        other_id[KEY_IDENT_BYTES] = '\0';
+        other_id[KEY_IDENT_DIGITS * 2] = '\0';
     }
 
     if (path_len >= destsize) {

src/message_queue.c

@@ -48,7 +48,7 @@ void cqueue_add(struct chat_queue *q, const char *msg, size_t len, uint8_t type,
         return;
     }
 
-    struct cqueue_msg *new_m = calloc(1, sizeof(struct cqueue_msg));
+    struct cqueue_msg *new_m = malloc(sizeof(struct cqueue_msg));
 
     if (new_m == NULL) {
         exit_toxic_err("failed in cqueue_message", FATALERR_MEMORY);
@@ -59,10 +59,8 @@ 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;
-    new_m->noread_flag = false;
 
     if (q->root == NULL) {
         new_m->prev = NULL;
@@ -78,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. */
@@ -156,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.
@@ -204,7 +176,7 @@ void cqueue_try_send(ToxWindow *self, Tox *m)
             return;
         }
 
-        Tox_Err_Friend_Send_Message err;
+        TOX_ERR_FRIEND_SEND_MESSAGE err;
         Tox_Message_Type type = msg->type == OUT_MSG ? TOX_MESSAGE_TYPE_NORMAL : TOX_MESSAGE_TYPE_ACTION;
         uint32_t receipt = tox_friend_send_message(m, self->num, type, (uint8_t *) msg->message, msg->len, &err);
 

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);
 

src/misc_tools.c

@@ -136,39 +136,16 @@ void get_elapsed_time_str(char *buf, int bufsize, time_t secs)
     }
 }
 
-/* Converts seconds to string in format H hours, m minutes, s seconds */
-void get_elapsed_time_str_alt(char *buf, int bufsize, uint64_t secs)
-{
-    if (!secs) {
-        return;
-    }
-
-    long int seconds = secs % 60;
-    long int minutes = (secs % 3600) / 60;
-    long int hours = secs / 3600;
-
-    if (!minutes && !hours) {
-        snprintf(buf, bufsize, "%ld seconds", seconds);
-    } else if (!hours) {
-        snprintf(buf, bufsize, "%ld minutes, %ld seconds", minutes, seconds);
-    } else {
-        snprintf(buf, bufsize, "%ld hours, %ld minutes, %ld seconds", hours, minutes, seconds);
-    }
-}
-
 /*
- * 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;
     }
 
@@ -180,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) {
@@ -206,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;
@@ -227,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;
@@ -308,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'};
@@ -490,59 +456,6 @@ on_error:
     strcpy(buf, UNKNOWN_NAME);
     len = strlen(UNKNOWN_NAME);
     buf[len] = '\0';
-
-    return len;
-}
-
-/* same as get_nick_truncate but for groupchats */
-size_t get_group_nick_truncate(Tox *m, char *buf, uint32_t peer_id, uint32_t groupnum)
-{
-    Tox_Err_Group_Peer_Query err;
-    size_t len = tox_group_peer_get_name_size(m, groupnum, peer_id, &err);
-
-    if (err != TOX_ERR_GROUP_PEER_QUERY_OK || len == 0) {
-        strcpy(buf, UNKNOWN_NAME);
-        len = strlen(UNKNOWN_NAME);
-    } else {
-        tox_group_peer_get_name(m, groupnum, peer_id, (uint8_t *) buf, &err);
-
-        if (err != TOX_ERR_GROUP_PEER_QUERY_OK) {
-            strcpy(buf, UNKNOWN_NAME);
-            len = strlen(UNKNOWN_NAME);
-        }
-    }
-
-    len = MIN(len, TOXIC_MAX_NAME_LENGTH - 1);
-    buf[len] = '\0';
-
-    filter_str(buf, len);
-
-    return len;
-}
-
-/* same as get_group_nick_truncate() but for self. */
-size_t get_group_self_nick_truncate(Tox *m, char *buf, uint32_t groupnum)
-{
-    Tox_Err_Group_Self_Query err;
-    size_t len = tox_group_self_get_name_size(m, groupnum, &err);
-
-    if (err != TOX_ERR_GROUP_SELF_QUERY_OK) {
-        strcpy(buf, UNKNOWN_NAME);
-        len = strlen(UNKNOWN_NAME);
-    } else {
-        tox_group_self_get_name(m, groupnum, (uint8_t *) buf, &err);
-
-        if (err != TOX_ERR_GROUP_SELF_QUERY_OK) {
-            strcpy(buf, UNKNOWN_NAME);
-            len = strlen(UNKNOWN_NAME);
-        }
-    }
-
-    len = MIN(len, TOXIC_MAX_NAME_LENGTH - 1);
-    buf[len] = 0;
-
-    filter_str(buf, len);
-
     return len;
 }
 
@@ -550,9 +463,10 @@ size_t get_group_self_nick_truncate(Tox *m, char *buf, uint32_t groupnum)
    returns length of msg, which will be no larger than size-1 */
 size_t copy_tox_str(char *msg, size_t size, const char *data, size_t length)
 {
+    size_t i;
     size_t j = 0;
 
-    for (size_t i = 0; (i < length) && (j < size - 1); ++i) {
+    for (i = 0; (i < length) && (j < size - 1); ++i) {
         if (data[i] != '\r') {
             msg[j++] = data[i];
         }
@@ -678,8 +592,7 @@ void set_window_title(ToxWindow *self, const char *title, int len)
 
     char cpy[TOXIC_MAX_NAME_LENGTH + 1];
 
-    /* keep conferencenumber in title */
+    if (self->type == WINDOW_TYPE_CONFERENCE) { /* keep conferencenumber in title for invites */
-    if (self->type == WINDOW_TYPE_CONFERENCE || self->type == WINDOW_TYPE_GROUPCHAT) {
         snprintf(cpy, sizeof(cpy), "%u %s", self->num, title);
     } else {
         snprintf(cpy, sizeof(cpy), "%s", title);

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);
@@ -97,9 +84,6 @@ time_t get_unix_time(void);
 /* Puts the current time in buf in the format of specified by the config */
 void get_time_str(char *buf, size_t bufsize);
 
-/* Converts seconds to string in format H hours, m minutes, s seconds */
-void get_elapsed_time_str_alt(char *buf, int bufsize, uint64_t secs);
-
 /* Converts seconds to string in format HH:mm:ss; truncates hours and minutes when necessary */
 void get_elapsed_time_str(char *buf, int bufsize, time_t secs);
 
@@ -171,12 +155,6 @@ size_t get_nick_truncate(Tox *m, char *buf, uint32_t friendnum);
 /* same as get_nick_truncate but for conferences */
 int get_conference_nick_truncate(Tox *m, char *buf, uint32_t peernum, uint32_t conferencenum);
 
-/* same as get_nick_truncate but for groupchats */
-size_t get_group_nick_truncate(Tox *m, char *buf, uint32_t peer_id, uint32_t groupnum);
-
-/* same as get_group_nick_truncate() but for self. */
-size_t get_group_self_nick_truncate(Tox *m, char *buf, uint32_t groupnum);
-
 /* copies data to msg buffer.
    returns length of msg, which will be no larger than size-1 */
 size_t copy_tox_str(char *msg, size_t size, const char *data, size_t length);

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;
     }
 
@@ -362,20 +362,16 @@ on_exit:
     return 0;
 }
 
-/* Attempts to do a tox name lookup.
+void name_lookup(ToxWindow *self, Tox *m, const char *id_bin, const char *addr, const char *message)
- *
- * Returns true on success.
- */
-bool name_lookup(ToxWindow *self, Tox *m, const char *id_bin, const char *addr, const char *message)
 {
     if (t_data.disabled) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "nameservers list is empty or does not exist.");
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "name lookups are disabled.");
-        return false;
+        return;
     }
 
     if (t_data.busy) {
         line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Please wait for previous name lookup to finish.");
-        return false;
+        return;
     }
 
     snprintf(t_data.id_bin, sizeof(t_data.id_bin), "%s", id_bin);
@@ -388,24 +384,22 @@ bool name_lookup(ToxWindow *self, Tox *m, const char *id_bin, const char *addr,
     if (pthread_attr_init(&lookup_thread.attr) != 0) {
         line_info_add(self, false, NULL, NULL, SYS_MSG, 0, RED, "Error: lookup thread attr failed to init");
         clear_thread_data();
-        return false;
+        return;
     }
 
     if (pthread_attr_setdetachstate(&lookup_thread.attr, PTHREAD_CREATE_DETACHED) != 0) {
         line_info_add(self, false, NULL, NULL, SYS_MSG, 0, RED, "Error: lookup thread attr failed to set");
         pthread_attr_destroy(&lookup_thread.attr);
         clear_thread_data();
-        return false;
+        return;
     }
 
     if (pthread_create(&lookup_thread.tid, &lookup_thread.attr, lookup_thread_func, NULL) != 0) {
         line_info_add(self, false, NULL, NULL, SYS_MSG, 0, RED, "Error: lookup thread failed to init");
         pthread_attr_destroy(&lookup_thread.attr);
         clear_thread_data();
-        return false;
+        return;
     }
-
-    return true;
 }
 
 /* Initializes http based name lookups. Note: This function must be called only once before additional

src/name_lookup.h

@@ -23,19 +23,14 @@
 #ifndef NAME_LOOKUP
 #define NAME_LOOKUP
 
-/* Initializes http based name lookups.
+/* Initializes http based name lookups. Note: This function must be called only once before additional
- *
+ * threads are spawned.
- * Note: This function must be called only once before additional threads are spawned.
  *
  * Returns 0 on success.
  * Returns -1 on failure.
  */
 int name_lookup_init(int curl_init_status);
 
-/* Attempts to do a tox name lookup.
+int name_lookup(ToxWindow *self, Tox *m, const char *id_bin, const char *addr, const char *message);
- *
- * Returns true on success.
- */
-bool name_lookup(ToxWindow *self, Tox *m, const char *id_bin, const char *addr, const char *message);
 
 #endif /* NAME_LOOKUP */

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;

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 */

src/prompt.c

@@ -59,13 +59,11 @@ static const char *glob_cmd_list[] = {
     "/connect",
     "/decline",
     "/exit",
-    "/group",
     "/conference",
-#ifdef GAMES
+#ifdef GAME
     "/game",
 #endif
     "/help",
-    "/join",
     "/log",
     "/myid",
 #ifdef QRCODE
@@ -127,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 */
@@ -177,7 +173,9 @@ static int add_friend_request(const char *public_key, const char *data)
         return -1;
     }
 
-    for (int i = 0; i <= FrndRequests.max_idx; ++i) {
+    int i;
+
+    for (i = 0; i <= FrndRequests.max_idx; ++i) {
         if (!FrndRequests.request[i].active) {
             FrndRequests.request[i].active = true;
             memcpy(FrndRequests.request[i].key, public_key, TOX_PUBLIC_KEY_SIZE);
@@ -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);
@@ -526,26 +503,6 @@ static void prompt_onConnectionChange(ToxWindow *self, Tox *m, uint32_t friendnu
     }
 }
 
-/**
- * Return true is the first 3 bytes of `key` are identical to any other contact in the contact list.
- */
-static bool key_is_similar(const char *key)
-{
-    for (size_t i = 0; i < Friends.max_idx; ++i) {
-        const ToxicFriend *friend = &Friends.list[i];
-
-        if (!friend->active) {
-            continue;
-        }
-
-        if (memcmp(friend->pub_key, key, KEY_IDENT_BYTES / 2) == 0) {
-            return true;
-        }
-    }
-
-    return false;
-}
-
 static void prompt_onFriendRequest(ToxWindow *self, Tox *m, const char *key, const char *data, size_t length)
 {
     UNUSED_VAR(m);
@@ -556,13 +513,6 @@ static void prompt_onFriendRequest(ToxWindow *self, Tox *m, const char *key, con
     line_info_add(self, true, NULL, NULL, SYS_MSG, 0, 0, "Friend request with the message '%s'", data);
     write_to_log("Friend request with the message '%s'", "", ctx->log, true);
 
-    if (key_is_similar(key)) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, RED,
-                      "WARNING: This contact's public key is suspiciously similar to that of another contact ");
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, RED,
-                      "in your list. This may be an impersonation attempt, or it may have occurred by chance.");
-    }
-
     int n = add_friend_request(key, data);
 
     if (n == -1) {

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);

src/python_api.c

@@ -20,10 +20,9 @@
  *
  */
 
-#include "api.h"
-
 #ifdef PYTHON
 #include <Python.h>
+#include "api.h"
 
 #include "execute.h"
 

src/settings.c

@@ -63,7 +63,6 @@ static struct ui_strings {
     const char *show_typing_other;
     const char *show_welcome_msg;
     const char *show_connection_msg;
-    const char *show_group_connection_msg;
     const char *nodeslist_update_freq;
     const char *autosave_freq;
 
@@ -71,8 +70,6 @@ static struct ui_strings {
     const char *line_quit;
     const char *line_alert;
     const char *line_normal;
-    const char *line_special;
-    const char *group_part_message;
 
     const char *mplex_away;
     const char *mplex_away_note;
@@ -100,19 +97,14 @@ static struct ui_strings {
     "show_typing_other",
     "show_welcome_msg",
     "show_connection_msg",
-    "show_group_connection_msg",
     "nodeslist_update_freq",
     "autosave_freq",
     "line_join",
     "line_quit",
     "line_alert",
     "line_normal",
-    "line_special",
-    "group_part_message",
-
     "mplex_away",
     "mplex_away_note",
-
     "color_bar_bg",
     "color_bar_fg",
     "color_bar_accent",
@@ -138,15 +130,13 @@ static void ui_defaults(struct user_settings *settings)
     settings->show_typing_other = SHOW_TYPING_ON;
     settings->show_welcome_msg = SHOW_WELCOME_MSG_ON;
     settings->show_connection_msg = SHOW_CONNECTION_MSG_ON;
-    settings->show_group_connection_msg = SHOW_GROUP_CONNECTION_MSG_ON;
+    settings->nodeslist_update_freq = 7;
-    settings->nodeslist_update_freq = 1;
     settings->autosave_freq = 600;
 
     snprintf(settings->line_join, LINE_HINT_MAX + 1, "%s", LINE_JOIN);
     snprintf(settings->line_quit, LINE_HINT_MAX + 1, "%s", LINE_QUIT);
     snprintf(settings->line_alert, LINE_HINT_MAX + 1, "%s", LINE_ALERT);
     snprintf(settings->line_normal, LINE_HINT_MAX + 1, "%s", LINE_NORMAL);
-    snprintf(settings->line_special, LINE_HINT_MAX + 1, "%s", LINE_SPECIAL);
 
     settings->mplex_away = MPLEX_ON;
     snprintf(settings->mplex_away_note, sizeof(settings->mplex_away_note), "%s", MPLEX_AWAY_NOTE);
@@ -408,7 +398,6 @@ int settings_load(struct user_settings *s, const char *patharg)
         config_setting_lookup_bool(setting, ui_strings.show_typing_other, &s->show_typing_other);
         config_setting_lookup_bool(setting, ui_strings.show_welcome_msg, &s->show_welcome_msg);
         config_setting_lookup_bool(setting, ui_strings.show_connection_msg, &s->show_connection_msg);
-        config_setting_lookup_bool(setting, ui_strings.show_group_connection_msg, &s->show_group_connection_msg);
 
         config_setting_lookup_int(setting, ui_strings.history_size, &s->history_size);
         config_setting_lookup_int(setting, ui_strings.notification_timeout, &s->notification_timeout);
@@ -431,19 +420,11 @@ int settings_load(struct user_settings *s, const char *patharg)
             snprintf(s->line_normal, sizeof(s->line_normal), "%s", str);
         }
 
-        if (config_setting_lookup_string(setting, ui_strings.line_special, &str)) {
-            snprintf(s->line_special, sizeof(s->line_special), "%s", str);
-        }
-
         config_setting_lookup_bool(setting, ui_strings.mplex_away, &s->mplex_away);
 
         if (config_setting_lookup_string(setting, ui_strings.mplex_away_note, &str)) {
             snprintf(s->mplex_away_note, sizeof(s->mplex_away_note), "%s", str);
         }
-
-        if (config_setting_lookup_string(setting, ui_strings.group_part_message, &str)) {
-            snprintf(s->group_part_message, sizeof(s->group_part_message), "%s", str);
-        }
     }
 
     /* paths */

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 */
@@ -54,7 +54,6 @@ struct user_settings {
     int show_typing_other; /* boolean */
     int show_welcome_msg;  /* boolean */
     int show_connection_msg;  /* boolean */
-    int show_group_connection_msg;  /* boolean */
     int nodeslist_update_freq;  /* int (<= 0 to disable updates) */
     int autosave_freq; /* int (<= 0 to disable autosave) */
 
@@ -62,7 +61,6 @@ struct user_settings {
     char line_quit[LINE_HINT_MAX + 1];
     char line_alert[LINE_HINT_MAX + 1];
     char line_normal[LINE_HINT_MAX + 1];
-    char line_special[LINE_HINT_MAX + 1];
 
     char download_path[PATH_MAX];
     char chatlogs_path[PATH_MAX];
@@ -87,7 +85,6 @@ struct user_settings {
 
     int mplex_away; /* boolean (1 for reaction to terminal attach/detach) */
     char mplex_away_note [TOX_MAX_STATUS_MESSAGE_LENGTH];
-    char group_part_message[TOX_GROUP_MAX_PART_LENGTH];
 
 #ifdef AUDIO
     int audio_in_dev;
@@ -99,8 +96,6 @@ struct user_settings {
 #endif
 };
 
-extern struct user_settings *user_settings;
-
 enum settings_values {
     AUTOLOG_OFF = 0,
     AUTOLOG_ON = 1,
@@ -123,9 +118,6 @@ enum settings_values {
     SHOW_CONNECTION_MSG_OFF = 0,
     SHOW_CONNECTION_MSG_ON = 1,
 
-    SHOW_GROUP_CONNECTION_MSG_OFF = 0,
-    SHOW_GROUP_CONNECTION_MSG_ON = 1,
-
     DFLT_HST_SIZE = 700,
 
     MPLEX_OFF = 0,
@@ -136,7 +128,6 @@ enum settings_values {
 #define LINE_QUIT    "<--"
 #define LINE_ALERT   "-!-"
 #define LINE_NORMAL  "-"
-#define LINE_SPECIAL ">"
 #define TIMESTAMP_DEFAULT      "%H:%M"
 #define LOG_TIMESTAMP_DEFAULT  "%Y/%m/%d [%H:%M:%S]"
 #define MPLEX_AWAY_NOTE "Away from keyboard, be back soon!"

src/toxic.c

@@ -37,7 +37,6 @@
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
-#include <sys/time.h>
 #include <sys/types.h>
 #include <termios.h>
 #include <time.h>
@@ -54,7 +53,6 @@
 #include "execute.h"
 #include "file_transfers.h"
 #include "friendlist.h"
-#include "groupchats.h"
 #include "line_info.h"
 #include "log.h"
 #include "message_queue.h"
@@ -76,7 +74,7 @@
 #ifdef VIDEO
 #include "video_call.h"
 #endif /* VIDEO */
-static ToxAV *av;
+ToxAV *av;
 #endif /* AUDIO */
 
 #ifdef PYTHON
@@ -100,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 {
@@ -231,61 +223,20 @@ void exit_toxic_err(const char *errmsg, int errcode)
     exit(EXIT_FAILURE);
 }
 
-static const char *tox_log_level_show(Tox_Log_Level level)
-{
-    switch (level) {
-        case TOX_LOG_LEVEL_TRACE:
-            return "TRACE";
-
-        case TOX_LOG_LEVEL_DEBUG:
-            return "DEBUG";
-
-        case TOX_LOG_LEVEL_INFO:
-            return "INFO";
-
-        case TOX_LOG_LEVEL_WARNING:
-            return "WARNING";
-
-        case TOX_LOG_LEVEL_ERROR:
-            return "ERROR";
-    }
-
-    return "<invalid>";
-}
-
 void cb_toxcore_logger(Tox *m, TOX_LOG_LEVEL level, const char *file, uint32_t line, const char *func,
                        const char *message, void *user_data)
 {
+    UNUSED_VAR(user_data);
+    UNUSED_VAR(file);
     UNUSED_VAR(m);
 
-    FILE *fp = (FILE *)user_data;
+    if (user_data) {
-
+        FILE *fp = (FILE *)user_data;
-    if (!fp) {
+        fprintf(fp, "[%d] %u:%s() - %s\n", level, line, func, message);
-        fp = stderr;
+        fflush(fp);
+    } else {
+        fprintf(stderr, "[%d] %u:%s() - %s\n", level, line, func, message);
     }
-
-    struct timeval tv;
-
-    gettimeofday(&tv, NULL);
-
-    struct tm tmp;
-
-    gmtime_r(&tv.tv_sec, &tmp);
-
-    char timestamp[200];
-
-    strftime(timestamp, sizeof(timestamp), "%F %T", &tmp);
-
-    fprintf(fp, "%c %s.%06ld %s:%u(%s) - %s\n", tox_log_level_show(level)[0], timestamp, tv.tv_usec, file, line, func,
-            message);
-
-    fflush(fp);
-}
-
-/* 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)
@@ -305,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;
@@ -432,7 +383,6 @@ static void init_term(void)
         init_pair(BLACK_BG, COLOR_BLACK, bar_bg_color);
         init_pair(PURPLE_BG, COLOR_MAGENTA, bar_bg_color);
         init_pair(BAR_TEXT, bar_fg_color, bar_bg_color);
-        init_pair(BAR_SOLID, bar_bg_color, bar_bg_color);
         init_pair(BAR_ACCENT, bar_accent_color, bar_bg_color);
         init_pair(BAR_NOTIFY, bar_notify_color, bar_bg_color);
         init_pair(STATUS_ONLINE, COLOR_GREEN, bar_bg_color);
@@ -484,7 +434,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]);
     }
 
@@ -493,33 +445,25 @@ 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);
     }
 
     sort_friendlist_index();
 }
 
-static void load_groups(Tox *m)
-{
-    size_t numgroups = tox_group_get_number_groups(m);
-
-    for (size_t i = 0; i < numgroups; ++i) {
-        if (init_groupchat_win(m, i, NULL, 0, Group_Join_Type_Load) != 0) {
-            tox_group_leave(m, i, NULL, 0, NULL);
-        }
-    }
-}
-
 static void load_conferences(Tox *m)
 {
     size_t num_chats = tox_conference_get_chatlist_size(m);
@@ -863,22 +807,6 @@ static void init_tox_callbacks(Tox *m)
     tox_callback_file_recv_control(m, on_file_recv_control);
     tox_callback_file_recv_chunk(m, on_file_recv_chunk);
     tox_callback_friend_lossless_packet(m, on_lossless_custom_packet);
-    tox_callback_group_invite(m, on_group_invite);
-    tox_callback_group_message(m, on_group_message);
-    tox_callback_group_private_message(m, on_group_private_message);
-    tox_callback_group_peer_status(m, on_group_status_change);
-    tox_callback_group_peer_join(m, on_group_peer_join);
-    tox_callback_group_peer_exit(m, on_group_peer_exit);
-    tox_callback_group_peer_name(m, on_group_nick_change);
-    tox_callback_group_topic(m, on_group_topic_change);
-    tox_callback_group_peer_limit(m, on_group_peer_limit);
-    tox_callback_group_privacy_state(m, on_group_privacy_state);
-    tox_callback_group_topic_lock(m, on_group_topic_lock);
-    tox_callback_group_password(m, on_group_password);
-    tox_callback_group_self_join(m, on_group_self_join);
-    tox_callback_group_join_fail(m, on_group_rejected);
-    tox_callback_group_moderation(m, on_group_moderation);
-    tox_callback_group_voice_state(m, on_group_voice_state);
 }
 
 static void init_tox_options(struct Tox_Options *tox_opts)
@@ -1143,37 +1071,6 @@ 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
 
 void *thread_winref(void *data)
@@ -1181,12 +1078,11 @@ void *thread_winref(void *data)
     Tox *m = (Tox *) data;
 
     uint8_t draw_count = 0;
-
     init_signal_catchers();
 
     while (true) {
-        draw_count++;
         draw_active_window(m);
+        draw_count++;
 
         if (Winthread.flag_resize) {
             on_window_resize();
@@ -1200,8 +1096,6 @@ void *thread_winref(void *data)
             pthread_mutex_lock(&Winthread.lock);
             exit_toxic_success(m);
         }
-
-        poll_interface_refresh_flag();
     }
 }
 
@@ -1215,12 +1109,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);
-                }
             }
         }
 
@@ -1312,23 +1203,21 @@ static void parse_args(int argc, char *argv[])
     };
 
     const char *opts_str = "4bdehLotuxvc:f:l:n:r:p:P:T:";
-    int opt = 0;
+    int opt, indexptr;
-    int indexptr = 0;
+    long int port = 0;
 
     while ((opt = getopt_long(argc, argv, opts_str, long_opts, &indexptr)) != -1) {
         switch (opt) {
-            case '4': {
+            case '4':
                 arg_opts.use_ipv4 = 1;
                 break;
-            }
 
-            case 'b': {
+            case 'b':
                 arg_opts.debug = 1;
                 queue_init_message("stderr enabled");
                 break;
-            }
 
-            case 'c': {
+            case 'c':
                 if (optarg == NULL) {
                     queue_init_message("Invalid argument for option: %d", opt);
                     break;
@@ -1341,20 +1230,17 @@ static void parse_args(int argc, char *argv[])
                 }
 
                 break;
-            }
 
-            case 'd': {
+            case 'd':
                 arg_opts.default_locale = 1;
                 queue_init_message("Using default POSIX locale");
                 break;
-            }
 
-            case 'e': {
+            case 'e':
                 arg_opts.encrypt_data = 1;
                 break;
-            }
 
-            case 'f': {
+            case 'f':
                 if (optarg == NULL) {
                     queue_init_message("Invalid argument for option: %d", opt);
                     break;
@@ -1392,9 +1278,8 @@ static void parse_args(int argc, char *argv[])
                 queue_init_message("Using '%s' data file", DATA_FILE);
 
                 break;
-            }
 
-            case 'l': {
+            case 'l':
                 if (optarg) {
                     arg_opts.logging = true;
 
@@ -1414,15 +1299,13 @@ static void parse_args(int argc, char *argv[])
                 }
 
                 break;
-            }
 
-            case 'L': {
+            case 'L':
                 arg_opts.disable_local_discovery = 1;
                 queue_init_message("Local discovery disabled");
                 break;
-            }
 
-            case 'n': {
+            case 'n':
                 if (optarg == NULL) {
                     queue_init_message("Invalid argument for option: %d", opt);
                     break;
@@ -1430,38 +1313,26 @@ static void parse_args(int argc, char *argv[])
 
                 snprintf(arg_opts.nodes_path, sizeof(arg_opts.nodes_path), "%s", optarg);
                 break;
-            }
 
-            case 'o': {
+            case 'o':
                 arg_opts.no_connect = 1;
                 queue_init_message("DHT disabled");
                 break;
-            }
 
-            case 'p': {
+            case 'p':
-                arg_opts.proxy_type = TOX_PROXY_TYPE_SOCKS5;
-            }
-
-            // Intentional fallthrough
-
-            case 'P': {
                 if (optarg == NULL) {
                     queue_init_message("Invalid argument for option: %d", opt);
-                    arg_opts.proxy_type = TOX_PROXY_TYPE_NONE;
                     break;
                 }
 
-                if (arg_opts.proxy_type == TOX_PROXY_TYPE_NONE) {
+                arg_opts.proxy_type = TOX_PROXY_TYPE_SOCKS5;
-                    arg_opts.proxy_type = TOX_PROXY_TYPE_HTTP;
-                }
-
                 snprintf(arg_opts.proxy_address, sizeof(arg_opts.proxy_address), "%s", optarg);
 
                 if (++optind > argc || argv[optind - 1][0] == '-') {
                     exit_toxic_err("Proxy error", FATALERR_PROXY);
                 }
 
-                long int port = strtol(argv[optind - 1], NULL, 10);
+                port = strtol(argv[optind - 1], NULL, 10);
 
                 if (port <= 0 || port > MAX_PORT_RANGE) {
                     exit_toxic_err("Proxy error", FATALERR_PROXY);
@@ -1469,9 +1340,30 @@ static void parse_args(int argc, char *argv[])
 
                 arg_opts.proxy_port = port;
                 break;
-            }
 
-            case 'r': {
+            case 'P':
+                if (optarg == NULL) {
+                    queue_init_message("Invalid argument for option: %d", opt);
+                    break;
+                }
+
+                arg_opts.proxy_type = TOX_PROXY_TYPE_HTTP;
+                snprintf(arg_opts.proxy_address, sizeof(arg_opts.proxy_address), "%s", optarg);
+
+                if (++optind > argc || argv[optind - 1][0] == '-') {
+                    exit_toxic_err("Proxy error", FATALERR_PROXY);
+                }
+
+                port = strtol(argv[optind - 1], NULL, 10);
+
+                if (port <= 0 || port > MAX_PORT_RANGE) {
+                    exit_toxic_err("Proxy error", FATALERR_PROXY);
+                }
+
+                arg_opts.proxy_port = port;
+                break;
+
+            case 'r':
                 if (optarg == NULL) {
                     queue_init_message("Invalid argument for option: %d", opt);
                     break;
@@ -1484,20 +1376,18 @@ static void parse_args(int argc, char *argv[])
                 }
 
                 break;
-            }
 
-            case 't': {
+            case 't':
                 arg_opts.force_tcp = 1;
                 break;
-            }
 
-            case 'T': {
+            case 'T':
                 if (optarg == NULL) {
                     queue_init_message("Invalid argument for option: %d", opt);
                     break;
                 }
 
-                long int port = strtol(optarg, NULL, 10);
+                port = strtol(optarg, NULL, 10);
 
                 if (port <= 0 || port > MAX_PORT_RANGE) {
                     port = MAX_PORT_RANGE;
@@ -1505,25 +1395,21 @@ static void parse_args(int argc, char *argv[])
 
                 arg_opts.tcp_port = port;
                 break;
-            }
 
-            case 'u': {
+            case 'u':
                 arg_opts.unencrypt_data = 1;
                 break;
-            }
 
-            case 'v': {
+            case 'v':
                 print_version();
                 exit(EXIT_SUCCESS);
-            }
 
             case 'h':
 
             // Intentional fallthrough
-            default: {
+            default:
                 print_usage();
                 exit(EXIT_SUCCESS);
-            }
         }
     }
 }
@@ -1648,7 +1534,6 @@ int main(int argc, char **argv)
 
     prompt = init_windows(m);
     prompt_init_statusbar(prompt, m, !datafile_exists);
-    load_groups(m);
     load_conferences(m);
     set_active_window_index(0);
 
@@ -1713,7 +1598,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();

src/toxic.h

@@ -23,10 +23,6 @@
 #ifndef TOXIC_H
 #define TOXIC_H
 
-#ifndef NCURSES_WIDECHAR
-#define NCURSES_WIDECHAR 1
-#endif
-
 #ifndef TOXICVER
 #define TOXICVER "NOVERS"    /* Use the -D flag to set this */
 #endif
@@ -50,13 +46,10 @@
 #define MAX_STR_SIZE TOX_MAX_MESSAGE_LENGTH    /* must be >= TOX_MAX_MESSAGE_LENGTH */
 #define MAX_CMDNAME_SIZE 64
 #define TOXIC_MAX_NAME_LENGTH 32   /* Must be <= TOX_MAX_NAME_LENGTH */
-#define KEY_IDENT_BYTES 6    /* number of hex digits to display for the public key identifier */
+#define KEY_IDENT_DIGITS 3    /* number of hex digits to display for the pub-key based identifier */
 #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
@@ -109,13 +102,8 @@ typedef enum _FATAL_ERRS {
 void lock_status(void);
 void unlock_status(void);
 
-void flag_interface_refresh(void);
+void exit_toxic_success(Tox *m);
-
+void exit_toxic_err(const char *errmsg, int errcode);
-/* 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) __attribute__((__noreturn__));
-void exit_toxic_err(const char *errmsg, int errcode) __attribute__((__noreturn__));
 
 int store_data(Tox *m, const char *path);
 
@@ -148,34 +136,6 @@ void on_file_recv(Tox *m, uint32_t friendnumber, uint32_t filenumber, uint32_t k
 void on_friend_typing(Tox *m, uint32_t friendnumber, bool is_typing, void *userdata);
 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);
-void on_group_invite(Tox *m, uint32_t friendnumber, const uint8_t *invite_data, size_t length,
-                     const uint8_t *group_name,
-                     size_t group_name_length, void *userdata);
-void on_group_message(Tox *m, uint32_t groupnumber, uint32_t peernumber, TOX_MESSAGE_TYPE type,
-                      const uint8_t *message, size_t length, uint32_t message_id, void *userdata);
-void on_group_private_message(Tox *m, uint32_t groupnumber, uint32_t peernumber, TOX_MESSAGE_TYPE type,
-                              const uint8_t *message, size_t length,
-                              void *userdata);
-void on_group_peer_join(Tox *m, uint32_t groupnumber, uint32_t peernumber, void *userdata);
-void on_group_peer_exit(Tox *m, uint32_t groupnumber, uint32_t peer_id, Tox_Group_Exit_Type exit_type,
-                        const uint8_t *nick,
-                        size_t nick_len, const uint8_t *partmsg, size_t length, void *userdata);
-void on_group_topic_change(Tox *m, uint32_t groupnumber, uint32_t peernumber, const uint8_t *topic, size_t length,
-                           void *userdata);
-void on_group_peer_limit(Tox *m, uint32_t groupnumber, uint32_t peer_limit, void *userdata);
-void on_group_privacy_state(Tox *m, uint32_t groupnumber, Tox_Group_Privacy_State privacy_state, void *userdata);
-void on_group_topic_lock(Tox *m, uint32_t groupnumber, Tox_Group_Topic_Lock topic_lock, void *userdata);
-void on_group_password(Tox *m, uint32_t groupnumber, const uint8_t *password, size_t length, void *userdata);
-void on_group_nick_change(Tox *m, uint32_t groupnumber, uint32_t peernumber, const uint8_t *newname, size_t length,
-                          void *userdata);
-void on_group_status_change(Tox *m, uint32_t groupnumber, uint32_t peernumber, TOX_USER_STATUS status, void *userdata);
-void on_group_self_join(Tox *m, uint32_t groupnumber, void *userdata);
-void on_group_rejected(Tox *m, uint32_t groupnumber, Tox_Group_Join_Fail type, void *userdata);
-void on_group_moderation(Tox *m, uint32_t groupnumber, uint32_t source_peernum, uint32_t target_peernum,
-                         Tox_Group_Mod_Event type, void *userdata);
-void on_group_voice_state(Tox *m, uint32_t groupnumber, Tox_Group_Voice_State voice_state, void *userdata);
 
-extern char *DATA_FILE;
-extern char *BLOCK_FILE;
 
 #endif /* TOXIC_H */

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) {

src/windows.c

@@ -30,7 +30,6 @@
 #include "conference.h"
 #include "file_transfers.h"
 #include "friendlist.h"
-#include "groupchats.h"
 #include "line_info.h"
 #include "misc_tools.h"
 #include "prompt.h"
@@ -42,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,8 +77,6 @@ void on_friend_connection_status(Tox *m, uint32_t friendnumber, Tox_Connection c
             windows[i]->onConnectionChange(windows[i], m, friendnumber, connection_status);
         }
     }
-
-    flag_interface_refresh();
 }
 
 void on_friend_typing(Tox *m, uint32_t friendnumber, bool is_typing, void *userdata)
@@ -89,8 +92,6 @@ void on_friend_typing(Tox *m, uint32_t friendnumber, bool is_typing, void *userd
             windows[i]->onTypingChange(windows[i], m, friendnumber, is_typing);
         }
     }
-
-    flag_interface_refresh();
 }
 
 void on_friend_message(Tox *m, uint32_t friendnumber, Tox_Message_Type type, const uint8_t *string, size_t length,
@@ -122,8 +123,6 @@ void on_friend_name(Tox *m, uint32_t friendnumber, const uint8_t *string, size_t
         }
     }
 
-    flag_interface_refresh();
-
     store_data(m, DATA_FILE);
 }
 
@@ -141,8 +140,6 @@ void on_friend_status_message(Tox *m, uint32_t friendnumber, const uint8_t *stri
             windows[i]->onStatusMessageChange(windows[i], friendnumber, msg, length);
         }
     }
-
-    flag_interface_refresh();
 }
 
 void on_friend_status(Tox *m, uint32_t friendnumber, Tox_User_Status status, void *userdata)
@@ -154,8 +151,6 @@ void on_friend_status(Tox *m, uint32_t friendnumber, Tox_User_Status status, voi
             windows[i]->onStatusChange(windows[i], m, friendnumber, status);
         }
     }
-
-    flag_interface_refresh();
 }
 
 void on_friend_added(Tox *m, uint32_t friendnumber, bool sort)
@@ -191,7 +186,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,8 +200,6 @@ void on_conference_peer_list_changed(Tox *m, uint32_t conferencenumber, void *us
             windows[i]->onConferenceNameListChange(windows[i], m, conferencenumber);
         }
     }
-
-    flag_interface_refresh();
 }
 
 void on_conference_peer_name(Tox *m, uint32_t conferencenumber, uint32_t peernumber, const uint8_t *name,
@@ -245,7 +238,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;
@@ -268,7 +261,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;
@@ -276,7 +269,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);
         }
     }
 }
@@ -286,7 +279,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;
@@ -317,7 +310,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);
         }
     }
@@ -380,192 +373,6 @@ void on_lossless_custom_packet(Tox *m, uint32_t friendnumber, const uint8_t *dat
     }
 }
 
-void on_group_invite(Tox *m, uint32_t friendnumber, const uint8_t *invite_data, size_t length,
-                     const uint8_t *group_name,
-                     size_t group_name_length, void *userdata)
-{
-    char gname[MAX_STR_SIZE + 1];
-    group_name_length = copy_tox_str(gname, sizeof(gname), (const char *) group_name, group_name_length);
-
-    for (size_t i = 0; i < MAX_WINDOWS_NUM; ++i) {
-        if (windows[i] != NULL && windows[i]->onGroupInvite != NULL) {
-            windows[i]->onGroupInvite(windows[i], m, friendnumber, (char *) invite_data, length, gname, group_name_length);
-        }
-    }
-}
-
-void on_group_message(Tox *m, uint32_t groupnumber, uint32_t peer_id, TOX_MESSAGE_TYPE type,
-                      const uint8_t *message, size_t length, uint32_t message_id, void *userdata)
-{
-    UNUSED_VAR(message_id);
-
-    char msg[MAX_STR_SIZE + 1];
-    length = copy_tox_str(msg, sizeof(msg), (const char *) message, length);
-
-    for (size_t i = 0; i < MAX_WINDOWS_NUM; ++i) {
-        if (windows[i] != NULL && windows[i]->onGroupMessage != NULL) {
-            windows[i]->onGroupMessage(windows[i], m, groupnumber, peer_id, type, msg, length);
-        }
-    }
-}
-
-void on_group_private_message(Tox *m, uint32_t groupnumber, uint32_t peer_id, TOX_MESSAGE_TYPE type,
-                              const uint8_t *message,
-                              size_t length, void *userdata)
-{
-    char msg[MAX_STR_SIZE + 1];
-    length = copy_tox_str(msg, sizeof(msg), (const char *) message, length);
-
-    for (size_t i = 0; i < MAX_WINDOWS_NUM; ++i) {
-        if (windows[i] != NULL && windows[i]->onGroupPrivateMessage != NULL) {
-            windows[i]->onGroupPrivateMessage(windows[i], m, groupnumber, peer_id, msg, length);
-        }
-    }
-}
-
-void on_group_status_change(Tox *m, uint32_t groupnumber, uint32_t peer_id, TOX_USER_STATUS status, void *userdata)
-{
-    for (size_t i = 0; i < MAX_WINDOWS_NUM; ++i) {
-        if (windows[i] != NULL && windows[i]->onGroupStatusChange != NULL) {
-            windows[i]->onGroupStatusChange(windows[i], m, groupnumber, peer_id, status);
-        }
-    }
-
-    flag_interface_refresh();
-}
-
-void on_group_peer_join(Tox *m, uint32_t groupnumber, uint32_t peer_id, void *userdata)
-{
-    for (size_t i = 0; i < MAX_WINDOWS_NUM; ++i) {
-        if (windows[i] != NULL && windows[i]->onGroupPeerJoin != NULL) {
-            windows[i]->onGroupPeerJoin(windows[i], m, groupnumber, peer_id);
-        }
-    }
-
-    flag_interface_refresh();
-}
-
-void on_group_peer_exit(Tox *m, uint32_t groupnumber, uint32_t peer_id, Tox_Group_Exit_Type exit_type,
-                        const uint8_t *nick,
-                        size_t nick_len, const uint8_t *part_message, size_t length, void *userdata)
-{
-    char toxic_nick[TOXIC_MAX_NAME_LENGTH + 1];
-    nick_len = copy_tox_str(toxic_nick, sizeof(toxic_nick), (const char *) nick, nick_len);
-
-    char buf[MAX_STR_SIZE + 1] = {0};
-    size_t buf_len = 0;
-
-    if (part_message) {
-        buf_len = copy_tox_str(buf, sizeof(buf), (const char *) part_message, length);
-    }
-
-    for (size_t i = 0; i < MAX_WINDOWS_NUM; ++i) {
-        if (windows[i] != NULL && windows[i]->onGroupPeerExit != NULL) {
-            windows[i]->onGroupPeerExit(windows[i], m, groupnumber, peer_id, exit_type, toxic_nick, nick_len, buf, buf_len);
-        }
-    }
-}
-
-void on_group_topic_change(Tox *m, uint32_t groupnumber, uint32_t peer_id, const uint8_t *topic, size_t length,
-                           void *userdata)
-{
-    char data[MAX_STR_SIZE + 1];
-    length = copy_tox_str(data, sizeof(data), (const char *) topic, length);
-
-    for (size_t i = 0; i < MAX_WINDOWS_NUM; ++i) {
-        if (windows[i] != NULL && windows[i]->onGroupTopicChange != NULL) {
-            windows[i]->onGroupTopicChange(windows[i], m, groupnumber, peer_id, data, length);
-        }
-    }
-}
-
-void on_group_peer_limit(Tox *m, uint32_t groupnumber, uint32_t peer_limit, void *userdata)
-{
-    for (size_t i = 0; i < MAX_WINDOWS_NUM; ++i) {
-        if (windows[i] != NULL && windows[i]->onGroupPeerLimit != NULL) {
-            windows[i]->onGroupPeerLimit(windows[i], m, groupnumber, peer_limit);
-        }
-    }
-}
-
-void on_group_privacy_state(Tox *m, uint32_t groupnumber, Tox_Group_Privacy_State privacy_state, void *userdata)
-{
-    for (size_t i = 0; i < MAX_WINDOWS_NUM; ++i) {
-        if (windows[i] != NULL && windows[i]->onGroupPrivacyState != NULL) {
-            windows[i]->onGroupPrivacyState(windows[i], m, groupnumber, privacy_state);
-        }
-    }
-}
-
-void on_group_topic_lock(Tox *m, uint32_t groupnumber, Tox_Group_Topic_Lock topic_lock, void *userdata)
-{
-    for (size_t i = 0; i < MAX_WINDOWS_NUM; ++i) {
-        if (windows[i] != NULL && windows[i]->onGroupTopicLock != NULL) {
-            windows[i]->onGroupTopicLock(windows[i], m, groupnumber, topic_lock);
-        }
-    }
-}
-
-void on_group_password(Tox *m, uint32_t groupnumber, const uint8_t *password, size_t length, void *userdata)
-{
-    for (size_t i = 0; i < MAX_WINDOWS_NUM; ++i) {
-        if (windows[i] != NULL && windows[i]->onGroupPassword != NULL) {
-            windows[i]->onGroupPassword(windows[i], m, groupnumber, (char *) password, length);
-        }
-    }
-}
-
-void on_group_nick_change(Tox *m, uint32_t groupnumber, uint32_t peer_id, const uint8_t *newname, size_t length,
-                          void *userdata)
-{
-    char name[TOXIC_MAX_NAME_LENGTH + 1];
-    length = copy_tox_str(name, sizeof(name), (const char *) newname, length);
-    filter_str(name, length);
-
-    for (size_t i = 0; i < MAX_WINDOWS_NUM; ++i) {
-        if (windows[i] != NULL && windows[i]->onGroupNickChange != NULL) {
-            windows[i]->onGroupNickChange(windows[i], m, groupnumber, peer_id, name, length);
-        }
-    }
-}
-
-void on_group_self_join(Tox *m, uint32_t groupnumber, void *userdata)
-{
-    for (size_t i = 0; i < MAX_WINDOWS_NUM; ++i) {
-        if (windows[i] != NULL && windows[i]->onGroupSelfJoin != NULL) {
-            windows[i]->onGroupSelfJoin(windows[i], m, groupnumber);
-        }
-    }
-}
-
-void on_group_rejected(Tox *m, uint32_t groupnumber, Tox_Group_Join_Fail type, void *userdata)
-{
-    for (size_t i = 0; i < MAX_WINDOWS_NUM; ++i) {
-        if (windows[i] != NULL && windows[i]->onGroupRejected != NULL) {
-            windows[i]->onGroupRejected(windows[i], m, groupnumber, type);
-        }
-    }
-}
-
-void on_group_moderation(Tox *m, uint32_t groupnumber, uint32_t source_peer_id, uint32_t target_peer_id,
-                         Tox_Group_Mod_Event type, void *userdata)
-{
-    for (size_t i = 0; i < MAX_WINDOWS_NUM; ++i) {
-        if (windows[i] != NULL && windows[i]->onGroupModeration != NULL) {
-            windows[i]->onGroupModeration(windows[i], m, groupnumber, source_peer_id, target_peer_id, type);
-        }
-    }
-}
-
-void on_group_voice_state(Tox *m, uint32_t groupnumber, Tox_Group_Voice_State voice_state, void *userdata)
-{
-    for (size_t i = 0; i < MAX_WINDOWS_NUM; ++i) {
-        if (windows[i] != NULL && windows[i]->onGroupVoiceState != NULL) {
-            windows[i]->onGroupVoiceState(windows[i], m, groupnumber, voice_state);
-        }
-    }
-}
-
 /* CALLBACKS END */
 
 int add_window(Tox *m, ToxWindow *w)
@@ -614,15 +421,13 @@ 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;
-
     if (ch == user_settings->key_next_tab) {
         for (uint8_t i = active_window_index + 1; i < MAX_WINDOWS_NUM; ++i) {
             if (windows[i] != NULL) {
-                index = i;
+                set_active_window_index(i);
-                break;
+                return;
             }
         }
     } else {
@@ -630,13 +435,13 @@ static void set_next_window(int ch)
 
         for (uint8_t i = start; i > 0; --i) {
             if (windows[i] != NULL) {
-                index = i;
+                set_active_window_index(i);
-                break;
+                return;
             }
         }
     }
 
-    set_active_window_index(index);
+    set_active_window_index(0);
 }
 
 /* Deletes window w and cleans up */
@@ -652,12 +457,7 @@ void del_window(ToxWindow *w)
     refresh();
 
     if (num_active_windows > 0) {
-        if (active_window_index == 2) {    // if closing current window would bring us to friend list
-            set_next_window(-1);           // skip back to the home window instead. FIXME: magic numbers
-        }
-
         set_next_window(-1);
-
         --num_active_windows;
     }
 }
@@ -719,12 +519,6 @@ void on_window_resize(void)
 
             getmaxyx(w->window, y2, x2);
 
-            if (y2 <= 0 || x2 <= 0) {
-                fprintf(stderr, "Failed to resize game window: max_x: %d, max_y: %d\n", x2, y2);
-                delwin(w->window);
-                continue;
-            }
-
             w->window_bar = subwin(w->window, WINDOW_BAR_HEIGHT, COLS, LINES - 2, 0);
             w->game->window = subwin(w->window, y2 - CHATBOX_HEIGHT - WINDOW_BAR_HEIGHT, x2, 0, 0);
             continue;
@@ -736,7 +530,7 @@ void on_window_resize(void)
             wclear(w->help->win);
         }
 
-        if (w->type == WINDOW_TYPE_CONFERENCE || w->type == WINDOW_TYPE_GROUPCHAT) {
+        if (w->type == WINDOW_TYPE_CONFERENCE) {
             delwin(w->chatwin->sidebar);
             w->chatwin->sidebar = NULL;
         } else {
@@ -755,7 +549,7 @@ void on_window_resize(void)
         if (y2 <= 0 || x2 <= 0) {
             fprintf(stderr, "Failed to resize window: max_x: %d, max_y: %d\n", x2, y2);
             delwin(w->window);
-            continue;
+            return;
         }
 
         if (w->show_peerlist) {
@@ -764,7 +558,7 @@ void on_window_resize(void)
         } else {
             w->chatwin->history =  subwin(w->window, y2 - CHATBOX_HEIGHT - WINDOW_BAR_HEIGHT, x2, 0, 0);
 
-            if (!(w->type == WINDOW_TYPE_CONFERENCE || w->type == WINDOW_TYPE_GROUPCHAT)) {
+            if (w->type != WINDOW_TYPE_CONFERENCE) {
                 w->stb->topline = subwin(w->window, TOP_BAR_HEIGHT, x2, 0, 0);
             }
         }
@@ -872,10 +666,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));
@@ -979,45 +773,24 @@ void draw_active_window(Tox *m)
     pthread_mutex_lock(&Winthread.lock);
     a->alert = WINDOW_ALERT_NONE;
     a->pending_messages = 0;
-    bool flag_refresh = Winthread.flag_refresh;
     pthread_mutex_unlock(&Winthread.lock);
 
-    if (flag_refresh) {
+    touchwin(a->window);
-        touchwin(a->window);
+    a->onDraw(a, m);
-        a->onDraw(a, m);
+    wrefresh(a->window);
-        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);
-            a->onDraw(a, m);
-            wrefresh(a->window);
-        }
-
         int ch = getch();
 
         if (ch == ERR) {
             return;
         }
 
-        pthread_mutex_lock(&Winthread.lock);
-        flag_interface_refresh();
-        pthread_mutex_unlock(&Winthread.lock);
-
         if (ch == user_settings->key_next_tab || ch == user_settings->key_prev_tab) {
             set_next_window(ch);
+            ch = KEY_F(2);
         }
 
         a->onKey(a, m, ch, false);
@@ -1034,10 +807,6 @@ void draw_active_window(Tox *m)
         return;
     }
 
-    pthread_mutex_lock(&Winthread.lock);
-    flag_interface_refresh();
-    pthread_mutex_unlock(&Winthread.lock);
-
     if (printable == 0 && (ch == user_settings->key_next_tab || ch == user_settings->key_prev_tab)) {
         set_next_window((int) ch);
         return;
@@ -1113,66 +882,28 @@ 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) {
             continue;
         }
 
-        switch (w->type) {
+        if (w->type == WINDOW_TYPE_CHAT) {
-            case WINDOW_TYPE_CHAT: {
+            kill_chat_window(w, m);
-                kill_chat_window(w, m);
+        } else if (w->type == WINDOW_TYPE_CONFERENCE) {
-                break;
+            free_conference(w, w->num);
-            }
+        }
-
-            case WINDOW_TYPE_CONFERENCE: {
-                free_conference(w, w->num);
-                break;
-            }
 
 #ifdef GAMES
-
+        else if (w->type == WINDOW_TYPE_GAME) {
-            case WINDOW_TYPE_GAME: {
+            game_kill(w);
-                game_kill(w);
+        }
-                break;
-            }
 
 #endif // GAMES
-
-            case WINDOW_TYPE_GROUPCHAT: {
-                exit_groupchat(w, m, w->num, user_settings->group_part_message,
-                               strlen(user_settings->group_part_message));
-                break;
-            }
-
-            default: {
-                break;
-            }
-        }
     }
 
     /* TODO: use enum instead of magic indices */

src/windows.h

@@ -72,7 +72,6 @@ typedef enum {
     STATUS_BUSY,
     STATUS_AWAY,
     BAR_NOTIFY,
-    BAR_SOLID,
 } C_COLOURS;
 
 /* tab alert types: lower types take priority (this relies on the order of C_COLOURS) */
@@ -87,7 +86,6 @@ typedef enum {
     WINDOW_TYPE_PROMPT,
     WINDOW_TYPE_CHAT,
     WINDOW_TYPE_CONFERENCE,
-    WINDOW_TYPE_GROUPCHAT,
     WINDOW_TYPE_FRIEND_LIST,
 
 #ifdef GAMES
@@ -99,24 +97,13 @@ 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;
 };
 
-extern struct Winthread Winthread;
-
 struct cqueue_thread {
     pthread_t tid;
 };
@@ -150,8 +137,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;
@@ -193,24 +178,6 @@ struct ToxWindow {
     void(*onGameData)(ToxWindow *, Tox *, uint32_t, const uint8_t *, size_t);
 #endif // GAMES
 
-    void(*onGroupInvite)(ToxWindow *, Tox *, uint32_t, const char *, size_t, const char *, size_t);
-    void(*onGroupMessage)(ToxWindow *, Tox *, uint32_t, uint32_t, TOX_MESSAGE_TYPE, const char *, size_t);
-    void(*onGroupPrivateMessage)(ToxWindow *, Tox *, uint32_t, uint32_t, const char *, size_t);
-    void(*onGroupPeerJoin)(ToxWindow *, Tox *, uint32_t, uint32_t);
-    void(*onGroupPeerExit)(ToxWindow *, Tox *, uint32_t, uint32_t, Tox_Group_Exit_Type, const char *, size_t, const char *,
-                           size_t);
-    void(*onGroupNickChange)(ToxWindow *, Tox *, uint32_t, uint32_t, const char *, size_t);
-    void(*onGroupStatusChange)(ToxWindow *, Tox *, uint32_t, uint32_t, TOX_USER_STATUS);
-    void(*onGroupTopicChange)(ToxWindow *, Tox *, uint32_t, uint32_t, const char *, size_t);
-    void(*onGroupPeerLimit)(ToxWindow *, Tox *, uint32_t, uint32_t);
-    void(*onGroupPrivacyState)(ToxWindow *, Tox *, uint32_t, Tox_Group_Privacy_State);
-    void(*onGroupTopicLock)(ToxWindow *, Tox *, uint32_t, Tox_Group_Topic_Lock);
-    void(*onGroupPassword)(ToxWindow *, Tox *, uint32_t, const char *, size_t);
-    void(*onGroupSelfJoin)(ToxWindow *, Tox *, uint32_t);
-    void(*onGroupRejected)(ToxWindow *, Tox *, uint32_t, Tox_Group_Join_Fail);
-    void(*onGroupModeration)(ToxWindow *, Tox *, uint32_t, uint32_t, uint32_t, Tox_Group_Mod_Event);
-    void(*onGroupVoiceState)(ToxWindow *, Tox *, uint32_t, Tox_Group_Voice_State);
-
 #ifdef AUDIO
 
     void(*onInvite)(ToxWindow *, ToxAV *, uint32_t, int);
@@ -256,8 +223,6 @@ struct ToxWindow {
     WINDOW *window_bar;
 };
 
-extern ToxWindow *windows[MAX_WINDOWS_NUM];
-
 /* statusbar info holder */
 struct StatusBar {
     WINDOW *topline;
@@ -341,12 +306,9 @@ 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);
 
-#endif // WINDOWS_H
+#endif // WINWDOWS_H