nnchat: main.c annotate

annotate main.c @ 472:53179f875131

Combine some prints.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sat, 26 May 2012 07:24:42 +0300
parents	607bd4491e79
children	06aa00ba32a2

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

Mercurial > hg > nnchat

annotate main.c @ 472:53179f875131