[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/work/kwin_composite
From: Luboš Luňák <l.lunak () kde ! org>
Date: 2006-07-04 20:32:49
Message-ID: 1152045169.866951.19345.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 558185 by lunakl:
Remove the temporary hacks again.
M +1 -2 client.cpp
M +0 -4 client.h
M +2 -44 composite.cpp
M +0 -1 manage.cpp
--- branches/work/kwin_composite/client.cpp #558184:558185
@@ -89,8 +89,7 @@
border_bottom( 0 ),
sm_stacking_order( -1 ),
demandAttentionKNotifyTimer( NULL ),
- damage( None ),
- appear_stage( 0 )
+ damage( None )
// SELI do all as initialization
{
autoRaiseTimer = 0;
--- branches/work/kwin_composite/client.h #558184:558185
@@ -296,9 +296,6 @@
void setShapable(bool b);
bool hasStrut() const;
- int appearStage() const { return appear_stage; }
- void appearStep() { if (appear_stage > 0 ) --appear_stage; }
-
private slots:
void autoRaise();
void shadeHover();
@@ -546,7 +543,6 @@
bool isBMP_;
QTimer* demandAttentionKNotifyTimer;
Damage damage;
- int appear_stage;
};
// helper for Client::postponeGeometryUpdates() being called in pairs (true/false)
--- branches/work/kwin_composite/composite.cpp #558184:558185
@@ -52,60 +52,22 @@
void Workspace::compositeTimeout()
{
- bool effect = false;
- for( ClientList::ConstIterator it = clients.begin();
- it != clients.end();
- ++it )
- {
- if( (*it)->appearStage())
- {
- effect = true;
- (*it)->appearStep();
- }
- }
-#define EFF
-#ifdef EFF
- const int SPD = 10;
- static int cnt = 0;
- int olds = cnt / SPD;
- ++cnt;
- if( cnt == 8 * SPD )
- cnt = 0;
- int s = cnt / SPD;
- if( !damaged && s == olds && !effect )
+ if( !damaged )
return;
-#else
- if( !damaged && !effect )
- return;
-#endif
XGCValues val;
val.foreground = WhitePixel( display(), DefaultScreen( display()));
val.subwindow_mode = IncludeInferiors;
GC gc = XCreateGC( display(), composite_pixmap, GCForeground | GCSubwindowMode, \
&val );
XFillRectangle( display(), composite_pixmap, gc, 0, 0, displayWidth(), \
displayHeight());
-#ifdef EFF
- val.fill_style = FillStippled;
- char data[] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x00 };
- data[ s ] = 1 << s;
- val.stipple = XCreateBitmapFromData( display(), rootWindow(), data, 8, 8 );
- val.foreground = BlackPixel( display(), DefaultScreen( display()));
- GC gc2 = XCreateGC( display(), composite_pixmap, GCForeground | GCSubwindowMode \
| GCFillStyle | GCStipple, &val );
-#endif
for( ClientList::ConstIterator it = stackingOrder().begin();
it != stackingOrder().end();
++it )
{
- QRect r = (*it)->geometry();
- if( (*it)->appearStage())
- r.setHeight( r.height() * ( 20 - (*it)->appearStage()) / 20 );
- r = r.intersect( QRect( 0, 0, displayWidth(), displayHeight()));
+ QRect r = (*it)->geometry().intersect( QRect( 0, 0, displayWidth(), \
displayHeight())); if( !r.isEmpty())
{
XCopyArea( display(), (*it)->windowPixmap(), composite_pixmap, gc,
qMax( 0, -(*it)->x()), qMax( 0, -(*it)->y()), r.width(), r.height(), \
r.x(), r.y());
-#ifdef EFF
- XFillRectangle( display(), composite_pixmap, gc2, r.x(), r.y(), \
r.width(), r.height());
-#endif
}
}
for( UnmanagedList::ConstIterator it = unmanaged.begin();
@@ -118,10 +80,6 @@
qMax( 0, -(*it)->x()), qMax( 0, -(*it)->y()), r.width(), r.height(), \
r.x(), r.y()); }
XCopyArea( display(), composite_pixmap, rootWindow(), gc, 0, 0, displayWidth(), \
displayHeight(), 0, 0 );
-#ifdef EFF
- XFreePixmap( display(), val.stipple );
- XFreeGC( display(), gc2 );
-#endif
XFreeGC( display(), gc );
XFlush( display());
damaged = false;
--- branches/work/kwin_composite/manage.cpp #558184:558185
@@ -54,7 +54,6 @@
embedClient( w, attr );
setupCompositing();
- appear_stage = 20;
// SELI order all these things in some sane manner
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic