nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with the 2.0 branch (make XAtom::getValue not use an XGrabServer)

Browse source
This commit is contained in:
Dana Jansens 2002-09-01 09:51:54 +00:00
parent 923c381dc1
commit e93ce60568
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/XAtom.cc
View file

@ -364,15 +364,9 @@ bool XAtom::getValue(Window win, Atom atom, Atom type,
int ret_size;
unsigned long ret_bytes;
int result;
const unsigned long maxread = nelements;
unsigned long maxread = nelements;
bool ret = False;
/*
Grab the server because this takes 2 reads and if it changes between, it
totally screws everything up.
*/
XGrabServer(_display);
// try get the first element
result = XGetWindowProperty(_display, win, atom, 0l, 1l, False,
AnyPropertyType, &ret_type, &ret_size,
@ -395,13 +389,20 @@ bool XAtom::getValue(Window win, Atom atom, Atom type,
result = XGetWindowProperty(_display, win, atom, 0l, remain, False, type,
&ret_type, &ret_size, &nelements, &ret_bytes,
&c_val);
assert(result == Success);
assert(ret_bytes == 0);
ret = (result == Success && ret_type == type && ret_size == size &&
ret_bytes == 0);
/*
If the property has changed type/size, or has grown since our first
read of it, then stop here and try again. If it shrank, then this will
still work.
*/
if (! ret)
return getValue(win, atom, type, maxread, value, size);
*value = new unsigned char[nelements * size/8 + 1];
memcpy(*value, c_val, nelements * size/8 + 1);
}
}
XUngrabServer(_display);
if (c_val) XFree(c_val);
return ret;
}