author | erik <erik> | 2007-01-19 01:15:31 (UTC) |
---|---|---|
committer | erik <erik> | 2007-01-19 01:15:31 (UTC) |
commit | ac0ce844e90a64247c0adb210e0a23021b011d57 (patch) (unidiff) | |
tree | 1fd3b8d0c24d8f2054ed45e7e2e102f940343462 | |
parent | 1ab92f1d2b346de7da8ca5c3aaa6bc75b43981e7 (diff) | |
download | opie-ac0ce844e90a64247c0adb210e0a23021b011d57.zip opie-ac0ce844e90a64247c0adb210e0a23021b011d57.tar.gz opie-ac0ce844e90a64247c0adb210e0a23021b011d57.tar.bz2 |
Commit of Paul's patch to remove a macro and substitute it with a
class variable.
-rw-r--r-- | library/qpeapplication.cpp | 16 | ||||
-rw-r--r-- | library/qpeapplication.h | 2 | ||||
-rw-r--r-- | library/widget_showing.cpp | 9 |
3 files changed, 15 insertions, 12 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index dcc1001..34f5e6a 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -56,124 +56,126 @@ | |||
56 | #include <qpixmapcache.h> | 56 | #include <qpixmapcache.h> |
57 | 57 | ||
58 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 58 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
59 | #define QTOPIA_INTERNAL_INITAPP | 59 | #define QTOPIA_INTERNAL_INITAPP |
60 | #include "qpeapplication.h" | 60 | #include "qpeapplication.h" |
61 | #include "qpestyle.h" | 61 | #include "qpestyle.h" |
62 | #include "styleinterface.h" | 62 | #include "styleinterface.h" |
63 | #if QT_VERSION >= 0x030000 | 63 | #if QT_VERSION >= 0x030000 |
64 | #include <qstylefactory.h> | 64 | #include <qstylefactory.h> |
65 | #else | 65 | #else |
66 | #include <qplatinumstyle.h> | 66 | #include <qplatinumstyle.h> |
67 | #include <qwindowsstyle.h> | 67 | #include <qwindowsstyle.h> |
68 | #include <qmotifstyle.h> | 68 | #include <qmotifstyle.h> |
69 | #include <qmotifplusstyle.h> | 69 | #include <qmotifplusstyle.h> |
70 | #include "lightstyle.h" | 70 | #include "lightstyle.h" |
71 | 71 | ||
72 | #include <qpe/qlibrary.h> | 72 | #include <qpe/qlibrary.h> |
73 | #endif | 73 | #endif |
74 | #include "global.h" | 74 | #include "global.h" |
75 | #include "resource.h" | 75 | #include "resource.h" |
76 | #if QT_VERSION <= 230 && defined(QT_NO_CODECS) | 76 | #if QT_VERSION <= 230 && defined(QT_NO_CODECS) |
77 | #include "qutfcodec.h" | 77 | #include "qutfcodec.h" |
78 | #endif | 78 | #endif |
79 | #include "config.h" | 79 | #include "config.h" |
80 | #include "network.h" | 80 | #include "network.h" |
81 | #ifdef QWS | 81 | #ifdef QWS |
82 | #include "fontmanager.h" | 82 | #include "fontmanager.h" |
83 | #include "fontdatabase.h" | 83 | #include "fontdatabase.h" |
84 | #endif | 84 | #endif |
85 | 85 | ||
86 | #include "alarmserver.h" | 86 | #include "alarmserver.h" |
87 | #include "applnk.h" | 87 | #include "applnk.h" |
88 | #include "qpemenubar.h" | 88 | #include "qpemenubar.h" |
89 | #include "textcodecinterface.h" | 89 | #include "textcodecinterface.h" |
90 | #include "imagecodecinterface.h" | 90 | #include "imagecodecinterface.h" |
91 | #include <qtopia/qpeglobal.h> | 91 | #include <qtopia/qpeglobal.h> |
92 | 92 | ||
93 | #include <unistd.h> | 93 | #include <unistd.h> |
94 | #include <sys/file.h> | 94 | #include <sys/file.h> |
95 | #include <sys/ioctl.h> | 95 | #include <sys/ioctl.h> |
96 | #ifndef QT_NO_SOUND | 96 | #ifndef QT_NO_SOUND |
97 | #include <sys/soundcard.h> | 97 | #include <sys/soundcard.h> |
98 | #endif | 98 | #endif |
99 | 99 | ||
100 | #include <backend/rohfeedback.h> | 100 | #include <backend/rohfeedback.h> |
101 | 101 | ||
102 | 102 | ||
103 | static bool useBigPixmaps = 0; | 103 | static bool useBigPixmaps = 0; |
104 | static bool saveWindowsPos = 0; | ||
104 | 105 | ||
105 | class HackWidget : public QWidget | 106 | class HackWidget : public QWidget |
106 | { | 107 | { |
107 | public: | 108 | public: |
108 | bool needsOk() | 109 | bool needsOk() |
109 | { return (getWState() & WState_Reserved1 ); } | 110 | { return (getWState() & WState_Reserved1 ); } |
110 | 111 | ||
111 | QRect normalGeometry() | 112 | QRect normalGeometry() |
112 | { return topData()->normalGeometry; }; | 113 | { return topData()->normalGeometry; }; |
113 | }; | 114 | }; |
114 | 115 | ||
115 | class QPEApplicationData | 116 | class QPEApplicationData |
116 | { | 117 | { |
117 | public: | 118 | public: |
118 | QPEApplicationData ( ) : | 119 | QPEApplicationData ( ) : |
119 | presstimer( 0 ), presswidget( 0 ), rightpressed( false ), kbgrabbed( false ), | 120 | presstimer( 0 ), presswidget( 0 ), rightpressed( false ), kbgrabbed( false ), |
120 | notbusysent( false ), preloaded( false ), forceshow( false ), nomaximize( false ), | 121 | notbusysent( false ), preloaded( false ), forceshow( false ), nomaximize( false ), |
121 | keep_running( true ), qcopQok( false ), | 122 | keep_running( true ), qcopQok( false ), |
122 | fontFamily( "Vera" ), fontSize( 10 ), smallIconSize( 14 ), | 123 | fontFamily( "Vera" ), fontSize( 10 ), smallIconSize( 14 ), |
123 | bigIconSize( 32 ), qpe_main_widget( 0 ) | 124 | bigIconSize( 32 ), qpe_main_widget( 0 ) |
124 | { | 125 | { |
125 | Config cfg( "qpe" ); | 126 | Config cfg( "qpe" ); |
126 | cfg.setGroup( "Appearance" ); | 127 | cfg.setGroup( "Appearance" ); |
127 | useBigPixmaps = cfg.readBoolEntry( "useBigPixmaps", false ); | 128 | useBigPixmaps = cfg.readBoolEntry( "useBigPixmaps", false ); |
128 | fontFamily = cfg.readEntry( "FontFamily", "Vera" ); | 129 | fontFamily = cfg.readEntry( "FontFamily", "Vera" ); |
129 | fontSize = cfg.readNumEntry( "FontSize", 10 ); | 130 | fontSize = cfg.readNumEntry( "FontSize", 10 ); |
130 | smallIconSize = cfg.readNumEntry( "SmallIconSize", 14 ); | 131 | smallIconSize = cfg.readNumEntry( "SmallIconSize", 14 ); |
131 | bigIconSize = cfg.readNumEntry( "BigIconSize", 32 ); | 132 | bigIconSize = cfg.readNumEntry( "BigIconSize", 32 ); |
133 | saveWindowsPos = cfg.readBoolEntry( "AllowWindowed", false ); | ||
132 | #ifdef OPIE_WITHROHFEEDBACK | 134 | #ifdef OPIE_WITHROHFEEDBACK |
133 | RoH = 0; | 135 | RoH = 0; |
134 | #endif | 136 | #endif |
135 | } | 137 | } |
136 | 138 | ||
137 | int presstimer; | 139 | int presstimer; |
138 | QWidget* presswidget; | 140 | QWidget* presswidget; |
139 | QPoint presspos; | 141 | QPoint presspos; |
140 | #ifdef OPIE_WITHROHFEEDBACK | 142 | #ifdef OPIE_WITHROHFEEDBACK |
141 | Opie::Internal::RoHFeedback *RoH; | 143 | Opie::Internal::RoHFeedback *RoH; |
142 | #endif | 144 | #endif |
143 | 145 | ||
144 | bool rightpressed : 1; | 146 | bool rightpressed : 1; |
145 | bool kbgrabbed : 1; | 147 | bool kbgrabbed : 1; |
146 | bool notbusysent : 1; | 148 | bool notbusysent : 1; |
147 | bool preloaded : 1; | 149 | bool preloaded : 1; |
148 | bool forceshow : 1; | 150 | bool forceshow : 1; |
149 | bool nomaximize : 1; | 151 | bool nomaximize : 1; |
150 | bool keep_running : 1; | 152 | bool keep_running : 1; |
151 | bool qcopQok : 1; | 153 | bool qcopQok : 1; |
152 | 154 | ||
153 | QCString fontFamily; | 155 | QCString fontFamily; |
154 | int fontSize; | 156 | int fontSize; |
155 | int smallIconSize; | 157 | int smallIconSize; |
156 | int bigIconSize; | 158 | int bigIconSize; |
157 | 159 | ||
158 | QString appName; | 160 | QString appName; |
159 | struct QCopRec | 161 | struct QCopRec |
160 | { | 162 | { |
161 | QCopRec( const QCString &ch, const QCString &msg, | 163 | QCopRec( const QCString &ch, const QCString &msg, |
162 | const QByteArray &d ) : | 164 | const QByteArray &d ) : |
163 | channel( ch ), message( msg ), data( d ) | 165 | channel( ch ), message( msg ), data( d ) |
164 | { } | 166 | { } |
165 | 167 | ||
166 | QCString channel; | 168 | QCString channel; |
167 | QCString message; | 169 | QCString message; |
168 | QByteArray data; | 170 | QByteArray data; |
169 | }; | 171 | }; |
170 | QGuardedPtr<QWidget> qpe_main_widget; | 172 | QGuardedPtr<QWidget> qpe_main_widget; |
171 | QGuardedPtr<QWidget> lastraised; | 173 | QGuardedPtr<QWidget> lastraised; |
172 | QQueue<QCopRec> qcopq; | 174 | QQueue<QCopRec> qcopq; |
173 | QString styleName; | 175 | QString styleName; |
174 | QString decorationName; | 176 | QString decorationName; |
175 | 177 | ||
176 | void enqueueQCop( const QCString &ch, const QCString &msg, | 178 | void enqueueQCop( const QCString &ch, const QCString &msg, |
177 | const QByteArray &data ) | 179 | const QByteArray &data ) |
178 | { | 180 | { |
179 | qcopq.enqueue( new QCopRec( ch, msg, data ) ); | 181 | qcopq.enqueue( new QCopRec( ch, msg, data ) ); |
@@ -205,190 +207,189 @@ public: | |||
205 | QPoint p; | 207 | QPoint p; |
206 | QSize s; | 208 | QSize s; |
207 | bool max; | 209 | bool max; |
208 | 210 | ||
209 | if ( mw->isVisible() ) { | 211 | if ( mw->isVisible() ) { |
210 | if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) { | 212 | if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) { |
211 | mw->resize(s); | 213 | mw->resize(s); |
212 | mw->move(p); | 214 | mw->move(p); |
213 | } | 215 | } |
214 | mw->raise(); | 216 | mw->raise(); |
215 | } else { | 217 | } else { |
216 | 218 | ||
217 | if ( mw->layout() && mw->inherits("QDialog") ) { | 219 | if ( mw->layout() && mw->inherits("QDialog") ) { |
218 | if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) { | 220 | if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) { |
219 | mw->resize(s); | 221 | mw->resize(s); |
220 | mw->move(p); | 222 | mw->move(p); |
221 | 223 | ||
222 | if ( max && !nomaximize ) { | 224 | if ( max && !nomaximize ) { |
223 | mw->showMaximized(); | 225 | mw->showMaximized(); |
224 | } else { | 226 | } else { |
225 | mw->show(); | 227 | mw->show(); |
226 | } | 228 | } |
227 | } else { | 229 | } else { |
228 | QPEApplication::showDialog((QDialog*)mw,nomaximize); | 230 | QPEApplication::showDialog((QDialog*)mw,nomaximize); |
229 | } | 231 | } |
230 | } else { | 232 | } else { |
231 | if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) { | 233 | if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) { |
232 | mw->resize(s); | 234 | mw->resize(s); |
233 | mw->move(p); | 235 | mw->move(p); |
234 | } else { //no stored rectangle, make an estimation | 236 | } else { //no stored rectangle, make an estimation |
235 | int x = (qApp->desktop()->width()-mw->frameGeometry().width())/2; | 237 | int x = (qApp->desktop()->width()-mw->frameGeometry().width())/2; |
236 | int y = (qApp->desktop()->height()-mw->frameGeometry().height())/2; | 238 | int y = (qApp->desktop()->height()-mw->frameGeometry().height())/2; |
237 | mw->move( QMAX(x,0), QMAX(y,0) ); | 239 | mw->move( QMAX(x,0), QMAX(y,0) ); |
238 | #ifdef Q_WS_QWS | 240 | #ifdef Q_WS_QWS |
239 | if ( !nomaximize ) | 241 | if ( !nomaximize ) |
240 | mw->showMaximized(); | 242 | mw->showMaximized(); |
241 | #endif | 243 | #endif |
242 | } | 244 | } |
243 | if ( max && !nomaximize ) | 245 | if ( max && !nomaximize ) |
244 | mw->showMaximized(); | 246 | mw->showMaximized(); |
245 | else | 247 | else |
246 | mw->show(); | 248 | mw->show(); |
247 | } | 249 | } |
248 | } | 250 | } |
249 | } | 251 | } |
250 | 252 | ||
251 | static bool read_widget_rect(const QString &app, bool &maximized, QPoint &p, QSize &s) | 253 | static bool read_widget_rect(const QString &app, bool &maximized, QPoint &p, QSize &s) |
252 | { | 254 | { |
253 | #ifndef OPIE_NO_WINDOWED | 255 | if (!saveWindowsPos) |
256 | return FALSE; | ||
254 | maximized = TRUE; | 257 | maximized = TRUE; |
255 | // 350 is the trigger in qwsdefaultdecoration for providing a resize button | 258 | // 350 is the trigger in qwsdefaultdecoration for providing a resize button |
256 | if ( qApp->desktop()->width() <= 350 ) | 259 | if ( qApp->desktop()->width() <= 350 ) |
257 | return FALSE; | 260 | return FALSE; |
258 | 261 | ||
259 | Config cfg( "qpe" ); | 262 | Config cfg( "qpe" ); |
260 | cfg.setGroup("ApplicationPositions"); | 263 | cfg.setGroup("ApplicationPositions"); |
261 | QString str = cfg.readEntry( app, QString::null ); | 264 | QString str = cfg.readEntry( app, QString::null ); |
262 | QStringList l = QStringList::split(",", str); | 265 | QStringList l = QStringList::split(",", str); |
263 | 266 | ||
264 | if ( l.count() == 5) { | 267 | if ( l.count() == 5) { |
265 | p.setX( l[0].toInt() ); | 268 | p.setX( l[0].toInt() ); |
266 | p.setY( l[1].toInt() ); | 269 | p.setY( l[1].toInt() ); |
267 | 270 | ||
268 | s.setWidth( l[2].toInt() ); | 271 | s.setWidth( l[2].toInt() ); |
269 | s.setHeight( l[3].toInt() ); | 272 | s.setHeight( l[3].toInt() ); |
270 | 273 | ||
271 | maximized = l[4].toInt(); | 274 | maximized = l[4].toInt(); |
272 | 275 | ||
273 | return TRUE; | 276 | return TRUE; |
274 | } | 277 | } |
275 | #endif | ||
276 | return FALSE; | ||
277 | } | 278 | } |
278 | 279 | ||
279 | 280 | ||
280 | static bool validate_widget_size(const QWidget *w, QPoint &p, QSize &s) | 281 | static bool validate_widget_size(const QWidget *w, QPoint &p, QSize &s) |
281 | { | 282 | { |
282 | #ifndef Q_WS_QWS | 283 | #ifndef Q_WS_QWS |
283 | QRect qt_maxWindowRect = qApp->desktop()->geometry(); | 284 | QRect qt_maxWindowRect = qApp->desktop()->geometry(); |
284 | #endif | 285 | #endif |
285 | int maxX = qt_maxWindowRect.width(); | 286 | int maxX = qt_maxWindowRect.width(); |
286 | int maxY = qt_maxWindowRect.height(); | 287 | int maxY = qt_maxWindowRect.height(); |
287 | int wWidth = s.width() + ( w->frameGeometry().width() - w->geometry().width() ); | 288 | int wWidth = s.width() + ( w->frameGeometry().width() - w->geometry().width() ); |
288 | int wHeight = s.height() + ( w->frameGeometry().height() - w->geometry().height() ); | 289 | int wHeight = s.height() + ( w->frameGeometry().height() - w->geometry().height() ); |
289 | 290 | ||
290 | // total window size is not allowed to be larger than desktop window size | 291 | // total window size is not allowed to be larger than desktop window size |
291 | if ( ( wWidth >= maxX ) && ( wHeight >= maxY ) ) | 292 | if ( ( wWidth >= maxX ) && ( wHeight >= maxY ) ) |
292 | return FALSE; | 293 | return FALSE; |
293 | 294 | ||
294 | if ( wWidth > maxX ) { | 295 | if ( wWidth > maxX ) { |
295 | s.setWidth( maxX - (w->frameGeometry().width() - w->geometry().width() ) ); | 296 | s.setWidth( maxX - (w->frameGeometry().width() - w->geometry().width() ) ); |
296 | wWidth = maxX; | 297 | wWidth = maxX; |
297 | } | 298 | } |
298 | 299 | ||
299 | if ( wHeight > maxY ) { | 300 | if ( wHeight > maxY ) { |
300 | s.setHeight( maxY - (w->frameGeometry().height() - w->geometry().height() ) ); | 301 | s.setHeight( maxY - (w->frameGeometry().height() - w->geometry().height() ) ); |
301 | wHeight = maxY; | 302 | wHeight = maxY; |
302 | } | 303 | } |
303 | 304 | ||
304 | // any smaller than this and the maximize/close/help buttons will be overlapping | 305 | // any smaller than this and the maximize/close/help buttons will be overlapping |
305 | if ( wWidth < 80 || wHeight < 60 ) | 306 | if ( wWidth < 80 || wHeight < 60 ) |
306 | return FALSE; | 307 | return FALSE; |
307 | 308 | ||
308 | if ( p.x() < 0 ) | 309 | if ( p.x() < 0 ) |
309 | p.setX(0); | 310 | p.setX(0); |
310 | if ( p.y() < 0 ) | 311 | if ( p.y() < 0 ) |
311 | p.setY(0); | 312 | p.setY(0); |
312 | 313 | ||
313 | if ( p.x() + wWidth > maxX ) | 314 | if ( p.x() + wWidth > maxX ) |
314 | p.setX( maxX - wWidth ); | 315 | p.setX( maxX - wWidth ); |
315 | if ( p.y() + wHeight > maxY ) | 316 | if ( p.y() + wHeight > maxY ) |
316 | p.setY( maxY - wHeight ); | 317 | p.setY( maxY - wHeight ); |
317 | 318 | ||
318 | return TRUE; | 319 | return TRUE; |
319 | } | 320 | } |
320 | 321 | ||
321 | static void store_widget_rect(QWidget *w, QString &app) | 322 | static void store_widget_rect(QWidget *w, QString &app) |
322 | { | 323 | { |
323 | if( !w ) | 324 | if( !w ) |
324 | return; | 325 | return; |
325 | #ifndef OPIE_NO_WINDOWED | 326 | if (!saveWindowsPos) |
327 | return; | ||
326 | // 350 is the trigger in qwsdefaultdecoration for providing a resize button | 328 | // 350 is the trigger in qwsdefaultdecoration for providing a resize button |
327 | if ( qApp->desktop()->width() <= 350 ) | 329 | if ( qApp->desktop()->width() <= 350 ) |
328 | return; | 330 | return; |
329 | // we use these to map the offset of geometry and pos. ( we can only use normalGeometry to | 331 | // we use these to map the offset of geometry and pos. ( we can only use normalGeometry to |
330 | // get the non-maximized version, so we have to do it the hard way ) | 332 | // get the non-maximized version, so we have to do it the hard way ) |
331 | int offsetX = w->x() - w->geometry().left(); | 333 | int offsetX = w->x() - w->geometry().left(); |
332 | int offsetY = w->y() - w->geometry().top(); | 334 | int offsetY = w->y() - w->geometry().top(); |
333 | 335 | ||
334 | QRect r; | 336 | QRect r; |
335 | if ( w->isMaximized() ) | 337 | if ( w->isMaximized() ) |
336 | r = ( (HackWidget *) w)->normalGeometry(); | 338 | r = ( (HackWidget *) w)->normalGeometry(); |
337 | else | 339 | else |
338 | r = w->geometry(); | 340 | r = w->geometry(); |
339 | 341 | ||
340 | // Stores the window placement as pos(), size() (due to the offset mapping) | 342 | // Stores the window placement as pos(), size() (due to the offset mapping) |
341 | Config cfg( "qpe" ); | 343 | Config cfg( "qpe" ); |
342 | cfg.setGroup("ApplicationPositions"); | 344 | cfg.setGroup("ApplicationPositions"); |
343 | QString s; | 345 | QString s; |
344 | s.sprintf("%d,%d,%d,%d,%d", r.left() + offsetX, r.top() + offsetY, r.width(), r.height(), w->isMaximized() ); | 346 | s.sprintf("%d,%d,%d,%d,%d", r.left() + offsetX, r.top() + offsetY, r.width(), r.height(), w->isMaximized() ); |
345 | cfg.writeEntry( app, s ); | 347 | cfg.writeEntry( app, s ); |
346 | #endif | ||
347 | } | 348 | } |
348 | 349 | ||
349 | static bool setWidgetCaptionFromAppName( QWidget* /*mw*/, const QString& /*appName*/, const QString& /*appsPath*/ ) | 350 | static bool setWidgetCaptionFromAppName( QWidget* /*mw*/, const QString& /*appName*/, const QString& /*appsPath*/ ) |
350 | { | 351 | { |
351 | /* | 352 | /* |
352 | // This works but disable it for now until it is safe to apply | 353 | // This works but disable it for now until it is safe to apply |
353 | // What is does is scan the .desktop files of all the apps for | 354 | // What is does is scan the .desktop files of all the apps for |
354 | // the applnk that has the corresponding argv[0] as this program | 355 | // the applnk that has the corresponding argv[0] as this program |
355 | // then it uses the name stored in the .desktop file as the caption | 356 | // then it uses the name stored in the .desktop file as the caption |
356 | // for the main widget. This saves duplicating translations for | 357 | // for the main widget. This saves duplicating translations for |
357 | // the app name in the program and in the .desktop files. | 358 | // the app name in the program and in the .desktop files. |
358 | 359 | ||
359 | AppLnkSet apps( appsPath ); | 360 | AppLnkSet apps( appsPath ); |
360 | 361 | ||
361 | QList<AppLnk> appsList = apps.children(); | 362 | QList<AppLnk> appsList = apps.children(); |
362 | for ( QListIterator<AppLnk> it(appsList); it.current(); ++it ) { | 363 | for ( QListIterator<AppLnk> it(appsList); it.current(); ++it ) { |
363 | if ( (*it)->exec() == appName ) { | 364 | if ( (*it)->exec() == appName ) { |
364 | mw->setCaption( (*it)->name() ); | 365 | mw->setCaption( (*it)->name() ); |
365 | return TRUE; | 366 | return TRUE; |
366 | } | 367 | } |
367 | } | 368 | } |
368 | */ | 369 | */ |
369 | return FALSE; | 370 | return FALSE; |
370 | } | 371 | } |
371 | 372 | ||
372 | 373 | ||
373 | void show(QWidget* mw, bool nomax) | 374 | void show(QWidget* mw, bool nomax) |
374 | { | 375 | { |
375 | setWidgetCaptionFromAppName( mw, appName, QPEApplication::qpeDir() + "apps" ); | 376 | setWidgetCaptionFromAppName( mw, appName, QPEApplication::qpeDir() + "apps" ); |
376 | nomaximize = nomax; | 377 | nomaximize = nomax; |
377 | qpe_main_widget = mw; | 378 | qpe_main_widget = mw; |
378 | qcopQok = TRUE; | 379 | qcopQok = TRUE; |
379 | #ifndef QT_NO_COP | 380 | #ifndef QT_NO_COP |
380 | 381 | ||
381 | sendQCopQ(); | 382 | sendQCopQ(); |
382 | #endif | 383 | #endif |
383 | 384 | ||
384 | if ( preloaded ) { | 385 | if ( preloaded ) { |
385 | if (forceshow) | 386 | if (forceshow) |
386 | show_mx(mw, nomax, appName); | 387 | show_mx(mw, nomax, appName); |
387 | } | 388 | } |
388 | else if ( keep_running ) { | 389 | else if ( keep_running ) { |
389 | show_mx(mw, nomax, appName); | 390 | show_mx(mw, nomax, appName); |
390 | } | 391 | } |
391 | } | 392 | } |
392 | 393 | ||
393 | void loadTextCodecs() | 394 | void loadTextCodecs() |
394 | { | 395 | { |
@@ -2162,96 +2163,101 @@ int QPEApplication::exec() | |||
2162 | loosing state. | 2163 | loosing state. |
2163 | */ | 2164 | */ |
2164 | void QPEApplication::tryQuit() | 2165 | void QPEApplication::tryQuit() |
2165 | { | 2166 | { |
2166 | if ( activeModalWidget() ) | 2167 | if ( activeModalWidget() ) |
2167 | return ; // Inside modal loop or konsole. Too hard to save state. | 2168 | return ; // Inside modal loop or konsole. Too hard to save state. |
2168 | #ifndef QT_NO_COP | 2169 | #ifndef QT_NO_COP |
2169 | 2170 | ||
2170 | { | 2171 | { |
2171 | QCopEnvelope e( "QPE/System", "closing(QString)" ); | 2172 | QCopEnvelope e( "QPE/System", "closing(QString)" ); |
2172 | e << d->appName; | 2173 | e << d->appName; |
2173 | } | 2174 | } |
2174 | #endif | 2175 | #endif |
2175 | if ( d->keep_running ) | 2176 | if ( d->keep_running ) |
2176 | d->store_widget_rect(d->qpe_main_widget, d->appName); | 2177 | d->store_widget_rect(d->qpe_main_widget, d->appName); |
2177 | processEvents(); | 2178 | processEvents(); |
2178 | 2179 | ||
2179 | quit(); | 2180 | quit(); |
2180 | } | 2181 | } |
2181 | 2182 | ||
2182 | 2183 | ||
2183 | /*! | 2184 | /*! |
2184 | \internal | 2185 | \internal |
2185 | User initiated quit. Makes the window 'Go Away'. If preloaded this means | 2186 | User initiated quit. Makes the window 'Go Away'. If preloaded this means |
2186 | hiding the window. If not it means quitting the application. | 2187 | hiding the window. If not it means quitting the application. |
2187 | As this is user initiated we don't need to check state. | 2188 | As this is user initiated we don't need to check state. |
2188 | */ | 2189 | */ |
2189 | void QPEApplication::hideOrQuit() | 2190 | void QPEApplication::hideOrQuit() |
2190 | { | 2191 | { |
2191 | if ( d->keep_running ) | 2192 | if ( d->keep_running ) |
2192 | d->store_widget_rect(d->qpe_main_widget, d->appName); | 2193 | d->store_widget_rect(d->qpe_main_widget, d->appName); |
2193 | processEvents(); | 2194 | processEvents(); |
2194 | 2195 | ||
2195 | // If we are a preloaded application we don't actually quit, so emit | 2196 | // If we are a preloaded application we don't actually quit, so emit |
2196 | // a System message indicating we're quasi-closing. | 2197 | // a System message indicating we're quasi-closing. |
2197 | if ( d->preloaded && d->qpe_main_widget ) | 2198 | if ( d->preloaded && d->qpe_main_widget ) |
2198 | #ifndef QT_NO_COP | 2199 | #ifndef QT_NO_COP |
2199 | 2200 | ||
2200 | { | 2201 | { |
2201 | QCopEnvelope e("QPE/System", "fastAppHiding(QString)" ); | 2202 | QCopEnvelope e("QPE/System", "fastAppHiding(QString)" ); |
2202 | e << d->appName; | 2203 | e << d->appName; |
2203 | d->qpe_main_widget->hide(); | 2204 | d->qpe_main_widget->hide(); |
2204 | } | 2205 | } |
2205 | #endif | 2206 | #endif |
2206 | else | 2207 | else |
2207 | quit(); | 2208 | quit(); |
2208 | } | 2209 | } |
2209 | 2210 | ||
2211 | bool QPEApplication::isSaveWindowsPos() | ||
2212 | { | ||
2213 | return saveWindowsPos; | ||
2214 | } | ||
2215 | |||
2210 | #if (__GNUC__ > 2 ) && !defined(_OS_MACX_) | 2216 | #if (__GNUC__ > 2 ) && !defined(_OS_MACX_) |
2211 | extern "C" void __cxa_pure_virtual(); | 2217 | extern "C" void __cxa_pure_virtual(); |
2212 | 2218 | ||
2213 | void __cxa_pure_virtual() | 2219 | void __cxa_pure_virtual() |
2214 | { | 2220 | { |
2215 | fprintf( stderr, "Pure virtual called\n"); | 2221 | fprintf( stderr, "Pure virtual called\n"); |
2216 | abort(); | 2222 | abort(); |
2217 | 2223 | ||
2218 | } | 2224 | } |
2219 | 2225 | ||
2220 | #endif | 2226 | #endif |
2221 | 2227 | ||
2222 | 2228 | ||
2223 | #if defined(OPIE_NEW_MALLOC) | 2229 | #if defined(OPIE_NEW_MALLOC) |
2224 | 2230 | ||
2225 | // The libraries with the skiff package (and possibly others) have | 2231 | // The libraries with the skiff package (and possibly others) have |
2226 | // completely useless implementations of builtin new and delete that | 2232 | // completely useless implementations of builtin new and delete that |
2227 | // use about 50% of your CPU. Here we revert to the simple libc | 2233 | // use about 50% of your CPU. Here we revert to the simple libc |
2228 | // functions. | 2234 | // functions. |
2229 | 2235 | ||
2230 | void* operator new[]( size_t size ) | 2236 | void* operator new[]( size_t size ) |
2231 | { | 2237 | { |
2232 | return malloc( size ); | 2238 | return malloc( size ); |
2233 | } | 2239 | } |
2234 | 2240 | ||
2235 | void* operator new( size_t size ) | 2241 | void* operator new( size_t size ) |
2236 | { | 2242 | { |
2237 | return malloc( size ); | 2243 | return malloc( size ); |
2238 | } | 2244 | } |
2239 | 2245 | ||
2240 | void operator delete[]( void* p ) | 2246 | void operator delete[]( void* p ) |
2241 | { | 2247 | { |
2242 | if ( p ) | 2248 | if ( p ) |
2243 | free( p ); | 2249 | free( p ); |
2244 | } | 2250 | } |
2245 | 2251 | ||
2246 | void operator delete[]( void* p, size_t /*size*/ ) | 2252 | void operator delete[]( void* p, size_t /*size*/ ) |
2247 | { | 2253 | { |
2248 | if ( p ) | 2254 | if ( p ) |
2249 | free( p ); | 2255 | free( p ); |
2250 | } | 2256 | } |
2251 | 2257 | ||
2252 | 2258 | ||
2253 | void operator delete( void* p ) | 2259 | void operator delete( void* p ) |
2254 | { | 2260 | { |
2255 | if ( p ) | 2261 | if ( p ) |
2256 | free( p ); | 2262 | free( p ); |
2257 | } | 2263 | } |
diff --git a/library/qpeapplication.h b/library/qpeapplication.h index 6486cad..7c99a9a 100644 --- a/library/qpeapplication.h +++ b/library/qpeapplication.h | |||
@@ -92,96 +92,98 @@ public: | |||
92 | static void setDefaultRotation(int r); | 92 | static void setDefaultRotation(int r); |
93 | static void setCurrentRotation(int r); | 93 | static void setCurrentRotation(int r); |
94 | static void setCurrentMode(int x, int y, int depth ); | 94 | static void setCurrentMode(int x, int y, int depth ); |
95 | static void grabKeyboard(); | 95 | static void grabKeyboard(); |
96 | static void ungrabKeyboard(); | 96 | static void ungrabKeyboard(); |
97 | 97 | ||
98 | enum StylusMode { | 98 | enum StylusMode { |
99 | LeftOnly, | 99 | LeftOnly, |
100 | RightOnHold | 100 | RightOnHold |
101 | // RightOnHoldLeftDelayed, etc. | 101 | // RightOnHoldLeftDelayed, etc. |
102 | }; | 102 | }; |
103 | static void setStylusOperation( QWidget*, StylusMode ); | 103 | static void setStylusOperation( QWidget*, StylusMode ); |
104 | static StylusMode stylusOperation( QWidget* ); | 104 | static StylusMode stylusOperation( QWidget* ); |
105 | 105 | ||
106 | enum InputMethodHint { | 106 | enum InputMethodHint { |
107 | Normal, | 107 | Normal, |
108 | AlwaysOff, | 108 | AlwaysOff, |
109 | AlwaysOn | 109 | AlwaysOn |
110 | }; | 110 | }; |
111 | 111 | ||
112 | enum screenSaverHint { | 112 | enum screenSaverHint { |
113 | Disable = 0, | 113 | Disable = 0, |
114 | DisableLightOff = 1, | 114 | DisableLightOff = 1, |
115 | DisableSuspend = 2, | 115 | DisableSuspend = 2, |
116 | Enable = 100 | 116 | Enable = 100 |
117 | }; | 117 | }; |
118 | 118 | ||
119 | static void setInputMethodHint( QWidget *, InputMethodHint ); | 119 | static void setInputMethodHint( QWidget *, InputMethodHint ); |
120 | static InputMethodHint inputMethodHint( QWidget * ); | 120 | static InputMethodHint inputMethodHint( QWidget * ); |
121 | 121 | ||
122 | void showMainWidget( QWidget*, bool nomax=FALSE ); | 122 | void showMainWidget( QWidget*, bool nomax=FALSE ); |
123 | void showMainDocumentWidget( QWidget*, bool nomax=FALSE ); | 123 | void showMainDocumentWidget( QWidget*, bool nomax=FALSE ); |
124 | 124 | ||
125 | static void showDialog( QDialog*, bool nomax=FALSE ) QPE_WEAK_SYMBOL; | 125 | static void showDialog( QDialog*, bool nomax=FALSE ) QPE_WEAK_SYMBOL; |
126 | static int execDialog ( QDialog*, bool nomax=FALSE ) QPE_WEAK_SYMBOL; | 126 | static int execDialog ( QDialog*, bool nomax=FALSE ) QPE_WEAK_SYMBOL; |
127 | static void showWidget( QWidget*, bool nomax=FALSE ) QPE_WEAK_SYMBOL; | 127 | static void showWidget( QWidget*, bool nomax=FALSE ) QPE_WEAK_SYMBOL; |
128 | /* Merge setTempScreenSaverMode */ | 128 | /* Merge setTempScreenSaverMode */ |
129 | #ifdef QTOPIA_INTERNAL_INITAPP | 129 | #ifdef QTOPIA_INTERNAL_INITAPP |
130 | void initApp( int argv, char **argv ); | 130 | void initApp( int argv, char **argv ); |
131 | #endif | 131 | #endif |
132 | 132 | ||
133 | static void setKeepRunning(); | 133 | static void setKeepRunning(); |
134 | bool keepRunning() const; | 134 | bool keepRunning() const; |
135 | 135 | ||
136 | bool keyboardGrabbed() const; | 136 | bool keyboardGrabbed() const; |
137 | 137 | ||
138 | int exec(); | 138 | int exec(); |
139 | 139 | ||
140 | static bool isSaveWindowsPos(); | ||
141 | |||
140 | signals: | 142 | signals: |
141 | void clientMoused(); | 143 | void clientMoused(); |
142 | void timeChanged(); | 144 | void timeChanged(); |
143 | void clockChanged( bool pm ); | 145 | void clockChanged( bool pm ); |
144 | void micChanged( bool muted ); | 146 | void micChanged( bool muted ); |
145 | void volumeChanged( bool muted ); | 147 | void volumeChanged( bool muted ); |
146 | void appMessage( const QCString& msg, const QByteArray& data); | 148 | void appMessage( const QCString& msg, const QByteArray& data); |
147 | void weekChanged( bool startOnMonday ); | 149 | void weekChanged( bool startOnMonday ); |
148 | void dateFormatChanged( DateFormat ); | 150 | void dateFormatChanged( DateFormat ); |
149 | void flush(); | 151 | void flush(); |
150 | void reload(); | 152 | void reload(); |
151 | /* linkChanged signal */ | 153 | /* linkChanged signal */ |
152 | 154 | ||
153 | private slots: | 155 | private slots: |
154 | void systemMessage( const QCString &msg, const QByteArray &data ); | 156 | void systemMessage( const QCString &msg, const QByteArray &data ); |
155 | void pidMessage( const QCString &msg, const QByteArray &data ); | 157 | void pidMessage( const QCString &msg, const QByteArray &data ); |
156 | void removeSenderFromStylusDict(); | 158 | void removeSenderFromStylusDict(); |
157 | void hideOrQuit(); | 159 | void hideOrQuit(); |
158 | 160 | ||
159 | protected: | 161 | protected: |
160 | bool qwsEventFilter( QWSEvent * ); | 162 | bool qwsEventFilter( QWSEvent * ); |
161 | void internalSetStyle( const QString &style ); | 163 | void internalSetStyle( const QString &style ); |
162 | void prepareForTermination(bool willrestart); | 164 | void prepareForTermination(bool willrestart); |
163 | virtual void restart(); | 165 | virtual void restart(); |
164 | virtual void shutdown(); | 166 | virtual void shutdown(); |
165 | bool eventFilter( QObject *, QEvent * ); | 167 | bool eventFilter( QObject *, QEvent * ); |
166 | void timerEvent( QTimerEvent * ); | 168 | void timerEvent( QTimerEvent * ); |
167 | bool raiseAppropriateWindow(); | 169 | bool raiseAppropriateWindow(); |
168 | virtual void tryQuit(); | 170 | virtual void tryQuit(); |
169 | private: | 171 | private: |
170 | void mapToDefaultAction( QWSKeyEvent *ke, int defKey ); | 172 | void mapToDefaultAction( QWSKeyEvent *ke, int defKey ); |
171 | void processQCopFile(); | 173 | void processQCopFile(); |
172 | 174 | ||
173 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 175 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
174 | QCopChannel *sysChannel; | 176 | QCopChannel *sysChannel; |
175 | QCopChannel *pidChannel; | 177 | QCopChannel *pidChannel; |
176 | #endif | 178 | #endif |
177 | QPEApplicationData *d; | 179 | QPEApplicationData *d; |
178 | 180 | ||
179 | bool reserved_sh; | 181 | bool reserved_sh; |
180 | 182 | ||
181 | }; | 183 | }; |
182 | 184 | ||
183 | 185 | ||
184 | 186 | ||
185 | enum Transformation { Rot0, Rot90, Rot180, Rot270 }; /* from qgfxtransformed_qws.cpp */ | 187 | enum Transformation { Rot0, Rot90, Rot180, Rot270 }; /* from qgfxtransformed_qws.cpp */ |
186 | 188 | ||
187 | inline int TransToDeg ( Transformation t ) | 189 | inline int TransToDeg ( Transformation t ) |
diff --git a/library/widget_showing.cpp b/library/widget_showing.cpp index e43a16a..cc1bfb2 100644 --- a/library/widget_showing.cpp +++ b/library/widget_showing.cpp | |||
@@ -7,73 +7,68 @@ | |||
7 | .>+-= | 7 | .>+-= |
8 | _;:, .> :=|. This library is free software; you can | 8 | _;:, .> :=|. This library is free software; you can |
9 | .> <`_, > . <= redistribute it and/or modify it under | 9 | .> <`_, > . <= redistribute it and/or modify it under |
10 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 10 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
11 | .="- .-=="i, .._ License as published by the Free Software | 11 | .="- .-=="i, .._ License as published by the Free Software |
12 | - . .-<_> .<> Foundation; either version 2 of the License, | 12 | - . .-<_> .<> Foundation; either version 2 of the License, |
13 | ._= =} : or (at your option) any later version. | 13 | ._= =} : or (at your option) any later version. |
14 | .%`+i> _;_. | 14 | .%`+i> _;_. |
15 | .i_,=:_. -<s. This library is distributed in the hope that | 15 | .i_,=:_. -<s. This library is distributed in the hope that |
16 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 16 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
17 | : .. .:, . . . without even the implied warranty of | 17 | : .. .:, . . . without even the implied warranty of |
18 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 18 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
19 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 19 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
20 | ..}^=.= = ; Library General Public License for more | 20 | ..}^=.= = ; Library General Public License for more |
21 | ++= -. .` .: details. | 21 | ++= -. .` .: details. |
22 | : = ...= . :.=- | 22 | : = ...= . :.=- |
23 | -. .:....=;==+<; You should have received a copy of the GNU | 23 | -. .:....=;==+<; You should have received a copy of the GNU |
24 | -_. . . )=. = Library General Public License along with | 24 | -_. . . )=. = Library General Public License along with |
25 | -- :-=` this library; see the file COPYING.LIB. | 25 | -- :-=` this library; see the file COPYING.LIB. |
26 | If not, write to the Free Software Foundation, | 26 | If not, write to the Free Software Foundation, |
27 | Inc., 59 Temple Place - Suite 330, | 27 | Inc., 59 Temple Place - Suite 330, |
28 | Boston, MA 02111-1307, USA. | 28 | Boston, MA 02111-1307, USA. |
29 | 29 | ||
30 | */ | 30 | */ |
31 | 31 | ||
32 | #include <qtopia/qpeapplication.h> | 32 | #include <qtopia/qpeapplication.h> |
33 | 33 | ||
34 | #ifdef Q_WS_QWS | 34 | #ifdef Q_WS_QWS |
35 | extern Q_EXPORT QRect qt_maxWindowRect; | 35 | extern Q_EXPORT QRect qt_maxWindowRect; |
36 | #endif | 36 | #endif |
37 | 37 | ||
38 | void QPEApplication::showDialog( QDialog* d, bool nomax ) | 38 | void QPEApplication::showDialog( QDialog* d, bool nomax ) |
39 | { | 39 | { |
40 | showWidget( d, nomax ); | 40 | showWidget( d, nomax ); |
41 | } | 41 | } |
42 | 42 | ||
43 | int QPEApplication::execDialog( QDialog* d, bool nomax ) | 43 | int QPEApplication::execDialog( QDialog* d, bool nomax ) |
44 | { | 44 | { |
45 | showDialog( d, nomax ); | 45 | showDialog( d, nomax ); |
46 | return d->exec(); | 46 | return d->exec(); |
47 | } | 47 | } |
48 | 48 | ||
49 | void QPEApplication::showWidget( QWidget* wg, bool nomax ) { | 49 | void QPEApplication::showWidget( QWidget* wg, bool nomax ) { |
50 | if ( wg->isVisible() ) { | 50 | if ( wg->isVisible() ) { |
51 | wg->show(); | 51 | wg->show(); |
52 | return; | 52 | return; |
53 | } | 53 | } |
54 | 54 | ||
55 | #ifdef OPIE_NO_WINDOWED | 55 | if ( !isSaveWindowsPos() || (!nomax |
56 | Q_UNUSED( nomax ) | 56 | && ( qApp->desktop()->width() <= 30 )) ){ |
57 | if ( TRUE ) { | ||
58 | #else | ||
59 | if ( !nomax | ||
60 | && ( qApp->desktop()->width() <= 320 ) ){ | ||
61 | #endif | ||
62 | wg->showMaximized(); | 57 | wg->showMaximized(); |
63 | } else { | 58 | } else { |
64 | #ifdef Q_WS_QWS | 59 | #ifdef Q_WS_QWS |
65 | QSize desk = QSize( qApp->desktop()->width(), qApp->desktop()->height() ); | 60 | QSize desk = QSize( qApp->desktop()->width(), qApp->desktop()->height() ); |
66 | #else | 61 | #else |
67 | QSize desk = QSize( qt_maxWindowRect.width(), qt_maxWindowRect.height() ); | 62 | QSize desk = QSize( qt_maxWindowRect.width(), qt_maxWindowRect.height() ); |
68 | #endif | 63 | #endif |
69 | 64 | ||
70 | QSize sh = wg->sizeHint(); | 65 | QSize sh = wg->sizeHint(); |
71 | int w = QMAX( sh.width(), wg->width() ); | 66 | int w = QMAX( sh.width(), wg->width() ); |
72 | int h = QMAX( sh.height(), wg->height() ); | 67 | int h = QMAX( sh.height(), wg->height() ); |
73 | // desktop widget-frame taskbar | 68 | // desktop widget-frame taskbar |
74 | w = QMIN( w, ( desk.width() - ( wg->frameGeometry().width() - wg->geometry().width() ) - 25 ) ); | 69 | w = QMIN( w, ( desk.width() - ( wg->frameGeometry().width() - wg->geometry().width() ) - 25 ) ); |
75 | h = QMIN( h, ( desk.height() - ( wg->frameGeometry().height() - wg->geometry().height() ) - 25 ) ); | 70 | h = QMIN( h, ( desk.height() - ( wg->frameGeometry().height() - wg->geometry().height() ) - 25 ) ); |
76 | wg->resize( w, h ); | 71 | wg->resize( w, h ); |
77 | wg->show(); | 72 | wg->show(); |
78 | } | 73 | } |
79 | } | 74 | } |