fix(cmd): increase /connect max args from 7 to 9

The /connect command can take: account + server <s> + port <p> + tls <t> + auth <a>
which totals 9 arguments, not 7. This fixes argument parsing for full command usage.

Dockerfile.arch

@@ -1,6 +1,9 @@
 FROM archlinux
 
-RUN pacman -Syu --noconfirm && pacman -S --needed --noconfirm \
+RUN pacman -Syu --noconfirm
+RUN pacman -S --needed --noconfirm reflector && reflector --latest 20 --protocol https --sort rate --save /etc/pacman.d/mirrorlist 
+RUN pacman-key --init
+RUN pacman -S --needed --noconfirm \
   autoconf \
   autoconf-archive \
   automake \
@@ -15,7 +18,7 @@ RUN pacman -Syu --noconfirm && pacman -S --needed --noconfirm \
   gcc \
   git \
   gpgme \
-  gtk2 \
+  gtk3 \
   libgcrypt \
   libmicrohttpd \
   libnotify \

apidocs/c/profhooks.h

@@ -1,220 +1,247 @@
-/** @file
-C Hooks.
-*/
+/** @file profhooks.h
+ * @brief C Plugin Hooks for CProof.
+ *
+ * This header defines optional callback hooks that CProof plugins can implement to
+ * handle events such as startup, shutdown, message processing, and presence updates in
+ * CProof, a console-based XMPP client. These hooks are called by CProof when the
+ * corresponding events occur, allowing plugins to customize behavior. All hooks are
+ * optional; plugins can define only the hooks they need, and CProof will automatically
+ * invoke them when appropriate.
+ *
+ * To use these hooks, define the functions in your plugin with the signatures provided
+ * in this header. For example, to handle the startup event:
+ *
+ * @code
+ * #include "profhooks.h"
+ * void prof_on_start(void) {
+ *     // Handle CProof startup
+ * }
+ * @endcode
+ *
+ * For additional plugin functionality, such as displaying messages or registering
+ * commands, see the CProof API functions in profapi.h.
+ *
+ * @see profapi.h
+ */
+
+/** @mainpage CProof Plugins API and Hooks
+ * List of all API functions available to plugins: @ref profapi.h
+ * List of all hooks which plugins may implement: @ref profhooks.h
+ */
 
 /**
-Called when a plugin is loaded, either when profanity is started, or when the /plugins load or /plugins install commands are called
-@param version the version of Profanity
-@param status the package status of Profanity, "development" or "release"
-@param account_name account name of the currently logged in account, or NULL if not logged in
-@param fulljid the users full Jabber ID (barejid and resource) if logged in, NULL otherwise
-*/
+ * Called when a plugin is loaded, either when CProof is started, or when the /plugins load or /plugins install commands are called
+ * @param version The version of CProof
+ * @param status The package status of CProof, "development" or "release"
+ * @param account_name Account name of the currently logged in account, or NULL if not logged in
+ * @param fulljid The user's full Jabber ID (barejid and resource) if logged in, NULL otherwise
+ */
 void prof_init(const char * const version, const char * const status, const char *const account_name, const char *const fulljid);
 
 /**
-Called when Profanity is started
-*/
+ * Called when CProof is started
+ */
 void prof_on_start(void);
 
 /**
-Called when the user quits Profanity
-*/
+ * Called when the user quits CProof
+ */
 void prof_on_shutdown(void);
 
 /**
-Called when a plugin is unloaded with the /plugins unload command
-*/
+ * Called when a plugin is unloaded with the /plugins unload command
+ */
 void prof_on_unload(void);
 
 /**
-Called when the user connects with an account
-@param account_name account name of the account used for logging in
-@param fulljid the full Jabber ID (barejid and resource) of the account
-*/
+ * Called when the user connects with an account
+ * @param account_name Account name of the account used for logging in
+ * @param fulljid The full Jabber ID (barejid and resource) of the account
+ */
 void prof_on_connect(const char * const account_name, const char * const fulljid);
 
 /**
-Called when the user disconnects an account
-@param account_name account name of the account being disconnected
-@param fulljid the full Jabber ID (barejid and resource) of the account
-*/
+ * Called when the user disconnects an account
+ * @param account_name Account name of the account being disconnected
+ * @param fulljid The full Jabber ID (barejid and resource) of the account
+ */
 void prof_on_disconnect(const char * const account_name, const char * const fulljid);
 
 /**
-Called before a chat message is displayed
-@param barejid Jabber ID of the message sender
-@param resource resource of the message sender
-@param message the received message
-@return the new message to display, or NULL to preserve the original message
-*/
+ * Called before a chat message is displayed
+ * @param barejid Jabber ID of the message sender
+ * @param resource Resource of the message sender
+ * @param message The received message
+ * @return The new message to display, or NULL to preserve the original message
+ */
 char* prof_pre_chat_message_display(const char * const barejid, const char *const resource, const char *message);
 
 /**
-Called after a chat message is displayed
-@param barejid Jabber ID of the message sender
-@param resource resource of the message sender
-@param message the received message
-*/
+ * Called after a chat message is displayed
+ * @param barejid Jabber ID of the message sender
+ * @param resource Resource of the message sender
+ * @param message The received message
+ */
 void prof_post_chat_message_display(const char * const barejid, const char *const resource, const char *message);
 
 /**
-Called before a chat message is sent
-@param barejid Jabber ID of the message recipient
-@param message the message to be sent
-@return the modified or original message to send, or NULL to cancel sending of the message
-*/
+ * Called before a chat message is sent
+ * @param barejid Jabber ID of the message recipient
+ * @param message The message to be sent
+ * @return The modified or original message to send, or NULL to cancel sending of the message
+ */
 char* prof_pre_chat_message_send(const char * const barejid, const char *message);
 
 /**
-Called after a chat message has been sent
-@param barejid Jabber ID of the message recipient
-@param message the sent message
-*/
+ * Called after a chat message has been sent
+ * @param barejid Jabber ID of the message recipient
+ * @param message The sent message
+ */
 void prof_post_chat_message_send(const char * const barejid, const char *message);
 
 /**
-Called before a chat room message is displayed
-@param barejid Jabber ID of the room
-@param nick nickname of message sender
-@param message the received message
-@return the new message to display, or NULL to preserve the original message
-*/
+ * Called before a chat room message is displayed
+ * @param barejid Jabber ID of the room
+ * @param nick Nickname of message sender
+ * @param message The received message
+ * @return The new message to display, or NULL to preserve the original message
+ */
 char* prof_pre_room_message_display(const char * const barejid, const char * const nick, const char *message);
 
 /**
-Called after a chat room message is displayed
-@param barejid Jabber ID of the room
-@param nick nickname of the message sender
-@param message the received message
-*/
+ * Called after a chat room message is displayed
+ * @param barejid Jabber ID of the room
+ * @param nick Nickname of the message sender
+ * @param message The received message
+ */
 void prof_post_room_message_display(const char * const barejid, const char * const nick, const char *message);
 
 /**
-Called before a chat room message is sent
-@param barejid Jabber ID of the room
-@param message the message to be sent
-@return the modified or original message to send, or NULL to cancel sending of the message
-*/
+ * Called before a chat room message is sent
+ * @param barejid Jabber ID of the room
+ * @param message The message to be sent
+ * @return The modified or original message to send, or NULL to cancel sending of the message
+ */
 char* prof_pre_room_message_send(const char * const barejid, const char *message);
 
 /**
-Called after a chat room message has been sent
-@param barejid Jabber ID of the room
-@param message the sent message
-*/
+ * Called after a chat room message has been sent
+ * @param barejid Jabber ID of the room
+ * @param message The sent message
+ */
 void prof_post_room_message_send(const char * const barejid, const char *message);
 
 /**
-Called when the server sends a chat room history message
-@param barejid Jabber ID of the room
-@param nick nickname of the message sender
-@param message the message to be sent
-@param timestamp time the message was originally sent to the room, in ISO8601 format
-*/
+ * Called when the server sends a chat room history message
+ * @param barejid Jabber ID of the room
+ * @param nick Nickname of the message sender
+ * @param message The message to be sent
+ * @param timestamp Time the message was originally sent to the room, in ISO8601 format
+ */
 void prof_on_room_history_message(const char * const barejid, const char *const nick, const char *const message, const char *const timestamp);
 
 /**
-Called before a private chat room message is displayed
-@param barejid Jabber ID of the room
-@param nick nickname of message sender
-@param message the received message
-@return the new message to display, or NULL to preserve the original message
-*/
+ * Called before a private chat room message is displayed
+ * @param barejid Jabber ID of the room
+ * @param nick Nickname of message sender
+ * @param message The received message
+ * @return The new message to display, or NULL to preserve the original message
+ */
 char* prof_pre_priv_message_display(const char * const barejid, const char * const nick, const char *message);
 
 /**
-Called after a private chat room message is displayed
-@param barejid Jabber ID of the room
-@param nick nickname of the message sender
-@param message the received message
-*/
+ * Called after a private chat room message is displayed
+ * @param barejid Jabber ID of the room
+ * @param nick Nickname of the message sender
+ * @param message The received message
+ */
 void prof_post_priv_message_display(const char * const barejid, const char * const nick, const char *message);
 
 /**
-Called before a private chat room message is sent
-@param barejid Jabber ID of the room
-@param nick nickname of message recipient
-@param message the message to be sent
-@return the modified or original message to send, or NULL to cancel sending of the message
-*/
+ * Called before a private chat room message is sent
+ * @param barejid Jabber ID of the room
+ * @param nick Nickname of message recipient
+ * @param message The message to be sent
+ * @return The modified or original message to send, or NULL to cancel sending of the message
+ */
 char* prof_pre_priv_message_send(const char * const barejid, const char * const nick, const char *message);
 
 /**
-Called after a private chat room message has been sent
-@param barejid Jabber ID of the room
-@param nick nickname of the message recipient
-@param message the sent message
-*/
+ * Called after a private chat room message has been sent
+ * @param barejid Jabber ID of the room
+ * @param nick Nickname of the message recipient
+ * @param message The sent message
+ */
 void prof_post_priv_message_send(const char * const barejid, const char * const nick, const char *message);
 
 /**
-Called before an XMPP message stanza is sent
-@param stanza The stanza to send
-@return The new stanza to send, or NULL to preserve the original stanza
-*/
+ * Called before an XMPP message stanza is sent
+ * @param stanza The stanza to send
+ * @return The new stanza to send, or NULL to preserve the original stanza
+ */
 char* prof_on_message_stanza_send(const char *const stanza);
 
 /**
-Called when an XMPP message stanza is received
-@param stanza The stanza received
-@return 1 if Profanity should continue to process the message stanza, 0 otherwise
-*/
+ * Called when an XMPP message stanza is received
+ * @param stanza The stanza received
+ * @return 1 if CProof should continue to process the message stanza, 0 otherwise
+ */
 int prof_on_message_stanza_receive(const char *const stanza);
 
 /**
-Called before an XMPP presence stanza is sent
-@param stanza The stanza to send
-@return The new stanza to send, or NULL to preserve the original stanza
-*/
+ * Called before an XMPP presence stanza is sent
+ * @param stanza The stanza to send
+ * @return The new stanza to send, or NULL to preserve the original stanza
+ */
 char* prof_on_presence_stanza_send(const char *const stanza);
 
 /**
-Called when an XMPP presence stanza is received
-@param stanza The stanza received
-@return 1 if Profanity should continue to process the presence stanza, 0 otherwise
-*/
+ * Called when an XMPP presence stanza is received
+ * @param stanza The stanza received
+ * @return 1 if CProof should continue to process the presence stanza, 0 otherwise
+ */
 int prof_on_presence_stanza_receive(const char *const stanza);
 
 /**
-Called before an XMPP iq stanza is sent
-@param stanza The stanza to send
-@return The new stanza to send, or NULL to preserve the original stanza
-*/
+ * Called before an XMPP iq stanza is sent
+ * @param stanza The stanza to send
+ * @return The new stanza to send, or NULL to preserve the original stanza
+ */
 char* prof_on_iq_stanza_send(const char *const stanza);
 
 /**
-Called when an XMPP iq stanza is received
-@param stanza The stanza received
-@return 1 if Profanity should continue to process the iq stanza, 0 otherwise
-*/
+ * Called when an XMPP iq stanza is received
+ * @param stanza The stanza received
+ * @return 1 if CProof should continue to process the iq stanza, 0 otherwise
+ */
 int prof_on_iq_stanza_receive(const char *const stanza);
 
 /**
-Called when a contact goes offline
-@param barejid Jabber ID of the contact
-@param resource the resource being disconnected
-@param status the status message received with the offline presence, or NULL
-*/
+ * Called when a contact goes offline
+ * @param barejid Jabber ID of the contact
+ * @param resource The resource being disconnected
+ * @param status The status message received with the offline presence, or NULL
+ */
 void prof_on_contact_offline(const char *const barejid, const char *const resource, const char *const status);
 
 /**
-Called when a presence notification is received from a contact
-@param barejid Jabber ID of the contact
-@param resource the resource being disconnected
-@param presence presence of the contact, one of "chat", "online", "away", "xa" or "dnd"
-@param status the status message received with the presence, or NULL
-@param priority the priority associated with the resource
-*/
+ * Called when a presence notification is received from a contact
+ * @param barejid Jabber ID of the contact
+ * @param resource The resource being disconnected
+ * @param presence Presence of the contact, one of "chat", "online", "away", "xa" or "dnd"
+ * @param status The status message received with the presence, or NULL
+ * @param priority The priority associated with the resource
+ */
 void prof_on_contact_presence(const char *const barejid, const char *const resource, const char *const presence, const char *const status, const int priority);
 
 /**
-Called when a chat window is focused
-@param barejid Jabber ID of the chat window recipient
-*/
+ * Called when a chat window is focused
+ * @param barejid Jabber ID of the chat window recipient
+ */
 void prof_on_chat_win_focus(const char *const barejid);
 
 /**
-Called when a chat room window is focused
-@param barejid Jabber ID of the room
-*/
-void prof_on_room_win_focus(const char *const barejid);
+ * Called when a chat room window is focused
+ * @param barejid Jabber ID of the room
+ */
+void prof_on_room_win_focus(const char *const barejid);

apidocs/python/src/prof.py

@@ -25,6 +25,7 @@ class CommandCallback(Protocol):
         def my_command(*command_parameters: str) -> None:
             prof.cons_show(f"Received: {command_parameters}")
 
+    .. :noindex:
     """
     def __call__(self, *command_parameters: str) -> None: ...
 
@@ -38,6 +39,7 @@ class TimedCallback(Protocol):
         def my_timed_callback() -> None:
             prof.cons_show("Timer triggered")
 
+    .. :noindex:
     """
     def __call__(self) -> None: ...
 
@@ -53,6 +55,7 @@ class WindowCallback(Protocol):
         def my_window_callback(win_id: str, message: str) -> None:
             prof.win_show(win_id, f"Processed: {message}")
 
+    .. :noindex:
     """
     def __call__(self, win_id: str, message: str) -> None: ...
 
@@ -827,6 +830,22 @@ def get_current_recipient() -> str | None:
     """
     pass
 
+def get_current_window() -> str:
+    """Retrieves the title of the current window as shown in the titlebar.
+
+    Returns the title of the currently active window, matching the titlebar display.
+    Special cases:
+    - For MUC configuration windows, includes "config" and an asterisk if modified (e.g., "room@example.com config \*").
+    - For vCard windows, includes the bare JID and an asterisk if modified (e.g., "vCard user@example.com \*").
+
+    :return: The window title as a string.
+
+    Example::
+
+        title = prof.get_current_window()
+        prof.cons_show(f"Current window: {title}")
+    """
+
 def get_current_muc() -> str | None:
     """Retrieves the Jabber ID of the current chat room.
 

src/command/cmd_defs.c

@@ -139,8 +139,9 @@ static const struct cmd_t command_defs[] = {
               "Show version and license information.")
     },
 
+    // Max args: account + server <s> + port <p> + tls <t> + auth <a> = 9
     { CMD_PREAMBLE("/connect",
-                   parse_args, 0, 7, NULL)
+                   parse_args, 0, 9, NULL)
       CMD_MAINFUNC(cmd_connect)
       CMD_TAGS(
               CMD_TAG_CONNECTION)
@@ -1902,9 +1903,9 @@ static const struct cmd_t command_defs[] = {
       CMD_ARGS(
               { "where", "Show the current log file location." },
               { "rotate on|off", "Rotate log, default on. Does not take effect if you specified a filename yourself when starting Profanity." },
-              { "maxsize <bytes>", "With rotate enabled, specifies the max log size, defaults to 10485760 (10MB)." },
+              { "maxsize <bytes>", "With rotate enabled, specifies the max log size, defaults to 10485760 (10MiB)." },
               { "shared on|off", "Share logs between all instances, default: on. When off, the process id will be included in the log filename. Does not take effect if you specified a filename yourself when starting Profanity." },
-              {"level INFO|DEBUG|WARN|ERROR", "Set the log level. Default is INFO. Only works with default log file, not with user provided log file during startup via -f." })
+              { "level INFO|DEBUG|WARN|ERROR", "Set the log level. Default is INFO." })
     },
 
     { CMD_PREAMBLE("/carbons",

src/command/cmd_funcs.c

@@ -5356,6 +5356,8 @@ cmd_time(ProfWin* window, const char* const command, gchar** args)
             cons_bad_cmd_usage(command);
             return TRUE;
         }
+        if (!set_all)
+            break;
     }
     if (!set_all && n == ARRAY_SIZE(time_prefs)) {
         cons_bad_cmd_usage(command);
@@ -6271,10 +6273,11 @@ cmd_log(ProfWin* window, const char* const command, gchar** args)
     if (strcmp(subcmd, "level") == 0) {
         log_level_t prof_log_level;
         if (log_level_from_string(value, &prof_log_level) == 0) {
+            auto_char char* log_file = strdup(get_log_file_location());
             log_close();
-            log_init(prof_log_level, NULL);
+            log_init(prof_log_level, log_file);
 
-            cons_show("Log level changed to: %s.", value);
+            cons_show("Log level changed to: %s (log file: %s).", value, log_file ? log_file : "[default]");
             return TRUE;
         }
     }

src/log.c

@@ -186,7 +186,7 @@ log_error(const char* const msg, ...)
 }
 
 void
-log_init(log_level_t filter, char* log_file)
+log_init(log_level_t filter, const char* const log_file)
 {
     level_filter = filter;
 

src/log.h

@@ -50,7 +50,7 @@ typedef enum {
     PROF_LEVEL_ERROR
 } log_level_t;
 
-void log_init(log_level_t filter, char* log_file);
+void log_init(log_level_t filter, const char* const log_file);
 log_level_t log_get_filter(void);
 void log_close(void);
 const gchar* get_log_file_location(void);

src/plugins/api.c

@@ -54,6 +54,7 @@
 #include "plugins/settings.h"
 #include "plugins/disco.h"
 #include "ui/ui.h"
+#include "ui/win_types.h"
 #include "ui/window_list.h"
 #include "xmpp/roster_list.h"
 
@@ -205,6 +206,13 @@ api_get_current_recipient(void)
     }
 }
 
+gchar*
+api_get_current_window(void)
+{
+    ProfWin* current = wins_get_current();
+    return win_get_title(current);
+}
+
 char*
 api_get_current_muc(void)
 {

src/plugins/api.h

@@ -46,6 +46,7 @@ void api_notify(const char* message, const char* category, int timeout_ms);
 void api_send_line(char* line);
 
 char* api_get_current_recipient(void);
+gchar* api_get_current_window(void);
 char* api_get_current_muc(void);
 gboolean api_current_win_is_console(void);
 char* api_get_current_nick(void);

src/plugins/c_api.c

@@ -165,6 +165,12 @@ c_api_get_current_recipient(void)
     return api_get_current_recipient();
 }
 
+static char*
+c_api_get_current_window(void)
+{
+    return api_get_current_window();
+}
+
 static char*
 c_api_get_current_muc(void)
 {
@@ -477,6 +483,7 @@ c_api_init(void)
     prof_notify = c_api_notify;
     prof_send_line = c_api_send_line;
     prof_get_current_recipient = c_api_get_current_recipient;
+    prof_get_current_window = c_api_get_current_window;
     prof_get_current_muc = c_api_get_current_muc;
     prof_current_win_is_console = c_api_current_win_is_console;
     prof_get_current_nick = c_api_get_current_nick;

src/plugins/profapi.c

@@ -62,6 +62,7 @@ void (*prof_notify)(const char* message, int timeout_ms, const char* category) =
 void (*prof_send_line)(char* line) = NULL;
 
 char* (*prof_get_current_recipient)(void) = NULL;
+char* (*prof_get_current_window)(void) = NULL;
 char* (*prof_get_current_muc)(void) = NULL;
 int (*prof_current_win_is_console)(void) = NULL;
 char* (*prof_get_current_nick)(void) = NULL;

src/plugins/profapi.h

@@ -71,6 +71,7 @@ void (*prof_notify)(const char* message, int timeout_ms, const char* category);
 void (*prof_send_line)(char* line);
 
 char* (*prof_get_current_recipient)(void);
+char* (*prof_get_current_window)(void);
 char* (*prof_get_current_muc)(void);
 int (*prof_current_win_is_console)(void);
 char* (*prof_get_current_nick)(void);

src/plugins/python_api.c

@@ -415,6 +415,15 @@ python_api_get_current_recipient(PyObject* self, PyObject* args)
     }
 }
 
+static PyObject*
+python_api_get_current_window(PyObject* self, PyObject* args)
+{
+    allow_python_threads();
+    auto_gchar gchar* recipient = api_get_current_window();
+    disable_python_threads();
+    return Py_BuildValue("s", recipient);
+}
+
 static PyObject*
 python_api_get_current_muc(PyObject* self, PyObject* args)
 {
@@ -1530,6 +1539,7 @@ static PyMethodDef apiMethods[] = {
     { "send_line", python_api_send_line, METH_VARARGS, "Send a line of input." },
     { "notify", python_api_notify, METH_VARARGS, "Send desktop notification." },
     { "get_current_recipient", python_api_get_current_recipient, METH_VARARGS, "Return the jid of the recipient of the current window." },
+    { "get_current_window", python_api_get_current_window, METH_VARARGS, "Return title of the current window." },
     { "get_current_muc", python_api_get_current_muc, METH_VARARGS, "Return the jid of the room of the current window." },
     { "get_current_nick", python_api_get_current_nick, METH_VARARGS, "Return nickname in current room." },
     { "get_name_from_roster", python_api_get_name_from_roster, METH_VARARGS, "Return nickname in roster of barejid." },

src/ui/buffer.c

@@ -1,40 +1,36 @@
 /*
  * buffer.c
- * vim: expandtab:ts=4:sts=4:sw=4
+ *
+ * Message buffer implementation for CProof.
+ *
+ * This module provides an in-memory buffer for managing active chat entries in the
+ * console-based XMPP client. Separate from persistent SQLite storage, it holds
+ * messages and metadata solely for UI rendering, ensuring responsive scrolling and
+ * display without exceeding ncurses pad limits (10k lines). By tracking rendered
+ * line counts per entry, it proactively trims content to prevent overflow, enabling
+ * seamless integration with ncurses for position-aware rendering.
+ *
+ * Key features and operations:
+ *   - Append/prepend entries (messages) with automatic line-based cleanup.
+ *   - Track cumulative lines for overflow prevention and efficient buffer sizing.
+ *   - Remove entries by ID or index; mark delivery receipts as received.
+ *   - Retrieve entries by index or ID for rendering and history queries.
+ *   - Store metadata including timestamps, senders, themes, and ncurses y-positions.
+ *
+ * CProof. Fork of Profanity (since 2025).
  *
  * Copyright (C) 2012 - 2019 James Booth <boothj5@gmail.com>
  * Copyright (C) 2019 - 2025 Michael Vetter <jubalh@iodoru.org>
+ * Copyright (C) 2025 CProof Developers
  *
- * This file is part of Profanity.
- *
- * Profanity 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.
- *
- * Profanity 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 Profanity.  If not, see <https://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give permission to
- * link the code of portions of this program with the OpenSSL library under
- * certain conditions as described in each individual source file, and
- * distribute linked combinations including the two.
- *
- * You must obey the GNU General Public License in all respects for all of the
- * code used other than OpenSSL. If you modify file(s) with this exception, you
- * may extend this exception to your version of the file(s), but you are not
- * obligated to do so. If you do not wish to do so, delete this exception
- * statement from your version. If you delete this exception statement from all
- * source files in the program, then also delete it here.
+ * Licensed under the GNU General Public License, version 3,
+ * with the OpenSSL exception. See LICENSE for details.
  *
+ * vim: expandtab:ts=4:sts=4:sw=4
  */
 
 #include "config.h"
+#include "ui/window_list.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -54,15 +50,8 @@
 #include "ui/window.h"
 #include "ui/buffer.h"
 
-#define MAX_BUFFER_SIZE     200
 #define STRDUP_OR_NULL(str) ((str) ? strdup(str) : NULL)
 
-struct prof_buff_t
-{
-    GSList* entries;
-    int lines;
-};
-
 static void _free_entry(ProfBuffEntry* entry);
 static ProfBuffEntry* _create_entry(const char* show_char, int pad_indent, GDateTime* time, int flags, theme_item_t theme_item, const char* const display_from, const char* const from_jid, const char* const message, DeliveryReceipt* receipt, const char* const id, int y_start_pos, int y_end_pos);
 static void _buffer_add(ProfBuff buffer, const char* show_char, int pad_indent, GDateTime* time, int flags, theme_item_t theme_item, const char* const display_from, const char* const from_jid, const char* const message, DeliveryReceipt* receipt, const char* const id, int y_start_pos, int y_end_pos, gboolean append);
@@ -108,23 +97,24 @@ _buffer_add(ProfBuff buffer, const char* show_char, int pad_indent, GDateTime* t
 
     buffer->lines += e->_lines;
 
-    while (g_slist_length(buffer->entries) >= MAX_BUFFER_SIZE) {
+    // With 10% margin to ensure overflow prevention
+    while (buffer->lines >= PAD_SIZE - (PAD_SIZE / 10) && g_slist_length(buffer->entries) > 1) {
         // Delete message from the opposite size to free buffer
         GSList* buffer_entry_to_delete = append ? buffer->entries : g_slist_last(buffer->entries);
         ProfBuffEntry* entry_to_delete = (ProfBuffEntry*)buffer_entry_to_delete->data;
+        // log_debug("(Messages left in buffer: %d) DELETING: %s", g_slist_length(buffer->entries), entry_to_delete->id);
         buffer->lines -= entry_to_delete->_lines;
         _free_entry(entry_to_delete);
         buffer->entries = g_slist_delete_link(buffer->entries, buffer_entry_to_delete);
     }
 
     if (from_jid && y_end_pos == y_start_pos) {
-        log_warning("Ncurses Overflow! From: %s, position: %d, ID: %s, append: %s, used message buffer size: %d, message buffer size: %d, rendered lines buffer size: %d",
-                    from_jid, y_start_pos, id, append ? "TRUE" : "FALSE", g_slist_length(buffer->entries), MAX_BUFFER_SIZE, PAD_SIZE);
-        // At this point we have a message that caused overflow of the render buffer.
-        // Ideally, we want to clean other messages to rerender everything properly. To do so,
-        // first we need to determine the size of the message that we are trying to display,
-        // then we need to print the message.
-        // However, _buffer_add is too late in the code to do this, therefore it has to be done in the win_print_old_history.
+        // win_redraw will redraw with entries above removed,
+        // it will also recalculate actual size of the message that caused overflow
+        int old_lines = buffer->lines;
+        win_redraw(wins_get_current());
+        log_debug("Ncurses Overflow! From: %s, position: %d, ID: %s, append: %s, used message buffer size: %d, rendered lines: (old: %d/ actual: %d/ max: %d)",
+                  from_jid, y_start_pos, id, append ? "TRUE" : "FALSE", g_slist_length(buffer->entries), old_lines, buffer->lines, PAD_SIZE);
     }
 
     buffer->entries = append ? g_slist_append(buffer->entries, e) : g_slist_prepend(buffer->entries, e);

src/ui/buffer.h

@@ -68,6 +68,12 @@ typedef struct prof_buff_entry_t
     char* id;
 } ProfBuffEntry;
 
+struct prof_buff_t
+{
+    GSList* entries;
+    int lines;
+};
+
 typedef struct prof_buff_t* ProfBuff;
 
 ProfBuff buffer_create();

src/ui/window.c

@@ -2003,6 +2003,10 @@ win_redraw(ProfWin* window)
             _win_print_internal(window, e->show_char, e->pad_indent, e->time, e->flags, e->theme_item, e->display_from, e->message, e->receipt);
         }
         e->y_end_pos = getcury(window->layout->win);
+        // Recalculate lines (might be incorrect in case of NCurses overflow)
+        window->layout->buffer->lines -= e->_lines;
+        e->_lines = e->y_end_pos - e->y_start_pos;
+        window->layout->buffer->lines += e->_lines;
     }
 }
 

src/xmpp/connection.c

@@ -312,6 +312,7 @@ iq_reg2_cb(xmpp_conn_t* xmpp_conn, xmpp_stanza_t* stanza, void* userdata)
     goto quit;
 
 quit:
+    log_debug("[CONNDBG] iq_reg2_cb: disconnecting after registration completion");
     xmpp_disconnect(xmpp_conn);
 
     return 0;
@@ -550,6 +551,7 @@ connection_disconnect(void)
     // don't disconnect already disconnected connection,
     // or we get infinite loop otherwise
     if (conn.conn_last_event == XMPP_CONN_CONNECT) {
+        log_debug("[CONNDBG] connection_disconnect: user-initiated disconnect (status=%d)", (int)conn.conn_status);
         conn.conn_status = JABBER_DISCONNECTING;
         xmpp_disconnect(conn.xmpp_conn);
 
@@ -557,6 +559,7 @@ connection_disconnect(void)
             session_process_events();
         }
     } else {
+        log_debug("[CONNDBG] connection_disconnect: already disconnected (last_event=%d)", (int)conn.conn_last_event);
         conn.conn_status = JABBER_DISCONNECTED;
     }
 
@@ -979,6 +982,7 @@ _connection_handler(xmpp_conn_t* const xmpp_conn, const xmpp_conn_event_t status
 
         connection_get_jid();
         conn.domain = strdup(conn.jid->domainpart);
+        log_debug("conn.domain=%s", conn.jid->domainpart);
 
         connection_clear_data();
         conn.features_by_jid = g_hash_table_new_full(g_str_hash, g_str_equal, free, (GDestroyNotify)g_hash_table_destroy);
@@ -1018,6 +1022,9 @@ _connection_handler(xmpp_conn_t* const xmpp_conn, const xmpp_conn_event_t status
     // disconnected
     case XMPP_CONN_DISCONNECT:
         log_debug("Connection handler: XMPP_CONN_DISCONNECT");
+        log_debug("[CONNDBG] disconnect: previous_status=%d error=%d has_stream_error=%s",
+                  (int)conn.conn_status, error,
+                  (stream_error && stream_error->stanza) ? "yes" : "no");
 
         // lost connection for unknown reason
         if (conn.conn_status == JABBER_CONNECTED || conn.conn_status == JABBER_DISCONNECTING) {
@@ -1163,3 +1170,32 @@ connection_get_profanity_identifier(void)
 {
     return prof_identifier;
 }
+
+void
+connection_debug_print_features()
+{
+    log_debug("=== Connection Features ===");
+
+    GHashTableIter iter;
+    gpointer jid_ptr, features_ptr;
+
+    g_hash_table_iter_init(&iter, conn.features_by_jid);
+    while (g_hash_table_iter_next(&iter, &jid_ptr, &features_ptr)) {
+        const char* jid = (const char*)jid_ptr;
+        GHashTable* features = (GHashTable*)features_ptr;
+
+        if (!features || g_hash_table_size(features) == 0) {
+            log_debug("%s:\t(no features)", jid);
+            continue;
+        }
+
+        GList* feature_keys = g_hash_table_get_keys(features);
+        for (GList* l = feature_keys; l != NULL; l = l->next) {
+            const char* feature = (const char*)l->data;
+            log_debug("%s:\t%s", jid, feature);
+        }
+        g_list_free(feature_keys);
+    }
+
+    log_debug("=== End of Features ===");
+}

src/xmpp/iq.c

@@ -1417,6 +1417,8 @@ _manual_pong_id_handler(xmpp_stanza_t* const stanza, void* const userdata)
     return 0;
 }
 
+static gboolean autoping_error_shown = false;
+
 static int
 _autoping_timed_send(xmpp_conn_t* const conn, void* const userdata)
 {
@@ -1425,10 +1427,13 @@ _autoping_timed_send(xmpp_conn_t* const conn, void* const userdata)
     }
 
     if (connection_supports(XMPP_FEATURE_PING) == FALSE) {
-        log_warning("Server doesn't advertise %s feature, disabling autoping.", XMPP_FEATURE_PING);
-        prefs_set_autoping(0);
-        cons_show_error("Server ping not supported (%s), autoping disabled.", XMPP_FEATURE_PING);
-        return 0;
+        // TODO: do we need to check it on each autoping call?
+        log_warning("Server doesn't advertise %s feature.", XMPP_FEATURE_PING);
+        if (!autoping_error_shown) {
+            connection_debug_print_features();
+            cons_show_error("Server ping not supported (%s). Check log for details.", XMPP_FEATURE_PING);
+        }
+        autoping_error_shown = 1;
     }
 
     if (autoping_wait) {
@@ -1499,7 +1504,7 @@ _auto_pong_id_handler(xmpp_stanza_t* const stanza, void* const userdata)
     if (g_strcmp0(errtype, STANZA_TYPE_CANCEL) == 0) {
         log_warning("Server ping (id=%s) error type 'cancel', disabling autoping.", id);
         prefs_set_autoping(0);
-        cons_show_error("Server ping not supported, autoping disabled.");
+        cons_show_error("Autoping is not supported by the server (stanza cancelled). The feature has been disabled automatically.");
         xmpp_timed_handler_delete(connection_get_conn(), _autoping_timed_send);
     }
 
@@ -2515,6 +2520,7 @@ _disco_items_result_handler(xmpp_stanza_t* const stanza)
     GSList* items = NULL;
 
     if ((g_strcmp0(id, "discoitemsreq") != 0) && (g_strcmp0(id, "discoitemsreq_onconnect") != 0)) {
+        log_warning("_disco_items_result_handler: Received unexpected disco id: %s", id);
         return;
     }
 

src/xmpp/session.c

@@ -218,6 +218,7 @@ session_connect_with_details(const char* const jid, const char* const passwd, co
 void
 session_autoping_fail(void)
 {
+    log_debug("[CONNDBG] session_autoping_fail: autoping timeout, triggering lost connection");
     session_lost_connection();
 }
 
@@ -264,11 +265,14 @@ session_process_events(void)
         if ((reconnect_sec != 0) && reconnect_timer) {
             int elapsed_sec = g_timer_elapsed(reconnect_timer, NULL);
             if (elapsed_sec > reconnect_sec) {
+                log_debug("[CONNDBG] session_process_events: auto-reconnect triggered after %d seconds (threshold=%d)",
+                          elapsed_sec, reconnect_sec);
                 session_reconnect_now();
             }
         }
         break;
     case JABBER_RECONNECT:
+        log_debug("[CONNDBG] session_process_events: JABBER_RECONNECT state, calling session_reconnect_now");
         session_reconnect_now();
         break;
     default:
@@ -327,12 +331,12 @@ session_login_success(gboolean secured)
 
     // logged in with account
     if (saved_account.name) {
-        log_debug("Connection handler: logged in with account name: %s", saved_account.name);
+        log_debug("[CONNDBG] Connection handler: logged in with account name: %s", saved_account.name);
         sv_ev_login_account_success(saved_account.name, secured);
 
         // logged in without account, use details to create new account
     } else {
-        log_debug("Connection handler: logged in with jid: %s", saved_details.name);
+        log_debug("[CONNDBG] Connection handler: logged in with jid: %s", saved_details.name);
         accounts_add(saved_details.name, saved_details.altdomain, saved_details.port, saved_details.tls_policy, saved_details.auth_policy);
         accounts_set_jid(saved_details.name, saved_details.jid);
 
@@ -371,11 +375,11 @@ void
 session_login_failed(void)
 {
     if (reconnect_timer == NULL) {
-        log_debug("Connection handler: No reconnect timer");
+        log_debug("[CONNDBG] Connection handler: No reconnect timer");
         sv_ev_failed_login();
         _session_free_internals();
     } else {
-        log_debug("Connection handler: Restarting reconnect timer");
+        log_debug("[CONNDBG] Connection handler: Restarting reconnect timer");
         if (prefs_get_reconnect() != 0) {
             g_timer_start(reconnect_timer);
         }
@@ -389,12 +393,16 @@ session_login_failed(void)
 void
 session_lost_connection(void)
 {
+    log_debug("[CONNDBG] session_lost_connection: connection lost, reconnect_interval=%d",
+              prefs_get_reconnect());
     /* this callback also clears all cached data */
     sv_ev_lost_connection();
     if (prefs_get_reconnect() != 0) {
         assert(reconnect_timer == NULL);
         reconnect_timer = g_timer_new();
+        log_debug("[CONNDBG] session_lost_connection: reconnect timer started");
     } else {
+        log_debug("[CONNDBG] session_lost_connection: auto-reconnect disabled, cleaning up");
         _session_free_internals();
     }
 }

src/xmpp/xmpp.h

@@ -208,6 +208,8 @@ const char* connection_jid_for_feature(const char* const feature);
 
 const char* connection_get_profanity_identifier(void);
 
+void connection_debug_print_features();
+
 char* message_send_chat(const char* const barejid, const char* const msg, const char* const oob_url, gboolean request_receipt, const char* const replace_id);
 char* message_send_chat_otr(const char* const barejid, const char* const msg, gboolean request_receipt, const char* const replace_id);
 char* message_send_chat_pgp(const char* const barejid, const char* const msg, gboolean request_receipt, const char* const replace_id);

tests/unittests/log/stub_log.c

@@ -26,7 +26,7 @@
 #include "log.h"
 
 void
-log_init(log_level_t filter, char* log_file)
+log_init(log_level_t filter, const char* const log_file)
 {
 }
 log_level_t

tests/unittests/xmpp/stub_xmpp.c

@@ -156,6 +156,11 @@ connection_get_profanity_identifier(void)
     return "profident";
 }
 
+void
+connection_debug_print_features()
+{
+}
+
 jabber_conn_status_t
 connection_register(const char* const altdomain, int port, const char* const tls_policy,
                     const char* const username, const char* const password)