yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

simplified x11util::isSupported( Atom ) code, needed for the size grip, so that it calls XGetWindowProperty only once, in a way that is similar to what netwm.cpp does.

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=1027369
This commit is contained in:
Hugo Pereira Da Costa 2009-09-23 22:44:35 +00:00
parent 348fd64a55
commit 955f04ae8e
1 changed files with 19 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
clients/oxygen/x11util.cpp
View file

@ -52,39 +52,31 @@ namespace Oxygen
Atom net_supported( findAtom( _NET_SUPPORTED ) );
Atom searched( findAtom( atom ) );
Atom actual;
Atom type;
int format;
unsigned char *data;
unsigned long offset = 0;
unsigned long count;
unsigned long unused;
while( 1 )
{
unsigned long n, left;
XGetWindowProperty( display, QX11Info::appRootWindow(),
net_supported, offset, 1L,
false, XA_ATOM, &actual,
&format, &n, &left,
(unsigned char **) &data);
// get window property
if( XGetWindowProperty(
display, QX11Info::appRootWindow(),
net_supported, 0l, 2048l,
false, XA_ATOM, &type,
&format, &count, &unused, (unsigned char **) &data) != Success )
{ return false; }
if( data == None ) break;
if( type != XA_ATOM || format != 32 || count <= 0 || data == None )
{ return false; }
// try cast data to atom
Atom found( *(Atom*)data );
long *states = (long *) data;
bool found = false;
static bool first( true );
for( unsigned long i = 0; i<count && !( found = (searched == states[i]) ); i++ )
{}
if( found == searched )
{
supportedAtoms_[atom] = true;
return true;
}
if( !left ) break;
else offset ++;
}
supportedAtoms_[atom] = false;
return false;
supportedAtoms_[atom] = found;
return found;
}