From ca7a0bfa5dd63fc45df0a46800a76d7048e70f2b Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 17 Jun 2010 02:23:53 +0200 Subject: Started writing GUI --- .gitignore | 3 +- core/ephraim.erl | 62 +++++++++++++++ core/ephraim_conn.erl | 45 +++++++++++ core/ephraim_conv.erl | 23 ++++++ ephraim.erl | 61 --------------- ephraim_conn.erl | 45 ----------- ephraim_conv.erl | 23 ------ gui/CoreConnector.vala | 72 ++++++++++++++++++ gui/Ephraim.vala | 31 ++++++++ gui/ephraim.glade | 200 +++++++++++++++++++++++++++++++++++++++++++++++++ 10 files changed, 435 insertions(+), 130 deletions(-) create mode 100644 core/ephraim.erl create mode 100644 core/ephraim_conn.erl create mode 100644 core/ephraim_conv.erl delete mode 100644 ephraim.erl delete mode 100644 ephraim_conn.erl delete mode 100644 ephraim_conv.erl create mode 100644 gui/CoreConnector.vala create mode 100644 gui/Ephraim.vala create mode 100644 gui/ephraim.glade diff --git a/.gitignore b/.gitignore index 27d389a..c2a0d67 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.beam -*~ \ No newline at end of file +*~ +gui/Ephraim diff --git a/core/ephraim.erl b/core/ephraim.erl new file mode 100644 index 0000000..6a68de0 --- /dev/null +++ b/core/ephraim.erl @@ -0,0 +1,62 @@ +-module(ephraim). +-compile([debug_info, export_all]). + +-record(state, { + conn :: pid(), + convs :: dict(), + guis :: set() + }). + +-spec start() -> ok. +start() -> + Pid = spawn(?MODULE, init, []), + case register(ephraim, Pid) of + true -> + ok + end. + +-spec stop() -> ok. +stop() -> + ephraim ! stop, + ok. + +-spec init() -> ok. +init() -> + Conn = spawn(ephraim_conn, init, []), + loop(#state{conn=Conn,convs=dict:new(),guis=sets:new()}). + +-spec get_conv(#state{},exmpp_jid:jid()) -> {#state{},pid()}. +get_conv(State, JID) -> + Key = exmpp_jid:to_lower(exmpp_jid:bare(JID)), + case dict:find(Key, State#state.convs) of + {ok, Conv} -> + {State, Conv}; + error -> + Conv = spawn(ephraim_conv, init, [Key]), + Dict = dict:store(Key, Conv, State#state.convs), + {State#state{convs=Dict}, Conv} + end. + +-spec loop(#state{}) -> ok. +loop(State) -> + receive + stop -> + dict:fold(fun(_,Conv,Msg) -> Conv ! Msg end, stop, State#state.convs), + State#state.conn ! stop, + ok; + {register_gui, Pid} -> + GUIs = State#state.guis, + State2 = State#state{guis=sets:add_element(Pid,GUIs)}, + loop(State2); + {unregister_gui, Pid} -> + GUIs = State#state.guis, + State2 = State#state{guis=sets:del_element(Pid,GUIs)}, + loop(State2); + {receive_message, From, Packet} -> + {State2, Conv} = get_conv(State, From), + Conv ! {receive_message, Packet}, + loop(State2); + Msg -> + io:format("ephraim: ~p~n", [Msg]), + loop(State) + end. diff --git a/core/ephraim_conn.erl b/core/ephraim_conn.erl new file mode 100644 index 0000000..18edd6a --- /dev/null +++ b/core/ephraim_conn.erl @@ -0,0 +1,45 @@ +-module(ephraim_conn). +-include_lib("exmpp/include/exmpp_client.hrl"). +-compile([debug_info, export_all]). + +-record(conn_state, { + session :: any(), + roster :: any() + }). + +-spec init() -> ok. +init() -> + application:start(exmpp), + Session = exmpp_session:start(), + JID = exmpp_jid:make("ephraim-test", "jabber.ccc.de", "Bar"), + exmpp_session:auth_basic_digest(Session, JID, "foobarbla"), + exmpp_session:connect_TCP(Session, "jabber.ccc.de", 5222), + session(#conn_state{session=Session}). + +-spec session(#conn_state{}) -> ok. +session(State) -> + exmpp_session:login(State#conn_state.session), + exmpp_session:send_packet(State#conn_state.session, exmpp_presence:set_status(exmpp_presence:available(), "Foo/Test\\Bar")), + loop(State). + +-spec loop(#conn_state{}) -> ok. +loop(State) -> + receive + stop -> + exmpp_session:stop(State#conn_state.session); + + #received_packet{packet_type=presence, raw_packet=Packet} -> + From = exmpp_xml:get_attribute(Packet, from, <<"unknown">>), + Type = atom_to_list(exmpp_presence:get_type(Packet)), + Status = exmpp_presence:get_status(Packet), + io:format("~ts is now ~ts: ~ts~n", [From, Type, Status]), + loop(State); + + #received_packet{packet_type=message, raw_packet=Packet} -> + From = exmpp_xml:get_attribute(Packet, from, <<"unknown">>), + ephraim ! {receive_message, From, Packet}, + loop(State); + Msg -> + io:format("ephraim_conn: ~p~n", [Msg]), + loop(State) + end. diff --git a/core/ephraim_conv.erl b/core/ephraim_conv.erl new file mode 100644 index 0000000..99c7668 --- /dev/null +++ b/core/ephraim_conv.erl @@ -0,0 +1,23 @@ +-module(ephraim_conv). +-compile([debug_info, export_all]). + +-record(conv_state, { + jid :: exmpp_jid:jid() + }). + +-spec init(exmpp_jid:jid()) -> ok. +init(JID) -> + loop(#conv_state{jid=JID}). + +-spec loop(#conv_state{}) -> ok. +loop(State) -> + receive + stop -> + ok; + {receive_message, Packet} -> + io:format("Received packet from ~p: ~p~n", [State#conv_state.jid, Packet]), + loop(State); + Msg -> + io:format("ephraim_conv (~p): ~p~n", [State#conv_state.jid, Msg]), + loop(State) + end. diff --git a/ephraim.erl b/ephraim.erl deleted file mode 100644 index 60902da..0000000 --- a/ephraim.erl +++ /dev/null @@ -1,61 +0,0 @@ --module(ephraim). --compile([debug_info, export_all]). - --record(state, { - conn :: pid(), - convs :: dict(), - guis :: set() - }). - --spec start() -> ok. -start() -> - Pid = spawn(?MODULE, init, []), - case register(ephraim, Pid) of - true -> - ok - end. - --spec stop() -> ok. -stop() -> - ephraim ! stop, - ok. - --spec init() -> ok. -init() -> - Conn = spawn(ephraim_conn, init, []), - loop(#state{conn=Conn,convs=dict:new(),guis=sets:new()}). - --spec get_conv(#state{},exmpp_jid:jid()) -> {#state{},pid()}. -get_conv(State, JID) -> - case dict:find(JID, State#state.convs) of - {ok, Conv} -> - {State, Conv}; - error -> - Conv = spawn(ephraim_conv, init, [JID]), - Dict = dict:store(JID, Conv, State#state.convs), - {State#state{convs=Dict}, Conv} - end. - --spec loop(#state{}) -> ok. -loop(State) -> - receive - stop -> - dict:fold(fun(_,Conv,Msg) -> Conv ! Msg end, stop, State#state.convs), - State#state.conn ! stop, - ok; - {register_gui, Pid} -> - GUIs = State#state.guis, - State2 = State#state{guis=sets:add_element(Pid,GUIs)}, - loop(State2); - {unregister_gui, Pid} -> - GUIs = State#state.guis, - State2 = State#state{guis=sets:del_element(Pid,GUIs)}, - loop(State2); - {receive_message, From, Packet} -> - {State2, Conv} = get_conv(State, From), - Conv ! {receive_message, Packet}, - loop(State2); - Msg -> - io:format("ephraim: ~p~n", [Msg]), - loop(State) - end. diff --git a/ephraim_conn.erl b/ephraim_conn.erl deleted file mode 100644 index 18edd6a..0000000 --- a/ephraim_conn.erl +++ /dev/null @@ -1,45 +0,0 @@ --module(ephraim_conn). --include_lib("exmpp/include/exmpp_client.hrl"). --compile([debug_info, export_all]). - --record(conn_state, { - session :: any(), - roster :: any() - }). - --spec init() -> ok. -init() -> - application:start(exmpp), - Session = exmpp_session:start(), - JID = exmpp_jid:make("ephraim-test", "jabber.ccc.de", "Bar"), - exmpp_session:auth_basic_digest(Session, JID, "foobarbla"), - exmpp_session:connect_TCP(Session, "jabber.ccc.de", 5222), - session(#conn_state{session=Session}). - --spec session(#conn_state{}) -> ok. -session(State) -> - exmpp_session:login(State#conn_state.session), - exmpp_session:send_packet(State#conn_state.session, exmpp_presence:set_status(exmpp_presence:available(), "Foo/Test\\Bar")), - loop(State). - --spec loop(#conn_state{}) -> ok. -loop(State) -> - receive - stop -> - exmpp_session:stop(State#conn_state.session); - - #received_packet{packet_type=presence, raw_packet=Packet} -> - From = exmpp_xml:get_attribute(Packet, from, <<"unknown">>), - Type = atom_to_list(exmpp_presence:get_type(Packet)), - Status = exmpp_presence:get_status(Packet), - io:format("~ts is now ~ts: ~ts~n", [From, Type, Status]), - loop(State); - - #received_packet{packet_type=message, raw_packet=Packet} -> - From = exmpp_xml:get_attribute(Packet, from, <<"unknown">>), - ephraim ! {receive_message, From, Packet}, - loop(State); - Msg -> - io:format("ephraim_conn: ~p~n", [Msg]), - loop(State) - end. diff --git a/ephraim_conv.erl b/ephraim_conv.erl deleted file mode 100644 index 99c7668..0000000 --- a/ephraim_conv.erl +++ /dev/null @@ -1,23 +0,0 @@ --module(ephraim_conv). --compile([debug_info, export_all]). - --record(conv_state, { - jid :: exmpp_jid:jid() - }). - --spec init(exmpp_jid:jid()) -> ok. -init(JID) -> - loop(#conv_state{jid=JID}). - --spec loop(#conv_state{}) -> ok. -loop(State) -> - receive - stop -> - ok; - {receive_message, Packet} -> - io:format("Received packet from ~p: ~p~n", [State#conv_state.jid, Packet]), - loop(State); - Msg -> - io:format("ephraim_conv (~p): ~p~n", [State#conv_state.jid, Msg]), - loop(State) - end. diff --git a/gui/CoreConnector.vala b/gui/CoreConnector.vala new file mode 100644 index 0000000..a3f0910 --- /dev/null +++ b/gui/CoreConnector.vala @@ -0,0 +1,72 @@ +using Erl; + + +public class CoreConnector { + unowned Thread thread; + bool running; + + private class TermStore { + public Erl.Term term; + } + + public CoreConnector() { + running = false; + } + + public bool start() { + if(running) + return true; + + running = true; + + try { + thread = Thread.create(receive, true); + return true; + } catch(ThreadError e) { + return false; + } + } + + public void stop() { + if(!running) + return; + + running = false; + thread.join(); + } + + private void* receive() { + Erl.Node node = Erl.Node("ephraim-gtk", "magiccookie", 0); + Erl.Connection con = node.connect("ephraim-core@avalon.local"); + + con.reg_send("ephraim", Erl.mk_self_pid(node)); + + while(running) { + TermStore response = new TermStore(); + Erl.ReceiveType ret = con.receive(out response.term, 1000); + + switch(ret) { + case Erl.ReceiveType.ERROR: + if(Erl.errno == Erl.Error.TIMEDOUT) + break; + + running = false; + break; + case Erl.ReceiveType.TICK: + // Do nothing + break; + case Erl.ReceiveType.MSG: + Idle.add(() => {handleTerm(response); return false;}); + break; + } + } + + return null; + } + + private void handleTerm(TermStore store) { + unowned Term term = store.term; + Erl.print_term(stdout, term); + stdout.printf("\n"); + } +} diff --git a/gui/Ephraim.vala b/gui/Ephraim.vala new file mode 100644 index 0000000..d05e449 --- /dev/null +++ b/gui/Ephraim.vala @@ -0,0 +1,31 @@ +using Gtk; + + +public class Ephraim { + public static int main(string[] args) { + Gtk.init(ref args); + Erl.init(); + + Gtk.Builder builder = new Gtk.Builder(); + try { + builder.add_from_file("ephraim.glade"); + } catch(Error e) { + return 1; + } + + CoreConnector coreconn = new CoreConnector(); + + if(!coreconn.start()) + return 1; + + unowned Gtk.Window window = builder.get_object("MainWindow") as Gtk.Window; + window.hide.connect(Gtk.main_quit); + window.show(); + + Gtk.main(); + + coreconn.stop(); + + return 0; + } +} diff --git a/gui/ephraim.glade b/gui/ephraim.glade new file mode 100644 index 0000000..b1b3455 --- /dev/null +++ b/gui/ephraim.glade @@ -0,0 +1,200 @@ + + + + + + + + True + vertical + + + True + + + True + _Datei + True + + + True + + + gtk-new + True + True + True + + + + + gtk-open + True + True + True + + + + + gtk-save + True + True + True + + + + + gtk-save-as + True + True + True + + + + + True + + + + + gtk-quit + True + True + True + + + + + + + + + True + _Bearbeiten + True + + + True + + + gtk-cut + True + True + True + + + + + gtk-copy + True + True + True + + + + + gtk-paste + True + True + True + + + + + gtk-delete + True + True + True + + + + + + + + + True + _Ansicht + True + + + + + True + _Hilfe + True + + + True + + + gtk-about + True + True + True + + + + + + + + + False + 0 + + + + + True + True + + + True + True + RosterStore + + + False + True + + + + + True + True + True + + + + + + + + + + + + + + + + + + + + + True + True + + + + + 1 + + + + + + + -- cgit v1.2.3