summaryrefslogtreecommitdiff
authoralwin <alwin>2004-08-01 10:32:56 (UTC)
committer alwin <alwin>2004-08-01 10:32:56 (UTC)
commit142d432ef9f8215636a81c358c828d4b6986a6ad (patch) (unidiff)
treefaf33f40f3e19fdd0362256c61e6774ea949f70c
parent24c8aff75cbb41ccb2acf3de79675c2f4fd7ecc9 (diff)
downloadopie-142d432ef9f8215636a81c358c828d4b6986a6ad.zip
opie-142d432ef9f8215636a81c358c828d4b6986a6ad.tar.gz
opie-142d432ef9f8215636a81c358c828d4b6986a6ad.tar.bz2
added a keyfilter singleton. All OPIE apps should use that instead of
the base from qte 'cause there are some stupids in handling pointers. key handlers from odevice-classes will handled at top of all others iPAQ and SIMPad are switched to that filter queue.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/device/odevice_ipaq.cpp55
-rw-r--r--libopie2/opiecore/device/odevice_simpad.cpp52
-rw-r--r--libopie2/opiecore/okeyfilter.cpp119
-rw-r--r--libopie2/opiecore/okeyfilter.h77
-rw-r--r--libopie2/opiecore/opiecore.pro2
5 files changed, 255 insertions, 50 deletions
diff --git a/libopie2/opiecore/device/odevice_ipaq.cpp b/libopie2/opiecore/device/odevice_ipaq.cpp
index 16c0538..791e409 100644
--- a/libopie2/opiecore/device/odevice_ipaq.cpp
+++ b/libopie2/opiecore/device/odevice_ipaq.cpp
@@ -1,66 +1,67 @@
1/* 1/*
2                 This file is part of the Opie Project 2 This file is part of the Opie Project
3              Copyright (C) The Opie Team <opie-devel@handhelds.org> 3 Copyright (C) The Opie Team <opie-devel@handhelds.org>
4 =. 4 =.
5 .=l. 5 .=l.
6           .>+-= 6 .>+-=
7 _;:,     .>    :=|. This program is free software; you can 7_;:, .> :=|. This program is free software; you can
8.> <`_,   >  .   <= redistribute it and/or modify it under 8.> <`_, > . <= redistribute it and/or modify it under
9:`=1 )Y*s>-.--   : the terms of the GNU Library General Public 9:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
10.="- .-=="i,     .._ License as published by the Free Software 10.="- .-=="i, .._ License as published by the Free Software
11 - .   .-<_>     .<> Foundation; either version 2 of the License, 11- . .-<_> .<> Foundation; either version 2 of the License,
12     ._= =}       : or (at your option) any later version. 12 ._= =} : or (at your option) any later version.
13    .%`+i>       _;_. 13 .%`+i> _;_.
14    .i_,=:_.      -<s. This program is distributed in the hope that 14 .i_,=:_. -<s. This program is distributed in the hope that
15     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 15 + . -:. = it will be useful, but WITHOUT ANY WARRANTY;
16    : ..    .:,     . . . without even the implied warranty of 16 : .. .:, . . . without even the implied warranty of
17    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 17 =_ + =;=|` MERCHANTABILITY or FITNESS FOR A
18  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU 18 _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU
19..}^=.=       =       ; Library General Public License for more 19..}^=.= = ; Library General Public License for more
20++=   -.     .`     .: details. 20++= -. .` .: details.
21 :     =  ...= . :.=- 21: = ...= . :.=-
22 -.   .:....=;==+<; You should have received a copy of the GNU 22-. .:....=;==+<; You should have received a copy of the GNU
23  -_. . .   )=.  = Library General Public License along with 23 -_. . . )=. = Library General Public License along with
24    --        :-=` this library; see the file COPYING.LIB. 24 -- :-=` this library; see the file COPYING.LIB.
25 If not, write to the Free Software Foundation, 25 If not, write to the Free Software Foundation,
26 Inc., 59 Temple Place - Suite 330, 26 Inc., 59 Temple Place - Suite 330,
27 Boston, MA 02111-1307, USA. 27 Boston, MA 02111-1307, USA.
28*/ 28*/
29 29
30#include "odevice_ipaq.h" 30#include "odevice_ipaq.h"
31 31
32/* QT */ 32/* QT */
33#include <qapplication.h> 33#include <qapplication.h>
34#include <qfile.h> 34#include <qfile.h>
35#include <qtextstream.h> 35#include <qtextstream.h>
36#include <qwindowsystem_qws.h> 36#include <qwindowsystem_qws.h>
37 37
38/* OPIE */ 38/* OPIE */
39#include <qpe/config.h> 39#include <qpe/config.h>
40#include <qpe/resource.h> 40#include <qpe/resource.h>
41#include <qpe/sound.h> 41#include <qpe/sound.h>
42#include <qpe/qcopenvelope_qws.h> 42#include <qpe/qcopenvelope_qws.h>
43#include <opie2/okeyfilter.h>
43 44
44/* STD */ 45/* STD */
45#include <fcntl.h> 46#include <fcntl.h>
46#include <math.h> 47#include <math.h>
47#include <stdlib.h> 48#include <stdlib.h>
48#include <signal.h> 49#include <signal.h>
49#include <sys/ioctl.h> 50#include <sys/ioctl.h>
50#include <sys/time.h> 51#include <sys/time.h>
51#include <unistd.h> 52#include <unistd.h>
52#ifndef QT_NO_SOUND 53#ifndef QT_NO_SOUND
53#include <linux/soundcard.h> 54#include <linux/soundcard.h>
54#endif 55#endif
55 56
56 57
57using namespace Opie::Core; 58using namespace Opie::Core;
58using namespace Opie::Core::Internal; 59using namespace Opie::Core::Internal;
59 60
60/* KERNEL */ 61/* KERNEL */
61#define OD_IOC(dir,type,number,size) (( dir << 30 ) | ( type << 8 ) | ( number ) | ( size << 16 )) 62#define OD_IOC(dir,type,number,size) (( dir << 30 ) | ( type << 8 ) | ( number ) | ( size << 16 ))
62 63
63#define OD_IO(type,number) OD_IOC(0,type,number,0) 64#define OD_IO(type,number) OD_IOC(0,type,number,0)
64#define OD_IOW(type,number,size) OD_IOC(1,type,number,sizeof(size)) 65#define OD_IOW(type,number,size) OD_IOC(1,type,number,sizeof(size))
65#define OD_IOR(type,number,size) OD_IOC(2,type,number,sizeof(size)) 66#define OD_IOR(type,number,size) OD_IOC(2,type,number,sizeof(size))
66#define OD_IORW(type,number,size) OD_IOC(3,type,number,sizeof(size)) 67#define OD_IORW(type,number,size) OD_IOC(3,type,number,sizeof(size))
@@ -146,50 +147,52 @@ void iPAQ::init(const QString& model)
146 case Model_iPAQ_H5xxx: 147 case Model_iPAQ_H5xxx:
147 case Model_iPAQ_H22xx: 148 case Model_iPAQ_H22xx:
148 d->m_rotation = Rot0; 149 d->m_rotation = Rot0;
149 break; 150 break;
150 case Model_iPAQ_H36xx: 151 case Model_iPAQ_H36xx:
151 case Model_iPAQ_H37xx: 152 case Model_iPAQ_H37xx:
152 case Model_iPAQ_H39xx: 153 case Model_iPAQ_H39xx:
153 default: 154 default:
154 d->m_rotation = Rot270; 155 d->m_rotation = Rot270;
155 break; 156 break;
156 157
157 } 158 }
158 159
159 m_leds [0] = m_leds [1] = Led_Off; 160 m_leds [0] = m_leds [1] = Led_Off;
160 161
161 m_power_timer = 0; 162 m_power_timer = 0;
162 163
163} 164}
164 165
165void iPAQ::initButtons() 166void iPAQ::initButtons()
166{ 167{
167 if ( d->m_buttons ) 168 if ( d->m_buttons )
168 return; 169 return;
169 170
170 if ( isQWS( ) ) 171 if ( isQWS( ) ) {
171 QWSServer::setKeyboardFilter ( this ); 172 Opie::Core::OKeyFilter::inst()->addPreHandler(this);
173 //QWSServer::setKeyboardFilter ( this );
174 }
172 175
173 d->m_buttons = new QValueList <ODeviceButton>; 176 d->m_buttons = new QValueList <ODeviceButton>;
174 177
175 for ( uint i = 0; i < ( sizeof( ipaq_buttons ) / sizeof( i_button )); i++ ) { 178 for ( uint i = 0; i < ( sizeof( ipaq_buttons ) / sizeof( i_button )); i++ ) {
176 i_button *ib = ipaq_buttons + i; 179 i_button *ib = ipaq_buttons + i;
177 ODeviceButton b; 180 ODeviceButton b;
178 181
179 if (( ib->model & d->m_model ) == d->m_model ) { 182 if (( ib->model & d->m_model ) == d->m_model ) {
180 b. setKeycode ( ib->code ); 183 b. setKeycode ( ib->code );
181 b. setUserText ( QObject::tr ( "Button", ib->utext )); 184 b. setUserText ( QObject::tr ( "Button", ib->utext ));
182 b. setPixmap ( Resource::loadPixmap ( ib->pix )); 185 b. setPixmap ( Resource::loadPixmap ( ib->pix ));
183 b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( ib->fpressedservice ), ib->fpressedaction )); 186 b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( ib->fpressedservice ), ib->fpressedaction ));
184 b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( ib->fheldservice ), ib->fheldaction )); 187 b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( ib->fheldservice ), ib->fheldaction ));
185 188
186 d->m_buttons->append ( b ); 189 d->m_buttons->append ( b );
187 } 190 }
188 } 191 }
189 reloadButtonMapping(); 192 reloadButtonMapping();
190 193
191 QCopChannel *sysch = new QCopChannel ( "QPE/System", this ); 194 QCopChannel *sysch = new QCopChannel ( "QPE/System", this );
192 connect ( sysch, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( systemMessage(const QCString&,const QByteArray&))); 195 connect ( sysch, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( systemMessage(const QCString&,const QByteArray&)));
193} 196}
194 197
195QValueList <OLed> iPAQ::ledList() const 198QValueList <OLed> iPAQ::ledList() const
@@ -250,58 +253,58 @@ bool iPAQ::setLedState ( OLed l, OLedState st )
250 m_leds [0] = st; 253 m_leds [0] = st;
251 return true; 254 return true;
252 } 255 }
253 } 256 }
254 } 257 }
255 return false; 258 return false;
256} 259}
257 260
258 261
259bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, bool autoRepeat ) 262bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, bool autoRepeat )
260{ 263{
261 int newkeycode = keycode; 264 int newkeycode = keycode;
262 265
263 switch ( keycode ) { 266 switch ( keycode ) {
264 // H38xx/H39xx have no "Q" key anymore - this is now the Mail key 267 // H38xx/H39xx have no "Q" key anymore - this is now the Mail key
265 case HardKey_Menu: { 268 case HardKey_Menu: {
266 if (( d->m_model == Model_iPAQ_H38xx ) || 269 if (( d->m_model == Model_iPAQ_H38xx ) ||
267 ( d->m_model == Model_iPAQ_H39xx ) || 270 ( d->m_model == Model_iPAQ_H39xx ) ||
268 ( d->m_model == Model_iPAQ_H5xxx)) { 271 ( d->m_model == Model_iPAQ_H5xxx)) {
269 newkeycode = HardKey_Mail; 272 newkeycode = HardKey_Mail;
270 } 273 }
271 break; 274 break;
272 } 275 }
273 276
274 // Rotate cursor keys 180° or 270° 277 // Rotate cursor keys 180 or 270
275 case Key_Left : 278 case Key_Left :
276 case Key_Right: 279 case Key_Right:
277 case Key_Up : 280 case Key_Up :
278 case Key_Down : { 281 case Key_Down : {
279 if (( d->m_model == Model_iPAQ_H31xx ) || 282 if (( d->m_model == Model_iPAQ_H31xx ) ||
280 ( d->m_model == Model_iPAQ_H38xx )) { 283 ( d->m_model == Model_iPAQ_H38xx )) {
281 newkeycode = Key_Left + ( keycode - Key_Left + 2 ) % 4; 284 newkeycode = Key_Left + ( keycode - Key_Left + 2 ) % 4;
282 } 285 }
283 // Rotate the cursor keys by 270° 286 // Rotate the cursor keys by 270
284 // keycode - Key_Left = position of the button starting from left clockwise 287 // keycode - Key_Left = position of the button starting from left clockwise
285 // add the rotation to it and modolo. No we've the original offset 288 // add the rotation to it and modolo. No we've the original offset
286 // add the offset to the Key_Left key 289 // add the offset to the Key_Left key
287 if ( d-> m_model == Model_iPAQ_H5xxx ) 290 if ( d-> m_model == Model_iPAQ_H5xxx )
288 newkeycode = Key_Left + ( keycode - Key_Left + 3 ) % 4; 291 newkeycode = Key_Left + ( keycode - Key_Left + 3 ) % 4;
289 break; 292 break;
290 } 293 }
291 294
292 // map Power Button short/long press to F34/F35 295 // map Power Button short/long press to F34/F35
293 case Key_SysReq: { 296 case Key_SysReq: {
294 if ( isPress ) { 297 if ( isPress ) {
295 if ( m_power_timer ) 298 if ( m_power_timer )
296 killTimer ( m_power_timer ); 299 killTimer ( m_power_timer );
297 m_power_timer = startTimer ( 500 ); 300 m_power_timer = startTimer ( 500 );
298 } 301 }
299 else if ( m_power_timer ) { 302 else if ( m_power_timer ) {
300 killTimer ( m_power_timer ); 303 killTimer ( m_power_timer );
301 m_power_timer = 0; 304 m_power_timer = 0;
302 QWSServer::sendKeyEvent ( -1, HardKey_Suspend, 0, true, false ); 305 QWSServer::sendKeyEvent ( -1, HardKey_Suspend, 0, true, false );
303 QWSServer::sendKeyEvent ( -1, HardKey_Suspend, 0, false, false ); 306 QWSServer::sendKeyEvent ( -1, HardKey_Suspend, 0, false, false );
304 } 307 }
305 newkeycode = Key_unknown; 308 newkeycode = Key_unknown;
306 break; 309 break;
307 } 310 }
@@ -389,49 +392,49 @@ bool iPAQ::setDisplayBrightness ( int bright )
389 int fd; 392 int fd;
390 393
391 if ( bright > 255 ) 394 if ( bright > 255 )
392 bright = 255; 395 bright = 255;
393 if ( bright < 0 ) 396 if ( bright < 0 )
394 bright = 0; 397 bright = 0;
395 398
396 if (( fd = ::open ( "/dev/touchscreen/0", O_WRONLY )) >= 0 ) { 399 if (( fd = ::open ( "/dev/touchscreen/0", O_WRONLY )) >= 0 ) {
397 FLITE_IN bl; 400 FLITE_IN bl;
398 bl. mode = 1; 401 bl. mode = 1;
399 bl. pwr = bright ? 1 : 0; 402 bl. pwr = bright ? 1 : 0;
400 bl. brightness = ( bright * ( displayBrightnessResolution() - 1 ) + 127 ) / 255; 403 bl. brightness = ( bright * ( displayBrightnessResolution() - 1 ) + 127 ) / 255;
401 res = ( ::ioctl ( fd, FLITE_ON, &bl ) == 0 ); 404 res = ( ::ioctl ( fd, FLITE_ON, &bl ) == 0 );
402 ::close ( fd ); 405 ::close ( fd );
403 } 406 }
404 return res; 407 return res;
405} 408}
406 409
407int iPAQ::displayBrightnessResolution() const 410int iPAQ::displayBrightnessResolution() const
408{ 411{
409 switch ( model()) { 412 switch ( model()) {
410 case Model_iPAQ_H31xx: 413 case Model_iPAQ_H31xx:
411 case Model_iPAQ_H36xx: 414 case Model_iPAQ_H36xx:
412 case Model_iPAQ_H37xx: 415 case Model_iPAQ_H37xx:
413 return 128; // really 256, but >128 could damage the LCD 416 return 128; // really 256, but >128 could damage the LCD
414 417
415 case Model_iPAQ_H38xx: 418 case Model_iPAQ_H38xx:
416 case Model_iPAQ_H39xx: 419 case Model_iPAQ_H39xx:
417 return 64; 420 return 64;
418 case Model_iPAQ_H5xxx: 421 case Model_iPAQ_H5xxx:
419 return 255; 422 return 255;
420 423
421 default: 424 default:
422 return 2; 425 return 2;
423 } 426 }
424} 427}
425 428
426 429
427bool iPAQ::hasLightSensor() const 430bool iPAQ::hasLightSensor() const
428{ 431{
429 return true; 432 return true;
430} 433}
431 434
432int iPAQ::readLightSensor() 435int iPAQ::readLightSensor()
433{ 436{
434 int fd; 437 int fd;
435 int val = -1; 438 int val = -1;
436 439
437 if (( fd = ::open ( "/proc/hal/light_sensor", O_RDONLY )) >= 0 ) { 440 if (( fd = ::open ( "/proc/hal/light_sensor", O_RDONLY )) >= 0 ) {
diff --git a/libopie2/opiecore/device/odevice_simpad.cpp b/libopie2/opiecore/device/odevice_simpad.cpp
index e62ea18..6c3253c 100644
--- a/libopie2/opiecore/device/odevice_simpad.cpp
+++ b/libopie2/opiecore/device/odevice_simpad.cpp
@@ -1,66 +1,67 @@
1/* 1/*
2                 This file is part of the Opie Project 2 This file is part of the Opie Project
3              Copyright (C) The Opie Team <opie-devel@handhelds.org> 3 Copyright (C) The Opie Team <opie-devel@handhelds.org>
4 =. 4 =.
5 .=l. 5 .=l.
6           .>+-= 6 .>+-=
7 _;:,     .>    :=|. This program is free software; you can 7_;:, .> :=|. This program is free software; you can
8.> <`_,   >  .   <= redistribute it and/or modify it under 8.> <`_, > . <= redistribute it and/or modify it under
9:`=1 )Y*s>-.--   : the terms of the GNU Library General Public 9:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
10.="- .-=="i,     .._ License as published by the Free Software 10.="- .-=="i, .._ License as published by the Free Software
11 - .   .-<_>     .<> Foundation; either version 2 of the License, 11- . .-<_> .<> Foundation; either version 2 of the License,
12     ._= =}       : or (at your option) any later version. 12 ._= =} : or (at your option) any later version.
13    .%`+i>       _;_. 13 .%`+i> _;_.
14    .i_,=:_.      -<s. This program is distributed in the hope that 14 .i_,=:_. -<s. This program is distributed in the hope that
15     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 15 + . -:. = it will be useful, but WITHOUT ANY WARRANTY;
16    : ..    .:,     . . . without even the implied warranty of 16 : .. .:, . . . without even the implied warranty of
17    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 17 =_ + =;=|` MERCHANTABILITY or FITNESS FOR A
18  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU 18 _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU
19..}^=.=       =       ; Library General Public License for more 19..}^=.= = ; Library General Public License for more
20++=   -.     .`     .: details. 20++= -. .` .: details.
21 :     =  ...= . :.=- 21: = ...= . :.=-
22 -.   .:....=;==+<; You should have received a copy of the GNU 22-. .:....=;==+<; You should have received a copy of the GNU
23  -_. . .   )=.  = Library General Public License along with 23 -_. . . )=. = Library General Public License along with
24    --        :-=` this library; see the file COPYING.LIB. 24 -- :-=` this library; see the file COPYING.LIB.
25 If not, write to the Free Software Foundation, 25 If not, write to the Free Software Foundation,
26 Inc., 59 Temple Place - Suite 330, 26 Inc., 59 Temple Place - Suite 330,
27 Boston, MA 02111-1307, USA. 27 Boston, MA 02111-1307, USA.
28*/ 28*/
29 29
30#include "odevice_simpad.h" 30#include "odevice_simpad.h"
31 31
32/* QT */ 32/* QT */
33#include <qapplication.h> 33#include <qapplication.h>
34#include <qfile.h> 34#include <qfile.h>
35#include <qtextstream.h> 35#include <qtextstream.h>
36#include <qwindowsystem_qws.h> 36#include <qwindowsystem_qws.h>
37 37
38/* OPIE */ 38/* OPIE */
39#include <qpe/config.h> 39#include <qpe/config.h>
40#include <qpe/resource.h> 40#include <qpe/resource.h>
41#include <qpe/sound.h> 41#include <qpe/sound.h>
42#include <qpe/qcopenvelope_qws.h> 42#include <qpe/qcopenvelope_qws.h>
43#include <opie2/okeyfilter.h>
43 44
44/* STD */ 45/* STD */
45#include <fcntl.h> 46#include <fcntl.h>
46#include <math.h> 47#include <math.h>
47#include <stdlib.h> 48#include <stdlib.h>
48#include <signal.h> 49#include <signal.h>
49#include <sys/ioctl.h> 50#include <sys/ioctl.h>
50#include <sys/time.h> 51#include <sys/time.h>
51#include <unistd.h> 52#include <unistd.h>
52#ifndef QT_NO_SOUND 53#ifndef QT_NO_SOUND
53#include <linux/soundcard.h> 54#include <linux/soundcard.h>
54#endif 55#endif
55 56
56using namespace Opie::Core; 57using namespace Opie::Core;
57using namespace Opie::Core::Internal; 58using namespace Opie::Core::Internal;
58 59
59struct s_button simpad_buttons [] = { 60struct s_button simpad_buttons [] = {
60 { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, 61 { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus,
61 Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Lower+Up"), 62 Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Lower+Up"),
62 "devicebuttons/simpad_lower_up", 63 "devicebuttons/simpad_lower_up",
63 "datebook", "nextView()", 64 "datebook", "nextView()",
64 "today", "raise()" }, 65 "today", "raise()" },
65 { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, 66 { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus,
66 Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Lower+Down"), 67 Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Lower+Down"),
@@ -124,50 +125,53 @@ void SIMpad::init(const QString&)
124 d->m_modelstr = "SL4"; 125 d->m_modelstr = "SL4";
125 d->m_model = Model_SIMpad_SL4; 126 d->m_model = Model_SIMpad_SL4;
126 127
127 switch ( d->m_model ) { 128 switch ( d->m_model ) {
128 default: 129 default:
129 d->m_rotation = Rot0; 130 d->m_rotation = Rot0;
130 d->m_direction = CCW; 131 d->m_direction = CCW;
131 d->m_holdtime = 1000; // 1000ms 132 d->m_holdtime = 1000; // 1000ms
132 133
133 break; 134 break;
134 } 135 }
135 136
136 //Distribution detecting code is now in base class 137 //Distribution detecting code is now in base class
137 m_leds [0] = m_leds [1] = Led_Off; 138 m_leds [0] = m_leds [1] = Led_Off;
138 139
139 m_power_timer = 0; 140 m_power_timer = 0;
140 141
141} 142}
142 143
143void SIMpad::initButtons() 144void SIMpad::initButtons()
144{ 145{
145 if ( d->m_buttons ) 146 if ( d->m_buttons )
146 return; 147 return;
147 148
148 if ( isQWS( ) ) 149 if ( isQWS( ) ) {
149 QWSServer::setKeyboardFilter ( this ); 150 Opie::Core::OKeyFilter::inst()->addPreHandler(this);
151// QWSServer::setKeyboardFilter ( this );
152 }
153
150 154
151 d->m_buttons = new QValueList <ODeviceButton>; 155 d->m_buttons = new QValueList <ODeviceButton>;
152 156
153 for ( uint i = 0; i < ( sizeof( simpad_buttons ) / sizeof( s_button )); i++ ) { 157 for ( uint i = 0; i < ( sizeof( simpad_buttons ) / sizeof( s_button )); i++ ) {
154 s_button *sb = simpad_buttons + i; 158 s_button *sb = simpad_buttons + i;
155 ODeviceButton b; 159 ODeviceButton b;
156 160
157 if (( sb->model & d->m_model ) == d->m_model ) { 161 if (( sb->model & d->m_model ) == d->m_model ) {
158 b. setKeycode ( sb->code ); 162 b. setKeycode ( sb->code );
159 b. setUserText ( QObject::tr ( "Button", sb->utext )); 163 b. setUserText ( QObject::tr ( "Button", sb->utext ));
160 b. setPixmap ( Resource::loadPixmap ( sb->pix )); 164 b. setPixmap ( Resource::loadPixmap ( sb->pix ));
161 b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( sb->fpressedservice ), sb->fpressedaction )); 165 b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( sb->fpressedservice ), sb->fpressedaction ));
162 b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( sb->fheldservice ), sb->fheldaction )); 166 b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( sb->fheldservice ), sb->fheldaction ));
163 167
164 d->m_buttons->append ( b ); 168 d->m_buttons->append ( b );
165 } 169 }
166 } 170 }
167 reloadButtonMapping(); 171 reloadButtonMapping();
168 172
169 QCopChannel *sysch = new QCopChannel ( "QPE/System", this ); 173 QCopChannel *sysch = new QCopChannel ( "QPE/System", this );
170 connect ( sysch, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( systemMessage(const QCString&,const QByteArray&))); 174 connect ( sysch, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( systemMessage(const QCString&,const QByteArray&)));
171} 175}
172 176
173// SIMpad boardcontrol register CS3 177// SIMpad boardcontrol register CS3
@@ -197,49 +201,49 @@ QValueList <OLed> SIMpad::ledList() const
197{ 201{
198 QValueList <OLed> vl; 202 QValueList <OLed> vl;
199 vl << Led_Power; //FIXME which LED is LED2 ? The green one or the amber one? 203 vl << Led_Power; //FIXME which LED is LED2 ? The green one or the amber one?
200 //vl << Led_Mail; //TODO find out if LED1 is accessible anyway 204 //vl << Led_Mail; //TODO find out if LED1 is accessible anyway
201 return vl; 205 return vl;
202} 206}
203 207
204QValueList <OLedState> SIMpad::ledStateList ( OLed l ) const 208QValueList <OLedState> SIMpad::ledStateList ( OLed l ) const
205{ 209{
206 QValueList <OLedState> vl; 210 QValueList <OLedState> vl;
207 211
208 if ( l == Led_Power ) //FIXME which LED is LED2 ? The green one or the amber one? 212 if ( l == Led_Power ) //FIXME which LED is LED2 ? The green one or the amber one?
209 vl << Led_Off << Led_On; 213 vl << Led_Off << Led_On;
210 //else if ( l == Led_Mail ) //TODO find out if LED1 is accessible anyway 214 //else if ( l == Led_Mail ) //TODO find out if LED1 is accessible anyway
211 //vl << Led_Off; 215 //vl << Led_Off;
212 return vl; 216 return vl;
213} 217}
214 218
215OLedState SIMpad::ledState ( OLed l ) const 219OLedState SIMpad::ledState ( OLed l ) const
216{ 220{
217 switch ( l ) { 221 switch ( l ) {
218 case Led_Power: 222 case Led_Power:
219 return m_leds [0]; 223 return m_leds [0];
220 //case Led_Mail: 224 //case Led_Mail:
221 //return m_leds [1]; 225 // return m_leds [1];
222 default: 226 default:
223 return Led_Off; 227 return Led_Off;
224 } 228 }
225} 229}
226 230
227bool SIMpad::setLedState ( OLed l, OLedState st ) 231bool SIMpad::setLedState ( OLed l, OLedState st )
228{ 232{
229#if 0 233#if 0
230 static int fd = ::open ( SIMPAD_BOARDCONTROL, O_RDWR | O_NONBLOCK ); 234 static int fd = ::open ( SIMPAD_BOARDCONTROL, O_RDWR | O_NONBLOCK );
231 235
232 /*TODO Implement this like that: 236 /*TODO Implement this like that:
233 read from cs3 237 read from cs3
234 && with SIMPAD_LED2_ON 238 && with SIMPAD_LED2_ON
235 write to cs3 */ 239 write to cs3 */
236 m_leds [0] = st; 240 m_leds [0] = st;
237 return true; 241 return true;
238 } 242 }
239 } 243 }
240 } 244 }
241 245
242#endif 246#endif
243 return false; 247 return false;
244} 248}
245 249
diff --git a/libopie2/opiecore/okeyfilter.cpp b/libopie2/opiecore/okeyfilter.cpp
new file mode 100644
index 0000000..d806dbd
--- a/dev/null
+++ b/libopie2/opiecore/okeyfilter.cpp
@@ -0,0 +1,119 @@
1/*
2 This file is part of the Opie Project
3 =. Copyright (C) 2004 Rajko 'Alwin' Albrecht <alwin@handhelds.org>
4 .=l. Copyright (C) The Opie Team <opie-devel@handhelds.org>
5 .>+-=
6_;:, .> :=|. This program is free software; you can
7.> <`_, > . <= redistribute it and/or modify it under
8:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
9.="- .-=="i, .._ License as published by the Free Software
10- . .-<_> .<> Foundation; either version 2 of the License,
11 ._= =} : or (at your option) any later version.
12 .%`+i> _;_.
13 .i_,=:_. -<s. This program is distributed in the hope that
14 + . -:. = it will be useful, but WITHOUT ANY WARRANTY;
15 : .. .:, . . . without even the implied warranty of
16 =_ + =;=|` MERCHANTABILITY or FITNESS FOR A
17 _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU
18..}^=.= = ; Library General Public License for more
19++= -. .` .: details.
20: = ...= . :.=-
21-. .:....=;==+<; You should have received a copy of the GNU
22 -_. . . )=. = Library General Public License along with
23 -- :-=` this library; see the file COPYING.LIB.
24 If not, write to the Free Software Foundation,
25 Inc., 59 Temple Place - Suite 330,
26 Boston, MA 02111-1307, USA.
27*/
28
29#include "okeyfilter.h"
30#include "device/odevice.h"
31#include "odebug.h"
32
33namespace Opie {
34namespace Core {
35
36QValueList<QWSServer::KeyboardFilter*> OKeyFilter::filterList;
37QValueList<QWSServer::KeyboardFilter*> OKeyFilter::preFilterList;
38
39OKeyFilter::OKeyFilter()
40 :QWSServer::KeyboardFilter()
41{
42 filterList.clear();
43 preFilterList.clear();
44 if ( isQWS( ) ) {
45 QWSServer::setKeyboardFilter ( this );
46 }
47}
48
49OKeyFilter::~OKeyFilter()
50{
51}
52
53OKeyFilter* OKeyFilter::inst()
54{
55 static OKeyFilter*ofilter = 0;
56 if (!ofilter) {
57 ofilter = new OKeyFilter;
58 }
59 return ofilter;
60}
61
62bool OKeyFilter::filter( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat )
63{
64 QValueList<QWSServer::KeyboardFilter*>::Iterator iter;
65 for (iter=preFilterList.begin();iter!=preFilterList.end();++iter) {
66 if ((*iter)->filter(unicode,keycode,modifiers,isPress,autoRepeat)) {
67 return true;
68 }
69 }
70 for (iter=filterList.begin();iter!=filterList.end();++iter) {
71 if ((*iter)->filter(unicode,keycode,modifiers,isPress,autoRepeat)) {
72 return true;
73 }
74 }
75 return false;
76}
77
78void OKeyFilter::addHandler(QWSServer::KeyboardFilter*aF)
79{
80 if (filterList.find(aF)!=filterList.end()) {
81 return;
82 }
83 odebug << "adding a keyboard filter handler"<<oendl;
84 filterList.append(aF);
85}
86
87void OKeyFilter::remHandler(QWSServer::KeyboardFilter*aF)
88{
89 QValueList<QWSServer::KeyboardFilter*>::Iterator iter;
90 if ( (iter=filterList.find(aF))==filterList.end() ) {
91 return;
92 }
93 odebug << "removing a keyboard filter handler"<<oendl;
94 filterList.remove(iter);
95}
96
97void OKeyFilter::addPreHandler(QWSServer::KeyboardFilter*aF)
98{
99 if (preFilterList.find(aF)!=preFilterList.end()) {
100 return;
101 }
102 odebug << "adding a preferred keyboard filter handler"<<oendl;
103 preFilterList.append(aF);
104}
105
106void OKeyFilter::remPreHandler(QWSServer::KeyboardFilter*aF)
107{
108 QValueList<QWSServer::KeyboardFilter*>::Iterator iter;
109 if ( (iter=preFilterList.find(aF))==preFilterList.end() ) {
110 return;
111 }
112 odebug << "removing a preferred keyboard filter handler"<<oendl;
113 preFilterList.remove(iter);
114}
115
116/* namespace Core */
117}
118/* namespace Opie */
119}
diff --git a/libopie2/opiecore/okeyfilter.h b/libopie2/opiecore/okeyfilter.h
new file mode 100644
index 0000000..3f9f744
--- a/dev/null
+++ b/libopie2/opiecore/okeyfilter.h
@@ -0,0 +1,77 @@
1/*
2 This file is part of the Opie Project
3 =. Copyright (C) 2004 Rajko 'Alwin' Albrecht <alwin@handhelds.org>
4 .=l. Copyright (C) The Opie Team <opie-devel@handhelds.org>
5 .>+-=
6_;:, .> :=|. This program is free software; you can
7.> <`_, > . <= redistribute it and/or modify it under
8:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
9.="- .-=="i, .._ License as published by the Free Software
10- . .-<_> .<> Foundation; either version 2 of the License,
11 ._= =} : or (at your option) any later version.
12 .%`+i> _;_.
13 .i_,=:_. -<s. This program is distributed in the hope that
14 + . -:. = it will be useful, but WITHOUT ANY WARRANTY;
15 : .. .:, . . . without even the implied warranty of
16 =_ + =;=|` MERCHANTABILITY or FITNESS FOR A
17 _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU
18..}^=.= = ; Library General Public License for more
19++= -. .` .: details.
20: = ...= . :.=-
21-. .:....=;==+<; You should have received a copy of the GNU
22 -_. . . )=. = Library General Public License along with
23 -- :-=` this library; see the file COPYING.LIB.
24 If not, write to the Free Software Foundation,
25 Inc., 59 Temple Place - Suite 330,
26 Boston, MA 02111-1307, USA.
27*/
28
29/* QT */
30#include <qwindowsystem_qws.h>
31#include <qvaluelist.h>
32
33namespace Opie {
34namespace Core {
35 class ODevice;
36namespace Internal {
37 class iPAQ;
38 class SIMpad;
39}
40
41/**
42 * A singleton which will manage all possible keyboard filters inside opie.
43 * It makes sure that key handlers of odevice are checked first than the
44 * keyfilters of software.
45 * @short a keyfilter proxy
46 * @see QWSServer::KeyboardFilter
47 * @author Rajko Albrecht
48 * @version 1.0
49 */
50class OKeyFilter:public QWSServer::KeyboardFilter
51{
52 friend class Opie::Core::ODevice;
53 friend class Opie::Core::Internal::iPAQ;
54 friend class Opie::Core::Internal::SIMpad;
55
56 static QValueList<QWSServer::KeyboardFilter*> filterList;
57 static QValueList<QWSServer::KeyboardFilter*> preFilterList;
58
59 OKeyFilter();
60 OKeyFilter(const OKeyFilter&):QWSServer::KeyboardFilter(){};
61
62protected:
63 void addPreHandler(QWSServer::KeyboardFilter*);
64 void remPreHandler(QWSServer::KeyboardFilter*);
65
66public:
67 virtual ~OKeyFilter();
68 virtual bool filter( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat );
69
70 void addHandler(QWSServer::KeyboardFilter*);
71 void remHandler(QWSServer::KeyboardFilter*);
72
73 static OKeyFilter*inst();
74};
75
76}
77}
diff --git a/libopie2/opiecore/opiecore.pro b/libopie2/opiecore/opiecore.pro
index 5056d48..8189a7c 100644
--- a/libopie2/opiecore/opiecore.pro
+++ b/libopie2/opiecore/opiecore.pro
@@ -1,46 +1,48 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qt warn_on 2CONFIG += qt warn_on
3DESTDIR = $(OPIEDIR)/lib 3DESTDIR = $(OPIEDIR)/lib
4HEADERS = oapplication.h \ 4HEADERS = oapplication.h \
5 oconfig.h \ 5 oconfig.h \
6 odebug.h \ 6 odebug.h \
7 oglobal.h \ 7 oglobal.h \
8 oglobalsettings.h \ 8 oglobalsettings.h \
9 okeyconfigmanager.h \ 9 okeyconfigmanager.h \
10 okeyfilter.h \
10 opluginloader.h \ 11 opluginloader.h \
11 oprocess.h \ 12 oprocess.h \
12 oprocctrl.h \ 13 oprocctrl.h \
13 osmartpointer.h \ 14 osmartpointer.h \
14 ostorageinfo.h \ 15 ostorageinfo.h \
15 xmltree.h 16 xmltree.h
16 17
17SOURCES = oapplication.cpp \ 18SOURCES = oapplication.cpp \
18 oconfig.cpp \ 19 oconfig.cpp \
19 odebug.cpp \ 20 odebug.cpp \
20 oglobal.cpp \ 21 oglobal.cpp \
21 oglobalsettings.cpp \ 22 oglobalsettings.cpp \
22 okeyconfigmanager.cpp \ 23 okeyconfigmanager.cpp \
24 okeyfilter.cpp \
23 opluginloader.cpp \ 25 opluginloader.cpp \
24 oprocess.cpp \ 26 oprocess.cpp \
25 oprocctrl.cpp \ 27 oprocctrl.cpp \
26 ostorageinfo.cpp \ 28 ostorageinfo.cpp \
27 xmltree.cpp 29 xmltree.cpp
28 30
29 31
30# The following files are currently not compileable on mac ! 32# The following files are currently not compileable on mac !
31# Therfore I removed them from the build .. (eilers) 33# Therfore I removed them from the build .. (eilers)
32 34
33CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) 35CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX )
34!contains( CONFTEST, y ) { 36!contains( CONFTEST, y ) {
35HEADERS += ofilenotify.h 37HEADERS += ofilenotify.h
36SOURCES += ofilenotify.cpp 38SOURCES += ofilenotify.cpp
37} else { 39} else {
38 message( "ofilenotify is not available in a mac build !" ) 40 message( "ofilenotify is not available in a mac build !" )
39} 41}
40 42
41include ( device/device.pro ) 43include ( device/device.pro )
42 44
43INTERFACES = 45INTERFACES =
44TARGET = opiecore2 46TARGET = opiecore2
45VERSION = 1.9.1 47VERSION = 1.9.1
46INCLUDEPATH += $(OPIEDIR)/include 48INCLUDEPATH += $(OPIEDIR)/include