fix problem with nroff detection, remove dead code with old floats, bogus message...

[lyx.git] / src / frontends / gnome / GUIRunTime.C

diff --git a/src/frontends/gnome/GUIRunTime.C b/src/frontends/gnome/GUIRunTime.C
index 7a3c4522fe526be08d5f9342df98ffe532474811..74738fb247d850650e3b38bc8a03e3ce7f732c86 100644 (file)
--- a/src/frontends/gnome/GUIRunTime.C
+++ b/src/frontends/gnome/GUIRunTime.C
@@ -19,7 +19,7 @@
 #include "debug.h"
 
 #include <gnome--/main.h>
-#include "mainapp.h"
+#include <glade/glade.h>
 
 using std::endl;
 
@@ -33,10 +33,14 @@ using std::endl;
 
 extern bool finished;
 
-static int const xforms_include_version = FL_INCLUDE_VERSION;
-GLyxAppWin * mainAppWin;
+namespace {
 
-int GUIRunTime::initApplication(int, char * argv[])
+int const xforms_include_version = FL_INCLUDE_VERSION;
+
+} // namespace anon
+
+
+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
@@ -63,18 +67,19 @@ int GUIRunTime::initApplication(int, char * argv[])
                return 1;
        }
 
-       static string app_id(PACKAGE);
-       static string app_version(VERSION);
+       // I belive that this should be done at a later stage, in
+       // lyx_gui, the same place as xforms does the same. (Lgb)
+       string app_id(PACKAGE);
+       string app_version(VERSION);
        static Gnome::Main  a(app_id, app_version, 1, argv);
-       static GLyxAppWin   appWin;
-       mainAppWin = &appWin;
+       glade_gnome_init(); // Initialize the glade library.
 
        return 0;
 }
 
 void GUIRunTime::processEvents() 
 {
-       while(Gnome::Main::instance()->events_pending())
+       while (Gnome::Main::instance()->events_pending())
                Gnome::Main::instance()->iteration(FALSE);
 }
 
@@ -85,8 +90,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;
                }
        }
 }
@@ -112,3 +119,41 @@ void GUIRunTime::setDefaults()
                        | FL_PDMenuFontSize
                        | FL_PDBorderWidth, &cntl);
 }
+
+
+#include "XFormsView.h"
+LyXView * GUIRunTime::createMainView(int w, int h)
+{
+       return new XFormsView(w, h);
+}
+
+       
+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;
+}