-rw-r--r-- | library/custom-ipaq.h | 5 | ||||
-rw-r--r-- | library/custom-ramses.h | 3 | ||||
-rw-r--r-- | library/custom-sharp.h | 4 | ||||
-rw-r--r-- | library/custom-simpad.h | 4 | ||||
-rw-r--r-- | library/qpeapplication.cpp | 10 | ||||
-rw-r--r-- | library/storage.cpp | 2 |
6 files changed, 19 insertions, 9 deletions
diff --git a/library/custom-ipaq.h b/library/custom-ipaq.h index a9319fa..8321199 100644 --- a/library/custom-ipaq.h +++ b/library/custom-ipaq.h | |||
@@ -1,21 +1,24 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of the Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #define QPE_NEED_CALIBRATION \ No newline at end of file | 21 | #define QPE_NEED_CALIBRATION |
22 | #define OPIE_SOUND_FRAGMENT_SHIFT 14 | ||
23 | #define USE_REALTIME_AUDIO_THREAD | ||
24 | #define OPIE_NEW_MALLOC | ||
diff --git a/library/custom-ramses.h b/library/custom-ramses.h index 9104931..5a1abe4 100644 --- a/library/custom-ramses.h +++ b/library/custom-ramses.h | |||
@@ -1,69 +1,72 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of the Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #define QPE_NEED_CALIBRATION | 21 | #define QPE_NEED_CALIBRATION |
22 | #define QPE_HAVE_TOGGLELIGHT | 22 | #define QPE_HAVE_TOGGLELIGHT |
23 | #define QPE_STARTMENU | 23 | #define QPE_STARTMENU |
24 | #define USE_REALTIME_AUDIO_THREAD | ||
25 | #define OPIE_NEW_MALLOC | ||
26 | |||
24 | 27 | ||
25 | #include <unistd.h> | 28 | #include <unistd.h> |
26 | #include <stdio.h> | 29 | #include <stdio.h> |
27 | #include <signal.h> | 30 | #include <signal.h> |
28 | #include <fcntl.h> | 31 | #include <fcntl.h> |
29 | #include <sys/ioctl.h> | 32 | #include <sys/ioctl.h> |
30 | 33 | ||
31 | #define QPE_HAVE_MEMALERTER | 34 | #define QPE_HAVE_MEMALERTER |
32 | 35 | ||
33 | #define QPE_MEMALERTER_IMPL \ | 36 | #define QPE_MEMALERTER_IMPL \ |
34 | static void sig_handler(int sig) \ | 37 | static void sig_handler(int sig) \ |
35 | { \ | 38 | { \ |
36 | switch (sig) { \ | 39 | switch (sig) { \ |
37 | case SIGHUP: \ | 40 | case SIGHUP: \ |
38 | memstate = VeryLow; \ | 41 | memstate = VeryLow; \ |
39 | break; \ | 42 | break; \ |
40 | case SIGUSR1: \ | 43 | case SIGUSR1: \ |
41 | memstate = Normal; \ | 44 | memstate = Normal; \ |
42 | break; \ | 45 | break; \ |
43 | case SIGUSR2: \ | 46 | case SIGUSR2: \ |
44 | memstate = Low; \ | 47 | memstate = Low; \ |
45 | break; \ | 48 | break; \ |
46 | } \ | 49 | } \ |
47 | } \ | 50 | } \ |
48 | static void initMemalerter() \ | 51 | static void initMemalerter() \ |
49 | { \ | 52 | { \ |
50 | struct sigaction sa; \ | 53 | struct sigaction sa; \ |
51 | memset(&sa, '\0', sizeof sa); \ | 54 | memset(&sa, '\0', sizeof sa); \ |
52 | sa.sa_handler = sig_handler; \ | 55 | sa.sa_handler = sig_handler; \ |
53 | sa.sa_flags = SA_RESTART; \ | 56 | sa.sa_flags = SA_RESTART; \ |
54 | if (sigaction(SIGHUP, &sa, NULL) < 0) { \ | 57 | if (sigaction(SIGHUP, &sa, NULL) < 0) { \ |
55 | return; \ | 58 | return; \ |
56 | } \ | 59 | } \ |
57 | if (sigaction(SIGUSR1, &sa, NULL) < 0) { \ | 60 | if (sigaction(SIGUSR1, &sa, NULL) < 0) { \ |
58 | return; \ | 61 | return; \ |
59 | } \ | 62 | } \ |
60 | if (sigaction(SIGUSR2, &sa, NULL) < 0) { \ | 63 | if (sigaction(SIGUSR2, &sa, NULL) < 0) { \ |
61 | return; \ | 64 | return; \ |
62 | } \ | 65 | } \ |
63 | FILE *fo = fopen("/proc/sys/vm/freepg_signal_proc", "w"); \ | 66 | FILE *fo = fopen("/proc/sys/vm/freepg_signal_proc", "w"); \ |
64 | \ | 67 | \ |
65 | if (!fo) \ | 68 | if (!fo) \ |
66 | return; \ | 69 | return; \ |
67 | fprintf(fo, "qpe\n"); \ | 70 | fprintf(fo, "qpe\n"); \ |
68 | fclose(fo); \ | 71 | fclose(fo); \ |
69 | } | 72 | } |
diff --git a/library/custom-sharp.h b/library/custom-sharp.h index 3936875..b0e67b8 100644 --- a/library/custom-sharp.h +++ b/library/custom-sharp.h | |||
@@ -1,73 +1,77 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of the Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #define QPE_NEED_CALIBRATION | 21 | #define QPE_NEED_CALIBRATION |
22 | #define QPE_OWNAPM | 22 | #define QPE_OWNAPM |
23 | #define QPE_HAVE_TOGGLELIGHT | 23 | #define QPE_HAVE_TOGGLELIGHT |
24 | #define QPE_NOCIBAUD | 24 | #define QPE_NOCIBAUD |
25 | #define QPE_STARTMENU | 25 | #define QPE_STARTMENU |
26 | #define OPIE_NEW_MALLOC | ||
27 | #define USE_REALTIME_AUDIO_THREAD | ||
28 | #define OPIE_NO_SOUND_PCM_READ_BITS | ||
29 | |||
26 | #include <asm/sharp_apm.h> | 30 | #include <asm/sharp_apm.h> |
27 | #ifndef APM_IOC_BATTERY_BACK_CHK | 31 | #ifndef APM_IOC_BATTERY_BACK_CHK |
28 | #define APM_IOC_BATTERY_BACK_CHK _IO(APM_IOC_MAGIC, 32) | 32 | #define APM_IOC_BATTERY_BACK_CHK _IO(APM_IOC_MAGIC, 32) |
29 | #endif | 33 | #endif |
30 | #ifndef APM_IOC_BATTERY_MAIN_CHK | 34 | #ifndef APM_IOC_BATTERY_MAIN_CHK |
31 | #define APM_IOC_BATTERY_MAIN_CHK _IO(APM_IOC_MAGIC, 33) | 35 | #define APM_IOC_BATTERY_MAIN_CHK _IO(APM_IOC_MAGIC, 33) |
32 | #endif | 36 | #endif |
33 | 37 | ||
34 | #include <unistd.h> | 38 | #include <unistd.h> |
35 | #include <stdio.h> | 39 | #include <stdio.h> |
36 | #include <signal.h> | 40 | #include <signal.h> |
37 | #include <fcntl.h> | 41 | #include <fcntl.h> |
38 | #include <sys/ioctl.h> | 42 | #include <sys/ioctl.h> |
39 | 43 | ||
40 | 44 | ||
41 | #include <sys/ioctl.h> | 45 | #include <sys/ioctl.h> |
42 | #include <asm/sharp_char.h> | 46 | #include <asm/sharp_char.h> |
43 | 47 | ||
44 | #define QPE_HAVE_MEMALERTER | 48 | #define QPE_HAVE_MEMALERTER |
45 | 49 | ||
46 | #define QPE_MEMALERTER_IMPL \ | 50 | #define QPE_MEMALERTER_IMPL \ |
47 | static void sig_handler(int sig) \ | 51 | static void sig_handler(int sig) \ |
48 | { \ | 52 | { \ |
49 | switch (sig) { \ | 53 | switch (sig) { \ |
50 | case SIGHUP: \ | 54 | case SIGHUP: \ |
51 | memstate = VeryLow; \ | 55 | memstate = VeryLow; \ |
52 | break; \ | 56 | break; \ |
53 | case SIGUSR1: \ | 57 | case SIGUSR1: \ |
54 | memstate = Normal; \ | 58 | memstate = Normal; \ |
55 | break; \ | 59 | break; \ |
56 | case SIGUSR2: \ | 60 | case SIGUSR2: \ |
57 | memstate = Low; \ | 61 | memstate = Low; \ |
58 | break; \ | 62 | break; \ |
59 | } \ | 63 | } \ |
60 | } \ | 64 | } \ |
61 | static void initMemalerter() \ | 65 | static void initMemalerter() \ |
62 | { \ | 66 | { \ |
63 | struct sigaction sa; \ | 67 | struct sigaction sa; \ |
64 | memset(&sa, '\0', sizeof sa); \ | 68 | memset(&sa, '\0', sizeof sa); \ |
65 | sa.sa_handler = sig_handler; \ | 69 | sa.sa_handler = sig_handler; \ |
66 | sa.sa_flags = SA_RESTART; \ | 70 | sa.sa_flags = SA_RESTART; \ |
67 | if (sigaction(SIGHUP, &sa, NULL) < 0) { \ | 71 | if (sigaction(SIGHUP, &sa, NULL) < 0) { \ |
68 | return; \ | 72 | return; \ |
69 | } \ | 73 | } \ |
70 | if (sigaction(SIGUSR1, &sa, NULL) < 0) { \ | 74 | if (sigaction(SIGUSR1, &sa, NULL) < 0) { \ |
71 | return; \ | 75 | return; \ |
72 | } \ | 76 | } \ |
73 | if (sigaction(SIGUSR2, &sa, NULL) < 0) { \ | 77 | if (sigaction(SIGUSR2, &sa, NULL) < 0) { \ |
diff --git a/library/custom-simpad.h b/library/custom-simpad.h index 3872dfd..c951296 100644 --- a/library/custom-simpad.h +++ b/library/custom-simpad.h | |||
@@ -1,7 +1,9 @@ | |||
1 | /* | 1 | /* |
2 | * GPLv2 only zecke@handhelds.org | 2 | * GPLv2 only zecke@handhelds.org |
3 | hOlgAr | 3 | hOlgAr |
4 | */ | 4 | */ |
5 | 5 | ||
6 | 6 | ||
7 | #define QPE_NEED_CALIBRATION \ No newline at end of file | 7 | #define QPE_NEED_CALIBRATION |
8 | #define OPIE_NEW_MALLOC | ||
9 | #define USE_REALTIME_AUDIO_THREAD | ||
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index feba8b6..cd1c62e 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -122,97 +122,97 @@ public: | |||
122 | QString appName; | 122 | QString appName; |
123 | struct QCopRec | 123 | struct QCopRec |
124 | { | 124 | { |
125 | QCopRec( const QCString &ch, const QCString &msg, | 125 | QCopRec( const QCString &ch, const QCString &msg, |
126 | const QByteArray &d ) : | 126 | const QByteArray &d ) : |
127 | channel( ch ), message( msg ), data( d ) | 127 | channel( ch ), message( msg ), data( d ) |
128 | { } | 128 | { } |
129 | 129 | ||
130 | QCString channel; | 130 | QCString channel; |
131 | QCString message; | 131 | QCString message; |
132 | QByteArray data; | 132 | QByteArray data; |
133 | }; | 133 | }; |
134 | QWidget* qpe_main_widget; | 134 | QWidget* qpe_main_widget; |
135 | QGuardedPtr<QWidget> lastraised; | 135 | QGuardedPtr<QWidget> lastraised; |
136 | QQueue<QCopRec> qcopq; | 136 | QQueue<QCopRec> qcopq; |
137 | QString styleName; | 137 | QString styleName; |
138 | QString decorationName; | 138 | QString decorationName; |
139 | 139 | ||
140 | void enqueueQCop( const QCString &ch, const QCString &msg, | 140 | void enqueueQCop( const QCString &ch, const QCString &msg, |
141 | const QByteArray &data ) | 141 | const QByteArray &data ) |
142 | { | 142 | { |
143 | qcopq.enqueue( new QCopRec( ch, msg, data ) ); | 143 | qcopq.enqueue( new QCopRec( ch, msg, data ) ); |
144 | } | 144 | } |
145 | void sendQCopQ() | 145 | void sendQCopQ() |
146 | { | 146 | { |
147 | if (!qcopQok ) | 147 | if (!qcopQok ) |
148 | return; | 148 | return; |
149 | 149 | ||
150 | QCopRec * r; | 150 | QCopRec * r; |
151 | 151 | ||
152 | while((r=qcopq.dequeue())) { | 152 | while((r=qcopq.dequeue())) { |
153 | // remove from queue before sending... | 153 | // remove from queue before sending... |
154 | // event loop can come around again before getting | 154 | // event loop can come around again before getting |
155 | // back from sendLocally | 155 | // back from sendLocally |
156 | #ifndef QT_NO_COP | 156 | #ifndef QT_NO_COP |
157 | QCopChannel::sendLocally( r->channel, r->message, r->data ); | 157 | QCopChannel::sendLocally( r->channel, r->message, r->data ); |
158 | #endif | 158 | #endif |
159 | 159 | ||
160 | delete r; | 160 | delete r; |
161 | } | 161 | } |
162 | } | 162 | } |
163 | static void show_mx(QWidget* mw, bool nomaximize, const QString & = QString::null ) | 163 | static void show_mx(QWidget* mw, bool nomaximize, const QString & = QString::null ) |
164 | { | 164 | { |
165 | 165 | ||
166 | // ugly hack, remove that later after finding a sane solution | 166 | // ugly hack, remove that later after finding a sane solution |
167 | // Addendum: Only Sharp currently has models with high resolution but (physically) small displays, | 167 | // Addendum: Only Sharp currently has models with high resolution but (physically) small displays, |
168 | // so this is only useful if QT_QWS_SIMPAD is NOT defined. E.g. SIMpad has 800x600 but has | 168 | // so this is only useful if QT_QWS_SIMPAD is NOT defined. E.g. SIMpad has 800x600 but has |
169 | // a (physically) large enough display to use the small icons | 169 | // a (physically) large enough display to use the small icons |
170 | #ifndef QT_QWS_SIMPAD | 170 | #if defined(OPIE_HIGH_RES_SMALL_PHY) |
171 | if ( QPEApplication::desktop() ->width() >= 600 && ( mw->inherits("QMainWindow") || mw->isA("QMainWindow") ) ) { | 171 | if ( QPEApplication::desktop() ->width() >= 600 && ( mw->inherits("QMainWindow") || mw->isA("QMainWindow") ) ) { |
172 | ( ( QMainWindow* ) mw )->setUsesBigPixmaps( true ); | 172 | ( ( QMainWindow* ) mw )->setUsesBigPixmaps( true ); |
173 | } | 173 | } |
174 | #endif | 174 | #endif |
175 | 175 | ||
176 | if ( mw->layout() && mw->inherits("QDialog") ) { | 176 | if ( mw->layout() && mw->inherits("QDialog") ) { |
177 | QPEApplication::showDialog((QDialog*)mw, nomaximize); | 177 | QPEApplication::showDialog((QDialog*)mw, nomaximize); |
178 | } | 178 | } |
179 | else { | 179 | else { |
180 | #ifdef Q_WS_QWS | 180 | #ifdef Q_WS_QWS |
181 | if ( !nomaximize ) | 181 | if ( !nomaximize ) |
182 | mw->showMaximized(); | 182 | mw->showMaximized(); |
183 | else | 183 | else |
184 | #endif | 184 | #endif |
185 | 185 | ||
186 | mw->show(); | 186 | mw->show(); |
187 | } | 187 | } |
188 | } | 188 | } |
189 | static bool setWidgetCaptionFromAppName( QWidget* /*mw*/, const QString& /*appName*/, const QString& /*appsPath*/ ) | 189 | static bool setWidgetCaptionFromAppName( QWidget* /*mw*/, const QString& /*appName*/, const QString& /*appsPath*/ ) |
190 | { | 190 | { |
191 | /* | 191 | /* |
192 | // This works but disable it for now until it is safe to apply | 192 | // This works but disable it for now until it is safe to apply |
193 | // What is does is scan the .desktop files of all the apps for | 193 | // What is does is scan the .desktop files of all the apps for |
194 | // the applnk that has the corresponding argv[0] as this program | 194 | // the applnk that has the corresponding argv[0] as this program |
195 | // then it uses the name stored in the .desktop file as the caption | 195 | // then it uses the name stored in the .desktop file as the caption |
196 | // for the main widget. This saves duplicating translations for | 196 | // for the main widget. This saves duplicating translations for |
197 | // the app name in the program and in the .desktop files. | 197 | // the app name in the program and in the .desktop files. |
198 | 198 | ||
199 | AppLnkSet apps( appsPath ); | 199 | AppLnkSet apps( appsPath ); |
200 | 200 | ||
201 | QList<AppLnk> appsList = apps.children(); | 201 | QList<AppLnk> appsList = apps.children(); |
202 | for ( QListIterator<AppLnk> it(appsList); it.current(); ++it ) { | 202 | for ( QListIterator<AppLnk> it(appsList); it.current(); ++it ) { |
203 | if ( (*it)->exec() == appName ) { | 203 | if ( (*it)->exec() == appName ) { |
204 | mw->setCaption( (*it)->name() ); | 204 | mw->setCaption( (*it)->name() ); |
205 | return TRUE; | 205 | return TRUE; |
206 | } | 206 | } |
207 | } | 207 | } |
208 | */ | 208 | */ |
209 | return FALSE; | 209 | return FALSE; |
210 | } | 210 | } |
211 | 211 | ||
212 | 212 | ||
213 | void show(QWidget* mw, bool nomax) | 213 | void show(QWidget* mw, bool nomax) |
214 | { | 214 | { |
215 | setWidgetCaptionFromAppName( mw, appName, QPEApplication::qpeDir() + "apps" ); | 215 | setWidgetCaptionFromAppName( mw, appName, QPEApplication::qpeDir() + "apps" ); |
216 | nomaximize = nomax; | 216 | nomaximize = nomax; |
217 | qpe_main_widget = mw; | 217 | qpe_main_widget = mw; |
218 | qcopQok = TRUE; | 218 | qcopQok = TRUE; |
@@ -545,100 +545,100 @@ void QPEApplication::processQCopFile() | |||
545 | This signal is emitted when a message is received on this | 545 | This signal is emitted when a message is received on this |
546 | application's QPE/Application/<i>appname</i> \link qcop.html | 546 | application's QPE/Application/<i>appname</i> \link qcop.html |
547 | QCop\endlink channel. | 547 | QCop\endlink channel. |
548 | 548 | ||
549 | The slot to which you connect this signal uses \a msg and \a data | 549 | The slot to which you connect this signal uses \a msg and \a data |
550 | in the following way: | 550 | in the following way: |
551 | 551 | ||
552 | \code | 552 | \code |
553 | void MyWidget::receive( const QCString& msg, const QByteArray& data ) | 553 | void MyWidget::receive( const QCString& msg, const QByteArray& data ) |
554 | { | 554 | { |
555 | QDataStream stream( data, IO_ReadOnly ); | 555 | QDataStream stream( data, IO_ReadOnly ); |
556 | if ( msg == "someMessage(int,int,int)" ) { | 556 | if ( msg == "someMessage(int,int,int)" ) { |
557 | int a,b,c; | 557 | int a,b,c; |
558 | stream >> a >> b >> c; | 558 | stream >> a >> b >> c; |
559 | ... | 559 | ... |
560 | } else if ( msg == "otherMessage(QString)" ) { | 560 | } else if ( msg == "otherMessage(QString)" ) { |
561 | ... | 561 | ... |
562 | } | 562 | } |
563 | } | 563 | } |
564 | \endcode | 564 | \endcode |
565 | 565 | ||
566 | \sa qcop.html | 566 | \sa qcop.html |
567 | Note that messages received here may be processed by qpe application | 567 | Note that messages received here may be processed by qpe application |
568 | and emitted as signals, such as flush() and reload(). | 568 | and emitted as signals, such as flush() and reload(). |
569 | */ | 569 | */ |
570 | 570 | ||
571 | /*! | 571 | /*! |
572 | Constructs a QPEApplication just as you would construct | 572 | Constructs a QPEApplication just as you would construct |
573 | a QApplication, passing \a argc, \a argv, and \a t. | 573 | a QApplication, passing \a argc, \a argv, and \a t. |
574 | 574 | ||
575 | For applications, \a t should be the default, GuiClient. Only | 575 | For applications, \a t should be the default, GuiClient. Only |
576 | the Qtopia server passes GuiServer. | 576 | the Qtopia server passes GuiServer. |
577 | */ | 577 | */ |
578 | QPEApplication::QPEApplication( int & argc, char **argv, Type t ) | 578 | QPEApplication::QPEApplication( int & argc, char **argv, Type t ) |
579 | : QApplication( hack(argc), argv, t ), pidChannel( 0 ) | 579 | : QApplication( hack(argc), argv, t ), pidChannel( 0 ) |
580 | { | 580 | { |
581 | QPixmapCache::setCacheLimit(256); // sensible default for smaller devices. | 581 | QPixmapCache::setCacheLimit(256); // sensible default for smaller devices. |
582 | 582 | ||
583 | d = new QPEApplicationData; | 583 | d = new QPEApplicationData; |
584 | d->loadTextCodecs(); | 584 | d->loadTextCodecs(); |
585 | d->loadImageCodecs(); | 585 | d->loadImageCodecs(); |
586 | int dw = desktop() ->width(); | 586 | int dw = desktop() ->width(); |
587 | 587 | ||
588 | if ( dw < 200 ) { | 588 | if ( dw < 200 ) { |
589 | setFont( QFont( "vera", 8 ) ); | 589 | setFont( QFont( "vera", 8 ) ); |
590 | AppLnk::setSmallIconSize( 10 ); | 590 | AppLnk::setSmallIconSize( 10 ); |
591 | AppLnk::setBigIconSize( 28 ); | 591 | AppLnk::setBigIconSize( 28 ); |
592 | } | 592 | } |
593 | #ifndef QT_QWS_SIMPAD | 593 | #ifndef OPIE_HIGH_RES_SMALL_PHY |
594 | else if ( dw > 600 ) { | 594 | else if ( dw > 600 ) { |
595 | setFont( QFont( "vera", 16 ) ); | 595 | setFont( QFont( "vera", 16 ) ); |
596 | AppLnk::setSmallIconSize( 24 ); | 596 | AppLnk::setSmallIconSize( 24 ); |
597 | AppLnk::setBigIconSize( 48 ); | 597 | AppLnk::setBigIconSize( 48 ); |
598 | } | 598 | } |
599 | #endif | 599 | #endif |
600 | else if ( dw > 200 ) { | 600 | else if ( dw > 200 ) { |
601 | setFont( QFont( "vera", 10 ) ); | 601 | setFont( QFont( "vera", 10 ) ); |
602 | AppLnk::setSmallIconSize( 14 ); | 602 | AppLnk::setSmallIconSize( 14 ); |
603 | AppLnk::setBigIconSize( 32 ); | 603 | AppLnk::setBigIconSize( 32 ); |
604 | } | 604 | } |
605 | 605 | ||
606 | QMimeSourceFactory::setDefaultFactory( new ResourceMimeFactory ); | 606 | QMimeSourceFactory::setDefaultFactory( new ResourceMimeFactory ); |
607 | 607 | ||
608 | connect( this, SIGNAL( lastWindowClosed() ), this, SLOT( hideOrQuit() ) ); | 608 | connect( this, SIGNAL( lastWindowClosed() ), this, SLOT( hideOrQuit() ) ); |
609 | 609 | ||
610 | 610 | ||
611 | sysChannel = new QCopChannel( "QPE/System", this ); | 611 | sysChannel = new QCopChannel( "QPE/System", this ); |
612 | connect( sysChannel, SIGNAL( received( const QCString &, const QByteArray & ) ), | 612 | connect( sysChannel, SIGNAL( received( const QCString &, const QByteArray & ) ), |
613 | this, SLOT( systemMessage( const QCString &, const QByteArray & ) ) ); | 613 | this, SLOT( systemMessage( const QCString &, const QByteArray & ) ) ); |
614 | 614 | ||
615 | /* COde now in initapp */ | 615 | /* COde now in initapp */ |
616 | #if 0 | 616 | #if 0 |
617 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 617 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
618 | 618 | ||
619 | QString qcopfn( "/tmp/qcop-msg-" ); | 619 | QString qcopfn( "/tmp/qcop-msg-" ); |
620 | qcopfn += QString( argv[ 0 ] ); // append command name | 620 | qcopfn += QString( argv[ 0 ] ); // append command name |
621 | 621 | ||
622 | QFile f( qcopfn ); | 622 | QFile f( qcopfn ); |
623 | if ( f.open( IO_ReadOnly ) ) { | 623 | if ( f.open( IO_ReadOnly ) ) { |
624 | flock( f.handle(), LOCK_EX ); | 624 | flock( f.handle(), LOCK_EX ); |
625 | } | 625 | } |
626 | 626 | ||
627 | 627 | ||
628 | 628 | ||
629 | QCString channel = QCString( argv[ 0 ] ); | 629 | QCString channel = QCString( argv[ 0 ] ); |
630 | channel.replace( QRegExp( ".*/" ), "" ); | 630 | channel.replace( QRegExp( ".*/" ), "" ); |
631 | d->appName = channel; | 631 | d->appName = channel; |
632 | channel = "QPE/Application/" + channel; | 632 | channel = "QPE/Application/" + channel; |
633 | pidChannel = new QCopChannel( channel, this ); | 633 | pidChannel = new QCopChannel( channel, this ); |
634 | connect( pidChannel, SIGNAL( received( const QCString &, const QByteArray & ) ), | 634 | connect( pidChannel, SIGNAL( received( const QCString &, const QByteArray & ) ), |
635 | this, SLOT( pidMessage( const QCString &, const QByteArray & ) ) ); | 635 | this, SLOT( pidMessage( const QCString &, const QByteArray & ) ) ); |
636 | 636 | ||
637 | if ( f.isOpen() ) { | 637 | if ( f.isOpen() ) { |
638 | d->keep_running = FALSE; | 638 | d->keep_running = FALSE; |
639 | QDataStream ds( &f ); | 639 | QDataStream ds( &f ); |
640 | QCString channel, message; | 640 | QCString channel, message; |
641 | QByteArray data; | 641 | QByteArray data; |
642 | while ( !ds.atEnd() ) { | 642 | while ( !ds.atEnd() ) { |
643 | ds >> channel >> message >> data; | 643 | ds >> channel >> message >> data; |
644 | d->enqueueQCop( channel, message, data ); | 644 | d->enqueueQCop( channel, message, data ); |
@@ -1963,97 +1963,97 @@ void QPEApplication::tryQuit() | |||
1963 | */ | 1963 | */ |
1964 | void QPEApplication::installTranslation( const QString& baseName ) { | 1964 | void QPEApplication::installTranslation( const QString& baseName ) { |
1965 | QTranslator* trans = new QTranslator(this); | 1965 | QTranslator* trans = new QTranslator(this); |
1966 | QString tfn = qpeDir() + "/i18n/"+baseName; | 1966 | QString tfn = qpeDir() + "/i18n/"+baseName; |
1967 | if ( trans->load( tfn ) ) | 1967 | if ( trans->load( tfn ) ) |
1968 | installTranslator( trans ); | 1968 | installTranslator( trans ); |
1969 | else | 1969 | else |
1970 | delete trans; | 1970 | delete trans; |
1971 | } | 1971 | } |
1972 | 1972 | ||
1973 | /*! | 1973 | /*! |
1974 | \internal | 1974 | \internal |
1975 | User initiated quit. Makes the window 'Go Away'. If preloaded this means | 1975 | User initiated quit. Makes the window 'Go Away'. If preloaded this means |
1976 | hiding the window. If not it means quitting the application. | 1976 | hiding the window. If not it means quitting the application. |
1977 | As this is user initiated we don't need to check state. | 1977 | As this is user initiated we don't need to check state. |
1978 | */ | 1978 | */ |
1979 | void QPEApplication::hideOrQuit() | 1979 | void QPEApplication::hideOrQuit() |
1980 | { | 1980 | { |
1981 | processEvents(); | 1981 | processEvents(); |
1982 | 1982 | ||
1983 | // If we are a preloaded application we don't actually quit, so emit | 1983 | // If we are a preloaded application we don't actually quit, so emit |
1984 | // a System message indicating we're quasi-closing. | 1984 | // a System message indicating we're quasi-closing. |
1985 | if ( d->preloaded && d->qpe_main_widget ) | 1985 | if ( d->preloaded && d->qpe_main_widget ) |
1986 | #ifndef QT_NO_COP | 1986 | #ifndef QT_NO_COP |
1987 | 1987 | ||
1988 | { | 1988 | { |
1989 | QCopEnvelope e("QPE/System", "fastAppHiding(QString)" ); | 1989 | QCopEnvelope e("QPE/System", "fastAppHiding(QString)" ); |
1990 | e << d->appName; | 1990 | e << d->appName; |
1991 | d->qpe_main_widget->hide(); | 1991 | d->qpe_main_widget->hide(); |
1992 | } | 1992 | } |
1993 | #endif | 1993 | #endif |
1994 | else | 1994 | else |
1995 | quit(); | 1995 | quit(); |
1996 | } | 1996 | } |
1997 | 1997 | ||
1998 | #if (__GNUC__ > 2 ) | 1998 | #if (__GNUC__ > 2 ) |
1999 | extern "C" void __cxa_pure_virtual(); | 1999 | extern "C" void __cxa_pure_virtual(); |
2000 | 2000 | ||
2001 | void __cxa_pure_virtual() | 2001 | void __cxa_pure_virtual() |
2002 | { | 2002 | { |
2003 | fprintf( stderr, "Pure virtual called\n"); | 2003 | fprintf( stderr, "Pure virtual called\n"); |
2004 | abort(); | 2004 | abort(); |
2005 | 2005 | ||
2006 | } | 2006 | } |
2007 | 2007 | ||
2008 | #endif | 2008 | #endif |
2009 | 2009 | ||
2010 | 2010 | ||
2011 | #if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_RAMSES) | 2011 | #if defined(OPIE_NEW_MALLOC) |
2012 | 2012 | ||
2013 | // The libraries with the skiff package (and possibly others) have | 2013 | // The libraries with the skiff package (and possibly others) have |
2014 | // completely useless implementations of builtin new and delete that | 2014 | // completely useless implementations of builtin new and delete that |
2015 | // use about 50% of your CPU. Here we revert to the simple libc | 2015 | // use about 50% of your CPU. Here we revert to the simple libc |
2016 | // functions. | 2016 | // functions. |
2017 | 2017 | ||
2018 | void* operator new[]( size_t size ) | 2018 | void* operator new[]( size_t size ) |
2019 | { | 2019 | { |
2020 | return malloc( size ); | 2020 | return malloc( size ); |
2021 | } | 2021 | } |
2022 | 2022 | ||
2023 | void* operator new( size_t size ) | 2023 | void* operator new( size_t size ) |
2024 | { | 2024 | { |
2025 | return malloc( size ); | 2025 | return malloc( size ); |
2026 | } | 2026 | } |
2027 | 2027 | ||
2028 | void operator delete[]( void* p ) | 2028 | void operator delete[]( void* p ) |
2029 | { | 2029 | { |
2030 | free( p ); | 2030 | free( p ); |
2031 | } | 2031 | } |
2032 | 2032 | ||
2033 | void operator delete[]( void* p, size_t /*size*/ ) | 2033 | void operator delete[]( void* p, size_t /*size*/ ) |
2034 | { | 2034 | { |
2035 | free( p ); | 2035 | free( p ); |
2036 | } | 2036 | } |
2037 | 2037 | ||
2038 | 2038 | ||
2039 | void operator delete( void* p ) | 2039 | void operator delete( void* p ) |
2040 | { | 2040 | { |
2041 | free( p ); | 2041 | free( p ); |
2042 | } | 2042 | } |
2043 | 2043 | ||
2044 | void operator delete( void* p, size_t /*size*/ ) | 2044 | void operator delete( void* p, size_t /*size*/ ) |
2045 | { | 2045 | { |
2046 | free( p ); | 2046 | free( p ); |
2047 | } | 2047 | } |
2048 | 2048 | ||
2049 | #endif | 2049 | #endif |
2050 | 2050 | ||
2051 | #if ( QT_VERSION <= 230 ) && !defined(SINGLE_APP) | 2051 | #if ( QT_VERSION <= 230 ) && !defined(SINGLE_APP) |
2052 | #include <qwidgetlist.h> | 2052 | #include <qwidgetlist.h> |
2053 | #ifdef QWS | 2053 | #ifdef QWS |
2054 | #include <qgfx_qws.h> | 2054 | #include <qgfx_qws.h> |
2055 | extern QRect qt_maxWindowRect; | 2055 | extern QRect qt_maxWindowRect; |
2056 | void qt_setMaxWindowRect(const QRect& r ) | 2056 | void qt_setMaxWindowRect(const QRect& r ) |
2057 | { | 2057 | { |
2058 | qt_maxWindowRect = qt_screen->mapFromDevice( r, | 2058 | qt_maxWindowRect = qt_screen->mapFromDevice( r, |
2059 | qt_screen->mapToDevice( QSize( qt_screen->width(), qt_screen->height() ) ) ); | 2059 | qt_screen->mapToDevice( QSize( qt_screen->width(), qt_screen->height() ) ) ); |
diff --git a/library/storage.cpp b/library/storage.cpp index 1ce43bc..dc5cc22 100644 --- a/library/storage.cpp +++ b/library/storage.cpp | |||
@@ -1,74 +1,72 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) Holger 'zecke' Freyther <freyther@kde.org> | 2 | ** Copyright (C) Holger 'zecke' Freyther <freyther@kde.org> |
3 | ** Copyright (C) Lorn Potter <llornkcor@handhelds.org> | 3 | ** Copyright (C) Lorn Potter <llornkcor@handhelds.org> |
4 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 4 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
5 | ** | 5 | ** |
6 | ** This file is part of Opie Environment. | 6 | ** This file is part of Opie Environment. |
7 | ** | 7 | ** |
8 | ** This file may be distributed and/or modified under the terms of the | 8 | ** This file may be distributed and/or modified under the terms of the |
9 | ** GNU General Public License version 2 as published by the Free Software | 9 | ** GNU General Public License version 2 as published by the Free Software |
10 | ** Foundation and appearing in the file LICENSE.GPL included in the | 10 | ** Foundation and appearing in the file LICENSE.GPL included in the |
11 | ** packaging of this file. | 11 | ** packaging of this file. |
12 | ** | 12 | ** |
13 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 13 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
14 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 14 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
15 | ** | 15 | ** |
16 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 16 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
17 | ** | 17 | ** |
18 | ** Contact info@trolltech.com if any conditions of this licensing are | 18 | ** Contact info@trolltech.com if any conditions of this licensing are |
19 | ** not clear to you. | 19 | ** not clear to you. |
20 | ** | 20 | ** |
21 | **********************************************************************/ | 21 | **********************************************************************/ |
22 | 22 | ||
23 | #include <qpe/storage.h> | 23 | #include <qpe/storage.h> |
24 | #if defined(QT_QWS_SL5XXX) | ||
25 | #include <qpe/custom.h> | 24 | #include <qpe/custom.h> |
26 | #endif | ||
27 | 25 | ||
28 | #include <qfile.h> | 26 | #include <qfile.h> |
29 | #include <qtimer.h> | 27 | #include <qtimer.h> |
30 | #include <qcopchannel_qws.h> | 28 | #include <qcopchannel_qws.h> |
31 | 29 | ||
32 | #include <stdio.h> | 30 | #include <stdio.h> |
33 | 31 | ||
34 | #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) | 32 | #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) |
35 | #include <sys/vfs.h> | 33 | #include <sys/vfs.h> |
36 | #include <mntent.h> | 34 | #include <mntent.h> |
37 | #endif | 35 | #endif |
38 | 36 | ||
39 | #include <qstringlist.h> | 37 | #include <qstringlist.h> |
40 | 38 | ||
41 | #include <sys/vfs.h> | 39 | #include <sys/vfs.h> |
42 | #include <mntent.h> | 40 | #include <mntent.h> |
43 | 41 | ||
44 | 42 | ||
45 | static bool isCF(const QString& m) | 43 | static bool isCF(const QString& m) |
46 | { | 44 | { |
47 | FILE* f = fopen("/var/run/stab", "r"); | 45 | FILE* f = fopen("/var/run/stab", "r"); |
48 | if (!f) f = fopen("/var/state/pcmcia/stab", "r"); | 46 | if (!f) f = fopen("/var/state/pcmcia/stab", "r"); |
49 | if (!f) f = fopen("/var/lib/pcmcia/stab", "r"); | 47 | if (!f) f = fopen("/var/lib/pcmcia/stab", "r"); |
50 | if ( f ) { | 48 | if ( f ) { |
51 | char line[1024]; | 49 | char line[1024]; |
52 | char devtype[80]; | 50 | char devtype[80]; |
53 | char devname[80]; | 51 | char devname[80]; |
54 | while ( fgets( line, 1024, f ) ) { | 52 | while ( fgets( line, 1024, f ) ) { |
55 | // 0 ide ide-cs 0 hda 3 0 | 53 | // 0 ide ide-cs 0 hda 3 0 |
56 | if ( sscanf(line,"%*d %s %*s %*s %s", devtype, devname )==2 ) | 54 | if ( sscanf(line,"%*d %s %*s %*s %s", devtype, devname )==2 ) |
57 | { | 55 | { |
58 | if ( QString(devtype) == "ide" && m.find(devname)>0 ) { | 56 | if ( QString(devtype) == "ide" && m.find(devname)>0 ) { |
59 | fclose(f); | 57 | fclose(f); |
60 | return TRUE; | 58 | return TRUE; |
61 | } | 59 | } |
62 | } | 60 | } |
63 | } | 61 | } |
64 | fclose(f); | 62 | fclose(f); |
65 | } | 63 | } |
66 | return FALSE; | 64 | return FALSE; |
67 | } | 65 | } |
68 | 66 | ||
69 | /*! \class StorageInfo storage.h | 67 | /*! \class StorageInfo storage.h |
70 | \brief The StorageInfo class describes the disks mounted on the file system. | 68 | \brief The StorageInfo class describes the disks mounted on the file system. |
71 | 69 | ||
72 | This class provides access to the mount information for the Linux | 70 | This class provides access to the mount information for the Linux |
73 | filesystem. Each mount point is represented by the FileSystem class. | 71 | filesystem. Each mount point is represented by the FileSystem class. |
74 | To ensure this class has the most up to date size information, call | 72 | To ensure this class has the most up to date size information, call |