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

CT: ok. smart placement is back. and shoved on you all to test it :-)

Browse source 
svn path=/trunk/kdebase/kwin/; revision=34116
This commit is contained in:
Cristian Tibirna 1999-11-17 06:11:39 +00:00
parent f49c7be018
commit a8136ad767
2 changed files with 32 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
options.cpp
View file

@ -13,7 +13,7 @@ Options::Options()
reload(); reload();
//CT //CT
placement = Random; //ACHTUNG!! for the moment *only* placement = Smart; //ACHTUNG!! for the moment *only*
} }
Options::~Options(){ Options::~Options(){

56
workspace.cpp
View file

@ -895,8 +895,8 @@ void Workspace::smartPlacement(Client* c){
* Anthony Martin (amartin@engr.csulb.edu). * Anthony Martin (amartin@engr.csulb.edu).
*/ */
const int none = 0, least = -1, wrong = -2; // overlap types const int none = 0, h_wrong = -1, w_wrong = -2; // overlap types
int overlap, min_overlap; long int overlap, min_overlap;
int x_optimal, y_optimal; int x_optimal, y_optimal;
int possible; int possible;
@ -906,18 +906,20 @@ void Workspace::smartPlacement(Client* c){
// get the maximum allowed windows space // get the maximum allowed windows space
QRect maxRect = clientArea(); QRect maxRect = clientArea();
int x = maxRect.left(), y = maxRect.top(); int x = maxRect.left(), y = maxRect.top();
x_optimal = x; y_optimal = y;
//client gabarit //client gabarit
int ch = c->height(), cw = c->width(); int ch = c->height(), cw = c->width();
bool first_pass = true; //CT lame flag. Don't like it. What else would do?
//loop over possible positions //loop over possible positions
do { do {
//test if enough room in x and y directions //test if enough room in x and y directions
if ( y + ch > maxRect.bottom() ) if ( y + ch > maxRect.bottom() )
overlap = -1; overlap = h_wrong; // this throws the algorithm to an exit
else if( x + cw > maxRect.right() ) else if( x + cw > maxRect.right() )
overlap = -2; overlap = w_wrong;
else { else {
overlap = none; //initialize overlap = none; //initialize
@ -925,13 +927,13 @@ void Workspace::smartPlacement(Client* c){
cyt = y; cyb = y + ch; cyt = y; cyb = y + ch;
QValueList<Client*>::ConstIterator l; QValueList<Client*>::ConstIterator l;
for(l = clients.begin(); l != clients.end() ; ++l ) { for(l = clients.begin(); l != clients.end() ; ++l ) {
if((*l)->isOnDesktop(currentDesktop()) || if((*l)->isOnDesktop(currentDesktop()) && (*l) != desktop_client &&
!(*l)->isIconified() || !((*l) == c) ) { !(*l)->isIconified() && (*l) != c ) {
xl = (*l)->x(); yt = (*l)->y(); xl = (*l)->x(); yt = (*l)->y();
xr = xl + (*l)->height(); yb = yt + (*l)->width(); xr = xl + (*l)->height(); yb = yt + (*l)->width();
//if windows overlap, calc the overlapping //if windows overlap, calc the overall overlapping
if((cxl < xr) && (cxr > xl) && if((cxl < xr) && (cxr > xl) &&
(cyt < yb) && (cyb > yt)) { (cyt < yb) && (cyb > yt)) {
xl = QMAX(cxl, xl); xr = QMIN(cxr, xr); xl = QMAX(cxl, xl); xr = QMIN(cxr, xr);
@ -941,7 +943,18 @@ void Workspace::smartPlacement(Client* c){
} }
} }
} }
if (first_pass) {
first_pass = false;
min_overlap = overlap;
}
//CT save the best position and the minimum overlap up to now
else if ( overlap >= none && overlap < min_overlap) {
min_overlap = overlap;
x_optimal = x;
y_optimal = y;
}
// really need to loop? test if there's any overlap // really need to loop? test if there's any overlap
if ( overlap > none ) { if ( overlap > none ) {
@ -952,8 +965,8 @@ void Workspace::smartPlacement(Client* c){
QValueList<Client*>::ConstIterator l; QValueList<Client*>::ConstIterator l;
for(l = clients.begin(); l != clients.end() ; ++l) { for(l = clients.begin(); l != clients.end() ; ++l) {
if ( (*l)->isOnDesktop(currentDesktop()) || if ( (*l)->isOnDesktop(currentDesktop()) && (*l) != desktop_client &&
!(*l)->isIconified() || !((*l) == c) ) { !(*l)->isIconified() && (*l) != c ) {
xl = (*l)->x(); yt = (*l)->y(); xl = (*l)->x(); yt = (*l)->y();
xr = xl + (*l)->height(); yb = yt + (*l)->width(); xr = xl + (*l)->height(); yb = yt + (*l)->width();
@ -973,20 +986,18 @@ void Workspace::smartPlacement(Client* c){
} }
} }
// ... else => not enough x dimension (overlap was -2) // ... else ==> not enough x dimension (overlap was wrong on horizontal)
else if (overlap == wrong) { else if ( overlap == w_wrong ) {
x = maxRect.left(); x = maxRect.left();
possible = maxRect.bottom(); possible = maxRect.bottom();
if(possible - ch > y) possible -= ch; if ( possible - ch > y ) possible -= ch;
//test the position of each window on current desk //test the position of each window on current desk
//07mar98. fixed bug which made iconified windows avoided as if visible
QValueList<Client*>::ConstIterator l; QValueList<Client*>::ConstIterator l;
for(l = clients.begin(); l != clients.end() ; ++l) { for( l = clients.begin(); l != clients.end() ; ++l ) {
if( (*l)->isOnDesktop( currentDesktop() ) || if( (*l)->isOnDesktop( currentDesktop() ) && (*l) != desktop_client &&
!((*l) == c) || !c->isIconified() ) { (*l) != c && !c->isIconified() ) {
xl = (*l)->x(); yt = (*l)->y(); xl = (*l)->x(); yt = (*l)->y();
xr = xl + (*l)->height(); yb = yt + (*l)->width(); xr = xl + (*l)->height(); yb = yt + (*l)->width();
@ -1000,13 +1011,8 @@ void Workspace::smartPlacement(Client* c){
y = possible; y = possible;
} }
} }
min_overlap = overlap;
x_optimal = x;
y_optimal = y;
} }
while((overlap != none) && (overlap != least)); while( overlap != none && overlap != h_wrong );
// place the window // place the window
c->move( x_optimal, y_optimal ); c->move( x_optimal, y_optimal );