*
* \author unknown
* \author John Levon
+ * \author Abdelrazak Younes
*
* Full author contact details are available in file CREDITS.
*/
#include "lyx_gui.h"
// FIXME: move this stuff out again
-#include "bufferlist.h"
-#include "BufferView.h"
#include "Color.h"
#include "funcrequest.h"
#include "LColor.h"
#include "LyXAction.h"
#include "lyxfunc.h"
#include "lyxrc.h"
-#include "lyxserver.h"
-#include "lyxsocket.h"
-#include "session.h"
-#include "graphics/LoaderQueue.h"
#include "support/lstrings.h"
-#include "support/convert.h"
-#include "support/os.h"
-#include "support/package.h"
-#include "debug.h"
-
-// Dear Lord, deliver us from Evil, aka the Qt headers
-// Qt defines a macro 'signals' that clashes with a boost namespace.
-// All is well if the namespace is visible first.
-#include <boost/signal.hpp> // FIXME: Is this needed? (Lgb)
-#include <boost/bind.hpp>
-#include <boost/shared_ptr.hpp>
-#include "QtView.h"
-#include "lcolorcache.h"
-#include "qfont_loader.h"
+#include "GuiView.h"
#include "QLImage.h"
#include "qt_helpers.h"
#include "socket_callback.h"
-
-#ifdef Q_WS_MACX
-#include <Carbon/Carbon.h>
-#endif
+#include "GuiApplication.h"
#include <QApplication>
#include <QEventLoop>
#include <QTranslator>
#include <QTextCodec>
+#include <QLocale>
+#include <QLibraryInfo>
-using lyx::support::ltrim;
-using lyx::support::package;
+#include <boost/bind.hpp>
+#include <boost/shared_ptr.hpp>
-using lyx::frontend::QtView;
-namespace os = lyx::support::os;
+using lyx::support::ltrim;
-using boost::shared_ptr;
+using lyx::frontend::GuiImplementation;
+using lyx::frontend::GuiView;
+using lyx::frontend::GuiApplication;
-#ifndef CXX_GLOBAL_CSTD
-using std::exit;
-#endif
+using boost::shared_ptr;
using std::map;
using std::vector;
using std::string;
-
-extern BufferList bufferlist;
+lyx::frontend::GuiApplication * guiApp;
namespace {
-int getDPI()
-{
- QWidget w;
- return int(0.5 * (w.logicalDpiX() + w.logicalDpiY()));
-}
-
map<int, shared_ptr<socket_callback> > socket_callbacks;
} // namespace anon
-// FIXME: wrong place !
-LyXServer * lyxserver;
-LyXServerSocket * lyxsocket;
-
-// in QLyXKeySym.C
-extern void initEncodings();
-
-#ifdef Q_WS_X11
-extern bool lyxX11EventFilter(XEvent * xev);
-#endif
-
-#ifdef Q_WS_MACX
-extern bool macEventFilter(EventRef event);
-extern pascal OSErr
-handleOpenDocuments(const AppleEvent* inEvent, AppleEvent* /*reply*/,
- long /*refCon*/);
-#endif
-
-class LQApplication : public QApplication
-{
-public:
- LQApplication(int & argc, char ** argv);
- ~LQApplication();
-#ifdef Q_WS_X11
- bool x11EventFilter (XEvent * ev) { return lyxX11EventFilter(ev); }
-#endif
-#ifdef Q_WS_MACX
- bool macEventFilter(EventRef event);
-#endif
-};
-
-
-LQApplication::LQApplication(int & argc, char ** argv)
- : QApplication(argc, argv)
-{
-#ifdef Q_WS_MACX
- AEInstallEventHandler(kCoreEventClass, kAEOpenDocuments,
- NewAEEventHandlerUPP(handleOpenDocuments),
- 0, false);
-#endif
-}
-
-
-LQApplication::~LQApplication()
-{}
-
-
-#ifdef Q_WS_MACX
-bool LQApplication::macEventFilter(EventRef event)
-{
- if (GetEventClass(event) == kEventClassAppleEvent) {
- EventRecord eventrec;
- ConvertEventRefToEventRecord(event, &eventrec);
- AEProcessAppleEvent(&eventrec);
-
- return false;
- }
- return false;
-}
-#endif
-
-
-namespace {
-
-LQApplication * app = 0;
-
-}
-
-
namespace lyx_gui {
-bool use_gui = true;
-
-void parse_init(int & argc, char * argv[])
-{
+int exec(int & argc, char * argv[])
+{
/*
FIXME : Abdel 29/05/2006 (younes.a@free.fr)
reorganize this code. In particular make sure that this
- advise from Qt documentation is respected:
-
+ advice from Qt documentation is respected:
+
Since the QApplication object does so much initialization, it
must be created before any other objects related to the user
interface are created.
-
- Right now this is not the case. For example, the call to
- "FontLoader::initFontPath()" below is doned before the QApplication
- creation. Moreover, I suspect that a number of global variables
+
+ Right now this is not the case, I suspect that a number of global variables
contains Qt object that are initialized before the passage through
parse_init(). This might also explain the message displayed by Qt
that caused the hanging:
QObject::killTimer: timers cannot be stopped from another thread
- */
- // Force adding of font path _before_ QApplication is initialized
- FontLoader::initFontPath();
+ I hope that the problem will disappear automagically when we get rid of
+ lyx_gui entirely, thus using theApp directly throughout the code for LyXFunc,
+ Clipboard and Selection access.
+ */
-#ifdef Q_WS_WIN
- static QApplication win_app(argc, argv);
+#if defined(Q_WS_WIN) && !defined(Q_CYGWIN_WIN)
+ static GuiApplication app(argc, argv);
#else
- app = new LQApplication(argc, argv);
+ GuiApplication app(argc, argv);
#endif
- // install translation file for Qt built-in dialogs
- // These are only installed since Qt 3.2.x
- static QTranslator qt_trans(0);
- if (qt_trans.load(QString("qt_") + QTextCodec::locale(),
- qInstallPathTranslations())) {
- qApp->installTranslator(&qt_trans);
- // even if the language calls for RtL, don't do that
- qApp->setReverseLayout(false);
- lyxerr[Debug::GUI]
- << "Successfully installed Qt translations for locale "
- << QTextCodec::locale() << std::endl;
- } else
- lyxerr[Debug::GUI]
- << "Could not find Qt translations for locale "
- << QTextCodec::locale() << std::endl;
-
-/*#ifdef Q_WS_MACX
- // These translations are meant to break Qt/Mac menu merging
- // algorithm on some entries. It lists the menu names that
- // should not be moved to the LyX menu
- static QTranslator aqua_trans(0);
- aqua_trans.insert(QTranslatorMessage("QMenuBar", "Setting", 0,
- "do_not_merge_me"));
- aqua_trans.insert(QTranslatorMessage("QMenuBar", "Config", 0,
- "do_not_merge_me"));
- aqua_trans.insert(QTranslatorMessage("QMenuBar", "Options", 0,
- "do_not_merge_me"));
- aqua_trans.insert(QTranslatorMessage("QMenuBar", "Setup", 0,
- "do_not_merge_me"));
-
- app.installTranslator(&aqua_trans);
-#endif
-*/
- using namespace lyx::graphics;
-
- Image::newImage = boost::bind(&QLImage::newImage);
- Image::loadableFormats = boost::bind(&QLImage::loadableFormats);
-
- // needs to be done before reading lyxrc
- lyxrc.dpi = getDPI();
+ guiApp = &app;
+ theApp = guiApp;
- LoaderQueue::setPriority(10,100);
-}
-
-
-void parse_lyxrc()
-{}
-
-
-void start(string const & batch, vector<string> const & files)
-{
- // this can't be done before because it needs the Languages object
- initEncodings();
-
- // initial geometry
- unsigned int width = 690;
- unsigned int height = 510;
- // first try lyxrc
- if (lyxrc.geometry_width != 0 && lyxrc.geometry_height != 0 ) {
- width = lyxrc.geometry_width;
- height = lyxrc.geometry_height;
- }
- // if lyxrc returns (0,0), then use session info
- else {
- string val = LyX::ref().session().loadSessionInfo("WindowWidth");
- if (val != "")
- width = convert<unsigned int>(val);
- val = LyX::ref().session().loadSessionInfo("WindowHeight");
- if (val != "")
- height = convert<unsigned int>(val);
- }
-
- boost::shared_ptr<QtView> view_ptr(new QtView(width, height));
- LyX::ref().addLyXView(view_ptr);
-
- QtView & view = *view_ptr.get();
-
- // if user wants to restore window position
- if (lyxrc.geometry_xysaved) {
- QPoint p = view.pos();
- string val = LyX::ref().session().loadSessionInfo("WindowPosX");
- if (val != "")
- p.setX(convert<unsigned int>(val));
- val = LyX::ref().session().loadSessionInfo("WindowPosY");
- if (val != "")
- p.setY(convert<unsigned int>(val));
- view.move(p);
- }
- view.show();
- view.init();
-
- // FIXME: some code below needs moving
-
- lyxserver = new LyXServer(&view.getLyXFunc(), lyxrc.lyxpipes);
- lyxsocket = new LyXServerSocket(&view.getLyXFunc(),
- os::internal_path(package().temp_dir() + "/lyxsocket"));
-
- for_each(files.begin(), files.end(),
- bind(&BufferView::loadLyXFile, view.view(), _1, true));
-
- // handle the batch commands the user asked for
- if (!batch.empty()) {
- view.getLyXFunc().dispatch(lyxaction.lookupFunc(batch));
- }
-
- qApp->exec();
-
- // FIXME
- delete lyxsocket;
- delete lyxserver;
- lyxserver = 0;
- delete app;
+ return LyX::ref().exec2(argc, argv);
}
// During screen update/ redraw, this method is disabled to
// prevent keyboard events being handed to the LyX core, where
// they could cause re-entrant calls to screen update.
-#if QT_VERSION >= 0x030100
- qApp->processEvents(QEventLoop::ExcludeUserInput);
-#endif
-}
-
-
-void exit()
-{
- delete lyxsocket;
- delete lyxserver;
- lyxserver = 0;
-
- // we cannot call qApp->exit(0) - that could return us
- // into a static dialog return in the lyx code (for example,
- // load autosave file QMessageBox. We have to just get the hell
- // out.
-
- ::exit(0);
-}
-
-
-FuncStatus getStatus(FuncRequest const & ev)
-{
- FuncStatus flag;
- switch (ev.action) {
- case LFUN_DIALOG_SHOW:
- if (ev.argument == "preamble")
- flag.unknown(true);
- break;
- case LFUN_TOOLTIPS_TOGGLE:
- flag.unknown(true);
- break;
- default:
- break;
- }
-
- return flag;
+ guiApp->processEvents(QEventLoop::ExcludeUserInputEvents);
}
bool getRGBColor(LColor_color col, lyx::RGBColor & rgbcol)
{
- QColor const & qcol = lcolorcache.get(col);
+ QColor const & qcol = guiApp->colorCache().get(col);
if (!qcol.isValid()) {
rgbcol.r = 0;
rgbcol.g = 0;
string const hexname(LColor_color col)
{
- return ltrim(fromqstr(lcolorcache.get(col).name()), "#");
+ return ltrim(fromqstr(guiApp->colorCache().get(col).name()), "#");
}
void update_color(LColor_color)
{
// FIXME: Bleh, can't we just clear them all at once ?
- lcolorcache.clear();
-}
-
-
-void update_fonts()
-{
- fontloader.update();
-}
-
-
-bool font_available(LyXFont const & font)
-{
- return fontloader.available(font);
+ guiApp->colorCache().clear();
}
socket_callbacks.erase(fd);
}
-
-string const roman_font_name()
-{
- if (!use_gui)
- return "serif";
-
- QFont font;
- font.setStyleHint(QFont::Serif);
- font.setFamily("serif");
-
- return fromqstr(QFontInfo(font).family());
-}
-
-
-string const sans_font_name()
-{
- if (!use_gui)
- return "sans";
-
- QFont font;
- font.setStyleHint(QFont::SansSerif);
- font.setFamily("sans");
-
- return fromqstr(QFontInfo(font).family());
-}
-
-
-string const typewriter_font_name()
-{
- if (!use_gui)
- return "monospace";
-
- QFont font;
- font.setStyleHint(QFont::TypeWriter);
- font.setFamily("monospace");
-
- return fromqstr(QFontInfo(font).family());
-}
-
}; // namespace lyx_gui
projects / lyx.git / blobdiff