nnchat: main.c annotate

annotate main.c @ 519:f17d2ab25618

Add option for only allowing private messages from people on a special friend list.

author	Matti Hamalainen <ccr@tnsp.org>
date	Tue, 05 Jun 2012 23:20:52 +0300
parents	8132548e1a07
children	ab56ed0d0c25

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
421 4b7cd24dc943 Update copyright. Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	4 * (C) Copyright 2008-2012 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"
468 607bd4491e79 Fix win32 build. Matti Hamalainen <ccr@tnsp.org> parents: 466 diff changeset	11 #include <time.h>
415 8263cb88556a Some #include cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 413 diff changeset	12 #include <errno.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>
128 713879a7ca10 Wait for forked processes, to prevent a zombie apocalypse. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	15 #else
713879a7ca10 Wait for forked processes, to prevent a zombie apocalypse. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	16 #include <sys/wait.h>
68 3ab7751fdad1 MingW compatibility, with one ugly kludge. Matti Hamalainen <ccr@tnsp.org> parents: 67 diff changeset	17 #endif
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	18
139 c39399725f7b Define some platform-specific constants. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	19 #ifdef __WIN32
160 d3c78f2ef77b Rename configuration file for Windows. Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	20 #define SET_CONFIG_FILE "nnchat.txt"
139 c39399725f7b Define some platform-specific constants. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	21 #define SET_DIR_SEPARATOR "\\"
c39399725f7b Define some platform-specific constants. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	22 #else
c39399725f7b Define some platform-specific constants. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	23 #define SET_CONFIG_FILE ".nnchat"
c39399725f7b Define some platform-specific constants. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	24 #define SET_DIR_SEPARATOR "/"
c39399725f7b Define some platform-specific constants. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	25 #endif
49 0bcc38910a77 Simple ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	26
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	27 #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	28 #define SET_NICK_SEPARATOR ':'
4556174b5be8 Make nickname autocomplete separator configurable. Matti Hamalainen <ccr@tnsp.org> parents: 408 diff changeset	29
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	30 #define SET_MAX_HISTORY (16) // Command history length
d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	31 #define SET_KEEPALIVE (15*60) // Ping/keepalive period in seconds
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	32
49 0bcc38910a77 Simple ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	33
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	34 /* Options
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	35 */
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	36 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	37 optProxyPort = 1080,
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	38 optProxyType = NN_PROXY_NONE;
207 e0c085426b91 Change default user color to black (#000000). Matti Hamalainen <ccr@tnsp.org> parents: 206 diff changeset	39 int optUserColor = 0x000000;
96 7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	40 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	41 *optProxyServer = NULL,
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	42 *optUserName = NULL,
198 21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	43 *optUserNameCmd = NULL,
21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	44 *optUserNameEnc = NULL,
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	45 *optPassword = NULL,
198 21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	46 *optPasswordCmd = NULL,
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	47 *optLogFilename = NULL,
409 4556174b5be8 Make nickname autocomplete separator configurable. Matti Hamalainen <ccr@tnsp.org> parents: 408 diff changeset	48 *optSite = "NN",
4556174b5be8 Make nickname autocomplete separator configurable. Matti Hamalainen <ccr@tnsp.org> parents: 408 diff changeset	49 *optNickSepStr = NULL;
4556174b5be8 Make nickname autocomplete separator configurable. Matti Hamalainen <ccr@tnsp.org> parents: 408 diff changeset	50 char optNickSep;
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	51 BOOL optDaemon = FALSE;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	52 FILE *optLogFile = 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	53 BOOL setIgnoreMode = 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	54 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	55 optLogEnable = 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	56 optOnlyFriendPrv = FALSE;
140 2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	57
265 b9c650db8a6a Rename variable nnIgnoreList to setIgnoreList. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	58 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	59 *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	60 *setIdleMessages = NULL;
140 2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	61 nn_userhash_t *nnUsers = NULL;
137 fad8c31e41e6 Move browser code around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	62 char *setConfigFile = NULL,
fad8c31e41e6 Move browser code around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	63 *setBrowser = NULL;
133 ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	64 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	65
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	66 nn_editbuf_t *editHistBuf[SET_MAX_HISTORY+2];
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	67 int editHistPos = 0,
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	68 editHistMax = 0;
273 4d106ad65f26 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 268 diff changeset	69
4d106ad65f26 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 268 diff changeset	70 /* Logging mode flags
4d106ad65f26 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 268 diff changeset	71 */
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	72 enum
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	73 {
273 4d106ad65f26 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 268 diff changeset	74 LOG_FILE = 1,
4d106ad65f26 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 268 diff changeset	75 LOG_WINDOW = 2,
4d106ad65f26 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 268 diff changeset	76 LOG_STAMP = 4
4d106ad65f26 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 268 diff changeset	77 };
4d106ad65f26 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 268 diff changeset	78
4d106ad65f26 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 268 diff changeset	79
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	80 /* Arguments
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	81 */
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	82 optarg_t optList[] =
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	83 {
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	84 { 0, '?', "help", "Show this help", OPT_NONE },
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	85 { 1, 'v', "verbose", "Be more verbose", OPT_NONE },
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	86 { 2, 'p', "port", "Connect to port", OPT_ARGREQ },
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	87 { 3, 's', "server", "Server to connect to", OPT_ARGREQ },
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	88 { 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	89 { 5, 'l', "logfile", "Log filename", OPT_ARGREQ },
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	90 { 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	91 { 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	92 { 8, 'd', "debug", "Enable various debug features", OPT_NONE },
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	93
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	94 {10, '4', "socks4", "SOCKS4 proxy server", OPT_ARGREQ },
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	95 {11, 'A', "socks4a", "SOCKS4A proxy server", OPT_ARGREQ },
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	96 {12, 'P', "proxy-port", "Proxy port (default: 1080)", OPT_ARGREQ },
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	97 };
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	98
43 40ba8cdcf03a Cleanups, added a silly morse code conversion mode. Matti Hamalainen <ccr@tnsp.org> parents: 41 diff changeset	99 const int optListN = (sizeof(optList) / sizeof(optList[0]));
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	100
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	101
258 8a0f7446318e General cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 254 diff changeset	102 void argShowHelp(void)
68 3ab7751fdad1 MingW compatibility, with one ugly kludge. Matti Hamalainen <ccr@tnsp.org> parents: 67 diff changeset	103 {
381 7c28f38cb6dd Update to use new th-libs from the subrepo. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	104 th_print_banner(stdout, th_prog_name,
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	105 "[options] <username> <password>");
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	106
381 7c28f38cb6dd Update to use new th-libs from the subrepo. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	107 th_args_help(stdout, optList, optListN);
68 3ab7751fdad1 MingW compatibility, with one ugly kludge. Matti Hamalainen <ccr@tnsp.org> parents: 67 diff changeset	108 }
3ab7751fdad1 MingW compatibility, with one ugly kludge. Matti Hamalainen <ccr@tnsp.org> parents: 67 diff changeset	109
3ab7751fdad1 MingW compatibility, with one ugly kludge. Matti Hamalainen <ccr@tnsp.org> parents: 67 diff changeset	110
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	111 BOOL argHandleOpt(const int optN, char optArg, char currArg)
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	112 {
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	113 switch (optN)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	114 {
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	115 case 0:
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	116 argShowHelp();
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	117 exit(0);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	118 break;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	119
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	120 case 1:
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	121 th_verbosityLevel++;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	122 break;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	123
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	124 case 2:
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	125 optPort = atoi(optArg);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	126 break;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	127
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	128 case 3:
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	129 optServer = optArg;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	130 break;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	131
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	132 case 4:
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	133 if ((optUserColor = th_get_hex_triplet(optArg)) < 0)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	134 {
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	135 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	136 optArg);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	137 return FALSE;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	138 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	139 THMSG(1, "Using color #%06x\n", optUserColor);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	140 break;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	141
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	142 case 5:
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	143 optLogFilename = optArg;
242 cb86d7543be2 Add functionality for generating logfile names based on port etc. and Matti Hamalainen <ccr@tnsp.org> parents: 240 diff changeset	144 optLogEnable = TRUE;
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	145 break;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	146
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	147 case 7:
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	148 optSite = optArg;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	149 break;
33 e49ea6febfeb Cleanups. Added option to specify/fake "site" where logging in from. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	150
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	151 case 6:
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	152 optDaemon = TRUE;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	153 THMSG(1, "Running in pseudo-daemon mode.\n");
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	154 break;
21 29098addfa65 Added a "daemon" mode. Matti Hamalainen <ccr@tnsp.org> parents: 19 diff changeset	155
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	156 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	157 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	158 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	159 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	160
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	161
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	162 case 10:
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	163 optProxyServer = optArg;
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	164 optProxyType = NN_PROXY_SOCKS4;
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	165 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	166
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	167 case 11:
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	168 optProxyServer = optArg;
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	169 optProxyType = NN_PROXY_SOCKS4A;
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	170 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	171
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	172 case 12:
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	173 optPort = atoi(optArg);
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	174 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	175
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	176
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	177 default:
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	178 THERR("Unknown option '%s'.\n", currArg);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	179 return FALSE;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	180 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	181
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	182 return TRUE;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	183 }
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	184
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	185
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	186 BOOL argHandleFile(char *currArg)
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	187 {
198 21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	188 if (!optUserNameCmd)
21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	189 optUserNameCmd = currArg;
21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	190 else if (!optPasswordCmd)
21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	191 optPasswordCmd = currArg;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	192 else
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	193 {
198 21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	194 THERR("Username '%s' already specified on commandline!\n", optUserNameCmd);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	195 return FALSE;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	196 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	197
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	198 return TRUE;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	199 }
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	200
460 c956af023014 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	201
28 512775f6b081 A refactored ncurses-based UI. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	202 int printFile(FILE outFile, const char fmt)
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	203 {
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	204 const char *s = fmt;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	205
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	206 while (*s)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	207 {
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	208 if (*s == '½')
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	209 {
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	210 s++;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	211 if (*s == '½')
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	212 {
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	213 fputc((unsigned char) *s, outFile);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	214 s++;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	215 }
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	216 else
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	217 {
74 98004129202a Portability fixes. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	218 while (s && isdigit((int) s)) s++;
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	219 if (*s != '½') return -1;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	220 s++;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	221 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	222 }
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	223 else
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	224 {
191 4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	225 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	226 fputc(' ', outFile);
4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	227 else
4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	228 fputc((unsigned char) *s, outFile);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	229 s++;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	230 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	231 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	232
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	233 return 0;
28 512775f6b081 A refactored ncurses-based UI. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	234 }
512775f6b081 A refactored ncurses-based UI. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	235
288 e7ef3db3b954 Implement "windows" in the chat. Only main window used for now, and even Matti Hamalainen <ccr@tnsp.org> parents: 280 diff changeset	236 void printMsgV(nn_window_t win, int flags, const char fmt, va_list ap)
28 512775f6b081 A refactored ncurses-based UI. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	237 {
288 e7ef3db3b954 Implement "windows" in the chat. Only main window used for now, and even Matti Hamalainen <ccr@tnsp.org> parents: 280 diff changeset	238 char tmpStr[128], *buf;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	239
397 932829a556c7 Rename a function. Matti Hamalainen <ccr@tnsp.org> parents: 391 diff changeset	240 str_get_timestamp(tmpStr, sizeof(tmpStr), "½17½[½11½%H:%M:%S½17½]½0½ ");
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	241
288 e7ef3db3b954 Implement "windows" in the chat. Only main window used for now, and even Matti Hamalainen <ccr@tnsp.org> parents: 280 diff changeset	242 buf = th_strdup_vprintf(fmt, ap);
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	243
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	244 if (optLogFile && (flags & LOG_FILE))
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	245 {
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	246 if (flags & LOG_STAMP) printFile(optLogFile, tmpStr);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	247 printFile(optLogFile, buf);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	248 fflush(optLogFile);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	249 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	250
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	251 if (!optDaemon && (flags & LOG_WINDOW))
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	252 {
466 796508f828f6 Refactor much of the "windowing" UI code into a new module, ui.[ch] Matti Hamalainen <ccr@tnsp.org> parents: 464 diff changeset	253 nn_window_t *tmp = (win != NULL) ? win : nnwin_main_window();
501 ca88945d8eda Begin work on integrating the removal of ncurses "windowing" and transition Matti Hamalainen <ccr@tnsp.org> parents: 497 diff changeset	254 if (flags & LOG_STAMP) nnwin_print(tmp, tmpStr);
ca88945d8eda Begin work on integrating the removal of ncurses "windowing" and transition Matti Hamalainen <ccr@tnsp.org> parents: 497 diff changeset	255 nnwin_print(tmp, buf);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	256 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	257
288 e7ef3db3b954 Implement "windows" in the chat. Only main window used for now, and even Matti Hamalainen <ccr@tnsp.org> parents: 280 diff changeset	258 th_free(buf);
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	259 }
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	260
288 e7ef3db3b954 Implement "windows" in the chat. Only main window used for now, and even Matti Hamalainen <ccr@tnsp.org> parents: 280 diff changeset	261 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	262 {
ed4067c10a8a Remove useless buffer usage from error reporting function. Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	263 va_list ap;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	264
100 ed4067c10a8a Remove useless buffer usage from error reporting function. Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	265 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	266 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	267 va_end(ap);
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	268 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	269
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	270 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	271 {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	272 va_list ap;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	273
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	274 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	275 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	276 va_end(ap);
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	277 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	278
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	279 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	280 {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	281 va_list ap;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	282
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	283 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	284 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	285 va_end(ap);
ed4067c10a8a Remove useless buffer usage from error reporting function. Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	286 }
ed4067c10a8a Remove useless buffer usage from error reporting function. Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	287
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	288
223 03af28fb1c38 Show error messages printed out to stderr only after the program has quit. Matti Hamalainen <ccr@tnsp.org> parents: 222 diff changeset	289 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	290
236 71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	291 void errorMsgV(const char *fmt, va_list ap)
96 7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	292 {
385 bbd5edbf1143 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 381 diff changeset	293 char *tmp = th_strdup_vprintf(fmt, ap);
96 7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	294
359 8f3c102db611 Fix SOCKS handling. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	295 printMsg(NULL, "%s", tmp);
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	296
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	297 if (errorMessages != NULL)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	298 {
223 03af28fb1c38 Show error messages printed out to stderr only after the program has quit. Matti Hamalainen <ccr@tnsp.org> parents: 222 diff changeset	299 char *tmp2 = th_strdup_printf("%s%s", errorMessages, tmp);
03af28fb1c38 Show error messages printed out to stderr only after the program has quit. Matti Hamalainen <ccr@tnsp.org> parents: 222 diff changeset	300 th_free(errorMessages);
03af28fb1c38 Show error messages printed out to stderr only after the program has quit. Matti Hamalainen <ccr@tnsp.org> parents: 222 diff changeset	301 th_free(tmp);
03af28fb1c38 Show error messages printed out to stderr only after the program has quit. Matti Hamalainen <ccr@tnsp.org> parents: 222 diff changeset	302 errorMessages = tmp2;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	303 }
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	304 else
223 03af28fb1c38 Show error messages printed out to stderr only after the program has quit. Matti Hamalainen <ccr@tnsp.org> parents: 222 diff changeset	305 errorMessages = tmp;
96 7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	306 }
7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	307
466 796508f828f6 Refactor much of the "windowing" UI code into a new module, ui.[ch] Matti Hamalainen <ccr@tnsp.org> parents: 464 diff changeset	308
236 71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	309 void errorMsg(const char *fmt, ...)
71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	310 {
71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	311 va_list ap;
71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	312
71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	313 va_start(ap, fmt);
71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	314 errorMsgV(fmt, ap);
71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	315 va_end(ap);
71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	316 }
71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	317
466 796508f828f6 Refactor much of the "windowing" UI code into a new module, ui.[ch] Matti Hamalainen <ccr@tnsp.org> parents: 464 diff changeset	318
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	319 void debugMsg(const char *fmt, ...)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	320 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	321 if (optDebug)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	322 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	323 va_list ap;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	324
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	325 va_start(ap, fmt);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	326 printMsgV(NULL, LOG_FILE\|LOG_WINDOW, fmt, ap);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	327 va_end(ap);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	328 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	329 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	330
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	331
236 71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	332 void errorFunc(struct _nn_conn_t conn, const char fmt, va_list ap)
71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	333 {
262 6d48fc4fd421 Shut up some trivial warnings. Matti Hamalainen <ccr@tnsp.org> parents: 258 diff changeset	334 (void) conn;
236 71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	335 errorMsgV(fmt, ap);
71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	336 }
71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	337
466 796508f828f6 Refactor much of the "windowing" UI code into a new module, ui.[ch] Matti Hamalainen <ccr@tnsp.org> parents: 464 diff changeset	338
236 71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	339 void messageFunc(struct _nn_conn_t conn, const char fmt, va_list ap)
71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	340 {
262 6d48fc4fd421 Shut up some trivial warnings. Matti Hamalainen <ccr@tnsp.org> parents: 258 diff changeset	341 (void) conn;
354 c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 353 diff changeset	342 printMsgV(NULL, LOG_STAMP \| LOG_WINDOW \| LOG_FILE, fmt, ap);
236 71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	343 }
71fa0364c058 Report network errors to the user. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	344
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	345
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	346 BOOL checkNameList(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	347 {
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	348 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	349
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	350 for (node = list; node != NULL; node = node->next)
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	351 {
372 b9f0bdad6285 Use th_strcasecmp() and th_strncasecmp(). Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	352 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	353 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	354 }
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	355
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	356 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	357 }
801ac37321f6 Sanitize ignore handling; Also action messages and PRVs were not being properly ignored, fixed. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	358
801ac37321f6 Sanitize ignore handling; Also action messages and PRVs were not being properly ignored, fixed. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	359
416 8bb69e749d97 Rename some functions. Matti Hamalainen <ccr@tnsp.org> parents: 415 diff changeset	360 int nnproto_parse_user(nn_conn_t *conn)
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	361 {
229 08d4355d6fc9 Repair automatic PRV target setting. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	362 BOOL isMine, isIgnored = FALSE;
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	363 char name, msg, *t;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	364
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	365 // Find start of the message
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	366 name = conn->ptr;
430 aaadf6cea6be Better handling of some messages. Matti Hamalainen <ccr@tnsp.org> parents: 429 diff changeset	367 t = nn_conn_buf_strstr(conn, "</USER>");
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	368 if (!t) return 1;
ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	369 *t = 0;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	370
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	371 // Find end of the message
430 aaadf6cea6be Better handling of some messages. Matti Hamalainen <ccr@tnsp.org> parents: 429 diff changeset	372 t = nn_conn_buf_strstr(conn, "<MESSAGE>");
aaadf6cea6be Better handling of some messages. Matti Hamalainen <ccr@tnsp.org> parents: 429 diff changeset	373 if (!t) return 2;
aaadf6cea6be Better handling of some messages. Matti Hamalainen <ccr@tnsp.org> parents: 429 diff changeset	374 msg = conn->ptr;
aaadf6cea6be Better handling of some messages. Matti Hamalainen <ccr@tnsp.org> parents: 429 diff changeset	375
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	376 t = nn_conn_buf_strstr(conn, "</MESSAGE>");
229 08d4355d6fc9 Repair automatic PRV target setting. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	377 if (!t) return 3;
08d4355d6fc9 Repair automatic PRV target setting. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	378 *t = 0;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	379
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	380 // Decode message string
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	381 msg = nn_decode_str1(msg);
481 73a648387d10 Improve error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	382 if (!msg)
73a648387d10 Improve error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	383 {
73a648387d10 Improve error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	384 errorMsg("Decode/malloc failure @ nnproto_parse_user()\n");
73a648387d10 Improve error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	385 return -1;
73a648387d10 Improve error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	386 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	387
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	388 // Decode username
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	389 name = nn_decode_str1(name);
ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	390 if (!name)
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	391 {
481 73a648387d10 Improve error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	392 errorMsg("Decode/malloc failure @ nnproto_parse_user()\n");
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	393 th_free(msg);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	394 return -2;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	395 }
229 08d4355d6fc9 Repair automatic PRV target setting. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	396
08d4355d6fc9 Repair automatic PRV target setting. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	397 /* 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	398 * that it is not our OWN username!
08d4355d6fc9 Repair automatic PRV target setting. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	399 */
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	400 isMine = strcmp(name, optUserName) == 0;
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	401 isIgnored = setIgnoreMode && !isMine && checkNameList(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	402
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	403 // Is it a special control message?
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	404 if (*msg == '/')
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	405 {
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	406 // Ignore room join/leave messages
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	407 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	408 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	409
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	410 t = nn_strip_tags(msg + 1);
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	411 if (!strncmp(t, "BPRV ", 5))
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	412 {
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	413 char in_name, tmp, in_msg, h;
293 ff39ebf05b40 Fix unwindowed PRVs. Matti Hamalainen <ccr@tnsp.org> parents: 291 diff changeset	414 nn_window_t *win;
ff39ebf05b40 Fix unwindowed PRVs. Matti Hamalainen <ccr@tnsp.org> parents: 291 diff changeset	415 h = nn_decode_str2(t + 1);
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	416
418 8ca09a6cca09 Minor cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	417 // Check type of
8ca09a6cca09 Minor cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	418 if ((isMine = strncmp(t, "BPRV from ", 10)) == 0)
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	419 in_name = nn_decode_str2(t + 10);
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	420 else
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	421 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	422
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	423 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	424 if (tmp[0] != 0 && tmp[1] == ' ')
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	425 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	426 else
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	427 in_msg = "";
291 cc2a1d837e7b Window / buffer functionality works now. Queries work (with few minor glitches). Matti Hamalainen <ccr@tnsp.org> parents: 289 diff changeset	428 *tmp = 0;
cc2a1d837e7b Window / buffer functionality works now. Queries work (with few minor glitches). Matti Hamalainen <ccr@tnsp.org> parents: 289 diff changeset	429
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	430 if (!optOnlyFriendPrv \|\| !checkNameList(setFriendList, in_name))
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	431 {
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	432 isIgnored = setIgnoreMode && checkNameList(setIgnoreList, in_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	433 win = nnwin_find(in_name);
388 f45673fe6b23 Log private messages always in the PRV format. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	434
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	435 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	436 {
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	437 printMsgF(win, isIgnored ? 0 : LOG_WINDOW,
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	438 "½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	439 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	440
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	441 printMsgF(NULL, LOG_FILE, "½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	442 }
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	443 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	444 {
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	445 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	446 "½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	447 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	448 }
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	449
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	450 th_free(in_name);
293 ff39ebf05b40 Fix unwindowed PRVs. Matti Hamalainen <ccr@tnsp.org> parents: 291 diff changeset	451 th_free(h);
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	452 }
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	453 else
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	454 {
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	455 // 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	456 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	457 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	458 "½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	459 th_free(h);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	460 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	461 th_free(t);
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	462 }
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	463 else
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	464 {
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	465 // 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	466 char *h;
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	467 t = nn_strip_tags(msg);
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	468 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	469 printMsgF(NULL, isIgnored ? LOG_FILE : (LOG_WINDOW \| LOG_FILE),
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	470 "½5½<½%d½%s½5½>½0½ %s\n", isMine ? 14 : 15, name, h);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	471 th_free(h);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	472 th_free(t);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	473 }
108 f323b137ca08 Tab-completion now works with cycling, but bugs with names that have whitespaces. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	474
229 08d4355d6fc9 Repair automatic PRV target setting. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	475 done:
417 ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	476 th_free(msg);
ccee77fe4525 Fix protocol message parsing. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	477 th_free(name);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	478 return 0;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	479 }
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	480
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	481
416 8bb69e749d97 Rename some functions. Matti Hamalainen <ccr@tnsp.org> parents: 415 diff changeset	482 int nnproto_parse_login(nn_conn_t *conn)
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	483 {
156 0a9fe14882dc Introduce utility function getTimeStamp() and use it to lessen code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	484 char tmpStr[256];
403 7bec02f382fb Refactor the connection and protocol handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	485 str_get_timestamp(tmpStr, sizeof(tmpStr), "%c");
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	486
403 7bec02f382fb Refactor the connection and protocol handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	487 if (!nn_conn_buf_strcmp(conn, "FAILURE>"))
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	488 {
430 aaadf6cea6be Better handling of some messages. Matti Hamalainen <ccr@tnsp.org> parents: 429 diff changeset	489 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	490 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	491 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	492 return -2;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	493 }
403 7bec02f382fb Refactor the connection and protocol handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	494 else if (!nn_conn_buf_strcmp(conn, "SUCCESS>"))
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	495 {
430 aaadf6cea6be Better handling of some messages. Matti Hamalainen <ccr@tnsp.org> parents: 429 diff changeset	496 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	497 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	498 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	499 nn_conn_send_msg(conn, optUserNameEnc, "%2FRequestUserList");
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	500 return 0;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	501 }
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	502 else
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	503 return 1;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	504 }
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	505
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	506
416 8bb69e749d97 Rename some functions. Matti Hamalainen <ccr@tnsp.org> parents: 415 diff changeset	507 int nnproto_parse_add_user(nn_conn_t *conn)
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	508 {
403 7bec02f382fb Refactor the connection and protocol handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	509 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	510 nn_window_t *win;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	511
403 7bec02f382fb Refactor the connection and protocol handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	512 s = nn_conn_buf_strstr(conn, "</ADD_USER>");
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	513 if (!s) return 1;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	514 *s = 0;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	515
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	516 p = nn_dbldecode_str(str);
481 73a648387d10 Improve error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	517 if (!p)
73a648387d10 Improve error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	518 {
73a648387d10 Improve error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	519 errorMsg("Decode/malloc failure @ nnproto_parse_add_user()\n");
73a648387d10 Improve error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	520 return -1;
73a648387d10 Improve error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	521 }
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	522
422 8eb2839a565c Rename various functions. Matti Hamalainen <ccr@tnsp.org> parents: 421 diff changeset	523 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	524 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	525
288 e7ef3db3b954 Implement "windows" in the chat. Only main window used for now, and even Matti Hamalainen <ccr@tnsp.org> parents: 280 diff changeset	526 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	527 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	528 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	529
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	530 th_free(p);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	531 return 0;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	532 }
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	533
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	534
416 8bb69e749d97 Rename some functions. Matti Hamalainen <ccr@tnsp.org> parents: 415 diff changeset	535 int nnproto_parse_delete_user(nn_conn_t *conn)
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	536 {
403 7bec02f382fb Refactor the connection and protocol handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	537 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	538 nn_window_t *win;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	539
403 7bec02f382fb Refactor the connection and protocol handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	540 s = nn_conn_buf_strstr(conn, "</DELETE_USER>");
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	541 if (!s) return 1;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	542 *s = 0;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	543
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	544 p = nn_dbldecode_str(str);
481 73a648387d10 Improve error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	545 if (!p)
73a648387d10 Improve error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	546 {
73a648387d10 Improve error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	547 errorMsg("Decode/malloc failure @ nnproto_parse_delete_user()\n");
73a648387d10 Improve error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	548 return -1;
73a648387d10 Improve error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	549 }
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	550
422 8eb2839a565c Rename various functions. Matti Hamalainen <ccr@tnsp.org> parents: 421 diff changeset	551 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	552 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	553
288 e7ef3db3b954 Implement "windows" in the chat. Only main window used for now, and even Matti Hamalainen <ccr@tnsp.org> parents: 280 diff changeset	554 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	555 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	556 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	557
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	558 th_free(p);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	559 return 0;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	560 }
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	561
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	562
416 8bb69e749d97 Rename some functions. Matti Hamalainen <ccr@tnsp.org> parents: 415 diff changeset	563 int nnproto_parse_num_clients(nn_conn_t *conn)
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	564 {
403 7bec02f382fb Refactor the connection and protocol handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	565 nn_conn_buf_strstr(conn, "</NUMCLIENTS>");
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	566 return 0;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	567 }
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	568
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	569
416 8bb69e749d97 Rename some functions. Matti Hamalainen <ccr@tnsp.org> parents: 415 diff changeset	570 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	571 {
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	572 (void) conn;
96 7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	573 errorMsg("Booted by server.\n");
7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	574 return -1;
7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	575 }
7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	576
7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	577
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	578 typedef struct
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	579 {
443 96cb82ebb93b Rename a structure member. Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	580 char *name;
431 a9b20b31cae1 More code cleanups, this time using clang with excessive warnings enabled. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	581 size_t len;
403 7bec02f382fb Refactor the connection and protocol handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	582 int (handler)(nn_conn_t );
7bec02f382fb Refactor the connection and protocol handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	583 } nn_protocolcmd_t;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	584
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	585
403 7bec02f382fb Refactor the connection and protocol handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	586 static nn_protocolcmd_t protoCmds[] =
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	587 {
431 a9b20b31cae1 More code cleanups, this time using clang with excessive warnings enabled. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	588 { "<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	589 { "<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	590 { "<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	591 { "<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	592 { "<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	593 { "<BOOT />", 0, nnproto_parse_boot },
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	594 };
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	595
108 f323b137ca08 Tab-completion now works with cycling, but bugs with names that have whitespaces. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	596 static const int nprotoCmds = sizeof(protoCmds) / sizeof(protoCmds[0]);
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	597
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	598
403 7bec02f382fb Refactor the connection and protocol handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	599 int nn_parse_protocol(nn_conn_t *conn)
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	600 {
130 352ec3c300e4 A different initialization. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	601 static BOOL protoCmdsInit = FALSE;
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	602 int i;
130 352ec3c300e4 A different initialization. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	603
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	604 if (!protoCmdsInit)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	605 {
130 352ec3c300e4 A different initialization. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	606 for (i = 0; i < nprotoCmds; i++)
443 96cb82ebb93b Rename a structure member. Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	607 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	608
130 352ec3c300e4 A different initialization. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	609 protoCmdsInit = TRUE;
352ec3c300e4 A different initialization. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	610 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	611
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	612 for (i = 0; i < nprotoCmds; i++)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	613 {
443 96cb82ebb93b Rename a structure member. Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	614 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	615 return protoCmds[i].handler(conn);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	616 }
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	617
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	618 if (optDebug)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	619 {
403 7bec02f382fb Refactor the connection and protocol handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	620 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	621 return 0;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	622 }
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	623 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	624 return 1;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	625 }
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	626
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	627
474 4ddc3d87242e Refactor web-browser launching into nn_open_uri(). Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	628 int nn_open_uri(const char *uri)
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	629 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	630 #ifdef __WIN32
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	631 HINSTANCE status;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	632
442 ecbd9773c74b Minor win32 build fix. Matti Hamalainen <ccr@tnsp.org> parents: 439 diff changeset	633 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	634 if (status <= (HINSTANCE) 32)
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	635 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	636 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	637 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	638 #else
474 4ddc3d87242e Refactor web-browser launching into nn_open_uri(). Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	639 int status;
4ddc3d87242e Refactor web-browser launching into nn_open_uri(). Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	640 int fds[2];
4ddc3d87242e Refactor web-browser launching into nn_open_uri(). Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	641 pid_t pid;
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	642
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	643 if (pipe(fds) == -1)
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	644 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	645 int ret = errno;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	646 printMsgQ(currWin, "Could not open process communication pipe! (%d, %s)\n", ret, strerror(ret));
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	647 return 0;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	648 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	649
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	650 if ((pid = fork()) < 0)
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	651 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	652 printMsgQ(currWin, "Could not create sub-process!\n");
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	653 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	654 else if (pid == 0)
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	655 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	656 dup2(fds[1], STDOUT_FILENO);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	657 dup2(fds[0], STDERR_FILENO);
474 4ddc3d87242e Refactor web-browser launching into nn_open_uri(). Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	658 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	659 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	660 th_free(url);
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	661 _exit(errno);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	662 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	663
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	664 wait(&status);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	665 #endif
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	666
474 4ddc3d87242e Refactor web-browser launching into nn_open_uri(). Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	667 return 0;
4ddc3d87242e Refactor web-browser launching into nn_open_uri(). Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	668 }
4ddc3d87242e Refactor web-browser launching into nn_open_uri(). Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	669
516 08bbd850e2dc Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 515 diff changeset	670
474 4ddc3d87242e Refactor web-browser launching into nn_open_uri(). Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	671 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	672 {
4ddc3d87242e Refactor web-browser launching into nn_open_uri(). Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	673 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	674 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	675 (void) conn;
4ddc3d87242e Refactor web-browser launching into nn_open_uri(). Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	676
4ddc3d87242e Refactor web-browser launching into nn_open_uri(). Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	677 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	678
4ddc3d87242e Refactor web-browser launching into nn_open_uri(). Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	679 nn_open_uri(uri);
4ddc3d87242e Refactor web-browser launching into nn_open_uri(). Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	680
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	681 th_free(uri);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	682 th_free(enc_name);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	683 return 0;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	684 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	685
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	686
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	687 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	688 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	689 (void) conn;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	690
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	691 if (name[0])
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	692 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	693 // 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	694 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	695 if (user != NULL)
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	696 {
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	697 printMsgQ(currWin, "Removed user '%s' from %s list.\n", name, listname);
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	698 th_llist_delete_node(&setIgnoreList, user);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	699 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	700 else
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	701 {
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	702 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	703 th_llist_append(list, th_strdup(name));
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	704 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	705 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	706 else
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	707 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	708 // 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	709 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	710 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	711 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	712 while (user != NULL)
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	713 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	714 if (user->data != NULL)
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	715 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	716 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	717 if (--nuser > 0)
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	718 th_pstr_printf(&result, "%s, ", result);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	719 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	720 user = user->next;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	721 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	722 printMsgQ(currWin, "%s\n", result);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	723 th_free(result);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	724 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	725
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	726 return 0;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	727 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	728
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	729
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	730 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	731 {
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	732 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	733 }
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	734
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	735
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	736 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	737 {
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	738 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	739 }
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	740
f17d2ab25618 Add option for only allowing private messages from people on a special friend list. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	741
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	742 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	743 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	744 int val;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	745 (void) conn;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	746
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	747 if ((val = th_get_hex_triplet(arg)) < 0)
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	748 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	749 printMsgQ(currWin, "Invalid color value '%s'\n", arg);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	750 return 1;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	751 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	752
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	753 optUserColor = val;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	754 printMsgQ(currWin, "Setting color to #%06x\n", optUserColor);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	755 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	756 return 0;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	757 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	758
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	759
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	760 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	761 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	762 (void) conn;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	763
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	764 if (name[0])
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	765 {
446 3396acd40147 Rename and remove some functions. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	766 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	767 if (user != NULL)
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	768 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	769 name = nn_username_decode(th_strdup(user->name));
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	770 printMsgQ(currWin, "Opening PRV query for '%s'.\n", name);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	771 if (nnwin_open(name, TRUE))
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	772 printMsgQ(currWin, "In PRV query with '%s'.\n", name);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	773 th_free(name);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	774 return 0;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	775 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	776 else
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	777 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	778 printMsgQ(currWin, "Could not find username '%s'.\n", name);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	779 return 1;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	780 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	781 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	782 else
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	783 {
472 53179f875131 Combine some prints. Matti Hamalainen <ccr@tnsp.org> parents: 468 diff changeset	784 printMsgQ(currWin,
53179f875131 Combine some prints. Matti Hamalainen <ccr@tnsp.org> parents: 468 diff changeset	785 "Usage: /query username\n"
53179f875131 Combine some prints. Matti Hamalainen <ccr@tnsp.org> parents: 468 diff changeset	786 "To close a PRV query, use /close [username]\n"
53179f875131 Combine some prints. Matti Hamalainen <ccr@tnsp.org> parents: 468 diff changeset	787 "/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	788 return 1;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	789 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	790 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	791
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	792
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	793 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	794 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	795 (void) conn;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	796
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	797 if (name[0])
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	798 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	799 nn_window_t *win = nnwin_find(name);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	800 if (win != NULL)
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	801 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	802 nnwin_close(win);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	803 printMsgQ(currWin, "Closed PRV query to '%s'.\n", name);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	804 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	805 else
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	806 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	807 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	808 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	809 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	810 else
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	811 {
466 796508f828f6 Refactor much of the "windowing" UI code into a new module, ui.[ch] Matti Hamalainen <ccr@tnsp.org> parents: 464 diff changeset	812 if (currWin != nnwin_main_window())
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	813 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	814 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	815 currWin = nnwin_main_window();
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	816 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	817 else
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	818 {
472 53179f875131 Combine some prints. Matti Hamalainen <ccr@tnsp.org> parents: 468 diff changeset	819 printMsgQ(currWin,
53179f875131 Combine some prints. Matti Hamalainen <ccr@tnsp.org> parents: 468 diff changeset	820 "Usage: /close [username]\n"
53179f875131 Combine some prints. Matti Hamalainen <ccr@tnsp.org> parents: 468 diff changeset	821 "/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	822 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	823 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	824
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	825 return 0;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	826 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	827
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	828
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	829 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	830 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	831 (void) conn;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	832
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	833 if (arg[0])
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	834 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	835 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	836 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	837 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	838 currWin = win;
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	839 else
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	840 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	841 printMsgQ(currWin, "Invalid window number '%s'\n", arg);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	842 return 1;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	843 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	844 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	845 else
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	846 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	847 printMsgQ(currWin, "Window : #%d\n", currWin->num);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	848 printMsgQ(currWin, "ID : %s\n", currWin->id);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	849 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	850 return 0;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	851 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	852
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	853
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	854 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	855 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	856 (void) buf;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	857
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	858 // Alias /listallusers
425 143fd51048a9 Fix /list command. Matti Hamalainen <ccr@tnsp.org> parents: 424 diff changeset	859 return nn_conn_send_msg(conn, optUserNameEnc, "%2Flistallusers");
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	860 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	861
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	862
486 d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	863 #define NAME_NUM_PER_LINE 3
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	864 #define NAME_ENTRY_SIZE 64
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	865 #define NAME_ENTRY_WIDTH 22
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	866
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	867 typedef struct
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	868 {
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	869 char buf[(NAME_NUM_PER_LINE * NAME_ENTRY_SIZE) + 16];
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	870 size_t offs;
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	871 int i, total;
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	872 } nncmd_namedata_t;
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	873
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	874
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	875 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	876 {
486 d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	877 nncmd_namedata_t *d = data;
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	878 char name[NAME_ENTRY_SIZE];
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	879 size_t len;
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	880
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	881 snprintf(name, sizeof(name), "[½3½%-20s½0½] ", user->name);
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	882
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	883 d->total++;
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	884 if (d->i >= NAME_NUM_PER_LINE)
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	885 {
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	886 printMsgQ(currWin, "%s\n", d->buf);
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	887 d->i = 0;
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	888 d->offs = 0;
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	889 }
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	890
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	891 len = strlen(name);
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	892 memcpy(d->buf + d->offs, name, len + 1);
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	893 d->offs += len;
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	894 d->i++;
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	895
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	896 return 0;
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	897 }
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	898
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	899
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	900 int nncmd_names(nn_conn_t conn, char arg)
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	901 {
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	902 nncmd_namedata_t data;
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	903 (void) conn;
486 d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	904 (void) arg;
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	905
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	906 printMsgQ(currWin, "Users:\n");
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	907 data.i = data.total = 0;
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	908 data.offs = 0;
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	909
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	910 nn_userhash_foreach(nnUsers, nncmd_names_do, &data);
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	911
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	912 if (data.i > 0)
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	913 {
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	914 printMsgQ(currWin, "%s\n", data.buf);
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	915 }
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	916
d48327519b17 Implement /who / /names functionality. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	917 printMsgQ(currWin, "%d users total.\n", data.total);
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	918 return 0;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	919 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	920
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	921
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	922 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	923 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	924 (void) conn;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	925 (void) buf;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	926
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	927 FILE *cfgfile = fopen(setConfigFile, "w");
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	928 if (cfgfile == NULL)
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	929 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	930 printMsgQ(currWin, "Could not create configuration to file '%s': %s\n",
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	931 setConfigFile, strerror(errno));
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	932 return 0;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	933 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	934
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	935 printMsgQ(currWin, "Configuration saved in file '%s', res=%d\n",
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	936 setConfigFile,
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	937 th_cfg_write(cfgfile, setConfigFile, cfg));
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	938
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	939 fclose(cfgfile);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	940 return 0;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	941 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	942
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	943
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	944 enum
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	945 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	946 CMDARG_NONE,
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	947 CMDARG_STRING,
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	948 CMDARG_OPTIONAL,
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	949 CMDARG_NICK,
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	950 };
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 typedef struct
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	953 {
443 96cb82ebb93b Rename a structure member. Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	954 char *name;
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	955 int flags;
431 a9b20b31cae1 More code cleanups, this time using clang with excessive warnings enabled. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	956 size_t len;
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	957 int (handler)(nn_conn_t , char *buf);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	958 } nn_usercmd_t;
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
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	961 static nn_usercmd_t userCmdsTable[] =
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	962 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	963 // Server side commands, we just implement completion
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	964 { "/me", CMDARG_STRING, 0, NULL },
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	965 { "/status", CMDARG_STRING, 0, NULL },
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	966 { "/list", CMDARG_NONE, 0, nncmd_list_all_users },
518 8132548e1a07 Add /prvon and /prvoff Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	967 { "/prvon", CMDARG_NONE, 0, NULL },
8132548e1a07 Add /prvon and /prvoff Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	968 { "/prvoff", CMDARG_NONE, 0, NULL },
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	969
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	970 // List internal username list
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	971 { "/who", CMDARG_NONE, 0, nncmd_names },
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	972 { "/names", CMDARG_NONE, 0, nncmd_names },
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	973
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	974 { "/w", CMDARG_NICK, 0, nncmd_open_profile },
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	975 { "/profile", CMDARG_NICK, 0, nncmd_open_profile },
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	976
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	977 { "/query", CMDARG_NICK, 0, nncmd_open_query },
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	978 { "/close", CMDARG_OPTIONAL, 0, nncmd_close_query },
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	979 { "/win", CMDARG_OPTIONAL, 0, nncmd_window_info },
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	980
497 cbbf502e4a70 Fix /ignore command. Matti Hamalainen <ccr@tnsp.org> parents: 494 diff changeset	981 { "/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	982 { "/friend", CMDARG_OPTIONAL, 0, nncmd_friend },
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	983 { "/color", CMDARG_STRING, 0, nncmd_set_color },
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	984 { "/save", CMDARG_NONE, 0, nncmd_save_config },
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	985 };
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	986
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	987 static qlist_t *userCmds = NULL;
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	988
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	989
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	990 void nn_usercmd_init()
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	991 {
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	992 size_t i;
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	993 for (i = 0; i < sizeof(userCmdsTable) / sizeof(userCmdsTable[0]); i++)
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	994 {
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	995 th_llist_append(&userCmds, &userCmdsTable[i]);
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	996 userCmdsTable[i].len = strlen(userCmdsTable[i].name);
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	997 }
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	998 }
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	999
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1000
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1001 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	1002 {
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1003 qlist_t *curr;
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1004
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1005 for (curr = userCmds; curr != NULL; curr = curr->next)
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1006 {
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1007 nn_usercmd_t *cmd = curr->data;
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1008
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1009 if (!th_strncasecmp(buf, cmd->name, cmd->len))
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1010 {
457 69ce77696c5d Fix command precedence. Matti Hamalainen <ccr@tnsp.org> parents: 456 diff changeset	1011 char *nbuf;
69ce77696c5d Fix command precedence. Matti Hamalainen <ccr@tnsp.org> parents: 456 diff changeset	1012 if (buf[cmd->len] != 0 && !th_isspace(buf[cmd->len]))
69ce77696c5d Fix command precedence. Matti Hamalainen <ccr@tnsp.org> parents: 456 diff changeset	1013 continue;
69ce77696c5d Fix command precedence. Matti Hamalainen <ccr@tnsp.org> parents: 456 diff changeset	1014
69ce77696c5d Fix command precedence. Matti Hamalainen <ccr@tnsp.org> parents: 456 diff changeset	1015 nbuf = str_trim_left(buf + cmd->len);
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1016
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1017 switch (cmd->flags)
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1018 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1019 case CMDARG_NICK:
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1020 case CMDARG_STRING:
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1021 if (!nbuf[0])
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1022 {
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1023 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	1024 return 1;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1025 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1026 break;
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 case CMDARG_NONE:
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1029 if (nbuf[0])
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1030 {
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1031 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	1032 return 1;
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 break;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1035
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1036 case CMDARG_OPTIONAL:
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1037 break;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1038 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1039
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1040 // Check if there is a handler function
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1041 if (cmd->handler)
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 // Internal commands have a handler
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1044 return cmd->handler(conn, nbuf);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1045 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1046 else
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1047 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1048 // Server-side commands are just pass-through here
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1049 char *tmp = nn_dblencode_str(buf);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1050 BOOL result;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1051 if (tmp == NULL) return -2;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1052 result = nn_conn_send_msg(conn, optUserNameEnc, tmp);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1053 th_free(tmp);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1054 return result ? 0 : -1;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1055 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1056 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1057 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1058
444 29a341fa80a1 Fix cosmetic output issue. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1059 printMsgQ(currWin, "Unknown command: %s\n", buf);
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1060 return 1;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1061 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1062
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1063
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1064 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	1065 {
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1066 qlist_t *node;
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1067 for (node = list; node != NULL; node = node->next)
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1068 {
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1069 nn_usercmd_t *cmd = node->data;
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1070 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	1071 return cmd;
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1072 }
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1073 return NULL;
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1074 }
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1075
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1076
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1077 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	1078 {
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1079 nn_usercmd_t *curr;
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1080 size_t len;
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1081
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1082 if (list == NULL \|\| pattern == NULL) return NULL;
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1083
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1084 len = strlen(pattern);
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1085
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1086 if (current != NULL)
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1087 {
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1088 qlist_t *node;
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1089 for (node = list; node != NULL; node = node->next)
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1090 {
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1091 curr = node->data;
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1092 if (th_strcasecmp(curr->name, current) == 0)
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1093 {
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1094 if (again)
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1095 return curr;
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1096
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1097 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	1098 return curr;
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1099 }
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1100 }
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1101 }
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1102
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1103 if ((curr = nn_usercmd_match_do(list, pattern, len)) != NULL)
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1104 return curr;
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1105
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1106 return NULL;
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1107 }
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1108
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1109
410 7ea78f4a4d23 Rename input handling main function. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	1110 int nn_handle_input(nn_conn_t conn, char buf, size_t bufLen)
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1111 {
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1112 BOOL result;
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1113 char *tmp;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1114
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1115 // Trim right side
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1116 while (bufLen > 0 && th_isspace(buf[bufLen - 1]))
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1117 buf[--bufLen] = 0;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1118
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1119 if (buf[0] == 0)
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1120 return 1;
258 8a0f7446318e General cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 254 diff changeset	1121
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	1122 // 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	1123 nn_username_decode(buf);
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1124
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1125 // Check for commands
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1126 if (buf[0] == '/')
426 c2e4d7b4e0ae Fix server-side commands. Matti Hamalainen <ccr@tnsp.org> parents: 425 diff changeset	1127 return nn_handle_command(conn, buf);
133 ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	1128
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1129 // 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	1130 if (currWin != nnwin_main_window())
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1131 {
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1132 if (currWin->id != NULL)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1133 {
431 a9b20b31cae1 More code cleanups, this time using clang with excessive warnings enabled. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	1134 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	1135 if (msg == NULL) return -3;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1136 tmp = nn_dblencode_str(msg);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1137 if (tmp == NULL)
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1138 {
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1139 th_free(msg);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1140 return -2;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1141 }
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1142 result = nn_conn_send_msg(conn, optUserNameEnc, tmp);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1143 th_free(tmp);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1144 th_free(msg);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1145 return result ? 0 : -1;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1146 }
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1147 else
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1148 {
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	1149 printMsgQ(NULL, "No target set, exiting prv mode.\n");
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1150 return 1;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1151 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1152 }
291 cc2a1d837e7b Window / buffer functionality works now. Queries work (with few minor glitches). Matti Hamalainen <ccr@tnsp.org> parents: 289 diff changeset	1153
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1154 // Send double-encoded message
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1155 tmp = nn_dblencode_str(buf);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1156 if (tmp == NULL) return -2;
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1157 result = nn_conn_send_msg(conn, optUserNameEnc, tmp);
aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1158 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	1159 return result ? 0 : -1;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1160 }
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1161
405 b4ed5d574edc Add some empty lines. Matti Hamalainen <ccr@tnsp.org> parents: 404 diff changeset	1162
449 7d9fa9f7caf1 Rename tab completion functions. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	1163 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	1164 {
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1165 size_t i;
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1166
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1167 for (i = startPos; i <= endPos; i++)
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1168 nn_editbuf_delete(buf, startPos);
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1169
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1170 for (i = startPos; *c; i++, c++)
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1171 nn_editbuf_insert(buf, i, *c);
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1172
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1173 *pi = i;
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1174 }
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1175
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1176
449 7d9fa9f7caf1 Rename tab completion functions. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	1177 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	1178 {
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1179 nn_editbuf_setpos(buf, startPos + 1 + strlen(name));
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1180 th_free(*previous);
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1181 *previous = th_strdup(name);
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1182 }
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1183
2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1184
449 7d9fa9f7caf1 Rename tab completion functions. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	1185 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	1186 {
189 b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	1187 static char previous = NULL, pattern = NULL;
451 733396469e5d Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 450 diff changeset	1188 char *str = buf->data;
429 2ac24f1e241b Start working on command completion. Matti Hamalainen <ccr@tnsp.org> parents: 427 diff changeset	1189 BOOL again = FALSE, hasSeparator = FALSE,
447 2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1190 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	1191 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	1192
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	1193 // previous word
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1194 if (startPos >= 2 && str[startPos - 1] == ' ' && str[startPos - 2] != ' ')
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1195 {
113 2a53156e7e12 Yay, tab-completion cycling now works (except for usernames with whitespaces, of course ...) Matti Hamalainen <ccr@tnsp.org> parents: 112 diff changeset	1196 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	1197 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	1198 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	1199 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1200 else
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	1201 // middle of a word, new pattern
404 d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1202 if (startPos < buf->len && str[startPos] != ' ')
d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1203 {
d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1204 endPos = startPos;
d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1205 while (startPos > 0 && str[startPos - 1] != ' ') startPos--;
d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1206 while (endPos < buf->len - 1 && str[endPos + 1] != ' ') endPos++;
d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1207 newPattern = TRUE;
d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1208 }
d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1209 else
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	1210 // previous word, new pattern
404 d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1211 if (startPos >= 1 && str[startPos - 1] != ' ')
d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1212 {
d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1213 startPos -= 1;
d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1214 endPos = startPos;
d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1215 while (startPos > 0 && str[startPos - 1] != ' ') startPos--;
d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1216 newPattern = TRUE;
d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1217 }
d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1218 else
d11a68f214eb Fix indentation after astyle reindent. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	1219 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	1220
429 2ac24f1e241b Start working on command completion. Matti Hamalainen <ccr@tnsp.org> parents: 427 diff changeset	1221 // Check if this is a command completion
2ac24f1e241b Start working on command completion. Matti Hamalainen <ccr@tnsp.org> parents: 427 diff changeset	1222 isCommand = (str[0] == '/' && startPos == 0);
2ac24f1e241b Start working on command completion. Matti Hamalainen <ccr@tnsp.org> parents: 427 diff changeset	1223
2ac24f1e241b Start working on command completion. Matti Hamalainen <ccr@tnsp.org> parents: 427 diff changeset	1224 if (!isCommand && str[endPos] == optNickSep)
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1225 {
189 b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	1226 endPos--;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1227 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	1228 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	1229 hasSeparator = TRUE;
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	1230 }
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	1231
451 733396469e5d Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 450 diff changeset	1232 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	1233 (buf->pos <= buf->len && str[buf->pos] == ' ');
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1234
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1235 if (newPattern)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1236 {
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	1237 // 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	1238 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	1239 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	1240 again = TRUE;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1241
189 b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	1242 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	1243 pattern = npattern;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1244
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1245 if (!again)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1246 {
116 741e45592522 Add simple "prediction" into tab-completion based on previously gotten last Matti Hamalainen <ccr@tnsp.org> parents: 115 diff changeset	1247 th_free(previous);
741e45592522 Add simple "prediction" into tab-completion based on previously gotten last Matti Hamalainen <ccr@tnsp.org> parents: 115 diff changeset	1248 previous = NULL;
741e45592522 Add simple "prediction" into tab-completion based on previously gotten last Matti Hamalainen <ccr@tnsp.org> parents: 115 diff changeset	1249 }
189 b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	1250 }
116 741e45592522 Add simple "prediction" into tab-completion based on previously gotten last Matti Hamalainen <ccr@tnsp.org> parents: 115 diff changeset	1251
429 2ac24f1e241b Start working on command completion. Matti Hamalainen <ccr@tnsp.org> parents: 427 diff changeset	1252 if (!pattern)
2ac24f1e241b Start working on command completion. Matti Hamalainen <ccr@tnsp.org> parents: 427 diff changeset	1253 return FALSE;
2ac24f1e241b Start working on command completion. Matti Hamalainen <ccr@tnsp.org> parents: 427 diff changeset	1254
2ac24f1e241b Start working on command completion. Matti Hamalainen <ccr@tnsp.org> parents: 427 diff changeset	1255 if (isCommand)
2ac24f1e241b Start working on command completion. Matti Hamalainen <ccr@tnsp.org> parents: 427 diff changeset	1256 {
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1257 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	1258 if (cmd)
429 2ac24f1e241b Start working on command completion. Matti Hamalainen <ccr@tnsp.org> parents: 427 diff changeset	1259 {
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1260 size_t i;
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1261 nn_tabcomplete_replace(buf, &i, startPos, endPos, cmd->name);
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1262
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1263 if (!hasSpace)
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1264 nn_editbuf_insert(buf, i++, ' ');
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1265
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1266 nn_tabcomplete_finish(buf, &previous, startPos, cmd->name);
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1267 return TRUE;
429 2ac24f1e241b Start working on command completion. Matti Hamalainen <ccr@tnsp.org> parents: 427 diff changeset	1268 }
2ac24f1e241b Start working on command completion. Matti Hamalainen <ccr@tnsp.org> parents: 427 diff changeset	1269 }
2ac24f1e241b Start working on command completion. Matti Hamalainen <ccr@tnsp.org> parents: 427 diff changeset	1270 else
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1271 {
446 3396acd40147 Rename and remove some functions. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1272 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	1273
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1274 if (user)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1275 {
431 a9b20b31cae1 More code cleanups, this time using clang with excessive warnings enabled. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	1276 size_t i;
449 7d9fa9f7caf1 Rename tab completion functions. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	1277 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	1278
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1279 if (!hasSeparator && startPos == 0)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1280 {
189 b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	1281 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	1282 startPos++;
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	1283 }
447 2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1284 else
189 b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	1285 if (hasSeparator)
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	1286 startPos++;
447 2d650408f5de Modularize tab completion code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	1287
189 b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	1288 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	1289 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	1290
449 7d9fa9f7caf1 Rename tab completion functions. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	1291 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	1292 return TRUE;
107 8037a3a7e491 Implement username tab-completion. It's still buggy, tho. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	1293 }
8037a3a7e491 Implement username tab-completion. It's still buggy, tho. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	1294 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1295
113 2a53156e7e12 Yay, tab-completion cycling now works (except for usernames with whitespaces, of course ...) Matti Hamalainen <ccr@tnsp.org> parents: 112 diff changeset	1296 return FALSE;
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1297 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1298
405 b4ed5d574edc Add some empty lines. Matti Hamalainen <ccr@tnsp.org> parents: 404 diff changeset	1299
511 291e3caa91a0 Move logParseFilename() to nn_log_parse_filename() under util.c and rename logFileOpen() and logFileClose(). Matti Hamalainen <ccr@tnsp.org> parents: 509 diff changeset	1300 BOOL nn_log_file_open(void)
239 b7e7ed741a18 Add unfinished code for logfile name parsing. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	1301 {
b7e7ed741a18 Add unfinished code for logfile name parsing. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	1302 char *filename;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1303
242 cb86d7543be2 Add functionality for generating logfile names based on port etc. and Matti Hamalainen <ccr@tnsp.org> parents: 240 diff changeset	1304 if (optLogFilename == NULL \|\| !optLogEnable)
239 b7e7ed741a18 Add unfinished code for logfile name parsing. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	1305 return FALSE;
b7e7ed741a18 Add unfinished code for logfile name parsing. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	1306
511 291e3caa91a0 Move logParseFilename() to nn_log_parse_filename() under util.c and rename logFileOpen() and logFileClose(). Matti Hamalainen <ccr@tnsp.org> parents: 509 diff changeset	1307 filename = nn_log_parse_filename(optLogFilename, optPort);
239 b7e7ed741a18 Add unfinished code for logfile name parsing. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	1308
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1309 if ((optLogFile = fopen(filename, "a")) == NULL)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1310 {
242 cb86d7543be2 Add functionality for generating logfile names based on port etc. and Matti Hamalainen <ccr@tnsp.org> parents: 240 diff changeset	1311 errorMsg("Could not open logfile '%s' for appending!\n", filename);
239 b7e7ed741a18 Add unfinished code for logfile name parsing. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	1312 th_free(filename);
b7e7ed741a18 Add unfinished code for logfile name parsing. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	1313 return FALSE;
b7e7ed741a18 Add unfinished code for logfile name parsing. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	1314 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1315
242 cb86d7543be2 Add functionality for generating logfile names based on port etc. and Matti Hamalainen <ccr@tnsp.org> parents: 240 diff changeset	1316 th_free(filename);
cb86d7543be2 Add functionality for generating logfile names based on port etc. and Matti Hamalainen <ccr@tnsp.org> parents: 240 diff changeset	1317
239 b7e7ed741a18 Add unfinished code for logfile name parsing. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	1318 return TRUE;
b7e7ed741a18 Add unfinished code for logfile name parsing. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	1319 }
b7e7ed741a18 Add unfinished code for logfile name parsing. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	1320
405 b4ed5d574edc Add some empty lines. Matti Hamalainen <ccr@tnsp.org> parents: 404 diff changeset	1321
511 291e3caa91a0 Move logParseFilename() to nn_log_parse_filename() under util.c and rename logFileOpen() and logFileClose(). Matti Hamalainen <ccr@tnsp.org> parents: 509 diff changeset	1322 void nn_log_file_close(void)
239 b7e7ed741a18 Add unfinished code for logfile name parsing. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	1323 {
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1324 if (optLogFile)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1325 {
242 cb86d7543be2 Add functionality for generating logfile names based on port etc. and Matti Hamalainen <ccr@tnsp.org> parents: 240 diff changeset	1326 fclose(optLogFile);
cb86d7543be2 Add functionality for generating logfile names based on port etc. and Matti Hamalainen <ccr@tnsp.org> parents: 240 diff changeset	1327 optLogFile = NULL;
cb86d7543be2 Add functionality for generating logfile names based on port etc. and Matti Hamalainen <ccr@tnsp.org> parents: 240 diff changeset	1328 }
239 b7e7ed741a18 Add unfinished code for logfile name parsing. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	1329 }
b7e7ed741a18 Add unfinished code for logfile name parsing. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	1330
405 b4ed5d574edc Add some empty lines. Matti Hamalainen <ccr@tnsp.org> parents: 404 diff changeset	1331
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1332 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	1333 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1334 // Chat window switching via Meta/Esc-[1..9]
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1335 if (c >= 0x5001 && c <= 0x5009)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1336 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1337 nn_window_t *win = nnwin_get(c - 0x5000);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1338 if (win != NULL)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1339 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1340 currWin = win;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1341 editState->update = TRUE;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1342 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1343 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1344 else
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1345 switch (c)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1346 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1347 case KEY_ENTER:
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1348 // Call the user input handler
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1349 if (editBuf->len > 0)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1350 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1351 int result;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1352
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1353 if (editHistMax > 0)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1354 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1355 nn_editbuf_free(editHistBuf[SET_MAX_HISTORY+1]);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1356 editHistBuf[SET_MAX_HISTORY+1] = NULL;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1357 memmove(&editHistBuf[2], &editHistBuf[1],
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1358 editHistMax * sizeof(editHistBuf[0]));
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1359 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1360
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1361 editHistPos = 0;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1362 editHistBuf[1] = nn_editbuf_copy(editBuf);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1363 if (editHistMax < SET_MAX_HISTORY)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1364 editHistMax++;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1365
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1366 result = nn_handle_input(editState->conn, editBuf->data, editBuf->len);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1367
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1368 nn_editbuf_clear(editBuf);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1369
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1370 if (result < 0)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1371 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1372 errorMsg("Fatal error handling user input: %s\n", editBuf->data);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1373 editState->isError = TRUE;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1374 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1375 else
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1376 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1377 // Update time value of last sent message for unidle timeouts
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1378 editState->prevKeepAlive = time(NULL);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1379 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1380 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1381 break;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1382
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1383 case KEY_NPAGE:
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1384 case KEY_PPAGE:
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1385 // Page Up / Page Down
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1386 if (currWin != NULL)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1387 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1388 int oldPos = currWin->pos, page = (scrHeight - 4) / 3;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1389
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1390 currWin->pos += (c == KEY_NPAGE) ? - page : page;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1391
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1392 if (currWin->pos >= currWin->data->n - page)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1393 currWin->pos = currWin->data->n - page;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1394 if (currWin->pos < 0)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1395 currWin->pos = 0;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1396
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1397 if (oldPos != currWin->pos)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1398 editState->update = TRUE;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1399 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1400 break;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1401
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1402 case KEY_UP: // Backwards in input history
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1403 if (editHistPos == 0)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1404 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1405 nn_editbuf_free(editHistBuf[0]);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1406 editHistBuf[0] = nn_editbuf_copy(editBuf);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1407 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1408 if (editHistPos < editHistMax)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1409 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1410 editHistPos++;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1411 nn_editbuf_free(editBuf);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1412 editBuf = nn_editbuf_copy(editHistBuf[editHistPos]);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1413 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1414 break;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1415
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1416 case KEY_DOWN: // Forwards in input history
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1417 if (editHistPos > 0)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1418 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1419 editHistPos--;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1420 nn_editbuf_free(editBuf);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1421 editBuf = nn_editbuf_copy(editHistBuf[editHistPos]);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1422 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1423 break;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1424
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1425 case KEY_F(5): // F5 = Ignore mode
515 151edcb79ce4 Fix ignore mode toggling. Matti Hamalainen <ccr@tnsp.org> parents: 513 diff changeset	1426 setIgnoreMode = !setIgnoreMode;
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1427 printMsgQ(currWin, "Ignore mode = %s\n", setIgnoreMode ? "ON" : "OFF");
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1428 break;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1429
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	1430 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	1431 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	1432 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	1433 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	1434
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1435 case 0x03: // ^C = quit
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1436 case KEY_F(9): // F9 = Quit
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1437 printMsg(currWin, "Quitting per user request (%d/0x%x).\n", c, c);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1438 editState->exitProg = TRUE;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1439 break;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1440
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1441 case 0x09: // Tab = complete username or command
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1442 nn_tabcomplete_buffer(editBuf);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1443 break;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1444
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1445 default:
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1446 return FALSE;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1447 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1448
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1449 return TRUE;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1450 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1451
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1452
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1453 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	1454 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1455 (void) editBuf;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1456
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1457 switch (c)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1458 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1459 case KEY_ENTER:
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1460 editState->done = TRUE;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1461 break;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1462
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1463 default:
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1464 return FALSE;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1465 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1466
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1467 return TRUE;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1468 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1469
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1470
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1471 void updateUserPrompt(nn_editbuf_t editBuf, nn_editstate_t editState)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1472 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1473 nnwin_update(editState->update, editState->mask, editBuf, optUserName, optUserColor);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1474 }
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1475
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1476
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1477 int main(int argc, char *argv[])
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1478 {
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1479 char *tmpStr;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1480 int index, updateCount = 0;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1481 BOOL argsOK, colorSet = FALSE;
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1482 nn_conn_t *conn = NULL;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1483 nn_editbuf_t *editBuf = nn_editbuf_new(NN_TMPBUF_SIZE);
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1484 nn_editstate_t editState;
154 e8f67e344aaf Get correct directory for saving configuration under Windows. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	1485 cfgitem_t *tmpcfg;
432 966c521e0954 Rename user home directory variable. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	1486 char *setHomeDir = 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	1487
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1488 memset(editHistBuf, 0, sizeof(editHistBuf));
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1489 memset(&editState, 0, sizeof(editState));
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1490 editState.insertMode = TRUE;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1491 editState.debugMsg = debugMsg;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1492
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	1493 // 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	1494 th_init("NNChat", "Newbie Nudes chat client", NN_VERSION,
399 06a1c1db5bbb Update copyright. Matti Hamalainen <ccr@tnsp.org> parents: 398 diff changeset	1495 "Written and designed by Anonymous Finnish Guy (C) 2008-2012",
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1496 "This software is freeware, use and distribute as you wish.");
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1497 th_verbosityLevel = 0;
133 ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	1498
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	1499 // Read configuration file
148 9da39d090ef1 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 147 diff changeset	1500 tmpcfg = NULL;
133 ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	1501 th_cfg_add_comment(&tmpcfg, "General settings");
ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	1502 th_cfg_add_string(&tmpcfg, "username", &optUserName, NULL);
ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	1503 th_cfg_add_string(&tmpcfg, "password", &optPassword, NULL);
409 4556174b5be8 Make nickname autocomplete separator configurable. Matti Hamalainen <ccr@tnsp.org> parents: 408 diff changeset	1504
150 db5e7a1f1eb3 Add comment in config file about format of user color setting. Matti Hamalainen <ccr@tnsp.org> parents: 149 diff changeset	1505 th_cfg_add_comment(&tmpcfg, "Default color as a hex-triplet");
133 ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	1506 th_cfg_add_hexvalue(&tmpcfg, "color", &optUserColor, optUserColor);
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1507
149 a4d6707161a7 Add config file option for default setting of ignore mode. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	1508 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	1509 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	1510 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	1511 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	1512
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	1513 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	1514 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	1515 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	1516 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	1517
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	1518 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	1519 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	1520
409 4556174b5be8 Make nickname autocomplete separator configurable. Matti Hamalainen <ccr@tnsp.org> parents: 408 diff changeset	1521 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	1522 th_cfg_add_string(&tmpcfg, "nick_separator", &optNickSepStr, NULL);
4556174b5be8 Make nickname autocomplete separator configurable. Matti Hamalainen <ccr@tnsp.org> parents: 408 diff changeset	1523
133 ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	1524 th_cfg_add_section(&cfg, "general", tmpcfg);
ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	1525
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	1526
133 ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	1527 tmpcfg = NULL;
ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	1528 th_cfg_add_comment(&tmpcfg, "Chat server hostname or IP address");
ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	1529 th_cfg_add_string(&tmpcfg, "host", &optServer, optServer);
321 384d508d1df3 Update configuration file comment about room ports. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1530 th_cfg_add_comment(&tmpcfg, "Default port to connect to (8005 = main room, 8003 = passion pit)");
133 ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	1531 th_cfg_add_int(&tmpcfg, "port", &optPort, optPort);
ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	1532 th_cfg_add_section(&cfg, "server", tmpcfg);
ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	1533
239 b7e7ed741a18 Add unfinished code for logfile name parsing. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	1534 tmpcfg = NULL;
369 461a6befb7c3 Oops, the proxy type was accidentally called "port" in the configuration file, as was the actual port setting. Fixed. Matti Hamalainen <ccr@tnsp.org> parents: 360 diff changeset	1535 th_cfg_add_comment(&tmpcfg, "Proxy server type (0 = none, 1 = SOCKS 4, 2 = SOCKS 4a)");
461a6befb7c3 Oops, the proxy type was accidentally called "port" in the configuration file, as was the actual port setting. Fixed. Matti Hamalainen <ccr@tnsp.org> parents: 360 diff changeset	1536 th_cfg_add_int(&tmpcfg, "type", &optProxyType, optProxyType);
353 83ae825bb8c1 Add configuration section for proxy settings. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	1537 th_cfg_add_comment(&tmpcfg, "Proxy server host name");
83ae825bb8c1 Add configuration section for proxy settings. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	1538 th_cfg_add_string(&tmpcfg, "host", &optProxyServer, optProxyServer);
83ae825bb8c1 Add configuration section for proxy settings. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	1539 th_cfg_add_comment(&tmpcfg, "Proxy port, 1080 is the standard SOCKS port");
83ae825bb8c1 Add configuration section for proxy settings. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	1540 th_cfg_add_int(&tmpcfg, "port", &optProxyPort, optProxyPort);
83ae825bb8c1 Add configuration section for proxy settings. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	1541 th_cfg_add_section(&cfg, "proxy", tmpcfg);
83ae825bb8c1 Add configuration section for proxy settings. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	1542
83ae825bb8c1 Add configuration section for proxy settings. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	1543 tmpcfg = NULL;
239 b7e7ed741a18 Add unfinished code for logfile name parsing. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	1544 th_cfg_add_comment(&tmpcfg, "Enable logging");
247 fce4e2e31d69 Add the config section ... Matti Hamalainen <ccr@tnsp.org> parents: 242 diff changeset	1545 th_cfg_add_bool(&tmpcfg, "enable", &optLogEnable, optLogEnable);
242 cb86d7543be2 Add functionality for generating logfile names based on port etc. and Matti Hamalainen <ccr@tnsp.org> parents: 240 diff changeset	1546 th_cfg_add_comment(&tmpcfg, "Log filename format");
247 fce4e2e31d69 Add the config section ... Matti Hamalainen <ccr@tnsp.org> parents: 242 diff changeset	1547 th_cfg_add_string(&tmpcfg, "filename", &optLogFilename, optLogFilename);
fce4e2e31d69 Add the config section ... Matti Hamalainen <ccr@tnsp.org> parents: 242 diff changeset	1548 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	1549
512 93c8ba1ef55f Support XDG specification. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	1550 // Get home directory path
154 e8f67e344aaf Get correct directory for saving configuration under Windows. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	1551 #ifdef __WIN32
e8f67e344aaf Get correct directory for saving configuration under Windows. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	1552 {
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1553 char tmpPath[MAX_PATH];
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1554 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	1555 setHomeDir = th_strdup(tmpPath);
197 e0ec2280a778 Implement browser launching on Windows via ShellExecute(). Matti Hamalainen <ccr@tnsp.org> parents: 196 diff changeset	1556
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1557 CoInitializeEx(NULL, COINIT_APARTMENTTHREADED \| COINIT_DISABLE_OLE1DDE);
154 e8f67e344aaf Get correct directory for saving configuration under Windows. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	1558 }
e8f67e344aaf Get correct directory for saving configuration under Windows. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	1559 #else
512 93c8ba1ef55f Support XDG specification. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	1560 {
93c8ba1ef55f Support XDG specification. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	1561 char *xdgConfigDir = getenv("XDG_CONFIG_HOME"),
93c8ba1ef55f Support XDG specification. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	1562 *userHomeDir = getenv("HOME");
93c8ba1ef55f Support XDG specification. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	1563 #ifdef USE_XDG
93c8ba1ef55f Support XDG specification. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	1564 if (xdgConfigDir != NULL)
93c8ba1ef55f Support XDG specification. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	1565 setHomeDir = th_strdup(xdgConfigDir);
93c8ba1ef55f Support XDG specification. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	1566 else
93c8ba1ef55f Support XDG specification. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	1567 setHomeDir = th_strdup_printf("%s/.config", userHomeDir);
93c8ba1ef55f Support XDG specification. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	1568 #else
93c8ba1ef55f Support XDG specification. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	1569 setHomeDir = th_strdup(userHomeDir);
93c8ba1ef55f Support XDG specification. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	1570 #endif
93c8ba1ef55f Support XDG specification. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	1571 }
154 e8f67e344aaf Get correct directory for saving configuration under Windows. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	1572 #endif
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1573
432 966c521e0954 Rename user home directory variable. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	1574 if (setHomeDir != NULL)
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1575 {
154 e8f67e344aaf Get correct directory for saving configuration under Windows. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	1576 FILE *cfgfile;
432 966c521e0954 Rename user home directory variable. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	1577 setConfigFile = th_strdup_printf("%s" SET_DIR_SEPARATOR "%s", setHomeDir, SET_CONFIG_FILE);
154 e8f67e344aaf Get correct directory for saving configuration under Windows. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	1578
e8f67e344aaf Get correct directory for saving configuration under Windows. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	1579 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	1580
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1581 if ((cfgfile = fopen(setConfigFile, "r")) != NULL)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1582 {
154 e8f67e344aaf Get correct directory for saving configuration under Windows. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	1583 th_cfg_read(cfgfile, setConfigFile, cfg);
315 864e6e52ed69 Fix a filehandle leak when reading in configuration file. Matti Hamalainen <ccr@tnsp.org> parents: 314 diff changeset	1584 fclose(cfgfile);
864e6e52ed69 Fix a filehandle leak when reading in configuration file. Matti Hamalainen <ccr@tnsp.org> parents: 314 diff changeset	1585 }
133 ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	1586 }
196 edd5ce3e5399 Add simplistic username/password requester if none given on commandline or config file. Matti Hamalainen <ccr@tnsp.org> parents: 195 diff changeset	1587
409 4556174b5be8 Make nickname autocomplete separator configurable. Matti Hamalainen <ccr@tnsp.org> parents: 408 diff changeset	1588 if (optNickSepStr)
4556174b5be8 Make nickname autocomplete separator configurable. Matti Hamalainen <ccr@tnsp.org> parents: 408 diff changeset	1589 optNickSep = optNickSepStr[0];
4556174b5be8 Make nickname autocomplete separator configurable. Matti Hamalainen <ccr@tnsp.org> parents: 408 diff changeset	1590 else
4556174b5be8 Make nickname autocomplete separator configurable. Matti Hamalainen <ccr@tnsp.org> parents: 408 diff changeset	1591 optNickSep = SET_NICK_SEPARATOR;
4556174b5be8 Make nickname autocomplete separator configurable. Matti Hamalainen <ccr@tnsp.org> parents: 408 diff changeset	1592
4556174b5be8 Make nickname autocomplete separator configurable. Matti Hamalainen <ccr@tnsp.org> parents: 408 diff changeset	1593
137 fad8c31e41e6 Move browser code around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	1594 setBrowser = getenv("BROWSER");
fad8c31e41e6 Move browser code around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	1595 if (setBrowser == NULL)
fad8c31e41e6 Move browser code around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	1596 setBrowser = "firefox";
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1597
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	1598 // Parse command line arguments
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1599 argsOK = th_args_process(argc, argv, optList, optListN,
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1600 argHandleOpt, argHandleFile, FALSE);
26 b84fc46c6035 Improved color hex triplet parsing. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	1601
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1602 if (optUserNameCmd != NULL)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1603 {
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1604 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	1605 optUserName = optUserNameCmd;
21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	1606 optPassword = optPasswordCmd;
21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	1607 }
21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	1608
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1609 if (!argsOK)
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1610 return -2;
64 6a3a917303e4 Some random cleanups, bring back WinSock support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	1611
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	1612 // Allocate userhash
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1613 if ((nnUsers = nn_userhash_new()) == NULL)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1614 {
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1615 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	1616 return -105;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1617 }
64 6a3a917303e4 Some random cleanups, bring back WinSock support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	1618
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	1619 // If no idle messages are set, add default
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1620 if (setIdleMessages == NULL)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1621 {
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	1622 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	1623 }
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	1624
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	1625 // Open logfile
511 291e3caa91a0 Move logParseFilename() to nn_log_parse_filename() under util.c and rename logFileOpen() and logFileClose(). Matti Hamalainen <ccr@tnsp.org> parents: 509 diff changeset	1626 nn_log_file_open();
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1627
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	1628 // Initialize network
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1629 if (!nn_network_init())
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1630 {
91 acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	1631 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	1632 goto err_exit;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1633 }
68 3ab7751fdad1 MingW compatibility, with one ugly kludge. Matti Hamalainen <ccr@tnsp.org> parents: 67 diff changeset	1634
466 796508f828f6 Refactor much of the "windowing" UI code into a new module, ui.[ch] Matti Hamalainen <ccr@tnsp.org> parents: 464 diff changeset	1635 // 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	1636 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	1637 goto err_exit;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1638
466 796508f828f6 Refactor much of the "windowing" UI code into a new module, ui.[ch] Matti Hamalainen <ccr@tnsp.org> parents: 464 diff changeset	1639 if (cursesInit)
501 ca88945d8eda Begin work on integrating the removal of ncurses "windowing" and transition Matti Hamalainen <ccr@tnsp.org> parents: 497 diff changeset	1640 {
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1641 printMsg(NULL, "%s v%s - %s\n", th_prog_name, th_prog_version, th_prog_fullname);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1642 printMsg(NULL, "%s\n", th_prog_author);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1643 printMsg(NULL, "%s\n", th_prog_license);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1644
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1645 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	1646
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1647 // Check if we have username and password
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1648 if (optUserName == NULL \|\| optPassword == NULL)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1649 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1650 printMsg(NULL, "Please enter your NN login credentials.\n");
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1651 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	1652
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1653 printMsg(NULL, "Enter your NN username ...\n");
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1654 optUserName = nnwin_prompt_requester(FALSE, &editState, processUserPrompt, updateUserPrompt);
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 editState.mask = TRUE;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1657 printMsg(NULL, "Enter your NN password ...\n");
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1658 optPassword = nnwin_prompt_requester(TRUE, &editState, processUserPrompt, updateUserPrompt);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1659 editState.mask = FALSE;
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1660 }
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	1661 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1662
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1663 if (optUserName == NULL \|\| optPassword == NULL)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1664 {
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	1665 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	1666 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	1667 }
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	1668
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	1669 // Create a connection
354 c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 353 diff changeset	1670 conn = nn_conn_new(errorFunc, messageFunc);
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1671 if (conn == NULL)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1672 {
354 c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 353 diff changeset	1673 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	1674 goto err_exit;
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 353 diff changeset	1675 }
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1676
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1677 editState.conn = conn;
354 c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 353 diff changeset	1678
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	1679 // Are we using a proxy?
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1680 if (optProxyType != NN_PROXY_NONE && optProxyServer != NULL)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1681 {
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1682 if (nn_conn_set_proxy(conn, optProxyType, optProxyPort, optProxyServer) != 0)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1683 {
354 c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 353 diff changeset	1684 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	1685 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	1686 }
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	1687 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1688
456 bb65460c7aa2 Clean up some initialization messages. Matti Hamalainen <ccr@tnsp.org> parents: 451 diff changeset	1689 // 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	1690 conn->host = th_strdup(optServer);
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 353 diff changeset	1691 conn->hst = nn_resolve_host(conn, optServer);
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1692 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	1693 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	1694
329 c0988ab45afd #ifdef out the policy probe. Matti Hamalainen <ccr@tnsp.org> parents: 328 diff changeset	1695 #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	1696 /* 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	1697 * 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	1698 */
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1699 if (nn_conn_open(conn, 843, NULL) != 0)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1700 {
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	1701 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	1702 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	1703 }
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	1704
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	1705 tmpStr = "<policy-file-request/>";
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1706 if (nn_conn_send_buf(conn, tmpStr, strlen(tmpStr) + 1) == FALSE)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1707 {
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	1708 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	1709 goto err_exit;
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1710 }
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1711 else
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1712 {
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	1713 int cres = nn_conn_pull(conn);
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1714 if (cres == 0)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1715 {
288 e7ef3db3b954 Implement "windows" in the chat. Only main window used for now, and even Matti Hamalainen <ccr@tnsp.org> parents: 280 diff changeset	1716 printMsg(currWin, "Probe got: %s\n", conn->buf);
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1717 }
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1718 else
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1719 {
288 e7ef3db3b954 Implement "windows" in the chat. Only main window used for now, and even Matti Hamalainen <ccr@tnsp.org> parents: 280 diff changeset	1720 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	1721 }
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	1722 }
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	1723 nn_conn_close(conn);
329 c0988ab45afd #ifdef out the policy probe. Matti Hamalainen <ccr@tnsp.org> parents: 328 diff changeset	1724 #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	1725
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	1726 // Okay, now do the proper connection ...
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1727 if (nn_conn_open(conn, optPort, NULL) != 0)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1728 {
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	1729 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	1730 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	1731 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1732
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	1733 // 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	1734 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	1735 tmpStr = nn_dblencode_str(optSite);
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1736 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	1737 th_free(tmpStr);
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1738
450 a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1739 // Initialize user commands
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1740 nn_usercmd_init();
a8373a1ce1eb Implement command tab completion. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1741
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	1742 // Initialize random numbers
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1743 editState.prevKeepAlive = time(NULL);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1744 srandom((int) editState.prevKeepAlive);
100 ed4067c10a8a Remove useless buffer usage from error reporting function. Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	1745
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	1746 // Enter mainloop
360 b465a17ffa47 Finally fix handling of long packets. Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	1747 nn_conn_reset(conn);
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1748 while (!editState.isError && !editState.exitProg)
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1749 {
445 7e46f2f0ba34 Cleanup packet retrying a bit. Matti Hamalainen <ccr@tnsp.org> parents: 444 diff changeset	1750 int retries = 3, cres;
7e46f2f0ba34 Cleanup packet retrying a bit. Matti Hamalainen <ccr@tnsp.org> parents: 444 diff changeset	1751
7e46f2f0ba34 Cleanup packet retrying a bit. Matti Hamalainen <ccr@tnsp.org> parents: 444 diff changeset	1752 packet_retry:
7e46f2f0ba34 Cleanup packet retrying a bit. Matti Hamalainen <ccr@tnsp.org> parents: 444 diff changeset	1753 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	1754 if (cres == 0)
70ea06294f3f Possibly fix packet handling after the whole mess of refactoring. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	1755 {
70ea06294f3f Possibly fix packet handling after the whole mess of refactoring. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	1756 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	1757 *(conn->in_ptr - 1) == 0 &&
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1758 retries > 0 && !editState.isError)
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1759 {
439 70ea06294f3f Possibly fix packet handling after the whole mess of refactoring. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	1760 // 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	1761 int result = nn_parse_protocol(conn);
436 f8d6a720388a Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 435 diff changeset	1762 if (result == 0)
f8d6a720388a Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 435 diff changeset	1763 {
f8d6a720388a Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 435 diff changeset	1764 nn_conn_buf_skip(conn, 1);
f8d6a720388a Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 435 diff changeset	1765 }
f8d6a720388a Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 435 diff changeset	1766 else
385 bbd5edbf1143 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 381 diff changeset	1767 if (result > 0)
bbd5edbf1143 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 381 diff changeset	1768 {
445 7e46f2f0ba34 Cleanup packet retrying a bit. Matti Hamalainen <ccr@tnsp.org> parents: 444 diff changeset	1769 // Retry if possible
439 70ea06294f3f Possibly fix packet handling after the whole mess of refactoring. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	1770 if (--retries > 0)
445 7e46f2f0ba34 Cleanup packet retrying a bit. Matti Hamalainen <ccr@tnsp.org> parents: 444 diff changeset	1771 goto packet_retry;
7e46f2f0ba34 Cleanup packet retrying a bit. Matti Hamalainen <ccr@tnsp.org> parents: 444 diff changeset	1772
7e46f2f0ba34 Cleanup packet retrying a bit. Matti Hamalainen <ccr@tnsp.org> parents: 444 diff changeset	1773 // Couldn't handle the message for some reason
7e46f2f0ba34 Cleanup packet retrying a bit. Matti Hamalainen <ccr@tnsp.org> parents: 444 diff changeset	1774 printMsg(currWin, "Could not handle: %s\n", conn->ptr);
7e46f2f0ba34 Cleanup packet retrying a bit. Matti Hamalainen <ccr@tnsp.org> parents: 444 diff changeset	1775 nn_conn_buf_skip(conn, strlen(conn->ptr) + 1);
385 bbd5edbf1143 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 381 diff changeset	1776 }
436 f8d6a720388a Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 435 diff changeset	1777 else
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1778 editState.isError = TRUE;
403 7bec02f382fb Refactor the connection and protocol handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	1779 }
7bec02f382fb Refactor the connection and protocol handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	1780 }
439 70ea06294f3f Possibly fix packet handling after the whole mess of refactoring. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	1781 else
70ea06294f3f Possibly fix packet handling after the whole mess of refactoring. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	1782 if (cres < 0 \|\| !nn_conn_check(conn))
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1783 editState.isError = TRUE;
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1784
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	1785 // Handle user input
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1786 if (cursesInit)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1787 {
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1788 nnwin_input_process(editBuf, &editState, processUserInput);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1789 nnwin_update(editState.update, editState.mask, editBuf, optUserName, optUserColor);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1790 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1791
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1792 if (++updateCount > 10)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1793 {
96 7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	1794 time_t tmpTime = time(NULL);
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1795 if (tmpTime - editState.prevKeepAlive > SET_KEEPALIVE)
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1796 {
435 708a15fdf791 Fix a type / conversion related warning. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1797 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	1798 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	1799 nn_conn_send_msg(conn, optUserNameEnc, node->data);
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1800 editState.prevKeepAlive = tmpTime;
96 7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	1801 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1802
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1803 if (!colorSet)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1804 {
96 7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	1805 colorSet = TRUE;
424 aeb24b1b5e77 Refactor the /command handling completely. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1806 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	1807 }
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1808
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1809 if (cursesInit)
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1810 {
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1811 nnwin_update(FALSE, editState.mask, editBuf, optUserName, optUserColor);
ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1812 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1813
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1814 updateCount = 0;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1815 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1816 }
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1817
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	1818 // 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	1819 err_exit:
316 1065115665bd Plug some more minor memory leaks. Matti Hamalainen <ccr@tnsp.org> parents: 315 diff changeset	1820 th_cfg_free(cfg);
432 966c521e0954 Rename user home directory variable. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	1821 th_free(setHomeDir);
316 1065115665bd Plug some more minor memory leaks. Matti Hamalainen <ccr@tnsp.org> parents: 315 diff changeset	1822 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	1823 nn_userhash_free(nnUsers);
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	1824 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	1825
466 796508f828f6 Refactor much of the "windowing" UI code into a new module, ui.[ch] Matti Hamalainen <ccr@tnsp.org> parents: 464 diff changeset	1826 for (index = 0; index <= SET_MAX_HISTORY; index++)
513 ef5a2aa8382b Refactor input handling. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	1827 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	1828
291 cc2a1d837e7b Window / buffer functionality works now. Queries work (with few minor glitches). Matti Hamalainen <ccr@tnsp.org> parents: 289 diff changeset	1829 #ifdef __WIN32
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1830 if (errorMessages)
a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1831 {
505 12939e665e49 Fix Windows build. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	1832 char *tmp = nnwin_prompt_requester("Press enter to quit.\n", FALSE);
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	1833 th_free(tmp);
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	1834 }
291 cc2a1d837e7b Window / buffer functionality works now. Queries work (with few minor glitches). Matti Hamalainen <ccr@tnsp.org> parents: 289 diff changeset	1835 #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	1836
489 ba48840b8525 Move network initialization/shutdown flag checking to network module. Matti Hamalainen <ccr@tnsp.org> parents: 486 diff changeset	1837 nnwin_shutdown();
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1838
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	1839 #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	1840 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	1841 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	1842 #endif
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1843
198 21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	1844 th_free(optUserNameEnc);
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1845 nn_conn_close(conn);
489 ba48840b8525 Move network initialization/shutdown flag checking to network module. Matti Hamalainen <ccr@tnsp.org> parents: 486 diff changeset	1846 nn_network_close();
68 3ab7751fdad1 MingW compatibility, with one ugly kludge. Matti Hamalainen <ccr@tnsp.org> parents: 67 diff changeset	1847
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1848 THMSG(1, "Connection terminated.\n");
391 a2b7ac328e62 Code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	1849
511 291e3caa91a0 Move logParseFilename() to nn_log_parse_filename() under util.c and rename logFileOpen() and logFileClose(). Matti Hamalainen <ccr@tnsp.org> parents: 509 diff changeset	1850 nn_log_file_close();
133 ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	1851
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1852 return 0;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1853 }

Mercurial > hg > nnchat

annotate main.c @ 519:f17d2ab25618