summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-05-22 16:43:38 (UTC)
committer harlekin <harlekin>2002-05-22 16:43:38 (UTC)
commit9b5016f30bb619b702664aad1e12cd4de4bc5b5b (patch) (unidiff)
treef053e522c1e33067bb7b60880a35c049753e2823
parentd7c7e0a272996ef3ae386e939d25737d3060e427 (diff)
downloadopie-9b5016f30bb619b702664aad1e12cd4de4bc5b5b.zip
opie-9b5016f30bb619b702664aad1e12cd4de4bc5b5b.tar.gz
opie-9b5016f30bb619b702664aad1e12cd4de4bc5b5b.tar.bz2
followup for custom-ipaq to make it compile again
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/taskbar.cpp16
-rw-r--r--library/custom-ipaq.h164
2 files changed, 17 insertions, 163 deletions
diff --git a/core/launcher/taskbar.cpp b/core/launcher/taskbar.cpp
index 54777c6..b69d165 100644
--- a/core/launcher/taskbar.cpp
+++ b/core/launcher/taskbar.cpp
@@ -16,7 +16,7 @@
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#include "startmenu.h" 21#include "startmenu.h"
22#include "inputmethods.h" 22#include "inputmethods.h"
@@ -32,9 +32,9 @@
32#include <qpe/qpeapplication.h> 32#include <qpe/qpeapplication.h>
33#include <qpe/qcopenvelope_qws.h> 33#include <qpe/qcopenvelope_qws.h>
34#include <qpe/global.h> 34#include <qpe/global.h>
35#ifdef QT_QWS_CUSTOM 35//#ifdef QT_QWS_CUSTOM
36#include <qpe/custom.h> 36//#include <qpe/custom.h>
37#endif 37//#endif
38#if defined(QT_QWS_IPAQ) 38#if defined(QT_QWS_IPAQ)
39#include "qpe/custom-ipaq.h" 39#include "qpe/custom-ipaq.h"
40#endif 40#endif
@@ -151,14 +151,14 @@ TaskBar::TaskBar() : QHBox(0, 0, WStyle_Customize | WStyle_Tool | WStyle_StaysOn
151 connect( inputMethods, SIGNAL(inputToggled(bool)), 151 connect( inputMethods, SIGNAL(inputToggled(bool)),
152 this, SLOT(calcMaxWindowRect()) ); 152 this, SLOT(calcMaxWindowRect()) );
153 //new QuickLauncher( this ); 153 //new QuickLauncher( this );
154 154
155 stack = new QWidgetStack( this ); 155 stack = new QWidgetStack( this );
156 stack->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) ); 156 stack->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) );
157 label = new QLabel(stack); 157 label = new QLabel(stack);
158 158
159 mru = new MRUList( stack ); 159 mru = new MRUList( stack );
160 stack->raiseWidget( mru ); 160 stack->raiseWidget( mru );
161 161
162 waitIcon = new Wait( this ); 162 waitIcon = new Wait( this );
163 (void) new AppIcons( this ); 163 (void) new AppIcons( this );
164 164
@@ -272,13 +272,13 @@ void TaskBar::receive( const QCString &msg, const QByteArray &data )
272 } else if ( msg == "soundAlarm()" ) { 272 } else if ( msg == "soundAlarm()" ) {
273 Desktop::soundAlarm(); 273 Desktop::soundAlarm();
274 } 274 }
275#ifdef CUSTOM_LEDS 275#ifdef CUSTOM_LEDS
276 else if ( msg == "setLed(int,bool)" ) { 276 else if ( msg == "setLed(int,bool)" ) {
277 int led, status; 277 int led, status;
278 stream >> led >> status; 278 stream >> led >> status;
279 CUSTOM_LEDS( led, status ); 279 CUSTOM_LEDS( led, status );
280 } 280 }
281#endif 281#endif
282} 282}
283 283
284QWidget *TaskBar::calibrate(bool) 284QWidget *TaskBar::calibrate(bool)
diff --git a/library/custom-ipaq.h b/library/custom-ipaq.h
index 6d3e50d..8434da7 100644
--- a/library/custom-ipaq.h
+++ b/library/custom-ipaq.h
@@ -17,154 +17,20 @@
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20
21#include <unistd.h> 20#include <unistd.h>
22#include <stdio.h> 21#include <stdio.h>
23#include <signal.h> 22#include <signal.h>
24#include <fcntl.h> 23#include <fcntl.h>
25#include <sys/ioctl.h> 24#include <sys/ioctl.h>
26#include <linux/soundcard.h> 25#include <linux/soundcard.h>
27
28#include <qpe/resource.h> 26#include <qpe/resource.h>
29#include <qsound.g> 27#include <qsound.h>
30
31// these are from collie_buzzer.c
32// you could use these, or a real wav file somewhere
33/* unsigned short tap_data[] = { */
34/* 0x0040 , 0xfec0 , 0xfc00 , 0x01c0 , 0xf940 , 0xfb40 , 0xc200 , 0x3e00 , */
35/* 0xd5c0 , 0xce80 , 0x3d00 , 0x1a80 , 0xc300 , 0x3d00 , 0xd140 , 0xd040 , */
36/* 0x1240 , 0x1180 , 0xc580 , 0x2480 , 0xe200 , 0x3d00 , 0xd440 , 0xc380 , */
37/* 0x24c0 , 0x0140 , 0xccc0 , 0x3a00 , 0x3a00 , 0xfb00 , 0x2e40 , 0xe580 , */
38/* 0xd300 , 0x1200 , 0xc780 , 0x3800 , 0x0f80 , 0x3700 , 0xf540 , 0x3700 , */
39/* 0xd540 , 0xfb00 , 0xd5c0 , 0x3600 , 0xcb40 , 0x2740 , 0xf680 , 0x33c0 , */
40/* 0x3400 , 0xdbc0 , 0xcc00 , 0xcc00 , 0xcd40 , 0x3100 , 0x3300 , 0x3300 , */
41/* 0x32c0 , 0x2500 , 0xcf80 , 0xda80 , 0xe140 , 0xe180 , 0x07c0 , 0xdec0 , */
42/* 0x01c0 , 0x2a80 , 0x2900 , 0xf740 , 0xdd40 , 0xd600 , 0xd680 , 0xe380 , */
43/* 0xf200 , 0xf9c0 , 0xd940 , 0xeb80 , 0xf080 , 0x0340 , 0xe180 , 0xe2c0 , */
44/* 0xe2c0 , 0xde00 , 0xdf00 , 0xe080 , 0xf300 , 0xeac0 , 0x2080 , 0x0e80 , */
45/* 0x1380 , 0x1280 , 0x2140 , 0x1900 , 0x1080 , 0x0400 , 0x0d00 , 0xe840 , */
46/* 0xe780 , 0xf880 , 0xee80 , 0xf300 , 0x1880 , 0x1580 , 0x1f80 , 0x1cc0 , */
47/* 0x0c40 , 0x1100 , 0x15c0 , 0x1140 , 0x1840 , 0x1c00 , 0x0d40 , 0x1000 , */
48/* 0x0fc0 , 0x1880 , 0x0080 , 0xfcc0 , 0x02c0 , 0xff40 , 0x0c40 , 0x0740 , */
49/* 0x0a00 , 0xff80 , 0x0840 , 0x1140 , 0x0fc0 , 0xf140 , 0x0000 , 0xec80 , */
50/* 0x0c40 , 0x1400 , 0x1300 , 0x0ac0 , 0xf580 , 0xea80 , 0xeb00 , 0xf180 , */
51/* 0xedc0 , 0xf240 , 0xf480 , 0xfa40 , 0x0e40 , 0x0540 , 0xf600 , 0x0880 , */
52/* 0x0840 , 0x0cc0 , 0xfb80 , 0x07c0 , 0xf180 , 0xed40 , 0xf140 , 0x09c0 , */
53/* 0x02c0 , 0x0400 , 0xf940 , 0xf300 , 0xf780 , 0x0980 , 0x0d40 , 0x0380 , */
54/* 0xff80 , 0xf680 , 0xf400 , 0xfa40 , 0xed00 , 0xf0c0 , 0x0300 , 0xf840 , */
55/* 0xfd00 , 0xf680 , 0xff00 , 0xf340 , 0xfa00 , 0xfd00 , 0xf180 , 0xf840 , */
56/* 0xf740 , 0xfd80 , 0x00c0 , 0x0e80 , 0x0ac0 , 0x0240 , 0xfd40 , 0xf1c0 , */
57/* 0xf200 , 0xfa80 , 0x0d00 , 0x0d00 , 0x0d00 , 0x0c00 , 0x0ac0 , 0x0a00 , */
58/* 0x0180 , 0x0300 , 0x0680 , 0x06c0 , 0x0500 , 0x06c0 , 0x03c0 , 0x0140 , */
59/* 0x0480 , 0x02c0 , 0x0900 , 0x0900 , 0x0900 , 0x0800 , 0x0040 , 0x00c0 , */
60/* 0x0140 , 0x01c0 , 0x03c0 , 0x0340 , 0x0400 , 0x0140 , 0x0000 , 0x02c0 , */
61/* 0x0380 , 0x0380 , 0x0000 , 0x0000 , 0x0040 , 0x0000 , 0x0000 , 0x0100 , */
62/* 0xffc0 , 0xff40 , 0xfe80 , 0xfd00 , 0xfd00 , 0xfd00 , 0xfe00 , 0xfe40 , */
63/* 0xfe80 , 0xff40 , 0xff00 , 0xff00 , 0xff00 , 0xff00 , 0x0000 , 0x0000 , */
64/* 0x0000 , 0x0000 , 0x0000 , }; */
65
66
67/* unsigned short click_data[] = { */
68/* 0x0100 , 0x0100 , 0x0100 , 0x0000 , */
69/* 0x0100 , 0xff00 , 0x0100 , 0x0000 , */
70/* 0xff00 , 0xff00 , 0xff00 , 0x0000 , */
71/* 0xff00 , 0xff00 , 0xff00 , 0xff00 , */
72/* 0xff00 , 0xff00 , 0x0000 , 0xff00 , */
73/* 0xff00 , 0xff00 , 0x0000 , 0xff00 , */
74/* 0xff00 , 0xff00 , 0xff00 , 0x0100 , */
75/* 0x0000 , 0xff00 , 0xfe00 , 0x0100 , */
76/* 0xff00 , 0x0100 , 0xff00 , 0x0100 , */
77/* 0x0100 , 0x0300 , 0xff00 , 0xff00 , */
78/* 0xff00 , 0x0100 , 0x0100 , 0x0000 , */
79/* 0xfe00 , 0xfe00 , 0xfe00 , 0xfc00 , */
80/* 0xfe00 , 0x0100 , 0xfd00 , 0xff00 , */
81/* 0xff00 , 0xfc00 , 0xfe00 , 0xfd00 , */
82/* 0x0100 , 0xfe00 , 0x0100 , 0xf800 , */
83/* 0xfe00 , 0xfe00 , 0xfc00 , 0xe600 , */
84/* 0xdb00 , 0x2500 , 0xdb00 , 0xee00 , */
85/* 0xdb00 , 0x0600 , 0xeb00 , 0x1f00 , */
86/* 0x1e00 , 0xeb00 , 0xfe00 , 0x0000 , */
87/* 0xff00 , 0x1900 , 0xef00 , 0xf700 , */
88/* 0x2100 , 0xe400 , 0x0100 , 0x0600 , */
89/* 0xff00 , 0x0300 , 0xf900 , 0x0f00 , */
90/* 0xf600 , 0x0100 , 0xfe00 , 0xf900 , */
91/* 0x0500 , 0xf500 , 0x0600 , 0xfb00 , */
92/* 0x0800 , 0x0100 , 0x0300 , 0x0100 , */
93/* 0xf700 , 0xfa00 , 0xfd00 , 0xfc00 , */
94/* 0x0800 , 0xfb00 , 0x0500 , 0xfe00 , */
95/* 0xfc00 , 0xfc00 , 0xfe00 , 0x0400 , */
96/* 0xff00 , 0xff00 , 0x0500 , 0x0100 , */
97/* 0xfc00 , 0xff00 , 0xfe00 , 0xfb00 , */
98/* 0x0200 , 0x0200 , 0xff00 , 0xfe00 , */
99/* 0xfe00 , 0x0600 , 0xfb00 , 0xff00 , */
100/* 0xfc00 , 0x0600 , 0xfb00 , 0xff00 , */
101/* 0xff00 , 0x0100 , 0xff00 , 0x0200 , */
102/* 0xff00 , 0xfb00 , 0xff00 , 0x0200 , */
103/* 0xff00 , 0x0200 , 0x0100 , 0xfe00 , */
104/* 0xfe00 , 0x0100 , 0xfd00 , 0x0200 , */
105/* 0xfc00 , 0x0800 , 0xfe00 , 0xfe00 , */
106/* 0x0400 , 0xfc00 , 0xff00 , 0xfc00 , */
107/* 0x0500 , 0x0200 , 0x0800 , 0x0200 , */
108/* 0x0100 , 0xfe00 , 0x0100 , 0xff00 , */
109/* 0x0700 , 0xfb00 , 0xfc00 , 0x0100 , */
110/* 0xfe00 , 0xfc00 , 0x0b00 , 0xfb00 , */
111/* 0xfb00 , 0x0700 , 0xfb00 , 0xfb00 , */
112/* 0x0100 , 0xff00 , 0xfb00 , 0xfd00 , */
113/* 0x0000 , 0xfe00 , 0xfe00 , 0xff00 , */
114/* 0xfc00 , 0x0400 , 0x0000 , 0xfe00 , */
115/* 0xff00 , 0x0200 , 0xff00 , 0x0000 , */
116/* 0x0500 , 0x0100 , 0x0100 , 0x0100 , */
117/* 0x0100 , 0x0000 , 0x0300 , 0xfe00 , */
118/* 0xff00 , 0x0100 , 0x0100 , 0xfe00 , */
119/* 0x0000 , 0xff00 , 0x0100 , 0xff00 , */
120/* 0x0200 , 0xff00 , 0xff00 , 0xff00 , */
121/* 0xff00 , 0xfe00 , 0x0000 , 0xff00 , */
122/* 0xfe00 , 0xff00 , 0xfd00 , 0x0000 , */
123/* 0xff00 , 0xfe00 , 0xff00 , 0xfc00 , */
124/* 0x0100 , 0xfd00 , 0xff00 , 0xff00 , */
125/* 0x0200 , 0xff00 , 0x0100 , 0xff00 , */
126/* 0xfc00 , 0x0300 , 0xff00 , 0x0200 , */
127/* 0xff00 , 0x0100 , 0xff00 , 0x0100 , */
128/* 0xff00 , 0xff00 , 0x0100 , 0xfe00 , */
129/* 0x0300 , 0xfc00 , 0x0100 , 0xff00 , */
130/* 0x0100 , 0x0100 , 0x0100 , 0xfc00 , */
131/* 0xff00 , 0x0100 , 0x0100 , 0xfe00 , */
132/* 0x0100 , 0xff00 , 0x0100 , 0xfc00 , */
133/* 0x0100 , 0x0200 , 0xff00 , 0x0100 , */
134/* 0xff00 , 0xff00 , 0x0200 , 0xfd00 , */
135/* 0xfe00 , 0x0100 , 0xff00 , 0x0100 , */
136/* 0xfe00 , 0x0100 , 0x0300 , 0xfe00 , */
137/* 0x0300 , 0xfe00 , 0xff00 , 0x0100 , */
138/* 0xff00 , 0x0200 , 0xfd00 , 0x0000 , */
139/* 0xff00 , 0x0200 , 0xff00 , 0x0200 , */
140/* 0xff00 , 0x0100 , 0x0000 , 0xff00 , */
141/* 0x0200 , 0x0100 , 0x0000 , 0xff00 , */
142/* 0x0100 , 0xfe00 , 0x0200 , 0xfe00 , */
143/* 0xfe00 , 0x0100 , 0xfe00 , 0x0100 , */
144/* 0xfd00 , 0xff00 , 0xff00 , 0xfe00 , */
145/* 0xff00 , 0xfc00 , 0x0100 , 0xfe00 , */
146/* 0x0100 , 0xff00 , 0xfe00 , 0xff00 , */
147/* 0xff00 , 0xfe00 , 0x0100 , 0xfe00 , */
148/* 0x0100 , 0xff00 , 0x0100 , 0xfe00 , */
149/* 0xff00 , 0x0200 , 0xfe00 , 0x0000 , */
150/* 0x0100 , 0x0200 , 0xff00 , 0x0200 , */
151/* 0xff00 , 0x0000 , 0x0100 , 0x0100 , */
152/* 0xff00 , 0x0200 , 0xfe00 , 0xff00 , */
153/* 0xff00 , 0xff00 , 0x0100 , 0x0000 , */
154/* 0xff00 , 0x0100 , 0xff00 , 0x0000 , */
155/* 0x0100 , 0xff00 , 0xfe00 , 0xff00 , */
156/* 0xff00 , 0x0100 , 0xff00 , 0x0100 , */
157/* 0xfe00 , 0xff00 , 0xff00 , 0xff00 , */
158/* 0xfe00 , 0xff00 , 0xff00 , 0x0100 , */
159/* 0xff00 , 0x0200 , 0xff00 , 0x0100 , */
160/* 0xff00 , 0xff00 }; */
161
162 28
163unsigned short alarm_data[] = { 29unsigned short alarm_data[] = {
164 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x7fff , 0x7fff , 0x8000 , 0x8000 , // 0 30 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x7fff , 0x7fff , 0x8000 , 0x8000 ,
165 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x7fff , 0x7fff , 0x8000 , 0x8000 , // 1 31 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x7fff , 0x7fff , 0x8000 , 0x8000 ,
166 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x7fff , 0x7fff , 0x8000 , 0x8000 , // 2 32 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x7fff , 0x7fff , 0x8000 , 0x8000 ,
167 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x7fff , 0x7fff , 0x8000 , 0x8000 , // 3 33 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x7fff , 0x7fff , 0x8000 , 0x8000 , // 3
168 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x7fff , 0x7fff , 0x8000 , 0x8000 , // 4 34 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x7fff , 0x7fff , 0x8000 , 0x8000 , // 4
169 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x7fff , 0x7fff , 0x8000 , 0x8000 , // 5 35 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x7fff , 0x7fff , 0x8000 , 0x8000 , // 5
170 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x7fff , 0x7fff , 0x8000 , 0x8000 , // 6 36 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x7fff , 0x7fff , 0x8000 , 0x8000 , // 6
@@ -641,19 +507,16 @@ unsigned short alarm_data[] = {
641 0x7fff , 0x7fff , 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x8000 , 0x8000 , // 7 507 0x7fff , 0x7fff , 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x8000 , 0x8000 , // 7
642 0x7fff , 0x7fff , 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x8000 , 0x8000 , // 8 508 0x7fff , 0x7fff , 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x8000 , 0x8000 , // 8
643 0x7fff , 0x7fff , 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x8000 , 0x8000 , // 9 5 509 0x7fff , 0x7fff , 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x8000 , 0x8000 , // 9 5
644
645}; 510};
646 511
647#define CUSTOM_SOUND_ALARM \ 512#define CUSTOM_SOUND_ALARM \
648{ \ 513{ \
649int dsp = ::open("/dev/dsp", O_RDWR); \ 514 int dsp = ::open("/dev/dsp", O_RDWR); \
650 if(dsp == -1) { \ 515 if(dsp == -1) { \
651 perror("open(\"/dev/dsp\")"); \ 516 perror("open(\"/dev/dsp\")"); \
652 return -1; \
653 } \ 517 } \
654 // hope this works, and not blows out any devices.. 518 int result = write( dsp, alarm_data, sizeof(alarm_data) ); \
655 int result = write( dsp, alarm_data, sizeof(alarm_data) ); \ 519 ::close(dsp); \
656 ::close(dsp); \
657} \ 520} \
658 521
659 522
@@ -674,14 +537,5 @@ int dsp = ::open("/dev/dsp", O_RDWR); \
674#define CUSTOM_SOUND_TOUCH \ 537#define CUSTOM_SOUND_TOUCH \
675{ \ 538{ \
676 QSound::play(Resource::findSound("screensound"));\ 539 QSound::play(Resource::findSound("screensound"));\
677// may have to change this.. I'm doing this blind and deaf
678/* int dsp = ::open("/dev/dsp", O_RDWR); \ */
679/* if(dsp == -1) { \ */
680/* perror("open(\"/dev/dsp\")"); \ */
681/* return -1; \ */
682/* } \ */
683/* // hope this works, and not blows out any devices.. */
684/* int result = write( dsp, tap_data, sizeof(tap_data) ); \ */
685/* ::close(dsp); \ */
686} \ 540} \
687 541