Fix nodes parsing bug

- File transfers now timeout properly
- Small refactor related to creating new transfers

.travis.yml

@@ -1,30 +1,30 @@
 language: c
 compiler:
   - gcc
-  # - clang  # Fix me
+  - clang
 
 before_script:
   # Installing yasm (needed for compiling vpx) and openal
-  - sudo apt-get -yq install yasm libopenal-dev libconfig-dev libalut-dev libnotify-dev asciidoc
+  - sudo apt-get -yq install yasm libopenal-dev libconfig-dev libalut-dev libnotify-dev clang llvm-dev
   # Installing libsodium, needed for toxcore
   - git clone https://github.com/jedisct1/libsodium.git libsodium
   - cd libsodium
-  - git checkout tags/0.7.0 > /dev/null
+  - git checkout tags/1.0.3 > /dev/null
   - ./autogen.sh > /dev/null
   - ./configure > /dev/null
   - make check -j2 || make check || exit 1 > /dev/null
   - sudo make install > /dev/null
   - cd ..
   # Installing libopus, needed for audio encoding/decoding
-  - wget http://downloads.xiph.org/releases/opus/opus-1.0.3.tar.gz
-  - tar xzf opus-1.0.3.tar.gz > /dev/null
-  - cd opus-1.0.3
+  - wget http://downloads.xiph.org/releases/opus/opus-1.1.tar.gz
+  - tar xzf opus-1.1.tar.gz > /dev/null
+  - cd opus-1.1
   - ./configure > /dev/null
   - make -j2 || make || exit 1 > /dev/null
   - sudo make install > /dev/null
   - cd ..
   # Installing vpx
-  - git clone http://git.chromium.org/webm/libvpx.git libvpx
+  - git clone https://chromium.googlesource.com/webm/libvpx libvpx
   - cd libvpx
   - ./configure --enable-shared > /dev/null
   - make -j2 || make || exit 1 > /dev/null
@@ -41,7 +41,6 @@ before_script:
   - sudo make install
   - cd ..
 script:
-  - cd build
   - make -j2 || make || exit 1
 notifications:
   email: false

INSTALL.md

@@ -0,0 +1,68 @@
+# Installation
+* [Dependencies](#deps)
+  * [OS X Notes](#deps_osx)
+* [Compiling](#compiling)
+  * [Documentation](#docs)
+* [Notes](#notes)
+  * [Compilation variables](#comp_vars)
+  * [Packaging](#packaging)
+
+<a name="deps" />
+## Dependencies
+| Name                                                 | Needed by                  | Debian package   |
+|------------------------------------------------------|----------------------------|------------------|
+| [Tox Core](https://github.com/irungentoo/toxcore)    | BASE                       | *None*           |
+| [NCurses](https://www.gnu.org/software/ncurses)      | BASE                       | libncursesw5-dev |
+| [LibConfig](http://www.hyperrealm.com/libconfig)     | BASE                       | libconfig-dev    |
+| [GNUmake](https://www.gnu.org/software/make)         | BASE                       | make             |
+| [Tox Core AV](https://github.com/irungentoo/toxcore) | AUDIO                      | *None*           |
+| [OpenAL](http://openal.org)                          | AUDIO, SOUND NOTIFICATIONS | libopenal-dev    |
+| [OpenALUT](http://openal.org)                        | SOUND NOTIFICATIONS        | libalut-dev      |
+| [LibNotify](https://developer.gnome.org/libnotify)   | DESKTOP NOTIFICATIONS      | libnotify-dev    |
+| [AsciiDoc](http://asciidoc.org/index.html)           | DOCUMENTATION<sup>1</sup>  | asciidoc         |
+<sup>1</sup>: see [Documentation](#docs)
+
+<a name="deps_osx" />
+#### OS X Notes
+Using [Homebrew](http://brew.sh):
+```
+brew install openal-soft freealut libconfig
+brew install https://raw.githubusercontent.com/Tox/homebrew-tox/master/Formula/libtoxcore.rb
+brew install https://raw.githubusercontent.com/Homebrew/homebrew-x11/master/libnotify.rb
+```
+
+You can omit `libnotify` if you intend to build without desktop notifications enabled. 
+
+<a name="Compiling">
+## Compiling
+```
+make PREFIX="/where/to/install"
+sudo make install PREFIX="/where/to/install"
+```
+
+<a name="docs" />
+#### Documentation
+Run `make doc` in the build directory after editing the asciidoc files to regenerate the manpages.<br />
+**NOTE FOR DEVELOPERS**: asciidoc files and generated manpages will need to be commited together.<br />
+**NOTE FOR EVERYONE**: [asciidoc](http://asciidoc.org/index.html) (and this step) is only required for regenerating manpages when you modify them.
+
+<a name="notes" />
+## Notes
+
+<a name="comp_vars" />
+#### Compilation variables
+* You can add specific flags to the Makefile with `USER_CFLAGS=""` and/or `USER_LDFLAGS=""`
+* You can pass your own flags to the Makefile with `CFLAGS=""` and/or `LDFLAGS=""` (this will supersede the default ones)
+* Additional features are automatically enabled if all dependencies are found, but you can disable them by using special variables:
+  * `DISABLE_X11=1` → build toxic without X11 support (needed for focus tracking)
+  * `DISABLE_AV=1` → build toxic without audio call support
+  * `DISABLE_SOUND_NOTIFY=1` → build toxic without sound notifications support
+  * `DISABLE_DESKTOP_NOTIFY=1` → build toxic without desktop notifications support
+
+<a name="packaging" />
+#### Packaging
+* For packaging purpose, you can use `DESTDIR=""` to specify a directory where to store installed files
+* `DESTDIR=""` can be used in addition to `PREFIX=""`:
+  * `DESTDIR=""` is meant to specify a directory where to store installed files (ex: "/tmp/build/pkg")
+  * `PREFIX=""` is meant to specify a prefix directory for binaries and data files (ex: "/usr/local")
+

Makefile

@@ -0,0 +1,77 @@
+BASE_DIR = $(shell pwd -P)
+CFG_DIR = $(BASE_DIR)/cfg
+
+-include $(CFG_DIR)/global_vars.mk
+
+LIBS = libtoxcore ncursesw libconfig
+
+CFLAGS = -std=gnu99 -pthread -Wall -g
+CFLAGS += '-DTOXICVER="$(VERSION)"' -DHAVE_WIDECHAR -D_XOPEN_SOURCE_EXTENDED -D_FILE_OFFSET_BITS=64
+CFLAGS += '-DPACKAGE_DATADIR="$(abspath $(DATADIR))"'
+CFLAGS += $(USER_CFLAGS)
+LDFLAGS = $(USER_LDFLAGS)
+
+OBJ = chat.o chat_commands.o configdir.o dns.o execute.o file_transfers.o notify.o
+OBJ += friendlist.o global_commands.o groupchat.o line_info.o input.o help.o autocomplete.o
+OBJ += log.o misc_tools.o prompt.o settings.o toxic.o toxic_strings.o windows.o message_queue.o
+OBJ += group_commands.o term_mplex.o avatars.o
+
+# Check on wich system we are running
+UNAME_S = $(shell uname -s)
+ifeq ($(UNAME_S), Linux)
+    -include $(CFG_DIR)/systems/Linux.mk
+endif
+ifeq ($(UNAME_S), FreeBSD)
+    -include $(CFG_DIR)/systems/FreeBSD.mk
+endif
+ifeq ($(UNAME_S), OpenBSD)
+    -include $(CFG_DIR)/systems/FreeBSD.mk
+endif
+ifeq ($(UNAME_S), Darwin)
+    -include $(CFG_DIR)/systems/Darwin.mk
+endif
+ifeq ($(UNAME_S), Solaris)
+    -include $(CFG_DIR)/systems/Solaris.mk
+endif
+
+# Check on which platform we are running
+UNAME_M = $(shell uname -m)
+ifeq ($(UNAME_M), x86_64)
+    -include $(CFG_DIR)/platforms/x86_64.mk
+endif
+ifneq ($(filter %86, $(UNAME_M)),)
+    -include $(CFG_DIR)/platforms/x86.mk
+endif
+ifneq ($(filter arm%, $(UNAME_M)),)
+    -include $(CFG_DIR)/platforms/arm.mk
+endif
+
+# Include all needed checks
+-include $(CFG_DIR)/checks/check_features.mk
+
+# Fix path for object files
+OBJ := $(addprefix $(BUILD_DIR)/, $(OBJ))
+
+# Targets
+all: $(BUILD_DIR)/toxic
+
+$(BUILD_DIR)/toxic: $(OBJ)
+	@echo "  LD    $(@:$(BUILD_DIR)/%=%)"
+	@$(CC) $(CFLAGS) -o $(BUILD_DIR)/toxic $(OBJ) $(LDFLAGS)
+
+$(BUILD_DIR)/%.o: $(SRC_DIR)/%.c
+	@if [ ! -e $(BUILD_DIR) ]; then \
+		mkdir -p $(BUILD_DIR) ;\
+	fi
+	@echo "  CC    $(@:$(BUILD_DIR)/%=%)"
+	@$(CC) $(CFLAGS) -o $(BUILD_DIR)/$*.o -c $(SRC_DIR)/$*.c
+	@$(CC) -MM $(CFLAGS) $(SRC_DIR)/$*.c > $(BUILD_DIR)/$*.d
+
+clean:
+	rm -f $(BUILD_DIR)/*.d $(BUILD_DIR)/*.o $(BUILD_DIR)/toxic
+
+-include $(BUILD_DIR)/$(OBJ:.o=.d)
+
+-include $(CFG_DIR)/targets/*.mk
+
+.PHONY: clean all

README.md

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

build/Makefile

@@ -1,67 +0,0 @@
-BASE_DIR = $(shell cd .. && pwd -P)
-CFG_DIR = $(BASE_DIR)/cfg
-
--include $(CFG_DIR)/global_vars.mk
-
-LIBS = libtoxcore ncursesw libconfig
-
-CFLAGS = -std=gnu99 -pthread -Wall -g
-CFLAGS += '-DTOXICVER="$(VERSION)"' -DHAVE_WIDECHAR -D_XOPEN_SOURCE_EXTENDED -D_FILE_OFFSET_BITS=64
-CFLAGS += '-DPACKAGE_DATADIR="$(abspath $(DATADIR))"'
-CFLAGS += $(USER_CFLAGS)
-LDFLAGS = $(USER_LDFLAGS)
-
-OBJ = chat.o chat_commands.o configdir.o dns.o execute.o file_senders.o notify.o
-OBJ += friendlist.o global_commands.o groupchat.o line_info.o input.o help.o autocomplete.o
-OBJ += log.o misc_tools.o prompt.o settings.o toxic.o toxic_strings.o windows.o message_queue.o
-
-# Check on wich system we are running
-UNAME_S = $(shell uname -s)
-ifeq ($(UNAME_S), Linux)
-	-include $(CFG_DIR)/systems/Linux.mk
-endif
-ifeq ($(UNAME_S), FreeBSD)
-	-include $(CFG_DIR)/systems/FreeBSD.mk
-endif
-ifeq ($(UNAME_S), Darwin)
-	-include $(CFG_DIR)/systems/Darwin.mk
-endif
-ifeq ($(UNAME_S), Solaris)
-	-include $(CFG_DIR)/systems/Solaris.mk
-endif
-
-# Check on which platform we are running
-UNAME_M = $(shell uname -m)
-ifeq ($(UNAME_M), x86_64)
-	-include $(CFG_DIR)/platforms/x86_64.mk
-endif
-ifneq ($(filter %86, $(UNAME_M)),)
-	-include $(CFG_DIR)/platforms/x86.mk
-endif
-ifneq ($(filter arm%, $(UNAME_M)),)
-	-include $(CFG_DIR)/platforms/arm.mk
-endif
-
-# Include all needed checks
--include $(CFG_DIR)/checks/check_features.mk
-
-# Targets
-all: toxic doc
-
-toxic: $(OBJ)
-	@echo "  LD    $@"
-	@$(CC) $(CFLAGS) -o toxic $(OBJ) $(LDFLAGS)
-
-%.o: $(SRC_DIR)/%.c
-	@echo "  CC    $@"
-	@$(CC) $(CFLAGS) -o $*.o -c $(SRC_DIR)/$*.c
-	@$(CC) -MM $(CFLAGS) $(SRC_DIR)/$*.c > $*.d
-
-clean:
-	rm -f *.d *.o toxic
-
--include $(OBJ:.o=.d)
-
--include $(CFG_DIR)/targets/*.mk
-
-.PHONY: clean all

cfg/checks/av.mk

@@ -8,16 +8,14 @@ else
 endif
 
 # Check if we can build audio support
-CHECK_AUDIO_LIBS = $(shell pkg-config --exists $(AUDIO_LIBS) || echo -n "error")
+CHECK_AUDIO_LIBS = $(shell $(PKG_CONFIG) --exists $(AUDIO_LIBS) || echo -n "error")
 ifneq ($(CHECK_AUDIO_LIBS), error)
     LIBS += $(AUDIO_LIBS)
     CFLAGS += $(AUDIO_CFLAGS)
     OBJ += $(AUDIO_OBJ)
-else
-ifneq ($(MAKECMDGOALS), clean)
-MISSING_AUDIO_LIBS = $(shell for lib in $(AUDIO_LIBS) ; do if ! pkg-config --exists $$lib ; then echo $$lib ; fi ; done)
-$(warning WARNING -- Toxic will be compiled without audio support)
-$(warning WARNING -- You need these libraries for audio support)
-$(warning WARNING -- $(MISSING_AUDIO_LIBS))
-endif
+else ifneq ($(MAKECMDGOALS), clean)
+    MISSING_AUDIO_LIBS = $(shell for lib in $(AUDIO_LIBS) ; do if ! $(PKG_CONFIG) --exists $$lib ; then echo $$lib ; fi ; done)
+    $(warning WARNING -- Toxic will be compiled without audio support)
+    $(warning WARNING -- You need these libraries for audio support)
+    $(warning WARNING -- $(MISSING_AUDIO_LIBS))
 endif

cfg/checks/check_features.mk

@@ -25,16 +25,14 @@ ifneq ($(DESK_NOTIFY), disabled)
 endif
 
 # Check if we can build Toxic
-CHECK_LIBS = $(shell pkg-config --exists $(LIBS) || echo -n "error")
+CHECK_LIBS = $(shell $(PKG_CONFIG) --exists $(LIBS) || echo -n "error")
 ifneq ($(CHECK_LIBS), error)
-	CFLAGS += $(shell pkg-config --cflags $(LIBS))
-	LDFLAGS += $(shell pkg-config --libs $(LIBS))
-else
-ifneq ($(MAKECMDGOALS), clean)
-MISSING_LIBS = $(shell for lib in $(LIBS) ; do if ! pkg-config --exists $$lib ; then echo $$lib ; fi ; done)
-$(warning ERROR -- Cannot compile Toxic)
-$(warning ERROR -- You need these libraries)
-$(warning ERROR -- $(MISSING_LIBS))
-$(error ERROR)
-endif
+    CFLAGS += $(shell $(PKG_CONFIG) --cflags $(LIBS))
+    LDFLAGS += $(shell $(PKG_CONFIG) --libs $(LIBS))
+else ifneq ($(MAKECMDGOALS), clean)
+    MISSING_LIBS = $(shell for lib in $(LIBS) ; do if ! $(PKG_CONFIG) --exists $$lib ; then echo $$lib ; fi ; done)
+    $(warning ERROR -- Cannot compile Toxic)
+    $(warning ERROR -- You need these libraries)
+    $(warning ERROR -- $(MISSING_LIBS))
+    $(error ERROR)
 endif

cfg/checks/desktop_notifications.mk

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

cfg/checks/sound_notifications.mk

@@ -8,16 +8,14 @@ else
 endif
 
 # Check if we can build sound notifications support
-CHECK_SND_NOTIFY_LIBS = $(shell pkg-config --exists $(SND_NOTIFY_LIBS) || echo -n "error")
+CHECK_SND_NOTIFY_LIBS = $(shell $(PKG_CONFIG) --exists $(SND_NOTIFY_LIBS) || echo -n "error")
 ifneq ($(CHECK_SND_NOTIFY_LIBS), error)
     LIBS += $(SND_NOTIFY_LIBS)
     CFLAGS += $(SND_NOTIFY_CFLAGS)
     OBJ += $(SND_NOTIFY_OBJ)
-else
-ifneq ($(MAKECMDGOALS), clean)
-MISSING_SND_NOTIFY_LIBS = $(shell for lib in $(SND_NOTIFY_LIBS) ; do if ! pkg-config --exists $$lib ; then echo $$lib ; fi ; done)
-$(warning WARNING -- Toxic will be compiled without sound notifications support)
-$(warning WARNING -- You need these libraries for sound notifications support)
-$(warning WARNING -- $(MISSING_SND_NOTIFY_LIBS))
-endif
+else ifneq ($(MAKECMDGOALS), clean)
+    MISSING_SND_NOTIFY_LIBS = $(shell for lib in $(SND_NOTIFY_LIBS) ; do if ! $(PKG_CONFIG) --exists $$lib ; then echo $$lib ; fi ; done)
+    $(warning WARNING -- Toxic will be compiled without sound notifications support)
+    $(warning WARNING -- You need these libraries for sound notifications support)
+    $(warning WARNING -- $(MISSING_SND_NOTIFY_LIBS))
 endif

cfg/checks/x11.mk

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

cfg/global_vars.mk

@@ -1,9 +1,14 @@
 # Version
-TOXIC_VERSION = 0.5.2
-REV = $(shell git rev-list HEAD --count)
-VERSION = $(TOXIC_VERSION)_r$(REV)
+TOXIC_VERSION = 0.6.0
+REV = $(shell git rev-list HEAD --count 2>/dev/null || echo -n "error")
+ifneq (, $(findstring error, $(REV)))
+    VERSION = $(TOXIC_VERSION)
+else
+    VERSION = $(TOXIC_VERSION)_r$(REV)
+endif
 
 # Project directories
+BUILD_DIR = $(BASE_DIR)/build
 DOC_DIR = $(BASE_DIR)/doc
 SRC_DIR = $(BASE_DIR)/src
 SND_DIR = $(BASE_DIR)/sounds
@@ -12,12 +17,17 @@ MISC_DIR = $(BASE_DIR)/misc
 # Project files
 MANFILES = toxic.1 toxic.conf.5
 DATAFILES = DHTnodes DNSservers toxic.conf.example
-SNDFILES = ContactLogsIn.wav ContactLogsOut.wav Error.wav IncomingCall.wav
-SNDFILES += LogIn.wav LogOut.wav NewMessage.wav OutgoingCall.wav
-SNDFILES += TransferComplete.wav TransferPending.wav
+DESKFILE = toxic.desktop
+SNDFILES = ToxicContactOnline.wav ToxicContactOffline.wav ToxicError.wav
+SNDFILES += ToxicRecvMessage.wav ToxicOutgoingCall.wav ToxicIncomingCall.wav
+SNDFILES += ToxicTransferComplete.wav ToxicTransferStart.wav
 
 # Install directories
 PREFIX = /usr/local
 BINDIR = $(PREFIX)/bin
 DATADIR = $(PREFIX)/share/toxic
 MANDIR = $(PREFIX)/share/man
+APPDIR = $(PREFIX)/share/applications
+
+# Platform tools
+PKG_CONFIG = pkg-config

cfg/systems/Darwin.mk

@@ -0,0 +1,10 @@
+# Special options for OS X
+# This assumes the use of Homebrew. Change the paths if using MacPorts or Fink.
+
+PKG_CONFIG_PATH = $(shell export PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/local/opt/libconfig/lib/pkgconfig:/usr/local/lib/pkgconfig:/opt/X11/lib/pkgconfig)
+
+LIBS := $(filter-out ncursesw, $(LIBS))
+
+# OS X ships a usable, recent version of ncurses, but calls it ncurses not ncursesw.
+LDFLAGS += -lncurses -lalut -ltoxav -ltoxcore -ltoxdns -lresolv -lconfig -ltoxencryptsave -g
+CFLAGS += -I/usr/local/opt/freealut/include/AL -I/usr/local/opt/glib/include/glib-2.0 -g

cfg/systems/Linux.mk

@@ -1,4 +1,4 @@
 # Specials options for linux systems
 CFLAGS +=
-LDFLAGS += -ldl -lresolv
+LDFLAGS += -ldl -lresolv -lrt
 MANDIR = $(PREFIX)/share/man

cfg/targets/help.mk

@@ -5,6 +5,7 @@ help:
 	@echo "  toxic:     Build toxic"
 	@echo "  doc:       Build documentation"
 	@echo "  install:   Build toxic and install it in PREFIX (default PREFIX is \"$(abspath $(PREFIX))\")"
+	@echo "  uninstall: Remove toxic from PREFIX (default PREFIX is \"$(abspath $(PREFIX))\")"
 	@echo "  clean:     Remove built files"
 	@echo "  help:      This help"
 	@echo

cfg/targets/install.mk

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

cfg/targets/uninstall.mk

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

doc/toxic.1

@@ -2,12 +2,12 @@
 .\"     Title: toxic
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2014-09-19
+.\"      Date: 2015-03-28
 .\"    Manual: Toxic Manual
 .\"    Source: toxic __VERSION__
 .\"  Language: English
 .\"
-.TH "TOXIC" "1" "2014\-09\-19" "toxic __VERSION__" "Toxic Manual"
+.TH "TOXIC" "1" "2015\-03\-28" "toxic __VERSION__" "Toxic Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -91,9 +91,14 @@ for DHT bootstrap nodes, instead of
 Do not connect to the DHT network
 .RE
 .PP
-\-p, \-\-proxy
+\-p, \-\-SOCKS5\-proxy
 .RS 4
-Use proxy: Requires [IP] [port]
+Use a SOCKS5 proxy: Requires [IP] [port]
+.RE
+.PP
+\-P, \-\-HTTP\-proxy
+.RS 4
+Use a HTTP proxy: Requires [IP] [port]
 .RE
 .PP
 \-r, \-\-dnslist
@@ -106,15 +111,15 @@ Use specified DNSservers file
 Force TCP connection (use this with proxies)
 .RE
 .PP
+\-T, \-\-tcp\-relay
+.RS 4
+Act as a TCP relay server for the network (Note: this uses significantly more bandwidth)
+.RE
+.PP
 \-u, \-\-unencrypt\-data
 .RS 4
 Unencrypt a data file\&. A warning will appear if this option is used with a data file that is already unencrypted\&.
 .RE
-.PP
-\-x, \-\-nodata
-.RS 4
-Ignore data file
-.RE
 .SH "FILES"
 .PP
 __DATADIR__/DHTnodes

doc/toxic.1.asc

@@ -47,8 +47,11 @@ OPTIONS
 -o, --noconnect::
     Do not connect to the DHT network
 
--p, --proxy::
-    Use proxy: Requires [IP] [port]
+-p, --SOCKS5-proxy::
+    Use a SOCKS5 proxy: Requires [IP] [port]
+
+-P, --HTTP-proxy::
+    Use a HTTP proxy: Requires [IP] [port]
 
 -r, --dnslist::
     Use specified DNSservers file
@@ -56,13 +59,13 @@ OPTIONS
 -t, --force-tcp::
     Force TCP connection (use this with proxies)
 
+-T, --tcp-relay::
+    Act as a TCP relay server for the network (Note: this uses significantly more bandwidth)
+
 -u, --unencrypt-data::
     Unencrypt a data file. A warning will appear if this option is used
     with a data file that is already unencrypted.
 
--x, --nodata::
-    Ignore data file
-
 FILES
 -----
 {datadir}/DHTnodes::

doc/toxic.conf.5

@@ -2,12 +2,12 @@
 .\"     Title: toxic.conf
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2014-09-19
+.\"      Date: 2015-03-28
 .\"    Manual: Toxic Manual
 .\"    Source: toxic __VERSION__
 .\"  Language: English
 .\"
-.TH "TOXIC\&.CONF" "5" "2014\-09\-19" "toxic __VERSION__" "Toxic Manual"
+.TH "TOXIC\&.CONF" "5" "2015\-03\-28" "toxic __VERSION__" "Toxic Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -66,6 +66,23 @@ Configuration related to interface elements\&.
 Enable or disable timestamps\&. true or false
 .RE
 .PP
+\fBtime_format\fR
+.RS 4
+Select between 24 and 12 hour time\&. Specify 24 or 12\&. Setting timestamp_format and log_timestamp_format will override this setting\&.
+.RE
+.PP
+\fBtimestamp_format\fR
+.RS 4
+Time format string for the interface enclosed by double quotes\&. See
+\fBdate\fR(1)
+.RE
+.PP
+\fBlog_timestamp_format\fR
+.RS 4
+Time format string for logging enclosed by double quotes\&. See
+\fBdate\fR(1)
+.RE
+.PP
 \fBalerts\fR
 .RS 4
 Enable or disable terminal alerts on events\&. true or false
@@ -81,11 +98,6 @@ Select between native terminal colors and toxic color theme\&. true or false
 Enable or disable autologging\&. true or false
 .RE
 .PP
-\fBtime_format\fR
-.RS 4
-Select between 24 and 12 hour time\&. Specify 24 or 12
-.RE
-.PP
 \fBshow_typing_other\fR
 .RS 4
 Show when others are typing in a 1\-on\-1 chat\&. true or false
@@ -105,6 +117,36 @@ Show welcome message on startup\&. true or false
 .RS 4
 Maximum lines for chat window history\&. Integer value\&. (for example: 700)
 .RE
+.PP
+\fBline_join\fR
+.RS 4
+Indicator for when someone connects or joins a group\&. Three characters max for line_ settings\&.
+.RE
+.PP
+\fBline_quit\fR
+.RS 4
+Indicator for when someone disconnects or leaves a group\&.
+.RE
+.PP
+\fBline_alert\fR
+.RS 4
+Indicator for alert messages\&.
+.RE
+.PP
+\fBline_normal\fR
+.RS 4
+Indicator for normal messages\&.
+.RE
+.PP
+\fBmplex_away\fR
+.RS 4
+Set user status when attaching and detaching from GNU screen or tmux\&. true or false
+.RE
+.PP
+\fBmplex_away_note\fR
+.RS 4
+Status message to set when status is set to away due to screen/tmux detach\&. When attaching, the status message is set back to the original value\&.
+.RE
 .RE
 .PP
 \fBaudio\fR
@@ -155,7 +197,7 @@ Configuration related to notification sounds\&. Special value "silent" can be us
 
 Each value is a string which corresponds to the absolute path of a wav sound file\&.
 .PP
-\fBerror\fR
+\fBnotif_error\fR
 .RS 4
 Sound to play when an error occurs\&.
 .RE
@@ -256,6 +298,11 @@ Key combination to scroll contacts list up\&.
 .RS 4
 Key combination to scroll contacts list down\&.
 .RE
+.PP
+\fBtoggle_peerlist\fR
+.RS 4
+Toggle the peer list on and off\&.
+.RE
 .RE
 .SH "FILES"
 .PP

doc/toxic.conf.5.asc

@@ -42,6 +42,18 @@ OPTIONS
     *timestamps*;;
         Enable or disable timestamps. true or false
 
+    *time_format*;;
+	Select between 24 and 12 hour time. Specify 24 or 12. Setting
+        timestamp_format and log_timestamp_format will override this setting.
+
+    *timestamp_format*;;
+        Time format string for the interface enclosed by double quotes.
+        See *date*(1)
+
+    *log_timestamp_format*;;
+        Time format string for logging enclosed by double quotes.
+        See *date*(1)
+
     *alerts*;;
         Enable or disable terminal alerts on events. true or false
 
@@ -51,9 +63,6 @@ OPTIONS
     *autolog*;;
         Enable or disable autologging. true or false
 
-    *time_format*;;
-        Select between 24 and 12 hour time. Specify 24 or 12
-
     *show_typing_other*;;
         Show when others are typing in a 1-on-1 chat. true or false
 
@@ -66,6 +75,27 @@ OPTIONS
     *history_size*;;
         Maximum lines for chat window history. Integer value. (for example: 700)
 
+    *line_join*;;
+        Indicator for when someone connects or joins a group.
+        Three characters max for line_ settings.
+
+    *line_quit*;;
+        Indicator for when someone disconnects or leaves a group.
+
+    *line_alert*;;
+        Indicator for alert messages.
+
+    *line_normal*;;
+        Indicator for normal messages.
+
+    *mplex_away*;;
+        Set user status when attaching and detaching from GNU screen or tmux.
+        true or false
+
+    *mplex_away_note*;;
+        Status message to set when status is set to away due to screen/tmux
+        detach. When attaching, the status message is set back to the original
+        value.
 
 *audio*::
     Configuration related to audio devices.
@@ -99,7 +129,7 @@ OPTIONS
     Each value is a string which corresponds to the absolute path of a wav
     sound file.
 
-    *error*;;
+    *notif_error*;;
         Sound to play when an error occurs.
 
     *self_log_in*;;
@@ -161,6 +191,9 @@ OPTIONS
     *peer_list_down*;;
         Key combination to scroll contacts list down.
 
+    *toggle_peerlist*;;
+        Toggle the peer list on and off.
+
 
 FILES
 -----

misc/DHTnodes

@@ -1,11 +1,25 @@
-192.254.75.98 33445 951C88B7E75C867418ACDB5D273821372BB5BD652740BCDF623A4FA293E75D2F
-37.187.46.132 33445 A9D98212B3F972BD11DA52BEB0658C326FCCC1BFD49F347F9C2D3D8B61E1B927
+192.254.75.102 33445 951C88B7E75C867418ACDB5D273821372BB5BD652740BCDF623A4FA293E75D2F
 144.76.60.215 33445 04119E835DF3E78BACF0F84235B300546AF8B936F035185E2A8E9E0A67C8924F
 23.226.230.47 33445 A09162D68618E742FFBCA1C2C70385E6679604B2D80EA6E84AD0996A1AC8A074
-54.199.139.199 33445 7F9C31FE850E97CEFD4C4591DF93FC757C7C12549DDD55F8EEAECC34FE76C029
-192.210.149.121 33445 F404ABAA1C99A9D37D61AB54898F56793E1DEF8BD46B1038B9D822E8460FAB67
-37.59.102.176 33445 B98A2CEAA6C6A2FADC2C3632D284318B60FE5375CCB41EFA081AB67F500C1B0B
+178.62.125.224 33445 10B20C49ACBD968D7C80F2E8438F92EA51F189F4E70CFBBB2C2C8C799E97F03E
 178.21.112.187 33445 4B2C19E924972CB9B57732FB172F8A8604DE13EEDA2A6234E348983344B23057
-107.161.17.51 33445 7BE3951B97CA4B9ECDDA768E8C52BA19E9E2690AB584787BF4C90E04DBB75111
-31.7.57.236 443 2A4B50D1D525DA2E669592A20C327B5FAD6C7E5962DC69296F9FEC77C4436E4E
-63.165.243.15 443 8CD087E31C67568103E8C2A28653337E90E6B8EDA0D765D57C6B5172B4F1F04C
+195.154.119.113 33445 E398A69646B8CEACA9F0B84F553726C1C49270558C57DF5F3C368F05A7D71354
+192.210.149.121 33445 F404ABAA1C99A9D37D61AB54898F56793E1DEF8BD46B1038B9D822E8460FAB67
+76.191.23.96 33445 93574A3FAB7D612FEA29FD8D67D3DD10DFD07A075A5D62E8AF3DD9F5D0932E11
+46.38.239.179 33445 F5A1A38EFB6BD3C2C8AF8B10D85F0F89E931704D349F1D0720C3C4059AF2440A
+178.62.250.138 33445 788236D34978D1D5BD822F0A5BEBD2C53C64CC31CD3149350EE27D4D9A2F9B6B
+78.225.128.39 33445 7A2306BFBA665E5480AE59B31E116BE9C04DCEFE04D9FE25082316FA34B4DA0C
+130.133.110.14 33445 461FA3776EF0FA655F1A05477DF1B3B614F7D6B124F7DB1DD4FE3C08B03B640F
+104.167.101.29 33445 5918AC3C06955962A75AD7DF4F80A5D7C34F7DB9E1498D2E0495DE35B3FE8A57
+195.154.109.148 33445 391C96CB67AE893D4782B8E4495EB9D89CF1031F48460C06075AA8CE76D50A21
+192.3.173.88 33445 3E1FFDEB667BFF549F619EC6737834762124F50A89C8D0DBF1DDF64A2DD6CD1B
+205.185.116.116 33445 A179B09749AC826FF01F37A9613F6B57118AE014D4196A0E1105A98F93A54702
+198.98.51.198 33445 1D5A5F2F5D6233058BF0259B09622FB40B482E4FA0931EB8FD3AB8E7BF7DAF6F
+80.232.246.79 33445 A7A060D553B017D9D8F038E265C7AFB6C70BAAC55070197F9C007432D0038E0F
+108.61.165.198 33445 8E7D0B859922EF569298B4D261A8CCB5FEA14FB91ED412A7603A585A25698832
+212.71.252.109 33445 C4CEB8C7AC607C6B374E2E782B3C00EA3A63B80D4910B8649CCACDD19F260819
+194.249.212.109 33445 3CEE1F054081E7A011234883BC4FC39F661A55B73637A5AC293DDF1251D9432B
+194.249.212.109 443 3CEE1F054081E7A011234883BC4FC39F661A55B73637A5AC293DDF1251D9432B
+103.38.216.87 33445 601AEE6FC8C17E8CD8F8F1FFC4D4AD84E59A73BE451F037194E7A404E3795320
+185.25.116.107 33445 DA4E4ED4B697F2E9B000EEFE3A34B554ACD3F45F5C96EAEA2516DD7FF9AF7B43
+192.99.168.140 33445 6A4D0607A296838434A6A7DDF99F50EF9D60A2C510BBF31FE538A25CB6B4652F

misc/toxic.conf.example

@@ -17,6 +17,9 @@ ui = {
   // 24 or 12 hour time
   time_format=24;
 
+  // timestamp format string according to date/strftime format. Overrides time_format setting
+  timestamp_format="%H:%M:%S";
+
   // true to show you when others are typing a message in 1-on-1 chats
   show_typing_other=true;
 
@@ -28,6 +31,24 @@ ui = {
 
   // maximum lines for chat window history
   history_size=700;
+
+  // Indicator for display when someone connects or joins a group.
+  line_join="-->";
+
+  // Indicator for display when someone disconnects or leaves a group.
+  line_quit="<--";
+
+  // Indicator for alert messages.
+  line_alert="-!-";
+
+  // Indicator for normal messages.
+  line_normal="---";
+
+  // true to change status based on screen/tmux attach/detach, false to disable
+  mplex_away=true;
+
+  // Status message to use when status set to away due to screen/tmux detach
+  mplex_away_note="Away from keyboard, be back soon!"
 };
 
 audio = {
@@ -54,16 +75,14 @@ tox = {
 
 // To disable a sound set the path to "silent"
 sounds = {
-  error="__DATADIR__/sounds/Error.wav";
-  self_log_in="__DATADIR__/sounds/LogIn.wav";
-  self_log_out="__DATADIR__/sounds/LogOut.wav";
-  user_log_in="__DATADIR__/sounds/ContactLogsIn.wav";
-  user_log_out="__DATADIR__/sounds/ContactLogsOut.wav";
-  call_incoming="__DATADIR__/sounds/IncomingCall.wav";
-  call_outgoing="__DATADIR__/sounds/OutgoingCall.wav";
-  generic_message="__DATADIR__/sounds/NewMessage.wav";
-  transfer_pending="__DATADIR__/sounds/TransferPending.wav";
-  transfer_completed="__DATADIR__/sounds/TransferComplete.wav";
+  error="__DATADIR__/sounds/ToxicError.wav";
+  user_log_in="__DATADIR__/sounds/ToxicContactOnline.wav";
+  user_log_out="__DATADIR__/sounds/ToxicContactOffline.wav";
+  call_incoming="__DATADIR__/sounds/ToxicIncomingCall.wav";
+  call_outgoing="__DATADIR__/sounds/ToxicOutgoingCall.wav";
+  generic_message="__DATADIR__/sounds/ToxicRecvMessage.wav";
+  transfer_pending="__DATADIR__/sounds/ToxicTransferStart.wav";
+  transfer_completed="__DATADIR__/sounds/ToxicTransferComplete.wav";
 };
 
 // Currently supported: Ctrl modified keys, Tab, PAGEUP and PAGEDOWN (case insensitive)
@@ -78,5 +97,6 @@ keys = {
   page_bottom="Ctrl+H";
   peer_list_up="Ctrl+[";
   peer_list_down="Ctrl+]";
+  toggle_peerlist="Ctrl+b";
 };
 

misc/toxic.desktop

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

sounds/license

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

src/audio_call.c

@@ -55,14 +55,6 @@
 
 #define frame_size (av_DefaultSettings.audio_sample_rate * av_DefaultSettings.audio_frame_duration / 1000)
 
-typedef struct Call {
-    pthread_t ttid; /* Transmission thread id */
-    bool ttas, has_output; /* Transmission thread active status (0 - stopped, 1- running) */
-    uint32_t in_idx, out_idx;
-    pthread_mutex_t mutex;
-} Call;
-
-
 static int set_call(Call* call, bool start)
 {
     call->in_idx = -1;
@@ -105,8 +97,7 @@ void callback_requ_timeout  ( void* av, int32_t call_index, void *arg );
 void callback_peer_timeout  ( void* av, int32_t call_index, void *arg );
 void callback_media_change  ( void* av, int32_t call_index, void *arg );
 
-int stop_transmission(int call_index);
-void write_device_callback(ToxAv* av, int32_t call_index, int16_t* data, int size, void* userdata);
+void write_device_callback( void* agent, int32_t call_index, const int16_t* PCM, uint16_t size, void* arg );
 
 static void print_err (ToxWindow *self, const char *error_str)
 {
@@ -120,7 +111,7 @@ ToxAv *init_audio(ToxWindow *self, Tox *tox)
 
     ASettins.errors = ae_None;
 
-    memset(ASettins.calls, 0, sizeof(Call) * 10);
+    memset(ASettins.calls, 0, sizeof(ASettins.calls));
 
 
     /* Streaming stuff from core */
@@ -145,14 +136,14 @@ ToxAv *init_audio(ToxWindow *self, Tox *tox)
     toxav_register_callstate_callback(ASettins.av, callback_recv_invite, av_OnInvite, self);
 
     toxav_register_callstate_callback(ASettins.av, callback_recv_ringing, av_OnRinging, self);
-    toxav_register_callstate_callback(ASettins.av, callback_recv_starting, av_OnStarting, self);
-    toxav_register_callstate_callback(ASettins.av, callback_recv_ending, av_OnEnding, self);
+    toxav_register_callstate_callback(ASettins.av, callback_recv_starting, av_OnStart, self);
+    toxav_register_callstate_callback(ASettins.av, callback_recv_ending, av_OnEnd, self);
 
     toxav_register_callstate_callback(ASettins.av, callback_requ_timeout, av_OnRequestTimeout, self);
     toxav_register_callstate_callback(ASettins.av, callback_peer_timeout, av_OnPeerTimeout, self);
-    toxav_register_callstate_callback(ASettins.av, callback_media_change, av_OnMediaChange, self);
+    //toxav_register_callstate_callback(ASettins.av, callback_media_change, av_OnMediaChange, self);
 
-    toxav_register_audio_recv_callback(ASettins.av, write_device_callback, NULL);
+    toxav_register_audio_callback(ASettins.av, write_device_callback, NULL);
 
     return ASettins.av;
 }
@@ -160,8 +151,8 @@ ToxAv *init_audio(ToxWindow *self, Tox *tox)
 void terminate_audio()
 {
     int i;
-    for (i = 0; i < MAX_CALLS; i ++)
-        stop_transmission(i);
+    for (i = 0; i < MAX_CALLS; ++i)
+        stop_transmission(&ASettins.calls[i], i);
 
     if ( ASettins.av )
         toxav_kill(ASettins.av);
@@ -180,67 +171,72 @@ void read_device_callback (const int16_t* captured, uint32_t size, void* data)
     }
 }
 
-
-void write_device_callback(ToxAv* av, int32_t call_index, int16_t* data, int size, void* userdata)
+void write_device_callback(void *agent, int32_t call_index, const int16_t* PCM, uint16_t size, void* arg)
 {
-    (void)userdata;
+    (void)arg;
+    (void)agent;
+
     if (call_index >= 0 && ASettins.calls[call_index].ttas) {
         ToxAvCSettings csettings = ASettins.cs;
-        toxav_get_peer_csettings(av, call_index, 0, &csettings);
-        write_out(ASettins.calls[call_index].out_idx, data, size, csettings.audio_channels);
+        toxav_get_peer_csettings(ASettins.av, call_index, 0, &csettings);
+        write_out(ASettins.calls[call_index].out_idx, PCM, size, csettings.audio_channels);
     }
 }
 
-int start_transmission(ToxWindow *self)
+int start_transmission(ToxWindow *self, Call *call)
 {
-    if ( !ASettins.av || self->call_idx == -1 ) return -1;
-    
-    /* Don't provide support for video */
-    if ( 0 != toxav_prepare_transmission(ASettins.av, self->call_idx, av_jbufdc * 2, av_VADd, 0) ) {
+    if ( !self || !ASettins.av || self->call_idx == -1 ) {
         line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Could not prepare transmission");
+        return -1;
     }
 
-    if ( !toxav_capability_supported(ASettins.av, self->call_idx, AudioDecoding) ||
-         !toxav_capability_supported(ASettins.av, self->call_idx, AudioEncoding) )
+    /* Don't provide support for video */
+    if ( 0 != toxav_prepare_transmission(ASettins.av, self->call_idx, 0) ) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Could not prepare transmission");
+        return -1;
+    }
+
+    if ( !toxav_capability_supported(ASettins.av, self->call_idx, av_AudioDecoding) ||
+         !toxav_capability_supported(ASettins.av, self->call_idx, av_AudioEncoding) )
         return -1;
 
-    if (set_call(&ASettins.calls[self->call_idx], true) == -1)
+    if (set_call(call, true) == -1)
         return -1;
 
     ToxAvCSettings csettings;
     toxav_get_peer_csettings(ASettins.av, self->call_idx, 0, &csettings);
 
-    if ( open_primary_device(input, &ASettins.calls[self->call_idx].in_idx,
+    if ( open_primary_device(input, &call->in_idx,
             csettings.audio_sample_rate, csettings.audio_frame_duration, csettings.audio_channels) != de_None )
         line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to open input device!");
 
-    if ( register_device_callback(self->call_idx, ASettins.calls[self->call_idx].in_idx, 
+    if ( register_device_callback(self->call_idx, call->in_idx,
          read_device_callback, &self->call_idx, true) != de_None)
         /* Set VAD as true for all; TODO: Make it more dynamic */
         line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to register input handler!");
 
-    if ( open_primary_device(output, &ASettins.calls[self->call_idx].out_idx, 
+    if ( open_primary_device(output, &call->out_idx,
             csettings.audio_sample_rate, csettings.audio_frame_duration, csettings.audio_channels) != de_None ) {
         line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to open output device!");
-        ASettins.calls[self->call_idx].has_output = 0;
+        call->has_output = 0;
     }
 
     return 0;
 }
 
-int stop_transmission(int call_index)
+int stop_transmission(Call *call, int32_t call_index)
 {
-    if ( ASettins.calls[call_index].ttas ) {
+    if ( call->ttas ) {
         toxav_kill_transmission(ASettins.av, call_index);
-        ASettins.calls[call_index].ttas = false;
+        call->ttas = false;
 
-        if ( ASettins.calls[call_index].in_idx != -1 )
-            close_device(input, ASettins.calls[call_index].in_idx);
+        if ( call->in_idx != -1 )
+            close_device(input, call->in_idx);
 
-        if ( ASettins.calls[call_index].out_idx != -1 )
-            close_device(output, ASettins.calls[call_index].out_idx);
+        if ( call->out_idx != -1 )
+            close_device(output, call->out_idx);
 
-        if (set_call(&ASettins.calls[call_index], false) == -1)
+        if (set_call(call, false) == -1)
             return -1;
 
         return 0;
@@ -278,7 +274,7 @@ void callback_recv_starting ( void* av, int32_t call_index, void* arg )
     for (i = 0; i < MAX_WINDOWS_NUM; ++i)
         if (windows[i].onStarting != NULL && windows[i].call_idx == call_index) {
             windows[i].onStarting(&windows[i], ASettins.av, call_index);
-            if ( 0 != start_transmission(&windows[i]) ) {/* YEAH! */
+            if ( 0 != start_transmission(&windows[i], &ASettins.calls[call_index])) {/* YEAH! */
                 line_info_add(&windows[i], NULL, NULL, NULL, SYS_MSG, 0, 0 , "Error starting transmission!");
             }
             return;
@@ -287,7 +283,7 @@ void callback_recv_starting ( void* av, int32_t call_index, void* arg )
 void callback_recv_ending ( void* av, int32_t call_index, void* arg )
 {
     CB_BODY(call_index, arg, onEnding);
-    stop_transmission(call_index);
+    stop_transmission(&ASettins.calls[call_index], call_index);
 }
 
 void callback_call_started ( void* av, int32_t call_index, void* arg )
@@ -297,7 +293,7 @@ void callback_call_started ( void* av, int32_t call_index, void* arg )
     for (i = 0; i < MAX_WINDOWS_NUM; ++i)
         if (windows[i].onStart != NULL && windows[i].call_idx == call_index) {
             windows[i].onStart(&windows[i], ASettins.av, call_index);
-            if ( 0 != start_transmission(&windows[i]) ) {/* YEAH! */
+            if ( 0 != start_transmission(&windows[i], &ASettins.calls[call_index]) ) {/* YEAH! */
                 line_info_add(&windows[i], NULL, NULL, NULL, SYS_MSG, 0, 0, "Error starting transmission!");
                 return;
             }
@@ -308,7 +304,7 @@ void callback_call_canceled ( void* av, int32_t call_index, void* arg )
     CB_BODY(call_index, arg, onCancel);
 
     /* In case call is active */
-    stop_transmission(call_index);
+    stop_transmission(&ASettins.calls[call_index], call_index);
 }
 void callback_call_rejected ( void* av, int32_t call_index, void* arg )
 {
@@ -317,7 +313,7 @@ void callback_call_rejected ( void* av, int32_t call_index, void* arg )
 void callback_call_ended ( void* av, int32_t call_index, void* arg )
 {
     CB_BODY(call_index, arg, onEnd);
-    stop_transmission(call_index);
+    stop_transmission(&ASettins.calls[call_index], call_index);
 }
 
 void callback_requ_timeout ( void* av, int32_t call_index, void* arg )
@@ -327,16 +323,18 @@ void callback_requ_timeout ( void* av, int32_t call_index, void* arg )
 void callback_peer_timeout ( void* av, int32_t call_index, void* arg )
 {
     CB_BODY(call_index, arg, onPeerTimeout);
-    stop_transmission(call_index);
+    stop_transmission(&ASettins.calls[call_index], call_index);
     /* Call is stopped manually since there might be some other
      * actions that one can possibly take on timeout
      */
     toxav_stop_call(ASettins.av, call_index);
 }
-void callback_media_change(void* av, int32_t call_index, void* arg)
-{
+
+// void callback_media_change(void* av, int32_t call_index, void* arg)
+// {
   /*... TODO cancel all media change requests */
-}
+// }
+
 /*
  * End of Callbacks
  */
@@ -359,15 +357,15 @@ void cmd_call(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MA
         goto on_error;
     }
 
-    if (!self->stb->is_online) {
+    if (!self->stb->connection) {
         error_str = "Friend is offline.";
         goto on_error;
     }
 
     ToxAvError error = toxav_call(ASettins.av, &self->call_idx, self->num, &ASettins.cs, 30);
 
-    if ( error != ErrorNone ) {
-        if ( error == ErrorAlreadyInCall ) error_str = "Already in a call!";
+    if ( error != av_ErrorNone ) {
+        if ( error == av_ErrorAlreadyInCallWithPeer ) error_str = "Already in a call!";
         else error_str = "Internal error!";
 
         goto on_error;
@@ -396,9 +394,9 @@ void cmd_answer(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[
 
     ToxAvError error = toxav_answer(ASettins.av, self->call_idx, &ASettins.cs);
 
-    if ( error != ErrorNone ) {
-        if ( error == ErrorInvalidState ) error_str = "Cannot answer in invalid state!";
-        else if ( error == ErrorNoCall ) error_str = "No incoming call!";
+    if ( error != av_ErrorNone ) {
+        if ( error == av_ErrorInvalidState ) error_str = "Cannot answer in invalid state!";
+        else if ( error == av_ErrorNoCall ) error_str = "No incoming call!";
         else error_str = "Internal error!";
 
         goto on_error;
@@ -427,9 +425,9 @@ void cmd_reject(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[
 
     ToxAvError error = toxav_reject(ASettins.av, self->call_idx, "Why not?");
 
-    if ( error != ErrorNone ) {
-        if ( error == ErrorInvalidState ) error_str = "Cannot reject in invalid state!";
-        else if ( error == ErrorNoCall ) error_str = "No incoming call!";
+    if ( error != av_ErrorNone ) {
+        if ( error == av_ErrorInvalidState ) error_str = "Cannot reject in invalid state!";
+        else if ( error == av_ErrorNoCall ) error_str = "No incoming call!";
         else error_str = "Internal error!";
 
         goto on_error;
@@ -469,9 +467,9 @@ void cmd_hangup(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[
         error = toxav_hangup(ASettins.av, self->call_idx);
     }
 
-    if ( error != ErrorNone ) {
-        if ( error == ErrorInvalidState ) error_str = "Cannot hangup in invalid state!";
-        else if ( error == ErrorNoCall ) error_str = "No call!";
+    if ( error != av_ErrorNone ) {
+        if ( error == av_ErrorInvalidState ) error_str = "Cannot hangup in invalid state!";
+        else if ( error == av_ErrorNoCall ) error_str = "No call!";
         else error_str = "Internal error!";
 
         goto on_error;
@@ -495,10 +493,10 @@ void cmd_list_devices(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*
 
     DeviceType type;
 
-    if ( strcmp(argv[1], "in") == 0 ) /* Input devices */
+    if ( strcasecmp(argv[1], "in") == 0 ) /* Input devices */
         type = input;
 
-    else if ( strcmp(argv[1], "out") == 0 ) /* Output devices */
+    else if ( strcasecmp(argv[1], "out") == 0 ) /* Output devices */
         type = output;
 
     else {
@@ -713,7 +711,7 @@ void stop_current_call(ToxWindow* self)
 {
     ToxAvCallState callstate;
     if ( ASettins.av != NULL && self->call_idx != -1 &&
-       ( callstate = toxav_get_call_state(ASettins.av, self->call_idx) ) != av_CallNonExistant) {
+       ( callstate = toxav_get_call_state(ASettins.av, self->call_idx) ) != av_CallNonExistent) {
         switch (callstate)
         {
         case av_CallActive:

src/audio_call.h

@@ -34,12 +34,18 @@ typedef enum _AudioError {
     ae_StartingCoreAudio = 1 << 2
 } AudioError;
 
-/* You will have to pass pointer to first member of 'windows'
- * declared in windows.c otherwise undefined behaviour will
- */
+typedef struct Call {
+    pthread_t ttid; /* Transmission thread id */
+    bool ttas, has_output; /* Transmission thread active status (0 - stopped, 1- running) */
+    uint32_t in_idx, out_idx;
+    pthread_mutex_t mutex;
+} Call;
+
+/* You will have to pass pointer to first member of 'windows' declared in windows.c */
 ToxAv *init_audio(ToxWindow *self, Tox *tox);
 void terminate_audio();
-
+int start_transmission(ToxWindow *self, Call *call);
+int stop_transmission(Call *call, int call_index);
 void stop_current_call(ToxWindow *self);
 
 #endif /* AUDIO_H */

src/autocomplete.c

@@ -93,7 +93,7 @@ int complete_line(ToxWindow *self, const void *list, int n_items, int size)
 {
     ChatContext *ctx = self->chatwin;
 
-    if (ctx->pos <= 0 || ctx->len <= 0 || ctx->len >= MAX_STR_SIZE || size > MAX_STR_SIZE)
+    if (ctx->pos <= 0 || ctx->len <= 0 || ctx->pos > ctx->len || ctx->len >= MAX_STR_SIZE || size > MAX_STR_SIZE)
         return -1;
 
     const char *L = (char *) list;
@@ -136,7 +136,7 @@ int complete_line(ToxWindow *self, const void *list, int n_items, int size)
         }
     }
 
-    if (string_is_empty(sub)) {
+    if (!sub[0]) {
         free(sub);
         return -1;
     }
@@ -185,7 +185,7 @@ int complete_line(ToxWindow *self, const void *list, int n_items, int size)
         return -1;
 
     char tmpend[MAX_STR_SIZE];
-    strcpy(tmpend, &ubuf[ctx->pos]);
+    snprintf(tmpend, sizeof(tmpend), "%s", &ubuf[ctx->pos]);
     strcpy(&ubuf[strt], match);
     strcpy(&ubuf[strt + m_len], endchrs);
     strcpy(&ubuf[strt + m_len + n_endchrs], tmpend);
@@ -193,7 +193,7 @@ int complete_line(ToxWindow *self, const void *list, int n_items, int size)
     /* convert to widechar and copy back to original buf */
     wchar_t newbuf[MAX_STR_SIZE];
 
-    if (mbs_to_wcs_buf(newbuf, ubuf, MAX_STR_SIZE) == -1)
+    if (mbs_to_wcs_buf(newbuf, ubuf, sizeof(newbuf) / sizeof(wchar_t)) == -1)
         return -1;
 
     wcscpy(ctx->line, newbuf);
@@ -209,7 +209,7 @@ static void complt_home_dir(ToxWindow *self, char *path, int pathsize, const cha
 {
     ChatContext *ctx = self->chatwin;
 
-    char homedir[MAX_STR_SIZE];
+    char homedir[MAX_STR_SIZE] = {0};
     get_home_dir(homedir, sizeof(homedir));
 
     char newline[MAX_STR_SIZE];
@@ -218,7 +218,7 @@ static void complt_home_dir(ToxWindow *self, char *path, int pathsize, const cha
 
     wchar_t wline[MAX_STR_SIZE];
 
-    if (mbs_to_wcs_buf(wline, newline, sizeof(wline)) == -1)
+    if (mbs_to_wcs_buf(wline, newline, sizeof(wline) / sizeof(wchar_t)) == -1)
         return;
 
     int newlen = wcslen(wline);
@@ -261,10 +261,10 @@ int dir_match(ToxWindow *self, Tox *m, const wchar_t *line, const wchar_t *cmd)
     } else if (!si && b_path[0] != '/') {    /* look for matches in pwd */
         char tmp[MAX_STR_SIZE];
         snprintf(tmp, sizeof(tmp), ".%s", b_path);
-        strcpy(b_path, tmp);  
+        snprintf(b_path, sizeof(b_path), "%s", tmp);
     }
 
-    strcpy(b_name, &b_path[si + 1]);
+    snprintf(b_name, sizeof(b_name), "%s", &b_path[si + 1]);
     b_path[si + 1] = '\0';
     int b_name_len = strlen(b_name);
     DIR *dp = opendir(b_path);
@@ -284,6 +284,8 @@ int dir_match(ToxWindow *self, Tox *m, const wchar_t *line, const wchar_t *cmd)
         }
     }
 
+    closedir(dp);
+
     if (dircount == 0)
         return -1;
 

src/avatars.c

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

src/avatars.h

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

src/chat_commands.c

@@ -31,15 +31,11 @@
 #include "line_info.h"
 #include "groupchat.h"
 #include "chat.h"
-#include "file_senders.h"
+#include "file_transfers.h"
 
 extern ToxWindow *prompt;
 extern FriendsList Friends;
 
-extern FileSender file_senders[MAX_FILES];
-extern uint8_t max_file_senders_index;
-extern uint8_t num_active_file_senders;
-
 void cmd_cancelfile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
 {
     if (argc < 2) {
@@ -47,51 +43,39 @@ void cmd_cancelfile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*ar
         return;
     }
 
-    const char *inoutstr = argv[1];
-    int filenum = atoi(argv[2]);
-
-    if (filenum >= MAX_FILES || filenum < 0) {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Invalid file ID.");
-        return;
-    }
-
-    if (strcasecmp(inoutstr, "in") == 0) {    /* cancel an incoming file transfer */
-        if (!Friends.list[self->num].file_receiver[filenum].active) {
-            line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Invalid file ID.");
-            return;  
-        }
-
-        const char *filepath = Friends.list[self->num].file_receiver[filenum].filename;
-        char name[MAX_STR_SIZE];
-        get_file_name(name, sizeof(name), filepath);
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "File transfer for '%s' canceled.", name);
-        chat_close_file_receiver(m, filenum, self->num, TOX_FILECONTROL_KILL);
-        return;
-    } else if (strcasecmp(inoutstr, "out") == 0) {    /* cancel an outgoing file transfer */
-        int i;
-        bool match = false;
-
-        for (i = 0; i < MAX_FILES; ++i) {
-            if (file_senders[i].active && file_senders[i].filenum == filenum) {
-                match = true;
-                break;
-            }
-        }
-
-        if (!match) {
-            line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Invalid file ID.");
-            return;  
-        }
-
-        const char *filename = file_senders[i].filename;
     char msg[MAX_STR_SIZE];
-        snprintf(msg, sizeof(msg), "File transfer for '%s' canceled.", filename);
-        close_file_sender(self, m, i, msg, TOX_FILECONTROL_KILL, filenum, self->num);
+    const char *inoutstr = argv[1];
+    int idx = atoi(argv[2]);
+
+    if (idx >= MAX_FILES || idx < 0) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Invalid file ID.");
         return;
+    }
+
+    struct FileTransfer *ft = NULL;
+
+    /* cancel an incoming file transfer */
+    if (strcasecmp(inoutstr, "in") == 0) {
+        ft = get_file_transfer_struct_index(self->num, idx, FILE_TRANSFER_RECV);
+    } else if (strcasecmp(inoutstr, "out") == 0) {
+        ft = get_file_transfer_struct_index(self->num, idx, FILE_TRANSFER_SEND);
     } else {
         line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Type must be 'in' or 'out'.");
         return;
     }
+
+    if (!ft) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Invalid file ID.");
+        return;
+    }
+
+    if (ft->state == FILE_TRANSFER_INACTIVE) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Invalid file ID.");
+        return;
+    }
+
+    snprintf(msg, sizeof(msg), "File transfer for '%s' aborted.", ft->file_name);
+    close_file_transfer(self, m, ft, TOX_FILE_CONTROL_CANCEL, msg, silent);
 }
 
 void cmd_groupinvite(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
@@ -125,24 +109,34 @@ void cmd_join_group(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*ar
 
     const char *groupkey = Friends.list[self->num].group_invite.key;
     uint16_t length = Friends.list[self->num].group_invite.length;
+    uint8_t type = Friends.list[self->num].group_invite.type;
 
     if (!Friends.list[self->num].group_invite.pending) {
         line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "No pending group chat invite.");
         return;
     }
 
-    int groupnum = tox_join_groupchat(m, self->num, (uint8_t *) groupkey, length);
+    int groupnum = -1;
+
+    if (type == TOX_GROUPCHAT_TYPE_TEXT)
+        groupnum = tox_join_groupchat(m, self->num, (uint8_t *) groupkey, length);
+#ifdef AUDIO
+    else
+        groupnum = toxav_join_av_groupchat(m, self->num, (uint8_t *) groupkey, length,
+                                           NULL, NULL);
+#endif
 
     if (groupnum == -1) {
         line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Group chat instance failed to initialize.");
         return;
     }
 
-    if (init_groupchat_win(prompt, m, groupnum) == -1) {
+    if (init_groupchat_win(prompt, m, groupnum, type) == -1) {
         line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Group chat window failed to initialize.");
         tox_del_groupchat(m, groupnum);
         return;
     }
+
 }
 
 void cmd_savefile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
@@ -152,50 +146,76 @@ void cmd_savefile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv
         return;
     }
 
-    uint8_t filenum = atoi(argv[1]);
+    int idx = atoi(argv[1]);
 
-    if ((filenum == 0 && strcmp(argv[1], "0")) || filenum >= MAX_FILES) {
+    if ((idx == 0 && strcmp(argv[1], "0")) || idx >= MAX_FILES) {
         line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "No pending file transfers with that ID.");
         return;
     }
 
-    if (!Friends.list[self->num].file_receiver[filenum].pending) {
+    struct FileTransfer *ft = get_file_transfer_struct_index(self->num, idx, FILE_TRANSFER_RECV);
+
+    if (!ft) {
         line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "No pending file transfers with that ID.");
         return;
     }
 
-    const char *filename = Friends.list[self->num].file_receiver[filenum].filename;
+    if (ft->state != FILE_TRANSFER_PENDING) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "No pending file transfers with that ID.");
+        return;
+    }
 
-    if (tox_file_send_control(m, self->num, 1, filenum, TOX_FILECONTROL_ACCEPT, 0, 0) == 0) {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Saving file [%d] as: '%s'", filenum, filename);
+    if ((ft->file = fopen(ft->file_path, "a")) == NULL) {
+        const char *msg =  "File transfer failed: Invalid file path.";
+        close_file_transfer(self, m, ft, TOX_FILE_CONTROL_CANCEL, msg, notif_error);
+        return;
+    }
+
+    TOX_ERR_FILE_CONTROL err;
+    tox_file_control(m, self->num, ft->filenum, TOX_FILE_CONTROL_RESUME, &err);
+
+    if (err != TOX_ERR_FILE_CONTROL_OK)
+        goto on_recv_error;
+
+    line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Saving file [%d] as: '%s'", idx, ft->file_path);
 
     /* prep progress bar line */
     char progline[MAX_STR_SIZE];
-        prep_prog_line(progline);
+    init_progress_bar(progline);
     line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "%s", progline);
-        Friends.list[self->num].file_receiver[filenum].line_id = self->chatwin->hst->line_end->id + 2;
 
-        if ((Friends.list[self->num].file_receiver[filenum].file = fopen(filename, "a")) == NULL) {
-            line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, RED, "* Error writing to file.");
-            tox_file_send_control(m, self->num, 1, filenum, TOX_FILECONTROL_KILL, 0, 0);
-        } else {
-            Friends.list[self->num].file_receiver[filenum].active = true;
-            ++Friends.list[self->num].active_file_receivers;
-        }
-    } else {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "File transfer failed.");
-    }
+    ft->line_id = self->chatwin->hst->line_end->id + 2;
+    ft->state = FILE_TRANSFER_STARTED;
 
-    Friends.list[self->num].file_receiver[filenum].pending = false;
+    return;
+
+on_recv_error:
+    switch (err) {
+        case TOX_ERR_FILE_CONTROL_FRIEND_NOT_FOUND:
+            line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "File transfer failed: Friend not found.");
+            return;
+
+        case TOX_ERR_FILE_CONTROL_FRIEND_NOT_CONNECTED:
+            line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "File transfer failed: Friend is not online.");
+            return;
+
+        case TOX_ERR_FILE_CONTROL_NOT_FOUND:
+            line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "File transfer failed: Invalid filenumber.");
+            return;
+
+        case TOX_ERR_FILE_CONTROL_SENDQ:
+            line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "File transfer failed: Connection error.");
+            return;
+
+        default:
+            line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "File transfer failed (error %d)\n", err);
+            return;
+    }
 }
 
 void cmd_sendfile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
 {
-    if (max_file_senders_index >= (MAX_FILES - 1)) {
-        const char *errmsg = "Please wait for some of your outgoing file transfers to complete.";
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, errmsg);
-        return;
-    }
+    const char *errmsg = NULL;
 
     if (argc < 1) {
         line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "File path required.");
@@ -227,50 +247,64 @@ void cmd_sendfile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv
 
     off_t filesize = file_size(path);
 
-    if (filesize == -1) {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "File corrupt.");
+    if (filesize == 0) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Invalid file.");
         fclose(file_to_send);
         return;
     }
 
-    char filename[MAX_STR_SIZE] = {0};
-    get_file_name(filename, sizeof(filename), path);
-    int namelen = strlen(filename);
-    int filenum = tox_new_file_sender(m, self->num, filesize, (const uint8_t *) filename, namelen);
+    char file_name[TOX_MAX_FILENAME_LENGTH];
+    size_t namelen = get_file_name(file_name, sizeof(file_name), path);
 
-    if (filenum == -1) {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Error sending file.");
-        fclose(file_to_send);
-        return;
+    TOX_ERR_FILE_SEND err;
+    uint32_t filenum = tox_file_send(m, self->num, TOX_FILE_KIND_DATA, (uint64_t) filesize, NULL,
+                                    (uint8_t *) file_name, namelen, &err);
+
+    if (err != TOX_ERR_FILE_SEND_OK)
+        goto on_send_error;
+
+    struct FileTransfer *ft = new_file_transfer(self, self->num, filenum, FILE_TRANSFER_SEND, TOX_FILE_KIND_DATA);
+
+    if (!ft) {
+        err = TOX_ERR_FILE_SEND_TOO_MANY;
+        goto on_send_error;
     }
 
-    int i;
-
-    for (i = 0; i < MAX_FILES; ++i) {
-        if (!file_senders[i].active) {
-            memcpy(file_senders[i].filename, filename, namelen + 1);
-            file_senders[i].active = true;
-            file_senders[i].toxwin = self;
-            file_senders[i].file = file_to_send;
-            file_senders[i].filenum = filenum;
-            file_senders[i].friendnum = self->num;
-            file_senders[i].timestamp = get_unix_time();
-            file_senders[i].size = filesize;
-            file_senders[i].piecelen = fread(file_senders[i].nextpiece, 1,
-                                             tox_file_data_size(m, self->num), file_to_send);
+    memcpy(ft->file_name, file_name, namelen + 1);
+    ft->file = file_to_send;
+    ft->file_size = filesize;
+    tox_file_get_file_id(m, self->num, filenum, ft->file_id, NULL);
 
     char sizestr[32];
     bytes_convert_str(sizestr, sizeof(sizestr), filesize);
-            line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, 
-                          "Sending file [%d]: '%s' (%s)", filenum, filename, sizestr);
+    line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Sending file [%d]: '%s' (%s)", filenum, file_name, sizestr);
 
-            ++num_active_file_senders;
-
-            if (i == max_file_senders_index)
-                ++max_file_senders_index;
-
-            reset_file_sender_queue();
     return;
+
+on_send_error:
+    switch (err) {
+        case TOX_ERR_FILE_SEND_FRIEND_NOT_FOUND:
+            errmsg = "File transfer failed: Invalid friend.";
+            break;
+
+        case TOX_ERR_FILE_SEND_FRIEND_NOT_CONNECTED:
+            errmsg = "File transfer failed: Friend is offline.";
+            break;
+
+        case TOX_ERR_FILE_SEND_NAME_TOO_LONG:
+            errmsg = "File transfer failed: Filename is too long.";
+            break;
+
+        case TOX_ERR_FILE_SEND_TOO_MANY:
+            errmsg = "File transfer failed: Too many concurrent file transfers.";
+            break;
+
+        default:
+            errmsg = "File transfer failed.";
+            break;
     }
-    }
+
+    line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "%s", errmsg);
+    tox_file_control(m, self->num, filenum, TOX_FILE_CONTROL_CANCEL, NULL);
+    fclose(file_to_send);
 }

src/configdir.c

@@ -66,7 +66,7 @@ void get_home_dir(char *home, int size)
  */
 char *get_user_config_dir(void)
 {
-    char home[NSS_BUFLEN_PASSWD];
+    char home[NSS_BUFLEN_PASSWD] = {0};
     get_home_dir(home, sizeof(home));
 
     char *user_config_dir;

src/device.c

@@ -38,8 +38,8 @@
 /* compatibility with older versions of OpenAL */
 #ifndef ALC_ALL_DEVICES_SPECIFIER
 #include <AL/alext.h>
-#endif
-#endif
+#endif  /* ALC_ALL_DEVICES_SPECIFIER */
+#endif  /* __APPLE__ */
 
 #include <stdbool.h>
 #include <string.h>
@@ -48,7 +48,6 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#define OPENAL_BUFS 5
 #define inline__ inline __attribute__((always_inline))
 
 extern struct user_settings *user_settings;
@@ -141,7 +140,10 @@ DeviceError init_devices()
 DeviceError terminate_devices()
 {
     /* Cleanup if needed */
+    lock;
     thread_running = false;
+    unlock;
+
     usleep(20000);
 
     if (pthread_mutex_destroy(&mutex) != 0)
@@ -202,6 +204,10 @@ DeviceError open_primary_device(DeviceType type, uint32_t* device_idx, uint32_t
     return open_device(type, primary_device[type], device_idx, sample_rate, frame_duration, channels);
 }
 
+void get_primary_device_name(DeviceType type, char *buf, int size)
+{
+    memcpy(buf, ddevice_names[type], size);
+}
 
 // TODO: generate buffers separately
 DeviceError open_device(DeviceType type, int32_t selection, uint32_t* device_idx, uint32_t sample_rate, uint32_t frame_duration, uint8_t channels)
@@ -215,7 +221,7 @@ DeviceError open_device(DeviceType type, int32_t selection, uint32_t* device_idx
     const uint32_t frame_size = (sample_rate * frame_duration / 1000);
 
     uint32_t i;
-    for (i = 0; i < MAX_DEVICES && running[type][i] != NULL; i ++);
+    for (i = 0; i < MAX_DEVICES && running[type][i] != NULL; ++i);
 
     if (i == MAX_DEVICES) { unlock; return de_AllDevicesBusy; }
     else *device_idx = i;
@@ -271,7 +277,7 @@ DeviceError open_device(DeviceType type, int32_t selection, uint32_t* device_idx
         uint16_t zeros[frame_size];
         memset(zeros, 0, frame_size*2);
 
-        for ( i =0; i < OPENAL_BUFS; ++i) {
+        for ( i = 0; i < OPENAL_BUFS; ++i ) {
             alBufferData(device->buffers[i], device->sound_mode, zeros, frame_size*2, sample_rate);
         }
 
@@ -323,9 +329,9 @@ DeviceError close_device(DeviceType type, uint32_t device_idx)
             alDeleteSources(1, &device->source);
             alDeleteBuffers(OPENAL_BUFS, device->buffers);
 
-            if ( !alcCloseDevice(device->dhndl) ) rc = de_AlError;
             alcMakeContextCurrent(NULL);
             if ( device->ctx ) alcDestroyContext(device->ctx);
+            if ( !alcCloseDevice(device->dhndl) ) rc = de_AlError;
         }
 
         free(device);
@@ -351,7 +357,7 @@ DeviceError register_device_callback( int32_t call_idx, uint32_t device_idx, Dat
     return de_None;
 }
 
-inline__ DeviceError write_out(uint32_t device_idx, int16_t* data, uint32_t lenght, uint8_t channels)
+inline__ DeviceError write_out(uint32_t device_idx, const int16_t* data, uint32_t length, uint8_t channels)
 {
     if (device_idx >= MAX_DEVICES) return de_InvalidSelection;
 
@@ -380,7 +386,7 @@ inline__ DeviceError write_out(uint32_t device_idx, int16_t* data, uint32_t leng
     }
 
 
-    alBufferData(bufid, device->sound_mode, data, lenght * 2 * channels, device->sample_rate);
+    alBufferData(bufid, device->sound_mode, data, length * 2 * channels, device->sample_rate);
     alSourceQueueBuffers(device->source, 1, &bufid);
 
     ALint state;
@@ -403,12 +409,19 @@ void* thread_poll (void* arg) // TODO: maybe use thread for every input source
     int32_t sample = 0;
 
 
-    while (thread_running)
+    while (true)
     {
+        lock;
+        if (!thread_running) {
+            unlock;
+            break;
+        }
+        unlock;
+
         if (thread_paused) usleep(10000); /* Wait for unpause. */
         else
         {
-            for (i = 0; i < size[input]; i ++) 
+            for (i = 0; i < size[input]; ++i)
             {
                 lock;
                 if (running[input][i] != NULL)
@@ -426,12 +439,10 @@ void* thread_poll (void* arg) // TODO: maybe use thread for every input source
                     int16_t frame[16000];
                     alcCaptureSamples(device->dhndl, frame, f_size);
 
-                    if ( device->muted 
-                    #ifdef AUDIO
-                        || (device->enable_VAD && !toxav_has_activity(av, device->call_idx, frame, f_size, device->VAD_treshold))
-                    #endif /* AUDIO */
-                        )
-                        { unlock; continue; } /* Skip if no voice activity */
+                    if (device->muted) {
+                        unlock;
+                        continue;
+                    }
 
                     if ( device->cb ) device->cb(frame, f_size, device->cb_data);
                 }
@@ -446,8 +457,9 @@ void* thread_poll (void* arg) // TODO: maybe use thread for every input source
 
 void print_devices(ToxWindow* self, DeviceType type)
 {
-    int i = 0;
-    for ( ; i < size[type]; i ++)
+    int i;
+
+    for (i = 0; i < size[type]; ++i)
         line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "%d: %s", i, devices_names[type][i]);
 
     return;

src/device.h

@@ -29,6 +29,7 @@
 #ifndef DEVICE_H
 #define DEVICE_H
 
+#define OPENAL_BUFS 5
 #define MAX_DEVICES 32
 #include <inttypes.h>
 #include "windows.h"
@@ -81,9 +82,10 @@ DeviceError open_device(DeviceType type, int32_t selection, uint32_t* device_idx
 DeviceError close_device(DeviceType type, uint32_t device_idx);
 
 /* Write data to device */
-DeviceError write_out(uint32_t device_idx, int16_t* data, uint32_t lenght, uint8_t channels);
+DeviceError write_out(uint32_t device_idx, const int16_t* data, uint32_t length, uint8_t channels);
 
 void print_devices(ToxWindow* self, DeviceType type);
+void get_primary_device_name(DeviceType type, char *buf, int size);
 
 DeviceError selection_valid(DeviceType type, int32_t selection);
 #endif /* DEVICE_H */

src/dns.c

@@ -47,7 +47,7 @@
 #define TOX_DNS3_TXT_PREFIX "v=tox3;id="
 
 extern struct Winthread Winthread;
-extern struct _dns3_servers dns3_servers;
+extern struct dns3_servers dns3_servers;
 extern struct arg_opts arg_opts;
 
 #define NUM_DNS3_BACKUP_SERVERS 2
@@ -73,16 +73,16 @@ static struct dns3_server_backup {
     },
 };
 
-static struct _thread_data {
+static struct thread_data {
     ToxWindow *self;
-    char id_bin[TOX_FRIEND_ADDRESS_SIZE];
+    char id_bin[TOX_ADDRESS_SIZE];
     char addr[MAX_STR_SIZE];
     char msg[MAX_STR_SIZE];
     uint8_t busy;
     Tox *m;
 } t_data;
 
-static struct _dns_thread {
+static struct dns_thread {
     pthread_t tid;
     pthread_attr_t attr;
 } dns_thread;
@@ -92,7 +92,7 @@ static struct _dns_thread {
 #define MAX_DOMAIN_SIZE 32
 #define MAX_DNS_LINE MAX_DOMAIN_SIZE + (DNS3_KEY_SIZE * 2) + 3
 
-struct _dns3_servers {
+struct dns3_servers {
     bool loaded;
     int lines;
     char names[MAX_DNS_SERVERS][MAX_DOMAIN_SIZE];
@@ -152,12 +152,12 @@ static int dns_error(ToxWindow *self, const char *errmsg)
     return -1;
 }
 
-static void kill_dns_thread(void *dns_obj)
+static void killdns_thread(void *dns_obj)
 {
     if (dns_obj)
         tox_dns3_kill(dns_obj);
 
-    memset(&t_data, 0, sizeof(struct _thread_data));
+    memset(&t_data, 0, sizeof(struct thread_data));
     pthread_attr_destroy(&dns_thread.attr);
     pthread_exit(NULL);
 }
@@ -234,12 +234,16 @@ static int parse_dns_response(ToxWindow *self, u_char *answer, int ans_len, char
    and the domain in dombuf.
 
    return length of username on success, -1 on failure */
-static int parse_addr(const char *addr, char *namebuf, char *dombuf)
+static int parse_addr(const char *addr, char *namebuf, size_t namebuf_sz, char *dombuf, size_t dombuf_sz)
 {
-    char tmpaddr[MAX_STR_SIZE];
-    char *tmpname, *tmpdom;
+    if (strlen(addr) >= MAX_STR_SIZE)
+        return -1;
 
-    strcpy(tmpaddr, addr);
+    char tmpaddr[MAX_STR_SIZE];
+    char *tmpname = NULL;
+    char *tmpdom = NULL;
+
+    snprintf(tmpaddr, sizeof(tmpaddr), "%s", addr);
     tmpname = strtok(tmpaddr, "@");
     tmpdom = strtok(NULL, "");
 
@@ -247,8 +251,8 @@ static int parse_addr(const char *addr, char *namebuf, char *dombuf)
         return -1;
 
     str_to_lower(tmpdom);
-    strcpy(namebuf, tmpname);
-    strcpy(dombuf, tmpdom);
+    snprintf(namebuf, namebuf_sz, "%s", tmpname);
+    snprintf(dombuf, dombuf_sz, "%s", tmpdom);
 
     return strlen(namebuf);
 }
@@ -295,11 +299,11 @@ void *dns3_lookup_thread(void *data)
     char inputdomain[MAX_STR_SIZE];
     char name[MAX_STR_SIZE];
 
-    int namelen = parse_addr(t_data.addr, name, inputdomain);
+    int namelen = parse_addr(t_data.addr, name, sizeof(name), inputdomain, sizeof(inputdomain));
 
     if (namelen == -1) {
         dns_error(self, "Must be a Tox ID or an address in the form username@domain");
-        kill_dns_thread(NULL);
+        killdns_thread(NULL);
     }
 
     char DNS_pubkey[DNS3_KEY_SIZE];
@@ -309,14 +313,14 @@ void *dns3_lookup_thread(void *data)
 
     if (match == -1) {
         dns_error(self, "Domain not found.");
-        kill_dns_thread(NULL);
+        killdns_thread(NULL);
     }
 
     void *dns_obj = tox_dns3_new((uint8_t *) DNS_pubkey);
 
     if (dns_obj == NULL) {
         dns_error(self, "Core failed to create DNS object.");
-        kill_dns_thread(NULL);
+        killdns_thread(NULL);
     }
 
     char string[MAX_DNS_REQST_SIZE + 1];
@@ -327,7 +331,7 @@ void *dns3_lookup_thread(void *data)
 
     if (str_len == -1) {
         dns_error(self, "Core failed to generate DNS3 string.");
-        kill_dns_thread(dns_obj);
+        killdns_thread(dns_obj);
     }
 
     string[str_len] = '\0';
@@ -341,14 +345,14 @@ void *dns3_lookup_thread(void *data)
 
     if (ans_len <= 0) {
         dns_error(self, "DNS query failed.");
-        kill_dns_thread(dns_obj);
+        killdns_thread(dns_obj);
     }
 
     char ans_id[MAX_DNS_REQST_SIZE + 1];
 
     /* extract TXT from DNS response */
     if (parse_dns_response(self, answer, ans_len, ans_id) == -1)
-        kill_dns_thread(dns_obj);
+        killdns_thread(dns_obj);
 
     char encrypted_id[MAX_DNS_REQST_SIZE + 1];
     int prfx_len = strlen(TOX_DNS3_TXT_PREFIX);
@@ -356,7 +360,7 @@ void *dns3_lookup_thread(void *data)
     /* extract the encrypted ID from TXT response */
     if (strncmp(ans_id, TOX_DNS3_TXT_PREFIX, prfx_len) != 0) {
         dns_error(self, "Bad DNS3 TXT response.");
-        kill_dns_thread(dns_obj);
+        killdns_thread(dns_obj);
     }
 
     memcpy(encrypted_id, ans_id + prfx_len, ans_len - prfx_len);
@@ -364,28 +368,27 @@ void *dns3_lookup_thread(void *data)
     if (tox_decrypt_dns3_TXT(dns_obj, (uint8_t *) t_data.id_bin, (uint8_t *) encrypted_id,
                              strlen(encrypted_id), request_id) == -1) {
         dns_error(self, "Core failed to decrypt DNS response.");
-        kill_dns_thread(dns_obj);
+        killdns_thread(dns_obj);
     }
 
     pthread_mutex_lock(&Winthread.lock);
     cmd_add_helper(self, t_data.m, t_data.id_bin, t_data.msg);
     pthread_mutex_unlock(&Winthread.lock);
 
-    kill_dns_thread(dns_obj);
+    killdns_thread(dns_obj);
     return 0;
 }
 
 /* creates new thread for dns3 lookup. Only allows one lookup at a time. */
 void dns3_lookup(ToxWindow *self, Tox *m, const char *id_bin, const char *addr, const char *msg)
 {
-    if (arg_opts.use_proxy && arg_opts.force_tcp) {
+    if (arg_opts.proxy_type != TOX_PROXY_TYPE_NONE && arg_opts.force_tcp) {
         line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "DNS lookups are disabled.");
         return;
     }
 
     if (t_data.busy) {
-        const char *err = "Please wait for previous user lookup to finish.";
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, err);
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Please wait for previous user lookup to finish.");
         return;
     }
 
@@ -407,12 +410,23 @@ void dns3_lookup(ToxWindow *self, Tox *m, const char *id_bin, const char *addr,
     t_data.m = m;
     t_data.busy = 1;
 
-    if (pthread_attr_init(&dns_thread.attr) != 0)
-        exit_toxic_err("failed in dns3_lookup", FATALERR_THREAD_ATTR);
+    if (pthread_attr_init(&dns_thread.attr) != 0) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, RED, "Error: DNS thread attr failed to init");
+        memset(&t_data, 0, sizeof(struct thread_data));
+        return;
+    }
 
-    if (pthread_attr_setdetachstate(&dns_thread.attr, PTHREAD_CREATE_DETACHED) != 0)
-        exit_toxic_err("failed in dns3_lookup", FATALERR_THREAD_ATTR);
+    if (pthread_attr_setdetachstate(&dns_thread.attr, PTHREAD_CREATE_DETACHED) != 0) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, RED, "Error: DNS thread attr failed to set");
+        pthread_attr_destroy(&dns_thread.attr);
+        memset(&t_data, 0, sizeof(struct thread_data));
+        return;
+    }
 
-    if (pthread_create(&dns_thread.tid, &dns_thread.attr, dns3_lookup_thread, NULL) != 0)
-        exit_toxic_err("failed in dns3_lookup", FATALERR_THREAD_CREATE);
+    if (pthread_create(&dns_thread.tid, &dns_thread.attr, dns3_lookup_thread, NULL) != 0) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, RED, "Error: DNS thread failed to init");
+        pthread_attr_destroy(&dns_thread.attr);
+        memset(&t_data, 0, sizeof(struct thread_data));
+        return;
+    }
 }

src/execute.c

@@ -29,6 +29,7 @@
 #include "execute.h"
 #include "chat_commands.h"
 #include "global_commands.h"
+#include "group_commands.h"
 #include "line_info.h"
 #include "misc_tools.h"
 #include "notify.h"
@@ -46,7 +47,7 @@ static struct cmd_func global_commands[] = {
     { "/connect",   cmd_connect       },
     { "/decline",   cmd_decline       },
     { "/exit",      cmd_quit          },
-    { "/groupchat", cmd_groupchat     },
+    { "/group",     cmd_groupchat     },
     { "/help",      cmd_prompt_help   },
     { "/log",       cmd_log           },
     { "/myid",      cmd_myid          },
@@ -74,7 +75,16 @@ static struct cmd_func chat_commands[] = {
     { "/answer",    cmd_answer      },
     { "/reject",    cmd_reject      },
     { "/hangup",    cmd_hangup      },
-    { "/sdev",      cmd_ccur_device },
+    { "/mute",      cmd_mute        },
+    { "/sense",     cmd_sense       },
+#endif /* AUDIO */
+    { NULL,         NULL            },
+};
+
+static struct cmd_func group_commands[] = {
+    { "/title",     cmd_set_title   },
+
+#ifdef AUDIO
     { "/mute",      cmd_mute        },
     { "/sense",     cmd_sense       },
 #endif /* AUDIO */
@@ -165,6 +175,8 @@ void execute(WINDOW *w, ToxWindow *self, Tox *m, const char *input, int mode)
             break;
 
         case GROUPCHAT_COMMAND_MODE:
+            if (do_command(w, self, m, num_args, group_commands, args) == 0)
+                return;
             break;
     }
 

src/file_senders.c

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

src/file_senders.h

@@ -1,75 +0,0 @@
-/*  file_senders.h
- *
- *
- *  Copyright (C) 2014 Toxic All Rights Reserved.
- *
- *  This file is part of Toxic.
- *
- *  Toxic is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Toxic is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Toxic.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef FILESENDERS_H
-#define FILESENDERS_H
-
-#include "toxic.h"
-#include "windows.h"
-
-#define KiB 1024
-#define MiB 1048576       /* 1024 ^ 2 */
-#define GiB 1073741824    /* 1024 ^ 3 */
-
-#define FILE_PIECE_SIZE 2048    /* must be >= (MAX_CRYPTO_DATA_SIZE - 2) in toxcore/net_crypto.h */
-#define MAX_FILES 32
-#define TIMEOUT_FILESENDER 120
-#define NUM_PROG_MARKS 50    /* number of "#"'s in file transfer progress bar. Keep well below MAX_STR_SIZE */
-
-typedef struct {
-    FILE *file;
-    ToxWindow *toxwin;
-    int32_t friendnum;
-    bool active;
-    bool noconnection;
-    bool finished;
-    int filenum;
-    char nextpiece[FILE_PIECE_SIZE];
-    uint16_t piecelen;
-    char filename[MAX_STR_SIZE];
-    uint64_t timestamp;
-    uint64_t last_progress;
-    double bps;
-    uint64_t size;
-    uint32_t line_id;
-    uint8_t queue_pos;
-} FileSender;
-
-/* creates initial progress line that will be updated during file transfer.
-   Assumes progline is of size MAX_STR_SIZE */
-void prep_prog_line(char *progline);
-
-/* prints a progress bar for file transfers. 
-   if friendnum is -1 we're sending the file, otherwise we're receiving.  */
-void print_progress_bar(ToxWindow *self, int idx, int friendnum, double pct_remain);
-
-/* set CTRL to -1 if we don't want to send a control signal.
-   set msg to NULL if we don't want to display a message */
-void close_file_sender(ToxWindow *self, Tox *m, int i, const char *msg, int CTRL, int filenum, int32_t friendnum);
-
-/* called whenever a file sender is opened or closed */
-void reset_file_sender_queue(void);
-
-void close_all_file_senders(Tox *m);
-void do_file_senders(Tox *m);
-
-#endif  /* #define FILESENDERS_H */

src/file_transfers.c

@@ -0,0 +1,316 @@
+/*  file_transfers.c
+ *
+ *
+ *  Copyright (C) 2014 Toxic All Rights Reserved.
+ *
+ *  This file is part of Toxic.
+ *
+ *  Toxic is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Toxic is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Toxic.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <string.h>
+#include <stdlib.h>
+#include <time.h>
+#include <unistd.h>
+
+#include "toxic.h"
+#include "windows.h"
+#include "friendlist.h"
+#include "file_transfers.h"
+#include "line_info.h"
+#include "misc_tools.h"
+#include "notify.h"
+
+extern FriendsList Friends;
+
+/* number of "#"'s in file transfer progress bar. Keep well below MAX_STR_SIZE */
+#define NUM_PROG_MARKS 50
+
+/* Checks for timed out file transfers and closes them. */
+#define CHECK_FILE_TIMEOUT_INTERAVAL 5
+void check_file_transfer_timeouts(Tox *m)
+{
+    char msg[MAX_STR_SIZE];
+    static uint64_t last_check = 0;
+
+    if (!timed_out(last_check, CHECK_FILE_TIMEOUT_INTERAVAL))
+        return;
+
+    last_check = get_unix_time();
+
+    size_t i, j;
+
+    for (i = 0; i < Friends.max_idx; ++i) {
+        if (!Friends.list[i].active)
+            continue;
+
+        for (j = 0; j < MAX_FILES; ++j) {
+            struct FileTransfer *ft_send = &Friends.list[i].file_sender[j];
+
+            if (ft_send->state > FILE_TRANSFER_PAUSED) {
+                if (timed_out(ft_send->last_keep_alive, TIMEOUT_FILESENDER)) {
+                    snprintf(msg, sizeof(msg), "File transfer for '%s' timed out.", ft_send->file_name);
+                    close_file_transfer(ft_send->window, m, ft_send, TOX_FILE_CONTROL_CANCEL, msg, notif_error);
+                }
+            }
+
+            struct FileTransfer *ft_recv = &Friends.list[i].file_receiver[j];
+
+            if (ft_recv->state > FILE_TRANSFER_PAUSED) {
+                if (timed_out(ft_recv->last_keep_alive, TIMEOUT_FILESENDER)) {
+                    snprintf(msg, sizeof(msg), "File transfer for '%s' timed out.", ft_recv->file_name);
+                    close_file_transfer(ft_recv->window, m, ft_recv, TOX_FILE_CONTROL_CANCEL, msg, notif_error);
+                }
+            }
+        }
+    }
+}
+
+/* creates initial progress line that will be updated during file transfer.
+   Assumes progline is of size MAX_STR_SIZE */
+void init_progress_bar(char *progline)
+{
+    strcpy(progline, "0.0 B/s [");
+    int i;
+
+    for (i = 0; i < NUM_PROG_MARKS; ++i)
+        strcat(progline, "-");
+
+    strcat(progline, "] 0%");
+}
+
+/* prints a progress bar for file transfers.
+   if friendnum is -1 we're sending the file, otherwise we're receiving.  */
+void print_progress_bar(ToxWindow *self, double bps, double pct_done, uint32_t line_id)
+{
+    if (bps < 0 || pct_done < 0 || pct_done > 100)
+        return;
+
+    char msg[MAX_STR_SIZE];
+    bytes_convert_str(msg, sizeof(msg), bps);
+    strcat(msg, "/s [");
+
+    int n = pct_done / (100 / NUM_PROG_MARKS);
+    int i, j;
+
+    for (i = 0; i < n; ++i)
+        strcat(msg, "#");
+
+    for (j = i; j < NUM_PROG_MARKS; ++j)
+        strcat(msg, "-");
+
+    strcat(msg, "] ");
+
+    char pctstr[16];
+    const char *frmt = pct_done == 100 ? "%.f%%" : "%.1f%%";
+    snprintf(pctstr, sizeof(pctstr), frmt, pct_done);
+    strcat(msg, pctstr);
+
+    line_info_set(self, line_id, msg);
+}
+
+static void refresh_progress_helper(ToxWindow *self, Tox *m, struct FileTransfer *ft)
+{
+    if (ft->state == FILE_TRANSFER_INACTIVE)
+        return;
+
+    /* Timeout must be set to 1 second to show correct bytes per second */
+    if (!timed_out(ft->last_line_progress, 1))
+        return;
+
+    double remain = ft->file_size - ft->position;
+    double pct_done = remain > 0 ? (1 - (remain / ft->file_size)) * 100 : 100;
+    print_progress_bar(self, ft->bps, pct_done, ft->line_id);
+
+    ft->bps = 0;
+    ft->last_line_progress = get_unix_time();
+}
+
+/* refreshes active file transfer status bars. */
+void refresh_file_transfer_progress(ToxWindow *self, Tox *m, uint32_t friendnum)
+{
+    size_t i;
+
+    for (i = 0; i < MAX_FILES; ++i) {
+        refresh_progress_helper(self, m, &Friends.list[friendnum].file_receiver[i]);
+        refresh_progress_helper(self, m, &Friends.list[friendnum].file_sender[i]);
+    }
+}
+
+/* Returns a pointer to friendnum's FileTransfer struct associated with filenum.
+ * Returns NULL if filenum is invalid.
+ */
+struct FileTransfer *get_file_transfer_struct(uint32_t friendnum, uint32_t filenum)
+{
+    size_t i;
+
+    for (i = 0; i < MAX_FILES; ++i) {
+        struct FileTransfer *ft_send = &Friends.list[friendnum].file_sender[i];
+
+        if (ft_send->state != FILE_TRANSFER_INACTIVE && ft_send->filenum == filenum)
+            return ft_send;
+
+        struct FileTransfer *ft_recv = &Friends.list[friendnum].file_receiver[i];
+
+        if (ft_recv->state != FILE_TRANSFER_INACTIVE && ft_recv->filenum == filenum)
+            return ft_recv;
+    }
+
+    return NULL;
+}
+
+/* Returns a pointer to the FileTransfer struct associated with index with the direction specified.
+ * Returns NULL on failure.
+ */
+struct FileTransfer *get_file_transfer_struct_index(uint32_t friendnum, uint32_t index,
+                                                    FILE_TRANSFER_DIRECTION direction)
+{
+    if (direction != FILE_TRANSFER_RECV && direction != FILE_TRANSFER_SEND)
+        return NULL;
+
+    size_t i;
+
+    for (i = 0; i < MAX_FILES; ++i) {
+        struct FileTransfer *ft = direction == FILE_TRANSFER_SEND ?
+                                              &Friends.list[friendnum].file_sender[i] :
+                                              &Friends.list[friendnum].file_receiver[i];
+
+        if (ft->state != FILE_TRANSFER_INACTIVE && ft->index == index)
+            return ft;
+    }
+
+    return NULL;
+}
+
+/* Returns a pointer to an unused file sender.
+ * Returns NULL if all file senders are in use.
+ */
+static struct FileTransfer *new_file_sender(ToxWindow *window, uint32_t friendnum, uint32_t filenum, uint8_t type)
+{
+    size_t i;
+
+    for (i = 0; i < MAX_FILES; ++i) {
+        struct FileTransfer *ft = &Friends.list[friendnum].file_sender[i];
+
+        if (ft->state == FILE_TRANSFER_INACTIVE) {
+            memset(ft, 0, sizeof(struct FileTransfer));
+            ft->window = window;
+            ft->index = i;
+            ft->friendnum = friendnum;
+            ft->filenum = filenum;
+            ft->file_type = type;
+            ft->last_keep_alive = get_unix_time();
+            ft->state = FILE_TRANSFER_PENDING;
+            ft->direction = FILE_TRANSFER_SEND;
+            return ft;
+        }
+    }
+
+    return NULL;
+}
+
+/* Returns a pointer to an unused file receiver.
+ * Returns NULL if all file receivers are in use.
+ */
+static struct FileTransfer *new_file_receiver(ToxWindow *window, uint32_t friendnum, uint32_t filenum, uint8_t type)
+{
+    size_t i;
+
+    for (i = 0; i < MAX_FILES; ++i) {
+        struct FileTransfer *ft = &Friends.list[friendnum].file_receiver[i];
+
+        if (ft->state == FILE_TRANSFER_INACTIVE) {
+            memset(ft, 0, sizeof(struct FileTransfer));
+            ft->window = window;
+            ft->index = i;
+            ft->friendnum = friendnum;
+            ft->filenum = filenum;
+            ft->file_type = type;
+            ft->last_keep_alive = get_unix_time();
+            ft->state = FILE_TRANSFER_PENDING;
+            ft->direction = FILE_TRANSFER_RECV;
+            return ft;
+        }
+    }
+
+    return NULL;
+}
+
+/* Initializes an unused file transfer and returns its pointer.
+ * Returns NULL on failure.
+ */
+struct FileTransfer *new_file_transfer(ToxWindow *window, uint32_t friendnum, uint32_t filenum,
+                                       FILE_TRANSFER_DIRECTION direction, uint8_t type)
+{
+    if (direction == FILE_TRANSFER_RECV)
+        return new_file_receiver(window, friendnum, filenum, type);
+
+    if (direction == FILE_TRANSFER_SEND)
+        return new_file_sender(window, friendnum, filenum, type);
+
+    return NULL;
+}
+
+
+/* Closes file transfer ft.
+ *
+ * Set CTRL to -1 if we don't want to send a control signal.
+ * Set message or self to NULL if we don't want to display a message.
+ */
+void close_file_transfer(ToxWindow *self, Tox *m, struct FileTransfer *ft, int CTRL, const char *message,
+                         Notification sound_type)
+{
+    if (!ft)
+        return;
+
+    if (ft->state == FILE_TRANSFER_INACTIVE)
+        return;
+
+    if (ft->file)
+        fclose(ft->file);
+
+    if (CTRL >= 0)
+        tox_file_control(m, ft->friendnum, ft->filenum, (TOX_FILE_CONTROL) CTRL, NULL);
+
+    if (message && self) {
+        if (self->active_box != -1 && sound_type != silent)
+            box_notify2(self, sound_type, NT_NOFOCUS | NT_WNDALERT_2, self->active_box, "%s", message);
+        else
+            box_notify(self, sound_type, NT_NOFOCUS | NT_WNDALERT_2, &self->active_box, self->name, "%s", message);
+
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "%s", message);
+    }
+
+    memset(ft, 0, sizeof(struct FileTransfer));
+}
+
+/* Kills all active file transfers for friendnum */
+void kill_all_file_transfers_friend(Tox *m, uint32_t friendnum)
+{
+    size_t i;
+
+    for (i = 0; i < MAX_FILES; ++i) {
+        close_file_transfer(NULL, m, &Friends.list[friendnum].file_sender[i], TOX_FILE_CONTROL_CANCEL, NULL, silent);
+        close_file_transfer(NULL, m, &Friends.list[friendnum].file_receiver[i], TOX_FILE_CONTROL_CANCEL, NULL, silent);
+    }
+}
+
+void kill_all_file_transfers(Tox *m)
+{
+    size_t i;
+
+    for (i = 0; i < Friends.max_idx; ++i)
+        kill_all_file_transfers_friend(m, Friends.list[i].num);
+}

src/file_transfers.h

@@ -0,0 +1,115 @@
+/*  file_transfers.h
+ *
+ *
+ *  Copyright (C) 2014 Toxic All Rights Reserved.
+ *
+ *  This file is part of Toxic.
+ *
+ *  Toxic is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Toxic is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Toxic.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef FILE_TRANSFERS_H
+#define FILE_TRANSFERS_H
+
+#include <limits.h>
+
+#include "toxic.h"
+#include "windows.h"
+#include "notify.h"
+
+#define KiB 1024
+#define MiB 1048576       /* 1024^2 */
+#define GiB 1073741824    /* 1024^3 */
+
+#define MAX_FILES 32
+#define TIMEOUT_FILESENDER 120
+
+typedef enum FILE_TRANSFER_STATE {
+    FILE_TRANSFER_INACTIVE,
+    FILE_TRANSFER_PAUSED,
+    FILE_TRANSFER_PENDING,
+    FILE_TRANSFER_STARTED,
+} FILE_TRANSFER_STATE;
+
+typedef enum FILE_TRANSFER_DIRECTION {
+    FILE_TRANSFER_SEND,
+    FILE_TRANSFER_RECV
+} FILE_TRANSFER_DIRECTION;
+
+struct FileTransfer {
+    ToxWindow *window;
+    FILE *file;
+    FILE_TRANSFER_STATE state;
+    FILE_TRANSFER_DIRECTION direction;
+    uint8_t file_type;
+    char file_name[TOX_MAX_FILENAME_LENGTH + 1];
+    char file_path[PATH_MAX + 1];    /* Not used by senders */
+    double   bps;
+    uint32_t filenum;
+    uint32_t friendnum;
+    size_t   index;
+    uint64_t file_size;
+    uint64_t position;
+    uint64_t last_line_progress;   /* The last time we updated the progress bar */
+    uint64_t last_keep_alive;  /* The last time we sent or received data */
+    uint32_t line_id;
+    uint8_t  file_id[TOX_FILE_ID_LENGTH];
+};
+
+/* Checks for timed out file transfers and closes them. */
+void check_file_transfer_timeouts(Tox *m);
+
+/* creates initial progress line that will be updated during file transfer.
+   progline must be at lesat MAX_STR_SIZE bytes */
+void init_progress_bar(char *progline);
+
+/* prints a progress bar for file transfers */
+void print_progress_bar(ToxWindow *self, double pct_done, double bps, uint32_t line_id);
+
+/* refreshes active file transfer status bars. */
+void refresh_file_transfer_progress(ToxWindow *self, Tox *m, uint32_t friendnum);
+
+/* Returns a pointer to friendnum's FileTransfer struct associated with filenum.
+ * Returns NULL if filenum is invalid.
+ */
+struct FileTransfer *get_file_transfer_struct(uint32_t friendnum, uint32_t filenum);
+
+
+/* Returns a pointer to the FileTransfer struct associated with index with the direction specified.
+ * Returns NULL on failure.
+ */
+struct FileTransfer *get_file_transfer_struct_index(uint32_t friendnum, uint32_t index,
+                                                    FILE_TRANSFER_DIRECTION direction);
+
+/* Initializes an unused file transfer and returns its pointer.
+ * Returns NULL on failure.
+ */
+struct FileTransfer *new_file_transfer(ToxWindow *window, uint32_t friendnum, uint32_t filenum,
+                                       FILE_TRANSFER_DIRECTION direction, uint8_t type);
+
+/* Closes file transfer ft.
+ *
+ * Set CTRL to -1 if we don't want to send a control signal.
+ * Set message or self to NULL if we don't want to display a message.
+ */
+void close_file_transfer(ToxWindow *self, Tox *m, struct FileTransfer *ft, int CTRL, const char *message,
+                         Notification sound_type);
+
+/* Kills all active file transfers for friendnum */
+void kill_all_file_transfers_friend(Tox *m, uint32_t friendnum);
+
+void kill_all_file_transfers(Tox *m);
+
+#endif  /* #define FILE_TRANSFERS_H */

src/friendlist.c

@@ -38,6 +38,7 @@
 #include "notify.h"
 #include "help.h"
 #include "log.h"
+#include "avatars.h"
 
 #ifdef AUDIO
 #include "audio_call.h"
@@ -59,16 +60,15 @@ static struct Blocked {
     int num_selected;
     int max_idx;
     int num_blocked;
-
-    int *index;
+    uint32_t *index;
     BlockedFriend *list;
 } Blocked;
 
-static struct pendingDel {
-    int num;
+static struct PendingDel {
+    uint32_t num;
     bool active;
     WINDOW *popup;
-} pendingdelete;
+} PendingDelete;
 
 static void realloc_friends(int n)
 {
@@ -81,7 +81,7 @@ static void realloc_friends(int n)
     }
 
     ToxicFriend *f = realloc(Friends.list, n * sizeof(ToxicFriend));
-    int *f_idx = realloc(Friends.index, n * sizeof(int));
+    uint32_t *f_idx = realloc(Friends.index, n * sizeof(uint32_t));
 
     if (f == NULL || f_idx == NULL)
         exit_toxic_err("failed in realloc_friends", FATALERR_MEMORY);
@@ -101,7 +101,7 @@ static void realloc_blocklist(int n)
     }
 
     BlockedFriend *b = realloc(Blocked.list, n * sizeof(BlockedFriend));
-    int *b_idx = realloc(Blocked.index, n * sizeof(int));
+    uint32_t *b_idx = realloc(Blocked.index, n * sizeof(uint32_t));
 
     if (b == NULL || b_idx == NULL)
         exit_toxic_err("failed in realloc_blocklist", FATALERR_MEMORY);
@@ -125,9 +125,6 @@ void kill_friendlist(void)
 
 static int save_blocklist(char *path)
 {
-    if (arg_opts.ignore_data_file)
-        return 0;
-
     if (path == NULL)
         return -1;
 
@@ -138,19 +135,21 @@ static int save_blocklist(char *path)
         exit_toxic_err("Failed in save_blocklist", FATALERR_MEMORY);
 
     int i;
-    int ret = -1;
+
     int count = 0;
 
     for (i = 0; i < Blocked.max_idx; ++i) {
-        if (count > Blocked.num_blocked)
-            goto on_error;
+        if (count > Blocked.num_blocked) {
+            free(data);
+            return -1;
+        }
 
         if (Blocked.list[i].active) {
             BlockedFriend tmp;
             memset(&tmp, 0, sizeof(BlockedFriend));
             tmp.namelength = htons(Blocked.list[i].namelength);
             memcpy(tmp.name, Blocked.list[i].name, Blocked.list[i].namelength + 1);
-            memcpy(tmp.pub_key, Blocked.list[i].pub_key, TOX_CLIENT_ID_SIZE);
+            memcpy(tmp.pub_key, Blocked.list[i].pub_key, TOX_PUBLIC_KEY_SIZE);
 
             uint8_t lastonline[sizeof(uint64_t)];
             memcpy(lastonline, &Blocked.list[i].last_on, sizeof(uint64_t));
@@ -164,18 +163,20 @@ static int save_blocklist(char *path)
 
     FILE *fp = fopen(path, "wb");
 
-    if (fp == NULL)
-        goto on_error;
+    if (fp == NULL) {
+        free(data);
+        return -1;
+    }
 
-    if (fwrite(data, len, 1, fp) == 1)
-        ret = 0;
+    if (fwrite(data, len, 1, fp) != 1) {
+        fclose(fp);
+        free(data);
+        return -1;
+    }
 
     fclose(fp);
-    return ret;
-
-on_error:
     free(data);
-    return ret;
+    return 0;
 }
 
 static void sort_blocklist_index(void);
@@ -192,7 +193,7 @@ int load_blocklist(char *path)
 
     off_t len = file_size(path);
 
-    if (len == -1) {
+    if (len == 0) {
         fclose(fp);
         return -1;
     }
@@ -223,15 +224,16 @@ int load_blocklist(char *path)
     int i;
 
     for (i = 0; i < num; ++i) {
+        BlockedFriend tmp;
+        memset(&tmp, 0, sizeof(BlockedFriend));
         memset(&Blocked.list[i], 0, sizeof(BlockedFriend));
 
-        BlockedFriend tmp;
         memcpy(&tmp, data + i * sizeof(BlockedFriend), sizeof(BlockedFriend));
         Blocked.list[i].active = true;
         Blocked.list[i].num = i;
         Blocked.list[i].namelength = ntohs(tmp.namelength);
         memcpy(Blocked.list[i].name, tmp.name, Blocked.list[i].namelength + 1);
-        memcpy(Blocked.list[i].pub_key, tmp.pub_key, TOX_CLIENT_ID_SIZE);
+        memcpy(Blocked.list[i].pub_key, tmp.pub_key, TOX_PUBLIC_KEY_SIZE);
 
         uint8_t lastonline[sizeof(uint64_t)];
         memcpy(lastonline, &tmp.last_on, sizeof(uint64_t));
@@ -254,8 +256,8 @@ static int index_name_cmp(const void *n1, const void *n2)
     int res = qsort_strcasecmp_hlpr(Friends.list[*(int *) n1].name, Friends.list[*(int *) n2].name);
 
     /* Use weight to make qsort always put online friends before offline */
-    res = Friends.list[*(int *) n1].online ? (res - S_WEIGHT) : (res + S_WEIGHT);
-    res = Friends.list[*(int *) n2].online ? (res + S_WEIGHT) : (res - S_WEIGHT);
+    res = Friends.list[*(int *) n1].connection_status ? (res - S_WEIGHT) : (res + S_WEIGHT);
+    res = Friends.list[*(int *) n2].connection_status ? (res + S_WEIGHT) : (res - S_WEIGHT);
 
     return res;
 }
@@ -263,15 +265,15 @@ static int index_name_cmp(const void *n1, const void *n2)
 /* sorts Friends.index first by connection status then alphabetically */
 void sort_friendlist_index(void)
 {
-    int i;
-    int n = 0;
+    size_t i;
+    uint32_t n = 0;
 
     for (i = 0; i < Friends.max_idx; ++i) {
         if (Friends.list[i].active)
             Friends.index[n++] = Friends.list[i].num;
     }
 
-    qsort(Friends.index, Friends.num_friends, sizeof(int), index_name_cmp);
+    qsort(Friends.index, Friends.num_friends, sizeof(uint32_t), index_name_cmp);
 }
 
 static int index_name_cmp_block(const void *n1, const void *n2)
@@ -281,37 +283,42 @@ static int index_name_cmp_block(const void *n1, const void *n2)
 
 static void sort_blocklist_index(void)
 {
-    int i;
-    int n = 0;
+    size_t i;
+    uint32_t n = 0;
 
     for (i = 0; i < Blocked.max_idx; ++i) {
         if (Blocked.list[i].active)
             Blocked.index[n++] = Blocked.list[i].num;
     }
 
-    qsort(Blocked.index, Blocked.num_blocked, sizeof(int), index_name_cmp_block);
+    qsort(Blocked.index, Blocked.num_blocked, sizeof(uint32_t), index_name_cmp_block);
 }
 
-static void update_friend_last_online(int32_t num, uint64_t timestamp)
+static void update_friend_last_online(uint32_t num, uint64_t timestamp)
 {
     Friends.list[num].last_online.last_on = timestamp;
     Friends.list[num].last_online.tm = *localtime((const time_t*)&timestamp);
 
     /* if the format changes make sure TIME_STR_SIZE is the correct size */
-    const char *t = user_settings->time == TIME_12 ? "%I:%M %p" : "%H:%M";
+    const char *t = user_settings->timestamp_format;
     strftime(Friends.list[num].last_online.hour_min_str, TIME_STR_SIZE, t,
              &Friends.list[num].last_online.tm);
 }
 
-static void friendlist_onMessage(ToxWindow *self, Tox *m, int32_t num, const char *str, uint16_t len)
+static void friendlist_onMessage(ToxWindow *self, Tox *m, uint32_t num, TOX_MESSAGE_TYPE type, const char *str,
+                                 size_t length)
 {
     if (num >= Friends.max_idx)
         return;
 
-    if (Friends.list[num].chatwin == -1) {
+    if (Friends.list[num].chatwin != -1)
+        return;
+
     if (get_num_active_windows() < MAX_WINDOWS_NUM) {
         Friends.list[num].chatwin = add_window(m, new_chat(m, Friends.list[num].num));
-        } else {
+        return;
+    }
+
     char nick[TOX_MAX_NAME_LENGTH];
     get_nick_truncate(m, nick, num);
 
@@ -319,47 +326,48 @@ static void friendlist_onMessage(ToxWindow *self, Tox *m, int32_t num, const cha
     get_time_str(timefrmt, sizeof(timefrmt));
 
     line_info_add(prompt, timefrmt, nick, NULL, IN_MSG, 0, 0, "%s", str);
-
-            const char *msg = "* Warning: Too many windows are open.";
-            line_info_add(prompt, NULL, NULL, NULL, SYS_MSG, 0, RED, msg);
-            sound_notify(prompt, error, NT_WNDALERT_1, NULL);
-        }
-    }
+    line_info_add(prompt, NULL, NULL, NULL, SYS_MSG, 0, RED, "* Warning: Too many windows are open.");
+    sound_notify(prompt, notif_error, NT_WNDALERT_1, NULL);
 }
 
-static void friendlist_onConnectionChange(ToxWindow *self, Tox *m, int32_t num, uint8_t status)
+static void friendlist_onConnectionChange(ToxWindow *self, Tox *m, uint32_t num, TOX_CONNECTION connection_status)
 {
     if (num >= Friends.max_idx)
         return;
 
-    Friends.list[num].online = status;
+    if (connection_status == TOX_CONNECTION_NONE) {
+        --Friends.num_online;
+    } else if (Friends.list[num].connection_status == TOX_CONNECTION_NONE) {
+        ++Friends.num_online;
+
+        if (avatar_send(m, num) == -1)
+            fprintf(stderr, "avatar_send failed for friend %d\n", num);
+    }
+
+    Friends.list[num].connection_status = connection_status;
     update_friend_last_online(num, get_unix_time());
     store_data(m, DATA_FILE);
     sort_friendlist_index();
 }
 
-static void friendlist_onNickChange(ToxWindow *self, Tox *m, int32_t num, const char *nick, uint16_t len)
+static void friendlist_onNickChange(ToxWindow *self, Tox *m, uint32_t num, const char *nick, size_t length)
 {
-    if (len > TOX_MAX_NAME_LENGTH || num >= Friends.max_idx)
+    if (num >= Friends.max_idx)
         return;
 
     /* save old name for log renaming */
-    char oldname[TOXIC_MAX_NAME_LENGTH];
+    char oldname[TOXIC_MAX_NAME_LENGTH + 1];
     snprintf(oldname, sizeof(oldname), "%s", Friends.list[num].name);
 
     /* update name */
-    char tempname[TOX_MAX_NAME_LENGTH];
-    strcpy(tempname, nick);
-    len = MIN(len, TOXIC_MAX_NAME_LENGTH - 1);
-    tempname[len] = '\0';
-    snprintf(Friends.list[num].name, sizeof(Friends.list[num].name), "%s", tempname);
-    Friends.list[num].namelength = len;
+    snprintf(Friends.list[num].name, sizeof(Friends.list[num].name), "%s", nick);
+    Friends.list[num].namelength = strlen(Friends.list[num].name);
 
     /* get data for chatlog renaming */
-    char newnamecpy[TOXIC_MAX_NAME_LENGTH];
-    char myid[TOX_FRIEND_ADDRESS_SIZE];
-    strcpy(newnamecpy, tempname);
-    tox_get_address(m, (uint8_t *) myid);
+    char newnamecpy[TOXIC_MAX_NAME_LENGTH + 1];
+    char myid[TOX_ADDRESS_SIZE];
+    strcpy(newnamecpy, Friends.list[num].name);
+    tox_self_get_address(m, (uint8_t *) myid);
 
     if (strcmp(oldname, newnamecpy) != 0)
         rename_logfile(oldname, newnamecpy, myid, Friends.list[num].pub_key, Friends.list[num].chatwin);
@@ -367,7 +375,7 @@ static void friendlist_onNickChange(ToxWindow *self, Tox *m, int32_t num, const
     sort_friendlist_index();
 }
 
-static void friendlist_onStatusChange(ToxWindow *self, Tox *m, int32_t num, uint8_t status)
+static void friendlist_onStatusChange(ToxWindow *self, Tox *m, uint32_t num, TOX_USER_STATUS status)
 {
     if (num >= Friends.max_idx)
         return;
@@ -375,50 +383,53 @@ static void friendlist_onStatusChange(ToxWindow *self, Tox *m, int32_t num, uint
     Friends.list[num].status = status;
 }
 
-static void friendlist_onStatusMessageChange(ToxWindow *self, int32_t num, const char *status, uint16_t len)
+static void friendlist_onStatusMessageChange(ToxWindow *self, uint32_t num, const char *note, size_t length)
 {
-    if (len > TOX_MAX_STATUSMESSAGE_LENGTH || num >= Friends.max_idx)
+    if (length > TOX_MAX_STATUS_MESSAGE_LENGTH || num >= Friends.max_idx)
         return;
 
-    snprintf(Friends.list[num].statusmsg, sizeof(Friends.list[num].statusmsg), "%s", status);
+    snprintf(Friends.list[num].statusmsg, sizeof(Friends.list[num].statusmsg), "%s", note);
     Friends.list[num].statusmsg_len = strlen(Friends.list[num].statusmsg);
 }
 
-void friendlist_onFriendAdded(ToxWindow *self, Tox *m, int32_t num, bool sort)
+void friendlist_onFriendAdded(ToxWindow *self, Tox *m, uint32_t num, bool sort)
 {
-    if (Friends.max_idx < 0)
-        return;
-
-
-    Friends.num_friends = tox_count_friendlist(m);
     realloc_friends(Friends.max_idx + 1);
     memset(&Friends.list[Friends.max_idx], 0, sizeof(ToxicFriend));
 
-    int i;
+    uint32_t i;
 
     for (i = 0; i <= Friends.max_idx; ++i) {
         if (Friends.list[i].active)
             continue;
 
+        ++Friends.num_friends;
+
         Friends.list[i].num = num;
         Friends.list[i].active = true;
         Friends.list[i].chatwin = -1;
-        Friends.list[i].online = false;
-        Friends.list[i].status = TOX_USERSTATUS_NONE;
+        Friends.list[i].connection_status = TOX_CONNECTION_NONE;
+        Friends.list[i].status = TOX_USER_STATUS_NONE;
         Friends.list[i].logging_on = (bool) user_settings->autolog == AUTOLOG_ON;
-        tox_get_client_id(m, num, (uint8_t *) Friends.list[i].pub_key);
-        update_friend_last_online(i, tox_get_last_online(m, i));
+
+        TOX_ERR_FRIEND_GET_PUBLIC_KEY pkerr;
+        tox_friend_get_public_key(m, num, (uint8_t *) Friends.list[i].pub_key, &pkerr);
+
+        if (pkerr != TOX_ERR_FRIEND_GET_PUBLIC_KEY_OK)
+            fprintf(stderr, "tox_friend_get_public_key failed (error %d)\n", pkerr);
+
+        TOX_ERR_FRIEND_GET_LAST_ONLINE loerr;
+        uint64_t t = tox_friend_get_last_online(m, num, &loerr);
+
+        if (loerr != TOX_ERR_FRIEND_GET_LAST_ONLINE_OK)
+            t = 0;
+
+        update_friend_last_online(i, t);
 
         char tempname[TOX_MAX_NAME_LENGTH] = {0};
-        int len = get_nick_truncate(m, tempname, num);
-
-        if (len == -1 || tempname[0] == '\0') {
-            strcpy(Friends.list[i].name, UNKNOWN_NAME);
-            Friends.list[i].namelength = strlen(UNKNOWN_NAME);
-        } else {    /* Enforce toxic's maximum name length */
-            Friends.list[i].namelength = len;
+        get_nick_truncate(m, tempname, num);
         snprintf(Friends.list[i].name, sizeof(Friends.list[i].name), "%s", tempname);
-        }
+        Friends.list[i].namelength = strlen(Friends.list[i].name);
 
         if (i == Friends.max_idx)
             ++Friends.max_idx;
@@ -431,9 +442,8 @@ void friendlist_onFriendAdded(ToxWindow *self, Tox *m, int32_t num, bool sort)
 }
 
 /* puts blocked friend back in friendlist. fnum is new friend number, bnum is blocked number */
-static void friendlist_add_blocked(Tox *m, int32_t fnum, int32_t bnum)
+static void friendlist_add_blocked(Tox *m, uint32_t fnum, uint32_t bnum)
 {
-    Friends.num_friends = tox_count_friendlist(m);
     realloc_friends(Friends.max_idx + 1);
     memset(&Friends.list[Friends.max_idx], 0, sizeof(ToxicFriend));
 
@@ -443,15 +453,17 @@ static void friendlist_add_blocked(Tox *m, int32_t fnum, int32_t bnum)
         if (Friends.list[i].active)
             continue;
 
+        ++Friends.num_friends;
+
         Friends.list[i].num = fnum;
         Friends.list[i].active = true;
         Friends.list[i].chatwin = -1;
-        Friends.list[i].status = TOX_USERSTATUS_NONE;
+        Friends.list[i].status = TOX_USER_STATUS_NONE;
         Friends.list[i].logging_on = (bool) user_settings->autolog == AUTOLOG_ON;
         Friends.list[i].namelength = Blocked.list[bnum].namelength;
         update_friend_last_online(i, Blocked.list[bnum].last_on);
         memcpy(Friends.list[i].name, Blocked.list[bnum].name, Friends.list[i].namelength + 1);
-        memcpy(Friends.list[i].pub_key, Blocked.list[bnum].pub_key, TOX_CLIENT_ID_SIZE);
+        memcpy(Friends.list[i].pub_key, Blocked.list[bnum].pub_key, TOX_PUBLIC_KEY_SIZE);
 
         if (i == Friends.max_idx)
             ++Friends.max_idx;
@@ -463,17 +475,21 @@ static void friendlist_add_blocked(Tox *m, int32_t fnum, int32_t bnum)
     }
 }
 
-static void friendlist_onFileSendRequest(ToxWindow *self, Tox *m, int32_t num, uint8_t filenum,
-        uint64_t filesize, const char *filename, uint16_t filename_len)
+static void friendlist_onFileRecv(ToxWindow *self, Tox *m, uint32_t num, uint32_t filenum,
+                                  uint64_t file_size, const char *filename, size_t name_length)
 {
     if (num >= Friends.max_idx)
         return;
 
-    if (Friends.list[num].chatwin == -1) {
+    if (Friends.list[num].chatwin != -1)
+        return;
+
     if (get_num_active_windows() < MAX_WINDOWS_NUM) {
         Friends.list[num].chatwin = add_window(m, new_chat(m, Friends.list[num].num));
-        } else {
-            tox_file_send_control(m, num, 1, filenum, TOX_FILECONTROL_KILL, 0, 0);
+        return;
+    }
+
+    tox_file_control(m, num, filenum, TOX_FILE_CONTROL_CANCEL, NULL);
 
     char nick[TOX_MAX_NAME_LENGTH];
     get_nick_truncate(m, nick, num);
@@ -481,27 +497,30 @@ static void friendlist_onFileSendRequest(ToxWindow *self, Tox *m, int32_t num, u
     line_info_add(prompt, NULL, NULL, NULL, SYS_MSG, 0, RED,
                   "* File transfer from %s failed: too many windows are open.", nick);
 
-            sound_notify(prompt, error, NT_WNDALERT_1, NULL);
-        }
-    }
+    sound_notify(prompt, notif_error, NT_WNDALERT_1, NULL);
 }
 
-static void friendlist_onGroupInvite(ToxWindow *self, Tox *m, int32_t num, const char *group_pub_key, uint16_t length)
+static void friendlist_onGroupInvite(ToxWindow *self, Tox *m, int32_t num, uint8_t type, const char *group_pub_key,
+                                     uint16_t length)
 {
     if (num >= Friends.max_idx)
         return;
 
-    if (Friends.list[num].chatwin == -1) {
+    if (Friends.list[num].chatwin != -1)
+        return;
+
     if (get_num_active_windows() < MAX_WINDOWS_NUM) {
         Friends.list[num].chatwin = add_window(m, new_chat(m, Friends.list[num].num));
-        } else {
+        return;
+    }
+
     char nick[TOX_MAX_NAME_LENGTH];
     get_nick_truncate(m, nick, num);
+
     line_info_add(prompt, NULL, NULL, NULL, SYS_MSG, 0, RED,
                  "* Group chat invite from %s failed: too many windows are open.", nick);
-            sound_notify(prompt, error, NT_WNDALERT_1, NULL);
-        }
-    }
+
+    sound_notify(prompt, notif_error, NT_WNDALERT_1, NULL);
 }
 
 /* move friendlist/blocklist cursor up and down */
@@ -518,8 +537,20 @@ static void select_friend(ToxWindow *self, wint_t key, int *selected, int num)
     }
 }
 
-static void delete_friend(Tox *m, int32_t f_num)
+static void delete_friend(Tox *m, uint32_t f_num)
 {
+    TOX_ERR_FRIEND_DELETE err;
+    if (tox_friend_delete(m, f_num, &err) != true) {
+        fprintf(stderr, "tox_friend_delete failed with error %d\n", err);
+        return;
+    }
+
+    --Friends.num_friends;
+
+    if (Friends.list[f_num].connection_status != TOX_CONNECTION_NONE)
+        --Friends.num_online;
+
+    /* close friend's chatwindow if it's currently open */
     if (Friends.list[f_num].chatwin >= 0) {
         ToxWindow *toxwin = get_window_ptr(Friends.list[f_num].chatwin);
 
@@ -532,7 +563,6 @@ static void delete_friend(Tox *m, int32_t f_num)
     if (Friends.list[f_num].group_invite.key != NULL)
         free(Friends.list[f_num].group_invite.key);
 
-    tox_del_friend(m, f_num);
     memset(&Friends.list[f_num], 0, sizeof(ToxicFriend));
 
     int i;
@@ -543,7 +573,6 @@ static void delete_friend(Tox *m, int32_t f_num)
     }
 
     Friends.max_idx = i;
-    Friends.num_friends = tox_count_friendlist(m);
     realloc_friends(i);
 
     /* make sure num_selected stays within Friends.num_friends range */
@@ -554,60 +583,62 @@ static void delete_friend(Tox *m, int32_t f_num)
 }
 
 /* activates delete friend popup */
-static void del_friend_activate(ToxWindow *self, Tox *m, int32_t f_num)
+static void del_friend_activate(ToxWindow *self, Tox *m, uint32_t f_num)
 {
-    pendingdelete.popup = newwin(3, 22 + TOXIC_MAX_NAME_LENGTH - 1, 8, 8);
-    pendingdelete.active = true;
-    pendingdelete.num = f_num;
+    PendingDelete.popup = newwin(3, 22 + TOXIC_MAX_NAME_LENGTH, 8, 8);
+    PendingDelete.active = true;
+    PendingDelete.num = f_num;
 }
 
-static void delete_blocked_friend(int32_t bnum);
+static void delete_blocked_friend(uint32_t bnum);
 
 /* deactivates delete friend popup and deletes friend if instructed */
 static void del_friend_deactivate(ToxWindow *self, Tox *m, wint_t key)
 {
     if (key == 'y') {
         if (blocklist_view == 0) {
-            delete_friend(m, pendingdelete.num);
+            delete_friend(m, PendingDelete.num);
             sort_friendlist_index();
         } else {
-            delete_blocked_friend(pendingdelete.num);
+            delete_blocked_friend(PendingDelete.num);
             sort_blocklist_index();
         }
     }
 
-    delwin(pendingdelete.popup);
-    memset(&pendingdelete, 0, sizeof(pendingdelete));
+    delwin(PendingDelete.popup);
+    memset(&PendingDelete, 0, sizeof(PendingDelete));
     clear();
     refresh();
 }
 
 static void draw_del_popup(void)
 {
-    if (!pendingdelete.active)
+    if (!PendingDelete.active)
         return;
 
-    wattron(pendingdelete.popup, A_BOLD);
-    box(pendingdelete.popup, ACS_VLINE, ACS_HLINE);
-    wattroff(pendingdelete.popup, A_BOLD);
+    wattron(PendingDelete.popup, A_BOLD);
+    box(PendingDelete.popup, ACS_VLINE, ACS_HLINE);
+    wattroff(PendingDelete.popup, A_BOLD);
 
-    wmove(pendingdelete.popup, 1, 1);
-    wprintw(pendingdelete.popup, "Delete contact ");
-    wattron(pendingdelete.popup, A_BOLD);
+    wmove(PendingDelete.popup, 1, 1);
+    wprintw(PendingDelete.popup, "Delete contact ");
+    wattron(PendingDelete.popup, A_BOLD);
 
+    pthread_mutex_lock(&Winthread.lock);
     if (blocklist_view == 0)
-        wprintw(pendingdelete.popup, "%s", Friends.list[pendingdelete.num].name);
+        wprintw(PendingDelete.popup, "%s", Friends.list[PendingDelete.num].name);
     else
-        wprintw(pendingdelete.popup, "%s", Blocked.list[pendingdelete.num].name);
+        wprintw(PendingDelete.popup, "%s", Blocked.list[PendingDelete.num].name);
+    pthread_mutex_unlock(&Winthread.lock);
 
-    wattroff(pendingdelete.popup, A_BOLD);
-    wprintw(pendingdelete.popup, "? y/n");
+    wattroff(PendingDelete.popup, A_BOLD);
+    wprintw(PendingDelete.popup, "? y/n");
 
-    wrefresh(pendingdelete.popup);
+    wrefresh(PendingDelete.popup);
 }
 
 /* deletes contact from blocked list */
-static void delete_blocked_friend(int32_t bnum)
+static void delete_blocked_friend(uint32_t bnum)
 {
     memset(&Blocked.list[bnum], 0, sizeof(BlockedFriend));
 
@@ -628,7 +659,7 @@ static void delete_blocked_friend(int32_t bnum)
 }
 
 /* deletes contact from friendlist and puts in blocklist */
-void block_friend(Tox *m, int32_t fnum)
+void block_friend(Tox *m, uint32_t fnum)
 {
     if (Friends.num_friends <= 0)
         return;
@@ -646,7 +677,7 @@ void block_friend(Tox *m, int32_t fnum)
         Blocked.list[i].num = i;
         Blocked.list[i].namelength = Friends.list[fnum].namelength;
         Blocked.list[i].last_on = Friends.list[fnum].last_online.last_on;
-        memcpy(Blocked.list[i].pub_key, Friends.list[fnum].pub_key, TOX_CLIENT_ID_SIZE);
+        memcpy(Blocked.list[i].pub_key, Friends.list[fnum].pub_key, TOX_PUBLIC_KEY_SIZE);
         memcpy(Blocked.list[i].name, Friends.list[fnum].name, Friends.list[fnum].namelength + 1);
 
         ++Blocked.num_blocked;
@@ -664,15 +695,16 @@ void block_friend(Tox *m, int32_t fnum)
 }
 
 /* removes friend from blocklist, puts back in friendlist */
-static void unblock_friend(Tox *m, int32_t bnum)
+static void unblock_friend(Tox *m, uint32_t bnum)
 {
     if (Blocked.num_blocked <= 0)
         return;
 
-    int32_t friendnum = tox_add_friend_norequest(m, (uint8_t *) Blocked.list[bnum].pub_key);
+    TOX_ERR_FRIEND_ADD err;
+    uint32_t friendnum = tox_friend_add_norequest(m, (uint8_t *) Blocked.list[bnum].pub_key, &err);
 
-    if (friendnum == -1) {
-        line_info_add(prompt, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to unblock friend");
+    if (err != TOX_ERR_FRIEND_ADD_OK) {
+        line_info_add(prompt, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to unblock friend (error %d)\n", err);
         return;
     }
 
@@ -709,7 +741,7 @@ static void friendlist_onKey(ToxWindow *self, Tox *m, wint_t key, bool ltr)
         f = Friends.index[Friends.num_selected];
 
     /* lock screen and force decision on deletion popup */
-    if (pendingdelete.active) {
+    if (PendingDelete.active) {
         if (key == 'y' || key == 'n')
             del_friend_deactivate(self, m, key);
 
@@ -733,7 +765,7 @@ static void friendlist_onKey(ToxWindow *self, Tox *m, wint_t key, bool ltr)
             } else {
                 const char *msg = "* Warning: Too many windows are open.";
                 line_info_add(prompt, NULL, NULL, NULL, SYS_MSG, 0, RED, msg);
-                sound_notify(prompt, error, NT_WNDALERT_1, NULL);
+                sound_notify(prompt, notif_error, NT_WNDALERT_1, NULL);
             }
 
             break;
@@ -775,7 +807,7 @@ static void blocklist_onDraw(ToxWindow *self, Tox *m, int y2, int x2)
     if ((y2 - FLIST_OFST) <= 0)
         return;
 
-    int selected_num = 0;
+    uint32_t selected_num = 0;
 
     /* Determine which portion of friendlist to draw based on current position */
     int page = Blocked.num_selected / (y2 - FLIST_OFST);
@@ -785,7 +817,7 @@ static void blocklist_onDraw(ToxWindow *self, Tox *m, int y2, int x2)
     int i;
 
     for (i = start; i < Blocked.num_blocked && i < end; ++i) {
-        int f = Blocked.index[i];
+        uint32_t f = Blocked.index[i];
         bool f_selected = false;
 
         if (i == Blocked.num_selected) {
@@ -825,7 +857,7 @@ static void blocklist_onDraw(ToxWindow *self, Tox *m, int y2, int x2)
 
         int i;
 
-        for (i = 0; i < TOX_CLIENT_ID_SIZE; ++i)
+        for (i = 0; i < TOX_PUBLIC_KEY_SIZE; ++i)
             wprintw(self->window, "%02X", Blocked.list[selected_num].pub_key[i] & 0xff);
     }
 
@@ -858,36 +890,45 @@ static void friendlist_onDraw(ToxWindow *self, Tox *m)
         return;
     }
 
-    uint64_t cur_time = get_unix_time();
+    uint64_t cur_time = time(NULL);
     struct tm cur_loc_tm = *localtime((const time_t *) &cur_time);
 
-    pthread_mutex_lock(&Winthread.lock);
-    int nf = tox_get_num_online_friends(m);
-    pthread_mutex_unlock(&Winthread.lock);
-
     wattron(self->window, A_BOLD);
     wprintw(self->window, " Online: ");
     wattroff(self->window, A_BOLD);
-    wprintw(self->window, "%d/%d \n\n", nf, Friends.num_friends);
+
+    wprintw(self->window, "%d/%d \n\n", Friends.num_online, Friends.num_friends);
 
     if ((y2 - FLIST_OFST) <= 0)
         return;
 
-    int selected_num = 0;
+    uint32_t selected_num = 0;
 
     /* Determine which portion of friendlist to draw based on current position */
+    pthread_mutex_lock(&Winthread.lock);
     int page = Friends.num_selected / (y2 - FLIST_OFST);
+    pthread_mutex_unlock(&Winthread.lock);
+
     int start = (y2 - FLIST_OFST) * page;
     int end = y2 - FLIST_OFST + start;
 
+    pthread_mutex_lock(&Winthread.lock);
+    size_t num_friends = Friends.num_friends;
+    pthread_mutex_unlock(&Winthread.lock);
+
     int i;
 
-    for (i = start; i < Friends.num_friends && i < end; ++i) {
-        int f = Friends.index[i];
+    for (i = start; i < num_friends && i < end; ++i) {
+        pthread_mutex_lock(&Winthread.lock);
+        uint32_t f = Friends.index[i];
+        bool is_active = Friends.list[f].active;
+        int num_selected = Friends.num_selected;
+        pthread_mutex_unlock(&Winthread.lock);
+
         bool f_selected = false;
 
-        if (Friends.list[f].active) {
-            if (i == Friends.num_selected) {
+        if (is_active) {
+            if (i == num_selected) {
                 wattron(self->window, A_BOLD);
                 wprintw(self->window, " > ");
                 wattroff(self->window, A_BOLD);
@@ -897,26 +938,24 @@ static void friendlist_onDraw(ToxWindow *self, Tox *m)
                 wprintw(self->window, "   ");
             }
 
-            if (Friends.list[f].online) {
-                uint8_t status = Friends.list[f].status;
-                int colour = WHITE;
+            pthread_mutex_lock(&Winthread.lock);
+            TOX_CONNECTION connection_status = Friends.list[f].connection_status;
+            TOX_USER_STATUS status = Friends.list[f].status;
+            pthread_mutex_unlock(&Winthread.lock);
+
+            if (connection_status != TOX_CONNECTION_NONE) {
+                int colour = MAGENTA;
 
                 switch (status) {
-                    case TOX_USERSTATUS_NONE:
+                    case TOX_USER_STATUS_NONE:
                         colour = GREEN;
                         break;
-
-                    case TOX_USERSTATUS_AWAY:
+                    case TOX_USER_STATUS_AWAY:
                         colour = YELLOW;
                         break;
-
-                    case TOX_USERSTATUS_BUSY:
+                    case TOX_USER_STATUS_BUSY:
                         colour = RED;
                         break;
-
-                    case TOX_USERSTATUS_INVALID:
-                        colour = MAGENTA;
-                        break;
                 }
 
                 wattron(self->window, COLOR_PAIR(colour) | A_BOLD);
@@ -927,7 +966,9 @@ static void friendlist_onDraw(ToxWindow *self, Tox *m)
                     wattron(self->window, COLOR_PAIR(BLUE));
 
                 wattron(self->window, A_BOLD);
+                pthread_mutex_lock(&Winthread.lock);
                 wprintw(self->window, "%s", Friends.list[f].name);
+                pthread_mutex_unlock(&Winthread.lock);
                 wattroff(self->window, A_BOLD);
 
                 if (f_selected)
@@ -935,18 +976,27 @@ static void friendlist_onDraw(ToxWindow *self, Tox *m)
 
                 /* Reset Friends.list[f].statusmsg on window resize */
                 if (fix_statuses) {
-                    char statusmsg[TOX_MAX_STATUSMESSAGE_LENGTH];
+                    char statusmsg[TOX_MAX_STATUS_MESSAGE_LENGTH];
 
                     pthread_mutex_lock(&Winthread.lock);
-                    tox_get_status_message(m, Friends.list[f].num, (uint8_t *) statusmsg, TOX_MAX_STATUSMESSAGE_LENGTH);
+                    tox_friend_get_status_message(m, Friends.list[f].num, (uint8_t *) statusmsg, NULL);
+                    size_t s_len = tox_friend_get_status_message_size(m, Friends.list[f].num, NULL);
                     pthread_mutex_unlock(&Winthread.lock);
 
+                    statusmsg[s_len] = '\0';
+
+                    filter_str(statusmsg, s_len);
+
+                    pthread_mutex_lock(&Winthread.lock);
                     snprintf(Friends.list[f].statusmsg, sizeof(Friends.list[f].statusmsg), "%s", statusmsg);
                     Friends.list[f].statusmsg_len = strlen(Friends.list[f].statusmsg);
+                    pthread_mutex_unlock(&Winthread.lock);
                 }
 
                 /* Truncate note if it doesn't fit on one line */
-                uint16_t maxlen = x2 - getcurx(self->window) - 2;
+                size_t maxlen = x2 - getcurx(self->window) - 2;
+
+                pthread_mutex_lock(&Winthread.lock);
 
                 if (Friends.list[f].statusmsg_len > maxlen) {
                     Friends.list[f].statusmsg[maxlen - 3] = '\0';
@@ -955,9 +1005,11 @@ static void friendlist_onDraw(ToxWindow *self, Tox *m)
                     Friends.list[f].statusmsg_len = maxlen;
                 }
 
-                if (Friends.list[f].statusmsg[0])
+                if (Friends.list[f].statusmsg_len > 0)
                     wprintw(self->window, " %s", Friends.list[f].statusmsg);
 
+                pthread_mutex_unlock(&Winthread.lock);
+
                 wprintw(self->window, "\n");
             } else {
                 wprintw(self->window, "%s ", OFFLINE_CHAR);
@@ -966,18 +1018,29 @@ static void friendlist_onDraw(ToxWindow *self, Tox *m)
                     wattron(self->window, COLOR_PAIR(BLUE));
 
                 wattron(self->window, A_BOLD);
+                pthread_mutex_lock(&Winthread.lock);
                 wprintw(self->window, "%s", Friends.list[f].name);
+                pthread_mutex_unlock(&Winthread.lock);
                 wattroff(self->window, A_BOLD);
 
                 if (f_selected)
                     wattroff(self->window, COLOR_PAIR(BLUE));
 
+                pthread_mutex_lock(&Winthread.lock);
                 uint64_t last_seen = Friends.list[f].last_online.last_on;
+                pthread_mutex_unlock(&Winthread.lock);
 
                 if (last_seen != 0) {
-                    int day_dist = (cur_loc_tm.tm_yday - Friends.list[f].last_online.tm.tm_yday) % 365;
+                    pthread_mutex_lock(&Winthread.lock);
+
+                    int day_dist = (
+                            cur_loc_tm.tm_yday - Friends.list[f].last_online.tm.tm_yday
+                        + ((cur_loc_tm.tm_year - Friends.list[f].last_online.tm.tm_year) * 365)
+                    );
                     const char *hourmin = Friends.list[f].last_online.hour_min_str;
 
+                    pthread_mutex_unlock(&Winthread.lock);
+
                     switch (day_dist) {
                         case 0:
                             wprintw(self->window, " Last seen: Today %s\n", hourmin);
@@ -1000,7 +1063,7 @@ static void friendlist_onDraw(ToxWindow *self, Tox *m)
 
     self->x = x2;
 
-    if (Friends.num_friends) {
+    if (num_friends) {
         wmove(self->window, y2 - 1, 1);
 
         wattron(self->window, A_BOLD);
@@ -1009,7 +1072,7 @@ static void friendlist_onDraw(ToxWindow *self, Tox *m)
 
         int i;
 
-        for (i = 0; i < TOX_CLIENT_ID_SIZE; ++i)
+        for (i = 0; i < TOX_PUBLIC_KEY_SIZE; ++i)
             wprintw(self->window, "%02X", Friends.list[selected_num].pub_key[i] & 0xff);
     }
 
@@ -1020,7 +1083,7 @@ static void friendlist_onDraw(ToxWindow *self, Tox *m)
         help_onDraw(self);
 }
 
-void disable_chatwin(int32_t f_num)
+void disable_chatwin(uint32_t f_num)
 {
     Friends.list[f_num].chatwin = -1;
 }
@@ -1030,7 +1093,7 @@ static void friendlist_onAv(ToxWindow *self, ToxAv *av, int call_index)
 {
     int id = toxav_get_peer_id(av, call_index, 0);
 
-    if ( id != ErrorInternal && id >= Friends.max_idx)
+    if ( id != av_ErrorUnknown && id >= Friends.max_idx)
         return;
 
     Tox *m = toxav_get_tox(av);
@@ -1048,7 +1111,7 @@ static void friendlist_onAv(ToxWindow *self, ToxAv *av, int call_index)
             const char *errmsg = "* Warning: Too many windows are open.";
             line_info_add(prompt, NULL, NULL, NULL, SYS_MSG, 0, RED, errmsg);
 
-            sound_notify(prompt, error, NT_WNDALERT_1, NULL);
+            sound_notify(prompt, notif_error, NT_WNDALERT_1, NULL);
         }
     }
 }
@@ -1067,11 +1130,10 @@ ToxWindow new_friendlist(void)
     ret.onFriendAdded = &friendlist_onFriendAdded;
     ret.onMessage = &friendlist_onMessage;
     ret.onConnectionChange = &friendlist_onConnectionChange;
-    ret.onAction = &friendlist_onMessage;    /* Action has identical behaviour to message */
     ret.onNickChange = &friendlist_onNickChange;
     ret.onStatusChange = &friendlist_onStatusChange;
     ret.onStatusMessageChange = &friendlist_onStatusMessageChange;
-    ret.onFileSendRequest = &friendlist_onFileSendRequest;
+    ret.onFileRecv = &friendlist_onFileRecv;
     ret.onGroupInvite = &friendlist_onGroupInvite;
 
 #ifdef AUDIO

src/friendlist.h

@@ -27,20 +27,7 @@
 
 #include "toxic.h"
 #include "windows.h"
-#include "file_senders.h"
-
-struct FileReceiver {
-    char filename[MAX_STR_SIZE];
-    int filenum;
-    FILE *file;
-    bool pending;
-    bool active;
-    uint64_t size;
-    uint64_t bytes_recv;
-    double bps;
-    uint64_t last_progress;   /* unix-time when we last updated progress */
-    uint32_t line_id;
-};
+#include "file_transfers.h"
 
 struct LastOnline {
     uint64_t last_on;
@@ -51,51 +38,55 @@ struct LastOnline {
 struct GroupChatInvite {
     char *key;
     uint16_t length;
+    uint8_t type;
     bool pending;
 };
 
 typedef struct {
-    char name[TOXIC_MAX_NAME_LENGTH];
+    char name[TOXIC_MAX_NAME_LENGTH + 1];
     int namelength;
-    char statusmsg[TOX_MAX_STATUSMESSAGE_LENGTH];
-    uint16_t statusmsg_len;
-    char pub_key[TOX_CLIENT_ID_SIZE];
-    int32_t num;
+    char statusmsg[TOX_MAX_STATUS_MESSAGE_LENGTH + 1];
+    size_t statusmsg_len;
+    char pub_key[TOX_PUBLIC_KEY_SIZE];
+    uint32_t num;
     int chatwin;
     bool active;
-    bool online;
-    uint8_t is_typing;
+    TOX_CONNECTION connection_status;
+    bool is_typing;
     bool logging_on;    /* saves preference for friend irrespective of global settings */
     uint8_t status;
+
     struct LastOnline last_online;
-    struct FileReceiver file_receiver[MAX_FILES];
     struct GroupChatInvite group_invite;
-    uint8_t active_file_receivers;
+
+    struct FileTransfer file_receiver[MAX_FILES];
+    struct FileTransfer file_sender[MAX_FILES];
 } ToxicFriend;
 
 typedef struct {
-    char name[TOXIC_MAX_NAME_LENGTH];
+    char name[TOXIC_MAX_NAME_LENGTH + 1];
     int namelength;
-    char pub_key[TOX_CLIENT_ID_SIZE];
-    int32_t num;
+    char pub_key[TOX_PUBLIC_KEY_SIZE];
+    uint32_t num;
     bool active;
     uint64_t last_on;
 } BlockedFriend;
 
 typedef struct {
     int num_selected;
-    int max_idx;    /* 1 + the index of the last friend in list */
-    int num_friends;
-    int *index;
+    size_t num_friends;
+    size_t num_online;
+    size_t max_idx;    /* 1 + the index of the last friend in list */
+    uint32_t *index;
     ToxicFriend *list;
 } FriendsList;
 
 ToxWindow new_friendlist(void);
-void disable_chatwin(int32_t f_num);
+void disable_chatwin(uint32_t f_num);
 int get_friendnum(uint8_t *name);
 int load_blocklist(char *data);
 void kill_friendlist(void);
-void friendlist_onFriendAdded(ToxWindow *self, Tox *m, int32_t num, bool sort);
+void friendlist_onFriendAdded(ToxWindow *self, Tox *m, uint32_t num, bool sort);
 
 /* sorts friendlist_index first by connection status then alphabetically */
 void sort_friendlist_index(void);

src/global_commands.c

@@ -34,6 +34,8 @@
 #include "groupchat.h"
 #include "prompt.h"
 #include "help.h"
+#include "term_mplex.h"
+#include "avatars.h"
 
 extern char *DATA_FILE;
 extern ToxWindow *prompt;
@@ -60,13 +62,14 @@ void cmd_accept(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[
         return;
     }
 
-    const char *msg;
-    int32_t friendnum = tox_add_friend_norequest(m, FrndRequests.request[req].key);
+    TOX_ERR_FRIEND_ADD err;
+    uint32_t friendnum = tox_friend_add_norequest(m, FrndRequests.request[req].key, &err);
 
-    if (friendnum == -1)
-        msg = "Failed to add friend.";
-    else {
-        msg = "Friend request accepted.";
+    if (err != TOX_ERR_FRIEND_ADD_OK) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to add friend (error %d\n)", err);
+        return;
+    } else {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Friend request accepted.");
         on_friendadded(m, friendnum, true);
     }
 
@@ -81,47 +84,55 @@ void cmd_accept(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[
 
     FrndRequests.max_idx = i;
     --FrndRequests.num_requests;
-    line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "%s", msg);
+
 }
 
-void cmd_add_helper(ToxWindow *self, Tox *m, char *id_bin, char *msg)
+void cmd_add_helper(ToxWindow *self, Tox *m, const char *id_bin, const char *msg)
 {
     const char *errmsg;
-    int32_t f_num = tox_add_friend(m, (uint8_t *) id_bin, (uint8_t *) msg, (uint16_t) strlen(msg));
 
-    switch (f_num) {
-        case TOX_FAERR_TOOLONG:
+    TOX_ERR_FRIEND_ADD err;
+    uint32_t f_num = tox_friend_add(m, (uint8_t *) id_bin, (uint8_t *) msg, strlen(msg), &err);
+
+    switch (err) {
+        case TOX_ERR_FRIEND_ADD_TOO_LONG:
             errmsg = "Message is too long.";
             break;
 
-        case TOX_FAERR_NOMESSAGE:
+        case TOX_ERR_FRIEND_ADD_NO_MESSAGE:
             errmsg = "Please add a message to your request.";
             break;
 
-        case TOX_FAERR_OWNKEY:
+        case TOX_ERR_FRIEND_ADD_OWN_KEY:
             errmsg = "That appears to be your own ID.";
             break;
 
-        case TOX_FAERR_ALREADYSENT:
+        case TOX_ERR_FRIEND_ADD_ALREADY_SENT:
             errmsg = "Friend request has already been sent.";
             break;
 
-        case TOX_FAERR_UNKNOWN:
-            errmsg = "Undefined error when adding friend.";
-            break;
-
-        case TOX_FAERR_BADCHECKSUM:
+        case TOX_ERR_FRIEND_ADD_BAD_CHECKSUM:
             errmsg = "Bad checksum in address.";
             break;
 
-        case TOX_FAERR_SETNEWNOSPAM:
+        case TOX_ERR_FRIEND_ADD_SET_NEW_NOSPAM:
             errmsg = "Nospam was different.";
             break;
 
-        default:
+        case TOX_ERR_FRIEND_ADD_MALLOC:
+            errmsg = "Core memory allocation failed.";
+            break;
+
+        case TOX_ERR_FRIEND_ADD_OK:
             errmsg = "Friend request sent.";
             on_friendadded(m, f_num, true);
             break;
+
+        case TOX_ERR_FRIEND_ADD_NULL:
+        /* fallthrough */
+        default:
+            errmsg = "Faile to add friend: Unknown error.";
+            break;
     }
 
     line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, errmsg);
@@ -151,21 +162,23 @@ void cmd_add(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX
         snprintf(msg, sizeof(msg), "%s", tmp);
     } else {
         char selfname[TOX_MAX_NAME_LENGTH];
-        uint16_t n_len = tox_get_self_name(m, (uint8_t *) selfname);
+        tox_self_get_name(m, (uint8_t *) selfname);
+
+        size_t n_len = tox_self_get_name_size(m);
         selfname[n_len] = '\0';
         snprintf(msg, sizeof(msg), "Hello, my name is %s. Care to Tox?", selfname);
     }
 
-    char id_bin[TOX_FRIEND_ADDRESS_SIZE] = {0};
+    char id_bin[TOX_ADDRESS_SIZE] = {0};
     uint16_t id_len = (uint16_t) strlen(id);
 
     /* try to add tox ID */
-    if (id_len == 2 * TOX_FRIEND_ADDRESS_SIZE) {
+    if (id_len == 2 * TOX_ADDRESS_SIZE) {
         size_t i;
         char xx[3];
         uint32_t x;
 
-        for (i = 0; i < TOX_FRIEND_ADDRESS_SIZE; ++i) {
+        for (i = 0; i < TOX_ADDRESS_SIZE; ++i) {
             xx[0] = id[2 * i];
             xx[1] = id[2 * i + 1];
             xx[2] = '\0';
@@ -186,15 +199,9 @@ void cmd_add(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX
 
 void cmd_avatar(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
 {
-    if (argc < 2) {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to set avatar: No file path supplied.");
-        return;
-    }
-
-    /* turns the avatar off */
-    if (strlen(argv[1]) < 3) {
-        tox_unset_avatar(m);
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "No avatar set.");
+    if (argc < 2 || strlen(argv[1]) < 3) {
+        avatar_unset(m);
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Avatar is not set.");
         return;
     }
 
@@ -207,64 +214,30 @@ void cmd_avatar(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[
     char path[MAX_STR_SIZE];
     snprintf(path, sizeof(path), "%s", &argv[1][1]);
     int len = strlen(path) - 1;
+
+    if (len <= 0) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Invalid path.");
+        return;
+    }
+
     path[len] = '\0';
-
-    off_t sz = file_size(path);
-
-    if (sz <= 8) {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to set avatar: Invalid file.");
-        return;
-    }
-
-    if (sz > TOX_AVATAR_MAX_DATA_LENGTH) {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to set avatar: File is too large.");
-        return;
-    }
-
-    FILE *fp = fopen(path, "rb");
-
-    if (fp == NULL) {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to set avatar: Could not open file.");
-        return;
-    }
-
-    char PNG_signature[8] = {0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A};
-
-    if (check_file_signature(PNG_signature, sizeof(PNG_signature), fp) != 0) {
-        fclose(fp);
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to set avatar: File type not supported.");
-        return;
-    }
-
-    char *avatar = malloc(sz);
-
-    if (avatar == NULL)
-        exit_toxic_err("Failed in set_avatar", FATALERR_MEMORY);
-
-    if (fread(avatar, sz, 1, fp) != 1) {
-        fclose(fp);
-        free(avatar);
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to set avatar: Read fail.");
-        return;
-    }
-
-    if (tox_set_avatar(m, TOX_AVATAR_FORMAT_PNG, (const uint8_t *) avatar, (uint32_t) sz) == -1)
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to set avatar: Core error.");
-
     char filename[MAX_STR_SIZE];
     get_file_name(filename, sizeof(filename), path);
-    line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Avatar set to '%s'", filename);
 
-    fclose(fp);
-    free(avatar);
+    if (avatar_set(m, path, len) == -1) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0,
+                      "Failed to set avatar. Avatars must be in PNG format and may not exceed %d bytes.",
+                      MAX_AVATAR_FILE_SIZE);
+        return;
+    }
+
+    line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Avatar set to '%s'", filename);
 }
 
 void cmd_clear(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
 {
     line_info_clear(self->chatwin->hst);
-    wclear(window);
-    endwin();
-    refresh();
+    force_refresh(window);
 }
 
 void cmd_connect(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
@@ -276,16 +249,38 @@ void cmd_connect(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)
 
     const char *ip = argv[1];
     const char *port = argv[2];
-    const char *key = argv[3];
+    const char *ascii_key = argv[3];
 
     if (atoi(port) == 0) {
         line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Invalid port.");
         return;
     }
 
-    char *binary_string = hex_string_to_bin(key);
-    tox_bootstrap_from_address(m, ip, atoi(port), (uint8_t *) binary_string);
-    free(binary_string);
+    char key_binary[TOX_PUBLIC_KEY_SIZE * 2 + 1];
+    if (hex_string_to_bin(ascii_key, strlen(ascii_key), key_binary, TOX_PUBLIC_KEY_SIZE) == -1) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Invalid key.");
+        return;
+    }
+
+    TOX_ERR_BOOTSTRAP err;
+    tox_bootstrap(m, ip, atoi(port), (uint8_t *) key_binary, &err);
+    tox_add_tcp_relay(m, ip, atoi(port), (uint8_t *) key_binary, &err);
+
+    switch (err) {
+        case TOX_ERR_BOOTSTRAP_BAD_HOST:
+            line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Bootstrap failed: Invalid IP.");
+            break;
+
+        case TOX_ERR_BOOTSTRAP_BAD_PORT:
+            line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Bootstrap failed: Invalid port.");
+            break;
+
+        case TOX_ERR_BOOTSTRAP_NULL:
+            line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Bootstrap failed.");
+            break;
+        default:
+            break;
+    }
 }
 
 void cmd_decline(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
@@ -327,14 +322,37 @@ void cmd_groupchat(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*arg
         return;
     }
 
-    int groupnum = tox_add_groupchat(m);
+    if (argc < 1) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Please specify group type: text | audio");
+        return;
+    }
+
+    uint8_t type;
+
+    if (!strcasecmp(argv[1], "audio"))
+        type = TOX_GROUPCHAT_TYPE_AV;
+    else if (!strcasecmp(argv[1], "text"))
+        type = TOX_GROUPCHAT_TYPE_TEXT;
+    else {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Valid group types are: text | audio");
+        return;
+    }
+
+    int groupnum = -1;
+
+    if (type == TOX_GROUPCHAT_TYPE_TEXT)
+        groupnum = tox_add_groupchat(m);
+#ifdef AUDIO
+    else
+        groupnum = toxav_add_av_groupchat(m, NULL, NULL);
+#endif
 
     if (groupnum == -1) {
         line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Group chat instance failed to initialize.");
         return;
     }
 
-    if (init_groupchat_win(prompt, m, groupnum) == -1) {
+    if (init_groupchat_win(prompt, m, groupnum, type) == -1) {
         line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Group chat window failed to initialize.");
         tox_del_groupchat(m, groupnum);
         return;
@@ -361,19 +379,21 @@ void cmd_log(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX
     const char *swch = argv[1];
 
     if (!strcmp(swch, "1") || !strcmp(swch, "on")) {
-        char myid[TOX_FRIEND_ADDRESS_SIZE];
-        tox_get_address(m, (uint8_t *) myid);
+        char myid[TOX_ADDRESS_SIZE];
+        tox_self_get_address(m, (uint8_t *) myid);
+
+        int log_ret = -1;
 
         if (self->is_chat) {
             Friends.list[self->num].logging_on = true;
-            log_enable(self->name, myid, Friends.list[self->num].pub_key, log, LOG_CHAT);
+            log_ret = log_enable(self->name, myid, Friends.list[self->num].pub_key, log, LOG_CHAT);
         } else if (self->is_prompt) {
-            log_enable(self->name, myid, NULL, log, LOG_PROMPT);
+            log_ret = log_enable(self->name, myid, NULL, log, LOG_PROMPT);
         } else if (self->is_groupchat) {
-            log_enable(self->name, myid, NULL, log, LOG_GROUP);
+            log_ret = log_enable(self->name, myid, NULL, log, LOG_GROUP);
         }
 
-        msg = "Logging enabled";
+        msg = log_ret == 0 ? "Logging enabled." : "Warning: Log failed to initialize.";
         line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, msg);
         return;
     } else if (!strcmp(swch, "0") || !strcmp(swch, "off")) {
@@ -382,7 +402,7 @@ void cmd_log(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX
 
         log_disable(log);
 
-        msg = "Logging disabled";
+        msg = "Logging disabled.";
         line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, msg);
         return;
     }
@@ -393,13 +413,13 @@ void cmd_log(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX
 
 void cmd_myid(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
 {
-    char id[TOX_FRIEND_ADDRESS_SIZE * 2 + 1] = {0};
-    char address[TOX_FRIEND_ADDRESS_SIZE];
-    tox_get_address(m, (uint8_t *) address);
+    char id[TOX_ADDRESS_SIZE * 2 + 1] = {0};
+    char address[TOX_ADDRESS_SIZE];
+    tox_self_get_address(m, (uint8_t *) address);
 
     size_t i;
 
-    for (i = 0; i < TOX_FRIEND_ADDRESS_SIZE; ++i) {
+    for (i = 0; i < TOX_ADDRESS_SIZE; ++i) {
         char xx[3];
         snprintf(xx, sizeof(xx), "%02X", address[i] & 0xff);
         strcat(id, xx);
@@ -416,7 +436,7 @@ void cmd_nick(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MA
     }
 
     char nick[MAX_STR_SIZE];
-    int len = 0;
+    size_t len = 0;
 
     if (argv[1][0] == '\"') {    /* remove opening and closing quotes */
         snprintf(nick, sizeof(nick), "%s", &argv[1][1]);
@@ -435,7 +455,7 @@ void cmd_nick(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MA
     len = MIN(len, TOXIC_MAX_NAME_LENGTH - 1);
     nick[len] = '\0';
 
-    tox_set_name(m, (uint8_t *) nick, (uint16_t) len);
+    tox_self_set_name(m, (uint8_t *) nick, len, NULL);
     prompt_update_nick(prompt, nick);
 
     store_data(m, DATA_FILE);
@@ -486,9 +506,9 @@ void cmd_requests(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv
         if (!FrndRequests.request[i].active)
             continue;
 
-        char id[TOX_CLIENT_ID_SIZE * 2 + 1] = {0};
+        char id[TOX_PUBLIC_KEY_SIZE * 2 + 1] = {0};
 
-        for (j = 0; j < TOX_CLIENT_ID_SIZE; ++j) {
+        for (j = 0; j < TOX_PUBLIC_KEY_SIZE; ++j) {
             char d[3];
             snprintf(d, sizeof(d), "%02X", FrndRequests.request[i].key[j] & 0xff);
             strcat(id, d);
@@ -507,39 +527,38 @@ void cmd_status(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[
     bool have_note = false;
     const char *errmsg;
 
+    lock_status ();
+
     if (argc >= 2) {
         have_note = true;
     } else if (argc < 1) {
         errmsg = "Require a status. Statuses are: online, busy and away.";
         line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, errmsg);
-        return;
+        goto finish;
     }
 
-    char status[MAX_STR_SIZE];
-    snprintf(status, sizeof(status), "%s", argv[1]);
-    str_to_lower(status);
+    const char *status_str = argv[1];
+    TOX_USER_STATUS status;
 
-    TOX_USERSTATUS status_kind;
-
-    if (!strcmp(status, "online"))
-        status_kind = TOX_USERSTATUS_NONE;
-    else if (!strcmp(status, "away"))
-        status_kind = TOX_USERSTATUS_AWAY;
-    else if (!strcmp(status, "busy"))
-        status_kind = TOX_USERSTATUS_BUSY;
+    if (!strcasecmp(status_str, "online"))
+        status = TOX_USER_STATUS_NONE;
+    else if (!strcasecmp(status_str, "away"))
+        status = TOX_USER_STATUS_AWAY;
+    else if (!strcasecmp(status_str, "busy"))
+        status = TOX_USER_STATUS_BUSY;
     else {
         errmsg = "Invalid status. Valid statuses are: online, busy and away.";
         line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, errmsg);
-        return;
+        goto finish;
     }
 
-    tox_set_user_status(m, status_kind);
-    prompt_update_status(prompt, status_kind);
+    tox_self_set_status(m, status);
+    prompt_update_status(prompt, status);
 
     if (have_note) {
         if (argv[2][0] != '\"') {
             line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Note must be enclosed in quotes.");
-            return;
+            goto finish;
         }
 
         /* remove opening and closing quotes */
@@ -550,4 +569,7 @@ void cmd_status(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[
 
         prompt_update_statusmessage(prompt, m, msg);
     }
+
+finish:
+    unlock_status ();
 }

src/global_commands.h

@@ -42,7 +42,7 @@ void cmd_quit(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]
 void cmd_requests(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_status(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 
-void cmd_add_helper(ToxWindow *self, Tox *m, char *id_bin, char *msg);
+void cmd_add_helper(ToxWindow *self, Tox *m, const char *id_bin, const char *msg);
 
 #ifdef AUDIO
 void cmd_list_devices(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);

src/group_commands.c

@@ -0,0 +1,79 @@
+/*  group_commands.c
+ *
+ *
+ *  Copyright (C) 2014 Toxic All Rights Reserved.
+ *
+ *  This file is part of Toxic.
+ *
+ *  Toxic is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Toxic is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Toxic.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <string.h>
+
+#include "toxic.h"
+#include "windows.h"
+#include "line_info.h"
+#include "misc_tools.h"
+#include "log.h"
+
+void cmd_set_title(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
+{
+    char title[MAX_STR_SIZE];
+
+    if (argc < 1) {
+        int tlen = tox_group_get_title(m, self->num, (uint8_t *) title, TOX_MAX_NAME_LENGTH);
+
+        if (tlen != -1) {
+            title[tlen] = '\0';
+            line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Title is set to: %s", title);
+        } else {
+            line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Title is not set");
+        }
+
+        return;
+    }
+
+    if (argv[1][0] != '\"') {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Title must be enclosed in quotes.");
+        return;
+    }
+
+    /* remove opening and closing quotes */
+    snprintf(title, sizeof(title), "%s", &argv[1][1]);
+    int len = strlen(title) - 1;
+    title[len] = '\0';
+
+    if (tox_group_set_title(m, self->num, (uint8_t *) title, len) != 0) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to set title.");
+        return;
+    }
+
+    set_window_title(self, title, len);
+
+    char timefrmt[TIME_STR_SIZE];
+    char selfnick[TOX_MAX_NAME_LENGTH];
+
+    get_time_str(timefrmt, sizeof(timefrmt));
+
+    tox_self_get_name(m, (uint8_t *) selfnick);
+    size_t sn_len = tox_self_get_name_size(m);
+    selfnick[sn_len] = '\0';
+
+    line_info_add(self, timefrmt, selfnick, NULL, NAME_CHANGE, 0, 0, " set the group title to: %s", title);
+
+    char tmp_event[MAX_STR_SIZE];
+    snprintf(tmp_event, sizeof(tmp_event), "set title to %s", title);
+    write_to_log(tmp_event, selfnick, self->chatwin->log, true);
+}

src/group_commands.h

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

src/groupchat.c

@@ -29,6 +29,21 @@
 #include <assert.h>
 #include <time.h>
 #include <wchar.h>
+#include <unistd.h>
+
+#ifdef AUDIO
+#ifdef __APPLE__
+#include <OpenAL/al.h>
+#include <OpenAL/alc.h>
+#else
+#include <AL/al.h>
+#include <AL/alc.h>
+/* compatibility with older versions of OpenAL */
+#ifndef ALC_ALL_DEVICES_SPECIFIER
+#include <AL/alext.h>
+#endif  /* ALC_ALL_DEVICES_SPECIFIER */
+#endif  /* __APPLE__ */
+#endif  /* AUDIO */
 
 #include "windows.h"
 #include "toxic.h"
@@ -44,6 +59,7 @@
 #include "help.h"
 #include "notify.h"
 #include "autocomplete.h"
+#include "device.h"
 
 extern char *DATA_FILE;
 
@@ -51,22 +67,65 @@ static GroupChat groupchats[MAX_GROUPCHAT_NUM];
 static int max_groupchat_index = 0;
 
 extern struct user_settings *user_settings;
+extern struct Winthread Winthread;
 
-/* temporary until group chats have unique commands */
-extern const char glob_cmd_list[AC_NUM_GLOB_COMMANDS][MAX_CMDNAME_SIZE];
+#ifdef AUDIO
+#define AC_NUM_GROUP_COMMANDS 22
+#else
+#define AC_NUM_GROUP_COMMANDS 18
+#endif /* AUDIO */
 
-int init_groupchat_win(ToxWindow *prompt, Tox *m, int groupnum)
+/* Array of groupchat command names used for tab completion. */
+static const char group_cmd_list[AC_NUM_GROUP_COMMANDS][MAX_CMDNAME_SIZE] = {
+    { "/accept"     },
+    { "/add"        },
+    { "/avatar"     },
+    { "/clear"      },
+    { "/close"      },
+    { "/connect"    },
+    { "/decline"    },
+    { "/exit"       },
+    { "/group"      },
+    { "/help"       },
+    { "/log"        },
+    { "/myid"       },
+    { "/nick"       },
+    { "/note"       },
+    { "/quit"       },
+    { "/requests"   },
+    { "/status"     },
+    { "/title"      },
+
+#ifdef AUDIO
+
+    { "/lsdev"       },
+    { "/sdev"        },
+    { "/mute"        },
+    { "/sense"       },
+
+#endif /* AUDIO */
+};
+
+#ifdef AUDIO
+static int group_audio_open_out_device(int groupnum);
+static int group_audio_close_out_device(int groupnum);
+#endif  /* AUDIO */
+
+int init_groupchat_win(ToxWindow *prompt, Tox *m, int groupnum, uint8_t type)
 {
     if (groupnum > MAX_GROUPCHAT_NUM)
         return -1;
 
+    ToxWindow self = new_group_chat(m, groupnum);
     int i;
 
     for (i = 0; i <= max_groupchat_index; ++i) {
         if (!groupchats[i].active) {
-            groupchats[i].chatwin = add_window(m, new_group_chat(m, groupnum));
+            groupchats[i].chatwin = add_window(m, self);
             groupchats[i].active = true;
             groupchats[i].num_peers = 0;
+            groupchats[i].type = type;
+            groupchats[i].start_time = get_unix_time();
 
             groupchats[i].peer_names = malloc(sizeof(uint8_t) * TOX_MAX_NAME_LENGTH);
             groupchats[i].oldpeer_names = malloc(sizeof(uint8_t) * TOX_MAX_NAME_LENGTH);
@@ -80,6 +139,12 @@ int init_groupchat_win(ToxWindow *prompt, Tox *m, int groupnum)
             memcpy(&groupchats[i].oldpeer_names[0], UNKNOWN_NAME, sizeof(UNKNOWN_NAME));
             groupchats[i].oldpeer_name_lengths[0] = (uint16_t) strlen(UNKNOWN_NAME);
 
+#ifdef AUDIO
+            if (type == TOX_GROUPCHAT_TYPE_AV)
+                if (group_audio_open_out_device(i) == -1)
+                    fprintf(stderr, "Group Audio failed to init\n");
+#endif /* AUDIO */
+
             set_active_window(groupchats[i].chatwin);
 
             if (i == max_groupchat_index)
@@ -92,7 +157,7 @@ int init_groupchat_win(ToxWindow *prompt, Tox *m, int groupnum)
     return -1;
 }
 
-void kill_groupchat_window(ToxWindow *self)
+static void kill_groupchat_window(ToxWindow *self)
 {
     ChatContext *ctx = self->chatwin;
 
@@ -107,9 +172,12 @@ void kill_groupchat_window(ToxWindow *self)
     del_window(self);
 }
 
-static void close_groupchat(ToxWindow *self, Tox *m, int groupnum)
+void close_groupchat(ToxWindow *self, Tox *m, int groupnum)
 {
     tox_del_groupchat(m, groupnum);
+#ifdef AUDIO
+    group_audio_close_out_device(groupnum);
+#endif
 
     free(groupchats[groupnum].peer_names);
     free(groupchats[groupnum].oldpeer_names);
@@ -128,6 +196,42 @@ static void close_groupchat(ToxWindow *self, Tox *m, int groupnum)
     kill_groupchat_window(self);
 }
 
+/* destroys and re-creates groupchat window with or without the peerlist */
+void redraw_groupchat_win(ToxWindow *self)
+{
+    ChatContext *ctx = self->chatwin;
+
+    endwin();
+    refresh();
+    clear();
+
+    int x2, y2;
+    getmaxyx(stdscr, y2, x2);
+    y2 -= 2;
+
+    if (ctx->sidebar) {
+        delwin(ctx->sidebar);
+        ctx->sidebar = NULL;
+    }
+
+    delwin(ctx->linewin);
+    delwin(ctx->history);
+    delwin(self->window);
+
+    self->window = newwin(y2, x2, 0, 0);
+    ctx->linewin = subwin(self->window, CHATBOX_HEIGHT, x2, y2 - CHATBOX_HEIGHT, 0);
+
+    if (self->show_peerlist) {
+        ctx->history = subwin(self->window, y2 - CHATBOX_HEIGHT + 1, x2 - SIDEBAR_WIDTH - 1, 0, 0);
+        ctx->sidebar = subwin(self->window, y2 - CHATBOX_HEIGHT + 1, SIDEBAR_WIDTH, 0, x2 - SIDEBAR_WIDTH);
+    } else {
+        ctx->history = subwin(self->window, y2 - CHATBOX_HEIGHT + 1, x2, 0, 0);
+    }
+
+    scrollok(ctx->history, 0);
+
+}
+
 static void groupchat_onGroupMessage(ToxWindow *self, Tox *m, int groupnum, int peernum,
                                      const char *msg, uint16_t len)
 {
@@ -137,18 +241,18 @@ static void groupchat_onGroupMessage(ToxWindow *self, Tox *m, int groupnum, int
     ChatContext *ctx = self->chatwin;
 
     char nick[TOX_MAX_NAME_LENGTH];
-    int n_len = tox_group_peername(m, groupnum, peernum, (uint8_t *) nick);
-    n_len = MIN(n_len, TOXIC_MAX_NAME_LENGTH - 1);  /* enforce client max name length */
-    nick[n_len] = '\0';
+    get_group_nick_truncate(m, nick, peernum, groupnum);
 
     char selfnick[TOX_MAX_NAME_LENGTH];
-    uint16_t sn_len = tox_get_self_name(m, (uint8_t *) selfnick);
+    tox_self_get_name(m, (uint8_t *) selfnick);
+
+    size_t sn_len = tox_self_get_name_size(m);
     selfnick[sn_len] = '\0';
 
     int nick_clr = strcmp(nick, selfnick) == 0 ? GREEN : CYAN;
 
-    /* Only play sound if mentioned */
-    if (strcasestr(msg, selfnick) && strncmp(selfnick, nick, TOXIC_MAX_NAME_LENGTH - 1)) {
+    /* Only play sound if mentioned by someone else */
+    if (strcasestr(msg, selfnick) && strcmp(selfnick, nick)) {
         sound_notify(self, generic_message, NT_WNDALERT_0, NULL);
 
         if (self->active_box != -1)
@@ -158,7 +262,9 @@ static void groupchat_onGroupMessage(ToxWindow *self, Tox *m, int groupnum, int
 
         nick_clr = RED;
     }
-    else sound_notify(self, silent, NT_WNDALERT_1, NULL);
+    else {
+        sound_notify(self, silent, NT_WNDALERT_1, NULL);
+    }
 
     char timefrmt[TIME_STR_SIZE];
     get_time_str(timefrmt, sizeof(timefrmt));
@@ -175,29 +281,26 @@ static void groupchat_onGroupAction(ToxWindow *self, Tox *m, int groupnum, int p
 
     ChatContext *ctx = self->chatwin;
 
+    char nick[TOX_MAX_NAME_LENGTH];
+    get_group_nick_truncate(m, nick, peernum, groupnum);
+
     char selfnick[TOX_MAX_NAME_LENGTH];
-    uint16_t n_len = tox_get_self_name(m, (uint8_t *) selfnick);
+    tox_self_get_name(m, (uint8_t *) selfnick);
+
+    size_t n_len = tox_self_get_name_size(m);
     selfnick[n_len] = '\0';
 
     if (strcasestr(action, selfnick)) {
         sound_notify(self, generic_message, NT_WNDALERT_0, NULL);
 
-        char nick[TOX_MAX_NAME_LENGTH];
-        int n_len = tox_group_peername(m, groupnum, peernum, (uint8_t *) nick);
-        n_len = MIN(n_len, TOXIC_MAX_NAME_LENGTH - 1);  /* enforce client max name length */
-        nick[n_len] = '\0';
-        
         if (self->active_box != -1)
             box_silent_notify2(self, NT_NOFOCUS, self->active_box, "* %s %s", nick, action );
         else
             box_silent_notify(self, NT_NOFOCUS, &self->active_box, self->name, "* %s %s", nick, action);
     }
-    else sound_notify(self, silent, NT_WNDALERT_1, NULL);
-
-    char nick[TOX_MAX_NAME_LENGTH];
-    n_len = tox_group_peername(m, groupnum, peernum, (uint8_t *) nick);
-    n_len = MIN(n_len, TOXIC_MAX_NAME_LENGTH - 1);
-    nick[n_len] = '\0';
+    else {
+        sound_notify(self, silent, NT_WNDALERT_1, NULL);
+    }
 
     char timefrmt[TIME_STR_SIZE];
     get_time_str(timefrmt, sizeof(timefrmt));
@@ -206,6 +309,32 @@ static void groupchat_onGroupAction(ToxWindow *self, Tox *m, int groupnum, int p
     write_to_log(action, nick, ctx->log, true);
 }
 
+static void groupchat_onGroupTitleChange(ToxWindow *self, Tox *m, int groupnum, int peernum, const char *title,
+                                         uint8_t length)
+{
+    ChatContext *ctx = self->chatwin;
+
+    if (self->num != groupnum)
+        return;
+
+    set_window_title(self, title, length);
+
+    char timefrmt[TIME_STR_SIZE];
+    get_time_str(timefrmt, sizeof(timefrmt));
+
+    /* don't announce title when we join the room */
+    if (!timed_out(groupchats[self->num].start_time, GROUP_EVENT_WAIT))
+        return;
+
+    char nick[TOX_MAX_NAME_LENGTH];
+    get_group_nick_truncate(m, nick, peernum, groupnum);
+    line_info_add(self, timefrmt, nick, NULL, NAME_CHANGE, 0, 0, " set the group title to: %s", title);
+
+    char tmp_event[MAX_STR_SIZE];
+    snprintf(tmp_event, sizeof(tmp_event), "set title to %s", title);
+    write_to_log(tmp_event, nick, ctx->log, true);
+}
+
 /* Puts two copies of peerlist/lengths in chat instance */
 static void copy_peernames(int gnum, uint8_t peerlist[][TOX_MAX_NAME_LENGTH], uint16_t lengths[], int npeers)
 {
@@ -227,31 +356,75 @@ static void copy_peernames(int gnum, uint8_t peerlist[][TOX_MAX_NAME_LENGTH], ui
         exit_toxic_err("failed in copy_peernames", FATALERR_MEMORY);
     }
 
-    uint16_t unknown_len = (uint16_t) strlen(UNKNOWN_NAME);
+    uint16_t u_len = strlen(UNKNOWN_NAME);
     int i;
 
     for (i = 0; i < npeers; ++i) {
-        if (string_is_empty((char *) peerlist[i])) {
-            memcpy(&groupchats[gnum].peer_names[i * N], UNKNOWN_NAME, sizeof(UNKNOWN_NAME));
-            groupchats[gnum].peer_name_lengths[i] = unknown_len;
+         if (!lengths[i]) {
+            memcpy(&groupchats[gnum].peer_names[i * N], UNKNOWN_NAME, u_len);
+            groupchats[gnum].peer_names[i * N + u_len] = '\0';
+            groupchats[gnum].peer_name_lengths[i] = u_len;
         } else {
-            memcpy(&groupchats[gnum].peer_names[i * N], peerlist[i], N);
-            uint16_t n_len = lengths[i];
-
-            n_len = MIN(n_len, TOXIC_MAX_NAME_LENGTH - 1);
-
+            uint16_t n_len = MIN(lengths[i], TOXIC_MAX_NAME_LENGTH - 1);
+            memcpy(&groupchats[gnum].peer_names[i * N], peerlist[i], n_len);
             groupchats[gnum].peer_names[i * N + n_len] = '\0';
             groupchats[gnum].peer_name_lengths[i] = n_len;
+            filter_str((char *) &groupchats[gnum].peer_names[i * N], n_len);
         }
     }
 
     memcpy(groupchats[gnum].oldpeer_names, groupchats[gnum].peer_names, N * npeers);
-    memcpy(groupchats[gnum].oldpeer_name_lengths, groupchats[gnum].peer_name_lengths,
-           sizeof(uint16_t) * npeers);
+    memcpy(groupchats[gnum].oldpeer_name_lengths, groupchats[gnum].peer_name_lengths, sizeof(uint16_t) * npeers);
 }
 
-static void groupchat_onGroupNamelistChange(ToxWindow *self, Tox *m, int groupnum, int peernum,
-                                            uint8_t change)
+struct group_add_thrd {
+    Tox *m;
+    ToxWindow *self;
+    int peernum;
+    int groupnum;
+    uint64_t timestamp;
+    pthread_t tid;
+    pthread_attr_t attr;
+};
+
+/* Waits GROUP_EVENT_WAIT seconds for a new peer to set their name before announcing them */
+void *group_add_wait(void *data)
+{
+    struct group_add_thrd *thrd = (struct group_add_thrd *) data;
+    ToxWindow *self = thrd->self;
+    Tox *m = thrd->m;
+    char peername[TOX_MAX_NAME_LENGTH];
+
+    /* keep polling for a name that differs from the default until we run out of time */
+    while (true) {
+        usleep(100000);
+
+        pthread_mutex_lock(&Winthread.lock);
+        get_group_nick_truncate(m, peername, thrd->peernum, thrd->groupnum);
+
+        if (strcmp(peername, DEFAULT_TOX_NAME) || timed_out(thrd->timestamp, GROUP_EVENT_WAIT)) {
+            pthread_mutex_unlock(&Winthread.lock);
+            break;
+        }
+
+        pthread_mutex_unlock(&Winthread.lock);
+    }
+
+    const char *event = "has joined the room";
+    char timefrmt[TIME_STR_SIZE];
+    get_time_str(timefrmt, sizeof(timefrmt));
+
+    pthread_mutex_lock(&Winthread.lock);
+    line_info_add(self, timefrmt, (char *) peername, NULL, CONNECTION, 0, GREEN, event);
+    write_to_log(event, (char *) peername, self->chatwin->log, true);
+    pthread_mutex_unlock(&Winthread.lock);
+
+    pthread_attr_destroy(&thrd->attr);
+    free(thrd);
+    pthread_exit(NULL);
+}
+
+static void groupchat_onGroupNamelistChange(ToxWindow *self, Tox *m, int groupnum, int peernum, uint8_t change)
 {
     if (self->num != groupnum)
         return;
@@ -278,7 +451,12 @@ static void groupchat_onGroupNamelistChange(ToxWindow *self, Tox *m, int groupnu
     /* Update name/len lists */
     uint8_t tmp_peerlist[num_peers][TOX_MAX_NAME_LENGTH];
     uint16_t tmp_peerlens[num_peers];
-    tox_group_get_names(m, groupnum, tmp_peerlist, tmp_peerlens, num_peers);
+
+    if (tox_group_get_names(m, groupnum, tmp_peerlist, tmp_peerlens, num_peers) == -1) {
+        memset(tmp_peerlist, 0, sizeof(tmp_peerlist));
+        memset(tmp_peerlens, 0, sizeof(tmp_peerlens));
+    }
+
     copy_peernames(groupnum, tmp_peerlist, tmp_peerlens, num_peers);
 
     /* get current peername then sort namelist */
@@ -300,14 +478,38 @@ static void groupchat_onGroupNamelistChange(ToxWindow *self, Tox *m, int groupnu
 
     switch (change) {
         case TOX_CHAT_CHANGE_PEER_ADD:
-            event = "has joined the room";
-            line_info_add(self, timefrmt, (char *) peername, NULL, CONNECTION, 0, GREEN, event);
-            write_to_log(event, (char *) peername, ctx->log, true);
+            if (!timed_out(groupchats[groupnum].start_time, GROUP_EVENT_WAIT))
+                break;
+
+            struct group_add_thrd *thrd = malloc(sizeof(struct group_add_thrd));
+            thrd->m = m;
+            thrd->peernum = peernum;
+            thrd->groupnum = groupnum;
+            thrd->self = self;
+            thrd->timestamp = get_unix_time();
+
+            if (pthread_attr_init(&thrd->attr) != 0) {
+                free(thrd);
+                return;
+            }
+
+            if (pthread_attr_setdetachstate(&thrd->attr, PTHREAD_CREATE_DETACHED) != 0) {
+                pthread_attr_destroy(&thrd->attr);
+                free(thrd);
+                return;
+            }
+
+            if (pthread_create(&thrd->tid, &thrd->attr, group_add_wait, (void *) thrd) != 0) {
+                pthread_attr_destroy(&thrd->attr);
+                free(thrd);
+                return;
+            }
+
             break;
 
         case TOX_CHAT_CHANGE_PEER_DEL:
             event = "has left the room";
-            line_info_add(self, timefrmt, (char *) oldpeername, NULL, CONNECTION, 0, RED, event);
+            line_info_add(self, timefrmt, (char *) oldpeername, NULL, DISCONNECTION, 0, RED, event);
 
             if (groupchats[self->num].side_pos > 0)
                 --groupchats[self->num].side_pos;
@@ -316,6 +518,13 @@ static void groupchat_onGroupNamelistChange(ToxWindow *self, Tox *m, int groupnu
             break;
 
         case TOX_CHAT_CHANGE_PEER_NAME:
+            if (!timed_out(groupchats[self->num].start_time, GROUP_EVENT_WAIT))
+                return;
+
+            /* ignore initial name change (TODO: this is a bad way to do this) */
+            if (strcmp((char *) oldpeername, DEFAULT_TOX_NAME) == 0)
+                return;
+
             event = " is now known as ";
             line_info_add(self, timefrmt, (char *) oldpeername, (char *) peername, NAME_CHANGE, 0, 0, event);
 
@@ -379,19 +588,19 @@ static void groupchat_onKey(ToxWindow *self, Tox *m, wint_t key, bool ltr)
             } else if (wcsncmp(ctx->line, L"/avatar \"", wcslen(L"/avatar \"")) == 0) {
                 diff = dir_match(self, m, ctx->line, L"/avatar");
             } else {
-                diff = complete_line(self, glob_cmd_list, AC_NUM_GLOB_COMMANDS, MAX_CMDNAME_SIZE);
+                diff = complete_line(self, group_cmd_list, AC_NUM_GROUP_COMMANDS, MAX_CMDNAME_SIZE);
             }
 
             if (diff != -1) {
                 if (x + diff > x2 - 1) {
-                    int wlen = wcswidth(ctx->line, sizeof(ctx->line));
+                    int wlen = MAX(0, wcswidth(ctx->line, sizeof(ctx->line) / sizeof(wchar_t)));
                     ctx->start = wlen < x2 ? 0 : wlen - x2 + 1;
                 }
             } else {
-                sound_notify(self, error, 0, NULL);
+                sound_notify(self, notif_error, 0, NULL);
             }
         } else {
-            sound_notify(self, error, 0, NULL);
+            sound_notify(self, notif_error, 0, NULL);
         }
     } else if (key == user_settings->key_peer_list_down) {    /* Scroll peerlist up and down one position */
         int L = y2 - CHATBOX_HEIGHT - SDBAR_OFST;
@@ -441,7 +650,10 @@ static void groupchat_onDraw(ToxWindow *self, Tox *m)
 
     ChatContext *ctx = self->chatwin;
 
+    pthread_mutex_lock(&Winthread.lock);
     line_info_print(self);
+    pthread_mutex_unlock(&Winthread.lock);
+
     wclear(ctx->linewin);
 
     curs_set(1);
@@ -450,8 +662,9 @@ static void groupchat_onDraw(ToxWindow *self, Tox *m)
         mvwprintw(ctx->linewin, 1, 0, "%ls", &ctx->line[ctx->start]);
 
     wclear(ctx->sidebar);
-
     mvwhline(self->window, y2 - CHATBOX_HEIGHT, 0, ACS_HLINE, x2);
+
+    if (self->show_peerlist) {
         mvwvline(ctx->sidebar, 0, 0, ACS_VLINE, y2 - CHATBOX_HEIGHT);
         mvwaddch(ctx->sidebar, y2 - CHATBOX_HEIGHT, 0, ACS_BTEE);
 
@@ -465,7 +678,6 @@ static void groupchat_onDraw(ToxWindow *self, Tox *m)
         mvwaddch(ctx->sidebar, 1, 0, ACS_LTEE);
         mvwhline(ctx->sidebar, 1, 1, ACS_HLINE, SIDEBAR_WIDTH - 1);
 
-    int N = TOX_MAX_NAME_LENGTH;
         int maxlines = y2 - SDBAR_OFST - CHATBOX_HEIGHT;
         int i;
 
@@ -475,16 +687,18 @@ static void groupchat_onDraw(ToxWindow *self, Tox *m)
 
             /* truncate nick to fit in side panel without modifying list */
             char tmpnck[TOX_MAX_NAME_LENGTH];
-        memcpy(tmpnck, &groupchats[self->num].peer_names[peer * N], SIDEBAR_WIDTH - 2);
-        tmpnck[SIDEBAR_WIDTH - 2] = '\0';
+            int maxlen = SIDEBAR_WIDTH - 2;
+            memcpy(tmpnck, &groupchats[self->num].peer_names[peer * TOX_MAX_NAME_LENGTH], maxlen);
+            tmpnck[maxlen] = '\0';
 
             wprintw(ctx->sidebar, "%s\n", tmpnck);
         }
+    }
 
     int y, x;
     getyx(self->window, y, x);
     (void) x;
-    int new_x = ctx->start ? x2 - 1 : wcswidth(ctx->line, ctx->pos);
+    int new_x = ctx->start ? x2 - 1 : MAX(0, wcswidth(ctx->line, ctx->pos));
     wmove(self->window, y + 1, new_x);
 
     wrefresh(self->window);
@@ -513,9 +727,11 @@ static void groupchat_onInit(ToxWindow *self, Tox *m)
     line_info_init(ctx->hst);
 
     if (user_settings->autolog == AUTOLOG_ON) {
-        char myid[TOX_FRIEND_ADDRESS_SIZE];
-        tox_get_address(m, (uint8_t *) myid);
-        log_enable(self->name, myid, NULL, ctx->log, LOG_GROUP);
+        char myid[TOX_ADDRESS_SIZE];
+        tox_self_get_address(m, (uint8_t *) myid);
+
+        if (log_enable(self->name, myid, NULL, ctx->log, LOG_GROUP) == -1)
+            line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Warning: Log failed to initialize.");
     }
 
     execute(ctx->history, self, m, "/log", GLOBAL_COMMAND_MODE);
@@ -524,6 +740,124 @@ static void groupchat_onInit(ToxWindow *self, Tox *m)
     wmove(self->window, y2 - CURS_Y_OFFSET, 0);
 }
 
+
+#ifdef AUDIO
+static int group_audio_open_out_device(int groupnum)
+{
+    char dname[MAX_STR_SIZE];
+    get_primary_device_name(output, dname, sizeof(dname));
+    dname[MAX_STR_SIZE - 1] = '\0';
+
+    groupchats[groupnum].audio.dvhandle = alcOpenDevice(dname);
+
+    if (groupchats[groupnum].audio.dvhandle == NULL)
+        return -1;
+
+    groupchats[groupnum].audio.dvctx = alcCreateContext(groupchats[groupnum].audio.dvhandle, NULL);
+    alcMakeContextCurrent(groupchats[groupnum].audio.dvctx);
+    alGenBuffers(OPENAL_BUFS, groupchats[groupnum].audio.buffers);
+    alGenSources((uint32_t) 1, &groupchats[groupnum].audio.source);
+    alSourcei(groupchats[groupnum].audio.source, AL_LOOPING, AL_FALSE);
+
+    if (alcGetError(groupchats[groupnum].audio.dvhandle) != AL_NO_ERROR) {
+        group_audio_close_out_device(groupnum);
+        groupchats[groupnum].audio.dvhandle = NULL;
+        groupchats[groupnum].audio.dvctx = NULL;
+        return -1;
+    }
+
+    alSourceQueueBuffers(groupchats[groupnum].audio.source, OPENAL_BUFS, groupchats[groupnum].audio.buffers);
+    alSourcePlay(groupchats[groupnum].audio.source);
+
+    return 0;
+}
+
+static int group_audio_close_out_device(int groupnum)
+{
+    if (!groupchats[groupnum].audio.dvhandle)
+        return -1;
+
+    if (!groupchats[groupnum].audio.dvctx)
+        return -1;
+
+    if (alcGetCurrentContext() != groupchats[groupnum].audio.dvctx)
+        alcMakeContextCurrent(groupchats[groupnum].audio.dvctx);
+
+    alDeleteSources((uint32_t) 1, &groupchats[groupnum].audio.source);
+    alDeleteBuffers(OPENAL_BUFS, groupchats[groupnum].audio.buffers);
+
+    alcMakeContextCurrent(NULL);
+    alcDestroyContext(groupchats[groupnum].audio.dvctx);
+
+    if (!alcCloseDevice(groupchats[groupnum].audio.dvhandle))
+        return -1;
+
+    return 0;
+}
+
+// static int group_audio_write(int peernum, int groupnum, const int16_t *pcm, unsigned int samples, uint8_t channels,
+//                              unsigned int sample_rate)
+// {
+//     if (!pcm)
+//         return -1;
+
+//     if (channels == 0 || channels > 2)
+//         return -2;
+
+//     ALuint bufid;
+//     ALint processed = 0, queued = 0;
+
+//     alGetSourcei(groupchats[groupnum].audio.source, AL_BUFFERS_PROCESSED, &processed);
+//     alGetSourcei(groupchats[groupnum].audio.source, AL_BUFFERS_QUEUED, &queued);
+//     fprintf(stderr, "source: %d, queued: %d, processed: %d\n", groupchats[groupnum].audio.source, queued, processed);
+
+//     if (processed) {
+//         ALuint bufids[processed];
+//         alSourceUnqueueBuffers(groupchats[groupnum].audio.source, processed, bufids);
+//         alDeleteBuffers(processed - 1, bufids + 1);
+//         bufid = bufids[0];
+//     } else if (queued < 16) {
+//         alGenBuffers(1, &bufid);
+//     } else {
+//         return -3;
+//     }
+
+//     int length = samples * channels * sizeof(int16_t);
+
+//     alBufferData(bufid, (channels == 1) ? AL_FORMAT_MONO16 : AL_FORMAT_STEREO16, pcm, length, sample_rate);
+//     alSourceQueueBuffers(groupchats[groupnum].audio.source, 1, &bufid);
+
+//     ALint state;
+//     alGetSourcei(groupchats[groupnum].audio.source, AL_SOURCE_STATE, &state);
+
+//     if (state != AL_PLAYING)
+//         alSourcePlay(groupchats[groupnum].audio.source);
+
+//     return 0;
+// }
+
+static void groupchat_onWriteDevice(ToxWindow *self, Tox *m, int groupnum, int peernum, const int16_t *pcm,
+                                    unsigned int samples, uint8_t channels, unsigned int sample_rate)
+{
+    return;
+
+    // if (groupnum != self->num)
+    //     return;
+
+    // if (peernum < 0)
+    //     return;
+
+    // if (groupchats[groupnum].audio.dvhandle == NULL)
+    //     fprintf(stderr, "dvhandle is null)\n");
+
+    // if (groupchats[groupnum].audio.dvctx == NULL)
+    //     fprintf(stderr, "ctx is null\n");
+
+    // int ret = group_audio_write(peernum, groupnum, pcm, samples, channels, sample_rate);
+    // fprintf(stderr, "write: %d\n", ret);
+}
+#endif  /* AUDIO */
+
 ToxWindow new_group_chat(Tox *m, int groupnum)
 {
     ToxWindow ret;
@@ -538,6 +872,11 @@ ToxWindow new_group_chat(Tox *m, int groupnum)
     ret.onGroupMessage = &groupchat_onGroupMessage;
     ret.onGroupNamelistChange = &groupchat_onGroupNamelistChange;
     ret.onGroupAction = &groupchat_onGroupAction;
+    ret.onGroupTitleChange = &groupchat_onGroupTitleChange;
+
+#ifdef AUDIO
+    ret.onWriteDevice = &groupchat_onWriteDevice;
+#endif
 
     snprintf(ret.name, sizeof(ret.name), "Group %d", groupnum);
 
@@ -551,6 +890,7 @@ ToxWindow new_group_chat(Tox *m, int groupnum)
     ret.help = help;
 
     ret.num = groupnum;
+    ret.show_peerlist = true;
     ret.active_box = -1;
 
     return ret;

src/groupchat.h

@@ -26,23 +26,61 @@
 #include "toxic.h"
 #include "windows.h"
 
+#ifdef AUDIO
+#include "audio_call.h"
+#endif
+
+#ifdef AUDIO
+#ifdef __APPLE__
+#include <OpenAL/al.h>
+#include <OpenAL/alc.h>
+#else
+#include <AL/al.h>
+#include <AL/alc.h>
+/* compatibility with older versions of OpenAL */
+#ifndef ALC_ALL_DEVICES_SPECIFIER
+#include <AL/alext.h>
+#endif  /* ALC_ALL_DEVICES_SPECIFIER */
+#endif  /* __APPLE__ */
+#endif  /* AUDIO */
+
 #define SIDEBAR_WIDTH 16
 #define SDBAR_OFST 2    /* Offset for the peer number box at the top of the statusbar */
 #define MAX_GROUPCHAT_NUM MAX_WINDOWS_NUM - 2
+#define GROUP_EVENT_WAIT 3
+
+#ifdef AUDIO
+struct GAudio {
+    ALCdevice  *dvhandle;    /* Handle of device selected/opened */
+    ALCcontext *dvctx;
+    ALuint source;
+    ALuint buffers[OPENAL_BUFS];
+};
+#endif  /* AUDIO */
 
 typedef struct {
     int chatwin;
     bool active;
+    uint8_t type;
     int num_peers;
     int side_pos;    /* current position of the sidebar - used for scrolling up and down */
+    uint64_t start_time;
     uint8_t  *peer_names;
     uint8_t  *oldpeer_names;
     uint16_t *peer_name_lengths;
     uint16_t *oldpeer_name_lengths;
+
+#ifdef AUDIO
+    struct GAudio audio;
+#endif
 } GroupChat;
 
-void kill_groupchat_window(ToxWindow *self);
-int init_groupchat_win(ToxWindow *prompt, Tox *m, int groupnum);
+void close_groupchat(ToxWindow *self, Tox *m, int groupnum);
+int init_groupchat_win(ToxWindow *prompt, Tox *m, int groupnum, uint8_t type);
+
+/* destroys and re-creates groupchat window with or without the peerlist */
+void redraw_groupchat_win(ToxWindow *self);
+
 ToxWindow new_group_chat(Tox *m, int groupnum);
 
 #endif /* #define GROUPCHAT_H */

src/help.c

@@ -27,7 +27,7 @@
 #include "help.h"
 #include "misc_tools.h"
 
-#define HELP_MENU_HEIGHT 8
+#define HELP_MENU_HEIGHT 9
 #define HELP_MENU_WIDTH 26
 
 void help_init_menu(ToxWindow *self)
@@ -86,6 +86,12 @@ static void help_draw_menu(ToxWindow *self)
     wattroff(win, A_BOLD | COLOR_PAIR(BLUE));
     wprintw(win, "hat commands\n");
 
+    wprintw(win, " g");
+    wattron(win, A_BOLD | COLOR_PAIR(BLUE));
+    wprintw(win, "r");
+    wattroff(win, A_BOLD | COLOR_PAIR(BLUE));
+    wprintw(win, "oup commands\n");
+
     wattron(win, A_BOLD | COLOR_PAIR(BLUE));
     wprintw(win, " f");
     wattroff(win, A_BOLD | COLOR_PAIR(BLUE));
@@ -138,7 +144,7 @@ static void help_draw_global(ToxWindow *self)
 
     wprintw(win, "  /add <addr> <msg>          : Add contact with optional message\n");
     wprintw(win, "  /accept <id>               : Accept friend request\n");
-    wprintw(win, "  /avatar <path>             : Set a personal avatar\n");
+    wprintw(win, "  /avatar <path>             : Set an avatar (leave path empty to unset)\n");
     wprintw(win, "  /decline <id>              : Decline friend request\n");
     wprintw(win, "  /requests                  : List pending friend requests\n");
     wprintw(win, "  /connect <ip> <port> <key> : Manually connect to a DHT node\n");
@@ -146,7 +152,7 @@ static void help_draw_global(ToxWindow *self)
     wprintw(win, "  /note <msg>                : Set a personal note\n");
     wprintw(win, "  /nick <nick>               : Set your nickname\n");
     wprintw(win, "  /log <on> or <off>         : Enable/disable logging\n");
-    wprintw(win, "  /groupchat                 : Create a group chat\n");
+    wprintw(win, "  /group <type>              : Create a group chat where type: text | audio\n");
     wprintw(win, "  /myid                      : Print your Tox ID\n");
     wprintw(win, "  /clear                     : Clear window history\n");
     wprintw(win, "  /close                     : Close the current chat window\n");
@@ -194,7 +200,7 @@ static void help_draw_chat(ToxWindow *self)
     wprintw(win, "  /hangup                    : Hangup active call\n");
     wprintw(win, "  /sdev <type> <id>          : Change active device\n");
     wprintw(win, "  /mute <type>               : Mute active device if in call\n");
-    wprintw(win, "  /sense <n>                 : VAD sensitivity treshold\n");
+    wprintw(win, "  /sense <n>                 : VAD sensitivity threshold\n");
 #endif /* AUDIO */
 
     help_draw_bottom_menu(win);
@@ -217,7 +223,8 @@ static void help_draw_keys(ToxWindow *self)
     wprintw(win, "  Page Up and Page Down     : Scroll window history one line\n");
     wprintw(win, "  Ctrl+F and Ctrl+V         : Scroll window history half a page\n");
     wprintw(win, "  Ctrl+H                    : Move to the bottom of window history\n");
-    wprintw(win, "  Ctrl+[ and Ctrl+]         : Scroll peer list in groupchats\n\n");
+    wprintw(win, "  Ctrl+[ and Ctrl+]         : Scroll peer list in groupchats\n");
+    wprintw(win, "  Ctrl+B                    : Toggle the groupchat peerlist\n\n");
     wprintw(win, "  (Note: Custom keybindings override these defaults.)\n\n");
 
     help_draw_bottom_menu(win);
@@ -226,6 +233,24 @@ static void help_draw_keys(ToxWindow *self)
     wrefresh(win);
 }
 
+static void help_draw_group(ToxWindow *self)
+{
+    WINDOW *win = self->help->win;
+
+    wmove(win, 1, 1);
+
+    wattron(win, A_BOLD | COLOR_PAIR(RED));
+    wprintw(win, "Group commands:\n");
+    wattroff(win, A_BOLD | COLOR_PAIR(RED));
+
+    wprintw(win, "  /title <msg>               : Set group title (show current title if no msg)\n\n");
+
+    help_draw_bottom_menu(win);
+
+    box(win, ACS_VLINE, ACS_HLINE);
+    wrefresh(win);
+}
+
 static void help_draw_contacts(ToxWindow *self)
 {
     WINDOW *win = self->help->win;
@@ -274,13 +299,18 @@ void help_onKey(ToxWindow *self, wint_t key)
             self->help->type = HELP_GLOBAL;
             break;
 
+        case 'r':
+            help_init_window(self, 6, 80);
+            self->help->type = HELP_GROUP;
+            break;
+
         case 'f':
             help_init_window(self, 10, 80);
             self->help->type = HELP_CONTACTS;
             break;
 
         case 'k':
-            help_init_window(self, 12, 80);
+            help_init_window(self, 13, 80);
             self->help->type = HELP_KEYS;
             break;
 
@@ -317,6 +347,7 @@ void help_onDraw(ToxWindow *self)
             break;
 
         case HELP_GROUP:
+            help_draw_group(self);
             break;
     }
 }

src/input.c

@@ -32,6 +32,10 @@
 #include "toxic_strings.h"
 #include "line_info.h"
 #include "notify.h"
+#include "groupchat.h"
+#include "settings.h"
+
+extern struct user_settings *user_settings;
 
 /* add a char to input field and buffer */
 void input_new_char(ToxWindow *self, wint_t key, int x, int y, int mx_x, int mx_y)
@@ -42,12 +46,12 @@ void input_new_char(ToxWindow *self, wint_t key, int x, int y, int mx_x, int mx_
 
     /* this is the only place we need to do this check */
     if (cur_len == -1) {
-        sound_notify(self, error, 0, NULL);
+        sound_notify(self, notif_error, 0, NULL);
         return;
     }
 
     if (add_char_to_buf(ctx, key) == -1) {
-        sound_notify(self, error, 0, NULL);
+        sound_notify(self, notif_error, 0, NULL);
         return;
     }
 
@@ -63,7 +67,7 @@ static void input_backspace(ToxWindow *self, int x, int mx_x)
     ChatContext *ctx = self->chatwin;
 
     if (del_char_buf_bck(ctx) == -1) {
-        sound_notify(self, error, 0, NULL);
+        sound_notify(self, notif_error, 0, NULL);
         return;
     }
 
@@ -80,21 +84,32 @@ static void input_backspace(ToxWindow *self, int x, int mx_x)
 static void input_delete(ToxWindow *self)
 {
     if (del_char_buf_frnt(self->chatwin) == -1)
-        sound_notify(self, error, 0, NULL);
+        sound_notify(self, notif_error, 0, NULL);
+}
+
+/* delete last typed word */
+static void input_del_word(ToxWindow *self, int x, int mx_x)
+{
+    ChatContext *ctx = self->chatwin;
+
+    if (del_word_buf(ctx) == -1) {
+        sound_notify(self, notif_error, 0, NULL);
+        return;
+    }
 }
 
 /* deletes entire line before cursor from input field and buffer */
 static void input_discard(ToxWindow *self)
 {
     if (discard_buf(self->chatwin) == -1)
-        sound_notify(self, error, 0, NULL);
+        sound_notify(self, notif_error, 0, NULL);
 }
 
 /* deletes entire line after cursor from input field and buffer */
 static void input_kill(ChatContext *ctx)
 {
     if (kill_buf(ctx) == -1)
-        sound_notify(NULL, error, NT_ALWAYS, NULL);
+        sound_notify(NULL, notif_error, NT_ALWAYS, NULL);
 }
 
 static void input_yank(ToxWindow *self, int x, int mx_x)
@@ -102,7 +117,7 @@ static void input_yank(ToxWindow *self, int x, int mx_x)
     ChatContext *ctx = self->chatwin;
 
     if (yank_buf(ctx) == -1) {
-        sound_notify(self, error, 0, NULL);
+        sound_notify(self, notif_error, 0, NULL);
         return;
     }
 
@@ -110,7 +125,7 @@ static void input_yank(ToxWindow *self, int x, int mx_x)
 
     if (x + yank_cols >= mx_x) {
         int rmdr = MAX(0, (x + yank_cols) - mx_x);
-        int s_len = wcswidth(&ctx->line[ctx->start], rmdr);
+        int s_len = MAX(0, wcswidth(&ctx->line[ctx->start], rmdr));
         ctx->start += s_len + 1;
     }
 }
@@ -122,7 +137,7 @@ static void input_mv_end(ToxWindow *self, int y, int mx_x)
 
     ctx->pos = ctx->len;
 
-    int wlen = wcswidth(ctx->line, sizeof(ctx->line));
+    int wlen = MAX(0, wcswidth(ctx->line, sizeof(ctx->line) / sizeof(wchar_t)));
     ctx->start = MAX(0, 1 + (mx_x * (wlen / mx_x) - mx_x) + (wlen % mx_x));
 }
 
@@ -181,7 +196,7 @@ static void input_history(ToxWindow *self, wint_t key, int mx_x)
     ChatContext *ctx = self->chatwin;
 
     fetch_hist_item(ctx, key);
-    int wlen = wcswidth(ctx->line, sizeof(ctx->line));
+    int wlen = MAX(0, wcswidth(ctx->line, sizeof(ctx->line) / sizeof(wchar_t)));
     ctx->start = wlen < mx_x ? 0 : wlen - mx_x + 1;
 }
 
@@ -213,6 +228,10 @@ bool input_handle(ToxWindow *self, wint_t key, int x, int y, int mx_x, int mx_y)
             input_yank(self, x, mx_x);
             break;
 
+        case T_KEY_C_W:
+            input_del_word(self, x, mx_x);
+            break;
+
         case KEY_HOME:
         case T_KEY_C_A:
             input_mv_home(self);
@@ -236,10 +255,26 @@ bool input_handle(ToxWindow *self, wint_t key, int x, int y, int mx_x, int mx_y)
             input_history(self, key, mx_x);
             break;
 
+        case T_KEY_C_L:
+            force_refresh(self->chatwin->history);
+            break;
+
         default:
             match = false;
             break;
     }
 
+    /* TODO: this special case is ugly.
+       maybe convert entire function to if/else and make them all customizable keys? */
+    if (!match && key == user_settings->key_toggle_peerlist) {
+        if (self->is_groupchat) {
+            self->show_peerlist ^= 1;
+            redraw_groupchat_win(self);
+        }
+
+        match = true;
+    }
+
+
     return match;
 }

src/line_info.c

@@ -59,7 +59,7 @@ void line_info_reset_start(ToxWindow *self, struct history *hst)
     int y2, x2;
     getmaxyx(self->window, y2, x2);
 
-    int side_offst = self->is_groupchat ? SIDEBAR_WIDTH : 0;
+    int side_offst = self->show_peerlist ? SIDEBAR_WIDTH : 0;
     int top_offst = self->is_chat || self->is_prompt ? 2 : 0;
     int max_y = (y2 - CHATBOX_HEIGHT - top_offst);
 
@@ -130,9 +130,12 @@ static struct line_info *line_info_ret_queue(struct history *hst)
 }
 
 /* creates new line_info line and puts it in the queue. */
-void line_info_add(ToxWindow *self, char *timestr, char *name1, char *name2, uint8_t type, uint8_t bold, 
-                   uint8_t colour, const char *msg, ...)
+void line_info_add(ToxWindow *self, const char *timestr, const char *name1, const char *name2, uint8_t type,
+                   uint8_t bold, uint8_t colour, const char *msg, ...)
 {
+    if (!self)
+        return;
+
     struct history *hst = self->chatwin->hst;
 
     if (hst->queue_sz >= MAX_LINE_INFO_QUEUE)
@@ -155,24 +158,30 @@ void line_info_add(ToxWindow *self, char *timestr, char *name1, char *name2, uin
     /* for type-specific formatting in print function */
     switch (type) {
         case IN_ACTION:
+        /* fallthrough */
         case OUT_ACTION:
-            len += 5;
+            len += strlen(user_settings->line_normal) + 2;
             break;
 
         case IN_MSG:
+        /* fallthrough */
         case OUT_MSG:
-            len += 6;
+            len += strlen(user_settings->line_normal) + 3;
             break;
 
         case CONNECTION:
-            len += 5;
+            len += strlen(user_settings->line_join) + 2;
+            break;
+
+        case DISCONNECTION:
+            len += strlen(user_settings->line_quit) + 2;
             break;
 
         case SYS_MSG:
             break;
 
         case NAME_CHANGE:
-            len += 4;
+            len += strlen(user_settings->line_alert) + 1;
             break;
 
         case PROMPT:
@@ -198,7 +207,7 @@ void line_info_add(ToxWindow *self, char *timestr, char *name1, char *name2, uin
 
     if (timestr) {
         snprintf(new_line->timestr, sizeof(new_line->timestr), "%s", timestr);
-        len += strlen(new_line->timestr);
+        len += strlen(new_line->timestr) + 1;
     }
 
     if (name1) {
@@ -246,7 +255,7 @@ static void line_info_check_queue(ToxWindow *self)
     if (x2 <= SIDEBAR_WIDTH)
         return;
 
-    int offst = self->is_groupchat ? SIDEBAR_WIDTH : 0;   /* offset width of groupchat sidebar */
+    int offst = self->show_peerlist ? SIDEBAR_WIDTH : 0;   /* offset width of groupchat sidebar */
     int lines = 1 + line->newlines + (line->len / (x2 - offst));
     int max_y = y2 - CHATBOX_HEIGHT;
 
@@ -258,10 +267,6 @@ static void line_info_check_queue(ToxWindow *self)
             ++hst->start_id;
         }
     }
-
-    /* force move to bottom of history when we print an outgoing message */
-    if (line->type == OUT_MSG)
-        line_info_reset_start(self, hst);
 }
 
 #define NOREAD_FLAG_TIMEOUT 5    /* seconds before a sent message with no read receipt is flagged as unread */
@@ -299,10 +304,12 @@ void line_info_print(ToxWindow *self)
 
         switch (type) {
             case OUT_MSG:
+            /* fallthrough */
             case OUT_MSG_READ:
+            /* fallthrough */
             case IN_MSG:
                 wattron(win, COLOR_PAIR(BLUE));
-                wprintw(win, "%s", line->timestr);
+                wprintw(win, "%s ", line->timestr);
                 wattroff(win, COLOR_PAIR(BLUE));
 
                 int nameclr = GREEN;
@@ -313,18 +320,22 @@ void line_info_print(ToxWindow *self)
                     nameclr = CYAN;
 
                 wattron(win, COLOR_PAIR(nameclr));
-                wprintw(win, "--- %s: ", line->name1);
+                wprintw(win, "%s %s: ", user_settings->line_normal, line->name1);
                 wattroff(win, COLOR_PAIR(nameclr));
 
                 if (line->msg[0] == '>')
                     wattron(win, COLOR_PAIR(GREEN));
+                else if (line->msg[0] == '<')
+                    wattron(win, COLOR_PAIR(RED));
 
                 wprintw(win, "%s", line->msg);
 
                 if (line->msg[0] == '>')
                     wattroff(win, COLOR_PAIR(GREEN));
+                else if (line->msg[0] == '<')
+                    wattroff(win, COLOR_PAIR(RED));
 
-                if (type == OUT_MSG && timed_out(line->timestamp, get_unix_time(), NOREAD_FLAG_TIMEOUT)) {
+                if (type == OUT_MSG && timed_out(line->timestamp, NOREAD_FLAG_TIMEOUT)) {
                     wattron(win, COLOR_PAIR(RED));
                     wprintw(win, " x", line->msg);
                     wattroff(win, COLOR_PAIR(RED));
@@ -339,17 +350,19 @@ void line_info_print(ToxWindow *self)
                 break;
 
             case OUT_ACTION_READ:
+            /* fallthrough */
             case OUT_ACTION:
+            /* fallthrough */
             case IN_ACTION:
                 wattron(win, COLOR_PAIR(BLUE));
-                wprintw(win, "%s", line->timestr);
+                wprintw(win, "%s ", line->timestr);
                 wattroff(win, COLOR_PAIR(BLUE));
 
                 wattron(win, COLOR_PAIR(YELLOW));
-                wprintw(win, "-*- %s %s", line->name1, line->msg);
+                wprintw(win, "%s %s %s", user_settings->line_normal, line->name1, line->msg);
                 wattroff(win, COLOR_PAIR(YELLOW));
 
-                if (type == OUT_ACTION && timed_out(line->timestamp, get_unix_time(), NOREAD_FLAG_TIMEOUT)) {
+                if (type == OUT_ACTION && timed_out(line->timestamp, NOREAD_FLAG_TIMEOUT)) {
                     wattron(win, COLOR_PAIR(RED));
                     wprintw(win, " x", line->msg);
                     wattroff(win, COLOR_PAIR(RED));
@@ -366,7 +379,7 @@ void line_info_print(ToxWindow *self)
             case SYS_MSG:
                 if (line->timestr[0]) {
                     wattron(win, COLOR_PAIR(BLUE));
-                    wprintw(win, "%s", line->timestr);
+                    wprintw(win, "%s ", line->timestr);
                     wattroff(win, COLOR_PAIR(BLUE));
                 }
 
@@ -399,11 +412,28 @@ void line_info_print(ToxWindow *self)
 
             case CONNECTION:
                 wattron(win, COLOR_PAIR(BLUE));
-                wprintw(win, "%s", line->timestr);
+                wprintw(win, "%s ", line->timestr);
                 wattroff(win, COLOR_PAIR(BLUE));
 
                 wattron(win, COLOR_PAIR(line->colour));
-                wprintw(win, "%s ", line->colour == RED ? "<--" : "-->");
+                wprintw(win, "%s ", user_settings->line_join);
+
+                wattron(win, A_BOLD);
+                wprintw(win, "%s ", line->name1);
+                wattroff(win, A_BOLD);
+
+                wprintw(win, "%s\n", line->msg);
+                wattroff(win, COLOR_PAIR(line->colour));
+
+                break;
+
+            case DISCONNECTION:
+                wattron(win, COLOR_PAIR(BLUE));
+                wprintw(win, "%s ", line->timestr);
+                wattroff(win, COLOR_PAIR(BLUE));
+
+                wattron(win, COLOR_PAIR(line->colour));
+                wprintw(win, "%s ", user_settings->line_quit);
 
                 wattron(win, A_BOLD);
                 wprintw(win, "%s ", line->name1);
@@ -416,11 +446,11 @@ void line_info_print(ToxWindow *self)
 
             case NAME_CHANGE:
                 wattron(win, COLOR_PAIR(BLUE));
-                wprintw(win, "%s", line->timestr);
+                wprintw(win, "%s ", line->timestr);
                 wattroff(win, COLOR_PAIR(BLUE));
 
                 wattron(win, COLOR_PAIR(MAGENTA));
-                wprintw(win, "-!- ");
+                wprintw(win, "%s ", user_settings->line_alert);
                 wattron(win, A_BOLD);
                 wprintw(win, "%s", line->name1);
                 wattroff(win, A_BOLD);
@@ -467,14 +497,14 @@ static void line_info_scroll_up(struct history *hst)
 {
     if (hst->line_start->prev)
         hst->line_start = hst->line_start->prev;
-    else sound_notify(NULL, error, NT_ALWAYS, NULL);
+    else sound_notify(NULL, notif_error, NT_ALWAYS, NULL);
 }
 
 static void line_info_scroll_down(struct history *hst)
 {
     if (hst->line_start->next)
         hst->line_start = hst->line_start->next;
-    else sound_notify(NULL, error, NT_ALWAYS, NULL);
+    else sound_notify(NULL, notif_error, NT_ALWAYS, NULL);
 }
 
 static void line_info_page_up(ToxWindow *self, struct history *hst)

src/line_info.h

@@ -41,13 +41,14 @@ enum {
     OUT_ACTION_READ,     /* same as OUT_MSG_READ but for actions */
     PROMPT,
     CONNECTION,
+    DISCONNECTION,
     NAME_CHANGE,
 } LINE_TYPE;
 
 struct line_info {
     char timestr[TIME_STR_SIZE];
-    char name1[TOXIC_MAX_NAME_LENGTH];
-    char name2[TOXIC_MAX_NAME_LENGTH];
+    char name1[TOXIC_MAX_NAME_LENGTH + 1];
+    char name2[TOXIC_MAX_NAME_LENGTH + 1];
     char msg[MAX_LINE_INFO_MSG_SIZE];
     uint64_t timestamp;
     uint8_t type;
@@ -74,8 +75,8 @@ struct history {
 };
 
 /* creates new line_info line and puts it in the queue. */
-void line_info_add(ToxWindow *self, char *timestr, char *name1, char *name2, uint8_t type, uint8_t bold, 
-                   uint8_t colour, const char *msg, ...);
+void line_info_add(ToxWindow *self, const char *timestr, const char *name1, const char *name2, uint8_t type,
+                   uint8_t bold, uint8_t colour, const char *msg, ...);
 
 /* Prints a section of history starting at line_start */
 void line_info_print(ToxWindow *self);

src/log.c

@@ -134,16 +134,14 @@ void write_to_log(const char *msg, const char *name, struct chatlog *log, bool e
     else
         snprintf(name_frmt, sizeof(name_frmt), "%s:", name);
 
-    const char *t = user_settings->time == TIME_12 ? "%Y/%m/%d [%I:%M:%S %p]" : "%Y/%m/%d [%H:%M:%S]";
+    const char *t = user_settings->log_timestamp_format;
     char s[MAX_STR_SIZE];
     strftime(s, MAX_STR_SIZE, t, get_time());
     fprintf(log->file, "%s %s %s\n", s, name_frmt, msg);
 
-    uint64_t curtime = get_unix_time();
-
-    if (timed_out(log->lastwrite, curtime, LOG_FLUSH_LIMIT)) {
+    if (timed_out(log->lastwrite, LOG_FLUSH_LIMIT)) {
         fflush(log->file);
-        log->lastwrite = curtime;
+        log->lastwrite = get_unix_time();
     }
 }
 
@@ -155,15 +153,19 @@ void log_disable(struct chatlog *log)
     memset(log, 0, sizeof(struct chatlog));
 }
 
-void log_enable(char *name, const char *selfkey, const char *otherkey, struct chatlog *log, int logtype)
+int log_enable(char *name, const char *selfkey, const char *otherkey, struct chatlog *log, int logtype)
 {
     log->log_on = true;
 
     if (log->file != NULL)
-        return;
+        return 0;
 
-    if (init_logging_session(name, selfkey, otherkey, log, logtype) == -1)
+    if (init_logging_session(name, selfkey, otherkey, log, logtype) == -1) {
         log_disable(log);
+        return -1;
+    }
+
+    return 0;
 }
 
 /* Loads previous history from chat log */
@@ -177,7 +179,7 @@ void load_chat_history(ToxWindow *self, struct chatlog *log)
     if (sz <= 0)
         return;
 
-    char *hstbuf = malloc(sz);
+    char *hstbuf = malloc(sz + 1);
 
     if (hstbuf == NULL)
         exit_toxic_err("failed in load_chat_history", FATALERR_MEMORY);
@@ -194,6 +196,8 @@ void load_chat_history(ToxWindow *self, struct chatlog *log)
         return;
     }
 
+    hstbuf[sz] = '\0';
+
     /* Number of history lines to load: must not be larger than MAX_LINE_INFO_QUEUE - 2 */
     int L = MIN(MAX_LINE_INFO_QUEUE - 2, user_settings->history_size);
     int start, count = 0;

src/log.h

@@ -39,8 +39,12 @@ enum {
 /* formats/writes line to log file */
 void write_to_log(const char *msg, const char *name, struct chatlog *log, bool event);
 
-/* enables logging for specified log and creates/fetches file if necessary */
-void log_enable(char *name, const char *selfkey, const char *otherkey, struct chatlog *log, int logtype);
+/* enables logging for specified log and creates/fetches file if necessary.
+ *
+ * Returns 0 on success.
+ * Returns -1 on failure.
+ */
+int log_enable(char *name, const char *selfkey, const char *otherkey, struct chatlog *log, int logtype);
 
 /* disables logging for specified log and closes file */
 void log_disable(struct chatlog *log);

src/message_queue.c

@@ -42,7 +42,7 @@ void cqueue_cleanup(struct chat_queue *q)
     free(q);
 }
 
-void cqueue_add(struct chat_queue *q, const char *msg, int len, uint8_t type, uint32_t line_id)
+void cqueue_add(struct chat_queue *q, const char *msg, size_t len, uint8_t type, uint32_t line_id)
 {
     struct cqueue_msg *new_m = malloc(sizeof(struct cqueue_msg));
 
@@ -103,7 +103,9 @@ void cqueue_remove(ToxWindow *self, Tox *m, uint32_t receipt)
         }
 
         char selfname[TOX_MAX_NAME_LENGTH];
-        uint16_t len = tox_get_self_name(m, (uint8_t *) selfname);
+        tox_self_get_name(m, (uint8_t *) selfname);
+
+        size_t len = tox_self_get_name_size(m);
         selfname[len] = '\0';
 
         write_to_log(msg->message, selfname, self->chatwin->log, msg->type == OUT_ACTION);
@@ -127,30 +129,26 @@ void cqueue_remove(ToxWindow *self, Tox *m, uint32_t receipt)
     }
 }
 
-#define CQUEUE_TRY_SEND_INTERVAL 10
+#define CQUEUE_TRY_SEND_INTERVAL 60
 
 /* Tries to send the oldest unsent message in queue. */
 void cqueue_try_send(ToxWindow *self, Tox *m)
 {
     struct chat_queue *q = self->chatwin->cqueue;
     struct cqueue_msg *msg = q->root;
-    uint64_t curtime = get_unix_time();
 
-    while (msg) {
-        if (msg->receipt != 0 && !timed_out(msg->last_send_try, curtime, CQUEUE_TRY_SEND_INTERVAL)) {
-            msg = msg->next;
-            continue;
-        }
+    if (!msg)
+        return;
+
+    if (msg->receipt != 0 && !timed_out(msg->last_send_try, CQUEUE_TRY_SEND_INTERVAL))
+        return;
 
     uint32_t receipt = 0;
 
-        if (msg->type == OUT_MSG)
-            receipt = tox_send_message(m, self->num, (uint8_t *) msg->message, msg->len);
-        else
-            receipt = tox_send_action(m, self->num, (uint8_t *) msg->message, msg->len);
+    TOX_MESSAGE_TYPE type = msg->type == OUT_MSG ? TOX_MESSAGE_TYPE_NORMAL : TOX_MESSAGE_TYPE_ACTION;
+    receipt = tox_friend_send_message(m, self->num, type, (uint8_t *) msg->message, msg->len, NULL);
 
-        msg->last_send_try = curtime;
+    msg->last_send_try = get_unix_time();
     msg->receipt = receipt;
     return;
-    }
 }

src/message_queue.h

@@ -25,7 +25,7 @@
 
 struct cqueue_msg {
     char message[MAX_STR_SIZE];
-    int len;
+    size_t len;
     int line_id;
     uint8_t type;
     uint32_t receipt;
@@ -40,7 +40,7 @@ struct chat_queue {
 };
 
 void cqueue_cleanup(struct chat_queue *q);
-void cqueue_add(struct chat_queue *q, const char *msg, int len, uint8_t type, uint32_t line_id);
+void cqueue_add(struct chat_queue *q, const char *msg, size_t len, uint8_t type, uint32_t line_id);
 
 /* Tries to send the oldest unsent message in queue. */
 void cqueue_try_send(ToxWindow *self, Tox *m);

src/misc_tools.c

@@ -32,7 +32,7 @@
 #include "windows.h"
 #include "misc_tools.h"
 #include "settings.h"
-#include "file_senders.h"
+#include "file_transfers.h"
 
 extern ToxWindow *prompt;
 extern struct user_settings *user_settings;
@@ -54,6 +54,7 @@ void hst_to_net(uint8_t *num, uint16_t numbytes)
     return;
 }
 
+/* Note: The time functions are not thread safe */
 void update_unix_time(void)
 {
     current_unix_time = (uint64_t) time(NULL);
@@ -65,9 +66,9 @@ uint64_t get_unix_time(void)
 }
 
 /* Returns 1 if connection has timed out, 0 otherwise */
-int timed_out(uint64_t timestamp, uint64_t curtime, uint64_t timeout)
+int timed_out(uint64_t timestamp, uint64_t timeout)
 {
-    return timestamp + timeout <= curtime;
+    return timestamp + timeout <= get_unix_time();
 }
 
 /* Get the current local time */
@@ -87,7 +88,7 @@ void get_time_str(char *buf, int bufsize)
         return;
     }
 
-    const char *t = user_settings->time == TIME_12 ? "%I:%M:%S " : "%H:%M:%S ";
+    const char *t = user_settings->timestamp_format;
     strftime(buf, bufsize, t, get_time());
 }
 
@@ -109,20 +110,24 @@ void get_elapsed_time_str(char *buf, int bufsize, uint64_t secs)
         snprintf(buf, bufsize, "%ld:%.2ld:%.2ld", hours, minutes, seconds);
 }
 
-char *hex_string_to_bin(const char *hex_string)
+/*
+ * Converts a hexidecimal string of length hex_len to binary format and puts the result in output.
+ * output_size must be exactly half of hex_len.
+ *
+ * Returns 0 on success.
+ * Returns -1 on failure.
+ */
+int hex_string_to_bin(const char *hex_string, size_t hex_len, char *output, size_t output_size)
 {
-    size_t len = strlen(hex_string);
-    char *val = malloc(len);
+    if (output_size == 0 || hex_len != output_size * 2)
+        return -1;
 
-    if (val == NULL)
-        exit_toxic_err("failed in hex_string_to_bin", FATALERR_MEMORY);
+    for (size_t i = 0; i < output_size; ++i) {
+        sscanf(hex_string, "%2hhx", &output[i]);
+        hex_string += 2;
+    }
 
-    size_t i;
-
-    for (i = 0; i < len; ++i, hex_string += 2)
-        sscanf(hex_string, "%2hhx", &val[i]);
-
-    return val;
+    return 0;
 }
 
 int hex_string_to_bytes(char *buf, int size, const char *keystr)
@@ -147,6 +152,9 @@ int hex_string_to_bytes(char *buf, int size, const char *keystr)
 /* Returns 1 if the string is empty, 0 otherwise */
 int string_is_empty(const char *string)
 {
+    if (!string)
+        return true;
+
     return string[0] == '\0';
 }
 
@@ -188,8 +196,9 @@ int qsort_strcasecmp_hlpr(const void *str1, const void *str2)
       - cannot be empty
       - cannot start with a space
       - must not contain a forward slash (for logfile naming purposes)
-      - must not contain contiguous spaces */
-int valid_nick(char *nick)
+      - must not contain contiguous spaces
+      - must not contain a newline or tab seqeunce */
+int valid_nick(const char *nick)
 {
     if (!nick[0] || nick[0] == ' ')
         return 0;
@@ -197,27 +206,43 @@ int valid_nick(char *nick)
     int i;
 
     for (i = 0; nick[i]; ++i) {
-        if (nick[i] == ' ' && nick[i + 1] == ' ')
-            return 0;
+        if ((nick[i] == ' ' && nick[i + 1] == ' ')
+            || nick[i] == '/'
+            || nick[i] == '\n'
+            || nick[i] == '\t'
+            || nick[i] == '\v'
+            || nick[i] == '\r')
 
-        if (nick[i] == '/')
             return 0;
     }
 
     return 1;
 }
 
-/* gets base file name from path or original file name if no path is supplied */
-void get_file_name(char *namebuf, int bufsize, const char *pathname)
+/* Converts all newline/tab chars to spaces (use for strings that should be contained to a single line) */
+void filter_str(char *str, size_t len)
 {
-    int idx = strlen(pathname) - 1;
+    size_t i;
+
+    for (i = 0; i < len; ++i) {
+        if (str[i] == '\n' || str[i] == '\r' || str[i] == '\t' || str[i] == '\v' || str[i] == '\0')
+            str[i] = ' ';
+    }
+}
+
+/* gets base file name from path or original file name if no path is supplied.
+ * Returns the file name length
+ */
+size_t get_file_name(char *namebuf, size_t bufsize, const char *pathname)
+{
+    int len = strlen(pathname) - 1;
     char *path = strdup(pathname);
 
     if (path == NULL)
         exit_toxic_err("failed in get_file_name", FATALERR_MEMORY);
 
-    while (idx >= 0 && pathname[idx] == '/')
-        path[idx--] = '\0';
+    while (len >= 0 && pathname[len] == '/')
+        path[len--] = '\0';
 
     char *finalname = strdup(path);
 
@@ -234,6 +259,8 @@ void get_file_name(char *namebuf, int bufsize, const char *pathname)
     snprintf(namebuf, bufsize, "%s", finalname);
     free(finalname);
     free(path);
+
+    return strlen(namebuf);
 }
 
 /* converts str to all lowercase */
@@ -246,12 +273,48 @@ void str_to_lower(char *str)
 }
 
 /* puts friendnum's nick in buf, truncating at TOXIC_MAX_NAME_LENGTH if necessary.
-   Returns nick len on success, -1 on failure */
-int get_nick_truncate(Tox *m, char *buf, int friendnum)
+   if toxcore API call fails, put UNKNOWN_NAME in buf
+   Returns nick len */
+size_t get_nick_truncate(Tox *m, char *buf, uint32_t friendnum)
 {
-    int len = tox_get_name(m, friendnum, (uint8_t *) buf);
+    size_t len = tox_friend_get_name_size(m, friendnum, NULL);
+
+    if (len == 0) {
+        strcpy(buf, UNKNOWN_NAME);
+        len = strlen(UNKNOWN_NAME);
+    } else {
+        tox_friend_get_name(m, friendnum, (uint8_t *) buf, NULL);
+    }
+
     len = MIN(len, TOXIC_MAX_NAME_LENGTH - 1);
     buf[len] = '\0';
+    filter_str(buf, len);
+    return len;
+}
+
+/* same as get_nick_truncate but for groupchats */
+int get_group_nick_truncate(Tox *m, char *buf, int peernum, int groupnum)
+{
+    int len = tox_group_peername(m, groupnum, peernum, (uint8_t *) buf);
+
+    if (len == -1) {
+        strcpy(buf, UNKNOWN_NAME);
+        len = strlen(UNKNOWN_NAME);
+    }
+
+    len = MIN(len, TOXIC_MAX_NAME_LENGTH - 1);
+    buf[len] = '\0';
+    filter_str(buf, len);
+    return len;
+}
+
+/* copies data to msg buffer.
+   returns length of msg, which will be no larger than size-1 */
+size_t copy_tox_str(char *msg, size_t size, const char *data, size_t length)
+{
+    size_t len = MIN(length, size - 1);
+    memcpy(msg, data, len);
+    msg[len] = '\0';
     return len;
 }
 
@@ -312,13 +375,13 @@ bool file_exists(const char *path)
     return stat(path, &s) == 0;
 }
 
-/* returns file size or -1 on error */
+/* returns file size. If file doesn't exist returns 0. */
 off_t file_size(const char *path)
 {
     struct stat st;
 
     if (stat(path, &st) == -1)
-        return -1;
+        return 0;
 
     return st.st_size;
 }
@@ -341,3 +404,21 @@ int check_file_signature(const char *signature, size_t size, FILE *fp)
 
     return ret == 0 ? 0 : 1;
 }
+
+/* sets window title in tab bar. */
+void set_window_title(ToxWindow *self, const char *title, int len)
+{
+    char cpy[TOXIC_MAX_NAME_LENGTH + 1];
+
+    if (self->is_groupchat)   /* keep groupnumber in title */
+        snprintf(cpy, sizeof(cpy), "%d %s", self->num, title);
+    else
+        snprintf(cpy, sizeof(cpy), "%s", title);
+
+    if (len > MAX_WINDOW_NAME_LENGTH) {
+        strcpy(&cpy[MAX_WINDOW_NAME_LENGTH - 3], "...");
+        cpy[MAX_WINDOW_NAME_LENGTH] = '\0';
+    }
+
+    snprintf(self->name, sizeof(self->name), "%s", cpy);
+}

src/misc_tools.h

@@ -41,22 +41,28 @@
 
 void hst_to_net(uint8_t *num, uint16_t numbytes);
 
-/* convert a hex string to binary */
-char *hex_string_to_bin(const char *hex_string);
+/*
+ * Converts a hexidecimal string of length hex_len to binary format and puts the result in output.
+ * output_size must be exactly half of hex_len.
+ *
+ * Returns 0 on success.
+ * Returns -1 on failure.
+ */
+int hex_string_to_bin(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 */
 int hex_string_to_bytes(char *buf, int size, const char *keystr);
 
-/* get the current unix time */
+/* get the current unix time (not thread safe) */
 uint64_t get_unix_time(void);
 
-/* Puts the current time in buf in the format of [HH:mm:ss] */
+/* Puts the current time in buf in the format of [HH:mm:ss] (not thread safe) */
 void get_time_str(char *buf, int bufsize);
 
 /* Converts seconds to string in format HH:mm:ss; truncates hours and minutes when necessary */
 void get_elapsed_time_str(char *buf, int bufsize, uint64_t secs);
 
-/* get the current local time */
+/* get the current local time (not thread safe) */
 struct tm *get_time(void);
 
 /* updates current unix time (should be run once per do_toxic loop) */
@@ -75,7 +81,7 @@ int wcs_to_mbs_buf(char *buf, const wchar_t *string, size_t n);
 int mbs_to_wcs_buf(wchar_t *buf, const char *string, size_t n);
 
 /* Returns 1 if connection has timed out, 0 otherwise */
-int timed_out(uint64_t timestamp, uint64_t timeout, uint64_t curtime);
+int timed_out(uint64_t timestamp, uint64_t timeout);
 
 /* Colours the window tab according to type. Beeps if is_beep is true */
 void alert_window(ToxWindow *self, int type, bool is_beep);
@@ -87,18 +93,29 @@ int qsort_strcasecmp_hlpr(const void *str1, const void *str2);
       - cannot be empty
       - cannot start with a space
       - must not contain a forward slash (for logfile naming purposes)
-      - must not contain contiguous spaces */
-int valid_nick(char *nick);
+      - must not contain contiguous spaces
+      - must not contain a newline or tab seqeunce */
+int valid_nick(const char *nick);
+
+/* Converts all newline/tab chars to spaces (use for strings that should be contained to a single line) */
+void filter_str(char *str, size_t len);
 
 /* gets base file name from path or original file name if no path is supplied */
-void get_file_name(char *namebuf, int bufsize, const char *pathname);
+size_t get_file_name(char *namebuf, size_t bufsize, const char *pathname);
 
 /* converts str to all lowercase */
 void str_to_lower(char *str);
 
 /* puts friendnum's nick in buf, truncating at TOXIC_MAX_NAME_LENGTH if necessary.
    Returns nick len on success, -1 on failure */
-int get_nick_truncate(Tox *m, char *buf, int friendnum);
+size_t get_nick_truncate(Tox *m, char *buf, uint32_t friendnum);
+
+/* same as get_nick_truncate but for groupchats */
+int get_group_nick_truncate(Tox *m, char *buf, int peernum, int groupnum);
+
+/* copies data to msg buffer.
+   returns length of msg, which will be no larger than size-1 */
+size_t copy_tox_str(char *msg, size_t size, const char *data, size_t length);
 
 /* returns index of the first instance of ch in s starting at idx.
    returns length of s if char not found */
@@ -114,7 +131,7 @@ void bytes_convert_str(char *buf, int size, uint64_t bytes);
 /* checks if a file exists. Returns true or false */
 bool file_exists(const char *path);
 
-/* returns file size or -1 on error */
+/* returns file size. If file doesn't exist returns 0. */
 off_t file_size(const char *path);
 
 /* compares the first size bytes of fp and signature.
@@ -123,4 +140,7 @@ off_t file_size(const char *path);
    On success this function will seek back to the beginning of fp */
 int check_file_signature(const char *signature, size_t size, FILE *fp);
 
+/* sets window title in tab bar. */
+void set_window_title(ToxWindow *self, const char *title, int len);
+
 #endif /* #define MISC_TOOLS_H */

src/notify.c

@@ -35,6 +35,7 @@
 #include "settings.h"
 #include "line_info.h"
 #include "misc_tools.h"
+#include "xtra.h"
 
 #if defined(AUDIO) || defined(SOUND_NOTIFY)
     #ifdef __APPLE__
@@ -53,10 +54,6 @@
     #endif
 #endif /* AUDIO */
 
-#ifdef X11
-    #include <X11/Xlib.h>
-#endif /* X11 */
-
 #ifdef BOX_NOTIFY
     #include <libnotify/notify.h>
 #endif
@@ -70,10 +67,6 @@ extern struct user_settings *user_settings;
 struct Control {
     time_t cooldown;
     time_t notif_timeout;
-#ifdef X11
-    Display *display;
-    unsigned long this_window;
-#endif /* X11 */
 
 #if defined(SOUND_NOTIFY) || defined(BOX_NOTIFY)
     pthread_mutex_t poll_mutex[1];
@@ -97,11 +90,11 @@ struct _ActiveNotifications {
 #ifdef BOX_NOTIFY
     NotifyNotification* box;
     char messages[MAX_BOX_MSG_LEN + 1][MAX_BOX_MSG_LEN + 1];
-    char title[24];
+    char title[64];
     size_t size;
     time_t n_timeout;
 #endif
-} actives[ACTIVE_NOTIFS_MAX] = {{0}};
+} actives[ACTIVE_NOTIFS_MAX];
 /**********************************************************************************/
 /**********************************************************************************/
 /**********************************************************************************/
@@ -122,23 +115,14 @@ static void tab_notify(ToxWindow *self, uint64_t flags)
         self->alert = WINDOW_ALERT_2;
 }
 
-#ifdef X11
-long unsigned int get_focused_window_id()
-{
-    if (!Control.display) return 0;
-    
-    Window focus;
-    int revert;
-    XGetInputFocus(Control.display, &focus, &revert);
-    return focus;
-}
-#endif /* X11 */
-
 static bool notifications_are_disabled(uint64_t flags)
 {
-    bool res = flags & NT_RESTOL && Control.cooldown > get_unix_time();
+    if (user_settings->alerts != ALERTS_ENABLED)
+        return true;
+
+    bool res = (flags & NT_RESTOL) && (Control.cooldown > get_unix_time());
 #ifdef X11
-    return res || (flags & NT_NOFOCUS && Control.this_window == get_focused_window_id());
+    return res || ((flags & NT_NOFOCUS) && is_focused());
 #else
     return res;
 #endif
@@ -172,33 +156,36 @@ bool is_playing(int source)
 static bool device_opened = false;
 time_t last_opened_update = 0;
 
-bool m_open_device()
+/* Opens primary device. Returns true on succe*/
+void m_open_device()
 {
-    last_opened_update = time(NULL);
+    last_opened_update = get_unix_time();
 
-    if (device_opened) return true;
+    if (device_opened) return;
 
     /* Blah error check */
     open_primary_device(output, &Control.device_idx, 48000, 20, 1);
 
-    return (device_opened = true);
+    device_opened = true;
 }
 
-bool m_close_device()
+void m_close_device()
 {
-    if (!device_opened) return true;
+    if (!device_opened) return;
 
     close_device(output, Control.device_idx);
 
-    return !(device_opened = false);
+    device_opened = false;
 }
 
 /* Terminate all sounds but wait for them to finish first */
 void graceful_clear()
 {
-    int i;
     control_lock();
+
     while (1) {
+        int i;
+
         for (i = 0; i < ACTIVE_NOTIFS_MAX; i ++) {
             if (actives[i].active) {
             #ifdef BOX_NOTIFY
@@ -209,7 +196,8 @@ void graceful_clear()
                 }
             #endif
 
-                if(actives[i].id_indicator) *actives[i].id_indicator = -1; // reset indicator value
+                if(actives[i].id_indicator)
+                    *actives[i].id_indicator = -1;    /* reset indicator value */
 
                 if ( actives[i].looping ) {
                     stop_sound(i);
@@ -229,18 +217,24 @@ void graceful_clear()
 
         usleep(1000);
     }
+
+    control_unlock();
 }
 
 void* do_playing(void* _p)
 {
     (void)_p;
-    int i;
 
-    bool has_looping = false;
-    
-    while(Control.poll_active) {
+    while(true) {
         control_lock();
 
+        if (!Control.poll_active) {
+            control_unlock();
+            break;
+        }
+
+        bool has_looping = false;
+        int i;
 
         for (i = 0; i < ACTIVE_NOTIFS_MAX; i ++) {
 
@@ -251,11 +245,14 @@ void* do_playing(void* _p)
                     && !actives[i].box
                 #endif
             ) {
+                if(actives[i].id_indicator)
+                    *actives[i].id_indicator = -1;    /* reset indicator value */
+
                 if (!is_playing(actives[i].source)) {
                 /* Close */
                     alSourceStop(actives[i].source);
                     alDeleteSources(1, &actives[i].source);
-                    alDeleteBuffers(1,&actives[i].buffer);
+                    alDeleteBuffers(1, &actives[i].buffer);
                     memset(&actives[i], 0, sizeof(struct _ActiveNotifications));
                 }
             }
@@ -265,14 +262,14 @@ void* do_playing(void* _p)
                 GError* ignore;
                 notify_notification_close(actives[i].box, &ignore);
                 actives[i].box = NULL;
-                
-                if(actives[i].id_indicator) *actives[i].id_indicator = -1; // reset indicator value
+                if(actives[i].id_indicator)
+                    *actives[i].id_indicator = -1;    /* reset indicator value */
 
                 if (!actives[i].looping && !is_playing(actives[i].source)) {
                 /* stop source if not looping or playing, just terminate box */
                     alSourceStop(actives[i].source);
                     alDeleteSources(1, &actives[i].source);
-                    alDeleteBuffers(1,&actives[i].buffer);
+                    alDeleteBuffers(1, &actives[i].buffer);
                     memset(&actives[i], 0, sizeof(struct _ActiveNotifications));
                 }
             }
@@ -314,17 +311,26 @@ int play_source(uint32_t source, uint32_t buffer, bool looping)
 void* do_playing(void* _p)
 {
     (void)_p;
-    int i;
-    while(Control.poll_active) {
+
+    while(true) {
         control_lock();
+
+        if (!Control.poll_active) {
+            control_unlock();
+            break;
+        }
+
+        int i;
+
         for (i = 0; i < ACTIVE_NOTIFS_MAX; i ++) {
             if (actives[i].box && time(NULL) >= actives[i].n_timeout)
             {
                 GError* ignore;
                 notify_notification_close(actives[i].box, &ignore);
                 actives[i].box = NULL;
+                if(actives[i].id_indicator)
+                    *actives[i].id_indicator = -1;    /* reset indicator value */
 
-                if(actives[i].id_indicator) *actives[i].id_indicator = -1; // reset indicator value
                 memset(&actives[i], 0, sizeof(struct _ActiveNotifications));
             }
         }
@@ -346,7 +352,9 @@ void graceful_clear()
             actives[i].box = NULL;
         }
 
-        if(actives[i].id_indicator) *actives[i].id_indicator = -1; // reset indicator value
+        if (actives[i].id_indicator)
+            *actives[i].id_indicator = -1;    /* reset indicator value */
+
         memset(&actives[i], 0, sizeof(struct _ActiveNotifications));
     }
 
@@ -373,24 +381,21 @@ int init_notify(int login_cooldown, int notification_timeout)
     if (pthread_mutex_init(Control.poll_mutex, NULL) != 0)
         return -1;
 
+    Control.poll_active = 1;
     pthread_t thread;
 
     if (pthread_create(&thread, NULL, do_playing, NULL) != 0 || pthread_detach(thread) != 0 ) {
         pthread_mutex_destroy(Control.poll_mutex);
+        Control.poll_active = 0;
         return -1;
     }
-    Control.poll_active = 1;
-#endif
 
+#endif
     Control.cooldown = time(NULL) + login_cooldown;
-#ifdef X11
-    Control.display = XOpenDisplay(NULL);
-    Control.this_window = get_focused_window_id();
-#endif /* X11 */
 
 
 #ifdef BOX_NOTIFY
-    notify_init("toxic");
+    notify_init("Toxic");
 #endif
     Control.notif_timeout = notification_timeout;
     return 1;
@@ -399,8 +404,15 @@ int init_notify(int login_cooldown, int notification_timeout)
 void terminate_notify()
 {
 #if defined(SOUND_NOTIFY) || defined(BOX_NOTIFY)
-    if ( !Control.poll_active ) return;    
+    control_lock();
+
+    if ( !Control.poll_active ) {
+        control_unlock();
+        return;
+    }
+
     Control.poll_active = 0;
+    control_unlock();
 
     graceful_clear();
 #endif
@@ -480,6 +492,7 @@ void stop_sound(int id)
             notify_notification_close(actives[id].box, &ignore);
         }
 #endif
+        if (actives[id].id_indicator)
             *actives[id].id_indicator = -1;
 //         alSourcei(actives[id].source, AL_LOOPING, false);
         alSourceStop(actives[id].source);
@@ -518,16 +531,15 @@ int sound_notify(ToxWindow* self, Notification notif, uint64_t flags, int* id_in
     int id = -1;
     control_lock();
 
-    if (self && (!self->stb || self->stb->status != TOX_USERSTATUS_BUSY) && user_settings->alerts == ALERTS_ENABLED) 
+    if (self && (!self->stb || self->stb->status != TOX_USER_STATUS_BUSY))
         id = m_play_sound(notif, flags);
-    
     else if (flags & NT_ALWAYS)
         id = m_play_sound(notif, flags);
 
 #if defined(BOX_NOTIFY) && !defined(SOUND_NOTIFY)
 
     if (id == -1) {
-        for (id = 0; id < ACTIVE_NOTIFS_MAX && actives[id].box; id ++);
+        for (id = 0; id < ACTIVE_NOTIFS_MAX && actives[id].box; id++);
         if ( id == ACTIVE_NOTIFS_MAX ) {
             control_unlock();
             return -1; /* Full */
@@ -588,7 +600,7 @@ int sound_notify2(ToxWindow* self, Notification notif, uint64_t flags, int id)
 #endif /* SOUND_NOTIFY */
 }
 
-int box_notify(ToxWindow* self, Notification notif, uint64_t flags, int* id_indicator, char* title, const char* format, ...)
+int box_notify(ToxWindow* self, Notification notif, uint64_t flags, int* id_indicator, const char* title, const char* format, ...)
 {
     if (notifications_are_disabled(flags)) {
         tab_notify(self, flags);
@@ -614,9 +626,12 @@ int box_notify(ToxWindow* self, Notification notif, uint64_t flags, int* id_indi
         actives[id].id_indicator = id_indicator;
         if (id_indicator) *id_indicator = id;
     }
-#endif
+#else
+    if (id == -1)
+        return -1;
+#endif    /* SOUND_NOTIFY */
 
-    strncpy(actives[id].title, title, 24);
+    snprintf(actives[id].title, sizeof(actives[id].title), "%s", title);
     if (strlen(title) > 23) strcpy(actives[id].title + 20, "...");
 
     va_list __ARGS__; va_start (__ARGS__, format);
@@ -627,8 +642,8 @@ int box_notify(ToxWindow* self, Notification notif, uint64_t flags, int* id_indi
         strcpy(actives[id].messages[0] + MAX_BOX_MSG_LEN - 3, "...");
 
     actives[id].box = notify_notification_new(actives[id].title, actives[id].messages[0], NULL);
-    actives[id].size ++;
-    actives[id].n_timeout = time(NULL) + Control.notif_timeout / 1000;
+    actives[id].size++;
+    actives[id].n_timeout = get_unix_time() + Control.notif_timeout / 1000;
 
     notify_notification_set_timeout(actives[id].box, Control.notif_timeout);
     notify_notification_set_app_name(actives[id].box, "toxic");
@@ -639,7 +654,7 @@ int box_notify(ToxWindow* self, Notification notif, uint64_t flags, int* id_indi
     return id;
 #else
     return sound_notify(self, notif, flags, id_indicator);
-#endif
+#endif   /* BOX_NOTIFY */
 }
 
 int box_notify2(ToxWindow* self, Notification notif, uint64_t flags, int id, const char* format, ...)
@@ -668,8 +683,8 @@ int box_notify2(ToxWindow* self, Notification notif, uint64_t flags, int id, con
     if (strlen(actives[id].messages[actives[id].size]) > MAX_BOX_MSG_LEN - 3)
         strcpy(actives[id].messages[actives[id].size] + MAX_BOX_MSG_LEN - 3, "...");
 
-    actives[id].size ++;
-    actives[id].n_timeout = time(NULL) + Control.notif_timeout / 1000;
+    actives[id].size++;
+    actives[id].n_timeout = get_unix_time() + Control.notif_timeout / 1000;
 
     char formated[128 * 129] = {'\0'};
 
@@ -715,7 +730,7 @@ int box_silent_notify(ToxWindow* self, uint64_t flags, int* id_indicator, const
         *id_indicator = id;
     }
 
-    strncpy(actives[id].title, title, 24);
+    snprintf(actives[id].title, sizeof(actives[id].title), "%s", title);
     if (strlen(title) > 23) strcpy(actives[id].title + 20, "...");
 
     va_list __ARGS__; va_start (__ARGS__, format);
@@ -728,7 +743,7 @@ int box_silent_notify(ToxWindow* self, uint64_t flags, int* id_indicator, const
     actives[id].active = 1;
     actives[id].box = notify_notification_new(actives[id].title, actives[id].messages[0], NULL);
     actives[id].size ++;
-    actives[id].n_timeout = time(NULL) + Control.notif_timeout / 1000;
+    actives[id].n_timeout = get_unix_time() + Control.notif_timeout / 1000;
 
     notify_notification_set_timeout(actives[id].box, Control.notif_timeout);
     notify_notification_set_app_name(actives[id].box, "toxic");
@@ -766,7 +781,7 @@ int box_silent_notify2(ToxWindow* self, uint64_t flags, int id, const char* form
         strcpy(actives[id].messages[actives[id].size] + MAX_BOX_MSG_LEN - 3, "...");
 
     actives[id].size ++;
-    actives[id].n_timeout = time(NULL) + Control.notif_timeout / 1000;
+    actives[id].n_timeout = get_unix_time() + Control.notif_timeout / 1000;
 
     char formated[128 * 129] = {'\0'};
 

src/notify.h

@@ -29,7 +29,7 @@
 typedef enum _Notification
 {
     silent = -1,
-    error,
+    notif_error,
     self_log_in,
     self_log_out,
     user_log_in,
@@ -68,7 +68,7 @@ int sound_notify2(ToxWindow* self, Notification notif, uint64_t flags, int id);
 
 void stop_sound(int id);
 
-int box_notify(ToxWindow* self, Notification notif, uint64_t flags, int* id_indicator, char* title, const char* format, ...);
+int box_notify(ToxWindow* self, Notification notif, uint64_t flags, int* id_indicator, const char* title, const char* format, ...);
 int box_notify2(ToxWindow* self, Notification notif, uint64_t flags, int id, const char* format, ...);
 int box_silent_notify(ToxWindow* self, uint64_t flags, int* id_indicator, const char* title, const char* format, ...);
 int box_silent_notify2(ToxWindow* self, uint64_t flags, int id, const char* format, ...);

src/prompt.c

@@ -31,6 +31,7 @@
 #include "toxic.h"
 #include "windows.h"
 #include "prompt.h"
+#include "friendlist.h"
 #include "execute.h"
 #include "misc_tools.h"
 #include "toxic_strings.h"
@@ -46,19 +47,25 @@ extern ToxWindow *prompt;
 extern struct user_settings *user_settings;
 extern struct Winthread Winthread;
 
+extern FriendsList Friends;
 FriendRequests FrndRequests;
 
+#ifdef AUDIO
+#define AC_NUM_GLOB_COMMANDS 18
+#else
+#define AC_NUM_GLOB_COMMANDS 16
+#endif /* AUDIO */
+
 /* Array of global command names used for tab completion. */
-const char glob_cmd_list[AC_NUM_GLOB_COMMANDS][MAX_CMDNAME_SIZE] = {
+static const char glob_cmd_list[AC_NUM_GLOB_COMMANDS][MAX_CMDNAME_SIZE] = {
     { "/accept"     },
     { "/add"        },
     { "/avatar"     },
     { "/clear"      },
-    { "/close"      },    /* rm /close when groupchats gets its own list */
     { "/connect"    },
     { "/decline"    },
     { "/exit"       },
-    { "/groupchat"  },
+    { "/group"      },
     { "/help"       },
     { "/log"        },
     { "/myid"       },
@@ -96,6 +103,13 @@ void kill_prompt_window(ToxWindow *self)
     del_window(self);
 }
 
+/* callback: Updates own connection status in prompt statusbar */
+void prompt_onSelfConnectionChange(Tox *m, TOX_CONNECTION connection_status, void *userdata)
+{
+    StatusBar *statusbar = prompt->stb;
+    statusbar->connection = connection_status;
+}
+
 /* Updates own nick in prompt statusbar */
 void prompt_update_nick(ToxWindow *prompt, const char *nick)
 {
@@ -109,25 +123,23 @@ void prompt_update_statusmessage(ToxWindow *prompt, Tox *m, const char *statusms
 {
     StatusBar *statusbar = prompt->stb;
     snprintf(statusbar->statusmsg, sizeof(statusbar->statusmsg), "%s", statusmsg);
-    int len = strlen(statusbar->statusmsg);
+    size_t len = strlen(statusbar->statusmsg);
     statusbar->statusmsg_len = len;
-    tox_set_status_message(m, (uint8_t *) statusmsg, (uint64_t) len); 
+
+    TOX_ERR_SET_INFO err;
+    tox_self_set_status_message(m, (uint8_t *) statusmsg, len, &err);
+
+    if (err != TOX_ERR_SET_INFO_OK)
+        line_info_add(prompt, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to set note (error %d)\n", err);
 }
 
 /* Updates own status in prompt statusbar */
-void prompt_update_status(ToxWindow *prompt, uint8_t status)
+void prompt_update_status(ToxWindow *prompt, TOX_USER_STATUS status)
 {
     StatusBar *statusbar = prompt->stb;
     statusbar->status = status;
 }
 
-/* Updates own connection status in prompt statusbar */
-void prompt_update_connectionstatus(ToxWindow *prompt, bool is_connected)
-{
-    StatusBar *statusbar = prompt->stb;
-    statusbar->is_online = is_connected;
-}
-
 /* Adds friend request to pending friend requests.
    Returns request number on success, -1 if queue is full. */
 static int add_friend_request(const char *public_key, const char *data)
@@ -140,7 +152,7 @@ static int add_friend_request(const char *public_key, const char *data)
     for (i = 0; i <= FrndRequests.max_idx; ++i) {
         if (!FrndRequests.request[i].active) {
             FrndRequests.request[i].active = true;
-            memcpy(FrndRequests.request[i].key, public_key, TOX_CLIENT_ID_SIZE);
+            memcpy(FrndRequests.request[i].key, public_key, TOX_PUBLIC_KEY_SIZE);
             snprintf(FrndRequests.request[i].msg, sizeof(FrndRequests.request[i].msg), "%s", data);
 
             if (i == FrndRequests.max_idx)
@@ -188,19 +200,26 @@ static void prompt_onKey(ToxWindow *self, Tox *m, wint_t key, bool ltr)
 
             if (wcsncmp(ctx->line, L"/avatar \"", wcslen(L"/avatar \"")) == 0)
                 diff = dir_match(self, m, ctx->line, L"/avatar");
-            else
+            else if (wcsncmp(ctx->line, L"/status ", wcslen(L"/status ")) == 0){
+                const char status_cmd_list[3][8] = {
+                  {"online"},
+                  {"away"},
+                  {"busy"},
+                };
+                diff = complete_line(self, status_cmd_list, 3, 8);
+            } else
                 diff = complete_line(self, glob_cmd_list, AC_NUM_GLOB_COMMANDS, MAX_CMDNAME_SIZE);
 
             if (diff != -1) {
                 if (x + diff > x2 - 1) {
-                    int wlen = wcswidth(ctx->line, sizeof(ctx->line));
+                    int wlen = MAX(0, wcswidth(ctx->line, sizeof(ctx->line) / sizeof(wchar_t)));
                     ctx->start = wlen < x2 ? 0 : wlen - x2 + 1;
                 }
             } else {
-                sound_notify(self, error, 0, NULL);
+                sound_notify(self, notif_error, 0, NULL);
             }
         } else {
-            sound_notify(self, error, 0, NULL);
+            sound_notify(self, notif_error, 0, NULL);
         }
     } else if (key == '\n') {
         rm_trailing_spaces_buf(ctx);
@@ -229,7 +248,10 @@ static void prompt_onDraw(ToxWindow *self, Tox *m)
 
     ChatContext *ctx = self->chatwin;
 
+    pthread_mutex_lock(&Winthread.lock);
     line_info_print(self);
+    pthread_mutex_unlock(&Winthread.lock);
+
     wclear(ctx->linewin);
 
     curs_set(1);
@@ -238,33 +260,35 @@ static void prompt_onDraw(ToxWindow *self, Tox *m)
         mvwprintw(ctx->linewin, 1, 0, "%ls", &ctx->line[ctx->start]);
 
     StatusBar *statusbar = self->stb;
+
     mvwhline(statusbar->topline, 1, 0, ACS_HLINE, x2);
     wmove(statusbar->topline, 0, 0);
 
-    if (statusbar->is_online) {
-        int colour = WHITE;
-        const char *status_text = "Unknown";
+    pthread_mutex_lock(&Winthread.lock);
+    TOX_CONNECTION connection = statusbar->connection;
+    pthread_mutex_unlock(&Winthread.lock);
 
-        switch (statusbar->status) {
-            case TOX_USERSTATUS_NONE:
+    if (connection != TOX_CONNECTION_NONE) {
+        int colour = MAGENTA;
+        const char *status_text = "ERROR";
+
+        pthread_mutex_lock(&Winthread.lock);
+        TOX_USER_STATUS status = statusbar->status;
+        pthread_mutex_unlock(&Winthread.lock);
+
+        switch (status) {
+            case TOX_USER_STATUS_NONE:
                 status_text = "Online";
                 colour = GREEN;
                 break;
-
-            case TOX_USERSTATUS_AWAY:
+            case TOX_USER_STATUS_AWAY:
                 status_text = "Away";
                 colour = YELLOW;
                 break;
-
-            case TOX_USERSTATUS_BUSY:
+            case TOX_USER_STATUS_BUSY:
                 status_text = "Busy";
                 colour = RED;
                 break;
-
-            case TOX_USERSTATUS_INVALID:
-                status_text = "ERROR";
-                colour = MAGENTA;
-                break;
         }
 
         wattron(statusbar->topline, COLOR_PAIR(colour) | A_BOLD);
@@ -272,25 +296,30 @@ static void prompt_onDraw(ToxWindow *self, Tox *m)
         wattroff(statusbar->topline, COLOR_PAIR(colour) | A_BOLD);
 
         wattron(statusbar->topline, A_BOLD);
+        pthread_mutex_lock(&Winthread.lock);
         wprintw(statusbar->topline, " %s", statusbar->nick);
+        pthread_mutex_unlock(&Winthread.lock);
         wattroff(statusbar->topline, A_BOLD);
     } else {
         wprintw(statusbar->topline, " [Offline]");
         wattron(statusbar->topline, A_BOLD);
+        pthread_mutex_lock(&Winthread.lock);
         wprintw(statusbar->topline, " %s", statusbar->nick);
+        pthread_mutex_unlock(&Winthread.lock);
         wattroff(statusbar->topline, A_BOLD);
     }
 
     /* Reset statusbar->statusmsg on window resize */
     if (x2 != self->x) {
-        char statusmsg[TOX_MAX_STATUSMESSAGE_LENGTH] = {0};
+        char statusmsg[TOX_MAX_STATUS_MESSAGE_LENGTH];
 
         pthread_mutex_lock(&Winthread.lock);
-        tox_get_self_status_message(m, (uint8_t *) statusmsg, TOX_MAX_STATUSMESSAGE_LENGTH);
-        pthread_mutex_unlock(&Winthread.lock);
-
+        size_t slen = tox_self_get_status_message_size(m);
+        tox_self_get_status_message (m, (uint8_t*) statusmsg);
+        statusmsg[slen] = '\0';
         snprintf(statusbar->statusmsg, sizeof(statusbar->statusmsg), "%s", statusmsg);
         statusbar->statusmsg_len = strlen(statusbar->statusmsg);
+        pthread_mutex_unlock(&Winthread.lock);
     }
 
     self->x = x2;
@@ -298,6 +327,8 @@ static void prompt_onDraw(ToxWindow *self, Tox *m)
     /* Truncate note if it doesn't fit in statusbar */
     uint16_t maxlen = x2 - getcurx(statusbar->topline) - 3;
 
+    pthread_mutex_lock(&Winthread.lock);
+
     if (statusbar->statusmsg_len > maxlen) {
         statusbar->statusmsg[maxlen - 3] = '\0';
         strcat(statusbar->statusmsg, "...");
@@ -307,13 +338,15 @@ static void prompt_onDraw(ToxWindow *self, Tox *m)
     if (statusbar->statusmsg[0])
         wprintw(statusbar->topline, " : %s", statusbar->statusmsg);
 
+    pthread_mutex_unlock(&Winthread.lock);
+
     mvwhline(self->window, y2 - CHATBOX_HEIGHT, 0, ACS_HLINE, x2);
 
     int y, x;
     getyx(self->window, y, x);
     (void) x;
 
-    int new_x = ctx->start ? x2 - 1 : wcswidth(ctx->line, ctx->pos);
+    int new_x = ctx->start ? x2 - 1 : MAX(0, wcswidth(ctx->line, ctx->pos));
     wmove(self->window, y + 1, new_x);
 
     wrefresh(self->window);
@@ -322,11 +355,8 @@ static void prompt_onDraw(ToxWindow *self, Tox *m)
         help_onDraw(self);
 }
 
-static void prompt_onConnectionChange(ToxWindow *self, Tox *m, int32_t friendnum , uint8_t status)
+static void prompt_onConnectionChange(ToxWindow *self, Tox *m, uint32_t friendnum , TOX_CONNECTION connection_status)
 {
-    if (friendnum < 0)
-        return;
-
     ChatContext *ctx = self->chatwin;
 
     char nick[TOX_MAX_NAME_LENGTH] = {0};    /* stop removing this initiation */
@@ -339,7 +369,7 @@ static void prompt_onConnectionChange(ToxWindow *self, Tox *m, int32_t friendnum
     get_time_str(timefrmt, sizeof(timefrmt));
     const char *msg;
 
-    if (status == 1) {
+    if (connection_status != TOX_CONNECTION_NONE && Friends.list[friendnum].connection_status == TOX_CONNECTION_NONE) {
         msg = "has come online";
         line_info_add(self, timefrmt, nick, NULL, CONNECTION, 0, GREEN, msg);
         write_to_log(msg, nick, ctx->log, true);
@@ -350,9 +380,10 @@ static void prompt_onConnectionChange(ToxWindow *self, Tox *m, int32_t friendnum
         else
             box_notify(self, user_log_in, NT_WNDALERT_2 | NT_NOTIFWND | NT_RESTOL, &self->active_box,
                        "Toxic", "%s has come online", nick );
-    } else {
+    }
+    else if (connection_status == TOX_CONNECTION_NONE) {
         msg = "has gone offline";
-        line_info_add(self, timefrmt, nick, NULL, CONNECTION, 0, RED, msg);
+        line_info_add(self, timefrmt, nick, NULL, DISCONNECTION, 0, RED, msg);
         write_to_log(msg, nick, ctx->log, true);
 
         if (self->active_box != -1)
@@ -364,8 +395,7 @@ static void prompt_onConnectionChange(ToxWindow *self, Tox *m, int32_t friendnum
     }
 }
 
-static void prompt_onFriendRequest(ToxWindow *self, Tox *m, const char *key, const char *data,
-                                   uint16_t length)
+static void prompt_onFriendRequest(ToxWindow *self, Tox *m, const char *key, const char *data, size_t length)
 {
     ChatContext *ctx = self->chatwin;
 
@@ -395,26 +425,25 @@ void prompt_init_statusbar(ToxWindow *self, Tox *m)
 
     /* Init statusbar info */
     StatusBar *statusbar = self->stb;
-    statusbar->status = TOX_USERSTATUS_NONE;
-    statusbar->is_online = false;
+    statusbar->status = TOX_USER_STATUS_NONE;
+    statusbar->connection = TOX_CONNECTION_NONE;
 
     char nick[TOX_MAX_NAME_LENGTH];
-    char statusmsg[MAX_STR_SIZE];
+    char statusmsg[TOX_MAX_STATUS_MESSAGE_LENGTH];
 
-    uint16_t n_len = tox_get_self_name(m, (uint8_t *) nick);
-    uint16_t s_len = tox_get_self_status_message(m, (uint8_t *) statusmsg, MAX_STR_SIZE);
-    uint8_t status = tox_get_self_user_status(m);
+    size_t n_len = tox_self_get_name_size(m);
+    tox_self_get_name(m, (uint8_t *) nick);
+
+    size_t s_len = tox_self_get_status_message_size(m);
+    tox_self_get_status_message(m, (uint8_t *) statusmsg);
+
+    TOX_USER_STATUS status = tox_self_get_status(m);
 
     nick[n_len] = '\0';
     statusmsg[s_len] = '\0';
 
-    /* load prev status message or show toxic version if it has never been set */
-    char ver[strlen(TOXICVER) + 1];
-    strcpy(ver, TOXICVER);
-    const char *toxic_ver = strtok(ver, "_");
-
-    if ( (s_len <= 0 || !strncmp("Toxing on Toxic", statusmsg, strlen("Toxing on Toxic"))) && toxic_ver != NULL) {
-        snprintf(statusmsg, sizeof(statusmsg), "Toxing on Toxic v.%s", toxic_ver);
+    if (s_len == 0 || !strncmp(statusmsg, "Toxing on Toxic", strlen("Toxing on Toxic"))) {
+        snprintf(statusmsg, sizeof(statusmsg), "Toxing on Toxic");
         s_len = strlen(statusmsg);
         statusmsg[s_len] = '\0';
     }
@@ -433,7 +462,7 @@ static void print_welcome_msg(ToxWindow *self)
     line_info_add(self, NULL, NULL, NULL, SYS_MSG, 1, BLUE, "   |_   _/ _ \\ \\/ /_ _/ ___|");
     line_info_add(self, NULL, NULL, NULL, SYS_MSG, 1, BLUE, "     | || | | \\  / | | |    ");
     line_info_add(self, NULL, NULL, NULL, SYS_MSG, 1, BLUE, "     | || |_| /  \\ | | |___ ");
-    line_info_add(self, NULL, NULL, NULL, SYS_MSG, 1, BLUE, "     |_| \\___/_/\\_\\___\\____|");
+    line_info_add(self, NULL, NULL, NULL, SYS_MSG, 1, BLUE, "     |_| \\___/_/\\_\\___\\____| v." TOXICVER);
     line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "");
 
     const char *msg = "Welcome to Toxic, a free, open source Tox-based instant messenging client.";
@@ -462,9 +491,11 @@ static void prompt_onInit(ToxWindow *self, Tox *m)
     line_info_init(ctx->hst);
 
     if (user_settings->autolog == AUTOLOG_ON) {
-        char myid[TOX_FRIEND_ADDRESS_SIZE];
-        tox_get_address(m, (uint8_t *) myid);
-        log_enable(self->name, myid, NULL, ctx->log, LOG_PROMPT);
+        char myid[TOX_ADDRESS_SIZE];
+        tox_self_get_address(m, (uint8_t *) myid);
+
+        if (log_enable(self->name, myid, NULL, ctx->log, LOG_PROMPT) == -1)
+            line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Warning: Log failed to initialize.");
     }
 
     scrollok(ctx->history, 0);

src/prompt.h

@@ -26,18 +26,12 @@
 #include "toxic.h"
 #include "windows.h"
 
-#ifdef AUDIO
-#define AC_NUM_GLOB_COMMANDS 19
-#else
-#define AC_NUM_GLOB_COMMANDS 17
-#endif /* AUDIO */
-
 #define MAX_FRIEND_REQUESTS 32
 
 struct friend_request {
     bool active;
     char msg[MAX_STR_SIZE];
-    uint8_t key[TOX_CLIENT_ID_SIZE];
+    uint8_t key[TOX_PUBLIC_KEY_SIZE];
 };
 
 typedef struct {
@@ -47,12 +41,16 @@ typedef struct {
 } FriendRequests;
 
 ToxWindow new_prompt(void);
+
 void prep_prompt_win(void);
 void prompt_init_statusbar(ToxWindow *self, Tox *m);
 void prompt_update_nick(ToxWindow *prompt, const char *nick);
 void prompt_update_statusmessage(ToxWindow *prompt, Tox *m, const char *statusmsg);
-void prompt_update_status(ToxWindow *prompt, uint8_t status);
+void prompt_update_status(ToxWindow *prompt, TOX_USER_STATUS status);
 void prompt_update_connectionstatus(ToxWindow *prompt, bool is_connected);
 void kill_prompt_window(ToxWindow *self);
 
+/* callback: Updates own connection status in prompt statusbar */
+void prompt_onSelfConnectionChange(Tox *m, TOX_CONNECTION connection_status, void *userdata);
+
 #endif /* end of include guard: PROMPT_H */

src/settings.c

@@ -47,31 +47,51 @@
 static struct ui_strings {
     const char* self;
     const char* timestamps;
+    const char* time_format;
+    const char* timestamp_format;
+    const char* log_timestamp_format;
     const char* alerts;
     const char* native_colors;
     const char* autolog;
-    const char* time_format;
     const char* history_size;
     const char* show_typing_self;
     const char* show_typing_other;
     const char* show_welcome_msg;
+
+    const char* line_join;
+    const char* line_quit;
+    const char* line_alert;
+    const char* line_normal;
+
+    const char* mplex_away;
+    const char* mplex_away_note;
 } ui_strings = {
     "ui",
     "timestamps",
+    "time_format",
+    "timestamp_format",
+    "log_timestamp_format",
     "alerts",
     "native_colors",
     "autolog",
-    "time_format",
     "history_size",
     "show_typing_self",
     "show_typing_other",
     "show_welcome_msg",
+    "line_join",
+    "line_quit",
+    "line_alert",
+    "line_normal",
+    "mplex_away",
+    "mplex_away_note",
 };
 
 static void ui_defaults(struct user_settings* settings)
 {
     settings->timestamps = TIMESTAMPS_ON;
-    settings->time = TIME_24;
+    snprintf(settings->timestamp_format, sizeof(settings->timestamp_format), "%s", TIMESTAMP_DEFAULT);
+    snprintf(settings->log_timestamp_format, sizeof(settings->log_timestamp_format), "%s", LOG_TIMESTAMP_DEFAULT);
+
     settings->autolog = AUTOLOG_OFF;
     settings->alerts = ALERTS_ENABLED;
     settings->colour_theme = DFLT_COLS;
@@ -79,6 +99,17 @@ static void ui_defaults(struct user_settings* settings)
     settings->show_typing_self = SHOW_TYPING_ON;
     settings->show_typing_other = SHOW_TYPING_ON;
     settings->show_welcome_msg = SHOW_WELCOME_MSG_ON;
+
+    snprintf(settings->line_join, LINE_HINT_MAX + 1, "%s", LINE_JOIN);
+    snprintf(settings->line_quit, LINE_HINT_MAX + 1, "%s", LINE_QUIT);
+    snprintf(settings->line_alert, LINE_HINT_MAX + 1, "%s", LINE_ALERT);
+    snprintf(settings->line_normal, LINE_HINT_MAX + 1, "%s", LINE_NORMAL);
+
+    settings->mplex_away = MPLEX_ON;
+    snprintf (settings->mplex_away_note,
+              sizeof (settings->mplex_away_note),
+              "%s",
+              MPLEX_AWAY_NOTE);
 }
 
 static const struct keys_strings {
@@ -92,6 +123,7 @@ static const struct keys_strings {
     const char* page_bottom;
     const char* peer_list_up;
     const char* peer_list_down;
+    const char* toggle_peerlist;
 } key_strings = {
     "keys",
     "next_tab",
@@ -102,7 +134,8 @@ static const struct keys_strings {
     "half_page_down",
     "page_bottom",
     "peer_list_up",
-	"peer_list_down"
+    "peer_list_down",
+    "toggle_peerlist",
 };
 
 /* defines from toxic.h */
@@ -117,6 +150,7 @@ static void key_defaults(struct user_settings* settings)
     settings->key_page_bottom = T_KEY_C_H;
     settings->key_peer_list_up = T_KEY_C_LB;
     settings->key_peer_list_down = T_KEY_C_RB;
+    settings->key_toggle_peerlist = T_KEY_C_B;
 }
 
 static const struct tox_strings {
@@ -162,7 +196,7 @@ static void audio_defaults(struct user_settings* settings)
 #ifdef SOUND_NOTIFY
 static const struct sound_strings {
     const char* self;
-    const char* error;
+    const char* notif_error;
     const char* self_log_in;
     const char* self_log_out;
     const char* user_log_in;
@@ -174,7 +208,7 @@ static const struct sound_strings {
     const char* transfer_completed;
 } sound_strings = {
     "sounds",
-    "error",
+    "notif_error",
     "self_log_in",
     "self_log_out",
     "user_log_in",
@@ -250,6 +284,23 @@ int settings_load(struct user_settings *s, const char *patharg)
     /* ui */
     if ((setting = config_lookup(cfg, ui_strings.self)) != NULL) {
         config_setting_lookup_bool(setting, ui_strings.timestamps, &s->timestamps);
+
+        int time = 24;
+        if ( config_setting_lookup_int(setting, ui_strings.time_format, &time) ) {
+            if (time == 12) {
+                snprintf(s->timestamp_format, sizeof(s->timestamp_format), "%s", "%I:%M:%S %p");
+                snprintf(s->log_timestamp_format, sizeof(s->log_timestamp_format), "%s", "%Y/%m/%d [%I:%M:%S %p]");
+            }
+        }
+
+        if ( config_setting_lookup_string(setting, ui_strings.timestamp_format, &str) ) {
+            snprintf(s->timestamp_format, sizeof(s->timestamp_format), "%s", str);
+        }
+
+        if ( config_setting_lookup_string(setting, ui_strings.log_timestamp_format, &str) ) {
+            snprintf(s->log_timestamp_format, sizeof(s->log_timestamp_format), "%s", str);
+        }
+
         config_setting_lookup_bool(setting, ui_strings.alerts, &s->alerts);
         config_setting_lookup_bool(setting, ui_strings.autolog, &s->autolog);
         config_setting_lookup_bool(setting, ui_strings.native_colors, &s->colour_theme);
@@ -257,8 +308,25 @@ int settings_load(struct user_settings *s, const char *patharg)
         config_setting_lookup_bool(setting, ui_strings.show_typing_self, &s->show_typing_self);
         config_setting_lookup_bool(setting, ui_strings.show_typing_other, &s->show_typing_other);
         config_setting_lookup_bool(setting, ui_strings.show_welcome_msg, &s->show_welcome_msg);
-        config_setting_lookup_int(setting, ui_strings.time_format, &s->time);
-        s->time = s->time == TIME_24 || s->time == TIME_12 ? s->time : TIME_24; /* Check defaults */
+
+        if ( config_setting_lookup_string(setting, ui_strings.line_join, &str) ) {
+            snprintf(s->line_join, sizeof(s->line_join), "%s", str);
+        }
+        if ( config_setting_lookup_string(setting, ui_strings.line_quit, &str) ) {
+            snprintf(s->line_quit, sizeof(s->line_quit), "%s", str);
+        }
+        if ( config_setting_lookup_string(setting, ui_strings.line_alert, &str) ) {
+            snprintf(s->line_alert, sizeof(s->line_alert), "%s", str);
+        }
+        if ( config_setting_lookup_string(setting, ui_strings.line_normal, &str) ) {
+            snprintf(s->line_normal, sizeof(s->line_normal), "%s", str);
+        }
+
+        config_setting_lookup_bool (setting, ui_strings.mplex_away, &s->mplex_away);
+
+        if (config_setting_lookup_string (setting, ui_strings.mplex_away_note, &str)) {
+            snprintf (s->mplex_away_note, sizeof (s->mplex_away_note), "%s", str);
+        }
     }
 
     /* paths */
@@ -286,7 +354,7 @@ int settings_load(struct user_settings *s, const char *patharg)
 
         if ( config_setting_lookup_string(setting, tox_strings.avatar_path, &str) ) {
             snprintf(s->avatar_path, sizeof(s->avatar_path), "%s", str);
-            int len = strlen(s->avatar_path);
+            int len = strlen(str);
 
             if (len >= sizeof(s->avatar_path))
                 s->avatar_path[0] = '\0';
@@ -296,15 +364,26 @@ int settings_load(struct user_settings *s, const char *patharg)
     /* keys */
     if ((setting = config_lookup(cfg, key_strings.self)) != NULL) {
         const char* tmp = NULL;
-	   if (config_setting_lookup_string(setting, key_strings.next_tab, &tmp)) s->key_next_tab = key_parse(&tmp);
-	   if (config_setting_lookup_string(setting, key_strings.prev_tab, &tmp)) s->key_prev_tab = key_parse(&tmp);
-	   if (config_setting_lookup_string(setting, key_strings.scroll_line_up, &tmp)) s->key_scroll_line_up = key_parse(&tmp);
-	   if (config_setting_lookup_string(setting, key_strings.scroll_line_down, &tmp)) s->key_scroll_line_down= key_parse(&tmp);
-	   if (config_setting_lookup_string(setting, key_strings.half_page_up, &tmp)) s->key_half_page_up = key_parse(&tmp);
-	   if (config_setting_lookup_string(setting, key_strings.half_page_down, &tmp)) s->key_half_page_down = key_parse(&tmp);
-	   if (config_setting_lookup_string(setting, key_strings.page_bottom, &tmp)) s->key_page_bottom = key_parse(&tmp);
-	   if (config_setting_lookup_string(setting, key_strings.peer_list_up, &tmp)) s->key_peer_list_up = key_parse(&tmp);
-	   if (config_setting_lookup_string(setting, key_strings.peer_list_down, &tmp)) s->key_peer_list_down = key_parse(&tmp);
+        if (config_setting_lookup_string(setting, key_strings.next_tab, &tmp))
+            s->key_next_tab = key_parse(&tmp);
+        if (config_setting_lookup_string(setting, key_strings.prev_tab, &tmp))
+            s->key_prev_tab = key_parse(&tmp);
+        if (config_setting_lookup_string(setting, key_strings.scroll_line_up, &tmp))
+            s->key_scroll_line_up = key_parse(&tmp);
+        if (config_setting_lookup_string(setting, key_strings.scroll_line_down, &tmp))
+            s->key_scroll_line_down= key_parse(&tmp);
+        if (config_setting_lookup_string(setting, key_strings.half_page_up, &tmp))
+            s->key_half_page_up = key_parse(&tmp);
+        if (config_setting_lookup_string(setting, key_strings.half_page_down, &tmp))
+            s->key_half_page_down = key_parse(&tmp);
+        if (config_setting_lookup_string(setting, key_strings.page_bottom, &tmp))
+            s->key_page_bottom = key_parse(&tmp);
+        if (config_setting_lookup_string(setting, key_strings.peer_list_up, &tmp))
+            s->key_peer_list_up = key_parse(&tmp);
+        if (config_setting_lookup_string(setting, key_strings.peer_list_down, &tmp))
+            s->key_peer_list_down = key_parse(&tmp);
+        if (config_setting_lookup_string(setting, key_strings.toggle_peerlist, &tmp))
+            s->key_toggle_peerlist = key_parse(&tmp);
     }
 
 #ifdef AUDIO
@@ -321,77 +400,63 @@ int settings_load(struct user_settings *s, const char *patharg)
 
 #ifdef SOUND_NOTIFY
     if ((setting = config_lookup(cfg, sound_strings.self)) != NULL) {
-        if ( (config_setting_lookup_string(setting, sound_strings.error, &str) != CONFIG_TRUE) ||
-                !set_sound(error, str) ) {
+        if ( (config_setting_lookup_string(setting, sound_strings.notif_error, &str) != CONFIG_TRUE) ||
+                !set_sound(notif_error, str) ) {
             if (str && strcasecmp(str, NO_SOUND) != 0)
-                set_sound(error, PACKAGE_DATADIR "/sounds/Error.wav");
+                set_sound(notif_error, PACKAGE_DATADIR "/sounds/ToxicError.wav");
         }
 
         if ( !config_setting_lookup_string(setting, sound_strings.user_log_in, &str) ||
                 !set_sound(user_log_in, str) ) {
             if (str && strcasecmp(str, NO_SOUND) != 0)
-                set_sound(user_log_in, PACKAGE_DATADIR "/sounds/ContactLogsIn.wav");
-        }
-        
-        if ( !config_setting_lookup_string(setting, sound_strings.self_log_in, &str) ||
-                !set_sound(self_log_in, str) ) {
-            if (str && strcasecmp(str, NO_SOUND) != 0)
-                set_sound(self_log_in, PACKAGE_DATADIR "/sounds/LogIn.wav");
+                set_sound(user_log_in, PACKAGE_DATADIR "/sounds/ToxicContactOnline.wav");
         }
 
         if ( !config_setting_lookup_string(setting, sound_strings.user_log_out, &str) ||
                 !set_sound(user_log_out, str) ) {
             if (str && strcasecmp(str, NO_SOUND) != 0)
-                set_sound(user_log_out, PACKAGE_DATADIR "/sounds/ContactLogsOut.wav");
-        }
-
-        if ( !config_setting_lookup_string(setting, sound_strings.self_log_out, &str) ||
-                !set_sound(self_log_out, str) ) {
-            if (str && strcasecmp(str, NO_SOUND) != 0)
-                set_sound(self_log_out, PACKAGE_DATADIR "/sounds/LogOut.wav");
+                set_sound(user_log_out, PACKAGE_DATADIR "/sounds/ToxicContactOffline.wav");
         }
 
         if ( !config_setting_lookup_string(setting, sound_strings.call_incoming, &str) ||
                 !set_sound(call_incoming, str) ) {
             if (str && strcasecmp(str, NO_SOUND) != 0)
-                set_sound(call_incoming, PACKAGE_DATADIR "/sounds/IncomingCall.wav");
+                set_sound(call_incoming, PACKAGE_DATADIR "/sounds/ToxicIncomingCall.wav");
         }
 
         if ( !config_setting_lookup_string(setting, sound_strings.call_outgoing, &str) ||
                 !set_sound(call_outgoing, str) ) {
             if (str && strcasecmp(str, NO_SOUND) != 0)
-                set_sound(call_outgoing, PACKAGE_DATADIR "/sounds/OutgoingCall.wav");
+                set_sound(call_outgoing, PACKAGE_DATADIR "/sounds/ToxicOutgoingCall.wav");
         }
 
         if ( !config_setting_lookup_string(setting, sound_strings.generic_message, &str) ||
                 !set_sound(generic_message, str) ) {
             if (str && strcasecmp(str, NO_SOUND) != 0)
-                set_sound(generic_message, PACKAGE_DATADIR "/sounds/NewMessage.wav");
+                set_sound(generic_message, PACKAGE_DATADIR "/sounds/ToxicRecvMessage.wav");
         }
 
         if ( !config_setting_lookup_string(setting, sound_strings.transfer_pending, &str) ||
                 !set_sound(transfer_pending, str) ) {
             if (str && strcasecmp(str, NO_SOUND) != 0)
-                set_sound(transfer_pending, PACKAGE_DATADIR "/sounds/TransferPending.wav");
+                set_sound(transfer_pending, PACKAGE_DATADIR "/sounds/ToxicTransferStart.wav");
         }
 
         if ( !config_setting_lookup_string(setting, sound_strings.transfer_completed, &str) ||
                 !set_sound(transfer_completed, str) ) {
             if (str && strcasecmp(str, NO_SOUND) != 0)
-                set_sound(transfer_completed, PACKAGE_DATADIR "/sounds/TransferComplete.wav");
+                set_sound(transfer_completed, PACKAGE_DATADIR "/sounds/ToxicTransferComplete.wav");
         }
     }
     else {
-        set_sound(error, PACKAGE_DATADIR "/sounds/Error.wav");
-        set_sound(user_log_in, PACKAGE_DATADIR "/sounds/ContactLogsIn.wav");
-        set_sound(self_log_in, PACKAGE_DATADIR "/sounds/LogIn.wav");
-        set_sound(user_log_out, PACKAGE_DATADIR "/sounds/ContactLogsOut.wav");
-        set_sound(self_log_out, PACKAGE_DATADIR "/sounds/LogOut.wav");
-        set_sound(call_incoming, PACKAGE_DATADIR "/sounds/IncomingCall.wav");
-        set_sound(call_outgoing, PACKAGE_DATADIR "/sounds/OutgoingCall.wav");
-        set_sound(generic_message, PACKAGE_DATADIR "/sounds/NewMessage.wav");
-        set_sound(transfer_pending, PACKAGE_DATADIR "/sounds/TransferPending.wav");
-        set_sound(transfer_completed, PACKAGE_DATADIR "/sounds/TransferComplete.wav");
+        set_sound(notif_error, PACKAGE_DATADIR "/sounds/ToxicError.wav");
+        set_sound(user_log_in, PACKAGE_DATADIR "/sounds/ToxicContactOnline.wav");
+        set_sound(user_log_out, PACKAGE_DATADIR "/sounds/ToxicContactOffline.wav");
+        set_sound(call_incoming, PACKAGE_DATADIR "/sounds/ToxicIncomingCall.wav");
+        set_sound(call_outgoing, PACKAGE_DATADIR "/sounds/ToxicOutgoingCall.wav");
+        set_sound(generic_message, PACKAGE_DATADIR "/sounds/ToxicRecvMessage.wav");
+        set_sound(transfer_pending, PACKAGE_DATADIR "/sounds/ToxicTransferStart.wav");
+        set_sound(transfer_completed, PACKAGE_DATADIR "/sounds/ToxicTransferComplete.wav");
     }
 #endif
 

src/settings.h

@@ -25,18 +25,31 @@
 
 #include <limits.h>
 
+#include <tox/tox.h>
+
+/* Represents line_* hints max strlen */
+#define LINE_HINT_MAX 3
+
 /* holds user setting values */
 struct user_settings {
     int autolog;           /* boolean */
     int alerts;            /* boolean */
-    int time;              /* 12 or 24 */
+
     int timestamps;        /* boolean */
+    char timestamp_format[TIME_STR_SIZE];
+    char log_timestamp_format[TIME_STR_SIZE];
+
     int colour_theme;      /* boolean (0 for default toxic colours) */
     int history_size;      /* int between MIN_HISTORY and MAX_HISTORY */
     int show_typing_self;  /* boolean */
     int show_typing_other; /* boolean */
     int show_welcome_msg;  /* boolean */
 
+    char line_join[LINE_HINT_MAX + 1];
+    char line_quit[LINE_HINT_MAX + 1];
+    char line_alert[LINE_HINT_MAX + 1];
+    char line_normal[LINE_HINT_MAX + 1];
+
     char download_path[PATH_MAX];
     char chatlogs_path[PATH_MAX];
     char avatar_path[PATH_MAX];
@@ -50,6 +63,10 @@ struct user_settings {
     int key_page_bottom;
     int key_peer_list_up;
     int key_peer_list_down;
+    int key_toggle_peerlist;
+
+    int mplex_away; /* boolean (1 for reaction to terminal attach/detach) */
+    char mplex_away_note [TOX_MAX_STATUS_MESSAGE_LENGTH];
 
 #ifdef AUDIO
     int audio_in_dev;
@@ -62,9 +79,6 @@ enum {
     AUTOLOG_OFF = 0,
     AUTOLOG_ON = 1,
 
-    TIME_24 = 24,
-    TIME_12 = 12,
-
     TIMESTAMPS_OFF = 0,
     TIMESTAMPS_ON = 1,
 
@@ -81,7 +95,18 @@ enum {
     SHOW_WELCOME_MSG_ON = 1,
 
     DFLT_HST_SIZE = 700,
+
+    MPLEX_OFF = 0,
+    MPLEX_ON = 1,
 } settings_values;
 
+#define LINE_JOIN    "-->"
+#define LINE_QUIT    "<--"
+#define LINE_ALERT   "-!-"
+#define LINE_NORMAL  "---"
+#define TIMESTAMP_DEFAULT      "%H:%M:%S"
+#define LOG_TIMESTAMP_DEFAULT  "%Y/%m/%d [%H:%M:%S]"
+#define MPLEX_AWAY_NOTE "Detached from screen"
+
 int settings_load(struct user_settings *s, const char *patharg);
 #endif /* #define SETTINGS_H */

src/term_mplex.c

@@ -0,0 +1,398 @@
+/*  term_mplex.c
+ *
+ *
+ *  Copyright (C) 2015 Toxic All Rights Reserved.
+ *
+ *  This file is part of Toxic.
+ *
+ *  Toxic is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Toxic is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Toxic.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <limits.h> /* PATH_MAX */
+#include <stdio.h>  /* fgets, popen, pclose */
+#include <stdlib.h> /* malloc, realloc, free, getenv */
+#include <string.h> /* strlen, strcpy, strstr, strchr, strrchr, strcat, strncmp */
+
+#include <pthread.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <time.h>
+#include <unistd.h>
+
+#include <tox/tox.h>
+
+#include "global_commands.h"
+#include "windows.h"
+#include "term_mplex.h"
+#include "toxic.h"
+#include "settings.h"
+
+extern struct ToxWindow *prompt;
+extern struct user_settings *user_settings;
+extern struct Winthread Winthread;
+
+#if defined(PATH_MAX) && PATH_MAX > 512
+#define BUFFER_SIZE PATH_MAX
+#else
+#define BUFFER_SIZE 512
+#endif
+
+#define PATH_SEP_S "/"
+#define PATH_SEP_C '/'
+
+typedef enum
+{
+    MPLEX_NONE,
+    MPLEX_SCREEN,
+    MPLEX_TMUX,
+} mplex_status;
+
+/* used for:
+   - storing screen socket name
+   - storing tmux session number in string form */
+static char mplex_data [BUFFER_SIZE];
+
+static char buffer [BUFFER_SIZE];
+
+/* Differentiates between mplex auto-away and manual-away */
+static bool auto_away_active = false;
+
+static mplex_status mplex = MPLEX_NONE;
+static TOX_USER_STATUS prev_status = TOX_USER_STATUS_NONE;
+static char prev_note [TOX_MAX_STATUS_MESSAGE_LENGTH] = "";
+
+/* mutex for access to status data, for sync between:
+   - user command /status from ncurses thread
+   - auto-away POSIX timer, which runs from a separate thread
+   after init, should be accessed only by cmd_status()
+ */
+static pthread_mutex_t status_lock;
+static pthread_t mplex_tid;
+
+void lock_status ()
+{
+    pthread_mutex_lock (&status_lock);
+}
+
+void unlock_status ()
+{
+    pthread_mutex_unlock (&status_lock);
+}
+
+static char *read_into_dyn_buffer (FILE *stream)
+{
+    const char *input_ptr = NULL;
+    char *dyn_buffer = NULL;
+    int dyn_buffer_size = 1; /* account for the \0 */
+
+    while ((input_ptr = fgets (buffer, BUFFER_SIZE, stream)) != NULL)
+    {
+        int length = dyn_buffer_size + strlen (input_ptr);
+        if (dyn_buffer)
+            dyn_buffer = (char*) realloc (dyn_buffer, length);
+        else
+            dyn_buffer = (char*) malloc (length);
+        strcpy (dyn_buffer + dyn_buffer_size - 1, input_ptr);
+        dyn_buffer_size = length;
+    }
+
+    return dyn_buffer;
+}
+
+static char *extract_socket_path (const char *info)
+{
+    const char *search_str = " Socket";
+    const char *pos = strstr (info, search_str);
+    char *end = NULL;
+    char* path = NULL;
+
+    if (!pos)
+        return NULL;
+
+    pos += strlen (search_str);
+    pos = strchr (pos, PATH_SEP_C);
+    if (!pos)
+        return NULL;
+
+    end = strchr (pos, '\n');
+    if (!end)
+        return NULL;
+
+    *end = '\0';
+    end = strrchr (pos, '.');
+    if (!end)
+        return NULL;
+
+    path = (char*) malloc (end - pos + 1);
+    *end = '\0';
+    return strcpy (path, pos);
+}
+
+static int detect_gnu_screen ()
+{
+    FILE *session_info_stream = NULL;
+    char *socket_name = NULL, *socket_path = NULL;
+    char *dyn_buffer = NULL;
+
+    socket_name = getenv ("STY");
+    if (!socket_name)
+        goto nomplex;
+
+    session_info_stream = popen ("env LC_ALL=C screen -ls", "r");
+    if (!session_info_stream)
+        goto nomplex;
+
+    dyn_buffer = read_into_dyn_buffer (session_info_stream);
+    if (!dyn_buffer)
+        goto nomplex;
+
+    pclose (session_info_stream);
+    session_info_stream = NULL;
+
+    socket_path = extract_socket_path (dyn_buffer);
+    if (!socket_path)
+        goto nomplex;
+
+    free (dyn_buffer);
+    dyn_buffer = NULL;
+
+    if (strlen(socket_path) + strlen(PATH_SEP_S) + strlen(socket_name) >= sizeof(mplex_data))
+        goto nomplex;
+
+    strcpy (mplex_data, socket_path);
+    strcat (mplex_data, PATH_SEP_S);
+    strcat (mplex_data, socket_name);
+    free (socket_path);
+    socket_path = NULL;
+
+    mplex = MPLEX_SCREEN;
+    return 1;
+
+nomplex:
+    if (session_info_stream)
+        pclose (session_info_stream);
+    if (dyn_buffer)
+        free (dyn_buffer);
+    if (socket_path)
+        free(socket_path);
+    return 0;
+}
+
+static int detect_tmux ()
+{
+    char *tmux_env = getenv ("TMUX"), *pos;
+    if (!tmux_env)
+        return 0;
+
+    /* find second separator */
+    pos = strrchr (tmux_env, ',');
+    if (!pos)
+        return 0;
+
+    /* store the session number string for later use */
+    snprintf (mplex_data, sizeof(mplex_data), "%s", pos + 1);
+    mplex = MPLEX_TMUX;
+    return 1;
+}
+
+/* Checks whether a terminal multiplexer (mplex) is present, and finds
+   its unix socket.
+
+   GNU screen and tmux are supported.
+
+   Returns 1 if present, 0 otherwise. This value can be used to determine
+   whether an auto-away detection timer is needed.
+ */
+static int detect_mplex ()
+{
+    /* try screen, and if fails try tmux */
+    return detect_gnu_screen () || detect_tmux ();
+}
+
+/* Detects gnu screen session attached/detached by examining permissions of
+   the session's unix socket.
+ */
+static int gnu_screen_is_detached ()
+{
+    if (mplex != MPLEX_SCREEN)
+        return 0;
+
+    struct stat sb;
+    if (stat (mplex_data, &sb) != 0)
+        return 0;
+
+    /* execution permission (x) means attached */
+    return ! (sb.st_mode & S_IXUSR);
+}
+
+/* Detects tmux attached/detached by getting session data and finding the
+   current session's entry. An attached entry ends with "(attached)". Example:
+
+    $ tmux list-sessions
+    0: 1 windows (created Mon Mar  2 21:48:29 2015) [80x23] (attached)
+    1: 2 windows (created Mon Mar  2 21:48:43 2015) [80x23]
+
+    In this example, session 0 is attached and session 1 is detached.
+*/
+static int tmux_is_detached ()
+{
+    if (mplex != MPLEX_TMUX)
+        return 0;
+
+    FILE *session_info_stream = NULL;
+    char *dyn_buffer = NULL, *search_str = NULL;
+    char *entry_pos, *nl_pos, *attached_pos;
+    const int numstr_len = strlen (mplex_data);
+
+    session_info_stream = popen ("env LC_ALL=C tmux list-sessions", "r");
+    if (!session_info_stream)
+        goto fail;
+
+    dyn_buffer = read_into_dyn_buffer (session_info_stream);
+    if (!dyn_buffer)
+        goto fail;
+
+    pclose (session_info_stream);
+    session_info_stream = NULL;
+
+    /* prepare search string, for finding the current session's entry */
+    search_str = (char*) malloc (numstr_len + 4);
+    search_str[0] = '\n';
+    strcpy (search_str + 1, mplex_data);
+    strcat (search_str, ": ");
+
+    /* do the search */
+    if (strncmp (dyn_buffer, search_str + 1, numstr_len + 2) == 0)
+        entry_pos = dyn_buffer;
+    else
+        entry_pos = strstr (dyn_buffer, search_str);
+
+    if (! entry_pos)
+        goto fail;
+
+    /* find the next \n and look for the "(attached)" before it */
+    nl_pos = strchr (entry_pos + 1, '\n');
+    attached_pos = strstr (entry_pos + 1, "(attached)\n");
+
+    free (search_str);
+    search_str = NULL;
+
+    free (dyn_buffer);
+    dyn_buffer = NULL;
+
+    return attached_pos == NULL  ||  attached_pos > nl_pos;
+
+fail:
+    if (session_info_stream)
+        pclose (session_info_stream);
+    if (dyn_buffer)
+        free (dyn_buffer);
+    if (search_str)
+        free (search_str);
+    return 0;
+}
+
+/* Checks whether there is a terminal multiplexer present, but in detached
+   state. Returns 1 if detached, 0 if attached or if there is no terminal
+   multiplexer.
+
+   If detect_mplex_socket() failed to find a mplex, there is no need to call
+   this function. If it did find one, this function can be used to periodically
+   sample its state and update away status according to attached/detached state
+   of the mplex.
+ */
+static int mplex_is_detached ()
+{
+    return gnu_screen_is_detached ()  ||  tmux_is_detached ();
+}
+
+static void mplex_timer_handler (Tox *m)
+{
+    TOX_USER_STATUS current_status, new_status;
+    const char *new_note;
+
+    if (mplex == MPLEX_NONE)
+        return;
+
+    int detached = mplex_is_detached ();
+
+    pthread_mutex_lock (&Winthread.lock);
+    current_status = tox_self_get_status (m);
+    pthread_mutex_unlock (&Winthread.lock);
+
+    if (auto_away_active && current_status == TOX_USER_STATUS_AWAY && !detached)
+    {
+        auto_away_active = false;
+        new_status = prev_status;
+        new_note = prev_note;
+    }
+    else
+    if (current_status == TOX_USER_STATUS_NONE && detached)
+    {
+        auto_away_active = true;
+        prev_status = current_status;
+        new_status = TOX_USER_STATUS_AWAY;
+        pthread_mutex_lock (&Winthread.lock);
+        size_t slen = tox_self_get_status_message_size(m);
+        tox_self_get_status_message (m, (uint8_t*) prev_note);
+        prev_note[slen] = '\0';
+        pthread_mutex_unlock (&Winthread.lock);
+        new_note = user_settings->mplex_away_note;
+    }
+    else
+        return;
+
+    char argv[3][MAX_STR_SIZE];
+    strcpy (argv[0], "/status");
+    strcpy (argv[1], (new_status == TOX_USER_STATUS_AWAY ? "away" :
+                      new_status == TOX_USER_STATUS_BUSY ? "busy" : "online"));
+    argv[2][0] = '\"';
+    strcpy (argv[2] + 1, new_note);
+    strcat (argv[2], "\"");
+    pthread_mutex_lock (&Winthread.lock);
+    cmd_status (prompt->chatwin->history, prompt, m, 2, argv);
+    pthread_mutex_unlock (&Winthread.lock);
+}
+
+/* Time in seconds between calls to mplex_timer_handler */
+#define MPLEX_TIMER_INTERVAL 5
+
+void *mplex_timer_thread(void *data)
+{
+    Tox *m = (Tox *) data;
+
+    while (true) {
+        sleep(MPLEX_TIMER_INTERVAL);
+        mplex_timer_handler(m);
+    }
+}
+
+int init_mplex_away_timer (Tox *m)
+{
+    if (! detect_mplex ())
+        return 0;
+
+    if (! user_settings->mplex_away)
+        return 0;
+
+    /* status access mutex */
+    if (pthread_mutex_init (&status_lock, NULL) != 0)
+        return -1;
+
+    if (pthread_create(&mplex_tid, NULL, mplex_timer_thread, (void *) m) != 0)
+        return -1;
+
+    return 0;
+}

src/term_mplex.h

@@ -0,0 +1,35 @@
+/*  term_mplex.h
+ *
+ *
+ *  Copyright (C) 2015 Toxic All Rights Reserved.
+ *
+ *  This file is part of Toxic.
+ *
+ *  Toxic is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Toxic is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Toxic.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef TERM_MPLEX_H
+#define TERM_MPLEX_H
+
+/* Checks if Toxic runs inside a terminal multiplexer (GNU screen or tmux). If
+   yes, it initializes a timer which periodically checks the attached/detached
+   state of the terminal and updates away status accordingly.
+ */
+int init_mplex_away_timer (Tox *m);
+
+void lock_status ();
+void unlock_status ();
+
+#endif /* #define TERM_MPLEX_H */

src/toxic.h

@@ -24,7 +24,7 @@
 #define TOXIC_H
 
 #ifndef TOXICVER
-#define TOXICVER "NOVER_"    /* Use the -D flag to set this */
+#define TOXICVER "NOVERS"    /* Use the -D flag to set this */
 #endif
 
 #ifndef SIGWINCH
@@ -41,12 +41,13 @@
 #include <tox/tox.h>
 
 #define UNKNOWN_NAME "Anonymous"
+#define DEFAULT_TOX_NAME "Tox User"   /* should always be the same as toxcore's default name */
 
-#define MAX_STR_SIZE TOX_MAX_MESSAGE_LENGTH
+#define MAX_STR_SIZE TOX_MAX_MESSAGE_LENGTH    /* must be >= TOX_MAX_MESSAGE_LENGTH */
 #define MAX_CMDNAME_SIZE 64
 #define TOXIC_MAX_NAME_LENGTH 32   /* Must be <= TOX_MAX_NAME_LENGTH */
 #define KEY_IDENT_DIGITS 3    /* number of hex digits to display for the pub-key based identifier */
-#define TIME_STR_SIZE 16
+#define TIME_STR_SIZE 32
 
 /* ASCII key codes */
 #define T_KEY_ESC        0x1B     /* ESC key */
@@ -62,6 +63,9 @@
 #define T_KEY_C_F        0x06     /* ctrl-f */
 #define T_KEY_C_H        0x08     /* ctrl-h */
 #define T_KEY_C_Y        0x19     /* ctrl-y */
+#define T_KEY_C_L        0x0C     /* ctrl-l */
+#define T_KEY_C_W        0x17     /* ctrl-w */
+#define T_KEY_C_B        0x02     /* ctrl-b */
 #define T_KEY_TAB        0x09     /* TAB key */
 
 #define ONLINE_CHAR "*"
@@ -73,42 +77,48 @@ typedef enum _FATAL_ERRS {
     FATALERR_THREAD_CREATE = -3,    /* thread creation failed for critical thread */
     FATALERR_MUTEX_INIT = -4,       /* mutex init for critical thread failed */
     FATALERR_THREAD_ATTR = -5,      /* thread attr object init failed */
-    FATALERR_LOCALE_SET = -6,       /* system locale not set */
+    FATALERR_LOCALE_NOT_SET = -6,   /* system locale not set */
     FATALERR_STORE_DATA = -7,       /* store_data failed in critical section */
-    FATALERR_NETWORKINIT = -8,      /* Tox network failed to init */
-    FATALERR_INFLOOP = -9,          /* infinite loop detected */
-    FATALERR_WININIT = -10,         /* window init failed */
-    FATALERR_PROXY = -11,           /* Tox network failed to init using a proxy */
-    FATALERR_ENCRYPT = -12,         /* Data file encryption failure */
+    FATALERR_INFLOOP = -8,          /* infinite loop detected */
+    FATALERR_WININIT = -9,          /* window init failed */
+    FATALERR_PROXY = -10,           /* Tox network failed to init using a proxy */
+    FATALERR_ENCRYPT = -11,         /* Data file encryption failure */
+    FATALERR_TOX_INIT = -12,        /* Tox instance failed to initialize */
 } FATAL_ERRS;
 
 /* Fixes text color problem on some terminals.
    Uncomment if necessary */
 /* #define URXVT_FIX */
 
+void lock_status ();
+void unlock_status ();
+
 void exit_toxic_success(Tox *m);
 void exit_toxic_err(const char *errmsg, int errcode);
 
 int store_data(Tox *m, const char *path);
 
-void on_request(Tox *m, const uint8_t *public_key, const uint8_t *data, uint16_t length, void *userdata);
-void on_connectionchange(Tox *m, int32_t friendnumber, uint8_t status, void *userdata);
-void on_message(Tox *m, int32_t friendnumber, const uint8_t *string, uint16_t length, void *userdata);
-void on_action(Tox *m, int32_t friendnumber, const uint8_t *string, uint16_t length, void *userdata);
-void on_nickchange(Tox *m, int32_t friendnumber, const uint8_t *string, uint16_t length, void *userdata);
-void on_statuschange(Tox *m, int32_t friendnumber, uint8_t status, void *userdata);
-void on_statusmessagechange(Tox *m, int32_t friendnumber, const uint8_t *string, uint16_t length, void *userdata);
-void on_friendadded(Tox *m, int32_t friendnumber, bool sort);
+/* callbacks */
+void on_request(Tox *m, const uint8_t *public_key, const uint8_t *data, size_t length, void *userdata);
+void on_connectionchange(Tox *m, uint32_t friendnumber, TOX_CONNECTION status, void *userdata);
+void on_message(Tox *m, uint32_t friendnumber, TOX_MESSAGE_TYPE type, const uint8_t *string, size_t length, void *userdata);
+void on_action(Tox *m, uint32_t friendnumber, const uint8_t *string, size_t length, void *userdata);
+void on_nickchange(Tox *m, uint32_t friendnumber, const uint8_t *string, size_t length, void *userdata);
+void on_statuschange(Tox *m, uint32_t friendnumber, TOX_USER_STATUS status, void *userdata);
+void on_statusmessagechange(Tox *m, uint32_t friendnumber, const uint8_t *string, size_t length, void *userdata);
+void on_friendadded(Tox *m, uint32_t friendnumber, bool sort);
 void on_groupmessage(Tox *m, int groupnumber, int peernumber, const uint8_t *message, uint16_t length, void *userdata);
 void on_groupaction(Tox *m, int groupnumber, int peernumber, const uint8_t *action, uint16_t length, void *userdata);
-void on_groupinvite(Tox *m, int32_t friendnumber, const uint8_t *group_pub_key, uint16_t length, void *userdata);
+void on_groupinvite(Tox *m, int32_t friendnumber, uint8_t type, const uint8_t *group_pub_key, uint16_t length, void *userdata);
 void on_group_namelistchange(Tox *m, int groupnumber, int peernumber, uint8_t change, void *userdata);
-void on_file_sendrequest(Tox *m, int32_t friendnumber, uint8_t filenumber, uint64_t filesize, const uint8_t *pathname,
-                         uint16_t pathname_length, void *userdata);
-void on_file_control(Tox *m, int32_t friendnumber, uint8_t receive_send, uint8_t filenumber, uint8_t control_type,
-                     const uint8_t *data, uint16_t length, void *userdata);
-void on_file_data(Tox *m, int32_t friendnumber, uint8_t filenumber, const uint8_t *data, uint16_t length, void *userdata);
-void on_typing_change(Tox *m, int32_t friendnumber, uint8_t is_typing, void *userdata);
-void on_read_receipt(Tox *m, int32_t, uint32_t, void *userdata);
+void on_group_titlechange(Tox *m, int groupnumber, int peernumber, const uint8_t *title, uint8_t length, void *userdata);
+void on_file_chunk_request(Tox *m, uint32_t friendnumber, uint32_t filenumber, uint64_t position, size_t length, void *userdata);
+void on_file_recv_chunk(Tox *m, uint32_t friendnumber, uint32_t filenumber, uint64_t position, const uint8_t *data,
+                        size_t length, void *userdata);
+void on_file_control (Tox *m, uint32_t friendnumber, uint32_t filenumber, TOX_FILE_CONTROL control, void *userdata);
+void on_file_recv(Tox *m, uint32_t friendnumber, uint32_t filenumber, uint32_t kind, uint64_t file_size,
+                  const uint8_t *filename, size_t filename_length, void *userdata);
+void on_typing_change(Tox *m, uint32_t friendnumber, bool is_typing, void *userdata);
+void on_read_receipt(Tox *m, uint32_t friendnumber, uint32_t receipt, void *userdata);
 
 #endif  /* #define TOXIC_H */

src/toxic_strings.c

@@ -121,6 +121,39 @@ int yank_buf(ChatContext *ctx)
     ctx->pos += ctx->yank_len;
     ctx->len += ctx->yank_len;
     ctx->line[ctx->len] = L'\0';
+
+    return 0;
+}
+
+/* Deletes all characters from line starting at pos and going backwards
+   until we find a space or run out of characters.
+   Return 0 on success, -1 if nothing to delete */
+int del_word_buf(ChatContext *ctx)
+{
+    if (ctx->len == 0 || ctx->pos == 0)
+        return -1;
+
+    int i = ctx->pos, count = 0;
+
+    /* traverse past empty space */
+    while (i > 0 && ctx->line[i-1] == L' ') {
+        ++count;
+        --i;
+    }
+
+    /* traverse past last entered word */
+    while (i > 0 && ctx->line[i-1] != L' ') {
+        ++count;
+        --i;
+    }
+
+    wmemmove(&ctx->line[i], &ctx->line[ctx->pos], ctx->len - ctx->pos);
+
+    ctx->start = MAX(0, ctx->start - count);   /* TODO: take into account widechar */
+    ctx->len -= count;
+    ctx->pos -= count;
+    ctx->line[ctx->len] = L'\0';
+
     return 0;
 }
 
@@ -192,7 +225,7 @@ void fetch_hist_item(ChatContext *ctx, int key_dir)
     if (key_dir == KEY_UP) {
         if (--ctx->hst_pos < 0) {
             ctx->hst_pos = 0;
-            sound_notify(NULL, error, NT_ALWAYS, NULL);
+            sound_notify(NULL, notif_error, NT_ALWAYS, NULL);
         }
     } else {
         if (++ctx->hst_pos >= ctx->hst_tot) {

src/toxic_strings.h

@@ -49,6 +49,11 @@ void reset_buf(ChatContext *ctx);
    Return 0 on success, -1 if yank buffer is empty or too long */
 int yank_buf(ChatContext *ctx);
 
+/* Deletes all characters from line starting at pos and going backwards 
+   until we find a space or run out of characters.
+   Return 0 on success, -1 if no line or already at the beginning */
+int del_word_buf(ChatContext *ctx);
+
 /* Removes trailing spaces from line. */
 void rm_trailing_spaces_buf(ChatContext *ctx);
 

src/windows.c

@@ -32,8 +32,11 @@
 #include "groupchat.h"
 #include "chat.h"
 #include "line_info.h"
-
+#include "misc_tools.h"
+#include "avatars.h"
 #include "settings.h"
+#include "file_transfers.h"
+
 extern char *DATA_FILE;
 extern struct Winthread Winthread;
 static ToxWindow windows[MAX_WINDOWS_NUM];
@@ -45,32 +48,36 @@ extern struct user_settings *user_settings;
 static int num_active_windows;
 
 /* CALLBACKS START */
-void on_request(Tox *m, const uint8_t *public_key, const uint8_t *data, uint16_t length, void *userdata)
+void on_request(Tox *m, const uint8_t *public_key, const uint8_t *data, size_t length, void *userdata)
 {
-    int i;
+    char msg[MAX_STR_SIZE + 1];
+    length = copy_tox_str(msg, sizeof(msg), (const char *) data, length);
+
+    size_t i;
 
     for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
-        if (windows[i].onFriendRequest != NULL)
-            windows[i].onFriendRequest(&windows[i], m, (const char *) public_key, (const char *) data, length);
+        if (windows[i].onFriendRequest != NULL) {
+            windows[i].onFriendRequest(&windows[i], m, (const char *) public_key, msg, length);
+        }
     }
 }
 
-void on_connectionchange(Tox *m, int32_t friendnumber, uint8_t status, void *userdata)
+void on_connectionchange(Tox *m, uint32_t friendnumber, TOX_CONNECTION connection_status, void *userdata)
 {
-    int i;
+    size_t i;
 
     for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
         if (windows[i].onConnectionChange != NULL)
-            windows[i].onConnectionChange(&windows[i], m, friendnumber, status);
+            windows[i].onConnectionChange(&windows[i], m, friendnumber, connection_status);
     }
 }
 
-void on_typing_change(Tox *m, int32_t friendnumber, uint8_t is_typing, void *userdata)
+void on_typing_change(Tox *m, uint32_t friendnumber, bool is_typing, void *userdata)
 {
     if (user_settings->show_typing_other == SHOW_TYPING_OFF)
         return;
 
-    int i;
+    size_t i;
 
     for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
         if (windows[i].onTypingChange != NULL)
@@ -78,51 +85,53 @@ void on_typing_change(Tox *m, int32_t friendnumber, uint8_t is_typing, void *use
     }
 }
 
-void on_message(Tox *m, int32_t friendnumber, const uint8_t *string, uint16_t length, void *userdata)
+void on_message(Tox *m, uint32_t friendnumber, TOX_MESSAGE_TYPE type, const uint8_t *string, size_t length,
+                void *userdata)
 {
-    int i;
+    char msg[MAX_STR_SIZE + 1];
+    length = copy_tox_str(msg, sizeof(msg), (const char *) string, length);
+
+    size_t i;
 
     for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
         if (windows[i].onMessage != NULL)
-            windows[i].onMessage(&windows[i], m, friendnumber, (const char *) string, length);
+            windows[i].onMessage(&windows[i], m, friendnumber, type, msg, length);
     }
 }
 
-void on_action(Tox *m, int32_t friendnumber, const uint8_t *string, uint16_t length, void *userdata)
+void on_nickchange(Tox *m, uint32_t friendnumber, const uint8_t *string, size_t length, void *userdata)
 {
-    int i;
+    char nick[TOXIC_MAX_NAME_LENGTH + 1];
+    length = copy_tox_str(nick, sizeof(nick), (const char *) string, length);
+    filter_str(nick, length);
 
-    for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
-        if (windows[i].onAction != NULL)
-            windows[i].onAction(&windows[i], m, friendnumber, (const char *) string, length);
-    }
-}
-
-void on_nickchange(Tox *m, int32_t friendnumber, const uint8_t *string, uint16_t length, void *userdata)
-{
-    int i;
+    size_t i;
 
     for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
         if (windows[i].onNickChange != NULL)
-            windows[i].onNickChange(&windows[i], m, friendnumber, (const char *) string, length);
+            windows[i].onNickChange(&windows[i], m, friendnumber, nick, length);
     }
 
     store_data(m, DATA_FILE);
 }
 
-void on_statusmessagechange(Tox *m, int32_t friendnumber, const uint8_t *string, uint16_t length, void *userdata)
+void on_statusmessagechange(Tox *m, uint32_t friendnumber, const uint8_t *string, size_t length, void *userdata)
 {
-    int i;
+    char msg[TOX_MAX_STATUS_MESSAGE_LENGTH + 1];
+    length = copy_tox_str(msg, sizeof(msg), (const char *) string, length);
+    filter_str(msg, length);
+
+    size_t i;
 
     for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
         if (windows[i].onStatusMessageChange != NULL)
-            windows[i].onStatusMessageChange(&windows[i], friendnumber, (const char *) string, length);
+            windows[i].onStatusMessageChange(&windows[i], friendnumber, msg, length);
     }
 }
 
-void on_statuschange(Tox *m, int32_t friendnumber, uint8_t status, void *userdata)
+void on_statuschange(Tox *m, uint32_t friendnumber, TOX_USER_STATUS status, void *userdata)
 {
-    int i;
+    size_t i;
 
     for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
         if (windows[i].onStatusChange != NULL)
@@ -130,9 +139,9 @@ void on_statuschange(Tox *m, int32_t friendnumber, uint8_t status, void *userdat
     }
 }
 
-void on_friendadded(Tox *m, int32_t friendnumber, bool sort)
+void on_friendadded(Tox *m, uint32_t friendnumber, bool sort)
 {
-    int i;
+    size_t i;
 
     for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
         if (windows[i].onFriendAdded != NULL)
@@ -145,38 +154,45 @@ void on_friendadded(Tox *m, int32_t friendnumber, bool sort)
 void on_groupmessage(Tox *m, int groupnumber, int peernumber, const uint8_t *message, uint16_t length,
                      void *userdata)
 {
-    int i;
+    char msg[MAX_STR_SIZE + 1];
+    length = copy_tox_str(msg, sizeof(msg), (const char *) message, length);
+
+    size_t i;
 
     for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
         if (windows[i].onGroupMessage != NULL)
-            windows[i].onGroupMessage(&windows[i], m, groupnumber, peernumber, (const char *) message, length);
+            windows[i].onGroupMessage(&windows[i], m, groupnumber, peernumber, msg, length);
     }
 }
 
 void on_groupaction(Tox *m, int groupnumber, int peernumber, const uint8_t *action, uint16_t length,
                     void *userdata)
 {
-    int i;
+    char msg[MAX_STR_SIZE + 1];
+    length = copy_tox_str(msg, sizeof(msg), (const char *) action, length);
+
+    size_t i;
 
     for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
         if (windows[i].onGroupAction != NULL)
-            windows[i].onGroupAction(&windows[i], m, groupnumber, peernumber, (const char *) action, length);
+            windows[i].onGroupAction(&windows[i], m, groupnumber, peernumber, msg, length);
     }
 }
 
-void on_groupinvite(Tox *m, int32_t friendnumber, const uint8_t *group_pub_key, uint16_t length, void *userdata)
+void on_groupinvite(Tox *m, int32_t friendnumber, uint8_t type, const uint8_t *group_pub_key, uint16_t length,
+                    void *userdata)
 {
-    int i;
+    size_t i;
 
     for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
         if (windows[i].onGroupInvite != NULL)
-            windows[i].onGroupInvite(&windows[i], m, friendnumber, (const char *) group_pub_key, length);
+            windows[i].onGroupInvite(&windows[i], m, friendnumber, type, (char *) group_pub_key, length);
     }
 }
 
 void on_group_namelistchange(Tox *m, int groupnumber, int peernumber, uint8_t change, void *userdata)
 {
-    int i;
+    size_t i;
 
     for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
         if (windows[i].onGroupNamelistChange != NULL)
@@ -184,44 +200,99 @@ void on_group_namelistchange(Tox *m, int groupnumber, int peernumber, uint8_t ch
     }
 }
 
-void on_file_sendrequest(Tox *m, int32_t friendnumber, uint8_t filenumber, uint64_t filesize,
-                         const uint8_t *filename, uint16_t filename_length, void *userdata)
+void on_group_titlechange(Tox *m, int groupnumber, int peernumber, const uint8_t *title, uint8_t length,
+                          void *userdata)
 {
-    int i;
+    char data[MAX_STR_SIZE + 1];
+    length = copy_tox_str(data, sizeof(data), (const char *) title, length);
+
+    size_t i;
 
     for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
-        if (windows[i].onFileSendRequest != NULL)
-            windows[i].onFileSendRequest(&windows[i], m, friendnumber, filenumber, filesize,
-                                         (const char *) filename, filename_length);
+        if (windows[i].onGroupTitleChange != NULL)
+            windows[i].onGroupTitleChange(&windows[i], m, groupnumber, peernumber, data, length);
     }
 }
 
-void on_file_control (Tox *m, int32_t friendnumber, uint8_t receive_send, uint8_t filenumber,
-                      uint8_t control_type, const uint8_t *data, uint16_t length, void *userdata)
+void on_file_chunk_request(Tox *m, uint32_t friendnumber, uint32_t filenumber, uint64_t position,
+                           size_t length, void *userdata)
 {
-    int i;
+    struct FileTransfer *ft = get_file_transfer_struct(friendnumber, filenumber);
+
+    if (!ft)
+        return;
+
+    if (ft->file_type == TOX_FILE_KIND_AVATAR) {
+        on_avatar_chunk_request(m, ft, position, length);
+        return;
+    }
+
+    size_t i;
+
+    for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
+        if (windows[i].onFileChunkRequest != NULL)
+            windows[i].onFileChunkRequest(&windows[i], m, friendnumber, filenumber, position, length);
+    }
+}
+
+void on_file_recv_chunk(Tox *m, uint32_t friendnumber, uint32_t filenumber, uint64_t position,
+                        const uint8_t *data, size_t length, void *user_data)
+{
+    struct FileTransfer *ft = get_file_transfer_struct(friendnumber, filenumber);
+
+    if (!ft)
+        return;
+
+    size_t i;
+
+    for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
+        if (windows[i].onFileRecvChunk != NULL)
+            windows[i].onFileRecvChunk(&windows[i], m, friendnumber, filenumber, position, (char *) data, length);
+    }
+}
+
+void on_file_control(Tox *m, uint32_t friendnumber, uint32_t filenumber, TOX_FILE_CONTROL control,
+                     void *userdata)
+{
+    struct FileTransfer *ft = get_file_transfer_struct(friendnumber, filenumber);
+
+    if (!ft)
+        return;
+
+    if (ft->file_type == TOX_FILE_KIND_AVATAR) {
+        on_avatar_file_control(m, ft, control);
+        return;
+    }
+
+    size_t i;
 
     for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
         if (windows[i].onFileControl != NULL)
-            windows[i].onFileControl(&windows[i], m, friendnumber, receive_send, filenumber,
-                                     control_type, (const char *) data, length);
+            windows[i].onFileControl(&windows[i], m, friendnumber, filenumber, control);
     }
 }
 
-void on_file_data(Tox *m, int32_t friendnumber, uint8_t filenumber, const uint8_t *data, uint16_t length,
-                  void *userdata)
+void on_file_recv(Tox *m, uint32_t friendnumber, uint32_t filenumber, uint32_t kind, uint64_t file_size,
+                  const uint8_t *filename, size_t filename_length, void *userdata)
 {
-    int i;
+    /* We don't care about receiving avatars */
+    if (kind != TOX_FILE_KIND_DATA) {
+        tox_file_control(m, friendnumber, filenumber, TOX_FILE_CONTROL_CANCEL, NULL);
+        return;
+    }
+
+    size_t i;
 
     for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
-        if (windows[i].onFileData != NULL)
-            windows[i].onFileData(&windows[i], m, friendnumber, filenumber, (const char *) data, length);
+        if (windows[i].onFileRecv != NULL)
+            windows[i].onFileRecv(&windows[i], m, friendnumber, filenumber, file_size, (char *) filename,
+                                  filename_length);
     }
 }
 
-void on_read_receipt(Tox *m, int32_t friendnumber, uint32_t receipt, void *userdata)
+void on_read_receipt(Tox *m, uint32_t friendnumber, uint32_t receipt, void *userdata)
 {
-    int i;
+    size_t i;
 
     for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
         if (windows[i].onReadReceipt != NULL)
@@ -235,7 +306,7 @@ int add_window(Tox *m, ToxWindow w)
     if (LINES < 2)
         return -1;
 
-    int i;
+    size_t i;
 
     for (i = 0; i < MAX_WINDOWS_NUM; i++) {
         if (windows[i].active)
@@ -329,7 +400,7 @@ void on_window_resize(void)
     getmaxyx(stdscr, y2, x2);
     y2 -= 2;
 
-    int i;
+    size_t i;
 
     for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
         if (!windows[i].active)
@@ -346,10 +417,12 @@ void on_window_resize(void)
         if (w->help->active)
             wclear(w->help->win);
 
-        if (w->is_groupchat)
+        if (w->is_groupchat) {
             delwin(w->chatwin->sidebar);
-        else
+            w->chatwin->sidebar = NULL;
+        } else {
             delwin(w->stb->topline);
+        }
 
         delwin(w->chatwin->linewin);
         delwin(w->chatwin->history);
@@ -358,11 +431,13 @@ void on_window_resize(void)
         w->window = newwin(y2, x2, 0, 0);
         w->chatwin->linewin = subwin(w->window, CHATBOX_HEIGHT, x2, y2 - CHATBOX_HEIGHT, 0);
 
-        if (w->is_groupchat) {
+        if (w->show_peerlist) {
             w->chatwin->history = subwin(w->window, y2 - CHATBOX_HEIGHT + 1, x2 - SIDEBAR_WIDTH - 1, 0, 0);
             w->chatwin->sidebar = subwin(w->window, y2 - CHATBOX_HEIGHT + 1, SIDEBAR_WIDTH, 0, x2 - SIDEBAR_WIDTH);
         } else {
             w->chatwin->history = subwin(w->window, y2 - CHATBOX_HEIGHT + 1, x2, 0, 0);
+
+            if (!w->is_groupchat)
                 w->stb->topline = subwin(w->window, 2, x2, 0, 0);
         }
 
@@ -379,10 +454,16 @@ void on_window_resize(void)
 
 static void draw_window_tab(ToxWindow *toxwin)
 {
+    pthread_mutex_lock(&Winthread.lock);
     if (toxwin->alert != WINDOW_ALERT_NONE) attron(COLOR_PAIR(toxwin->alert));
+    pthread_mutex_unlock(&Winthread.lock);
+
     clrtoeol();
     printw(" [%s]", toxwin->name);
+
+    pthread_mutex_lock(&Winthread.lock);
     if (toxwin->alert != WINDOW_ALERT_NONE) attroff(COLOR_PAIR(toxwin->alert));
+    pthread_mutex_unlock(&Winthread.lock);
 }
 
 static void draw_bar(void)
@@ -397,7 +478,7 @@ static void draw_bar(void)
     printw(" TOXIC " TOXICVER " |");
     attroff(COLOR_PAIR(BLUE) | A_BOLD);
 
-    int i;
+    size_t i;
 
     for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
         if (!windows[i].active)
@@ -430,7 +511,10 @@ static void draw_bar(void)
 void draw_active_window(Tox *m)
 {
     ToxWindow *a = active_window;
+
+    pthread_mutex_lock(&Winthread.lock);
     a->alert = WINDOW_ALERT_NONE;
+    pthread_mutex_unlock(&Winthread.lock);
 
     wint_t ch = 0;
 
@@ -475,13 +559,16 @@ void draw_active_window(Tox *m)
    call at least once per second */
 void refresh_inactive_windows(void)
 {
-    int i;
+    size_t i;
 
     for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
         ToxWindow *a = &windows[i];
 
-        if (a->active && a != active_window && !a->is_friendlist)
+        if (a->active && a != active_window && !a->is_friendlist) {
+            pthread_mutex_lock(&Winthread.lock);
             line_info_print(a);
+            pthread_mutex_unlock(&Winthread.lock);
+        }
     }
 }
 
@@ -490,12 +577,19 @@ ToxWindow *get_window_ptr(int i)
 {
     ToxWindow *toxwin = NULL;
 
-    if (i >= 0 && i <= MAX_WINDOWS_NUM && windows[i].active)
+    if (i >= 0 && i < MAX_WINDOWS_NUM && windows[i].active)
         toxwin = &windows[i];
 
     return toxwin;
 }
 
+void force_refresh(WINDOW *w)
+{
+    wclear(w);
+    endwin();
+    refresh();
+}
+
 int get_num_active_windows(void)
 {
     return num_active_windows;
@@ -504,13 +598,13 @@ int get_num_active_windows(void)
 /* destroys all chat and groupchat windows (should only be called on shutdown) */
 void kill_all_windows(Tox *m)
 {
-    int i;
+    size_t i;
 
     for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
         if (windows[i].is_chat)
             kill_chat_window(&windows[i], m);
         else if (windows[i].is_groupchat)
-            kill_groupchat_window(&windows[i]);
+            close_groupchat(&windows[i], m, windows[i].num);
     }
 
     kill_prompt_window(prompt);

src/windows.h

@@ -37,7 +37,7 @@
 #include "toxic.h"
 
 #define MAX_WINDOWS_NUM 32
-#define MAX_WINDOW_NAME_LENGTH 16
+#define MAX_WINDOW_NAME_LENGTH 22
 #define CURS_Y_OFFSET 1    /* y-axis cursor offset for chat contexts */
 #define CHATBOX_HEIGHT 2
 
@@ -76,23 +76,29 @@ struct cqueue_thread {
     pthread_t tid;
 };
 
+struct audio_thread {
+    pthread_t tid;
+};
+
 struct arg_opts {
-    int ignore_data_file;
-    int use_ipv4;
-    int force_tcp;
-    int debug;
-    int default_locale;
-    int use_custom_data;
-    int no_connect;
-    int encrypt_data;
-    int unencrypt_data;
+    bool use_ipv4;
+    bool force_tcp;
+    bool debug;
+    bool default_locale;
+    bool use_custom_data;
+    bool no_connect;
+    bool encrypt_data;
+    bool unencrypt_data;
+
     char dns_path[MAX_STR_SIZE];
     char config_path[MAX_STR_SIZE];
     char nodes_path[MAX_STR_SIZE];
 
-    int use_proxy;
     char proxy_address[256];
+    uint8_t proxy_type;
     uint16_t proxy_port;
+
+    uint16_t tcp_port;
 };
 
 typedef struct ToxWindow ToxWindow;
@@ -102,26 +108,30 @@ typedef struct ChatContext ChatContext;
 typedef struct Help Help;
 
 struct ToxWindow {
+    /* ncurses */
     void(*onKey)(ToxWindow *, Tox *, wint_t, bool);
     void(*onDraw)(ToxWindow *, Tox *);
     void(*onInit)(ToxWindow *, Tox *);
-    void(*onFriendRequest)(ToxWindow *, Tox *, const char *, const char *, uint16_t);
-    void(*onFriendAdded)(ToxWindow *, Tox *, int32_t, bool);
-    void(*onConnectionChange)(ToxWindow *, Tox *, int32_t, uint8_t);
-    void(*onMessage)(ToxWindow *, Tox *, int32_t, const char *, uint16_t);
-    void(*onNickChange)(ToxWindow *, Tox *, int32_t, const char *, uint16_t);
-    void(*onStatusChange)(ToxWindow *, Tox *, int32_t, uint8_t);
-    void(*onStatusMessageChange)(ToxWindow *, int32_t, const char *, uint16_t);
-    void(*onAction)(ToxWindow *, Tox *, int32_t, const char *, uint16_t);
+
+    /* toxcore */
+    void(*onFriendRequest)(ToxWindow *, Tox *, const char *, const char *, size_t);
+    void(*onFriendAdded)(ToxWindow *, Tox *, uint32_t, bool);
+    void(*onConnectionChange)(ToxWindow *, Tox *, uint32_t, TOX_CONNECTION);
+    void(*onMessage)(ToxWindow *, Tox *, uint32_t, TOX_MESSAGE_TYPE, const char *, size_t);
+    void(*onNickChange)(ToxWindow *, Tox *, uint32_t, const char *, size_t);
+    void(*onStatusChange)(ToxWindow *, Tox *, uint32_t, TOX_USER_STATUS);
+    void(*onStatusMessageChange)(ToxWindow *, uint32_t, const char *, size_t);
     void(*onGroupMessage)(ToxWindow *, Tox *, int, int, const char *, uint16_t);
     void(*onGroupAction)(ToxWindow *, Tox *, int, int, const char *, uint16_t);
-    void(*onGroupInvite)(ToxWindow *, Tox *, int32_t, const char *, uint16_t);
+    void(*onGroupInvite)(ToxWindow *, Tox *, int32_t, uint8_t, const char *, uint16_t);
     void(*onGroupNamelistChange)(ToxWindow *, Tox *, int, int, uint8_t);
-    void(*onFileSendRequest)(ToxWindow *, Tox *, int32_t, uint8_t, uint64_t, const char *, uint16_t);
-    void(*onFileControl)(ToxWindow *, Tox *, int32_t, uint8_t, uint8_t, uint8_t, const char *, uint16_t);
-    void(*onFileData)(ToxWindow *, Tox *, int32_t, uint8_t, const char *, uint16_t);
-    void(*onTypingChange)(ToxWindow *, Tox *, int32_t, uint8_t);
-    void(*onReadReceipt)(ToxWindow *, Tox *, int32_t, uint32_t);
+    void(*onGroupTitleChange)(ToxWindow *, Tox *, int, int, const char *, uint8_t);
+    void(*onFileChunkRequest)(ToxWindow *, Tox *, uint32_t, uint32_t, uint64_t, size_t);
+    void(*onFileRecvChunk)(ToxWindow *, Tox *, uint32_t, uint32_t, uint64_t, const char *, size_t);
+    void(*onFileControl)(ToxWindow *, Tox *, uint32_t, uint32_t, TOX_FILE_CONTROL);
+    void(*onFileRecv)(ToxWindow *, Tox *, uint32_t, uint32_t, uint64_t, const char *, size_t);
+    void(*onTypingChange)(ToxWindow *, Tox *, uint32_t, bool);
+    void(*onReadReceipt)(ToxWindow *, Tox *, uint32_t, uint32_t);
 
 #ifdef AUDIO
 
@@ -136,6 +146,7 @@ struct ToxWindow {
     void(*onEnd)(ToxWindow *, ToxAv *, int);
     void(*onRequestTimeout)(ToxWindow *, ToxAv *, int);
     void(*onPeerTimeout)(ToxWindow *, ToxAv *, int);
+    void(*onWriteDevice)(ToxWindow *, Tox *, int, int, const int16_t *, unsigned int, uint8_t, unsigned int);
 
     int call_idx; /* If in a call will have this index set, otherwise it's -1.
                    * Don't modify outside av callbacks. */
@@ -146,15 +157,16 @@ struct ToxWindow {
 
     int active_box; /* For box notify */
 
-    char name[TOXIC_MAX_NAME_LENGTH];
-    int32_t num;    /* corresponds to friendnumber in chat windows */
+    char name[TOXIC_MAX_NAME_LENGTH + 1];
+    uint32_t num;    /* corresponds to friendnumber in chat windows */
     bool active;
     int x;
 
     bool is_chat;
-    bool is_groupchat;
     bool is_prompt;
     bool is_friendlist;
+    bool is_groupchat;
+    int show_peerlist;    /* used to toggle groupchat peerlist */
 
     WINDOW_ALERTS alert;
 
@@ -168,19 +180,19 @@ struct ToxWindow {
 /* statusbar info holder */
 struct StatusBar {
     WINDOW *topline;
-    char statusmsg[TOX_MAX_STATUSMESSAGE_LENGTH];
-    uint16_t statusmsg_len;
-    char nick[TOXIC_MAX_NAME_LENGTH];
-    int nick_len;
-    uint8_t status;
-    bool is_online;
+    char statusmsg[TOX_MAX_STATUS_MESSAGE_LENGTH + 1];
+    size_t statusmsg_len;
+    char nick[TOXIC_MAX_NAME_LENGTH + 1];
+    size_t nick_len;
+    TOX_USER_STATUS status;
+    TOX_CONNECTION connection;
 };
 
 #ifdef AUDIO
 
-
 #define INFOBOX_HEIGHT 7
 #define INFOBOX_WIDTH 21
+
 /* holds display info for audio calls */
 struct infobox {
     float vad_lvl;
@@ -242,6 +254,7 @@ void set_active_window(int ch);
 int get_num_active_windows(void);
 void kill_all_windows(Tox *m);    /* should only be called on shutdown */
 void on_window_resize(void);
+void force_refresh(WINDOW *w);
 ToxWindow *get_window_ptr(int i);
 
 /* refresh inactive windows to prevent scrolling bugs.

src/xtra.c

@@ -0,0 +1,379 @@
+/*  xtra.c
+ *
+ *
+ *  Copyright (C) 2014 Toxic All Rights Reserved.
+ *
+ *  This file is part of Toxic.
+ *
+ *  Toxic is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Toxic is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Toxic.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "xtra.h"
+
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+
+#include <pthread.h>
+#include <assert.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdio.h>
+
+
+const  Atom XtraTerminate = 1;
+const  Atom XtraNil = 0;
+
+static Atom XdndAware;
+static Atom XdndEnter;
+static Atom XdndLeave;
+static Atom XdndPosition;
+static Atom XdndStatus;
+static Atom XdndDrop;
+static Atom XdndSelection;
+static Atom XdndDATA;
+static Atom XdndTypeList;
+static Atom XdndActionCopy;
+static Atom XdndFinished;
+
+struct _Xtra {
+    drop_callback on_drop;
+    Display *display;
+    Window terminal_window;
+    Window proxy_window;
+    Window source_window; /* When we have a drop */
+    Atom handling_version;
+    Atom expecting_type;
+} Xtra;
+
+typedef struct _Property
+{
+    unsigned char *data;
+    int            read_format;
+    unsigned long  read_num;
+    Atom           read_type;
+} Property;
+
+Property read_property(Window s, Atom p)
+{
+    Atom read_type;
+    int  read_format;
+    unsigned long read_num;
+    unsigned long left_bytes;
+    unsigned char *data = NULL;
+
+    int read_bytes = 1024;
+
+    /* Keep trying to read the property until there are no bytes unread */
+    do {
+        if (data) XFree(data);
+
+        XGetWindowProperty(Xtra.display, s,
+                           p, 0,
+                           read_bytes,
+                           False, AnyPropertyType,
+                           &read_type, &read_format,
+                           &read_num, &left_bytes,
+                           &data);
+
+        read_bytes *= 2;
+    } while (left_bytes != 0);
+
+    Property property = {data, read_format, read_num, read_type};
+    return property;
+}
+
+Atom get_dnd_type(long *a, int l)
+{
+    int i = 0;
+    for (; i < l; i ++) {
+        if (a[i] != XtraNil) return a[i]; /* Get first valid */
+    }
+    return XtraNil;
+}
+
+/* TODO maybe support only certain types in the future */
+static void handle_xdnd_enter(XClientMessageEvent* e)
+{
+    Xtra.handling_version = (e->data.l[1] >> 24);
+
+    if ((e->data.l[1] & 1)) {
+        // Fetch the list of possible conversions
+        Property p = read_property(e->data.l[0], XdndTypeList);
+        Xtra.expecting_type = get_dnd_type((long*)p.data, p.read_num);
+        XFree(p.data);
+    } else {
+        // Use the available list
+        Xtra.expecting_type = get_dnd_type(e->data.l + 2, 3);
+    }
+}
+
+static void handle_xdnd_position(XClientMessageEvent* e)
+{
+    XEvent ev = {
+        .xclient = {
+            .type = ClientMessage,
+            .display = e->display,
+            .window = e->data.l[0],
+            .message_type = XdndStatus,
+            .format = 32,
+            .data = {
+                .l = {
+                    Xtra.proxy_window,
+                    (Xtra.expecting_type != XtraNil),
+                    0, 0,
+                    XdndActionCopy
+                }
+            }
+        }
+    };
+
+    XSendEvent(Xtra.display, e->data.l[0], False, NoEventMask, &ev);
+    XFlush(Xtra.display);
+}
+
+static void handle_xdnd_drop(XClientMessageEvent* e)
+{
+    /* Not expecting any type */
+    if (Xtra.expecting_type == XtraNil) {
+        XEvent ev = {
+            .xclient = {
+                .type = ClientMessage,
+                .display = e->display,
+                .window = e->data.l[0],
+                .message_type = XdndFinished,
+                .format = 32,
+                .data = {
+                    .l = {Xtra.proxy_window, 0, 0}
+                }
+            }
+        };
+
+        XSendEvent(Xtra.display, e->data.l[0], False, NoEventMask, &ev);
+    } else {
+        Xtra.source_window = e->data.l[0];
+        XConvertSelection(Xtra.display,
+                          XdndSelection,
+                          Xtra.expecting_type,
+                          XdndSelection,
+                          Xtra.proxy_window,
+                          Xtra.handling_version >= 1 ? e->data.l[2] : CurrentTime);
+    }
+}
+
+static void handle_xdnd_selection(XSelectionEvent* e)
+{
+    /* DnD succesfully finished, send finished and call callback */
+    XEvent ev = {
+        .xclient = {
+            .type = ClientMessage,
+            .display = Xtra.display,
+            .window = Xtra.source_window,
+            .message_type = XdndFinished,
+            .format = 32,
+            .data = {
+                .l = {Xtra.proxy_window, 1, XdndActionCopy}
+            }
+        }
+    };
+    XSendEvent(Xtra.display, Xtra.source_window, False, NoEventMask, &ev);
+
+    Property p = read_property(Xtra.proxy_window, XdndSelection);
+    DropType dt;
+
+    if (strcmp(XGetAtomName(Xtra.display, p.read_type), "text/uri-list") == 0)
+        dt = DT_file_list;
+    else /* text/uri-list */
+        dt = DT_plain;
+
+
+    /* Call callback for every entry */
+    if (Xtra.on_drop && p.read_num)
+    {
+        char *sptr;
+        char *str = strtok_r((char *) p.data, "\n\r", &sptr);
+
+        if (str) Xtra.on_drop(str, dt);
+        while ((str = strtok_r(NULL, "\n\r", &sptr)))
+            Xtra.on_drop(str, dt);
+    }
+
+    if (p.data) XFree(p.data);
+}
+
+void *event_loop(void* p)
+{
+    /* Handle events like a real nigga */
+
+    (void) p; /* DINDUNOTHIN */
+
+    XEvent event;
+    int pending;
+
+    while (Xtra.display)
+    {
+        /* NEEDMOEVENTSFODEMPROGRAMS */
+
+        XLockDisplay(Xtra.display);
+        if((pending = XPending(Xtra.display))) XNextEvent(Xtra.display, &event);
+
+        if (!pending)
+        {
+            XUnlockDisplay(Xtra.display);
+            usleep(10000);
+            continue;
+        }
+
+        if (event.type == ClientMessage)
+        {
+            Atom type = event.xclient.message_type;
+
+            if      (type == XdndEnter)         handle_xdnd_enter(&event.xclient);
+            else if (type == XdndPosition)      handle_xdnd_position(&event.xclient);
+            else if (type == XdndDrop)          handle_xdnd_drop(&event.xclient);
+            else if (type == XtraTerminate)     break;
+        }
+        else if (event.type == SelectionNotify) handle_xdnd_selection(&event.xselection);
+        /* AINNOBODYCANHANDLEDEMEVENTS*/
+        else XSendEvent(Xtra.display, Xtra.terminal_window, 0, 0, &event);
+
+        XUnlockDisplay(Xtra.display);
+    }
+
+    /* Actual XTRA termination
+     * Please call xtra_terminate() at exit
+     * otherwise HEWUSAGUDBOI happens
+     */
+    if (Xtra.display) XCloseDisplay(Xtra.display);
+    return (Xtra.display = NULL);
+}
+
+int init_xtra(drop_callback d)
+{
+    memset(&Xtra, 0, sizeof(Xtra));
+
+    if (!d) return -1;
+    else Xtra.on_drop = d;
+
+    XInitThreads();
+    if ( !(Xtra.display = XOpenDisplay(NULL))) return -1;
+
+    Xtra.terminal_window = focused_window_id();
+
+    {
+        /* Create an invisible window which will act as proxy for the DnD operation. */
+        XSetWindowAttributes attr  = {0};
+        attr.event_mask            = EnterWindowMask |
+                                     LeaveWindowMask |
+                                     ButtonMotionMask |
+                                     ButtonPressMask |
+                                     ButtonReleaseMask |
+                                     ResizeRedirectMask;
+
+        attr.do_not_propagate_mask = NoEventMask;
+
+        Window root;
+        int x, y;
+        unsigned int wht, hht, b, d;
+
+        /* Since we cannot capture resize events for parent window we will have to create
+         * this window to have maximum size as defined in root window
+         */
+        XGetGeometry(Xtra.display,
+                     XDefaultRootWindow(Xtra.display),
+                     &root, &x, &y, &wht, &hht, &b, &d);
+
+        if (! (Xtra.proxy_window = XCreateWindow
+                        (Xtra.display, Xtra.terminal_window,       /* Parent */
+                         0, 0,                                     /* Position */
+                         wht, hht,                                 /* Width + height */
+                         0,                                        /* Border width */
+                         CopyFromParent,                           /* Depth */
+                         InputOnly,                                /* Class */
+                         CopyFromParent,                           /* Visual */
+                         CWEventMask | CWCursor,                   /* Value mask */
+                         &attr)) )                                 /* Attributes for value mask */
+            return -1;
+    }
+
+    XMapWindow(Xtra.display, Xtra.proxy_window);   /* Show window (sandwich) */
+    XLowerWindow(Xtra.display, Xtra.proxy_window); /* Don't interfere with parent lmao */
+
+    XdndAware = XInternAtom(Xtra.display, "XdndAware", False);
+    XdndEnter = XInternAtom(Xtra.display, "XdndEnter", False);
+    XdndLeave = XInternAtom(Xtra.display, "XdndLeave", False);
+    XdndPosition = XInternAtom(Xtra.display, "XdndPosition", False);
+    XdndStatus = XInternAtom(Xtra.display, "XdndStatus", False);
+    XdndDrop = XInternAtom(Xtra.display, "XdndDrop", False);
+    XdndSelection = XInternAtom(Xtra.display, "XdndSelection", False);
+    XdndDATA = XInternAtom(Xtra.display, "XdndDATA", False);
+    XdndTypeList = XInternAtom(Xtra.display, "XdndTypeList", False);
+    XdndActionCopy = XInternAtom(Xtra.display, "XdndActionCopy", False);
+    XdndFinished = XInternAtom(Xtra.display, "XdndFinished", False);
+
+    /* Inform my nigga windows that we are aware of dnd */
+    Atom XdndVersion = 3;
+    XChangeProperty(Xtra.display,
+                    Xtra.proxy_window,
+                    XdndAware,
+                    XA_ATOM,
+                    32,
+                    PropModeReplace,
+                    (unsigned char*)&XdndVersion, 1);
+
+    pthread_t id;
+    if (pthread_create(&id, NULL, event_loop, NULL) != 0)
+        return -1;
+
+    pthread_detach(id);
+
+    return 0;
+}
+
+void terminate_xtra()
+{
+    if (!Xtra.display) return;
+
+    XEvent terminate = {
+        .xclient = {
+            .type = ClientMessage,
+            .display = Xtra.display,
+            .message_type = XtraTerminate,
+        }
+    };
+
+    XLockDisplay(Xtra.display);
+    XDeleteProperty(Xtra.display, Xtra.proxy_window, XdndAware);
+    XSendEvent(Xtra.display, Xtra.proxy_window, 0, NoEventMask, &terminate);
+    XUnlockDisplay(Xtra.display);
+
+    while (Xtra.display); /* Wait for termination */
+}
+
+long unsigned int focused_window_id()
+{
+    if (!Xtra.display) return 0;
+
+    Window focus;
+    int revert;
+    XLockDisplay(Xtra.display);
+    XGetInputFocus(Xtra.display, &focus, &revert);
+    XUnlockDisplay(Xtra.display);
+    return focus;
+}
+
+int is_focused()
+{
+    return Xtra.proxy_window == focused_window_id() || Xtra.terminal_window == focused_window_id();
+}

src/xtra.h

@@ -0,0 +1,41 @@
+/*  xtra.h
+ *
+ *
+ *  Copyright (C) 2014 Toxic All Rights Reserved.
+ *
+ *  This file is part of Toxic.
+ *
+ *  Toxic is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Toxic is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Toxic.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef XTRA_H
+#define XTRA_H
+
+/* NOTE: If no xlib present don't compile */
+
+typedef enum {
+    DT_plain,
+    DT_file_list
+} 
+DropType;
+
+typedef void (*drop_callback) (const char*, DropType);
+
+int               init_xtra(drop_callback d);
+void              terminate_xtra();
+long unsigned int focused_window_id();
+int               is_focused(); /* returns bool */
+
+#endif /* XTRA_H */