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

Properly ifdef everything requiering HAVE_XSYNC

Browse source 
REVIEW: 104080
This commit is contained in:
Martin Gräßlin 2012-02-26 09:42:17 +01:00
parent 83affb0d81
commit 7f0770f99d
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client.cpp
View file

@ -2223,10 +2223,12 @@ void Client::removeSyncSupport()
setReadyForPainting();
return;
}
#ifdef HAVE_XSYNC
syncRequest.isPending = false;
syncRequest.counter = syncRequest.alarm = None;
delete syncRequest.timeout; delete syncRequest.failsafeTimeout;
syncRequest.timeout = syncRequest.failsafeTimeout = NULL;
#endif
}
bool Client::wantsTabFocus() const

2
composite.cpp
View file

@ -660,10 +660,10 @@ void Client::damageNotifyEvent(XDamageNotifyEvent* e)
if (!ready_for_painting) { // avoid "setReadyForPainting()" function calling overhead
if (syncRequest.counter == None) // cannot detect complete redraw, consider done now
setReadyForPainting();
}
#else
setReadyForPainting();
#endif
}
Toplevel::damageNotifyEvent(e);
}

4
geometry.cpp
View file

@ -2657,8 +2657,10 @@ void Client::leaveMoveResize()
move_resize_grab_window = None;
workspace()->setClientIsMoving(0);
moveResizeMode = false;
#ifdef HAVE_XSYNC
delete syncRequest.timeout;
syncRequest.timeout = NULL;
#endif
#ifdef KWIN_BUILD_SCREENEDGES
if (options->electricBorders() == Options::ElectricMoveOnly ||
options->electricBorderMaximize() ||
@ -2739,8 +2741,10 @@ void Client::delayedMoveResize()
void Client::handleMoveResize(int x, int y, int x_root, int y_root)
{
#ifdef HAVE_XSYNC
if (syncRequest.isPending && isResize())
return; // we're still waiting for the client or the timeout
#endif
if ((mode == PositionCenter && !isMovableAcrossScreens())
|| (mode != PositionCenter && (isShade() || !isResizable())))