Bugfixes: checkboxes to radiobuttons (from J�rgen S) and remove a little

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

diff --git a/src/frontends/xforms/GUIRunTime.C b/src/frontends/xforms/GUIRunTime.C
index 419654b4001c1f6e940f6787e6cdcd4603cbf267..9d4305856ad91255adf62d93be521e0dc5756d73 100644 (file)
--- a/src/frontends/xforms/GUIRunTime.C
+++ b/src/frontends/xforms/GUIRunTime.C
@@ -3,7 +3,7 @@
  * 
  *           LyX, The Document Processor
  *      
- *           Copyright 2000 The LyX Team.
+ *           Copyright 2000-2001 The LyX Team.
  *
  *======================================================*/
 
@@ -16,6 +16,7 @@
 #endif
 
 #include "GUIRunTime.h"
+#include "XFormsView.h"
 #include "debug.h"
 
 // I keep these here so that it will be processed as early in
@@ -30,9 +31,14 @@ using std::endl;
 
 extern bool finished;
 
-static int const xforms_include_version = FL_INCLUDE_VERSION;
+namespace {
 
-int GUIRunTime::initApplication(int , char **)
+int const xforms_include_version = FL_INCLUDE_VERSION;
+
+} // namespace anon
+
+
+int GUIRunTime::initApplication(int &, char **)
 {
        // Check the XForms version in the forms.h header against
        // the one in the libforms. If they don't match quit the
@@ -64,22 +70,25 @@ int GUIRunTime::initApplication(int , char **)
 
 void GUIRunTime::processEvents() 
 {
-       XEvent ev;
-
        if (fl_do_forms() == FL_EVENT) {
-               lyxerr << "LyX: This shouldn't happen..." << endl;
+               XEvent ev;
                fl_XNextEvent(&ev);
+               lyxerr << "Received unhandled X11 event" << endl;
+               lyxerr << "Type: 0x" << std::hex << ev.xany.type <<
+                       "Target: 0x" << std::hex << ev.xany.window << endl;
        }
 }
 
 
 void GUIRunTime::runTime()
 {
-       XEvent ev;
        while (!finished) {
                if (fl_check_forms() == FL_EVENT) {
-                       lyxerr << "LyX: This shouldn't happen..." << endl;
+                       XEvent ev;
                        fl_XNextEvent(&ev);
+                       lyxerr << "Received unhandled X11 event" << endl;
+                       lyxerr << "Type: 0x" << std::hex << ev.xany.type <<
+                               "Target: 0x" << std::hex << ev.xany.window << endl;
                }
        }
 }
@@ -105,3 +114,40 @@ void GUIRunTime::setDefaults()
                        | FL_PDMenuFontSize
                        | FL_PDBorderWidth, &cntl);
 }
+
+
+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;
+}