nnchat: main.c annotate

annotate main.c @ 621:29b8ff5b625b

Use th_get_error() and th_error_str().

author	Matti Hamalainen <ccr@tnsp.org>
date	Tue, 27 May 2014 07:27:14 +0300
parents	a1abf812785f
children	bb6b07b44800

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

Mercurial > hg > nnchat

annotate main.c @ 621:29b8ff5b625b