nnchat: main.c annotate

annotate main.c @ 694:788a58dab07a

th-libs function th_llist_free_func() was renamed to th_llist_free_func_data(). Fix references.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sun, 05 Jan 2020 20:48:15 +0200
parents	9ed896f7b531
children	07b5f729252f

rev	line source
41 fe3140cec818 v0.6.1 Matti Hamalainen <ccr@tnsp.org> parents: 40 diff changeset	1 /*
fe3140cec818 v0.6.1 Matti Hamalainen <ccr@tnsp.org> parents: 40 diff changeset	2 * NNChat - Custom chat client for NewbieNudes.com chatrooms
39 bb25bdfc0d71 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 36 diff changeset	3 * Written by Matti 'ccr' Hämäläinen
668 f212cbfbd93c Bump copyrights. Matti Hamalainen <ccr@tnsp.org> parents: 666 diff changeset	4 * (C) Copyright 2008-2016 Tecnic Software productions (TNSP)
39 bb25bdfc0d71 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 36 diff changeset	5 */
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	6 #include "th_args.h"
133 ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	7 #include "th_config.h"
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	8 #include "th_network.h"
662 0c94af18f55e Two more generic functions were moved to th-libs, so factor out the Matti Hamalainen <ccr@tnsp.org> parents: 661 diff changeset	9 #include "th_file.h"
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	10 #include "util.h"
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	11 #include "ui.h"
555 66d18a82d6b9 Clean up header includes. Matti Hamalainen <ccr@tnsp.org> parents: 554 diff changeset	12 #include <unistd.h>
66d18a82d6b9 Clean up header includes. Matti Hamalainen <ccr@tnsp.org> parents: 554 diff changeset	13 #include <fcntl.h>
661 eb3692d85ac2 Use TH_PLAT_WINDOWS for preprocessor conditionals. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	14 #ifdef TH_PLAT_WINDOWS
649 a190b618100a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 648 diff changeset	15 # include <shlwapi.h>
a190b618100a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 648 diff changeset	16 # include <shfolder.h>
128 713879a7ca10 Wait for forked processes, to prevent a zombie apocalypse. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	17 #else
649 a190b618100a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 648 diff changeset	18 # include <sys/wait.h>
a190b618100a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 648 diff changeset	19 # include <sys/stat.h>
a190b618100a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 648 diff changeset	20 # include <sys/types.h>
68 3ab7751fdad1 MingW compatibility, with one ugly kludge. Matti Hamalainen <ccr@tnsp.org> parents: 67 diff changeset	21 #endif
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	22
661 eb3692d85ac2 Use TH_PLAT_WINDOWS for preprocessor conditionals. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	23 #ifdef TH_PLAT_WINDOWS
649 a190b618100a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 648 diff changeset	24 # define SET_CONFIG_FILE "nnchat.txt"
a190b618100a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 648 diff changeset	25 # define SET_LOG_DIR "NNChat Log Files"
139 c39399725f7b Define some platform-specific constants. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	26 #else
650 98f5d15d5ec4 Improve and fix XDG support. Matti Hamalainen <ccr@tnsp.org> parents: 649 diff changeset	27 # define SET_LOG_DIR "nnlogs"
98f5d15d5ec4 Improve and fix XDG support. Matti Hamalainen <ccr@tnsp.org> parents: 649 diff changeset	28 # if defined(USE_XDG)
98f5d15d5ec4 Improve and fix XDG support. Matti Hamalainen <ccr@tnsp.org> parents: 649 diff changeset	29 # define SET_XDG_CONFIG_DIR "nnchat"
98f5d15d5ec4 Improve and fix XDG support. Matti Hamalainen <ccr@tnsp.org> parents: 649 diff changeset	30 # define SET_CONFIG_FILE "config"
98f5d15d5ec4 Improve and fix XDG support. Matti Hamalainen <ccr@tnsp.org> parents: 649 diff changeset	31 # else
98f5d15d5ec4 Improve and fix XDG support. Matti Hamalainen <ccr@tnsp.org> parents: 649 diff changeset	32 # define SET_CONFIG_FILE ".nnchat"
98f5d15d5ec4 Improve and fix XDG support. Matti Hamalainen <ccr@tnsp.org> parents: 649 diff changeset	33 # endif
139 c39399725f7b Define some platform-specific constants. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	34 #endif
49 0bcc38910a77 Simple ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	35
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	36 #define SET_PROFILE_PREFIX "http://www.newbienudes.com/profile/%s/"
409 4556174b5be8 Make nickname autocomplete separator configurable. Matti Hamalainen <ccr@tnsp.org> parents: 408 diff changeset	37 #define SET_NICK_SEPARATOR ':'
4556174b5be8 Make nickname autocomplete separator configurable. Matti Hamalainen <ccr@tnsp.org> parents: 408 diff changeset	38
636 6273c4ea6e51 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	39 #define SET_PROXY_PORT 1080
588 573a3ad30938 Bump up the command history size. Matti Hamalainen <ccr@tnsp.org> parents: 586 diff changeset	40 #define SET_MAX_HISTORY (64) // Command history length
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	41 #define SET_KEEPALIVE (15*60) // Ping/keepalive period in seconds
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	42
652 58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	43 enum
58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	44 {
58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	45 BMT_MOZILLA,
58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	46 BMT_NEW_FIREFOX,
58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	47 };
58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	48
49 0bcc38910a77 Simple ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	49
592 27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	50 typedef struct
27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	51 {
27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	52 char *name;
27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	53 int port;
27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	54 char *desc;
27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	55 } nn_room_data_t;
27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	56
27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	57 static const nn_room_data_t nn_room_data[] =
27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	58 {
27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	59 { "main" , 8005, "Main room" },
27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	60 { "pit" , 8003, "Passion Pit" },
27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	61 };
27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	62
27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	63 static const int nn_room_data_n = sizeof(nn_room_data) / sizeof(nn_room_data[0]);
27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	64
27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	65
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	66 /* Options
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	67 */
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 347 diff changeset	68 int optPort = 8005,
636 6273c4ea6e51 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	69 optProxyPort = SET_PROXY_PORT,
623 118276b60667 More work towards using th-libs th_network module. Matti Hamalainen <ccr@tnsp.org> parents: 622 diff changeset	70 optProxyType = TH_PROXY_NONE,
633 ce605ac8167a Proxy handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 629 diff changeset	71 optProxyAuthType = TH_PROXY_AUTH_NONE,
ce605ac8167a Proxy handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 629 diff changeset	72 optProxyAddrType = TH_PROXY_ADDR_DOMAIN;
690 6fa9c36d0634 Adjust to match th-libs API changes. Matti Hamalainen <ccr@tnsp.org> parents: 689 diff changeset	73 unsigned int optUserColor = 0x000000;
652 58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	74 int optBrowserRunMethod = BMT_NEW_FIREFOX;
96 7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	75 char *optServer = "chat.newbienudes.com",
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 347 diff changeset	76 *optProxyServer = NULL,
602 4bae14092b78 Add parameters (unused for now) for proxy password etc. in case SOCKS 5 Matti Hamalainen <ccr@tnsp.org> parents: 601 diff changeset	77 *optProxyUserID = NULL,
4bae14092b78 Add parameters (unused for now) for proxy password etc. in case SOCKS 5 Matti Hamalainen <ccr@tnsp.org> parents: 601 diff changeset	78 *optProxyPassword = NULL,
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	79 *optUserName = NULL,
198 21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	80 *optUserNameCmd = NULL,
21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	81 *optUserNameEnc = NULL,
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	82 *optPassword = NULL,
198 21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	83 *optPasswordCmd = NULL,
541 44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	84 *optLogPath = NULL,
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	85 *optLogExtension = ".log",
409 4556174b5be8 Make nickname autocomplete separator configurable. Matti Hamalainen <ccr@tnsp.org> parents: 408 diff changeset	86 *optSite = "NN",
4556174b5be8 Make nickname autocomplete separator configurable. Matti Hamalainen <ccr@tnsp.org> parents: 408 diff changeset	87 *optNickSepStr = NULL;
4556174b5be8 Make nickname autocomplete separator configurable. Matti Hamalainen <ccr@tnsp.org> parents: 408 diff changeset	88 char optNickSep;
552 dfe46cd1b81b Cosmetics, comments. Matti Hamalainen <ccr@tnsp.org> parents: 551 diff changeset	89 BOOL optDaemon = FALSE,
638 bda973fa2b3b Add proxy disable/enable setting. Matti Hamalainen <ccr@tnsp.org> parents: 636 diff changeset	90 optProxyEnable = FALSE,
552 dfe46cd1b81b Cosmetics, comments. Matti Hamalainen <ccr@tnsp.org> parents: 551 diff changeset	91 setIgnoreMode = FALSE,
519 f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	92 optDebug = FALSE,
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	93 optLogEnable = FALSE,
554 13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	94 optLogDaily = FALSE,
519 f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	95 optOnlyFriendPrv = FALSE;
140 2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	96
664 87ef546de419 Create configuration directory path if it does not yet exist when saving Matti Hamalainen <ccr@tnsp.org> parents: 663 diff changeset	97 char setHomeDir = NULL, setConfigDir = NULL, *setProxyURI = NULL;
657 8b8ef14d7177 Update to match th-libs API changes. Matti Hamalainen <ccr@tnsp.org> parents: 654 diff changeset	98 th_llist_t *setIgnoreList = NULL,
519 f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	99 *setFriendList = NULL,
264 4c1c18a388d9 Add configuration setting and functionality for random "keepalive" messages to avoid idle timeout kicks from chat. Matti Hamalainen <ccr@tnsp.org> parents: 258 diff changeset	100 *setIdleMessages = NULL;
140 2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	101 nn_userhash_t *nnUsers = NULL;
137 fad8c31e41e6 Move browser code around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	102 char *setConfigFile = NULL,
fad8c31e41e6 Move browser code around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	103 *setBrowser = NULL;
561 1ff9e85a1fcc Rework the configuration file loading and saving to use the I/O context and new th-config API. Matti Hamalainen <ccr@tnsp.org> parents: 560 diff changeset	104 th_cfgitem_t *cfg = NULL;
89 c2d916b340bf Change some typedef names; Add struct for user list handling. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	105
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	106 nn_editbuf_t *editHistBuf[SET_MAX_HISTORY+2];
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	107 int editHistPos = 0,
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	108 editHistMax = 0;
273 4d106ad65f26 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 268 diff changeset	109
4d106ad65f26 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 268 diff changeset	110 /* Logging mode flags
4d106ad65f26 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 268 diff changeset	111 */
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	112 enum
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	113 {
553 b464409fa643 Make LOG_* flags enum more readable and extendable by using hexadecimal values. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	114 LOG_FILE = 0x0001,
b464409fa643 Make LOG_* flags enum more readable and extendable by using hexadecimal values. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	115 LOG_WINDOW = 0x0002,
b464409fa643 Make LOG_* flags enum more readable and extendable by using hexadecimal values. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	116 LOG_STAMP = 0x0004,
b464409fa643 Make LOG_* flags enum more readable and extendable by using hexadecimal values. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	117 LOG_FILE2 = 0x0008,
554 13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	118 LOG_RECURSIVE = 0x0010,
273 4d106ad65f26 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 268 diff changeset	119 };
4d106ad65f26 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 268 diff changeset	120
4d106ad65f26 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 268 diff changeset	121
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	122 /* Arguments
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	123 */
670 06199003043a Fix to match th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 668 diff changeset	124 static const th_optarg optList[] =
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	125 {
640 51dd01786d25 Update to work with changed th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	126 { 0, '?', "help", "Show this help and be so very much verbose that it almost hurts you", OPT_NONE },
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	127 { 1, 'v', "verbose", "Be more verbose", OPT_NONE },
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	128 { 2, 'p', "port", "Connect to port", OPT_ARGREQ },
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	129 { 3, 's', "server", "Server to connect to", OPT_ARGREQ },
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	130 { 4, 'C', "color", "Initial color in RGB hex 000000", OPT_ARGREQ },
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	131 { 6, 'D', "daemon", "A pseudo-daemon mode for logging", OPT_NONE },
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 347 diff changeset	132 { 7, 'f', "force-site", "Force site (default: NN)", OPT_ARGREQ },
162 e59cec397811 Add a debug mode option (commandline) and enable certain features when we are in debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	133 { 8, 'd', "debug", "Enable various debug features", OPT_NONE },
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	134
608 a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	135 {10, 'P', "proxy", "Set proxy data, see below for syntax", OPT_ARGREQ },
592 27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	136
27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	137 {13, 'r', "room", "Connect to room (main, pit)", OPT_ARGREQ },
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	138 };
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	139
640 51dd01786d25 Update to work with changed th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	140 static const int optListN = sizeof(optList) / sizeof(optList[0]);
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	141
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	142
258 8a0f7446318e General cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 254 diff changeset	143 void argShowHelp(void)
68 3ab7751fdad1 MingW compatibility, with one ugly kludge. Matti Hamalainen <ccr@tnsp.org> parents: 67 diff changeset	144 {
592 27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	145 int i;
607 c7b8e299c612 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	146 th_print_banner(stdout, th_prog_name, "[options] <username> <password>");
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	147
640 51dd01786d25 Update to work with changed th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	148 th_args_help(stdout, optList, optListN, 0);
592 27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	149
608 a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	150 printf(
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	151 "\n"
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	152 "Supported proxy types are SOCKS 4/4A and SOCKS 5.\n"
617 ada20f599490 Update online help. Matti Hamalainen <ccr@tnsp.org> parents: 616 diff changeset	153 "(Only user/pass auth and no auth supported, no GSSAPI!)\n"
608 a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	154 "These can be set with the -P option as follows:\n"
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	155 "\n"
638 bda973fa2b3b Add proxy disable/enable setting. Matti Hamalainen <ccr@tnsp.org> parents: 636 diff changeset	156 " -P disable (to disable proxy use)\n"
608 a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	157 " -P <type>://[<userid>[:passwd]@]<host>[:<port>]\n"
636 6273c4ea6e51 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	158 " -P socks4://localhost:9000\n"
6273c4ea6e51 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	159 " -P socks5://foobar:pass@localhost\n"
608 a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	160 "\n"
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	161 "Type can be socks4, socks4a or socks5. Only socks5\n"
636 6273c4ea6e51 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	162 "supports user/pass authentication. Default port is %d.\n"
608 a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	163 "\n"
636 6273c4ea6e51 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	164 "Supported rooms (for option '-r'):\n",
6273c4ea6e51 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	165 SET_PROXY_PORT);
608 a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	166
592 27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	167 for (i = 0; i < nn_room_data_n; i++)
27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	168 {
27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	169 printf(" %s - %s (port %d)\n",
27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	170 nn_room_data[i].name,
27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	171 nn_room_data[i].desc,
27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	172 nn_room_data[i].port);
27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	173 }
636 6273c4ea6e51 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	174
6273c4ea6e51 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	175 printf("\n");
68 3ab7751fdad1 MingW compatibility, with one ugly kludge. Matti Hamalainen <ccr@tnsp.org> parents: 67 diff changeset	176 }
3ab7751fdad1 MingW compatibility, with one ugly kludge. Matti Hamalainen <ccr@tnsp.org> parents: 67 diff changeset	177
3ab7751fdad1 MingW compatibility, with one ugly kludge. Matti Hamalainen <ccr@tnsp.org> parents: 67 diff changeset	178
608 a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	179 BOOL argSplitStr(const char src, const char at, char res1, char res2)
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	180 {
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	181 char pos, tmp = th_strdup(src);
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	182
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	183 if (tmp != NULL && (pos = strstr(tmp, at)) != NULL)
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	184 {
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	185 *pos = 0;
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	186 pos += strlen(at);
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	187 *res1 = th_strdup_trim(tmp, TH_TRIM_BOTH);
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	188 *res2 = th_strdup_trim(pos, TH_TRIM_BOTH);
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	189 th_free(tmp);
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	190 return TRUE;
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	191 }
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	192 else
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	193 {
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	194 th_free(tmp);
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	195 return FALSE;
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	196 }
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	197 }
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	198
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	199
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	200 BOOL argHandleProxyURI(const char *uri)
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	201 {
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	202 // Attempt to parse the proxy URI
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	203 BOOL ret = FALSE;
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	204 char proto = NULL, rest = NULL, *host = NULL,
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	205 auth = NULL, port = NULL;
612 59588bbf8d55 Remove possible trailing slash from proxy URI. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	206 size_t len;
608 a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	207
638 bda973fa2b3b Add proxy disable/enable setting. Matti Hamalainen <ccr@tnsp.org> parents: 636 diff changeset	208 optProxyEnable = FALSE;
bda973fa2b3b Add proxy disable/enable setting. Matti Hamalainen <ccr@tnsp.org> parents: 636 diff changeset	209
bda973fa2b3b Add proxy disable/enable setting. Matti Hamalainen <ccr@tnsp.org> parents: 636 diff changeset	210 // Handle disable case
642 c8e5949a8961 Use th-libs functions. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	211 if (th_strncasecmp(uri, "disab", 5) == 0)
638 bda973fa2b3b Add proxy disable/enable setting. Matti Hamalainen <ccr@tnsp.org> parents: 636 diff changeset	212 return TRUE;
bda973fa2b3b Add proxy disable/enable setting. Matti Hamalainen <ccr@tnsp.org> parents: 636 diff changeset	213
bda973fa2b3b Add proxy disable/enable setting. Matti Hamalainen <ccr@tnsp.org> parents: 636 diff changeset	214 // Split the URI
608 a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	215 if (!argSplitStr(uri, "://", &proto, &rest))
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	216 {
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	217 THERR("Malformed proxy URI, should be <type>://[<userid>[:passwd]@]<host>[:<port>]\n");
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	218 goto out;
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	219 }
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	220
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	221 // Validate proxy type
642 c8e5949a8961 Use th-libs functions. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	222 if (th_strcasecmp(proto, "socks4") == 0)
623 118276b60667 More work towards using th-libs th_network module. Matti Hamalainen <ccr@tnsp.org> parents: 622 diff changeset	223 optProxyType = TH_PROXY_SOCKS4;
608 a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	224 else
642 c8e5949a8961 Use th-libs functions. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	225 if (th_strcasecmp(proto, "socks4a") == 0)
623 118276b60667 More work towards using th-libs th_network module. Matti Hamalainen <ccr@tnsp.org> parents: 622 diff changeset	226 optProxyType = TH_PROXY_SOCKS4A;
608 a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	227 else
642 c8e5949a8961 Use th-libs functions. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	228 if (th_strcasecmp(proto, "socks5") == 0)
625 edac1485308d Socks5 support stuff, not finished yet (as SOCKS5 needs to be implemented in th_network) Matti Hamalainen <ccr@tnsp.org> parents: 624 diff changeset	229 optProxyType = TH_PROXY_SOCKS5;
edac1485308d Socks5 support stuff, not finished yet (as SOCKS5 needs to be implemented in th_network) Matti Hamalainen <ccr@tnsp.org> parents: 624 diff changeset	230 else
608 a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	231 {
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	232 THERR("Invalid proxy type specified: '%s'\n", proto);
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	233 goto out;
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	234 }
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	235
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	236 // Does the URI contain anything else?
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	237 if (strlen(rest) == 0)
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	238 {
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	239 THERR("Malformed proxy URI, no host specified.\n");
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	240 goto out;
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	241 }
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	242
612 59588bbf8d55 Remove possible trailing slash from proxy URI. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	243 // Remove trailing slash
59588bbf8d55 Remove possible trailing slash from proxy URI. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	244 len = strlen(rest) - 1;
59588bbf8d55 Remove possible trailing slash from proxy URI. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	245 if (rest[len] == '/')
59588bbf8d55 Remove possible trailing slash from proxy URI. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	246 rest[len] = 0;
59588bbf8d55 Remove possible trailing slash from proxy URI. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	247
608 a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	248 // Check for auth credentials
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	249 if (argSplitStr(rest, "@", &auth, &host))
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	250 {
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	251 if (strlen(auth) == 0)
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	252 {
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	253 THERR("Malformed proxy URI, zero length authentication credentials.\n");
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	254 goto out;
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	255 }
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	256
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	257 // Should have authentication credentials
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	258 if (!argSplitStr(auth, ":", &optProxyUserID, &optProxyPassword))
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	259 optProxyUserID = th_strdup(auth);
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	260 }
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	261 else
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	262 host = th_strdup(rest);
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	263
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	264 // Check if proxy port was specified
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	265 if (argSplitStr(host, ":", &optProxyServer, &port))
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	266 optProxyPort = atoi(port);
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	267 else
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	268 optProxyServer = th_strdup(host);
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	269
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	270 // Check what authentication type to use
623 118276b60667 More work towards using th-libs th_network module. Matti Hamalainen <ccr@tnsp.org> parents: 622 diff changeset	271 if (optProxyType == TH_PROXY_SOCKS5 &&
608 a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	272 optProxyUserID != NULL && optProxyPassword != NULL)
623 118276b60667 More work towards using th-libs th_network module. Matti Hamalainen <ccr@tnsp.org> parents: 622 diff changeset	273 optProxyAuthType = TH_PROXY_AUTH_USER;
608 a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	274 else
623 118276b60667 More work towards using th-libs th_network module. Matti Hamalainen <ccr@tnsp.org> parents: 622 diff changeset	275 optProxyAuthType = TH_PROXY_AUTH_NONE;
608 a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	276
638 bda973fa2b3b Add proxy disable/enable setting. Matti Hamalainen <ccr@tnsp.org> parents: 636 diff changeset	277 optProxyEnable = TRUE;
608 a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	278 ret = TRUE;
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	279
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	280 out:
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	281 th_free(proto);
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	282 th_free(rest);
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	283 th_free(host);
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	284 th_free(auth);
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	285 th_free(port);
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	286
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	287 return ret;
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	288 }
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	289
629 005d7a0351b6 More API changes in th_network. Matti Hamalainen <ccr@tnsp.org> parents: 628 diff changeset	290
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	291 BOOL argHandleOpt(const int optN, char optArg, char currArg)
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	292 {
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	293 switch (optN)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	294 {
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	295 case 0:
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	296 argShowHelp();
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	297 exit(0);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	298 break;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	299
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	300 case 1:
678 75daa6ec65df Fix to match changes in th-libs API. Matti Hamalainen <ccr@tnsp.org> parents: 677 diff changeset	301 th_verbosity++;
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	302 break;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	303
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	304 case 2:
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	305 optPort = atoi(optArg);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	306 break;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	307
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	308 case 3:
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	309 optServer = optArg;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	310 break;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	311
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	312 case 4:
690 6fa9c36d0634 Adjust to match th-libs API changes. Matti Hamalainen <ccr@tnsp.org> parents: 689 diff changeset	313 if (!th_get_hex_triplet(optArg, &optUserColor))
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	314 {
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	315 THERR("Invalid color argument '%s', should be a RGB hex triplet '000000'.\n",
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	316 optArg);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	317 return FALSE;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	318 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	319 THMSG(1, "Using color #%06x\n", optUserColor);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	320 break;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	321
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	322 case 7:
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	323 optSite = optArg;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	324 break;
33 e49ea6febfeb Cleanups. Added option to specify/fake "site" where logging in from. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	325
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	326 case 6:
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	327 optDaemon = TRUE;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	328 THMSG(1, "Running in pseudo-daemon mode.\n");
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	329 break;
21 29098addfa65 Added a "daemon" mode. Matti Hamalainen <ccr@tnsp.org> parents: 19 diff changeset	330
162 e59cec397811 Add a debug mode option (commandline) and enable certain features when we are in debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	331 case 8:
e59cec397811 Add a debug mode option (commandline) and enable certain features when we are in debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	332 optDebug = TRUE;
e59cec397811 Add a debug mode option (commandline) and enable certain features when we are in debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	333 THMSG(1, "Debug mode enabled.\n");
e59cec397811 Add a debug mode option (commandline) and enable certain features when we are in debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	334 break;
e59cec397811 Add a debug mode option (commandline) and enable certain features when we are in debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	335
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 347 diff changeset	336
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 347 diff changeset	337 case 10:
608 a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	338 if (!argHandleProxyURI(optArg))
a8fa7803284a Change how proxy is specified on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 607 diff changeset	339 return FALSE;
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 347 diff changeset	340 break;
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 347 diff changeset	341
592 27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	342 case 13:
27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	343 {
27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	344 int i;
27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	345 for (i = 0; i < nn_room_data_n; i++)
642 c8e5949a8961 Use th-libs functions. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	346 if (!th_strcasecmp(nn_room_data[i].name, optArg))
592 27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	347 {
27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	348 optPort = nn_room_data[i].port;
27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	349 return TRUE;
27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	350 }
27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	351
27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	352 THERR("Unsupported room '%s'.\n", optArg);
594 463210f14158 Oops, we didn't error out when the room name was non-existent for -r option. Matti Hamalainen <ccr@tnsp.org> parents: 593 diff changeset	353 return FALSE;
592 27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	354 }
27a6b7c2caad Add -r option for specifying the room by name instead of port. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	355 break;
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 347 diff changeset	356
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	357 default:
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	358 THERR("Unknown option '%s'.\n", currArg);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	359 return FALSE;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	360 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	361
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	362 return TRUE;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	363 }
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	364
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	365
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	366 BOOL argHandleFile(char *currArg)
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	367 {
198 21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	368 if (!optUserNameCmd)
21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	369 optUserNameCmd = currArg;
21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	370 else if (!optPasswordCmd)
21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	371 optPasswordCmd = currArg;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	372 else
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	373 {
198 21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	374 THERR("Username '%s' already specified on commandline!\n", optUserNameCmd);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	375 return FALSE;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	376 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	377
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	378 return TRUE;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	379 }
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	380
460 c956af023014 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	381
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	382 BOOL nn_conn_send_msg(th_conn_t conn, const char user, const char *str)
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	383 {
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	384 char *msg;
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	385
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	386 if (str == NULL)
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	387 return FALSE;
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	388
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	389 msg = th_strdup_printf("<USER>%s</USER><MESSAGE>%s</MESSAGE>", user, str);
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	390
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	391 if (msg != NULL)
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	392 {
629 005d7a0351b6 More API changes in th_network. Matti Hamalainen <ccr@tnsp.org> parents: 628 diff changeset	393 int ret = th_conn_send_buf(conn, msg, strlen(msg) + 1);
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	394 th_free(msg);
629 005d7a0351b6 More API changes in th_network. Matti Hamalainen <ccr@tnsp.org> parents: 628 diff changeset	395 return ret == THERR_OK;
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	396 }
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	397 else
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	398 return FALSE;
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	399 }
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	400
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	401
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	402 BOOL nn_conn_send_msg_v(th_conn_t conn, const char user, const char *fmt, ...)
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	403 {
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	404 BOOL res;
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	405 char *tmp;
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	406 va_list ap;
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	407
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	408 va_start(ap, fmt);
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	409 tmp = th_strdup_vprintf(fmt, ap);
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	410 va_end(ap);
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	411
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	412 res = nn_conn_send_msg(conn, user, tmp);
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	413 th_free(tmp);
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	414 return res;
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	415 }
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	416
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	417
28 512775f6b081 A refactored ncurses-based UI. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	418 int printFile(FILE outFile, const char fmt)
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	419 {
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	420 const char *s = fmt;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	421
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	422 while (*s)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	423 {
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	424 if (*s == '½')
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	425 {
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	426 s++;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	427 if (*s == '½')
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	428 {
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	429 fputc((unsigned char) *s, outFile);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	430 s++;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	431 }
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	432 else
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	433 {
74 98004129202a Portability fixes. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	434 while (s && isdigit((int) s)) s++;
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	435 if (*s != '½') return -1;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	436 s++;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	437 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	438 }
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	439 else
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	440 {
191 4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	441 if ((unsigned char) *s == 255)
4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	442 fputc(' ', outFile);
4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	443 else
4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	444 fputc((unsigned char) *s, outFile);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	445 s++;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	446 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	447 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	448
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	449 return 0;
28 512775f6b081 A refactored ncurses-based UI. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	450 }
512775f6b081 A refactored ncurses-based UI. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	451
620 a1abf812785f Rename a function. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	452
542 d8184a3c241f Clean up window logging logic a bit. Matti Hamalainen <ccr@tnsp.org> parents: 541 diff changeset	453 void printMsgFile(nn_window_t win, int flags, const char stamp, const char *msg)
d8184a3c241f Clean up window logging logic a bit. Matti Hamalainen <ccr@tnsp.org> parents: 541 diff changeset	454 {
d8184a3c241f Clean up window logging logic a bit. Matti Hamalainen <ccr@tnsp.org> parents: 541 diff changeset	455 if (win != NULL && win->logFile != NULL)
d8184a3c241f Clean up window logging logic a bit. Matti Hamalainen <ccr@tnsp.org> parents: 541 diff changeset	456 {
d8184a3c241f Clean up window logging logic a bit. Matti Hamalainen <ccr@tnsp.org> parents: 541 diff changeset	457 if (flags & LOG_STAMP) printFile(win->logFile, stamp);
d8184a3c241f Clean up window logging logic a bit. Matti Hamalainen <ccr@tnsp.org> parents: 541 diff changeset	458 printFile(win->logFile, msg);
d8184a3c241f Clean up window logging logic a bit. Matti Hamalainen <ccr@tnsp.org> parents: 541 diff changeset	459 fflush(win->logFile);
d8184a3c241f Clean up window logging logic a bit. Matti Hamalainen <ccr@tnsp.org> parents: 541 diff changeset	460 }
d8184a3c241f Clean up window logging logic a bit. Matti Hamalainen <ccr@tnsp.org> parents: 541 diff changeset	461 }
d8184a3c241f Clean up window logging logic a bit. Matti Hamalainen <ccr@tnsp.org> parents: 541 diff changeset	462
554 13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	463
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	464 void printMsgF(nn_window_t win, int flags, const char fmt, ...);
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	465 BOOL nn_log_reopen(nn_window_t *win);
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	466
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	467
563 c3e4e8f3c658 Refactor message/error/etc printing functions to be a bit more sane. Matti Hamalainen <ccr@tnsp.org> parents: 561 diff changeset	468 void printMsgConst(nn_window_t win, int flags, const char msg)
28 512775f6b081 A refactored ncurses-based UI. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	469 {
563 c3e4e8f3c658 Refactor message/error/etc printing functions to be a bit more sane. Matti Hamalainen <ccr@tnsp.org> parents: 561 diff changeset	470 char tmpStr[128];
554 13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	471 nn_window_t *tmpwin = (win != NULL) ? win : nnwin_main_window();
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	472
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	473 // Only the main window
576 414d11df07ce Gracefully handle error situations when the main UI has not yet been Matti Hamalainen <ccr@tnsp.org> parents: 573 diff changeset	474 if (win == NULL && tmpwin != NULL && (flags & LOG_RECURSIVE) == 0)
554 13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	475 {
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	476 time_t currTime = time(NULL);
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	477 struct tm currTm, prevTm;
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	478
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	479 if ((currTm = localtime(&currTime)) != NULL &&
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	480 currTm->tm_hour == 0 &&
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	481 (prevTm = localtime(&tmpwin->logPrevMsgTime)) != NULL &&
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	482 prevTm->tm_hour == 23)
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	483 {
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	484 str_get_timestamp(tmpStr, sizeof(tmpStr), "%d %b %Y");
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	485 printMsgF(win, LOG_RECURSIVE, "Day changed to %s.\n", tmpStr);
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	486 nn_log_reopen(tmpwin);
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	487 }
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	488
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	489 tmpwin->logPrevMsgTime = currTime;
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	490 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	491
520 ab56ed0d0c25 Slight optimization. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	492 if (flags & LOG_STAMP)
ab56ed0d0c25 Slight optimization. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	493 {
ab56ed0d0c25 Slight optimization. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	494 str_get_timestamp(tmpStr, sizeof(tmpStr), "½17½[½11½%H:%M:%S½17½]½0½ ");
ab56ed0d0c25 Slight optimization. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	495 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	496
542 d8184a3c241f Clean up window logging logic a bit. Matti Hamalainen <ccr@tnsp.org> parents: 541 diff changeset	497 if (flags & LOG_FILE)
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	498 {
563 c3e4e8f3c658 Refactor message/error/etc printing functions to be a bit more sane. Matti Hamalainen <ccr@tnsp.org> parents: 561 diff changeset	499 printMsgFile(win != NULL ? win : nnwin_main_window(), flags, tmpStr, msg);
544 e30fa8592a48 Possibly fix logging after latest changes. Matti Hamalainen <ccr@tnsp.org> parents: 542 diff changeset	500 }
542 d8184a3c241f Clean up window logging logic a bit. Matti Hamalainen <ccr@tnsp.org> parents: 541 diff changeset	501
544 e30fa8592a48 Possibly fix logging after latest changes. Matti Hamalainen <ccr@tnsp.org> parents: 542 diff changeset	502 if (flags & LOG_FILE2)
e30fa8592a48 Possibly fix logging after latest changes. Matti Hamalainen <ccr@tnsp.org> parents: 542 diff changeset	503 {
563 c3e4e8f3c658 Refactor message/error/etc printing functions to be a bit more sane. Matti Hamalainen <ccr@tnsp.org> parents: 561 diff changeset	504 printMsgFile(nnwin_main_window(), flags, tmpStr, msg);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	505 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	506
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	507 if (!optDaemon && (flags & LOG_WINDOW))
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	508 {
554 13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	509 if (flags & LOG_STAMP) nnwin_print(tmpwin, tmpStr);
563 c3e4e8f3c658 Refactor message/error/etc printing functions to be a bit more sane. Matti Hamalainen <ccr@tnsp.org> parents: 561 diff changeset	510 nnwin_print(tmpwin, msg);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	511 }
563 c3e4e8f3c658 Refactor message/error/etc printing functions to be a bit more sane. Matti Hamalainen <ccr@tnsp.org> parents: 561 diff changeset	512 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	513
563 c3e4e8f3c658 Refactor message/error/etc printing functions to be a bit more sane. Matti Hamalainen <ccr@tnsp.org> parents: 561 diff changeset	514 void printMsgV(nn_window_t win, int flags, const char fmt, va_list ap)
c3e4e8f3c658 Refactor message/error/etc printing functions to be a bit more sane. Matti Hamalainen <ccr@tnsp.org> parents: 561 diff changeset	515 {
c3e4e8f3c658 Refactor message/error/etc printing functions to be a bit more sane. Matti Hamalainen <ccr@tnsp.org> parents: 561 diff changeset	516 char *buf = th_strdup_vprintf(fmt, ap);
c3e4e8f3c658 Refactor message/error/etc printing functions to be a bit more sane. Matti Hamalainen <ccr@tnsp.org> parents: 561 diff changeset	517 printMsgConst(win, flags, buf);
288 e7ef3db3b954 Implement "windows" in the chat. Only main window used for now, and even Matti Hamalainen <ccr@tnsp.org> parents: 280 diff changeset	518 th_free(buf);
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	519 }
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	520
288 e7ef3db3b954 Implement "windows" in the chat. Only main window used for now, and even Matti Hamalainen <ccr@tnsp.org> parents: 280 diff changeset	521 void printMsg(nn_window_t win, const char fmt, ...)
100 ed4067c10a8a Remove useless buffer usage from error reporting function. Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	522 {
ed4067c10a8a Remove useless buffer usage from error reporting function. Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	523 va_list ap;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	524
100 ed4067c10a8a Remove useless buffer usage from error reporting function. Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	525 va_start(ap, fmt);
288 e7ef3db3b954 Implement "windows" in the chat. Only main window used for now, and even Matti Hamalainen <ccr@tnsp.org> parents: 280 diff changeset	526 printMsgV(win, LOG_STAMP \| LOG_WINDOW \| LOG_FILE, fmt, ap);
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	527 va_end(ap);
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	528 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	529
322 b9c15c57dc8f Clean up message functions, add new printMsgQ() helper function for messages that should not Matti Hamalainen <ccr@tnsp.org> parents: 321 diff changeset	530 void printMsgF(nn_window_t win, int flags, const char fmt, ...)
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	531 {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	532 va_list ap;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	533
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	534 va_start(ap, fmt);
322 b9c15c57dc8f Clean up message functions, add new printMsgQ() helper function for messages that should not Matti Hamalainen <ccr@tnsp.org> parents: 321 diff changeset	535 printMsgV(win, flags \| LOG_STAMP, fmt, ap);
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	536 va_end(ap);
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	537 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	538
322 b9c15c57dc8f Clean up message functions, add new printMsgQ() helper function for messages that should not Matti Hamalainen <ccr@tnsp.org> parents: 321 diff changeset	539 void printMsgQ(nn_window_t win, const char fmt, ...)
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	540 {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	541 va_list ap;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	542
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	543 va_start(ap, fmt);
322 b9c15c57dc8f Clean up message functions, add new printMsgQ() helper function for messages that should not Matti Hamalainen <ccr@tnsp.org> parents: 321 diff changeset	544 printMsgV(win, LOG_STAMP \| LOG_WINDOW, fmt, ap);
100 ed4067c10a8a Remove useless buffer usage from error reporting function. Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	545 va_end(ap);
ed4067c10a8a Remove useless buffer usage from error reporting function. Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	546 }
ed4067c10a8a Remove useless buffer usage from error reporting function. Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	547
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	548
223 03af28fb1c38 Show error messages printed out to stderr only after the program has quit. Matti Hamalainen <ccr@tnsp.org> parents: 222 diff changeset	549 char *errorMessages = NULL;
03af28fb1c38 Show error messages printed out to stderr only after the program has quit. Matti Hamalainen <ccr@tnsp.org> parents: 222 diff changeset	550
563 c3e4e8f3c658 Refactor message/error/etc printing functions to be a bit more sane. Matti Hamalainen <ccr@tnsp.org> parents: 561 diff changeset	551 void errorMsgConst(const char *msg)
96 7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	552 {
563 c3e4e8f3c658 Refactor message/error/etc printing functions to be a bit more sane. Matti Hamalainen <ccr@tnsp.org> parents: 561 diff changeset	553 printMsgConst(NULL, LOG_STAMP \| LOG_WINDOW \| LOG_FILE, msg);
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	554
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	555 if (errorMessages != NULL)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	556 {
563 c3e4e8f3c658 Refactor message/error/etc printing functions to be a bit more sane. Matti Hamalainen <ccr@tnsp.org> parents: 561 diff changeset	557 // XXX Yes, this is lazy.
c3e4e8f3c658 Refactor message/error/etc printing functions to be a bit more sane. Matti Hamalainen <ccr@tnsp.org> parents: 561 diff changeset	558 char *tmp = th_strdup_printf("%s%s", errorMessages, msg);
223 03af28fb1c38 Show error messages printed out to stderr only after the program has quit. Matti Hamalainen <ccr@tnsp.org> parents: 222 diff changeset	559 th_free(errorMessages);
563 c3e4e8f3c658 Refactor message/error/etc printing functions to be a bit more sane. Matti Hamalainen <ccr@tnsp.org> parents: 561 diff changeset	560 errorMessages = tmp;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	561 }
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	562 else
563 c3e4e8f3c658 Refactor message/error/etc printing functions to be a bit more sane. Matti Hamalainen <ccr@tnsp.org> parents: 561 diff changeset	563 errorMessages = th_strdup(msg);
c3e4e8f3c658 Refactor message/error/etc printing functions to be a bit more sane. Matti Hamalainen <ccr@tnsp.org> parents: 561 diff changeset	564 }
c3e4e8f3c658 Refactor message/error/etc printing functions to be a bit more sane. Matti Hamalainen <ccr@tnsp.org> parents: 561 diff changeset	565
c3e4e8f3c658 Refactor message/error/etc printing functions to be a bit more sane. Matti Hamalainen <ccr@tnsp.org> parents: 561 diff changeset	566
c3e4e8f3c658 Refactor message/error/etc printing functions to be a bit more sane. Matti Hamalainen <ccr@tnsp.org> parents: 561 diff changeset	567 void errorMsgV(const char *fmt, va_list ap)
c3e4e8f3c658 Refactor message/error/etc printing functions to be a bit more sane. Matti Hamalainen <ccr@tnsp.org> parents: 561 diff changeset	568 {
c3e4e8f3c658 Refactor message/error/etc printing functions to be a bit more sane. Matti Hamalainen <ccr@tnsp.org> parents: 561 diff changeset	569 char *msg = th_strdup_vprintf(fmt, ap);
c3e4e8f3c658 Refactor message/error/etc printing functions to be a bit more sane. Matti Hamalainen <ccr@tnsp.org> parents: 561 diff changeset	570 errorMsgConst(msg);
c3e4e8f3c658 Refactor message/error/etc printing functions to be a bit more sane. Matti Hamalainen <ccr@tnsp.org> parents: 561 diff changeset	571 th_free(msg);
96 7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	572 }
7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	573
466 796508f828f6 Refactor much of the "windowing" UI code into a new module, ui.[ch] Matti Hamalainen <ccr@tnsp.org> parents: 464 diff changeset	574
236 71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	575 void errorMsg(const char *fmt, ...)
71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	576 {
71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	577 va_list ap;
71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	578
71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	579 va_start(ap, fmt);
71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	580 errorMsgV(fmt, ap);
71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	581 va_end(ap);
71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	582 }
71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	583
466 796508f828f6 Refactor much of the "windowing" UI code into a new module, ui.[ch] Matti Hamalainen <ccr@tnsp.org> parents: 464 diff changeset	584
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	585 void debugMsg(const char *fmt, ...)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	586 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	587 if (optDebug)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	588 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	589 va_list ap;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	590
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	591 va_start(ap, fmt);
544 e30fa8592a48 Possibly fix logging after latest changes. Matti Hamalainen <ccr@tnsp.org> parents: 542 diff changeset	592 printMsgV(NULL, LOG_FILE \| LOG_WINDOW, fmt, ap);
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	593 va_end(ap);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	594 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	595 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	596
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	597
623 118276b60667 More work towards using th-libs th_network module. Matti Hamalainen <ccr@tnsp.org> parents: 622 diff changeset	598 void nn_network_errfunc(struct _th_conn_t conn, int err, const char msg)
236 71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	599 {
262 6d48fc4fd421 Shut up some trivial warnings. Matti Hamalainen <ccr@tnsp.org> parents: 258 diff changeset	600 (void) conn;
623 118276b60667 More work towards using th-libs th_network module. Matti Hamalainen <ccr@tnsp.org> parents: 622 diff changeset	601 (void) err;
564 6e5789cbb4d4 Change network layer error/info message passing API to pass direct strings Matti Hamalainen <ccr@tnsp.org> parents: 563 diff changeset	602 errorMsg("%s", msg);
236 71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	603 }
71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	604
466 796508f828f6 Refactor much of the "windowing" UI code into a new module, ui.[ch] Matti Hamalainen <ccr@tnsp.org> parents: 464 diff changeset	605
623 118276b60667 More work towards using th-libs th_network module. Matti Hamalainen <ccr@tnsp.org> parents: 622 diff changeset	606 void nn_network_msgfunc(struct _th_conn_t conn, int loglevel, const char msg)
236 71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	607 {
262 6d48fc4fd421 Shut up some trivial warnings. Matti Hamalainen <ccr@tnsp.org> parents: 258 diff changeset	608 (void) conn;
623 118276b60667 More work towards using th-libs th_network module. Matti Hamalainen <ccr@tnsp.org> parents: 622 diff changeset	609 (void) loglevel;
564 6e5789cbb4d4 Change network layer error/info message passing API to pass direct strings Matti Hamalainen <ccr@tnsp.org> parents: 563 diff changeset	610 printMsgConst(NULL, LOG_STAMP \| LOG_WINDOW \| LOG_FILE, msg);
236 71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	611 }
71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	612
225 801ac37321f6 Sanitize ignore handling; Also action messages and PRVs were not being properly ignored, fixed. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	613
663 0b81e5fdc7b5 Use the new io context API. Matti Hamalainen <ccr@tnsp.org> parents: 662 diff changeset	614 void nn_ioctx_errfunc(th_ioctx ctx, const int err, const char msg)
565 de1af9652fef Update to conform to changes in th-libs ioctx API. Matti Hamalainen <ccr@tnsp.org> parents: 564 diff changeset	615 {
de1af9652fef Update to conform to changes in th-libs ioctx API. Matti Hamalainen <ccr@tnsp.org> parents: 564 diff changeset	616 (void) err;
582 8a0c2eb25b35 Adjust certain error message formats slightly. Matti Hamalainen <ccr@tnsp.org> parents: 581 diff changeset	617 errorMsg("[%s:%d] %s",
565 de1af9652fef Update to conform to changes in th-libs ioctx API. Matti Hamalainen <ccr@tnsp.org> parents: 564 diff changeset	618 ctx->filename, ctx->line, msg);
de1af9652fef Update to conform to changes in th-libs ioctx API. Matti Hamalainen <ccr@tnsp.org> parents: 564 diff changeset	619 }
de1af9652fef Update to conform to changes in th-libs ioctx API. Matti Hamalainen <ccr@tnsp.org> parents: 564 diff changeset	620
de1af9652fef Update to conform to changes in th-libs ioctx API. Matti Hamalainen <ccr@tnsp.org> parents: 564 diff changeset	621
663 0b81e5fdc7b5 Use the new io context API. Matti Hamalainen <ccr@tnsp.org> parents: 662 diff changeset	622 void nn_ioctx_msgfunc(th_ioctx ctx, const int level, const char msg)
565 de1af9652fef Update to conform to changes in th-libs ioctx API. Matti Hamalainen <ccr@tnsp.org> parents: 564 diff changeset	623 {
de1af9652fef Update to conform to changes in th-libs ioctx API. Matti Hamalainen <ccr@tnsp.org> parents: 564 diff changeset	624 (void) ctx;
666 1b18551b25e7 Silence a warning about unused function argument. Matti Hamalainen <ccr@tnsp.org> parents: 664 diff changeset	625 (void) level;
565 de1af9652fef Update to conform to changes in th-libs ioctx API. Matti Hamalainen <ccr@tnsp.org> parents: 564 diff changeset	626 printMsgConst(NULL, LOG_STAMP \| LOG_WINDOW \| LOG_FILE, msg);
de1af9652fef Update to conform to changes in th-libs ioctx API. Matti Hamalainen <ccr@tnsp.org> parents: 564 diff changeset	627 }
de1af9652fef Update to conform to changes in th-libs ioctx API. Matti Hamalainen <ccr@tnsp.org> parents: 564 diff changeset	628
de1af9652fef Update to conform to changes in th-libs ioctx API. Matti Hamalainen <ccr@tnsp.org> parents: 564 diff changeset	629
657 8b8ef14d7177 Update to match th-libs API changes. Matti Hamalainen <ccr@tnsp.org> parents: 654 diff changeset	630 BOOL nn_check_name_list(th_llist_t list, const char name)
225 801ac37321f6 Sanitize ignore handling; Also action messages and PRVs were not being properly ignored, fixed. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	631 {
657 8b8ef14d7177 Update to match th-libs API changes. Matti Hamalainen <ccr@tnsp.org> parents: 654 diff changeset	632 th_llist_t *node;
519 f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	633
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	634 for (node = list; node != NULL; node = node->next)
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	635 {
372 b9f0bdad6285 Use th_strcasecmp() and th_strncasecmp(). Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	636 if (th_strcasecmp(name, (char *) node->data) == 0)
225 801ac37321f6 Sanitize ignore handling; Also action messages and PRVs were not being properly ignored, fixed. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	637 return TRUE;
801ac37321f6 Sanitize ignore handling; Also action messages and PRVs were not being properly ignored, fixed. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	638 }
519 f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	639
225 801ac37321f6 Sanitize ignore handling; Also action messages and PRVs were not being properly ignored, fixed. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	640 return FALSE;
801ac37321f6 Sanitize ignore handling; Also action messages and PRVs were not being properly ignored, fixed. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	641 }
801ac37321f6 Sanitize ignore handling; Also action messages and PRVs were not being properly ignored, fixed. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	642
801ac37321f6 Sanitize ignore handling; Also action messages and PRVs were not being properly ignored, fixed. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	643
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	644 int nnproto_parse_user(th_conn_t *conn)
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	645 {
229 08d4355d6fc9 Repair automatic PRV target setting. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	646 BOOL isMine, isIgnored = FALSE;
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	647 char name, msg, *t;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	648
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	649 // Find start of the message
639 02e1307e2a62 API changes in th_network module. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	650 name = conn->base.ptr;
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	651 t = th_conn_buf_strstr(conn, "</USER>");
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	652 if (!t) return 1;
ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	653 *t = 0;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	654
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	655 // Find end of the message
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	656 t = th_conn_buf_strstr(conn, "<MESSAGE>");
430 aaadf6cea6be Better handling of some messages. Matti Hamalainen <ccr@tnsp.org> parents: 429 diff changeset	657 if (!t) return 2;
639 02e1307e2a62 API changes in th_network module. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	658 msg = conn->base.ptr;
430 aaadf6cea6be Better handling of some messages. Matti Hamalainen <ccr@tnsp.org> parents: 429 diff changeset	659
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	660 t = th_conn_buf_strstr(conn, "</MESSAGE>");
229 08d4355d6fc9 Repair automatic PRV target setting. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	661 if (!t) return 3;
08d4355d6fc9 Repair automatic PRV target setting. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	662 *t = 0;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	663
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	664 // Decode message string
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	665 msg = nn_decode_str1(msg);
481 73a648387d10 Improve error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	666 if (!msg)
73a648387d10 Improve error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	667 {
73a648387d10 Improve error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	668 errorMsg("Decode/malloc failure @ nnproto_parse_user()\n");
73a648387d10 Improve error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	669 return -1;
73a648387d10 Improve error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	670 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	671
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	672 // Decode username
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	673 name = nn_decode_str1(name);
ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	674 if (!name)
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	675 {
481 73a648387d10 Improve error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	676 errorMsg("Decode/malloc failure @ nnproto_parse_user()\n");
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	677 th_free(msg);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	678 return -2;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	679 }
229 08d4355d6fc9 Repair automatic PRV target setting. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	680
08d4355d6fc9 Repair automatic PRV target setting. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	681 /* Check if the username is on our ignore list and
08d4355d6fc9 Repair automatic PRV target setting. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	682 * that it is not our OWN username!
08d4355d6fc9 Repair automatic PRV target setting. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	683 */
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	684 isMine = strcmp(name, optUserName) == 0;
620 a1abf812785f Rename a function. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	685 isIgnored = setIgnoreMode && !isMine && nn_check_name_list(setIgnoreList, name);
108 f323b137ca08 Tab-completion now works with cycling, but bugs with names that have whitespaces. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	686
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	687 // Is it a special control message?
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	688 if (*msg == '/')
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	689 {
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	690 // Ignore room join/leave messages
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	691 if (!optDebug && (strstr(msg, "left the room") \|\| strstr(msg, "joined the room from")))
229 08d4355d6fc9 Repair automatic PRV target setting. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	692 goto done;
108 f323b137ca08 Tab-completion now works with cycling, but bugs with names that have whitespaces. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	693
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	694 t = nn_strip_tags(msg + 1);
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	695 if (!strncmp(t, "BPRV ", 5))
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	696 {
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	697 char in_name, tmp, in_msg, h;
293 ff39ebf05b40 Fix unwindowed PRVs. Matti Hamalainen <ccr@tnsp.org> parents: 291 diff changeset	698 nn_window_t *win;
ff39ebf05b40 Fix unwindowed PRVs. Matti Hamalainen <ccr@tnsp.org> parents: 291 diff changeset	699 h = nn_decode_str2(t + 1);
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	700
418 8ca09a6cca09 Minor cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	701 // Check type of
8ca09a6cca09 Minor cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	702 if ((isMine = strncmp(t, "BPRV from ", 10)) == 0)
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	703 in_name = nn_decode_str2(t + 10);
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	704 else
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	705 in_name = nn_decode_str2(t + 8);
291 cc2a1d837e7b Window / buffer functionality works now. Queries work (with few minor glitches). Matti Hamalainen <ccr@tnsp.org> parents: 289 diff changeset	706
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	707 for (tmp = in_name; tmp && tmp != ':'; tmp++);
291 cc2a1d837e7b Window / buffer functionality works now. Queries work (with few minor glitches). Matti Hamalainen <ccr@tnsp.org> parents: 289 diff changeset	708 if (tmp[0] != 0 && tmp[1] == ' ')
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	709 in_msg = tmp + 2;
291 cc2a1d837e7b Window / buffer functionality works now. Queries work (with few minor glitches). Matti Hamalainen <ccr@tnsp.org> parents: 289 diff changeset	710 else
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	711 in_msg = "";
291 cc2a1d837e7b Window / buffer functionality works now. Queries work (with few minor glitches). Matti Hamalainen <ccr@tnsp.org> parents: 289 diff changeset	712 *tmp = 0;
cc2a1d837e7b Window / buffer functionality works now. Queries work (with few minor glitches). Matti Hamalainen <ccr@tnsp.org> parents: 289 diff changeset	713
620 a1abf812785f Rename a function. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	714 if (!optOnlyFriendPrv \|\| !nn_check_name_list(setFriendList, in_name))
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	715 {
620 a1abf812785f Rename a function. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	716 isIgnored = setIgnoreMode && nn_check_name_list(setIgnoreList, in_name);
519 f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	717 win = nnwin_find(in_name);
388 f45673fe6b23 Log private messages always in the PRV format. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	718
519 f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	719 if (win != NULL)
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	720 {
544 e30fa8592a48 Possibly fix logging after latest changes. Matti Hamalainen <ccr@tnsp.org> parents: 542 diff changeset	721 printMsgF(win, isIgnored ? LOG_FILE : (LOG_FILE \| LOG_WINDOW),
519 f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	722 "½5½<½%d½%s½5½>½0½ %s\n",
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	723 isMine ? 14 : 15, isMine ? optUserName : in_name, in_msg);
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	724
544 e30fa8592a48 Possibly fix logging after latest changes. Matti Hamalainen <ccr@tnsp.org> parents: 542 diff changeset	725 printMsgF(NULL, LOG_FILE2, "½11½%s½0½\n", h);
519 f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	726 }
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	727 else
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	728 {
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	729 printMsgF(NULL, isIgnored ? LOG_FILE : (LOG_WINDOW \| LOG_FILE),
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	730 "½11½%s½0½\n", h);
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	731 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	732 }
519 f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	733
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	734 th_free(in_name);
293 ff39ebf05b40 Fix unwindowed PRVs. Matti Hamalainen <ccr@tnsp.org> parents: 291 diff changeset	735 th_free(h);
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	736 }
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	737 else
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	738 {
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	739 // It's an action (/me)
291 cc2a1d837e7b Window / buffer functionality works now. Queries work (with few minor glitches). Matti Hamalainen <ccr@tnsp.org> parents: 289 diff changeset	740 char *h = nn_decode_str2(t);
322 b9c15c57dc8f Clean up message functions, add new printMsgQ() helper function for messages that should not Matti Hamalainen <ccr@tnsp.org> parents: 321 diff changeset	741 printMsgF(NULL, isIgnored ? LOG_FILE : (LOG_WINDOW \| LOG_FILE),
b9c15c57dc8f Clean up message functions, add new printMsgQ() helper function for messages that should not Matti Hamalainen <ccr@tnsp.org> parents: 321 diff changeset	742 "½9½* %s½0½\n", h);
291 cc2a1d837e7b Window / buffer functionality works now. Queries work (with few minor glitches). Matti Hamalainen <ccr@tnsp.org> parents: 289 diff changeset	743 th_free(h);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	744 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	745 th_free(t);
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	746 }
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	747 else
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	748 {
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	749 // It's a normal message
291 cc2a1d837e7b Window / buffer functionality works now. Queries work (with few minor glitches). Matti Hamalainen <ccr@tnsp.org> parents: 289 diff changeset	750 char *h;
530 f0bca971170b Change coloring to use friend list as well. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	751 int colorNick, colorText;
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	752 t = nn_strip_tags(msg);
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	753 h = nn_decode_str2(t);
530 f0bca971170b Change coloring to use friend list as well. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	754 if (isMine)
f0bca971170b Change coloring to use friend list as well. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	755 {
f0bca971170b Change coloring to use friend list as well. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	756 colorNick = 14;
f0bca971170b Change coloring to use friend list as well. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	757 colorText = 0;
f0bca971170b Change coloring to use friend list as well. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	758 }
f0bca971170b Change coloring to use friend list as well. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	759 else
f0bca971170b Change coloring to use friend list as well. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	760 {
620 a1abf812785f Rename a function. Matti Hamalainen <ccr@tnsp.org> parents: 618 diff changeset	761 if (nn_check_name_list(setFriendList, name))
530 f0bca971170b Change coloring to use friend list as well. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	762 {
535 379e361f1144 Fix various segfault issues. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	763 colorNick = 11;
379e361f1144 Fix various segfault issues. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	764 colorText = 0;
530 f0bca971170b Change coloring to use friend list as well. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	765 }
f0bca971170b Change coloring to use friend list as well. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	766 else
f0bca971170b Change coloring to use friend list as well. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	767 {
f0bca971170b Change coloring to use friend list as well. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	768 colorNick = 15;
f0bca971170b Change coloring to use friend list as well. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	769 colorText = 0;
f0bca971170b Change coloring to use friend list as well. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	770 }
f0bca971170b Change coloring to use friend list as well. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	771 }
f0bca971170b Change coloring to use friend list as well. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	772
322 b9c15c57dc8f Clean up message functions, add new printMsgQ() helper function for messages that should not Matti Hamalainen <ccr@tnsp.org> parents: 321 diff changeset	773 printMsgF(NULL, isIgnored ? LOG_FILE : (LOG_WINDOW \| LOG_FILE),
530 f0bca971170b Change coloring to use friend list as well. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	774 "½5½<½%d½%s½5½>½%d½ %s½0½\n", colorNick, name, colorText, h);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	775 th_free(h);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	776 th_free(t);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	777 }
108 f323b137ca08 Tab-completion now works with cycling, but bugs with names that have whitespaces. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	778
229 08d4355d6fc9 Repair automatic PRV target setting. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	779 done:
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	780 th_free(msg);
ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	781 th_free(name);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	782 return 0;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	783 }
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	784
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	785
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	786 int nnproto_parse_login(th_conn_t *conn)
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	787 {
156 0a9fe14882dc Introduce utility function getTimeStamp() and use it to lessen code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	788 char tmpStr[256];
403 7bec02f382fb Refactor the connection and protocol handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	789 str_get_timestamp(tmpStr, sizeof(tmpStr), "%c");
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	790
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	791 if (!th_conn_buf_strcmp(conn, "FAILURE>"))
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	792 {
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	793 th_conn_buf_strstr(conn, "</LOGIN_FAILURE>");
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	794 th_conn_buf_strstr(conn, "</USER>");
288 e7ef3db3b954 Implement "windows" in the chat. Only main window used for now, and even Matti Hamalainen <ccr@tnsp.org> parents: 280 diff changeset	795 printMsg(NULL, "½1½Login failure½0½ - ½3½%s½0½\n", tmpStr);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	796 return -2;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	797 }
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	798 else if (!th_conn_buf_strcmp(conn, "SUCCESS>"))
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	799 {
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	800 th_conn_buf_strstr(conn, "</LOGIN_SUCCESS>");
bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	801 th_conn_buf_strstr(conn, "</USER>");
288 e7ef3db3b954 Implement "windows" in the chat. Only main window used for now, and even Matti Hamalainen <ccr@tnsp.org> parents: 280 diff changeset	802 printMsg(NULL, "½2½Login success½0½ - ½3½%s½0½\n", tmpStr);
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	803 nn_conn_send_msg(conn, optUserNameEnc, "%2FRequestUserList");
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	804 return 0;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	805 }
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	806 else
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	807 return 1;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	808 }
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	809
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	810
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	811 int nnproto_parse_add_user(th_conn_t *conn)
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	812 {
639 02e1307e2a62 API changes in th_network module. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	813 char p, s, *str = conn->base.ptr;
297 d34910f1b1e1 Print messages about user leaving or joining the chat in the specific buffer, too. Matti Hamalainen <ccr@tnsp.org> parents: 293 diff changeset	814 nn_window_t *win;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	815
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	816 s = th_conn_buf_strstr(conn, "</ADD_USER>");
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	817 if (!s) return 1;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	818 *s = 0;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	819
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	820 p = nn_dbldecode_str(str);
481 73a648387d10 Improve error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	821 if (!p)
73a648387d10 Improve error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	822 {
73a648387d10 Improve error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	823 errorMsg("Decode/malloc failure @ nnproto_parse_add_user()\n");
73a648387d10 Improve error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	824 return -1;
73a648387d10 Improve error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	825 }
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	826
422 8eb2839a565c Rename various functions. Matti Hamalainen <ccr@tnsp.org> parents: 421 diff changeset	827 win = nnwin_find(p);
288 e7ef3db3b954 Implement "windows" in the chat. Only main window used for now, and even Matti Hamalainen <ccr@tnsp.org> parents: 280 diff changeset	828 nn_userhash_insert(nnUsers, nn_username_encode(p));
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	829
654 9c2ae1b96674 Change messages for join/part. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	830 printMsg(NULL, "! ½3½%s½0½ ½2½JOINED.½0½\n", p);
297 d34910f1b1e1 Print messages about user leaving or joining the chat in the specific buffer, too. Matti Hamalainen <ccr@tnsp.org> parents: 293 diff changeset	831 if (win != NULL)
d34910f1b1e1 Print messages about user leaving or joining the chat in the specific buffer, too. Matti Hamalainen <ccr@tnsp.org> parents: 293 diff changeset	832 printMsg(win, "! ½3½%s½0½ ½2½joined the chat.½0½\n", p);
d34910f1b1e1 Print messages about user leaving or joining the chat in the specific buffer, too. Matti Hamalainen <ccr@tnsp.org> parents: 293 diff changeset	833
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	834 th_free(p);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	835 return 0;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	836 }
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	837
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	838
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	839 int nnproto_parse_delete_user(th_conn_t *conn)
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	840 {
639 02e1307e2a62 API changes in th_network module. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	841 char p, s, *str = conn->base.ptr;
297 d34910f1b1e1 Print messages about user leaving or joining the chat in the specific buffer, too. Matti Hamalainen <ccr@tnsp.org> parents: 293 diff changeset	842 nn_window_t *win;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	843
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	844 s = th_conn_buf_strstr(conn, "</DELETE_USER>");
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	845 if (!s) return 1;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	846 *s = 0;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	847
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	848 p = nn_dbldecode_str(str);
481 73a648387d10 Improve error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	849 if (!p)
73a648387d10 Improve error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	850 {
73a648387d10 Improve error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	851 errorMsg("Decode/malloc failure @ nnproto_parse_delete_user()\n");
73a648387d10 Improve error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	852 return -1;
73a648387d10 Improve error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	853 }
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	854
422 8eb2839a565c Rename various functions. Matti Hamalainen <ccr@tnsp.org> parents: 421 diff changeset	855 win = nnwin_find(p);
288 e7ef3db3b954 Implement "windows" in the chat. Only main window used for now, and even Matti Hamalainen <ccr@tnsp.org> parents: 280 diff changeset	856 nn_userhash_delete(nnUsers, nn_username_encode(p));
107 8037a3a7e491 Implement username tab-completion. It's still buggy, tho. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	857
654 9c2ae1b96674 Change messages for join/part. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	858 printMsg(NULL, "! ½3½%s½0½ ½1½LEFT.½0½\n", p);
297 d34910f1b1e1 Print messages about user leaving or joining the chat in the specific buffer, too. Matti Hamalainen <ccr@tnsp.org> parents: 293 diff changeset	859 if (win != NULL)
d34910f1b1e1 Print messages about user leaving or joining the chat in the specific buffer, too. Matti Hamalainen <ccr@tnsp.org> parents: 293 diff changeset	860 printMsg(win, "! ½3½%s½0½ ½1½left the chat.½0½\n", p);
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	861
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	862 th_free(p);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	863 return 0;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	864 }
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	865
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	866
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	867 int nnproto_parse_num_clients(th_conn_t *conn)
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	868 {
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	869 th_conn_buf_strstr(conn, "</NUMCLIENTS>");
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	870 return 0;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	871 }
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	872
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	873
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	874 int nnproto_parse_boot(th_conn_t *conn)
96 7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	875 {
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	876 (void) conn;
96 7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	877 errorMsg("Booted by server.\n");
7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	878 return -1;
7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	879 }
7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	880
7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	881
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	882 typedef struct
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	883 {
443 96cb82ebb93b Rename a structure member. Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	884 char *name;
431 a9b20b31cae1 More code cleanups, this time using clang with excessive warnings enabled. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	885 size_t len;
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	886 int (handler)(th_conn_t );
403 7bec02f382fb Refactor the connection and protocol handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	887 } nn_protocolcmd_t;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	888
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	889
403 7bec02f382fb Refactor the connection and protocol handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	890 static nn_protocolcmd_t protoCmds[] =
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	891 {
431 a9b20b31cae1 More code cleanups, this time using clang with excessive warnings enabled. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	892 { "<USER>", 0, nnproto_parse_user },
a9b20b31cae1 More code cleanups, this time using clang with excessive warnings enabled. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	893 { "<LOGIN_", 0, nnproto_parse_login },
a9b20b31cae1 More code cleanups, this time using clang with excessive warnings enabled. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	894 { "<DELETE_USER>", 0, nnproto_parse_delete_user },
a9b20b31cae1 More code cleanups, this time using clang with excessive warnings enabled. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	895 { "<ADD_USER>", 0, nnproto_parse_add_user },
a9b20b31cae1 More code cleanups, this time using clang with excessive warnings enabled. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	896 { "<NUMCLIENTS>", 0, nnproto_parse_num_clients },
a9b20b31cae1 More code cleanups, this time using clang with excessive warnings enabled. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	897 { "<BOOT />", 0, nnproto_parse_boot },
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	898 };
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	899
108 f323b137ca08 Tab-completion now works with cycling, but bugs with names that have whitespaces. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	900 static const int nprotoCmds = sizeof(protoCmds) / sizeof(protoCmds[0]);
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	901
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	902
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	903 int nn_parse_protocol(th_conn_t *conn)
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	904 {
130 352ec3c300e4 A different initialization. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	905 static BOOL protoCmdsInit = FALSE;
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	906 int i;
130 352ec3c300e4 A different initialization. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	907
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	908 if (!protoCmdsInit)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	909 {
130 352ec3c300e4 A different initialization. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	910 for (i = 0; i < nprotoCmds; i++)
443 96cb82ebb93b Rename a structure member. Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	911 protoCmds[i].len = strlen(protoCmds[i].name);
403 7bec02f382fb Refactor the connection and protocol handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	912
130 352ec3c300e4 A different initialization. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	913 protoCmdsInit = TRUE;
352ec3c300e4 A different initialization. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	914 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	915
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	916 for (i = 0; i < nprotoCmds; i++)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	917 {
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	918 if (!th_conn_buf_strncmp(conn, protoCmds[i].name, protoCmds[i].len))
403 7bec02f382fb Refactor the connection and protocol handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	919 return protoCmds[i].handler(conn);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	920 }
162 e59cec397811 Add a debug mode option (commandline) and enable certain features when we are in debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	921
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	922 if (optDebug)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	923 {
639 02e1307e2a62 API changes in th_network module. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	924 printMsg(NULL, "Unknown protocmd: \"%s\"\n", conn->base.ptr);
162 e59cec397811 Add a debug mode option (commandline) and enable certain features when we are in debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	925 return 0;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	926 }
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	927 else
162 e59cec397811 Add a debug mode option (commandline) and enable certain features when we are in debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	928 return 1;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	929 }
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	930
402 563a70e8a303 Oops, these functions were moved/renamed and were left out from a previous commit. :\| Matti Hamalainen <ccr@tnsp.org> parents: 401 diff changeset	931
474 4ddc3d87242e Refactor web-browser launching into nn_open_uri(). Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	932 int nn_open_uri(const char *uri)
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	933 {
661 eb3692d85ac2 Use TH_PLAT_WINDOWS for preprocessor conditionals. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	934 #ifdef TH_PLAT_WINDOWS
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	935 HINSTANCE status;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	936
442 ecbd9773c74b Minor win32 build fix. Matti Hamalainen <ccr@tnsp.org> parents: 439 diff changeset	937 status = ShellExecute(NULL, "open", uri, NULL, NULL, SW_SHOWNA);
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	938 if (status <= (HINSTANCE) 32)
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	939 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	940 printMsgQ(currWin, "Could not launch default web browser: %d\n", status);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	941 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	942 #else
474 4ddc3d87242e Refactor web-browser launching into nn_open_uri(). Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	943 int status;
4ddc3d87242e Refactor web-browser launching into nn_open_uri(). Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	944 int fds[2];
4ddc3d87242e Refactor web-browser launching into nn_open_uri(). Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	945 pid_t pid;
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	946
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	947 if (pipe(fds) == -1)
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	948 {
621 29b8ff5b625b Use th_get_error() and th_error_str(). Matti Hamalainen <ccr@tnsp.org> parents: 620 diff changeset	949 int ret = th_get_error();
29b8ff5b625b Use th_get_error() and th_error_str(). Matti Hamalainen <ccr@tnsp.org> parents: 620 diff changeset	950 printMsgQ(currWin, "Could not open process communication pipe! (%d, %s)\n",
29b8ff5b625b Use th_get_error() and th_error_str(). Matti Hamalainen <ccr@tnsp.org> parents: 620 diff changeset	951 ret, th_error_str(ret));
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	952 return 0;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	953 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	954
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	955 if ((pid = fork()) < 0)
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	956 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	957 printMsgQ(currWin, "Could not create sub-process!\n");
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	958 }
652 58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	959 else
58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	960 if (pid == 0)
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	961 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	962 dup2(fds[1], STDOUT_FILENO);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	963 dup2(fds[0], STDERR_FILENO);
652 58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	964 switch (optBrowserRunMethod)
58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	965 {
58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	966 case BMT_NEW_FIREFOX:
58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	967 // Newer method, supported by new-ish versions of Firefox
58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	968 execlp(setBrowser, setBrowser, "-new-tab", uri, (void *)NULL);
58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	969 break;
58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	970
58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	971 default:
58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	972 // Default old method
58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	973 {
58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	974 char *url = th_strdup_printf("openurl(%s,new-tab)", uri);
58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	975 execlp(setBrowser, setBrowser, "-remote", url, (void *)NULL);
58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	976 th_free(url);
58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	977 }
58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	978 }
58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	979
621 29b8ff5b625b Use th_get_error() and th_error_str(). Matti Hamalainen <ccr@tnsp.org> parents: 620 diff changeset	980 _exit(th_get_error());
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	981 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	982
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	983 wait(&status);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	984 #endif
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	985
474 4ddc3d87242e Refactor web-browser launching into nn_open_uri(). Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	986 return 0;
4ddc3d87242e Refactor web-browser launching into nn_open_uri(). Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	987 }
4ddc3d87242e Refactor web-browser launching into nn_open_uri(). Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	988
516 08bbd850e2dc Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 515 diff changeset	989
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	990 int nncmd_send_raw(th_conn_t conn, char str)
603 0a30bf8db004 Add new command /raw for sending only once encoded data. Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	991 {
0a30bf8db004 Add new command /raw for sending only once encoded data. Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	992 #if 1
0a30bf8db004 Add new command /raw for sending only once encoded data. Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	993 char *tmp = nn_encode_str1(str);
0a30bf8db004 Add new command /raw for sending only once encoded data. Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	994 if (tmp == NULL) return -2;
0a30bf8db004 Add new command /raw for sending only once encoded data. Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	995 nn_conn_send_msg(conn, optUserNameEnc, tmp);
0a30bf8db004 Add new command /raw for sending only once encoded data. Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	996 th_free(tmp);
0a30bf8db004 Add new command /raw for sending only once encoded data. Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	997 #else
0a30bf8db004 Add new command /raw for sending only once encoded data. Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	998 nn_conn_send_msg(conn, optUserNameEnc, str);
0a30bf8db004 Add new command /raw for sending only once encoded data. Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	999 #endif
0a30bf8db004 Add new command /raw for sending only once encoded data. Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	1000
0a30bf8db004 Add new command /raw for sending only once encoded data. Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	1001 return 0;
0a30bf8db004 Add new command /raw for sending only once encoded data. Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	1002 }
0a30bf8db004 Add new command /raw for sending only once encoded data. Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	1003
0a30bf8db004 Add new command /raw for sending only once encoded data. Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	1004
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	1005 int nncmd_open_profile(th_conn_t conn, char name)
474 4ddc3d87242e Refactor web-browser launching into nn_open_uri(). Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	1006 {
4ddc3d87242e Refactor web-browser launching into nn_open_uri(). Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	1007 char *enc_name = nn_encode_str1(name);
4ddc3d87242e Refactor web-browser launching into nn_open_uri(). Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	1008 char *uri = th_strdup_printf(SET_PROFILE_PREFIX, name);
4ddc3d87242e Refactor web-browser launching into nn_open_uri(). Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	1009 (void) conn;
4ddc3d87242e Refactor web-browser launching into nn_open_uri(). Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	1010
4ddc3d87242e Refactor web-browser launching into nn_open_uri(). Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	1011 printMsg(currWin, "Opening profile for: '%s'\n", name);
4ddc3d87242e Refactor web-browser launching into nn_open_uri(). Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	1012
4ddc3d87242e Refactor web-browser launching into nn_open_uri(). Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	1013 nn_open_uri(uri);
4ddc3d87242e Refactor web-browser launching into nn_open_uri(). Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	1014
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1015 th_free(uri);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1016 th_free(enc_name);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1017 return 0;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1018 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1019
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1020
657 8b8ef14d7177 Update to match th-libs API changes. Matti Hamalainen <ccr@tnsp.org> parents: 654 diff changeset	1021 int nncmd_change_list(th_conn_t conn, const char listname, th_llist_t *list, const char name)
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1022 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1023 (void) conn;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1024
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1025 if (name[0])
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1026 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1027 // Add or remove someone to/from ignore
657 8b8ef14d7177 Update to match th-libs API changes. Matti Hamalainen <ccr@tnsp.org> parents: 654 diff changeset	1028 th_llist_t user = th_llist_find_func(list, name, str_compare);
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1029 if (user != NULL)
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1030 {
519 f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	1031 printMsgQ(currWin, "Removed user '%s' from %s list.\n", name, listname);
531 5d1a832d6e61 Fix removing from lists. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	1032 th_llist_delete_node(list, user);
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1033 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1034 else
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1035 {
519 f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	1036 printMsgQ(currWin, "Added '%s' to %s list.\n", name, listname);
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	1037 th_llist_append(list, th_strdup(name));
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1038 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1039 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1040 else
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1041 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1042 // Just list whomever is in ignore now
657 8b8ef14d7177 Update to match th-libs API changes. Matti Hamalainen <ccr@tnsp.org> parents: 654 diff changeset	1043 th_llist_t user = list;
519 f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	1044 size_t nuser = th_llist_length(*list);
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	1045 char *result = th_strdup_printf("Users on %s list (%d): ", listname, nuser);
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1046 while (user != NULL)
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1047 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1048 if (user->data != NULL)
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1049 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1050 th_pstr_printf(&result, "%s'%s'", result, (char *) user->data);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1051 if (--nuser > 0)
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1052 th_pstr_printf(&result, "%s, ", result);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1053 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1054 user = user->next;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1055 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1056 printMsgQ(currWin, "%s\n", result);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1057 th_free(result);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1058 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1059
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1060 return 0;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1061 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1062
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1063
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	1064 int nncmd_ignore(th_conn_t conn, char name)
519 f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	1065 {
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	1066 return nncmd_change_list(conn, "ignore", &setIgnoreList, name);
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	1067 }
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	1068
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	1069
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	1070 int nncmd_friend(th_conn_t conn, char name)
519 f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	1071 {
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	1072 return nncmd_change_list(conn, "friend", &setFriendList, name);
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	1073 }
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	1074
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	1075
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	1076 int nncmd_set_color(th_conn_t conn, char arg)
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1077 {
690 6fa9c36d0634 Adjust to match th-libs API changes. Matti Hamalainen <ccr@tnsp.org> parents: 689 diff changeset	1078 unsigned int val;
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1079 (void) conn;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1080
690 6fa9c36d0634 Adjust to match th-libs API changes. Matti Hamalainen <ccr@tnsp.org> parents: 689 diff changeset	1081 if (!th_get_hex_triplet(arg, &val))
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1082 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1083 printMsgQ(currWin, "Invalid color value '%s'\n", arg);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1084 return 1;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1085 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1086
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1087 optUserColor = val;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1088 printMsgQ(currWin, "Setting color to #%06x\n", optUserColor);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1089 nn_conn_send_msg_v(conn, optUserNameEnc, "%%2FSetFontColor%%20%%2Dcolor%%20%06X", optUserColor);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1090 return 0;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1091 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1092
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1093
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	1094 int nncmd_open_query(th_conn_t conn, char name)
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1095 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1096 (void) conn;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1097
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1098 if (name[0])
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1099 {
446 3396acd40147 Rename and remove some functions. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1100 nn_user_t *user = nn_userhash_find(nnUsers, nn_username_encode(name));
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1101 if (user != NULL)
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1102 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1103 name = nn_username_decode(th_strdup(user->name));
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1104 printMsgQ(currWin, "Opening PRV query for '%s'.\n", name);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1105 if (nnwin_open(name, TRUE))
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1106 printMsgQ(currWin, "In PRV query with '%s'.\n", name);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1107 th_free(name);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1108 return 0;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1109 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1110 else
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1111 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1112 printMsgQ(currWin, "Could not find username '%s'.\n", name);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1113 return 1;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1114 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1115 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1116 else
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1117 {
472 53179f875131 Combine some prints. Matti Hamalainen <ccr@tnsp.org> parents: 468 diff changeset	1118 printMsgQ(currWin,
53179f875131 Combine some prints. Matti Hamalainen <ccr@tnsp.org> parents: 468 diff changeset	1119 "Usage: /query username\n"
53179f875131 Combine some prints. Matti Hamalainen <ccr@tnsp.org> parents: 468 diff changeset	1120 "To close a PRV query, use /close [username]\n"
53179f875131 Combine some prints. Matti Hamalainen <ccr@tnsp.org> parents: 468 diff changeset	1121 "/close without username will close the current PRV window, if any.\n");
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1122 return 1;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1123 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1124 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1125
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1126
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	1127 int nncmd_close_query(th_conn_t conn, char name)
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1128 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1129 (void) conn;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1130
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1131 if (name[0])
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1132 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1133 nn_window_t *win = nnwin_find(name);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1134 if (win != NULL)
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1135 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1136 nnwin_close(win);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1137 printMsgQ(currWin, "Closed PRV query to '%s'.\n", name);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1138 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1139 else
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1140 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1141 printMsgQ(currWin, "No PRV query by name '%s'.\n", name);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1142 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1143 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1144 else
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1145 {
466 796508f828f6 Refactor much of the "windowing" UI code into a new module, ui.[ch] Matti Hamalainen <ccr@tnsp.org> parents: 464 diff changeset	1146 if (currWin != nnwin_main_window())
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1147 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1148 nnwin_close(currWin);
466 796508f828f6 Refactor much of the "windowing" UI code into a new module, ui.[ch] Matti Hamalainen <ccr@tnsp.org> parents: 464 diff changeset	1149 currWin = nnwin_main_window();
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1150 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1151 else
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1152 {
472 53179f875131 Combine some prints. Matti Hamalainen <ccr@tnsp.org> parents: 468 diff changeset	1153 printMsgQ(currWin,
53179f875131 Combine some prints. Matti Hamalainen <ccr@tnsp.org> parents: 468 diff changeset	1154 "Usage: /close [username]\n"
53179f875131 Combine some prints. Matti Hamalainen <ccr@tnsp.org> parents: 468 diff changeset	1155 "/close without username will close the current PRV window. if any.\n");
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1156 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1157 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1158
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1159 return 0;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1160 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1161
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1162
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	1163 int nncmd_window_info(th_conn_t conn, char arg)
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1164 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1165 (void) conn;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1166
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1167 if (arg[0])
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1168 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1169 int val = atoi(arg);
466 796508f828f6 Refactor much of the "windowing" UI code into a new module, ui.[ch] Matti Hamalainen <ccr@tnsp.org> parents: 464 diff changeset	1170 nn_window_t *win = nnwin_get(val);
796508f828f6 Refactor much of the "windowing" UI code into a new module, ui.[ch] Matti Hamalainen <ccr@tnsp.org> parents: 464 diff changeset	1171 if (win != NULL)
796508f828f6 Refactor much of the "windowing" UI code into a new module, ui.[ch] Matti Hamalainen <ccr@tnsp.org> parents: 464 diff changeset	1172 currWin = win;
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1173 else
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1174 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1175 printMsgQ(currWin, "Invalid window number '%s'\n", arg);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1176 return 1;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1177 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1178 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1179 else
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1180 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1181 printMsgQ(currWin, "Window : #%d\n", currWin->num);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1182 printMsgQ(currWin, "ID : %s\n", currWin->id);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1183 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1184 return 0;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1185 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1186
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1187
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	1188 int nncmd_list_all_users(th_conn_t conn, char buf)
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1189 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1190 (void) buf;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1191
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1192 // Alias /listallusers
425 143fd51048a9 Fix /list command. Matti Hamalainen <ccr@tnsp.org> parents: 424 diff changeset	1193 return nn_conn_send_msg(conn, optUserNameEnc, "%2Flistallusers");
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1194 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1195
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1196
486 d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1197 #define NAME_NUM_PER_LINE 3
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1198 #define NAME_ENTRY_SIZE 64
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1199 #define NAME_ENTRY_WIDTH 22
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1200
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1201 typedef struct
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1202 {
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1203 char buf[(NAME_NUM_PER_LINE * NAME_ENTRY_SIZE) + 16];
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1204 size_t offs;
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1205 int i, total;
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1206 } nncmd_namedata_t;
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1207
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1208
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1209 static int nncmd_names_do(const nn_user_t user, void data)
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1210 {
486 d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1211 nncmd_namedata_t *d = data;
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1212 char name[NAME_ENTRY_SIZE];
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1213 size_t len;
538 ffacb78d9b9f Add colorization of usernames on userlist based on friend/ignore status. Matti Hamalainen <ccr@tnsp.org> parents: 536 diff changeset	1214 int color;
486 d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1215
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	1216 if (nn_check_name_list(setFriendList, user->name))
538 ffacb78d9b9f Add colorization of usernames on userlist based on friend/ignore status. Matti Hamalainen <ccr@tnsp.org> parents: 536 diff changeset	1217 color = 11;
ffacb78d9b9f Add colorization of usernames on userlist based on friend/ignore status. Matti Hamalainen <ccr@tnsp.org> parents: 536 diff changeset	1218 else
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	1219 if (nn_check_name_list(setIgnoreList, user->name))
538 ffacb78d9b9f Add colorization of usernames on userlist based on friend/ignore status. Matti Hamalainen <ccr@tnsp.org> parents: 536 diff changeset	1220 color = 1;
ffacb78d9b9f Add colorization of usernames on userlist based on friend/ignore status. Matti Hamalainen <ccr@tnsp.org> parents: 536 diff changeset	1221 else
ffacb78d9b9f Add colorization of usernames on userlist based on friend/ignore status. Matti Hamalainen <ccr@tnsp.org> parents: 536 diff changeset	1222 color = 3;
ffacb78d9b9f Add colorization of usernames on userlist based on friend/ignore status. Matti Hamalainen <ccr@tnsp.org> parents: 536 diff changeset	1223
ffacb78d9b9f Add colorization of usernames on userlist based on friend/ignore status. Matti Hamalainen <ccr@tnsp.org> parents: 536 diff changeset	1224 snprintf(name, sizeof(name), "[½%d½%-20s½0½] ", color, user->name);
486 d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1225
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1226 d->total++;
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1227 if (d->i >= NAME_NUM_PER_LINE)
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1228 {
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1229 printMsgQ(currWin, "%s\n", d->buf);
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1230 d->i = 0;
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1231 d->offs = 0;
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1232 }
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1233
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1234 len = strlen(name);
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1235 memcpy(d->buf + d->offs, name, len + 1);
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1236 d->offs += len;
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1237 d->i++;
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1238
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1239 return 0;
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1240 }
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1241
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1242
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	1243 int nncmd_names(th_conn_t conn, char arg)
486 d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1244 {
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1245 nncmd_namedata_t data;
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1246 (void) conn;
486 d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1247 (void) arg;
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1248
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1249 printMsgQ(currWin, "Users:\n");
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1250 data.i = data.total = 0;
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1251 data.offs = 0;
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1252
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1253 nn_userhash_foreach(nnUsers, nncmd_names_do, &data);
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1254
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1255 if (data.i > 0)
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1256 {
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1257 printMsgQ(currWin, "%s\n", data.buf);
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1258 }
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1259
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1260 printMsgQ(currWin, "%d users total.\n", data.total);
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1261 return 0;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1262 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1263
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1264
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	1265 int nncmd_save_config(th_conn_t conn, char buf)
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1266 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1267 (void) conn;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1268 (void) buf;
663 0b81e5fdc7b5 Use the new io context API. Matti Hamalainen <ccr@tnsp.org> parents: 662 diff changeset	1269 th_ioctx *ctx = NULL;
556 9b72d0060b85 Create configuration and log files with reduced permissions (rw for user Matti Hamalainen <ccr@tnsp.org> parents: 555 diff changeset	1270 int cfgfd = -1;
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1271
664 87ef546de419 Create configuration directory path if it does not yet exist when saving Matti Hamalainen <ccr@tnsp.org> parents: 663 diff changeset	1272 if (!th_mkdir_path(setConfigDir, 0))
87ef546de419 Create configuration directory path if it does not yet exist when saving Matti Hamalainen <ccr@tnsp.org> parents: 663 diff changeset	1273 {
87ef546de419 Create configuration directory path if it does not yet exist when saving Matti Hamalainen <ccr@tnsp.org> parents: 663 diff changeset	1274 printMsgQ(currWin, "Could not create configuration file directory '%s'.\n",
87ef546de419 Create configuration directory path if it does not yet exist when saving Matti Hamalainen <ccr@tnsp.org> parents: 663 diff changeset	1275 setConfigDir);
87ef546de419 Create configuration directory path if it does not yet exist when saving Matti Hamalainen <ccr@tnsp.org> parents: 663 diff changeset	1276 goto error;
87ef546de419 Create configuration directory path if it does not yet exist when saving Matti Hamalainen <ccr@tnsp.org> parents: 663 diff changeset	1277 }
87ef546de419 Create configuration directory path if it does not yet exist when saving Matti Hamalainen <ccr@tnsp.org> parents: 663 diff changeset	1278
663 0b81e5fdc7b5 Use the new io context API. Matti Hamalainen <ccr@tnsp.org> parents: 662 diff changeset	1279 if ((ctx = th_io_new(&th_stdio_io_ops, setConfigFile)) == NULL)
561 1ff9e85a1fcc Rework the configuration file loading and saving to use the I/O context and new th-config API. Matti Hamalainen <ccr@tnsp.org> parents: 560 diff changeset	1280 {
1ff9e85a1fcc Rework the configuration file loading and saving to use the I/O context and new th-config API. Matti Hamalainen <ccr@tnsp.org> parents: 560 diff changeset	1281 printMsgQ(currWin, "Could not initialize I/O context for configuration file writing!\n");
1ff9e85a1fcc Rework the configuration file loading and saving to use the I/O context and new th-config API. Matti Hamalainen <ccr@tnsp.org> parents: 560 diff changeset	1282 goto error;
1ff9e85a1fcc Rework the configuration file loading and saving to use the I/O context and new th-config API. Matti Hamalainen <ccr@tnsp.org> parents: 560 diff changeset	1283 }
1ff9e85a1fcc Rework the configuration file loading and saving to use the I/O context and new th-config API. Matti Hamalainen <ccr@tnsp.org> parents: 560 diff changeset	1284
663 0b81e5fdc7b5 Use the new io context API. Matti Hamalainen <ccr@tnsp.org> parents: 662 diff changeset	1285 th_io_set_handlers(ctx, nn_ioctx_errfunc, nn_ioctx_msgfunc);
0b81e5fdc7b5 Use the new io context API. Matti Hamalainen <ccr@tnsp.org> parents: 662 diff changeset	1286
672 c7a24acb3620 Fix Windows builds. Matti Hamalainen <ccr@tnsp.org> parents: 670 diff changeset	1287 if ((cfgfd = open(ctx->filename, O_CREAT \| O_TRUNC \| O_WRONLY,
663 0b81e5fdc7b5 Use the new io context API. Matti Hamalainen <ccr@tnsp.org> parents: 662 diff changeset	1288 #ifdef TH_PLAT_WINDOWS
672 c7a24acb3620 Fix Windows builds. Matti Hamalainen <ccr@tnsp.org> parents: 670 diff changeset	1289 0
556 9b72d0060b85 Create configuration and log files with reduced permissions (rw for user Matti Hamalainen <ccr@tnsp.org> parents: 555 diff changeset	1290 #else
672 c7a24acb3620 Fix Windows builds. Matti Hamalainen <ccr@tnsp.org> parents: 670 diff changeset	1291 S_IRUSR \| S_IWUSR
c7a24acb3620 Fix Windows builds. Matti Hamalainen <ccr@tnsp.org> parents: 670 diff changeset	1292 #endif
c7a24acb3620 Fix Windows builds. Matti Hamalainen <ccr@tnsp.org> parents: 670 diff changeset	1293 )) == -1 \|\|
663 0b81e5fdc7b5 Use the new io context API. Matti Hamalainen <ccr@tnsp.org> parents: 662 diff changeset	1294 (ctx->data = (void *) fdopen(cfgfd, "w")) == NULL)
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1295 {
621 29b8ff5b625b Use th_get_error() and th_error_str(). Matti Hamalainen <ccr@tnsp.org> parents: 620 diff changeset	1296 int err = th_get_error();
556 9b72d0060b85 Create configuration and log files with reduced permissions (rw for user Matti Hamalainen <ccr@tnsp.org> parents: 555 diff changeset	1297 printMsgQ(currWin, "Could not create configuration to file '%s', %d: %s\n",
663 0b81e5fdc7b5 Use the new io context API. Matti Hamalainen <ccr@tnsp.org> parents: 662 diff changeset	1298 ctx->filename, err, th_error_str(err));
556 9b72d0060b85 Create configuration and log files with reduced permissions (rw for user Matti Hamalainen <ccr@tnsp.org> parents: 555 diff changeset	1299 goto error;
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1300 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1301
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1302 printMsgQ(currWin, "Configuration saved in file '%s', res=%d\n",
663 0b81e5fdc7b5 Use the new io context API. Matti Hamalainen <ccr@tnsp.org> parents: 662 diff changeset	1303 ctx->filename, th_cfg_write(ctx, cfg));
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1304
556 9b72d0060b85 Create configuration and log files with reduced permissions (rw for user Matti Hamalainen <ccr@tnsp.org> parents: 555 diff changeset	1305 error:
663 0b81e5fdc7b5 Use the new io context API. Matti Hamalainen <ccr@tnsp.org> parents: 662 diff changeset	1306 th_io_free(ctx);
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1307 return 0;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1308 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1309
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1310
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	1311 int nncmd_quit(th_conn_t conn, char buf)
573 699147b1bbbc Add a new command /quit. Matti Hamalainen <ccr@tnsp.org> parents: 572 diff changeset	1312 {
699147b1bbbc Add a new command /quit. Matti Hamalainen <ccr@tnsp.org> parents: 572 diff changeset	1313 (void) conn;
699147b1bbbc Add a new command /quit. Matti Hamalainen <ccr@tnsp.org> parents: 572 diff changeset	1314 (void) buf;
699147b1bbbc Add a new command /quit. Matti Hamalainen <ccr@tnsp.org> parents: 572 diff changeset	1315
699147b1bbbc Add a new command /quit. Matti Hamalainen <ccr@tnsp.org> parents: 572 diff changeset	1316 appQuitFlag = TRUE;
699147b1bbbc Add a new command /quit. Matti Hamalainen <ccr@tnsp.org> parents: 572 diff changeset	1317 return 0;
699147b1bbbc Add a new command /quit. Matti Hamalainen <ccr@tnsp.org> parents: 572 diff changeset	1318 }
699147b1bbbc Add a new command /quit. Matti Hamalainen <ccr@tnsp.org> parents: 572 diff changeset	1319
699147b1bbbc Add a new command /quit. Matti Hamalainen <ccr@tnsp.org> parents: 572 diff changeset	1320
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1321 enum
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1322 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1323 CMDARG_NONE,
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1324 CMDARG_STRING,
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1325 CMDARG_OPTIONAL,
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1326 CMDARG_NICK,
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1327 };
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1328
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1329 typedef struct
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1330 {
443 96cb82ebb93b Rename a structure member. Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1331 char *name;
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1332 int flags;
431 a9b20b31cae1 More code cleanups, this time using clang with excessive warnings enabled. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	1333 size_t len;
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	1334 int (handler)(th_conn_t , char *buf);
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1335 } nn_usercmd_t;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1336
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1337
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1338 static nn_usercmd_t userCmdsTable[] =
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1339 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1340 // Server side commands, we just implement completion
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1341 { "/me", CMDARG_STRING, 0, NULL },
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1342 { "/status", CMDARG_STRING, 0, NULL },
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1343 { "/list", CMDARG_NONE, 0, nncmd_list_all_users },
518 8132548e1a07 Add /prvon and /prvoff Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	1344 { "/prvon", CMDARG_NONE, 0, NULL },
8132548e1a07 Add /prvon and /prvoff Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	1345 { "/prvoff", CMDARG_NONE, 0, NULL },
601 e661d7654e23 Add /mute to 'supported' passthrough commands. Matti Hamalainen <ccr@tnsp.org> parents: 599 diff changeset	1346 { "/mute", CMDARG_STRING, 0, NULL },
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1347
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1348 // List internal username list
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1349 { "/who", CMDARG_NONE, 0, nncmd_names },
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1350 { "/names", CMDARG_NONE, 0, nncmd_names },
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1351
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1352 { "/w", CMDARG_NICK, 0, nncmd_open_profile },
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1353 { "/profile", CMDARG_NICK, 0, nncmd_open_profile },
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1354
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1355 { "/query", CMDARG_NICK, 0, nncmd_open_query },
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1356 { "/close", CMDARG_OPTIONAL, 0, nncmd_close_query },
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1357 { "/win", CMDARG_OPTIONAL, 0, nncmd_window_info },
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1358
497 cbbf502e4a70 Fix /ignore command. Matti Hamalainen <ccr@tnsp.org> parents: 494 diff changeset	1359 { "/ignore", CMDARG_OPTIONAL, 0, nncmd_ignore },
519 f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	1360 { "/friend", CMDARG_OPTIONAL, 0, nncmd_friend },
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1361 { "/color", CMDARG_STRING, 0, nncmd_set_color },
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1362 { "/save", CMDARG_NONE, 0, nncmd_save_config },
573 699147b1bbbc Add a new command /quit. Matti Hamalainen <ccr@tnsp.org> parents: 572 diff changeset	1363
603 0a30bf8db004 Add new command /raw for sending only once encoded data. Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	1364 { "/raw", CMDARG_STRING, 0, nncmd_send_raw },
0a30bf8db004 Add new command /raw for sending only once encoded data. Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	1365
573 699147b1bbbc Add a new command /quit. Matti Hamalainen <ccr@tnsp.org> parents: 572 diff changeset	1366 { "/quit", CMDARG_NONE, 0, nncmd_quit },
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1367 };
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1368
657 8b8ef14d7177 Update to match th-libs API changes. Matti Hamalainen <ccr@tnsp.org> parents: 654 diff changeset	1369 static th_llist_t *userCmds = NULL;
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1370
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1371
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1372 void nn_usercmd_init()
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1373 {
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1374 size_t i;
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1375 for (i = 0; i < sizeof(userCmdsTable) / sizeof(userCmdsTable[0]); i++)
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1376 {
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1377 th_llist_append(&userCmds, &userCmdsTable[i]);
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1378 userCmdsTable[i].len = strlen(userCmdsTable[i].name);
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1379 }
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1380 }
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1381
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1382
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	1383 int nn_handle_command(th_conn_t conn, char buf)
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1384 {
657 8b8ef14d7177 Update to match th-libs API changes. Matti Hamalainen <ccr@tnsp.org> parents: 654 diff changeset	1385 th_llist_t *curr;
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1386
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1387 for (curr = userCmds; curr != NULL; curr = curr->next)
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1388 {
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1389 nn_usercmd_t *cmd = curr->data;
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1390
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1391 if (!th_strncasecmp(buf, cmd->name, cmd->len))
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1392 {
457 69ce77696c5d Fix command precedence. Matti Hamalainen <ccr@tnsp.org> parents: 456 diff changeset	1393 char *nbuf;
69ce77696c5d Fix command precedence. Matti Hamalainen <ccr@tnsp.org> parents: 456 diff changeset	1394 if (buf[cmd->len] != 0 && !th_isspace(buf[cmd->len]))
69ce77696c5d Fix command precedence. Matti Hamalainen <ccr@tnsp.org> parents: 456 diff changeset	1395 continue;
69ce77696c5d Fix command precedence. Matti Hamalainen <ccr@tnsp.org> parents: 456 diff changeset	1396
69ce77696c5d Fix command precedence. Matti Hamalainen <ccr@tnsp.org> parents: 456 diff changeset	1397 nbuf = str_trim_left(buf + cmd->len);
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1398
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1399 switch (cmd->flags)
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1400 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1401 case CMDARG_NICK:
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1402 case CMDARG_STRING:
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1403 if (!nbuf[0])
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1404 {
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1405 printMsgQ(currWin, "Command %s requires an argument.\n", cmd->name);
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1406 return 1;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1407 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1408 break;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1409
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1410 case CMDARG_NONE:
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1411 if (nbuf[0])
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1412 {
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1413 printMsgQ(currWin, "Command %s does not take arguments.\n", cmd->name);
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1414 return 1;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1415 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1416 break;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1417
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1418 case CMDARG_OPTIONAL:
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1419 break;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1420 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1421
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1422 // Check if there is a handler function
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1423 if (cmd->handler)
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1424 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1425 // Internal commands have a handler
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1426 return cmd->handler(conn, nbuf);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1427 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1428 else
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1429 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1430 // Server-side commands are just pass-through here
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1431 char *tmp = nn_dblencode_str(buf);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1432 BOOL result;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1433 if (tmp == NULL) return -2;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1434 result = nn_conn_send_msg(conn, optUserNameEnc, tmp);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1435 th_free(tmp);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1436 return result ? 0 : -1;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1437 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1438 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1439 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1440
444 29a341fa80a1 Fix cosmetic output issue. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1441 printMsgQ(currWin, "Unknown command: %s\n", buf);
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1442 return 1;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1443 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1444
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1445
657 8b8ef14d7177 Update to match th-libs API changes. Matti Hamalainen <ccr@tnsp.org> parents: 654 diff changeset	1446 static nn_usercmd_t nn_usercmd_match_do(th_llist_t list, const char *pattern, size_t len)
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1447 {
657 8b8ef14d7177 Update to match th-libs API changes. Matti Hamalainen <ccr@tnsp.org> parents: 654 diff changeset	1448 th_llist_t *node;
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1449 for (node = list; node != NULL; node = node->next)
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1450 {
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1451 nn_usercmd_t *cmd = node->data;
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1452 if (len <= strlen(cmd->name) && th_strncasecmp(cmd->name, pattern, len) == 0)
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1453 return cmd;
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1454 }
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1455 return NULL;
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1456 }
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1457
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1458
657 8b8ef14d7177 Update to match th-libs API changes. Matti Hamalainen <ccr@tnsp.org> parents: 654 diff changeset	1459 nn_usercmd_t nn_usercmd_match(th_llist_t list, const char pattern, const char current, BOOL again)
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1460 {
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1461 nn_usercmd_t *curr;
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1462 size_t len;
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1463
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1464 if (list == NULL \|\| pattern == NULL) return NULL;
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1465
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1466 len = strlen(pattern);
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1467
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1468 if (current != NULL)
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1469 {
657 8b8ef14d7177 Update to match th-libs API changes. Matti Hamalainen <ccr@tnsp.org> parents: 654 diff changeset	1470 th_llist_t *node;
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1471 for (node = list; node != NULL; node = node->next)
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1472 {
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1473 curr = node->data;
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1474 if (th_strcasecmp(curr->name, current) == 0)
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1475 {
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1476 if (again)
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1477 return curr;
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1478
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1479 if ((curr = nn_usercmd_match_do(node->next, pattern, len)) != NULL)
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1480 return curr;
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1481 }
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1482 }
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1483 }
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1484
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1485 if ((curr = nn_usercmd_match_do(list, pattern, len)) != NULL)
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1486 return curr;
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1487
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1488 return NULL;
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1489 }
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1490
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1491
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	1492 int nn_handle_input(th_conn_t conn, char buf, size_t bufLen)
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1493 {
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1494 BOOL result;
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1495 char *tmp;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1496
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1497 // Trim right side
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1498 while (bufLen > 0 && th_isspace(buf[bufLen - 1]))
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1499 buf[--bufLen] = 0;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1500
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1501 if (buf[0] == 0)
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1502 return 1;
258 8a0f7446318e General cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 254 diff changeset	1503
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	1504 // Decode completed usernames
288 e7ef3db3b954 Implement "windows" in the chat. Only main window used for now, and even Matti Hamalainen <ccr@tnsp.org> parents: 280 diff changeset	1505 nn_username_decode(buf);
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1506
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1507 // Check for commands
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1508 if (buf[0] == '/')
426 c2e4d7b4e0ae Fix server-side commands. Matti Hamalainen <ccr@tnsp.org> parents: 425 diff changeset	1509 return nn_handle_command(conn, buf);
133 ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	1510
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1511 // If current window is not the main room window, send private
466 796508f828f6 Refactor much of the "windowing" UI code into a new module, ui.[ch] Matti Hamalainen <ccr@tnsp.org> parents: 464 diff changeset	1512 if (currWin != nnwin_main_window())
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1513 {
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1514 if (currWin->id != NULL)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1515 {
431 a9b20b31cae1 More code cleanups, this time using clang with excessive warnings enabled. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	1516 char *msg = th_strdup_printf("/prv -to %s -msg %s", currWin->id, buf);
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1517 if (msg == NULL) return -3;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1518 tmp = nn_dblencode_str(msg);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1519 if (tmp == NULL)
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1520 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1521 th_free(msg);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1522 return -2;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1523 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1524 result = nn_conn_send_msg(conn, optUserNameEnc, tmp);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1525 th_free(tmp);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1526 th_free(msg);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1527 return result ? 0 : -1;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1528 }
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1529 else
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1530 {
322 b9c15c57dc8f Clean up message functions, add new printMsgQ() helper function for messages that should not Matti Hamalainen <ccr@tnsp.org> parents: 321 diff changeset	1531 printMsgQ(NULL, "No target set, exiting prv mode.\n");
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1532 return 1;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1533 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1534 }
291 cc2a1d837e7b Window / buffer functionality works now. Queries work (with few minor glitches). Matti Hamalainen <ccr@tnsp.org> parents: 289 diff changeset	1535
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1536 // Send double-encoded message
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1537 tmp = nn_dblencode_str(buf);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1538 if (tmp == NULL) return -2;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1539 result = nn_conn_send_msg(conn, optUserNameEnc, tmp);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1540 th_free(tmp);
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1541 return result ? 0 : -1;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1542 }
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1543
405 b4ed5d574edc Add some empty lines. Matti Hamalainen <ccr@tnsp.org> parents: 404 diff changeset	1544
449 7d9fa9f7caf1 Rename tab completion functions. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	1545 static void nn_tabcomplete_replace(nn_editbuf_t buf, size_t pi, const size_t startPos, const size_t endPos, char *c)
447 2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1546 {
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1547 size_t i;
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1548
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1549 for (i = startPos; i <= endPos; i++)
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1550 nn_editbuf_delete(buf, startPos);
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1551
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1552 for (i = startPos; *c; i++, c++)
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1553 nn_editbuf_insert(buf, i, *c);
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1554
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1555 *pi = i;
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1556 }
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1557
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1558
449 7d9fa9f7caf1 Rename tab completion functions. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	1559 static void nn_tabcomplete_finish(nn_editbuf_t buf, char previous, const size_t startPos, const char name)
447 2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1560 {
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1561 nn_editbuf_setpos(buf, startPos + 1 + strlen(name));
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1562 th_free(*previous);
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1563 *previous = th_strdup(name);
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1564 }
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1565
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1566
449 7d9fa9f7caf1 Rename tab completion functions. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	1567 BOOL nn_tabcomplete_buffer(nn_editbuf_t *buf)
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1568 {
189 b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	1569 static char previous = NULL, pattern = NULL;
451 733396469e5d Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 450 diff changeset	1570 char *str = buf->data;
429 2ac24f1e241b Start working on command completion. Matti Hamalainen <ccr@tnsp.org> parents: 427 diff changeset	1571 BOOL again = FALSE, hasSeparator = FALSE,
447 2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1572 hasSpace, newPattern = FALSE, isCommand;
431 a9b20b31cae1 More code cleanups, this time using clang with excessive warnings enabled. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	1573 size_t endPos, startPos = buf->pos;
107 8037a3a7e491 Implement username tab-completion. It's still buggy, tho. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	1574
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	1575 // previous word
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1576 if (startPos >= 2 && str[startPos - 1] == ' ' && str[startPos - 2] != ' ')
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1577 {
113 2a53156e7e12 Yay, tab-completion cycling now works (except for usernames with whitespaces, of course ...) Matti Hamalainen <ccr@tnsp.org> parents: 112 diff changeset	1578 startPos -= 2;
2a53156e7e12 Yay, tab-completion cycling now works (except for usernames with whitespaces, of course ...) Matti Hamalainen <ccr@tnsp.org> parents: 112 diff changeset	1579 endPos = startPos;
2a53156e7e12 Yay, tab-completion cycling now works (except for usernames with whitespaces, of course ...) Matti Hamalainen <ccr@tnsp.org> parents: 112 diff changeset	1580 while (startPos > 0 && str[startPos - 1] != ' ') startPos--;
189 b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	1581 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1582 else
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	1583 // middle of a word, new pattern
404 d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1584 if (startPos < buf->len && str[startPos] != ' ')
d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1585 {
d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1586 endPos = startPos;
d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1587 while (startPos > 0 && str[startPos - 1] != ' ') startPos--;
d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1588 while (endPos < buf->len - 1 && str[endPos + 1] != ' ') endPos++;
d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1589 newPattern = TRUE;
d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1590 }
d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1591 else
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	1592 // previous word, new pattern
404 d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1593 if (startPos >= 1 && str[startPos - 1] != ' ')
d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1594 {
d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1595 startPos -= 1;
d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1596 endPos = startPos;
d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1597 while (startPos > 0 && str[startPos - 1] != ' ') startPos--;
d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1598 newPattern = TRUE;
d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1599 }
d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1600 else
d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1601 return FALSE;
189 b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	1602
429 2ac24f1e241b Start working on command completion. Matti Hamalainen <ccr@tnsp.org> parents: 427 diff changeset	1603 // Check if this is a command completion
2ac24f1e241b Start working on command completion. Matti Hamalainen <ccr@tnsp.org> parents: 427 diff changeset	1604 isCommand = (str[0] == '/' && startPos == 0);
2ac24f1e241b Start working on command completion. Matti Hamalainen <ccr@tnsp.org> parents: 427 diff changeset	1605
2ac24f1e241b Start working on command completion. Matti Hamalainen <ccr@tnsp.org> parents: 427 diff changeset	1606 if (!isCommand && str[endPos] == optNickSep)
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1607 {
189 b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	1608 endPos--;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1609 if (startPos > 0)
113 2a53156e7e12 Yay, tab-completion cycling now works (except for usernames with whitespaces, of course ...) Matti Hamalainen <ccr@tnsp.org> parents: 112 diff changeset	1610 return FALSE;
189 b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	1611 hasSeparator = TRUE;
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	1612 }
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	1613
451 733396469e5d Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 450 diff changeset	1614 hasSpace = (buf->pos > 0 && str[buf->pos - 1] == ' ') \|\|
447 2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1615 (buf->pos <= buf->len && str[buf->pos] == ' ');
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1616
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1617 if (newPattern)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1618 {
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	1619 // Get pattern, check if it matches previous pattern and set 'again' flag
189 b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	1620 char *npattern = nn_editbuf_get_string(buf, startPos, endPos);
372 b9f0bdad6285 Use th_strcasecmp() and th_strncasecmp(). Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	1621 if (pattern && npattern && th_strcasecmp(npattern, pattern) == 0)
116 741e45592522 Add simple "prediction" into tab-completion based on previously gotten last Matti Hamalainen <ccr@tnsp.org> parents: 115 diff changeset	1622 again = TRUE;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1623
189 b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	1624 th_free(pattern);
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	1625 pattern = npattern;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1626
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1627 if (!again)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1628 {
677 f40d5613c753 Use th_free_r(). Matti Hamalainen <ccr@tnsp.org> parents: 672 diff changeset	1629 th_free_r(&previous);
116 741e45592522 Add simple "prediction" into tab-completion based on previously gotten last Matti Hamalainen <ccr@tnsp.org> parents: 115 diff changeset	1630 }
189 b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	1631 }
116 741e45592522 Add simple "prediction" into tab-completion based on previously gotten last Matti Hamalainen <ccr@tnsp.org> parents: 115 diff changeset	1632
429 2ac24f1e241b Start working on command completion. Matti Hamalainen <ccr@tnsp.org> parents: 427 diff changeset	1633 if (!pattern)
2ac24f1e241b Start working on command completion. Matti Hamalainen <ccr@tnsp.org> parents: 427 diff changeset	1634 return FALSE;
2ac24f1e241b Start working on command completion. Matti Hamalainen <ccr@tnsp.org> parents: 427 diff changeset	1635
2ac24f1e241b Start working on command completion. Matti Hamalainen <ccr@tnsp.org> parents: 427 diff changeset	1636 if (isCommand)
2ac24f1e241b Start working on command completion. Matti Hamalainen <ccr@tnsp.org> parents: 427 diff changeset	1637 {
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1638 nn_usercmd_t *cmd = nn_usercmd_match(userCmds, pattern, previous, again);
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1639 if (cmd)
429 2ac24f1e241b Start working on command completion. Matti Hamalainen <ccr@tnsp.org> parents: 427 diff changeset	1640 {
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1641 size_t i;
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1642 nn_tabcomplete_replace(buf, &i, startPos, endPos, cmd->name);
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1643
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1644 if (!hasSpace)
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1645 nn_editbuf_insert(buf, i++, ' ');
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1646
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1647 nn_tabcomplete_finish(buf, &previous, startPos, cmd->name);
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1648 return TRUE;
429 2ac24f1e241b Start working on command completion. Matti Hamalainen <ccr@tnsp.org> parents: 427 diff changeset	1649 }
2ac24f1e241b Start working on command completion. Matti Hamalainen <ccr@tnsp.org> parents: 427 diff changeset	1650 }
2ac24f1e241b Start working on command completion. Matti Hamalainen <ccr@tnsp.org> parents: 427 diff changeset	1651 else
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1652 {
446 3396acd40147 Rename and remove some functions. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1653 nn_user_t *user = nn_userhash_match(nnUsers, pattern, previous, again);
107 8037a3a7e491 Implement username tab-completion. It's still buggy, tho. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	1654
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1655 if (user)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1656 {
431 a9b20b31cae1 More code cleanups, this time using clang with excessive warnings enabled. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	1657 size_t i;
449 7d9fa9f7caf1 Rename tab completion functions. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	1658 nn_tabcomplete_replace(buf, &i, startPos, endPos, user->name);
107 8037a3a7e491 Implement username tab-completion. It's still buggy, tho. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	1659
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1660 if (!hasSeparator && startPos == 0)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1661 {
189 b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	1662 nn_editbuf_insert(buf, i++, optNickSep);
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	1663 startPos++;
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	1664 }
447 2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1665 else
189 b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	1666 if (hasSeparator)
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	1667 startPos++;
447 2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1668
189 b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	1669 if (!hasSpace)
113 2a53156e7e12 Yay, tab-completion cycling now works (except for usernames with whitespaces, of course ...) Matti Hamalainen <ccr@tnsp.org> parents: 112 diff changeset	1670 nn_editbuf_insert(buf, i++, ' ');
189 b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	1671
449 7d9fa9f7caf1 Rename tab completion functions. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	1672 nn_tabcomplete_finish(buf, &previous, startPos, user->name);
113 2a53156e7e12 Yay, tab-completion cycling now works (except for usernames with whitespaces, of course ...) Matti Hamalainen <ccr@tnsp.org> parents: 112 diff changeset	1673 return TRUE;
107 8037a3a7e491 Implement username tab-completion. It's still buggy, tho. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	1674 }
8037a3a7e491 Implement username tab-completion. It's still buggy, tho. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	1675 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1676
113 2a53156e7e12 Yay, tab-completion cycling now works (except for usernames with whitespaces, of course ...) Matti Hamalainen <ccr@tnsp.org> parents: 112 diff changeset	1677 return FALSE;
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1678 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1679
405 b4ed5d574edc Add some empty lines. Matti Hamalainen <ccr@tnsp.org> parents: 404 diff changeset	1680
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1681 BOOL processUserInput(int c, nn_editbuf_t editBuf, nn_editstate_t editState)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1682 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1683 // Chat window switching via Meta/Esc-[1..9]
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1684 if (c >= 0x5001 && c <= 0x5009)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1685 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1686 nn_window_t *win = nnwin_get(c - 0x5000);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1687 if (win != NULL)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1688 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1689 currWin = win;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1690 editState->update = TRUE;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1691 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1692 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1693 else
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1694 switch (c)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1695 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1696 case KEY_ENTER:
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1697 // Call the user input handler
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1698 if (editBuf->len > 0)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1699 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1700 int result;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1701
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1702 if (editHistMax > 0)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1703 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1704 nn_editbuf_free(editHistBuf[SET_MAX_HISTORY+1]);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1705 editHistBuf[SET_MAX_HISTORY+1] = NULL;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1706 memmove(&editHistBuf[2], &editHistBuf[1],
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1707 editHistMax * sizeof(editHistBuf[0]));
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1708 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1709
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1710 editHistPos = 0;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1711 editHistBuf[1] = nn_editbuf_copy(editBuf);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1712 if (editHistMax < SET_MAX_HISTORY)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1713 editHistMax++;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1714
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1715 result = nn_handle_input(editState->conn, editBuf->data, editBuf->len);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1716
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1717 nn_editbuf_clear(editBuf);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1718
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1719 if (result < 0)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1720 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1721 errorMsg("Fatal error handling user input: %s\n", editBuf->data);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1722 editState->isError = TRUE;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1723 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1724 else
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1725 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1726 // Update time value of last sent message for unidle timeouts
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1727 editState->prevKeepAlive = time(NULL);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1728 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1729 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1730 break;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1731
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1732 case KEY_NPAGE:
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1733 case KEY_PPAGE:
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1734 // Page Up / Page Down
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1735 if (currWin != NULL)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1736 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1737 int oldPos = currWin->pos, page = (scrHeight - 4) / 3;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1738
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1739 currWin->pos += (c == KEY_NPAGE) ? - page : page;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1740
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1741 if (currWin->pos >= currWin->data->n - page)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1742 currWin->pos = currWin->data->n - page;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1743 if (currWin->pos < 0)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1744 currWin->pos = 0;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1745
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1746 if (oldPos != currWin->pos)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1747 editState->update = TRUE;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1748 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1749 break;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1750
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1751 case KEY_UP: // Backwards in input history
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1752 if (editHistPos == 0)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1753 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1754 nn_editbuf_free(editHistBuf[0]);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1755 editHistBuf[0] = nn_editbuf_copy(editBuf);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1756 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1757 if (editHistPos < editHistMax)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1758 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1759 editHistPos++;
681 ceb73b712121 Fix an issue in editBuffer handling. Matti Hamalainen <ccr@tnsp.org> parents: 678 diff changeset	1760 nn_editbuf_copy_to(editBuf, editHistBuf[editHistPos]);
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1761 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1762 break;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1763
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1764 case KEY_DOWN: // Forwards in input history
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1765 if (editHistPos > 0)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1766 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1767 editHistPos--;
681 ceb73b712121 Fix an issue in editBuffer handling. Matti Hamalainen <ccr@tnsp.org> parents: 678 diff changeset	1768 nn_editbuf_copy_to(editBuf, editHistBuf[editHistPos]);
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1769 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1770 break;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1771
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1772 case KEY_F(5): // F5 = Ignore mode
515 151edcb79ce4 Fix ignore mode toggling. Matti Hamalainen <ccr@tnsp.org> parents: 513 diff changeset	1773 setIgnoreMode = !setIgnoreMode;
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1774 printMsgQ(currWin, "Ignore mode = %s\n", setIgnoreMode ? "ON" : "OFF");
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1775 break;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1776
519 f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	1777 case KEY_F(6): // F6 = Ignore mode
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	1778 optOnlyFriendPrv = !optOnlyFriendPrv;
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	1779 printMsgQ(currWin, "Only friends allowed to PRV you = %s\n", optOnlyFriendPrv ? "ON" : "OFF");
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	1780 break;
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	1781
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1782 case KEY_F(9): // F9 = Quit
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1783 printMsg(currWin, "Quitting per user request (%d/0x%x).\n", c, c);
571 3ae357fd34bb Rename quit-related internal variables. Matti Hamalainen <ccr@tnsp.org> parents: 565 diff changeset	1784 appQuitFlag = TRUE;
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1785 break;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1786
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1787 case 0x09: // Tab = complete username or command
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1788 nn_tabcomplete_buffer(editBuf);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1789 break;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1790
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1791 default:
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1792 return FALSE;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1793 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1794
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1795 return TRUE;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1796 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1797
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1798
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1799 BOOL processUserPrompt(int c, nn_editbuf_t editBuf, nn_editstate_t editState)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1800 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1801 (void) editBuf;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1802
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1803 switch (c)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1804 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1805 case KEY_ENTER:
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1806 editState->done = TRUE;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1807 break;
526 ba5807ebff88 Make it possible to quit when entering username/passwd. Matti Hamalainen <ccr@tnsp.org> parents: 521 diff changeset	1808
ba5807ebff88 Make it possible to quit when entering username/passwd. Matti Hamalainen <ccr@tnsp.org> parents: 521 diff changeset	1809 case KEY_F(9): // F9 = Quit
ba5807ebff88 Make it possible to quit when entering username/passwd. Matti Hamalainen <ccr@tnsp.org> parents: 521 diff changeset	1810 printMsg(currWin, "Quitting per user request (%d/0x%x).\n", c, c);
571 3ae357fd34bb Rename quit-related internal variables. Matti Hamalainen <ccr@tnsp.org> parents: 565 diff changeset	1811 appQuitFlag = TRUE;
526 ba5807ebff88 Make it possible to quit when entering username/passwd. Matti Hamalainen <ccr@tnsp.org> parents: 521 diff changeset	1812 break;
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1813
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1814 default:
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1815 return FALSE;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1816 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1817
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1818 return TRUE;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1819 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1820
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1821
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1822 void updateUserPrompt(nn_editbuf_t editBuf, nn_editstate_t editState)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1823 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1824 nnwin_update(editState->update, editState->mask, editBuf, optUserName, optUserColor);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1825 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1826
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1827
535 379e361f1144 Fix various segfault issues. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	1828 void clearEditState(nn_editstate_t *st)
379e361f1144 Fix various segfault issues. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	1829 {
379e361f1144 Fix various segfault issues. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	1830 memset(st, 0, sizeof(nn_editstate_t));
379e361f1144 Fix various segfault issues. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	1831 st->insertMode = TRUE;
379e361f1144 Fix various segfault issues. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	1832 st->debugMsg = debugMsg;
379e361f1144 Fix various segfault issues. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	1833 }
379e361f1144 Fix various segfault issues. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	1834
541 44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1835
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1836 BOOL nn_log_open(nn_window_t *win)
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1837 {
650 98f5d15d5ec4 Improve and fix XDG support. Matti Hamalainen <ccr@tnsp.org> parents: 649 diff changeset	1838 char path = NULL, plt;
661 eb3692d85ac2 Use TH_PLAT_WINDOWS for preprocessor conditionals. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	1839 #ifndef TH_PLAT_WINDOWS
556 9b72d0060b85 Create configuration and log files with reduced permissions (rw for user Matti Hamalainen <ccr@tnsp.org> parents: 555 diff changeset	1840 int logFd = -1;
9b72d0060b85 Create configuration and log files with reduced permissions (rw for user Matti Hamalainen <ccr@tnsp.org> parents: 555 diff changeset	1841 #endif
541 44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1842
650 98f5d15d5ec4 Improve and fix XDG support. Matti Hamalainen <ccr@tnsp.org> parents: 649 diff changeset	1843 if (!optLogEnable \|\| optLogPath == NULL)
541 44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1844 return FALSE;
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1845
693 9ed896f7b531 Use TH_DIR_SEPARATOR_CHR instead of our own define. Matti Hamalainen <ccr@tnsp.org> parents: 692 diff changeset	1846 plt = strrchr(optLogPath, TH_DIR_SEPARATOR_CHR);
650 98f5d15d5ec4 Improve and fix XDG support. Matti Hamalainen <ccr@tnsp.org> parents: 649 diff changeset	1847 if (plt == NULL \|\| plt[1] != 0)
693 9ed896f7b531 Use TH_DIR_SEPARATOR_CHR instead of our own define. Matti Hamalainen <ccr@tnsp.org> parents: 692 diff changeset	1848 path = th_strdup_printf("%s%c", optLogPath, TH_DIR_SEPARATOR_CHR);
650 98f5d15d5ec4 Improve and fix XDG support. Matti Hamalainen <ccr@tnsp.org> parents: 649 diff changeset	1849 else
98f5d15d5ec4 Improve and fix XDG support. Matti Hamalainen <ccr@tnsp.org> parents: 649 diff changeset	1850 path = th_strdup(optLogPath);
541 44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1851
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1852 if (win->id == NULL)
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1853 {
554 13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	1854 // Main window log (aka room log)
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	1855 if (optLogDaily)
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	1856 {
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	1857 char stamp[64];
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	1858 str_get_timestamp(stamp, sizeof(stamp), "%Y-%m-%d");
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	1859 win->logFilename = th_strdup_printf("%sroom_%d-%s%s",
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	1860 path != NULL ? path : "", optPort,
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	1861 stamp, optLogExtension);
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	1862 }
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	1863 else
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	1864 {
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	1865 win->logFilename = th_strdup_printf("%sroom_%d%s",
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	1866 path != NULL ? path : "", optPort, optLogExtension);
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	1867 }
541 44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1868 }
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1869 else
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1870 {
552 dfe46cd1b81b Cosmetics, comments. Matti Hamalainen <ccr@tnsp.org> parents: 551 diff changeset	1871 // PRV chat log
541 44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1872 size_t pos;
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1873 char *cleaned;
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1874
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1875 if ((cleaned = th_strdup(win->id)) == NULL)
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1876 return FALSE;
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1877
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1878 for (pos = 0; cleaned[pos] != 0; pos++)
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1879 {
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1880 if (!isalnum(cleaned[pos]))
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1881 cleaned[pos] = '_';
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1882 }
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1883
551 89fafb218396 Fix situations where the log path is unset. Matti Hamalainen <ccr@tnsp.org> parents: 550 diff changeset	1884 win->logFilename = th_strdup_printf("%s%s%s",
89fafb218396 Fix situations where the log path is unset. Matti Hamalainen <ccr@tnsp.org> parents: 550 diff changeset	1885 path != NULL ? path : "", cleaned, optLogExtension);
89fafb218396 Fix situations where the log path is unset. Matti Hamalainen <ccr@tnsp.org> parents: 550 diff changeset	1886
541 44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1887 th_free(cleaned);
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1888 }
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1889
552 dfe46cd1b81b Cosmetics, comments. Matti Hamalainen <ccr@tnsp.org> parents: 551 diff changeset	1890 // Try to open the file for appending
541 44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1891 if (win->logFilename == NULL)
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1892 goto error;
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1893
661 eb3692d85ac2 Use TH_PLAT_WINDOWS for preprocessor conditionals. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	1894 #ifdef TH_PLAT_WINDOWS
541 44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1895 if ((win->logFile = fopen(win->logFilename, "a")) == NULL)
556 9b72d0060b85 Create configuration and log files with reduced permissions (rw for user Matti Hamalainen <ccr@tnsp.org> parents: 555 diff changeset	1896 #else
9b72d0060b85 Create configuration and log files with reduced permissions (rw for user Matti Hamalainen <ccr@tnsp.org> parents: 555 diff changeset	1897 if ((logFd = open(win->logFilename, O_CREAT \| O_APPEND \| O_WRONLY, S_IRUSR \| S_IWUSR)) == -1 \|\|
9b72d0060b85 Create configuration and log files with reduced permissions (rw for user Matti Hamalainen <ccr@tnsp.org> parents: 555 diff changeset	1898 (win->logFile = fdopen(logFd, "a")) == NULL)
9b72d0060b85 Create configuration and log files with reduced permissions (rw for user Matti Hamalainen <ccr@tnsp.org> parents: 555 diff changeset	1899 #endif
541 44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1900 {
621 29b8ff5b625b Use th_get_error() and th_error_str(). Matti Hamalainen <ccr@tnsp.org> parents: 620 diff changeset	1901 int err = th_get_error();
556 9b72d0060b85 Create configuration and log files with reduced permissions (rw for user Matti Hamalainen <ccr@tnsp.org> parents: 555 diff changeset	1902 errorMsg("Could not open logfile '%s' for appending, %d: %s\n",
621 29b8ff5b625b Use th_get_error() and th_error_str(). Matti Hamalainen <ccr@tnsp.org> parents: 620 diff changeset	1903 win->logFilename, err, th_error_str(err));
541 44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1904 goto error;
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1905 }
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1906
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1907 printMsg(win, "Logging to '%s'.\n", win->logFilename);
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1908
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1909 th_free(path);
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1910 return TRUE;
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1911
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1912 error:
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1913 th_free(path);
677 f40d5613c753 Use th_free_r(). Matti Hamalainen <ccr@tnsp.org> parents: 672 diff changeset	1914 th_free_r(&win->logFilename);
556 9b72d0060b85 Create configuration and log files with reduced permissions (rw for user Matti Hamalainen <ccr@tnsp.org> parents: 555 diff changeset	1915 if (win->logFile != NULL)
9b72d0060b85 Create configuration and log files with reduced permissions (rw for user Matti Hamalainen <ccr@tnsp.org> parents: 555 diff changeset	1916 fclose(win->logFile);
661 eb3692d85ac2 Use TH_PLAT_WINDOWS for preprocessor conditionals. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	1917 #ifndef TH_PLAT_WINDOWS
556 9b72d0060b85 Create configuration and log files with reduced permissions (rw for user Matti Hamalainen <ccr@tnsp.org> parents: 555 diff changeset	1918 else
9b72d0060b85 Create configuration and log files with reduced permissions (rw for user Matti Hamalainen <ccr@tnsp.org> parents: 555 diff changeset	1919 if (logFd >= 0)
9b72d0060b85 Create configuration and log files with reduced permissions (rw for user Matti Hamalainen <ccr@tnsp.org> parents: 555 diff changeset	1920 close(logFd);
9b72d0060b85 Create configuration and log files with reduced permissions (rw for user Matti Hamalainen <ccr@tnsp.org> parents: 555 diff changeset	1921 #endif
541 44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1922 return FALSE;
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1923 }
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1924
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1925
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1926 void nn_log_close(nn_window_t *win)
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1927 {
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1928 if (win->logFile != NULL)
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1929 fclose(win->logFile);
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1930 win->logFile = NULL;
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1931
677 f40d5613c753 Use th_free_r(). Matti Hamalainen <ccr@tnsp.org> parents: 672 diff changeset	1932 th_free_r(&win->logFilename);
541 44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1933 }
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1934
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	1935
554 13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	1936 BOOL nn_log_reopen(nn_window_t *win)
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	1937 {
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	1938 nn_log_close(win);
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	1939 return nn_log_open(win);
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	1940 }
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	1941
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	1942
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1943 int main(int argc, char *argv[])
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1944 {
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1945 char *tmpStr;
623 118276b60667 More work towards using th-libs th_network module. Matti Hamalainen <ccr@tnsp.org> parents: 622 diff changeset	1946 int index, updateCount = 0, ret;
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1947 BOOL argsOK, colorSet = FALSE;
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	1948 th_conn_t *conn = NULL;
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1949 nn_editbuf_t *editBuf = nn_editbuf_new(NN_TMPBUF_SIZE);
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1950 nn_editstate_t editState;
561 1ff9e85a1fcc Rework the configuration file loading and saving to use the I/O context and new th-config API. Matti Hamalainen <ccr@tnsp.org> parents: 560 diff changeset	1951 th_cfgitem_t *tmpcfg;
288 e7ef3db3b954 Implement "windows" in the chat. Only main window used for now, and even Matti Hamalainen <ccr@tnsp.org> parents: 280 diff changeset	1952
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1953 memset(editHistBuf, 0, sizeof(editHistBuf));
535 379e361f1144 Fix various segfault issues. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	1954 clearEditState(&editState);
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1955
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	1956 // Initialize
195 829457be9eea Build system changes to support (in a big kludgy manner) icon and version information resource generation for Win32 binaries. Matti Hamalainen <ccr@tnsp.org> parents: 191 diff changeset	1957 th_init("NNChat", "Newbie Nudes chat client", NN_VERSION,
668 f212cbfbd93c Bump copyrights. Matti Hamalainen <ccr@tnsp.org> parents: 666 diff changeset	1958 "Written and designed by Anonymous Finnish Guy (C) 2008-2016",
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1959 "This software is freeware, use and distribute as you wish.");
678 75daa6ec65df Fix to match changes in th-libs API. Matti Hamalainen <ccr@tnsp.org> parents: 677 diff changeset	1960
75daa6ec65df Fix to match changes in th-libs API. Matti Hamalainen <ccr@tnsp.org> parents: 677 diff changeset	1961 th_verbosity = 0;
133 ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	1962
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	1963 // Read configuration file
148 9da39d090ef1 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 147 diff changeset	1964 tmpcfg = NULL;
133 ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	1965 th_cfg_add_comment(&tmpcfg, "General settings");
ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	1966 th_cfg_add_string(&tmpcfg, "username", &optUserName, NULL);
ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	1967 th_cfg_add_string(&tmpcfg, "password", &optPassword, NULL);
409 4556174b5be8 Make nickname autocomplete separator configurable. Matti Hamalainen <ccr@tnsp.org> parents: 408 diff changeset	1968
150 db5e7a1f1eb3 Add comment in config file about format of user color setting. Matti Hamalainen <ccr@tnsp.org> parents: 149 diff changeset	1969 th_cfg_add_comment(&tmpcfg, "Default color as a hex-triplet");
133 ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	1970 th_cfg_add_hexvalue(&tmpcfg, "color", &optUserColor, optUserColor);
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1971
149 a4d6707161a7 Add config file option for default setting of ignore mode. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	1972 th_cfg_add_comment(&tmpcfg, "Default setting of ignore mode");
151 303db1141147 Oops, should be th_cfg_add_bool() instead of th_cfg_add_boolean() Matti Hamalainen <ccr@tnsp.org> parents: 150 diff changeset	1973 th_cfg_add_bool(&tmpcfg, "ignore", &setIgnoreMode, setIgnoreMode);
149 a4d6707161a7 Add config file option for default setting of ignore mode. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	1974 th_cfg_add_comment(&tmpcfg, "People to be ignored when ignore mode is enabled");
265 b9c650db8a6a Rename variable nnIgnoreList to setIgnoreList. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	1975 th_cfg_add_string_list(&tmpcfg, "ignore_list", &setIgnoreList);
264 4c1c18a388d9 Add configuration setting and functionality for random "keepalive" messages to avoid idle timeout kicks from chat. Matti Hamalainen <ccr@tnsp.org> parents: 258 diff changeset	1976
519 f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	1977 th_cfg_add_comment(&tmpcfg, "Allow only defined friends to private to you");
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	1978 th_cfg_add_bool(&tmpcfg, "prv_friends", &optOnlyFriendPrv, optOnlyFriendPrv);
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	1979 th_cfg_add_comment(&tmpcfg, "List of your friends");
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	1980 th_cfg_add_string_list(&tmpcfg, "friend_list", &setFriendList);
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	1981
264 4c1c18a388d9 Add configuration setting and functionality for random "keepalive" messages to avoid idle timeout kicks from chat. Matti Hamalainen <ccr@tnsp.org> parents: 258 diff changeset	1982 th_cfg_add_comment(&tmpcfg, "Random messages for idle timeout protection. If none are set, plain '.' is used.");
4c1c18a388d9 Add configuration setting and functionality for random "keepalive" messages to avoid idle timeout kicks from chat. Matti Hamalainen <ccr@tnsp.org> parents: 258 diff changeset	1983 th_cfg_add_string_list(&tmpcfg, "idle_messages", &setIdleMessages);
4c1c18a388d9 Add configuration setting and functionality for random "keepalive" messages to avoid idle timeout kicks from chat. Matti Hamalainen <ccr@tnsp.org> parents: 258 diff changeset	1984
409 4556174b5be8 Make nickname autocomplete separator configurable. Matti Hamalainen <ccr@tnsp.org> parents: 408 diff changeset	1985 th_cfg_add_comment(&tmpcfg, "Character used as nickname auto-completion separator (default is ':')");
4556174b5be8 Make nickname autocomplete separator configurable. Matti Hamalainen <ccr@tnsp.org> parents: 408 diff changeset	1986 th_cfg_add_string(&tmpcfg, "nick_separator", &optNickSepStr, NULL);
4556174b5be8 Make nickname autocomplete separator configurable. Matti Hamalainen <ccr@tnsp.org> parents: 408 diff changeset	1987
133 ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	1988 th_cfg_add_section(&cfg, "general", tmpcfg);
ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	1989
264 4c1c18a388d9 Add configuration setting and functionality for random "keepalive" messages to avoid idle timeout kicks from chat. Matti Hamalainen <ccr@tnsp.org> parents: 258 diff changeset	1990
133 ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	1991 tmpcfg = NULL;
ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	1992 th_cfg_add_comment(&tmpcfg, "Chat server hostname or IP address");
ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	1993 th_cfg_add_string(&tmpcfg, "host", &optServer, optServer);
593 00f476c65e1b Remove port descriptions from configuration. Matti Hamalainen <ccr@tnsp.org> parents: 592 diff changeset	1994
00f476c65e1b Remove port descriptions from configuration. Matti Hamalainen <ccr@tnsp.org> parents: 592 diff changeset	1995 th_cfg_add_comment(&tmpcfg, "Default port to connect");
133 ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	1996 th_cfg_add_int(&tmpcfg, "port", &optPort, optPort);
ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	1997 th_cfg_add_section(&cfg, "server", tmpcfg);
ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	1998
239 b7e7ed741a18 Add unfinished code for logfile name parsing. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	1999 tmpcfg = NULL;
638 bda973fa2b3b Add proxy disable/enable setting. Matti Hamalainen <ccr@tnsp.org> parents: 636 diff changeset	2000 th_cfg_add_comment(&tmpcfg, "Enable proxy");
bda973fa2b3b Add proxy disable/enable setting. Matti Hamalainen <ccr@tnsp.org> parents: 636 diff changeset	2001 th_cfg_add_bool(&tmpcfg, "enable", &optProxyEnable, optProxyEnable);
689 1b15cf9442ff Typofix in config file comments. Matti Hamalainen <ccr@tnsp.org> parents: 687 diff changeset	2002 th_cfg_add_comment(&tmpcfg, "Proxy URI (see commandline help for more information)");
609 b10d81ddfc55 Use URI form of proxy configuration in the config file as well. Matti Hamalainen <ccr@tnsp.org> parents: 608 diff changeset	2003 th_cfg_add_string(&tmpcfg, "uri", &setProxyURI, NULL);
353 83ae825bb8c1 Add configuration section for proxy settings. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	2004 th_cfg_add_section(&cfg, "proxy", tmpcfg);
83ae825bb8c1 Add configuration section for proxy settings. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	2005
541 44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	2006
353 83ae825bb8c1 Add configuration section for proxy settings. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	2007 tmpcfg = NULL;
652 58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	2008 th_cfg_add_comment(&tmpcfg, "Web browser binary/path to execute (UNIX/Linux only)");
58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	2009 th_cfg_add_string(&tmpcfg, "browser", &setBrowser, NULL);
58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	2010 th_cfg_add_comment(&tmpcfg, "Browser execution method (0 = default/old Mozilla, 1 = new Firefox)");
58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	2011 th_cfg_add_int(&tmpcfg, "run-method", &optBrowserRunMethod, BMT_MOZILLA);
58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	2012 th_cfg_add_section(&cfg, "web-browser", tmpcfg);
58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	2013
58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	2014
58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	2015 tmpcfg = NULL;
239 b7e7ed741a18 Add unfinished code for logfile name parsing. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	2016 th_cfg_add_comment(&tmpcfg, "Enable logging");
247 fce4e2e31d69 Add the config section ... Matti Hamalainen <ccr@tnsp.org> parents: 242 diff changeset	2017 th_cfg_add_bool(&tmpcfg, "enable", &optLogEnable, optLogEnable);
554 13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	2018
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	2019 th_cfg_add_comment(&tmpcfg, "Use daily logfiles for room logs");
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	2020 th_cfg_add_bool(&tmpcfg, "daily", &optLogDaily, optLogDaily);
13901e9be15b Implement daily logs for room logs. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	2021
541 44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	2022 th_cfg_add_comment(&tmpcfg, "Log files path");
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	2023 th_cfg_add_string(&tmpcfg, "path", &optLogPath, optLogPath);
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	2024
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	2025 th_cfg_add_comment(&tmpcfg, "Log filename extension");
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	2026 th_cfg_add_string(&tmpcfg, "extension", &optLogExtension, optLogExtension);
44f67ec5e945 Improve logging facilities. Private chats in query windows are now logged Matti Hamalainen <ccr@tnsp.org> parents: 538 diff changeset	2027
247 fce4e2e31d69 Add the config section ... Matti Hamalainen <ccr@tnsp.org> parents: 242 diff changeset	2028 th_cfg_add_section(&cfg, "logging", tmpcfg);
239 b7e7ed741a18 Add unfinished code for logfile name parsing. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	2029
512 93c8ba1ef55f Support XDG specification. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	2030 // Get home directory path
154 e8f67e344aaf Get correct directory for saving configuration under Windows. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	2031 {
691 b5d5d37bbc64 Use th_get_home_dir(). Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	2032 setHomeDir = th_get_home_dir();
b5d5d37bbc64 Use th_get_home_dir(). Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	2033
661 eb3692d85ac2 Use TH_PLAT_WINDOWS for preprocessor conditionals. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	2034 #if defined(TH_PLAT_WINDOWS)
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2035 CoInitializeEx(NULL, COINIT_APARTMENTTHREADED \| COINIT_DISABLE_OLE1DDE);
648 a9d25e083f44 Separate home dir and config dir functionality. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	2036 setConfigDir = th_strdup(setHomeDir);
616 1ffacd20b88b Clean up the #ifdef mess around homedir handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	2037 #elif defined(USE_XDG)
648 a9d25e083f44 Separate home dir and config dir functionality. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	2038 const char *xdgConfigDir = getenv("XDG_CONFIG_HOME");
546 3d7ff16389cf Cosmetics and comments. Matti Hamalainen <ccr@tnsp.org> parents: 545 diff changeset	2039
3d7ff16389cf Cosmetics and comments. Matti Hamalainen <ccr@tnsp.org> parents: 545 diff changeset	2040 // If XDG is enabled, try the environment variable first
648 a9d25e083f44 Separate home dir and config dir functionality. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	2041 if (xdgConfigDir != NULL && strcmp(xdgConfigDir, ""))
650 98f5d15d5ec4 Improve and fix XDG support. Matti Hamalainen <ccr@tnsp.org> parents: 649 diff changeset	2042 setConfigDir = th_strdup_printf("%s/%s/", xdgConfigDir, SET_XDG_CONFIG_DIR);
512 93c8ba1ef55f Support XDG specification. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	2043 else
546 3d7ff16389cf Cosmetics and comments. Matti Hamalainen <ccr@tnsp.org> parents: 545 diff changeset	2044 // Nope, try the obvious alternative
650 98f5d15d5ec4 Improve and fix XDG support. Matti Hamalainen <ccr@tnsp.org> parents: 649 diff changeset	2045 setConfigDir = th_strdup_printf("%s/.config/%s/", setHomeDir, SET_XDG_CONFIG_DIR);
512 93c8ba1ef55f Support XDG specification. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	2046 #else
648 a9d25e083f44 Separate home dir and config dir functionality. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	2047 setConfigDir = th_strdup(setHomeDir);
512 93c8ba1ef55f Support XDG specification. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	2048 #endif
93c8ba1ef55f Support XDG specification. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	2049 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2050
648 a9d25e083f44 Separate home dir and config dir functionality. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	2051 if (setConfigDir != NULL)
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2052 {
663 0b81e5fdc7b5 Use the new io context API. Matti Hamalainen <ccr@tnsp.org> parents: 662 diff changeset	2053 th_ioctx *ctx;
154 e8f67e344aaf Get correct directory for saving configuration under Windows. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	2054
693 9ed896f7b531 Use TH_DIR_SEPARATOR_CHR instead of our own define. Matti Hamalainen <ccr@tnsp.org> parents: 692 diff changeset	2055 setConfigFile = th_strdup_printf("%s%c%s", setConfigDir, TH_DIR_SEPARATOR_CHR, SET_CONFIG_FILE);
687 e6d60eacf24d Update to new th_io_fopen() API. Matti Hamalainen <ccr@tnsp.org> parents: 686 diff changeset	2056 if (th_io_fopen(&ctx, &th_stdio_io_ops, setConfigFile, "r") == THERR_OK)
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2057 {
663 0b81e5fdc7b5 Use the new io context API. Matti Hamalainen <ccr@tnsp.org> parents: 662 diff changeset	2058 th_io_set_handlers(ctx, nn_ioctx_errfunc, nn_ioctx_msgfunc);
0b81e5fdc7b5 Use the new io context API. Matti Hamalainen <ccr@tnsp.org> parents: 662 diff changeset	2059
687 e6d60eacf24d Update to new th_io_fopen() API. Matti Hamalainen <ccr@tnsp.org> parents: 686 diff changeset	2060 THMSG(0, "Reading configuration from '%s'.\n",
e6d60eacf24d Update to new th_io_fopen() API. Matti Hamalainen <ccr@tnsp.org> parents: 686 diff changeset	2061 setConfigFile);
663 0b81e5fdc7b5 Use the new io context API. Matti Hamalainen <ccr@tnsp.org> parents: 662 diff changeset	2062
0b81e5fdc7b5 Use the new io context API. Matti Hamalainen <ccr@tnsp.org> parents: 662 diff changeset	2063 th_cfg_read(ctx, cfg);
692 863542691130 Free io context instead of just closing it. Matti Hamalainen <ccr@tnsp.org> parents: 691 diff changeset	2064 th_io_free(ctx);
315 864e6e52ed69 Fix a filehandle leak when reading in configuration file. Matti Hamalainen <ccr@tnsp.org> parents: 314 diff changeset	2065 }
133 ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	2066 }
196 edd5ce3e5399 Add simplistic username/password requester if none given on commandline or config file. Matti Hamalainen <ccr@tnsp.org> parents: 195 diff changeset	2067
609 b10d81ddfc55 Use URI form of proxy configuration in the config file as well. Matti Hamalainen <ccr@tnsp.org> parents: 608 diff changeset	2068 if (setProxyURI && !argHandleProxyURI(setProxyURI))
b10d81ddfc55 Use URI form of proxy configuration in the config file as well. Matti Hamalainen <ccr@tnsp.org> parents: 608 diff changeset	2069 goto err_exit;
b10d81ddfc55 Use URI form of proxy configuration in the config file as well. Matti Hamalainen <ccr@tnsp.org> parents: 608 diff changeset	2070
546 3d7ff16389cf Cosmetics and comments. Matti Hamalainen <ccr@tnsp.org> parents: 545 diff changeset	2071 optNickSep = optNickSepStr ? optNickSepStr[0] : SET_NICK_SEPARATOR;
409 4556174b5be8 Make nickname autocomplete separator configurable. Matti Hamalainen <ccr@tnsp.org> parents: 408 diff changeset	2072
137 fad8c31e41e6 Move browser code around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	2073 setBrowser = getenv("BROWSER");
652 58a376f86cdf Make browser a configurable setting (in addition to environment variable), Matti Hamalainen <ccr@tnsp.org> parents: 650 diff changeset	2074 if (setBrowser == NULL \|\| setBrowser[0] == 0)
137 fad8c31e41e6 Move browser code around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	2075 setBrowser = "firefox";
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2076
648 a9d25e083f44 Separate home dir and config dir functionality. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	2077 if (optLogPath == NULL && setHomeDir != NULL)
545 895ede06ff11 Implement default log file directory. Matti Hamalainen <ccr@tnsp.org> parents: 544 diff changeset	2078 {
895ede06ff11 Implement default log file directory. Matti Hamalainen <ccr@tnsp.org> parents: 544 diff changeset	2079 optLogPath = th_strdup_printf("%s%c%s%c",
693 9ed896f7b531 Use TH_DIR_SEPARATOR_CHR instead of our own define. Matti Hamalainen <ccr@tnsp.org> parents: 692 diff changeset	2080 setHomeDir, TH_DIR_SEPARATOR_CHR, SET_LOG_DIR, TH_DIR_SEPARATOR_CHR);
545 895ede06ff11 Implement default log file directory. Matti Hamalainen <ccr@tnsp.org> parents: 544 diff changeset	2081 }
895ede06ff11 Implement default log file directory. Matti Hamalainen <ccr@tnsp.org> parents: 544 diff changeset	2082
558 e32881ece842 Only try to create log directories if logging is enabled. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	2083 if (optLogEnable)
550 504a8b9297a3 Fix log directory creation. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	2084 {
686 256002aa06cc Changed to conform to new th_stat_path() API. Matti Hamalainen <ccr@tnsp.org> parents: 681 diff changeset	2085 th_stat_data sdata;
256002aa06cc Changed to conform to new th_stat_path() API. Matti Hamalainen <ccr@tnsp.org> parents: 681 diff changeset	2086 if (th_stat_path(optLogPath, &sdata))
550 504a8b9297a3 Fix log directory creation. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	2087 {
686 256002aa06cc Changed to conform to new th_stat_path() API. Matti Hamalainen <ccr@tnsp.org> parents: 681 diff changeset	2088 if ((sdata.flags & TH_IS_DIR) == 0)
550 504a8b9297a3 Fix log directory creation. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	2089 {
504a8b9297a3 Fix log directory creation. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	2090 THERR("The log file path '%s' is not a directory.\n",
504a8b9297a3 Fix log directory creation. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	2091 optLogPath);
504a8b9297a3 Fix log directory creation. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	2092 goto err_exit;
504a8b9297a3 Fix log directory creation. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	2093 }
504a8b9297a3 Fix log directory creation. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	2094 else
686 256002aa06cc Changed to conform to new th_stat_path() API. Matti Hamalainen <ccr@tnsp.org> parents: 681 diff changeset	2095 if ((sdata.flags & TH_IS_WRITABLE) == 0)
550 504a8b9297a3 Fix log directory creation. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	2096 {
661 eb3692d85ac2 Use TH_PLAT_WINDOWS for preprocessor conditionals. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	2097 #ifdef TH_PLAT_WINDOWS
662 0c94af18f55e Two more generic functions were moved to th-libs, so factor out the Matti Hamalainen <ccr@tnsp.org> parents: 661 diff changeset	2098 if (!th_mkdir_path(optLogPath, 0))
557 02244c553741 Fix Win32 side of log directory creation. Matti Hamalainen <ccr@tnsp.org> parents: 556 diff changeset	2099 {
02244c553741 Fix Win32 side of log directory creation. Matti Hamalainen <ccr@tnsp.org> parents: 556 diff changeset	2100 THERR("Could not create log file directory '%s'.\n",
02244c553741 Fix Win32 side of log directory creation. Matti Hamalainen <ccr@tnsp.org> parents: 556 diff changeset	2101 optLogPath);
02244c553741 Fix Win32 side of log directory creation. Matti Hamalainen <ccr@tnsp.org> parents: 556 diff changeset	2102 goto err_exit;
02244c553741 Fix Win32 side of log directory creation. Matti Hamalainen <ccr@tnsp.org> parents: 556 diff changeset	2103 }
02244c553741 Fix Win32 side of log directory creation. Matti Hamalainen <ccr@tnsp.org> parents: 556 diff changeset	2104 #else
550 504a8b9297a3 Fix log directory creation. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	2105 THERR("The log file path '%s' is not writable.\n",
504a8b9297a3 Fix log directory creation. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	2106 optLogPath);
504a8b9297a3 Fix log directory creation. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	2107 goto err_exit;
557 02244c553741 Fix Win32 side of log directory creation. Matti Hamalainen <ccr@tnsp.org> parents: 556 diff changeset	2108 #endif
550 504a8b9297a3 Fix log directory creation. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	2109 }
504a8b9297a3 Fix log directory creation. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	2110 }
504a8b9297a3 Fix log directory creation. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	2111 else
662 0c94af18f55e Two more generic functions were moved to th-libs, so factor out the Matti Hamalainen <ccr@tnsp.org> parents: 661 diff changeset	2112 if (!th_mkdir_path(optLogPath, 0))
550 504a8b9297a3 Fix log directory creation. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	2113 {
504a8b9297a3 Fix log directory creation. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	2114 THERR("Could not create log file directory '%s'.\n",
504a8b9297a3 Fix log directory creation. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	2115 optLogPath);
504a8b9297a3 Fix log directory creation. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	2116 goto err_exit;
504a8b9297a3 Fix log directory creation. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	2117 }
504a8b9297a3 Fix log directory creation. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	2118 }
504a8b9297a3 Fix log directory creation. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	2119
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	2120 // Parse command line arguments
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	2121 argsOK = th_args_process(argc, argv, optList, optListN,
640 51dd01786d25 Update to work with changed th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	2122 argHandleOpt, argHandleFile, 0);
26 b84fc46c6035 Improved color hex triplet parsing. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	2123
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2124 if (optUserNameCmd != NULL)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2125 {
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2126 THMSG(1, "Username set on commandline.\n");
198 21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	2127 optUserName = optUserNameCmd;
21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	2128 optPassword = optPasswordCmd;
21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	2129 }
21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	2130
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	2131 if (!argsOK)
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	2132 return -2;
64 6a3a917303e4 Some random cleanups, bring back WinSock support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	2133
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	2134 // Allocate userhash
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2135 if ((nnUsers = nn_userhash_new()) == NULL)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2136 {
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	2137 THERR("Could not allocate userhash. Fatal error.\n");
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	2138 return -105;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	2139 }
64 6a3a917303e4 Some random cleanups, bring back WinSock support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	2140
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	2141 // If no idle messages are set, add default
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2142 if (setIdleMessages == NULL)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2143 {
264 4c1c18a388d9 Add configuration setting and functionality for random "keepalive" messages to avoid idle timeout kicks from chat. Matti Hamalainen <ccr@tnsp.org> parents: 258 diff changeset	2144 th_llist_append(&setIdleMessages, th_strdup("."));
4c1c18a388d9 Add configuration setting and functionality for random "keepalive" messages to avoid idle timeout kicks from chat. Matti Hamalainen <ccr@tnsp.org> parents: 258 diff changeset	2145 }
4c1c18a388d9 Add configuration setting and functionality for random "keepalive" messages to avoid idle timeout kicks from chat. Matti Hamalainen <ccr@tnsp.org> parents: 258 diff changeset	2146
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	2147 // Initialize network
623 118276b60667 More work towards using th-libs th_network module. Matti Hamalainen <ccr@tnsp.org> parents: 622 diff changeset	2148 if ((ret = th_network_init()) != THERR_OK)
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2149 {
623 118276b60667 More work towards using th-libs th_network module. Matti Hamalainen <ccr@tnsp.org> parents: 622 diff changeset	2150 THERR("Could not initialize network subsystem: %s\n", th_error_str(ret));
91 acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	2151 goto err_exit;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2152 }
68 3ab7751fdad1 MingW compatibility, with one ugly kludge. Matti Hamalainen <ccr@tnsp.org> parents: 67 diff changeset	2153
466 796508f828f6 Refactor much of the "windowing" UI code into a new module, ui.[ch] Matti Hamalainen <ccr@tnsp.org> parents: 464 diff changeset	2154 // Initialize curses windowing
796508f828f6 Refactor much of the "windowing" UI code into a new module, ui.[ch] Matti Hamalainen <ccr@tnsp.org> parents: 464 diff changeset	2155 if (!optDaemon && !nnwin_init(SET_DELAY))
796508f828f6 Refactor much of the "windowing" UI code into a new module, ui.[ch] Matti Hamalainen <ccr@tnsp.org> parents: 464 diff changeset	2156 goto err_exit;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2157
549 dd7b58eca06d Use the helper functions for creating log file directory automatically. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	2158
571 3ae357fd34bb Rename quit-related internal variables. Matti Hamalainen <ccr@tnsp.org> parents: 565 diff changeset	2159 if (appCursesInit)
501 ca88945d8eda Begin work on integrating the removal of ncurses "windowing" and transition Matti Hamalainen <ccr@tnsp.org> parents: 497 diff changeset	2160 {
536 15e447d6a2a6 Fix to conform to th-libs changes. Matti Hamalainen <ccr@tnsp.org> parents: 535 diff changeset	2161 printMsg(NULL, "%s v%s - %s\n", th_prog_name, th_prog_version, th_prog_desc);
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2162 printMsg(NULL, "%s\n", th_prog_author);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2163 printMsg(NULL, "%s\n", th_prog_license);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2164
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2165 nnwin_update(TRUE, FALSE, NULL, optUserName, optUserColor);
268 d04ea4395e9e Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase. Matti Hamalainen <ccr@tnsp.org> parents: 267 diff changeset	2166
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2167 // Check if we have username and password
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2168 if (optUserName == NULL \|\| optPassword == NULL)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2169 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2170 printMsg(NULL, "Please enter your NN login credentials.\n");
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2171 printMsg(NULL, "You can avoid doing this every time by issuing '/save' after logging in.\n");
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2172
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2173 printMsg(NULL, "Enter your NN username ...\n");
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2174 optUserName = nnwin_prompt_requester(FALSE, &editState, processUserPrompt, updateUserPrompt);
571 3ae357fd34bb Rename quit-related internal variables. Matti Hamalainen <ccr@tnsp.org> parents: 565 diff changeset	2175 if (appQuitFlag)
526 ba5807ebff88 Make it possible to quit when entering username/passwd. Matti Hamalainen <ccr@tnsp.org> parents: 521 diff changeset	2176 goto err_exit;
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2177
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2178 editState.mask = TRUE;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2179 printMsg(NULL, "Enter your NN password ...\n");
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2180 optPassword = nnwin_prompt_requester(TRUE, &editState, processUserPrompt, updateUserPrompt);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2181 editState.mask = FALSE;
571 3ae357fd34bb Rename quit-related internal variables. Matti Hamalainen <ccr@tnsp.org> parents: 565 diff changeset	2182 if (appQuitFlag)
526 ba5807ebff88 Make it possible to quit when entering username/passwd. Matti Hamalainen <ccr@tnsp.org> parents: 521 diff changeset	2183 goto err_exit;
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2184 }
268 d04ea4395e9e Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase. Matti Hamalainen <ccr@tnsp.org> parents: 267 diff changeset	2185 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2186
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2187 if (optUserName == NULL \|\| optPassword == NULL)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2188 {
268 d04ea4395e9e Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase. Matti Hamalainen <ccr@tnsp.org> parents: 267 diff changeset	2189 errorMsg("Username and/or password not specified.\n");
d04ea4395e9e Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase. Matti Hamalainen <ccr@tnsp.org> parents: 267 diff changeset	2190 goto err_exit;
d04ea4395e9e Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase. Matti Hamalainen <ccr@tnsp.org> parents: 267 diff changeset	2191 }
d04ea4395e9e Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase. Matti Hamalainen <ccr@tnsp.org> parents: 267 diff changeset	2192
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	2193 // Create a connection
627 493c08d452d9 API changes in th_network. Matti Hamalainen <ccr@tnsp.org> parents: 625 diff changeset	2194 conn = th_conn_new(nn_network_errfunc, nn_network_msgfunc, -1);
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2195 if (conn == NULL)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2196 {
354 c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 353 diff changeset	2197 errorMsg("Could not create connection structure.\n");
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 353 diff changeset	2198 goto err_exit;
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 353 diff changeset	2199 }
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2200
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2201 editState.conn = conn;
354 c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 353 diff changeset	2202
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	2203 // Are we using a proxy?
638 bda973fa2b3b Add proxy disable/enable setting. Matti Hamalainen <ccr@tnsp.org> parents: 636 diff changeset	2204 if (optProxyEnable && optProxyType != TH_PROXY_NONE && optProxyServer != NULL)
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2205 {
602 4bae14092b78 Add parameters (unused for now) for proxy password etc. in case SOCKS 5 Matti Hamalainen <ccr@tnsp.org> parents: 601 diff changeset	2206 if (optProxyUserID == NULL)
4bae14092b78 Add parameters (unused for now) for proxy password etc. in case SOCKS 5 Matti Hamalainen <ccr@tnsp.org> parents: 601 diff changeset	2207 optProxyUserID = "James Bond";
4bae14092b78 Add parameters (unused for now) for proxy password etc. in case SOCKS 5 Matti Hamalainen <ccr@tnsp.org> parents: 601 diff changeset	2208
628 fd0e1589e268 API update. Matti Hamalainen <ccr@tnsp.org> parents: 627 diff changeset	2209 if (th_conn_set_proxy(conn, optProxyType, optProxyPort, optProxyServer, optProxyAuthType) != THERR_OK \|\|
633 ce605ac8167a Proxy handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 629 diff changeset	2210 th_conn_set_proxy_auth_user(conn, optProxyUserID, optProxyPassword) != THERR_OK \|\|
ce605ac8167a Proxy handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 629 diff changeset	2211 th_conn_set_proxy_mode(conn, TH_PROXY_CMD_CONNECT) != THERR_OK \|\|
635 43eee625021a Fixes in proxy usage. Matti Hamalainen <ccr@tnsp.org> parents: 633 diff changeset	2212 th_conn_set_proxy_addr_type(conn, optProxyAddrType) != THERR_OK)
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2213 {
354 c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 353 diff changeset	2214 errorMsg("Error setting proxy information.\n");
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 347 diff changeset	2215 goto err_exit;
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 347 diff changeset	2216 }
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 347 diff changeset	2217 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2218
329 c0988ab45afd #ifdef out the policy probe. Matti Hamalainen <ccr@tnsp.org> parents: 328 diff changeset	2219 #ifdef FINAL_BUILD
268 d04ea4395e9e Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase. Matti Hamalainen <ccr@tnsp.org> parents: 267 diff changeset	2220 /* To emulate the official client, we first make a request for
d04ea4395e9e Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase. Matti Hamalainen <ccr@tnsp.org> parents: 267 diff changeset	2221 * policy file, even though we don't use it for anything...
d04ea4395e9e Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase. Matti Hamalainen <ccr@tnsp.org> parents: 267 diff changeset	2222 */
635 43eee625021a Fixes in proxy usage. Matti Hamalainen <ccr@tnsp.org> parents: 633 diff changeset	2223 if (th_conn_open(conn, 843, optServer) != 0)
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2224 {
268 d04ea4395e9e Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase. Matti Hamalainen <ccr@tnsp.org> parents: 267 diff changeset	2225 errorMsg("Policy file request connection setup failed!\n");
d04ea4395e9e Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase. Matti Hamalainen <ccr@tnsp.org> parents: 267 diff changeset	2226 goto err_exit;
d04ea4395e9e Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase. Matti Hamalainen <ccr@tnsp.org> parents: 267 diff changeset	2227 }
d04ea4395e9e Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase. Matti Hamalainen <ccr@tnsp.org> parents: 267 diff changeset	2228
d04ea4395e9e Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase. Matti Hamalainen <ccr@tnsp.org> parents: 267 diff changeset	2229 tmpStr = "<policy-file-request/>";
629 005d7a0351b6 More API changes in th_network. Matti Hamalainen <ccr@tnsp.org> parents: 628 diff changeset	2230 if (th_conn_send_buf(conn, tmpStr, strlen(tmpStr) + 1) != THERR_OK)
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2231 {
268 d04ea4395e9e Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase. Matti Hamalainen <ccr@tnsp.org> parents: 267 diff changeset	2232 errorMsg("Failed to send policy file request.\n");
d04ea4395e9e Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase. Matti Hamalainen <ccr@tnsp.org> parents: 267 diff changeset	2233 goto err_exit;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2234 }
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2235 else
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2236 {
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	2237 int cres = th_conn_pull(conn);
624 24d97c710497 Adjust to changes in API. Matti Hamalainen <ccr@tnsp.org> parents: 623 diff changeset	2238 if (cres == TH_CONN_DATA_AVAIL)
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2239 {
288 e7ef3db3b954 Implement "windows" in the chat. Only main window used for now, and even Matti Hamalainen <ccr@tnsp.org> parents: 280 diff changeset	2240 printMsg(currWin, "Probe got: %s\n", conn->buf);
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2241 }
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2242 else
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2243 {
288 e7ef3db3b954 Implement "windows" in the chat. Only main window used for now, and even Matti Hamalainen <ccr@tnsp.org> parents: 280 diff changeset	2244 printMsg(currWin, "Could not get policy probe.\n");
268 d04ea4395e9e Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase. Matti Hamalainen <ccr@tnsp.org> parents: 267 diff changeset	2245 }
d04ea4395e9e Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase. Matti Hamalainen <ccr@tnsp.org> parents: 267 diff changeset	2246 }
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	2247 th_conn_free(conn);
329 c0988ab45afd #ifdef out the policy probe. Matti Hamalainen <ccr@tnsp.org> parents: 328 diff changeset	2248 #endif
268 d04ea4395e9e Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase. Matti Hamalainen <ccr@tnsp.org> parents: 267 diff changeset	2249
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	2250 // Okay, now do the proper connection ...
635 43eee625021a Fixes in proxy usage. Matti Hamalainen <ccr@tnsp.org> parents: 633 diff changeset	2251 if (th_conn_open(conn, optPort, optServer) != 0)
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2252 {
268 d04ea4395e9e Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase. Matti Hamalainen <ccr@tnsp.org> parents: 267 diff changeset	2253 errorMsg("Main connection setup failed!\n");
d04ea4395e9e Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase. Matti Hamalainen <ccr@tnsp.org> parents: 267 diff changeset	2254 goto err_exit;
d04ea4395e9e Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase. Matti Hamalainen <ccr@tnsp.org> parents: 267 diff changeset	2255 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2256
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	2257 // Send login command
268 d04ea4395e9e Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase. Matti Hamalainen <ccr@tnsp.org> parents: 267 diff changeset	2258 optUserNameEnc = nn_dblencode_str(optUserName);
d04ea4395e9e Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase. Matti Hamalainen <ccr@tnsp.org> parents: 267 diff changeset	2259 tmpStr = nn_dblencode_str(optSite);
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	2260 nn_conn_send_msg_v(conn, optUserNameEnc, "%%2Flogin%%20%%2Dsite%%20%s%%20%%2Dpassword%%20%s", tmpStr, optPassword);
268 d04ea4395e9e Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase. Matti Hamalainen <ccr@tnsp.org> parents: 267 diff changeset	2261 th_free(tmpStr);
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2262
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	2263 // Initialize user commands
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	2264 nn_usercmd_init();
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	2265
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	2266 // Initialize random numbers
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2267 editState.prevKeepAlive = time(NULL);
643 d6792ccefe2f Use ANSI C srand/rand() instead of POSIX srandom/random(). Matti Hamalainen <ccr@tnsp.org> parents: 642 diff changeset	2268 srand((int) editState.prevKeepAlive);
100 ed4067c10a8a Remove useless buffer usage from error reporting function. Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	2269
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	2270 // Enter mainloop
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	2271 th_conn_reset(conn);
571 3ae357fd34bb Rename quit-related internal variables. Matti Hamalainen <ccr@tnsp.org> parents: 565 diff changeset	2272 while (!editState.isError && !appQuitFlag)
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2273 {
445 7e46f2f0ba34 Cleanup packet retrying a bit. Matti Hamalainen <ccr@tnsp.org> parents: 444 diff changeset	2274 int retries = 3, cres;
584 6d23385c0643 Prevent spurious screen updates. Matti Hamalainen <ccr@tnsp.org> parents: 582 diff changeset	2275 editState.update = FALSE;
445 7e46f2f0ba34 Cleanup packet retrying a bit. Matti Hamalainen <ccr@tnsp.org> parents: 444 diff changeset	2276
7e46f2f0ba34 Cleanup packet retrying a bit. Matti Hamalainen <ccr@tnsp.org> parents: 444 diff changeset	2277 packet_retry:
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	2278 cres = th_conn_pull(conn);
624 24d97c710497 Adjust to changes in API. Matti Hamalainen <ccr@tnsp.org> parents: 623 diff changeset	2279 if (cres == TH_CONN_DATA_AVAIL)
439 70ea06294f3f Possibly fix packet handling after the whole mess of refactoring. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	2280 {
639 02e1307e2a62 API changes in th_network module. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	2281 while (conn->base.ptr < conn->base.in_ptr &&
02e1307e2a62 API changes in th_network module. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	2282 *(conn->base.in_ptr - 1) == 0 &&
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2283 retries > 0 && !editState.isError)
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2284 {
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	2285 // th_conn_dump_buffer(stderr, conn);
403 7bec02f382fb Refactor the connection and protocol handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	2286 int result = nn_parse_protocol(conn);
436 f8d6a720388a Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 435 diff changeset	2287 if (result == 0)
f8d6a720388a Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 435 diff changeset	2288 {
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	2289 th_conn_buf_skip(conn, 1);
436 f8d6a720388a Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 435 diff changeset	2290 }
f8d6a720388a Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 435 diff changeset	2291 else
385 bbd5edbf1143 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 381 diff changeset	2292 if (result > 0)
bbd5edbf1143 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 381 diff changeset	2293 {
445 7e46f2f0ba34 Cleanup packet retrying a bit. Matti Hamalainen <ccr@tnsp.org> parents: 444 diff changeset	2294 // Retry if possible
439 70ea06294f3f Possibly fix packet handling after the whole mess of refactoring. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	2295 if (--retries > 0)
445 7e46f2f0ba34 Cleanup packet retrying a bit. Matti Hamalainen <ccr@tnsp.org> parents: 444 diff changeset	2296 goto packet_retry;
7e46f2f0ba34 Cleanup packet retrying a bit. Matti Hamalainen <ccr@tnsp.org> parents: 444 diff changeset	2297
7e46f2f0ba34 Cleanup packet retrying a bit. Matti Hamalainen <ccr@tnsp.org> parents: 444 diff changeset	2298 // Couldn't handle the message for some reason
639 02e1307e2a62 API changes in th_network module. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	2299 printMsg(currWin, "Could not handle: %s\n", conn->base.ptr);
02e1307e2a62 API changes in th_network module. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	2300 th_conn_buf_skip(conn, strlen(conn->base.ptr) + 1);
385 bbd5edbf1143 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 381 diff changeset	2301 }
436 f8d6a720388a Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 435 diff changeset	2302 else
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2303 editState.isError = TRUE;
403 7bec02f382fb Refactor the connection and protocol handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	2304 }
7bec02f382fb Refactor the connection and protocol handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	2305 }
439 70ea06294f3f Possibly fix packet handling after the whole mess of refactoring. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	2306 else
624 24d97c710497 Adjust to changes in API. Matti Hamalainen <ccr@tnsp.org> parents: 623 diff changeset	2307 if (cres < TH_CONN_ERROR \|\| !th_conn_check(conn))
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2308 editState.isError = TRUE;
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	2309
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	2310 // Handle user input
586 7c593c9303e8 Add another tiny screen update flush check. Matti Hamalainen <ccr@tnsp.org> parents: 584 diff changeset	2311 BOOL flushed = FALSE;
571 3ae357fd34bb Rename quit-related internal variables. Matti Hamalainen <ccr@tnsp.org> parents: 565 diff changeset	2312 if (appCursesInit)
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2313 {
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2314 nnwin_input_process(editBuf, &editState, processUserInput);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2315 nnwin_update(editState.update, editState.mask, editBuf, optUserName, optUserColor);
586 7c593c9303e8 Add another tiny screen update flush check. Matti Hamalainen <ccr@tnsp.org> parents: 584 diff changeset	2316 flushed = TRUE;
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2317 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2318
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2319 if (++updateCount > 10)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2320 {
96 7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	2321 time_t tmpTime = time(NULL);
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2322 if (tmpTime - editState.prevKeepAlive > SET_KEEPALIVE)
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2323 {
643 d6792ccefe2f Use ANSI C srand/rand() instead of POSIX srandom/random(). Matti Hamalainen <ccr@tnsp.org> parents: 642 diff changeset	2324 size_t n = ((size_t) rand()) % th_llist_length(setIdleMessages);
657 8b8ef14d7177 Update to match th-libs API changes. Matti Hamalainen <ccr@tnsp.org> parents: 654 diff changeset	2325 th_llist_t *node = th_llist_get_nth(setIdleMessages, n);
264 4c1c18a388d9 Add configuration setting and functionality for random "keepalive" messages to avoid idle timeout kicks from chat. Matti Hamalainen <ccr@tnsp.org> parents: 258 diff changeset	2326 nn_conn_send_msg(conn, optUserNameEnc, node->data);
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2327 editState.prevKeepAlive = tmpTime;
96 7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	2328 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2329
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2330 if (!colorSet)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2331 {
96 7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	2332 colorSet = TRUE;
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	2333 nn_conn_send_msg_v(conn, optUserNameEnc, "%%2FSetFontColor%%20%%2Dcolor%%20%06X", optUserColor);
96 7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	2334 }
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2335
586 7c593c9303e8 Add another tiny screen update flush check. Matti Hamalainen <ccr@tnsp.org> parents: 584 diff changeset	2336 if (appCursesInit && !flushed)
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2337 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2338 nnwin_update(FALSE, editState.mask, editBuf, optUserName, optUserColor);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2339 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2340
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	2341 updateCount = 0;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	2342 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	2343 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2344
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	2345 // Shutdown
13 86fe5f0d1a85 Cleanups; Added probing connection (requesting some policy crap) to emulate the official client. Matti Hamalainen <ccr@tnsp.org> parents: 12 diff changeset	2346 err_exit:
532 cfab338d3c9e Stop to show errors when exiting even when not running on Win32. Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	2347 if (errorMessages \|\| editState.isError)
521 a9a81db93c74 Fix win32 build again. Matti Hamalainen <ccr@tnsp.org> parents: 520 diff changeset	2348 {
a9a81db93c74 Fix win32 build again. Matti Hamalainen <ccr@tnsp.org> parents: 520 diff changeset	2349 char *tmp;
a9a81db93c74 Fix win32 build again. Matti Hamalainen <ccr@tnsp.org> parents: 520 diff changeset	2350 printMsg(NULL, "Press enter to exit.\n");
535 379e361f1144 Fix various segfault issues. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	2351 clearEditState(&editState);
521 a9a81db93c74 Fix win32 build again. Matti Hamalainen <ccr@tnsp.org> parents: 520 diff changeset	2352 tmp = nnwin_prompt_requester(FALSE, &editState, processUserPrompt, updateUserPrompt);
a9a81db93c74 Fix win32 build again. Matti Hamalainen <ccr@tnsp.org> parents: 520 diff changeset	2353 th_free(tmp);
a9a81db93c74 Fix win32 build again. Matti Hamalainen <ccr@tnsp.org> parents: 520 diff changeset	2354 }
a9a81db93c74 Fix win32 build again. Matti Hamalainen <ccr@tnsp.org> parents: 520 diff changeset	2355
316 1065115665bd Plug some more minor memory leaks. Matti Hamalainen <ccr@tnsp.org> parents: 315 diff changeset	2356 th_cfg_free(cfg);
432 966c521e0954 Rename user home directory variable. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	2357 th_free(setHomeDir);
648 a9d25e083f44 Separate home dir and config dir functionality. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	2358 th_free(setConfigDir);
694 788a58dab07a th-libs function th_llist_free_func() was renamed to th_llist_free_func_data(). Fix references. Matti Hamalainen <ccr@tnsp.org> parents: 693 diff changeset	2359 th_llist_free_func_data(setIdleMessages, th_free);
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	2360 nn_userhash_free(nnUsers);
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	2361 nn_editbuf_free(editBuf);
288 e7ef3db3b954 Implement "windows" in the chat. Only main window used for now, and even Matti Hamalainen <ccr@tnsp.org> parents: 280 diff changeset	2362
466 796508f828f6 Refactor much of the "windowing" UI code into a new module, ui.[ch] Matti Hamalainen <ccr@tnsp.org> parents: 464 diff changeset	2363 for (index = 0; index <= SET_MAX_HISTORY; index++)
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	2364 nn_editbuf_free(editHistBuf[index]);
288 e7ef3db3b954 Implement "windows" in the chat. Only main window used for now, and even Matti Hamalainen <ccr@tnsp.org> parents: 280 diff changeset	2365
489 ba48840b8525 Move network initialization/shutdown flag checking to network module. Matti Hamalainen <ccr@tnsp.org> parents: 486 diff changeset	2366 nnwin_shutdown();
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2367
661 eb3692d85ac2 Use TH_PLAT_WINDOWS for preprocessor conditionals. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	2368 #ifndef TH_PLAT_WINDOWS
223 03af28fb1c38 Show error messages printed out to stderr only after the program has quit. Matti Hamalainen <ccr@tnsp.org> parents: 222 diff changeset	2369 if (errorMessages)
03af28fb1c38 Show error messages printed out to stderr only after the program has quit. Matti Hamalainen <ccr@tnsp.org> parents: 222 diff changeset	2370 THERR("%s", errorMessages);
222 a1fefbce0b7a Add a simple 'press enter to continue' for Windows port, when an error occurs so the user can see it before the application closes. Matti Hamalainen <ccr@tnsp.org> parents: 221 diff changeset	2371 #endif
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2372
198 21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	2373 th_free(optUserNameEnc);
622 bb6b07b44800 Network code is being generalized into a th-libs module. Matti Hamalainen <ccr@tnsp.org> parents: 621 diff changeset	2374 th_conn_free(conn);
623 118276b60667 More work towards using th-libs th_network module. Matti Hamalainen <ccr@tnsp.org> parents: 622 diff changeset	2375 th_network_close();
68 3ab7751fdad1 MingW compatibility, with one ugly kludge. Matti Hamalainen <ccr@tnsp.org> parents: 67 diff changeset	2376
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	2377 THMSG(1, "Connection terminated.\n");
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	2378
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	2379 return 0;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2380 }

Mercurial > hg > nnchat

annotate main.c @ 694:788a58dab07a