about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--chat.c45
1 files changed, 40 insertions, 5 deletions
diff --git a/chat.c b/chat.c
index c3a4f4f..f799687 100644
--- a/chat.c
+++ b/chat.c
@@ -40,6 +40,7 @@
 
 static wchar_t *wcssep(wchar_t **stringp, const wchar_t *delim) {
 	wchar_t *orig = *stringp;
+	if (!orig) return NULL;
 	size_t i = wcscspn(orig, delim);
 	*stringp = NULL;
 	if (orig[i]) {
@@ -475,18 +476,52 @@ static void privmsg(bool action, const wchar_t *mesg) {
 	free(line);
 }
 
+typedef void (*Command)(wchar_t *params);
+
+static void inputMe(wchar_t *params) {
+	privmsg(true, params ? params : L"");
+}
+
+static void inputNick(wchar_t *params) {
+	wchar_t *nick = wcssep(&params, L" ");
+	if (nick) {
+		clientFmt("NICK %ls\r\n", nick);
+	} else {
+		uiFmt("/nick requires a name");
+	}
+}
+
+static void inputQuit(wchar_t *params) {
+	if (params) {
+		clientFmt("QUIT :%ls\r\n", params);
+	} else {
+		clientFmt("QUIT :Goodbye\r\n");
+	}
+}
+
+static const struct {
+	const wchar_t *command;
+	Command handler;
+} COMMANDS[] = {
+	{ L"me", inputMe },
+	{ L"nick", inputNick },
+	{ L"quit", inputQuit },
+};
+static const size_t COMMANDS_LEN = sizeof(COMMANDS) / sizeof(COMMANDS[0]);
+
 static void input(wchar_t *input) {
 	if (input[0] != '/') {
 		privmsg(false, input);
 		return;
 	}
 	input++;
-	wchar_t *cmd = wcssep(&input, L" ");
-	if (!wcscmp(cmd, L"me")) {
-		privmsg(true, input ? input : L"");
-	} else {
-		uiFmt("/%ls isn't a recognized command", cmd);
+	wchar_t *command = wcssep(&input, L" ");
+	for (size_t i = 0; i < COMMANDS_LEN; ++i) {
+		if (wcscmp(command, COMMANDS[i].command)) continue;
+		COMMANDS[i].handler(input);
+		return;
 	}
+	uiFmt("/%ls isn't a recognized command", command);
 }
 
 static void uiRead(void) {
backport&id=8a4618a20339ed233cc5e5a6a4e32c4344f97c1c&follow=1'>Clean up spawn constantsJune McEnroe 2018-03-05Rename Tile timestamps {create,modify,access}TimeJune McEnroe 2018-03-05Pack message type enumsJune McEnroe 2018-03-05Undef COLOR_ constants in torus.hJune McEnroe 2018-03-05Generate tagsJune McEnroe 2017-10-03Simplify Makefile with pattern ruleJune McEnroe Insert rant about how GNU make handles the .c rule with extra dependencies. Also I don't care that everything links curses now. 2017-09-27Remove leading blank linesJune McEnroe 2017-09-27Add merge.c to READMEJune McEnroe 2017-09-03Assert client coords are valid after movementJune McEnroe 2017-09-03Relicense AGPLJune McEnroe I know it's already published under a permissive license in what is probably its final form, but I want to license it AGPL anyway on principle following some conversations I had about open source, corporations and copyleft. 2017-09-01Revert "Add client readOnly mode"June McEnroe This reverts commit 34f25ae40a3db9369e9d98b3814f2b93bbc21451. 2017-09-01Remove clientRemove call from clientCastJune McEnroe If an error occurs on a client socket during a broadcast, that client will show up in the kqueue loop with EV_EOF and get removed that way. Tested by sending SIGKILL to a client and watching its cursor disappear. 2017-09-01Add client readOnly modeJune McEnroe 2017-08-31Clean up merge toolJune McEnroe Choose the version with the most recent access if the modify times are the same. 2017-08-31Choose B for tiles with equal modify timesJune McEnroe This way newer access counts and times will be preserved. 2017-08-31Add quick data file merge toolJune McEnroe Hopefully I won't have to use it ever again. 2017-08-30Use only foreground color for selecting spawnJune McEnroe 2017-08-29Add four additional spawnsJune McEnroe 2017-08-28Add respawningJune McEnroe 2017-08-26Move license above includesJune McEnroe Why was it down there? 2017-08-26Snapshot metadataJune McEnroe 2017-08-26Add meta.c to READMEJune McEnroe 2017-08-26Use MakefileJune McEnroe