summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/main.cpp27
1 files changed, 19 insertions, 8 deletions
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index 8ed8710..4063517 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -91,159 +91,170 @@ void initEnvironment()
if ( env.isEmpty() )
{
int rot = ODevice::inst()->rotation() * 90;
QString qws_display = QString( "%1:Rot%2:0").arg(ODevice::inst()->qteDriver()).arg(rot);
odebug << "setting QWS_DISPLAY to '" << qws_display << "'" << oendl;
setenv("QWS_DISPLAY", (const char*) qws_display, 1);
}
else
odebug << "QWS_DISPLAY already set as '" << env << "' - overriding ODevice transformation" << oendl;
QPEApplication::defaultRotation(); /* to ensure deforient matches reality */
}
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 );
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 );
}
if ( !needFirstUse )
return FALSE;
FirstUse *fu = new FirstUse();
fu->exec();
bool rs = fu->restartNeeded();
delete fu;
return rs;
}
int initApplication( int argc, char ** argv )
{
cleanup();
initEnvironment();
#ifdef QWS
QWSServer::setDesktopBackground( QImage() );
#endif
ServerApplication a( argc, argv, QApplication::GuiServer );
initKeyboard();
- if ( firstUse() )
+ bool firstUseShown = firstUse();
+ if ( firstUseShown )
{
a.restart();
return 0;
}
{
QCopEnvelope e("QPE/System", "setBacklight(int)" );
e << -3; // Forced on
}
AlarmServer::initialize();
Server *s = new Server();
new SysFileMonitor(s);
#ifdef QWS
Network::createServer(s);
#endif
s->show();
-#if 0
- if ( QDate::currentDate().year() < 2005 )
- {
- if ( QMessageBox::information ( 0, ServerApplication::tr( "Information" ),
- ServerApplication::tr( "<p>The system date doesn't seem to be valid.\n(%1)</p><p>Do you want to correct the clock ?</p>" )
- .arg( TimeString::dateString( QDate::currentDate())), QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
+ if ( !firstUseShown ) {
+ Config config( "qpe" );
+ config.setGroup( "Startup" );
+ bool showTimeSettings = config.readBoolEntry( "ShowTimeSettings", FALSE );
+
+ if ( !showTimeSettings && QDate::currentDate().year() < 2007 )
+ {
+ if ( QMessageBox::information ( 0, ServerApplication::tr( "Information" ),
+ ServerApplication::tr( "<p>The system date doesn't seem to be valid.\n(%1)</p><p>Do you want to correct the clock ?</p>" )
+ .arg( TimeString::dateString( QDate::currentDate())),
+ QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
+ {
+ showTimeSettings = TRUE;
+ }
+ }
+
+ if ( showTimeSettings )
{
QCopEnvelope e ( "QPE/Application/systemtime", "setDocument(QString)" );
e << QString ( );
}
}
-#endif
create_pidfile();
odebug << "--> mainloop in" << oendl;
int rv = a.exec();
odebug << "<-- mainloop out" << oendl;
remove_pidfile();
odebug << "removing server object..." << oendl;
delete s;
odebug << "returning from qpe/initapplication..." << oendl;
return rv;
}
static const char *pidfile_path = "/var/run/opie.pid";
void create_pidfile()
{
FILE *f;
if (( f = ::fopen( pidfile_path, "w" ))) {
::fprintf( f, "%d", getpid ( ));
::fclose( f );
}
else
{
odebug << "couldn't create pidfile: " << strerror( errno ) << oendl;
}
}
void remove_pidfile()
{
::unlink( pidfile_path );
}
void handle_sigterm( int sig )
{
qDebug( "D'oh! QPE Server process got SIGNAL %d. Trying to exit gracefully...", sig );
::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();
}
int main( int argc, char ** argv )
{
::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 );
::atexit( remove_pidfile );
int retVal = initApplication( argc, argv );
// Have we been asked to restart?
if ( ServerApplication::doRestart )
{