summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/main.cpp92
1 files changed, 37 insertions, 55 deletions
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index b119399..aa0dfdf 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -61,17 +61,17 @@ using namespace Opie::Core;
static void cleanup()
{
QDir dir( "/tmp", "qcop-msg-*" );
QStringList stale = dir.entryList();
QStringList::Iterator it;
for ( it = stale.begin(); it != stale.end(); ++it ) {
- dir.remove( *it );
+ dir.remove( *it );
}
}
static void refreshTimeZoneConfig()
{
/* ### FIXME timezone handling for qtopia */
}
@@ -82,25 +82,25 @@ void initEnvironment()
qt_init_winver();
#endif
Config config("locale");
config.setGroup( "Location" );
QString tz = config.readEntry( "Timezone", getenv("TZ") ).stripWhiteSpace();
// if not timezone set, pick New York
if (tz.isNull() || tz.isEmpty())
- tz = "America/New_York";
+ tz = "America/New_York";
setenv( "TZ", tz, 1 );
config.writeEntry( "Timezone", tz);
config.setGroup( "Language" );
QString lang = config.readEntry( "Language", getenv("LANG") ).stripWhiteSpace();
if( lang.isNull() || lang.isEmpty())
- lang = "en_US";
+ lang = "en_US";
setenv( "LANG", lang, 1 );
config.writeEntry("Language", lang);
config.write();
QString env(getenv("QWS_DISPLAY"));
if (env.contains("Transformed")) {
@@ -120,39 +120,39 @@ static void initKeyboard()
{
Config config("qpe");
config.setGroup( "Keyboard" );
int ard = config.readNumEntry( "RepeatDelay" );
int arp = config.readNumEntry( "RepeatPeriod" );
if ( ard > 0 && arp > 0 )
- qwsSetKeyboardAutoRepeat( ard, arp );
+ qwsSetKeyboardAutoRepeat( ard, arp );
QString layout = config.readEntry( "Layout", "us101" );
Server::setKeyboardLayout( layout );
}
static bool firstUse()
{
bool needFirstUse = FALSE;
if ( QWSServer::mouseHandler() &&
QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) {
if ( !QFile::exists( "/etc/pointercal" ) )
needFirstUse = TRUE;
}
{
- Config config( "qpe" );
- config.setGroup( "Startup" );
- needFirstUse |= config.readBoolEntry( "FirstUse", TRUE );
+ Config config( "qpe" );
+ config.setGroup( "Startup" );
+ needFirstUse |= config.readBoolEntry( "FirstUse", TRUE );
}
if ( !needFirstUse )
- return FALSE;
+ return FALSE;
FirstUse *fu = new FirstUse();
fu->exec();
bool rs = fu->restartNeeded();
delete fu;
return rs;
}
@@ -170,25 +170,25 @@ int initApplication( int argc, char ** argv )
ServerApplication a( argc, argv, QApplication::GuiServer );
refreshTimeZoneConfig();
initKeyboard();
// Don't use first use under Windows
if ( firstUse() ) {
- a.restart();
- return 0;
+ a.restart();
+ return 0;
}
ODevice::inst ( )-> setSoftSuspend ( true );
{
QCopEnvelope e("QPE/System", "setBacklight(int)" );
- e << -3; // Forced on
+ e << -3; // Forced on
}
AlarmServer::initialize();
Server *s = new Server();
@@ -218,75 +218,57 @@ int initApplication( int argc, char ** argv )
return rv;
}
static const char *pidfile_path = "/var/run/opie.pid";
void create_pidfile ( )
{
- FILE *f;
+ FILE *f;
- if (( f = ::fopen ( pidfile_path, "w" ))) {
- ::fprintf ( f, "%d", getpid ( ));
- ::fclose ( f );
- }
+ if (( f = ::fopen ( pidfile_path, "w" ))) {
+ ::fprintf ( f, "%d", getpid ( ));
+ ::fclose ( f );
+ }
}
void remove_pidfile ( )
{
- ::unlink ( pidfile_path );
+ ::unlink ( pidfile_path );
}
void handle_sigterm ( int /* sig */ )
{
- if ( qApp )
- qApp-> quit ( );
+ ::signal( SIGCHLD, SIG_IGN );
+ ::signal( SIGSEGV, SIG_IGN );
+ ::signal( SIGBUS, SIG_IGN );
+ ::signal( SIGILL, SIG_IGN );
+ ::signal( SIGTERM, SIG_IGN );
+ ::signal ( SIGINT, SIG_IGN );
+ if ( qApp ) qApp->quit();
}
-#ifndef Q_OS_WIN32
int main( int argc, char ** argv )
{
-
- ::signal ( SIGCHLD, SIG_IGN );
-
- ::signal ( SIGTERM, handle_sigterm );
+ ::signal( SIGCHLD, SIG_IGN );
+ ::signal( SIGSEGV, handle_sigterm );
+ ::signal( SIGBUS, handle_sigterm );
+ ::signal( SIGILL, handle_sigterm );
+ ::signal( SIGTERM, handle_sigterm );
::signal ( SIGINT, handle_sigterm );
+ ::setsid();
+ ::setpgid( 0, 0 );
- ::setsid ( );
- ::setpgid ( 0, 0 );
-
- ::atexit ( remove_pidfile );
- create_pidfile ( );
+ ::atexit( remove_pidfile );
+ create_pidfile();
int retVal = initApplication( argc, argv );
// Have we been asked to restart?
- if ( ServerApplication::doRestart ) {
- for ( int fd = 3; fd < 100; fd++ )
- close( fd );
-
- execl( (QPEApplication::qpeDir()+"bin/qpe").latin1(), "qpe", 0 );
- }
-
- // Kill them. Kill them all.
- ::kill ( 0, SIGTERM );
- ::sleep ( 1 );
- ::kill ( 0, SIGKILL );
-
- return retVal;
-}
-#else
-
-int main( int argc, char ** argv )
-{
- int retVal = initApplication( argc, argv );
-
- if ( DesktopApplication::doRestart ) {
- odebug << "Trying to restart" << oendl;
- execl( (QPEApplication::qpeDir()+"bin\\qpe").latin1(), "qpe", 0 );
+ if ( ServerApplication::doRestart )
+ {
+ for ( int fd = 3; fd < 100; fd++ ) close( fd );
+ execl( (QPEApplication::qpeDir()+"bin/qpe").latin1(), "qpe", 0 );
}
return retVal;
}
-
-#endif
-