author | mickeyl <mickeyl> | 2005-01-23 21:35:29 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-01-23 21:35:29 (UTC) |
commit | dd410f1eb69e68f04cf26b6d3e6bca88f0987f71 (patch) (unidiff) | |
tree | 0f2b59bae4c326011783e9cdea0754e180ae0e27 /core/opie-login/main.cpp | |
parent | 78e658cecc7521cf3932f5eb44d3f551d73f3181 (diff) | |
download | opie-dd410f1eb69e68f04cf26b6d3e6bca88f0987f71.zip opie-dd410f1eb69e68f04cf26b6d3e6bca88f0987f71.tar.gz opie-dd410f1eb69e68f04cf26b6d3e6bca88f0987f71.tar.bz2 |
remove setSoftSuspend() from ODevice. this is a left-over from the old days
-rw-r--r-- | core/opie-login/main.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp index 0699d0a..2de0180 100644 --- a/core/opie-login/main.cpp +++ b/core/opie-login/main.cpp | |||
@@ -147,98 +147,97 @@ int main ( int argc, char **argv ) | |||
147 | case SIGTERM: | 147 | case SIGTERM: |
148 | case SIGINT : | 148 | case SIGINT : |
149 | case SIGKILL: | 149 | case SIGKILL: |
150 | break; | 150 | break; |
151 | 151 | ||
152 | default : | 152 | default : |
153 | killedbysig = WTERMSIG( status ); | 153 | killedbysig = WTERMSIG( status ); |
154 | break; | 154 | break; |
155 | } | 155 | } |
156 | } | 156 | } |
157 | if ( killedbysig ) { // qpe was killed by an uncaught signal | 157 | if ( killedbysig ) { // qpe was killed by an uncaught signal |
158 | qApp = 0; | 158 | qApp = 0; |
159 | 159 | ||
160 | ::syslog ( LOG_ERR, "Opie was killed by a signal #%d", killedbysig ); | 160 | ::syslog ( LOG_ERR, "Opie was killed by a signal #%d", killedbysig ); |
161 | 161 | ||
162 | QWSServer::setDesktopBackground ( QImage ( )); | 162 | QWSServer::setDesktopBackground ( QImage ( )); |
163 | QApplication *app = new QApplication ( argc, argv, QApplication::GuiServer ); | 163 | QApplication *app = new QApplication ( argc, argv, QApplication::GuiServer ); |
164 | app-> setFont ( QFont ( "Helvetica", 10 )); | 164 | app-> setFont ( QFont ( "Helvetica", 10 )); |
165 | app-> setStyle ( new QPEStyle ( )); | 165 | app-> setStyle ( new QPEStyle ( )); |
166 | 166 | ||
167 | // const char *sig = ::strsignal ( killedbysig ); | 167 | // const char *sig = ::strsignal ( killedbysig ); |
168 | const char *sig = ::sys_siglist[killedbysig]; | 168 | const char *sig = ::sys_siglist[killedbysig]; |
169 | QLabel *l = new QLabel ( 0, "sig", Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_Tool ); | 169 | QLabel *l = new QLabel ( 0, "sig", Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_Tool ); |
170 | l-> setText ( LoginWindowImpl::tr( "Opie was terminated\nby an uncaught signal\n(%1)\n" ). arg ( sig )); | 170 | l-> setText ( LoginWindowImpl::tr( "Opie was terminated\nby an uncaught signal\n(%1)\n" ). arg ( sig )); |
171 | l-> setAlignment ( Qt::AlignCenter ); | 171 | l-> setAlignment ( Qt::AlignCenter ); |
172 | l-> move ( 0, 0 ); | 172 | l-> move ( 0, 0 ); |
173 | l-> resize ( app-> desktop ( )-> width ( ), app-> desktop ( )-> height ( )); | 173 | l-> resize ( app-> desktop ( )-> width ( ), app-> desktop ( )-> height ( )); |
174 | l-> show ( ); | 174 | l-> show ( ); |
175 | QTimer::singleShot ( 3000, app, SLOT( quit())); | 175 | QTimer::singleShot ( 3000, app, SLOT( quit())); |
176 | app-> exec ( ); | 176 | app-> exec ( ); |
177 | delete app; | 177 | delete app; |
178 | qApp = 0; | 178 | qApp = 0; |
179 | } | 179 | } |
180 | } | 180 | } |
181 | else { | 181 | else { |
182 | if ( !autolog ) { | 182 | if ( !autolog ) { |
183 | QString confFile=QPEApplication::qpeDir() + "etc/opie-login.conf"; | 183 | QString confFile=QPEApplication::qpeDir() + "etc/opie-login.conf"; |
184 | Config cfg ( confFile, Config::File ); | 184 | Config cfg ( confFile, Config::File ); |
185 | cfg. setGroup ( "General" ); | 185 | cfg. setGroup ( "General" ); |
186 | QString user = cfg. readEntry ( "AutoLogin" ); | 186 | QString user = cfg. readEntry ( "AutoLogin" ); |
187 | 187 | ||
188 | if ( !user. isEmpty ( )) | 188 | if ( !user. isEmpty ( )) |
189 | autolog = ::strdup ( user. latin1 ( )); | 189 | autolog = ::strdup ( user. latin1 ( )); |
190 | } | 190 | } |
191 | 191 | ||
192 | if ( autolog && !userExited ) { | 192 | if ( autolog && !userExited ) { |
193 | 193 | ||
194 | QWSServer::setDesktopBackground( QImage() ); | 194 | QWSServer::setDesktopBackground( QImage() ); |
195 | ODevice::inst ( )-> setDisplayStatus ( true ); | 195 | ODevice::inst()->setDisplayStatus( true ); |
196 | ODevice::inst ( )-> setSoftSuspend ( false ); | ||
197 | LoginApplication *app = new LoginApplication ( argc, argv, ppid ); | 196 | LoginApplication *app = new LoginApplication ( argc, argv, ppid ); |
198 | LoginApplication::setLoginAs ( autolog ); | 197 | LoginApplication::setLoginAs ( autolog ); |
199 | 198 | ||
200 | 199 | ||
201 | if ( LoginApplication::changeIdentity ( )) | 200 | if ( LoginApplication::changeIdentity ( )) |
202 | ::exit ( LoginApplication::login ( )); | 201 | ::exit ( LoginApplication::login ( )); |
203 | else | 202 | else |
204 | ::exit ( 0 ); | 203 | ::exit ( 0 ); |
205 | } | 204 | } |
206 | else { | 205 | else { |
207 | ::exit ( login_main ( argc, argv, ppid )); | 206 | ::exit ( login_main ( argc, argv, ppid )); |
208 | } | 207 | } |
209 | } | 208 | } |
210 | } | 209 | } |
211 | return 0; | 210 | return 0; |
212 | } | 211 | } |
213 | 212 | ||
214 | void sigterm ( int /*sig*/ ) | 213 | void sigterm ( int /*sig*/ ) |
215 | { | 214 | { |
216 | ::exit ( 0 ); | 215 | ::exit ( 0 ); |
217 | } | 216 | } |
218 | 217 | ||
219 | 218 | ||
220 | void exit_closelog ( ) | 219 | void exit_closelog ( ) |
221 | { | 220 | { |
222 | ::closelog ( ); | 221 | ::closelog ( ); |
223 | } | 222 | } |
224 | 223 | ||
225 | 224 | ||
226 | class LoginScreenSaver : public QWSScreenSaver | 225 | class LoginScreenSaver : public QWSScreenSaver |
227 | { | 226 | { |
228 | public: | 227 | public: |
229 | LoginScreenSaver ( ) | 228 | LoginScreenSaver ( ) |
230 | { | 229 | { |
231 | m_lcd_status = true; | 230 | m_lcd_status = true; |
232 | 231 | ||
233 | m_backlight_bright = -1; | 232 | m_backlight_bright = -1; |
234 | m_backlight_forcedoff = false; | 233 | m_backlight_forcedoff = false; |
235 | 234 | ||
236 | // Make sure the LCD is in fact on, (if opie was killed while the LCD is off it would still be off) | 235 | // Make sure the LCD is in fact on, (if opie was killed while the LCD is off it would still be off) |
237 | ODevice::inst ( )-> setDisplayStatus ( true ); | 236 | ODevice::inst ( )-> setDisplayStatus ( true ); |
238 | } | 237 | } |
239 | void restore() | 238 | void restore() |
240 | { | 239 | { |
241 | if ( !m_lcd_status ) // We must have turned it off | 240 | if ( !m_lcd_status ) // We must have turned it off |
242 | ODevice::inst ( ) -> setDisplayStatus ( true ); | 241 | ODevice::inst ( ) -> setDisplayStatus ( true ); |
243 | 242 | ||
244 | setBacklight ( -3 ); | 243 | setBacklight ( -3 ); |
@@ -290,94 +289,90 @@ public: | |||
290 | 289 | ||
291 | return m_backlight_bright; | 290 | return m_backlight_bright; |
292 | } | 291 | } |
293 | 292 | ||
294 | void setBacklight ( int bright ) | 293 | void setBacklight ( int bright ) |
295 | { | 294 | { |
296 | if ( bright == -3 ) { | 295 | if ( bright == -3 ) { |
297 | // Forced on | 296 | // Forced on |
298 | m_backlight_forcedoff = false; | 297 | m_backlight_forcedoff = false; |
299 | bright = -1; | 298 | bright = -1; |
300 | } | 299 | } |
301 | if ( m_backlight_forcedoff && bright != -2 ) | 300 | if ( m_backlight_forcedoff && bright != -2 ) |
302 | return ; | 301 | return ; |
303 | if ( bright == -2 ) { | 302 | if ( bright == -2 ) { |
304 | // Toggle between off and on | 303 | // Toggle between off and on |
305 | bright = m_backlight_bright ? 0 : -1; | 304 | bright = m_backlight_bright ? 0 : -1; |
306 | m_backlight_forcedoff = !bright; | 305 | m_backlight_forcedoff = !bright; |
307 | } | 306 | } |
308 | 307 | ||
309 | m_backlight_bright = bright; | 308 | m_backlight_bright = bright; |
310 | 309 | ||
311 | bright = backlight ( ); | 310 | bright = backlight ( ); |
312 | ODevice::inst ( ) -> setDisplayBrightness ( bright ); | 311 | ODevice::inst ( ) -> setDisplayBrightness ( bright ); |
313 | 312 | ||
314 | m_backlight_bright = bright; | 313 | m_backlight_bright = bright; |
315 | } | 314 | } |
316 | 315 | ||
317 | private: | 316 | private: |
318 | bool m_lcd_status; | 317 | bool m_lcd_status; |
319 | 318 | ||
320 | int m_backlight_bright; | 319 | int m_backlight_bright; |
321 | bool m_backlight_forcedoff; | 320 | bool m_backlight_forcedoff; |
322 | }; | 321 | }; |
323 | 322 | ||
324 | 323 | ||
325 | namespace Opie { extern int force_appearance; } // HACK to get around the force-style setting | 324 | namespace Opie { extern int force_appearance; } // HACK to get around the force-style setting |
326 | 325 | ||
327 | 326 | ||
328 | int login_main ( int argc, char **argv, pid_t ppid ) | 327 | int login_main ( int argc, char **argv, pid_t ppid ) |
329 | { | 328 | { |
330 | QWSServer::setDesktopBackground( QImage() ); | 329 | QWSServer::setDesktopBackground( QImage() ); |
331 | LoginApplication *app = new LoginApplication ( argc, argv, ppid ); | 330 | LoginApplication *app = new LoginApplication ( argc, argv, ppid ); |
332 | 331 | ||
333 | Opie::force_appearance = 0; | 332 | Opie::force_appearance = 0; |
334 | 333 | ||
335 | app-> setFont ( QFont ( "Helvetica", 10 )); | 334 | app-> setFont ( QFont ( "Helvetica", 10 )); |
336 | app-> setStyle ( new QPEStyle ( )); | 335 | app-> setStyle ( new QPEStyle ( )); |
337 | 336 | ||
338 | ODevice::inst ( )-> setSoftSuspend ( true ); | ||
339 | |||
340 | if ( QWSServer::mouseHandler() && | 337 | if ( QWSServer::mouseHandler() && |
341 | QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { | 338 | QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { |
342 | if ( !QFile::exists ( "/etc/pointercal" )) { | 339 | if ( !QFile::exists ( "/etc/pointercal" )) { |
343 | // Make sure calibration widget starts on top. | 340 | // Make sure calibration widget starts on top. |
344 | Calibrate *cal = new Calibrate; | 341 | Calibrate *cal = new Calibrate; |
345 | cal-> exec ( ); | 342 | cal-> exec ( ); |
346 | delete cal; | 343 | delete cal; |
347 | } | 344 | } |
348 | } | 345 | } |
349 | 346 | ||
350 | LoginScreenSaver *saver = new LoginScreenSaver; | 347 | LoginScreenSaver *saver = new LoginScreenSaver; |
351 | 348 | ||
352 | saver-> setIntervals ( ); | 349 | saver-> setIntervals ( ); |
353 | QWSServer::setScreenSaver ( saver ); | 350 | QWSServer::setScreenSaver ( saver ); |
354 | saver-> restore ( ); | 351 | saver-> restore ( ); |
355 | 352 | ||
356 | 353 | ||
357 | LoginWindowImpl *lw = new LoginWindowImpl ( ); | 354 | LoginWindowImpl *lw = new LoginWindowImpl ( ); |
358 | app-> setMainWidget ( lw ); | 355 | app-> setMainWidget ( lw ); |
359 | lw-> setGeometry ( 0, 0, app-> desktop ( )-> width ( ), app-> desktop ( )-> height ( )); | 356 | lw-> setGeometry ( 0, 0, app-> desktop ( )-> width ( ), app-> desktop ( )-> height ( )); |
360 | lw-> show ( ); | 357 | lw-> show ( ); |
361 | 358 | ||
362 | int rc = app-> exec ( ); | 359 | int rc = app-> exec ( ); |
363 | 360 | ||
364 | ODevice::inst ( )-> setSoftSuspend ( false ); | ||
365 | |||
366 | if ( app-> loginAs ( )) { | 361 | if ( app-> loginAs ( )) { |
367 | if ( app-> changeIdentity ( )) { | 362 | if ( app-> changeIdentity ( )) { |
368 | app-> login ( ); | 363 | app-> login ( ); |
369 | 364 | ||
370 | // if login succeeds, it never comes back | 365 | // if login succeeds, it never comes back |
371 | 366 | ||
372 | QMessageBox::critical ( 0, LoginWindowImpl::tr( "Failure" ), LoginWindowImpl::tr( "Could not start Opie." )); | 367 | QMessageBox::critical ( 0, LoginWindowImpl::tr( "Failure" ), LoginWindowImpl::tr( "Could not start Opie." )); |
373 | rc = 1; | 368 | rc = 1; |
374 | } | 369 | } |
375 | else { | 370 | else { |
376 | QMessageBox::critical ( 0, LoginWindowImpl::tr( "Failure" ), LoginWindowImpl::tr( "Could not switch to new user identity" )); | 371 | QMessageBox::critical ( 0, LoginWindowImpl::tr( "Failure" ), LoginWindowImpl::tr( "Could not switch to new user identity" )); |
377 | rc = 2; | 372 | rc = 2; |
378 | } | 373 | } |
379 | 374 | ||
380 | } | 375 | } |
381 | return rc; | 376 | return rc; |
382 | } | 377 | } |
383 | 378 | ||