mirror of
				https://github.com/Tha14/toxic.git
				synced 2025-11-04 12:06:51 +01:00 
			
		
		
		
	Compare commits
	
		
			23 Commits
		
	
	
		
			v0.11.1
			...
			changelog_
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					d7a19791b4 | ||
| 
						 | 
					e2c8497da9 | ||
| 
						 | 
					afbd185222 | ||
| 
						 | 
					e9a0a30408 | ||
| 
						 | 
					8aa57b0539 | ||
| 
						 | 
					7b734f3996 | ||
| 
						 | 
					27e20d6f44 | ||
| 
						 | 
					58d0bd0663 | ||
| 
						 | 
					090fcfffe3 | ||
| 
						 | 
					1cba726bb8 | ||
| 
						 | 
					50a074ed22 | ||
| 
						 | 
					3fddc410b3 | ||
| 
						 | 
					0a708e4a2e | ||
| 
						 | 
					b7002ef3f0 | ||
| 
						 | 
					1803da85c1 | ||
| 
						 | 
					f3f81111c8 | ||
| 
						 | 
					13337041ce | ||
| 
						 | 
					41e93adbdb | ||
| 
						 | 
					34b7c0a0d8 | ||
| 
						 | 
					bcdec5d624 | ||
| 
						 | 
					9e353443c2 | ||
| 
						 | 
					d02f3b4acb | ||
| 
						 | 
					f2b1c81279 | 
							
								
								
									
										503
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										503
									
								
								CHANGELOG.md
									
									
									
									
									
								
							@@ -1,503 +0,0 @@
 | 
				
			|||||||
# 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)*
 | 
					 | 
				
			||||||
@@ -10,7 +10,7 @@
 | 
				
			|||||||
## Dependencies
 | 
					## Dependencies
 | 
				
			||||||
| Name                                                 | Needed by                  | Debian package      |
 | 
					| Name                                                 | Needed by                  | Debian package      |
 | 
				
			||||||
|------------------------------------------------------|----------------------------|---------------------|
 | 
					|------------------------------------------------------|----------------------------|---------------------|
 | 
				
			||||||
| [Tox Core](https://github.com/toktok/c-toxcore)      | BASE                       | *None*              |
 | 
					| [Tox Core](https://github.com/toktok/c-toxcore)      | BASE                       | libtoxcore-dev      |
 | 
				
			||||||
| [NCurses](https://www.gnu.org/software/ncurses)      | BASE                       | libncursesw5-dev    |
 | 
					| [NCurses](https://www.gnu.org/software/ncurses)      | BASE                       | libncursesw5-dev    |
 | 
				
			||||||
| [LibConfig](http://www.hyperrealm.com/libconfig)     | BASE                       | libconfig-dev       |
 | 
					| [LibConfig](http://www.hyperrealm.com/libconfig)     | BASE                       | libconfig-dev       |
 | 
				
			||||||
| [GNUmake](https://www.gnu.org/software/make)         | BASE                       | make                |
 | 
					| [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_X11=1` → Disable X11 support (needed for focus tracking)
 | 
				
			||||||
  * `DISABLE_AV=1` → Disable audio call support
 | 
					  * `DISABLE_AV=1` → Disable audio call support
 | 
				
			||||||
  * `DISABLE_SOUND_NOTIFY=1` → Disable sound notifications support
 | 
					  * `DISABLE_SOUND_NOTIFY=1` → Disable sound notifications support
 | 
				
			||||||
  * `DISABLE_QRCODE` → Disable QR exporting support
 | 
					  * `DISABLE_QRCODE=1` → Disable QR exporting support
 | 
				
			||||||
  * `DISABLE_QRPNG` → Disable support for exporting QR as PNG
 | 
					  * `DISABLE_QRPNG=1` → Disable support for exporting QR as PNG
 | 
				
			||||||
  * `DISABLE_DESKTOP_NOTIFY=1` → Disable desktop notifications support
 | 
					  * `DISABLE_DESKTOP_NOTIFY=1` → Disable desktop notifications support
 | 
				
			||||||
  * `DISABLE_GAMES=1` → Disable support for games
 | 
					  * `DISABLE_GAMES=1` → Disable support for games
 | 
				
			||||||
  * `ENABLE_PYTHON=1` → Build toxic with Python scripting support
 | 
					  * `ENABLE_PYTHON=1` → Build toxic with Python scripting support
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,12 +2,12 @@
 | 
				
			|||||||
.\"     Title: toxic
 | 
					.\"     Title: toxic
 | 
				
			||||||
.\"    Author: [see the "AUTHORS" section]
 | 
					.\"    Author: [see the "AUTHORS" section]
 | 
				
			||||||
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
 | 
					.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
 | 
				
			||||||
.\"      Date: 2020-05-04
 | 
					.\"      Date: 2021-05-24
 | 
				
			||||||
.\"    Manual: Toxic Manual
 | 
					.\"    Manual: Toxic Manual
 | 
				
			||||||
.\"    Source: toxic __VERSION__
 | 
					.\"    Source: toxic __VERSION__
 | 
				
			||||||
.\"  Language: English
 | 
					.\"  Language: English
 | 
				
			||||||
.\"
 | 
					.\"
 | 
				
			||||||
.TH "TOXIC" "1" "2020\-05\-04" "toxic __VERSION__" "Toxic Manual"
 | 
					.TH "TOXIC" "1" "2021\-05\-24" "toxic __VERSION__" "Toxic Manual"
 | 
				
			||||||
.\" -----------------------------------------------------------------
 | 
					.\" -----------------------------------------------------------------
 | 
				
			||||||
.\" * Define some portability stuff
 | 
					.\" * Define some portability stuff
 | 
				
			||||||
.\" -----------------------------------------------------------------
 | 
					.\" -----------------------------------------------------------------
 | 
				
			||||||
@@ -153,9 +153,9 @@ Configuration example\&.
 | 
				
			|||||||
.sp
 | 
					.sp
 | 
				
			||||||
\-Unicode characters with a width larger than 1 column may cause strange behaviour\&.
 | 
					\-Unicode characters with a width larger than 1 column may cause strange behaviour\&.
 | 
				
			||||||
.sp
 | 
					.sp
 | 
				
			||||||
\-Text occasionally fails to auto\-scroll to the bottom\&.
 | 
					 | 
				
			||||||
.sp
 | 
					 | 
				
			||||||
\-Screen flickering sometimes occurs on certain terminals\&.
 | 
					\-Screen flickering sometimes occurs on certain terminals\&.
 | 
				
			||||||
 | 
					.sp
 | 
				
			||||||
 | 
					\-Resizing the terminal window when a game window is open will break things\&.
 | 
				
			||||||
.SH "AUTHORS"
 | 
					.SH "AUTHORS"
 | 
				
			||||||
.sp
 | 
					.sp
 | 
				
			||||||
JFreegman <JFreegman@gmail\&.com>
 | 
					JFreegman <JFreegman@gmail\&.com>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -89,10 +89,10 @@ BUGS
 | 
				
			|||||||
-Unicode characters with a width larger than 1 column may cause strange
 | 
					-Unicode characters with a width larger than 1 column may cause strange
 | 
				
			||||||
behaviour.
 | 
					behaviour.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
-Text occasionally fails to auto-scroll to the bottom.
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
-Screen flickering sometimes occurs on certain terminals.
 | 
					-Screen flickering sometimes occurs on certain terminals.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					-Resizing the terminal window when a game window is open will break things.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
AUTHORS
 | 
					AUTHORS
 | 
				
			||||||
-------
 | 
					-------
 | 
				
			||||||
JFreegman <JFreegman@gmail.com>
 | 
					JFreegman <JFreegman@gmail.com>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,12 +2,12 @@
 | 
				
			|||||||
.\"     Title: toxic.conf
 | 
					.\"     Title: toxic.conf
 | 
				
			||||||
.\"    Author: [see the "AUTHORS" section]
 | 
					.\"    Author: [see the "AUTHORS" section]
 | 
				
			||||||
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
 | 
					.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
 | 
				
			||||||
.\"      Date: 2020-12-05
 | 
					.\"      Date: 2021-05-24
 | 
				
			||||||
.\"    Manual: Toxic Manual
 | 
					.\"    Manual: Toxic Manual
 | 
				
			||||||
.\"    Source: toxic __VERSION__
 | 
					.\"    Source: toxic __VERSION__
 | 
				
			||||||
.\"  Language: English
 | 
					.\"  Language: English
 | 
				
			||||||
.\"
 | 
					.\"
 | 
				
			||||||
.TH "TOXIC\&.CONF" "5" "2020\-12\-05" "toxic __VERSION__" "Toxic Manual"
 | 
					.TH "TOXIC\&.CONF" "5" "2021\-05\-24" "toxic __VERSION__" "Toxic Manual"
 | 
				
			||||||
.\" -----------------------------------------------------------------
 | 
					.\" -----------------------------------------------------------------
 | 
				
			||||||
.\" * Define some portability stuff
 | 
					.\" * Define some portability stuff
 | 
				
			||||||
.\" -----------------------------------------------------------------
 | 
					.\" -----------------------------------------------------------------
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -131,11 +131,15 @@ mkdir -p "$BUILD_DIR"
 | 
				
			|||||||
# Build Toxcore
 | 
					# Build Toxcore
 | 
				
			||||||
cd "$BUILD_DIR"
 | 
					cd "$BUILD_DIR"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# The git hash of the c-toxcore version we're using
 | 
				
			||||||
TOXCORE_VERSION="25a56c354937e9c8c4c50a64c3b4cfc099c34e29"
 | 
					TOXCORE_VERSION="25a56c354937e9c8c4c50a64c3b4cfc099c34e29"
 | 
				
			||||||
TOXCORE_HASH="78749dccfd2e6ec95d59d7a07c882aa034754a9ff62113b95281927e71b42574"
 | 
					
 | 
				
			||||||
 | 
					# The sha256sum of the c-toxcore tarball for TOXCORE_VERSION
 | 
				
			||||||
 | 
					TOXCORE_HASH="8448752e6286c747130254571fde2db8e2fc073a8116f9fff489ed53af546c0a"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
TOXCORE_FILENAME="c-toxcore-$TOXCORE_VERSION.tar.gz"
 | 
					TOXCORE_FILENAME="c-toxcore-$TOXCORE_VERSION.tar.gz"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
wget --timeout=10 -O "$TOXCORE_FILENAME" "https://github.com/TokTok/c-toxcore/archive/master.tar.gz"
 | 
					wget --timeout=10 -O "$TOXCORE_FILENAME" "https://github.com/TokTok/c-toxcore/archive/$TOXCORE_VERSION.tar.gz"
 | 
				
			||||||
check_sha256 "$TOXCORE_HASH" "$TOXCORE_FILENAME"
 | 
					check_sha256 "$TOXCORE_HASH" "$TOXCORE_FILENAME"
 | 
				
			||||||
tar -o -xf "$TOXCORE_FILENAME"
 | 
					tar -o -xf "$TOXCORE_FILENAME"
 | 
				
			||||||
rm "$TOXCORE_FILENAME"
 | 
					rm "$TOXCORE_FILENAME"
 | 
				
			||||||
@@ -160,8 +164,8 @@ cmake --build _build --target install
 | 
				
			|||||||
# location with SSL_CERT_FILE env variable.
 | 
					# location with SSL_CERT_FILE env variable.
 | 
				
			||||||
cd "$BUILD_DIR"
 | 
					cd "$BUILD_DIR"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
CURL_VERSION="7.74.0"
 | 
					CURL_VERSION="7.77.0"
 | 
				
			||||||
CURL_HASH="e56b3921eeb7a2951959c02db0912b5fcd5fdba5aca071da819e1accf338bbd7"
 | 
					CURL_HASH="b0a3428acb60fa59044c4d0baae4e4fc09ae9af1d8a3aa84b2e3fbcd99841f77"
 | 
				
			||||||
CURL_FILENAME="curl-$CURL_VERSION.tar.gz"
 | 
					CURL_FILENAME="curl-$CURL_VERSION.tar.gz"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
wget --timeout=10 -O "$CURL_FILENAME" "https://curl.haxx.se/download/$CURL_FILENAME"
 | 
					wget --timeout=10 -O "$CURL_FILENAME" "https://curl.haxx.se/download/$CURL_FILENAME"
 | 
				
			||||||
@@ -178,7 +182,8 @@ cd curl*
 | 
				
			|||||||
  --without-ca-path \
 | 
					  --without-ca-path \
 | 
				
			||||||
  --with-ca-fallback \
 | 
					  --with-ca-fallback \
 | 
				
			||||||
  --with-nghttp2 \
 | 
					  --with-nghttp2 \
 | 
				
			||||||
  --with-brotli
 | 
					  --with-brotli \
 | 
				
			||||||
 | 
					  --with-openssl
 | 
				
			||||||
make
 | 
					make
 | 
				
			||||||
make install
 | 
					make install
 | 
				
			||||||
sed -i 's|-lbrotlidec |-lbrotlidec-static -lbrotlicommon-static |g' $BUILD_DIR/prefix-curl/lib/pkgconfig/libcurl.pc
 | 
					sed -i 's|-lbrotlidec |-lbrotlidec-static -lbrotlicommon-static |g' $BUILD_DIR/prefix-curl/lib/pkgconfig/libcurl.pc
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -106,7 +106,7 @@ void api_send(const char *msg)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    self_window = get_active_window();
 | 
					    self_window = get_active_window();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    strncpy((char *) self_window->chatwin->line, msg, sizeof(self_window->chatwin->line));
 | 
					    snprintf((char *) self_window->chatwin->line, sizeof(self_window->chatwin->line), "%s", msg);
 | 
				
			||||||
    add_line_to_hist(self_window->chatwin);
 | 
					    add_line_to_hist(self_window->chatwin);
 | 
				
			||||||
    int id = line_info_add(self_window, true, name, NULL, OUT_MSG, 0, 0, "%s", msg);
 | 
					    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);
 | 
					    cqueue_add(self_window->chatwin->cqueue, msg, strlen(msg), OUT_MSG, id);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -204,7 +204,7 @@ static int start_transmission(ToxWindow *self, Call *call)
 | 
				
			|||||||
        return -1;
 | 
					        return -1;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    DeviceError error = open_input_device(&call->in_idx, read_device_callback, &self->num, false,
 | 
					    DeviceError error = open_input_device(&call->in_idx, read_device_callback, &self->num,
 | 
				
			||||||
                                          CallControl.audio_sample_rate, CallControl.audio_frame_duration, CallControl.audio_channels);
 | 
					                                          CallControl.audio_sample_rate, CallControl.audio_frame_duration, CallControl.audio_channels);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (error != de_None) {
 | 
					    if (error != de_None) {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -484,8 +484,7 @@ DeviceError set_al_device(DeviceType type, int32_t selection)
 | 
				
			|||||||
    return de_None;
 | 
					    return de_None;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static DeviceError open_device(DeviceType type, uint32_t *device_idx,
 | 
					static DeviceError open_device(DeviceType type, uint32_t *device_idx, DataHandleCallback cb, void *cb_data,
 | 
				
			||||||
                               DataHandleCallback cb, void *cb_data, bool enable_VAD,
 | 
					 | 
				
			||||||
                               uint32_t sample_rate, uint32_t frame_duration, uint8_t channels)
 | 
					                               uint32_t sample_rate, uint32_t frame_duration, uint8_t channels)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    if (channels != 1 && channels != 2) {
 | 
					    if (channels != 1 && channels != 2) {
 | 
				
			||||||
@@ -530,7 +529,11 @@ static DeviceError open_device(DeviceType type, uint32_t *device_idx,
 | 
				
			|||||||
        device->cb = cb;
 | 
					        device->cb = cb;
 | 
				
			||||||
        device->cb_data = cb_data;
 | 
					        device->cb_data = cb_data;
 | 
				
			||||||
#ifdef AUDIO
 | 
					#ifdef AUDIO
 | 
				
			||||||
        device->VAD_threshold = enable_VAD ? user_settings->VAD_threshold : 0.0f;
 | 
					
 | 
				
			||||||
 | 
					        if (user_settings->VAD_threshold >= 0.0f) {
 | 
				
			||||||
 | 
					            device->VAD_threshold = user_settings->VAD_threshold;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#else
 | 
					#else
 | 
				
			||||||
        device->VAD_threshold = 0.0f;
 | 
					        device->VAD_threshold = 0.0f;
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
@@ -547,21 +550,15 @@ static DeviceError open_device(DeviceType type, uint32_t *device_idx,
 | 
				
			|||||||
    return de_None;
 | 
					    return de_None;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
DeviceError open_input_device(uint32_t *device_idx,
 | 
					DeviceError open_input_device(uint32_t *device_idx, DataHandleCallback cb, void *cb_data, uint32_t sample_rate,
 | 
				
			||||||
                              DataHandleCallback cb, void *cb_data, bool enable_VAD,
 | 
					                              uint32_t frame_duration, uint8_t channels)
 | 
				
			||||||
                              uint32_t sample_rate, uint32_t frame_duration, uint8_t channels)
 | 
					 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    return open_device(input, device_idx,
 | 
					    return open_device(input, device_idx, cb, cb_data, sample_rate, frame_duration, channels);
 | 
				
			||||||
                       cb, cb_data, enable_VAD,
 | 
					 | 
				
			||||||
                       sample_rate, frame_duration, channels);
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
DeviceError open_output_device(uint32_t *device_idx,
 | 
					DeviceError open_output_device(uint32_t *device_idx, uint32_t sample_rate, uint32_t frame_duration, uint8_t channels)
 | 
				
			||||||
                               uint32_t sample_rate, uint32_t frame_duration, uint8_t channels)
 | 
					 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    return open_device(output, device_idx,
 | 
					    return open_device(output, device_idx, 0, 0, sample_rate, frame_duration, channels);
 | 
				
			||||||
                       0, 0, 0,
 | 
					 | 
				
			||||||
                       sample_rate, frame_duration, channels);
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
DeviceError close_device(DeviceType type, uint32_t device_idx)
 | 
					DeviceError close_device(DeviceType type, uint32_t device_idx)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -75,11 +75,9 @@ DeviceError set_source_position(uint32_t device_idx, float x, float y, float z);
 | 
				
			|||||||
DeviceError set_al_device(DeviceType type, int32_t selection);
 | 
					DeviceError set_al_device(DeviceType type, int32_t selection);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Start device */
 | 
					/* Start device */
 | 
				
			||||||
DeviceError open_input_device(uint32_t *device_idx,
 | 
					DeviceError open_input_device(uint32_t *device_idx, DataHandleCallback cb, void *cb_data,
 | 
				
			||||||
                              DataHandleCallback cb, void *cb_data, bool enable_VAD,
 | 
					 | 
				
			||||||
                              uint32_t sample_rate, uint32_t frame_duration, uint8_t channels);
 | 
					                              uint32_t sample_rate, uint32_t frame_duration, uint8_t channels);
 | 
				
			||||||
DeviceError open_output_device(uint32_t *device_idx,
 | 
					DeviceError open_output_device(uint32_t *device_idx, uint32_t sample_rate, uint32_t frame_duration, uint8_t channels);
 | 
				
			||||||
                               uint32_t sample_rate, uint32_t frame_duration, uint8_t channels);
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Stop device */
 | 
					/* Stop device */
 | 
				
			||||||
DeviceError close_device(DeviceType type, uint32_t device_idx);
 | 
					DeviceError close_device(DeviceType type, uint32_t device_idx);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -164,7 +164,7 @@ static int complete_line_helper(ToxWindow *self, const char **list, const size_t
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    /* put all list matches in matches array */
 | 
					    /* put all list matches in matches array */
 | 
				
			||||||
    for (size_t i = 0; i < n_items; ++i) {
 | 
					    for (size_t i = 0; i < n_items; ++i) {
 | 
				
			||||||
        if (strncasecmp(list[i], sub, s_len) == 0) {
 | 
					        if (strncmp(list[i], sub, s_len) == 0) {
 | 
				
			||||||
            snprintf(matches[n_matches++], MAX_STR_SIZE, "%s", list[i]);
 | 
					            snprintf(matches[n_matches++], MAX_STR_SIZE, "%s", list[i]);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -381,8 +381,11 @@ static long long int extract_val_last_pinged(const char *s)
 | 
				
			|||||||
 * Return number of bytes copied to key_buf on success.
 | 
					 * Return number of bytes copied to key_buf on success.
 | 
				
			||||||
 * Return -1 on failure.
 | 
					 * Return -1 on failure.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
static int extract_val_pk(const char *s, char *key_buf)
 | 
					static int extract_val_pk(const char *s, char *key_buf, size_t buf_length)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					    if (buf_length < TOX_PUBLIC_KEY_SIZE * 2 + 1) {
 | 
				
			||||||
 | 
					        return -1;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    int key_len = char_find(0, s, '"');
 | 
					    int key_len = char_find(0, s, '"');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -445,13 +448,13 @@ static int extract_node(const char *line, struct Node *node)
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    char key_string[TOX_PUBLIC_KEY_SIZE * 2 + 1];
 | 
					    char key_string[TOX_PUBLIC_KEY_SIZE * 2 + 1];
 | 
				
			||||||
    int key_len = extract_val_pk(key_start + PK_JSON_KEY_LEN, key_string);
 | 
					    int key_len = extract_val_pk(key_start + PK_JSON_KEY_LEN, key_string, sizeof(key_string));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (key_len == -1) {
 | 
					    if (key_len == -1) {
 | 
				
			||||||
        return -6;
 | 
					        return -6;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (hex_string_to_bin(key_string, key_len, node->key, TOX_PUBLIC_KEY_SIZE) == -1) {
 | 
					    if (tox_pk_string_to_bytes(key_string, key_len, node->key, sizeof(node->key)) == -1) {
 | 
				
			||||||
        return -6;
 | 
					        return -6;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										98
									
								
								src/chat.c
									
									
									
									
									
								
							
							
						
						
									
										98
									
								
								src/chat.c
									
									
									
									
									
								
							@@ -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.win = newwin(INFOBOX_HEIGHT, INFOBOX_WIDTH + 1, 1, x2 - INFOBOX_WIDTH);
 | 
				
			||||||
    ctx->infobox.starttime = get_unix_time();
 | 
					    ctx->infobox.starttime = get_unix_time();
 | 
				
			||||||
    ctx->infobox.vad_lvl = 0.0f;
 | 
					    ctx->infobox.vad_lvl = user_settings->VAD_threshold;
 | 
				
			||||||
    ctx->infobox.active = true;
 | 
					    ctx->infobox.active = true;
 | 
				
			||||||
    strcpy(ctx->infobox.timestr, "00");
 | 
					    strcpy(ctx->infobox.timestr, "00");
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
@@ -1072,13 +1072,12 @@ static void draw_infobox(ToxWindow *self)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    time_t curtime = get_unix_time();
 | 
					    time_t curtime = get_unix_time();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /* update elapsed time string once per second */
 | 
					    /* update interface once per second */
 | 
				
			||||||
    if (curtime > infobox->lastupdate) {
 | 
					    if (timed_out(infobox->lastupdate, 1)) {
 | 
				
			||||||
        get_elapsed_time_str(infobox->timestr, sizeof(infobox->timestr), curtime - infobox->starttime);
 | 
					        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 *in_is_muted = infobox->in_is_muted ? "yes" : "no";
 | 
				
			||||||
    const char *out_is_muted = infobox->out_is_muted ? "yes" : "no";
 | 
					    const char *out_is_muted = infobox->out_is_muted ? "yes" : "no";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -1286,24 +1285,58 @@ static void chat_onDraw(ToxWindow *self, Tox *m)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    /* Draw status bar */
 | 
					    /* Draw status bar */
 | 
				
			||||||
    StatusBar *statusbar = self->stb;
 | 
					    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);
 | 
					    wmove(statusbar->topline, 0, 0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /* Draw name, status and note in statusbar */
 | 
					    wattron(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
 | 
				
			||||||
    if (statusbar->connection != TOX_CONNECTION_NONE) {
 | 
					    wprintw(statusbar->topline, " [");
 | 
				
			||||||
 | 
					    wattroff(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    switch (connection) {
 | 
				
			||||||
 | 
					        case TOX_CONNECTION_TCP:
 | 
				
			||||||
 | 
					            wattron(statusbar->topline, A_BOLD | COLOR_PAIR(STATUS_ONLINE));
 | 
				
			||||||
 | 
					            wprintw(statusbar->topline, "TCP");
 | 
				
			||||||
 | 
					            wattroff(statusbar->topline, A_BOLD | COLOR_PAIR(STATUS_ONLINE));
 | 
				
			||||||
 | 
					            break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        case TOX_CONNECTION_UDP:
 | 
				
			||||||
 | 
					            wattron(statusbar->topline, A_BOLD | COLOR_PAIR(STATUS_ONLINE));
 | 
				
			||||||
 | 
					            wprintw(statusbar->topline, "UDP");
 | 
				
			||||||
 | 
					            wattroff(statusbar->topline, A_BOLD | COLOR_PAIR(STATUS_ONLINE));
 | 
				
			||||||
 | 
					            break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        default:
 | 
				
			||||||
 | 
					            wattron(statusbar->topline, COLOR_PAIR(BAR_TEXT));
 | 
				
			||||||
 | 
					            wprintw(statusbar->topline, "Offline");
 | 
				
			||||||
 | 
					            wattroff(statusbar->topline, COLOR_PAIR(BAR_TEXT));
 | 
				
			||||||
 | 
					            break;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    wattron(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
 | 
				
			||||||
 | 
					    wprintw(statusbar->topline, "]");
 | 
				
			||||||
 | 
					    wattroff(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (status != TOX_USER_STATUS_NONE) {
 | 
				
			||||||
 | 
					        const char *status_text = "ERROR";
 | 
				
			||||||
        int colour = MAGENTA;
 | 
					        int colour = MAGENTA;
 | 
				
			||||||
        Tox_User_Status status = statusbar->status;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        switch (status) {
 | 
					        switch (status) {
 | 
				
			||||||
            case TOX_USER_STATUS_NONE:
 | 
					 | 
				
			||||||
                colour = STATUS_ONLINE;
 | 
					 | 
				
			||||||
                break;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            case TOX_USER_STATUS_AWAY:
 | 
					            case TOX_USER_STATUS_AWAY:
 | 
				
			||||||
                colour = STATUS_AWAY;
 | 
					                colour = STATUS_AWAY;
 | 
				
			||||||
 | 
					                status_text = "Away";
 | 
				
			||||||
                break;
 | 
					                break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            case TOX_USER_STATUS_BUSY:
 | 
					            case TOX_USER_STATUS_BUSY:
 | 
				
			||||||
                colour = STATUS_BUSY;
 | 
					                colour = STATUS_BUSY;
 | 
				
			||||||
 | 
					                status_text = "Busy";
 | 
				
			||||||
 | 
					                break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            default:
 | 
				
			||||||
                break;
 | 
					                break;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -1312,7 +1345,7 @@ static void chat_onDraw(ToxWindow *self, Tox *m)
 | 
				
			|||||||
        wattroff(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
 | 
					        wattroff(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        wattron(statusbar->topline, COLOR_PAIR(colour) | A_BOLD);
 | 
					        wattron(statusbar->topline, COLOR_PAIR(colour) | A_BOLD);
 | 
				
			||||||
        wprintw(statusbar->topline, "%s", ONLINE_CHAR);
 | 
					        wprintw(statusbar->topline, "%s", status_text);
 | 
				
			||||||
        wattroff(statusbar->topline, COLOR_PAIR(colour) | A_BOLD);
 | 
					        wattroff(statusbar->topline, COLOR_PAIR(colour) | A_BOLD);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        wattron(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
 | 
					        wattron(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
 | 
				
			||||||
@@ -1337,20 +1370,8 @@ static void chat_onDraw(ToxWindow *self, Tox *m)
 | 
				
			|||||||
            wattroff(statusbar->topline, A_BOLD | COLOR_PAIR(BAR_TEXT));
 | 
					            wattroff(statusbar->topline, A_BOLD | COLOR_PAIR(BAR_TEXT));
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    } else {
 | 
					    } 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));
 | 
					        wattron(statusbar->topline, COLOR_PAIR(BAR_TEXT));
 | 
				
			||||||
        wprintw(statusbar->topline, "%s", OFFLINE_CHAR);
 | 
					        wprintw(statusbar->topline, " %s", statusbar->nick);
 | 
				
			||||||
        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));
 | 
					        wattroff(statusbar->topline, COLOR_PAIR(BAR_TEXT));
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -1359,13 +1380,15 @@ static void chat_onDraw(ToxWindow *self, Tox *m)
 | 
				
			|||||||
        char statusmsg[TOX_MAX_STATUS_MESSAGE_LENGTH] = {'\0'};
 | 
					        char statusmsg[TOX_MAX_STATUS_MESSAGE_LENGTH] = {'\0'};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        pthread_mutex_lock(&Winthread.lock);
 | 
					        pthread_mutex_lock(&Winthread.lock);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        tox_friend_get_status_message(m, self->num, (uint8_t *) statusmsg, NULL);
 | 
					        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);
 | 
					        size_t s_len = tox_friend_get_status_message_size(m, self->num, NULL);
 | 
				
			||||||
        pthread_mutex_unlock(&Winthread.lock);
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        filter_str(statusmsg, s_len);
 | 
					        filter_str(statusmsg, s_len);
 | 
				
			||||||
        snprintf(statusbar->statusmsg, sizeof(statusbar->statusmsg), "%s", statusmsg);
 | 
					        snprintf(statusbar->statusmsg, sizeof(statusbar->statusmsg), "%s", statusmsg);
 | 
				
			||||||
        statusbar->statusmsg_len = strlen(statusbar->statusmsg);
 | 
					        statusbar->statusmsg_len = strlen(statusbar->statusmsg);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        pthread_mutex_unlock(&Winthread.lock);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    self->x = x2;
 | 
					    self->x = x2;
 | 
				
			||||||
@@ -1373,19 +1396,27 @@ static void chat_onDraw(ToxWindow *self, Tox *m)
 | 
				
			|||||||
    /* Truncate note if it doesn't fit in statusbar */
 | 
					    /* Truncate note if it doesn't fit in statusbar */
 | 
				
			||||||
    size_t maxlen = x2 - getcurx(statusbar->topline) - (KEY_IDENT_DIGITS * 2) - 6;
 | 
					    size_t maxlen = x2 - getcurx(statusbar->topline) - (KEY_IDENT_DIGITS * 2) - 6;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (statusbar->statusmsg_len > maxlen) {
 | 
					    pthread_mutex_lock(&Winthread.lock);
 | 
				
			||||||
        statusbar->statusmsg[maxlen - 3] = '\0';
 | 
					    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;
 | 
				
			||||||
        strcat(statusbar->statusmsg, "...");
 | 
					        strcat(statusbar->statusmsg, "...");
 | 
				
			||||||
        statusbar->statusmsg_len = maxlen;
 | 
					        statusbar->statusmsg_len = maxlen;
 | 
				
			||||||
 | 
					        pthread_mutex_unlock(&Winthread.lock);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (statusbar->statusmsg[0]) {
 | 
					    if (statusmsg_len > 0) {
 | 
				
			||||||
        wattron(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
 | 
					        wattron(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
 | 
				
			||||||
        wprintw(statusbar->topline, " | ");
 | 
					        wprintw(statusbar->topline, " | ");
 | 
				
			||||||
        wattroff(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
 | 
					        wattroff(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        wattron(statusbar->topline, COLOR_PAIR(BAR_TEXT));
 | 
					        wattron(statusbar->topline, COLOR_PAIR(BAR_TEXT));
 | 
				
			||||||
 | 
					        pthread_mutex_lock(&Winthread.lock);
 | 
				
			||||||
        wprintw(statusbar->topline, "%s ", statusbar->statusmsg);
 | 
					        wprintw(statusbar->topline, "%s ", statusbar->statusmsg);
 | 
				
			||||||
 | 
					        pthread_mutex_unlock(&Winthread.lock);
 | 
				
			||||||
    } else {
 | 
					    } else {
 | 
				
			||||||
        wattron(statusbar->topline, COLOR_PAIR(BAR_TEXT));
 | 
					        wattron(statusbar->topline, COLOR_PAIR(BAR_TEXT));
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
@@ -1441,7 +1472,11 @@ static void chat_onDraw(ToxWindow *self, Tox *m)
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    pthread_mutex_lock(&Winthread.lock);
 | 
					    pthread_mutex_lock(&Winthread.lock);
 | 
				
			||||||
    refresh_file_transfer_progress(self, self->num);
 | 
					
 | 
				
			||||||
 | 
					    if (refresh_file_transfer_progress(self, self->num)) {
 | 
				
			||||||
 | 
					        flag_interface_refresh();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    pthread_mutex_unlock(&Winthread.lock);
 | 
					    pthread_mutex_unlock(&Winthread.lock);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -1484,6 +1519,7 @@ static void chat_onInit(ToxWindow *self, Tox *m)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    /* Init statusbar info */
 | 
					    /* Init statusbar info */
 | 
				
			||||||
    StatusBar *statusbar = self->stb;
 | 
					    StatusBar *statusbar = self->stb;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    statusbar->status = get_friend_status(self->num);
 | 
					    statusbar->status = get_friend_status(self->num);
 | 
				
			||||||
    statusbar->connection = get_friend_connection_status(self->num);
 | 
					    statusbar->connection = get_friend_connection_status(self->num);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -510,8 +510,7 @@ static void conference_update_name_list(uint32_t conferencenum)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        if (peer->active) {
 | 
					        if (peer->active) {
 | 
				
			||||||
            memcpy(entry->name, peer->name, peer->name_length + 1);
 | 
					            memcpy(entry->name, peer->name, peer->name_length + 1);
 | 
				
			||||||
            bin_pubkey_to_string(peer->pubkey, sizeof(peer->pubkey),
 | 
					            tox_pk_bytes_to_str(peer->pubkey, sizeof(peer->pubkey), entry->pubkey_str, sizeof(entry->pubkey_str));
 | 
				
			||||||
                                 entry->pubkey_str, sizeof(entry->pubkey_str));
 | 
					 | 
				
			||||||
            entry->peernum = i;
 | 
					            entry->peernum = i;
 | 
				
			||||||
            ++count;
 | 
					            ++count;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
@@ -1312,7 +1311,7 @@ bool init_conference_audio_input(Tox *tox, uint32_t conferencenum)
 | 
				
			|||||||
    int channels = user_settings->conference_audio_channels;
 | 
					    int channels = user_settings->conference_audio_channels;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    bool success = (open_input_device(&chat->audio_in_idx,
 | 
					    bool success = (open_input_device(&chat->audio_in_idx,
 | 
				
			||||||
                                      conference_read_device_callback, &chat->audio_input_callback_data, true,
 | 
					                                      conference_read_device_callback, &chat->audio_input_callback_data,
 | 
				
			||||||
                                      CONFAV_SAMPLE_RATE, CONFAV_FRAME_DURATION, channels)
 | 
					                                      CONFAV_SAMPLE_RATE, CONFAV_FRAME_DURATION, channels)
 | 
				
			||||||
                    == de_None);
 | 
					                    == de_None);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -1334,7 +1333,7 @@ bool toggle_conference_push_to_talk(uint32_t conferencenum, bool enabled)
 | 
				
			|||||||
    return true;
 | 
					    return true;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool enable_conference_audio(Tox *tox, uint32_t conferencenum)
 | 
					bool enable_conference_audio(ToxWindow *self, Tox *tox, uint32_t conferencenum)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    if (!toxav_groupchat_av_enabled(tox, conferencenum)) {
 | 
					    if (!toxav_groupchat_av_enabled(tox, conferencenum)) {
 | 
				
			||||||
        if (toxav_groupchat_enable_av(tox, conferencenum, audio_conference_callback, NULL) != 0) {
 | 
					        if (toxav_groupchat_enable_av(tox, conferencenum, audio_conference_callback, NULL) != 0) {
 | 
				
			||||||
@@ -1342,10 +1341,16 @@ bool enable_conference_audio(Tox *tox, uint32_t conferencenum)
 | 
				
			|||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    return init_conference_audio_input(tox, conferencenum);
 | 
					    bool success = init_conference_audio_input(tox, conferencenum);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (success) {
 | 
				
			||||||
 | 
					        self->is_call = true;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return success;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool disable_conference_audio(Tox *tox, uint32_t conferencenum)
 | 
					bool disable_conference_audio(ToxWindow *self, Tox *tox, uint32_t conferencenum)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    ConferenceChat *chat = &conferences[conferencenum];
 | 
					    ConferenceChat *chat = &conferences[conferencenum];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -1358,7 +1363,13 @@ bool disable_conference_audio(Tox *tox, uint32_t conferencenum)
 | 
				
			|||||||
        chat->audio_enabled = false;
 | 
					        chat->audio_enabled = false;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    return toxav_groupchat_disable_av(tox, conferencenum) == 0;
 | 
					    bool success = toxav_groupchat_disable_av(tox, conferencenum) == 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (success) {
 | 
				
			||||||
 | 
					        self->is_call = false;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return success;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool conference_mute_self(uint32_t conferencenum)
 | 
					bool conference_mute_self(uint32_t conferencenum)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -103,8 +103,8 @@ uint32_t get_name_list_entries_by_prefix(uint32_t conferencenum, const char *pre
 | 
				
			|||||||
        uint32_t maxpeers);
 | 
					        uint32_t maxpeers);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool init_conference_audio_input(Tox *tox, uint32_t conferencenum);
 | 
					bool init_conference_audio_input(Tox *tox, uint32_t conferencenum);
 | 
				
			||||||
bool enable_conference_audio(Tox *tox, uint32_t conferencenum);
 | 
					bool enable_conference_audio(ToxWindow *self, Tox *tox, uint32_t conferencenum);
 | 
				
			||||||
bool disable_conference_audio(Tox *tox, uint32_t conferencenum);
 | 
					bool disable_conference_audio(ToxWindow *self, Tox *tox, uint32_t conferencenum);
 | 
				
			||||||
bool toggle_conference_push_to_talk(uint32_t conferencenum, bool enabled);
 | 
					bool toggle_conference_push_to_talk(uint32_t conferencenum, bool enabled);
 | 
				
			||||||
void audio_conference_callback(void *tox, uint32_t conferencenum, uint32_t peernum,
 | 
					void audio_conference_callback(void *tox, uint32_t conferencenum, uint32_t peernum,
 | 
				
			||||||
                               const int16_t *pcm, unsigned int samples, uint8_t channels, uint32_t
 | 
					                               const int16_t *pcm, unsigned int samples, uint8_t channels, uint32_t
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -108,7 +108,7 @@ void cmd_enable_audio(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*
 | 
				
			|||||||
        return;
 | 
					        return;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (enable ? enable_conference_audio(m, self->num) : disable_conference_audio(m, self->num)) {
 | 
					    if (enable ? enable_conference_audio(self, m, self->num) : disable_conference_audio(self, m, self->num)) {
 | 
				
			||||||
        print_err(self, enable ? "Enabled conference audio. Use the '/ptt' command to toggle Push-To-Talk."
 | 
					        print_err(self, enable ? "Enabled conference audio. Use the '/ptt' command to toggle Push-To-Talk."
 | 
				
			||||||
                  : "Disabled conference audio");
 | 
					                  : "Disabled conference audio");
 | 
				
			||||||
    } else {
 | 
					    } else {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -119,13 +119,14 @@ static struct cmd_func conference_commands[] = {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifdef PYTHON
 | 
					#ifdef PYTHON
 | 
				
			||||||
#define SPECIAL_COMMANDS 7
 | 
					#define SPECIAL_COMMANDS 8
 | 
				
			||||||
#else
 | 
					#else
 | 
				
			||||||
#define SPECIAL_COMMANDS 6
 | 
					#define SPECIAL_COMMANDS 7
 | 
				
			||||||
#endif /* PYTHON */
 | 
					#endif /* PYTHON */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Special commands are commands that only take one argument even if it contains spaces */
 | 
					/* Special commands are commands that only take one argument even if it contains spaces */
 | 
				
			||||||
static const char special_commands[SPECIAL_COMMANDS][MAX_CMDNAME_SIZE] = {
 | 
					static const char special_commands[SPECIAL_COMMANDS][MAX_CMDNAME_SIZE] = {
 | 
				
			||||||
 | 
					    "/add",
 | 
				
			||||||
    "/avatar",
 | 
					    "/avatar",
 | 
				
			||||||
    "/nick",
 | 
					    "/nick",
 | 
				
			||||||
    "/note",
 | 
					    "/note",
 | 
				
			||||||
@@ -219,9 +220,7 @@ 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,
 | 
					static int do_command(WINDOW *w, ToxWindow *self, Tox *m, int num_args, struct cmd_func *commands,
 | 
				
			||||||
                      char (*args)[MAX_STR_SIZE])
 | 
					                      char (*args)[MAX_STR_SIZE])
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    int i;
 | 
					    for (size_t i = 0; commands[i].name != NULL; ++i) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
    for (i = 0; commands[i].name != NULL; ++i) {
 | 
					 | 
				
			||||||
        if (strcmp(args[0], commands[i].name) == 0) {
 | 
					        if (strcmp(args[0], commands[i].name) == 0) {
 | 
				
			||||||
            (commands[i].func)(w, self, m, num_args - 1, args);
 | 
					            (commands[i].func)(w, self, m, num_args - 1, args);
 | 
				
			||||||
            return 0;
 | 
					            return 0;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -117,13 +117,27 @@ static void refresh_progress_helper(ToxWindow *self, struct FileTransfer *ft)
 | 
				
			|||||||
    ft->last_line_progress = get_unix_time();
 | 
					    ft->last_line_progress = get_unix_time();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* refreshes active file transfer status bars. */
 | 
					/* refreshes active file transfer status bars.
 | 
				
			||||||
void refresh_file_transfer_progress(ToxWindow *self, uint32_t friendnumber)
 | 
					 *
 | 
				
			||||||
 | 
					 * Return true if there is at least one active file transfer in either direction.
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					bool refresh_file_transfer_progress(ToxWindow *self, uint32_t friendnumber)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					    bool active = false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    for (size_t i = 0; i < MAX_FILES; ++i) {
 | 
					    for (size_t i = 0; i < MAX_FILES; ++i) {
 | 
				
			||||||
        refresh_progress_helper(self, &Friends.list[friendnumber].file_receiver[i]);
 | 
					        struct FileTransfer *ft_r = &Friends.list[friendnumber].file_receiver[i];
 | 
				
			||||||
        refresh_progress_helper(self, &Friends.list[friendnumber].file_sender[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;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return active;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void clear_file_transfer(struct FileTransfer *ft)
 | 
					static void clear_file_transfer(struct FileTransfer *ft)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -72,8 +72,11 @@ void init_progress_bar(char *progline);
 | 
				
			|||||||
/* prints a progress bar for file transfers */
 | 
					/* prints a progress bar for file transfers */
 | 
				
			||||||
void print_progress_bar(ToxWindow *self, double pct_done, double bps, uint32_t line_id);
 | 
					void print_progress_bar(ToxWindow *self, double pct_done, double bps, uint32_t line_id);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* refreshes active file transfer status bars. */
 | 
					/* refreshes active file transfer status bars.
 | 
				
			||||||
void refresh_file_transfer_progress(ToxWindow *self, uint32_t friendnumber);
 | 
					 *
 | 
				
			||||||
 | 
					 * Return true if there is at least one active file transfer in either direction.
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					bool refresh_file_transfer_progress(ToxWindow *self, uint32_t friendnumber);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Returns a pointer to friendnumber's FileTransfer struct associated with filenumber.
 | 
					/* Returns a pointer to friendnumber's FileTransfer struct associated with filenumber.
 | 
				
			||||||
 * Returns NULL if filenumber is invalid.
 | 
					 * Returns NULL if filenumber is invalid.
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -174,6 +174,10 @@ void game_kill(ToxWindow *self)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    kill_notifs(self->active_box);
 | 
					    kill_notifs(self->active_box);
 | 
				
			||||||
    del_window(self);
 | 
					    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)
 | 
					static void game_init_abort(const ToxWindow *parent, ToxWindow *self)
 | 
				
			||||||
@@ -300,6 +304,8 @@ int game_initialize(const ToxWindow *parent, Tox *m, GameType type, uint32_t id,
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    set_active_window_index(window_id);
 | 
					    set_active_window_index(window_id);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    set_window_refresh_rate(NCURSES_GAME_REFRESH_RATE);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    return 0;
 | 
					    return 0;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -540,20 +546,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 x = (max_x - game_max_x) / 2;
 | 
				
			||||||
    const int y = (max_y - game_max_y) / 2;
 | 
					    const int y = (max_y - game_max_y) / 2;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wattron(win, A_BOLD | COLOR_PAIR(GAME_BORDER_COLOUR));
 | 
					    wattron(win, COLOR_PAIR(GAME_BORDER_COLOUR));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    mvwaddch(win, y, x, ' ');
 | 
					    mvwaddch(win, y, x, ACS_ULCORNER);
 | 
				
			||||||
    mvwhline(win, y, x + 1, ' ', game_max_x - 1);
 | 
					    mvwhline(win, y, x + 1, ACS_HLINE, game_max_x - 1);
 | 
				
			||||||
    mvwvline(win, y + 1, x, ' ', game_max_y - 1);
 | 
					    mvwvline(win, y + 1, x, ACS_VLINE, game_max_y - 1);
 | 
				
			||||||
    mvwvline(win, y, x - 1, ' ', game_max_y + 1);
 | 
					    mvwvline(win, y, x - 1, ACS_VLINE, game_max_y + 1);
 | 
				
			||||||
    mvwaddch(win, y, x + game_max_x, ' ');
 | 
					    mvwaddch(win, y, x + game_max_x, ACS_URCORNER);
 | 
				
			||||||
    mvwvline(win, y + 1, x + game_max_x, ' ', game_max_y - 1);
 | 
					    mvwvline(win, y + 1, x + game_max_x, ACS_VLINE, game_max_y - 1);
 | 
				
			||||||
    mvwvline(win, y, x + game_max_x + 1, ' ', 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, ' ');
 | 
					    mvwaddch(win, y + game_max_y, x, ACS_LLCORNER);
 | 
				
			||||||
    mvwhline(win, y + game_max_y, x + 1, ' ', game_max_x - 1);
 | 
					    mvwhline(win, y + game_max_y, x + 1, ACS_HLINE, game_max_x - 1);
 | 
				
			||||||
    mvwaddch(win, y + game_max_y, x + game_max_x, ' ');
 | 
					    mvwaddch(win, y + game_max_y, x + game_max_x, ACS_LRCORNER);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wattroff(win, A_BOLD | COLOR_PAIR(GAME_BORDER_COLOUR));
 | 
					    wattroff(win, COLOR_PAIR(GAME_BORDER_COLOUR));
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void game_draw_status(const GameData *game, const int max_x, const int max_y)
 | 
					static void game_draw_status(const GameData *game, const int max_x, const int max_y)
 | 
				
			||||||
@@ -561,7 +567,7 @@ static void game_draw_status(const GameData *game, const int max_x, const int ma
 | 
				
			|||||||
    WINDOW *win = game->window;
 | 
					    WINDOW *win = game->window;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    int x = ((max_x - game->game_max_x) / 2) - 1;
 | 
					    int x = ((max_x - game->game_max_x) / 2) - 1;
 | 
				
			||||||
    int y = ((max_y - game->game_max_y) / 2) - 1;
 | 
					    const int y = ((max_y - game->game_max_y) / 2) - 1;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wattron(win, A_BOLD);
 | 
					    wattron(win, A_BOLD);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -31,7 +31,7 @@
 | 
				
			|||||||
#include "game_util.h"
 | 
					#include "game_util.h"
 | 
				
			||||||
#include "windows.h"
 | 
					#include "windows.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define GAME_BORDER_COLOUR BAR_TEXT
 | 
					#define GAME_BORDER_COLOUR BAR_SOLID
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Max size of a default square game window */
 | 
					/* Max size of a default square game window */
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1626,11 +1626,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);
 | 
					    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, message);
 | 
					    mvwprintw(win, board->y_top_bound  - 2, x_mid, "%s", message);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (state->message_length > 0) {
 | 
					    if (state->message_length > 0) {
 | 
				
			||||||
        x_mid = (board->x_left_bound + (CHESS_TILE_SIZE_X * (CHESS_BOARD_COLUMNS / 2))) - (state->message_length / 2);
 | 
					        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, state->status_message);
 | 
					        mvwprintw(win, board->y_bottom_bound + 2, x_mid, "%s", state->status_message);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wattroff(win, A_BOLD);
 | 
					    wattroff(win, A_BOLD);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -157,22 +157,22 @@ void cmd_add(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX
 | 
				
			|||||||
        return;
 | 
					        return;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    char msg[MAX_STR_SIZE] = {0};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    const char *id = argv[1];
 | 
					    const char *id = argv[1];
 | 
				
			||||||
    char msg[MAX_STR_SIZE];
 | 
					    const size_t arg_length = strlen(id);
 | 
				
			||||||
 | 
					    const bool is_tox_id = arg_length >= (2 * TOX_ADDRESS_SIZE);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (argc > 1) {
 | 
					    if (is_tox_id) {
 | 
				
			||||||
        if (argv[2][0] != '\"') {
 | 
					        // we have to manually parse the message due to this command being a special case
 | 
				
			||||||
            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Message must be enclosed in quotes.");
 | 
					        int idx = char_find(0, id, ' ');
 | 
				
			||||||
            return;
 | 
					
 | 
				
			||||||
 | 
					        if (idx > 0 && idx < arg_length - 1) {
 | 
				
			||||||
 | 
					            snprintf(msg, sizeof(msg), "%s", &id[idx + 1]);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        /* remove opening and closing quotes */
 | 
					    if (!msg[0]) {
 | 
				
			||||||
        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];
 | 
					        char selfname[TOX_MAX_NAME_LENGTH];
 | 
				
			||||||
        tox_self_get_name(m, (uint8_t *) selfname);
 | 
					        tox_self_get_name(m, (uint8_t *) selfname);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -182,10 +182,9 @@ void cmd_add(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    char id_bin[TOX_ADDRESS_SIZE] = {0};
 | 
					    char id_bin[TOX_ADDRESS_SIZE] = {0};
 | 
				
			||||||
    uint16_t id_len = (uint16_t) strlen(id);
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /* try to add tox ID */
 | 
					    /* try to add tox ID */
 | 
				
			||||||
    if (id_len == 2 * TOX_ADDRESS_SIZE) {
 | 
					    if (is_tox_id) {
 | 
				
			||||||
        size_t i;
 | 
					        size_t i;
 | 
				
			||||||
        char xx[3];
 | 
					        char xx[3];
 | 
				
			||||||
        uint32_t x;
 | 
					        uint32_t x;
 | 
				
			||||||
@@ -193,7 +192,7 @@ void cmd_add(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX
 | 
				
			|||||||
        for (i = 0; i < TOX_ADDRESS_SIZE; ++i) {
 | 
					        for (i = 0; i < TOX_ADDRESS_SIZE; ++i) {
 | 
				
			||||||
            xx[0] = id[2 * i];
 | 
					            xx[0] = id[2 * i];
 | 
				
			||||||
            xx[1] = id[2 * i + 1];
 | 
					            xx[1] = id[2 * i + 1];
 | 
				
			||||||
            xx[2] = '\0';
 | 
					            xx[2] = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            if (sscanf(xx, "%02x", &x) != 1) {
 | 
					            if (sscanf(xx, "%02x", &x) != 1) {
 | 
				
			||||||
                line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invalid Tox ID.");
 | 
					                line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invalid Tox ID.");
 | 
				
			||||||
@@ -277,9 +276,9 @@ void cmd_connect(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)
 | 
				
			|||||||
        return;
 | 
					        return;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    char key_binary[TOX_PUBLIC_KEY_SIZE * 2 + 1];
 | 
					    char key_binary[TOX_PUBLIC_KEY_SIZE];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (hex_string_to_bin(ascii_key, strlen(ascii_key), key_binary, TOX_PUBLIC_KEY_SIZE) == -1) {
 | 
					    if (tox_pk_string_to_bytes(ascii_key, strlen(ascii_key), key_binary, sizeof(key_binary)) == -1) {
 | 
				
			||||||
        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invalid key.");
 | 
					        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invalid key.");
 | 
				
			||||||
        return;
 | 
					        return;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
@@ -521,7 +520,7 @@ void cmd_myid(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MA
 | 
				
			|||||||
    char bin_id[TOX_ADDRESS_SIZE];
 | 
					    char bin_id[TOX_ADDRESS_SIZE];
 | 
				
			||||||
    tox_self_get_address(m, (uint8_t *) bin_id);
 | 
					    tox_self_get_address(m, (uint8_t *) bin_id);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (bin_id_to_string(bin_id, sizeof(bin_id), id_string, sizeof(id_string)) == -1) {
 | 
					    if (tox_id_bytes_to_str(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.");
 | 
					        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to print ID.");
 | 
				
			||||||
        return;
 | 
					        return;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
@@ -538,7 +537,7 @@ void cmd_myqr(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MA
 | 
				
			|||||||
    char bin_id[TOX_ADDRESS_SIZE];
 | 
					    char bin_id[TOX_ADDRESS_SIZE];
 | 
				
			||||||
    tox_self_get_address(m, (uint8_t *) bin_id);
 | 
					    tox_self_get_address(m, (uint8_t *) bin_id);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (bin_id_to_string(bin_id, sizeof(bin_id), id_string, sizeof(id_string)) == -1) {
 | 
					    if (tox_id_bytes_to_str(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.");
 | 
					        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to create QR code.");
 | 
				
			||||||
        return;
 | 
					        return;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
@@ -656,12 +655,9 @@ void cmd_note(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MA
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
    UNUSED_VAR(window);
 | 
					    UNUSED_VAR(window);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (argc < 1) {
 | 
					    const char *note = argc >= 1 ? argv[1] : "";
 | 
				
			||||||
        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Input required.");
 | 
					 | 
				
			||||||
        return;
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    prompt_update_statusmessage(prompt, m, argv[1]);
 | 
					    prompt_update_statusmessage(prompt, m, note);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void cmd_nospam(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
 | 
					void cmd_nospam(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -174,7 +174,7 @@ static void help_draw_global(ToxWindow *self)
 | 
				
			|||||||
    wprintw(win, "  /decline <id>              : Decline friend request\n");
 | 
					    wprintw(win, "  /decline <id>              : Decline friend request\n");
 | 
				
			||||||
    wprintw(win, "  /requests                  : List pending friend requests\n");
 | 
					    wprintw(win, "  /requests                  : List pending friend requests\n");
 | 
				
			||||||
    wprintw(win, "  /connect <ip> <port> <key> : Manually connect to a DHT node\n");
 | 
					    wprintw(win, "  /connect <ip> <port> <key> : Manually connect to a DHT node\n");
 | 
				
			||||||
    wprintw(win, "  /status <type> <msg>       : Set status with optional note\n");
 | 
					    wprintw(win, "  /status <type>             : Set status (Online, Busy, Away)\n");
 | 
				
			||||||
    wprintw(win, "  /note <msg>                : Set a personal note\n");
 | 
					    wprintw(win, "  /note <msg>                : Set a personal note\n");
 | 
				
			||||||
    wprintw(win, "  /nick <nick>               : Set your nickname\n");
 | 
					    wprintw(win, "  /nick <nick>               : Set your nickname\n");
 | 
				
			||||||
    wprintw(win, "  /nospam <value>            : Change part of your Tox ID to stop spam\n");
 | 
					    wprintw(win, "  /nospam <value>            : Change part of your Tox ID to stop spam\n");
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -346,5 +346,9 @@ bool input_handle(ToxWindow *self, wint_t key, int x, int mx_x)
 | 
				
			|||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (match) {
 | 
				
			||||||
 | 
					        flag_interface_refresh();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    return match;
 | 
					    return match;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -440,6 +440,10 @@ int line_info_add(ToxWindow *self, bool show_timestamp, const char *name1, const
 | 
				
			|||||||
    new_line->noread_flag = false;
 | 
					    new_line->noread_flag = false;
 | 
				
			||||||
    new_line->timestamp = get_unix_time();
 | 
					    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);
 | 
					    line_info_init_line(self, new_line);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    hst->queue[hst->queue_size++] = new_line;
 | 
					    hst->queue[hst->queue_size++] = new_line;
 | 
				
			||||||
@@ -471,8 +475,6 @@ 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)
 | 
					void line_info_print(ToxWindow *self)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    ChatContext *ctx = self->chatwin;
 | 
					    ChatContext *ctx = self->chatwin;
 | 
				
			||||||
@@ -573,12 +575,6 @@ void line_info_print(ToxWindow *self)
 | 
				
			|||||||
                    wattroff(win, COLOR_PAIR(RED));
 | 
					                    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');
 | 
					                waddch(win, '\n');
 | 
				
			||||||
                break;
 | 
					                break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -598,12 +594,6 @@ void line_info_print(ToxWindow *self)
 | 
				
			|||||||
                print_ret = print_wrap(win, line, max_x, max_y);
 | 
					                print_ret = print_wrap(win, line, max_x, max_y);
 | 
				
			||||||
                wattroff(win, COLOR_PAIR(YELLOW));
 | 
					                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');
 | 
					                waddch(win, '\n');
 | 
				
			||||||
                break;
 | 
					                break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -709,6 +699,8 @@ void line_info_print(ToxWindow *self)
 | 
				
			|||||||
        line = line->next;
 | 
					        line = line->next;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    flag_interface_refresh();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /* keep calling until queue is empty */
 | 
					    /* keep calling until queue is empty */
 | 
				
			||||||
    if (hst->queue_size > 0) {
 | 
					    if (hst->queue_size > 0) {
 | 
				
			||||||
        line_info_print(self);
 | 
					        line_info_print(self);
 | 
				
			||||||
@@ -750,6 +742,8 @@ static bool line_info_screen_fit(ToxWindow *self, struct line_info *line)
 | 
				
			|||||||
/* puts msg in specified line_info msg buffer */
 | 
					/* puts msg in specified line_info msg buffer */
 | 
				
			||||||
void line_info_set(ToxWindow *self, uint32_t id, char *msg)
 | 
					void line_info_set(ToxWindow *self, uint32_t id, char *msg)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					    flag_interface_refresh();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    struct line_info *line = self->chatwin->hst->line_end;
 | 
					    struct line_info *line = self->chatwin->hst->line_end;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    while (line) {
 | 
					    while (line) {
 | 
				
			||||||
@@ -765,6 +759,24 @@ 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)
 | 
					static void line_info_scroll_up(ToxWindow *self, struct history *hst)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    if (hst->line_start->prev) {
 | 
					    if (hst->line_start->prev) {
 | 
				
			||||||
@@ -855,6 +867,10 @@ bool line_info_onKey(ToxWindow *self, wint_t key)
 | 
				
			|||||||
        match = false;
 | 
					        match = false;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (match) {
 | 
				
			||||||
 | 
					        flag_interface_refresh();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    return match;
 | 
					    return match;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -96,6 +96,11 @@ void line_info_clear(struct history *hst);
 | 
				
			|||||||
/* puts msg in specified line_info msg buffer */
 | 
					/* puts msg in specified line_info msg buffer */
 | 
				
			||||||
void line_info_set(ToxWindow *self, uint32_t id, char *msg);
 | 
					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) */
 | 
					/* resets line_start (moves to end of chat history) */
 | 
				
			||||||
void line_info_reset_start(ToxWindow *self, struct history *hst);
 | 
					void line_info_reset_start(ToxWindow *self, struct history *hst);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -59,6 +59,7 @@ void cqueue_add(struct chat_queue *q, const char *msg, size_t len, uint8_t type,
 | 
				
			|||||||
    new_m->type = type;
 | 
					    new_m->type = type;
 | 
				
			||||||
    new_m->line_id = line_id;
 | 
					    new_m->line_id = line_id;
 | 
				
			||||||
    new_m->last_send_try = 0;
 | 
					    new_m->last_send_try = 0;
 | 
				
			||||||
 | 
					    new_m->time_added = get_unix_time();
 | 
				
			||||||
    new_m->receipt = -1;
 | 
					    new_m->receipt = -1;
 | 
				
			||||||
    new_m->next = NULL;
 | 
					    new_m->next = NULL;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -76,23 +77,19 @@ 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 */
 | 
					/* update line to show receipt was received after queue removal */
 | 
				
			||||||
static void cqueue_mark_read(ToxWindow *self, struct cqueue_msg *msg)
 | 
					static void cqueue_mark_read(ToxWindow *self, struct cqueue_msg *msg)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    struct line_info *line = self->chatwin->hst->line_end;
 | 
					    struct line_info *line = line_info_get(self, msg->line_id);
 | 
				
			||||||
 | 
					 | 
				
			||||||
    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;
 | 
					        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. */
 | 
					/* removes message with matching receipt from queue, writes to log and updates line to show the message was received. */
 | 
				
			||||||
@@ -158,6 +155,36 @@ 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.
 | 
					 * Tries to send all messages in the send queue in sequential order.
 | 
				
			||||||
 * If a message fails to send the function will immediately return.
 | 
					 * If a message fails to send the function will immediately return.
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -28,8 +28,10 @@ struct cqueue_msg {
 | 
				
			|||||||
    size_t len;
 | 
					    size_t len;
 | 
				
			||||||
    int line_id;
 | 
					    int line_id;
 | 
				
			||||||
    time_t last_send_try;
 | 
					    time_t last_send_try;
 | 
				
			||||||
 | 
					    time_t time_added;
 | 
				
			||||||
    uint8_t type;
 | 
					    uint8_t type;
 | 
				
			||||||
    int64_t receipt;
 | 
					    int64_t receipt;
 | 
				
			||||||
 | 
					    bool noread_flag;
 | 
				
			||||||
    struct cqueue_msg *next;
 | 
					    struct cqueue_msg *next;
 | 
				
			||||||
    struct cqueue_msg *prev;
 | 
					    struct cqueue_msg *prev;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
@@ -48,6 +50,12 @@ void cqueue_add(struct chat_queue *q, const char *msg, size_t len, uint8_t type,
 | 
				
			|||||||
 */
 | 
					 */
 | 
				
			||||||
void cqueue_try_send(ToxWindow *self, Tox *m);
 | 
					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. */
 | 
					/* 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);
 | 
					void cqueue_remove(ToxWindow *self, Tox *m, uint32_t receipt);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -137,15 +137,18 @@ void get_elapsed_time_str(char *buf, int bufsize, time_t secs)
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * Converts a hexidecimal string of length hex_len to binary format and puts the result in output.
 | 
					 * Converts a hexidecimal string representation of a Tox public key to binary format and puts
 | 
				
			||||||
 * output_size must be exactly half of hex_len.
 | 
					 * 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.
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 * Returns 0 on success.
 | 
					 * Returns 0 on success.
 | 
				
			||||||
 * Returns -1 on failure.
 | 
					 * Returns -1 on failure.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
int hex_string_to_bin(const char *hex_string, size_t hex_len, char *output, size_t output_size)
 | 
					int tox_pk_string_to_bytes(const char *hex_string, size_t hex_len, char *output, size_t output_size)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    if (output_size == 0 || hex_len != output_size * 2) {
 | 
					    if (output_size != TOX_PUBLIC_KEY_SIZE || hex_len > output_size * 2) {
 | 
				
			||||||
        return -1;
 | 
					        return -1;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -157,6 +160,11 @@ int hex_string_to_bin(const char *hex_string, size_t hex_len, char *output, size
 | 
				
			|||||||
    return 0;
 | 
					    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)
 | 
					int hex_string_to_bytes(char *buf, int size, const char *keystr)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    if (size % 2 != 0) {
 | 
					    if (size % 2 != 0) {
 | 
				
			||||||
@@ -178,11 +186,14 @@ int hex_string_to_bytes(char *buf, int size, const char *keystr)
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Converts a binary representation of a Tox ID into a string.
 | 
					/* 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 0 on success.
 | 
				
			||||||
 * Returns -1 on failure.
 | 
					 * Returns -1 on failure.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
int bin_id_to_string(const char *bin_id, size_t bin_id_size, char *output, size_t output_size)
 | 
					int tox_id_bytes_to_str(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)) {
 | 
					    if (bin_id_size != TOX_ADDRESS_SIZE || output_size < (TOX_ADDRESS_SIZE * 2 + 1)) {
 | 
				
			||||||
        return -1;
 | 
					        return -1;
 | 
				
			||||||
@@ -196,11 +207,14 @@ int bin_id_to_string(const char *bin_id, size_t bin_id_size, char *output, size_
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Converts a binary representation of a Tox public key into a string.
 | 
					/* 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 0 on success.
 | 
				
			||||||
 * Returns -1 on failure.
 | 
					 * Returns -1 on failure.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
int bin_pubkey_to_string(const uint8_t *bin_pubkey, size_t bin_pubkey_size, char *output, size_t output_size)
 | 
					int tox_pk_bytes_to_str(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)) {
 | 
					    if (bin_pubkey_size != TOX_PUBLIC_KEY_SIZE || output_size < (TOX_PUBLIC_KEY_SIZE * 2 + 1)) {
 | 
				
			||||||
        return -1;
 | 
					        return -1;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -53,30 +53,43 @@ void clear_screen(void);
 | 
				
			|||||||
void hst_to_net(uint8_t *num, uint16_t numbytes);
 | 
					void hst_to_net(uint8_t *num, uint16_t numbytes);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * Converts a hexidecimal string of length hex_len to binary format and puts the result in output.
 | 
					 * Converts a hexidecimal string representation of a Tox public key to binary format and puts
 | 
				
			||||||
 * output_size must be exactly half of hex_len.
 | 
					 * 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.
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 * Returns 0 on success.
 | 
					 * Returns 0 on success.
 | 
				
			||||||
 * Returns -1 on failure.
 | 
					 * Returns -1 on failure.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
int hex_string_to_bin(const char *hex_string, size_t hex_len, char *output, size_t output_size);
 | 
					int tox_pk_string_to_bytes(const char *hex_string, size_t hex_len, char *output, size_t output_size);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* convert a hex string to bytes. returns 0 on success, -1 on failure */
 | 
					/* 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.
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
int hex_string_to_bytes(char *buf, int size, const char *keystr);
 | 
					int hex_string_to_bytes(char *buf, int size, const char *keystr);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Converts a binary representation of a Tox ID into a string.
 | 
					/* Converts a binary representation of a Tox ID into a string.
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 * Returns 0 on success.
 | 
					 * `bin_id_size` must be exactly TOX_ADDRESS_SIZE bytes in length, and
 | 
				
			||||||
 * Returns -1 on failure.
 | 
					 * `output_size` must be at least TOX_ADDRESS_SIZE * 2 + 1.
 | 
				
			||||||
 */
 | 
					 | 
				
			||||||
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 0 on success.
 | 
				
			||||||
 * Returns -1 on failure.
 | 
					 * Returns -1 on failure.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
int bin_pubkey_to_string(const uint8_t *bin_pubkey, size_t bin_pubkey_size, char *output, size_t output_size);
 | 
					int tox_id_bytes_to_str(const char *bin_id, size_t bin_id_size, char *output, size_t output_size);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* get the current unix time (not thread safe) */
 | 
					/* get the current unix time (not thread safe) */
 | 
				
			||||||
time_t get_unix_time(void);
 | 
					time_t get_unix_time(void);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -132,8 +132,10 @@ static int load_nameserver_list(const char *path)
 | 
				
			|||||||
            continue;
 | 
					            continue;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        snprintf(Nameservers.names[Nameservers.lines], sizeof(Nameservers.names[Nameservers.lines]), "%s", name);
 | 
					        const size_t idx = Nameservers.lines;
 | 
				
			||||||
        int res = hex_string_to_bytes(Nameservers.keys[Nameservers.lines], SERVER_KEY_SIZE, keystr);
 | 
					        snprintf(Nameservers.names[idx], sizeof(Nameservers.names[idx]), "%s", name);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        int res = hex_string_to_bytes(Nameservers.keys[idx], SERVER_KEY_SIZE, keystr);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if (res == -1) {
 | 
					        if (res == -1) {
 | 
				
			||||||
            continue;
 | 
					            continue;
 | 
				
			||||||
@@ -231,7 +233,7 @@ static int process_response(struct Recv_Curl_Data *recv_data)
 | 
				
			|||||||
    memcpy(ID_string, IDstart + prefix_size, TOX_ADDRESS_SIZE * 2);
 | 
					    memcpy(ID_string, IDstart + prefix_size, TOX_ADDRESS_SIZE * 2);
 | 
				
			||||||
    ID_string[TOX_ADDRESS_SIZE * 2] = 0;
 | 
					    ID_string[TOX_ADDRESS_SIZE * 2] = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (hex_string_to_bin(ID_string, strlen(ID_string), t_data.id_bin, sizeof(t_data.id_bin)) == -1) {
 | 
					    if (tox_pk_string_to_bytes(ID_string, strlen(ID_string), t_data.id_bin, sizeof(t_data.id_bin)) == -1) {
 | 
				
			||||||
        return -1;
 | 
					        return -1;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -318,7 +318,7 @@ void *do_playing(void *_p)
 | 
				
			|||||||
        has_looping = false;
 | 
					        has_looping = false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        control_unlock();
 | 
					        control_unlock();
 | 
				
			||||||
        sleep_thread(10000L);
 | 
					        sleep_thread(100000L);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    pthread_exit(NULL);
 | 
					    pthread_exit(NULL);
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										73
									
								
								src/prompt.c
									
									
									
									
									
								
							
							
						
						
									
										73
									
								
								src/prompt.c
									
									
									
									
									
								
							@@ -125,6 +125,8 @@ void on_self_connection_status(Tox *m, Tox_Connection connection_status, void *u
 | 
				
			|||||||
    UNUSED_VAR(userdata);
 | 
					    UNUSED_VAR(userdata);
 | 
				
			||||||
    StatusBar *statusbar = prompt->stb;
 | 
					    StatusBar *statusbar = prompt->stb;
 | 
				
			||||||
    statusbar->connection = connection_status;
 | 
					    statusbar->connection = connection_status;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    flag_interface_refresh();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Updates own nick in prompt statusbar */
 | 
					/* Updates own nick in prompt statusbar */
 | 
				
			||||||
@@ -338,24 +340,50 @@ static void prompt_onDraw(ToxWindow *self, Tox *m)
 | 
				
			|||||||
    Tox_User_Status status = statusbar->status;
 | 
					    Tox_User_Status status = statusbar->status;
 | 
				
			||||||
    pthread_mutex_unlock(&Winthread.lock);
 | 
					    pthread_mutex_unlock(&Winthread.lock);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (connection != TOX_CONNECTION_NONE) {
 | 
					    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) {
 | 
				
			||||||
        int colour = MAGENTA;
 | 
					        int colour = MAGENTA;
 | 
				
			||||||
        const char *status_text = "ERROR";
 | 
					        const char *status_text = "ERROR";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        switch (status) {
 | 
					        switch (status) {
 | 
				
			||||||
            case TOX_USER_STATUS_NONE:
 | 
					 | 
				
			||||||
                status_text = "Online";
 | 
					 | 
				
			||||||
                colour = STATUS_ONLINE;
 | 
					 | 
				
			||||||
                break;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            case TOX_USER_STATUS_AWAY:
 | 
					            case TOX_USER_STATUS_AWAY:
 | 
				
			||||||
                status_text = "Away";
 | 
					 | 
				
			||||||
                colour = STATUS_AWAY;
 | 
					                colour = STATUS_AWAY;
 | 
				
			||||||
 | 
					                status_text = "Away";
 | 
				
			||||||
                break;
 | 
					                break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            case TOX_USER_STATUS_BUSY:
 | 
					            case TOX_USER_STATUS_BUSY:
 | 
				
			||||||
                status_text = "Busy";
 | 
					 | 
				
			||||||
                colour = STATUS_BUSY;
 | 
					                colour = STATUS_BUSY;
 | 
				
			||||||
 | 
					                status_text = "Busy";
 | 
				
			||||||
 | 
					                break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            default:
 | 
				
			||||||
                break;
 | 
					                break;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -377,18 +405,6 @@ static void prompt_onDraw(ToxWindow *self, Tox *m)
 | 
				
			|||||||
        wprintw(statusbar->topline, " %s", statusbar->nick);
 | 
					        wprintw(statusbar->topline, " %s", statusbar->nick);
 | 
				
			||||||
        pthread_mutex_unlock(&Winthread.lock);
 | 
					        pthread_mutex_unlock(&Winthread.lock);
 | 
				
			||||||
    } else {
 | 
					    } 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));
 | 
					        wattron(statusbar->topline, COLOR_PAIR(BAR_TEXT));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        pthread_mutex_lock(&Winthread.lock);
 | 
					        pthread_mutex_lock(&Winthread.lock);
 | 
				
			||||||
@@ -408,11 +424,14 @@ static void prompt_onDraw(ToxWindow *self, Tox *m)
 | 
				
			|||||||
        char statusmsg[TOX_MAX_STATUS_MESSAGE_LENGTH];
 | 
					        char statusmsg[TOX_MAX_STATUS_MESSAGE_LENGTH];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        pthread_mutex_lock(&Winthread.lock);
 | 
					        pthread_mutex_lock(&Winthread.lock);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        size_t slen = tox_self_get_status_message_size(m);
 | 
					        size_t slen = tox_self_get_status_message_size(m);
 | 
				
			||||||
        tox_self_get_status_message(m, (uint8_t *) statusmsg);
 | 
					        tox_self_get_status_message(m, (uint8_t *) statusmsg);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        statusmsg[slen] = '\0';
 | 
					        statusmsg[slen] = '\0';
 | 
				
			||||||
        snprintf(statusbar->statusmsg, sizeof(statusbar->statusmsg), "%s", statusmsg);
 | 
					        snprintf(statusbar->statusmsg, sizeof(statusbar->statusmsg), "%s", statusmsg);
 | 
				
			||||||
        statusbar->statusmsg_len = strlen(statusbar->statusmsg);
 | 
					        statusbar->statusmsg_len = strlen(statusbar->statusmsg);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        pthread_mutex_unlock(&Winthread.lock);
 | 
					        pthread_mutex_unlock(&Winthread.lock);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -422,25 +441,29 @@ static void prompt_onDraw(ToxWindow *self, Tox *m)
 | 
				
			|||||||
    uint16_t maxlen = x2 - getcurx(statusbar->topline) - 3;
 | 
					    uint16_t maxlen = x2 - getcurx(statusbar->topline) - 3;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    pthread_mutex_lock(&Winthread.lock);
 | 
					    pthread_mutex_lock(&Winthread.lock);
 | 
				
			||||||
 | 
					    size_t statusmsg_len = statusbar->statusmsg_len;
 | 
				
			||||||
 | 
					    pthread_mutex_unlock(&Winthread.lock);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (statusbar->statusmsg_len > maxlen) {
 | 
					    if (statusmsg_len > maxlen) {
 | 
				
			||||||
        statusbar->statusmsg[maxlen - 3] = '\0';
 | 
					        pthread_mutex_lock(&Winthread.lock);
 | 
				
			||||||
 | 
					        statusbar->statusmsg[maxlen - 3] = 0;
 | 
				
			||||||
        strcat(statusbar->statusmsg, "...");
 | 
					        strcat(statusbar->statusmsg, "...");
 | 
				
			||||||
        statusbar->statusmsg_len = maxlen;
 | 
					        statusbar->statusmsg_len = maxlen;
 | 
				
			||||||
 | 
					        pthread_mutex_unlock(&Winthread.lock);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (statusbar->statusmsg[0]) {
 | 
					    if (statusmsg_len) {
 | 
				
			||||||
        wattron(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
 | 
					        wattron(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
 | 
				
			||||||
        wprintw(statusbar->topline, " | ");
 | 
					        wprintw(statusbar->topline, " | ");
 | 
				
			||||||
        wattroff(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
 | 
					        wattroff(statusbar->topline, COLOR_PAIR(BAR_ACCENT));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        wattron(statusbar->topline, COLOR_PAIR(BAR_TEXT));
 | 
					        wattron(statusbar->topline, COLOR_PAIR(BAR_TEXT));
 | 
				
			||||||
 | 
					        pthread_mutex_lock(&Winthread.lock);
 | 
				
			||||||
        wprintw(statusbar->topline, "%s", statusbar->statusmsg);
 | 
					        wprintw(statusbar->topline, "%s", statusbar->statusmsg);
 | 
				
			||||||
 | 
					        pthread_mutex_unlock(&Winthread.lock);
 | 
				
			||||||
        wattroff(statusbar->topline, COLOR_PAIR(BAR_TEXT));
 | 
					        wattroff(statusbar->topline, COLOR_PAIR(BAR_TEXT));
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    pthread_mutex_unlock(&Winthread.lock);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    int y;
 | 
					    int y;
 | 
				
			||||||
    int x;
 | 
					    int x;
 | 
				
			||||||
    getyx(self->window, y, x);
 | 
					    getyx(self->window, y, x);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -32,7 +32,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#define PASSWORD_EVAL_MAX 512
 | 
					#define PASSWORD_EVAL_MAX 512
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* holds user setting values */
 | 
					/* Holds user setting values defined in the toxic config file. */
 | 
				
			||||||
struct user_settings {
 | 
					struct user_settings {
 | 
				
			||||||
    int autolog;           /* boolean */
 | 
					    int autolog;           /* boolean */
 | 
				
			||||||
    int alerts;            /* boolean */
 | 
					    int alerts;            /* boolean */
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										156
									
								
								src/toxic.c
									
									
									
									
									
								
							
							
						
						
									
										156
									
								
								src/toxic.c
									
									
									
									
									
								
							@@ -101,6 +101,9 @@ struct Winthread Winthread;
 | 
				
			|||||||
struct cqueue_thread cqueue_thread;
 | 
					struct cqueue_thread cqueue_thread;
 | 
				
			||||||
struct av_thread av_thread;
 | 
					struct av_thread av_thread;
 | 
				
			||||||
struct arg_opts arg_opts;
 | 
					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;
 | 
					struct user_settings *user_settings = NULL;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static struct user_password {
 | 
					static struct user_password {
 | 
				
			||||||
@@ -239,6 +242,12 @@ 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)
 | 
					static void init_term(void)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
#if HAVE_WIDECHAR
 | 
					#if HAVE_WIDECHAR
 | 
				
			||||||
@@ -256,7 +265,7 @@ static void init_term(void)
 | 
				
			|||||||
    keypad(stdscr, 1);
 | 
					    keypad(stdscr, 1);
 | 
				
			||||||
    noecho();
 | 
					    noecho();
 | 
				
			||||||
    nonl();
 | 
					    nonl();
 | 
				
			||||||
    timeout(30);
 | 
					    set_window_refresh_rate(NCURSES_DEFAULT_REFRESH_RATE);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (has_colors()) {
 | 
					    if (has_colors()) {
 | 
				
			||||||
        short bg_color = COLOR_BLACK;
 | 
					        short bg_color = COLOR_BLACK;
 | 
				
			||||||
@@ -383,6 +392,7 @@ static void init_term(void)
 | 
				
			|||||||
        init_pair(BLACK_BG, COLOR_BLACK, bar_bg_color);
 | 
					        init_pair(BLACK_BG, COLOR_BLACK, bar_bg_color);
 | 
				
			||||||
        init_pair(PURPLE_BG, COLOR_MAGENTA, 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_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_ACCENT, bar_accent_color, bar_bg_color);
 | 
				
			||||||
        init_pair(BAR_NOTIFY, bar_notify_color, bar_bg_color);
 | 
					        init_pair(BAR_NOTIFY, bar_notify_color, bar_bg_color);
 | 
				
			||||||
        init_pair(STATUS_ONLINE, COLOR_GREEN, bar_bg_color);
 | 
					        init_pair(STATUS_ONLINE, COLOR_GREEN, bar_bg_color);
 | 
				
			||||||
@@ -434,9 +444,7 @@ static void cleanup_init_messages(void)
 | 
				
			|||||||
        return;
 | 
					        return;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    int i;
 | 
					    for (int i = 0; i < init_messages.num; ++i) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
    for (i = 0; i < init_messages.num; ++i) {
 | 
					 | 
				
			||||||
        free(init_messages.msgs[i]);
 | 
					        free(init_messages.msgs[i]);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -445,19 +453,16 @@ static void cleanup_init_messages(void)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
static void print_init_messages(ToxWindow *toxwin)
 | 
					static void print_init_messages(ToxWindow *toxwin)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    int i;
 | 
					    for (int i = 0; i < init_messages.num; ++i) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
    for (i = 0; i < init_messages.num; ++i) {
 | 
					 | 
				
			||||||
        line_info_add(toxwin, NULL, NULL, NULL, SYS_MSG, 0, 0, init_messages.msgs[i]);
 | 
					        line_info_add(toxwin, NULL, NULL, NULL, SYS_MSG, 0, 0, init_messages.msgs[i]);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void load_friendlist(Tox *m)
 | 
					static void load_friendlist(Tox *m)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    size_t i;
 | 
					 | 
				
			||||||
    size_t numfriends = tox_self_get_friend_list_size(m);
 | 
					    size_t numfriends = tox_self_get_friend_list_size(m);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    for (i = 0; i < numfriends; ++i) {
 | 
					    for (size_t i = 0; i < numfriends; ++i) {
 | 
				
			||||||
        friendlist_onFriendAdded(NULL, m, i, false);
 | 
					        friendlist_onFriendAdded(NULL, m, i, false);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -1071,6 +1076,37 @@ static void do_toxic(Tox *m)
 | 
				
			|||||||
    pthread_mutex_unlock(&Winthread.lock);
 | 
					    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
 | 
					#define INACTIVE_WIN_REFRESH_RATE 10
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void *thread_winref(void *data)
 | 
					void *thread_winref(void *data)
 | 
				
			||||||
@@ -1078,11 +1114,12 @@ void *thread_winref(void *data)
 | 
				
			|||||||
    Tox *m = (Tox *) data;
 | 
					    Tox *m = (Tox *) data;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    uint8_t draw_count = 0;
 | 
					    uint8_t draw_count = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    init_signal_catchers();
 | 
					    init_signal_catchers();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    while (true) {
 | 
					    while (true) {
 | 
				
			||||||
        draw_active_window(m);
 | 
					 | 
				
			||||||
        draw_count++;
 | 
					        draw_count++;
 | 
				
			||||||
 | 
					        draw_active_window(m);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if (Winthread.flag_resize) {
 | 
					        if (Winthread.flag_resize) {
 | 
				
			||||||
            on_window_resize();
 | 
					            on_window_resize();
 | 
				
			||||||
@@ -1096,6 +1133,8 @@ void *thread_winref(void *data)
 | 
				
			|||||||
            pthread_mutex_lock(&Winthread.lock);
 | 
					            pthread_mutex_lock(&Winthread.lock);
 | 
				
			||||||
            exit_toxic_success(m);
 | 
					            exit_toxic_success(m);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        poll_interface_refresh_flag();
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -1109,9 +1148,12 @@ void *thread_cqueue(void *data)
 | 
				
			|||||||
        for (size_t i = 2; i < MAX_WINDOWS_NUM; ++i) {
 | 
					        for (size_t i = 2; i < MAX_WINDOWS_NUM; ++i) {
 | 
				
			||||||
            ToxWindow *toxwin = get_window_ptr(i);
 | 
					            ToxWindow *toxwin = get_window_ptr(i);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            if ((toxwin != NULL) && (toxwin->type == WINDOW_TYPE_CHAT)
 | 
					            if ((toxwin != NULL) && (toxwin->type == WINDOW_TYPE_CHAT)) {
 | 
				
			||||||
                    && (get_friend_connection_status(toxwin->num) != TOX_CONNECTION_NONE)) {
 | 
					                cqueue_check_unread(toxwin);
 | 
				
			||||||
                cqueue_try_send(toxwin, m);
 | 
					
 | 
				
			||||||
 | 
					                if (get_friend_connection_status(toxwin->num) != TOX_CONNECTION_NONE) {
 | 
				
			||||||
 | 
					                    cqueue_try_send(toxwin, m);
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -1203,21 +1245,23 @@ static void parse_args(int argc, char *argv[])
 | 
				
			|||||||
    };
 | 
					    };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    const char *opts_str = "4bdehLotuxvc:f:l:n:r:p:P:T:";
 | 
					    const char *opts_str = "4bdehLotuxvc:f:l:n:r:p:P:T:";
 | 
				
			||||||
    int opt, indexptr;
 | 
					    int opt = 0;
 | 
				
			||||||
    long int port = 0;
 | 
					    int indexptr = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    while ((opt = getopt_long(argc, argv, opts_str, long_opts, &indexptr)) != -1) {
 | 
					    while ((opt = getopt_long(argc, argv, opts_str, long_opts, &indexptr)) != -1) {
 | 
				
			||||||
        switch (opt) {
 | 
					        switch (opt) {
 | 
				
			||||||
            case '4':
 | 
					            case '4': {
 | 
				
			||||||
                arg_opts.use_ipv4 = 1;
 | 
					                arg_opts.use_ipv4 = 1;
 | 
				
			||||||
                break;
 | 
					                break;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            case 'b':
 | 
					            case 'b': {
 | 
				
			||||||
                arg_opts.debug = 1;
 | 
					                arg_opts.debug = 1;
 | 
				
			||||||
                queue_init_message("stderr enabled");
 | 
					                queue_init_message("stderr enabled");
 | 
				
			||||||
                break;
 | 
					                break;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            case 'c':
 | 
					            case 'c': {
 | 
				
			||||||
                if (optarg == NULL) {
 | 
					                if (optarg == NULL) {
 | 
				
			||||||
                    queue_init_message("Invalid argument for option: %d", opt);
 | 
					                    queue_init_message("Invalid argument for option: %d", opt);
 | 
				
			||||||
                    break;
 | 
					                    break;
 | 
				
			||||||
@@ -1230,17 +1274,20 @@ static void parse_args(int argc, char *argv[])
 | 
				
			|||||||
                }
 | 
					                }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                break;
 | 
					                break;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            case 'd':
 | 
					            case 'd': {
 | 
				
			||||||
                arg_opts.default_locale = 1;
 | 
					                arg_opts.default_locale = 1;
 | 
				
			||||||
                queue_init_message("Using default POSIX locale");
 | 
					                queue_init_message("Using default POSIX locale");
 | 
				
			||||||
                break;
 | 
					                break;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            case 'e':
 | 
					            case 'e': {
 | 
				
			||||||
                arg_opts.encrypt_data = 1;
 | 
					                arg_opts.encrypt_data = 1;
 | 
				
			||||||
                break;
 | 
					                break;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            case 'f':
 | 
					            case 'f': {
 | 
				
			||||||
                if (optarg == NULL) {
 | 
					                if (optarg == NULL) {
 | 
				
			||||||
                    queue_init_message("Invalid argument for option: %d", opt);
 | 
					                    queue_init_message("Invalid argument for option: %d", opt);
 | 
				
			||||||
                    break;
 | 
					                    break;
 | 
				
			||||||
@@ -1278,8 +1325,9 @@ static void parse_args(int argc, char *argv[])
 | 
				
			|||||||
                queue_init_message("Using '%s' data file", DATA_FILE);
 | 
					                queue_init_message("Using '%s' data file", DATA_FILE);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                break;
 | 
					                break;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            case 'l':
 | 
					            case 'l': {
 | 
				
			||||||
                if (optarg) {
 | 
					                if (optarg) {
 | 
				
			||||||
                    arg_opts.logging = true;
 | 
					                    arg_opts.logging = true;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -1299,13 +1347,15 @@ static void parse_args(int argc, char *argv[])
 | 
				
			|||||||
                }
 | 
					                }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                break;
 | 
					                break;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            case 'L':
 | 
					            case 'L': {
 | 
				
			||||||
                arg_opts.disable_local_discovery = 1;
 | 
					                arg_opts.disable_local_discovery = 1;
 | 
				
			||||||
                queue_init_message("Local discovery disabled");
 | 
					                queue_init_message("Local discovery disabled");
 | 
				
			||||||
                break;
 | 
					                break;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            case 'n':
 | 
					            case 'n': {
 | 
				
			||||||
                if (optarg == NULL) {
 | 
					                if (optarg == NULL) {
 | 
				
			||||||
                    queue_init_message("Invalid argument for option: %d", opt);
 | 
					                    queue_init_message("Invalid argument for option: %d", opt);
 | 
				
			||||||
                    break;
 | 
					                    break;
 | 
				
			||||||
@@ -1313,48 +1363,38 @@ static void parse_args(int argc, char *argv[])
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
                snprintf(arg_opts.nodes_path, sizeof(arg_opts.nodes_path), "%s", optarg);
 | 
					                snprintf(arg_opts.nodes_path, sizeof(arg_opts.nodes_path), "%s", optarg);
 | 
				
			||||||
                break;
 | 
					                break;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            case 'o':
 | 
					            case 'o': {
 | 
				
			||||||
                arg_opts.no_connect = 1;
 | 
					                arg_opts.no_connect = 1;
 | 
				
			||||||
                queue_init_message("DHT disabled");
 | 
					                queue_init_message("DHT disabled");
 | 
				
			||||||
                break;
 | 
					                break;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            case 'p':
 | 
					            case 'p': {
 | 
				
			||||||
                if (optarg == NULL) {
 | 
					 | 
				
			||||||
                    queue_init_message("Invalid argument for option: %d", opt);
 | 
					 | 
				
			||||||
                    break;
 | 
					 | 
				
			||||||
                }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
                arg_opts.proxy_type = TOX_PROXY_TYPE_SOCKS5;
 | 
					                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] == '-') {
 | 
					            // Intentional fallthrough
 | 
				
			||||||
                    exit_toxic_err("Proxy error", FATALERR_PROXY);
 | 
					 | 
				
			||||||
                }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
                port = strtol(argv[optind - 1], NULL, 10);
 | 
					            case 'P': {
 | 
				
			||||||
 | 
					 | 
				
			||||||
                if (port <= 0 || port > MAX_PORT_RANGE) {
 | 
					 | 
				
			||||||
                    exit_toxic_err("Proxy error", FATALERR_PROXY);
 | 
					 | 
				
			||||||
                }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
                arg_opts.proxy_port = port;
 | 
					 | 
				
			||||||
                break;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            case 'P':
 | 
					 | 
				
			||||||
                if (optarg == NULL) {
 | 
					                if (optarg == NULL) {
 | 
				
			||||||
                    queue_init_message("Invalid argument for option: %d", opt);
 | 
					                    queue_init_message("Invalid argument for option: %d", opt);
 | 
				
			||||||
 | 
					                    arg_opts.proxy_type = TOX_PROXY_TYPE_NONE;
 | 
				
			||||||
                    break;
 | 
					                    break;
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                arg_opts.proxy_type = TOX_PROXY_TYPE_HTTP;
 | 
					                if (arg_opts.proxy_type == TOX_PROXY_TYPE_NONE) {
 | 
				
			||||||
 | 
					                    arg_opts.proxy_type = TOX_PROXY_TYPE_HTTP;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                snprintf(arg_opts.proxy_address, sizeof(arg_opts.proxy_address), "%s", optarg);
 | 
					                snprintf(arg_opts.proxy_address, sizeof(arg_opts.proxy_address), "%s", optarg);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                if (++optind > argc || argv[optind - 1][0] == '-') {
 | 
					                if (++optind > argc || argv[optind - 1][0] == '-') {
 | 
				
			||||||
                    exit_toxic_err("Proxy error", FATALERR_PROXY);
 | 
					                    exit_toxic_err("Proxy error", FATALERR_PROXY);
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                port = strtol(argv[optind - 1], NULL, 10);
 | 
					                long int port = strtol(argv[optind - 1], NULL, 10);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                if (port <= 0 || port > MAX_PORT_RANGE) {
 | 
					                if (port <= 0 || port > MAX_PORT_RANGE) {
 | 
				
			||||||
                    exit_toxic_err("Proxy error", FATALERR_PROXY);
 | 
					                    exit_toxic_err("Proxy error", FATALERR_PROXY);
 | 
				
			||||||
@@ -1362,8 +1402,9 @@ static void parse_args(int argc, char *argv[])
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
                arg_opts.proxy_port = port;
 | 
					                arg_opts.proxy_port = port;
 | 
				
			||||||
                break;
 | 
					                break;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            case 'r':
 | 
					            case 'r': {
 | 
				
			||||||
                if (optarg == NULL) {
 | 
					                if (optarg == NULL) {
 | 
				
			||||||
                    queue_init_message("Invalid argument for option: %d", opt);
 | 
					                    queue_init_message("Invalid argument for option: %d", opt);
 | 
				
			||||||
                    break;
 | 
					                    break;
 | 
				
			||||||
@@ -1376,18 +1417,20 @@ static void parse_args(int argc, char *argv[])
 | 
				
			|||||||
                }
 | 
					                }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                break;
 | 
					                break;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            case 't':
 | 
					            case 't': {
 | 
				
			||||||
                arg_opts.force_tcp = 1;
 | 
					                arg_opts.force_tcp = 1;
 | 
				
			||||||
                break;
 | 
					                break;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            case 'T':
 | 
					            case 'T': {
 | 
				
			||||||
                if (optarg == NULL) {
 | 
					                if (optarg == NULL) {
 | 
				
			||||||
                    queue_init_message("Invalid argument for option: %d", opt);
 | 
					                    queue_init_message("Invalid argument for option: %d", opt);
 | 
				
			||||||
                    break;
 | 
					                    break;
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                port = strtol(optarg, NULL, 10);
 | 
					                long int port = strtol(optarg, NULL, 10);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                if (port <= 0 || port > MAX_PORT_RANGE) {
 | 
					                if (port <= 0 || port > MAX_PORT_RANGE) {
 | 
				
			||||||
                    port = MAX_PORT_RANGE;
 | 
					                    port = MAX_PORT_RANGE;
 | 
				
			||||||
@@ -1395,21 +1438,25 @@ static void parse_args(int argc, char *argv[])
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
                arg_opts.tcp_port = port;
 | 
					                arg_opts.tcp_port = port;
 | 
				
			||||||
                break;
 | 
					                break;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            case 'u':
 | 
					            case 'u': {
 | 
				
			||||||
                arg_opts.unencrypt_data = 1;
 | 
					                arg_opts.unencrypt_data = 1;
 | 
				
			||||||
                break;
 | 
					                break;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            case 'v':
 | 
					            case 'v': {
 | 
				
			||||||
                print_version();
 | 
					                print_version();
 | 
				
			||||||
                exit(EXIT_SUCCESS);
 | 
					                exit(EXIT_SUCCESS);
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            case 'h':
 | 
					            case 'h':
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            // Intentional fallthrough
 | 
					            // Intentional fallthrough
 | 
				
			||||||
            default:
 | 
					            default: {
 | 
				
			||||||
                print_usage();
 | 
					                print_usage();
 | 
				
			||||||
                exit(EXIT_SUCCESS);
 | 
					                exit(EXIT_SUCCESS);
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
@@ -1598,6 +1645,7 @@ int main(int argc, char **argv)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    pthread_mutex_lock(&Winthread.lock);
 | 
					    pthread_mutex_lock(&Winthread.lock);
 | 
				
			||||||
    print_init_messages(prompt);
 | 
					    print_init_messages(prompt);
 | 
				
			||||||
 | 
					    flag_interface_refresh();
 | 
				
			||||||
    pthread_mutex_unlock(&Winthread.lock);
 | 
					    pthread_mutex_unlock(&Winthread.lock);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    cleanup_init_messages();
 | 
					    cleanup_init_messages();
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -50,6 +50,9 @@
 | 
				
			|||||||
#define TIME_STR_SIZE 32
 | 
					#define TIME_STR_SIZE 32
 | 
				
			||||||
#define COLOR_STR_SIZE 10 /* should fit every color option */
 | 
					#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
 | 
					#ifndef MAX_PORT_RANGE
 | 
				
			||||||
#define MAX_PORT_RANGE 65535
 | 
					#define MAX_PORT_RANGE 65535
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
@@ -102,6 +105,11 @@ typedef enum _FATAL_ERRS {
 | 
				
			|||||||
void lock_status(void);
 | 
					void lock_status(void);
 | 
				
			||||||
void unlock_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_success(Tox *m);
 | 
				
			||||||
void exit_toxic_err(const char *errmsg, int errcode);
 | 
					void exit_toxic_err(const char *errmsg, int errcode);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -77,6 +77,8 @@ void on_friend_connection_status(Tox *m, uint32_t friendnumber, Tox_Connection c
 | 
				
			|||||||
            windows[i]->onConnectionChange(windows[i], m, friendnumber, connection_status);
 | 
					            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)
 | 
					void on_friend_typing(Tox *m, uint32_t friendnumber, bool is_typing, void *userdata)
 | 
				
			||||||
@@ -92,6 +94,8 @@ void on_friend_typing(Tox *m, uint32_t friendnumber, bool is_typing, void *userd
 | 
				
			|||||||
            windows[i]->onTypingChange(windows[i], m, friendnumber, is_typing);
 | 
					            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,
 | 
					void on_friend_message(Tox *m, uint32_t friendnumber, Tox_Message_Type type, const uint8_t *string, size_t length,
 | 
				
			||||||
@@ -123,6 +127,8 @@ void on_friend_name(Tox *m, uint32_t friendnumber, const uint8_t *string, size_t
 | 
				
			|||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    flag_interface_refresh();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    store_data(m, DATA_FILE);
 | 
					    store_data(m, DATA_FILE);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -140,6 +146,8 @@ void on_friend_status_message(Tox *m, uint32_t friendnumber, const uint8_t *stri
 | 
				
			|||||||
            windows[i]->onStatusMessageChange(windows[i], friendnumber, msg, length);
 | 
					            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)
 | 
					void on_friend_status(Tox *m, uint32_t friendnumber, Tox_User_Status status, void *userdata)
 | 
				
			||||||
@@ -151,6 +159,8 @@ void on_friend_status(Tox *m, uint32_t friendnumber, Tox_User_Status status, voi
 | 
				
			|||||||
            windows[i]->onStatusChange(windows[i], m, friendnumber, status);
 | 
					            windows[i]->onStatusChange(windows[i], m, friendnumber, status);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    flag_interface_refresh();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void on_friend_added(Tox *m, uint32_t friendnumber, bool sort)
 | 
					void on_friend_added(Tox *m, uint32_t friendnumber, bool sort)
 | 
				
			||||||
@@ -200,6 +210,8 @@ void on_conference_peer_list_changed(Tox *m, uint32_t conferencenumber, void *us
 | 
				
			|||||||
            windows[i]->onConferenceNameListChange(windows[i], m, conferencenumber);
 | 
					            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,
 | 
					void on_conference_peer_name(Tox *m, uint32_t conferencenumber, uint32_t peernumber, const uint8_t *name,
 | 
				
			||||||
@@ -421,13 +433,15 @@ void set_active_window_index(uint8_t index)
 | 
				
			|||||||
/* Displays the next window if `ch` is equal to the next window key binding.
 | 
					/* Displays the next window if `ch` is equal to the next window key binding.
 | 
				
			||||||
 * Otherwise displays the previous window.
 | 
					 * Otherwise displays the previous window.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
void set_next_window(int ch)
 | 
					static void set_next_window(int ch)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					    uint8_t index = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (ch == user_settings->key_next_tab) {
 | 
					    if (ch == user_settings->key_next_tab) {
 | 
				
			||||||
        for (uint8_t i = active_window_index + 1; i < MAX_WINDOWS_NUM; ++i) {
 | 
					        for (uint8_t i = active_window_index + 1; i < MAX_WINDOWS_NUM; ++i) {
 | 
				
			||||||
            if (windows[i] != NULL) {
 | 
					            if (windows[i] != NULL) {
 | 
				
			||||||
                set_active_window_index(i);
 | 
					                index = i;
 | 
				
			||||||
                return;
 | 
					                break;
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    } else {
 | 
					    } else {
 | 
				
			||||||
@@ -435,13 +449,13 @@ void set_next_window(int ch)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        for (uint8_t i = start; i > 0; --i) {
 | 
					        for (uint8_t i = start; i > 0; --i) {
 | 
				
			||||||
            if (windows[i] != NULL) {
 | 
					            if (windows[i] != NULL) {
 | 
				
			||||||
                set_active_window_index(i);
 | 
					                index = i;
 | 
				
			||||||
                return;
 | 
					                break;
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    set_active_window_index(0);
 | 
					    set_active_window_index(index);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Deletes window w and cleans up */
 | 
					/* Deletes window w and cleans up */
 | 
				
			||||||
@@ -784,21 +798,43 @@ void draw_active_window(Tox *m)
 | 
				
			|||||||
    pthread_mutex_lock(&Winthread.lock);
 | 
					    pthread_mutex_lock(&Winthread.lock);
 | 
				
			||||||
    a->alert = WINDOW_ALERT_NONE;
 | 
					    a->alert = WINDOW_ALERT_NONE;
 | 
				
			||||||
    a->pending_messages = 0;
 | 
					    a->pending_messages = 0;
 | 
				
			||||||
 | 
					    bool flag_refresh = Winthread.flag_refresh;
 | 
				
			||||||
    pthread_mutex_unlock(&Winthread.lock);
 | 
					    pthread_mutex_unlock(&Winthread.lock);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    touchwin(a->window);
 | 
					    if (flag_refresh) {
 | 
				
			||||||
    a->onDraw(a, m);
 | 
					        touchwin(a->window);
 | 
				
			||||||
    wrefresh(a->window);
 | 
					        a->onDraw(a, m);
 | 
				
			||||||
 | 
					        wrefresh(a->window);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#ifdef AUDIO
 | 
				
			||||||
 | 
					    else if (a->is_call && timed_out(a->chatwin->infobox.lastupdate, 1)) {
 | 
				
			||||||
 | 
					        touchwin(a->window);
 | 
				
			||||||
 | 
					        a->onDraw(a, m);
 | 
				
			||||||
 | 
					        wrefresh(a->window);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif  // AUDIO
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifdef GAMES
 | 
					#ifdef GAMES
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (a->type == WINDOW_TYPE_GAME) {
 | 
					    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();
 | 
					        int ch = getch();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if (ch == ERR) {
 | 
					        if (ch == ERR) {
 | 
				
			||||||
            return;
 | 
					            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) {
 | 
					        if (ch == user_settings->key_next_tab || ch == user_settings->key_prev_tab) {
 | 
				
			||||||
            set_next_window(ch);
 | 
					            set_next_window(ch);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
@@ -817,6 +853,10 @@ void draw_active_window(Tox *m)
 | 
				
			|||||||
        return;
 | 
					        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)) {
 | 
					    if (printable == 0 && (ch == user_settings->key_next_tab || ch == user_settings->key_prev_tab)) {
 | 
				
			||||||
        set_next_window((int) ch);
 | 
					        set_next_window((int) ch);
 | 
				
			||||||
        return;
 | 
					        return;
 | 
				
			||||||
@@ -892,10 +932,30 @@ int get_num_active_windows(void)
 | 
				
			|||||||
    return num_active_windows;
 | 
					    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) */
 | 
					/* destroys all chat and conference windows (should only be called on shutdown) */
 | 
				
			||||||
void kill_all_windows(Tox *m)
 | 
					void kill_all_windows(Tox *m)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    for (uint8_t i = 2; i < MAX_WINDOWS_NUM; ++i) {
 | 
					    for (size_t i = 2; i < MAX_WINDOWS_NUM; ++i) {
 | 
				
			||||||
        ToxWindow *w = windows[i];
 | 
					        ToxWindow *w = windows[i];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if (w == NULL) {
 | 
					        if (w == NULL) {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -72,6 +72,7 @@ typedef enum {
 | 
				
			|||||||
    STATUS_BUSY,
 | 
					    STATUS_BUSY,
 | 
				
			||||||
    STATUS_AWAY,
 | 
					    STATUS_AWAY,
 | 
				
			||||||
    BAR_NOTIFY,
 | 
					    BAR_NOTIFY,
 | 
				
			||||||
 | 
					    BAR_SOLID,
 | 
				
			||||||
} C_COLOURS;
 | 
					} C_COLOURS;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* tab alert types: lower types take priority (this relies on the order of C_COLOURS) */
 | 
					/* tab alert types: lower types take priority (this relies on the order of C_COLOURS) */
 | 
				
			||||||
@@ -97,11 +98,20 @@ typedef enum {
 | 
				
			|||||||
   Uncomment if necessary */
 | 
					   Uncomment if necessary */
 | 
				
			||||||
/* #define URXVT_FIX */
 | 
					/* #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 {
 | 
					struct Winthread {
 | 
				
			||||||
    pthread_t tid;
 | 
					    pthread_t tid;
 | 
				
			||||||
    pthread_mutex_t lock;
 | 
					    pthread_mutex_t lock;
 | 
				
			||||||
    volatile sig_atomic_t sig_exit_toxic;
 | 
					    volatile sig_atomic_t sig_exit_toxic;
 | 
				
			||||||
    volatile sig_atomic_t flag_resize;
 | 
					    volatile sig_atomic_t flag_resize;
 | 
				
			||||||
 | 
					    volatile sig_atomic_t flag_refresh;
 | 
				
			||||||
 | 
					    volatile sig_atomic_t last_refresh_flag;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct cqueue_thread {
 | 
					struct cqueue_thread {
 | 
				
			||||||
@@ -306,6 +316,9 @@ ToxWindow *get_window_ptr(size_t i);
 | 
				
			|||||||
ToxWindow *get_active_window(void);
 | 
					ToxWindow *get_active_window(void);
 | 
				
			||||||
void draw_window_bar(ToxWindow *self);
 | 
					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.
 | 
					/* refresh inactive windows to prevent scrolling bugs.
 | 
				
			||||||
   call at least once per second */
 | 
					   call at least once per second */
 | 
				
			||||||
void refresh_inactive_windows(void);
 | 
					void refresh_inactive_windows(void);
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user