Configure mouse to the screen when doing move/resize.
BUG: 88506 svn path=/trunk/KDE/kdebase/workspace/; revision=608815icc-effect-5.14.5
parent
7d243977ce
commit
b1ce5309a3
65
geometry.cpp
65
geometry.cpp
|
@ -28,7 +28,6 @@ License. See the file "COPYING" for the exact licensing terms.
|
||||||
#include "notifications.h"
|
#include "notifications.h"
|
||||||
#include "geometrytip.h"
|
#include "geometrytip.h"
|
||||||
#include "rules.h"
|
#include "rules.h"
|
||||||
#include "effects.h"
|
|
||||||
#include <QX11Info>
|
#include <QX11Info>
|
||||||
#include <QDesktopWidget>
|
#include <QDesktopWidget>
|
||||||
|
|
||||||
|
@ -1405,7 +1404,7 @@ void Client::configureRequest( int value_mask, int rx, int ry, int rw, int rh, i
|
||||||
|| ns != size())
|
|| ns != size())
|
||||||
{
|
{
|
||||||
QRect orig_geometry = geometry();
|
QRect orig_geometry = geometry();
|
||||||
GeometryUpdatesBlocker blocker( this );
|
GeometryUpdatesPostponer blocker( this );
|
||||||
move( new_pos );
|
move( new_pos );
|
||||||
plainResize( ns );
|
plainResize( ns );
|
||||||
setGeometry( QRect( calculateGravitation( false, gravity ), size()));
|
setGeometry( QRect( calculateGravitation( false, gravity ), size()));
|
||||||
|
@ -1438,7 +1437,7 @@ void Client::configureRequest( int value_mask, int rx, int ry, int rw, int rh, i
|
||||||
if( ns != size()) // don't restore if some app sets its own size again
|
if( ns != size()) // don't restore if some app sets its own size again
|
||||||
{
|
{
|
||||||
QRect orig_geometry = geometry();
|
QRect orig_geometry = geometry();
|
||||||
GeometryUpdatesBlocker blocker( this );
|
GeometryUpdatesPostponer blocker( this );
|
||||||
int save_gravity = xSizeHint.win_gravity;
|
int save_gravity = xSizeHint.win_gravity;
|
||||||
xSizeHint.win_gravity = gravity;
|
xSizeHint.win_gravity = gravity;
|
||||||
resizeWithChecks( ns );
|
resizeWithChecks( ns );
|
||||||
|
@ -1658,19 +1657,18 @@ void Client::setGeometry( int x, int y, int w, int h, ForceGeometry_t force )
|
||||||
{
|
{
|
||||||
client_size = QSize( w - border_left - border_right, h - border_top - border_bottom );
|
client_size = QSize( w - border_left - border_right, h - border_top - border_bottom );
|
||||||
}
|
}
|
||||||
if( force == NormalGeometrySet && geom == QRect( x, y, w, h ))
|
if( force == NormalGeometrySet && frame_geometry == QRect( x, y, w, h ))
|
||||||
return;
|
return;
|
||||||
geom = QRect( x, y, w, h );
|
frame_geometry = QRect( x, y, w, h );
|
||||||
updateWorkareaDiffs();
|
updateWorkareaDiffs();
|
||||||
if( block_geometry_updates != 0 )
|
if( postpone_geometry_updates != 0 )
|
||||||
{
|
{
|
||||||
pending_geometry_update = true;
|
pending_geometry_update = true;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if( geom_before_block.size() != geom.size())
|
|
||||||
{
|
|
||||||
resizeDecoration( QSize( w, h ));
|
resizeDecoration( QSize( w, h ));
|
||||||
XMoveResizeWindow( display(), frameId(), x, y, w, h );
|
XMoveResizeWindow( display(), frameId(), x, y, w, h );
|
||||||
|
// resizeDecoration( QSize( w, h ));
|
||||||
if( !isShade())
|
if( !isShade())
|
||||||
{
|
{
|
||||||
QSize cs = clientSize();
|
QSize cs = clientSize();
|
||||||
|
@ -1678,20 +1676,12 @@ void Client::setGeometry( int x, int y, int w, int h, ForceGeometry_t force )
|
||||||
cs.width(), cs.height());
|
cs.width(), cs.height());
|
||||||
XMoveResizeWindow( display(), window(), 0, 0, cs.width(), cs.height());
|
XMoveResizeWindow( display(), window(), 0, 0, cs.width(), cs.height());
|
||||||
}
|
}
|
||||||
if( shape())
|
|
||||||
updateShape();
|
updateShape();
|
||||||
}
|
|
||||||
else
|
|
||||||
XMoveWindow( display(), frameId(), x, y );
|
|
||||||
// SELI TODO won't this be too expensive?
|
// SELI TODO won't this be too expensive?
|
||||||
updateWorkareaDiffs();
|
updateWorkareaDiffs();
|
||||||
sendSyntheticConfigureNotify();
|
sendSyntheticConfigureNotify();
|
||||||
updateWindowRules();
|
updateWindowRules();
|
||||||
checkMaximizeGeometry();
|
checkMaximizeGeometry();
|
||||||
if( geom_before_block.size() != geom.size())
|
|
||||||
addDamageFull(); // damage window only if it actually was a resize
|
|
||||||
workspace()->addDamage( geom_before_block ); // TODO add damage only if not obscured
|
|
||||||
geom_before_block = geom;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Client::plainResize( int w, int h, ForceGeometry_t force )
|
void Client::plainResize( int w, int h, ForceGeometry_t force )
|
||||||
|
@ -1721,11 +1711,11 @@ void Client::plainResize( int w, int h, ForceGeometry_t force )
|
||||||
kDebug() << "forced size fail:" << QSize( w,h ) << ":" << rules()->checkSize( QSize( w, h )) << endl;
|
kDebug() << "forced size fail:" << QSize( w,h ) << ":" << rules()->checkSize( QSize( w, h )) << endl;
|
||||||
kDebug() << kBacktrace() << endl;
|
kDebug() << kBacktrace() << endl;
|
||||||
}
|
}
|
||||||
if( force == NormalGeometrySet && geom.size() == QSize( w, h ))
|
if( force == NormalGeometrySet && frame_geometry.size() == QSize( w, h ))
|
||||||
return;
|
return;
|
||||||
geom.setSize( QSize( w, h ));
|
frame_geometry.setSize( QSize( w, h ));
|
||||||
updateWorkareaDiffs();
|
updateWorkareaDiffs();
|
||||||
if( block_geometry_updates != 0 )
|
if( postpone_geometry_updates != 0 )
|
||||||
{
|
{
|
||||||
pending_geometry_update = true;
|
pending_geometry_update = true;
|
||||||
return;
|
return;
|
||||||
|
@ -1740,15 +1730,11 @@ void Client::plainResize( int w, int h, ForceGeometry_t force )
|
||||||
cs.width(), cs.height());
|
cs.width(), cs.height());
|
||||||
XMoveResizeWindow( display(), window(), 0, 0, cs.width(), cs.height());
|
XMoveResizeWindow( display(), window(), 0, 0, cs.width(), cs.height());
|
||||||
}
|
}
|
||||||
if( shape())
|
|
||||||
updateShape();
|
updateShape();
|
||||||
updateWorkareaDiffs();
|
updateWorkareaDiffs();
|
||||||
sendSyntheticConfigureNotify();
|
sendSyntheticConfigureNotify();
|
||||||
updateWindowRules();
|
updateWindowRules();
|
||||||
checkMaximizeGeometry();
|
checkMaximizeGeometry();
|
||||||
addDamageFull(); // TODO add damage only in added area?
|
|
||||||
workspace()->addDamage( geom_before_block ); // TODO add damage only if not obscured
|
|
||||||
geom_before_block = geom;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
|
@ -1756,11 +1742,11 @@ void Client::plainResize( int w, int h, ForceGeometry_t force )
|
||||||
*/
|
*/
|
||||||
void Client::move( int x, int y, ForceGeometry_t force )
|
void Client::move( int x, int y, ForceGeometry_t force )
|
||||||
{
|
{
|
||||||
if( force == NormalGeometrySet && geom.topLeft() == QPoint( x, y ))
|
if( force == NormalGeometrySet && frame_geometry.topLeft() == QPoint( x, y ))
|
||||||
return;
|
return;
|
||||||
geom.moveTopLeft( QPoint( x, y ));
|
frame_geometry.moveTopLeft( QPoint( x, y ));
|
||||||
updateWorkareaDiffs();
|
updateWorkareaDiffs();
|
||||||
if( block_geometry_updates != 0 )
|
if( postpone_geometry_updates != 0 )
|
||||||
{
|
{
|
||||||
pending_geometry_update = true;
|
pending_geometry_update = true;
|
||||||
return;
|
return;
|
||||||
|
@ -1769,22 +1755,20 @@ void Client::move( int x, int y, ForceGeometry_t force )
|
||||||
sendSyntheticConfigureNotify();
|
sendSyntheticConfigureNotify();
|
||||||
updateWindowRules();
|
updateWindowRules();
|
||||||
checkMaximizeGeometry();
|
checkMaximizeGeometry();
|
||||||
// client itself is not damaged
|
|
||||||
workspace()->addDamage( geom_before_block ); // TODO add damage only if not obscured
|
|
||||||
geom_before_block = geom;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Client::blockGeometryUpdates( bool block )
|
|
||||||
|
void Client::postponeGeometryUpdates( bool postpone )
|
||||||
{
|
{
|
||||||
if( block )
|
if( postpone )
|
||||||
{
|
{
|
||||||
if( block_geometry_updates == 0 )
|
if( postpone_geometry_updates == 0 )
|
||||||
pending_geometry_update = false;
|
pending_geometry_update = false;
|
||||||
++block_geometry_updates;
|
++postpone_geometry_updates;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if( --block_geometry_updates == 0 )
|
if( --postpone_geometry_updates == 0 )
|
||||||
{
|
{
|
||||||
if( pending_geometry_update )
|
if( pending_geometry_update )
|
||||||
{
|
{
|
||||||
|
@ -1833,7 +1817,7 @@ void Client::changeMaximize( bool vertical, bool horizontal, bool adjust )
|
||||||
if( !adjust && max_mode == old_mode )
|
if( !adjust && max_mode == old_mode )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
GeometryUpdatesBlocker blocker( this );
|
GeometryUpdatesPostponer blocker( this );
|
||||||
|
|
||||||
// maximing one way and unmaximizing the other way shouldn't happen
|
// maximing one way and unmaximizing the other way shouldn't happen
|
||||||
Q_ASSERT( !( vertical && horizontal )
|
Q_ASSERT( !( vertical && horizontal )
|
||||||
|
@ -2085,7 +2069,7 @@ void Client::setFullScreen( bool set, bool user )
|
||||||
if( was_fs == isFullScreen())
|
if( was_fs == isFullScreen())
|
||||||
return;
|
return;
|
||||||
StackingUpdatesBlocker blocker1( workspace());
|
StackingUpdatesBlocker blocker1( workspace());
|
||||||
GeometryUpdatesBlocker blocker2( this );
|
GeometryUpdatesPostponer blocker2( this );
|
||||||
workspace()->updateClientLayer( this ); // active fullscreens get different layer
|
workspace()->updateClientLayer( this ); // active fullscreens get different layer
|
||||||
info->setState( isFullScreen() ? NET::FullScreen : 0, NET::FullScreen );
|
info->setState( isFullScreen() ? NET::FullScreen : 0, NET::FullScreen );
|
||||||
updateDecoration( false, false );
|
updateDecoration( false, false );
|
||||||
|
@ -2241,7 +2225,7 @@ bool Client::startMoveResize()
|
||||||
XMapRaised( display(), move_resize_grab_window );
|
XMapRaised( display(), move_resize_grab_window );
|
||||||
if( XGrabPointer( display(), move_resize_grab_window, False,
|
if( XGrabPointer( display(), move_resize_grab_window, False,
|
||||||
ButtonPressMask | ButtonReleaseMask | PointerMotionMask | EnterWindowMask | LeaveWindowMask,
|
ButtonPressMask | ButtonReleaseMask | PointerMotionMask | EnterWindowMask | LeaveWindowMask,
|
||||||
GrabModeAsync, GrabModeAsync, None, cursor.handle(), xTime() ) == Success )
|
GrabModeAsync, GrabModeAsync, move_resize_grab_window, cursor.handle(), xTime() ) == Success )
|
||||||
has_grab = true;
|
has_grab = true;
|
||||||
if( XGrabKeyboard( display(), frameId(), False, GrabModeAsync, GrabModeAsync, xTime() ) == Success )
|
if( XGrabKeyboard( display(), frameId(), False, GrabModeAsync, GrabModeAsync, xTime() ) == Success )
|
||||||
has_grab = true;
|
has_grab = true;
|
||||||
|
@ -2271,8 +2255,6 @@ bool Client::startMoveResize()
|
||||||
// not needed anymore? kapp->installEventFilter( eater );
|
// not needed anymore? kapp->installEventFilter( eater );
|
||||||
}
|
}
|
||||||
Notify::raise( isResize() ? Notify::ResizeStart : Notify::MoveStart );
|
Notify::raise( isResize() ? Notify::ResizeStart : Notify::MoveStart );
|
||||||
if( effects )
|
|
||||||
effects->windowUserMovedResized( this, true, false );
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2286,8 +2268,6 @@ void Client::finishMoveResize( bool cancel )
|
||||||
checkMaximizeGeometry();
|
checkMaximizeGeometry();
|
||||||
// FRAME update();
|
// FRAME update();
|
||||||
Notify::raise( isResize() ? Notify::ResizeEnd : Notify::MoveEnd );
|
Notify::raise( isResize() ? Notify::ResizeEnd : Notify::MoveEnd );
|
||||||
if( effects )
|
|
||||||
effects->windowUserMovedResized( this, false, true );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Client::leaveMoveResize()
|
void Client::leaveMoveResize()
|
||||||
|
@ -2551,8 +2531,7 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root )
|
||||||
}
|
}
|
||||||
if ( isMove() )
|
if ( isMove() )
|
||||||
workspace()->clientMoved(globalPos, xTime());
|
workspace()->clientMoved(globalPos, xTime());
|
||||||
if( effects )
|
|
||||||
effects->windowUserMovedResized( this, false, false );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
Loading…
Reference in New Issue