author | sandman <sandman> | 2002-09-30 21:37:26 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-09-30 21:37:26 (UTC) |
commit | 9208485864ccbd2a12160334cef302874b50043a (patch) (unidiff) | |
tree | 14a6017f54a86c1be53c87a8ed2b277b62dbcef1 | |
parent | 3c6afa049f07c7e6311b3c88faf8a200827f3452 (diff) | |
download | opie-9208485864ccbd2a12160334cef302874b50043a.zip opie-9208485864ccbd2a12160334cef302874b50043a.tar.gz opie-9208485864ccbd2a12160334cef302874b50043a.tar.bz2 |
misc. cleanups
-rw-r--r-- | core/opie-login/loginwindowimpl.cpp | 3 | ||||
-rw-r--r-- | core/opie-login/main.cpp | 11 |
2 files changed, 7 insertions, 7 deletions
diff --git a/core/opie-login/loginwindowimpl.cpp b/core/opie-login/loginwindowimpl.cpp index f24ebb3..63baaa6 100644 --- a/core/opie-login/loginwindowimpl.cpp +++ b/core/opie-login/loginwindowimpl.cpp | |||
@@ -25,24 +25,27 @@ | |||
25 | #ifdef USEPAM | 25 | #ifdef USEPAM |
26 | extern "C" { | 26 | extern "C" { |
27 | #include <security/pam_appl.h> | 27 | #include <security/pam_appl.h> |
28 | } | 28 | } |
29 | #else | 29 | #else |
30 | #include <crypt.h> | 30 | #include <crypt.h> |
31 | #include <shadow.h> | 31 | #include <shadow.h> |
32 | #endif | 32 | #endif |
33 | 33 | ||
34 | #include "loginwindowimpl.h" | 34 | #include "loginwindowimpl.h" |
35 | #include "inputmethods.h" | 35 | #include "inputmethods.h" |
36 | 36 | ||
37 | using namespace Opie; | ||
38 | |||
39 | |||
37 | LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_Customize | WStyle_NoBorder | WDestructiveClose ) | 40 | LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_Customize | WStyle_NoBorder | WDestructiveClose ) |
38 | { | 41 | { |
39 | QPopupMenu *pop = new QPopupMenu ( this ); | 42 | QPopupMenu *pop = new QPopupMenu ( this ); |
40 | pop-> insertItem ( tr( "Restart" ), this, SLOT( restart ( ))); | 43 | pop-> insertItem ( tr( "Restart" ), this, SLOT( restart ( ))); |
41 | pop-> insertItem ( tr( "Quit" ), this, SLOT( quit ( ))); | 44 | pop-> insertItem ( tr( "Quit" ), this, SLOT( quit ( ))); |
42 | m_menu-> setPopup ( pop ); | 45 | m_menu-> setPopup ( pop ); |
43 | 46 | ||
44 | QHBoxLayout *lay = new QHBoxLayout ( m_taskbar, 4, 4 ); | 47 | QHBoxLayout *lay = new QHBoxLayout ( m_taskbar, 4, 4 ); |
45 | m_input = new InputMethods ( m_taskbar ); | 48 | m_input = new InputMethods ( m_taskbar ); |
46 | lay-> addWidget ( m_input ); | 49 | lay-> addWidget ( m_input ); |
47 | lay-> addStretch ( 10 ); | 50 | lay-> addStretch ( 10 ); |
48 | 51 | ||
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp index 718009a..df9451d 100644 --- a/core/opie-login/main.cpp +++ b/core/opie-login/main.cpp | |||
@@ -12,24 +12,26 @@ | |||
12 | #include <qpe/qcopenvelope_qws.h> | 12 | #include <qpe/qcopenvelope_qws.h> |
13 | #include <qpe/qpestyle.h> | 13 | #include <qpe/qpestyle.h> |
14 | #include <qpe/power.h> | 14 | #include <qpe/power.h> |
15 | 15 | ||
16 | #include <opie/odevice.h> | 16 | #include <opie/odevice.h> |
17 | 17 | ||
18 | #include <qwindowsystem_qws.h> | 18 | #include <qwindowsystem_qws.h> |
19 | #include <qfile.h> | 19 | #include <qfile.h> |
20 | 20 | ||
21 | #include "loginwindowimpl.h" | 21 | #include "loginwindowimpl.h" |
22 | #include "calibrate.h" | 22 | #include "calibrate.h" |
23 | 23 | ||
24 | using namespace Opie; | ||
25 | |||
24 | int login_main ( int argc, char **argv ); | 26 | int login_main ( int argc, char **argv ); |
25 | void sigusr1 ( int sig ); | 27 | void sigusr1 ( int sig ); |
26 | void exit_closelog ( ); | 28 | void exit_closelog ( ); |
27 | 29 | ||
28 | 30 | ||
29 | 31 | ||
30 | int main ( int argc, char **argv ) | 32 | int main ( int argc, char **argv ) |
31 | { | 33 | { |
32 | if ( ::geteuid ( ) != 0 ) { | 34 | if ( ::geteuid ( ) != 0 ) { |
33 | ::fprintf ( stderr, "%s can only be executed by root. (or chmod +s)", argv [0] ); | 35 | ::fprintf ( stderr, "%s can only be executed by root. (or chmod +s)", argv [0] ); |
34 | return 1; | 36 | return 1; |
35 | } | 37 | } |
@@ -88,25 +90,25 @@ public: | |||
88 | 90 | ||
89 | m_backlight_bright = -1; | 91 | m_backlight_bright = -1; |
90 | m_backlight_forcedoff = false; | 92 | m_backlight_forcedoff = false; |
91 | 93 | ||
92 | // Make sure the LCD is in fact on, (if opie was killed while the LCD is off it would still be off) | 94 | // Make sure the LCD is in fact on, (if opie was killed while the LCD is off it would still be off) |
93 | ODevice::inst ( ) -> setDisplayStatus ( true ); | 95 | ODevice::inst ( ) -> setDisplayStatus ( true ); |
94 | } | 96 | } |
95 | void restore() | 97 | void restore() |
96 | { | 98 | { |
97 | if ( !m_lcd_status ) // We must have turned it off | 99 | if ( !m_lcd_status ) // We must have turned it off |
98 | ODevice::inst ( ) -> setDisplayStatus ( true ); | 100 | ODevice::inst ( ) -> setDisplayStatus ( true ); |
99 | 101 | ||
100 | setBacklight ( -1 ); | 102 | setBacklight ( -3 ); |
101 | } | 103 | } |
102 | bool save( int level ) | 104 | bool save( int level ) |
103 | { | 105 | { |
104 | switch ( level ) { | 106 | switch ( level ) { |
105 | case 0: | 107 | case 0: |
106 | if ( backlight() > 1 ) | 108 | if ( backlight() > 1 ) |
107 | setBacklight( 1 ); // lowest non-off | 109 | setBacklight( 1 ); // lowest non-off |
108 | return true; | 110 | return true; |
109 | break; | 111 | break; |
110 | case 1: | 112 | case 1: |
111 | setBacklight( 0 ); // off | 113 | setBacklight( 0 ); // off |
112 | return true; | 114 | return true; |
@@ -180,43 +182,38 @@ private: | |||
180 | 182 | ||
181 | 183 | ||
182 | int login_main ( int argc, char **argv ) | 184 | int login_main ( int argc, char **argv ) |
183 | { | 185 | { |
184 | QWSServer::setDesktopBackground( QImage() ); | 186 | QWSServer::setDesktopBackground( QImage() ); |
185 | QPEApplication app ( argc, argv, QApplication::GuiServer ); | 187 | QPEApplication app ( argc, argv, QApplication::GuiServer ); |
186 | 188 | ||
187 | app. setFont ( QFont ( "Helvetica", 10 )); | 189 | app. setFont ( QFont ( "Helvetica", 10 )); |
188 | app. setStyle ( new QPEStyle ( )); | 190 | app. setStyle ( new QPEStyle ( )); |
189 | 191 | ||
190 | ODevice::inst ( )-> setSoftSuspend ( true ); | 192 | ODevice::inst ( )-> setSoftSuspend ( true ); |
191 | 193 | ||
192 | { | ||
193 | QCopEnvelope e("QPE/System", "setBacklight(int)" ); | ||
194 | e << -3; // Forced on | ||
195 | } | ||
196 | |||
197 | #if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) | 194 | #if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) |
198 | if ( !QFile::exists ( "/etc/pointercal" )) { | 195 | if ( !QFile::exists ( "/etc/pointercal" )) { |
199 | // Make sure calibration widget starts on top. | 196 | // Make sure calibration widget starts on top. |
200 | Calibrate *cal = new Calibrate; | 197 | Calibrate *cal = new Calibrate; |
201 | cal-> exec ( ); | 198 | cal-> exec ( ); |
202 | delete cal; | 199 | delete cal; |
203 | } | 200 | } |
204 | #endif | 201 | #endif |
205 | 202 | ||
206 | |||
207 | LoginScreenSaver *saver = new LoginScreenSaver; | 203 | LoginScreenSaver *saver = new LoginScreenSaver; |
208 | 204 | ||
209 | saver-> setIntervals ( ); | 205 | saver-> setIntervals ( ); |
210 | QWSServer::setScreenSaver ( saver ); | 206 | QWSServer::setScreenSaver ( saver ); |
207 | saver-> restore ( ); | ||
211 | 208 | ||
212 | 209 | ||
213 | LoginWindowImpl *lw = new LoginWindowImpl ( ); | 210 | LoginWindowImpl *lw = new LoginWindowImpl ( ); |
214 | app. setMainWidget ( lw ); | 211 | app. setMainWidget ( lw ); |
215 | lw-> setGeometry ( 0, 0, app. desktop ( )-> width ( ), app. desktop ( )-> height ( )); | 212 | lw-> setGeometry ( 0, 0, app. desktop ( )-> width ( ), app. desktop ( )-> height ( )); |
216 | lw-> show ( ); | 213 | lw-> show ( ); |
217 | 214 | ||
218 | int rc = app. exec ( ); | 215 | int rc = app. exec ( ); |
219 | 216 | ||
220 | ODevice::inst ( )-> setSoftSuspend ( false ); | 217 | ODevice::inst ( )-> setSoftSuspend ( false ); |
221 | 218 | ||
222 | return rc; | 219 | return rc; |