File 0002-Add-support-for-urgency-hint-in-NETWinInfo... of Package kwindowsystem

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-Add-support-for-urgency-hint-in-NETWinInfo.patch of Package kwindowsystem (Revision 4edcf5b1c19e850a206704563d2ad8f7)

Currently displaying revision 4edcf5b1c19e850a206704563d2ad8f7 , Show latest

From 512b7c17dd3d02d5c49b2b34cbb155f7ad754115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
Date: Fri, 12 Sep 2014 11:39:55 +0200
Subject: [PATCH 02/13] Add support for urgency hint in NETWinInfo

UrgencyHint is part of WM_HINTS property which is already processed
for WM2GroupLeader.

REVIEW: 120158
CHANGELOG: NETWinInfo provides convenient wrapper for urgency hint of WM_HINTS property.
---
 autotests/netwininfotestclient.cpp | 42 ++++++++++++++++++++++++++++++++++++++
 src/netwm.cpp                      | 13 ++++++++++--
 src/netwm.h                        |  8 ++++++++
 src/netwm_def.h                    |  2 ++
 src/netwm_p.h                      |  1 +
 5 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/autotests/netwininfotestclient.cpp b/autotests/netwininfotestclient.cpp
index 160f759..8a39ba5 100644
--- a/autotests/netwininfotestclient.cpp
+++ b/autotests/netwininfotestclient.cpp
@@ -78,6 +78,8 @@ private Q_SLOTS:
     void testWindowClass();
     void testClientMachine();
     void testGroupLeader();
+    void testUrgency_data();
+    void testUrgency();
     void testTransientFor();
 
 private:
@@ -665,6 +667,46 @@ void NetWinInfoTestClient::testGroupLeader()
     QCOMPARE(info.groupLeader(), m_rootWindow);
 }
 
+void NetWinInfoTestClient::testUrgency_data()
+{
+    QTest::addColumn<quint32>("flags");
+    QTest::addColumn<bool>("expected");
+
+    QTest::newRow("urgency") << quint32(1 << 8) << true;
+    QTest::newRow("none") << quint32(0) << false;
+    QTest::newRow("group_urgency") << quint32((1 << 6) | (1 << 8)) << true;
+    QTest::newRow("input") << quint32(1) << false;
+}
+
+void NetWinInfoTestClient::testUrgency()
+{
+    QVERIFY(connection());
+    INFO
+
+    QVERIFY(!info.urgency());
+    QFETCH(quint32, flags);
+
+    // group leader needs to be changed through wm hints
+    uint32_t values[] = {
+        flags,
+        1, /* Input */
+        1, /* Normal State */
+        XCB_NONE, /* icon pixmap */
+        XCB_NONE, /* icon window */
+        XCB_NONE, /* icon x */
+        XCB_NONE, /* icon y */
+        XCB_NONE, /* icon mask */
+        XCB_NONE /* group leader */
+    };
+    xcb_change_property(connection(), XCB_PROP_MODE_REPLACE, m_testWindow,
+                        XCB_ATOM_WM_HINTS, XCB_ATOM_WM_HINTS, 32, 9, values);
+    xcb_flush(connection());
+
+    // only updated after event
+    waitForPropertyChange(&info, XCB_ATOM_WM_HINTS, NET::Property(0), NET::WM2Urgency);
+    QTEST(info.urgency(), "expected");
+}
+
 void NetWinInfoTestClient::testTransientFor()
 {
     QVERIFY(connection());
diff --git a/src/netwm.cpp b/src/netwm.cpp
index 07e5254..0e77a95 100644
--- a/src/netwm.cpp
+++ b/src/netwm.cpp
@@ -2763,6 +2763,7 @@ NETWinInfo::NETWinInfo(xcb_connection_t *connection, xcb_window_t window, xcb_wi
     p->icon_sizes = NULL;
     p->activities = (char *) 0;
     p->blockCompositing = false;
+    p->urgency = false;
 
     // p->strut.left = p->strut.right = p->strut.top = p->strut.bottom = 0;
     // p->frame_strut.left = p->frame_strut.right = p->frame_strut.top =
@@ -2822,6 +2823,7 @@ NETWinInfo::NETWinInfo(xcb_connection_t *connection, xcb_window_t window, xcb_wi
     p->icon_sizes = NULL;
     p->activities = (char *) 0;
     p->blockCompositing = false;
+    p->urgency = false;
 
     // p->strut.left = p->strut.right = p->strut.top = p->strut.bottom = 0;
     // p->frame_strut.left = p->frame_strut.right = p->frame_strut.top =
@@ -3917,6 +3919,7 @@ void NETWinInfo::event(xcb_generic_event_t *event, NET::Properties *properties,
             dirty2 |= WM2UserTime;
         } else if (pe->atom == XCB_ATOM_WM_HINTS) {
             dirty2 |= WM2GroupLeader;
+            dirty2 |= WM2Urgency;
         } else if (pe->atom == XCB_ATOM_WM_TRANSIENT_FOR) {
             dirty2 |= WM2TransientFor;
         } else if (pe->atom == XCB_ATOM_WM_CLASS) {
@@ -4093,7 +4096,7 @@ void NETWinInfo::update(NET::Properties dirtyProperties, NET::Properties2 dirtyP
         cookies[c++] = xcb_get_property(p->conn, false, p->window, XCB_ATOM_WM_TRANSIENT_FOR, XCB_ATOM_WINDOW, 0, 1);
     }
 
-    if (dirty2 & WM2GroupLeader) {
+    if (dirty2 & (WM2GroupLeader | WM2Urgency)) {
         cookies[c++] = xcb_get_property(p->conn, false, p->window, XCB_ATOM_WM_HINTS, XCB_ATOM_WM_HINTS, 0, 9);
     }
 
@@ -4547,7 +4550,7 @@ void NETWinInfo::update(NET::Properties dirtyProperties, NET::Properties2 dirtyP
         p->transient_for = get_value_reply<xcb_window_t>(p->conn, cookies[c++], XCB_ATOM_WINDOW, 0);
     }
 
-    if (dirty2 & WM2GroupLeader) {
+    if (dirty2 & (WM2GroupLeader | WM2Urgency)) {
         xcb_get_property_reply_t *reply = xcb_get_property_reply(p->conn, cookies[c++], 0);
 
         if (reply && reply->format == 32 && reply->value_len == 9 && reply->type == XCB_ATOM_WM_HINTS) {
@@ -4556,6 +4559,7 @@ void NETWinInfo::update(NET::Properties dirtyProperties, NET::Properties2 dirtyP
             if (hints->flags & (1 << 6)/*WindowGroupHint*/) {
                 p->window_group = hints->window_group;
             }
+            p->urgency = (hints->flags & (1 << 8)/*UrgencyHint*/);
         }
 
         if (reply) {
@@ -4740,6 +4744,11 @@ xcb_window_t NETWinInfo::groupLeader() const
     return p->window_group;
 }
 
+bool NETWinInfo::urgency() const
+{
+    return p->urgency;
+}
+
 const char *NETWinInfo::windowClassClass() const
 {
     return p->class_class;
diff --git a/src/netwm.h b/src/netwm.h
index 0c89dc7..ba97db1 100644
--- a/src/netwm.h
+++ b/src/netwm.h
@@ -1373,6 +1373,14 @@ public:
     xcb_window_t groupLeader() const;
 
     /**
+     * Returns whether the UrgencyHint is set in the WM_HINTS.flags.
+     * See ICCCM 4.1.2.4.
+     *
+     * @since 5.3
+     **/
+    bool urgency() const;
+
+    /**
      * Returns the class component of the window class for the window
      * (i.e. WM_CLASS property).
      */
diff --git a/src/netwm_def.h b/src/netwm_def.h
index 0edadc0..9e14634 100644
--- a/src/netwm_def.h
+++ b/src/netwm_def.h
@@ -675,6 +675,7 @@ public:
         @li WM2DesktopLayout _NET_DESKTOP_LAYOUT
         @li WM2FullPlacement _NET_WM_FULL_PLACEMENT
         @li WM2FullscreenMonitors _NET_WM_FULLSCREEN_MONITORS
+        @li WM2Urgency urgency hint in WM_HINTS (see ICCCM 4.1.2.4)
     **/
     enum Property2 {
         WM2UserTime            = 1u << 0,
@@ -698,6 +699,7 @@ public:
         WM2Activities          = 1u << 18, // NOT STANDARD @since 4.6
         WM2BlockCompositing    = 1u << 19, // NOT STANDARD @since 4.7
         WM2KDEShadow           = 1u << 20, // NOT Standard @since 4.7
+        WM2Urgency             = 1u << 21, // @since 5.3
         WM2AllProperties       = ~0u
     };
     Q_DECLARE_FLAGS(Properties2, Property2)
diff --git a/src/netwm_p.h b/src/netwm_p.h
index 2e4659e..36ffb8d 100644
--- a/src/netwm_p.h
+++ b/src/netwm_p.h
@@ -165,6 +165,7 @@ struct NETWinInfoPrivate {
 
     const char *activities;
     bool blockCompositing;
+    bool urgency;
 
     int ref;
 };
-- 
2.1.0

Places

File 0002-Add-support-for-urgency-hint-in-NETWinInfo.patch of Package kwindowsystem (Revision 4edcf5b1c19e850a206704563d2ad8f7)

Places