X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fgnome%2FGUIRunTime.C;h=ccd1d48d8dba25142a98b2e449f48cbfcdddc672;hb=3e39bef2c13125023f3b72532d90575bbe307335;hp=72a73aecf317c194b8f107fa82c8f233e066d693;hpb=9ecaaf3ec9d3e8cd48548ab696ac69e6c5aaa6ca;p=lyx.git

diff --git a/src/frontends/gnome/GUIRunTime.C b/src/frontends/gnome/GUIRunTime.C
index 72a73aecf3..ccd1d48d8d 100644
--- a/src/frontends/gnome/GUIRunTime.C
+++ b/src/frontends/gnome/GUIRunTime.C
@@ -1,8 +1,8 @@
 /* This file is part of
  * ======================================================
- * 
+ *
  *           LyX, The Document Processor
- * 	 
+ *
  *           Copyright 2000 The LyX Team.
  *
  *======================================================*/
@@ -19,9 +19,16 @@
 #include "debug.h"
 
 #include <gnome--/main.h>
-#include "mainapp.h"
 #include <glade/glade.h>
 
+// For now we use the xforms image loader if we can.
+// In the future, this will be replaced by a gnome equivalent.
+#if defined(HAVE_FLIMAGE_DUP) && defined(HAVE_FLIMAGE_TO_PIXMAP)
+#include "xforms/xformsGImage.h"
+#else
+#include "graphics/GraphicsImageXPM.h"
+#endif
+
 using std::endl;
 
 // I keep these here so that it will be processed as early in
@@ -40,9 +47,8 @@ int const xforms_include_version = FL_INCLUDE_VERSION;
 
 } // namespace anon
 
-GLyxAppWin * mainAppWin;
 
-int GUIRunTime::initApplication(int, char * argv[])
+int GUIRunTime::initApplication(int &, char * argv[])
 {
 	// Check the XForms version in the forms.h header against
 	// the one in the libforms. If they don't match quit the
@@ -75,15 +81,13 @@ int GUIRunTime::initApplication(int, char * argv[])
 	string app_version(VERSION);
 	static Gnome::Main  a(app_id, app_version, 1, argv);
 	glade_gnome_init(); // Initialize the glade library.
-	static GLyxAppWin   appWin;
-	mainAppWin = &appWin;
 
 	return 0;
 }
 
-void GUIRunTime::processEvents() 
+void GUIRunTime::processEvents()
 {
-	while(Gnome::Main::instance()->events_pending())
+	while (Gnome::Main::instance()->events_pending())
 		Gnome::Main::instance()->iteration(FALSE);
 }
 
@@ -94,8 +98,10 @@ void GUIRunTime::runTime()
 	while (!finished) {
 		processEvents();
 		if (fl_check_forms() == FL_EVENT) {
-			lyxerr << "LyX: This shouldn't happen..." << endl;
 			fl_XNextEvent(&ev);
+			lyxerr << "Received unhandled X11 event" << endl;
+			lyxerr << "Type: 0x" << hex << ev.xany.type <<
+				"Target: 0x" << hex << ev.xany.window << endl;
 		}
 	}
 }
@@ -129,7 +135,26 @@ LyXView * GUIRunTime::createMainView(int w, int h)
 	return new XFormsView(w, h);
 }
 
-	
+
+// Called by the graphics cache to connect the appropriate frontend
+// image loading routines to the LyX kernel.
+void GUIRunTime::initialiseGraphics()
+{
+	using namespace grfx;
+	using SigC::slot;
+
+#if defined(HAVE_FLIMAGE_DUP) && defined(HAVE_FLIMAGE_TO_PIXMAP)
+	// connect the image loader based on the xforms library
+	GImage::newImage.connect(slot(&xformsGImage::newImage));
+	GImage::loadableFormats.connect(slot(&xformsGImage::loadableFormats));
+#else
+	// connect the image loader based on the XPM library
+	GImage::newImage.connect(slot(&GImageXPM::newImage));
+	GImage::loadableFormats.connect(slot(&GImageXPM::loadableFormats));
+#endif
+}
+
+
 Display * GUIRunTime::x11Display()
 {
 	return fl_get_display();
@@ -152,3 +177,10 @@ int GUIRunTime::x11VisualDepth()
 {
 	return fl_get_visual_depth();
 }
+
+float GUIRunTime::getScreenDPI()
+{
+	Screen * scr = ScreenOfDisplay(fl_get_display(), fl_screen);
+	return ((HeightOfScreen(scr) * 25.4 / HeightMMOfScreen(scr)) +
+		(WidthOfScreen(scr) * 25.4 / WidthMMOfScreen(scr))) / 2;
+}