nnchat: nnchat.c annotate

annotate nnchat.c @ 216:3ccfe8902fd5

Use (void *) typecast for execlp() sentinel to avoid a warning under OpenBSD.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sun, 21 Nov 2010 04:14:08 +0200
parents	c40329e95445
children	7ba4e371e9a6

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
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	4 * (C) Copyright 2008-2010 Tecnic Software productions (TNSP)
39 bb25bdfc0d71 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 36 diff changeset	5 */
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	6 #include "libnnchat.h"
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	7 #include <stdlib.h>
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	8 #include "th_args.h"
133 ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	9 #include "th_config.h"
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	10 #include <string.h>
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	11 #include <errno.h>
64 6a3a917303e4 Some random cleanups, bring back WinSock support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	12 #ifdef __WIN32
68 3ab7751fdad1 MingW compatibility, with one ugly kludge. Matti Hamalainen <ccr@tnsp.org> parents: 67 diff changeset	13 /* Undefine because both windows.h and curses.h #define it */
3ab7751fdad1 MingW compatibility, with one ugly kludge. Matti Hamalainen <ccr@tnsp.org> parents: 67 diff changeset	14 #undef MOUSE_MOVED
154 e8f67e344aaf Get correct directory for saving configuration under Windows. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	15 #include <shlwapi.h>
128 713879a7ca10 Wait for forked processes, to prevent a zombie apocalypse. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	16 #else
713879a7ca10 Wait for forked processes, to prevent a zombie apocalypse. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	17 #include <sys/wait.h>
68 3ab7751fdad1 MingW compatibility, with one ugly kludge. Matti Hamalainen <ccr@tnsp.org> parents: 67 diff changeset	18 #endif
64 6a3a917303e4 Some random cleanups, bring back WinSock support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	19 #include <curses.h>
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	20
139 c39399725f7b Define some platform-specific constants. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	21 #ifdef __WIN32
160 d3c78f2ef77b Rename configuration file for Windows. Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	22 #define SET_CONFIG_FILE "nnchat.txt"
139 c39399725f7b Define some platform-specific constants. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	23 #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	24 #define SET_DELAY (0)
139 c39399725f7b Define some platform-specific constants. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	25 #else
c39399725f7b Define some platform-specific constants. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	26 #define SET_CONFIG_FILE ".nnchat"
c39399725f7b Define some platform-specific constants. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	27 #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	28 #define SET_DELAY (15)
139 c39399725f7b Define some platform-specific constants. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	29 #endif
49 0bcc38910a77 Simple ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	30
141 cce05daf6f01 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	31 #define SET_MIN_BACKBUF (1024) /* Backbuffer size (in lines) */
cce05daf6f01 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	32 #define SET_MAX_HISTORY (16) /* Command history length */
96 7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	33 #define SET_KEEPALIVE (1560) / 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 */
104 06e6ac51e3f2 Change default port to 8003. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	38 int optPort = 8003;
207 e0c085426b91 Change default user color to black (#000000). Matti Hamalainen <ccr@tnsp.org> parents: 206 diff changeset	39 int optUserColor = 0x000000;
96 7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	40 char *optServer = "chat.newbienudes.com",
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	41 *optUserName = NULL,
198 21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	42 *optUserNameCmd = NULL,
21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	43 *optUserNameEnc = NULL,
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	44 *optPassword = NULL,
198 21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	45 *optPasswordCmd = NULL,
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	46 *optLogFilename = NULL,
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	47 *setTarget = NULL,
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	48 *optSite = "NN";
116 741e45592522 Add simple "prediction" into tab-completion based on previously gotten last Matti Hamalainen <ccr@tnsp.org> parents: 115 diff changeset	49 char optNickSep = ':';
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	50 BOOL optDaemon = FALSE;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	51 FILE *optLogFile = NULL;
28 512775f6b081 A refactored ncurses-based UI. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	52 WINDOW *mainWin = NULL,
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	53 *statusWin = NULL,
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	54 *editWin = NULL;
59 d57a8acf92bf Remove morse code mode. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	55 BOOL setPrvMode = FALSE;
149 a4d6707161a7 Add config file option for default setting of ignore mode. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	56 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	57 BOOL optDebug = FALSE;
33 e49ea6febfeb Cleanups. Added option to specify/fake "site" where logging in from. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	58
140 2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	59
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	60 qlist_t *nnIgnoreList = NULL;
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;
ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	65
89 c2d916b340bf Change some typedef names; Add struct for user list handling. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	66
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	67 /* Arguments
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	68 */
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	69 optarg_t optList[] = {
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	70 { 0, '?', "help", "Show this help", OPT_NONE },
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	71 { 1, 'v', "verbose", "Be more verbose", OPT_NONE },
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	72 { 2, 'p', "port", "Connect to port", OPT_ARGREQ },
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	73 { 3, 's', "server", "Server to connect to", OPT_ARGREQ },
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	74 { 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	75 { 5, 'l', "logfile", "Log filename", OPT_ARGREQ },
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	76 { 6, 'D', "daemon", "A pseudo-daemon mode for logging", OPT_NONE },
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	77 { 7, 'S', "site", "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	78 { 8, 'd', "debug", "Enable various debug features", OPT_NONE },
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	79 };
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	80
43 40ba8cdcf03a Cleanups, added a silly morse code conversion mode. Matti Hamalainen <ccr@tnsp.org> parents: 41 diff changeset	81 const int optListN = (sizeof(optList) / sizeof(optList[0]));
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	82
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	83
68 3ab7751fdad1 MingW compatibility, with one ugly kludge. Matti Hamalainen <ccr@tnsp.org> parents: 67 diff changeset	84 void argShowHelp()
3ab7751fdad1 MingW compatibility, with one ugly kludge. Matti Hamalainen <ccr@tnsp.org> parents: 67 diff changeset	85 {
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	86 th_args_help(stdout, optList, optListN, th_prog_name,
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	87 "[options] <username> <password>");
68 3ab7751fdad1 MingW compatibility, with one ugly kludge. Matti Hamalainen <ccr@tnsp.org> parents: 67 diff changeset	88 }
3ab7751fdad1 MingW compatibility, with one ugly kludge. Matti Hamalainen <ccr@tnsp.org> parents: 67 diff changeset	89
3ab7751fdad1 MingW compatibility, with one ugly kludge. Matti Hamalainen <ccr@tnsp.org> parents: 67 diff changeset	90
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	91 BOOL argHandleOpt(const int optN, char optArg, char currArg)
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	92 {
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	93 switch (optN) {
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	94 case 0:
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	95 argShowHelp();
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	96 exit(0);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	97 break;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	98
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	99 case 1:
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	100 th_verbosityLevel++;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	101 break;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	102
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	103 case 2:
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	104 optPort = atoi(optArg);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	105 break;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	106
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	107 case 3:
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	108 optServer = optArg;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	109 break;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	110
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	111 case 4:
132 10daf4660cae Use th_get_hex_triplet(). Matti Hamalainen <ccr@tnsp.org> parents: 130 diff changeset	112 if ((optUserColor = th_get_hex_triplet(optArg)) < 0) {
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	113 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	114 optArg);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	115 return FALSE;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	116 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	117 THMSG(1, "Using color #%06x\n", optUserColor);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	118 break;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	119
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	120 case 5:
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	121 optLogFilename = optArg;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	122 break;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	123
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	124 case 7:
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	125 optSite = optArg;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	126 break;
33 e49ea6febfeb Cleanups. Added option to specify/fake "site" where logging in from. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	127
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	128 case 6:
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	129 optDaemon = TRUE;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	130 THMSG(1, "Running in pseudo-daemon mode.\n");
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	131 break;
21 29098addfa65 Added a "daemon" mode. Matti Hamalainen <ccr@tnsp.org> parents: 19 diff changeset	132
162 e59cec397811 Add a debug mode option (commandline) and enable certain features when we are in debug mode. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	133 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	134 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	135 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	136 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	137
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	138 default:
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	139 THERR("Unknown option '%s'.\n", currArg);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	140 return FALSE;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	141 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	142
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	143 return TRUE;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	144 }
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	145
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	146
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	147 BOOL argHandleFile(char *currArg)
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	148 {
198 21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	149 if (!optUserNameCmd)
21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	150 optUserNameCmd = currArg;
21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	151 else if (!optPasswordCmd)
21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	152 optPasswordCmd = currArg;
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	153 else {
198 21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	154 THERR("Username '%s' already specified on commandline!\n", optUserNameCmd);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	155 return FALSE;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	156 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	157
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	158 return TRUE;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	159 }
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	160
156 0a9fe14882dc Introduce utility function getTimeStamp() and use it to lessen code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	161 BOOL getTimeStamp(char str, size_t len, const char fmt)
0a9fe14882dc Introduce utility function getTimeStamp() and use it to lessen code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	162 {
0a9fe14882dc Introduce utility function getTimeStamp() and use it to lessen code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	163 time_t stamp = time(NULL);
0a9fe14882dc Introduce utility function getTimeStamp() and use it to lessen code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	164 struct tm *stamp_tm;
0a9fe14882dc Introduce utility function getTimeStamp() and use it to lessen code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	165 if ((stamp_tm = localtime(&stamp)) != NULL) {
0a9fe14882dc Introduce utility function getTimeStamp() and use it to lessen code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	166 strftime(str, len, fmt, stamp_tm);
0a9fe14882dc Introduce utility function getTimeStamp() and use it to lessen code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	167 return TRUE;
0a9fe14882dc Introduce utility function getTimeStamp() and use it to lessen code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	168 } else {
0a9fe14882dc Introduce utility function getTimeStamp() and use it to lessen code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	169 str[0] = 0;
0a9fe14882dc Introduce utility function getTimeStamp() and use it to lessen code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	170 return FALSE;
0a9fe14882dc Introduce utility function getTimeStamp() and use it to lessen code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	171 }
0a9fe14882dc Introduce utility function getTimeStamp() and use it to lessen code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	172 }
49 0bcc38910a77 Simple ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	173
191 4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	174 char encodeUsername(char str)
4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	175 {
4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	176 unsigned char c = (unsigned char ) str;
4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	177 if (str == NULL) return NULL;
4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	178 for (; *c ; c++)
4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	179 if (c == ' ') c = 255;
4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	180 return str;
4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	181 }
4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	182
4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	183 char decodeUsername(char str)
4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	184 {
4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	185 unsigned char c = (unsigned char ) str;
4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	186 if (str == NULL) return NULL;
4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	187 for (; *c ; c++)
4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	188 if (c == 255) c = ' ';
4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	189 return str;
4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	190 }
4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	191
30 751cff550992 Hmm. Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	192 void updateStatus(BOOL insertMode)
28 512775f6b081 A refactored ncurses-based UI. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	193 {
156 0a9fe14882dc Introduce utility function getTimeStamp() and use it to lessen code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	194 char tmpStr[128];
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	195
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	196 if (statusWin == NULL) return;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	197
156 0a9fe14882dc Introduce utility function getTimeStamp() and use it to lessen code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	198 getTimeStamp(tmpStr, sizeof(tmpStr), "%H:%M:%S");
110 8af4072dc31a Fix Win32/MinGW/PDcurses issues. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	199
119 4bc63a535acb Fix some PDCurses incompatibilities and remove some Win32/PDCurses specific hacks. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	200 wbkgdset(statusWin, COLOR_PAIR(10));
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	201 werase(statusWin);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	202
119 4bc63a535acb Fix some PDCurses incompatibilities and remove some Win32/PDCurses specific hacks. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	203 wattrset(statusWin, A_BOLD \| COLOR_PAIR(11));
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	204 mvwaddstr(statusWin, 0, 1, tmpStr);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	205
119 4bc63a535acb Fix some PDCurses incompatibilities and remove some Win32/PDCurses specific hacks. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	206 wattrset(statusWin, A_BOLD \| COLOR_PAIR(13));
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	207 waddstr(statusWin, " \| ");
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	208 wattrset(statusWin, A_BOLD \| COLOR_PAIR(16));
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	209 waddstr(statusWin, optUserName);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	210 wattrset(statusWin, A_BOLD \| COLOR_PAIR(13));
29 a27ef0e359b9 Make statusline more informative. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	211
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	212 waddstr(statusWin, " \| ");
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	213 wattrset(statusWin, A_BOLD \| COLOR_PAIR(11));
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	214 waddstr(statusWin, insertMode ? "INS" : "DEL");
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	215
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	216 wattrset(statusWin, A_BOLD \| COLOR_PAIR(13));
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	217 waddstr(statusWin, " \| Prv: ");
28 512775f6b081 A refactored ncurses-based UI. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	218
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	219 wattrset(statusWin, A_BOLD \| COLOR_PAIR(11));
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	220 waddstr(statusWin, setTarget != NULL ? setTarget : "-");
29 a27ef0e359b9 Make statusline more informative. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	221
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	222 wattrset(statusWin, A_BOLD \| COLOR_PAIR(13));
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	223 waddstr(statusWin, " \| P/C: ");
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	224 wattrset(statusWin, A_BOLD \| COLOR_PAIR(11));
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	225 snprintf(tmpStr, sizeof(tmpStr), "%d / #%06x", optPort, optUserColor);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	226 waddstr(statusWin, tmpStr);
29 a27ef0e359b9 Make statusline more informative. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	227
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	228 wrefresh(statusWin);
28 512775f6b081 A refactored ncurses-based UI. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	229 }
512775f6b081 A refactored ncurses-based UI. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	230
161 6dd282b5f431 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 160 diff changeset	231 void printEditBuf(const char str, nn_editbuf_t buf)
28 512775f6b081 A refactored ncurses-based UI. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	232 {
191 4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	233 char *tmp;
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	234 if (statusWin == NULL \|\| buf == NULL) return;
32 67ec4073e38c Check for NULL pointers (fixes "daemon" mode) Matti Hamalainen <ccr@tnsp.org> parents: 31 diff changeset	235
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	236 buf->data[buf->len] = 0;
191 4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	237 tmp = decodeUsername(th_strdup(buf->data));
4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	238
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	239 werase(editWin);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	240
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	241 wattrset(editWin, A_BOLD);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	242 mvwaddstr(editWin, 0, 0, str);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	243 waddstr(editWin, "> ");
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	244 wattrset(editWin, A_NORMAL);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	245
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	246 if (buf->pos < buf->len) {
191 4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	247 waddnstr(editWin, tmp, buf->pos);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	248 wattrset(editWin, A_REVERSE);
191 4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	249 waddch(editWin, tmp[buf->pos]);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	250 wattrset(editWin, A_NORMAL);
191 4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	251 waddnstr(editWin, tmp + buf->pos + 1, buf->len - buf->pos - 1);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	252 } else {
191 4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	253 waddnstr(editWin, tmp, buf->len);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	254 wattrset(editWin, A_REVERSE);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	255 waddch(editWin, ' ');
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	256 wattrset(editWin, A_NORMAL);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	257 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	258 wrefresh(editWin);
191 4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	259 th_free(tmp);
28 512775f6b081 A refactored ncurses-based UI. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	260 }
512775f6b081 A refactored ncurses-based UI. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	261
512775f6b081 A refactored ncurses-based UI. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	262 int printWin(WINDOW win, const char fmt)
512775f6b081 A refactored ncurses-based UI. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	263 {
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	264 const char *s = fmt;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	265 int col = 0;
141 cce05daf6f01 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	266
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	267 while (*s) {
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	268 if (*s == '½') {
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	269 int val = 0;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	270 s++;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	271 if (*s == '½') {
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	272 waddch(win, ((unsigned char) *s) \| col);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	273 s++;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	274 } else {
110 8af4072dc31a Fix Win32/MinGW/PDcurses issues. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	275 while (s >= '0' && s <= '9') {
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	276 val *= 10;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	277 val += (*s - '0');
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	278 s++;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	279 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	280 if (*s != '½') return -1;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	281 s++;
191 4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	282
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	283 if (val < 9) {
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	284 col = A_DIM \| COLOR_PAIR(val);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	285 } else if (val < 30) {
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	286 col = A_BOLD \| COLOR_PAIR(val - 9);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	287 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	288 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	289 } else {
191 4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	290 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	291 waddch(win, ((unsigned char) ' ') \| col);
4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	292 else
110 8af4072dc31a Fix Win32/MinGW/PDcurses issues. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	293 if (*s != '\r')
121 dad765129133 Remove #ifdef __WIN32 around non-win32 specific code. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	294 waddch(win, ((unsigned char) *s) \| col);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	295 s++;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	296 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	297 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	298 return 0;
28 512775f6b081 A refactored ncurses-based UI. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	299 }
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	300
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	301
28 512775f6b081 A refactored ncurses-based UI. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	302 int printFile(FILE outFile, const char fmt)
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	303 {
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	304 const char *s = fmt;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	305
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	306 while (*s) {
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	307 if (*s == '½') {
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	308 s++;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	309 if (*s == '½') {
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	310 fputc((unsigned char) *s, outFile);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	311 s++;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	312 } else {
74 98004129202a Portability fixes. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	313 while (s && isdigit((int) s)) s++;
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	314 if (*s != '½') return -1;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	315 s++;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	316 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	317 } else {
191 4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	318 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	319 fputc(' ', outFile);
4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	320 else
4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	321 fputc((unsigned char) *s, outFile);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	322 s++;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	323 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	324 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	325
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	326 return 0;
28 512775f6b081 A refactored ncurses-based UI. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	327 }
512775f6b081 A refactored ncurses-based UI. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	328
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	329
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	330 void printMsgV(BOOL addStamp, BOOL logOnly, const char *fmt, va_list ap)
28 512775f6b081 A refactored ncurses-based UI. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	331 {
156 0a9fe14882dc Introduce utility function getTimeStamp() and use it to lessen code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	332 char tmpStr[128], buf[8192];
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	333
156 0a9fe14882dc Introduce utility function getTimeStamp() and use it to lessen code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	334 getTimeStamp(tmpStr, sizeof(tmpStr), "½17½[½11½%H:%M:%S½17½]½0½ ");
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	335
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	336 vsnprintf(buf, sizeof(buf), fmt, ap);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	337
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	338 if (optLogFile) {
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	339 if (addStamp) printFile(optLogFile, tmpStr);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	340 printFile(optLogFile, buf);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	341 fflush(optLogFile);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	342 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	343
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	344 if (!optDaemon && !logOnly) {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	345 if (addStamp) printWin(mainWin, tmpStr);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	346 printWin(mainWin, buf);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	347 wrefresh(mainWin);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	348 }
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	349 }
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	350
100 ed4067c10a8a Remove useless buffer usage from error reporting function. Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	351 void printMsg(const char *fmt, ...)
ed4067c10a8a Remove useless buffer usage from error reporting function. Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	352 {
ed4067c10a8a Remove useless buffer usage from error reporting function. Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	353 va_list ap;
ed4067c10a8a Remove useless buffer usage from error reporting function. Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	354
ed4067c10a8a Remove useless buffer usage from error reporting function. Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	355 va_start(ap, fmt);
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	356 printMsgV(TRUE, FALSE, fmt, ap);
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	357 va_end(ap);
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	358 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	359
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	360 void printMsgC(const char *fmt, ...)
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	361 {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	362 va_list ap;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	363
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	364 va_start(ap, fmt);
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	365 printMsgV(FALSE, FALSE, fmt, ap);
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	366 va_end(ap);
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	367 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	368
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	369 void printMsgQ(BOOL logOnly, const char *fmt, ...)
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	370 {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	371 va_list ap;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	372
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	373 va_start(ap, fmt);
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	374 printMsgV(TRUE, logOnly, fmt, ap);
100 ed4067c10a8a Remove useless buffer usage from error reporting function. Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	375 va_end(ap);
ed4067c10a8a Remove useless buffer usage from error reporting function. Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	376 }
ed4067c10a8a Remove useless buffer usage from error reporting function. Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	377
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	378
181 b0a88d3835e9 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 180 diff changeset	379 void errorMsg(const char *fmt, ...)
96 7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	380 {
100 ed4067c10a8a Remove useless buffer usage from error reporting function. Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	381 va_list ap1, ap2;
96 7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	382
100 ed4067c10a8a Remove useless buffer usage from error reporting function. Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	383 va_start(ap1, fmt);
ed4067c10a8a Remove useless buffer usage from error reporting function. Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	384 va_copy(ap2, ap1);
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	385 printMsgV(TRUE, FALSE, fmt, ap1);
100 ed4067c10a8a Remove useless buffer usage from error reporting function. Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	386 va_end(ap1);
96 7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	387
100 ed4067c10a8a Remove useless buffer usage from error reporting function. Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	388 THERR_V(fmt, ap2);
ed4067c10a8a Remove useless buffer usage from error reporting function. Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	389 va_end(ap2);
96 7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	390 }
7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	391
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	392 int handleUser(nn_conn_t conn, const char str)
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	393 {
108 f323b137ca08 Tab-completion now works with cycling, but bugs with names that have whitespaces. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	394 const char msg = "</USER><MESSAGE>", p = str;
f323b137ca08 Tab-completion now works with cycling, but bugs with names that have whitespaces. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	395 char q, s, t, h, *p2;
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	396
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	397 (void) conn;
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	398
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	399 s = strstr(str, msg);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	400 if (!s) return 1;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	401 *s = 0;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	402 s += strlen(msg);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	403
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	404 q = strstr(s, "</MESSAGE>");
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	405 if (!q) return 3;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	406 *q = 0;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	407
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	408 s = nn_decode_str1(s);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	409 if (!s) return -1;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	410
108 f323b137ca08 Tab-completion now works with cycling, but bugs with names that have whitespaces. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	411 p2 = nn_decode_str1(p);
f323b137ca08 Tab-completion now works with cycling, but bugs with names that have whitespaces. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	412 if (!p2) {
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	413 th_free(s);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	414 return -2;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	415 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	416
108 f323b137ca08 Tab-completion now works with cycling, but bugs with names that have whitespaces. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	417
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	418 if (*s == '/') {
108 f323b137ca08 Tab-completion now works with cycling, but bugs with names that have whitespaces. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	419 /* Ignore room join/leave messages */
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	420 if (!optDebug && (strstr(s, "left the room") \|\| strstr(s, "joined the room from")))
108 f323b137ca08 Tab-completion now works with cycling, but bugs with names that have whitespaces. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	421 goto error;
f323b137ca08 Tab-completion now works with cycling, but bugs with names that have whitespaces. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	422
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	423 t = nn_strip_tags(s + 1);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	424 if (!strncmp(t, "BPRV", 4)) {
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	425 h = nn_decode_str2(t + 1);
188 6b399b7ce40b Automatically grab PRV target from incoming PRV if target not already set. Matti Hamalainen <ccr@tnsp.org> parents: 187 diff changeset	426 if (setTarget == NULL && !strncmp(h, "PRV from ", 9)) {
6b399b7ce40b Automatically grab PRV target from incoming PRV if target not already set. Matti Hamalainen <ccr@tnsp.org> parents: 187 diff changeset	427 char end, name = th_strdup(h + 9);
6b399b7ce40b Automatically grab PRV target from incoming PRV if target not already set. Matti Hamalainen <ccr@tnsp.org> parents: 187 diff changeset	428 if (name != NULL && (end = strchr(name, ':')) != NULL) {
6b399b7ce40b Automatically grab PRV target from incoming PRV if target not already set. Matti Hamalainen <ccr@tnsp.org> parents: 187 diff changeset	429 *end = 0;
6b399b7ce40b Automatically grab PRV target from incoming PRV if target not already set. Matti Hamalainen <ccr@tnsp.org> parents: 187 diff changeset	430 setTarget = th_strdup(name);
6b399b7ce40b Automatically grab PRV target from incoming PRV if target not already set. Matti Hamalainen <ccr@tnsp.org> parents: 187 diff changeset	431 printMsg("PRV target autoset to '%s'\n", setTarget);
6b399b7ce40b Automatically grab PRV target from incoming PRV if target not already set. Matti Hamalainen <ccr@tnsp.org> parents: 187 diff changeset	432 }
6b399b7ce40b Automatically grab PRV target from incoming PRV if target not already set. Matti Hamalainen <ccr@tnsp.org> parents: 187 diff changeset	433 th_free(name);
6b399b7ce40b Automatically grab PRV target from incoming PRV if target not already set. Matti Hamalainen <ccr@tnsp.org> parents: 187 diff changeset	434 }
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	435 printMsg("½11½%s½0½\n", h);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	436 } else {
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	437 h = nn_decode_str2(t);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	438 printMsg("½9½* %s½0½\n", h);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	439 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	440 th_free(h);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	441 th_free(t);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	442 } else {
108 f323b137ca08 Tab-completion now works with cycling, but bugs with names that have whitespaces. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	443 BOOL isMine = strcmp(p2, optUserName) == 0;
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	444 BOOL logOnly = FALSE;
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	445 t = nn_strip_tags(s);
218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	446 h = nn_decode_str2(t);
149 a4d6707161a7 Add config file option for default setting of ignore mode. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	447 if (setIgnoreMode) {
140 2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	448 qlist_t *node = nnIgnoreList;
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	449 while (node != NULL) {
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	450 if (strcasecmp(p2, (char *) node->data) == 0) {
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	451 logOnly = TRUE;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	452 break;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	453 }
140 2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	454 node = node->next;
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	455 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	456 }
108 f323b137ca08 Tab-completion now works with cycling, but bugs with names that have whitespaces. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	457 printMsgQ(logOnly, "½5½<½%d½%s½5½>½0½ %s\n", isMine ? 14 : 15, p2, h);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	458 th_free(h);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	459 th_free(t);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	460 }
108 f323b137ca08 Tab-completion now works with cycling, but bugs with names that have whitespaces. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	461
f323b137ca08 Tab-completion now works with cycling, but bugs with names that have whitespaces. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	462 error:
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	463 th_free(s);
108 f323b137ca08 Tab-completion now works with cycling, but bugs with names that have whitespaces. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	464 th_free(p2);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	465 return 0;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	466 }
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	467
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	468
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	469 int handleLogin(nn_conn_t conn, const char str)
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	470 {
156 0a9fe14882dc Introduce utility function getTimeStamp() and use it to lessen code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	471 char tmpStr[256];
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	472
156 0a9fe14882dc Introduce utility function getTimeStamp() and use it to lessen code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	473 getTimeStamp(tmpStr, sizeof(tmpStr), "%c");
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	474
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	475 if (!strncmp(str, "FAILURE", 7)) {
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	476 printMsg("½1½Login failure½0½ - ½3½%s½0½\n", tmpStr);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	477 return -2;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	478 } else if (!strncmp(str, "SUCCESS", 7)) {
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	479 printMsg("½2½Login success½0½ - ½3½%s½0½\n", tmpStr);
198 21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	480 nn_conn_send_msg(conn, optUserNameEnc, "%%2FRequestUserList");
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	481 return 0;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	482 } else
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	483 return 1;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	484 }
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	485
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	486
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	487 int handleAddUser(nn_conn_t conn, const char str)
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	488 {
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	489 char p, s = strstr(str, "</ADD_USER>");
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	490
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	491 (void) conn;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	492
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	493 if (!s) return 1;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	494 *s = 0;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	495
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	496 p = nn_dbldecode_str(str);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	497 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	498
191 4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	499 nn_userhash_insert(nnUsers, encodeUsername(p));
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	500
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	501 printMsg("! ½3½%s½0½ ½2½ADDED.½0½\n", p);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	502 th_free(p);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	503 return 0;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	504 }
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	505
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	506
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	507 int handleDeleteUser(nn_conn_t conn, const char str)
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	508 {
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	509 char p, s = strstr(str, "</DELETE_USER>");
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	510
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	511 (void) conn;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	512
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	513 if (!s) return 1;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	514 *s = 0;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	515
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	516 p = nn_dbldecode_str(str);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	517 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	518
191 4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	519 nn_userhash_delete(nnUsers, encodeUsername(p));
107 8037a3a7e491 Implement username tab-completion. It's still buggy, tho. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	520
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	521 printMsg("! ½3½%s½0½ ½1½DELETED.½0½\n", p);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	522 th_free(p);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	523 return 0;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	524 }
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	525
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	526
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	527 int handleFoo(nn_conn_t conn, const char str)
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	528 {
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	529 (void) conn; (void) str;
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	530
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	531 return 0;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	532 }
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	533
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	534
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	535 int handleBoot(nn_conn_t conn, const char str)
96 7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	536 {
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	537 (void) conn; (void) str;
96 7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	538 errorMsg("Booted by server.\n");
7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	539 return -1;
7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	540 }
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
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	543 typedef struct {
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	544 char *cmd;
129 4235ff4ced04 "Optimize" protocol handling. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	545 ssize_t len;
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	546 int (handler)(nn_conn_t , const char *);
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	547 } protocmd_t;
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	548
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	549
129 4235ff4ced04 "Optimize" protocol handling. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	550 static protocmd_t protoCmds[] = {
4235ff4ced04 "Optimize" protocol handling. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	551 { "<USER>", -1, handleUser },
4235ff4ced04 "Optimize" protocol handling. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	552 { "<LOGIN_", -1, handleLogin },
4235ff4ced04 "Optimize" protocol handling. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	553 { "<DELETE_USER>", -1, handleDeleteUser },
4235ff4ced04 "Optimize" protocol handling. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	554 { "<ADD_USER>", -1, handleAddUser },
4235ff4ced04 "Optimize" protocol handling. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	555 { "<NUMCLIENTS>", -1, handleFoo },
4235ff4ced04 "Optimize" protocol handling. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	556 { "<BOOT />", -1, handleBoot },
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	557 };
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	558
108 f323b137ca08 Tab-completion now works with cycling, but bugs with names that have whitespaces. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	559 static const int nprotoCmds = sizeof(protoCmds) / sizeof(protoCmds[0]);
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	560
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	561
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	562 int handleProtocol(nn_conn_t conn, const char buf, const ssize_t bufLen)
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	563 {
130 352ec3c300e4 A different initialization. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	564 static BOOL protoCmdsInit = FALSE;
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	565 int i;
130 352ec3c300e4 A different initialization. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	566
352ec3c300e4 A different initialization. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	567 if (!protoCmdsInit) {
352ec3c300e4 A different initialization. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	568 for (i = 0; i < nprotoCmds; i++)
352ec3c300e4 A different initialization. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	569 protoCmds[i].len = strlen(protoCmds[i].cmd);
352ec3c300e4 A different initialization. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	570 protoCmdsInit = TRUE;
352ec3c300e4 A different initialization. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	571 }
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	572
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	573 for (i = 0; i < nprotoCmds; i++) {
129 4235ff4ced04 "Optimize" protocol handling. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	574 ssize_t cmdLen = protoCmds[i].len;
4235ff4ced04 "Optimize" protocol handling. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	575 if (cmdLen < bufLen && !strncmp(buf, protoCmds[i].cmd, cmdLen))
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	576 return protoCmds[i].handler(conn, buf + cmdLen);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	577 }
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	578
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	579 if (optDebug) {
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	580 printMsg("Unknown protocmd: \"%s\"\n", buf);
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	581 return 0;
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	582 } else
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 return 1;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	584 }
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	585
125 d03ebefb92a6 Improve internal command handling, use fork() and execlp() instead of system() for opening profiles into external browser's tabs. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	586 char * trimLeft(char *buf)
d03ebefb92a6 Improve internal command handling, use fork() and execlp() instead of system() for opening profiles into external browser's tabs. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	587 {
202 4b93442bd411 Silence a warning under Solaris and few other systems by using th_isspace() wrapper instead of isspace(). Matti Hamalainen <ccr@tnsp.org> parents: 198 diff changeset	588 while (buf != 0 && th_isspace(buf)) buf++;
125 d03ebefb92a6 Improve internal command handling, use fork() and execlp() instead of system() for opening profiles into external browser's tabs. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	589 return buf;
d03ebefb92a6 Improve internal command handling, use fork() and execlp() instead of system() for opening profiles into external browser's tabs. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	590 }
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	591
140 2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	592 int compareUsername(const void s1, const void s2)
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	593 {
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	594 return strcasecmp((char ) s1, (char ) s2);
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	595 }
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	596
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	597 int handleUserInput(nn_conn_t conn, char buf, size_t bufLen)
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	598 {
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 77 diff changeset	599 char *tmpStr, tmpBuf[4096];
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	600 BOOL result;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	601
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	602 /* Trim right */
112 c4865ac2386c Fix right-side trimming of command line. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	603 bufLen--;
c4865ac2386c Fix right-side trimming of command line. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	604 buf[bufLen--] = 0;
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	605 while (bufLen > 0 && (buf[bufLen] == '\n' \|\| buf[bufLen] == '\r' \|\| th_isspace(buf[bufLen])))
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	606 buf[bufLen--] = 0;
191 4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	607 decodeUsername(buf);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	608
109 1323a7f88c21 Fix /w -command and add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	609 /* Check for special user commands */
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	610 if (*buf == 0) {
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	611 return 1;
111 9db08807018f Make local commands case-insensitive. Matti Hamalainen <ccr@tnsp.org> parents: 110 diff changeset	612 } else if (!strncasecmp(buf, "/color ", 7)) {
109 1323a7f88c21 Fix /w -command and add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	613 /* Change color */
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	614 int tmpInt;
132 10daf4660cae Use th_get_hex_triplet(). Matti Hamalainen <ccr@tnsp.org> parents: 130 diff changeset	615 if ((tmpInt = th_get_hex_triplet(trimLeft(buf + 7))) < 0) {
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	616 printMsg("Invalid color value '%s'\n", buf+7);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	617 return 1;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	618 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	619 optUserColor = tmpInt;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	620 printMsg("Setting color to #%06x\n", optUserColor);
198 21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	621 nn_conn_send_msg(conn, optUserNameEnc, "%%2FSetFontColor%%20%%2Dcolor%%20%06X", optUserColor);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	622 return 0;
140 2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	623 } else if (!strncasecmp(buf, "/ignore", 7)) {
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	624 char *name = trimLeft(buf + 7);
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	625 if (strlen(name) > 0) {
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	626 /* Add or remove someone to/from ignore */
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	627 qlist_t *user = th_llist_find_func(nnIgnoreList, name, compareUsername);
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	628 if (user != NULL) {
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	629 printMsg("Removed user '%s' from ignore.\n", name);
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	630 th_llist_delete_node(&nnIgnoreList, user);
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	631 } else {
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	632 printMsg("Now ignoring '%s'.\n", name);
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	633 th_llist_append(&nnIgnoreList, th_strdup(name));
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	634 }
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	635 } else {
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	636 /* Just list whomever is in ignore now */
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	637 qlist_t *user = nnIgnoreList;
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	638 ssize_t nuser = th_llist_length(nnIgnoreList);
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	639 printMsg("Users ignored (%d): ", nuser);
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	640 while (user != NULL) {
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	641 if (user->data != NULL) {
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	642 printMsgC("'%s'", (char *) user->data);
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	643 if (--nuser > 0)
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	644 printMsgC(", ");
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	645 }
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	646 user = user->next;
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	647 }
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	648 printMsgC("\n");
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	649 }
2d2ef5bbcc11 Use th-libs linked list code for managing ignore list. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	650 return 0;
133 ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	651 } else if (!strncasecmp(buf, "/save", 5)) {
ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	652 /* Save configuration */
143 5babbff7ca26 Rename some variables, cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	653 FILE *cfgfile = fopen(setConfigFile, "w");
5babbff7ca26 Rename some variables, cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	654 if (cfgfile == NULL) {
5babbff7ca26 Rename some variables, cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	655 printMsg("Could not create configuration to file '%s': %s\n", setConfigFile,
5babbff7ca26 Rename some variables, cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	656 strerror(errno));
133 ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	657 return 0;
ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	658 }
ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	659 printMsg("Configuration saved in file '%s', res=%d\n",
ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	660 setConfigFile,
143 5babbff7ca26 Rename some variables, cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	661 th_cfg_write(cfgfile, setConfigFile, cfg));
133 ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	662
143 5babbff7ca26 Rename some variables, cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	663 fclose(cfgfile);
133 ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	664 return 0;
111 9db08807018f Make local commands case-insensitive. Matti Hamalainen <ccr@tnsp.org> parents: 110 diff changeset	665 } else if (!strncasecmp(buf, "/w ", 3)) {
109 1323a7f88c21 Fix /w -command and add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	666 /* Open given username's profile via firefox in a new tab */
137 fad8c31e41e6 Move browser code around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	667 char *name = trimLeft(buf + 3);
114 256cca8cc086 Support $BROWSER environment variable setting. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	668
125 d03ebefb92a6 Improve internal command handling, use fork() and execlp() instead of system() for opening profiles into external browser's tabs. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	669 printMsg("Opening profile for: '%s'\n", name);
d03ebefb92a6 Improve internal command handling, use fork() and execlp() instead of system() for opening profiles into external browser's tabs. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	670
108 f323b137ca08 Tab-completion now works with cycling, but bugs with names that have whitespaces. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	671 tmpStr = nn_encode_str1(name);
197 e0ec2280a778 Implement browser launching on Windows via ShellExecute(). Matti Hamalainen <ccr@tnsp.org> parents: 196 diff changeset	672 #ifdef __WIN32
e0ec2280a778 Implement browser launching on Windows via ShellExecute(). Matti Hamalainen <ccr@tnsp.org> parents: 196 diff changeset	673 {
e0ec2280a778 Implement browser launching on Windows via ShellExecute(). Matti Hamalainen <ccr@tnsp.org> parents: 196 diff changeset	674 int status;
e0ec2280a778 Implement browser launching on Windows via ShellExecute(). Matti Hamalainen <ccr@tnsp.org> parents: 196 diff changeset	675 snprintf(tmpBuf, sizeof(tmpBuf), "http://www.newbienudes.com/profile/%s/", tmpStr);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	676 th_free(tmpStr);
197 e0ec2280a778 Implement browser launching on Windows via ShellExecute(). Matti Hamalainen <ccr@tnsp.org> parents: 196 diff changeset	677 status = ShellExecute(NULL, "open", tmpBuf, NULL, NULL, SW_SHOWNA);
e0ec2280a778 Implement browser launching on Windows via ShellExecute(). Matti Hamalainen <ccr@tnsp.org> parents: 196 diff changeset	678 if (status <= 32)
e0ec2280a778 Implement browser launching on Windows via ShellExecute(). Matti Hamalainen <ccr@tnsp.org> parents: 196 diff changeset	679 printMsg("Could not launch default web browser: %d\n", status);
e0ec2280a778 Implement browser launching on Windows via ShellExecute(). Matti Hamalainen <ccr@tnsp.org> parents: 196 diff changeset	680 }
128 713879a7ca10 Wait for forked processes, to prevent a zombie apocalypse. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	681 #else
713879a7ca10 Wait for forked processes, to prevent a zombie apocalypse. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	682 {
713879a7ca10 Wait for forked processes, to prevent a zombie apocalypse. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	683 int status;
713879a7ca10 Wait for forked processes, to prevent a zombie apocalypse. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	684 pid_t pid;
197 e0ec2280a778 Implement browser launching on Windows via ShellExecute(). Matti Hamalainen <ccr@tnsp.org> parents: 196 diff changeset	685 snprintf(tmpBuf, sizeof(tmpBuf), "openurl(http://www.newbienudes.com/profile/%s/,new-tab)", tmpStr);
e0ec2280a778 Implement browser launching on Windows via ShellExecute(). Matti Hamalainen <ccr@tnsp.org> parents: 196 diff changeset	686 th_free(tmpStr);
e0ec2280a778 Implement browser launching on Windows via ShellExecute(). Matti Hamalainen <ccr@tnsp.org> parents: 196 diff changeset	687
125 d03ebefb92a6 Improve internal command handling, use fork() and execlp() instead of system() for opening profiles into external browser's tabs. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	688 if ((pid = fork()) < 0) {
d03ebefb92a6 Improve internal command handling, use fork() and execlp() instead of system() for opening profiles into external browser's tabs. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	689 printMsg("Could not create sub-process!\n");
d03ebefb92a6 Improve internal command handling, use fork() and execlp() instead of system() for opening profiles into external browser's tabs. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	690 } else if (pid == 0) {
216 3ccfe8902fd5 Use (void ) typecast for execlp() sentinel to avoid a warning under OpenBSD. Matti Hamalainen <ccr@tnsp.org>* parents: 211 diff changeset	691 execlp(setBrowser, setBrowser, "-remote", tmpBuf, (void *)NULL);
128 713879a7ca10 Wait for forked processes, to prevent a zombie apocalypse. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	692 _exit(errno);
125 d03ebefb92a6 Improve internal command handling, use fork() and execlp() instead of system() for opening profiles into external browser's tabs. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	693 }
128 713879a7ca10 Wait for forked processes, to prevent a zombie apocalypse. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	694
713879a7ca10 Wait for forked processes, to prevent a zombie apocalypse. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	695 wait(&status);
713879a7ca10 Wait for forked processes, to prevent a zombie apocalypse. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	696 }
713879a7ca10 Wait for forked processes, to prevent a zombie apocalypse. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	697 #endif
109 1323a7f88c21 Fix /w -command and add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	698 return 0;
183 209546c5b7d0 Improve /to command a bit. Matti Hamalainen <ccr@tnsp.org> parents: 181 diff changeset	699 } else if (!strncasecmp(buf, "/to", 3)) {
209546c5b7d0 Improve /to command a bit. Matti Hamalainen <ccr@tnsp.org> parents: 181 diff changeset	700 char *name = trimLeft(buf + 3);
109 1323a7f88c21 Fix /w -command and add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	701 /* Set private messaging target */
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	702 th_free(setTarget);
183 209546c5b7d0 Improve /to command a bit. Matti Hamalainen <ccr@tnsp.org> parents: 181 diff changeset	703 if (strlen(name) > 0) {
209546c5b7d0 Improve /to command a bit. Matti Hamalainen <ccr@tnsp.org> parents: 181 diff changeset	704 setTarget = th_strdup(trimLeft(buf + 3));
209546c5b7d0 Improve /to command a bit. Matti Hamalainen <ccr@tnsp.org> parents: 181 diff changeset	705 printMsg("Set prv target to '%s'\n", setTarget);
209546c5b7d0 Improve /to command a bit. Matti Hamalainen <ccr@tnsp.org> parents: 181 diff changeset	706 } else {
209546c5b7d0 Improve /to command a bit. Matti Hamalainen <ccr@tnsp.org> parents: 181 diff changeset	707 setTarget = NULL;
209546c5b7d0 Improve /to command a bit. Matti Hamalainen <ccr@tnsp.org> parents: 181 diff changeset	708 printMsg("Cleared prv target.\n");
209546c5b7d0 Improve /to command a bit. Matti Hamalainen <ccr@tnsp.org> parents: 181 diff changeset	709 }
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	710 return 0;
111 9db08807018f Make local commands case-insensitive. Matti Hamalainen <ccr@tnsp.org> parents: 110 diff changeset	711 } else if (!strncasecmp(buf, "/who", 4)) {
109 1323a7f88c21 Fix /w -command and add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	712 /* Alias /who to /listallusers */
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	713 snprintf(tmpBuf, sizeof(tmpBuf), "/listallusers");
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	714 buf = tmpBuf;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	715 } else if (setPrvMode) {
109 1323a7f88c21 Fix /w -command and add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	716 /* Private chat mode, send as PRV */
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	717 if (setTarget != NULL) {
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	718 snprintf(tmpBuf, sizeof(tmpBuf), "/prv -to %s -msg %s", setTarget, buf);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	719 buf = tmpBuf;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	720 } else {
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	721 printMsg("No target set, exiting prv mode.\n");
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	722 setPrvMode = FALSE;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	723 return 1;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	724 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	725 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	726
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	727 /* Send double-encoded */
191 4007b9ac7cde Handle usernames with whitespace by converting whitespaces to chr 255 in Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	728 tmpStr = nn_dblencode_str(decodeUsername(buf));
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	729 if (tmpStr == 0) return -2;
198 21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	730 result = nn_conn_send_msg(conn, optUserNameEnc, "%s", tmpStr);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	731 th_free(tmpStr);
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	732
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	733 return result ? 0 : -1;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	734 }
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	735
155 0720ca51673e Plug some minor "memory leaks" related to curses. Matti Hamalainen <ccr@tnsp.org> parents: 154 diff changeset	736 void closeWindows(void)
0720ca51673e Plug some minor "memory leaks" related to curses. Matti Hamalainen <ccr@tnsp.org> parents: 154 diff changeset	737 {
0720ca51673e Plug some minor "memory leaks" related to curses. Matti Hamalainen <ccr@tnsp.org> parents: 154 diff changeset	738 if (mainWin) delwin(mainWin);
0720ca51673e Plug some minor "memory leaks" related to curses. Matti Hamalainen <ccr@tnsp.org> parents: 154 diff changeset	739 if (statusWin) delwin(statusWin);
0720ca51673e Plug some minor "memory leaks" related to curses. Matti Hamalainen <ccr@tnsp.org> parents: 154 diff changeset	740 if (editWin) delwin(editWin);
0720ca51673e Plug some minor "memory leaks" related to curses. Matti Hamalainen <ccr@tnsp.org> parents: 154 diff changeset	741 }
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	742
46 65b1ac6a1e2e Support for resizing the terminal on fly. Not perfect, but works. Matti Hamalainen <ccr@tnsp.org> parents: 45 diff changeset	743 BOOL initializeWindows(void)
65b1ac6a1e2e Support for resizing the terminal on fly. Not perfect, but works. Matti Hamalainen <ccr@tnsp.org> parents: 45 diff changeset	744 {
118 9e7f52878725 Use getmaxyx() instead of LINES and COLS globals as recommended by curses programming guidelines. Matti Hamalainen <ccr@tnsp.org> parents: 117 diff changeset	745 int w, h;
9e7f52878725 Use getmaxyx() instead of LINES and COLS globals as recommended by curses programming guidelines. Matti Hamalainen <ccr@tnsp.org> parents: 117 diff changeset	746
9e7f52878725 Use getmaxyx() instead of LINES and COLS globals as recommended by curses programming guidelines. Matti Hamalainen <ccr@tnsp.org> parents: 117 diff changeset	747 getmaxyx(stdscr, h, w);
9e7f52878725 Use getmaxyx() instead of LINES and COLS globals as recommended by curses programming guidelines. Matti Hamalainen <ccr@tnsp.org> parents: 117 diff changeset	748
155 0720ca51673e Plug some minor "memory leaks" related to curses. Matti Hamalainen <ccr@tnsp.org> parents: 154 diff changeset	749 closeWindows();
118 9e7f52878725 Use getmaxyx() instead of LINES and COLS globals as recommended by curses programming guidelines. Matti Hamalainen <ccr@tnsp.org> parents: 117 diff changeset	750
209 e1bfd5227a24 Use curses subwin(stdscr, ...) instead of newwin(). Matti Hamalainen <ccr@tnsp.org> parents: 208 diff changeset	751 mainWin = subwin(stdscr, h - 4, w, 0, 0);
e1bfd5227a24 Use curses subwin(stdscr, ...) instead of newwin(). Matti Hamalainen <ccr@tnsp.org> parents: 208 diff changeset	752 statusWin = subwin(stdscr, 1, w, h - 4, 0);
e1bfd5227a24 Use curses subwin(stdscr, ...) instead of newwin(). Matti Hamalainen <ccr@tnsp.org> parents: 208 diff changeset	753 editWin = subwin(stdscr, 3, w, h - 3, 0);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	754
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	755 if (mainWin == NULL \|\| statusWin == NULL \|\| editWin == NULL) {
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	756 THERR("Could not create ncurses windows!\n");
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	757 return FALSE;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	758 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	759 scrollok(mainWin, 1);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	760
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	761 return TRUE;
46 65b1ac6a1e2e Support for resizing the terminal on fly. Not perfect, but works. Matti Hamalainen <ccr@tnsp.org> parents: 45 diff changeset	762 }
65b1ac6a1e2e Support for resizing the terminal on fly. Not perfect, but works. Matti Hamalainen <ccr@tnsp.org> parents: 45 diff changeset	763
179 8c493b5671bd Add separate updateWindows() function. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	764 void updateWindows(void)
8c493b5671bd Add separate updateWindows() function. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	765 {
8c493b5671bd Add separate updateWindows() function. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	766 if (mainWin) redrawwin(mainWin);
8c493b5671bd Add separate updateWindows() function. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	767 if (statusWin) redrawwin(statusWin);
8c493b5671bd Add separate updateWindows() function. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	768 if (editWin) redrawwin(editWin);
8c493b5671bd Add separate updateWindows() function. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	769 }
113 2a53156e7e12 Yay, tab-completion cycling now works (except for usernames with whitespaces, of course ...) Matti Hamalainen <ccr@tnsp.org> parents: 112 diff changeset	770
2a53156e7e12 Yay, tab-completion cycling now works (except for usernames with whitespaces, of course ...) Matti Hamalainen <ccr@tnsp.org> parents: 112 diff changeset	771 BOOL performTabCompletion(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	772 {
189 b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	773 static char previous = NULL, pattern = NULL;
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	774 BOOL again = FALSE, hasSeparator = FALSE, newPattern = FALSE, hasSpace = FALSE;
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	775 char *str = buf->data;
113 2a53156e7e12 Yay, tab-completion cycling now works (except for usernames with whitespaces, of course ...) Matti Hamalainen <ccr@tnsp.org> parents: 112 diff changeset	776 int mode = 0;
189 b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	777 ssize_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	778
189 b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	779 /* previous word */
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	780 if (startPos >= 2 && str[startPos - 1] == ' ' && str[startPos - 2] != ' ') {
113 2a53156e7e12 Yay, tab-completion cycling now works (except for usernames with whitespaces, of course ...) Matti Hamalainen <ccr@tnsp.org> parents: 112 diff changeset	781 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	782 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	783 while (startPos > 0 && str[startPos - 1] != ' ') startPos--;
2a53156e7e12 Yay, tab-completion cycling now works (except for usernames with whitespaces, of course ...) Matti Hamalainen <ccr@tnsp.org> parents: 112 diff changeset	784 mode = 1;
107 8037a3a7e491 Implement username tab-completion. It's still buggy, tho. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	785 } else
189 b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	786 /* middle of a word, new pattern */
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	787 if (startPos < buf->len && str[startPos] != ' ') {
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	788 endPos = startPos;
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	789 while (startPos > 0 && str[startPos - 1] != ' ') startPos--;
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	790 while (endPos < buf->len - 1 && str[endPos + 1] != ' ') endPos++;
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	791 newPattern = TRUE;
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	792 mode = 2;
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	793 } else
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	794 /* previous word, new pattern */
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	795 if (startPos >= 1 && str[startPos - 1] != ' ') {
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	796 startPos -= 1;
113 2a53156e7e12 Yay, tab-completion cycling now works (except for usernames with whitespaces, of course ...) Matti Hamalainen <ccr@tnsp.org> parents: 112 diff changeset	797 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	798 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	799 newPattern = TRUE;
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	800 mode = 3;
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	801 } else {
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	802 if (optDebug)
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	803 printMsg("no mode\n");
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	804 return FALSE;
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	805 }
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	806
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	807 if (str[endPos] == optNickSep) {
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	808 endPos--;
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	809 if (startPos > 0) {
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	810 if (optDebug)
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	811 printMsg("str[endPos] == optNickSep && startPos > 0 (%d)\n", startPos);
113 2a53156e7e12 Yay, tab-completion cycling now works (except for usernames with whitespaces, of course ...) Matti Hamalainen <ccr@tnsp.org> parents: 112 diff changeset	812 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	813 }
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	814 hasSeparator = TRUE;
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	815 }
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	816
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	817 if (buf->pos > 0 && str[buf->pos - 1] == ' ')
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	818 hasSpace = TRUE;
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	819 if (buf->pos <= buf->len && str[buf->pos] == ' ')
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	820 hasSpace = TRUE;
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	821
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	822 if (newPattern) {
116 741e45592522 Add simple "prediction" into tab-completion based on previously gotten last Matti Hamalainen <ccr@tnsp.org> parents: 115 diff changeset	823 /* 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	824 char *npattern = nn_editbuf_get_string(buf, startPos, endPos);
165 f2f0b6f9281b Dont set 'again' flag in tab completion function if the new and old pattern do not match exactly (apart from case). Matti Hamalainen <ccr@tnsp.org> parents: 163 diff changeset	825 if (pattern && npattern && 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	826 again = TRUE;
189 b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	827
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	828 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	829 pattern = npattern;
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	830
116 741e45592522 Add simple "prediction" into tab-completion based on previously gotten last Matti Hamalainen <ccr@tnsp.org> parents: 115 diff changeset	831 if (!again) {
741e45592522 Add simple "prediction" into tab-completion based on previously gotten last Matti Hamalainen <ccr@tnsp.org> parents: 115 diff changeset	832 th_free(previous);
741e45592522 Add simple "prediction" into tab-completion based on previously gotten last Matti Hamalainen <ccr@tnsp.org> parents: 115 diff changeset	833 previous = NULL;
741e45592522 Add simple "prediction" into tab-completion based on previously gotten last Matti Hamalainen <ccr@tnsp.org> parents: 115 diff changeset	834 }
189 b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	835 }
116 741e45592522 Add simple "prediction" into tab-completion based on previously gotten last Matti Hamalainen <ccr@tnsp.org> parents: 115 diff changeset	836
189 b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	837 if (optDebug) {
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	838 printMsg("sPos=%d, ePos=%d <-> bPos=%d, bufLen=%d : pat='%s' (again=%s, hassep=%s, hasspc=%s, newpat=%s, mode=%d)\n",
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	839 startPos, endPos, buf->pos, buf->len, pattern,
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	840 again ? "yes" : "no",
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	841 hasSeparator ? "yes" : "no",
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	842 hasSpace ? "yes" : "no",
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	843 newPattern ? "yes" : "no", mode);
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	844 }
107 8037a3a7e491 Implement username tab-completion. It's still buggy, tho. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	845
113 2a53156e7e12 Yay, tab-completion cycling now works (except for usernames with whitespaces, of course ...) Matti Hamalainen <ccr@tnsp.org> parents: 112 diff changeset	846 if (pattern) {
116 741e45592522 Add simple "prediction" into tab-completion based on previously gotten last Matti Hamalainen <ccr@tnsp.org> parents: 115 diff changeset	847 nn_user_t *user = nn_user_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	848
108 f323b137ca08 Tab-completion now works with cycling, but bugs with names that have whitespaces. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	849 if (user) {
107 8037a3a7e491 Implement username tab-completion. It's still buggy, tho. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	850 int i;
108 f323b137ca08 Tab-completion now works with cycling, but bugs with names that have whitespaces. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	851 char *c = user->name;
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	852 if (optDebug)
163 cc1cc49d26f0 Make tab username completion debug messages clearer. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	853 printMsg("match='%s' / prev='%s'\n", user->name, previous);
107 8037a3a7e491 Implement username tab-completion. It's still buggy, tho. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	854
113 2a53156e7e12 Yay, tab-completion cycling now works (except for usernames with whitespaces, of course ...) Matti Hamalainen <ccr@tnsp.org> parents: 112 diff changeset	855 for (i = startPos; i <= endPos; i++)
2a53156e7e12 Yay, tab-completion cycling now works (except for usernames with whitespaces, of course ...) Matti Hamalainen <ccr@tnsp.org> parents: 112 diff changeset	856 nn_editbuf_delete(buf, startPos);
107 8037a3a7e491 Implement username tab-completion. It's still buggy, tho. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	857
113 2a53156e7e12 Yay, tab-completion cycling now works (except for usernames with whitespaces, of course ...) Matti Hamalainen <ccr@tnsp.org> parents: 112 diff changeset	858 for (i = startPos; *c; i++, c++)
107 8037a3a7e491 Implement username tab-completion. It's still buggy, tho. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	859 nn_editbuf_insert(buf, i, *c);
8037a3a7e491 Implement username tab-completion. It's still buggy, tho. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	860
189 b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	861 if (!hasSeparator && startPos == 0) {
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	862 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	863 startPos++;
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	864 }
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	865 if (hasSeparator)
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	866 startPos++;
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	867 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	868 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	869
b0d64dde62af Fix username tab completion. Should now work like in Irssi, though the Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	870 nn_editbuf_setpos(buf, startPos + 1 + strlen(user->name));
107 8037a3a7e491 Implement username tab-completion. It's still buggy, tho. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	871
108 f323b137ca08 Tab-completion now works with cycling, but bugs with names that have whitespaces. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	872 th_free(previous);
f323b137ca08 Tab-completion now works with cycling, but bugs with names that have whitespaces. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	873 previous = th_strdup(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	874
2a53156e7e12 Yay, tab-completion cycling now works (except for usernames with whitespaces, of course ...) Matti Hamalainen <ccr@tnsp.org> parents: 112 diff changeset	875 return TRUE;
107 8037a3a7e491 Implement username tab-completion. It's still buggy, tho. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	876 }
8037a3a7e491 Implement username tab-completion. It's still buggy, tho. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	877 }
113 2a53156e7e12 Yay, tab-completion cycling now works (except for usernames with whitespaces, of course ...) Matti Hamalainen <ccr@tnsp.org> parents: 112 diff changeset	878
2a53156e7e12 Yay, tab-completion cycling now works (except for usernames with whitespaces, of course ...) Matti Hamalainen <ccr@tnsp.org> parents: 112 diff changeset	879 return FALSE;
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	880 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	881
211 c40329e95445 Trim both left and right side of username+password prompt input. Also allow empty passwords, to be able to use guest accounts. Matti Hamalainen <ccr@tnsp.org> parents: 210 diff changeset	882 char promptRequester(const char info, BOOL allowEmpty)
196 edd5ce3e5399 Add simplistic username/password requester if none given on commandline or config file. Matti Hamalainen <ccr@tnsp.org> parents: 195 diff changeset	883 {
211 c40329e95445 Trim both left and right side of username+password prompt input. Also allow empty passwords, to be able to use guest accounts. Matti Hamalainen <ccr@tnsp.org> parents: 210 diff changeset	884 char tmpBuf[512], *ptr;
c40329e95445 Trim both left and right side of username+password prompt input. Also allow empty passwords, to be able to use guest accounts. Matti Hamalainen <ccr@tnsp.org> parents: 210 diff changeset	885 ssize_t pos;
196 edd5ce3e5399 Add simplistic username/password requester if none given on commandline or config file. Matti Hamalainen <ccr@tnsp.org> parents: 195 diff changeset	886
edd5ce3e5399 Add simplistic username/password requester if none given on commandline or config file. Matti Hamalainen <ccr@tnsp.org> parents: 195 diff changeset	887 fputs(info, stdout);
edd5ce3e5399 Add simplistic username/password requester if none given on commandline or config file. Matti Hamalainen <ccr@tnsp.org> parents: 195 diff changeset	888 fgets(tmpBuf, sizeof(tmpBuf), stdin);
197 e0ec2280a778 Implement browser launching on Windows via ShellExecute(). Matti Hamalainen <ccr@tnsp.org> parents: 196 diff changeset	889
211 c40329e95445 Trim both left and right side of username+password prompt input. Also allow empty passwords, to be able to use guest accounts. Matti Hamalainen <ccr@tnsp.org> parents: 210 diff changeset	890 for (pos = strlen(tmpBuf) - 1; pos > 0 && (tmpBuf[pos] == '\n' \|\| tmpBuf[pos] == '\r' \|\| th_isspace(tmpBuf[pos])); pos--)
c40329e95445 Trim both left and right side of username+password prompt input. Also allow empty passwords, to be able to use guest accounts. Matti Hamalainen <ccr@tnsp.org> parents: 210 diff changeset	891 tmpBuf[pos] = 0;
196 edd5ce3e5399 Add simplistic username/password requester if none given on commandline or config file. Matti Hamalainen <ccr@tnsp.org> parents: 195 diff changeset	892
211 c40329e95445 Trim both left and right side of username+password prompt input. Also allow empty passwords, to be able to use guest accounts. Matti Hamalainen <ccr@tnsp.org> parents: 210 diff changeset	893 ptr = trimLeft(tmpBuf);
c40329e95445 Trim both left and right side of username+password prompt input. Also allow empty passwords, to be able to use guest accounts. Matti Hamalainen <ccr@tnsp.org> parents: 210 diff changeset	894
c40329e95445 Trim both left and right side of username+password prompt input. Also allow empty passwords, to be able to use guest accounts. Matti Hamalainen <ccr@tnsp.org> parents: 210 diff changeset	895 if (allowEmpty \|\| strlen(ptr) > 0)
c40329e95445 Trim both left and right side of username+password prompt input. Also allow empty passwords, to be able to use guest accounts. Matti Hamalainen <ccr@tnsp.org> parents: 210 diff changeset	896 return th_strdup(ptr);
196 edd5ce3e5399 Add simplistic username/password requester if none given on commandline or config file. Matti Hamalainen <ccr@tnsp.org> parents: 195 diff changeset	897 else
edd5ce3e5399 Add simplistic username/password requester if none given on commandline or config file. Matti Hamalainen <ccr@tnsp.org> parents: 195 diff changeset	898 return NULL;
edd5ce3e5399 Add simplistic username/password requester if none given on commandline or config file. Matti Hamalainen <ccr@tnsp.org> parents: 195 diff changeset	899 }
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	900
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	901 int main(int argc, char *argv[])
728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	902 {
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	903 nn_conn_t *conn = NULL;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	904 int curVis = ERR, updateCount = 0;
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	905 struct hostent *tmpHost;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	906 BOOL argsOK, isError = FALSE,
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	907 exitProg = FALSE,
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	908 colorSet = FALSE,
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	909 cursesInit = FALSE,
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	910 networkInit = FALSE,
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	911 insertMode = TRUE;
96 7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	912 time_t prevTime;
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	913 char *tmpStr;
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	914 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	915 nn_editbuf_t *histBuf[SET_MAX_HISTORY+2];
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	916 int histPos = 0, histMax = 0;
186 ff3688e747c3 Add a nasty hack to draw edit line correctly after startup... still a Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	917 BOOL first = TRUE;
154 e8f67e344aaf Get correct directory for saving configuration under Windows. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	918
e8f67e344aaf Get correct directory for saving configuration under Windows. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	919 cfgitem_t *tmpcfg;
e8f67e344aaf Get correct directory for saving configuration under Windows. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	920 char *homeDir = NULL;
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	921
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	922 memset(histBuf, 0, sizeof(histBuf));
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	923
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	924 /* 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	925 th_init("NNChat", "Newbie Nudes chat client", NN_VERSION,
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	926 "Written and designed by Anonymous Finnish Guy (C) 2008-2010",
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	927 "This software is freeware, use and distribute as you wish.");
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	928 th_verbosityLevel = 0;
133 ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	929
ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	930 /* Read config */
148 9da39d090ef1 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 147 diff changeset	931 tmpcfg = NULL;
133 ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	932 th_cfg_add_comment(&tmpcfg, "General settings");
ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	933 th_cfg_add_string(&tmpcfg, "username", &optUserName, NULL);
ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	934 th_cfg_add_string(&tmpcfg, "password", &optPassword, NULL);
150 db5e7a1f1eb3 Add comment in config file about format of user color setting. Matti Hamalainen <ccr@tnsp.org> parents: 149 diff changeset	935 th_cfg_add_comment(&tmpcfg, "Default color as a hex-triplet");
133 ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	936 th_cfg_add_hexvalue(&tmpcfg, "color", &optUserColor, optUserColor);
149 a4d6707161a7 Add config file option for default setting of ignore mode. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	937
a4d6707161a7 Add config file option for default setting of ignore mode. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	938 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	939 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	940 th_cfg_add_comment(&tmpcfg, "People to be ignored when ignore mode is enabled");
a4d6707161a7 Add config file option for default setting of ignore mode. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	941 th_cfg_add_string_list(&tmpcfg, "ignore_list", &nnIgnoreList);
133 ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	942 th_cfg_add_section(&cfg, "general", tmpcfg);
ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	943
ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	944 tmpcfg = NULL;
ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	945 th_cfg_add_comment(&tmpcfg, "Chat server hostname or IP address");
ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	946 th_cfg_add_string(&tmpcfg, "host", &optServer, optServer);
ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	947 th_cfg_add_comment(&tmpcfg, "Default port to connect to (8002 = public room, 8003 = passion pit, 8005 = members only)");
ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	948 th_cfg_add_int(&tmpcfg, "port", &optPort, optPort);
ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	949 th_cfg_add_section(&cfg, "server", tmpcfg);
ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	950
154 e8f67e344aaf Get correct directory for saving configuration under Windows. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	951 #ifdef __WIN32
e8f67e344aaf Get correct directory for saving configuration under Windows. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	952 {
e8f67e344aaf Get correct directory for saving configuration under Windows. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	953 char tmpPath[MAX_PATH];
e8f67e344aaf Get correct directory for saving configuration under Windows. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	954 if (SHGetFolderPath(NULL, CSIDL_APPDATA \| CSIDL_FLAG_CREATE, NULL, 0, tmpPath) == S_OK)
e8f67e344aaf Get correct directory for saving configuration under Windows. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	955 homeDir = th_strdup(tmpPath);
197 e0ec2280a778 Implement browser launching on Windows via ShellExecute(). Matti Hamalainen <ccr@tnsp.org> parents: 196 diff changeset	956
e0ec2280a778 Implement browser launching on Windows via ShellExecute(). Matti Hamalainen <ccr@tnsp.org> parents: 196 diff changeset	957 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	958 }
e8f67e344aaf Get correct directory for saving configuration under Windows. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	959 #else
172 ffba05eb578c Make a copy of getenv("HOME") result instead of using it directly. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	960 homeDir = th_strdup(getenv("HOME"));
154 e8f67e344aaf Get correct directory for saving configuration under Windows. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	961 #endif
e8f67e344aaf Get correct directory for saving configuration under Windows. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	962
e8f67e344aaf Get correct directory for saving configuration under Windows. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	963 if (homeDir != NULL) {
e8f67e344aaf Get correct directory for saving configuration under Windows. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	964 FILE *cfgfile;
e8f67e344aaf Get correct directory for saving configuration under Windows. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	965 setConfigFile = th_strdup_printf("%s" SET_DIR_SEPARATOR "%s", homeDir, SET_CONFIG_FILE);
e8f67e344aaf Get correct directory for saving configuration under Windows. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	966
e8f67e344aaf Get correct directory for saving configuration under Windows. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	967 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	968
e8f67e344aaf Get correct directory for saving configuration under Windows. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	969 if ((cfgfile = fopen(setConfigFile, "r")) != NULL)
e8f67e344aaf Get correct directory for saving configuration under Windows. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	970 th_cfg_read(cfgfile, setConfigFile, cfg);
133 ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	971 }
196 edd5ce3e5399 Add simplistic username/password requester if none given on commandline or config file. Matti Hamalainen <ccr@tnsp.org> parents: 195 diff changeset	972
137 fad8c31e41e6 Move browser code around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	973 setBrowser = getenv("BROWSER");
fad8c31e41e6 Move browser code around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	974 if (setBrowser == NULL)
fad8c31e41e6 Move browser code around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	975 setBrowser = "firefox";
fad8c31e41e6 Move browser code around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	976
153 f1684884fd56 Comment cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 151 diff changeset	977 /* Parse command line arguments */
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	978 argsOK = th_args_process(argc, argv, optList, optListN,
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	979 argHandleOpt, argHandleFile, FALSE);
26 b84fc46c6035 Improved color hex triplet parsing. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	980
198 21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	981 if (optUserNameCmd != NULL) {
21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	982 optUserName = optUserNameCmd;
21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	983 optPassword = optPasswordCmd;
21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	984 }
21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	985
153 f1684884fd56 Comment cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 151 diff changeset	986 /* Check if we have username and password */
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	987 if (optUserName == NULL \|\| optPassword == NULL) {
196 edd5ce3e5399 Add simplistic username/password requester if none given on commandline or config file. Matti Hamalainen <ccr@tnsp.org> parents: 195 diff changeset	988 printf("\nYou can avoid this prompt by issuing '/save' after logging in.\n\n");
211 c40329e95445 Trim both left and right side of username+password prompt input. Also allow empty passwords, to be able to use guest accounts. Matti Hamalainen <ccr@tnsp.org> parents: 210 diff changeset	989 optUserName = promptRequester("NN username: ", FALSE);
c40329e95445 Trim both left and right side of username+password prompt input. Also allow empty passwords, to be able to use guest accounts. Matti Hamalainen <ccr@tnsp.org> parents: 210 diff changeset	990 optPassword = promptRequester("NN password: ", TRUE);
196 edd5ce3e5399 Add simplistic username/password requester if none given on commandline or config file. Matti Hamalainen <ccr@tnsp.org> parents: 195 diff changeset	991 if (optUserName == NULL \|\| optPassword == NULL) {
edd5ce3e5399 Add simplistic username/password requester if none given on commandline or config file. Matti Hamalainen <ccr@tnsp.org> parents: 195 diff changeset	992 THERR("User/pass not specified, get some --help\n");
edd5ce3e5399 Add simplistic username/password requester if none given on commandline or config file. Matti Hamalainen <ccr@tnsp.org> parents: 195 diff changeset	993 return -1;
edd5ce3e5399 Add simplistic username/password requester if none given on commandline or config file. Matti Hamalainen <ccr@tnsp.org> parents: 195 diff changeset	994 }
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	995 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	996
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	997 if (!argsOK)
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	998 return -2;
64 6a3a917303e4 Some random cleanups, bring back WinSock support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	999
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1000 /* Allocate userhash */
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1001 if ((nnUsers = nn_userhash_new()) == NULL) {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1002 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	1003 return -105;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1004 }
64 6a3a917303e4 Some random cleanups, bring back WinSock support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	1005
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1006 /* Open logfile */
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1007 if (optLogFilename) {
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1008 THMSG(1, "Opening logfile '%s'\n", optLogFilename);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1009
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1010 if ((optLogFile = fopen(optLogFilename, "a")) == NULL) {
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1011 THERR("Could not open logfile for appending!\n");
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1012 return -9;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1013 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1014 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1015
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	1016 if (!nn_network_init()) {
91 acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	1017 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	1018 goto err_exit;
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	1019 } else
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1020 networkInit = TRUE;
68 3ab7751fdad1 MingW compatibility, with one ugly kludge. Matti Hamalainen <ccr@tnsp.org> parents: 67 diff changeset	1021
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1022 /* Okay ... */
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1023 THMSG(1, "Trying to resolve host '%s' ...\n", optServer);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1024 tmpHost = gethostbyname(optServer);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1025 if (tmpHost == NULL) {
174 f5518f10dd1a Don't use hstrerror(), but strerror() instead. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	1026 THERR("Could not resolve hostname: %s.\n", strerror(h_errno));
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1027 goto err_exit;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1028 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1029 THMSG(2, "True hostname: %s\n", tmpHost->h_name);
26 b84fc46c6035 Improved color hex triplet parsing. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	1030
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1031 /* To emulate the official client, we first make a request for
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1032 * policy file, even though we don't use it for anything...
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1033 */
170 8d4cdbeae606 Clean up connection forming. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	1034 conn = nn_conn_open((struct in_addr *) tmpHost->h_addr, 843);
8d4cdbeae606 Clean up connection forming. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	1035 if (!nn_conn_check(conn)) {
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1036 THERR("Policy file request connection setup failed!\n");
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1037 goto err_exit;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1038 }
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1039
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1040 tmpStr = "<policy-file-request/>";
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1041 if (nn_conn_send_buf(conn, tmpStr, strlen(tmpStr) + 1) == FALSE) {
96 7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	1042 THERR("Failed to send policy file request.\n");
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1043 goto err_exit;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1044 } else {
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1045 int cres = nn_conn_pull(conn);
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1046 if (cres == 0) {
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1047 THMSG(2, "Probe got: %s\n", conn->buf);
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1048 } else {
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1049 THMSG(2, "Could not get policy probe.\n");
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1050 }
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1051 }
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1052 nn_conn_close(conn);
26 b84fc46c6035 Improved color hex triplet parsing. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	1053
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1054 /* Okay, now do the proper connection ... */
170 8d4cdbeae606 Clean up connection forming. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	1055 conn = nn_conn_open((struct in_addr *) tmpHost->h_addr, optPort);
8d4cdbeae606 Clean up connection forming. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	1056 if (!nn_conn_check(conn)) {
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1057 THERR("Main connection setup failed!\n");
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1058 goto err_exit;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1059 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1060
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1061 THMSG(1, "Connected, logging in as '%s', site '%s'.\n", optUserName, optSite);
198 21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	1062 optUserNameEnc = nn_dblencode_str(optUserName);
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	1063 tmpStr = nn_dblencode_str(optSite);
198 21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	1064 nn_conn_send_msg(conn, optUserNameEnc, "%%2Flogin%%20%%2Dsite%%20%s%%20%%2Dpassword%%20%s", tmpStr, optPassword);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1065 th_free(tmpStr);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1066
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1067 /* Initialize NCurses */
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1068 if (!optDaemon) {
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1069 if (LINES < 0 \|\| LINES > 1000) LINES = 24;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1070 if (COLS < 0 \|\| COLS > 1000) COLS = 80;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1071 initscr();
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1072 raw();
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1073 keypad(stdscr, TRUE);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1074 noecho();
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1075 meta(stdscr, TRUE);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1076 timeout(SET_DELAY);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1077 curVis = curs_set(0);
110 8af4072dc31a Fix Win32/MinGW/PDcurses issues. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	1078
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1079 if (has_colors()) {
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1080 start_color();
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1081
185 73bdf1ede348 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	1082 init_pair( 1, COLOR_RED, COLOR_BLACK);
73bdf1ede348 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	1083 init_pair( 2, COLOR_GREEN, COLOR_BLACK);
73bdf1ede348 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	1084 init_pair( 3, COLOR_YELLOW, COLOR_BLACK);
73bdf1ede348 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	1085 init_pair( 4, COLOR_BLUE, COLOR_BLACK);
73bdf1ede348 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	1086 init_pair( 5, COLOR_MAGENTA, COLOR_BLACK);
73bdf1ede348 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	1087 init_pair( 6, COLOR_CYAN, COLOR_BLACK);
73bdf1ede348 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	1088 init_pair( 7, COLOR_WHITE, COLOR_BLACK);
73bdf1ede348 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	1089 init_pair( 8, COLOR_BLACK, COLOR_BLACK);
28 512775f6b081 A refactored ncurses-based UI. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	1090
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1091 init_pair(10, COLOR_BLACK, COLOR_RED);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1092 init_pair(11, COLOR_WHITE, COLOR_RED);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1093 init_pair(12, COLOR_GREEN, COLOR_RED);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1094 init_pair(13, COLOR_YELLOW, COLOR_RED);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1095 init_pair(14, COLOR_BLUE, COLOR_RED);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1096 init_pair(15, COLOR_MAGENTA, COLOR_RED);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1097 init_pair(16, COLOR_CYAN, COLOR_RED);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1098 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1099
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1100 cursesInit = TRUE;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1101
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1102 if (!initializeWindows())
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1103 goto err_exit;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1104
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	1105 nn_editbuf_clear(editBuf);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1106 printEditBuf("", editBuf);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1107 updateStatus(insertMode);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1108 }
100 ed4067c10a8a Remove useless buffer usage from error reporting function. Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	1109
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1110 /* Enter mainloop */
96 7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	1111 prevTime = time(NULL);
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1112
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1113 while (!isError && !exitProg) {
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1114 int cres = nn_conn_pull(conn);
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1115 if (cres == 0) {
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1116 do {
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1117 size_t bufLen = strlen(conn->ptr) + 1;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1118 int result = handleProtocol(conn, conn->ptr, bufLen);
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1119
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1120 if (result > 0) {
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1121 /* Couldn't handle the message for some reason */
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1122 printMsg("Could not handle: %s\n", conn->ptr);
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1123 } else if (result < 0) {
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1124 /* Fatal error, quit */
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1125 errorMsg("Fatal error with message: %s\n", conn->ptr);
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1126 isError = TRUE;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1127 }
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1128
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1129 conn->got -= bufLen;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1130 conn->ptr += bufLen;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1131 } while (conn->got > 0 && !isError);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1132 }
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1133 if (!nn_conn_check(conn))
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1134 isError = TRUE;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1135
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1136 /* Handle user input */
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1137 if (!optDaemon) {
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1138 int c, cnt = 0;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1139 BOOL update = FALSE;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1140
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1141 /* Handle several buffered keypresses at once */
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1142 do {
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1143 c = wgetch(stdscr);
77 e8c9d7d13866 Handle certain key sequences better. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	1144 if (c == 0x1b) {
e8c9d7d13866 Handle certain key sequences better. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	1145 c = wgetch(stdscr);
e8c9d7d13866 Handle certain key sequences better. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	1146 if (c == 'O') {
e8c9d7d13866 Handle certain key sequences better. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	1147 c = wgetch(stdscr);
e8c9d7d13866 Handle certain key sequences better. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	1148 switch (c) {
e8c9d7d13866 Handle certain key sequences better. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	1149 case 'd': c = 0x204; break;
e8c9d7d13866 Handle certain key sequences better. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	1150 case 'c': c = 0x206; break;
e8c9d7d13866 Handle certain key sequences better. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	1151 default:
e8c9d7d13866 Handle certain key sequences better. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	1152 printMsg("Unhandled ESC-O key sequence 0x%02x\n", c);
e8c9d7d13866 Handle certain key sequences better. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	1153 break;
e8c9d7d13866 Handle certain key sequences better. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	1154 }
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	1155 } else
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	1156 if (c == '[') {
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	1157 c = wgetch(stdscr);
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	1158 switch (c) {
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	1159 case 0x32: c = KEY_IC; break;
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	1160 case 0x33: c = KEY_DC; break;
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	1161
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	1162 case 0x35: c = KEY_PPAGE; break;
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	1163 case 0x36: c = KEY_NPAGE; break;
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	1164
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	1165 case 0x37: c = KEY_HOME; break;
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	1166 case 0x38: c = KEY_END; break;
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	1167
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	1168 default:
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	1169 printMsg("Unhandled ESC-[*~ key sequence 0x%02x\n", c);
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	1170 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	1171 break;
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	1172 }
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	1173 /* Get the trailing ~ */
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	1174 if (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	1175 wgetch(stdscr);
77 e8c9d7d13866 Handle certain key sequences better. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	1176 } else {
e8c9d7d13866 Handle certain key sequences better. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	1177 printMsg("Unhandled ESC key sequence 0x%02x\n", c);
e8c9d7d13866 Handle certain key sequences better. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	1178 continue;
e8c9d7d13866 Handle certain key sequences better. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	1179 }
e8c9d7d13866 Handle certain key sequences better. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	1180 }
e8c9d7d13866 Handle certain key sequences better. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	1181
119 4bc63a535acb Fix some PDCurses incompatibilities and remove some Win32/PDCurses specific hacks. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	1182
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1183 switch (c) {
74 98004129202a Portability fixes. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	1184 #ifdef KEY_RESIZE
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1185 case KEY_RESIZE:
119 4bc63a535acb Fix some PDCurses incompatibilities and remove some Win32/PDCurses specific hacks. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	1186 resize_term(0, 0);
4bc63a535acb Fix some PDCurses incompatibilities and remove some Win32/PDCurses specific hacks. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	1187 erase();
134 f367fc14021a Use resize_term() and erase() on resize event also with ncurses and not only with PDcurses. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	1188 #ifdef PDCURSES
119 4bc63a535acb Fix some PDCurses incompatibilities and remove some Win32/PDCurses specific hacks. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	1189 timeout(SET_DELAY);
4bc63a535acb Fix some PDCurses incompatibilities and remove some Win32/PDCurses specific hacks. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	1190 #endif
4bc63a535acb Fix some PDCurses incompatibilities and remove some Win32/PDCurses specific hacks. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	1191
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1192 if (!initializeWindows()) {
119 4bc63a535acb Fix some PDCurses incompatibilities and remove some Win32/PDCurses specific hacks. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	1193 errorMsg("Error resizing curses windows\n");
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1194 isError = TRUE;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1195 }
119 4bc63a535acb Fix some PDCurses incompatibilities and remove some Win32/PDCurses specific hacks. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	1196 update = TRUE;
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1197 break;
74 98004129202a Portability fixes. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	1198 #endif
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1199
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1200 case KEY_ENTER:
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1201 case '\n':
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1202 case '\r':
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1203 /* Call the user input handler */
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1204 if (editBuf->len > 0) {
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1205 int result;
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1206
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1207 if (histMax > 0) {
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	1208 nn_editbuf_free(histBuf[SET_MAX_HISTORY+1]);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1209 histBuf[SET_MAX_HISTORY+1] = NULL;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1210 memmove(&histBuf[2], &histBuf[1], histMax * sizeof(histBuf[0]));
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1211 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1212
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1213 histPos = 0;
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	1214 histBuf[1] = nn_editbuf_copy(editBuf);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1215 if (histMax < SET_MAX_HISTORY) histMax++;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1216
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	1217 nn_editbuf_insert(editBuf, editBuf->len, 0);
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1218 result = handleUserInput(conn, editBuf->data, editBuf->len);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1219
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	1220 nn_editbuf_clear(editBuf);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1221
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1222 if (result < 0) {
96 7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	1223 errorMsg("Fatal error handling user input: %s\n", editBuf->data);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1224 isError = TRUE;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1225 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1226
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1227 update = TRUE;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1228 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1229 break;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1230
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1231 case KEY_UP: /* Backwards in input history */
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1232 if (histPos == 0) {
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	1233 nn_editbuf_free(histBuf[0]);
218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	1234 histBuf[0] = nn_editbuf_copy(editBuf);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1235 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1236 if (histPos < histMax) {
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1237 histPos++;
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	1238 nn_editbuf_free(editBuf);
218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	1239 editBuf = nn_editbuf_copy(histBuf[histPos]);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1240 update = TRUE;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1241 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1242 break;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1243
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1244 case KEY_DOWN: /* Forwards in input history */
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1245 if (histPos > 0) {
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1246 histPos--;
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	1247 nn_editbuf_free(editBuf);
218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	1248 editBuf = nn_editbuf_copy(histBuf[histPos]);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1249 update = TRUE;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1250 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1251 break;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1252
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1253 case 0x204: /* ctrl+left arrow = Skip words left */
74 98004129202a Portability fixes. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	1254 while (editBuf->pos > 0 && isspace((int) editBuf->data[editBuf->pos - 1]))
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1255 editBuf->pos--;
74 98004129202a Portability fixes. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	1256 while (editBuf->pos > 0 && !isspace((int) editBuf->data[editBuf->pos - 1]))
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1257 editBuf->pos--;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1258 update = TRUE;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1259 break;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1260
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1261 case 0x206: /* ctrl+right arrow = Skip words right */
74 98004129202a Portability fixes. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	1262 while (editBuf->pos < editBuf->len && isspace((int) editBuf->data[editBuf->pos]))
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1263 editBuf->pos++;
74 98004129202a Portability fixes. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	1264 while (editBuf->pos < editBuf->len && !isspace((int) editBuf->data[editBuf->pos]))
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1265 editBuf->pos++;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1266 if (editBuf->pos > editBuf->len)
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1267 editBuf->pos = editBuf->len;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1268 update = TRUE;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1269 break;
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1270
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	1271 case KEY_HOME: nn_editbuf_setpos(editBuf, 0); update = TRUE; break;
218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	1272 case KEY_END: nn_editbuf_setpos(editBuf, editBuf->len); update = TRUE; break;
218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	1273 case KEY_LEFT: nn_editbuf_setpos(editBuf, editBuf->pos - 1); update = TRUE; break;
218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	1274 case KEY_RIGHT: nn_editbuf_setpos(editBuf, editBuf->pos + 1); update = TRUE; break;
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1275
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1276 case KEY_BACKSPACE:
73 c56e766acce1 Support keycode 0x08 as backspace for Win32 compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 70 diff changeset	1277 case 0x08:
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	1278 case 0x7f:
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	1279 nn_editbuf_delete(editBuf, editBuf->pos - 1);
218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	1280 nn_editbuf_setpos(editBuf, editBuf->pos - 1);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1281 update = TRUE;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1282 break;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1283
122 e564dd9df07c Change some key defines. Matti Hamalainen <ccr@tnsp.org> parents: 121 diff changeset	1284 case KEY_DC: /* Delete character */
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	1285 nn_editbuf_delete(editBuf, editBuf->pos);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1286 update = TRUE;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1287 break;
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1288
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1289
175 86904a43c339 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	1290 case KEY_IC: /* Ins = Toggle insert / overwrite mode */
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1291 insertMode = !insertMode;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1292 update = TRUE;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1293 break;
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1294
208 6c5d136b6e6a Use curses KEY_F(n) macros for defining function keys instead of hardcoded values. Matti Hamalainen <ccr@tnsp.org> parents: 207 diff changeset	1295 case KEY_F(2): /* F2 = Clear editbuffer */
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1296 nn_editbuf_clear(editBuf);
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1297 update = TRUE;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1298 break;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1299
208 6c5d136b6e6a Use curses KEY_F(n) macros for defining function keys instead of hardcoded values. Matti Hamalainen <ccr@tnsp.org> parents: 207 diff changeset	1300 case KEY_F(5): /* F5 = Ignore mode */
149 a4d6707161a7 Add config file option for default setting of ignore mode. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	1301 setIgnoreMode = !setIgnoreMode;
a4d6707161a7 Add config file option for default setting of ignore mode. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	1302 printMsg("Ignore mode = %s\n", setIgnoreMode ? "ON" : "OFF");
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1303 break;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1304
208 6c5d136b6e6a Use curses KEY_F(n) macros for defining function keys instead of hardcoded values. Matti Hamalainen <ccr@tnsp.org> parents: 207 diff changeset	1305 case KEY_F(7): /* F7 = Clear PRV target */
187 c73003485c2d F7 to clear current PRV target. Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	1306 if (setTarget) {
c73003485c2d F7 to clear current PRV target. Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	1307 printMsg("Cleared PRV target.\n");
c73003485c2d F7 to clear current PRV target. Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	1308 setPrvMode = FALSE;
c73003485c2d F7 to clear current PRV target. Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	1309 th_free(setTarget);
c73003485c2d F7 to clear current PRV target. Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	1310 setTarget = NULL;
c73003485c2d F7 to clear current PRV target. Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	1311 update = TRUE;
c73003485c2d F7 to clear current PRV target. Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	1312 }
c73003485c2d F7 to clear current PRV target. Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	1313 break;
c73003485c2d F7 to clear current PRV target. Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	1314
208 6c5d136b6e6a Use curses KEY_F(n) macros for defining function keys instead of hardcoded values. Matti Hamalainen <ccr@tnsp.org> parents: 207 diff changeset	1315 case KEY_F(8): /* F8 = switch between PRV */
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1316 if (setPrvMode)
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1317 setPrvMode = FALSE;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1318 else {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1319 if (setTarget != NULL)
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1320 setPrvMode = TRUE;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1321 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1322 update = TRUE;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1323 break;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1324
203 e7538539de7f Make ^C equivalent of quit (F9). Matti Hamalainen <ccr@tnsp.org> parents: 202 diff changeset	1325 case 0x03: /* ^C = quit */
208 6c5d136b6e6a Use curses KEY_F(n) macros for defining function keys instead of hardcoded values. Matti Hamalainen <ccr@tnsp.org> parents: 207 diff changeset	1326 case KEY_F(9): /* F9 = Quit */
175 86904a43c339 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	1327 printMsg("Quitting per user request.\n");
86904a43c339 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	1328 exitProg = TRUE;
86904a43c339 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	1329 break;
86904a43c339 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	1330
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1331 case 0x09: /* Tab = complete username */
107 8037a3a7e491 Implement username tab-completion. It's still buggy, tho. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	1332 performTabCompletion(editBuf);
8037a3a7e491 Implement username tab-completion. It's still buggy, tho. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	1333 update = TRUE;
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1334 break;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1335
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1336 case 0x0c: /* Ctrl + L */
179 8c493b5671bd Add separate updateWindows() function. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	1337 updateWindows();
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1338 break;
122 e564dd9df07c Change some key defines. Matti Hamalainen <ccr@tnsp.org> parents: 121 diff changeset	1339
e564dd9df07c Change some key defines. Matti Hamalainen <ccr@tnsp.org> parents: 121 diff changeset	1340 case KEY_NPAGE:
e564dd9df07c Change some key defines. Matti Hamalainen <ccr@tnsp.org> parents: 121 diff changeset	1341 case KEY_PPAGE:
e564dd9df07c Change some key defines. Matti Hamalainen <ccr@tnsp.org> parents: 121 diff changeset	1342 break;
e564dd9df07c Change some key defines. Matti Hamalainen <ccr@tnsp.org> parents: 121 diff changeset	1343
e564dd9df07c Change some key defines. Matti Hamalainen <ccr@tnsp.org> parents: 121 diff changeset	1344
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1345 case ERR:
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1346 /* Ignore */
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1347 break;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1348
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1349 default:
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1350 if (isprint(c) \|\| c == 0xe4 \|\| c == 0xf6 \|\| c == 0xc4 \|\| c == 0xd6) {
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1351 if (insertMode)
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	1352 nn_editbuf_insert(editBuf, editBuf->pos, c);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1353 else
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	1354 nn_editbuf_write(editBuf, editBuf->pos, c);
218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	1355 nn_editbuf_setpos(editBuf, editBuf->pos + 1);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1356 update = TRUE;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1357 } else {
77 e8c9d7d13866 Handle certain key sequences better. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	1358 printMsg("Unhandled key: 0x%02x\n", c);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1359 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1360 break;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1361 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1362 } while (c != ERR && !exitProg && ++cnt < 10);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1363
186 ff3688e747c3 Add a nasty hack to draw edit line correctly after startup... still a Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	1364 if (update \|\| first) {
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1365 /* Update edit line */
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1366 printEditBuf(setPrvMode ? setTarget : "", editBuf);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1367 updateStatus(insertMode);
186 ff3688e747c3 Add a nasty hack to draw edit line correctly after startup... still a Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	1368 first = FALSE; /* a nasty hack ... */
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1369 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1370 } /* !optDaemon */
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1371
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1372 if (++updateCount > 10) {
96 7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	1373 time_t tmpTime = time(NULL);
7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	1374 if (tmpTime - prevTime > SET_KEEPALIVE) {
198 21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	1375 nn_conn_send_msg(conn, optUserNameEnc, "/listallusers");
96 7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	1376 prevTime = tmpTime;
7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	1377 }
7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	1378
7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	1379 if (!colorSet) {
7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	1380 colorSet = TRUE;
7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	1381 printMsg("%s v%s - %s\n", th_prog_name, th_prog_version, th_prog_fullname);
7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	1382 printMsg("%s\n", th_prog_author);
7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	1383 printMsg("%s\n", th_prog_license);
198 21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	1384 nn_conn_send_msg(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	1385 }
7c9538e71c89 Add connection keepalive by sending /listallusers every 15 minutes, Matti Hamalainen <ccr@tnsp.org> parents: 92 diff changeset	1386
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1387 updateStatus(insertMode);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1388 updateCount = 0;
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1389 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1390
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1391 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1392
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1393 /* 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	1394 err_exit:
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1395 nn_userhash_free(nnUsers);
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	1396
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	1397 nn_editbuf_free(editBuf);
75 abbdd101b267 Free some memory. Matti Hamalainen <ccr@tnsp.org> parents: 74 diff changeset	1398 for (histPos = 0; histPos <= SET_MAX_HISTORY; histPos++)
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	1399 nn_editbuf_free(histBuf[histPos]);
75 abbdd101b267 Free some memory. Matti Hamalainen <ccr@tnsp.org> parents: 74 diff changeset	1400
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1401 if (cursesInit) {
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1402 if (curVis != ERR)
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1403 curs_set(curVis);
155 0720ca51673e Plug some minor "memory leaks" related to curses. Matti Hamalainen <ccr@tnsp.org> parents: 154 diff changeset	1404 closeWindows();
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1405 endwin();
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1406 THMSG(1, "NCurses deinitialized.\n");
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1407 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1408
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1409 if (isError) {
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1410 THMSG(1, "Error exit.\n");
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1411 }
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1412
198 21a37995c3fb Make configuration username/password overridable on command line. Matti Hamalainen <ccr@tnsp.org> parents: 197 diff changeset	1413 th_free(optUserNameEnc);
10 53e127854dca WinSock support fixes. Matti Hamalainen <ccr@tnsp.org> parents: 9 diff changeset	1414
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	1415 nn_conn_close(conn);
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1416
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1417 if (networkInit)
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	1418 nn_network_close();
68 3ab7751fdad1 MingW compatibility, with one ugly kludge. Matti Hamalainen <ccr@tnsp.org> parents: 67 diff changeset	1419
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1420 THMSG(1, "Connection terminated.\n");
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1421
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1422 if (optLogFile) {
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1423 THMSG(1, "Closing logfile.\n");
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1424 fclose(optLogFile);
5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1425 }
133 ffe8bbd429fa Config file. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	1426
70 5228ad7b4f57 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	1427 return 0;
0 728243125263 Import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1428 }

Mercurial > hg > nnchat

annotate nnchat.c @ 216:3ccfe8902fd5