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

Allow the quick tiling keyboard shortcuts to move the window between

Browse source 
Xinerama screens.

svn path=/trunk/KDE/kdebase/workspace/; revision=1065319
This commit is contained in:
Lucas Murray 2009-12-23 01:36:44 +00:00
parent 738917e603
commit ae3ef3f765
3 changed files with 50 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client.h
View file

@ -236,7 +236,7 @@ class Client
* This will also handle preserving and restoring of window geometry as necessary.
* @param mode The tile mode (left/right) to give this window.
*/
void setQuickTileMode( QuickTileMode mode );
void setQuickTileMode( QuickTileMode mode, bool keyboard = false );
void growHorizontal();
void shrinkHorizontal();

56
geometry.cpp
View file

@ -3297,7 +3297,7 @@ QRect Client::electricBorderMaximizeGeometry()
return ret;
}
void Client::setQuickTileMode( QuickTileMode mode )
void Client::setQuickTileMode( QuickTileMode mode, bool keyboard )
{
// Only allow quick tile on a regular or maximized window
if( !isResizable() && maximizeMode() != MaximizeFull )
@ -3318,18 +3318,56 @@ void Client::setQuickTileMode( QuickTileMode mode )
{
// Untiling, so just restore geometry, and we're done.
setGeometry( geom_pretile );
checkWorkspacePosition(); // Just in case it's a different screen
quick_tile_mode = QuickTileNone;
return;
}
else
{
// Check they aren't retiling in an existing direction, so we don't overwrite the saved geometry needlessly
if ( quick_tile_mode == mode )
return;
QPoint whichScreen = keyboard ? geometry().center() : cursorPos();
// Not coming out of an existing tile, not shifting monitors, we're setting a brand new tile.
// Store geometry first, so we can go out of this tile later.
geom_pretile = geometry();
// If trying to tile to the side that the window is already tiled to move the window to the next
// screen if it exists, otherwise ignore the request to prevent corrupting geom_pretile.
if( quick_tile_mode == mode )
{
const int numScreens = Kephal::ScreenUtils::numScreens();
const int curScreen = screen();
int nextScreen = curScreen;
QRect screens[numScreens];
for( int i = 0; i < numScreens; ++i ) // Cache
screens[i] = Kephal::ScreenUtils::screenGeometry( i );
for( int i = 0; i < numScreens; ++i )
{
if( i == curScreen )
continue;
if((( mode == QuickTileLeft &&
screens[i].center().x() < screens[nextScreen].center().x() ) ||
( mode == QuickTileRight &&
screens[i].center().x() > screens[nextScreen].center().x() )) &&
// Must be in horizontal line
( screens[i].bottom() > screens[nextScreen].top() ||
screens[i].top() < screens[nextScreen].bottom() ))
nextScreen = i;
}
if( nextScreen == curScreen )
return; // No other screens
// Move to other screen
geom_pretile.translate(
screens[nextScreen].x() - screens[curScreen].x(),
screens[nextScreen].y() - screens[curScreen].y() );
whichScreen = screens[nextScreen].center();
// Swap sides
if( mode == QuickTileLeft )
mode = QuickTileRight;
else
mode = QuickTileLeft;
}
else
// Not coming out of an existing tile, not shifting monitors, we're setting a brand new tile.
// Store geometry first, so we can go out of this tile later.
geom_pretile = geometry();
// Temporary, so the maximize code doesn't get all confused
quick_tile_mode = QuickTileNone;
@ -3337,12 +3375,12 @@ void Client::setQuickTileMode( QuickTileMode mode )
// Do the actual tile.
if( mode == QuickTileLeft )
{
QRect max = workspace()->clientArea( MaximizeArea, cursorPos(), desktop() );
QRect max = workspace()->clientArea( MaximizeArea, whichScreen, desktop() );
setGeometry( QRect( max.x(), max.y(), max.width()/2, max.height() ) );
}
else
{
QRect max = workspace()->clientArea( MaximizeArea, cursorPos(), desktop() );
QRect max = workspace()->clientArea( MaximizeArea, whichScreen, desktop() );
setGeometry( QRect( max.x() + max.width()/2, max.y(), max.width()/2, max.height() ) );
}

4
placement.cpp
View file

@ -727,7 +727,7 @@ void Workspace::slotWindowQuickTileLeft()
if( !active_client )
return;
active_client->setQuickTileMode( QuickTileLeft );
active_client->setQuickTileMode( QuickTileLeft, true );
}
void Workspace::slotWindowQuickTileRight()
@ -735,7 +735,7 @@ void Workspace::slotWindowQuickTileRight()
if( !active_client )
return;
active_client->setQuickTileMode( QuickTileRight );
active_client->setQuickTileMode( QuickTileRight, true );
}
int Workspace::packPositionLeft( const Client* cl, int oldx, bool left_edge ) const