Added ui events module

6 files changed, 92 insertions, 16 deletions

diff --git a/Makefile.am b/Makefile.am
index 6566cdfa..55631477 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,6 +15,7 @@ core_sources = \
 	src/xmpp/form.c src/xmpp/form.h \
 	src/event/server_events.c src/event/server_events.h \
 	src/event/client_events.c src/event/client_events.h \
+	src/event/ui_events.c src/event/ui_events.h \
 	src/ui/ui.h src/ui/window.c src/ui/window.h src/ui/core.c \
 	src/ui/titlebar.c src/ui/statusbar.c src/ui/inputwin.c \
 	src/ui/titlebar.h src/ui/statusbar.h src/ui/inputwin.h \
@@ -63,6 +64,7 @@ tests_sources = \
 	src/ui/titlebar.h src/ui/statusbar.h src/ui/inputwin.h \
 	src/event/server_events.c src/event/server_events.h \
 	src/event/client_events.c src/event/client_events.h \
+	src/event/ui_events.c src/event/ui_events.h \
 	tests/xmpp/stub_xmpp.c \
 	tests/ui/stub_ui.c \
 	tests/log/stub_log.c \
diff --git a/src/command/commands.c b/src/command/commands.c
index 9eaa6e9b..44069693 100644
--- a/src/command/commands.c
+++ b/src/command/commands.c
@@ -66,6 +66,7 @@
 #include "ui/ui.h"
 #include "ui/windows.h"
 #include "event/client_events.h"
+#include "event/ui_events.h"
 
 static void _update_presence(const resource_presence_t presence,
     const char * const show, gchar **args);
diff --git a/src/event/client_events.c b/src/event/client_events.c
index 6ee3c832..70de5f6c 100644
--- a/src/event/client_events.c
+++ b/src/event/client_events.c
@@ -83,17 +83,4 @@ cl_ev_send_priv_msg(const char * const fulljid, const char * const msg)
 {
     message_send_private(fulljid, msg);
     ui_outgoing_private_msg(fulljid, msg);
-}
-
-void
-ui_ev_focus_win(ProfWin *win)
-{
-    ui_switch_win(win);
-}
-
-void
-ui_ev_new_chat_win(const char * const barejid)
-{
-    ProfWin *win = ui_new_chat_win(barejid);
-    ui_switch_win(win);
 }
\ No newline at end of file
diff --git a/src/event/client_events.h b/src/event/client_events.h
index 55f2b477..fcf26523 100644
--- a/src/event/client_events.h
+++ b/src/event/client_events.h
@@ -42,7 +42,4 @@ void cl_ev_send_msg(const char * const barejid, const char * const msg);
 void cl_ev_send_muc_msg(const char * const roomjid, const char * const msg);
 void cl_ev_send_priv_msg(const char * const fulljid, const char * const msg);
 
-void ui_ev_focus_win(ProfWin *win);
-void ui_ev_new_chat_win(const char * const barejid);
-
 #endif
\ No newline at end of file
diff --git a/src/event/ui_events.c b/src/event/ui_events.c
new file mode 100644
index 00000000..c079c0e6
--- /dev/null
+++ b/src/event/ui_events.c
@@ -0,0 +1,48 @@
+/*
+ * ui_events.c
+ *
+ * Copyright (C) 2012 - 2015 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/>.
+ *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link the code of portions of this program with the OpenSSL library under
+ * certain conditions as described in each individual source file, and
+ * distribute linked combinations including the two.
+ *
+ * You must obey the GNU General Public License in all respects for all of the
+ * code used other than OpenSSL. If you modify file(s) with this exception, you
+ * may extend this exception to your version of the file(s), but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version. If you delete this exception statement from all
+ * source files in the program, then also delete it here.
+ *
+ */
+
+#include "ui/ui.h"
+
+void
+ui_ev_focus_win(ProfWin *win)
+{
+    ui_switch_win(win);
+}
+
+void
+ui_ev_new_chat_win(const char * const barejid)
+{
+    ProfWin *win = ui_new_chat_win(barejid);
+    ui_switch_win(win);
+}
\ No newline at end of file
diff --git a/src/event/ui_events.h b/src/event/ui_events.h
new file mode 100644
index 00000000..77017d2c
--- /dev/null
+++ b/src/event/ui_events.h
@@ -0,0 +1,41 @@
+/*
+ * ui_events.h
+ *
+ * Copyright (C) 2012 - 2015 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/>.
+ *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link the code of portions of this program with the OpenSSL library under
+ * certain conditions as described in each individual source file, and
+ * distribute linked combinations including the two.
+ *
+ * You must obey the GNU General Public License in all respects for all of the
+ * code used other than OpenSSL. If you modify file(s) with this exception, you
+ * may extend this exception to your version of the file(s), but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version. If you delete this exception statement from all
+ * source files in the program, then also delete it here.
+ *
+ */
+
+#ifndef UI_EVENTS_H
+#define UI_EVENTS_H
+
+void ui_ev_focus_win(ProfWin *win);
+void ui_ev_new_chat_win(const char * const barejid);
+
+#endif
\ No newline at end of file