X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiClipboard.cpp;h=297b828948e45612d0a50456fcfe8ddfe70f4526;hb=8e7d7e42952f0119db1c192386a63d1d9ede3b7f;hp=faf330dc9b5b6b3f5b6a38f85491fdb667b523d4;hpb=2bf1c09376de37a3d66b79ca5f4304f29d5b4d06;p=lyx.git diff --git a/src/frontends/qt4/GuiClipboard.cpp b/src/frontends/qt4/GuiClipboard.cpp index faf330dc9b..297b828948 100644 --- a/src/frontends/qt4/GuiClipboard.cpp +++ b/src/frontends/qt4/GuiClipboard.cpp @@ -17,18 +17,23 @@ #include "GuiClipboard.h" #include "qt_helpers.h" -#include "frontends/alert.h" - #include "Buffer.h" #include "BufferView.h" #include "Cursor.h" +#include "support/lassert.h" #include "support/convert.h" #include "support/debug.h" #include "support/filetools.h" -#include "support/FileFilterList.h" #include "support/gettext.h" #include "support/lstrings.h" +#include "support/lyxtime.h" + +#ifdef Q_WS_MACX +#include "support/linkback/LinkBackProxy.h" +#endif // Q_WS_MACX + +#include "frontends/alert.h" #include #include @@ -36,93 +41,64 @@ #include #include #include -#include #include #include #include -#include "boost/assert.hpp" - +#include #include - -#ifdef Q_WS_MACX -#include "support/linkback/LinkBackProxy.h" -#endif // Q_WS_MACX +#include using namespace std; using namespace lyx::support; -static char const * const lyx_mime_type = "application/x-lyx"; -static char const * const pdf_mime_type = "application/pdf"; namespace lyx { namespace frontend { -#ifdef Q_WS_MACX - -class QMacPasteboardMimeGraphics : public QMacPasteboardMime { -public: - QMacPasteboardMimeGraphics() - : QMacPasteboardMime(MIME_QT_CONVERTOR|MIME_ALL) {} - ~QMacPasteboardMimeGraphics() {} - QString convertorName(); - QString flavorFor(const QString &mime); - QString mimeFor(QString flav); - bool canConvert(const QString &mime, QString flav); - QVariant convertToMime(const QString &mime, QList data, QString flav); - QList convertFromMime(const QString &mime, QVariant data, QString flav); -}; - - -QString QMacPasteboardMimeGraphics::convertorName() -{ - return "Graphics"; -} - - -QString QMacPasteboardMimeGraphics::flavorFor(const QString &mime) -{ - LYXERR(Debug::ACTION, "flavorFor " << fromqstr(mime)); - if (mime == QLatin1String(pdf_mime_type)) - return QLatin1String("com.adobe.pdf"); - return QString(); -} - - -QString QMacPasteboardMimeGraphics::mimeFor(QString flav) -{ - LYXERR(Debug::ACTION, "mimeFor " << fromqstr(flav)); - if (flav == QLatin1String("com.adobe.pdf")) - return QLatin1String(pdf_mime_type); - return QString(); -} - - -bool QMacPasteboardMimeGraphics::canConvert(const QString &mime, QString flav) +static QMimeData const * read_clipboard() { - return mimeFor(flav) == mime; + LYXERR(Debug::ACTION, "Getting Clipboard"); + QMimeData const * source = + qApp->clipboard()->mimeData(QClipboard::Clipboard); + if (!source) { + LYXERR0("0 bytes (no QMimeData)"); + return new QMimeData(); + } + // It appears that doing IO between getting a mimeData object + // and using it can cause a crash (maybe Qt used IO + // as an excuse to free() it? Anyway let's not introduce + // any new IO here, so e.g. leave the following line commented. + // lyxerr << "Got Clipboard (" << (long) source << ")\n" ; + return source; } -QVariant QMacPasteboardMimeGraphics::convertToMime(const QString &mime, QList data, QString) +void CacheMimeData::update() { - if(data.count() > 1) - qWarning("QMacPasteboardMimeGraphics: Cannot handle multiple member data"); - return data.first(); + time_t const start_time = current_time(); + LYXERR(Debug::ACTION, "Creating CacheMimeData object"); + cached_formats_ = read_clipboard()->formats(); + + // Qt times out after 5 seconds if it does not recieve a response. + if (current_time() - start_time > 3) { + LYXERR0("No timely response from clipboard, perhaps process " + << "holding clipboard is frozen?"); + } } -QList QMacPasteboardMimeGraphics::convertFromMime(const QString &mime, QVariant data, QString) +QByteArray CacheMimeData::data(QString const & mimeType) const { - QList ret; - ret.append(data.toByteArray()); - return ret; + return read_clipboard()->data(mimeType); } -static QMacPasteboardMimeGraphics * graphicsPasteboardMime; -#endif // Q_WS_MACX +QString const lyxMimeType(){ return "application/x-lyx"; } +QString const pdfMimeType(){ return "application/pdf"; } +QString const emfMimeType(){ return "image/x-emf"; } +QString const wmfMimeType(){ return "image/x-wmf"; } GuiClipboard::GuiClipboard() @@ -131,19 +107,6 @@ GuiClipboard::GuiClipboard() this, SLOT(on_dataChanged())); // initialize clipboard status. on_dataChanged(); - -#ifdef Q_WS_MACX - if (!graphicsPasteboardMime) - graphicsPasteboardMime = new QMacPasteboardMimeGraphics(); -#endif // Q_WS_MACX -} - - -GuiClipboard::~GuiClipboard() -{ -#ifdef Q_WS_MACX - closeAllLinkBackLinks(); -#endif // Q_WS_MACX } @@ -152,16 +115,9 @@ string const GuiClipboard::getAsLyX() const LYXERR(Debug::ACTION, "GuiClipboard::getAsLyX(): `"); // We don't convert encodings here since the encoding of the // clipboard contents is specified in the data itself - QMimeData const * source = - qApp->clipboard()->mimeData(QClipboard::Clipboard); - if (!source) { - LYXERR(Debug::ACTION, "' (no QMimeData)"); - return string(); - } - - if (source->hasFormat(lyx_mime_type)) { + if (cache_.hasFormat(lyxMimeType())) { // data from ourself or some other LyX instance - QByteArray const ar = source->data(lyx_mime_type); + QByteArray const ar = cache_.data(lyxMimeType()); string const s(ar.data(), ar.count()); LYXERR(Debug::ACTION, s << "'"); return s; @@ -176,6 +132,10 @@ FileName GuiClipboard::getPastedGraphicsFileName(Cursor const & cur, { // create file dialog filter according to the existing types in the clipboard vector types; + if (hasGraphicsContents(Clipboard::EmfGraphicsType)) + types.push_back(Clipboard::EmfGraphicsType); + if (hasGraphicsContents(Clipboard::WmfGraphicsType)) + types.push_back(Clipboard::WmfGraphicsType); if (hasGraphicsContents(Clipboard::LinkBackGraphicsType)) types.push_back(Clipboard::LinkBackGraphicsType); if (hasGraphicsContents(Clipboard::PdfGraphicsType)) @@ -185,7 +145,7 @@ FileName GuiClipboard::getPastedGraphicsFileName(Cursor const & cur, if (hasGraphicsContents(Clipboard::JpegGraphicsType)) types.push_back(Clipboard::JpegGraphicsType); - BOOST_ASSERT(!types.empty()); + LASSERT(!types.empty(), /**/); // select prefered type if AnyGraphicsType was passed if (type == Clipboard::AnyGraphicsType) @@ -195,24 +155,27 @@ FileName GuiClipboard::getPastedGraphicsFileName(Cursor const & cur, map extensions; map typeNames; + extensions[Clipboard::EmfGraphicsType] = "emf"; + extensions[Clipboard::WmfGraphicsType] = "wmf"; extensions[Clipboard::LinkBackGraphicsType] = "linkback"; extensions[Clipboard::PdfGraphicsType] = "pdf"; extensions[Clipboard::PngGraphicsType] = "png"; extensions[Clipboard::JpegGraphicsType] = "jpeg"; + typeNames[Clipboard::EmfGraphicsType] = _("Enhanced Metafile"); + typeNames[Clipboard::WmfGraphicsType] = _("Windows Metafile"); typeNames[Clipboard::LinkBackGraphicsType] = _("LinkBack PDF"); typeNames[Clipboard::PdfGraphicsType] = _("PDF"); typeNames[Clipboard::PngGraphicsType] = _("PNG"); typeNames[Clipboard::JpegGraphicsType] = _("JPEG"); // find unused filename with primary extension - string document_path = cur.buffer().fileName().onlyPath().absFilename(); + string document_path = cur.buffer()->fileName().onlyPath().absFileName(); unsigned newfile_number = 0; FileName filename; do { ++newfile_number; - filename - = FileName(addName(document_path, + filename = FileName(addName(document_path, to_utf8(_("pasted")) + convert(newfile_number) + "." + extensions[type])); @@ -220,27 +183,27 @@ FileName GuiClipboard::getPastedGraphicsFileName(Cursor const & cur, while (true) { // create file type filter, putting the prefered on to the front - docstring filterSpec; - for (unsigned i = 0; i < types.size(); ++i) { + QStringList filter; + for (size_t i = 0; i != types.size(); ++i) { docstring s = bformat(_("%1$s Files"), typeNames[types[i]]) - + " (*." + from_ascii(extensions[types[i]]) + ")"; + + " (*." + from_ascii(extensions[types[i]]) + ")"; if (types[i] == type) - filterSpec = s + filterSpec; + filter.prepend(toqstr(s)); else - filterSpec += ";;" + s; + filter.append(toqstr(s)); } - FileFilterList const filter(filterSpec); + filter = fileFilters(filter.join(";;")); // show save dialog for the graphic - FileDialog dlg(_("Choose a filename to save the pasted graphic as")); + FileDialog dlg(qt_("Choose a filename to save the pasted graphic as")); FileDialog::Result result = - dlg.save(from_utf8(filename.onlyPath().absFilename()), filter, - from_utf8(filename.onlyFileName())); + dlg.save(toqstr(filename.onlyPath().absFileName()), filter, + toqstr(filename.onlyFileName())); if (result.first == FileDialog::Later) return FileName(); - string newFilename = to_utf8(result.second); + string newFilename = fromqstr(result.second); if (newFilename.empty()) { cur.bv().message(_("Canceled.")); return FileName(); @@ -248,12 +211,12 @@ FileName GuiClipboard::getPastedGraphicsFileName(Cursor const & cur, filename.set(newFilename); // check the extension (the user could have changed it) - if (!suffixIs(ascii_lowercase(filename.absFilename()), + if (!suffixIs(ascii_lowercase(filename.absFileName()), "." + extensions[type])) { // the user changed the extension. Check if the type is available - unsigned i; - for (i = 1; i < types.size(); ++i) { - if (suffixIs(ascii_lowercase(filename.absFilename()), + size_t i; + for (i = 1; i != types.size(); ++i) { + if (suffixIs(ascii_lowercase(filename.absFileName()), "." + extensions[types[i]])) { type = types[i]; break; @@ -273,8 +236,8 @@ FileName GuiClipboard::getPastedGraphicsFileName(Cursor const & cur, break; int ret = frontend::Alert::prompt( _("Overwrite external file?"), - bformat(_("File %1$s already exists, do you want to overwrite it"), - from_utf8(filename.absFilename())), 1, 1, _("&Overwrite"), _("&Cancel")); + bformat(_("File %1$s already exists, do you want to overwrite it?"), + from_utf8(filename.absFileName())), 1, 1, _("&Overwrite"), _("&Cancel")); if (ret == 0) // overwrite, hence break the dialog loop break; @@ -307,43 +270,37 @@ FileName GuiClipboard::getAsGraphics(Cursor const & cur, GraphicsType type) cons QBuffer buffer(&ar); buffer.open(QIODevice::WriteOnly); if (type == PngGraphicsType) - image.save(toqstr(filename.absFilename()), "PNG"); + image.save(toqstr(filename.absFileName()), "PNG"); else if (type == JpegGraphicsType) - image.save(toqstr(filename.absFilename()), "JPEG"); + image.save(toqstr(filename.absFileName()), "JPEG"); else - BOOST_ASSERT(false); + LASSERT(false, /**/); return filename; } - // get mime data - QMimeData const * source = - qApp->clipboard()->mimeData(QClipboard::Clipboard); - if (!source) { - LYXERR(Debug::ACTION, "0 bytes (no QMimeData)"); - return FileName(); - } - // get mime for type QString mime; switch (type) { - case PdfGraphicsType: mime = pdf_mime_type; break; - case LinkBackGraphicsType: mime = pdf_mime_type; break; - default: BOOST_ASSERT(false); + case PdfGraphicsType: mime = pdfMimeType(); break; + case LinkBackGraphicsType: mime = pdfMimeType(); break; + case EmfGraphicsType: mime = emfMimeType(); break; + case WmfGraphicsType: mime = wmfMimeType(); break; + default: LASSERT(false, /**/); } // get data - if (!source->hasFormat(mime)) + if (!cache_.hasFormat(mime)) return FileName(); // data from ourself or some other LyX instance - QByteArray const ar = source->data(mime); + QByteArray const ar = cache_.data(mime); LYXERR(Debug::ACTION, "Getting from clipboard: mime = " << mime.data() << "length = " << ar.count()); - QFile f(toqstr(filename.absFilename())); + QFile f(toqstr(filename.absFileName())); if (!f.open(QIODevice::WriteOnly | QIODevice::Truncate)) { LYXERR(Debug::ACTION, "Error opening file " - << filename.absFilename() << " for writing"); + << filename.absFileName() << " for writing"); return FileName(); } @@ -360,7 +317,7 @@ FileName GuiClipboard::getAsGraphics(Cursor const & cur, GraphicsType type) cons ds << pdfLen; // big endian by default #else // only non-Mac this should never happen - BOOST_ASSERT(false); + LASSERT(false, /**/); #endif // Q_WS_MACX } @@ -374,11 +331,11 @@ docstring const GuiClipboard::getAsText() const // text data from other applications QString const str = qApp->clipboard()->text(QClipboard::Clipboard) .normalized(QString::NormalizationForm_C); - LYXERR(Debug::ACTION, "GuiClipboard::getAsText(): `" << fromqstr(str) << "'"); + LYXERR(Debug::ACTION, "GuiClipboard::getAsText(): `" << str << "'"); if (str.isNull()) return docstring(); - return internalLineEnding(qstring_to_ucs4(str)); + return internalLineEnding(str); } @@ -391,7 +348,7 @@ void GuiClipboard::put(string const & lyx, docstring const & text) QMimeData * data = new QMimeData; if (!lyx.empty()) { QByteArray const qlyx(lyx.c_str(), lyx.size()); - data->setData(lyx_mime_type, qlyx); + data->setData(lyxMimeType(), qlyx); } // Don't test for text.empty() since we want to be able to clear the // clipboard. @@ -403,9 +360,13 @@ void GuiClipboard::put(string const & lyx, docstring const & text) bool GuiClipboard::hasLyXContents() const { - QMimeData const * const source = - qApp->clipboard()->mimeData(QClipboard::Clipboard); - return source && source->hasFormat(lyx_mime_type); + return cache_.hasFormat(lyxMimeType()); +} + + +bool GuiClipboard::hasTextContents() const +{ + return cache_.hasText(); } @@ -415,40 +376,39 @@ bool GuiClipboard::hasGraphicsContents(Clipboard::GraphicsType type) const return hasGraphicsContents(PdfGraphicsType) || hasGraphicsContents(PngGraphicsType) || hasGraphicsContents(JpegGraphicsType) + || hasGraphicsContents(EmfGraphicsType) + || hasGraphicsContents(WmfGraphicsType) || hasGraphicsContents(LinkBackGraphicsType); } - QMimeData const * const source = - qApp->clipboard()->mimeData(QClipboard::Clipboard); - // handle image cases first if (type == PngGraphicsType || type == JpegGraphicsType) - return source->hasImage(); + return cache_.hasImage(); // handle LinkBack for Mac -#ifdef Q_WS_MACX if (type == LinkBackGraphicsType) +#ifdef Q_WS_MACX return isLinkBackDataInPasteboard(); #else - if (type == LinkBackGraphicsType) return false; #endif // Q_WS_MACX // get mime data - QStringList const & formats = source->formats(); + QStringList const & formats = cache_.formats(); LYXERR(Debug::ACTION, "We found " << formats.size() << " formats"); - for (int i = 0; i < formats.size(); ++i) { - LYXERR(Debug::ACTION, "Found format " << fromqstr(formats[i])); - } + for (int i = 0; i < formats.size(); ++i) + LYXERR(Debug::ACTION, "Found format " << formats[i]); // compute mime for type QString mime; switch (type) { - case PdfGraphicsType: mime = pdf_mime_type; break; - default: BOOST_ASSERT(false); + case EmfGraphicsType: mime = emfMimeType(); break; + case WmfGraphicsType: mime = wmfMimeType(); break; + case PdfGraphicsType: mime = pdfMimeType(); break; + default: LASSERT(false, /**/); } - return source && source->hasFormat(mime); + return cache_.hasFormat(mime); } @@ -477,13 +437,17 @@ bool GuiClipboard::hasInternal() const void GuiClipboard::on_dataChanged() { - QMimeData const * const source = - qApp->clipboard()->mimeData(QClipboard::Clipboard); - QStringList l = source->formats(); + //Note: we do not really need to run cache_.update() unless the + //data has been changed *and* the GuiClipboard has been queried. + //However if run cache_.update() the moment a process grabs the + //clipboard, the process holding the clipboard presumably won't + //yet be frozen, and so we won't need to wait 5 seconds for Qt + //to time-out waiting for the clipboard. + cache_.update(); + QStringList l = cache_.formats(); LYXERR(Debug::ACTION, "Qt Clipboard changed. We found the following mime types:"); - for (int i = 0; i < l.count(); i++) { - LYXERR(Debug::ACTION, fromqstr(l.value(i))); - } + for (int i = 0; i < l.count(); i++) + LYXERR(Debug::ACTION, l.value(i)); text_clipboard_empty_ = qApp->clipboard()-> text(QClipboard::Clipboard).isEmpty(); @@ -507,4 +471,4 @@ bool GuiClipboard::empty() const } // namespace frontend } // namespace lyx -#include "GuiClipboard_moc.cpp" +#include "moc_GuiClipboard.cpp"