TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix TDM hang in certain circumstances when themed greeter is deleted

Browse Source 
This resolves Bug 1453
Resolve themed greeter drawing inconsistencies between composited and non-composited mode
pull/2/head
Timothy Pearson 11 years ago
parent 9804217b51
commit 3421d01bb0
9 changed files with 203 additions and 122 deletions
Show Stats Download Patch File Download Diff File

15
tdm/kfrontend/kgapp.cpp
Unescape View File

@ -218,6 +218,11 @@ kg_main( const char *argv0 )
#else #else
trinity_desktop_lock_use_sak = false; trinity_desktop_lock_use_sak = false;
#endif #endif
if (trinity_desktop_lock_use_sak) {
if (system(KDE_BINDIR "/tsak checkdeps") != 0) {
trinity_desktop_lock_use_sak = false;
}
}
if (trinity_desktop_lock_use_sak) { if (trinity_desktop_lock_use_sak) {
tsak = new TDEProcess; tsak = new TDEProcess;
*tsak << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + "tsak"; *tsak << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + "tsak";
@ -273,10 +278,11 @@ kg_main( const char *argv0 )
XSetErrorHandler( (XErrorHandler)0 ); XSetErrorHandler( (XErrorHandler)0 );
GreeterApp *app; GreeterApp *app;
if ( (argb_visual_available == true) && (!_compositor.isEmpty()) ) { if ((!_compositor.isEmpty()) && ( argb_visual_available == true )) {
app = new GreeterApp(dpyi, Qt::HANDLE( visual ), Qt::HANDLE( colormap )); app = new GreeterApp(dpyi, Qt::HANDLE( visual ), Qt::HANDLE( colormap ));
} }
else { else {
argb_visual_available = false;
app = new GreeterApp(dpyi); app = new GreeterApp(dpyi);
} }
// End ARGB initialization // End ARGB initialization
@ -359,6 +365,11 @@ kg_main( const char *argv0 )
} }
twin = new TDEProcess; twin = new TDEProcess;
*twin << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + _windowManager.ascii(); *twin << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + _windowManager.ascii();
if (_windowManager == "twin") {
// Special case
// Do not allow twin to start kompmgr...
*twin << "--disablecompositionmanager";
}
twin->start(); twin->start();
has_twin = true; has_twin = true;
} }
@ -492,7 +503,7 @@ kg_main( const char *argv0 )
if (userinfo) { if (userinfo) {
TQString newuid = TQString("%1").arg(userinfo->pw_uid); TQString newuid = TQString("%1").arg(userinfo->pw_uid);
// kompmgr allows us to change its uid in this manner: // kompmgr allows us to change its uid in this manner:
// 1.) Send SIGUSER1 // 1.) Send SIGUSR1
// 2.) Send the new UID to it on the command line // 2.) Send the new UID to it on the command line
comp->kill(SIGUSR1); comp->kill(SIGUSR1);
comp->writeStdin(newuid.ascii(), newuid.length()); comp->writeStdin(newuid.ascii(), newuid.length());

6
tdm/kfrontend/kgreeter.cpp
Unescape View File

@ -154,8 +154,9 @@ public:
return TDEListView::paintEmptyArea(p, rect ); return TDEListView::paintEmptyArea(p, rect );
const TQPixmap *pm = TQT_TQPIXMAP_CONST(paletteBackgroundPixmap()); const TQPixmap *pm = TQT_TQPIXMAP_CONST(paletteBackgroundPixmap());
if (!pm || pm->isNull()) if (!pm || pm->isNull()) {
return; return;
}
kdDebug() << "paintEmpty " << rect << endl; kdDebug() << "paintEmpty " << rect << endl;
TQRect devRect = p->xForm( rect ); TQRect devRect = p->xForm( rect );
@ -1355,6 +1356,9 @@ void ControlPipeHandlerObject::run(void) {
return; return;
} }
} }
// Thread cancellation point
usleep(1);
} }
TQApplication::eventLoop()->exit(-1); TQApplication::eventLoop()->exit(-1);
} }

13
tdm/kfrontend/themer/tdmitem.cpp
Unescape View File

@ -286,17 +286,18 @@ KdmItem::setGeometry( const TQRect &newGeometry, bool force )
void void
KdmItem::paint( TQPainter *p, const TQRect &rect ) KdmItem::paint( TQPainter *p, const TQRect &rect )
{ {
if (isHidden()) if (isHidden()) {
return; return;
}
if (myWidget || (myLayoutItem && myLayoutItem->widget())) { if (myWidget || (myLayoutItem && myLayoutItem->widget())) {
// TDEListView because it's missing a Q_OBJECT' // TDEListView because it's missing a Q_OBJECT
// FIXME: This is a nice idea in theory, but in practice it is // FIXME: This is a nice idea in theory, but in practice it is
// very confusing for the user not to see the empty list box // very confusing for the user not to see the empty list box
// delineated from the rest of the greeter. // delineated from the rest of the greeter.
// Maybe set a darker version of the background instead of an exact copy? // Maybe set a darker version of the background instead of an exact copy?
if ( myWidget && myWidget->isA( "TDEListView" ) ) { if ( myWidget && myWidget->isA( "TDEListView" ) ) {
if ((_compositor.isEmpty()) || (!argb_visual_available)) { if (!argb_visual_available) {
// Software blend only (no compositing support) // Software blend only (no compositing support)
TQPixmap copy( myWidget->size() ); TQPixmap copy( myWidget->size() );
kdDebug() << myWidget->geometry() << " " << area << " " << myWidget->size() << endl; kdDebug() << myWidget->geometry() << " " << area << " " << myWidget->size() << endl;
@ -371,13 +372,15 @@ KdmItem::paint( TQPainter *p, const TQRect &rect )
p->drawRect( area ); p->drawRect( area );
#endif #endif
if (myLayoutItem) if (myLayoutItem) {
return; return;
}
// Dispatch paint events to children // Dispatch paint events to children
TQValueList<KdmItem *>::Iterator it; TQValueList<KdmItem *>::Iterator it;
for (it = m_children.begin(); it != m_children.end(); ++it) for (it = m_children.begin(); it != m_children.end(); ++it) {
(*it)->paint( p, rect ); (*it)->paint( p, rect );
}
} }

104
tdm/kfrontend/themer/tdmpixmap.cpp
Unescape View File

@ -69,7 +69,7 @@ KdmPixmap::KdmPixmap( KdmItem *parent, const TQDomNode &node, const char *name )
pixmap.normal.alpha = el.attribute( "alpha", "1.0" ).toFloat(); pixmap.normal.alpha = el.attribute( "alpha", "1.0" ).toFloat();
if (el.attribute( "file", "" ) == "@@@TDMBACKGROUND@@@") { if (el.attribute( "file", "" ) == "@@@TDMBACKGROUND@@@") {
if ((_compositor.isEmpty()) || (!argb_visual_available)) { if (!argb_visual_available) {
// Software blend only (no compositing support) // Software blend only (no compositing support)
// Use the preset TDM background... // Use the preset TDM background...
TDEStandardDirs *m_pDirs = TDEGlobal::dirs(); TDEStandardDirs *m_pDirs = TDEGlobal::dirs();
@ -111,13 +111,16 @@ KdmPixmap::sizeHint()
{ {
// choose the correct pixmap class // choose the correct pixmap class
PixmapStruct::PixmapClass * pClass = &pixmap.normal; PixmapStruct::PixmapClass * pClass = &pixmap.normal;
if (state == Sactive && pixmap.active.present) if (state == Sactive && pixmap.active.present) {
pClass = &pixmap.active; pClass = &pixmap.active;
if (state == Sprelight && pixmap.prelight.present) }
if (state == Sprelight && pixmap.prelight.present) {
pClass = &pixmap.prelight; pClass = &pixmap.prelight;
}
// use the pixmap size as the size hint // use the pixmap size as the size hint
if (!pClass->pixmap.isNull()) if (!pClass->pixmap.isNull()) {
return pClass->pixmap.size(); return pClass->pixmap.size();
}
return KdmItem::sizeHint(); return KdmItem::sizeHint();
} }
@ -134,12 +137,14 @@ KdmPixmap::setGeometry( const TQRect &newGeometry, bool force )
TQString TQString
KdmPixmap::fullPath( const TQString &fileName) KdmPixmap::fullPath( const TQString &fileName)
{ {
if (fileName.isEmpty()) if (fileName.isEmpty()) {
return TQString::null; return TQString::null;
}
TQString fullName = fileName; TQString fullName = fileName;
if (fullName.at( 0 ) != '/') if (fullName.at( 0 ) != '/') {
fullName = baseDir() + "/" + fileName; fullName = baseDir() + "/" + fileName;
}
return fullName; return fullName;
} }
@ -170,20 +175,22 @@ KdmPixmap::renderSvg( PixmapStruct::PixmapClass *pClass, const TQRect &area )
void void
KdmPixmap::loadPixmap( PixmapStruct::PixmapClass *pClass ) KdmPixmap::loadPixmap( PixmapStruct::PixmapClass *pClass )
{ {
TQString fullpath = pClass->fullpath; TQString fullpath = pClass->fullpath;
kdDebug() << timestamp() << " load " << fullpath << endl; kdDebug() << timestamp() << " load " << fullpath << endl;
int index = fullpath.findRev('.'); int index = fullpath.findRev('.');
TQString ext = fullpath.right(fullpath.length() - index); TQString ext = fullpath.right(fullpath.length() - index);
fullpath = fullpath.left(index); fullpath = fullpath.left(index);
kdDebug() << timestamp() << " ext " << ext << " " << fullpath << endl; kdDebug() << timestamp() << " ext " << ext << " " << fullpath << endl;
TQString testpath = TQString("-%1x%2").arg(area.width()).arg(area.height()) + ext; TQString testpath = TQString("-%1x%2").arg(area.width()).arg(area.height()) + ext;
kdDebug() << timestamp() << " testing for " << fullpath + testpath << endl; kdDebug() << timestamp() << " testing for " << fullpath + testpath << endl;
if (TDEStandardDirs::exists(fullpath + testpath)) if (TDEStandardDirs::exists(fullpath + testpath)) {
pClass->pixmap.load(fullpath + testpath); pClass->pixmap.load(fullpath + testpath);
else }
pClass->pixmap.load( fullpath + ext ); else {
kdDebug() << timestamp() << " done\n"; pClass->pixmap.load( fullpath + ext );
}
kdDebug() << timestamp() << " done\n";
} }
void void
@ -191,16 +198,19 @@ KdmPixmap::drawContents( TQPainter *p, const TQRect &r )
{ {
// choose the correct pixmap class // choose the correct pixmap class
PixmapStruct::PixmapClass *pClass = &pixmap.normal; PixmapStruct::PixmapClass *pClass = &pixmap.normal;
if (state == Sactive && pixmap.active.present) if (state == Sactive && pixmap.active.present) {
pClass = &pixmap.active; pClass = &pixmap.active;
if (state == Sprelight && pixmap.prelight.present) }
if (state == Sprelight && pixmap.prelight.present) {
pClass = &pixmap.prelight; pClass = &pixmap.prelight;
}
kdDebug() << "draw " << id << " " << pClass->pixmap.isNull() << endl; kdDebug() << "draw " << id << " " << pClass->pixmap.isNull() << endl;
if (pClass->pixmap.isNull()) { if (pClass->pixmap.isNull()) {
if (pClass->fullpath.isEmpty()) // if neither is set, we're empty if (pClass->fullpath.isEmpty()) { // if neither is set, we're empty
return; return;
}
if (!pClass->fullpath.endsWith( ".svg" ) ) { if (!pClass->fullpath.endsWith( ".svg" ) ) {
loadPixmap(pClass); loadPixmap(pClass);
@ -230,21 +240,20 @@ KdmPixmap::drawContents( TQPainter *p, const TQRect &r )
if (pClass->readyPixmap.isNull()) { if (pClass->readyPixmap.isNull()) {
bool haveTint = pClass->tint.rgb() != 0xFFFFFF; bool haveTint = pClass->tint.rgb() != 0xFFFFFF;
bool haveAlpha = pClass->alpha < 1.0; bool haveAlpha = pClass->alpha < 1.0;
TQImage scaledImage; TQImage scaledImage;
// use the loaded pixmap or a scaled version if needed // use the loaded pixmap or a scaled version if needed
kdDebug() << timestamp() << " prepare readyPixmap " << pClass->fullpath << " " << area.size() << " " << pClass->pixmap.size() << endl; kdDebug() << timestamp() << " prepare readyPixmap " << pClass->fullpath << " " << area.size() << " " << pClass->pixmap.size() << endl;
if (area.size() != pClass->pixmap.size()) { if (area.size() != pClass->pixmap.size()) {
if (pClass->fullpath.endsWith( ".svg" )) { if (pClass->fullpath.endsWith( ".svg" )) {
kdDebug() << timestamp() << " renderSVG\n"; kdDebug() << timestamp() << " renderSVG\n";
renderSvg( pClass, area ); renderSvg( pClass, area );
scaledImage = pClass->pixmap.convertToImage(); scaledImage = pClass->pixmap.convertToImage();
} else { }
else {
kdDebug() << timestamp() << " convertFromImage smoothscale\n"; kdDebug() << timestamp() << " convertFromImage smoothscale\n";
if (pClass->pixmap.isNull()) { if (pClass->pixmap.isNull()) {
scaledImage = TQImage(); scaledImage = TQImage();
@ -256,20 +265,22 @@ KdmPixmap::drawContents( TQPainter *p, const TQRect &r )
} }
kdDebug() << timestamp() << " done\n"; kdDebug() << timestamp() << " done\n";
} }
} else { }
if (haveTint || haveAlpha) else {
{ if (haveTint || haveAlpha) {
scaledImage = pClass->pixmap.convertToImage(); scaledImage = pClass->pixmap.convertToImage();
// enforce rgba values for the latter // enforce rgba values for the latter
if (!scaledImage.isNull()) scaledImage = scaledImage.convertDepth( 32 ); if (!scaledImage.isNull()) {
} scaledImage = scaledImage.convertDepth( 32 );
else }
pClass->readyPixmap = pClass->pixmap; }
else {
pClass->readyPixmap = pClass->pixmap;
}
} }
if (haveTint || haveAlpha) { if (haveTint || haveAlpha) {
// blend image(pix) with the given tint // blend image(pix) with the given tint
if (!scaledImage.isNull()) scaledImage = scaledImage.convertDepth( 32 ); if (!scaledImage.isNull()) scaledImage = scaledImage.convertDepth( 32 );
int w = scaledImage.width(); int w = scaledImage.width();
int h = scaledImage.height(); int h = scaledImage.height();
@ -290,14 +301,9 @@ KdmPixmap::drawContents( TQPainter *p, const TQRect &r )
} }
} }
} }
if ((_compositor.isEmpty()) || (!argb_visual_available)) { // Convert pixmap from premultiplied alpha to normal alpha
// Software blend only (no compositing support) {
} if (scaledImage.isNull()) scaledImage = pClass->readyPixmap;
else {
// We have a compositor!
// Apply the alpha in the same manner as above, exept we are now
// using the hardware blending engine for all painting
scaledImage = pClass->readyPixmap;
if (!scaledImage.isNull()) scaledImage = scaledImage.convertDepth( 32 ); if (!scaledImage.isNull()) scaledImage = scaledImage.convertDepth( 32 );
int w = scaledImage.width(); int w = scaledImage.width();
int h = scaledImage.height(); int h = scaledImage.height();
@ -317,8 +323,8 @@ KdmPixmap::drawContents( TQPainter *p, const TQRect &r )
} }
if (!scaledImage.isNull()) { if (!scaledImage.isNull()) {
kdDebug() << timestamp() << " convertFromImage " << id << " " << area << endl; kdDebug() << timestamp() << " convertFromImage " << id << " " << area << endl;
pClass->readyPixmap.convertFromImage( scaledImage ); pClass->readyPixmap.convertFromImage( scaledImage );
} }
} }
kdDebug() << timestamp() << " Pixmap::drawContents " << pClass->readyPixmap.size() << " " << px << " " << py << " " << sx << " " << sy << " " << sw << " " << sh << endl; kdDebug() << timestamp() << " Pixmap::drawContents " << pClass->readyPixmap.size() << " " << px << " " << py << " " << sx << " " << sy << " " << sw << " " << sh << endl;
@ -329,11 +335,13 @@ void
KdmPixmap::statusChanged() KdmPixmap::statusChanged()
{ {
KdmItem::statusChanged(); KdmItem::statusChanged();
if (!pixmap.active.present && !pixmap.prelight.present) if (!pixmap.active.present && !pixmap.prelight.present) {
return; return;
}
if ((state == Sprelight && !pixmap.prelight.present) || if ((state == Sprelight && !pixmap.prelight.present) ||
(state == Sactive && !pixmap.active.present)) (state == Sactive && !pixmap.active.present)) {
return; return;
}
needUpdate(); needUpdate();
} }

33
tdm/kfrontend/themer/tdmrect.cpp
Unescape View File

@ -57,8 +57,9 @@ KdmRect::init( const TQDomNode &node, const char * )
rect.hasBorder = false; rect.hasBorder = false;
// A rect can have no properties (defaults to parent ones) // A rect can have no properties (defaults to parent ones)
if (node.isNull()) if (node.isNull()) {
return; return;
}
// Read RECT ID // Read RECT ID
TQDomNode n = node; TQDomNode n = node;
@ -75,18 +76,22 @@ KdmRect::init( const TQDomNode &node, const char * )
parseColor( el.attribute( "color", TQString::null ), rect.normal.color ); parseColor( el.attribute( "color", TQString::null ), rect.normal.color );
rect.normal.alpha = el.attribute( "alpha", "1.0" ).toFloat(); rect.normal.alpha = el.attribute( "alpha", "1.0" ).toFloat();
parseFont( el.attribute( "font", "Sans 14" ), rect.normal.font ); parseFont( el.attribute( "font", "Sans 14" ), rect.normal.font );
} else if (tagName == "active") { }
else if (tagName == "active") {
rect.active.present = true; rect.active.present = true;
parseColor( el.attribute( "color", TQString::null ), rect.active.color ); parseColor( el.attribute( "color", TQString::null ), rect.active.color );
rect.active.alpha = el.attribute( "alpha", "1.0" ).toFloat(); rect.active.alpha = el.attribute( "alpha", "1.0" ).toFloat();
parseFont( el.attribute( "font", "Sans 14" ), rect.active.font ); parseFont( el.attribute( "font", "Sans 14" ), rect.active.font );
} else if (tagName == "prelight") { }
else if (tagName == "prelight") {
rect.prelight.present = true; rect.prelight.present = true;
parseColor( el.attribute( "color", TQString::null ), rect.prelight.color ); parseColor( el.attribute( "color", TQString::null ), rect.prelight.color );
rect.prelight.alpha = el.attribute( "alpha", "1.0" ).toFloat(); rect.prelight.alpha = el.attribute( "alpha", "1.0" ).toFloat();
parseFont( el.attribute( "font", "Sans 14" ), rect.prelight.font ); parseFont( el.attribute( "font", "Sans 14" ), rect.prelight.font );
} else if (tagName == "border") }
else if (tagName == "border") {
rect.hasBorder = true; rect.hasBorder = true;
}
} }
} }
@ -95,18 +100,22 @@ KdmRect::drawContents( TQPainter *p, const TQRect &r )
{ {
// choose the correct rect class // choose the correct rect class
RectStruct::RectClass *rClass = &rect.normal; RectStruct::RectClass *rClass = &rect.normal;
if (state == Sactive && rect.active.present) if (state == Sactive && rect.active.present) {
rClass = &rect.active; rClass = &rect.active;
if (state == Sprelight && rect.prelight.present) }
if (state == Sprelight && rect.prelight.present) {
rClass = &rect.prelight; rClass = &rect.prelight;
}
if (rClass->alpha <= 0 || !rClass->color.isValid()) if (rClass->alpha <= 0 || !rClass->color.isValid()) {
return; return;
}
if (rClass->alpha == 1) if (rClass->alpha == 1) {
p->fillRect( area, TQBrush( rClass->color ) ); p->fillRect( area, TQBrush( rClass->color ) );
}
else { else {
// if ((_compositor.isEmpty()) || (!argb_visual_available)) { // if (!argb_visual_available) {
// Software blend only (no compositing support) // Software blend only (no compositing support)
TQRect backRect = r; TQRect backRect = r;
backRect.moveBy( area.x(), area.y() ); backRect.moveBy( area.x(), area.y() );
@ -127,11 +136,13 @@ void
KdmRect::statusChanged() KdmRect::statusChanged()
{ {
KdmItem::statusChanged(); KdmItem::statusChanged();
if (!rect.active.present && !rect.prelight.present) if (!rect.active.present && !rect.prelight.present) {
return; return;
}
if ((state == Sprelight && !rect.prelight.present) || if ((state == Sprelight && !rect.prelight.present) ||
(state == Sactive && !rect.active.present)) (state == Sactive && !rect.active.present)) {
return; return;
}
needUpdate(); needUpdate();
} }

125
tdm/kfrontend/themer/tdmthemer.cpp
Unescape View File

@ -161,12 +161,14 @@ KdmThemer::widgetEvent( TQEvent *e )
TQRect paintRect = TQT_TQPAINTEVENT(e)->rect(); TQRect paintRect = TQT_TQPAINTEVENT(e)->rect();
kdDebug() << timestamp() << " paint on: " << paintRect << endl; kdDebug() << timestamp() << " paint on: " << paintRect << endl;
if ((_compositor.isEmpty()) || (!argb_visual_available)) { if (!argb_visual_available) {
// Software blend only (no compositing support) // Software blend only (no compositing support)
if (!backBuffer) if (!backBuffer) {
backBuffer = new TQPixmap( widget()->size() ); backBuffer = new TQPixmap( widget()->size() );
if (backBuffer->size() != widget()->size()) }
if (backBuffer->size() != widget()->size()) {
backBuffer->resize( widget()->size() ); backBuffer->resize( widget()->size() );
}
TQPainter p; TQPainter p;
p.begin( backBuffer ); p.begin( backBuffer );
@ -177,17 +179,27 @@ KdmThemer::widgetEvent( TQEvent *e )
} }
else { else {
// We have compositing support! // We have compositing support!
if (!backBuffer) {
backBuffer = new TQPixmap( widget()->size(), 32 );
}
if (backBuffer->size() != widget()->size()) {
backBuffer->resize( widget()->size() );
}
TQRgb blend_color = tqRgba(0, 0, 0, 0); // RGBA TQRgb blend_color = tqRgba(0, 0, 0, 0); // RGBA
float alpha = tqAlpha(blend_color) / 255.; float alpha = tqAlpha(blend_color) / 255.;
int pixel = tqAlpha(blend_color) << 24 | int pixel = tqAlpha(blend_color) << 24 |
int(tqRed(blend_color) * alpha) << 16 | int(tqRed(blend_color) * alpha) << 16 |
int(tqGreen(blend_color) * alpha) << 8 | int(tqGreen(blend_color) * alpha) << 8 |
int(tqBlue(blend_color) * alpha); int(tqBlue(blend_color) * alpha);
TQPainter p1;
p1.begin( widget() ); TQPainter p;
p1.fillRect( paintRect, TQColor(blend_color, pixel) ); p.begin( backBuffer );
rootItem->paint( &p1, paintRect ); p.fillRect( paintRect, TQColor(blend_color, pixel) );
p1.end(); rootItem->paint( &p, paintRect );
p.end();
bitBlt( widget(), paintRect.topLeft(), backBuffer, paintRect );
} }
} }
@ -238,13 +250,15 @@ KdmThemer::generateItems( KdmItem *parent, const TQDomNode &node )
TQString tagName = el.tagName(); TQString tagName = el.tagName();
if (tagName == "item") { if (tagName == "item") {
if (!willDisplay( subnode )) if (!willDisplay( subnode )) {
continue; continue;
}
TQString id = el.attribute("id"); TQString id = el.attribute("id");
if (id.startsWith("plugin-specific-")) { if (id.startsWith("plugin-specific-")) {
id = id.mid(strlen("plugin-specific-")); id = id.mid(strlen("plugin-specific-"));
if (!_pluginsLogin.contains(id)) if (!_pluginsLogin.contains(id)) {
continue; continue;
}
} }
// It's a new item. Draw it // It's a new item. Draw it
@ -252,33 +266,40 @@ KdmThemer::generateItems( KdmItem *parent, const TQDomNode &node )
KdmItem *newItem = 0; KdmItem *newItem = 0;
if (type == "label") if (type == "label") {
newItem = new KdmLabel( parent, subnode ); newItem = new KdmLabel( parent, subnode );
else if (type == "pixmap") }
else if (type == "pixmap") {
newItem = new KdmPixmap( parent, subnode ); newItem = new KdmPixmap( parent, subnode );
else if (type == "rect") }
else if (type == "rect") {
newItem = new KdmRect( parent, subnode ); newItem = new KdmRect( parent, subnode );
}
else if (type == "entry" || type == "list") { else if (type == "entry" || type == "list") {
newItem = new KdmRect( parent, subnode ); newItem = new KdmRect( parent, subnode );
newItem->setType( type ); newItem->setType( type );
} }
// newItem = new KdmEntry( parent, subnode ); // newItem = new KdmEntry( parent, subnode );
else if (type == "svg") else if (type == "svg") {
newItem = new KdmPixmap( parent, subnode ); newItem = new KdmPixmap( parent, subnode );
}
if (newItem) { if (newItem) {
generateItems( newItem, subnode ); generateItems( newItem, subnode );
if (el.attribute( "button", "false" ) == "true") if (el.attribute( "button", "false" ) == "true") {
newItem->inheritFromButton( newItem ); newItem->inheritFromButton( newItem );
}
} }
} else if (tagName == "box") { } else if (tagName == "box") {
if (!willDisplay( subnode )) if (!willDisplay( subnode )) {
continue; continue;
}
// It's a new box. Draw it // It's a new box. Draw it
parent->setBoxLayout( subnode ); parent->setBoxLayout( subnode );
generateItems( parent, subnode ); generateItems( parent, subnode );
} else if (tagName == "fixed") { } else if (tagName == "fixed") {
if (!willDisplay( subnode )) if (!willDisplay( subnode )) {
continue; continue;
}
// It's a new box. Draw it // It's a new box. Draw it
parent->setFixedLayout( subnode ); parent->setFixedLayout( subnode );
generateItems( parent, subnode ); generateItems( parent, subnode );
@ -336,8 +357,9 @@ KdmThemer::showStructure( TQObject *obj )
const TQObjectList wlist = obj->childrenListObject(); const TQObjectList wlist = obj->childrenListObject();
static int counter = 0; static int counter = 0;
if (counter == 0) if (counter == 0) {
kdDebug() << timestamp() << " \n\n<======= Widget tree =================" << endl; kdDebug() << timestamp() << " \n\n<======= Widget tree =================" << endl;
}
if (!wlist.isEmpty()) { if (!wlist.isEmpty()) {
counter++; counter++;
TQObjectListIterator it( wlist ); TQObjectListIterator it( wlist );
@ -358,47 +380,56 @@ KdmThemer::showStructure( TQObject *obj )
} }
counter--; counter--;
} }
if (counter == 0) if (counter == 0) {
kdDebug() << timestamp() << " \n\n<======= Widget tree =================\n\n" << endl; kdDebug() << timestamp() << " \n\n<======= Widget tree =================\n\n" << endl;
}
} }
void void
KdmThemer::slotActivated( const TQString &id ) KdmThemer::slotActivated( const TQString &id )
{ {
TQString toactivate; TQString toactivate;
if (id == "username-label") if (id == "username-label") {
toactivate = "user-entry"; toactivate = "user-entry";
else if (id == "password-label") }
toactivate = "pw-entry"; else if (id == "password-label") {
else toactivate = "pw-entry";
return; }
else {
KdmItem *item = findNode(toactivate); return;
if (!item || !item->widget()) }
return;
KdmItem *item = findNode(toactivate);
item->widget()->setFocus(); if (!item || !item->widget()) {
TQLineEdit *le = (TQLineEdit*)item->widget()->tqt_cast(TQLINEEDIT_OBJECT_NAME_STRING); return;
if (le) }
le->selectAll();
item->widget()->setFocus();
TQLineEdit *le = (TQLineEdit*)item->widget()->tqt_cast(TQLINEEDIT_OBJECT_NAME_STRING);
if (le) {
le->selectAll();
}
} }
void void
KdmThemer::slotPaintRoot() KdmThemer::slotPaintRoot()
{ {
KdmItem *back_item = findNode("background"); KdmItem *back_item = findNode("background");
if (!back_item)
return;
TQRect screen = TQApplication::desktop()->screenGeometry(0); TQRect screen = TQApplication::desktop()->screenGeometry(0);
TQPixmap pm(screen.size()); TQPixmap pm(screen.size());
TQPainter painter( &pm, true ); if (back_item) {
back_item->paint( &painter, back_item->rect()); TQPainter painter( &pm, true );
painter.end(); back_item->paint( &painter, back_item->rect());
painter.end();
}
else {
pm.fill(TQt::black);
}
TQT_TQWIDGET(TQApplication::desktop()->screen())->setErasePixmap(pm); TQT_TQWIDGET(TQApplication::desktop()->screen())->setErasePixmap(pm);
TQT_TQWIDGET(TQApplication::desktop()->screen())->erase(); TQT_TQWIDGET(TQApplication::desktop()->screen())->erase();
} }
#include "tdmthemer.moc" #include "tdmthemer.moc"

2
tdm/kfrontend/themes/o2_enterprise/enterprise.xml
Unescape View File

@ -6,7 +6,7 @@
<pos width="100%" x="0" y="0" height="100%" /> <pos width="100%" x="0" y="0" height="100%" />
</item> </item>
<item type="pixmap" > <item type="pixmap" >
<normal file="Dialog.png" /> <normal alpha="1.0" file="Dialog.png" />
<pos width="640" x="50%" y="50%" anchor="c" height="400" /> <pos width="640" x="50%" y="50%" anchor="c" height="400" />
<item type="label" id="clock" > <item type="label" id="clock" >
<normal color="#000000" font="Sans 10" /> <normal color="#000000" font="Sans 10" />

9
twin/main.cpp
Unescape View File

@ -44,6 +44,7 @@ Options* options;
Atoms* atoms; Atoms* atoms;
int screen_number = -1; int screen_number = -1;
bool disable_twin_composition_manager = false;
static bool initting = FALSE; static bool initting = FALSE;
@ -95,8 +96,13 @@ Application::Application( )
config()->reparseConfiguration(); config()->reparseConfiguration();
} }
if (screen_number == -1) if (screen_number == -1) {
screen_number = DefaultScreen(tqt_xdisplay()); screen_number = DefaultScreen(tqt_xdisplay());
}
if (args->isSet( "disablecompositionmanager" )) {
disable_twin_composition_manager = true;
}
if( !owner.claim( args->isSet( "replace" ), true )) if( !owner.claim( args->isSet( "replace" ), true ))
{ {
@ -234,6 +240,7 @@ static TDECmdLineOptions args[] =
{ {
{ "lock", I18N_NOOP("Disable configuration options"), 0 }, { "lock", I18N_NOOP("Disable configuration options"), 0 },
{ "replace", I18N_NOOP("Replace already-running ICCCM2.0-compliant window manager"), 0 }, { "replace", I18N_NOOP("Replace already-running ICCCM2.0-compliant window manager"), 0 },
{ "disablecompositionmanager", I18N_NOOP("Do not start composition manager"), 0 },
TDECmdLineLastOption TDECmdLineLastOption
}; };

8
twin/workspace.cpp
Unescape View File

@ -59,9 +59,14 @@ TDEProcess* kompmgr = 0;
TDESelectionOwner* kompmgr_selection; TDESelectionOwner* kompmgr_selection;
bool allowKompmgrRestart = TRUE; bool allowKompmgrRestart = TRUE;
extern bool disable_twin_composition_manager;
bool supportsCompMgr() bool supportsCompMgr()
{ {
if (disable_twin_composition_manager) {
return false;
}
int i; int i;
bool damageExt = XQueryExtension(tqt_xdisplay(), "DAMAGE", &i, &i, &i); bool damageExt = XQueryExtension(tqt_xdisplay(), "DAMAGE", &i, &i, &i);
@ -213,8 +218,9 @@ Workspace::Workspace( bool restore )
connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized()));
#endif #endif
if (!supportsCompMgr()) if (!supportsCompMgr()) {
options->useTranslucency = false; options->useTranslucency = false;
}
// start kompmgr - i wanted to put this into main.cpp, but that would prevent dcop support, as long as Application was no dcop_object // start kompmgr - i wanted to put this into main.cpp, but that would prevent dcop support, as long as Application was no dcop_object
if (options->useTranslucency) if (options->useTranslucency)

Write Preview
Loading…
Cancel
Save