-rw-r--r-- | core/launcher/server.cpp | 26 |
1 files changed, 2 insertions, 24 deletions
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 | ||
199 | static 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 | ||
224 | void Server::activate(const ODeviceButton* button, bool held) | 200 | void 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 | ||
696 | void Server::applicationTerminated(int pid, const QString &app) | 672 | void 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 | ||
704 | void Server::applicationConnected(const QString &app) | 682 | void Server::applicationConnected(const QString &app) |
705 | { | 683 | { |
706 | serverGui->applicationStateChanged( app, ServerInterface::Running ); | 684 | serverGui->applicationStateChanged( app, ServerInterface::Running ); |