X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fgtk%2Flyx_gui.C;h=4218311c76cb454d2c1cd2f72c84e427547b23b7;hb=6b553bee4ce30c70537cd8e54aa12b35013d253d;hp=99aeab74458163b7221600bee02103024616bd1d;hpb=50257b86904437b6695a7a9a823fbe4301ba0ce3;p=lyx.git

diff --git a/src/frontends/gtk/lyx_gui.C b/src/frontends/gtk/lyx_gui.C
index 99aeab7445..4218311c76 100644
--- a/src/frontends/gtk/lyx_gui.C
+++ b/src/frontends/gtk/lyx_gui.C
@@ -11,15 +11,9 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
 
 #include "lyx_gui.h"
 
-#include "support/lyxlib.h"
-#include "support/os.h"
-#include "support/filetools.h"
-#include "support/path_defines.h"
-
 #include "debug.h"
 #include "funcrequest.h"
 #include "gettext.h"
@@ -31,11 +25,14 @@
 #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"
@@ -44,24 +41,42 @@
 #include "xftFontLoader.h"
 #include "GWorkArea.h"
 
-#include "support/std_sstream.h"
-#include <iomanip>
-#include <fcntl.h>
-#include <boost/bind.hpp>
-
 //just for xforms
 #include "lyx_forms.h"
 #include "xformsImage.h"
 #include "xforms_helpers.h"
 
+#include "support/lyxlib.h"
+#include "support/os.h"
+#include "support/filetools.h"
+#include "support/path_defines.h"
+
+#include <gtkmm.h>
+
+#include <boost/bind.hpp>
+#include <boost/function.hpp>
+#include <boost/shared_ptr.hpp>
+
+#include <fcntl.h>
+
+#include <sstream>
+#include <iomanip>
+
+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;
 
@@ -117,7 +132,7 @@ int LyX_XErrHandler(Display * display, XErrorEvent * xeev) {
 	}
 
 	// emergency cleanup
-	LyX::emergencyCleanup();
+	LyX::cref().emergencyCleanup();
 
 	// Get the reason for the crash.
 	char etxt[513];
@@ -321,24 +336,14 @@ void lyx_gui::start(string const & batch, std::vector<string> const & files)
 	view.show();
 	view.init();
 
-	Buffer * last = 0;
-
-	// FIXME: some code below needs moving
+	// FIXME: server 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_each(files.begin(), files.end(),
+		 bind(&BufferView::loadLyXFile, view.view(), _1, true));
 
 	// handle the batch commands the user asked for
 	if (!batch.empty()) {
@@ -353,6 +358,7 @@ void lyx_gui::start(string const & batch, std::vector<string> const & files)
 	}
 
 	// FIXME: breaks emergencyCleanup
+	delete lyxsocket;
 	delete lyxserver;
 }
 
@@ -363,10 +369,23 @@ void lyx_gui::exit()
 }
 
 
-FuncStatus lyx_gui::getStatus(FuncRequest const & /*ev*/)
+FuncStatus lyx_gui::getStatus(FuncRequest const & ev)
 {
-	// Nothing interesting to do here
-	return FuncStatus();
+	FuncStatus flag;
+	switch (ev.action) {
+	// Add this back if the gtk doc prefs dialog includes preamble - jcs
+	/*case LFUN_DIALOG_SHOW:
+		if (ev.argument == "preamble")
+			flag.unknown(true);
+		break;*/
+	case LFUN_TOOLTIPS_TOGGLE:
+		flag.unknown(true);
+		break;
+	default:
+		break;
+	}
+
+	return flag;
 }
 
 
@@ -412,51 +431,24 @@ 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;
-}
-
+} // NS anon
 
-std::map<int, SigC::Connection> gReadCallbackMap;
 
-}
-
-
-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);
 }
 
 
-void lyx_gui::set_datasocket_callback(LyXDataSocket * /* p */)
-{}
-
-
-void lyx_gui::remove_datasocket_callback(LyXDataSocket * /* p */)
-{}
-
-
-void lyx_gui::set_serversocket_callback(LyXServerSocket * /* p */)
-{}
-
-
-void lyx_gui::remove_serversocket_callback(LyXServerSocket * /* p */)
-{}
-
-
 string const lyx_gui::roman_font_name()
 {
 	return "times";