nnchat: main.c comparison

comparison main.c @ 450:a8373a1ce1eb

Implement command tab completion.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sat, 26 May 2012 05:09:40 +0300
parents	7d9fa9f7caf1
children	733396469e5d

comparison

equal deleted inserted replaced

-:7d9fa9f7caf1
+:a8373a1ce1eb
 size_t len;
 int (*handler)(nn_conn_t *, char *buf);
 } nn_usercmd_t;
-static nn_usercmd_t userCmds[] =
+static nn_usercmd_t userCmdsTable[] =
 {
 // Server side commands, we just implement completion
-{ "me",       CMDARG_STRING,   0, NULL },
+{ "/me",       CMDARG_STRING,   0, NULL },
-{ "status",   CMDARG_STRING,   0, NULL },
+{ "/status",   CMDARG_STRING,   0, NULL },
-{ "list",     CMDARG_NONE,     0, nncmd_list_all_users },
+{ "/list",     CMDARG_NONE,     0, nncmd_list_all_users },
 // List internal username list
-{ "who",      CMDARG_NONE,     0, nncmd_names },
+{ "/who",      CMDARG_NONE,     0, nncmd_names },
-{ "names",    CMDARG_NONE,     0, nncmd_names },
+{ "/names",    CMDARG_NONE,     0, nncmd_names },
-{ "w",        CMDARG_NICK,     0, nncmd_open_profile },
+{ "/w",        CMDARG_NICK,     0, nncmd_open_profile },
-{ "profile",  CMDARG_NICK,     0, nncmd_open_profile },
+{ "/profile",  CMDARG_NICK,     0, nncmd_open_profile },
-{ "query",    CMDARG_NICK,     0, nncmd_open_query },
+{ "/query",    CMDARG_NICK,     0, nncmd_open_query },
-{ "close",    CMDARG_OPTIONAL, 0, nncmd_close_query },
+{ "/close",    CMDARG_OPTIONAL, 0, nncmd_close_query },
-{ "win",      CMDARG_OPTIONAL, 0, nncmd_window_info },
+{ "/win",      CMDARG_OPTIONAL, 0, nncmd_window_info },
-{ "ignore",   CMDARG_NICK,     0, nncmd_ignore },
+{ "/ignore",   CMDARG_NICK,     0, nncmd_ignore },
-{ "color",    CMDARG_STRING,   0, nncmd_set_color },
+{ "/color",    CMDARG_STRING,   0, nncmd_set_color },
-{ "save",     CMDARG_NONE,     0, nncmd_save_config },
+{ "/save",     CMDARG_NONE,     0, nncmd_save_config },
 };
-static const int nuserCmds = sizeof(userCmds) / sizeof(userCmds[0]);
+static qlist_t *userCmds = NULL;
+void nn_usercmd_init()
+{
+size_t i;
+for (i = 0; i < sizeof(userCmdsTable) / sizeof(userCmdsTable[0]); i++)
+{
+th_llist_append(&userCmds, &userCmdsTable[i]);
+userCmdsTable[i].len = strlen(userCmdsTable[i].name);
+}
+}
 int nn_handle_command(nn_conn_t *conn, char *buf)
 {
-static BOOL userCmdsInit = FALSE;
+qlist_t *curr;
-int i;
+for (curr = userCmds; curr != NULL; curr = curr->next)
-// Initialize command structure
+{
-if (!userCmdsInit)
+nn_usercmd_t *cmd = curr->data;
-{
-for (i = 0; i < nuserCmds; i++)
+if (!th_strncasecmp(buf, cmd->name, cmd->len))
-userCmds[i].len = strlen(userCmds[i].name);
+{
+char *nbuf = str_trim_left(buf + cmd->len);
-userCmdsInit = TRUE;
-}
-for (i = 0; i < nuserCmds; i++)
-{
-nn_usercmd_t *cmd = &userCmds[i];
-if (!th_strncasecmp(buf + 1, cmd->name, cmd->len))
-{
-char *nbuf = str_trim_left(buf + 1 + cmd->len);
 switch (cmd->flags)
 {
 case CMDARG_NICK:
 case CMDARG_STRING:
 if (!nbuf[0])
 {
-printMsgQ(currWin, "Command: /%s requires an argument.\n", cmd->name);
+printMsgQ(currWin, "Command %s requires an argument.\n", cmd->name);
 return 1;
 }
 break;
 case CMDARG_NONE:
 if (nbuf[0])
 {
-printMsgQ(currWin, "Command: /%s does not take arguments.\n", cmd->name);
+printMsgQ(currWin, "Command %s does not take arguments.\n", cmd->name);
 return 1;
 }
 break;
 case CMDARG_OPTIONAL:
 printMsgQ(currWin, "Unknown command: %s\n", buf);
 return 1;
 }
+static nn_usercmd_t *nn_usercmd_match_do(qlist_t *list, const char *pattern, size_t len)
+{
+qlist_t *node;
+for (node = list; node != NULL; node = node->next)
+{
+nn_usercmd_t *cmd = node->data;
+if (len <= strlen(cmd->name) && th_strncasecmp(cmd->name, pattern, len) == 0)
+return cmd;
+}
+return NULL;
+}
+nn_usercmd_t *nn_usercmd_match(qlist_t *list, const char *pattern, const char *current, BOOL again)
+{
+nn_usercmd_t *curr;
+size_t len;
+if (list == NULL || pattern == NULL) return NULL;
+len = strlen(pattern);
+if (current != NULL)
+{
+qlist_t *node;
+for (node = list; node != NULL; node = node->next)
+{
+curr = node->data;
+if (th_strcasecmp(curr->name, current) == 0)
+{
+if (again)
+return curr;
+if ((curr = nn_usercmd_match_do(node->next, pattern, len)) != NULL)
+return curr;
+}
+}
+}
+if ((curr = nn_usercmd_match_do(list, pattern, len)) != NULL)
+return curr;
+return NULL;
+}
 int nn_handle_input(nn_conn_t *conn, char *buf, size_t bufLen)
 {
 BOOL result;
 char *tmp;
 if (!pattern)
 return FALSE;
 if (isCommand)
 {
-/*
+nn_usercmd_t *cmd = nn_usercmd_match(userCmds, pattern, previous, again);
-int i;
+if (cmd)
-for (i = 0; i < nuserCmds; i++)
+{
-{
+size_t i;
-if (nncmd_match(pattern,
+nn_tabcomplete_replace(buf, &i, startPos, endPos, cmd->name);
-}
-*/
+if (!hasSpace)
+nn_editbuf_insert(buf, i++, ' ');
+nn_tabcomplete_finish(buf, &previous, startPos, cmd->name);
+return TRUE;
+}
 }
 else
 {
 nn_user_t *user = nn_userhash_match(nnUsers, pattern, previous, again);
 optUserNameEnc = nn_dblencode_str(optUserName);
 tmpStr = nn_dblencode_str(optSite);
 nn_conn_send_msg_v(conn, optUserNameEnc, "%%2Flogin%%20%%2Dsite%%20%s%%20%%2Dpassword%%20%s", tmpStr, optPassword);
 th_free(tmpStr);
+// Initialize user commands
+nn_usercmd_init();
 // Initialize random numbers
 prevTime = time(NULL);
 srandom((int) prevTime);
 if (cursesInit)

Mercurial > hg > nnchat

comparison main.c @ 450:a8373a1ce1eb