#include "support/lassert.h"
#include "support/lstrings.h"
#include "support/lyxalgo.h" // sorted
+#include "support/textutils.h"
#include "support/Messages.h"
#include "support/os.h"
#include "support/Package.h"
#include <QThreadPool>
#include <QWidget>
-// FIXME QT5
#ifdef Q_WS_X11
#include <X11/Xatom.h>
#include <X11/Xlib.h>
#undef CursorShape
#undef None
+#elif defined(QPA_XCB)
+#include <xcb/xcb.h>
#endif
#if (QT_VERSION < 0x050000) || (QT_VERSION >= 0x050400)
if (lyxrc.gui_language == "auto") {
theLocale = QLocale::system();
code = fromqstr(theLocale.name());
- // Qt tries to outsmart us and transforms en_US to C.
- if (code == "C")
- code = "en_US";
} else {
Language const * l = languages.getLanguage(lyxrc.gui_language);
- code = l ? l->code() : string();
+ code = l ? l->code() : "C";
theLocale = QLocale(toqstr(code));
}
- Messages::guiLanguage(code);
+ // Qt tries to outsmart us and transforms en_US to C.
+ Messages::guiLanguage((code == "C") ? "en_US" : code);
QLocale::setDefault(theLocale);
setlocale(LC_NUMERIC, "C");
}
namespace {
-struct PngMap {
+struct ImgMap {
QString key;
QString value;
};
-bool operator<(PngMap const & lhs, PngMap const & rhs)
+bool operator<(ImgMap const & lhs, ImgMap const & rhs)
{
return lhs.key < rhs.key;
}
class CompareKey {
public:
CompareKey(QString const & name) : name_(name) {}
- bool operator()(PngMap const & other) const { return other.key == name_; }
+ bool operator()(ImgMap const & other) const { return other.key == name_; }
private:
QString const name_;
};
// Upper case comes before lower case
// Please don't change the formatting, this list is parsed by
// development/tools/generate_symbols_images.py.
-PngMap sorted_png_map[] = {
+ImgMap sorted_img_map[] = {
{ "Arrownot", "arrownot2"},
{ "Arrowvert", "arrowvert2"},
{ "Bowtie", "bowtie2" },
};
-size_t const nr_sorted_png_map = sizeof(sorted_png_map) / sizeof(PngMap);
+size_t const nr_sorted_img_map = sizeof(sorted_img_map) / sizeof(ImgMap);
// This list specifies which system's theme icon is related to which lyx
// command. It was based on:
// http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
// this must be sorted alphabetically
// Upper case comes before lower case
-PngMap sorted_theme_icon_map[] = {
+ImgMap sorted_theme_icon_map[] = {
{ "bookmark-goto 0", "go-jump" },
{ "buffer-new", "document-new" },
- { "buffer-print", "document-print" },
{ "buffer-write", "document-save" },
{ "buffer-write-as", "document-save-as" },
{ "buffer-zoom-in", "zoom-in" },
{ "cut", "edit-cut" },
{ "depth-decrement", "format-indent-less" },
{ "depth-increment", "format-indent-more" },
- { "dialog-show print", "document-print" },
{ "dialog-show spellchecker", "tools-check-spelling" },
{ "dialog-show-new-inset graphics", "insert-image" },
{ "dialog-toggle findreplaceadv", "edit-find-replace" },
{ "window-new", "window-new" }
};
-size_t const nr_sorted_theme_icon_map = sizeof(sorted_theme_icon_map) / sizeof(PngMap);
+size_t const nr_sorted_theme_icon_map = sizeof(sorted_theme_icon_map) / sizeof(ImgMap);
-QString findPng(QString const & name)
+QString findImg(QString const & name)
{
- PngMap const * const begin = sorted_png_map;
- PngMap const * const end = begin + nr_sorted_png_map;
+ ImgMap const * const begin = sorted_img_map;
+ ImgMap const * const end = begin + nr_sorted_img_map;
LATTEST(sorted(begin, end));
- PngMap const * const it = find_if(begin, end, CompareKey(name));
+ ImgMap const * const it = find_if(begin, end, CompareKey(name));
- QString png_name;
+ QString img_name;
if (it != end) {
- png_name = it->value;
+ img_name = it->value;
} else {
- png_name = name;
- png_name.replace('_', "underscore");
- png_name.replace(' ', '_');
+ img_name = name;
+ img_name.replace('_', "underscore");
+ img_name.replace(' ', '_');
// This way we can have "math-delim { }" on the toolbar.
- png_name.replace('(', "lparen");
- png_name.replace(')', "rparen");
- png_name.replace('[', "lbracket");
- png_name.replace(']', "rbracket");
- png_name.replace('{', "lbrace");
- png_name.replace('}', "rbrace");
- png_name.replace('|', "bars");
- png_name.replace(',', "thinspace");
- png_name.replace(':', "mediumspace");
- png_name.replace(';', "thickspace");
- png_name.replace('!', "negthinspace");
+ img_name.replace('(', "lparen");
+ img_name.replace(')', "rparen");
+ img_name.replace('[', "lbracket");
+ img_name.replace(']', "rbracket");
+ img_name.replace('{', "lbrace");
+ img_name.replace('}', "rbrace");
+ img_name.replace('|', "bars");
+ img_name.replace(',', "thinspace");
+ img_name.replace(':', "mediumspace");
+ img_name.replace(';', "thickspace");
+ img_name.replace('!', "negthinspace");
}
- LYXERR(Debug::GUI, "findPng(" << name << ")\n"
- << "Looking for math PNG called \"" << png_name << '"');
- return png_name;
+ LYXERR(Debug::GUI, "findImg(" << name << ")\n"
+ << "Looking for math icon called \"" << img_name << '"');
+ return img_name;
}
} // namespace anon
QString themeIconName(QString const & action)
{
- PngMap const * const begin = sorted_theme_icon_map;
- PngMap const * const end = begin + nr_sorted_theme_icon_map;
+ ImgMap const * const begin = sorted_theme_icon_map;
+ ImgMap const * const end = begin + nr_sorted_theme_icon_map;
LASSERT(sorted(begin, end), /**/);
- PngMap const * const it = find_if(begin, end, CompareKey(action));
+ ImgMap const * const it = find_if(begin, end, CompareKey(action));
if (it != end)
return it->value;
case LFUN_MATH_INSERT:
if (!f.argument().empty()) {
path = "math/";
- name1 = findPng(toqstr(f.argument()).mid(1));
+ name1 = findImg(toqstr(f.argument()).mid(1));
}
break;
case LFUN_MATH_DELIM:
case LFUN_MATH_BIGDELIM:
path = "math/";
- name1 = findPng(toqstr(f.argument()));
+ name1 = findImg(toqstr(f.argument()));
break;
case LFUN_CALL:
path = "commands/";
FileName fname = imageLibFileSearch(imagedir, "unknown", "svgz,png", mode);
if (fname.exists())
return toqstr(fname.absFileName());
- return QString(":/images/unknown.png");
+ return QString(":/images/unknown.svgz");
}
return QString();
}
+
+bool getPixmap(QPixmap & pixmap, QString const & path)
+{
+ if (pixmap.load(path)) {
+#if QT_VERSION >= 0x050000
+ if (path.endsWith(".svgz") || path.endsWith(".svg") ) {
+ GuiApplication const * guiApp = theGuiApp();
+ if (guiApp != 0) {
+ pixmap.setDevicePixelRatio(guiApp->pixelRatio());
+ }
+ }
+#endif
+ return true;
+ }
+ return false;
+}
+
+
QPixmap getPixmap(QString const & path, QString const & name, QString const & ext)
{
- QPixmap pixmap;
QString imagedir = path;
FileName fname = imageLibFileSearch(imagedir, name, ext, theGuiApp()->imageSearchMode());
QString fpath = toqstr(fname.absFileName());
+ QPixmap pixmap = QPixmap();
- if (pixmap.load(fpath)) {
+ if (getPixmap(pixmap, fpath)) {
return pixmap;
- } else {
- QStringList exts = ext.split(",");
- fpath = ":/" + path + name + ".";
- for (int i = 0; i < exts.size(); ++i) {
- if (pixmap.load(fpath + exts.at(i)))
+ }
+
+ QStringList exts = ext.split(",");
+ fpath = ":/" + path + name + ".";
+ for (int i = 0; i < exts.size(); ++i) {
+ if (getPixmap(pixmap, fpath + exts.at(i))) {
return pixmap;
- }
+ }
}
bool const list = ext.contains(",");
return QPixmap();
}
+
QIcon getIcon(FuncRequest const & f, bool unknown)
{
#if (QT_VERSION >= 0x040600)
return QIcon();
//LYXERR(Debug::GUI, "Found icon: " << icon);
- QPixmap pm;
- if (!pm.load(icon)) {
+ QPixmap pixmap = QPixmap();
+ if (!getPixmap(pixmap,icon)) {
LYXERR0("Cannot load icon " << icon << " please verify resource system!");
return QIcon();
}
- return QIcon(pm);
+ return QIcon(pixmap);
}
///
KeyModifier meta_fake_bit;
+ /// The result of last dispatch action
+ DispatchResult dispatch_result_;
+
/// Multiple views container.
/**
* Warning: This must not be a smart pointer as the destruction of the
// Install translator for GUI elements.
installTranslator(&d->qt_trans_);
+#ifdef QPA_XCB
+ // Enable reception of XCB events.
+ installNativeEventFilter(this);
+#endif
+
// FIXME: quitOnLastWindowClosed is true by default. We should have a
// lyxrc setting for this in order to let the application stay resident.
// But then we need some kind of dock icon, at least on Windows.
/// Only needed with Qt/Mac.
installTranslator(new MenuTranslator(this));
///
- setupApplescript();
+ setupApplescript();
#endif
#if defined(Q_WS_X11) || defined(QPA_XCB)
docstring Application::mathIcon(docstring const & c)
{
- return qstring_to_ucs4(findPng(toqstr(c)));
+ return qstring_to_ucs4(findImg(toqstr(c)));
}
}
-void GuiApplication::dispatch(FuncRequest const & cmd)
+DispatchResult const & GuiApplication::dispatch(FuncRequest const & cmd)
{
Buffer * buffer = 0;
if (current_view_ && current_view_->currentBufferView()) {
// the buffer may have been closed by one action
if (theBufferList().isLoaded(buffer))
buffer->undo().endUndoGroup();
+
+ d->dispatch_result_ = dr;
+ return d->dispatch_result_;
}
// if the current buffer is not that one, switch to it.
BufferView * doc_bv = current_view_ ?
current_view_->documentBufferView() : 0;
+ Cursor const old = doc_bv->cursor();
if (!doc_bv || doc_bv->buffer().fileName() != tmp.filename) {
if (switchToBuffer) {
dispatch(FuncRequest(LFUN_BUFFER_SWITCH, file));
tmp.bottom_pit, tmp.bottom_pos, tmp.top_id, tmp.top_pos))
return;
+ Cursor & cur = doc_bv->cursor();
+ if (cur != old)
+ notifyCursorLeavesOrEnters(old, cur);
+
// bm changed
if (idx == 0)
return;
// Cursor jump succeeded!
- Cursor const & cur = doc_bv->cursor();
pit_type new_pit = cur.pit();
pos_type new_pos = cur.pos();
int new_id = cur.paragraph().id();
}
// Make sure we don't keep old colors in cache.
d->color_cache_.clear();
+ // Update the current view
+ lyx::dispatch(FuncRequest(LFUN_SCREEN_FONT_UPDATE));
break;
}
if (current_view_ == 0)
createView();
}
+ // fall through
}
default:
}
if (func.action() == LFUN_UNKNOWN_ACTION) {
- // Hmm, we didn't match any of the keysequences. See
- // if it's normal insertable text not already covered
- // by a binding
+ // We didn't match any of the key sequences.
+ // See if it's normal insertable text not already
+ // covered by a binding
if (keysym.isText() && d->keyseq.length() == 1) {
+ // Non-printable characters (such as ASCII control characters)
+ // must not be inserted (#5704)
+ if (!isPrintable(encoded_last_key)) {
+ LYXERR(Debug::KEY, "Non-printable character! Omitting.");
+ if (current_view_)
+ current_view_->restartCursor();
+ return;
+ }
+ // The following modifier check is not needed on Mac.
+ // The keysym is either not text or it is different
+ // from the non-modifier keysym. See #9875 for the
+ // broken alt-modifier effect of having this code active.
+#if !defined(Q_OS_MAC)
+ // If a non-Shift Modifier is used we have a non-bound key sequence
+ // (such as Alt+j = j). This should be omitted (#5575).
+ // On Windows, AltModifier and ControlModifier are both
+ // set when AltGr is pressed. Therefore, in order to not
+ // break AltGr-bound symbols (see #5575 for details),
+ // unbound Ctrl+Alt key sequences are allowed.
+ if ((state & AltModifier || state & ControlModifier || state & MetaModifier)
+#if defined(Q_OS_WIN) || defined(Q_CYGWIN_WIN)
+ && !(state & AltModifier && state & ControlModifier)
+#endif
+ )
+ {
+ if (current_view_) {
+ current_view_->message(_("Unknown function."));
+ current_view_->restartCursor();
+ }
+ return;
+ }
+#endif
+ // Since all checks above were passed, we now really have text that
+ // is to be inserted (e.g., AltGr-bound symbols). Thus change the
+ // func to LFUN_SELF_INSERT and thus cause the text to be inserted
+ // below.
LYXERR(Debug::KEY, "isText() is true, inserting.");
- func = FuncRequest(LFUN_SELF_INSERT,
- FuncRequest::KEYBOARD);
+ func = FuncRequest(LFUN_SELF_INSERT, FuncRequest::KEYBOARD);
} else {
- LYXERR(Debug::KEY, "Unknown, !isText() - giving up");
+ LYXERR(Debug::KEY, "Unknown Action and not isText() -- giving up");
if (current_view_) {
current_view_->message(_("Unknown function."));
current_view_->restartCursor();
#ifdef Q_OS_MAC
#if QT_VERSION > 0x040600
setAttribute(Qt::AA_MacDontSwapCtrlAndMeta,lyxrc.mac_dontswap_ctrl_meta);
+#endif
+#if QT_VERSION > 0x050100
+ setAttribute(Qt::AA_UseHighDpiPixmaps,true);
#endif
// Create the global default menubar which is shown for the dialogs
// and if no GuiView is visible.
QStandardItemModel * lang_model = new QStandardItemModel(this);
lang_model->insertColumns(0, 3);
- int current_row;
QIcon speller(getPixmap("images/", "dialog-show_spellchecker", "svgz,png"));
QIcon saurus(getPixmap("images/", "thesaurus-entry", "svgz,png"));
Languages::const_iterator it = lyx::languages.begin();
Languages::const_iterator end = lyx::languages.end();
for (; it != end; ++it) {
- current_row = lang_model->rowCount();
+ int current_row = lang_model->rowCount();
lang_model->insertRows(current_row, 1);
QModelIndex pl_item = lang_model->index(current_row, 0);
QModelIndex sp_item = lang_model->index(current_row, 1);
void GuiApplication::commitData(QSessionManager & sm)
{
- /// The implementation is required to avoid an application exit
- /// when session state save is triggered by session manager.
- /// The default implementation sends a close event to all
- /// visible top level widgets when session managment allows
- /// interaction.
- /// We are changing that to close all wiew one by one.
- /// FIXME: verify if the default implementation is enough now.
+ /** The implementation is required to avoid an application exit
+ ** when session state save is triggered by session manager.
+ ** The default implementation sends a close event to all
+ ** visible top level widgets when session managment allows
+ ** interaction.
+ ** We are changing that to check the state of each buffer in all
+ ** views and ask the users what to do if buffers are dirty.
+ ** Furthermore, we save the session state.
+ ** We do NOT close the views here since the user still can cancel
+ ** the logout process (see #9277); also, this would hide LyX from
+ ** an OSes own session handling (application restoration).
+ **/
#ifdef QT_NO_SESSIONMANAGER
#ifndef _MSC_VER
#warning Qt is compiled without session manager
#endif
(void) sm;
#else
- if (sm.allowsInteraction() && !closeAllViews())
+ if (sm.allowsInteraction() && !prepareAllViewsForLogout())
sm.cancel();
+ else
+ sm.release();
#endif
}
void GuiApplication::unregisterView(GuiView * gv)
{
- LAPPERR(d->views_[gv->id()] == gv);
- d->views_.remove(gv->id());
- if (current_view_ == gv)
- current_view_ = 0;
+ if(d->views_.contains(gv->id()) && d->views_.value(gv->id()) == gv) {
+ d->views_.remove(gv->id());
+ if (current_view_ == gv)
+ current_view_ = 0;
+ }
}
}
+bool GuiApplication::prepareAllViewsForLogout()
+{
+ if (d->views_.empty())
+ return true;
+
+ QList<GuiView *> const views = d->views_.values();
+ foreach (GuiView * view, views) {
+ if (!view->prepareAllBuffersForLogout())
+ return false;
+ }
+
+ return true;
+}
+
+
GuiView & GuiApplication::view(int id) const
{
LAPPERR(d->views_.contains(id));
//
// X11 specific stuff goes here...
-// FIXME QT5
#ifdef Q_WS_X11
bool GuiApplication::x11EventFilter(XEvent * xev)
{
}
return false;
}
+#elif defined(QPA_XCB)
+bool GuiApplication::nativeEventFilter(const QByteArray & eventType,
+ void * message, long *)
+{
+ if (!current_view_ || eventType != "xcb_generic_event_t")
+ return false;
+
+ xcb_generic_event_t * ev = static_cast<xcb_generic_event_t *>(message);
+
+ switch (ev->response_type) {
+ case XCB_SELECTION_REQUEST: {
+ xcb_selection_request_event_t * srev =
+ reinterpret_cast<xcb_selection_request_event_t *>(ev);
+ if (srev->selection != XCB_ATOM_PRIMARY)
+ break;
+ LYXERR(Debug::SELECTION, "X requested selection.");
+ BufferView * bv = current_view_->currentBufferView();
+ if (bv) {
+ docstring const sel = bv->requestSelection();
+ if (!sel.empty())
+ d->selection_.put(sel);
+ }
+ break;
+ }
+ case XCB_SELECTION_CLEAR: {
+ xcb_selection_clear_event_t * scev =
+ reinterpret_cast<xcb_selection_clear_event_t *>(ev);
+ if (scev->selection != XCB_ATOM_PRIMARY)
+ break;
+ LYXERR(Debug::SELECTION, "Lost selection.");
+ BufferView * bv = current_view_->currentBufferView();
+ if (bv)
+ bv->clearSelection();
+ break;
+ }
+ }
+ return false;
+}
#endif
} // namespace frontend
projects / lyx.git / blobdiff