Mercurial > hg > nnchat

annotate main.c @ 555:66d18a82d6b9

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