Differential D14926 Diff 40001 3rdparty/ext_frameworks/kwindowsystem-x11.diff

Changeset View

Standalone View

View Options

3rdparty/ext_frameworks/kwindowsystem-x11.diff

  • This file was added.
1​diff --git a/src/kstartupinfo.cpp b/src/kstartupinfo.cpp
2​index a97b8b5..0ae7e5b 100644
3​--- a/src/kstartupinfo.cpp
4​+++ b/src/kstartupinfo.cpp
5​@@ -493,7 +493,7 @@ bool KStartupInfo::sendStartupX(Display *disp_P, const KStartupInfoId &id_P,
6​ #ifdef KSTARTUPINFO_ALL_DEBUG
7​ qCDebug(LOG_KWINDOWSYSTEM) << "sending " << msg;
8​ #endif
9​- return KXMessages::broadcastMessageX(disp_P, NET_STARTUP_MSG, msg);
10​+ return true; // KXMessages::broadcastMessageX(disp_P, NET_STARTUP_MSG, msg);
11​ #else
12​ Q_UNUSED(disp_P)
13​ Q_UNUSED(data_P)
14​@@ -548,7 +548,7 @@ bool KStartupInfo::sendChangeX(Display *disp_P, const KStartupInfoId &id_P,
15​ #ifdef KSTARTUPINFO_ALL_DEBUG
16​ qCDebug(LOG_KWINDOWSYSTEM) << "sending " << msg;
17​ #endif
18​- return KXMessages::broadcastMessageX(disp_P, NET_STARTUP_MSG, msg);
19​+ return true; //KXMessages::broadcastMessageX(disp_P, NET_STARTUP_MSG, msg);
20​ #else
21​ Q_UNUSED(disp_P)
22​ Q_UNUSED(data_P)
23​@@ -580,7 +580,7 @@ bool KStartupInfo::sendFinishX(Display *disp_P, const KStartupInfoId &id_P)
24​ #ifdef KSTARTUPINFO_ALL_DEBUG
25​ qCDebug(LOG_KWINDOWSYSTEM) << "sending " << msg;
26​ #endif
27​- return KXMessages::broadcastMessageX(disp_P, NET_STARTUP_MSG, msg);
28​+ return true; //KXMessages::broadcastMessageX(disp_P, NET_STARTUP_MSG, msg);
29​ #else
30​ Q_UNUSED(disp_P)
31​ return true;
32​@@ -615,7 +615,7 @@ bool KStartupInfo::sendFinishX(Display *disp_P, const KStartupInfoId &id_P,
33​ #ifdef KSTARTUPINFO_ALL_DEBUG
34​ qCDebug(LOG_KWINDOWSYSTEM) << "sending " << msg;
35​ #endif
36​- return KXMessages::broadcastMessageX(disp_P, NET_STARTUP_MSG, msg);
37​+ return true; //KXMessages::broadcastMessageX(disp_P, NET_STARTUP_MSG, msg);
38​ #else
39​ Q_UNUSED(disp_P)
40​ Q_UNUSED(id_P)
41​diff --git a/src/platforms/xcb/kwindowsystem.cpp b/src/platforms/xcb/kwindowsystem.cpp
42​index 9d28704..603d9b2 100644
43​--- a/src/platforms/xcb/kwindowsystem.cpp
44​+++ b/src/platforms/xcb/kwindowsystem.cpp
45​@@ -196,7 +196,7 @@ bool NETEventFilter::nativeEventFilter(xcb_generic_event_t *ev)
46​ int old_number_of_desktops = numberOfDesktops();
47​ bool old_showing_desktop = showingDesktop();
48​ unsigned long m[ 5 ];
49​- NETRootInfo::event(ev, m, 5);
50​+ //NETRootInfo::event(ev, m, 5);
51​
52​ if ((m[ PROTOCOLS ] & CurrentDesktop) && currentDesktop() != old_current_desktop) {
53​ emit s_q->currentDesktopChanged(currentDesktop());