/* This file is part of
* ======================================================
- *
+ *
* LyX, The Document Processor
- *
+ *
* Copyright 2000 The LyX Team.
*
*======================================================*/
#endif
#include FORMS_H_LOCATION
-
+#include "gnome_helpers.h"
#include "GUIRunTime.h"
#include "debug.h"
-#include <gnome--/main.h>
-#include "mainapp.h"
-#include <glade/glade.h>
+#include <gtkmm/main.h>
+#include <libglademm/xml.h>
-using std::endl;
+#include <boost/bind.hpp>
-// I keep these here so that it will be processed as early in
-// the compilation process as possible.
-#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0
-#error LyX will not compile with this version of XForms.\
- Please get version 0.89.\
- If you want to try to compile anyway, delete this test in src/frontends/gnome/GUIRunTime.C.
+// 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;
+
+
extern bool finished;
namespace {
} // namespace anon
-GLyxAppWin * mainAppWin;
-int GUIRunTime::initApplication(int, char * argv[])
+int GUIRunTime::initApplication(int & argc , char * argv[])
{
// Check the XForms version in the forms.h header against
// the one in the libforms. If they don't match quit the
// I belive that this should be done at a later stage, in
// lyx_gui, the same place as xforms does the same. (Lgb)
- static string app_id(PACKAGE);
- static 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;
+ string app_id(PACKAGE);
+ string app_version(VERSION);
+ new Gtk::Main (argc, argv);
return 0;
}
-void GUIRunTime::processEvents()
+void GUIRunTime::processEvents()
{
- while(Gnome::Main::instance()->events_pending())
- Gnome::Main::instance()->iteration(FALSE);
+ while (Gtk::Main::events_pending())
+ Gtk::Main::iteration(false);
}
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;
}
}
}
| FL_PDMenuFontSize
| FL_PDBorderWidth, &cntl);
}
+
+
+#include "XFormsView.h"
+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;
+
+#if defined(HAVE_FLIMAGE_DUP) && defined(HAVE_FLIMAGE_TO_PIXMAP)
+ // connect the image loader based on the xforms library
+ GImage::newImage.connect(boost::bind(&xformsGImage::newImage));
+ GImage::loadableFormats.connect(boost::bind(&xformsGImage::loadableFormats));
+#else
+ // connect the image loader based on the XPM library
+ GImage::newImage.connect(boost::bind(&GImageXPM::newImage));
+ GImage::loadableFormats.connect(boost::bind(&GImageXPM::loadableFormats));
+#endif
+}
+
+
+Display * GUIRunTime::x11Display()
+{
+ return fl_get_display();
+}
+
+
+int GUIRunTime::x11Screen()
+{
+ return fl_screen;
+}
+
+
+Colormap GUIRunTime::x11Colormap()
+{
+ return fl_state[fl_get_vclass()].colormap;
+}
+
+
+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;
+}