better selection and scrolling behaviour

[lyx.git] / src / frontends / qt2 / lyx_gui.C

diff --git a/src/frontends/qt2/lyx_gui.C b/src/frontends/qt2/lyx_gui.C
index 21dfd7261871649681f66db79e156cf25e63df41..c64afc720fded4539e31c216dcbcb76a349c8883 100644 (file)
--- a/src/frontends/qt2/lyx_gui.C
+++ b/src/frontends/qt2/lyx_gui.C
@@ -22,9 +22,6 @@
 #include "debug.h"
 #include "gettext.h"
 
-#include <fcntl.h>
-#include <boost/bind.hpp>
-
 #include "lyx_gui.h"
 #include "lyx_main.h"
 #include "lyxrc.h"
@@ -41,6 +38,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/function/function0.hpp>
 #include <boost/signals/signal1.hpp>
+#include <boost/bind.hpp>
 
 #include "QtView.h"
 #include "QLImage.h"
@@ -48,8 +46,10 @@
 #include "io_callback.h"
 
 #include <qapplication.h>
-#include <qwidget.h> 
-#include <qpaintdevicemetrics.h> 
+#include <qwidget.h>
+#include <qpaintdevicemetrics.h>
+
+#include <fcntl.h>
 
 #ifndef CXX_GLOBAL_CSTD
 using std::exit;
@@ -64,20 +64,44 @@ extern BufferList bufferlist;
 namespace {
 
 float getDPI()
-{ 
+{
        QWidget w;
        QPaintDeviceMetrics pdm(&w);
        return 0.5 * (pdm.logicalDpiX() + pdm.logicalDpiY());
 }
 
-}
+map<int, io_callback *> io_callbacks;
+
+} // namespace anon
+
 
 // FIXME: wrong place !
 LyXServer * lyxserver;
 
+#ifdef Q_WS_X11
+extern bool lyxX11EventFilter(XEvent * xev);
+#endif
+
+class LQApplication : public QApplication
+{
+public:
+       LQApplication(int &argc, char **argv);
+       ~LQApplication();
+#ifdef Q_WS_X11
+       bool x11EventFilter (XEvent * ev) { return lyxX11EventFilter(ev); }
+#endif
+};
+
+LQApplication::LQApplication(int &argc, char **argv)
+       : QApplication( argc, argv )
+{}
+
+LQApplication::~LQApplication()
+{}
+
 void lyx_gui::parse_init(int & argc, char * argv[])
 {
-       static QApplication a(argc, argv);
+       static LQApplication a(argc, argv);
 
        using namespace grfx;
 
@@ -94,7 +118,7 @@ void lyx_gui::parse_lyxrc()
 }
 
 
-void lyx_gui::start(string const & batch, vector<string> files)
+void lyx_gui::start(string const & batch, vector<string> const & files)
 {
        // initial geometry
        int xpos = -1;
@@ -169,11 +193,6 @@ bool lyx_gui::font_available(LyXFont const & font)
 }
 
 
-namespace {
-       map<int, io_callback *> io_callbacks;
-}
-
-
 void lyx_gui::set_read_callback(int fd, LyXComm * comm)
 {
        io_callbacks[fd] = new io_callback(fd, comm);