-rw-r--r-- | core/launcher/main.cpp | 2 |
1 files changed, 1 insertions, 1 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 | |||
@@ -46,97 +46,97 @@ using namespace Opie::Core; | |||
46 | #include <stdlib.h> | 46 | #include <stdlib.h> |
47 | #include <stdio.h> | 47 | #include <stdio.h> |
48 | #include <signal.h> | 48 | #include <signal.h> |
49 | #include <unistd.h> | 49 | #include <unistd.h> |
50 | #include <errno.h> | 50 | #include <errno.h> |
51 | #include <string.h> | 51 | #include <string.h> |
52 | 52 | ||
53 | void create_pidfile(); | 53 | void create_pidfile(); |
54 | void remove_pidfile(); | 54 | void remove_pidfile(); |
55 | 55 | ||
56 | static void cleanup() | 56 | static void cleanup() |
57 | { | 57 | { |
58 | QDir dir( "/tmp", "qcop-msg-*" ); | 58 | QDir dir( "/tmp", "qcop-msg-*" ); |
59 | 59 | ||
60 | QStringList stale = dir.entryList(); | 60 | QStringList stale = dir.entryList(); |
61 | QStringList::Iterator it; | 61 | QStringList::Iterator it; |
62 | for ( it = stale.begin(); it != stale.end(); ++it ) { | 62 | for ( it = stale.begin(); it != stale.end(); ++it ) { |
63 | dir.remove( *it ); | 63 | dir.remove( *it ); |
64 | } | 64 | } |
65 | } | 65 | } |
66 | 66 | ||
67 | void initEnvironment() | 67 | void initEnvironment() |
68 | { | 68 | { |
69 | Config config("locale"); | 69 | Config config("locale"); |
70 | config.setGroup( "Location" ); | 70 | config.setGroup( "Location" ); |
71 | QString tz = config.readEntry( "Timezone", getenv("TZ") ).stripWhiteSpace(); | 71 | QString tz = config.readEntry( "Timezone", getenv("TZ") ).stripWhiteSpace(); |
72 | 72 | ||
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 | } |
118 | 118 | ||
119 | static bool firstUse() | 119 | static bool firstUse() |
120 | { | 120 | { |
121 | bool needFirstUse = FALSE; | 121 | bool needFirstUse = FALSE; |
122 | if ( QWSServer::mouseHandler() && | 122 | if ( QWSServer::mouseHandler() && |
123 | QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { | 123 | QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { |
124 | if ( !QFile::exists( "/etc/pointercal" ) ) | 124 | if ( !QFile::exists( "/etc/pointercal" ) ) |
125 | needFirstUse = TRUE; | 125 | needFirstUse = TRUE; |
126 | } | 126 | } |
127 | 127 | ||
128 | { | 128 | { |
129 | Config config( "qpe" ); | 129 | Config config( "qpe" ); |
130 | config.setGroup( "Startup" ); | 130 | config.setGroup( "Startup" ); |
131 | needFirstUse |= config.readBoolEntry( "FirstUse", TRUE ); | 131 | needFirstUse |= config.readBoolEntry( "FirstUse", TRUE ); |
132 | } | 132 | } |
133 | 133 | ||
134 | if ( !needFirstUse ) | 134 | if ( !needFirstUse ) |
135 | return FALSE; | 135 | return FALSE; |
136 | 136 | ||
137 | FirstUse *fu = new FirstUse(); | 137 | FirstUse *fu = new FirstUse(); |
138 | fu->exec(); | 138 | fu->exec(); |
139 | bool rs = fu->restartNeeded(); | 139 | bool rs = fu->restartNeeded(); |
140 | delete fu; | 140 | delete fu; |
141 | return rs; | 141 | return rs; |
142 | } | 142 | } |