summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-02-07 21:30:25 -0500
committerJune McEnroe <june@causal.agency>2020-02-07 21:39:56 -0500
commitfe5fd897052abd1909d1536056936a0417666459 (patch)
treee253d8786b633a0002b156b1da1d9d6eae320f6e
parentUse define_key for meta keys (diff)
downloadcatgirl-fe5fd897052abd1909d1536056936a0417666459.tar.gz
catgirl-fe5fd897052abd1909d1536056936a0417666459.zip
Populate completion with commands
Diffstat (limited to '')
-rw-r--r--Makefile1
-rw-r--r--chat.c1
-rw-r--r--chat.h8
-rw-r--r--command.c6
-rw-r--r--complete.c110
-rw-r--r--edit.c3
-rw-r--r--ui.c1
7 files changed, 130 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 5380d20..48aba7b 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@ LDLIBS = -lcrypto -ltls -lncursesw
 
 OBJS += chat.o
 OBJS += command.o
+OBJS += complete.o
 OBJS += config.o
 OBJS += edit.o
 OBJS += handle.o
diff --git a/chat.c b/chat.c
index c487722..91da6e3 100644
--- a/chat.c
+++ b/chat.c
@@ -110,6 +110,7 @@ int main(int argc, char *argv[]) {
 	set(&self.network, host);
 	set(&self.chanTypes, "#&");
 	set(&self.prefixes, "@+");
+	commandComplete();
 
 	FILE *certFile = NULL;
 	FILE *privFile = NULL;
diff --git a/chat.h b/chat.h
index a327620..f164e7a 100644
--- a/chat.h
+++ b/chat.h
@@ -118,6 +118,7 @@ void command(size_t id, char *input);
 const char *commandIsPrivmsg(size_t id, const char *input);
 const char *commandIsNotice(size_t id, const char *input);
 const char *commandIsAction(size_t id, const char *input);
+void commandComplete(void);
 
 enum Heat { Cold, Warm, Hot };
 void uiInit(void);
@@ -140,12 +141,19 @@ enum Edit {
 	EditKill,
 	EditErase,
 	EditInsert,
+	EditComplete,
 	EditEnter,
 };
 void edit(size_t id, enum Edit op, wchar_t ch);
 char *editHead(void);
 char *editTail(void);
 
+const char *complete(size_t id, const char *prefix);
+void completeAccept(void);
+void completeReject(void);
+void completeAdd(size_t id, const char *str, enum Color color);
+void completeTouch(size_t id, const char *str, enum Color color);
+
 FILE *configOpen(const char *path, const char *mode);
 int getopt_config(
 	int argc, char *const *argv,
diff --git a/command.c b/command.c
index 3215322..41aacc9 100644
--- a/command.c
+++ b/command.c
@@ -136,3 +136,9 @@ void command(size_t id, char *input) {
 		}
 	}
 }
+
+void commandComplete(void) {
+	for (size_t i = 0; i < ARRAY_LEN(Commands); ++i) {
+		completeAdd(None, Commands[i].cmd, Default);
+	}
+}
diff --git a/complete.c b/complete.c
new file mode 100644
index 0000000..b8f2dfc
--- /dev/null
+++ b/complete.c
@@ -0,0 +1,110 @@
+/* Copyright (C) 2020  C. McEnroe <june@causal.agency>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <err.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sysexits.h>
+
+#include "chat.h"
+
+struct Node {
+	size_t id;
+	char *str;
+	enum Color color;
+	struct Node *prev;
+	struct Node *next;
+};
+
+static struct Node *alloc(size_t id, const char *str, enum Color color) {
+	struct Node *node = malloc(sizeof(*node));
+	if (!node) err(EX_OSERR, "malloc");
+	node->id = id;
+	node->str = strdup(str);
+	if (!node->str) err(EX_OSERR, "strdup");
+	node->color = color;
+	node->prev = NULL;
+	node->next = NULL;
+	return node;
+}
+
+static struct Node *head;
+static struct Node *tail;
+
+static struct Node *detach(struct Node *node) {
+	if (node->prev) node->prev->next = node->next;
+	if (node->next) node->next->prev = node->prev;
+	if (head == node) head = node->next;
+	if (tail == node) tail = node->prev;
+	node->prev = NULL;
+	node->next = NULL;
+	return node;
+}
+
+static struct Node *prepend(struct Node *node) {
+	node->prev = NULL;
+	node->next = head;
+	if (head) head->prev = node;
+	head = node;
+	if (!tail) tail = node;
+	return node;
+}
+
+static struct Node *append(struct Node *node) {
+	node->next = NULL;
+	node->prev = tail;
+	if (tail) tail->next = node;
+	tail = node;
+	if (!head) head = node;
+	return node;
+}
+
+static struct Node *find(size_t id, const char *str) {
+	for (struct Node *node = head; node; node = node->next) {
+		if (node->id == id && !strcmp(node->str, str)) return node;
+	}
+	return NULL;
+}
+
+void completeAdd(size_t id, const char *str, enum Color color) {
+	if (!find(id, str)) append(alloc(id, str, color));
+}
+
+void completeTouch(size_t id, const char *str, enum Color color) {
+	struct Node *node = find(id, str);
+	prepend(node ? detach(node) : alloc(id, str, color));
+}
+
+static struct Node *match;
+
+const char *complete(size_t id, const char *prefix) {
+	for (match = (match ? match->next : head); match; match = match->next) {
+		if (match->id && match->id != id) continue;
+		if (strncasecmp(match->str, prefix, strlen(prefix))) continue;
+		return match->str;
+	}
+	return NULL;
+}
+
+void completeAccept(void) {
+	if (match) prepend(detach(match));
+	match = NULL;
+}
+
+void completeReject(void) {
+	match = NULL;
+}
diff --git a/edit.c b/edit.c
index b6edb98..0c50f33 100644
--- a/edit.c
+++ b/edit.c
@@ -73,6 +73,9 @@ void edit(size_t id, enum Edit op, wchar_t ch) {
 			reserve(pos, 1);
 			if (pos < Cap) buf[pos++] = ch;
 		}
+		break; case EditComplete: {
+			// TODO
+		}
 		break; case EditEnter: {
 			pos = 0;
 			command(id, editTail());
diff --git a/ui.c b/ui.c
index 147381e..5a8f155 100644
--- a/ui.c
+++ b/ui.c
@@ -596,6 +596,7 @@ static void keyCtrl(wchar_t ch) {
 		break; case L'A': edit(id, EditHome, 0);
 		break; case L'E': edit(id, EditEnd, 0);
 		break; case L'H': edit(id, EditErase, 0);
+		break; case L'I': edit(id, EditComplete, 0);
 		break; case L'J': edit(id, EditEnter, 0);
 		break; case L'L': clearok(curscr, true);
 		break; case L'U': edit(id, EditKill, 0);