summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-04-15 03:09:04 (UTC)
committer kergoth <kergoth>2003-04-15 03:09:04 (UTC)
commit35edf52692c9f5e68b07072dd79b857d16d79559 (patch) (side-by-side diff)
treeeba09e5b180592ddbad73106025759bb1b30c888
parenta0dd69741995f33de4eea6a5f97f46b91dff4cb8 (diff)
downloadopie-35edf52692c9f5e68b07072dd79b857d16d79559.zip
opie-35edf52692c9f5e68b07072dd79b857d16d79559.tar.gz
opie-35edf52692c9f5e68b07072dd79b857d16d79559.tar.bz2
Unconditionally override Rot value when using the Transformed driver.
This 1) Ensures that we dont hose QWS_DISPLAY when using a driver other than transformed, and 2) should ensure that the default rotation isnt screwed up when 'restart'ing Opie, thereby closing bug #796.
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/launcher/main.cpp11
1 files changed, 3 insertions, 8 deletions
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index a6e2a9d..20a1ecd 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -27,104 +27,99 @@
#include <qpe/config.h>
#if defined( QT_QWS_SL5XXX ) || defined( QT_QWS_IPAQ )
#include <qpe/custom.h>
#endif
#include <opie/odevice.h>
#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 ( getenv("QWS_DISPLAY") == NULL ) {
+ QString env(getenv("QWS_DISPLAY"));
+ if (env.contains("Transformed")) {
+ // transformed driver default rotation is controlled by the hardware.
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 */
}
}
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;
}