author | sandman <sandman> | 2002-07-27 23:33:26 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-07-27 23:33:26 (UTC) |
commit | 4baf36396739502c5471950e29f18954cca4517b (patch) (unidiff) | |
tree | 46b25659b442666b4b5153fa8210d86e6708b47b | |
parent | 9cc89b6a54ee267953b0422c4607097d075ecab9 (diff) | |
download | opie-4baf36396739502c5471950e29f18954cca4517b.zip opie-4baf36396739502c5471950e29f18954cca4517b.tar.gz opie-4baf36396739502c5471950e29f18954cca4517b.tar.bz2 |
Update for OPIE to use opie-login
-rw-r--r-- | Makefile | 1 | ||||
-rw-r--r-- | core/launcher/main.cpp | 12 | ||||
-rw-r--r-- | core/opie-login/opie-login.control | 9 | ||||
-rwxr-xr-x | root/etc/init.d/opie | 5 |
4 files changed, 15 insertions, 12 deletions
@@ -25,24 +25,25 @@ PLAYER = core/multimedia/opieplayer/libmpeg3 \ | |||
25 | core/multimedia/opieplayer/wavplugin \ | 25 | core/multimedia/opieplayer/wavplugin \ |
26 | core/multimedia/opieplayer/modplug | 26 | core/multimedia/opieplayer/modplug |
27 | 27 | ||
28 | COMPONENTS=$(LOCALCOMPONENTS) $(INPUTCOMPONENTS) $(APPLETS) $(MAIL) $(PLAYER) | 28 | COMPONENTS=$(LOCALCOMPONENTS) $(INPUTCOMPONENTS) $(APPLETS) $(MAIL) $(PLAYER) |
29 | 29 | ||
30 | 30 | ||
31 | PIMAPPS = core/pim/addressbook core/pim/datebook \ | 31 | PIMAPPS = core/pim/addressbook core/pim/datebook \ |
32 | core/pim/today core/pim/todo | 32 | core/pim/today core/pim/todo |
33 | 33 | ||
34 | COREAPPS = core/apps/filebrowser core/apps/helpbrowser \ | 34 | COREAPPS = core/apps/filebrowser core/apps/helpbrowser \ |
35 | core/apps/textedit core/apps/embeddedkonsole \ | 35 | core/apps/textedit core/apps/embeddedkonsole \ |
36 | core/launcher \ | 36 | core/launcher \ |
37 | core/opie-login \ | ||
37 | core/apps/oipkg core/apps/qcop | 38 | core/apps/oipkg core/apps/qcop |
38 | 39 | ||
39 | COREMULTIMEDIA = core/multimedia/opieplayer | 40 | COREMULTIMEDIA = core/multimedia/opieplayer |
40 | 41 | ||
41 | CORESETTINGS = core/settings/light-and-power core/settings/security \ | 42 | CORESETTINGS = core/settings/light-and-power core/settings/security \ |
42 | core/settings/systemtime core/settings/citytime \ | 43 | core/settings/systemtime core/settings/citytime \ |
43 | 44 | ||
44 | NONCORESETTINGS =noncore/settings/language noncore/settings/rotation \ | 45 | NONCORESETTINGS =noncore/settings/language noncore/settings/rotation \ |
45 | noncore/settings/appearance noncore/settings/sound \ | 46 | noncore/settings/appearance noncore/settings/sound \ |
46 | noncore/settings/mediummount \ | 47 | noncore/settings/mediummount \ |
47 | noncore/settings/tabmanager noncore/settings/appskey \ | 48 | noncore/settings/tabmanager noncore/settings/appskey \ |
48 | noncore/settings/netsystemtime \ | 49 | noncore/settings/netsystemtime \ |
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp index b3c331b..a19da14 100644 --- a/core/launcher/main.cpp +++ b/core/launcher/main.cpp | |||
@@ -36,28 +36,24 @@ | |||
36 | #include <qpe/qcopenvelope_qws.h> | 36 | #include <qpe/qcopenvelope_qws.h> |
37 | #include <qpe/alarmserver.h> | 37 | #include <qpe/alarmserver.h> |
38 | 38 | ||
39 | #include <stdlib.h> | 39 | #include <stdlib.h> |
40 | #include <stdio.h> | 40 | #include <stdio.h> |
41 | #include <signal.h> | 41 | #include <signal.h> |
42 | #include <unistd.h> | 42 | #include <unistd.h> |
43 | 43 | ||
44 | #if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) | 44 | #if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) |
45 | #include "../calibrate/calibrate.h" | 45 | #include "../calibrate/calibrate.h" |
46 | #endif | 46 | #endif |
47 | 47 | ||
48 | #ifdef QT_QWS_LOGIN | ||
49 | #include "../login/qdmdialogimpl.h" | ||
50 | #endif | ||
51 | |||
52 | #ifdef QT_QWS_CASSIOPEIA | 48 | #ifdef QT_QWS_CASSIOPEIA |
53 | static void ignoreMessage( QtMsgType, const char * ) | 49 | static void ignoreMessage( QtMsgType, const char * ) |
54 | { | 50 | { |
55 | } | 51 | } |
56 | #include <sys/mount.h> | 52 | #include <sys/mount.h> |
57 | #include <sys/types.h> | 53 | #include <sys/types.h> |
58 | #include <sys/stat.h> | 54 | #include <sys/stat.h> |
59 | #include <sys/time.h> | 55 | #include <sys/time.h> |
60 | #include <fcntl.h> | 56 | #include <fcntl.h> |
61 | #include <qdatetime.h> | 57 | #include <qdatetime.h> |
62 | 58 | ||
63 | void initCassiopeia() | 59 | void initCassiopeia() |
@@ -294,32 +290,24 @@ int initApplication( int argc, char ** argv ) | |||
294 | #endif | 290 | #endif |
295 | 291 | ||
296 | //Don't flicker at startup: | 292 | //Don't flicker at startup: |
297 | QWSServer::setDesktopBackground( QImage() ); | 293 | QWSServer::setDesktopBackground( QImage() ); |
298 | DesktopApplication a( argc, argv, QApplication::GuiServer ); | 294 | DesktopApplication a( argc, argv, QApplication::GuiServer ); |
299 | 295 | ||
300 | (void) new ModelKeyFilter ( ); | 296 | (void) new ModelKeyFilter ( ); |
301 | 297 | ||
302 | initBacklight(); | 298 | initBacklight(); |
303 | 299 | ||
304 | AlarmServer::initialize(); | 300 | AlarmServer::initialize(); |
305 | 301 | ||
306 | #if defined(QT_QWS_LOGIN) | ||
307 | for( int i=0; i<a.argc(); i++ ) | ||
308 | if( strcmp( a.argv()[i], "-login" ) == 0 ) { | ||
309 | QDMDialogImpl::login( ); | ||
310 | return 0; | ||
311 | } | ||
312 | #endif | ||
313 | |||
314 | Desktop *d = new Desktop(); | 302 | Desktop *d = new Desktop(); |
315 | 303 | ||
316 | QObject::connect( &a, SIGNAL(datebook()), d, SLOT(raiseDatebook()) ); | 304 | QObject::connect( &a, SIGNAL(datebook()), d, SLOT(raiseDatebook()) ); |
317 | QObject::connect( &a, SIGNAL(contacts()), d, SLOT(raiseContacts()) ); | 305 | QObject::connect( &a, SIGNAL(contacts()), d, SLOT(raiseContacts()) ); |
318 | QObject::connect( &a, SIGNAL(launch()), d, SLOT(raiseLauncher()) ); | 306 | QObject::connect( &a, SIGNAL(launch()), d, SLOT(raiseLauncher()) ); |
319 | QObject::connect( &a, SIGNAL(email()), d, SLOT(raiseEmail()) ); | 307 | QObject::connect( &a, SIGNAL(email()), d, SLOT(raiseEmail()) ); |
320 | QObject::connect( &a, SIGNAL(power()), d, SLOT(togglePower()) ); | 308 | QObject::connect( &a, SIGNAL(power()), d, SLOT(togglePower()) ); |
321 | QObject::connect( &a, SIGNAL(backlight()), d, SLOT(toggleLight()) ); | 309 | QObject::connect( &a, SIGNAL(backlight()), d, SLOT(toggleLight()) ); |
322 | QObject::connect( &a, SIGNAL(symbol()), d, SLOT(toggleSymbolInput()) ); | 310 | QObject::connect( &a, SIGNAL(symbol()), d, SLOT(toggleSymbolInput()) ); |
323 | QObject::connect( &a, SIGNAL(numLockStateToggle()), d, SLOT(toggleNumLockState()) ); | 311 | QObject::connect( &a, SIGNAL(numLockStateToggle()), d, SLOT(toggleNumLockState()) ); |
324 | QObject::connect( &a, SIGNAL(capsLockStateToggle()), d, SLOT(toggleCapsLockState()) ); | 312 | QObject::connect( &a, SIGNAL(capsLockStateToggle()), d, SLOT(toggleCapsLockState()) ); |
325 | QObject::connect( &a, SIGNAL(prepareForRestart()), d, SLOT(terminateServers()) ); | 313 | QObject::connect( &a, SIGNAL(prepareForRestart()), d, SLOT(terminateServers()) ); |
diff --git a/core/opie-login/opie-login.control b/core/opie-login/opie-login.control new file mode 100644 index 0000000..d87fc6c --- a/dev/null +++ b/core/opie-login/opie-login.control | |||
@@ -0,0 +1,9 @@ | |||
1 | Files: bin/opie-login | ||
2 | Priority: optional | ||
3 | Section: opie/system | ||
4 | Maintainer: Project Opie <opie@handhelds.org> | ||
5 | Architecture: arm | ||
6 | Version: $QPE_VERSION-$SUB_VERSION | ||
7 | Depends: opie-base ($QPE_VERSION), libopie | ||
8 | Description: Multiuser login for OPIE | ||
9 | A xdm/kdm equivalent for OPIE. | ||
diff --git a/root/etc/init.d/opie b/root/etc/init.d/opie index b5a185e..eed69c2 100755 --- a/root/etc/init.d/opie +++ b/root/etc/init.d/opie | |||
@@ -35,24 +35,29 @@ case $1 in | |||
35 | cd $HOME | 35 | cd $HOME |
36 | 36 | ||
37 | rm -f /etc/rc2.d/S99x # Can't have both running! | 37 | rm -f /etc/rc2.d/S99x # Can't have both running! |
38 | 38 | ||
39 | case `module_id` in | 39 | case `module_id` in |
40 | "3100" ) export QWS_DISPLAY=Transformed:Rot90:0 ;; | 40 | "3100" ) export QWS_DISPLAY=Transformed:Rot90:0 ;; |
41 | "3600" ) export QWS_DISPLAY=Transformed:Rot270:0 ;; | 41 | "3600" ) export QWS_DISPLAY=Transformed:Rot270:0 ;; |
42 | "3700" ) export QWS_DISPLAY=Transformed:Rot270:0 ;; | 42 | "3700" ) export QWS_DISPLAY=Transformed:Rot270:0 ;; |
43 | "3800" ) export QWS_DISPLAY=Transformed:Rot90:0 ;; | 43 | "3800" ) export QWS_DISPLAY=Transformed:Rot90:0 ;; |
44 | *) echo "Unknown processor type -`module_id`-!" ;; | 44 | *) echo "Unknown processor type -`module_id`-!" ;; |
45 | esac | 45 | esac |
46 | 46 | ||
47 | if [ -x $OPIEDIR/bin/opie-login ]; then | ||
48 | $OPIEDIR/bin/opie-login 2>/dev/null >/dev/null & | ||
49 | else | ||
47 | $OPIEDIR/bin/qpe 2>/dev/null >/dev/null & | 50 | $OPIEDIR/bin/qpe 2>/dev/null >/dev/null & |
51 | fi | ||
48 | 52 | ||
49 | ;; | 53 | ;; |
50 | 'stop') | 54 | 'stop') |
51 | echo "Killing Opie..." | 55 | echo "Killing Opie..." |
52 | killproc qpe | 56 | killproc qpe |
57 | killproc opie-login | ||
53 | ;; | 58 | ;; |
54 | *) | 59 | *) |
55 | echo "usage: $0 { start | stop }" | 60 | echo "usage: $0 { start | stop }" |
56 | ;; | 61 | ;; |
57 | esac | 62 | esac |
58 | 63 | ||