summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/launcherview.cpp2
-rw-r--r--core/launcher/server.cpp26
-rw-r--r--core/launcher/serverapp.cpp4
3 files changed, 6 insertions, 26 deletions
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index 0d0f2cb..cd9c14b 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -442,12 +442,14 @@ void LauncherItem::paintAnimatedIcon( QPainter *p )
442 bounceY = bounceY < 0 ? -bounceY : bounceY; 442 bounceY = bounceY < 0 ? -bounceY : bounceY;
443 } 443 }
444#endif 444#endif
445 p2.drawPixmap( x1, y1 + bounceY, *pixmap() ); 445 p2.drawPixmap( x1, y1 + bounceY, *pixmap() );
446#ifdef USE_ANIMATED_BUSY_ICON_OVERLAY 446#ifdef USE_ANIMATED_BUSY_ICON_OVERLAY
447 p2.drawPixmap( x1, y1 + bounceY, liv->busyPixmap(), w * pic, 0, w, h ); 447 p2.drawPixmap( x1, y1 + bounceY, liv->busyPixmap(), w * pic, 0, w, h );
448#else
449 Q_UNUSED( pic )
448#endif 450#endif
449 p->drawPixmap( x1, y1, dblBuf ); 451 p->drawPixmap( x1, y1, dblBuf );
450} 452}
451 453
452void LauncherItem::animateIcon() 454void LauncherItem::animateIcon()
453{ 455{
diff --git a/core/launcher/server.cpp b/core/launcher/server.cpp
index 950032d..5ae517b 100644
--- a/core/launcher/server.cpp
+++ b/core/launcher/server.cpp
@@ -193,36 +193,12 @@ Server::~Server()
193 delete serverGui; 193 delete serverGui;
194#if 0 194#if 0
195 delete tsmMonitor; 195 delete tsmMonitor;
196#endif 196#endif
197} 197}
198 198
199static bool hasVisibleWindow(const QString& clientname, bool partial)
200{
201#ifdef QWS
202 const QList<QWSWindow> &list = qwsServer->clientWindows();
203 QWSWindow* w;
204 for (QListIterator<QWSWindow> it(list); (w=it.current()); ++it) {
205 if ( w->client()->identity() == clientname ) {
206 if ( partial && !w->isFullyObscured() )
207 return TRUE;
208 if ( !partial && !w->isFullyObscured() && !w->isPartiallyObscured() ) {
209# if QT_VERSION < 0x030000
210 QRect mwr = qt_screen->mapToDevice(qt_maxWindowRect,
211 QSize(qt_screen->width(),qt_screen->height()) );
212# else
213 QRect mwr = qt_maxWindowRect;
214# endif
215 if ( mwr.contains(w->requested().boundingRect()) )
216 return TRUE;
217 }
218 }
219 }
220#endif
221 return FALSE;
222}
223 199
224void Server::activate(const ODeviceButton* button, bool held) 200void Server::activate(const ODeviceButton* button, bool held)
225{ 201{
226 Global::terminateBuiltin("calibrate"); // No tr 202 Global::terminateBuiltin("calibrate"); // No tr
227 OQCopMessage om; 203 OQCopMessage om;
228 if ( held ) { 204 if ( held ) {
@@ -695,12 +671,14 @@ void Server::applicationLaunched(int, const QString &app)
695 671
696void Server::applicationTerminated(int pid, const QString &app) 672void Server::applicationTerminated(int pid, const QString &app)
697{ 673{
698 serverGui->applicationStateChanged( app, ServerInterface::Terminated ); 674 serverGui->applicationStateChanged( app, ServerInterface::Terminated );
699#if 0 675#if 0
700 tsmMonitor->applicationTerminated( pid ); 676 tsmMonitor->applicationTerminated( pid );
677#else
678 Q_UNUSED( pid )
701#endif 679#endif
702} 680}
703 681
704void Server::applicationConnected(const QString &app) 682void Server::applicationConnected(const QString &app)
705{ 683{
706 serverGui->applicationStateChanged( app, ServerInterface::Running ); 684 serverGui->applicationStateChanged( app, ServerInterface::Running );
diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp
index a2302d8..66cc788 100644
--- a/core/launcher/serverapp.cpp
+++ b/core/launcher/serverapp.cpp
@@ -354,14 +354,14 @@ ServerApplication::ServerApplication( int& argc, char **argv, Type t )
354 354
355 serverApp = this; 355 serverApp = this;
356 356
357 apmTimeout(); 357 apmTimeout();
358 grabKeyboard(); 358 grabKeyboard();
359 359
360 /* make sure the event filter is installed */ 360 /* make sure the event filter is installed */ /* std::limits<short>::max() when you've stdc++ */
361 const ODeviceButton* but = ODevice::inst()->buttonForKeycode( -1 ); 361 const ODeviceButton* but = ODevice::inst()->buttonForKeycode( SHRT_MAX );
362 Q_CONST_UNUSED( but ) 362 Q_CONST_UNUSED( but )
363} 363}
364 364
365 365
366ServerApplication::~ServerApplication() 366ServerApplication::~ServerApplication()
367{ 367{