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

This should fix #64869 - make sure the user timestamp is valid at the end

Browse source 
of manage().
CCMAIL: 64869-done@bugs.kde.org

svn path=/trunk/kdebase/kwin/; revision=253667
This commit is contained in:
Luboš Luňák 2003-09-24 18:31:30 +00:00
parent 8a11c2ff74
commit 124dd73f49
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
manage.cpp
View file

@ -22,6 +22,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include "notifications.h"
extern Time qt_x_time;
extern Atom qt_window_role;
namespace KWinInternal
@ -93,9 +94,6 @@ bool Client::manage( Window w, bool isMapped )
info = new WinInfo( this, qt_xdisplay(), client, qt_xrootwin(), properties, 2 );
if( info->userTime() != -1U )
user_time = info->userTime();
cmap = attr.colormap;
bool mresize, mmove, mminimize, mmaximize, mclose;
@ -412,6 +410,8 @@ bool Client::manage( Window w, bool isMapped )
// - keep it?
XLowerWindow( qt_xdisplay(), frameId());
user_time = readUserTimeMapTimestamp( asn_valid ? &asn_data : NULL, session );
if ( isShown() && !doNotShow )
{
if( isDialog())
@ -434,8 +434,7 @@ bool Client::manage( Window w, bool isMapped )
}
else
{
Time time = readUserTimeMapTimestamp( asn_valid ? &asn_data : NULL, session );
if( workspace()->allowClientActivation( this, time, false, session && session->active ))
if( workspace()->allowClientActivation( this, user_time, false, session && session->active ))
{
workspace()->raiseClient( this );
rawShow();
@ -481,6 +480,9 @@ bool Client::manage( Window w, bool isMapped )
area = workspace()->clientArea( geometry().center() );
}
if( user_time == CurrentTime ) // no known user time, set something old
user_time = qt_x_time - 1000000;
updateWorkareaDiffs( area );
// sendSyntheticConfigureNotify(); done when setting mapping state