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

Change Toplevel::damage_handle to xcb_damage_damage_t

Browse source 
Damage handling has already been ported to XCB - no need to keep it on an
XLib datatype.
This commit is contained in:
Martin Gräßlin 2013-04-26 11:12:52 +02:00
parent 2ab0de12e9
commit 94470f1ea2
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
composite.cpp
View file

@ -782,7 +782,7 @@ bool Toplevel::setupCompositing()
if (!compositing())
return false;
if (damage_handle != None)
if (damage_handle != XCB_NONE)
return false;
damage_handle = xcb_generate_id(connection());
@ -807,7 +807,7 @@ bool Toplevel::setupCompositing()
void Toplevel::finishCompositing()
{
if (damage_handle == None)
if (damage_handle == XCB_NONE)
return;
Compositor::self()->checkUnredirect(true);
if (effect_window->window() == this) { // otherwise it's already passed to Deleted, don't free data

5
toplevel.h
View file

@ -32,8 +32,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "virtualdesktops.h"
#include "workspace.h"
#include <X11/extensions/Xdamage.h>
#include <xcb/damage.h>
#include <xcb/xfixes.h>
class NETWinInfo2;
@ -401,7 +400,7 @@ private:
Window frame;
Workspace* wspace;
Pixmap window_pix;
Damage damage_handle;
xcb_damage_damage_t damage_handle;
QRegion damage_region; // damage is really damaged window (XDamage) and texture needs
bool is_shape;
EffectWindowImpl* effect_window;