author | kergoth <kergoth> | 2003-03-26 22:14:35 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-03-26 22:14:35 (UTC) |
commit | 0e3f3b3edcbfb26239230e00fa5dc9244bdbbf02 (patch) (unidiff) | |
tree | df259e71f3fc2263d8053221c103745eea05064e | |
parent | 01e8da96a688b8a84133b7c3e5a89c295a71d9fd (diff) | |
download | opie-0e3f3b3edcbfb26239230e00fa5dc9244bdbbf02.zip opie-0e3f3b3edcbfb26239230e00fa5dc9244bdbbf02.tar.gz opie-0e3f3b3edcbfb26239230e00fa5dc9244bdbbf02.tar.bz2 |
Modified launcher to set rotation via:
1) QWS_DISPLAY env var
2) Rot field as saved by setDefaultRotation
3) physical orientation as controlled by ODevice (this is broken currently,
due to ODevice requiring a QApplication to be created)
-rw-r--r-- | core/launcher/main.cpp | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp index d11b6c5..0b38738 100644 --- a/core/launcher/main.cpp +++ b/core/launcher/main.cpp | |||
@@ -50,7 +50,9 @@ using namespace Opie; | |||
50 | 50 | ||
51 | void initEnvironment() | 51 | void initEnvironment() |
52 | { | 52 | { |
53 | int rot; | ||
53 | Config config("locale"); | 54 | Config config("locale"); |
55 | |||
54 | config.setGroup( "Location" ); | 56 | config.setGroup( "Location" ); |
55 | QString tz = config.readEntry( "Timezone", getenv("TZ") ); | 57 | QString tz = config.readEntry( "Timezone", getenv("TZ") ); |
56 | 58 | ||
@@ -65,6 +67,26 @@ void initEnvironment() | |||
65 | QString lang = config.readEntry( "Language", getenv("LANG") ); | 67 | QString lang = config.readEntry( "Language", getenv("LANG") ); |
66 | if ( !lang.isNull() ) | 68 | if ( !lang.isNull() ) |
67 | setenv( "LANG", lang, 1 ); | 69 | setenv( "LANG", lang, 1 ); |
70 | |||
71 | #if !defined(QT_QWS_CASSIOPEIA) && !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX) | ||
72 | setenv( "QWS_SIZE", "240x320", 0 ); | ||
73 | #endif | ||
74 | |||
75 | /* | ||
76 | * Rotation: | ||
77 | * 1. use env var if set | ||
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 ( ( rot = QPEApplication::defaultRotation ( ) ) == 0 ) { | ||
83 | Config config("qpe"); | ||
84 | config.setGroup( "Rotation" ); | ||
85 | if ( ( rot = config.readNumEntry( "Rot", -1 ) ) == -1 ) | ||
86 | rot = ODevice::inst ( )-> rotation ( ) * 90; | ||
87 | } | ||
88 | |||
89 | setenv("QWS_DISPLAY", QString("Transformed:Rot%1:0").arg(rot), 1); | ||
68 | } | 90 | } |
69 | 91 | ||
70 | 92 | ||
@@ -72,12 +94,9 @@ int initApplication( int argc, char ** argv ) | |||
72 | { | 94 | { |
73 | initEnvironment(); | 95 | initEnvironment(); |
74 | 96 | ||
75 | #if !defined(QT_QWS_CASSIOPEIA) && !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX) | ||
76 | setenv( "QWS_SIZE", "240x320", 0 ); | ||
77 | #endif | ||
78 | |||
79 | //Don't flicker at startup: | 97 | //Don't flicker at startup: |
80 | QWSServer::setDesktopBackground( QImage() ); | 98 | QWSServer::setDesktopBackground( QImage() ); |
99 | |||
81 | DesktopApplication a( argc, argv, QApplication::GuiServer ); | 100 | DesktopApplication a( argc, argv, QApplication::GuiServer ); |
82 | 101 | ||
83 | ODevice::inst ( )-> setSoftSuspend ( true ); | 102 | ODevice::inst ( )-> setSoftSuspend ( true ); |