nnchat: main.c annotate

annotate main.c @ 629:005d7a0351b6

More API changes in th_network.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sat, 21 Jun 2014 06:38:54 +0300
parents	fd0e1589e268
children	ce605ac8167a

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

Mercurial > hg > nnchat

annotate main.c @ 629:005d7a0351b6