Bump to version 0.11.0

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

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@ -151,4 +151,7 @@ texinfo_documents = [
    (master_doc, 'toxic_api', 'toxic_api Documentation',
     author, 'toxic_api', 'One line description of project.',
     'Miscellaneous'),
-]
+]
+
+
+
--- a/cfg/checks/check_features.mk
+++ b/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)
--- a/cfg/checks/games.mk
+++ b/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)
--- a/cfg/global_vars.mk
+++ b/cfg/global_vars.mk
@ -1,5 +1,5 @@
 # Version
-TOXIC_VERSION = 0.11.2
+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)
--- a/doc/toxic.1
+++ b/doc/toxic.1
@ -2,12 +2,12 @@
 .\"     Title: toxic
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 2021-05-24
+.\"      Date: 2020-05-04
 .\"    Manual: Toxic Manual
 .\"    Source: toxic __VERSION__
 .\"  Language: English
 .\"
-.TH "TOXIC" "1" "2021\-05\-24" "toxic __VERSION__" "Toxic Manual"
+.TH "TOXIC" "1" "2020\-05\-04" "toxic __VERSION__" "Toxic Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@ -153,9 +153,9 @@ Configuration example\&.
 .sp
 \-Unicode characters with a width larger than 1 column may cause strange behaviour\&.
 .sp
-\-Screen flickering sometimes occurs on certain terminals\&.
+\-Text occasionally fails to auto\-scroll to the bottom\&.
 .sp
-\-Resizing the terminal window when a game window is open will break things\&.
+\-Screen flickering sometimes occurs on certain terminals\&.
 .SH "AUTHORS"
 .sp
 JFreegman <JFreegman@gmail\&.com>
@ -166,4 +166,4 @@ JFreegman <JFreegman@gmail\&.com>
 .sp
 Project page: https://github\&.com/JFreegman/toxic
 .sp
-IRC channel: irc\&.libera\&.chat#tox
+IRC channel: chat\&.freenode\&.net#tox
--- a/doc/toxic.1.asc
+++ b/doc/toxic.1.asc
@ -89,9 +89,9 @@ BUGS
 -Unicode characters with a width larger than 1 column may cause strange
 behaviour.

-Screen flickering sometimes occurs on certain terminals.
+-Text occasionally fails to auto-scroll to the bottom.

-Resizing the terminal window when a game window is open will break things.
+-Screen flickering sometimes occurs on certain terminals.

 AUTHORS
 -------
@ -105,4 +105,4 @@ LINKS
 -----
 Project page: <https://github.com/JFreegman/toxic>

-IRC channel: irc.libera.chat#tox
+IRC channel: chat.freenode.net#tox
--- a/doc/toxic.conf.5
+++ b/doc/toxic.conf.5
@ -2,12 +2,12 @@
 .\"     Title: toxic.conf
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 2021-05-24
+.\"      Date: 2020-11-18
 .\"    Manual: Toxic Manual
 .\"    Source: toxic __VERSION__
 .\"  Language: English
 .\"
-.TH "TOXIC\&.CONF" "5" "2021\-05\-24" "toxic __VERSION__" "Toxic Manual"
+.TH "TOXIC\&.CONF" "5" "2020\-11\-18" "toxic __VERSION__" "Toxic Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@ -414,7 +414,7 @@ Configuration example\&.
 .sp
 Project page: https://github\&.com/JFreegman/toxic
 .sp
-IRC channel: irc\&.libera\&.chat#tox
+IRC channel: chat\&.freenode\&.net#tox
 .SH "AUTHORS"
 .sp
 JFreegman <JFreegman@gmail\&.com>
--- a/doc/toxic.conf.5.asc
+++ b/doc/toxic.conf.5.asc
@ -267,7 +267,7 @@ RESOURCES
 ---------
 Project page: <https://github.com/JFreegman/toxic>

-IRC channel:  irc.libera.chat#tox
+IRC channel:  chat.freenode.net#tox


 AUTHORS
--- a/script/build-minimal-static-toxic.sh
+++ b/script/build-minimal-static-toxic.sh
@ -131,15 +131,11 @@ mkdir -p "$BUILD_DIR"
 # Build Toxcore
 cd "$BUILD_DIR"

-# The git hash of the c-toxcore version we're using
-TOXCORE_VERSION="25a56c354937e9c8c4c50a64c3b4cfc099c34e29"
-
-# The sha256sum of the c-toxcore tarball for TOXCORE_VERSION
-TOXCORE_HASH="8448752e6286c747130254571fde2db8e2fc073a8116f9fff489ed53af546c0a"
-
+TOXCORE_VERSION="0.2.12"
+TOXCORE_HASH="30ae3263c9b68d3bef06f799ba9d7a67e3fad447030625f0ffa4bb22684228b0"
 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"
@ -164,8 +160,8 @@ cmake --build _build --target install
 # location with SSL_CERT_FILE env variable.
 cd "$BUILD_DIR"

-CURL_VERSION="7.77.0"
-CURL_HASH="b0a3428acb60fa59044c4d0baae4e4fc09ae9af1d8a3aa84b2e3fbcd99841f77"
+CURL_VERSION="7.74.0"
+CURL_HASH="e56b3921eeb7a2951959c02db0912b5fcd5fdba5aca071da819e1accf338bbd7"
 CURL_FILENAME="curl-$CURL_VERSION.tar.gz"

 wget --timeout=10 -O "$CURL_FILENAME" "https://curl.haxx.se/download/$CURL_FILENAME"
@ -182,8 +178,7 @@ cd curl*
  --without-ca-path \
  --with-ca-fallback \
  --with-nghttp2 \
-  --with-brotli \
-  --with-openssl
+  --with-brotli
 make
 make install
 sed -i 's|-lbrotlidec |-lbrotlidec-static -lbrotlicommon-static |g' $BUILD_DIR/prefix-curl/lib/pkgconfig/libcurl.pc
@ -219,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


@ -301,4 +295,3 @@ mv "$PREPARE_ARTIFACT_DIR" "$PREPARE_ARTIFACT_DIR/../$ARTIFACT_NAME"
 tar -cJf "$ARTIFACT_NAME.tar.xz" "$ARTIFACT_NAME"
 mv "$ARTIFACT_NAME.tar.xz" "$ARTIFACT_DIR"
 chmod 777 -R "$ARTIFACT_DIR"
-
--- a/src/api.c
+++ b/src/api.c
@ -106,7 +106,7 @@ void api_send(const char *msg)

    self_window = get_active_window();

-    snprintf((char *) self_window->chatwin->line, sizeof(self_window->chatwin->line), "%s", msg);
+    strncpy((char *) self_window->chatwin->line, msg, sizeof(self_window->chatwin->line));
    add_line_to_hist(self_window->chatwin);
    int id = line_info_add(self_window, true, name, NULL, OUT_MSG, 0, 0, "%s", msg);
    cqueue_add(self_window->chatwin->cqueue, msg, strlen(msg), OUT_MSG, id);
--- a/src/audio_call.c
+++ b/src/audio_call.c
@ -204,7 +204,7 @@ static int start_transmission(ToxWindow *self, Call *call)
        return -1;
    }

-    DeviceError error = open_input_device(&call->in_idx, read_device_callback, &self->num,
+    DeviceError error = open_input_device(&call->in_idx, read_device_callback, &self->num, false,
                                          CallControl.audio_sample_rate, CallControl.audio_frame_duration, CallControl.audio_channels);

    if (error != de_None) {
--- a/src/audio_device.c
+++ b/src/audio_device.c
@ -484,7 +484,8 @@ DeviceError set_al_device(DeviceType type, int32_t selection)
    return de_None;
 }

-static DeviceError open_device(DeviceType type, uint32_t *device_idx, DataHandleCallback cb, void *cb_data,
+static DeviceError open_device(DeviceType type, uint32_t *device_idx,
+                               DataHandleCallback cb, void *cb_data, bool enable_VAD,
                               uint32_t sample_rate, uint32_t frame_duration, uint8_t channels)
 {
    if (channels != 1 && channels != 2) {
@ -529,11 +530,7 @@ static DeviceError open_device(DeviceType type, uint32_t *device_idx, DataHandle
        device->cb = cb;
        device->cb_data = cb_data;
 #ifdef AUDIO
-
-        if (user_settings->VAD_threshold >= 0.0f) {
-            device->VAD_threshold = user_settings->VAD_threshold;
-        }
-
+        device->VAD_threshold = enable_VAD ? user_settings->VAD_threshold : 0.0f;
 #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,
-                              uint32_t frame_duration, uint8_t channels)
+DeviceError open_input_device(uint32_t *device_idx,
+                              DataHandleCallback cb, void *cb_data, bool enable_VAD,
+                              uint32_t sample_rate, uint32_t frame_duration, uint8_t channels)
 {
-    return open_device(input, device_idx, cb, cb_data, sample_rate, frame_duration, channels);
+    return open_device(input, device_idx,
+                       cb, cb_data, enable_VAD,
+                       sample_rate, frame_duration, channels);
 }

-DeviceError open_output_device(uint32_t *device_idx, uint32_t sample_rate, uint32_t frame_duration, uint8_t channels)
+DeviceError open_output_device(uint32_t *device_idx,
+                               uint32_t sample_rate, uint32_t frame_duration, uint8_t channels)
 {
-    return open_device(output, device_idx, 0, 0, sample_rate, frame_duration, channels);
+    return open_device(output, device_idx,
+                       0, 0, 0,
+                       sample_rate, frame_duration, channels);
 }

 DeviceError close_device(DeviceType type, uint32_t device_idx)
--- a/src/audio_device.h
+++ b/src/audio_device.h
@ -75,9 +75,11 @@ DeviceError set_source_position(uint32_t device_idx, float x, float y, float z);
 DeviceError set_al_device(DeviceType type, int32_t selection);

 /* Start device */
-DeviceError open_input_device(uint32_t *device_idx, DataHandleCallback cb, void *cb_data,
+DeviceError open_input_device(uint32_t *device_idx,
+                              DataHandleCallback cb, void *cb_data, bool enable_VAD,
                              uint32_t sample_rate, uint32_t frame_duration, uint8_t channels);
-DeviceError open_output_device(uint32_t *device_idx, uint32_t sample_rate, uint32_t frame_duration, uint8_t channels);
+DeviceError open_output_device(uint32_t *device_idx,
+                               uint32_t sample_rate, uint32_t frame_duration, uint8_t channels);

 /* Stop device */
 DeviceError close_device(DeviceType type, uint32_t device_idx);
--- a/src/autocomplete.c
+++ b/src/autocomplete.c
@ -164,7 +164,7 @@ static int complete_line_helper(ToxWindow *self, const char **list, const size_t

    /* 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]);
        }
    }
--- a/src/bootstrap.c
+++ b/src/bootstrap.c
@ -381,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, '"');

@ -448,13 +445,13 @@ static int extract_node(const char *line, struct Node *node)
    }

    char key_string[TOX_PUBLIC_KEY_SIZE * 2 + 1];
-    int key_len = extract_val_pk(key_start + PK_JSON_KEY_LEN, key_string, sizeof(key_string));
+    int key_len = extract_val_pk(key_start + PK_JSON_KEY_LEN, key_string);

    if (key_len == -1) {
        return -6;
    }

-    if (tox_pk_string_to_bytes(key_string, key_len, node->key, sizeof(node->key)) == -1) {
+    if (hex_string_to_bin(key_string, key_len, node->key, TOX_PUBLIC_KEY_SIZE) == -1) {
        return -6;
    }

--- a/src/chat.c
+++ b/src/chat.c
@ -82,7 +82,6 @@ static const char *chat_cmd_list[] = {
    "/conference",
 #ifdef GAMES
    "/game",
-    "/play",
 #endif
    "/help",
    "/invite",
@ -95,6 +94,7 @@ static const char *chat_cmd_list[] = {
    "/nick",
    "/note",
    "/nospam",
+    "/play",
    "/quit",
    "/savefile",
    "/sendfile",
@ -771,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;
    }

@ -1034,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");
 }
@ -1072,12 +1072,13 @@ static void draw_infobox(ToxWindow *self)

    time_t curtime = get_unix_time();

-    /* update interface once per second */
-    if (timed_out(infobox->lastupdate, 1)) {
+    /* update elapsed time string once per second */
+    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";

@ -1285,58 +1286,24 @@ static void chat_onDraw(ToxWindow *self, Tox *m)

    /* Draw status bar */
    StatusBar *statusbar = self->stb;
-
-    pthread_mutex_lock(&Winthread.lock);
-    Tox_Connection connection = statusbar->connection;
-    Tox_User_Status status = statusbar->status;
-    pthread_mutex_unlock(&Winthread.lock);
-
    wmove(statusbar->topline, 0, 0);

-    wattron(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
-    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) {
-        const char *status_text = "ERROR";
+    /* Draw name, status and note in statusbar */
+    if (statusbar->connection != TOX_CONNECTION_NONE) {
        int colour = MAGENTA;
+        Tox_User_Status status = statusbar->status;

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

@ -1345,7 +1312,7 @@ static void chat_onDraw(ToxWindow *self, Tox *m)
        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));
@ -1370,8 +1337,20 @@ static void chat_onDraw(ToxWindow *self, Tox *m)
            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", statusbar->nick);
+        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));
    }

@ -1380,15 +1359,13 @@ static void chat_onDraw(ToxWindow *self, Tox *m)
        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;
@ -1396,27 +1373,19 @@ static void chat_onDraw(ToxWindow *self, Tox *m)
    /* Truncate note if it doesn't fit in statusbar */
    size_t maxlen = x2 - getcurx(statusbar->topline) - (KEY_IDENT_DIGITS * 2) - 6;

-    pthread_mutex_lock(&Winthread.lock);
-    size_t statusmsg_len = statusbar->statusmsg_len;
-    pthread_mutex_unlock(&Winthread.lock);
-
-    if (statusmsg_len > maxlen) {
-        pthread_mutex_lock(&Winthread.lock);
-        statusbar->statusmsg[maxlen - 3] = 0;
+    if (statusbar->statusmsg_len > maxlen) {
+        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));
    }
@ -1472,11 +1441,7 @@ static void chat_onDraw(ToxWindow *self, Tox *m)
    }

    pthread_mutex_lock(&Winthread.lock);
-
-    if (refresh_file_transfer_progress(self, self->num)) {
-        flag_interface_refresh();
-    }
-
+    refresh_file_transfer_progress(self, self->num);
    pthread_mutex_unlock(&Winthread.lock);
 }

@ -1519,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);

--- a/src/chat_commands.c
+++ b/src/chat_commands.c
@ -179,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;
@ -194,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: {
--- a/src/conference.c
+++ b/src/conference.c
@ -88,7 +88,7 @@ static const char *conference_cmd_list[] = {
    "/decline",
    "/exit",
    "/conference",
-#ifdef GAMES
+#ifdef GAME
    "/game",
 #endif
    "/help",
@ -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);
-
-    if (success) {
-        self->is_call = true;
-    }
-
-    return success;
+    return init_conference_audio_input(tox, conferencenum);
 }

-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;
-
-    if (success) {
-        self->is_call = false;
-    }
-
-    return success;
+    return toxav_groupchat_disable_av(tox, conferencenum) == 0;
 }

 bool conference_mute_self(uint32_t conferencenum)
--- a/src/conference.h
+++ b/src/conference.h
@ -103,8 +103,8 @@ uint32_t get_name_list_entries_by_prefix(uint32_t conferencenum, const char *pre
        uint32_t maxpeers);

 bool init_conference_audio_input(Tox *tox, uint32_t conferencenum);
-bool enable_conference_audio(ToxWindow *self, Tox *tox, uint32_t conferencenum);
-bool disable_conference_audio(ToxWindow *self, Tox *tox, uint32_t conferencenum);
+bool enable_conference_audio(Tox *tox, uint32_t conferencenum);
+bool disable_conference_audio(Tox *tox, uint32_t conferencenum);
 bool toggle_conference_push_to_talk(uint32_t conferencenum, bool enabled);
 void audio_conference_callback(void *tox, uint32_t conferencenum, uint32_t peernum,
                               const int16_t *pcm, unsigned int samples, uint8_t channels, uint32_t
--- a/src/conference_commands.c
+++ b/src/conference_commands.c
@ -108,7 +108,7 @@ void cmd_enable_audio(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*
        return;
    }

-    if (enable ? enable_conference_audio(self, m, self->num) : disable_conference_audio(self, m, self->num)) {
+    if (enable ? enable_conference_audio(m, self->num) : disable_conference_audio(m, self->num)) {
        print_err(self, enable ? "Enabled conference audio. Use the '/ptt' command to toggle Push-To-Talk."
                  : "Disabled conference audio");
    } else {
--- a/src/execute.c
+++ b/src/execute.c
@ -119,14 +119,13 @@ static struct cmd_func conference_commands[] = {


 #ifdef PYTHON
-#define SPECIAL_COMMANDS 8
-#else
 #define SPECIAL_COMMANDS 7
+#else
+#define SPECIAL_COMMANDS 6
 #endif /* PYTHON */

 /* Special commands are commands that only take one argument even if it contains spaces */
 static const char special_commands[SPECIAL_COMMANDS][MAX_CMDNAME_SIZE] = {
-    "/add",
    "/avatar",
    "/nick",
    "/note",
@ -220,7 +219,9 @@ static int parse_command(const char *input, char (*args)[MAX_STR_SIZE])
 static int do_command(WINDOW *w, ToxWindow *self, Tox *m, int num_args, struct cmd_func *commands,
                      char (*args)[MAX_STR_SIZE])
 {
-    for (size_t i = 0; commands[i].name != NULL; ++i) {
+    int i;
+
+    for (i = 0; commands[i].name != NULL; ++i) {
        if (strcmp(args[0], commands[i].name) == 0) {
            (commands[i].func)(w, self, m, num_args - 1, args);
            return 0;
--- a/src/file_transfers.c
+++ b/src/file_transfers.c
@ -117,27 +117,13 @@ static void refresh_progress_helper(ToxWindow *self, struct FileTransfer *ft)
    ft->last_line_progress = get_unix_time();
 }

-/* refreshes active file transfer status bars.
- *
- * Return true if there is at least one active file transfer in either direction.
- */
-bool refresh_file_transfer_progress(ToxWindow *self, uint32_t friendnumber)
+/* refreshes active file transfer status bars. */
+void refresh_file_transfer_progress(ToxWindow *self, uint32_t friendnumber)
 {
-    bool active = false;
-
    for (size_t i = 0; i < MAX_FILES; ++i) {
-        struct FileTransfer *ft_r = &Friends.list[friendnumber].file_receiver[i];
-        struct FileTransfer *ft_s = &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;
-        }
+        refresh_progress_helper(self, &Friends.list[friendnumber].file_receiver[i]);
+        refresh_progress_helper(self, &Friends.list[friendnumber].file_sender[i]);
    }
-
-    return active;
 }

 static void clear_file_transfer(struct FileTransfer *ft)
--- a/src/file_transfers.h
+++ b/src/file_transfers.h
@ -72,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.
- *
- * Return true if there is at least one active file transfer in either direction.
- */
-bool refresh_file_transfer_progress(ToxWindow *self, uint32_t friendnumber);
+/* refreshes active file transfer status bars. */
+void 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.
--- a/src/game_base.c
+++ b/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))\
-                                             && ((max_x) >= (GAME_MAX_SQUARE_X_DEFAULT)))
+#define WINDOW_SIZE_LARGE_SQUARE_VALID(max_x, max_y)((((max_y) - 4) >= (GAME_MAX_SQUARE_Y))\
+                                                  && ((max_x) >= (GAME_MAX_SQUARE_X)))

-#define WINDOW_SIZE_LARGE_SQUARE_VALID(max_x, max_y)((((max_y) - 4) >= (GAME_MAX_SQUARE_Y_LARGE))\
-                                                   && ((max_x) >= (GAME_MAX_SQUARE_X_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_SMALL)))

-#define WINDOW_SIZE_RECT_VALID(max_x, max_y)((((max_y) - 4) >= (GAME_MAX_RECT_Y_DEFAULT))\
-                                           && ((max_x) >= (GAME_MAX_RECT_X_DEFAULT)))
+#define WINDOW_SIZE_LARGE_RECT_VALID(max_x, max_y)((((max_y) - 4) >= (GAME_MAX_RECT_Y))\
+                                                  && ((max_x) >= (GAME_MAX_RECT_X)))

-#define WINDOW_SIZE_LARGE_RECT_VALID(max_x, max_y)((((max_y) - 4) >= (GAME_MAX_RECT_Y_LARGE))\
-                                                 && ((max_x) >= (GAME_MAX_RECT_X_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_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) {
-            game->cb_game_kill(game, game->cb_game_kill_data);
-        }
-
-        delwin(game->window);
-        free(game->messages);
-        free(game);
+    if (game->cb_game_kill) {
+        game->cb_game_kill(game, game->cb_game_kill_data);
    }

-    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) {
-        case GW_ShapeSquare: {
-            if (WINDOW_SIZE_SQUARE_VALID(max_x, max_y)) {
-                game->game_max_x = GAME_MAX_SQUARE_X_DEFAULT;
-                game->game_max_y = GAME_MAX_SQUARE_Y_DEFAULT;
-                return 0;
-            }
+    if (WINDOW_SIZE_LARGE_RECT_VALID(max_x, max_y)) {
+        game->game_max_x = GAME_MAX_RECT_X;
+        game->game_max_y = GAME_MAX_RECT_Y;
+        return 0;
+    }

-            break;
-        }
-
-        case GW_ShapeSquareLarge: {
-            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;
-        }
+    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;
+        return 0;
    }

    return -1;
@ -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);
-    mvwhline(win, y, x + 1, ACS_HLINE, game_max_x - 1);
-    mvwvline(win, y + 1, x, ACS_VLINE, game_max_y - 1);
-    mvwvline(win, y, x - 1, ACS_VLINE, game_max_y + 1);
-    mvwaddch(win, y, x + game_max_x, ACS_URCORNER);
-    mvwvline(win, y + 1, x + game_max_x, ACS_VLINE, game_max_y - 1);
-    mvwvline(win, y, x + game_max_x + 1, ACS_VLINE, game_max_y + 1);
-    mvwaddch(win, y + game_max_y, x, ACS_LLCORNER);
-    mvwhline(win, y + game_max_y, x + 1, ACS_HLINE, game_max_x - 1);
-    mvwaddch(win, y + game_max_y, x + game_max_x, ACS_LRCORNER);
+    mvwaddch(win, y, x, ' ');
+    mvwhline(win, y, x + 1, ' ', game_max_x - 1);
+    mvwvline(win, y + 1, x, ' ', game_max_y - 1);
+    mvwvline(win, y, x - 1, ' ', game_max_y + 1);
+    mvwaddch(win, y, x + game_max_x, ' ');
+    mvwvline(win, y + 1, x + game_max_x, ' ', game_max_y - 1);
+    mvwvline(win, y, x + game_max_x + 1, ' ', game_max_y + 1);
+    mvwaddch(win, y + game_max_y, x, ' ');
+    mvwhline(win, y + game_max_y, x + 1, ' ', game_max_x - 1);
+    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 1:   Game type
- * Byte 2-5: Game ID
- * Byte 6-*  Game data
+ * Byte 0:   Game type
+ * Byte 1-4: Game ID
+ * Byte 5-*  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;
-
-    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);
-    }
+    snprintf(ret->name, sizeof(ret->name), "%s", window_name);

    return ret;
 }
@ -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;
    }

@ -1136,5 +1070,5 @@ int game_packet_send(const GameData *game, const uint8_t *data, size_t length, G
        return -1;
    }

-    return 0;
+    return -0;
 }
--- a/src/game_base.h
+++ b/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 */
-#define GAME_MAX_SQUARE_Y_DEFAULT 26
-#define GAME_MAX_SQUARE_X_DEFAULT (GAME_MAX_SQUARE_Y_DEFAULT * 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 small square game window */
+#define GAME_MAX_SQUARE_Y_SMALL 18
+#define GAME_MAX_SQUARE_X_SMALL (GAME_MAX_SQUARE_Y_SMALL * 2)

 /* Max size of a default size rectangle game window */
-#define GAME_MAX_RECT_Y_DEFAULT 24
-#define GAME_MAX_RECT_X_DEFAULT (GAME_MAX_RECT_Y_DEFAULT * 4)
+#define GAME_MAX_RECT_Y 24
+#define GAME_MAX_RECT_X (GAME_MAX_RECT_Y * 4)

-/* Max size of a large rectangle game window */
-#define GAME_MAX_RECT_Y_LARGE 52
-#define GAME_MAX_RECT_X_LARGE (GAME_MAX_RECT_Y_LARGE * 4)
+/* Max size of a small rectangle game window */
+#define GAME_MAX_RECT_Y_SMALL 14
+#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

--- a/src/game_centipede.c
+++ b/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);
--- a/src/game_chess.c
+++ b/src/game_chess.c
@ -826,7 +826,9 @@ 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);
@ -1077,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;
@ -1407,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;
@ -1420,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;
@ -1433,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;
@ -1446,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;
@ -1626,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);
@ -1712,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);
@ -1768,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);
@ -1809,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;
    }

@ -1841,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;
    }

@ -1849,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;
    }

@ -1924,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)
@ -2040,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;
    }

@ -2056,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;
    }

@ -2069,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;
    }

@ -2081,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;
    }

@ -2156,3 +2130,4 @@ int chess_initialize(GameData *game, const uint8_t *init_data, size_t length)

    return 0;
 }
+
--- a/src/game_life.c
+++ b/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;
-}
--- a/src/game_life.h
+++ b/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
-
--- a/src/game_snake.c
+++ b/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_AGENT_MAX_LIST_SIZE  (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 * 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;
    }
--- a/src/game_util.c
+++ b/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;
        }

--- a/src/game_util.h
+++ b/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
+
--- a/src/global_commands.c
+++ b/src/global_commands.c
@ -157,22 +157,22 @@ 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);
-    const bool is_tox_id = arg_length >= (2 * TOX_ADDRESS_SIZE);
+    char msg[MAX_STR_SIZE];

-    if (is_tox_id) {
-        // we have to manually parse the message due to this command being a special case
-        int idx = char_find(0, id, ' ');
-
-        if (idx > 0 && idx < arg_length - 1) {
-            snprintf(msg, sizeof(msg), "%s", &id[idx + 1]);
+    if (argc > 1) {
+        if (argv[2][0] != '\"') {
+            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Message must be enclosed in quotes.");
+            return;
        }
-    }

-    if (!msg[0]) {
+        /* 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);

@ -182,9 +182,10 @@ 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);

    /* try to add tox ID */
-    if (is_tox_id) {
+    if (id_len == 2 * TOX_ADDRESS_SIZE) {
        size_t i;
        char xx[3];
        uint32_t x;
@ -192,7 +193,7 @@ void cmd_add(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX
        for (i = 0; i < TOX_ADDRESS_SIZE; ++i) {
            xx[0] = id[2 * i];
            xx[1] = id[2 * i + 1];
-            xx[2] = 0;
+            xx[2] = '\0';

            if (sscanf(xx, "%02x", &x) != 1) {
                line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invalid Tox ID.");
@ -276,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;
    }
@ -366,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: {
@ -375,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;
        }

@ -520,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;
    }
@ -537,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;
    }
@ -655,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])
--- a/src/help.c
+++ b/src/help.c
@ -174,7 +174,7 @@ static void help_draw_global(ToxWindow *self)
    wprintw(win, "  /decline <id>              : Decline friend request\n");
    wprintw(win, "  /requests                  : List pending friend requests\n");
    wprintw(win, "  /connect <ip> <port> <key> : Manually connect to a DHT node\n");
-    wprintw(win, "  /status <type>             : Set status (Online, Busy, Away)\n");
+    wprintw(win, "  /status <type> <msg>       : Set status with optional note\n");
    wprintw(win, "  /note <msg>                : Set a personal note\n");
    wprintw(win, "  /nick <nick>               : Set your nickname\n");
    wprintw(win, "  /nospam <value>            : Change part of your Tox ID to stop spam\n");
--- a/src/input.c
+++ b/src/input.c
@ -346,9 +346,5 @@ bool input_handle(ToxWindow *self, wint_t key, int x, int mx_x)
        }
    }

-    if (match) {
-        flag_interface_refresh();
-    }
-
    return match;
 }
--- a/src/line_info.c
+++ b/src/line_info.c
@ -440,10 +440,6 @@ int line_info_add(ToxWindow *self, bool show_timestamp, const char *name1, const
    new_line->noread_flag = false;
    new_line->timestamp = get_unix_time();

-    if (type == OUT_MSG || type == OUT_ACTION) {
-        new_line->noread_flag = self->stb->connection == TOX_CONNECTION_NONE;
-    }
-
    line_info_init_line(self, new_line);

    hst->queue[hst->queue_size++] = new_line;
@ -475,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;
@ -575,6 +573,12 @@ void line_info_print(ToxWindow *self)
                    wattroff(win, COLOR_PAIR(RED));
                }

+                if (type == OUT_MSG && !line->read_flag) {
+                    if (timed_out(line->timestamp, NOREAD_FLAG_TIMEOUT)) {
+                        line->noread_flag = true;
+                    }
+                }
+
                waddch(win, '\n');
                break;

@ -594,6 +598,12 @@ void line_info_print(ToxWindow *self)
                print_ret = print_wrap(win, line, max_x, max_y);
                wattroff(win, COLOR_PAIR(YELLOW));

+                if (type == OUT_ACTION && !line->read_flag) {
+                    if (timed_out(line->timestamp, NOREAD_FLAG_TIMEOUT)) {
+                        line->noread_flag = true;
+                    }
+                }
+
                waddch(win, '\n');
                break;

@ -699,8 +709,6 @@ void line_info_print(ToxWindow *self)
        line = line->next;
    }

-    flag_interface_refresh();
-
    /* keep calling until queue is empty */
    if (hst->queue_size > 0) {
        line_info_print(self);
@ -742,8 +750,6 @@ static bool line_info_screen_fit(ToxWindow *self, struct line_info *line)
 /* puts msg in specified line_info msg buffer */
 void line_info_set(ToxWindow *self, uint32_t id, char *msg)
 {
-    flag_interface_refresh();
-
    struct line_info *line = self->chatwin->hst->line_end;

    while (line) {
@ -759,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) {
@ -867,10 +855,6 @@ bool line_info_onKey(ToxWindow *self, wint_t key)
        match = false;
    }

-    if (match) {
-        flag_interface_refresh();
-    }
-
    return match;
 }

--- a/src/line_info.h
+++ b/src/line_info.h
@ -96,11 +96,6 @@ void line_info_clear(struct history *hst);
 /* puts msg in specified line_info msg buffer */
 void line_info_set(ToxWindow *self, uint32_t id, char *msg);

-/* Return the line_info object associated with `id`.
- * Return NULL if id cannot be found
- */
-struct line_info *line_info_get(ToxWindow *self, uint32_t id);
-
 /* resets line_start (moves to end of chat history) */
 void line_info_reset_start(ToxWindow *self, struct history *hst);

--- a/src/message_queue.c
+++ b/src/message_queue.c
@ -59,7 +59,6 @@ void cqueue_add(struct chat_queue *q, const char *msg, size_t len, uint8_t type,
    new_m->type = type;
    new_m->line_id = line_id;
    new_m->last_send_try = 0;
-    new_m->time_added = get_unix_time();
    new_m->receipt = -1;
    new_m->next = NULL;

@ -77,19 +76,23 @@ void cqueue_add(struct chat_queue *q, const char *msg, size_t len, uint8_t type,
 /* update line to show receipt was received after queue removal */
 static void cqueue_mark_read(ToxWindow *self, struct cqueue_msg *msg)
 {
-    struct line_info *line = line_info_get(self, msg->line_id);
+    struct line_info *line = self->chatwin->hst->line_end;
+
+    while (line) {
+        if (line->id != msg->line_id) {
+            line = line->prev;
+            continue;
+        }
+
+        line->type = msg->type == OUT_ACTION ? OUT_ACTION_READ : OUT_MSG_READ;
+
+        if (line->noread_flag) {
+            line->noread_flag = false;
+            line->read_flag = true;
+        }

-    if (line == NULL) {
        return;
    }
-
-    line->type = msg->type == OUT_ACTION ? OUT_ACTION_READ : OUT_MSG_READ;
-
-    if (line->noread_flag) {
-        line->noread_flag = false;
-        line->read_flag = true;
-        flag_interface_refresh();
-    }
 }

 /* removes message with matching receipt from queue, writes to log and updates line to show the message was received. */
@ -155,36 +158,6 @@ static void cqueue_check_timeouts(struct cqueue_msg *msg)
    }
 }

-/*
- * Sets the noread flag for messages sent to the peer associated with `self` which have not
- * received a receipt after a period of time.
- */
-#define NOREAD_TIMEOUT 5
-void cqueue_check_unread(ToxWindow *self)
-{
-    struct chat_queue *q = self->chatwin->cqueue;
-    struct cqueue_msg *msg = q->root;
-
-    while (msg) {
-        if (msg->noread_flag) {
-            msg = msg->next;
-            continue;
-        }
-
-        struct line_info *line = line_info_get(self, msg->line_id);
-
-        if (line != NULL) {
-            if (timed_out(msg->time_added, NOREAD_TIMEOUT)) {
-                line->noread_flag = true;
-                msg->noread_flag = true;
-                flag_interface_refresh();
-            }
-        }
-
-        msg = msg->next;
-    }
-}
-
 /*
 * Tries to send all messages in the send queue in sequential order.
 * If a message fails to send the function will immediately return.
--- a/src/message_queue.h
+++ b/src/message_queue.h
@ -28,10 +28,8 @@ struct cqueue_msg {
    size_t len;
    int line_id;
    time_t last_send_try;
-    time_t time_added;
    uint8_t type;
    int64_t receipt;
-    bool noread_flag;
    struct cqueue_msg *next;
    struct cqueue_msg *prev;
 };
@ -50,12 +48,6 @@ void cqueue_add(struct chat_queue *q, const char *msg, size_t len, uint8_t type,
 */
 void cqueue_try_send(ToxWindow *self, Tox *m);

-/*
- * Sets the noread flag for messages sent to the peer associated with `self` which have not
- * received a receipt after a period of time.
- */
-void cqueue_check_unread(ToxWindow *self);
-
 /* removes message with matching receipt from queue, writes to log and updates line to show the message was received. */
 void cqueue_remove(ToxWindow *self, Tox *m, uint32_t receipt);

--- a/src/misc_tools.c
+++ b/src/misc_tools.c
@ -137,18 +137,15 @@ void get_elapsed_time_str(char *buf, int bufsize, time_t secs)
 }

 /*
- * Converts a hexidecimal string representation of a Tox public key to binary format and puts
- * the result in output.
- *
- * `hex_len` must be exactly TOX_PUBLIC_KEY_SIZE * 2, and `output_size` must have room
- * for TOX_PUBLIC_KEY_SIZE bytes.
+ * Converts a hexidecimal string of length hex_len to binary format and puts the result in output.
+ * output_size must be exactly half of hex_len.
 *
 * Returns 0 on success.
 * Returns -1 on failure.
 */
-int tox_pk_string_to_bytes(const char *hex_string, size_t hex_len, char *output, size_t output_size)
+int hex_string_to_bin(const char *hex_string, size_t hex_len, char *output, size_t output_size)
 {
-    if (output_size != TOX_PUBLIC_KEY_SIZE || hex_len > output_size * 2) {
+    if (output_size == 0 || hex_len != output_size * 2) {
        return -1;
    }

@ -160,11 +157,6 @@ int tox_pk_string_to_bytes(const char *hex_string, size_t hex_len, char *output,
    return 0;
 }

-/* Convert a hexadecimcal string of length `size` to bytes and puts the result in `keystr`.
- *
- * Returns 0 on success.
- * Returns -1 on failure.
- */
 int hex_string_to_bytes(char *buf, int size, const char *keystr)
 {
    if (size % 2 != 0) {
@ -186,14 +178,11 @@ int hex_string_to_bytes(char *buf, int size, const char *keystr)
 }

 /* Converts a binary representation of a Tox ID into a string.
- *
- * `bin_id_size` must be exactly TOX_ADDRESS_SIZE bytes in length, and
- * `output_size` must be at least TOX_ADDRESS_SIZE * 2 + 1.
 *
 * Returns 0 on success.
 * Returns -1 on failure.
 */
-int tox_id_bytes_to_str(const char *bin_id, size_t bin_id_size, char *output, size_t output_size)
+int bin_id_to_string(const char *bin_id, size_t bin_id_size, char *output, size_t output_size)
 {
    if (bin_id_size != TOX_ADDRESS_SIZE || output_size < (TOX_ADDRESS_SIZE * 2 + 1)) {
        return -1;
@ -207,14 +196,11 @@ int tox_id_bytes_to_str(const char *bin_id, size_t bin_id_size, char *output, si
 }

 /* Converts a binary representation of a Tox public key into a string.
- *
- * `bin_pubkey_size` must be exactly TOX_PUBLIC_KEY_SIZE bytes in size, and
- * `output_size` must be at least TOX_PUBLIC_KEY_SIZE * 2 + 1.
 *
 * Returns 0 on success.
 * Returns -1 on failure.
 */
-int tox_pk_bytes_to_str(const uint8_t *bin_pubkey, size_t bin_pubkey_size, char *output, size_t output_size)
+int bin_pubkey_to_string(const uint8_t *bin_pubkey, size_t bin_pubkey_size, char *output, size_t output_size)
 {
    if (bin_pubkey_size != TOX_PUBLIC_KEY_SIZE || output_size < (TOX_PUBLIC_KEY_SIZE * 2 + 1)) {
        return -1;
--- a/src/misc_tools.h
+++ b/src/misc_tools.h
@ -53,43 +53,30 @@ void clear_screen(void);
 void hst_to_net(uint8_t *num, uint16_t numbytes);

 /*
- * Converts a hexidecimal string representation of a Tox public key to binary format and puts
- * the result in output.
- *
- * `hex_len` must be exactly TOX_PUBLIC_KEY_SIZE * 2, and `output_size` must have room
- * for TOX_PUBLIC_KEY_SIZE bytes.
+ * Converts a hexidecimal string of length hex_len to binary format and puts the result in output.
+ * output_size must be exactly half of hex_len.
 *
 * 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.
- *
- * `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.
- */
+/* convert a hex string to bytes. returns 0 on success, -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
- * `output_size` must be at least TOX_ADDRESS_SIZE * 2 + 1.
+ * Returns 0 on success.
+ * Returns -1 on failure.
+ */
+int bin_id_to_string(const char *bin_id, size_t bin_id_size, char *output, size_t output_size);
+
+/* Converts a binary representation of a Tox public key into a string.
 *
 * Returns 0 on success.
 * Returns -1 on failure.
 */
-int tox_id_bytes_to_str(const char *bin_id, size_t bin_id_size, char *output, size_t output_size);
+int bin_pubkey_to_string(const uint8_t *bin_pubkey, size_t bin_pubkey_size, char *output, size_t output_size);

 /* get the current unix time (not thread safe) */
 time_t get_unix_time(void);
--- a/src/name_lookup.c
+++ b/src/name_lookup.c
@ -132,10 +132,8 @@ static int load_nameserver_list(const char *path)
            continue;
        }

-        const size_t idx = Nameservers.lines;
-        snprintf(Nameservers.names[idx], sizeof(Nameservers.names[idx]), "%s", name);
-
-        int res = hex_string_to_bytes(Nameservers.keys[idx], SERVER_KEY_SIZE, keystr);
+        snprintf(Nameservers.names[Nameservers.lines], sizeof(Nameservers.names[Nameservers.lines]), "%s", name);
+        int res = hex_string_to_bytes(Nameservers.keys[Nameservers.lines], SERVER_KEY_SIZE, keystr);

        if (res == -1) {
            continue;
@ -233,7 +231,7 @@ static int process_response(struct Recv_Curl_Data *recv_data)
    memcpy(ID_string, IDstart + prefix_size, TOX_ADDRESS_SIZE * 2);
    ID_string[TOX_ADDRESS_SIZE * 2] = 0;

-    if (tox_pk_string_to_bytes(ID_string, strlen(ID_string), t_data.id_bin, sizeof(t_data.id_bin)) == -1) {
+    if (hex_string_to_bin(ID_string, strlen(ID_string), t_data.id_bin, sizeof(t_data.id_bin)) == -1) {
        return -1;
    }

--- a/src/notify.c
+++ b/src/notify.c
@ -318,7 +318,7 @@ void *do_playing(void *_p)
        has_looping = false;

        control_unlock();
-        sleep_thread(100000L);
+        sleep_thread(10000L);
    }

    pthread_exit(NULL);
--- a/src/prompt.c
+++ b/src/prompt.c
@ -60,7 +60,7 @@ static const char *glob_cmd_list[] = {
    "/decline",
    "/exit",
    "/conference",
-#ifdef GAMES
+#ifdef GAME
    "/game",
 #endif
    "/help",
@ -125,8 +125,6 @@ void on_self_connection_status(Tox *m, Tox_Connection connection_status, void *u
    UNUSED_VAR(userdata);
    StatusBar *statusbar = prompt->stb;
    statusbar->connection = connection_status;
-
-    flag_interface_refresh();
 }

 /* Updates own nick in prompt statusbar */
@ -340,50 +338,24 @@ static void prompt_onDraw(ToxWindow *self, Tox *m)
    Tox_User_Status status = statusbar->status;
    pthread_mutex_unlock(&Winthread.lock);

-    wattron(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
-    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) {
+    if (connection != TOX_CONNECTION_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;
-
-            default:
+                colour = STATUS_BUSY;
                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) {
-        pthread_mutex_lock(&Winthread.lock);
-        statusbar->statusmsg[maxlen - 3] = 0;
+    if (statusbar->statusmsg_len > maxlen) {
+        statusbar->statusmsg[maxlen - 3] = '\0';
        strcat(statusbar->statusmsg, "...");
        statusbar->statusmsg_len = maxlen;
-        pthread_mutex_unlock(&Winthread.lock);
    }

-    if (statusmsg_len) {
+    if (statusbar->statusmsg[0]) {
        wattron(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
        wprintw(statusbar->topline, " | ");
        wattroff(statusbar->topline, COLOR_PAIR(BAR_ACCENT));

        wattron(statusbar->topline, COLOR_PAIR(BAR_TEXT));
-        pthread_mutex_lock(&Winthread.lock);
        wprintw(statusbar->topline, "%s", statusbar->statusmsg);
-        pthread_mutex_unlock(&Winthread.lock);
        wattroff(statusbar->topline, COLOR_PAIR(BAR_TEXT));
    }

+    pthread_mutex_unlock(&Winthread.lock);
+
    int y;
    int x;
    getyx(self->window, y, x);
--- a/src/settings.h
+++ b/src/settings.h
@ -32,7 +32,7 @@

 #define PASSWORD_EVAL_MAX 512

-/* Holds user setting values defined in the toxic config file. */
+/* holds user setting values */
 struct user_settings {
    int autolog;           /* boolean */
    int alerts;            /* boolean */
--- a/src/toxic.c
+++ b/src/toxic.c
@ -101,9 +101,6 @@ struct Winthread Winthread;
 struct cqueue_thread cqueue_thread;
 struct av_thread av_thread;
 struct arg_opts arg_opts;
-
-// 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 {
@ -242,12 +239,6 @@ void cb_toxcore_logger(Tox *m, TOX_LOG_LEVEL level, const char *file, uint32_t l
    }
 }

-/* Sets ncurses refresh rate. Lower values make it refresh more often. */
-void set_window_refresh_rate(size_t refresh_rate)
-{
-    timeout(refresh_rate);
-}
-
 static void init_term(void)
 {
 #if HAVE_WIDECHAR
@ -265,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;
@ -392,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);
@ -444,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]);
    }

@ -453,16 +445,19 @@ static void cleanup_init_messages(void)

 static void print_init_messages(ToxWindow *toxwin)
 {
-    for (int i = 0; i < init_messages.num; ++i) {
+    int i;
+
+    for (i = 0; i < init_messages.num; ++i) {
        line_info_add(toxwin, NULL, NULL, NULL, SYS_MSG, 0, 0, init_messages.msgs[i]);
    }
 }

 static void load_friendlist(Tox *m)
 {
+    size_t i;
    size_t numfriends = tox_self_get_friend_list_size(m);

-    for (size_t i = 0; i < numfriends; ++i) {
+    for (i = 0; i < numfriends; ++i) {
        friendlist_onFriendAdded(NULL, m, i, false);
    }

@ -1076,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)
@ -1114,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();
@ -1133,8 +1096,6 @@ void *thread_winref(void *data)
            pthread_mutex_lock(&Winthread.lock);
            exit_toxic_success(m);
        }
-
-        poll_interface_refresh_flag();
    }
 }

@ -1148,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)) {
-                cqueue_check_unread(toxwin);
-
-                if (get_friend_connection_status(toxwin->num) != TOX_CONNECTION_NONE) {
-                    cqueue_try_send(toxwin, m);
-                }
+            if ((toxwin != NULL) && (toxwin->type == WINDOW_TYPE_CHAT)
+                    && (get_friend_connection_status(toxwin->num) != TOX_CONNECTION_NONE)) {
+                cqueue_try_send(toxwin, m);
            }
        }

@ -1245,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 indexptr = 0;
+    int opt, indexptr;
+    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;
@ -1274,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;
@ -1325,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;

@ -1347,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;
@ -1363,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': {
-                arg_opts.proxy_type = TOX_PROXY_TYPE_SOCKS5;
-            }
-
-            // Intentional fallthrough
-
-            case 'P': {
+            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_HTTP;
-                }
-
+                arg_opts.proxy_type = TOX_PROXY_TYPE_SOCKS5;
                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);
@ -1402,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;
@ -1417,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;
@ -1438,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);
-            }
        }
    }
 }
@ -1645,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();
--- a/src/toxic.h
+++ b/src/toxic.h
@ -50,9 +50,6 @@
 #define TIME_STR_SIZE 32
 #define COLOR_STR_SIZE 10 /* should fit every color option */

-#define NCURSES_DEFAULT_REFRESH_RATE 100
-#define NCURSES_GAME_REFRESH_RATE 25
-
 #ifndef MAX_PORT_RANGE
 #define MAX_PORT_RANGE 65535
 #endif
@ -105,11 +102,6 @@ typedef enum _FATAL_ERRS {
 void lock_status(void);
 void unlock_status(void);

-void flag_interface_refresh(void);
-
-/* Sets ncurses refresh rate. Lower values make it refresh more often. */
-void set_window_refresh_rate(size_t refresh_rate);
-
 void exit_toxic_success(Tox *m);
 void exit_toxic_err(const char *errmsg, int errcode);

--- a/src/windows.c
+++ b/src/windows.c
@ -77,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)
@ -94,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,
@ -127,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);
 }

@ -146,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)
@ -159,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)
@ -210,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,
@ -433,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;
-                break;
+                set_active_window_index(i);
+                return;
            }
        }
    } else {
@ -449,13 +435,13 @@ static void set_next_window(int ch)

        for (uint8_t i = start; i > 0; --i) {
            if (windows[i] != NULL) {
-                index = i;
-                break;
+                set_active_window_index(i);
+                return;
            }
        }
    }

-    set_active_window_index(index);
+    set_active_window_index(0);
 }

 /* Deletes window w and cleans up */
@ -471,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;
    }
 }
@ -538,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;
@ -574,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) {
@ -798,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);
-        a->onDraw(a, m);
-        wrefresh(a->window);
-    }
-
-#ifdef AUDIO
-    else if (a->is_call && timed_out(a->chatwin->infobox.lastupdate, 1)) {
-        touchwin(a->window);
-        a->onDraw(a, m);
-        wrefresh(a->window);
-    }
-
-#endif  // AUDIO
+    touchwin(a->window);
+    a->onDraw(a, m);
+    wrefresh(a->window);

 #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);
@ -853,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;
@ -932,60 +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) {
-            case WINDOW_TYPE_CHAT: {
-                kill_chat_window(w, m);
-                break;
-            }
-
-            case WINDOW_TYPE_CONFERENCE: {
-                free_conference(w, w->num);
-                break;
-            }
+        if (w->type == WINDOW_TYPE_CHAT) {
+            kill_chat_window(w, m);
+        } else if (w->type == WINDOW_TYPE_CONFERENCE) {
+            free_conference(w, w->num);
+        }

 #ifdef GAMES
-
-            case WINDOW_TYPE_GAME: {
-                game_kill(w);
-                break;
-            }
+        else if (w->type == WINDOW_TYPE_GAME) {
+            game_kill(w);
+        }

 #endif // GAMES
-
-            default: {
-                break;
-            }
-        }
    }

    /* TODO: use enum instead of magic indices */
--- a/src/windows.h
+++ b/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) */
@ -98,20 +97,11 @@ 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;
 };

 struct cqueue_thread {
@ -316,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
Author	SHA1	Message	Date
jfreegman	3dd5c58a7b	Bump to version 0.11.0	2021-04-22 13:08:00 -04:00
jfreegman	30513e2161	Show previous window instead of Home after closing a window	2021-04-22 12:57:15 -04:00
jfreegman	960ad7c4cb	Add ability to compile without game support	2021-04-22 12:57:15 -04:00
jfreegman	787d081e74	Add networking to game engine / add multiplayer chess	2021-04-22 12:57:15 -04:00
jfreegman	97cb43a218	Begin implementing chess	2021-04-22 12:57:14 -04:00
jfreegman	b9ea733470	Add game module (WIP)	2021-04-22 12:57:11 -04:00