| -rw-r--r-- | core/launcher/taskbar.cpp | 8 | ||||
| -rw-r--r-- | library/custom-ipaq.h | 154 |
2 files changed, 8 insertions, 154 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 @@ -7,43 +7,43 @@ ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** -**********************************************************************/ +*********************************************************************/ #include "startmenu.h" #include "inputmethods.h" #include "mrulist.h" #include "systray.h" #include "calibrate.h" #include "wait.h" #include "appicons.h" #include "taskbar.h" #include "desktop.h" #include <qpe/qpeapplication.h> #include <qpe/qcopenvelope_qws.h> #include <qpe/global.h> -#ifdef QT_QWS_CUSTOM -#include <qpe/custom.h> -#endif +//#ifdef QT_QWS_CUSTOM +//#include <qpe/custom.h> +//#endif #if defined(QT_QWS_IPAQ) #include "qpe/custom-ipaq.h" #endif #include <qlabel.h> #include <qlayout.h> #include <qtimer.h> #include <qwindowsystem_qws.h> #include <qwidgetstack.h> #if defined( Q_WS_QWS ) 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 @@ -8,171 +8,37 @@ ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ - #include <unistd.h> #include <stdio.h> #include <signal.h> #include <fcntl.h> #include <sys/ioctl.h> #include <linux/soundcard.h> - #include <qpe/resource.h> -#include <qsound.g> - -// these are from collie_buzzer.c -// you could use these, or a real wav file somewhere -/* unsigned short tap_data[] = { */ -/* 0x0040 , 0xfec0 , 0xfc00 , 0x01c0 , 0xf940 , 0xfb40 , 0xc200 , 0x3e00 , */ -/* 0xd5c0 , 0xce80 , 0x3d00 , 0x1a80 , 0xc300 , 0x3d00 , 0xd140 , 0xd040 , */ -/* 0x1240 , 0x1180 , 0xc580 , 0x2480 , 0xe200 , 0x3d00 , 0xd440 , 0xc380 , */ -/* 0x24c0 , 0x0140 , 0xccc0 , 0x3a00 , 0x3a00 , 0xfb00 , 0x2e40 , 0xe580 , */ -/* 0xd300 , 0x1200 , 0xc780 , 0x3800 , 0x0f80 , 0x3700 , 0xf540 , 0x3700 , */ -/* 0xd540 , 0xfb00 , 0xd5c0 , 0x3600 , 0xcb40 , 0x2740 , 0xf680 , 0x33c0 , */ -/* 0x3400 , 0xdbc0 , 0xcc00 , 0xcc00 , 0xcd40 , 0x3100 , 0x3300 , 0x3300 , */ -/* 0x32c0 , 0x2500 , 0xcf80 , 0xda80 , 0xe140 , 0xe180 , 0x07c0 , 0xdec0 , */ -/* 0x01c0 , 0x2a80 , 0x2900 , 0xf740 , 0xdd40 , 0xd600 , 0xd680 , 0xe380 , */ -/* 0xf200 , 0xf9c0 , 0xd940 , 0xeb80 , 0xf080 , 0x0340 , 0xe180 , 0xe2c0 , */ -/* 0xe2c0 , 0xde00 , 0xdf00 , 0xe080 , 0xf300 , 0xeac0 , 0x2080 , 0x0e80 , */ -/* 0x1380 , 0x1280 , 0x2140 , 0x1900 , 0x1080 , 0x0400 , 0x0d00 , 0xe840 , */ -/* 0xe780 , 0xf880 , 0xee80 , 0xf300 , 0x1880 , 0x1580 , 0x1f80 , 0x1cc0 , */ -/* 0x0c40 , 0x1100 , 0x15c0 , 0x1140 , 0x1840 , 0x1c00 , 0x0d40 , 0x1000 , */ -/* 0x0fc0 , 0x1880 , 0x0080 , 0xfcc0 , 0x02c0 , 0xff40 , 0x0c40 , 0x0740 , */ -/* 0x0a00 , 0xff80 , 0x0840 , 0x1140 , 0x0fc0 , 0xf140 , 0x0000 , 0xec80 , */ -/* 0x0c40 , 0x1400 , 0x1300 , 0x0ac0 , 0xf580 , 0xea80 , 0xeb00 , 0xf180 , */ -/* 0xedc0 , 0xf240 , 0xf480 , 0xfa40 , 0x0e40 , 0x0540 , 0xf600 , 0x0880 , */ -/* 0x0840 , 0x0cc0 , 0xfb80 , 0x07c0 , 0xf180 , 0xed40 , 0xf140 , 0x09c0 , */ -/* 0x02c0 , 0x0400 , 0xf940 , 0xf300 , 0xf780 , 0x0980 , 0x0d40 , 0x0380 , */ -/* 0xff80 , 0xf680 , 0xf400 , 0xfa40 , 0xed00 , 0xf0c0 , 0x0300 , 0xf840 , */ -/* 0xfd00 , 0xf680 , 0xff00 , 0xf340 , 0xfa00 , 0xfd00 , 0xf180 , 0xf840 , */ -/* 0xf740 , 0xfd80 , 0x00c0 , 0x0e80 , 0x0ac0 , 0x0240 , 0xfd40 , 0xf1c0 , */ -/* 0xf200 , 0xfa80 , 0x0d00 , 0x0d00 , 0x0d00 , 0x0c00 , 0x0ac0 , 0x0a00 , */ -/* 0x0180 , 0x0300 , 0x0680 , 0x06c0 , 0x0500 , 0x06c0 , 0x03c0 , 0x0140 , */ -/* 0x0480 , 0x02c0 , 0x0900 , 0x0900 , 0x0900 , 0x0800 , 0x0040 , 0x00c0 , */ -/* 0x0140 , 0x01c0 , 0x03c0 , 0x0340 , 0x0400 , 0x0140 , 0x0000 , 0x02c0 , */ -/* 0x0380 , 0x0380 , 0x0000 , 0x0000 , 0x0040 , 0x0000 , 0x0000 , 0x0100 , */ -/* 0xffc0 , 0xff40 , 0xfe80 , 0xfd00 , 0xfd00 , 0xfd00 , 0xfe00 , 0xfe40 , */ -/* 0xfe80 , 0xff40 , 0xff00 , 0xff00 , 0xff00 , 0xff00 , 0x0000 , 0x0000 , */ -/* 0x0000 , 0x0000 , 0x0000 , }; */ - - -/* unsigned short click_data[] = { */ -/* 0x0100 , 0x0100 , 0x0100 , 0x0000 , */ -/* 0x0100 , 0xff00 , 0x0100 , 0x0000 , */ -/* 0xff00 , 0xff00 , 0xff00 , 0x0000 , */ -/* 0xff00 , 0xff00 , 0xff00 , 0xff00 , */ -/* 0xff00 , 0xff00 , 0x0000 , 0xff00 , */ -/* 0xff00 , 0xff00 , 0x0000 , 0xff00 , */ -/* 0xff00 , 0xff00 , 0xff00 , 0x0100 , */ -/* 0x0000 , 0xff00 , 0xfe00 , 0x0100 , */ -/* 0xff00 , 0x0100 , 0xff00 , 0x0100 , */ -/* 0x0100 , 0x0300 , 0xff00 , 0xff00 , */ -/* 0xff00 , 0x0100 , 0x0100 , 0x0000 , */ -/* 0xfe00 , 0xfe00 , 0xfe00 , 0xfc00 , */ -/* 0xfe00 , 0x0100 , 0xfd00 , 0xff00 , */ -/* 0xff00 , 0xfc00 , 0xfe00 , 0xfd00 , */ -/* 0x0100 , 0xfe00 , 0x0100 , 0xf800 , */ -/* 0xfe00 , 0xfe00 , 0xfc00 , 0xe600 , */ -/* 0xdb00 , 0x2500 , 0xdb00 , 0xee00 , */ -/* 0xdb00 , 0x0600 , 0xeb00 , 0x1f00 , */ -/* 0x1e00 , 0xeb00 , 0xfe00 , 0x0000 , */ -/* 0xff00 , 0x1900 , 0xef00 , 0xf700 , */ -/* 0x2100 , 0xe400 , 0x0100 , 0x0600 , */ -/* 0xff00 , 0x0300 , 0xf900 , 0x0f00 , */ -/* 0xf600 , 0x0100 , 0xfe00 , 0xf900 , */ -/* 0x0500 , 0xf500 , 0x0600 , 0xfb00 , */ -/* 0x0800 , 0x0100 , 0x0300 , 0x0100 , */ -/* 0xf700 , 0xfa00 , 0xfd00 , 0xfc00 , */ -/* 0x0800 , 0xfb00 , 0x0500 , 0xfe00 , */ -/* 0xfc00 , 0xfc00 , 0xfe00 , 0x0400 , */ -/* 0xff00 , 0xff00 , 0x0500 , 0x0100 , */ -/* 0xfc00 , 0xff00 , 0xfe00 , 0xfb00 , */ -/* 0x0200 , 0x0200 , 0xff00 , 0xfe00 , */ -/* 0xfe00 , 0x0600 , 0xfb00 , 0xff00 , */ -/* 0xfc00 , 0x0600 , 0xfb00 , 0xff00 , */ -/* 0xff00 , 0x0100 , 0xff00 , 0x0200 , */ -/* 0xff00 , 0xfb00 , 0xff00 , 0x0200 , */ -/* 0xff00 , 0x0200 , 0x0100 , 0xfe00 , */ -/* 0xfe00 , 0x0100 , 0xfd00 , 0x0200 , */ -/* 0xfc00 , 0x0800 , 0xfe00 , 0xfe00 , */ -/* 0x0400 , 0xfc00 , 0xff00 , 0xfc00 , */ -/* 0x0500 , 0x0200 , 0x0800 , 0x0200 , */ -/* 0x0100 , 0xfe00 , 0x0100 , 0xff00 , */ -/* 0x0700 , 0xfb00 , 0xfc00 , 0x0100 , */ -/* 0xfe00 , 0xfc00 , 0x0b00 , 0xfb00 , */ -/* 0xfb00 , 0x0700 , 0xfb00 , 0xfb00 , */ -/* 0x0100 , 0xff00 , 0xfb00 , 0xfd00 , */ -/* 0x0000 , 0xfe00 , 0xfe00 , 0xff00 , */ -/* 0xfc00 , 0x0400 , 0x0000 , 0xfe00 , */ -/* 0xff00 , 0x0200 , 0xff00 , 0x0000 , */ -/* 0x0500 , 0x0100 , 0x0100 , 0x0100 , */ -/* 0x0100 , 0x0000 , 0x0300 , 0xfe00 , */ -/* 0xff00 , 0x0100 , 0x0100 , 0xfe00 , */ -/* 0x0000 , 0xff00 , 0x0100 , 0xff00 , */ -/* 0x0200 , 0xff00 , 0xff00 , 0xff00 , */ -/* 0xff00 , 0xfe00 , 0x0000 , 0xff00 , */ -/* 0xfe00 , 0xff00 , 0xfd00 , 0x0000 , */ -/* 0xff00 , 0xfe00 , 0xff00 , 0xfc00 , */ -/* 0x0100 , 0xfd00 , 0xff00 , 0xff00 , */ -/* 0x0200 , 0xff00 , 0x0100 , 0xff00 , */ -/* 0xfc00 , 0x0300 , 0xff00 , 0x0200 , */ -/* 0xff00 , 0x0100 , 0xff00 , 0x0100 , */ -/* 0xff00 , 0xff00 , 0x0100 , 0xfe00 , */ -/* 0x0300 , 0xfc00 , 0x0100 , 0xff00 , */ -/* 0x0100 , 0x0100 , 0x0100 , 0xfc00 , */ -/* 0xff00 , 0x0100 , 0x0100 , 0xfe00 , */ -/* 0x0100 , 0xff00 , 0x0100 , 0xfc00 , */ -/* 0x0100 , 0x0200 , 0xff00 , 0x0100 , */ -/* 0xff00 , 0xff00 , 0x0200 , 0xfd00 , */ -/* 0xfe00 , 0x0100 , 0xff00 , 0x0100 , */ -/* 0xfe00 , 0x0100 , 0x0300 , 0xfe00 , */ -/* 0x0300 , 0xfe00 , 0xff00 , 0x0100 , */ -/* 0xff00 , 0x0200 , 0xfd00 , 0x0000 , */ -/* 0xff00 , 0x0200 , 0xff00 , 0x0200 , */ -/* 0xff00 , 0x0100 , 0x0000 , 0xff00 , */ -/* 0x0200 , 0x0100 , 0x0000 , 0xff00 , */ -/* 0x0100 , 0xfe00 , 0x0200 , 0xfe00 , */ -/* 0xfe00 , 0x0100 , 0xfe00 , 0x0100 , */ -/* 0xfd00 , 0xff00 , 0xff00 , 0xfe00 , */ -/* 0xff00 , 0xfc00 , 0x0100 , 0xfe00 , */ -/* 0x0100 , 0xff00 , 0xfe00 , 0xff00 , */ -/* 0xff00 , 0xfe00 , 0x0100 , 0xfe00 , */ -/* 0x0100 , 0xff00 , 0x0100 , 0xfe00 , */ -/* 0xff00 , 0x0200 , 0xfe00 , 0x0000 , */ -/* 0x0100 , 0x0200 , 0xff00 , 0x0200 , */ -/* 0xff00 , 0x0000 , 0x0100 , 0x0100 , */ -/* 0xff00 , 0x0200 , 0xfe00 , 0xff00 , */ -/* 0xff00 , 0xff00 , 0x0100 , 0x0000 , */ -/* 0xff00 , 0x0100 , 0xff00 , 0x0000 , */ -/* 0x0100 , 0xff00 , 0xfe00 , 0xff00 , */ -/* 0xff00 , 0x0100 , 0xff00 , 0x0100 , */ -/* 0xfe00 , 0xff00 , 0xff00 , 0xff00 , */ -/* 0xfe00 , 0xff00 , 0xff00 , 0x0100 , */ -/* 0xff00 , 0x0200 , 0xff00 , 0x0100 , */ -/* 0xff00 , 0xff00 }; */ - +#include <qsound.h> unsigned short alarm_data[] = { - 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x7fff , 0x7fff , 0x8000 , 0x8000 , // 0 - 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x7fff , 0x7fff , 0x8000 , 0x8000 , // 1 - 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x7fff , 0x7fff , 0x8000 , 0x8000 , // 2 + 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x7fff , 0x7fff , 0x8000 , 0x8000 , + 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x7fff , 0x7fff , 0x8000 , 0x8000 , + 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x7fff , 0x7fff , 0x8000 , 0x8000 , // 3 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x7fff , 0x7fff , 0x8000 , 0x8000 , // 4 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x7fff , 0x7fff , 0x8000 , 0x8000 , // 5 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x7fff , 0x7fff , 0x8000 , 0x8000 , // 6 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x7fff , 0x7fff , 0x8000 , 0x8000 , // 7 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x7fff , 0x7fff , 0x8000 , 0x8000 , // 8 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x7fff , 0x7fff , 0x8000 , 0x8000 , // 9 0 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x7fff , 0x7fff , 0x8000 , 0x8000 , // 0 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x7fff , 0x7fff , 0x8000 , 0x8000 , // 1 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x7fff , 0x7fff , 0x8000 , 0x8000 , // 2 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x7fff , 0x7fff , 0x8000 , 0x8000 , // 3 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x7fff , 0x7fff , 0x8000 , 0x8000 , // 4 @@ -632,56 +498,44 @@ unsigned short alarm_data[] = { 0x7fff , 0x7fff , 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x8000 , 0x8000 , // 8 0x7fff , 0x7fff , 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x8000 , 0x8000 , // 9 4 0x7fff , 0x7fff , 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x8000 , 0x8000 , // 0 0x7fff , 0x7fff , 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x8000 , 0x8000 , // 1 0x7fff , 0x7fff , 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x8000 , 0x8000 , // 2 0x7fff , 0x7fff , 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x8000 , 0x8000 , // 3 0x7fff , 0x7fff , 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x8000 , 0x8000 , // 4 0x7fff , 0x7fff , 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x8000 , 0x8000 , // 5 0x7fff , 0x7fff , 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x8000 , 0x8000 , // 6 0x7fff , 0x7fff , 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x8000 , 0x8000 , // 7 0x7fff , 0x7fff , 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x8000 , 0x8000 , // 8 0x7fff , 0x7fff , 0x7fff , 0x7fff , 0x8000 , 0x8000 , 0x8000 , 0x8000 , // 9 5 - }; #define CUSTOM_SOUND_ALARM \ { \ int dsp = ::open("/dev/dsp", O_RDWR); \ if(dsp == -1) { \ perror("open(\"/dev/dsp\")"); \ - return -1; \ } \ - // hope this works, and not blows out any devices.. int result = write( dsp, alarm_data, sizeof(alarm_data) ); \ ::close(dsp); \ } \ /* #define CUSTOM_SOUND_KEYCLICK \ */ /* { \ */ /* int dsp = ::open("/dev/dsp", O_RDWR); \ */ /* if(dsp == -1) { \ */ /* perror("open(\"/dev/dsp\")"); \ */ /* return -1; \ */ /* } \ */ /* // hope this works, and not blows out any devices.. */ /* int result = write( dsp, click_data, sizeof( click_data) ); \ */ /* ::close(dsp); \ */ /* } \ */ #define CUSTOM_SOUND_TOUCH \ { \ QSound::play(Resource::findSound("screensound"));\ -// may have to change this.. I'm doing this blind and deaf -/* int dsp = ::open("/dev/dsp", O_RDWR); \ */ -/* if(dsp == -1) { \ */ -/* perror("open(\"/dev/dsp\")"); \ */ -/* return -1; \ */ -/* } \ */ -/* // hope this works, and not blows out any devices.. */ -/* int result = write( dsp, tap_data, sizeof(tap_data) ); \ */ -/* ::close(dsp); \ */ } \ |