-rw-r--r-- | core/launcher/main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp index 5bbed59..8ed8710 100644 --- a/core/launcher/main.cpp +++ b/core/launcher/main.cpp | |||
@@ -73,45 +73,45 @@ void initEnvironment() | |||
73 | // timezone | 73 | // timezone |
74 | if (tz.isNull() || tz.isEmpty()) tz = "America/New_York"; | 74 | if (tz.isNull() || tz.isEmpty()) tz = "America/New_York"; |
75 | setenv( "TZ", tz, 1 ); | 75 | setenv( "TZ", tz, 1 ); |
76 | config.writeEntry( "Timezone", tz); | 76 | config.writeEntry( "Timezone", tz); |
77 | 77 | ||
78 | // language | 78 | // language |
79 | config.setGroup( "Language" ); | 79 | config.setGroup( "Language" ); |
80 | QString lang = config.readEntry( "Language", getenv("LANG") ).stripWhiteSpace(); | 80 | QString lang = config.readEntry( "Language", getenv("LANG") ).stripWhiteSpace(); |
81 | if( lang.isNull() || lang.isEmpty()) lang = "en_US"; | 81 | if( lang.isNull() || lang.isEmpty()) lang = "en_US"; |
82 | setenv( "LANG", lang, 1 ); | 82 | setenv( "LANG", lang, 1 ); |
83 | config.writeEntry("Language", lang); | 83 | config.writeEntry("Language", lang); |
84 | config.write(); | 84 | config.write(); |
85 | 85 | ||
86 | // rotation | 86 | // rotation |
87 | int t = ODevice::inst()->rotation(); | 87 | int t = ODevice::inst()->rotation(); |
88 | odebug << "ODevice reports transformation to be " << t << oendl; | 88 | odebug << "ODevice reports transformation to be " << t << oendl; |
89 | 89 | ||
90 | QString env( getenv("QWS_DISPLAY") ); | 90 | QString env( getenv("QWS_DISPLAY") ); |
91 | if ( env.isEmpty() ) | 91 | if ( env.isEmpty() ) |
92 | { | 92 | { |
93 | int rot = ODevice::inst()->rotation() * 90; | 93 | int rot = ODevice::inst()->rotation() * 90; |
94 | QString qws_display = QString("Transformed:Rot%1:0").arg(rot); | 94 | QString qws_display = QString( "%1:Rot%2:0").arg(ODevice::inst()->qteDriver()).arg(rot); |
95 | odebug << "setting QWS_DISPLAY to '" << qws_display << "'" << oendl; | 95 | odebug << "setting QWS_DISPLAY to '" << qws_display << "'" << oendl; |
96 | setenv("QWS_DISPLAY", (const char*) qws_display, 1); | 96 | setenv("QWS_DISPLAY", (const char*) qws_display, 1); |
97 | } | 97 | } |
98 | else | 98 | else |
99 | odebug << "QWS_DISPLAY already set as '" << env << "' - overriding ODevice transformation" << oendl; | 99 | odebug << "QWS_DISPLAY already set as '" << env << "' - overriding ODevice transformation" << oendl; |
100 | 100 | ||
101 | QPEApplication::defaultRotation(); /* to ensure deforient matches reality */ | 101 | QPEApplication::defaultRotation(); /* to ensure deforient matches reality */ |
102 | } | 102 | } |
103 | 103 | ||
104 | static void initKeyboard() | 104 | static void initKeyboard() |
105 | { | 105 | { |
106 | Config config("qpe"); | 106 | Config config("qpe"); |
107 | 107 | ||
108 | config.setGroup( "Keyboard" ); | 108 | config.setGroup( "Keyboard" ); |
109 | 109 | ||
110 | int ard = config.readNumEntry( "RepeatDelay" ); | 110 | int ard = config.readNumEntry( "RepeatDelay" ); |
111 | int arp = config.readNumEntry( "RepeatPeriod" ); | 111 | int arp = config.readNumEntry( "RepeatPeriod" ); |
112 | if ( ard > 0 && arp > 0 ) | 112 | if ( ard > 0 && arp > 0 ) |
113 | qwsSetKeyboardAutoRepeat( ard, arp ); | 113 | qwsSetKeyboardAutoRepeat( ard, arp ); |
114 | 114 | ||
115 | QString layout = config.readEntry( "Layout", "us101" ); | 115 | QString layout = config.readEntry( "Layout", "us101" ); |
116 | Server::setKeyboardLayout( layout ); | 116 | Server::setKeyboardLayout( layout ); |
117 | } | 117 | } |
@@ -158,50 +158,50 @@ int initApplication( int argc, char ** argv ) | |||
158 | return 0; | 158 | return 0; |
159 | } | 159 | } |
160 | 160 | ||
161 | { | 161 | { |
162 | QCopEnvelope e("QPE/System", "setBacklight(int)" ); | 162 | QCopEnvelope e("QPE/System", "setBacklight(int)" ); |
163 | e << -3; // Forced on | 163 | e << -3; // Forced on |
164 | } | 164 | } |
165 | 165 | ||
166 | AlarmServer::initialize(); | 166 | AlarmServer::initialize(); |
167 | Server *s = new Server(); | 167 | Server *s = new Server(); |
168 | new SysFileMonitor(s); | 168 | new SysFileMonitor(s); |
169 | #ifdef QWS | 169 | #ifdef QWS |
170 | Network::createServer(s); | 170 | Network::createServer(s); |
171 | #endif | 171 | #endif |
172 | s->show(); | 172 | s->show(); |
173 | 173 | ||
174 | #if 0 | 174 | #if 0 |
175 | if ( QDate::currentDate().year() < 2005 ) | 175 | if ( QDate::currentDate().year() < 2005 ) |
176 | { | 176 | { |
177 | if ( QMessageBox::information ( 0, ServerApplication::tr( "Information" ), | 177 | if ( QMessageBox::information ( 0, ServerApplication::tr( "Information" ), |
178 | ServerApplication::tr( "<p>The system date doesn't seem to be valid.\n(%1)</p><p>Do you want to correct the clock ?</p>" ) | 178 | ServerApplication::tr( "<p>The system date doesn't seem to be valid.\n(%1)</p><p>Do you want to correct the clock ?</p>" ) |
179 | .arg( TimeString::dateString( QDate::currentDate())), QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) | 179 | .arg( TimeString::dateString( QDate::currentDate())), QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) |
180 | { | 180 | { |
181 | QCopEnvelope e ( "QPE/Application/systemtime", "setDocument(QString)" ); | 181 | QCopEnvelope e ( "QPE/Application/systemtime", "setDocument(QString)" ); |
182 | e << QString ( ); | 182 | e << QString ( ); |
183 | } | 183 | } |
184 | } | 184 | } |
185 | #endif | 185 | #endif |
186 | 186 | ||
187 | create_pidfile(); | 187 | create_pidfile(); |
188 | odebug << "--> mainloop in" << oendl; | 188 | odebug << "--> mainloop in" << oendl; |
189 | int rv = a.exec(); | 189 | int rv = a.exec(); |
190 | odebug << "<-- mainloop out" << oendl; | 190 | odebug << "<-- mainloop out" << oendl; |
191 | remove_pidfile(); | 191 | remove_pidfile(); |
192 | odebug << "removing server object..." << oendl; | 192 | odebug << "removing server object..." << oendl; |
193 | delete s; | 193 | delete s; |
194 | 194 | ||
195 | odebug << "returning from qpe/initapplication..." << oendl; | 195 | odebug << "returning from qpe/initapplication..." << oendl; |
196 | return rv; | 196 | return rv; |
197 | } | 197 | } |
198 | 198 | ||
199 | static const char *pidfile_path = "/var/run/opie.pid"; | 199 | static const char *pidfile_path = "/var/run/opie.pid"; |
200 | 200 | ||
201 | void create_pidfile() | 201 | void create_pidfile() |
202 | { | 202 | { |
203 | FILE *f; | 203 | FILE *f; |
204 | 204 | ||
205 | if (( f = ::fopen( pidfile_path, "w" ))) { | 205 | if (( f = ::fopen( pidfile_path, "w" ))) { |
206 | ::fprintf( f, "%d", getpid ( )); | 206 | ::fprintf( f, "%d", getpid ( )); |
207 | ::fclose( f ); | 207 | ::fclose( f ); |