Show peer join/part messages in conferences

Also a couple trivial fixes
Update config example and some default settings to reflect recent changes
2025-06-28 21:26:46 +02:00 · 2020-11-30 12:06:13 -05:00 · 2020-11-30 00:58:43 -05:00 · 2020-11-29 23:26:51 -05:00 · 2020-11-26 18:25:37 -05:00 · 2020-11-26 16:58:09 -05:00
45 changed files with 1523 additions and 1053 deletions
--- a/INSTALL.md
+++ b/INSTALL.md
@ -59,6 +59,8 @@ Run `make doc` in the build directory after editing the asciidoc files to regene
  * `DISABLE_QRPNG` → Disable support for exporting QR as PNG
  * `DISABLE_DESKTOP_NOTIFY=1` → Disable desktop notifications support
  * `ENABLE_PYTHON=1` → Build toxic with Python scripting support
+  * `ENABLE_RELEASE=1` → Build toxic without debug symbols and with full compiler optimizations
+  * `ENABLE_ASAN=1` → Build toxic with LLVM Address Sanitizer enabled

 * `DESTDIR=""` Specifies the base install directory for binaries and data files (e.g.: DESTDIR="/tmp/build/pkg")

--- a/19
+++ b/19
@ -5,8 +5,7 @@ CFG_DIR = $(BASE_DIR)/cfg

 LIBS = toxcore ncursesw libconfig libcurl

-CFLAGS ?= -g
-CFLAGS += -std=c99 -pthread -Wall -Wpedantic -Wunused -fstack-protector-all -Wvla -Wmissing-field-initializers -Wno-missing-braces
+CFLAGS ?= -std=c99 -pthread -Wall -Wpedantic -Wunused -fstack-protector-all -Wvla -Wno-missing-braces
 CFLAGS += '-DTOXICVER="$(VERSION)"' -DHAVE_WIDECHAR -D_XOPEN_SOURCE_EXTENDED -D_FILE_OFFSET_BITS=64
 CFLAGS += '-DPACKAGE_DATADIR="$(abspath $(DATADIR))"'
 CFLAGS += ${USER_CFLAGS}
@ -18,6 +17,22 @@ OBJ += file_transfers.o friendlist.o global_commands.o conference_commands.o con
 OBJ += line_info.o log.o message_queue.o misc_tools.o name_lookup.o notify.o prompt.o qr_code.o settings.o
 OBJ += term_mplex.o toxic.o toxic_strings.o windows.o

+# Check if debug build is enabled
+RELEASE := $(shell if [ -z "$(RELEASE_ENABLED)" ] || [ "$(RELEASE_ENABLED)" = "0" ] ; then echo disabled ; else echo enabled ; fi)
+ifneq ($(RELEASE), enabled)
+	CFLAGS += -O0 -g -DDEBUG
+	LDFLAGS += -O0
+else
+	CFLAGS += -O2 -flto
+	LDFLAGS += -O2 -flto
+endif
+
+# Check if LLVM Address Sanitizer is enabled
+ASAN_ENABLED := $(shell if [ -z "$(ENABLE_ASAN)" ] || [ "$(ENABLE_ASAN)" = "0" ] ; then echo disabled ; else echo enabled ; fi)
+ifneq ($(ASAN_ENABLED), disabled)
+	CFLAGS += -fsanitize=address -fno-omit-frame-pointer
+endif
+
 # Check on wich system we are running
 UNAME_S = $(shell uname -s)
 ifeq ($(UNAME_S), Linux)
--- a/README.md
+++ b/README.md
@ -5,7 +5,7 @@

 Toxic is a [Tox](https://tox.chat)-based instant messaging and video chat client.

-[![Toxic Screenshot](https://i.imgur.com/san99Z2.png "Home Screen")](https://i.imgur.com/san99Z2.png)
+[![Toxic Screenshot](https://i.imgur.com/TwYA8L0.png "Toxic Home Screen")](https://i.imgur.com/TwYA8L0.png)

 ## Installation
 [See the install instructions](/INSTALL.md)
--- a/apidoc/python/source/conf.py
+++ b/apidoc/python/source/conf.py
@ -55,9 +55,9 @@ author = 'Jakob Kreuze'
 # built documents.
 #
 # The short X.Y version.
-version = '0.9.0'
+version = '0.10.0'
 # The full version, including alpha/beta/rc tags.
-release = '0.9.0'
+release = '0.10.0'

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
--- a/cfg/checks/x11.mk
+++ b/cfg/checks/x11.mk
@ -1,7 +1,7 @@
 # Variables for X11 support
 X11_LIBS = x11
 X11_CFLAGS = -DX11
-X11_OBJ = xtra.o
+X11_OBJ = x11focus.o

 # Check if we can build X11 support
 CHECK_X11_LIBS = $(shell $(PKG_CONFIG) --exists $(X11_LIBS) || echo -n "error")
--- a/cfg/global_vars.mk
+++ b/cfg/global_vars.mk
@ -1,5 +1,5 @@
 # Version
-TOXIC_VERSION = 0.9.0
+TOXIC_VERSION = 0.10.0
 REV = $(shell git rev-list HEAD --count 2>/dev/null || echo -n "error")
 ifneq (, $(findstring error, $(REV)))
    VERSION = $(TOXIC_VERSION)
--- a/cfg/targets/help.mk
+++ b/cfg/targets/help.mk
@ -17,6 +17,8 @@ help:
 	@echo "  DISABLE_QRCODE:         Set to \"1\" to force building without QR export support"
 	@echo "  DISABLE_QRPNG:          Set to \"1\" to force building without QR exported as PNG support"
 	@echo "  ENABLE_PYTHON:          Set to \"1\" to enable building with Python scripting support"
+	@echo "  RELEASE_ENABLED:        Set to \"1\" to build without debug symbols and with full compiler optimizations"
+	@echo "  ASAN_ENABLED:           Set to \"1\" to build with LLVM address sanitizer enabled.
 	@echo "  USER_CFLAGS:            Add custom flags to default CFLAGS"
 	@echo "  USER_LDFLAGS:           Add custom flags to default LDFLAGS"
 	@echo "  PREFIX:                 Specify a prefix directory for binaries, data files,... (default is \"$(abspath $(PREFIX))\")"
--- a/doc/toxic.1
+++ b/doc/toxic.1
@ -1,13 +1,13 @@
 '\" t
 .\"     Title: toxic
 .\"    Author: [see the "AUTHORS" section]
-.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2016-09-20
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
+.\"      Date: 2020-05-04
 .\"    Manual: Toxic Manual
 .\"    Source: toxic __VERSION__
 .\"  Language: English
 .\"
-.TH "TOXIC" "1" "2016\-09\-20" "toxic __VERSION__" "Toxic Manual"
+.TH "TOXIC" "1" "2020\-05\-04" "toxic __VERSION__" "Toxic Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/doc/toxic.conf.5
+++ b/doc/toxic.conf.5
@ -2,12 +2,12 @@
 .\"     Title: toxic.conf
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 2018-10-27
+.\"      Date: 2020-05-07
 .\"    Manual: Toxic Manual
 .\"    Source: toxic __VERSION__
 .\"  Language: English
 .\"
-.TH "TOXIC\&.CONF" "5" "2018\-10\-27" "toxic __VERSION__" "Toxic Manual"
+.TH "TOXIC\&.CONF" "5" "2020\-05\-07" "toxic __VERSION__" "Toxic Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@ -135,7 +135,7 @@ Maximum lines for chat window history\&. Integer value\&. (for example: 700)
 .PP
 \fBnotification_timeout\fR
 .RS 4
-Time in milliseconds to display a notification\&. (for example: 3000)
+Time in milliseconds to display a notification\&. Integer value\&. (for example: 3000)
 .RE
 .PP
 \fBline_join\fR
@ -219,7 +219,22 @@ Audio output device\&. Integer value\&. Number corresponds to
 .PP
 \fBVAD_threshold\fR
 .RS 4
-Voice Activity Detection threshold\&. Float value\&. Recommended values are 1\&.0-40\&.0
+Voice Activity Detection threshold\&. Float value\&. Recommended values are 1\&.0\-40\&.0
+.RE
+.PP
+\fBpush_to_talk\fR
+.RS 4
+Enable/Disable Push\-To\-Talk for conference audio chats (active key is F2)\&. true or false
+.RE
+.PP
+\fBconference_audio_channels\fR
+.RS 4
+Number of channels for conference audio broadcast\&. Integer value\&. 1 (mono) or 2 (stereo)
+.RE
+.PP
+\fBchat_audio_channels\fR
+.RS 4
+Number of channels for 1\-on\-1 audio broadcast\&. Integer value\&. 1 (mono) or 2 (stereo)
 .RE
 .RE
 .PP
--- a/doc/toxic.conf.5.asc
+++ b/doc/toxic.conf.5.asc
@ -139,6 +139,15 @@ OPTIONS
        Voice Activity Detection threshold.  Float value. Recommended values are
        1.0-40.0

+    *conference_audio_channels*;;
+        Number of channels for conference audio broadcast. Integer value. 1 (mono) or 2 (stereo)
+
+    *chat_audio_channels*;;
+        Number of channels for 1-on-1 audio broadcast. Integer value. 1 (mono) or 2 (stereo)
+
+    *push_to_talk*;;
+        Enable/Disable Push-To-Talk for conference audio chats (active key is F2). true or false
+
 *tox*::
    Configuration related to paths.

--- a/misc/toxic.conf.example
+++ b/misc/toxic.conf.example
@ -30,7 +30,7 @@ ui = {
  time_format=24;

  // Timestamp format string according to date/strftime format. Overrides time_format setting
-  timestamp_format="%H:%M:%S";
+  timestamp_format="%H:%M";

  // true to show you when others are typing a message in 1-on-1 chats
  show_typing_other=true;
@ -54,7 +54,7 @@ ui = {
  history_size=700;

  // time in milliseconds to display a notification
-  notification_timeout=3000;
+  notification_timeout=6000;

  // Indicator for display when someone connects or joins a group.
  line_join="-->";
@ -66,7 +66,7 @@ ui = {
  line_alert="-!-";

  // Indicator for normal messages.
-  line_normal="---";
+  line_normal="-";

  // true to change status based on screen/tmux attach/detach, false to disable
  mplex_away=true;
@ -84,6 +84,15 @@ audio = {

  // default VAD threshold; float (recommended values are 1.0-40.0)
  VAD_threshold=5.0;
+
+  // Number of channels to use for conference audio broadcasts; 1 for mono, 2 for stereo.
+  conference_audio_channels=1;
+
+  // Number of channels to use for 1-on-1 audio broadcasts; 1 for mono, 2 for stereo.
+  chat_audio_channels=2;
+
+  // toggle conference push-to-talk
+  push_to_talk=false;
 };

 tox = {
--- a/src/api.c
+++ b/src/api.c
@ -175,36 +175,36 @@ void cmd_run(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX

 void invoke_autoruns(WINDOW *window, ToxWindow *self)
 {
-    struct dirent *dir;
-    char    abspath_buf[PATH_MAX + 1], err_buf[PATH_MAX + 1];
-    size_t  path_len;
-    DIR    *d;
-    FILE   *fp;
+    char abspath_buf[PATH_MAX + 256];
+    char err_buf[PATH_MAX + 128];

    if (user_settings->autorun_path[0] == '\0') {
        return;
    }

-    d = opendir(user_settings->autorun_path);
+    DIR *d = opendir(user_settings->autorun_path);

    if (d == NULL) {
-        snprintf(err_buf, PATH_MAX + 1, "Autorun path does not exist: %s", user_settings->autorun_path);
+        snprintf(err_buf, sizeof(err_buf), "Autorun path does not exist: %s", user_settings->autorun_path);
        api_display(err_buf);
        return;
    }

+    struct dirent *dir = NULL;
+
    cur_window  = window;
+
    self_window = self;

    while ((dir = readdir(d)) != NULL) {
-        path_len = strlen(dir->d_name);
+        size_t path_len = strlen(dir->d_name);

        if (!strcmp(dir->d_name + path_len - 3, ".py")) {
-            snprintf(abspath_buf, PATH_MAX + 1, "%s%s", user_settings->autorun_path, dir->d_name);
-            fp = fopen(abspath_buf, "r");
+            snprintf(abspath_buf, sizeof(abspath_buf), "%s%s", user_settings->autorun_path, dir->d_name);
+            FILE *fp = fopen(abspath_buf, "r");

            if (fp == NULL) {
-                snprintf(err_buf, PATH_MAX + 1, "Invalid path: %s", abspath_buf);
+                snprintf(err_buf, sizeof(err_buf), "Invalid path: %s", abspath_buf);
                api_display(err_buf);
                continue;
            }
--- a/src/audio_call.c
+++ b/src/audio_call.c
@ -29,6 +29,7 @@
 #include "line_info.h"
 #include "misc_tools.h"
 #include "notify.h"
+#include "settings.h"
 #include "toxic.h"
 #include "windows.h"

@ -64,6 +65,7 @@ extern ToxWindow *windows[MAX_WINDOWS_NUM];

 struct CallControl CallControl;

+extern struct user_settings *user_settings;
 extern struct Winthread Winthread;

 void on_call(ToxAV *av, uint32_t friend_number, bool audio_enabled, bool video_enabled,
@ -103,7 +105,7 @@ ToxAV *init_audio(ToxWindow *self, Tox *tox)
    CallControl.default_audio_bit_rate = 64;
    CallControl.audio_sample_rate = 48000;
    CallControl.audio_frame_duration = 20;
-    CallControl.audio_channels = 1;
+    CallControl.audio_channels = user_settings->chat_audio_channels;

    CallControl.video_enabled = false;
    CallControl.default_video_bit_rate = 0;
@ -914,7 +916,7 @@ void stop_current_call(ToxWindow *self)
 */
 static void realloc_calls(uint32_t n)
 {
-    if (n <= 0) {
+    if (n == 0) {
        free(CallControl.calls);
        CallControl.calls = NULL;
        return;
--- a/src/audio_device.c
+++ b/src/audio_device.c
@ -397,7 +397,7 @@ static DeviceError open_source(Device *device)
    alSourcei(device->source, AL_LOOPING, AL_FALSE);

    const uint32_t frame_size = device->frame_info.samples_per_frame * sample_size(device->frame_info.stereo);
-    size_t zeros_size = frame_size / 2;
+    size_t zeros_size = frame_size * sizeof(uint16_t);
    uint16_t *zeros = calloc(1, zeros_size);

    if (zeros == NULL) {
@ -407,7 +407,7 @@ static DeviceError open_source(Device *device)

    for (int i = 0; i < OPENAL_BUFS; ++i) {
        alBufferData(device->buffers[i], sound_mode(device->frame_info.stereo), zeros,
-                     frame_size, device->frame_info.sample_rate);
+                     zeros_size, device->frame_info.sample_rate);
    }

    free(zeros);
--- a/src/autocomplete.c
+++ b/src/autocomplete.c
@ -109,7 +109,7 @@ static int complete_line_helper(ToxWindow *self, const char **list, const size_t
    }

    const char *endchrs = " ";
-    char ubuf[MAX_STR_SIZE] = {0};
+    char ubuf[MAX_STR_SIZE];

    /* work with multibyte string copy of buf for simplicity */
    if (wcs_to_mbs_buf(ubuf, ctx->line, sizeof(ubuf)) == -1) {
@ -118,8 +118,8 @@ static int complete_line_helper(ToxWindow *self, const char **list, const size_t

    /* isolate substring from space behind pos to pos */
    char tmp[MAX_STR_SIZE];
-    snprintf(tmp, sizeof(tmp), "%s", ubuf);
-    tmp[ctx->pos] = '\0';
+    memcpy(tmp, ubuf, ctx->pos);
+    tmp[ctx->pos] = 0;

    const char *s = dir_search ? strchr(tmp, ' ') : strrchr(tmp, ' ');
    char *sub = calloc(1, strlen(ubuf) + 1);
@ -147,7 +147,7 @@ static int complete_line_helper(ToxWindow *self, const char **list, const size_t
        }
    }

-    if (!sub[0]) {
+    if (!sub[0] && !(dir_search && n_items == 1)) {
        free(sub);
        return 0;
    }
--- a/src/chat.c
+++ b/src/chat.c
@ -128,7 +128,14 @@ static void set_self_typingstatus(ToxWindow *self, Tox *m, bool is_typing)

    ChatContext *ctx = self->chatwin;

-    tox_self_set_typing(m, self->num, is_typing, NULL);
+    TOX_ERR_SET_TYPING err;
+    tox_self_set_typing(m, self->num, is_typing, &err);
+
+    if (err != TOX_ERR_SET_TYPING_OK) {
+        fprintf(stderr, "Warning: tox_self_set_typing() failed with error %d\n", err);
+        return;
+    }
+
    ctx->self_is_typing = is_typing;
 }

@ -253,7 +260,7 @@ static void chat_onConnectionChange(ToxWindow *self, Tox *m, uint32_t num, Tox_C
        Friends.list[num].is_typing = false;

        if (self->chatwin->self_is_typing) {
-            set_self_typingstatus(self, m, 0);
+            set_self_typingstatus(self, m, false);
        }

        chat_pause_file_transfers(num);
@ -497,8 +504,6 @@ static void chat_onFileControl(ToxWindow *self, Tox *m, uint32_t friendnum, uint
        return;
    }

-    char msg[MAX_STR_SIZE];
-
    switch (control) {
        case TOX_FILE_CONTROL_RESUME: {
            /* transfer is accepted */
@ -524,6 +529,7 @@ static void chat_onFileControl(ToxWindow *self, Tox *m, uint32_t friendnum, uint
        }

        case TOX_FILE_CONTROL_CANCEL: {
+            char msg[MAX_STR_SIZE];
            snprintf(msg, sizeof(msg), "File transfer for '%s' was aborted.", ft->file_name);
            close_file_transfer(self, m, ft, -1, msg, notif_error);
            break;
@ -739,17 +745,17 @@ static void chat_onConferenceInvite(ToxWindow *self, Tox *m, int32_t friendnumbe
    Friends.list[friendnumber].conference_invite.length = length;
    Friends.list[friendnumber].conference_invite.type = type;

-    sound_notify(self, generic_message, NT_WNDALERT_2 | user_settings->bell_on_invite, NULL);
-
    char name[TOX_MAX_NAME_LENGTH];
    get_nick_truncate(m, name, friendnumber);

    const char *description = type == TOX_CONFERENCE_TYPE_AV ? "an audio conference" : "a conference";

    if (self->active_box != -1) {
-        box_silent_notify2(self, NT_WNDALERT_2 | NT_NOFOCUS, self->active_box, "invites you to join %s", description);
+        box_notify2(self, generic_message, NT_WNDALERT_2 | user_settings->bell_on_invite, self->active_box,
+                    "invites you to join %s", description);
    } else {
-        box_silent_notify(self, NT_WNDALERT_2 | NT_NOFOCUS, &self->active_box, name, "invites you to join %s", description);
+        box_notify(self, generic_message, NT_WNDALERT_2 | user_settings->bell_on_invite, &self->active_box, name,
+                   "invites you to join %s", description);
    }

    line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "%s has invited you to %s.", name, description);
@ -1083,7 +1089,7 @@ bool chat_onKey(ToxWindow *self, Tox *m, wint_t key, bool ltr)
        input_new_char(self, key, x, x2);

        if (ctx->line[0] != '/' && !ctx->self_is_typing && statusbar->connection != TOX_CONNECTION_NONE) {
-            set_self_typingstatus(self, m, 1);
+            set_self_typingstatus(self, m, true);
        }

        return true;
@ -1093,11 +1099,7 @@ bool chat_onKey(ToxWindow *self, Tox *m, wint_t key, bool ltr)
        return true;
    }

-    if (input_handle(self, key, x, x2)) {
-        return true;
-    }
-
-    int input_ret = false;
+    int input_ret = input_handle(self, key, x, x2);

    if (key == L'\t' && ctx->len > 1 && ctx->line[0] == '/') {    /* TAB key: auto-complete */
        input_ret = true;
@ -1146,7 +1148,7 @@ bool chat_onKey(ToxWindow *self, Tox *m, wint_t key, bool ltr)

            wstrsubst(ctx->line, L'¶', L'\n');

-            char line[MAX_STR_SIZE] = {0};
+            char line[MAX_STR_SIZE];

            if (wcs_to_mbs_buf(line, ctx->line, MAX_STR_SIZE) == -1) {
                memset(line, 0, sizeof(line));
@ -1161,7 +1163,7 @@ bool chat_onKey(ToxWindow *self, Tox *m, wint_t key, bool ltr)
                } else {
                    execute(ctx->history, self, m, line, CHAT_COMMAND_MODE);
                }
-            } else {
+            } else if (line[0]) {
                char selfname[TOX_MAX_NAME_LENGTH];
                tox_self_get_name(m, (uint8_t *) selfname);

@ -1173,16 +1175,18 @@ bool chat_onKey(ToxWindow *self, Tox *m, wint_t key, bool ltr)

                int id = line_info_add(self, timefrmt, selfname, NULL, OUT_MSG, 0, 0, "%s", line);
                cqueue_add(ctx->cqueue, line, strlen(line), OUT_MSG, id);
+            } else {
+                line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, RED, " * Failed to parse message.");
            }
        }

        wclear(ctx->linewin);
-        wmove(self->window, y2 - CURS_Y_OFFSET, 0);
+        wmove(self->window, y2, 0);
        reset_buf(ctx);
    }

    if (ctx->len <= 0 && ctx->self_is_typing) {
-        set_self_typingstatus(self, m, 0);
+        set_self_typingstatus(self, m, false);
    }

    return input_ret;
@ -1190,7 +1194,8 @@ bool chat_onKey(ToxWindow *self, Tox *m, wint_t key, bool ltr)

 static void chat_onDraw(ToxWindow *self, Tox *m)
 {
-    int x2, y2;
+    int x2;
+    int y2;
    getmaxyx(self->window, y2, x2);

    if (y2 <= 0 || x2 <= 0) {
@ -1205,15 +1210,14 @@ static void chat_onDraw(ToxWindow *self, Tox *m)

    wclear(ctx->linewin);

-    curs_set(1);
-
    if (ctx->len > 0) {
-        mvwprintw(ctx->linewin, 1, 0, "%ls", &ctx->line[ctx->start]);
+        mvwprintw(ctx->linewin, 0, 0, "%ls", &ctx->line[ctx->start]);
    }

+    curs_set(1);
+
    /* Draw status bar */
    StatusBar *statusbar = self->stb;
-    mvwhline(statusbar->topline, 1, 0, ACS_HLINE, x2);
    wmove(statusbar->topline, 0, 0);

    /* Draw name, status and note in statusbar */
@ -1223,38 +1227,63 @@ static void chat_onDraw(ToxWindow *self, Tox *m)

        switch (status) {
            case TOX_USER_STATUS_NONE:
-                colour = GREEN;
+                colour = GREEN_BLUE;
                break;

            case TOX_USER_STATUS_AWAY:
-                colour = YELLOW;
+                colour = YELLOW_BLUE;
                break;

            case TOX_USER_STATUS_BUSY:
-                colour = RED;
+                colour = RED_BLUE;
                break;
        }

+        wattron(statusbar->topline, COLOR_PAIR(CYAN_BLUE));
+        wprintw(statusbar->topline, " [");
+        wattroff(statusbar->topline, COLOR_PAIR(CYAN_BLUE));
+
        wattron(statusbar->topline, COLOR_PAIR(colour) | A_BOLD);
-        wprintw(statusbar->topline, " %s", ONLINE_CHAR);
+        wprintw(statusbar->topline, "%s", ONLINE_CHAR);
        wattroff(statusbar->topline, COLOR_PAIR(colour) | A_BOLD);

-        if (Friends.list[self->num].is_typing) {
-            wattron(statusbar->topline, COLOR_PAIR(YELLOW));
+        wattron(statusbar->topline, COLOR_PAIR(CYAN_BLUE));
+        wprintw(statusbar->topline, "] ");
+        wattroff(statusbar->topline, COLOR_PAIR(CYAN_BLUE));
+
+        pthread_mutex_lock(&Winthread.lock);
+        const bool is_typing = Friends.list[self->num].is_typing;
+        pthread_mutex_unlock(&Winthread.lock);
+
+        if (is_typing) {
+            wattron(statusbar->topline, A_BOLD | COLOR_PAIR(YELLOW_BLUE));
+        } else {
+            wattron(statusbar->topline, COLOR_PAIR(WHITE_BLUE));
        }

-        wattron(statusbar->topline, A_BOLD);
-        wprintw(statusbar->topline, " %s ", statusbar->nick);
-        wattroff(statusbar->topline, A_BOLD);
+        wprintw(statusbar->topline, "%s", statusbar->nick);

-        if (Friends.list[self->num].is_typing) {
-            wattroff(statusbar->topline, COLOR_PAIR(YELLOW));
+        if (is_typing) {
+            wattroff(statusbar->topline, A_BOLD | COLOR_PAIR(YELLOW_BLUE));
+        } else {
+            wattroff(statusbar->topline, A_BOLD | COLOR_PAIR(WHITE_BLUE));
        }
    } else {
-        wprintw(statusbar->topline, " %s", OFFLINE_CHAR);
-        wattron(statusbar->topline, A_BOLD);
-        wprintw(statusbar->topline, " %s ", statusbar->nick);
-        wattroff(statusbar->topline, A_BOLD);
+        wattron(statusbar->topline, COLOR_PAIR(CYAN_BLUE));
+        wprintw(statusbar->topline, " [");
+        wattroff(statusbar->topline, COLOR_PAIR(CYAN_BLUE));
+
+        wattron(statusbar->topline, COLOR_PAIR(WHITE_BLUE));
+        wprintw(statusbar->topline, "%s", OFFLINE_CHAR);
+        wattroff(statusbar->topline, COLOR_PAIR(WHITE_BLUE));
+
+        wattron(statusbar->topline, COLOR_PAIR(CYAN_BLUE));
+        wprintw(statusbar->topline, "] ");
+        wattroff(statusbar->topline, COLOR_PAIR(CYAN_BLUE));
+
+        wattron(statusbar->topline, COLOR_PAIR(WHITE_BLUE));
+        wprintw(statusbar->topline, "%s", statusbar->nick);
+        wattroff(statusbar->topline, COLOR_PAIR(WHITE_BLUE));
    }

    /* Reset statusbar->statusmsg on window resize */
@ -1283,30 +1312,51 @@ static void chat_onDraw(ToxWindow *self, Tox *m)
    }

    if (statusbar->statusmsg[0]) {
-        wprintw(statusbar->topline, ": %s ", statusbar->statusmsg);
+        wattron(statusbar->topline, COLOR_PAIR(CYAN_BLUE));
+        wprintw(statusbar->topline, " | ");
+        wattroff(statusbar->topline, COLOR_PAIR(CYAN_BLUE));
+
+        wattron(statusbar->topline, COLOR_PAIR(WHITE_BLUE));
+        wprintw(statusbar->topline, "%s ", statusbar->statusmsg);
+    } else {
+        wattron(statusbar->topline, COLOR_PAIR(WHITE_BLUE));
    }

-    wclrtoeol(statusbar->topline);
+    int s_y;
+    int s_x;
+    getyx(statusbar->topline, s_y, s_x);
+
+    mvwhline(statusbar->topline, s_y, s_x, ' ', x2 - s_x - (KEY_IDENT_DIGITS * 2) - 3);
+    wattroff(statusbar->topline, COLOR_PAIR(WHITE_BLUE));
+
    wmove(statusbar->topline, 0, x2 - (KEY_IDENT_DIGITS * 2) - 3);
+
+    wattron(statusbar->topline, COLOR_PAIR(CYAN_BLUE));
    wprintw(statusbar->topline, "{");
+    wattroff(statusbar->topline, COLOR_PAIR(CYAN_BLUE));

-    size_t i;
+    wattron(statusbar->topline, COLOR_PAIR(WHITE_BLUE));

-    for (i = 0; i < KEY_IDENT_DIGITS; ++i) {
+    for (size_t i = 0; i < KEY_IDENT_DIGITS; ++i) {
        wprintw(statusbar->topline, "%02X", Friends.list[self->num].pub_key[i] & 0xff);
    }

-    wprintw(statusbar->topline, "}\n");
+    wattroff(statusbar->topline, COLOR_PAIR(WHITE_BLUE));

-    mvwhline(self->window, y2 - CHATBOX_HEIGHT, 0, ACS_HLINE, x2);
+    wattron(statusbar->topline, COLOR_PAIR(CYAN_BLUE));
+    wprintw(statusbar->topline, "} ");
+    wattroff(statusbar->topline, COLOR_PAIR(CYAN_BLUE));

-    int y, x;
+    int y;
+    int x;
    getyx(self->window, y, x);

    UNUSED_VAR(x);

    int new_x = ctx->start ? x2 - 1 : MAX(0, wcswidth(ctx->line, ctx->pos));
-    wmove(self->window, y + 1, new_x);
+    wmove(self->window, y, new_x);
+
+    draw_window_bar(self);

    wnoutrefresh(self->window);

@ -1327,10 +1377,35 @@ static void chat_onDraw(ToxWindow *self, Tox *m)
    pthread_mutex_unlock(&Winthread.lock);
 }

+static void chat_init_log(ToxWindow *self, Tox *m, const char *self_nick)
+{
+    ChatContext *ctx = self->chatwin;
+
+    char myid[TOX_ADDRESS_SIZE];
+    tox_self_get_address(m, (uint8_t *) myid);
+
+    if (log_init(ctx->log, self_nick, myid, Friends.list[self->num].pub_key, LOG_TYPE_CHAT) != 0) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to initialize chat log.");
+        return;
+    }
+
+    if (load_chat_history(self, ctx->log) != 0) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to load chat history.");
+    }
+
+    if (Friends.list[self->num].logging_on) {
+        if (log_enable(ctx->log) != 0) {
+            line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to enable chat log.");
+        }
+    }
+}
+
 static void chat_onInit(ToxWindow *self, Tox *m)
 {
    curs_set(1);
-    int x2, y2;
+
+    int x2;
+    int y2;
    getmaxyx(self->window, y2, x2);

    if (y2 <= 0 || x2 <= 0) {
@ -1363,9 +1438,10 @@ static void chat_onInit(ToxWindow *self, Tox *m)
    /* Init subwindows */
    ChatContext *ctx = self->chatwin;

-    statusbar->topline = subwin(self->window, 2, x2, 0, 0);
-    ctx->history = subwin(self->window, y2 - CHATBOX_HEIGHT + 1, x2, 0, 0);
-    ctx->linewin = subwin(self->window, CHATBOX_HEIGHT, x2, y2 - CHATBOX_HEIGHT, 0);
+    statusbar->topline = subwin(self->window, TOP_BAR_HEIGHT, x2, 0, 0);
+    ctx->history = subwin(self->window, y2 - CHATBOX_HEIGHT - WINDOW_BAR_HEIGHT, x2, 0, 0);
+    self->window_bar = subwin(self->window, WINDOW_BAR_HEIGHT, x2, y2 - (CHATBOX_HEIGHT + WINDOW_BAR_HEIGHT), 0);
+    ctx->linewin = subwin(self->window, CHATBOX_HEIGHT, x2, y2 - WINDOW_BAR_HEIGHT, 0);

    ctx->hst = calloc(1, sizeof(struct history));
    ctx->log = calloc(1, sizeof(struct chatlog));
@ -1377,19 +1453,9 @@ static void chat_onInit(ToxWindow *self, Tox *m)

    line_info_init(ctx->hst);

-    char myid[TOX_ADDRESS_SIZE];
-    tox_self_get_address(m, (uint8_t *) myid);
+    chat_init_log(self, m, nick);

-    int log_ret = log_enable(nick, myid, Friends.list[self->num].pub_key, ctx->log, LOG_CHAT);
-    load_chat_history(self, ctx->log);
-
-    if (!Friends.list[self->num].logging_on) {
-        log_disable(ctx->log);
-    } else if (log_ret == -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);
+    execute(ctx->history, self, m, "/log", GLOBAL_COMMAND_MODE);  // Print log status to screen

    scrollok(ctx->history, 0);
    wmove(self->window, y2 - CURS_Y_OFFSET, 0);
--- a/src/conference.c
+++ b/src/conference.c
@ -65,6 +65,9 @@

 extern char *DATA_FILE;

+#define MAX_CONFERENCE_NUM (MAX_WINDOWS_NUM - 2)
+#define CONFERENCE_EVENT_WAIT 30
+
 static ConferenceChat conferences[MAX_CONFERENCE_NUM];
 static int max_conference_index = 0;

@ -100,6 +103,7 @@ static const char *conference_cmd_list[] = {
    "/quit",
    "/requests",
 #ifdef AUDIO
+    "/ptt",
    "/sense",
 #endif
    "/status",
@ -114,6 +118,25 @@ static const char *conference_cmd_list[] = {

 static ToxWindow *new_conference_chat(uint32_t conferencenum);

+void conference_set_title(ToxWindow *self, uint32_t conferencesnum, const char *title, size_t length)
+{
+    ConferenceChat *chat = &conferences[conferencesnum];
+
+    if (!chat->active) {
+        return;
+    }
+
+    if (length > CONFERENCE_MAX_TITLE_LENGTH) {
+        length = CONFERENCE_MAX_TITLE_LENGTH;
+    }
+
+    memcpy(chat->title, title, length);
+    chat->title[length] = 0;
+    chat->title_length = length;
+
+    set_window_title(self, title, length);
+}
+
 static void kill_conference_window(ToxWindow *self)
 {
    ChatContext *ctx = self->chatwin;
@ -130,8 +153,35 @@ static void kill_conference_window(ToxWindow *self)
    del_window(self);
 }

-int init_conference_win(Tox *m, uint32_t conferencenum, uint8_t type, const char *title,
-                        size_t title_length)
+static void init_conference_logging(ToxWindow *self, Tox *m, uint32_t conferencenum)
+{
+    ChatContext *ctx = self->chatwin;
+
+    char my_id[TOX_ADDRESS_SIZE];
+    tox_self_get_address(m, (uint8_t *) my_id);
+
+    char conference_id[TOX_CONFERENCE_ID_SIZE];
+    tox_conference_get_id(m, conferencenum, (uint8_t *) conference_id);
+
+    if (log_init(ctx->log, conferences[self->num].title, my_id, conference_id, LOG_TYPE_CHAT) != 0) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Warning: Log failed to initialize.");
+        return;
+    }
+
+    if (load_chat_history(self, ctx->log) != 0) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to load chat history.");
+    }
+
+    if (user_settings->autolog == AUTOLOG_ON) {
+        if (log_enable(ctx->log) != 0) {
+            line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to enable chat log.");
+        }
+    }
+
+    execute(ctx->history, self, m, "/log", GLOBAL_COMMAND_MODE);  // print log state to screen
+}
+
+int init_conference_win(Tox *m, uint32_t conferencenum, uint8_t type, const char *title, size_t length)
 {
    if (conferencenum > MAX_CONFERENCE_NUM) {
        return -1;
@ -154,8 +204,15 @@ int init_conference_win(Tox *m, uint32_t conferencenum, uint8_t type, const char
            conferences[i].audio_enabled = false;
            conferences[i].last_sent_audio = 0;

+#ifdef AUDIO
+            conferences[i].push_to_talk_enabled = user_settings->push_to_talk;
+#endif
+
            set_active_window_index(conferences[i].chatwin);
-            set_window_title(self, title, title_length);
+
+            conference_set_title(self, conferencenum, title, length);
+
+            init_conference_logging(self, m, conferencenum);

            if (i == max_conference_index) {
                ++max_conference_index;
@ -225,6 +282,25 @@ static void delete_conference(ToxWindow *self, Tox *m, uint32_t conferencenum)
    free_conference(self, conferencenum);
 }

+void conference_rename_log_path(Tox *m, uint32_t conferencenum, const char *new_title)
+{
+    ConferenceChat *chat = &conferences[conferencenum];
+
+    if (!chat->active) {
+        return;
+    }
+
+    char myid[TOX_ADDRESS_SIZE];
+    tox_self_get_address(m, (uint8_t *) myid);
+
+    char conference_id[TOX_CONFERENCE_ID_SIZE];
+    tox_conference_get_id(m, conferencenum, (uint8_t *) conference_id);
+
+    if (rename_logfile(chat->title, new_title, myid, conference_id, chat->chatwin) != 0) {
+        fprintf(stderr, "Failed to rename conference log to `%s`\n", new_title);
+    }
+}
+
 /* destroys and re-creates conference window with or without the peerlist */
 void redraw_conference_win(ToxWindow *self)
 {
@ -234,9 +310,9 @@ void redraw_conference_win(ToxWindow *self)
    refresh();
    clear();

-    int x2, y2;
-    getmaxyx(stdscr, y2, x2);
-    y2 -= 2;
+    int x2;
+    int y2;
+    getmaxyx(self->window, y2, x2);

    if (y2 <= 0 || x2 <= 0) {
        return;
@ -249,20 +325,22 @@ void redraw_conference_win(ToxWindow *self)

    delwin(ctx->linewin);
    delwin(ctx->history);
+    delwin(self->window_bar);
    delwin(self->window);

    self->window = newwin(y2, x2, 0, 0);
    ctx->linewin = subwin(self->window, CHATBOX_HEIGHT, x2, y2 - CHATBOX_HEIGHT, 0);
+    self->window_bar = subwin(self->window, WINDOW_BAR_HEIGHT, x2, y2 - (CHATBOX_HEIGHT + WINDOW_BAR_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);
+        ctx->history = subwin(self->window, y2 - CHATBOX_HEIGHT - WINDOW_BAR_HEIGHT, x2 - SIDEBAR_WIDTH - 1, 0, 0);
+        ctx->sidebar = subwin(self->window, y2 - CHATBOX_HEIGHT - WINDOW_BAR_HEIGHT, SIDEBAR_WIDTH, 0, x2 - SIDEBAR_WIDTH);
    } else {
-        ctx->history = subwin(self->window, y2 - CHATBOX_HEIGHT + 1, x2, 0, 0);
+        ctx->history = subwin(self->window, y2 - CHATBOX_HEIGHT - WINDOW_BAR_HEIGHT, x2, 0, 0);
    }

    scrollok(ctx->history, 0);
-
+    wmove(self->window, y2 - CURS_Y_OFFSET, 0);
 }

 static void conference_onConferenceMessage(ToxWindow *self, Tox *m, uint32_t conferencenum, uint32_t peernum,
@ -289,12 +367,12 @@ static void conference_onConferenceMessage(ToxWindow *self, Tox *m, uint32_t con

    /* Only play sound if mentioned by someone else */
    if (strcasestr(msg, selfnick) && strcmp(selfnick, nick)) {
-        sound_notify(self, generic_message, NT_WNDALERT_0 | user_settings->bell_on_message, NULL);
-
        if (self->active_box != -1) {
-            box_silent_notify2(self, NT_NOFOCUS, self->active_box, "%s %s", nick, msg);
+            box_notify2(self, generic_message, NT_WNDALERT_0 | NT_NOFOCUS | user_settings->bell_on_message,
+                        self->active_box, "%s %s", nick, msg);
        } else {
-            box_silent_notify(self, NT_NOFOCUS, &self->active_box, self->name, "%s %s", nick, msg);
+            box_notify(self, generic_message, NT_WNDALERT_0 | NT_NOFOCUS | user_settings->bell_on_message,
+                       &self->active_box, self->name, "%s %s", nick, msg);
        }

        nick_clr = RED;
@ -319,13 +397,21 @@ static void conference_onConferenceTitleChange(ToxWindow *self, Tox *m, uint32_t
        return;
    }

-    set_window_title(self, title, length);
+    ConferenceChat *chat = &conferences[conferencenum];
+
+    if (!chat->active) {
+        return;
+    }
+
+    conference_rename_log_path(m, conferencenum, title);  // must be called first
+
+    conference_set_title(self, conferencenum, 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(conferences[self->num].start_time, CONFERENCE_EVENT_WAIT)) {
+    if (!timed_out(conferences[conferencenum].start_time, CONFERENCE_EVENT_WAIT)) {
        return;
    }

@ -492,6 +578,22 @@ static ConferencePeer *peer_in_conference(uint32_t conferencenum, uint32_t peern
 }

 #ifdef AUDIO
+
+/* Return true if ptt is disabled or enabled and active. */
+static bool conference_check_push_to_talk(ConferenceChat *chat)
+{
+    if (!chat->push_to_talk_enabled) {
+        return true;
+    }
+
+    return !timed_out(chat->ptt_last_pushed, 1);
+}
+
+static void conference_enable_push_to_talk(ConferenceChat *chat)
+{
+    chat->ptt_last_pushed = get_unix_time();
+}
+
 static void set_peer_audio_position(Tox *m, uint32_t conferencenum, uint32_t peernum)
 {
    ConferenceChat *chat = &conferences[conferencenum];
@ -523,7 +625,7 @@ static void set_peer_audio_position(Tox *m, uint32_t conferencenum, uint32_t pee
    const float angle = asinf(peer_posn - (float)(num_posns - 1) / 2);
    set_source_position(peer->audio_out_idx, sinf(angle), cosf(angle), 0);
 }
-#endif
+#endif // AUDIO


 static bool find_peer_by_pubkey(const ConferencePeer *list, uint32_t num_peers, uint8_t *pubkey, uint32_t *idx)
@ -532,7 +634,10 @@ static bool find_peer_by_pubkey(const ConferencePeer *list, uint32_t num_peers,
        const ConferencePeer *peer = &list[i];

        if (peer->active && memcmp(peer->pubkey, pubkey, TOX_PUBLIC_KEY_SIZE) == 0) {
-            *idx = i;
+            if (idx) {
+                *idx = i;
+            }
+
            return true;
        }
    }
@ -540,7 +645,8 @@ static bool find_peer_by_pubkey(const ConferencePeer *list, uint32_t num_peers,
    return false;
 }

-static void update_peer_list(Tox *m, uint32_t conferencenum, uint32_t num_peers, uint32_t old_num_peers)
+static void update_peer_list(ToxWindow *self, Tox *m, uint32_t conferencenum, uint32_t num_peers,
+                             uint32_t old_num_peers)
 {
    ConferenceChat *chat = &conferences[conferencenum];

@ -548,6 +654,8 @@ static void update_peer_list(Tox *m, uint32_t conferencenum, uint32_t num_peers,
        return;
    }

+    ChatContext *ctx = self->chatwin;
+
    ConferencePeer *old_peer_list = malloc(old_num_peers * sizeof(ConferencePeer));

    if (!old_peer_list) {
@ -559,7 +667,13 @@ static void update_peer_list(Tox *m, uint32_t conferencenum, uint32_t num_peers,
        memcpy(old_peer_list, chat->peer_list, old_num_peers * sizeof(ConferencePeer));
    }

-    realloc_peer_list(chat, num_peers);
+    if (realloc_peer_list(chat, num_peers) != 0) {
+        free(old_peer_list);
+        fprintf(stderr, "Warning: realloc_peer_list() failed in update_peer_list()\n");
+        return;
+    }
+
+    char timefrmt[TIME_STR_SIZE];

    for (uint32_t i = 0; i < num_peers; ++i) {
        ConferencePeer *peer = &chat->peer_list[i];
@ -575,12 +689,14 @@ static void update_peer_list(Tox *m, uint32_t conferencenum, uint32_t num_peers,
            continue;
        }

+        bool new_peer = true;
        uint32_t j;

        if (find_peer_by_pubkey(old_peer_list, old_num_peers, peer->pubkey, &j)) {
            ConferencePeer *old_peer = &old_peer_list[j];
            memcpy(peer, old_peer, sizeof(ConferencePeer));
            old_peer->active = false;
+            new_peer = false;
        }

        size_t length = tox_conference_peer_get_name_size(m, conferencenum, i, &err);
@ -601,22 +717,37 @@ static void update_peer_list(Tox *m, uint32_t conferencenum, uint32_t num_peers,
        peer->name_length = length;
        peer->peernum = i;

+        if (new_peer && peer->name_length > 0 && timed_out(chat->start_time, CONFERENCE_EVENT_WAIT)) {
+            const char *msg = "has joined the group";
+            get_time_str(timefrmt, sizeof(timefrmt));
+            line_info_add(self, timefrmt, peer->name, NULL, CONNECTION, 0, GREEN, msg);
+            write_to_log(msg, peer->name, ctx->log, true);
+        }
+
 #ifdef AUDIO
        set_peer_audio_position(m, conferencenum, i);
 #endif
    }

+    conference_update_name_list(conferencenum);
+
    for (uint32_t i = 0; i < old_num_peers; ++i) {
        ConferencePeer *old_peer = &old_peer_list[i];

        if (old_peer->active) {
+            if (!find_peer_by_pubkey(chat->peer_list, chat->num_peers, old_peer->pubkey, NULL)) {
+                const char *msg = "has left the group";
+                get_time_str(timefrmt, sizeof(timefrmt));
+
+                line_info_add(self, timefrmt, old_peer->name, NULL, DISCONNECTION, 0, RED, msg);
+                write_to_log(msg, old_peer->name, ctx->log, true);
+            }
+
            free_peer(old_peer);
        }
    }

    free(old_peer_list);
-
-    conference_update_name_list(conferencenum);
 }

 static void conference_onConferenceNameListChange(ToxWindow *self, Tox *m, uint32_t conferencenum)
@ -648,7 +779,7 @@ static void conference_onConferenceNameListChange(ToxWindow *self, Tox *m, uint3

    chat->num_peers = num_peers;
    chat->max_idx = num_peers;
-    update_peer_list(m, conferencenum, num_peers, old_num);
+    update_peer_list(self, m, conferencenum, num_peers, old_num);
 }

 static void conference_onConferencePeerNameChange(ToxWindow *self, Tox *m, uint32_t conferencenum, uint32_t peernum,
@ -662,17 +793,24 @@ static void conference_onConferencePeerNameChange(ToxWindow *self, Tox *m, uint3

    const ConferencePeer *peer = peer_in_conference(conferencenum, peernum);

-    if (peer != NULL && peer->name_length > 0) {
+    if (peer != NULL) {
        ChatContext *ctx = self->chatwin;
+
        char timefrmt[TIME_STR_SIZE];
        get_time_str(timefrmt, sizeof(timefrmt));

-        char tmp_event[TOXIC_MAX_NAME_LENGTH * 2 + 32];
-        snprintf(tmp_event, sizeof(tmp_event), "is now known as %s", (const char *) name);
+        if (peer->name_length > 0) {
+            char log_event[TOXIC_MAX_NAME_LENGTH * 2 + 32];
+            line_info_add(self, timefrmt, peer->name, (const char *) name, NAME_CHANGE, 0, 0, " is now known as ");

-        write_to_log(tmp_event, peer->name, ctx->log, true);
-        line_info_add(self, timefrmt, peer->name, (const char *) name, NAME_CHANGE, 0, 0, " is now known as ");
+            snprintf(log_event, sizeof(log_event), "is now known as %s", (const char *) name);
+            write_to_log(log_event, peer->name, ctx->log, true);

+        } else {  // this is kind of a hack; peers always join a group with no name set and then set it after
+            const char *msg = "has joined the group";
+            line_info_add(self, timefrmt, name, NULL, CONNECTION, 0, GREEN, msg);
+            write_to_log(msg, name, ctx->log, true);
+        }
    }

    conference_onConferenceNameListChange(self, m, conferencenum);
@ -698,7 +836,6 @@ static int sidebar_offset(uint32_t conferencenum)
    return 2 + conferences[conferencenum].audio_enabled;
 }

-
 /*
 * Return true if input is recognized by handler
 */
@ -741,6 +878,15 @@ static bool conference_onKey(ToxWindow *self, Tox *m, wint_t key, bool ltr)
    bool input_ret = false;
    ConferenceChat *chat = &conferences[self->num];

+#ifdef AUDIO
+
+    if (chat->audio_enabled && chat->push_to_talk_enabled && key == KEY_F(2)) {
+        input_ret = true;
+        conference_enable_push_to_talk(chat);
+    }
+
+#endif // AUDIO
+
    if (key == L'\t') {  /* TAB key: auto-completes peer name or command */
        input_ret = true;

@ -842,17 +988,19 @@ static bool conference_onKey(ToxWindow *self, Tox *m, wint_t key, bool ltr)
                } else {
                    execute(ctx->history, self, m, line, CONFERENCE_COMMAND_MODE);
                }
-            } else {
+            } else if (line[0]) {
                Tox_Err_Conference_Send_Message err;

                if (!tox_conference_send_message(m, self->num, TOX_MESSAGE_TYPE_NORMAL, (uint8_t *) line, strlen(line), &err)) {
                    line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, RED, " * Failed to send message (error %d)", err);
                }
+            } else {
+                line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, RED, " * Failed to parse message.");
            }
        }

        wclear(ctx->linewin);
-        wmove(self->window, y2 - CURS_Y_OFFSET, 0);
+        wmove(self->window, y2, 0);
        reset_buf(ctx);
    }

@ -866,15 +1014,9 @@ static void draw_peer(ToxWindow *self, Tox *m, ChatContext *ctx, uint32_t i)
    const uint32_t peernum = conferences[self->num].name_list[peer_idx].peernum;
    const bool is_self = tox_conference_peer_number_is_ours(m, self->num, peernum, NULL);
    const bool audio = conferences[self->num].audio_enabled;
-    pthread_mutex_unlock(&Winthread.lock);
-
-    /* truncate nick to fit in side panel without modifying list */
-    char tmpnick[TOX_MAX_NAME_LENGTH];
-    int maxlen = SIDEBAR_WIDTH - 2 - 2 * audio;

    if (audio) {
 #ifdef AUDIO
-        pthread_mutex_lock(&Winthread.lock);
        const ConferencePeer *peer = peer_in_conference(self->num, peernum);
        const bool audio_active = is_self
                                  ? !timed_out(conferences[self->num].last_sent_audio, 2)
@ -891,8 +1033,14 @@ static void draw_peer(ToxWindow *self, Tox *m, ChatContext *ctx, uint32_t i)
        wattroff(ctx->sidebar, aud_attr);
        waddch(ctx->sidebar, ' ');
 #endif
+    } else {
+        pthread_mutex_unlock(&Winthread.lock);
    }

+    /* truncate nick to fit in side panel without modifying list */
+    char tmpnick[TOX_MAX_NAME_LENGTH];
+    int maxlen = SIDEBAR_WIDTH - 2 - 2 * audio;
+
    pthread_mutex_lock(&Winthread.lock);
    memcpy(tmpnick, &conferences[self->num].name_list[peer_idx].name, maxlen);
    pthread_mutex_unlock(&Winthread.lock);
@ -921,6 +1069,12 @@ static void conference_onDraw(ToxWindow *self, Tox *m)
        return;
    }

+    ConferenceChat *chat = &conferences[self->num];
+
+    if (!chat->active) {
+        return;
+    }
+
    ChatContext *ctx = self->chatwin;

    pthread_mutex_lock(&Winthread.lock);
@ -932,19 +1086,20 @@ static void conference_onDraw(ToxWindow *self, Tox *m)
    curs_set(1);

    if (ctx->len > 0) {
-        mvwprintw(ctx->linewin, 1, 0, "%ls", &ctx->line[ctx->start]);
+        mvwprintw(ctx->linewin, 0, 0, "%ls", &ctx->line[ctx->start]);
    }

    wclear(ctx->sidebar);
-    mvwhline(self->window, y2 - CHATBOX_HEIGHT, 0, ACS_HLINE, x2);

    if (self->show_peerlist) {
+        wattron(ctx->sidebar, COLOR_PAIR(BLUE));
        mvwvline(ctx->sidebar, 0, 0, ACS_VLINE, y2 - CHATBOX_HEIGHT);
        mvwaddch(ctx->sidebar, y2 - CHATBOX_HEIGHT, 0, ACS_BTEE);
+        wattroff(ctx->sidebar, COLOR_PAIR(BLUE));

        pthread_mutex_lock(&Winthread.lock);
-        const uint32_t num_peers = conferences[self->num].num_peers;
-        const bool audio = conferences[self->num].audio_enabled;
+        const uint32_t num_peers = chat->num_peers;
+        const bool audio = chat->audio_enabled;
        const int header_lines = sidebar_offset(self->num);
        pthread_mutex_unlock(&Winthread.lock);

@ -953,32 +1108,45 @@ static void conference_onDraw(ToxWindow *self, Tox *m)
        if (audio) {
 #ifdef AUDIO
            pthread_mutex_lock(&Winthread.lock);
-            const bool mic_on = !device_is_muted(input, conferences[self->num].audio_in_idx);
+            const bool ptt_idle = !conference_check_push_to_talk(chat) && chat->push_to_talk_enabled;
+            const bool mic_on = !device_is_muted(input, chat->audio_in_idx);
            const float volume = get_input_volume();
-            const float threshold = device_get_VAD_threshold(conferences[self->num].audio_in_idx);
+            const float threshold = device_get_VAD_threshold(chat->audio_in_idx);
            pthread_mutex_unlock(&Winthread.lock);

            wmove(ctx->sidebar, line, 1);
            wattron(ctx->sidebar, A_BOLD);
            wprintw(ctx->sidebar, "Mic: ");
-            const int color = mic_on && volume > threshold ? GREEN : RED;
-            wattron(ctx->sidebar, COLOR_PAIR(color));

-            if (mic_on) {
+            if (!mic_on) {
+                wattron(ctx->sidebar, COLOR_PAIR(RED));
+                wprintw(ctx->sidebar, "MUTED");
+                wattroff(ctx->sidebar, COLOR_PAIR(RED));
+            } else if (ptt_idle)  {
+                wattron(ctx->sidebar, COLOR_PAIR(GREEN));
+                wprintw(ctx->sidebar, "PTT");
+                wattroff(ctx->sidebar, COLOR_PAIR(GREEN));
+            }  else {
+                const int color = volume > threshold ? GREEN : RED;
+                wattron(ctx->sidebar, COLOR_PAIR(color));
+
                float v = volume;

+                if (v <= 0.0f) {
+                    wprintw(ctx->sidebar, ".");
+                }
+
                while (v > 0.0f) {
                    wprintw(ctx->sidebar, v > 10.0f ? (v > 15.0f ? "*" : "+") : (v > 5.0f ? "-" : "."));
                    v -= 20.0f;
                }
-            } else {
-                wprintw(ctx->sidebar, "OFF");
+
+                wattroff(ctx->sidebar, COLOR_PAIR(color));
            }

-            wattroff(ctx->sidebar, COLOR_PAIR(color));
            wattroff(ctx->sidebar, A_BOLD);
            ++line;
-#endif
+#endif  // AUDIO
        }

        wmove(ctx->sidebar, line, 1);
@ -987,8 +1155,10 @@ static void conference_onDraw(ToxWindow *self, Tox *m)
        wattroff(ctx->sidebar, A_BOLD);
        ++line;

+        wattron(ctx->sidebar, COLOR_PAIR(BLUE));
        mvwaddch(ctx->sidebar, line, 0, ACS_LTEE);
        mvwhline(ctx->sidebar, line, 1, ACS_HLINE, SIDEBAR_WIDTH - 1);
+        wattroff(ctx->sidebar, COLOR_PAIR(BLUE));
        ++line;

        for (uint32_t i = 0;
@ -1005,7 +1175,9 @@ static void conference_onDraw(ToxWindow *self, Tox *m)
    UNUSED_VAR(x);

    int new_x = ctx->start ? x2 - 1 : MAX(0, wcswidth(ctx->line, ctx->pos));
-    wmove(self->window, y + 1, new_x);
+    wmove(self->window, y, new_x);
+
+    draw_window_bar(self);

    wnoutrefresh(self->window);

@ -1025,9 +1197,10 @@ static void conference_onInit(ToxWindow *self, Tox *m)

    ChatContext *ctx = self->chatwin;

-    ctx->history = subwin(self->window, y2 - CHATBOX_HEIGHT + 1, x2 - SIDEBAR_WIDTH - 1, 0, 0);
+    ctx->history = subwin(self->window, y2 - CHATBOX_HEIGHT - WINDOW_BAR_HEIGHT, x2 - SIDEBAR_WIDTH - 1, 0, 0);
+    self->window_bar = subwin(self->window, WINDOW_BAR_HEIGHT, x2, y2 - (CHATBOX_HEIGHT + WINDOW_BAR_HEIGHT), 0);
    ctx->linewin = subwin(self->window, CHATBOX_HEIGHT, x2, y2 - CHATBOX_HEIGHT, 0);
-    ctx->sidebar = subwin(self->window, y2 - CHATBOX_HEIGHT + 1, SIDEBAR_WIDTH, 0, x2 - SIDEBAR_WIDTH);
+    ctx->sidebar = subwin(self->window, y2 - CHATBOX_HEIGHT - WINDOW_BAR_HEIGHT, SIDEBAR_WIDTH, 0, x2 - SIDEBAR_WIDTH);

    ctx->hst = calloc(1, sizeof(struct history));
    ctx->log = calloc(1, sizeof(struct chatlog));
@ -1038,17 +1211,6 @@ static void conference_onInit(ToxWindow *self, Tox *m)

    line_info_init(ctx->hst);

-    if (user_settings->autolog == AUTOLOG_ON) {
-        char myid[TOX_ADDRESS_SIZE];
-        tox_self_get_address(m, (uint8_t *) myid);
-
-        if (log_enable(self->name, myid, NULL, ctx->log, LOG_CONFERENCE) == -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);
-
    scrollok(ctx->history, 0);
    wmove(self->window, y2 - CURS_Y_OFFSET, 0);
 }
@ -1094,7 +1256,6 @@ static ToxWindow *new_conference_chat(uint32_t conferencenum)

 #define CONFAV_SAMPLE_RATE 48000
 #define CONFAV_FRAME_DURATION 20
-#define CONFAV_AUDIO_CHANNELS 1
 #define CONFAV_SAMPLES_PER_FRAME (CONFAV_SAMPLE_RATE * CONFAV_FRAME_DURATION / 1000)

 void audio_conference_callback(void *tox, uint32_t conferencenum, uint32_t peernum, const int16_t *pcm,
@ -1131,12 +1292,20 @@ static void conference_read_device_callback(const int16_t *captured, uint32_t si

    AudioInputCallbackData *audio_input_callback_data = (AudioInputCallbackData *)data;

-    conferences[audio_input_callback_data->conferencenum].last_sent_audio = get_unix_time();
+    ConferenceChat *chat = &conferences[audio_input_callback_data->conferencenum];
+
+    if (!conference_check_push_to_talk(chat)) {
+        return;
+    }
+
+    chat->last_sent_audio = get_unix_time();
+
+    int channels = user_settings->conference_audio_channels;

    toxav_group_send_audio(audio_input_callback_data->tox,
                           audio_input_callback_data->conferencenum,
                           captured, CONFAV_SAMPLES_PER_FRAME,
-                           CONFAV_AUDIO_CHANNELS, CONFAV_SAMPLE_RATE);
+                           channels, CONFAV_SAMPLE_RATE);
 }

 bool init_conference_audio_input(Tox *tox, uint32_t conferencenum)
@ -1150,9 +1319,11 @@ bool init_conference_audio_input(Tox *tox, uint32_t conferencenum)
    const AudioInputCallbackData audio_input_callback_data = { tox, conferencenum };
    chat->audio_input_callback_data = audio_input_callback_data;

+    int channels = user_settings->conference_audio_channels;
+
    bool success = (open_input_device(&chat->audio_in_idx,
                                      conference_read_device_callback, &chat->audio_input_callback_data, true,
-                                      CONFAV_SAMPLE_RATE, CONFAV_FRAME_DURATION, CONFAV_AUDIO_CHANNELS)
+                                      CONFAV_SAMPLE_RATE, CONFAV_FRAME_DURATION, channels)
                    == de_None);

    chat->audio_enabled = success;
@ -1160,6 +1331,19 @@ bool init_conference_audio_input(Tox *tox, uint32_t conferencenum)
    return success;
 }

+bool toggle_conference_push_to_talk(uint32_t conferencenum, bool enabled)
+{
+    ConferenceChat *chat = &conferences[conferencenum];
+
+    if (!chat->active) {
+        return false;
+    }
+
+    chat->push_to_talk_enabled = enabled;
+
+    return true;
+}
+
 bool enable_conference_audio(Tox *tox, uint32_t conferencenum)
 {
    if (!toxav_groupchat_av_enabled(tox, conferencenum)) {
@ -1244,4 +1428,4 @@ float conference_get_VAD_threshold(uint32_t conferencenum)

    return device_get_VAD_threshold(chat->audio_in_idx);
 }
-#endif
+#endif  // AUDIO
--- a/src/conference.h
+++ b/src/conference.h
@ -26,9 +26,8 @@
 #include "toxic.h"
 #include "windows.h"

+#define CONFERENCE_MAX_TITLE_LENGTH TOX_MAX_NAME_LENGTH
 #define SIDEBAR_WIDTH 16
-#define MAX_CONFERENCE_NUM MAX_WINDOWS_NUM - 2
-#define CONFERENCE_EVENT_WAIT 3

 typedef struct ConferencePeer {
    bool       active;
@ -64,12 +63,18 @@ typedef struct {
    int side_pos;    /* current position of the sidebar - used for scrolling up and down */
    time_t start_time;

+    char title[CONFERENCE_MAX_TITLE_LENGTH + 1];
+    size_t title_length;
+
    ConferencePeer *peer_list;
    uint32_t max_idx;

    NameListEntry *name_list;
    uint32_t num_peers;

+    bool push_to_talk_enabled;
+    time_t ptt_last_pushed;
+
    bool audio_enabled;
    time_t last_sent_audio;
    uint32_t audio_in_idx;
@ -79,11 +84,15 @@ typedef struct {
 /* Frees all Toxic associated data structures for a conference (does not call tox_conference_delete() ) */
 void free_conference(ToxWindow *self, uint32_t conferencenum);

-int init_conference_win(Tox *m, uint32_t conferencenum, uint8_t type, const char *title, size_t title_length);
+int init_conference_win(Tox *m, uint32_t conferencenum, uint8_t type, const char *title, size_t length);

 /* destroys and re-creates conference window with or without the peerlist */
 void redraw_conference_win(ToxWindow *self);

+void conference_set_title(ToxWindow *self, uint32_t conferencesnum, const char *title, size_t length);
+void conference_rename_log_path(Tox *m, uint32_t conferencenum, const char *new_title);
+int conference_enable_logging(ToxWindow *self, Tox *m, uint32_t conferencenum, struct chatlog *log);
+
 /* Puts `(NameListEntry *)`s in `entries` for each matched peer, up to a maximum
 * of `maxpeers`.
 * Maches each peer whose name or pubkey begins with `prefix`.
@ -96,6 +105,7 @@ uint32_t get_name_list_entries_by_prefix(uint32_t conferencenum, const char *pre
 bool init_conference_audio_input(Tox *tox, uint32_t conferencenum);
 bool enable_conference_audio(Tox *tox, uint32_t conferencenum);
 bool disable_conference_audio(Tox *tox, uint32_t conferencenum);
+bool toggle_conference_push_to_talk(uint32_t conferencenum, bool enabled);
 void audio_conference_callback(void *tox, uint32_t conferencenum, uint32_t peernum,
                               const int16_t *pcm, unsigned int samples, uint8_t channels, uint32_t
                               sample_rate, void *userdata);
--- a/src/conference_commands.c
+++ b/src/conference_commands.c
@ -40,7 +40,7 @@ void cmd_conference_set_title(WINDOW *window, ToxWindow *self, Tox *m, int argc,
    UNUSED_VAR(window);

    Tox_Err_Conference_Title err;
-    char title[MAX_STR_SIZE];
+    char title[CONFERENCE_MAX_TITLE_LENGTH + 1];

    if (argc < 1) {
        size_t tlen = tox_conference_get_title_size(m, self->num, &err);
@ -61,15 +61,23 @@ void cmd_conference_set_title(WINDOW *window, ToxWindow *self, Tox *m, int argc,
        return;
    }

+    size_t len = strlen(argv[1]);
+
+    if (len >= sizeof(title)) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to set title: max length exceeded.");
+        return;
+    }
+
    snprintf(title, sizeof(title), "%s", argv[1]);
-    int len = strlen(title);

    if (!tox_conference_set_title(m, self->num, (uint8_t *) title, len, &err)) {
        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to set title (error %d)", err);
        return;
    }

-    set_window_title(self, title, len);
+    conference_rename_log_path(m, self->num, title);  // must be called first
+
+    conference_set_title(self, self->num, title, len);

    char timefrmt[TIME_STR_SIZE];
    char selfnick[TOX_MAX_NAME_LENGTH];
@ -104,7 +112,8 @@ void cmd_enable_audio(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*
    }

    if (enable ? enable_conference_audio(m, self->num) : disable_conference_audio(m, self->num)) {
-        print_err(self, enable ? "Enabled conference audio" : "Disabled conference audio");
+        print_err(self, enable ? "Enabled conference audio. Use the '/ptt' command to toggle Push-To-Talk."
+                  : "Disabled conference audio");
    } else {
        print_err(self, enable ? "Failed to enable audio" : "Failed to disable audio");
    }
@ -142,7 +151,7 @@ void cmd_conference_mute(WINDOW *window, ToxWindow *self, Tox *m, int argc, char
        if (conference_mute_peer(m, self->num, entries[0]->peernum)) {
            line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Toggled audio mute status of %s", entries[0]->name);
        } else {
-            print_err(self, "No such audio peer");
+            print_err(self, "Peer is not on the call");
        }
    }
 }
@ -177,4 +186,28 @@ void cmd_conference_sense(WINDOW *window, ToxWindow *self, Tox *m, int argc, cha
        print_err(self, "Failed to set conference audio input sensitivity.");
    }
 }
+
+void cmd_conference_push_to_talk(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
+{
+    UNUSED_VAR(window);
+    UNUSED_VAR(m);
+
+    bool enable;
+
+    if (argc == 1 && !strcasecmp(argv[1], "on")) {
+        enable = true;
+    } else if (argc == 1 && !strcasecmp(argv[1], "off")) {
+        enable = false;
+    } else {
+        print_err(self, "Please specify: on | off");
+        return;
+    }
+
+    if (!toggle_conference_push_to_talk(self->num, enable)) {
+        print_err(self, "Failed to toggle push to talk.");
+        return;
+    }
+
+    print_err(self, enable ? "Push-To-Talk is enabled. Push F2 to activate" : "Push-To-Talk is disabled");
+}
 #endif /* AUDIO */
--- a/src/conference_commands.h
+++ b/src/conference_commands.h
@ -30,5 +30,6 @@ void cmd_conference_set_title(WINDOW *window, ToxWindow *self, Tox *m, int argc,
 void cmd_enable_audio(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_conference_mute(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_conference_sense(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
+void cmd_conference_push_to_talk(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);

 #endif /* CONFERENCE_COMMANDS_H */
--- a/src/execute.c
+++ b/src/execute.c
@ -105,6 +105,7 @@ static struct cmd_func conference_commands[] = {
 #ifdef AUDIO
    { "/audio",     cmd_enable_audio },
    { "/mute",      cmd_conference_mute   },
+    { "/ptt",       cmd_conference_push_to_talk },
    { "/sense",     cmd_conference_sense  },
 #endif /* AUDIO */
    { NULL,         NULL             },
--- a/src/file_transfers.c
+++ b/src/file_transfers.c
@ -60,13 +60,15 @@ void print_progress_bar(ToxWindow *self, double bps, double pct_done, uint32_t l
        return;
    }

-    char pct_str[STR_BUF_SIZE] = {0};
+    char pct_str[STR_BUF_SIZE];
    snprintf(pct_str, sizeof(pct_str), "%.1f%%", pct_done);

-    char bps_str[STR_BUF_SIZE] = {0};
+    char bps_str[STR_BUF_SIZE];
    bytes_convert_str(bps_str, sizeof(bps_str), bps);

-    char prog_line[NUM_PROG_MARKS + 1] = {0};
+    char prog_line[NUM_PROG_MARKS + 1];
+    prog_line[0] = 0;
+
    int n = pct_done / (100 / NUM_PROG_MARKS);
    int i, j;

--- a/src/friendlist.c
+++ b/src/friendlist.c
@ -453,7 +453,9 @@ static void friendlist_onNickChange(ToxWindow *self, Tox *m, uint32_t num, const
    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);
+        if (rename_logfile(oldname, newnamecpy, myid, Friends.list[num].pub_key, Friends.list[num].chatwin) != 0) {
+            fprintf(stderr, "Failed to rename friend chat log from `%s` to `%s`\n", oldname, newnamecpy);
+        }
    }

    sort_friendlist_index();
@ -805,7 +807,7 @@ static void delete_blocked_friend(uint32_t bnum)
 /* deletes contact from friendlist and puts in blocklist */
 void block_friend(Tox *m, uint32_t fnum)
 {
-    if (Friends.num_friends <= 0) {
+    if (Friends.num_friends == 0) {
        return;
    }

@ -1020,7 +1022,7 @@ static void blocklist_onDraw(ToxWindow *self, Tox *m, int y2, int x2)
        wmove(self->window, y2 - 1, 1);

        wattron(self->window, A_BOLD);
-        wprintw(self->window, "Key: ");
+        wprintw(self->window, "Public key: ");
        wattroff(self->window, A_BOLD);

        int i;
@ -1055,6 +1057,8 @@ static void friendlist_onDraw(ToxWindow *self, Tox *m)
    wprintw(self->window, "key for help\n\n");
    wattroff(self->window, COLOR_PAIR(CYAN));

+    draw_window_bar(self);
+
    if (blocklist_view == 1) {
        blocklist_onDraw(self, m, y2, x2);
        return;
@ -1096,9 +1100,9 @@ static void friendlist_onDraw(ToxWindow *self, Tox *m)
        int num_selected = Friends.num_selected;
        pthread_mutex_unlock(&Winthread.lock);

-        bool f_selected = false;
-
        if (is_active) {
+            bool f_selected = false;
+
            if (i == num_selected) {
                wattron(self->window, A_BOLD);
                wprintw(self->window, " > ");
@ -1245,7 +1249,7 @@ static void friendlist_onDraw(ToxWindow *self, Tox *m)
        wmove(self->window, y2 - 1, 1);

        wattron(self->window, A_BOLD);
-        wprintw(self->window, "Key: ");
+        wprintw(self->window, "Public key: ");
        wattroff(self->window, A_BOLD);

        int i;
@ -1263,6 +1267,21 @@ static void friendlist_onDraw(ToxWindow *self, Tox *m)
    }
 }

+void friendlist_onInit(ToxWindow *self, Tox *m)
+{
+    UNUSED_VAR(m);
+
+    int x2;
+    int y2;
+    getmaxyx(self->window, y2, x2);
+
+    if (y2 <= 0 || x2 <= 0) {
+        exit_toxic_err("failed in friendlist_onInit", FATALERR_CURSES);
+    }
+
+    self->window_bar = subwin(self->window, WINDOW_BAR_HEIGHT, x2, y2 - 2, 0);
+}
+
 void disable_chatwin(uint32_t f_num)
 {
    Friends.list[f_num].chatwin = -1;
@ -1341,6 +1360,7 @@ ToxWindow *new_friendlist(void)

    ret->type = WINDOW_TYPE_FRIEND_LIST;

+    ret->onInit = &friendlist_onInit;
    ret->onKey = &friendlist_onKey;
    ret->onDraw = &friendlist_onDraw;
    ret->onFriendAdded = &friendlist_onFriendAdded;
@ -1376,6 +1396,6 @@ ToxWindow *new_friendlist(void)
    }

    ret->help = help;
-    strcpy(ret->name, "contacts");
+    strcpy(ret->name, "Contacts");
    return ret;
 }
--- a/src/friendlist.h
+++ b/src/friendlist.h
@ -82,6 +82,7 @@ typedef struct {
 } FriendsList;

 ToxWindow *new_friendlist(void);
+void friendlist_onInit(ToxWindow *self, Tox *m);
 void disable_chatwin(uint32_t f_num);
 int get_friendnum(uint8_t *name);
 int load_blocklist(char *data);
--- a/src/global_commands.c
+++ b/src/global_commands.c
@ -365,7 +365,7 @@ void cmd_conference(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*ar
        return;
    }

-    uint32_t conferencenum;
+    uint32_t conferencenum = 0;

    if (type == TOX_CONFERENCE_TYPE_TEXT) {
        Tox_Err_Conference_New err;
@ -389,9 +389,6 @@ void cmd_conference(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*ar
        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Audio support disabled by compile-time option.");
        return;
 #endif
-    } else {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Unknown conference type %d", type);
-        return;
    }

    if (init_conference_win(m, conferencenum, type, NULL, 0) == -1) {
@ -434,21 +431,7 @@ 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_ADDRESS_SIZE];
-        tox_self_get_address(m, (uint8_t *) myid);
-
-        int log_ret = -1;
-
-        if (self->type == WINDOW_TYPE_CHAT) {
-            Friends.list[self->num].logging_on = true;
-            log_ret = log_enable(self->name, myid, Friends.list[self->num].pub_key, log, LOG_CHAT);
-        } else if (self->type == WINDOW_TYPE_PROMPT) {
-            log_ret = log_enable(self->name, myid, NULL, log, LOG_PROMPT);
-        } else if (self->type == WINDOW_TYPE_CONFERENCE) {
-            log_ret = log_enable(self->name, myid, NULL, log, LOG_CONFERENCE);
-        }
-
-        msg = log_ret == 0 ? "Logging enabled." : "Warning: Log failed to initialize.";
+        msg = log_enable(log) == 0 ? "Logging enabled." : "Warning: Failed to enable log.";
        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, msg);
        return;
    } else if (!strcmp(swch, "0") || !strcmp(swch, "off")) {
--- a/src/help.c
+++ b/src/help.c
@ -306,7 +306,7 @@ static void help_draw_conference(ToxWindow *self)
    wprintw(win, "Conference commands:\n");
    wattroff(win, A_BOLD | COLOR_PAIR(RED));

-    wprintw(win, "  /title <msg>               : Set conference title (show current title if no msg)\n");
+    wprintw(win, "  /title <msg>               : Show/set conference title\n");
 #ifdef AUDIO
    wattron(win, A_BOLD);
    wprintw(win, "\n Audio:\n");
@ -314,6 +314,7 @@ static void help_draw_conference(ToxWindow *self)
    wprintw(win, "  /audio <on> or <off>       : Enable/disable audio in an audio conference\n");
    wprintw(win, "  /mute                      : Toggle self audio mute status\n");
    wprintw(win, "  /mute <nick> or <pubkey>   : Toggle peer audio mute status\n");
+    wprintw(win, "  /ptt <on> or <off>         : Toggle audio input Push-To-Talk (F2 to activate)\n");
    wprintw(win, "  /sense <n>                 : VAD sensitivity threshold\n\n");
 #endif

@ -403,7 +404,7 @@ void help_onKey(ToxWindow *self, wint_t key)
        case L'o':
            height = 6;
 #ifdef AUDIO
-            height += 5;
+            height += 7;
 #endif
            help_init_window(self, height, 80);
            self->help->type = HELP_CONFERENCE;
--- a/src/line_info.c
+++ b/src/line_info.c
@ -46,7 +46,7 @@ void line_info_init(struct history *hst)

    hst->line_start = hst->line_root;
    hst->line_end = hst->line_start;
-    hst->queue_sz = 0;
+    hst->queue_size = 0;
 }

 /* resets line_start (moves to end of chat history) */
@ -54,27 +54,28 @@ void line_info_reset_start(ToxWindow *self, struct history *hst)
 {
    struct line_info *line = hst->line_end;

-    if (line->prev == NULL) {
+    if (line == NULL || line->prev == NULL) {
        return;
    }

-    int y2, x2;
+    int y2;
+    int x2;
    getmaxyx(self->window, y2, x2);
+    UNUSED_VAR(x2);

-    int side_offst = self->show_peerlist ? SIDEBAR_WIDTH : 0;
-    int top_offst = (self->type == WINDOW_TYPE_CHAT) || (self->type == WINDOW_TYPE_PROMPT) ? 2 : 0;
-    int max_y = (y2 - CHATBOX_HEIGHT - top_offst);
+    int top_offst = (self->type == WINDOW_TYPE_CHAT) || (self->type == WINDOW_TYPE_PROMPT) ? TOP_BAR_HEIGHT : 0;
+    int max_y = y2 - CHATBOX_HEIGHT - WINDOW_BAR_HEIGHT - top_offst;

-    int curlines = 0;
-    int nxtlines = line->newlines + (line->len / (x2 - side_offst));
+    uint16_t curlines = 0;

    do {
-        curlines += 1 + nxtlines;
+        curlines += line->format_lines;
        line = line->prev;
-        nxtlines = line->newlines + (line->len / (x2 - side_offst));
-    } while (line->prev && curlines + nxtlines < max_y);
+    } while (line->prev && curlines + line->format_lines <= max_y);

    hst->line_start = line;
+
+    self->scroll_pause = false;
 }

 void line_info_cleanup(struct history *hst)
@ -87,9 +88,7 @@ void line_info_cleanup(struct history *hst)
        tmp1 = tmp2;
    }

-    int i;
-
-    for (i = 0; i < hst->queue_sz; ++i) {
+    for (size_t i = 0; i < hst->queue_size; ++i) {
        if (hst->queue[i]) {
            free(hst->queue[i]);
        }
@ -117,23 +116,224 @@ static void line_info_root_fwd(struct history *hst)
 /* returns ptr to queue item 0 and removes it from queue. Returns NULL if queue is empty. */
 static struct line_info *line_info_ret_queue(struct history *hst)
 {
-    if (hst->queue_sz <= 0) {
+    if (hst->queue_size == 0) {
        return NULL;
    }

    struct line_info *line = hst->queue[0];

-    int i;
-
-    for (i = 0; i < hst->queue_sz; ++i) {
+    for (size_t i = 0; i < hst->queue_size; ++i) {
        hst->queue[i] = hst->queue[i + 1];
    }

-    --hst->queue_sz;
+    --hst->queue_size;

    return line;
 }

+/* Prints a maximum of `n` chars from `s` to `win`.
+ *
+ * Return 1 if the string contains a newline byte.
+ * Return 0 if string does not contain a newline byte.
+ * Return -1 if printing was aborted.
+ */
+static int print_n_chars(WINDOW *win, const char *s, size_t n, int max_y)
+{
+    bool newline = false;
+    char ch;
+
+    for (size_t i = 0; i < n && (ch = s[i]); ++i) {
+        if (ch == '\n') {
+            newline = true;
+
+            int x;
+            int y;
+            UNUSED_VAR(x);
+            getyx(win, y, x);
+
+            // make sure cursor will wrap correctly after newline to prevent display bugs
+            if (y + 1 >= max_y) {
+                return -1;
+            }
+        }
+
+        if (win) {
+            wprintw(win, "%c", ch);
+        }
+    }
+
+    return newline;
+}
+
+/* Returns the index of the last space character in `s` found before `limit`.
+ * Returns -1 if no space is found.
+ */
+static int rspace_index(const char *s, int limit)
+{
+    for (int i = limit; i >= 0; --i) {
+        if (s[i] == ' ') {
+            return i;
+        }
+    }
+
+    return -1;
+}
+
+/* Returns the first index in `s` containing a newline byte found before `limit`.
+ * Returns -1 if no newline  is found.
+ */
+static int newline_index(const char *s, int limit)
+{
+    char ch;
+
+    for (int i = 0; i < limit && (ch = s[i]); ++i) {
+        if (ch == '\n') {
+            return i;
+        }
+    }
+
+    return -1;
+}
+
+/* Returns the number of newline bytes in `s` */
+static unsigned int newline_count(const char *s)
+{
+    char ch;
+    unsigned int count = 0;
+
+    for (size_t i = 0; (ch = s[i]); ++i) {
+        if (ch == '\n') {
+            ++count;
+        }
+    }
+
+    return count;
+}
+
+/* Prints `line` message to window, wrapping at the last word that fits on the current line.
+ * This function updates the `format_lines` field of `line` according to current window dimensions.
+ *
+ * If `win` is null nothing will be printed to the window. This is useful to set the
+ * `format_lines` field on initialization.
+ *
+ * Return 0 on success.
+ * Return -1 if not all characters in line's message were printed to screen.
+ */
+static int print_wrap(WINDOW *win, struct line_info *line, int max_x, int max_y)
+{
+    int x;
+    int y;
+    UNUSED_VAR(y);
+
+    const char *msg = line->msg;
+    uint16_t length = line->msg_len;
+    uint16_t lines = 0;
+    const int x_start = line->len - line->msg_len - 1;  // manually keep track of x position because ncurses sucks
+    int x_limit = max_x - x_start;
+
+    if (x_limit <= 1) {
+        fprintf(stderr, "Warning: x_limit <= 0 in print_wrap(): %d\n", x_limit);
+        return -1;
+    }
+
+    while (msg) {
+        getyx(win, y, x);
+
+        // next line would print past window limit so we abort; we don't want to update format_lines
+        if (x > x_start) {
+            return -1;
+        }
+
+        if (length < x_limit) {
+            int p_ret = print_n_chars(win, msg, length, max_y);
+
+            if (p_ret == 1) {
+                lines += newline_count(msg);
+            } else if (p_ret == -1) {
+                return -1;
+            }
+
+            ++lines;
+            break;
+        }
+
+        int newline_idx = newline_index(msg, x_limit - 1);
+
+        if (newline_idx >= 0) {
+            if (print_n_chars(win, msg, newline_idx + 1, max_y) == -1) {
+                return -1;
+            }
+
+            msg += (newline_idx + 1);
+            length -= (newline_idx + 1);
+            x_limit = max_x; // if we find a newline we stop adding column padding for rest of message
+            ++lines;
+            continue;
+        }
+
+        int space_idx = rspace_index(msg, x_limit - 1);
+
+        if (space_idx >= 1) {
+            if (print_n_chars(win, msg, space_idx, max_y) == -1) {
+                return -1;
+            }
+
+            msg += space_idx + 1;
+            length -= (space_idx + 1);
+
+            if (win) {
+                waddch(win, '\n');
+            }
+        } else {
+            if (print_n_chars(win, msg, x_limit, max_y) == -1) {
+                return -1;
+            }
+
+            msg += x_limit;
+            length -= x_limit;
+        }
+
+        // Add padding to the start of the next line
+        if (win && x_limit < max_x) {
+            for (size_t i = 0; i < x_start; ++i) {
+                waddch(win, ' ');
+            }
+        }
+
+        ++lines;
+    }
+
+    if (win && line->noread_flag) {
+        getyx(win, y, x);
+
+        if (x >= max_x - 1 || x == x_start) {
+            ++lines;
+        }
+
+        wattron(win, COLOR_PAIR(RED));
+        wprintw(win, " x");
+        wattroff(win, COLOR_PAIR(RED));
+    }
+
+    line->format_lines = lines;
+
+    return 0;
+}
+
+static void line_info_init_line(ToxWindow *self, struct line_info *line)
+{
+    int y2;
+    int x2;
+    UNUSED_VAR(y2);
+
+    getmaxyx(self->window, y2, x2);
+
+    const int max_y = y2 - CHATBOX_HEIGHT - WINDOW_BAR_HEIGHT;
+    const int max_x = self->show_peerlist ? x2 - 1 - SIDEBAR_WIDTH : x2;
+
+    print_wrap(NULL, line, max_x, max_y);
+}
+
 /* creates new line_info line and puts it in the queue.
 *
 * Returns the id of the new line.
@ -148,7 +348,7 @@ int line_info_add(ToxWindow *self, const char *timestr, const char *name1, const

    struct history *hst = self->chatwin->hst;

-    if (hst->queue_sz >= MAX_LINE_INFO_QUEUE) {
+    if (hst->queue_size >= MAX_LINE_INFO_QUEUE) {
        return -1;
    }

@ -158,7 +358,8 @@ int line_info_add(ToxWindow *self, const char *timestr, const char *name1, const
        exit_toxic_err("failed in line_info_add", FATALERR_MEMORY);
    }

-    char frmt_msg[MAX_LINE_INFO_MSG_SIZE] = {0};
+    char frmt_msg[MAX_LINE_INFO_MSG_SIZE];
+    frmt_msg[0] = 0;

    va_list args;
    va_start(args, msg);
@ -199,7 +400,7 @@ int line_info_add(ToxWindow *self, const char *timestr, const char *name1, const
            break;

        case PROMPT:
-            ++len;
+            len += 2;
            break;

        default:
@ -207,17 +408,12 @@ int line_info_add(ToxWindow *self, const char *timestr, const char *name1, const
            break;
    }

+    uint16_t msg_len = 0;
+
    if (frmt_msg[0]) {
        snprintf(new_line->msg, sizeof(new_line->msg), "%s", frmt_msg);
-        len += strlen(new_line->msg);
-
-        int i;
-
-        for (i = 0; frmt_msg[i]; ++i) {
-            if (frmt_msg[i] == '\n') {
-                ++new_line->newlines;
-            }
-        }
+        msg_len = strlen(new_line->msg);
+        len += msg_len;
    }

    if (timestr) {
@ -235,15 +431,18 @@ int line_info_add(ToxWindow *self, const char *timestr, const char *name1, const
        len += strlen(new_line->name2);
    }

-    new_line->id = (hst->line_end->id + 1 + hst->queue_sz) % INT_MAX;
+    new_line->id = (hst->line_end->id + 1 + hst->queue_size) % INT_MAX;
    new_line->len = len;
+    new_line->msg_len = msg_len;
    new_line->type = type;
    new_line->bold = bold;
    new_line->colour = colour;
    new_line->noread_flag = false;
    new_line->timestamp = get_unix_time();

-    hst->queue[hst->queue_sz++] = new_line;
+    line_info_init_line(self, new_line);
+
+    hst->queue[hst->queue_size++] = new_line;

    return new_line->id;
 }
@ -267,27 +466,8 @@ static void line_info_check_queue(ToxWindow *self)
    hst->line_end = line;
    hst->line_end->id = line->id;

-    int y, y2, x, x2;
-    getmaxyx(self->window, y2, x2);
-    getyx(self->chatwin->history, y, x);
-
-    UNUSED_VAR(x);
-
-    if (x2 <= SIDEBAR_WIDTH) {
-        return;
-    }
-
-    int offst = self->show_peerlist ? SIDEBAR_WIDTH : 0;   /* offset width of conference sidebar */
-    int lines = 1 + line->newlines + (line->len / (x2 - offst));
-    int max_y = y2 - CHATBOX_HEIGHT;
-
-    /* move line_start forward proportionate to the number of new lines */
-    if (y + lines - 1 >= max_y) {
-        while (lines > 0 && hst->line_start->next) {
-            lines -= 1 + hst->line_start->next->newlines + (hst->line_start->next->len / (x2 - offst));
-            hst->line_start = hst->line_start->next;
-            ++hst->start_id;
-        }
+    if (!self->scroll_pause) {
+        line_info_reset_start(self, hst);
    }
 }

@ -310,25 +490,44 @@ void line_info_print(ToxWindow *self)

    wclear(win);

-    int y2, x2;
+    int y2;
+
+    int x2;

    getmaxyx(self->window, y2, x2);

-    if (x2 <= SIDEBAR_WIDTH) {
+    if (x2 - 1 <= SIDEBAR_WIDTH) {  // leave room on x axis for sidebar padding
        return;
    }

    if (self->type == WINDOW_TYPE_CONFERENCE) {
        wmove(win, 0, 0);
    } else {
-        wmove(win, 2, 0);
+        wmove(win, TOP_BAR_HEIGHT, 0);
    }

    struct line_info *line = hst->line_start->next;

-    int numlines = 0;
+    if (!line) {
+        return;
+    }
+
+    const int max_y = y2 - CHATBOX_HEIGHT - WINDOW_BAR_HEIGHT;
+    const int max_x = self->show_peerlist ? x2 - 1 - SIDEBAR_WIDTH : x2;
+    uint16_t numlines = line->format_lines;
+    int print_ret = 0;
+
+    while (line && numlines++ <= max_y && print_ret == 0) {
+        int y;
+        int x;
+        UNUSED_VAR(y);
+
+        getyx(win, y, x);
+
+        if (x > 0) { // Prevents us from printing off the screen
+            break;
+        }

-    while (line && numlines++ <= y2) {
        uint8_t type = line->type;

        switch (type) {
@ -355,43 +554,32 @@ void line_info_print(ToxWindow *self)
                wprintw(win, "%s %s: ", user_settings->line_normal, line->name1);
                wattroff(win, COLOR_PAIR(nameclr));

-                char *msg = line->msg;
-
-                while (msg) {
-                    char *line = strsep(&msg, "\n");
-
-                    if (line[0] == '>') {
-                        wattron(win, COLOR_PAIR(GREEN));
-                    } else if (line[0] == '<') {
-                        wattron(win, COLOR_PAIR(RED));
-                    }
-
-                    wprintw(win, "%s%c", line, msg ? '\n' : '\0');
-
-                    if (line[0] == '>') {
-                        wattroff(win, COLOR_PAIR(GREEN));
-                    } else if (line[0] == '<') {
-                        wattroff(win, COLOR_PAIR(RED));
-                    }
-
-                    // change the \0 set by strsep back to \n
-                    if (msg) {
-                        msg[-1] = '\n';
-                    }
+                if (line->msg[0] == 0) {
+                    waddch(win, '\n');
+                    break;
                }

-                if (type == OUT_MSG && timed_out(line->timestamp, NOREAD_FLAG_TIMEOUT)) {
+                if (line->msg[0] == '>') {
+                    wattron(win, COLOR_PAIR(GREEN));
+                } else if (line->msg[0] == '<') {
                    wattron(win, COLOR_PAIR(RED));
-                    wprintw(win, " x");
-                    wattroff(win, COLOR_PAIR(RED));
+                }

-                    if (line->noread_flag == false) {
+                print_ret = print_wrap(win, line, max_x, max_y);
+
+                if (line->msg[0] == '>') {
+                    wattroff(win, COLOR_PAIR(GREEN));
+                } else if (line->msg[0] == '<') {
+                    wattroff(win, COLOR_PAIR(RED));
+                }
+
+                if (type == OUT_MSG && !line->read_flag) {
+                    if (timed_out(line->timestamp, NOREAD_FLAG_TIMEOUT)) {
                        line->noread_flag = true;
-                        line->len += 2;
                    }
                }

-                wprintw(win, "\n");
+                waddch(win, '\n');
                break;

            case OUT_ACTION_READ:
@ -406,21 +594,17 @@ void line_info_print(ToxWindow *self)
                wattroff(win, COLOR_PAIR(BLUE));

                wattron(win, COLOR_PAIR(YELLOW));
-                wprintw(win, "%s %s %s", user_settings->line_normal, line->name1, line->msg);
+                wprintw(win, "%s %s ", user_settings->line_normal, line->name1);
+                print_ret = print_wrap(win, line, max_x, max_y);
                wattroff(win, COLOR_PAIR(YELLOW));

-                if (type == OUT_ACTION && timed_out(line->timestamp, NOREAD_FLAG_TIMEOUT)) {
-                    wattron(win, COLOR_PAIR(RED));
-                    wprintw(win, " x");
-                    wattroff(win, COLOR_PAIR(RED));
-
-                    if (line->noread_flag == false) {
+                if (type == OUT_ACTION && !line->read_flag) {
+                    if (timed_out(line->timestamp, NOREAD_FLAG_TIMEOUT)) {
                        line->noread_flag = true;
-                        line->len += 2;
                    }
                }

-                wprintw(win, "\n");
+                waddch(win, '\n');
                break;

            case SYS_MSG:
@ -438,7 +622,8 @@ void line_info_print(ToxWindow *self)
                    wattron(win, COLOR_PAIR(line->colour));
                }

-                wprintw(win, "%s\n", line->msg);
+                print_ret = print_wrap(win, line, max_x, max_y);
+                waddch(win, '\n');

                if (line->bold) {
                    wattroff(win, A_BOLD);
@ -456,10 +641,10 @@ void line_info_print(ToxWindow *self)
                wattroff(win, COLOR_PAIR(GREEN));

                if (line->msg[0]) {
-                    wprintw(win, "%s", line->msg);
+                    print_ret = print_wrap(win, line, max_x, max_y);
                }

-                wprintw(win, "\n");
+                waddch(win, '\n');
                break;

            case CONNECTION:
@ -474,7 +659,9 @@ void line_info_print(ToxWindow *self)
                wprintw(win, "%s ", line->name1);
                wattroff(win, A_BOLD);

-                wprintw(win, "%s\n", line->msg);
+                print_ret = print_wrap(win, line, max_x, max_y);
+                waddch(win, '\n');
+
                wattroff(win, COLOR_PAIR(line->colour));

                break;
@ -491,7 +678,9 @@ void line_info_print(ToxWindow *self)
                wprintw(win, "%s ", line->name1);
                wattroff(win, A_BOLD);

-                wprintw(win, "%s\n", line->msg);
+                print_ret = print_wrap(win, line, max_x, max_y);
+                waddch(win, '\n');
+
                wattroff(win, COLOR_PAIR(line->colour));

                break;
@ -507,7 +696,7 @@ void line_info_print(ToxWindow *self)
                wprintw(win, "%s", line->name1);
                wattroff(win, A_BOLD);

-                wprintw(win, "%s", line->msg);
+                print_ret = print_wrap(win, line, max_x, max_y);

                wattron(win, A_BOLD);
                wprintw(win, "%s\n", line->name2);
@ -521,11 +710,43 @@ void line_info_print(ToxWindow *self)
    }

    /* keep calling until queue is empty */
-    if (hst->queue_sz > 0) {
+    if (hst->queue_size > 0) {
        line_info_print(self);
    }
 }

+/*
+ * Return true if all lines starting from `line` can fit on the screen.
+ */
+static bool line_info_screen_fit(ToxWindow *self, struct line_info *line)
+{
+    if (!line) {
+        return true;
+    }
+
+    int x2;
+    int y2;
+    getmaxyx(self->chatwin->history, y2, x2);
+
+    UNUSED_VAR(x2);
+
+    const int top_offset = (self->type == WINDOW_TYPE_CHAT) || (self->type == WINDOW_TYPE_PROMPT) ? TOP_BAR_HEIGHT : 0;
+    const int max_y = y2 - top_offset;
+
+    uint16_t lines = line->format_lines;
+
+    while (line) {
+        if (lines > max_y) {
+            return false;
+        }
+
+        lines += line->format_lines;
+        line = line->next;
+    }
+
+    return true;
+}
+
 /* puts msg in specified line_info msg buffer */
 void line_info_set(ToxWindow *self, uint32_t id, char *msg)
 {
@ -533,6 +754,9 @@ void line_info_set(ToxWindow *self, uint32_t id, char *msg)

    while (line) {
        if (line->id == id) {
+            size_t new_len = strlen(msg);
+            line->len = line->len - line->msg_len + new_len;
+            line->msg_len = new_len;
            snprintf(line->msg, sizeof(line->msg), "%s", msg);
            return;
        }
@ -541,56 +765,74 @@ void line_info_set(ToxWindow *self, uint32_t id, char *msg)
    }
 }

-/* static void line_info_goto_root(struct history *hst)
-{
-    hst->line_start = hst->line_root;
-} */
-
-static void line_info_scroll_up(struct history *hst)
+static void line_info_scroll_up(ToxWindow *self, struct history *hst)
 {
    if (hst->line_start->prev) {
        hst->line_start = hst->line_start->prev;
-    } else {
-        sound_notify(NULL, notif_error, NT_ALWAYS, NULL);
+        self->scroll_pause = true;
    }
 }

-static void line_info_scroll_down(struct history *hst)
+static void line_info_scroll_down(ToxWindow *self, struct history *hst)
 {
-    if (hst->line_start->next) {
-        hst->line_start = hst->line_start->next;
+    struct line_info *next = hst->line_start->next;
+
+    if (next && self->scroll_pause) {
+        if (line_info_screen_fit(self, next->next)) {
+            line_info_reset_start(self, hst);
+        } else {
+            hst->line_start = next;
+        }
    } else {
-        sound_notify(NULL, notif_error, NT_ALWAYS, NULL);
+        line_info_reset_start(self, hst);
    }
 }

 static void line_info_page_up(ToxWindow *self, struct history *hst)
 {
-    int x2, y2;
+    int x2;
+    int y2;
    getmaxyx(self->window, y2, x2);

    UNUSED_VAR(x2);

-    int jump_dist = y2 / 2;
-    int i;
+    const int top_offset = (self->type == WINDOW_TYPE_CHAT) || (self->type == WINDOW_TYPE_PROMPT) ? TOP_BAR_HEIGHT : 0;
+    const int max_y = y2 - top_offset;
+    size_t jump_dist = max_y / 2;

-    for (i = 0; i < jump_dist && hst->line_start->prev; ++i) {
+    for (size_t i = 0; i < jump_dist && hst->line_start->prev; ++i) {
        hst->line_start = hst->line_start->prev;
    }
+
+    self->scroll_pause = true;
 }

 static void line_info_page_down(ToxWindow *self, struct history *hst)
 {
-    int x2, y2;
-    getmaxyx(self->window, y2, x2);
+    if (!self->scroll_pause) {
+        return;
+    }
+
+    int x2;
+    int y2;
+    getmaxyx(self->chatwin->history, y2, x2);

    UNUSED_VAR(x2);

-    int jump_dist = y2 / 2;
-    int i;
+    const int top_offset = (self->type == WINDOW_TYPE_CHAT) || (self->type == WINDOW_TYPE_PROMPT) ? TOP_BAR_HEIGHT : 0;
+    const int max_y = y2 - top_offset;
+    size_t jump_dist = max_y / 2;

-    for (i = 0; i < jump_dist && hst->line_start->next; ++i) {
-        hst->line_start = hst->line_start->next;
+    struct line_info *next = hst->line_start->next;
+
+    for (size_t i = 0; i < jump_dist && next; ++i) {
+        if (line_info_screen_fit(self, next->next)) {
+            line_info_reset_start(self, hst);
+            break;
+        }
+
+        hst->line_start = next;
+        next = hst->line_start->next;
    }
 }

@ -604,9 +846,9 @@ bool line_info_onKey(ToxWindow *self, wint_t key)
    } else if (key == user_settings->key_half_page_down) {
        line_info_page_down(self, hst);
    } else if (key == user_settings->key_scroll_line_up) {
-        line_info_scroll_up(hst);
+        line_info_scroll_up(self, hst);
    } else if (key == user_settings->key_scroll_line_down) {
-        line_info_scroll_down(hst);
+        line_info_scroll_down(self, hst);
    } else if (key == user_settings->key_page_bottom) {
        line_info_reset_start(self, hst);
    } else {
--- a/src/line_info.h
+++ b/src/line_info.h
@ -29,7 +29,7 @@
 #define MAX_HISTORY 100000
 #define MIN_HISTORY 40
 #define MAX_LINE_INFO_QUEUE 1024
-#define MAX_LINE_INFO_MSG_SIZE MAX_STR_SIZE + TOXIC_MAX_NAME_LENGTH + 32    /* needs extra room for log loading */
+#define MAX_LINE_INFO_MSG_SIZE (MAX_STR_SIZE + TOXIC_MAX_NAME_LENGTH + 32) /* needs extra room for log loading */

 typedef enum {
    SYS_MSG,
@ -54,10 +54,12 @@ struct line_info {
    uint8_t type;
    uint8_t bold;
    uint8_t colour;
-    uint8_t noread_flag;   /* true if a line should be flagged as unread */
+    bool    noread_flag;   /* true if a line should be flagged as unread */
+    bool    read_flag;     /* true if a message has been flagged as read */
    uint32_t id;
-    uint16_t len;   /* combined len of entire line */
-    uint8_t newlines;
+    uint16_t len;        /* combined length of entire line */
+    uint16_t msg_len;    /* length of the message */
+    uint16_t format_lines;  /* number of lines the combined string takes up (dynamically set) */

    struct line_info *prev;
    struct line_info *next;
@ -71,7 +73,7 @@ struct history {
    uint32_t start_id;    /* keeps track of where line_start should be when at bottom of history */

    struct line_info *queue[MAX_LINE_INFO_QUEUE];
-    int queue_sz;
+    size_t queue_size;
 };

 /* creates new line_info line and puts it in the queue.
--- a/src/log.c
+++ b/src/log.c
@ -35,29 +35,33 @@

 extern struct user_settings *user_settings;

-/* There are three types of logs: chat logs, conference logs, and prompt logs (see LOG_TYPE in log.h)
-   A prompt log is in the format: LOGDIR/selfkey-home.log
-   A chat log is in the format: LOGDIR/selfkey-friendname-otherkey.log
-   A conference log is in the format: LOGDIR/selfkey-conferencename-date[time].log
-
-   Only the first (KEY_IDENT_DIGITS * 2) numbers of the key are used.
-
-   Returns 0 on success, -1 if the path is too long */
-static int get_log_path(char *dest, int destsize, char *name, const char *selfkey, const char *otherkey, int logtype)
+/* Creates a log path and puts it in `dest.
+ *
+ * There are two types of logs: chat logs and prompt logs (see LOG_TYPE in log.h)
+ * A prompt log is in the format: LOGDIR/selfkey-home.log
+ * A chat log is in the format: LOGDIR/selfkey-name-otherkey.log
+ *
+ * For friend chats `otherkey` is the first 6 bytes of the friend's Tox ID.
+ * For Conferences/groups `otherkey` is the first 6 bytes of the group's unique ID.
+ *
+ * Return path length on success.
+ * Return -1 if the path is too long.
+ */
+static int get_log_path(char *dest, int destsize, const char *name, const char *selfkey, const char *otherkey)
 {
    if (!valid_nick(name)) {
        name = UNKNOWN_NAME;
    }

-    const char *namedash = logtype == LOG_PROMPT ? "" : "-";
+    const char *namedash = otherkey ? "-" : "";
    const char *set_path = user_settings->chatlogs_path;

    char *user_config_dir = get_user_config_dir();
    int path_len = strlen(name) + strlen(".log") + strlen("-") + strlen(namedash);
    path_len += strlen(set_path) ? *set_path : strlen(user_config_dir) + strlen(LOGDIR);

-    /* first 6 digits of selfkey */
-    char self_id[32];
+    /* first 6 bytes of selfkey */
+    char self_id[32] = {0};
    path_len += KEY_IDENT_DIGITS * 2;
    sprintf(&self_id[0], "%02X", selfkey[0] & 0xff);
    sprintf(&self_id[2], "%02X", selfkey[1] & 0xff);
@ -66,19 +70,13 @@ static int get_log_path(char *dest, int destsize, char *name, const char *selfke

    char other_id[32] = {0};

-    switch (logtype) {
-        case LOG_CHAT:
-            path_len += KEY_IDENT_DIGITS * 2;
-            sprintf(&other_id[0], "%02X", otherkey[0] & 0xff);
-            sprintf(&other_id[2], "%02X", otherkey[1] & 0xff);
-            sprintf(&other_id[4], "%02X", otherkey[2] & 0xff);
-            other_id[KEY_IDENT_DIGITS * 2] = '\0';
-            break;
-
-        case LOG_CONFERENCE:
-            strftime(other_id, sizeof(other_id), "%Y-%m-%d[%H:%M:%S]", get_time());
-            path_len += strlen(other_id);
-            break;
+    if (otherkey) {
+        /* first 6 bytes of otherkey */
+        path_len += KEY_IDENT_DIGITS * 2;
+        sprintf(&other_id[0], "%02X", otherkey[0] & 0xff);
+        sprintf(&other_id[2], "%02X", otherkey[1] & 0xff);
+        sprintf(&other_id[4], "%02X", otherkey[2] & 0xff);
+        other_id[KEY_IDENT_DIGITS * 2] = '\0';
    }

    if (path_len >= destsize) {
@ -94,28 +92,35 @@ static int get_log_path(char *dest, int destsize, char *name, const char *selfke

    free(user_config_dir);

-    return 0;
+    return path_len;
 }

-/* Opens log file or creates a new one */
-static int init_logging_session(char *name, const char *selfkey, const char *otherkey, struct chatlog *log, int logtype)
+/* Initializes log path for `log`.
+ *
+ * Return 0 on success.
+ * Return -1 on failure.
+ */
+static int init_logging_session(const char *name, const char *selfkey, const char *otherkey, struct chatlog *log,
+                                LOG_TYPE type)
 {
-    if (selfkey == NULL || (logtype == LOG_CHAT && otherkey == NULL)) {
+    if (log == NULL) {
+        return -1;
+    }
+
+    if (selfkey == NULL || (type == LOG_TYPE_CHAT && otherkey == NULL)) {
        return -1;
    }

    char log_path[MAX_STR_SIZE];

-    if (get_log_path(log_path, sizeof(log_path), name, selfkey, otherkey, logtype) == -1) {
+    int path_len = get_log_path(log_path, sizeof(log_path), name, selfkey, otherkey);
+
+    if (path_len == -1 || path_len >= sizeof(log->path)) {
        return -1;
    }

-    log->file = fopen(log_path, "a+");
-    snprintf(log->path, sizeof(log->path), "%s", log_path);
-
-    if (log->file == NULL) {
-        return -1;
-    }
+    memcpy(log->path, log_path, path_len);
+    log->path[path_len] = 0;

    return 0;
 }
@ -124,6 +129,10 @@ static int init_logging_session(char *name, const char *selfkey, const char *oth

 void write_to_log(const char *msg, const char *name, struct chatlog *log, bool event)
 {
+    if (log == NULL) {
+        return;
+    }
+
    if (!log->log_on) {
        return;
    }
@ -154,94 +163,162 @@ void write_to_log(const char *msg, const char *name, struct chatlog *log, bool e

 void log_disable(struct chatlog *log)
 {
-    if (log->file != NULL) {
-        fclose(log->file);
+    if (log == NULL) {
+        return;
    }

-    *log = (struct chatlog) {
-        0
-    };
+    if (log->file != NULL) {
+        fclose(log->file);
+        log->file = NULL;
+    }
+
+    log->lastwrite = 0;
+    log->log_on = false;
 }

-int log_enable(char *name, const char *selfkey, const char *otherkey, struct chatlog *log, int logtype)
+int log_enable(struct chatlog *log)
 {
-    log->log_on = true;
+    if (log == NULL) {
+        return -1;
+    }

-    if (log->file != NULL) {
+    if (log->log_on) {
        return 0;
    }

-    if (init_logging_session(name, selfkey, otherkey, log, logtype) == -1) {
-        log_disable(log);
+    if (*log->path == 0) {
        return -1;
    }

+    if (log->file != NULL) {
+        return -1;
+    }
+
+    log->file = fopen(log->path, "a+");
+
+    if (log->file == NULL) {
+        return -1;
+    }
+
+    log->log_on = true;
+
    return 0;
 }

-/* Loads previous history from chat log */
-void load_chat_history(ToxWindow *self, struct chatlog *log)
+/* Initializes a log. This function must be called before any other logging operations.
+ *
+ * Return 0 on success.
+ * Return -1 on failure.
+ */
+int log_init(struct chatlog *log, const char *name, const char *selfkey, const char *otherkey, LOG_TYPE type)
 {
-    if (log->file == NULL) {
-        return;
+    if (log == NULL) {
+        return -1;
+    }
+
+    if (log->file != NULL || log->log_on) {
+        fprintf(stderr, "Warning: Called log_init() on an already initialized log\n");
+        return -1;
+    }
+
+    if (init_logging_session(name, selfkey, otherkey, log, type) == -1) {
+        return -1;
+    }
+
+    log_disable(log);
+
+    return 0;
+}
+
+/* Loads chat log history and prints it to `self` window.
+ *
+ * Return 0 on success or if log file doesn't exist.
+ * Return -1 on failure.
+ */
+int load_chat_history(ToxWindow *self, struct chatlog *log)
+{
+    if (log == NULL) {
+        return -1;
+    }
+
+    if (*log->path == 0) {
+        return -1;
    }

    off_t sz = file_size(log->path);

    if (sz <= 0) {
-        return;
+        return 0;
    }

-    char *hstbuf = malloc(sz + 1);
+    FILE *fp = fopen(log->path, "r");

-    if (hstbuf == NULL) {
-        exit_toxic_err("failed in load_chat_history", FATALERR_MEMORY);
+    if (fp == NULL) {
+        return -1;
    }

-    if (fseek(log->file, 0L, SEEK_SET) == -1) {
-        free(hstbuf);
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, RED, " * Failed to read log file");
-        return;
+    char *buf = malloc(sz + 1);
+
+    if (buf == NULL) {
+        fclose(fp);
+        return -1;
    }

-    if (fread(hstbuf, sz, 1, log->file) != 1) {
-        free(hstbuf);
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, RED, " * Failed to read log file");
-        return;
+    if (fseek(fp, 0L, SEEK_SET) == -1) {
+        free(buf);
+        fclose(fp);
+        return -1;
    }

-    hstbuf[sz] = '\0';
+    if (fread(buf, sz, 1, fp) != 1) {
+        free(buf);
+        fclose(fp);
+        return -1;
+    }
+
+    fclose(fp);
+
+    buf[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;
+
+    int start = 0;
+    int count = 0;

    /* start at end and backtrace L lines or to the beginning of buffer */
    for (start = sz - 1; start >= 0 && count < L; --start) {
-        if (hstbuf[start] == '\n') {
+        if (buf[start] == '\n') {
            ++count;
        }
    }

-    const char *line = strtok(&hstbuf[start + 1], "\n");
+    char *tmp = NULL;
+    const char *line = strtok_r(&buf[start + 1], "\n", &tmp);

    if (line == NULL) {
-        free(hstbuf);
-        return;
+        free(buf);
+        return -1;
    }

    while (line != NULL && count--) {
        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "%s", line);
-        line = strtok(NULL, "\n");
+        line = strtok_r(NULL, "\n", &tmp);
    }

-    line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "");
-    free(hstbuf);
+    line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, YELLOW, "---");
+
+    free(buf);
+
+    return 0;
 }

-/* renames chatlog file replacing src with dest.
-   Returns 0 on success or if no log exists, -1 on failure. */
-int rename_logfile(char *src, char *dest, const char *selfkey, const char *otherkey, int winnum)
+/* Renames chatlog file `src` to `dest`.
+ *
+ * Return 0 on success or if no log exists.
+ * Return -1 on failure.
+ */
+int rename_logfile(const char *src, const char *dest, const char *selfkey, const char *otherkey, int winnum)
 {
    ToxWindow *toxwin = get_window_ptr(winnum);
    struct chatlog *log = NULL;
@ -250,6 +327,11 @@ int rename_logfile(char *src, char *dest, const char *selfkey, const char *other
    /* disable log if necessary and save its state */
    if (toxwin != NULL) {
        log = toxwin->chatwin->log;
+
+        if (log == NULL) {
+            return -1;
+        }
+
        log_on = log->log_on;
    }

@ -260,24 +342,36 @@ int rename_logfile(char *src, char *dest, const char *selfkey, const char *other
    char newpath[MAX_STR_SIZE];
    char oldpath[MAX_STR_SIZE];

-    if (get_log_path(oldpath, sizeof(oldpath), src, selfkey, otherkey, LOG_CHAT) == -1) {
+    if (get_log_path(oldpath, sizeof(oldpath), src, selfkey, otherkey) == -1) {
        goto on_error;
    }

    if (!file_exists(oldpath)) {
+        init_logging_session(dest, selfkey, otherkey, log, LOG_TYPE_CHAT);  // still need to rename path
        return 0;
    }

-    if (get_log_path(newpath, sizeof(newpath), dest, selfkey, otherkey, LOG_CHAT) == -1) {
+    int new_path_len = get_log_path(newpath, sizeof(newpath), dest, selfkey, otherkey);
+
+    if (new_path_len == -1 || new_path_len >= MAX_STR_SIZE) {
        goto on_error;
    }

-    if (rename(oldpath, newpath) != 0) {
+    if (file_exists(newpath)) {
+        if (remove(oldpath) != 0) {
+            fprintf(stderr, "Warning: remove() failed to remove log path `%s`\n", oldpath);
+        }
+    } else if (rename(oldpath, newpath) != 0) {
        goto on_error;
    }

-    if (log_on) {
-        log_enable(dest, selfkey, otherkey, log, LOG_CHAT);
+    if (log != NULL) {
+        memcpy(log->path, newpath, new_path_len);
+        log->path[new_path_len] = 0;
+
+        if (log_on) {
+            log_enable(log);
+        }
    }

    return 0;
@ -285,7 +379,7 @@ int rename_logfile(char *src, char *dest, const char *selfkey, const char *other
 on_error:

    if (log_on) {
-        log_enable(src, selfkey, otherkey, log, LOG_CHAT);
+        log_enable(log);
    }

    return -1;
--- a/src/log.h
+++ b/src/log.h
@ -30,30 +30,43 @@ struct chatlog {
    bool log_on;    /* specific to current chat window */
 };

-typedef enum {
-    LOG_CONFERENCE,
-    LOG_PROMPT,
-    LOG_CHAT,
+typedef enum LOG_TYPE {
+    LOG_TYPE_PROMPT,
+    LOG_TYPE_CHAT,
 } LOG_TYPE;

+/* Initializes a log. This function must be called before any other logging operations.
+ *
+ * Return 0 on success.
+ * Return -1 on failure.
+ */
+int log_init(struct chatlog *log, const char *name, const char *selfkey, const char *otherkey, LOG_TYPE type);
+
 /* 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.
+/* enables logging for specified log.
 *
 * Returns 0 on success.
 * Returns -1 on failure.
 */
-int log_enable(char *name, const char *selfkey, const char *otherkey, struct chatlog *log, int logtype);
+int log_enable(struct chatlog *log);

 /* disables logging for specified log and closes file */
 void log_disable(struct chatlog *log);

-/* Loads previous history from chat log */
-void load_chat_history(ToxWindow *self, struct chatlog *log);
+/* Loads chat log history and prints it to `self` window.
+ *
+ * Return 0 on success or if log file doesn't exist.
+ * Return -1 on failure.
+ */
+int load_chat_history(ToxWindow *self, struct chatlog *log);

-/* renames chatlog file replacing src with dest.
-   Returns 0 on success or if no log exists, -1 on failure. */
-int rename_logfile(char *src, char *dest, const char *selfkey, const char *otherkey, int winnum);
+/* Renames chatlog file `src` to `dest`.
+ *
+ * Return 0 on success or if no log exists.
+ * Return -1 on failure.
+ */
+int rename_logfile(const char *src, const char *dest, const char *selfkey, const char *otherkey, int winnum);

 #endif /* LOG_H */
--- a/src/message_queue.c
+++ b/src/message_queue.c
@ -86,9 +86,9 @@ static void cqueue_mark_read(ToxWindow *self, struct cqueue_msg *msg)

        line->type = msg->type == OUT_ACTION ? OUT_ACTION_READ : OUT_MSG_READ;

-        if (line->noread_flag == true) {
-            line->len -= 2;
+        if (line->noread_flag) {
            line->noread_flag = false;
+            line->read_flag = true;
        }

        return;
--- a/src/misc_tools.c
+++ b/src/misc_tools.c
@ -71,16 +71,19 @@ int timed_out(time_t timestamp, time_t timeout)
    return timestamp + timeout <= get_unix_time();
 }

-/* Sleeps the caller's thread for `usec` microseconds */
+/* Attempts to sleep the caller's thread for `usec` microseconds */
 void sleep_thread(long int usec)
 {
    struct timespec req;
+    struct timespec rem;

    req.tv_sec = 0;
    req.tv_nsec = usec * 1000L;

-    if (nanosleep(&req, NULL) == -1) {
-        fprintf(stderr, "nanosleep() returned -1\n");
+    if (nanosleep(&req, &rem) == -1) {
+        if (nanosleep(&rem, NULL) == -1) {
+            fprintf(stderr, "nanosleep() returned -1\n");
+        }
    }
 }

@ -584,7 +587,7 @@ void set_window_title(ToxWindow *self, const char *title, int len)

    char cpy[TOXIC_MAX_NAME_LENGTH + 1];

-    if (self->type == WINDOW_TYPE_CONFERENCE) { /* keep conferencenumber in title */
+    if (self->type == WINDOW_TYPE_CONFERENCE) { /* keep conferencenumber in title for invites */
        snprintf(cpy, sizeof(cpy), "%u %s", self->num, title);
    } else {
        snprintf(cpy, sizeof(cpy), "%s", title);
--- a/src/misc_tools.h
+++ b/src/misc_tools.h
@ -108,7 +108,7 @@ 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(time_t timestamp, time_t timeout);

-/* Sleeps the caller's thread for `usec` microseconds */
+/* Attempts to sleep the caller's thread for `usec` microseconds */
 void sleep_thread(long int usec);

 /* Colours the window tab according to type. Beeps if is_beep is true */
--- a/src/notify.c
+++ b/src/notify.c
@ -35,7 +35,7 @@
 #include "misc_tools.h"
 #include "notify.h"
 #include "settings.h"
-#include "xtra.h"
+#include "x11focus.h"

 #if defined(AUDIO) || defined(SOUND_NOTIFY)
 #ifdef __APPLE__
@ -126,6 +126,8 @@ static void tab_notify(ToxWindow *self, uint64_t flags)
    } else if ((flags & NT_WNDALERT_2) && (!self->alert || self->alert > WINDOW_ALERT_1)) {
        self->alert = WINDOW_ALERT_2;
    }
+
+    ++self->pending_messages;
 }

 static bool notifications_are_disabled(uint64_t flags)
--- a/src/prompt.c
+++ b/src/prompt.c
@ -281,18 +281,18 @@ static bool prompt_onKey(ToxWindow *self, Tox *m, wint_t key, bool ltr)
            add_line_to_hist(ctx);
            wstrsubst(ctx->line, L'¶', L'\n');

-            char line[MAX_STR_SIZE] = {0};
+            char line[MAX_STR_SIZE];

            if (wcs_to_mbs_buf(line, ctx->line, MAX_STR_SIZE) == -1) {
-                memset(line, 0, sizeof(line));
+                line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, RED, " * Failed to parse message.");
+            } else {
+                line_info_add(self, NULL, NULL, NULL, PROMPT, 0, 0, "%s", line);
+                execute(ctx->history, self, m, line, GLOBAL_COMMAND_MODE);
            }
-
-            line_info_add(self, NULL, NULL, NULL, PROMPT, 0, 0, "%s", line);
-            execute(ctx->history, self, m, line, GLOBAL_COMMAND_MODE);
        }

        wclear(ctx->linewin);
-        wmove(self->window, y2 - CURS_Y_OFFSET, 0);
+        wmove(self->window, y2, 0);
        reset_buf(ctx);
    }

@ -301,7 +301,8 @@ static bool prompt_onKey(ToxWindow *self, Tox *m, wint_t key, bool ltr)

 static void prompt_onDraw(ToxWindow *self, Tox *m)
 {
-    int x2, y2;
+    int x2;
+    int y2;
    getmaxyx(self->window, y2, x2);

    if (y2 <= 0 || x2 <= 0) {
@ -316,64 +317,88 @@ static void prompt_onDraw(ToxWindow *self, Tox *m)

    wclear(ctx->linewin);

-    curs_set(1);
-
    if (ctx->len > 0) {
-        mvwprintw(ctx->linewin, 1, 0, "%ls", &ctx->line[ctx->start]);
+        mvwprintw(ctx->linewin, 0, 0, "%ls", &ctx->line[ctx->start]);
    }

+    mvwhline(ctx->linewin, 0, ctx->len, ' ', x2 - ctx->len);
+
+    curs_set(1);
+
    StatusBar *statusbar = self->stb;

-    mvwhline(statusbar->topline, 1, 0, ACS_HLINE, x2);
    wmove(statusbar->topline, 0, 0);

    pthread_mutex_lock(&Winthread.lock);
    Tox_Connection connection = statusbar->connection;
+    Tox_User_Status status = statusbar->status;
    pthread_mutex_unlock(&Winthread.lock);

    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;
+                colour = GREEN_BLUE;
                break;

            case TOX_USER_STATUS_AWAY:
                status_text = "Away";
-                colour = YELLOW;
+                colour = YELLOW_BLUE;
                break;

            case TOX_USER_STATUS_BUSY:
                status_text = "Busy";
-                colour = RED;
+                colour = RED_BLUE;
                break;
        }

-        wattron(statusbar->topline, COLOR_PAIR(colour) | A_BOLD);
-        wprintw(statusbar->topline, " [%s]", status_text);
-        wattroff(statusbar->topline, COLOR_PAIR(colour) | A_BOLD);
+        wattron(statusbar->topline, COLOR_PAIR(CYAN_BLUE));
+        wprintw(statusbar->topline, " [");
+        wattroff(statusbar->topline, COLOR_PAIR(CYAN_BLUE));
+
+        wattron(statusbar->topline, A_BOLD | COLOR_PAIR(colour));
+        wprintw(statusbar->topline, "%s", status_text);
+        wattroff(statusbar->topline, A_BOLD | COLOR_PAIR(colour));
+
+        wattron(statusbar->topline, COLOR_PAIR(CYAN_BLUE));
+        wprintw(statusbar->topline, "]");
+        wattroff(statusbar->topline, COLOR_PAIR(CYAN_BLUE));
+
+        wattron(statusbar->topline, COLOR_PAIR(WHITE_BLUE));

-        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);
+        wattron(statusbar->topline, COLOR_PAIR(CYAN_BLUE));
+        wprintw(statusbar->topline, " [");
+        wattroff(statusbar->topline, COLOR_PAIR(CYAN_BLUE));
+
+        wattron(statusbar->topline, COLOR_PAIR(WHITE_BLUE));
+        wprintw(statusbar->topline, "Offline");
+        wattroff(statusbar->topline, COLOR_PAIR(WHITE_BLUE));
+
+        wattron(statusbar->topline, COLOR_PAIR(CYAN_BLUE));
+        wprintw(statusbar->topline, "]");
+        wattroff(statusbar->topline, COLOR_PAIR(CYAN_BLUE));
+
+        wattron(statusbar->topline, COLOR_PAIR(WHITE_BLUE));
+
        pthread_mutex_lock(&Winthread.lock);
        wprintw(statusbar->topline, " %s", statusbar->nick);
        pthread_mutex_unlock(&Winthread.lock);
-        wattroff(statusbar->topline, A_BOLD);
    }

+    int s_y;
+    int s_x;
+    getyx(statusbar->topline, s_y, s_x);
+
+    mvwhline(statusbar->topline, s_y, s_x, ' ', x2 - s_x);
+    wattroff(statusbar->topline, COLOR_PAIR(WHITE_BLUE));
+
    /* Reset statusbar->statusmsg on window resize */
    if (x2 != self->x) {
        char statusmsg[TOX_MAX_STATUS_MESSAGE_LENGTH];
@ -401,20 +426,27 @@ static void prompt_onDraw(ToxWindow *self, Tox *m)
    }

    if (statusbar->statusmsg[0]) {
-        wprintw(statusbar->topline, " : %s", statusbar->statusmsg);
+        wattron(statusbar->topline, COLOR_PAIR(CYAN_BLUE));
+        wprintw(statusbar->topline, " | ");
+        wattroff(statusbar->topline, COLOR_PAIR(CYAN_BLUE));
+
+        wattron(statusbar->topline, COLOR_PAIR(WHITE_BLUE));
+        wprintw(statusbar->topline, "%s", statusbar->statusmsg);
+        wattroff(statusbar->topline, COLOR_PAIR(WHITE_BLUE));
    }

    pthread_mutex_unlock(&Winthread.lock);

-    mvwhline(self->window, y2 - CHATBOX_HEIGHT, 0, ACS_HLINE, x2);
-
-    int y, x;
+    int y;
+    int x;
    getyx(self->window, y, x);

    UNUSED_VAR(x);

    int new_x = ctx->start ? x2 - 1 : MAX(0, wcswidth(ctx->line, ctx->pos));
-    wmove(self->window, y + 1, new_x);
+    wmove(self->window, y, new_x);
+
+    draw_window_bar(self);

    wnoutrefresh(self->window);

@ -535,7 +567,7 @@ void prompt_init_statusbar(ToxWindow *self, Tox *m, bool first_time_run)
    prompt_update_nick(prompt, nick);

    /* Init statusbar subwindow */
-    statusbar->topline = subwin(self->window, 2, x2, 0, 0);
+    statusbar->topline = subwin(self->window, TOP_BAR_HEIGHT, x2, 0, 0);
 }

 static void print_welcome_msg(ToxWindow *self)
@ -554,10 +586,31 @@ static void print_welcome_msg(ToxWindow *self)
    line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "");
 }

+static void prompt_init_log(ToxWindow *self, Tox *m, const char *self_name)
+{
+    ChatContext *ctx = self->chatwin;
+
+    char myid[TOX_ADDRESS_SIZE];
+    tox_self_get_address(m, (uint8_t *) myid);
+
+    if (log_init(ctx->log, self->name, myid, NULL, LOG_TYPE_PROMPT) != 0) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Warning: Log failed to initialize.");
+        return;
+    }
+
+    if (user_settings->autolog == AUTOLOG_ON) {
+        if (log_enable(ctx->log) == -1) {
+            line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Warning: Failed to enable log.");
+        }
+    }
+}
+
 static void prompt_onInit(ToxWindow *self, Tox *m)
 {
    curs_set(1);
-    int y2, x2;
+
+    int y2;
+    int x2;
    getmaxyx(self->window, y2, x2);

    if (y2 <= 0 || x2 <= 0) {
@ -565,8 +618,10 @@ static void prompt_onInit(ToxWindow *self, Tox *m)
    }

    ChatContext *ctx = self->chatwin;
-    ctx->history = subwin(self->window, y2 - CHATBOX_HEIGHT + 1, x2, 0, 0);
-    ctx->linewin = subwin(self->window, CHATBOX_HEIGHT, x2, y2 - CHATBOX_HEIGHT, 0);
+
+    ctx->history = subwin(self->window, y2 - CHATBOX_HEIGHT - WINDOW_BAR_HEIGHT, x2, 0, 0);
+    self->window_bar = subwin(self->window, WINDOW_BAR_HEIGHT, x2, y2 - (CHATBOX_HEIGHT + WINDOW_BAR_HEIGHT), 0);
+    ctx->linewin = subwin(self->window, CHATBOX_HEIGHT, x2, y2 - WINDOW_BAR_HEIGHT, 0);

    ctx->log = calloc(1, sizeof(struct chatlog));
    ctx->hst = calloc(1, sizeof(struct history));
@ -577,14 +632,7 @@ static void prompt_onInit(ToxWindow *self, Tox *m)

    line_info_init(ctx->hst);

-    if (user_settings->autolog == AUTOLOG_ON) {
-        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.");
-        }
-    }
+    prompt_init_log(self, m, self->name);

    scrollok(ctx->history, 0);
    wmove(self->window, y2 - CURS_Y_OFFSET, 0);
@ -611,7 +659,7 @@ ToxWindow *new_prompt(void)
    ret->onConnectionChange = &prompt_onConnectionChange;
    ret->onFriendRequest = &prompt_onFriendRequest;

-    strcpy(ret->name, "home");
+    strcpy(ret->name, "Home");

    ChatContext *chatwin = calloc(1, sizeof(ChatContext));
    StatusBar *stb = calloc(1, sizeof(StatusBar));
--- a/src/python_api.c
+++ b/src/python_api.c
@ -114,25 +114,23 @@ static PyObject *python_api_get_status_message(PyObject *self, PyObject *args)

 static PyObject *python_api_get_all_friends(PyObject *self, PyObject *args)
 {
-    size_t       i, ii;
    FriendsList  friends;
-    PyObject    *cur, *ret;
-    char         pubkey_buf[TOX_PUBLIC_KEY_SIZE * 2 + 1];
+    char pubkey_buf[TOX_PUBLIC_KEY_SIZE * 2 + 1];

    if (!PyArg_ParseTuple(args, "")) {
        return NULL;
    }

    friends = api_get_friendslist();
-    ret     = PyList_New(0);
+    PyObject *ret = PyList_New(0);

-    for (i = 0; i < friends.num_friends; i++) {
-        for (ii = 0; ii < TOX_PUBLIC_KEY_SIZE; ii++) {
+    for (size_t i = 0; i < friends.num_friends; i++) {
+        for (size_t ii = 0; ii < TOX_PUBLIC_KEY_SIZE; ii++) {
            snprintf(pubkey_buf + ii * 2, 3, "%02X", friends.list[i].pub_key[ii] & 0xff);
        }

        pubkey_buf[TOX_PUBLIC_KEY_SIZE * 2] = '\0';
-        cur = Py_BuildValue("(s,s)", friends.list[i].name, pubkey_buf);
+        PyObject *cur = Py_BuildValue("(s,s)", friends.list[i].name, pubkey_buf);
        PyList_Append(ret, cur);
    }

@ -264,14 +262,14 @@ PyMODINIT_FUNC PyInit_toxic_api(void)

 void terminate_python(void)
 {
-    struct python_registered_func *cur, *old;
-
    if (python_commands.name != NULL) {
        free(python_commands.name);
    }

+    struct python_registered_func *cur = NULL;
+
    for (cur = python_commands.next; cur != NULL;) {
-        old = cur;
+        struct python_registered_func *old = cur;
        cur = cur->next;
        free(old->name);
        free(old);
--- a/src/settings.c
+++ b/src/settings.c
@ -116,7 +116,7 @@ static void ui_defaults(struct user_settings *settings)
    settings->bell_on_invite = 0;
    settings->colour_theme = DFLT_COLS;
    settings->history_size = 700;
-    settings->notification_timeout = 3000;
+    settings->notification_timeout = 6000;
    settings->show_typing_self = SHOW_TYPING_ON;
    settings->show_typing_other = SHOW_TYPING_ON;
    settings->show_welcome_msg = SHOW_WELCOME_MSG_ON;
@ -130,10 +130,7 @@ static void ui_defaults(struct user_settings *settings)
    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);
+    snprintf(settings->mplex_away_note, sizeof(settings->mplex_away_note), "%s", MPLEX_AWAY_NOTE);
 }

 static const struct keys_strings {
@ -205,11 +202,17 @@ static const struct audio_strings {
    const char *input_device;
    const char *output_device;
    const char *VAD_threshold;
+    const char *conference_audio_channels;
+    const char *chat_audio_channels;
+    const char *push_to_talk;
 } audio_strings = {
    "audio",
    "input_device",
    "output_device",
    "VAD_threshold",
+    "conference_audio_channels",
+    "chat_audio_channels",
+    "push_to_talk",
 };

 static void audio_defaults(struct user_settings *settings)
@ -217,6 +220,9 @@ static void audio_defaults(struct user_settings *settings)
    settings->audio_in_dev = 0;
    settings->audio_out_dev = 0;
    settings->VAD_threshold = 5.0;
+    settings->conference_audio_channels = 1;
+    settings->chat_audio_channels = 2;
+    settings->push_to_talk = 0;
 }
 #endif

@ -330,7 +336,7 @@ int settings_load(struct user_settings *s, const char *patharg)

        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->timestamp_format, sizeof(s->timestamp_format), "%s", "%I:%M %p");
                snprintf(s->log_timestamp_format, sizeof(s->log_timestamp_format), "%s", "%Y/%m/%d [%I:%M:%S %p]");
            }
        }
@ -506,6 +512,15 @@ int settings_load(struct user_settings *s, const char *patharg)
        s->audio_out_dev = s->audio_out_dev < 0 || s->audio_out_dev > MAX_DEVICES ? 0 : s->audio_out_dev;

        config_setting_lookup_float(setting, audio_strings.VAD_threshold, &s->VAD_threshold);
+
+        config_setting_lookup_int(setting, audio_strings.conference_audio_channels, &s->conference_audio_channels);
+        s->conference_audio_channels = s->conference_audio_channels <= 0
+                                       || s->conference_audio_channels > 2 ? 1 : s->conference_audio_channels;
+
+        config_setting_lookup_int(setting, audio_strings.chat_audio_channels, &s->chat_audio_channels);
+        s->chat_audio_channels = s->chat_audio_channels <= 0 || s->chat_audio_channels > 2 ? 2 : s->chat_audio_channels;
+
+        config_setting_lookup_bool(setting, audio_strings.push_to_talk, &s->push_to_talk);
    }

 #endif
--- a/src/settings.h
+++ b/src/settings.h
@ -85,6 +85,9 @@ struct user_settings {
    int audio_in_dev;
    int audio_out_dev;
    double VAD_threshold;
+    int conference_audio_channels;
+    int chat_audio_channels;
+    int push_to_talk;      /* boolean */
 #endif
 };

@ -119,10 +122,10 @@ enum settings_values {
 #define LINE_JOIN    "-->"
 #define LINE_QUIT    "<--"
 #define LINE_ALERT   "-!-"
-#define LINE_NORMAL  "---"
-#define TIMESTAMP_DEFAULT      "%H:%M:%S"
+#define LINE_NORMAL  "-"
+#define TIMESTAMP_DEFAULT      "%H:%M"
 #define LOG_TIMESTAMP_DEFAULT  "%Y/%m/%d [%H:%M:%S]"
-#define MPLEX_AWAY_NOTE "Detached from screen"
+#define MPLEX_AWAY_NOTE "Away from keyboard, be back soon!"

 int settings_load(struct user_settings *s, const char *patharg);

--- a/src/toxic.c
+++ b/src/toxic.c
@ -66,7 +66,7 @@
 #include "windows.h"

 #ifdef X11
-#include "xtra.h"
+#include "x11focus.h"
 #endif

 #ifdef AUDIO
@ -205,10 +205,7 @@ void exit_toxic_success(Tox *m)
    curl_global_cleanup();

 #ifdef X11
-    /* We have to terminate xtra last coz reasons
-     * Please don't call this anywhere else coz trust me
-     */
-    terminate_xtra();
+    terminate_x11focus();
 #endif /* X11 */

    exit(EXIT_SUCCESS);
@ -259,7 +256,7 @@ static void init_term(void)
    keypad(stdscr, 1);
    noecho();
    nonl();
-    timeout(100);
+    timeout(50);

    if (has_colors()) {
        short bg_color = COLOR_BLACK;
@ -271,15 +268,23 @@ static void init_term(void)
            }
        }

-        init_pair(0, COLOR_WHITE, COLOR_BLACK);
-        init_pair(1, COLOR_GREEN, bg_color);
-        init_pair(2, COLOR_CYAN, bg_color);
-        init_pair(3, COLOR_RED, bg_color);
-        init_pair(4, COLOR_BLUE, bg_color);
-        init_pair(5, COLOR_YELLOW, bg_color);
-        init_pair(6, COLOR_MAGENTA, bg_color);
-        init_pair(7, COLOR_BLACK, COLOR_BLACK);
-        init_pair(8, COLOR_BLACK, COLOR_WHITE);
+        init_pair(WHITE, COLOR_WHITE, COLOR_BLACK);
+        init_pair(GREEN, COLOR_GREEN, bg_color);
+        init_pair(CYAN, COLOR_CYAN, bg_color);
+        init_pair(RED, COLOR_RED, bg_color);
+        init_pair(BLUE, COLOR_BLUE, bg_color);
+        init_pair(YELLOW, COLOR_YELLOW, bg_color);
+        init_pair(MAGENTA, COLOR_MAGENTA, bg_color);
+        init_pair(BLACK, COLOR_BLACK, COLOR_BLACK);
+        init_pair(BLUE_BLACK, COLOR_BLUE, COLOR_BLACK);
+        init_pair(BLACK_WHITE, COLOR_BLACK, COLOR_WHITE);
+        init_pair(WHITE_BLUE, COLOR_WHITE, COLOR_BLUE);
+        init_pair(CYAN_BLUE, COLOR_CYAN, COLOR_BLUE);
+        init_pair(GREEN_BLUE, COLOR_GREEN, COLOR_BLUE);
+        init_pair(PURPLE_BLUE, COLOR_MAGENTA, COLOR_BLUE);
+        init_pair(BLACK_BLUE, COLOR_BLACK, COLOR_BLUE);
+        init_pair(YELLOW_BLUE, COLOR_YELLOW, COLOR_BLUE);
+        init_pair(RED_BLUE, COLOR_RED, COLOR_BLUE);
    }

    refresh();
@ -1350,21 +1355,6 @@ static void init_default_data_files(void)
    free(user_config_dir);
 }

-// this doesn't do anything (yet)
-#ifdef X11
-void DnD_callback(const char *asdv, DropType dt)
-{
-    UNUSED_VAR(asdv);
-    UNUSED_VAR(dt);
-    // if (dt != DT_plain)
-    //     return;
-
-    // pthread_mutex_lock(&Winthread.lock);
-    // line_info_add(prompt, NULL, NULL, NULL, SYS_MSG, 0, 0, asdv);
-    // pthread_mutex_unlock(&Winthread.lock);
-}
-#endif /* X11 */
-
 int main(int argc, char **argv)
 {
    /* Make sure all written files are read/writeable only by the current user. */
@ -1422,7 +1412,7 @@ int main(int argc, char **argv)

 #ifdef X11

-    if (init_xtra(DnD_callback) == -1) {
+    if (init_x11focus() == -1) {
        queue_init_message("X failed to initialize");
    }

@ -1439,6 +1429,7 @@ int main(int argc, char **argv)
    prompt = init_windows(m);
    prompt_init_statusbar(prompt, m, !datafile_exists);
    load_conferences(m);
+    set_active_window_index(0);

    if (pthread_mutex_init(&Winthread.lock, NULL) != 0) {
        exit_toxic_err("failed in main", FATALERR_MUTEX_INIT);
--- a/src/toxic.h
+++ b/src/toxic.h
@ -75,7 +75,7 @@
 #define T_KEY_C_DOWN     0x20D    /* ctrl-down arrow */
 #define T_KEY_TAB        0x09     /* TAB key */

-#define ONLINE_CHAR "*"
+#define ONLINE_CHAR  "o"
 #define OFFLINE_CHAR "o"

 typedef enum _FATAL_ERRS {
--- a/src/windows.c
+++ b/src/windows.c
@ -336,7 +336,7 @@ int add_window(Tox *m, ToxWindow *w)
        }

        w->index = i;
-        w->window = newwin(LINES - 2, COLS, 0, 0);
+        w->window = newwin(LINES, COLS, 0, 0);

        if (w->window == NULL) {
            return -1;
@ -397,8 +397,9 @@ void del_window(ToxWindow *w)
    set_active_window_index(0);

    uint8_t idx = w->index;
+    delwin(w->window_bar);
    delwin(w->window);
-    free(windows[idx]);
+    free(w);
    windows[idx] = NULL;

    clear();
@ -408,7 +409,12 @@ void del_window(ToxWindow *w)

 ToxWindow *init_windows(Tox *m)
 {
+    if (COLS <= CHATBOX_HEIGHT + WINDOW_BAR_HEIGHT) {
+        exit_toxic_err("add_window() for prompt failed in init_windows", FATALERR_WININIT);
+    }
+
    prompt = new_prompt();
+
    int n_prompt = add_window(m, prompt);

    if (n_prompt < 0) {
@ -430,25 +436,18 @@ void on_window_resize(void)
    refresh();
    clear();

-    /* equivalent to LINES and COLS */
-    int x2, y2;
-    getmaxyx(stdscr, y2, x2);
-    y2 -= 2;
-
-    if (y2 <= 0 || x2 <= 0) {
-        return;
-    }
-
    for (uint8_t i = 0; i < MAX_WINDOWS_NUM; ++i) {
-        if (windows[i] == NULL) {
+        ToxWindow *w = windows[i];
+
+        if (w == NULL) {
            continue;
        }

-        ToxWindow *w = windows[i];
-
-        if (windows[i]->type == WINDOW_TYPE_FRIEND_LIST)  {
+        if (w->type == WINDOW_TYPE_FRIEND_LIST)  {
+            delwin(w->window_bar);
            delwin(w->window);
-            w->window = newwin(y2, x2, 0, 0);
+            w->window = newwin(LINES, COLS, 0, 0);
+            w->window_bar = subwin(w->window, WINDOW_BAR_HEIGHT, COLS, LINES - 2, 0);
            continue;
        }

@ -465,22 +464,35 @@ void on_window_resize(void)

        delwin(w->chatwin->linewin);
        delwin(w->chatwin->history);
+        delwin(w->window_bar);
        delwin(w->window);

-        w->window = newwin(y2, x2, 0, 0);
-        w->chatwin->linewin = subwin(w->window, CHATBOX_HEIGHT, x2, y2 - CHATBOX_HEIGHT, 0);
+        w->window = newwin(LINES, COLS, 0, 0);
+
+        int x2;
+        int y2;
+        getmaxyx(w->window, y2, x2);
+
+        if (y2 <= 0 || x2 <= 0) {
+            fprintf(stderr, "Failed to resize window: max_x: %d, max_y: %d\n", x2, y2);
+            delwin(w->window);
+            return;
+        }

        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);
+            w->chatwin->history = subwin(w->window, y2 - CHATBOX_HEIGHT - WINDOW_BAR_HEIGHT, x2 - SIDEBAR_WIDTH - 1, 0, 0);
+            w->chatwin->sidebar = subwin(w->window, y2 - CHATBOX_HEIGHT - WINDOW_BAR_HEIGHT, SIDEBAR_WIDTH, 0, x2 - SIDEBAR_WIDTH);
        } else {
-            w->chatwin->history = subwin(w->window, y2 - CHATBOX_HEIGHT + 1, x2, 0, 0);
+            w->chatwin->history =  subwin(w->window, y2 - CHATBOX_HEIGHT - WINDOW_BAR_HEIGHT, x2, 0, 0);

            if (w->type != WINDOW_TYPE_CONFERENCE) {
-                w->stb->topline = subwin(w->window, 2, x2, 0, 0);
+                w->stb->topline = subwin(w->window, TOP_BAR_HEIGHT, x2, 0, 0);
            }
        }

+        w->window_bar = subwin(w->window, WINDOW_BAR_HEIGHT, x2, y2 - (CHATBOX_HEIGHT + WINDOW_BAR_HEIGHT), 0);
+        w->chatwin->linewin = subwin(w->window, CHATBOX_HEIGHT, x2, y2 - WINDOW_BAR_HEIGHT, 0);
+
 #ifdef AUDIO

        if (w->chatwin->infobox.active) {
@ -491,82 +503,103 @@ void on_window_resize(void)
 #endif /* AUDIO */

        scrollok(w->chatwin->history, 0);
+        wmove(w->window, y2 - CURS_Y_OFFSET, 0);
    }
 }

-static void draw_window_tab(ToxWindow *toxwin)
+static void draw_window_tab(WINDOW *win, ToxWindow *toxwin, bool active_window)
 {
    pthread_mutex_lock(&Winthread.lock);

-    if (toxwin->alert != WINDOW_ALERT_NONE) {
-        attron(COLOR_PAIR(toxwin->alert));
-    }
+    bool has_alert = toxwin->alert != WINDOW_ALERT_NONE;
+    unsigned int pending_messages = toxwin->pending_messages;

    pthread_mutex_unlock(&Winthread.lock);

-    clrtoeol();
-    printw(" [%s]", toxwin->name);
+    WINDOW_TYPE type = toxwin->type;

-    pthread_mutex_lock(&Winthread.lock);
-
-    if (toxwin->alert != WINDOW_ALERT_NONE) {
-        attroff(COLOR_PAIR(toxwin->alert));
+    if (active_window) {
+        wattron(win, A_BOLD | COLOR_PAIR(CYAN_BLUE));
+        wprintw(win, " [");
+        wattroff(win, COLOR_PAIR(CYAN_BLUE));
+        wattron(win, COLOR_PAIR(WHITE_BLUE));
+    } else {
+        if (has_alert) {
+            wattron(win, COLOR_PAIR(CYAN_BLUE));
+            wprintw(win, " [");
+            wattroff(win, COLOR_PAIR(CYAN_BLUE));
+            wattron(win, A_BOLD | COLOR_PAIR(toxwin->alert));
+        } else {
+            wattron(win, COLOR_PAIR(CYAN_BLUE));
+            wprintw(win, " [");
+            wattroff(win, COLOR_PAIR(CYAN_BLUE));
+            wattron(win, COLOR_PAIR(WHITE_BLUE));
+        }
    }

-    pthread_mutex_unlock(&Winthread.lock);
+    if (active_window || (type == WINDOW_TYPE_PROMPT || type == WINDOW_TYPE_FRIEND_LIST)) {
+        wprintw(win, "%s", toxwin->name);
+    } else {
+        if (pending_messages > 0) {
+            wprintw(win, "%u", pending_messages);
+        } else {
+            wprintw(win, "-");
+        }
+    }
+
+    if (active_window) {
+        wattroff(win, COLOR_PAIR(WHITE_BLUE));
+        wattron(win, COLOR_PAIR(CYAN_BLUE));
+        wprintw(win, "]");
+        wattroff(win, A_BOLD | COLOR_PAIR(CYAN_BLUE));
+    } else {
+        if (has_alert) {
+            wattroff(win, A_BOLD | COLOR_PAIR(toxwin->alert));
+            wattron(win, COLOR_PAIR(CYAN_BLUE));
+            wprintw(win, "]");
+            wattroff(win, COLOR_PAIR(CYAN_BLUE));
+        } else {
+            wattroff(win, COLOR_PAIR(WHITE_BLUE));
+            wattron(win, COLOR_PAIR(CYAN_BLUE));
+            wprintw(win, "]");
+            wattroff(win, COLOR_PAIR(CYAN_BLUE));
+        }
+    }
 }

-static void draw_bar(void)
+void draw_window_bar(ToxWindow *self)
 {
-    int y, x;
+    WINDOW *win = self->window_bar;
+    wclear(win);

-    ToxWindow *w = windows[active_window_index];
-
-    if (w == NULL) {
-        return;
+    if (self->scroll_pause) {
+        wattron(win, A_BLINK | A_BOLD | COLOR_PAIR(YELLOW_BLUE));
+        wprintw(win, "^");
+        wattroff(win, A_BLINK | A_BOLD | COLOR_PAIR(YELLOW_BLUE));
+    } else {
+        wattron(win, COLOR_PAIR(WHITE_BLUE));
+        wprintw(win, " ");
+        wattroff(win, COLOR_PAIR(WHITE_BLUE));
    }

-    // save current cursor position
-    getyx(w->window, y, x);
-
-    attron(COLOR_PAIR(BLUE));
-    mvhline(LINES - 2, 0, '_', COLS);
-    attroff(COLOR_PAIR(BLUE));
-
-    move(LINES - 1, 0);
-
    for (uint8_t i = 0; i < MAX_WINDOWS_NUM; ++i) {
        if (windows[i] == NULL) {
            continue;
        }

-        if (i == active_window_index) {
-
-#ifdef URXVT_FIX
-            attron(A_BOLD | COLOR_PAIR(GREEN));
-        } else {
-#endif
-
-            attron(A_BOLD);
-        }
-
-        draw_window_tab(windows[i]);
-
-        if (i == active_window_index) {
-
-#ifdef URXVT_FIX
-            attroff(A_BOLD | COLOR_PAIR(GREEN));
-        } else {
-#endif
-
-            attroff(A_BOLD);
-        }
+        bool active_window = i == active_window_index;
+        draw_window_tab(win, windows[i], active_window);
    }

-    // restore cursor position after drawing
-    move(y, x);
+    int cur_x;
+    int cur_y;
+    UNUSED_VAR(cur_y);

-    refresh();
+    getyx(win, cur_y, cur_x);
+
+    wattron(win, COLOR_PAIR(WHITE_BLUE));
+    mvwhline(win, 0, cur_x, ' ', COLS - cur_x);
+    wattroff(win, COLOR_PAIR(WHITE_BLUE));
 }

 /*
@ -666,10 +699,9 @@ void draw_active_window(Tox *m)

    pthread_mutex_lock(&Winthread.lock);
    a->alert = WINDOW_ALERT_NONE;
+    a->pending_messages = 0;
    pthread_mutex_unlock(&Winthread.lock);

-    draw_bar();
-
    touchwin(a->window);
    a->onDraw(a, m);
    wrefresh(a->window);
--- a/src/windows.h
+++ b/src/windows.h
@ -36,12 +36,14 @@

 #include "toxic.h"

-#define MAX_WINDOWS_NUM 16
+#define MAX_WINDOWS_NUM 20
 #define MAX_WINDOW_NAME_LENGTH 22
 #define CURS_Y_OFFSET 1    /* y-axis cursor offset for chat contexts */
-#define CHATBOX_HEIGHT 2
+#define CHATBOX_HEIGHT 1
+#define TOP_BAR_HEIGHT 1
+#define WINDOW_BAR_HEIGHT 1

-/* Curses foreground colours (background is black) */
+/* ncurses colour pairs as FOREGROUND_BACKGROUND. No background defaults to black. */
 typedef enum {
    WHITE,
    GREEN,
@ -51,14 +53,23 @@ typedef enum {
    YELLOW,
    MAGENTA,
    BLACK,
+    BLUE_BLACK,
+    BLACK_WHITE,
+    WHITE_BLUE,
+    GREEN_BLUE,
+    CYAN_BLUE,
+    PURPLE_BLUE,
+    BLACK_BLUE,
+    RED_BLUE,
+    YELLOW_BLUE,
 } C_COLOURS;

 /* tab alert types: lower types take priority (this relies on the order of C_COLOURS) */
 typedef enum {
    WINDOW_ALERT_NONE = 0,
-    WINDOW_ALERT_0 = GREEN,
-    WINDOW_ALERT_1 = RED,
-    WINDOW_ALERT_2 = MAGENTA,
+    WINDOW_ALERT_0 = GREEN_BLUE,
+    WINDOW_ALERT_1 = CYAN_BLUE,
+    WINDOW_ALERT_2 = PURPLE_BLUE,
 } WINDOW_ALERTS;

 typedef enum {
@ -167,6 +178,8 @@ struct ToxWindow {
    char name[TOXIC_MAX_NAME_LENGTH + 1];
    uint32_t num;    /* corresponds to friendnumber in chat windows */
    uint8_t index; /* This window's index in the windows array */
+    bool scroll_pause; /* true if this window is not scrolled to the bottom */
+    unsigned int pending_messages;  /* # of new messages in this window since the last time it was focused */
    int x;

    WINDOW_TYPE type;
@ -180,6 +193,7 @@ struct ToxWindow {
    Help *help;

    WINDOW *window;
+    WINDOW *window_bar;
 };

 /* statusbar info holder */
@ -263,6 +277,7 @@ void on_window_resize(void);
 void force_refresh(WINDOW *w);
 ToxWindow *get_window_ptr(size_t i);
 ToxWindow *get_active_window(void);
+void draw_window_bar(ToxWindow *self);

 /* refresh inactive windows to prevent scrolling bugs.
   call at least once per second */
--- a/src/x11focus.c
+++ b/src/x11focus.c
@ -0,0 +1,87 @@
+/*  x11focus.c
+ *
+ *
+ *  Copyright (C) 2020 Toxic All Rights Reserved.
+ *
+ *  This file is part of Toxic.
+ *
+ *  Toxic is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Toxic is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Toxic.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "x11focus.h"
+
+#ifndef __APPLE__
+
+#include <X11/Xlib.h>
+
+static struct Focus {
+    Display *display;
+    Window terminal_window;
+} Focus;
+
+static long unsigned int focused_window_id(void)
+{
+    if (!Focus.display) {
+        return 0;
+    }
+
+    Window focus;
+    int revert;
+
+    XLockDisplay(Focus.display);
+    XGetInputFocus(Focus.display, &focus, &revert);
+    XUnlockDisplay(Focus.display);
+
+    return focus;
+}
+
+bool is_focused(void)
+{
+    if (!Focus.display) {
+        return false;
+    }
+
+    return Focus.terminal_window == focused_window_id();
+}
+
+int init_x11focus(void)
+{
+    if (XInitThreads() == 0) {
+        return -1;
+    }
+
+    Focus.display = XOpenDisplay(NULL);
+
+    if (!Focus.display) {
+        return -1;
+    }
+
+    Focus.terminal_window = focused_window_id();
+
+    return 0;
+}
+
+void terminate_x11focus(void)
+{
+    if (!Focus.display || !Focus.terminal_window) {
+        return;
+    }
+
+    XLockDisplay(Focus.display);
+    XCloseDisplay(Focus.display);
+    XUnlockDisplay(Focus.display);
+}
+
+#endif /* !__APPLE__ */
--- a/src/x11focus.h
+++ b/src/x11focus.h
@ -1,7 +1,7 @@
 /*  xtra.h
 *
 *
- *  Copyright (C) 2014 Toxic All Rights Reserved.
+ *  Copyright (C) 2020 Toxic All Rights Reserved.
 *
 *  This file is part of Toxic.
 *
@ -20,21 +20,15 @@
 *
 */

-#ifndef XTRA_H
-#define XTRA_H
+#ifndef X11FOCUS_H
+#define X11FOCUS_H
+
+#include <stdbool.h>

 /* NOTE: If no xlib present don't compile */

-typedef enum {
-    DT_plain,
-    DT_file_list
-}
-DropType;
+int               init_x11focus(void);
+void              terminate_x11focus(void);
+bool              is_focused(void);

-typedef void (*drop_callback)(const char *, DropType);
-
-int               init_xtra(drop_callback d);
-void              terminate_xtra(void);
-int               is_focused(void); /* returns bool */
-
-#endif /* XTRA_H */
+#endif /* X11FOCUS */
--- a/src/xtra.c
+++ b/src/xtra.c
@ -1,425 +0,0 @@
-/*  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 "misc_tools.h"
-#include "xtra.h"
-
-#ifndef __APPLE__
-
-#include <X11/Xatom.h>
-#include <X11/Xlib.h>
-
-#include <assert.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.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;
-
-static 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;
-}
-
-static 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)
-{
-    UNUSED_VAR(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 */
-
-    UNUSED_VAR(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);
-            sleep_thread(10000L);
-            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);
-}
-
-static long unsigned int focused_window_id(void)
-{
-    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(void)
-{
-    return Xtra.display && (Xtra.proxy_window == focused_window_id() || Xtra.terminal_window == focused_window_id());
-}
-
-int init_xtra(drop_callback d)
-{
-    if (!d) {
-        return -1;
-    } else {
-        Xtra.on_drop = d;
-    }
-
-    XInitThreads();
-
-    if (!(Xtra.display = XOpenDisplay(NULL))) {
-        return -1;
-    }
-
-    Xtra.terminal_window = focused_window_id();
-
-    /* OSX: if focused window is 0, it means toxic is ran from
-     * native terminal and not X11 terminal window, silently exit */
-    if (!Xtra.terminal_window) {
-        return 0;
-    }
-
-    {
-        /* 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(void)
-{
-    if (!Xtra.display || !Xtra.terminal_window) {
-        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 */
-}
-
-#endif /* !__APPLE__ */
Author	SHA1	Message	Date
jfreegman	4330bf5867	Show peer join/part messages in conferences Also a couple trivial fixes	2020-11-30 12:06:13 -05:00
jfreegman	3f1b7cdd26	Update config example and some default settings to reflect recent changes	2020-11-30 00:58:43 -05:00
jfreegman	1e985c1456	Interface improvements and bump to v0.10.0 - Give window tab and statusbar a make over - Place window tab above input field - Reduce input field to one square in height - Refactor window tab so that it's now a subwin of its parent ToxWindow - Fix bug causing notification counter to sometimes increment by 2 - No longer scroll on output when output is not at bottom of screen - Show a small indicator on far left of window tab when output is not at bottom of screen - Reduce ncurses/UI thread sleep time by half - Handle nanosleep errors better	2020-11-29 23:26:51 -05:00
jfreegman	61740bda85	Fix a couple minor issues Print a warning if remove() fails, and check if the win pointer is null before using it (this is unnecessary but it's correct and shuts coverity up)	2020-11-26 18:25:37 -05:00
jfreegman	0d8e6d713e	Update readme screenshot and bump to v0.9.1	2020-11-26 16:58:09 -05:00
jfreegman	39e4ff8bd6	Fix tab complete bug If a directory contains a single entry tab complete will no longer fail	2020-11-26 16:20:51 -05:00
jfreegman	0434ac186a	Fix bug causing file transfer status bars to be truncated	2020-11-26 16:17:00 -05:00
jfreegman	8d9d51640c	Fix display bug caused by noread flag appended to unread messages A line's line count now increments without messing up the formatting in cases where the noread flag wraps to the next line. Additionally, the way noread flags are handled has been refactored and made more efficient.	2020-11-26 16:16:59 -05:00
jfreegman	c4c0c0d1f4	Another logging fix When renaming a log file, if the new name already exists we just start appending to it and delete the old file. There's no need to create a backup. This fixes an issue where leaving and rejoining the same group multiple times will eventually lead to the logger not working due to trying to use the same file name over and over again.	2020-11-26 16:10:59 -05:00
jfreegman	3f2826bd66	Add release and LLVM asan build options The release build uses -O2 and flto, and has no debug symbols. -Wmissing-field-initializer was removed due to false positives on newer versions of clang	2020-11-26 16:04:54 -05:00
jfreegman	7b7ea0e386	Fix small regression This wasn't supposed to make it into the commit	2020-11-24 23:42:25 -05:00
jfreegman	d35a38735b	Fix line wrapping/padding issues It should now parse messages with newlines properly as well as messages that contain long sequences of characters with no spaces	2020-11-24 19:47:04 -05:00
jfreegman	f0c4906fdc	Fix some off by one bugs with line scrolling and some cleanup Instead of trying (and failing) to correctly calculate the number of lines on the screen a given message will need space for, we dynamically set the value both on initiation of a new line, and whenever that line is printed to the screen using the print_wrap() function. This should fix the screen occasionally not scrolling down the correct number of lines when a new message is printed.	2020-11-24 19:36:03 -05:00
jfreegman	56ba61e061	Cleanup and refactor x11 code - Deleted X11 code for an unfinished/broken feature - Rename xtra -> x11focus - Cleanup the remaining code a bit	2020-11-24 19:31:59 -05:00
jfreegman	898d89e95a	Properly handle failures to convert widechar strings to multibyte	2020-11-24 16:41:42 -05:00
jfreegman	1fd1e27bdf	Remove seconds from default timestamp Also reduce the --- prefix to one dash before a message. These characters are taking up valuable real-estate	2020-11-22 18:53:32 -05:00
jfreegman	8e84ac58d4	Implement word wrapping It's about time	2020-11-22 18:41:12 -05:00
jfreegman	9d65997871	Add notification counters to bottom tab A counter now increments in the bottom bar for unfocused windows showing how many unread messages are pending. Tabs with no pending messages show [*] instead of their index (showing the index is useless and somewhat confusing)	2020-11-21 11:25:41 -05:00
jfreegman	da2889f3ab	Fix UI regression The conference number needs to be displayed in the tab name so that you can invite friends to conferences	2020-11-20 02:10:52 -05:00
jfreegman	312b38d253	A few small fixes - Fix race condition in draw_peer() - Handle realloc_peer_list() error - Remove dead code in cmd_conference() - Reduce scope of a few variable variables - Fix possible buffer truncation in api.c	2020-11-19 14:23:32 -05:00
jfreegman	0554bf0240	Create backup of duplicate log file instead of deleting it This case should never occur, but just in case it does it's good to handle it without any data loss	2020-11-19 14:23:31 -05:00
jfreegman	53a7530e8a	Some UI improvements - Bottom tab now only shows indices of active chat windows unless focused - Always focus Home screen on startup instead of the last loaded conference - Conference tab names are no longer prefixed with the conference number - Home and Contact tab names are now capitalized	2020-11-19 01:30:30 -05:00
jfreegman	41be04a142	Implement push-to-talk for conference audio	2020-11-18 16:57:26 -05:00
jfreegman	31f36318a2	Add config settings for audio channels	2020-11-18 16:29:01 -05:00
jfreegman	f882fdf608	Use two channels for conference audio	2020-11-17 16:31:17 -05:00
jfreegman	7e1e410307	Refactor logging - Conference logging now behaves the same as 1-on-1 chats: Instead of creating a new log file every time we restat the client we use the unique conference ID to keep track of path names. This also allows us to load history for saved groups on client startup - Added a log init function / general code refactor. - Fixed a bug that caused log files to be created even when logging is disabled.	2020-11-17 16:05:20 -05:00
zugz (tox)	c135c812c2	Fix playing unallocated memory on opening audio device	2020-11-16 00:00:00 +00:00
jfreegman	6c239193ab	Fix bug sometimes preventing typing status from being updated	2020-11-15 12:30:26 -05:00