-rw-r--r-- | Rules.make | 3 | ||||
-rw-r--r-- | config.in | 4 | ||||
-rw-r--r-- | library/qpeapplication.h | 2 | ||||
-rw-r--r-- | library/qt_override.cpp | 9 |
4 files changed, 17 insertions, 1 deletions
@@ -39,24 +39,27 @@ else | |||
39 | echo CONFIG -= quick-app >> $@ | 39 | echo CONFIG -= quick-app >> $@ |
40 | echo CONFIG += quick-app-bin >> $@ | 40 | echo CONFIG += quick-app-bin >> $@ |
41 | echo \} >> $@ | 41 | echo \} >> $@ |
42 | endif | 42 | endif |
43 | ifeq ($(CONFIG_SQL_PIM_BACKEND),y) | 43 | ifeq ($(CONFIG_SQL_PIM_BACKEND),y) |
44 | echo ENABLE_SQL_PIM_BACKEND=$(CONFIG_SQL_PIM_BACKEND) >> $@ | 44 | echo ENABLE_SQL_PIM_BACKEND=$(CONFIG_SQL_PIM_BACKEND) >> $@ |
45 | else | 45 | else |
46 | echo ENABLE_SQL_PIM_BACKEND=n >> $@ | 46 | echo ENABLE_SQL_PIM_BACKEND=n >> $@ |
47 | endif | 47 | endif |
48 | ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y) | 48 | ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y) |
49 | echo CONFIG += no-override >> $@ | 49 | echo CONFIG += no-override >> $@ |
50 | endif | 50 | endif |
51 | ifeq ($(CONFIG_OPIE_NO_ERASERECT_FIX),y) | ||
52 | echo DEFINES += OPIE_NO_ERASE_RECT_HACKFIX >> $@ | ||
53 | endif | ||
51 | ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y) | 54 | ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y) |
52 | echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@ | 55 | echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@ |
53 | endif | 56 | endif |
54 | ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y) | 57 | ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y) |
55 | echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@ | 58 | echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@ |
56 | endif | 59 | endif |
57 | ifeq ($(CONFIG_USE_REALTIME_AUDIO_THREAD),y) | 60 | ifeq ($(CONFIG_USE_REALTIME_AUDIO_THREAD),y) |
58 | echo DEFINES += USE_REALTIME_AUDIO_THREAD >> $@ | 61 | echo DEFINES += USE_REALTIME_AUDIO_THREAD >> $@ |
59 | endif | 62 | endif |
60 | ifeq ($(CONFIG_USE_FILE_NOTIFICATION),y) | 63 | ifeq ($(CONFIG_USE_FILE_NOTIFICATION),y) |
61 | echo DEFINES += USE_FILE_NOTIFICATION >> $@ | 64 | echo DEFINES += USE_FILE_NOTIFICATION >> $@ |
62 | endif | 65 | endif |
@@ -97,24 +97,28 @@ config OPTIMIZATIONS | |||
97 | 97 | ||
98 | config EXPERIMENTAL | 98 | config EXPERIMENTAL |
99 | bool "Prompt for development and/or incomplete items" | 99 | bool "Prompt for development and/or incomplete items" |
100 | default y | 100 | default y |
101 | 101 | ||
102 | endmenu | 102 | endmenu |
103 | 103 | ||
104 | menu "Configuration" | 104 | menu "Configuration" |
105 | config OPIE_NO_OVERRIDE_QT | 105 | config OPIE_NO_OVERRIDE_QT |
106 | boolean "Build Opie against an unpatched version of Qt" | 106 | boolean "Build Opie against an unpatched version of Qt" |
107 | default n | 107 | default n |
108 | 108 | ||
109 | config OPIE_NO_ERASERECT_FIX | ||
110 | boolean "Disable Fixup eraseRect for HancomMobileWord,neocal.. to make libopiecore work on Sharps libqpe" | ||
111 | default n | ||
112 | |||
109 | config OPIE_NO_BUILTIN_SHUTDOWN | 113 | config OPIE_NO_BUILTIN_SHUTDOWN |
110 | boolean "Disable the built in shutdown application" | 114 | boolean "Disable the built in shutdown application" |
111 | default y | 115 | default y |
112 | 116 | ||
113 | config OPIE_NO_BUILTIN_CALIBRATE | 117 | config OPIE_NO_BUILTIN_CALIBRATE |
114 | boolean "Disable the built in calibrate application" | 118 | boolean "Disable the built in calibrate application" |
115 | default y if TARGET_YOPY | 119 | default y if TARGET_YOPY |
116 | default n if ! TARGET_YOPY | 120 | default n if ! TARGET_YOPY |
117 | 121 | ||
118 | config OPIE_SOUND_FRAGMENT_SHIFT | 122 | config OPIE_SOUND_FRAGMENT_SHIFT |
119 | string "The sound fragment used in Opie Player I" | 123 | string "The sound fragment used in Opie Player I" |
120 | default "14" if TARGET_IPAQ | 124 | default "14" if TARGET_IPAQ |
diff --git a/library/qpeapplication.h b/library/qpeapplication.h index 8c85ad0..d2782e4 100644 --- a/library/qpeapplication.h +++ b/library/qpeapplication.h | |||
@@ -155,27 +155,29 @@ private slots: | |||
155 | void hideOrQuit(); | 155 | void hideOrQuit(); |
156 | 156 | ||
157 | protected: | 157 | protected: |
158 | bool qwsEventFilter( QWSEvent * ); | 158 | bool qwsEventFilter( QWSEvent * ); |
159 | void internalSetStyle( const QString &style ); | 159 | void internalSetStyle( const QString &style ); |
160 | void prepareForTermination(bool willrestart); | 160 | void prepareForTermination(bool willrestart); |
161 | virtual void restart(); | 161 | virtual void restart(); |
162 | virtual void shutdown(); | 162 | virtual void shutdown(); |
163 | bool eventFilter( QObject *, QEvent * ); | 163 | bool eventFilter( QObject *, QEvent * ); |
164 | void timerEvent( QTimerEvent * ); | 164 | void timerEvent( QTimerEvent * ); |
165 | bool raiseAppropriateWindow(); | 165 | bool raiseAppropriateWindow(); |
166 | virtual void tryQuit(); | 166 | virtual void tryQuit(); |
167 | #ifndef OPIE_NO_ERASE_RECT_HACKFIX | ||
167 | #if QT_VERSION > 233 | 168 | #if QT_VERSION > 233 |
168 | virtual void polish ( QWidget * ); // this is actually implemented in qt_override.cpp (!) | 169 | virtual void polish ( QWidget * ); // this is actually implemented in qt_override.cpp (!) |
169 | #endif | 170 | #endif |
171 | #endif | ||
170 | private: | 172 | private: |
171 | #ifndef QT_NO_TRANSLATION | 173 | #ifndef QT_NO_TRANSLATION |
172 | void installTranslation( const QString& baseName ); | 174 | void installTranslation( const QString& baseName ); |
173 | #endif | 175 | #endif |
174 | void mapToDefaultAction( QWSKeyEvent *ke, int defKey ); | 176 | void mapToDefaultAction( QWSKeyEvent *ke, int defKey ); |
175 | void processQCopFile(); | 177 | void processQCopFile(); |
176 | 178 | ||
177 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 179 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
178 | QCopChannel *sysChannel; | 180 | QCopChannel *sysChannel; |
179 | QCopChannel *pidChannel; | 181 | QCopChannel *pidChannel; |
180 | #endif | 182 | #endif |
181 | QPEApplicationData *d; | 183 | QPEApplicationData *d; |
diff --git a/library/qt_override.cpp b/library/qt_override.cpp index 4d1f475..56f82d7 100644 --- a/library/qt_override.cpp +++ b/library/qt_override.cpp | |||
@@ -3,41 +3,46 @@ | |||
3 | #include <qfontdatabase.h> | 3 | #include <qfontdatabase.h> |
4 | 4 | ||
5 | #include <unistd.h> | 5 | #include <unistd.h> |
6 | #include <stdlib.h> | 6 | #include <stdlib.h> |
7 | #include <stdio.h> | 7 | #include <stdio.h> |
8 | #include <limits.h> | 8 | #include <limits.h> |
9 | #include <sys/param.h> // for toolchains with old libc headers | 9 | #include <sys/param.h> // for toolchains with old libc headers |
10 | 10 | ||
11 | #include "qt_override_p.h" | 11 | #include "qt_override_p.h" |
12 | 12 | ||
13 | #if QT_VERSION > 233 | 13 | #if QT_VERSION > 233 |
14 | 14 | ||
15 | #ifndef OPIE_NO_ERASE_RECT_HACKFIX | ||
15 | struct color_fix_t { | 16 | struct color_fix_t { |
16 | char *m_app; | 17 | char *m_app; |
17 | char *m_class; | 18 | char *m_class; |
18 | char *m_name; | 19 | char *m_name; |
19 | QColorGroup::ColorRole m_set; | 20 | QColorGroup::ColorRole m_set; |
20 | QColorGroup::ColorRole m_get; | 21 | QColorGroup::ColorRole m_get; |
21 | }; | 22 | }; |
22 | 23 | ||
23 | #ifndef OPIE_NO_OVERRIDE_QT | 24 | |
24 | 25 | ||
25 | static const color_fix_t apps_that_need_special_colors [] = { | 26 | static const color_fix_t apps_that_need_special_colors [] = { |
26 | { "HancomMobileWord", "HTextEdit", 0, QColorGroup::Background, QColorGroup::Base }, | 27 | { "HancomMobileWord", "HTextEdit", 0, QColorGroup::Background, QColorGroup::Base }, |
27 | { "neocal", "Display", 0, QColorGroup::Background, QColorGroup::Base }, | 28 | { "neocal", "Display", 0, QColorGroup::Background, QColorGroup::Base }, |
28 | 29 | ||
29 | { 0, 0, 0, QColorGroup::Base, QColorGroup::Base } | 30 | { 0, 0, 0, QColorGroup::Base, QColorGroup::Base } |
30 | }; | 31 | }; |
31 | 32 | ||
33 | #endif | ||
34 | |||
35 | #ifndef OPIE_NO_OVERRIDE_QT | ||
36 | |||
32 | static const char * const apps_that_need_pointsizes_times_10 [] = { | 37 | static const char * const apps_that_need_pointsizes_times_10 [] = { |
33 | "HancomMobileWord", | 38 | "HancomMobileWord", |
34 | "hancomsheet", | 39 | "hancomsheet", |
35 | "HancomPresenterViewer", | 40 | "HancomPresenterViewer", |
36 | 41 | ||
37 | 0 | 42 | 0 |
38 | }; | 43 | }; |
39 | 44 | ||
40 | 45 | ||
41 | 46 | ||
42 | 47 | ||
43 | int Opie::force_appearance = 0; | 48 | int Opie::force_appearance = 0; |
@@ -80,45 +85,47 @@ int Opie::force_appearance = 0; | |||
80 | 85 | ||
81 | extern "C" { | 86 | extern "C" { |
82 | 87 | ||
83 | extern void __gmon_start__ ( ) __attribute__(( weak )); | 88 | extern void __gmon_start__ ( ) __attribute__(( weak )); |
84 | 89 | ||
85 | extern void __gmon_start__ ( ) | 90 | extern void __gmon_start__ ( ) |
86 | { | 91 | { |
87 | } | 92 | } |
88 | 93 | ||
89 | } | 94 | } |
90 | 95 | ||
91 | 96 | ||
97 | #ifndef OPIE_NO_ERASE_RECT_HACKFIX | ||
92 | // Fix for apps, that use QPainter::eraseRect() which doesn't work with styles | 98 | // Fix for apps, that use QPainter::eraseRect() which doesn't work with styles |
93 | // that set a background pixmap (it would be easier to fix eraseRect(), but | 99 | // that set a background pixmap (it would be easier to fix eraseRect(), but |
94 | // TT made it an inline ...) | 100 | // TT made it an inline ...) |
95 | 101 | ||
96 | void QPEApplication::polish ( QWidget *w ) | 102 | void QPEApplication::polish ( QWidget *w ) |
97 | { | 103 | { |
98 | #ifndef OPIE_NO_OVERRIDE_QT | 104 | #ifndef OPIE_NO_OVERRIDE_QT |
99 | //qDebug ( "QPEApplication::polish()" ); | 105 | //qDebug ( "QPEApplication::polish()" ); |
100 | 106 | ||
101 | for ( const color_fix_t *ptr = apps_that_need_special_colors; ptr-> m_app; ptr++ ) { | 107 | for ( const color_fix_t *ptr = apps_that_need_special_colors; ptr-> m_app; ptr++ ) { |
102 | if (( ::strcmp ( Opie::binaryName ( ), ptr-> m_app ) == 0 ) && | 108 | if (( ::strcmp ( Opie::binaryName ( ), ptr-> m_app ) == 0 ) && |
103 | ( ptr-> m_class ? w-> inherits ( ptr-> m_class ) : true ) && | 109 | ( ptr-> m_class ? w-> inherits ( ptr-> m_class ) : true ) && |
104 | ( ptr-> m_name ? ( ::strcmp ( w-> name ( ), ptr-> m_name ) == 0 ) : true )) { | 110 | ( ptr-> m_name ? ( ::strcmp ( w-> name ( ), ptr-> m_name ) == 0 ) : true )) { |
105 | QPalette pal = w-> palette ( ); | 111 | QPalette pal = w-> palette ( ); |
106 | pal. setColor ( ptr-> m_set, pal. color ( QPalette::Active, ptr-> m_get )); | 112 | pal. setColor ( ptr-> m_set, pal. color ( QPalette::Active, ptr-> m_get )); |
107 | w-> setPalette ( pal ); | 113 | w-> setPalette ( pal ); |
108 | } | 114 | } |
109 | } | 115 | } |
110 | #endif | 116 | #endif |
111 | QApplication::polish ( w ); | 117 | QApplication::polish ( w ); |
112 | } | 118 | } |
119 | #endif | ||
113 | 120 | ||
114 | 121 | ||
115 | #ifndef OPIE_NO_OVERRIDE_QT | 122 | #ifndef OPIE_NO_OVERRIDE_QT |
116 | // Fix for the binary incompatibility that TT introduced in Qt/E 2.3.4 -- point sizes | 123 | // Fix for the binary incompatibility that TT introduced in Qt/E 2.3.4 -- point sizes |
117 | // were multiplied by 10 (which was incorrect) | 124 | // were multiplied by 10 (which was incorrect) |
118 | 125 | ||
119 | QValueList <int> QFontDatabase::pointSizes ( QString const &family, QString const &style, QString const &charset ) | 126 | QValueList <int> QFontDatabase::pointSizes ( QString const &family, QString const &style, QString const &charset ) |
120 | { | 127 | { |
121 | //qDebug ( "QFontDatabase::pointSizes()" ); | 128 | //qDebug ( "QFontDatabase::pointSizes()" ); |
122 | 129 | ||
123 | QValueList <int> sl = pointSizes_NonWeak ( family, style, charset ); | 130 | QValueList <int> sl = pointSizes_NonWeak ( family, style, charset ); |
124 | 131 | ||