Started work on chat session, and chat states

Makefile.am

@@ -6,13 +6,15 @@ profanity_SOURCES = src/command.c src/contact.c src/history.c src/jabber.h \
 	src/contact_list.c src/input_win.c src/log.h src/profanity.c \
 	src/prof_history.c src/ui.h src/common.h src/ contact_list.h src/jabber.c \
 	src/main.c src/profanity.h src/prof_history.h src/chat_log.c \
-	src/chat_log.h src/tinyurl.c src/tinyurl.h
+	src/chat_log.h src/tinyurl.c src/tinyurl.h src/chat_session.c \
+	src/chat_session.h
 
 TESTS = tests/testsuite
 check_PROGRAMS = tests/testsuite
 tests_testsuite_SOURCES = tests/test_contact_list.c src/contact_list.c src/contact.c \
 	tests/test_common.c tests/test_prof_history.c src/prof_history.c src/common.c \
-	tests/test_prof_autocomplete.c src/prof_autocomplete.c tests/testsuite.c
+	tests/test_prof_autocomplete.c src/prof_autocomplete.c tests/testsuite.c \
+	tests/test_chat_session.c src/chat_session.c
 tests_testsuite_LDADD = -lheadunit -lstdc++
 
 man_MANS = docs/profanity.1

src/chat_session.c

@@ -0,0 +1,101 @@
+/* 
+ * chat_session.c
+ *
+ * Copyright (C) 2012 James Booth <boothj5@gmail.com>
+ * 
+ * This file is part of Profanity.
+ *
+ * Profanity 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.
+ *
+ * Profanity 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 Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <glib.h>
+
+#include "chat_session.h"
+
+static ChatSession _chat_session_new(char *recipient);
+static void _chat_session_free(ChatSession session);
+
+struct chat_session_t {
+    GTimer *last_composing_sent;
+    char *recipient;
+    chat_state_t state;
+};
+
+static GHashTable *sessions;
+
+void
+chat_session_init(void)
+{
+    sessions = g_hash_table_new_full(NULL, g_str_equal, g_free, 
+        (GDestroyNotify)_chat_session_free);
+}
+
+ChatSession
+chat_session_new(char *recipient)
+{
+    ChatSession session = _chat_session_new(recipient);
+    g_hash_table_insert(sessions, recipient, session);
+    return session;
+}
+
+int
+chat_session_size(void)
+{
+    return g_hash_table_size(sessions);
+}
+
+ChatSession
+chat_session_get(char *recipient)
+{
+    return (ChatSession) g_hash_table_lookup(sessions, recipient);
+}
+
+chat_state_t
+chat_session_get_state(ChatSession session)
+{
+    return session->state;
+}
+
+char *
+chat_session_get_recipient(ChatSession session)
+{
+    return session->recipient;
+}
+
+static ChatSession
+_chat_session_new(char *recipient)
+{
+    ChatSession new_session = malloc(sizeof(struct chat_session_t));
+    new_session->last_composing_sent = NULL;
+    new_session->recipient = malloc(strlen(recipient) + 1);
+    strcpy(new_session->recipient, recipient);
+    new_session->state = ACTIVE;
+    
+    return new_session;
+}
+
+static void
+_chat_session_free(ChatSession session)
+{
+    if (session->last_composing_sent != NULL) {
+        g_timer_destroy(session->last_composing_sent);
+        session->last_composing_sent = NULL;
+    }
+    g_free(session->recipient);
+    g_free(session);
+}

src/chat_session.h

@@ -0,0 +1,41 @@
+/* 
+ * chat_session.h
+ *
+ * Copyright (C) 2012 James Booth <boothj5@gmail.com>
+ * 
+ * This file is part of Profanity.
+ *
+ * Profanity 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.
+ *
+ * Profanity 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 Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef CHAT_SESSION_H
+#define CHAT_SESSION_H
+
+typedef struct chat_session_t *ChatSession;
+
+typedef enum {
+    ACTIVE,
+    COMPOSING,
+    PAUSED
+} chat_state_t;
+
+void chat_session_init(void);
+int chat_session_size(void);
+ChatSession chat_session_new(char *recipient);
+ChatSession chat_session_get(char *recipient);
+chat_state_t chat_session_get_state(ChatSession session);
+char * chat_session_get_recipient(ChatSession session);
+
+#endif

src/profanity.c

@@ -87,6 +87,8 @@ prof_run(const int disable_tls, char *log_level)
         inp[size++] = '\0';
         cmd_result = _process_input(inp);
     }
+
+    g_timer_destroy(timer);
 }
 
 void

tests/test_chat_session.c

@@ -0,0 +1,25 @@
+#include <stdio.h>
+#include <head-unit.h>
+#include "chat_session.h"
+
+void can_init(void)
+{
+    chat_session_init();
+    assert_true(1);
+}
+
+void adding_new_sets_state_to_active(void)
+{
+    chat_session_init();
+    chat_session_new("prof1@panesar");
+    ChatSession session = chat_session_get("prof1@panesar");
+
+    assert_int_equals(ACTIVE, chat_session_get_state(session));
+}
+
+void register_chat_session_tests(void)
+{
+    TEST_MODULE("chat_session_tests");
+    TEST(can_init);
+    TEST(adding_new_sets_state_to_active);
+}

tests/testsuite.c

@@ -7,6 +7,7 @@ int main(void)
     register_contact_list_tests();
     register_common_tests();
     register_prof_autocomplete_tests();
+    register_chat_session_tests();
     run_suite();
     return 0;
 }

tests/testsuite.h

@@ -5,5 +5,6 @@ void register_prof_history_tests(void);
 void register_contact_list_tests(void);
 void register_common_tests(void);
 void register_prof_autocomplete_tests(void);
+void register_chat_session_tests(void);
 
 #endif