summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-03-26 23:18:14 (UTC)
committer kergoth <kergoth>2003-03-26 23:18:14 (UTC)
commita99096fa8b72704bcec0b76a6ad2107c3db70f13 (patch) (unidiff)
treec4cd6d45d3aa97cab24d50eb0ac79ecbb16855a8
parenta57325de7183c21df6b5ff06eff8cf7e3c328ef4 (diff)
downloadopie-a99096fa8b72704bcec0b76a6ad2107c3db70f13.zip
opie-a99096fa8b72704bcec0b76a6ad2107c3db70f13.tar.gz
opie-a99096fa8b72704bcec0b76a6ad2107c3db70f13.tar.bz2
Add a second call to defaultRotation, to ensrue deforient matches reality, if we loaded the rotation from Config or ODevice.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/main.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index 0b38738..fa4df3c 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -66,48 +66,49 @@ void initEnvironment()
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 /*
76 * Rotation: 76 * Rotation:
77 * 1. use env var if set 77 * 1. use env var if set
78 * 2. use saved default if set 78 * 2. use saved default if set
79 * 3. use physical orientation (currently fails due to ODevice 79 * 3. use physical orientation (currently fails due to ODevice
80 * using a QPixmap and therefore requiring a QApplication) 80 * using a QPixmap and therefore requiring a QApplication)
81 */ 81 */
82 if ( ( rot = QPEApplication::defaultRotation ( ) ) == 0 ) { 82 if ( ( rot = QPEApplication::defaultRotation ( ) ) == 0 ) {
83 Config config("qpe"); 83 Config config("qpe");
84 config.setGroup( "Rotation" ); 84 config.setGroup( "Rotation" );
85 if ( ( rot = config.readNumEntry( "Rot", -1 ) ) == -1 ) 85 if ( ( rot = config.readNumEntry( "Rot", -1 ) ) == -1 )
86 rot = ODevice::inst ( )-> rotation ( ) * 90; 86 rot = ODevice::inst ( )-> rotation ( ) * 90;
87 } 87 }
88 88
89 setenv("QWS_DISPLAY", QString("Transformed:Rot%1:0").arg(rot), 1); 89 setenv("QWS_DISPLAY", QString("Transformed:Rot%1:0").arg(rot), 1);
90 QPEApplication::defaultRotation ( ); /* to ensure deforient matches reality */
90} 91}
91 92
92 93
93int initApplication( int argc, char ** argv ) 94int initApplication( int argc, char ** argv )
94{ 95{
95 initEnvironment(); 96 initEnvironment();
96 97
97 //Don't flicker at startup: 98 //Don't flicker at startup:
98 QWSServer::setDesktopBackground( QImage() ); 99 QWSServer::setDesktopBackground( QImage() );
99 100
100 DesktopApplication a( argc, argv, QApplication::GuiServer ); 101 DesktopApplication a( argc, argv, QApplication::GuiServer );
101 102
102 ODevice::inst ( )-> setSoftSuspend ( true ); 103 ODevice::inst ( )-> setSoftSuspend ( true );
103 104
104 { // init backlight 105 { // init backlight
105 QCopEnvelope e("QPE/System", "setBacklight(int)" ); 106 QCopEnvelope e("QPE/System", "setBacklight(int)" );
106 e << -3; // Forced on 107 e << -3; // Forced on
107 } 108 }
108 109
109 AlarmServer::initialize(); 110 AlarmServer::initialize();
110 111
111 Desktop *d = new Desktop(); 112 Desktop *d = new Desktop();
112 113
113 QObject::connect( &a, SIGNAL(power()), d, SLOT(togglePower()) ); 114 QObject::connect( &a, SIGNAL(power()), d, SLOT(togglePower()) );