Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove custom Window Manager activities definitions

Browse source
This commit is contained in:
Ivailo Monev 2015-01-15 20:17:54 +00:00
parent 0f76d5e3ea
commit 908c9b4b78
2 changed files with 2 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
kdeui/windowmanagement/netwm.cpp
View file

@ -96,7 +96,6 @@ static Atom kde_net_wm_window_type_override = 0;
static Atom kde_net_wm_window_type_topmenu = 0;
static Atom kde_net_wm_temporary_rules = 0;
static Atom kde_net_wm_frame_overlap = 0;
static Atom kde_net_wm_activities = 0;
static Atom kde_net_wm_block_compositing = 0;
static Atom kde_net_wm_shadow = 0;
@ -354,7 +353,6 @@ static void create_netwm_atoms(Display *d) {
"WM_PROTOCOLS",
"_NET_WM_FULL_PLACEMENT",
"_KDE_NET_WM_ACTIVITIES",
"_KDE_NET_WM_BLOCK_COMPOSITING",
"_KDE_NET_WM_SHADOW"
};
@ -455,7 +453,6 @@ static void create_netwm_atoms(Display *d) {
&wm_protocols,
&net_wm_full_placement,
&kde_net_wm_activities,
&kde_net_wm_block_compositing,
&kde_net_wm_shadow
};
@ -1294,9 +1291,6 @@ void NETRootInfo::setSupported() {
if (p->properties[ PROTOCOLS2 ] & WM2FullPlacement)
atoms[pnum++] = net_wm_full_placement;
if (p->properties[ PROTOCOLS2 ] & WM2Activities)
atoms[pnum++] = kde_net_wm_activities;
if (p->properties[ PROTOCOLS2 ] & WM2BlockCompositing)
atoms[pnum++] = kde_net_wm_block_compositing;
@ -1539,9 +1533,6 @@ void NETRootInfo::updateSupportedProperties( Atom atom )
else if( atom == net_wm_full_placement )
p->properties[ PROTOCOLS2 ] |= WM2FullPlacement;
else if( atom == kde_net_wm_activities )
p->properties[ PROTOCOLS2 ] |= WM2Activities;
else if( atom == kde_net_wm_block_compositing )
p->properties[ PROTOCOLS2 ] |= WM2BlockCompositing;
@ -3882,8 +3873,6 @@ void NETWinInfo::event(XEvent *event, unsigned long* properties, int properties_
dirty2 |= WM2WindowRole;
else if (pe.xproperty.atom == XA_WM_CLIENT_MACHINE)
dirty2 |= WM2ClientMachine;
else if (pe.xproperty.atom == kde_net_wm_activities)
dirty2 |= WM2Activities;
else if (pe.xproperty.atom == kde_net_wm_block_compositing)
dirty2 |= WM2BlockCompositing;
else if (pe.xproperty.atom == kde_net_wm_shadow)
@ -4347,22 +4336,6 @@ void NETWinInfo::update(const unsigned long dirty_props[]) {
}
}
if (dirty2 & WM2Activities) {
delete[] p->activities;
p->activities = NULL;
if (XGetWindowProperty(p->display, p->window, kde_net_wm_activities, 0l,
MAX_PROP_SIZE, False, XA_STRING, &type_ret,
&format_ret, &nitems_ret, &unused, &data_ret)
== Success) {
if (type_ret == XA_STRING && format_ret == 8 && nitems_ret > 0) {
p->activities = nstrndup((const char *) data_ret, nitems_ret);
}
if( data_ret )
XFree(data_ret);
}
}
if (dirty2 & WM2BlockCompositing) {
p->blockCompositing = false;
if (XGetWindowProperty(p->display, p->window, kde_net_wm_block_compositing, 0l,

5
kdeui/windowmanagement/netwm_def.h
View file

@ -692,9 +692,8 @@ public:
WM2FullPlacement = 1<<16,
WM2FullscreenMonitors = 1<<17,
WM2FrameOverlap = 1<<18, // NOT STANDARD
WM2Activities = 1<<19, // NOT STANDARD @since 4.6
WM2BlockCompositing = 1<<20, // NOT STANDARD @since 4.7
WM2KDEShadow = 1<<21 // NOT Standard @since 4.7
WM2BlockCompositing = 1<<19, // NOT STANDARD @since 4.7
WM2KDEShadow = 1<<20 // NOT Standard @since 4.7
};
/**