summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-04-15 03:09:04 (UTC)
committer kergoth <kergoth>2003-04-15 03:09:04 (UTC)
commit35edf52692c9f5e68b07072dd79b857d16d79559 (patch) (unidiff)
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) (ignore 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
@@ -63,32 +63,27 @@ void initEnvironment()
63 setenv( "TZ", tz, 1 ); 63 setenv( "TZ", tz, 1 );
64 config.writeEntry( "Timezone", tz); 64 config.writeEntry( "Timezone", tz);
65 65
66 config.setGroup( "Language" ); 66 config.setGroup( "Language" );
67 QString lang = config.readEntry( "Language", getenv("LANG") ); 67 QString lang = config.readEntry( "Language", getenv("LANG") );
68 if ( !lang.isNull() ) 68 if ( !lang.isNull() )
69 setenv( "LANG", lang, 1 ); 69 setenv( "LANG", lang, 1 );
70 70
71#if !defined(QT_QWS_CASSIOPEIA) && !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX) 71#if !defined(QT_QWS_CASSIOPEIA) && !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX)
72 setenv( "QWS_SIZE", "240x320", 0 ); 72 setenv( "QWS_SIZE", "240x320", 0 );
73#endif 73#endif
74 74
75 /* 75 QString env(getenv("QWS_DISPLAY"));
76 * Rotation: 76 if (env.contains("Transformed")) {
77 * 1. use env var if set 77 // transformed driver default rotation is controlled by the hardware.
78 * 2. use saved default if set
79 * 3. use physical orientation (currently fails due to ODevice
80 * using a QPixmap and therefore requiring a QApplication)
81 */
82 if ( getenv("QWS_DISPLAY") == NULL ) {
83 Config config("qpe"); 78 Config config("qpe");
84 config.setGroup( "Rotation" ); 79 config.setGroup( "Rotation" );
85 if ( ( rot = config.readNumEntry( "Rot", -1 ) ) == -1 ) 80 if ( ( rot = config.readNumEntry( "Rot", -1 ) ) == -1 )
86 rot = ODevice::inst ( )-> rotation ( ) * 90; 81 rot = ODevice::inst ( )-> rotation ( ) * 90;
87 82
88 setenv("QWS_DISPLAY", QString("Transformed:Rot%1:0").arg(rot), 1); 83 setenv("QWS_DISPLAY", QString("Transformed:Rot%1:0").arg(rot), 1);
89 QPEApplication::defaultRotation ( ); /* to ensure deforient matches reality */ 84 QPEApplication::defaultRotation ( ); /* to ensure deforient matches reality */
90 } 85 }
91} 86}
92 87
93 88
94int initApplication( int argc, char ** argv ) 89int initApplication( int argc, char ** argv )