AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correctly define standard XA_FOO atoms

Browse Source
This commit is contained in:
Lars Knoll 2011-05-22 23:50:32 +02:00
parent 1b1142b305
commit 28ab03741e
4 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/platforms/xcb/qxcbconnection.cpp
View File

@ -583,12 +583,9 @@ static const char * xcb_atomnames = {
"_NET_ACTIVE_WINDOW\0"
// Property formats
"XA_STRING\0"
"COMPOUND_TEXT\0"
"TEXT\0"
"UTF8_STRING\0"
"XA_PIXMAP\0"
"XA_BITMAP\0"
// xdnd
"XdndEnter\0"

9
src/plugins/platforms/xcb/qxcbconnection.h
View File

@ -57,6 +57,12 @@ class QXcbWindow;
typedef QHash<xcb_window_t, QXcbWindow *> WindowMapper;
namespace QXcbAtom {
static const xcb_atom_t XA_PRIMARY = 1;
static const xcb_atom_t XA_SECONDARY = 2;
static const xcb_atom_t XA_PIXMAP = 20;
static const xcb_atom_t XA_BITMAP = 5;
static const xcb_atom_t XA_STRING = 32;
enum Atom {
// window-manager <-> client protocols
WM_PROTOCOLS,
@ -164,12 +170,9 @@ namespace QXcbAtom {
_NET_ACTIVE_WINDOW,
// Property formats
XA_STRING,
COMPOUND_TEXT,
TEXT,
UTF8_STRING,
XA_PIXMAP,
XA_BITMAP,
// Xdnd
XdndEnter,

32
src/plugins/platforms/xcb/qxcbmime.cpp
View File

@ -66,14 +66,14 @@ QString QXcbMime::mimeAtomToString(QXcbConnection *connection, xcb_atom_t a)
return 0;
// special cases for string type
if (a == connection->atom(QXcbAtom::XA_STRING)
|| a == connection->atom(QXcbAtom::UTF8_STRING)
|| a == connection->atom(QXcbAtom::TEXT)
|| a == connection->atom(QXcbAtom::COMPOUND_TEXT))
if (a == QXcbAtom::XA_STRING
|| a == connection->atom(QXcbAtom::UTF8_STRING)
|| a == connection->atom(QXcbAtom::TEXT)
|| a == connection->atom(QXcbAtom::COMPOUND_TEXT))
return QLatin1String("text/plain");
// special case for images
if (a == connection->atom(QXcbAtom::XA_PIXMAP))
if (a == QXcbAtom::XA_PIXMAP)
return QLatin1String("image/ppm");
QByteArray atomName = connection->atomName(a);
@ -96,14 +96,14 @@ bool QXcbMime::mimeDataForAtom(QXcbConnection *connection, xcb_atom_t a, QMimeDa
*dataFormat = 8;
if ((a == connection->atom(QXcbAtom::UTF8_STRING)
|| a == connection->atom(QXcbAtom::XA_STRING)
|| a == QXcbAtom::XA_STRING
|| a == connection->atom(QXcbAtom::TEXT)
|| a == connection->atom(QXcbAtom::COMPOUND_TEXT))
&& QInternalMimeData::hasFormatHelper(QLatin1String("text/plain"), mimeData)) {
if (a == connection->atom(QXcbAtom::UTF8_STRING)){
*data = QInternalMimeData::renderDataHelper(QLatin1String("text/plain"), mimeData);
ret = true;
} else if (a == connection->atom(QXcbAtom::XA_STRING)) {
} else if (a == QXcbAtom::XA_STRING) {
*data = QString::fromUtf8(QInternalMimeData::renderDataHelper(
QLatin1String("text/plain"), mimeData)).toLocal8Bit();
ret = true;
@ -145,7 +145,7 @@ bool QXcbMime::mimeDataForAtom(QXcbConnection *connection, xcb_atom_t a, QMimeDa
mozUri += QLatin1Char('\n');
*data = QByteArray(reinterpret_cast<const char *>(mozUri.utf16()), mozUri.length() * 2);
ret = true;
} else if ((a == connection->atom(QXcbAtom::XA_PIXMAP) || a == connection->atom(QXcbAtom::XA_BITMAP)) && mimeData->hasImage()) {
} else if ((a == QXcbAtom::XA_PIXMAP || a == QXcbAtom::XA_BITMAP) && mimeData->hasImage()) {
ret = true;
}
return ret;
@ -159,7 +159,7 @@ QList<xcb_atom_t> QXcbMime::mimeAtomsForFormat(QXcbConnection *connection, const
// special cases for strings
if (format == QLatin1String("text/plain")) {
atoms.append(connection->atom(QXcbAtom::UTF8_STRING));
atoms.append(connection->atom(QXcbAtom::XA_STRING));
atoms.append(QXcbAtom::XA_STRING);
atoms.append(connection->atom(QXcbAtom::TEXT));
atoms.append(connection->atom(QXcbAtom::COMPOUND_TEXT));
}
@ -170,9 +170,9 @@ QList<xcb_atom_t> QXcbMime::mimeAtomsForFormat(QXcbConnection *connection, const
//special cases for images
if (format == QLatin1String("image/ppm"))
atoms.append(connection->atom(QXcbAtom::XA_PIXMAP));
atoms.append(QXcbAtom::XA_PIXMAP);
if (format == QLatin1String("image/pbm"))
atoms.append(connection->atom(QXcbAtom::XA_BITMAP));
atoms.append(QXcbAtom::XA_BITMAP);
return atoms;
}
@ -200,7 +200,7 @@ QVariant QXcbMime::mimeConvertToFormat(QXcbConnection *connection, xcb_atom_t a,
if (format == QLatin1String("text/plain")) {
if (a == connection->atom(QXcbAtom::UTF8_STRING))
return QString::fromUtf8(data);
if (a == connection->atom(QXcbAtom::XA_STRING))
if (a == QXcbAtom::XA_STRING)
return QString::fromLatin1(data);
if (a == connection->atom(QXcbAtom::TEXT)
|| a == connection->atom(QXcbAtom::COMPOUND_TEXT))
@ -267,8 +267,8 @@ xcb_atom_t QXcbMime::mimeAtomForFormat(QXcbConnection *connection, const QString
return connection->atom(QXcbAtom::COMPOUND_TEXT);
if (atoms.contains(connection->atom(QXcbAtom::TEXT)))
return connection->atom(QXcbAtom::TEXT);
if (atoms.contains(connection->atom(QXcbAtom::XA_STRING)))
return connection->atom(QXcbAtom::XA_STRING);
if (atoms.contains(QXcbAtom::XA_STRING))
return QXcbAtom::XA_STRING;
}
// find matches for uri types
@ -283,8 +283,8 @@ xcb_atom_t QXcbMime::mimeAtomForFormat(QXcbConnection *connection, const QString
// find match for image
if (format == QLatin1String("image/ppm")) {
if (atoms.contains(connection->atom(QXcbAtom::XA_PIXMAP)))
return connection->atom(QXcbAtom::XA_PIXMAP);
if (atoms.contains(QXcbAtom::XA_PIXMAP))
return QXcbAtom::XA_PIXMAP;
}
// for string/text requests try to use a format with a well-defined charset

2
src/plugins/platforms/xcb/xcb.pro
View File

@ -6,6 +6,7 @@ QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms
QT += core-private gui-private
SOURCES = \
# qxcbclipboard.cpp \
qxcbconnection.cpp \
qxcbintegration.cpp \
qxcbkeyboard.cpp \
@ -17,6 +18,7 @@ SOURCES = \
qxcbnativeinterface.cpp
HEADERS = \
# qxcbclipboard.h \
qxcbconnection.h \
qxcbintegration.h \
qxcbkeyboard.h \