change "support/std_sstream.h" to <sstream>

[features.git] / src / frontends / gtk / lyx_gui.C

diff --git a/src/frontends/gtk/lyx_gui.C b/src/frontends/gtk/lyx_gui.C
index 750e040037a36c8c64fd629e2504540afb8f243e..9fbf7a1b6e8a1355c067c25bdbcf7bd2dda9048c 100644 (file)
--- a/src/frontends/gtk/lyx_gui.C
+++ b/src/frontends/gtk/lyx_gui.C
@@ -21,18 +21,24 @@
 #include "support/path_defines.h"
 
 #include "debug.h"
+#include "funcrequest.h"
 #include "gettext.h"
 
+#include "LColor.h"
+#include "LyXAction.h"
 #include "lyx_main.h"
 #include "lyxrc.h"
 #include "lyxfont.h"
 #include "graphics/LoaderQueue.h"
 
+#include "io_callback.h"
+
 // FIXME: move this stuff out again
 #include "bufferlist.h"
 #include "buffer_funcs.h"
 #include "lyxfunc.h"
 #include "lyxserver.h"
+#include "lyxsocket.h"
 #include "BufferView.h"
 
 #include "GView.h"
@@ -41,23 +47,35 @@
 #include "xftFontLoader.h"
 #include "GWorkArea.h"
 
-#include "support/std_sstream.h"
-#include <iomanip>
-#include <fcntl.h>
 #include <boost/bind.hpp>
+#include <boost/function.hpp>
+#include <boost/shared_ptr.hpp>
+
+#include <fcntl.h>
+
+#include <sstream>
+#include <iomanip>
 
 //just for xforms
 #include "lyx_forms.h"
 #include "xformsImage.h"
 #include "xforms_helpers.h"
 
+namespace os = lyx::support::os;
+
 using std::ostringstream;
+using std::string;
+
+using lyx::frontend::colorCache;
+using lyx::frontend::GView;
+using lyx::frontend::XformsColor;
 
 
 extern BufferList bufferlist;
 
 // FIXME: wrong place !
 LyXServer * lyxserver;
+LyXServerSocket * lyxsocket;
 
 bool lyx_gui::use_gui = true;
 
@@ -113,7 +131,7 @@ int LyX_XErrHandler(Display * display, XErrorEvent * xeev) {
        }
 
        // emergency cleanup
-       LyX::emergencyCleanup();
+       LyX::cref().emergencyCleanup();
 
        // Get the reason for the crash.
        char etxt[513];
@@ -309,32 +327,28 @@ void lyx_gui::start(string const & batch, std::vector<string> const & files)
        start_xforms();
        // just for debug
        XSynchronize(getDisplay(), true);
-       GView view;
+
+       boost::shared_ptr<GView> view_ptr(new GView);
+       LyX::ref().addLyXView(view_ptr);
+
+       GView & view = *view_ptr.get();
        view.show();
        view.init();
 
-       Buffer * last = 0;
-
        // FIXME: some code below needs moving
 
        lyxserver = new LyXServer(&view.getLyXFunc(), lyxrc.lyxpipes);
+       lyxsocket = new LyXServerSocket(&view.getLyXFunc(),
+                         os::slashify_path(os::getTmpDir() + "/lyxsocket"));
 
        std::vector<string>::const_iterator cit = files.begin();
        std::vector<string>::const_iterator end = files.end();
-       for (; cit != end; ++cit) {
-               Buffer * b = bufferlist.newBuffer(*cit);
-               if (loadLyXFile(b, *cit))
-                       last = b;
-       }
-
-       // switch to the last buffer successfully loaded
-       if (last) {
-               view.view()->buffer(last);
-       }
+       for (; cit != end; ++cit)
+               view.view()->loadLyXFile(*cit, true);
 
        // handle the batch commands the user asked for
        if (!batch.empty()) {
-               view.getLyXFunc().dispatch(batch);
+               view.getLyXFunc().dispatch(lyxaction.lookupFunc(batch));
        }
 
        // enter the event loop
@@ -345,6 +359,7 @@ void lyx_gui::start(string const & batch, std::vector<string> const & files)
        }
 
        // FIXME: breaks emergencyCleanup
+       delete lyxsocket;
        delete lyxserver;
 }
 
@@ -362,7 +377,7 @@ FuncStatus lyx_gui::getStatus(FuncRequest const & /*ev*/)
 }
 
 
-string const lyx_gui::hexname(EnumLColor col)
+string const lyx_gui::hexname(LColor_color col)
 {
        Gdk::Color gdkColor;
        Gdk::Color * gclr = colorCache.getColor(col);
@@ -384,7 +399,7 @@ string const lyx_gui::hexname(EnumLColor col)
 }
 
 
-void lyx_gui::update_color(EnumLColor /*col*/)
+void lyx_gui::update_color(LColor_color /*col*/)
 {
        colorCache.clear();
 }
@@ -404,32 +419,21 @@ bool lyx_gui::font_available(LyXFont const & font)
 
 namespace {
 
+std::map<int, boost::shared_ptr<io_callback> > callbacks;
 
-bool readCallback(Glib::IOCondition /*condition*/, LyXComm * comm)
-{
-       comm->read_ready();
-       return true;
-}
-
-
-std::map<int, SigC::Connection> gReadCallbackMap;
-
-}
+} // NS anon
 
 
-void lyx_gui::set_read_callback(int fd, LyXComm * comm)
+void lyx_gui::register_socket_callback(int fd,
+                                      boost::function<void()> func)
 {
-       gReadCallbackMap[fd] = Glib::signal_io().connect(
-               SigC::bind(SigC::slot(readCallback), comm),
-               fd,
-               Glib::IO_IN);
+       callbacks[fd] = boost::shared_ptr<io_callback>(new io_callback(fd, func));
 }
 
 
-void lyx_gui::remove_read_callback(int fd)
+void lyx_gui::unregister_socket_callback(int fd)
 {
-       gReadCallbackMap[fd].disconnect();
-       gReadCallbackMap.erase(fd);
+       callbacks.erase(fd);
 }