vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Modified workspace method names to mark them up as referring to tiling 

svn path=/trunk/KDE/kdebase/workspace/; revision=1125434
icc-effect-5.14.5
Nikhil Marathe 2010-05-11 11:10:53 +00:00
parent cb36b296b0
commit 2163f87264
8 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activation.cpp
View File

@ -261,7 +261,7 @@ void Workspace::setActiveClient( Client* c, allowed_t )
static_cast<EffectsHandlerImpl*>(effects)->windowActivated( active_client ? active_client->effectWindow() : NULL ); static_cast<EffectsHandlerImpl*>(effects)->windowActivated( active_client ? active_client->effectWindow() : NULL );
if( tilingEnabled() ) if( tilingEnabled() )
notifyWindowActivated( active_client ); notifyTilingWindowActivated( active_client );
--set_active_client_recursion; --set_active_client_recursion;
} }

4
client.cpp
View File

@ -896,7 +896,7 @@ void Client::minimize( bool avoid_animation )
static_cast<EffectsHandlerImpl*>(effects)->windowMinimized( effectWindow()); static_cast<EffectsHandlerImpl*>(effects)->windowMinimized( effectWindow());
// when tiling, request a rearrangement // when tiling, request a rearrangement
workspace()->notifyWindowMinimizeToggled( this ); workspace()->notifyTilingWindowMinimizeToggled( this );
// Update states of all other windows in this group // Update states of all other windows in this group
if( clientGroup() ) if( clientGroup() )
@ -919,7 +919,7 @@ void Client::unminimize( bool avoid_animation )
static_cast<EffectsHandlerImpl*>( effects )->windowUnminimized( effectWindow() ); static_cast<EffectsHandlerImpl*>( effects )->windowUnminimized( effectWindow() );
// when tiling, request a rearrangement // when tiling, request a rearrangement
workspace()->notifyWindowMinimizeToggled( this ); workspace()->notifyTilingWindowMinimizeToggled( this );
// Update states of all other windows in this group // Update states of all other windows in this group
if( clientGroup() ) if( clientGroup() )

10
geometry.cpp
View File

@ -2155,7 +2155,7 @@ void Client::move( int x, int y, ForceGeometry_t force )
workspace()->checkActiveScreen( this ); workspace()->checkActiveScreen( this );
workspace()->updateStackingOrder(); workspace()->updateStackingOrder();
workspace()->checkUnredirect(); workspace()->checkUnredirect();
workspace()->notifyWindowMove( this, moveResizeGeom, initialMoveResizeGeom ); workspace()->notifyTilingWindowMove( this, moveResizeGeom, initialMoveResizeGeom );
// client itself is not damaged // client itself is not damaged
const QRect deco_rect = decorationRect().translated( geom.x(), geom.y() ); const QRect deco_rect = decorationRect().translated( geom.x(), geom.y() );
addWorkspaceRepaint( deco_rect_before_block ); addWorkspaceRepaint( deco_rect_before_block );
@ -2819,9 +2819,9 @@ void Client::finishMoveResize( bool cancel )
if( workspace()->tilingEnabled() ) if( workspace()->tilingEnabled() )
{ {
if( wasResize ) if( wasResize )
workspace()->notifyWindowResizeDone( this, moveResizeGeom, initialMoveResizeGeom, cancel ); workspace()->notifyTilingWindowResizeDone( this, moveResizeGeom, initialMoveResizeGeom, cancel );
else if( wasMove ) else if( wasMove )
workspace()->notifyWindowMoveDone( this, moveResizeGeom, initialMoveResizeGeom, cancel ); workspace()->notifyTilingWindowMoveDone( this, moveResizeGeom, initialMoveResizeGeom, cancel );
} }
else else
{ {
@ -3095,7 +3095,7 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root )
abort(); abort();
break; break;
} }
workspace()->notifyWindowResize( this, moveResizeGeom, initialMoveResizeGeom ); workspace()->notifyTilingWindowResize( this, moveResizeGeom, initialMoveResizeGeom );
// adjust new size to snap to other windows/borders // adjust new size to snap to other windows/borders
moveResizeGeom = workspace()->adjustClientSize( this, moveResizeGeom, mode ); moveResizeGeom = workspace()->adjustClientSize( this, moveResizeGeom, mode );
@ -3270,7 +3270,7 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root )
if ( isMove() ) if ( isMove() )
{ {
workspace()->notifyWindowMove( this, moveResizeGeom, initialMoveResizeGeom ); workspace()->notifyTilingWindowMove( this, moveResizeGeom, initialMoveResizeGeom );
workspace()->checkElectricBorder(globalPos, xTime()); workspace()->checkElectricBorder(globalPos, xTime());
} }
} }

2
tile.cpp
View File

@ -96,7 +96,7 @@ void Tile::floatTile()
restorePreviousGeometry(); restorePreviousGeometry();
commit(); commit();
client()->workspace()->notifyWindowActivated( client() ); client()->workspace()->notifyTilingWindowActivated( client() );
// TODO: notify layout manager // TODO: notify layout manager
} }

40
tiling.cpp
View File

@ -169,14 +169,14 @@ void Workspace::updateAllTiles()
/* /*
* Resize the neighbouring clients to close any gaps * Resize the neighbouring clients to close any gaps
*/ */
void Workspace::notifyWindowResize( Client *c, const QRect &moveResizeGeom, const QRect &orig ) void Workspace::notifyTilingWindowResize( Client *c, const QRect &moveResizeGeom, const QRect &orig )
{ {
if( tilingLayouts.value( c->desktop() ) == NULL ) if( tilingLayouts.value( c->desktop() ) == NULL )
return; return;
tilingLayouts[ c->desktop() ]->clientResized( c, moveResizeGeom, orig ); tilingLayouts[ c->desktop() ]->clientResized( c, moveResizeGeom, orig );
} }
void Workspace::notifyWindowMove( Client *c, const QRect &moveResizeGeom, const QRect &orig ) void Workspace::notifyTilingWindowMove( Client *c, const QRect &moveResizeGeom, const QRect &orig )
{ {
if( tilingLayouts.value( c->desktop() ) == NULL ) if( tilingLayouts.value( c->desktop() ) == NULL )
{ {
@ -187,23 +187,23 @@ void Workspace::notifyWindowMove( Client *c, const QRect &moveResizeGeom, const
updateAllTiles(); updateAllTiles();
} }
void Workspace::notifyWindowResizeDone( Client *c, const QRect &moveResizeGeom, const QRect &orig, bool canceled ) void Workspace::notifyTilingWindowResizeDone( Client *c, const QRect &moveResizeGeom, const QRect &orig, bool canceled )
{ {
if( canceled ) if( canceled )
notifyWindowResize( c, orig, moveResizeGeom ); notifyTilingWindowResize( c, orig, moveResizeGeom );
else else
notifyWindowResize( c, moveResizeGeom, orig ); notifyTilingWindowResize( c, moveResizeGeom, orig );
} }
void Workspace::notifyWindowMoveDone( Client *c, const QRect &moveResizeGeom, const QRect &orig, bool canceled ) void Workspace::notifyTilingWindowMoveDone( Client *c, const QRect &moveResizeGeom, const QRect &orig, bool canceled )
{ {
if( canceled ) if( canceled )
notifyWindowMove( c, orig, moveResizeGeom ); notifyTilingWindowMove( c, orig, moveResizeGeom );
else else
notifyWindowMove( c, moveResizeGeom, orig ); notifyTilingWindowMove( c, moveResizeGeom, orig );
} }
void Workspace::notifyWindowDesktopChanged( Client *c, int old_desktop ) void Workspace::notifyTilingWindowDesktopChanged( Client *c, int old_desktop )
{ {
if( c->desktop() < 1 || c->desktop() > numberOfDesktops() ) if( c->desktop() < 1 || c->desktop() > numberOfDesktops() )
return; return;
@ -229,7 +229,7 @@ void Workspace::notifyWindowDesktopChanged( Client *c, int old_desktop )
/* /*
* Implements the 3 raising modes in Window Behaviour -> Advanced * Implements the 3 raising modes in Window Behaviour -> Advanced
*/ */
void Workspace::notifyWindowActivated( Client *c ) void Workspace::notifyTilingWindowActivated( Client *c )
{ {
if( c == NULL ) if( c == NULL )
return; return;
@ -271,7 +271,7 @@ void Workspace::notifyWindowActivated( Client *c )
} }
} }
void Workspace::notifyWindowMinimizeToggled( Client *c ) void Workspace::notifyTilingWindowMinimizeToggled( Client *c )
{ {
if( tilingLayouts.value( c->desktop() ) ) if( tilingLayouts.value( c->desktop() ) )
{ {
@ -279,7 +279,7 @@ void Workspace::notifyWindowMinimizeToggled( Client *c )
} }
} }
void Workspace::notifyWindowMaximized( Client *c, Options::WindowOperation op ) void Workspace::notifyTilingWindowMaximized( Client *c, Options::WindowOperation op )
{ {
if( tilingLayouts.value( c->desktop() ) ) if( tilingLayouts.value( c->desktop() ) )
{ {
@ -394,42 +394,42 @@ void Workspace::moveTile( int d )
} }
} }
void Workspace::slotLeft() void Workspace::slotFocusTileLeft()
{ {
focusTile( Tile::Left ); focusTile( Tile::Left );
} }
void Workspace::slotRight() void Workspace::slotFocusTileRight()
{ {
focusTile( Tile::Right ); focusTile( Tile::Right );
} }
void Workspace::slotTop() void Workspace::slotFocusTileTop()
{ {
focusTile( Tile::Top ); focusTile( Tile::Top );
} }
void Workspace::slotBottom() void Workspace::slotFocusTileBottom()
{ {
focusTile( Tile::Bottom ); focusTile( Tile::Bottom );
} }
void Workspace::slotMoveLeft() void Workspace::slotMoveTileLeft()
{ {
moveTile( Tile::Left ); moveTile( Tile::Left );
} }
void Workspace::slotMoveRight() void Workspace::slotMoveTileRight()
{ {
moveTile( Tile::Right ); moveTile( Tile::Right );
} }
void Workspace::slotMoveTop() void Workspace::slotMoveTileTop()
{ {
moveTile( Tile::Top ); moveTile( Tile::Top );
} }
void Workspace::slotMoveBottom() void Workspace::slotMoveTileBottom()
{ {
moveTile( Tile::Bottom ); moveTile( Tile::Bottom );
} }

2
useractions.cpp
View File

@ -705,7 +705,7 @@ void Workspace::performWindowOperation( Client* c, Options::WindowOperation op )
|| op == Options::VMaximizeOp || op == Options::VMaximizeOp
|| op == Options::RestoreOp ) ) || op == Options::RestoreOp ) )
{ {
notifyWindowMaximized( c, op ); notifyTilingWindowMaximized( c, op );
} }
if (op == Options::MoveOp || op == Options::UnrestrictedMoveOp ) if (op == Options::MoveOp || op == Options::UnrestrictedMoveOp )

6
workspace.cpp
View File

@ -1158,7 +1158,7 @@ void Workspace::slotReconfigure()
layout->reconfigureTiling(); layout->reconfigureTiling();
} }
// just so that we reset windows in the right manner, 'activate' the current active window // just so that we reset windows in the right manner, 'activate' the current active window
notifyWindowActivated( activeClient() ); notifyTilingWindowActivated( activeClient() );
rootInfo->setSupported( NET::WM2FrameOverlap, mgr->factory()->supports( AbilityExtendIntoClientArea ) ); rootInfo->setSupported( NET::WM2FrameOverlap, mgr->factory()->supports( AbilityExtendIntoClientArea ) );
} }
@ -1431,7 +1431,7 @@ bool Workspace::setCurrentDesktop( int new_desktop )
movingClient->setDesktop( new_desktop ); movingClient->setDesktop( new_desktop );
if( tilingEnabled() ) if( tilingEnabled() )
{ {
notifyWindowDesktopChanged( movingClient, old_desktop ); notifyTilingWindowDesktopChanged( movingClient, old_desktop );
} }
} }
@ -1621,7 +1621,7 @@ void Workspace::sendClientToDesktop( Client* c, int desk, bool dont_activate )
else else
raiseClient( c ); raiseClient( c );
notifyWindowDesktopChanged( c, old_desktop ); notifyTilingWindowDesktopChanged( c, old_desktop );
ClientList transients_stacking_order = ensureStackingOrder( c->transients() ); ClientList transients_stacking_order = ensureStackingOrder( c->transients() );
for( ClientList::ConstIterator it = transients_stacking_order.constBegin(); for( ClientList::ConstIterator it = transients_stacking_order.constBegin();

32
workspace.h
View File

@ -186,14 +186,14 @@ class Workspace : public QObject, public KDecorationDefines
// various points in existing code so that // various points in existing code so that
// tiling can take any action if required. // tiling can take any action if required.
// They are defined in tiling.cpp // They are defined in tiling.cpp
void notifyWindowResize( Client *c, const QRect &moveResizeGeom, const QRect &orig ); void notifyTilingWindowResize( Client *c, const QRect &moveResizeGeom, const QRect &orig );
void notifyWindowMove( Client *c, const QRect &moveResizeGeom, const QRect &orig ); void notifyTilingWindowMove( Client *c, const QRect &moveResizeGeom, const QRect &orig );
void notifyWindowResizeDone( Client *c, const QRect &moveResizeGeom, const QRect &orig, bool canceled ); void notifyTilingWindowResizeDone( Client *c, const QRect &moveResizeGeom, const QRect &orig, bool canceled );
void notifyWindowMoveDone( Client *c, const QRect &moveResizeGeom, const QRect &orig, bool canceled ); void notifyTilingWindowMoveDone( Client *c, const QRect &moveResizeGeom, const QRect &orig, bool canceled );
void notifyWindowDesktopChanged( Client *c, int old_desktop ); void notifyTilingWindowDesktopChanged( Client *c, int old_desktop );
void notifyWindowActivated( Client *c ); void notifyTilingWindowActivated( Client *c );
void notifyWindowMinimizeToggled( Client *c ); void notifyTilingWindowMinimizeToggled( Client *c );
void notifyWindowMaximized( Client *c, WindowOperation op ); void notifyTilingWindowMaximized( Client *c, WindowOperation op );
Position supportedTilingResizeMode( Client *c, Position currentMode ); Position supportedTilingResizeMode( Client *c, Position currentMode );
@ -698,15 +698,15 @@ class Workspace : public QObject, public KDecorationDefines
void slotPreviousTileLayout(); void slotPreviousTileLayout();
// Changes the focused client // Changes the focused client
void slotLeft(); void slotFocusTileLeft();
void slotRight(); void slotFocusTileRight();
void slotTop(); void slotFocusTileTop();
void slotBottom(); void slotFocusTileBottom();
// swaps active and adjacent client. // swaps active and adjacent client.
void slotMoveLeft(); void slotMoveTileLeft();
void slotMoveRight(); void slotMoveTileRight();
void slotMoveTop(); void slotMoveTileTop();
void slotMoveBottom(); void slotMoveTileBottom();
void belowCursor(); void belowCursor();
// NOTE: debug method // NOTE: debug method