summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-03-26 23:55:38 (UTC)
committer kergoth <kergoth>2003-03-26 23:55:38 (UTC)
commitd57d83e0cda09c34dc92dfedb841a979b767e504 (patch) (side-by-side diff)
tree4eaf57168e956228a3039ce50eca6f7595ade7f7
parent9d291e88efa5b33bbf34112cdee8b0e516150dd6 (diff)
downloadopie-d57d83e0cda09c34dc92dfedb841a979b767e504.zip
opie-d57d83e0cda09c34dc92dfedb841a979b767e504.tar.gz
opie-d57d83e0cda09c34dc92dfedb841a979b767e504.tar.bz2
BUGFIX: as pointed out by robert, dont fsck with QWS_DISPLAY if it was already set.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/main.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index fa4df3c..a6e2a9d 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -34,105 +34,105 @@
#include <qmessagebox.h>
#include <qfile.h>
#include <qimage.h>
#include <qwindowsystem_qws.h>
#include <qwsmouse_qws.h>
#include <qpe/qcopenvelope_qws.h>
#include <qpe/alarmserver.h>
#include <stdlib.h>
#include <stdio.h>
#include <signal.h>
#include <unistd.h>
#include "../calibrate/calibrate.h"
using namespace Opie;
void initEnvironment()
{
int rot;
Config config("locale");
config.setGroup( "Location" );
QString tz = config.readEntry( "Timezone", getenv("TZ") );
// if not timezone set, pick New York
if (tz.isNull())
tz = "America/New_York";
setenv( "TZ", tz, 1 );
config.writeEntry( "Timezone", tz);
config.setGroup( "Language" );
QString lang = config.readEntry( "Language", getenv("LANG") );
if ( !lang.isNull() )
setenv( "LANG", lang, 1 );
#if !defined(QT_QWS_CASSIOPEIA) && !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX)
setenv( "QWS_SIZE", "240x320", 0 );
#endif
/*
* Rotation:
* 1. use env var if set
* 2. use saved default if set
* 3. use physical orientation (currently fails due to ODevice
* using a QPixmap and therefore requiring a QApplication)
*/
- if ( ( rot = QPEApplication::defaultRotation ( ) ) == 0 ) {
+ if ( getenv("QWS_DISPLAY") == NULL ) {
Config config("qpe");
config.setGroup( "Rotation" );
if ( ( rot = config.readNumEntry( "Rot", -1 ) ) == -1 )
rot = ODevice::inst ( )-> rotation ( ) * 90;
- }
- setenv("QWS_DISPLAY", QString("Transformed:Rot%1:0").arg(rot), 1);
- QPEApplication::defaultRotation ( ); /* to ensure deforient matches reality */
+ setenv("QWS_DISPLAY", QString("Transformed:Rot%1:0").arg(rot), 1);
+ QPEApplication::defaultRotation ( ); /* to ensure deforient matches reality */
+ }
}
int initApplication( int argc, char ** argv )
{
initEnvironment();
//Don't flicker at startup:
QWSServer::setDesktopBackground( QImage() );
DesktopApplication a( argc, argv, QApplication::GuiServer );
ODevice::inst ( )-> setSoftSuspend ( true );
{ // init backlight
QCopEnvelope e("QPE/System", "setBacklight(int)" );
e << -3; // Forced on
}
AlarmServer::initialize();
Desktop *d = new Desktop();
QObject::connect( &a, SIGNAL(power()), d, SLOT(togglePower()) );
QObject::connect( &a, SIGNAL(backlight()), d, SLOT(toggleLight()) );
QObject::connect( &a, SIGNAL(symbol()), d, SLOT(toggleSymbolInput()) );
QObject::connect( &a, SIGNAL(numLockStateToggle()), d, SLOT(toggleNumLockState()) );
QObject::connect( &a, SIGNAL(capsLockStateToggle()), d, SLOT(toggleCapsLockState()) );
QObject::connect( &a, SIGNAL(prepareForRestart()), d, SLOT(terminateServers()) );
(void)new SysFileMonitor(d);
Network::createServer(d);
if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) {
if ( !QFile::exists( "/etc/pointercal" ) ) {
// Make sure calibration widget starts on top.
Calibrate *cal = new Calibrate;
cal->exec();
delete cal;
}
}
d->show();
if ( QDate::currentDate ( ). year ( ) < 2000 ) {
if ( QMessageBox::information ( 0, DesktopApplication::tr( "Information" ), DesktopApplication::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 ) {
QCopEnvelope e ( "QPE/Application/systemtime", "setDocument(QString)" );
e << QString ( );