pool/kwindowsystem
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kwindowsystem?expand=0&rev=38

Browse Source
This commit is contained in:
Hrvoje Senjan 2014-09-24 20:08:59 +00:00 committed by Git OBS Bridge
parent 653c1b27b2
commit 659a127469
1 changed files with 0 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
0007-Add-support-for-protocols-to-NETWinInfo.patch
View File

@ -16,154 +16,12 @@ So far the following protocols are supported:
REVIEW: 120213
CHANGELOG: NETWinInfo provides convenient wrapper for WM_PROTOCOLS.
---
autotests/netwininfotestclient.cpp | 123 +++++++++++++++++++++++++++++++++++++
src/netwm.cpp | 46 +++++++++++++-
src/netwm.h | 13 ++++
src/netwm_def.h | 19 ++++++
src/netwm_p.h | 1 +
5 files changed, 201 insertions(+), 1 deletion(-)
diff --git a/autotests/netwininfotestclient.cpp b/autotests/netwininfotestclient.cpp
index 7d941f4..2795cbf 100644
--- a/autotests/netwininfotestclient.cpp
+++ b/autotests/netwininfotestclient.cpp
@@ -84,6 +84,8 @@ private Q_SLOTS:
void testInput_data();
void testInput();
void testTransientFor();
+ void testProtocols_data();
+ void testProtocols();
private:
void performNameTest(xcb_atom_t atom, const char *(NETWinInfo:: *getter)(void)const, void (NETWinInfo:: *setter)(const char *), NET::Property property);
@@ -838,6 +840,127 @@ void NetWinInfoTestClient::testActivities()
QTEST(QByteArray(info.activities()), "expectedActivities");
}
+Q_DECLARE_METATYPE(NET::Protocols)
+void NetWinInfoTestClient::testProtocols_data()
+{
+ QTest::addColumn<NET::Protocols>("protocols");
+ QTest::addColumn<bool>("takeFocus");
+ QTest::addColumn<bool>("deleteWindow");
+ QTest::addColumn<bool>("ping");
+ QTest::addColumn<bool>("sync");
+ QTest::addColumn<bool>("context");
+
+ const NET::Protocol t = NET::TakeFocusProtocol;
+ const NET::Protocol d = NET::DeleteWindowProtocol;
+ const NET::Protocol p = NET::PingProtocol;
+ const NET::Protocol s = NET::SyncRequestProtocol;
+ const NET::Protocol c = NET::ContextHelpProtocol;
+
+ QTest::newRow("none") << NET::Protocols(NET::NoProtocol) << false << false << false << false << false;
+
+ QTest::newRow("t") << NET::Protocols(t) << true << false << false << false << false;
+ QTest::newRow("d") << NET::Protocols(d) << false << true << false << false << false;
+ QTest::newRow("p") << NET::Protocols(p) << false << false << true << false << false;
+ QTest::newRow("s") << NET::Protocols(s) << false << false << false << true << false;
+ QTest::newRow("c") << NET::Protocols(c) << false << false << false << false << true;
+
+ // all two combinations with t
+ QTest::newRow("t/d") << NET::Protocols(t | d) << true << true << false << false << false;
+ QTest::newRow("t/p") << NET::Protocols(t | p) << true << false << true << false << false;
+ QTest::newRow("t/s") << NET::Protocols(t | s) << true << false << false << true << false;
+ QTest::newRow("t/c") << NET::Protocols(t | c) << true << false << false << false << true;
+ // all two combinations with d
+ QTest::newRow("d/p") << NET::Protocols(d | p) << false << true << true << false << false;
+ QTest::newRow("d/s") << NET::Protocols(d | s) << false << true << false << true << false;
+ QTest::newRow("d/c") << NET::Protocols(d | c) << false << true << false << false << true;
+ // all two combinations with p
+ QTest::newRow("p/s") << NET::Protocols(p | s) << false << false << true << true << false;
+ QTest::newRow("p/c") << NET::Protocols(p | c) << false << false << true << false << true;
+ // and remaining two combination
+ QTest::newRow("s/c") << NET::Protocols(s | c) << false << false << false << true << true;
+
+ // all three combinations with t
+ QTest::newRow("t/d/p") << NET::Protocols(t | d | p) << true << true << true << false << false;
+ QTest::newRow("t/d/s") << NET::Protocols(t | d | s) << true << true << false << true << false;
+ QTest::newRow("t/d/c") << NET::Protocols(t | d | c) << true << true << false << false << true;
+ QTest::newRow("t/p/s") << NET::Protocols(t | p | s) << true << false << true << true << false;
+ QTest::newRow("t/p/c") << NET::Protocols(t | p | c) << true << false << true << false << true;
+ QTest::newRow("t/s/c") << NET::Protocols(t | s | c) << true << false << false << true << true;
+ // all three combinations with d
+ QTest::newRow("d/p/s") << NET::Protocols(d | p | s) << false << true << true << true << false;
+ QTest::newRow("d/p/c") << NET::Protocols(d | p | c) << false << true << true << false << true;
+ QTest::newRow("d/s/c") << NET::Protocols(d | s | c) << false << true << false << true << true;
+ // and remaining
+ QTest::newRow("p/s/c") << NET::Protocols(p | s | c) << false << false << true << true << true;
+
+ QTest::newRow("t/d/p/s") << NET::Protocols(t | d | p | s) << true << true << true << true << false;
+ QTest::newRow("t/d/p/c") << NET::Protocols(t | d | p | c) << true << true << true << false << true;
+ QTest::newRow("t/d/s/c") << NET::Protocols(t | d | s | c) << true << true << false << true << true;
+ QTest::newRow("t/p/s/c") << NET::Protocols(t | p | s | c) << true << false << true << true << true;
+ QTest::newRow("d/p/s/c") << NET::Protocols(d | p | s | c) << false << true << true << true << true;
+
+ QTest::newRow("all") << NET::Protocols(t | d | p | s | c) << true << true << true << true << true;
+}
+
+void NetWinInfoTestClient::testProtocols()
+{
+ QVERIFY(connection());
+ ATOM(WM_PROTOCOLS)
+ KXUtils::Atom takeFocus(connection(), QByteArrayLiteral("WM_TAKE_FOCUS"));
+ KXUtils::Atom deleteWindow(connection(), QByteArrayLiteral("WM_DELETE_WINDOW"));
+ KXUtils::Atom ping(connection(), QByteArrayLiteral("_NET_WM_PING"));
+ KXUtils::Atom syncRequest(connection(), QByteArrayLiteral("_NET_WM_SYNC_REQUEST"));
+ KXUtils::Atom contextHelp(connection(), QByteArrayLiteral("_NET_WM_CONTEXT_HELP"));
+ INFO
+
+ QVERIFY(!info.supportsProtocol(NET::TakeFocusProtocol));
+ QVERIFY(!info.supportsProtocol(NET::DeleteWindowProtocol));
+ QVERIFY(!info.supportsProtocol(NET::PingProtocol));
+ QVERIFY(!info.supportsProtocol(NET::SyncRequestProtocol));
+ QVERIFY(!info.supportsProtocol(NET::ContextHelpProtocol));
+ QCOMPARE(info.protocols(), NET::Protocols(NET::NoProtocol));
+
+ QVector<xcb_atom_t> props;
+ QFETCH(NET::Protocols, protocols);
+ if (protocols.testFlag(NET::TakeFocusProtocol)) {
+ props << takeFocus;
+ }
+ if (protocols.testFlag(NET::DeleteWindowProtocol)) {
+ props << deleteWindow;
+ }
+ if (protocols.testFlag(NET::PingProtocol)) {
+ props << ping;
+ }
+ if (protocols.testFlag(NET::SyncRequestProtocol)) {
+ props << syncRequest;
+ }
+ if (protocols.testFlag(NET::ContextHelpProtocol)) {
+ props << contextHelp;
+ }
+
+ xcb_change_property(connection(), XCB_PROP_MODE_REPLACE, m_testWindow, atom, XCB_ATOM_ATOM, 32, props.size(), props.constData());
+ xcb_flush(connection());
+
+ // only updated after event
+ waitForPropertyChange(&info, atom, NET::Property(0), NET::WM2Protocols);
+ QCOMPARE(info.protocols(), protocols);
+ QTEST(info.supportsProtocol(NET::TakeFocusProtocol), "takeFocus");
+ QTEST(info.supportsProtocol(NET::DeleteWindowProtocol), "deleteWindow");
+ QTEST(info.supportsProtocol(NET::PingProtocol), "ping");
+ QTEST(info.supportsProtocol(NET::SyncRequestProtocol), "sync");
+ QTEST(info.supportsProtocol(NET::ContextHelpProtocol), "context");
+
+ xcb_delete_property(connection(), m_testWindow, atom);
+ xcb_flush(connection());
+ waitForPropertyChange(&info, atom, NET::Property(0), NET::WM2Protocols);
+ QVERIFY(!info.supportsProtocol(NET::TakeFocusProtocol));
+ QVERIFY(!info.supportsProtocol(NET::DeleteWindowProtocol));
+ QVERIFY(!info.supportsProtocol(NET::PingProtocol));
+ QVERIFY(!info.supportsProtocol(NET::SyncRequestProtocol));
+ QVERIFY(!info.supportsProtocol(NET::ContextHelpProtocol));
+ QCOMPARE(info.protocols(), NET::Protocols(NET::NoProtocol));
+}
+
QTEST_MAIN(NetWinInfoTestClient)
#include "netwininfotestclient.moc"
diff --git a/src/netwm.cpp b/src/netwm.cpp
index 1431cf6..3107a23 100644
--- a/src/netwm.cpp