1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xcb: Fix getting of virtual roots

Browse Source 
Update QXcbWMSupport::net_virtual_roots instead of QXcbWMSupport::net_wm_atoms.
It's a copy/paste error.

Change-Id: If146955d954850f02980f473ad2318d67f193ec9
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Alexander Volkov 2015-04-09 14:50:36 +03:00
parent 4ecae86e4b
commit 364905b592
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/platforms/xcb/qxcbwmsupport.cpp
View File

@ -68,7 +68,7 @@ void QXcbWMSupport::updateNetWMAtoms()
remaining = 0; remaining = 0;
if (reply->type == XCB_ATOM_ATOM && reply->format == 32) { if (reply->type == XCB_ATOM_ATOM && reply->format == 32) {
int len = xcb_get_property_value_length(reply)/4; int len = xcb_get_property_value_length(reply)/sizeof(xcb_atom_t);
xcb_atom_t *atoms = (xcb_atom_t *)xcb_get_property_value(reply); xcb_atom_t *atoms = (xcb_atom_t *)xcb_get_property_value(reply);
int s = net_wm_atoms.size(); int s = net_wm_atoms.size();
net_wm_atoms.resize(s + len); net_wm_atoms.resize(s + len);
@ -102,11 +102,11 @@ void QXcbWMSupport::updateVirtualRoots()
remaining = 0; remaining = 0;
if (reply->type == XCB_ATOM_ATOM && reply->format == 32) { if (reply->type == XCB_ATOM_ATOM && reply->format == 32) {
int len = xcb_get_property_value_length(reply)/4; int len = xcb_get_property_value_length(reply)/sizeof(xcb_window_t);
xcb_atom_t *atoms = (xcb_atom_t *)xcb_get_property_value(reply); xcb_window_t *roots = (xcb_window_t *)xcb_get_property_value(reply);
int s = net_wm_atoms.size(); int s = net_virtual_roots.size();
net_wm_atoms.resize(s + len); net_virtual_roots.resize(s + len);
memcpy(net_wm_atoms.data() + s, atoms, len*sizeof(xcb_atom_t)); memcpy(net_virtual_roots.data() + s, roots, len*sizeof(xcb_window_t));
remaining = reply->bytes_after; remaining = reply->bytes_after;
offset += len; offset += len;