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.
author: alwin <alwin> 2004-08-01 10:32:56 (UTC)
committer: alwin <alwin> 2004-08-01 10:32:56 (UTC)
commit: 142d432ef9f8215636a81c358c828d4b6986a6ad (patch) (unidiff)
tree: faf33f40f3e19fdd0362256c61e6774ea949f70c /libopie2/opiecore/device
parent: 24c8aff75cbb41ccb2acf3de79675c2f4fd7ecc9 (diff)
download: opie-142d432ef9f8215636a81c358c828d4b6986a6ad.zip
opie-142d432ef9f8215636a81c358c828d4b6986a6ad.tar.gz
opie-142d432ef9f8215636a81c358c828d4b6986a6ad.tar.bz2
2 files changed, 55 insertions, 48 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,27 +1,27 @@
 /*
-                             This file is part of the Opie Project
+                     This file is part of the Opie Project
-                             Copyright (C) The Opie Team <opie-devel@handhelds.org>
+                      Copyright (C) The Opie Team <opie-devel@handhelds.org>
              =.
            .=l.
-           .>+-=
+     .>+-=
- _;:,     .>    :=|.         This program is free software; you can
+_;:,   .>  :=|.         This program is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or  modify it under
+.> <`_,  > .  <=          redistribute it and/or  modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+:`=1 )Y*s>-.--  :           the terms of the GNU Library General Public
-.="- .-=="i,     .._         License as published by the Free Software
+.="- .-=="i,   .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
+- .  .-<_>   .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
+  ._= =}    :          or (at your option) any later version.
-    .%`+i>       _;_.
+  .%`+i>    _;_.
-    .i_,=:_.      -<s.       This program is distributed in the hope that
+  .i_,=:_.   -<s.       This program is distributed in the hope that
-     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+  + . -:.    =       it will be useful,  but WITHOUT ANY WARRANTY;
-    : ..    .:,     . . .    without even the implied warranty of
+  : ..  .:,   . . .    without even the implied warranty of
-    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
-  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+ _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU
-..}^=.=       =       ;      Library General Public License for more
+..}^=.=    =    ;      Library General Public License for more
-++=   -.     .`     .:       details.
++=  -.   .`   .:       details.
- :     =  ...= . :.=-
+:   = ...= . :.=-
- -.   .:....=;==+<;          You should have received a copy of the GNU
+-.  .:....=;==+<;          You should have received a copy of the GNU
-  -_. . .   )=.  =           Library General Public License along with
+ -_. . .  )=. =           Library General Public License along with
-    --        :-=`           this library; see the file COPYING.LIB.
+  --    :-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
@@ -40,6 +40,7 @@
 #include <qpe/resource.h>
 #include <qpe/sound.h>
 #include <qpe/qcopenvelope_qws.h>
+#include <opie2/okeyfilter.h>
 /* STD */
 #include <fcntl.h>
@@ -167,8 +168,10 @@ void iPAQ::initButtons()
    if ( d->m_buttons )
        return;
-    if ( isQWS( ) )
+    if ( isQWS( ) ) {
-        QWSServer::setKeyboardFilter ( this );
+        Opie::Core::OKeyFilter::inst()->addPreHandler(this);
+        //QWSServer::setKeyboardFilter ( this );
+    }
    d->m_buttons = new QValueList <ODeviceButton>;
@@ -271,7 +274,7 @@ bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, b
            break;
        }
-        // Rotate cursor keys 180° or 270°
+        // Rotate cursor keys 180 or 270
        case Key_Left :
        case Key_Right:
        case Key_Up   :
@@ -280,7 +283,7 @@ bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, b
                ( d->m_model == Model_iPAQ_H38xx )) {
                newkeycode = Key_Left + ( keycode - Key_Left + 2 ) % 4;
            }
-            // Rotate the cursor keys by 270°
+            // Rotate the cursor keys by 270
            // keycode - Key_Left = position of the button starting from left clockwise
            // add the rotation to it and modolo. No we've the original offset
            // add the offset to the Key_Left key
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,27 +1,27 @@
 /*
-                             This file is part of the Opie Project
+                     This file is part of the Opie Project
-                             Copyright (C) The Opie Team <opie-devel@handhelds.org>
+                      Copyright (C) The Opie Team <opie-devel@handhelds.org>
              =.
            .=l.
-           .>+-=
+     .>+-=
- _;:,     .>    :=|.         This program is free software; you can
+_;:,   .>  :=|.         This program is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or  modify it under
+.> <`_,  > .  <=          redistribute it and/or  modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+:`=1 )Y*s>-.--  :           the terms of the GNU Library General Public
-.="- .-=="i,     .._         License as published by the Free Software
+.="- .-=="i,   .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
+- .  .-<_>   .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
+  ._= =}    :          or (at your option) any later version.
-    .%`+i>       _;_.
+  .%`+i>    _;_.
-    .i_,=:_.      -<s.       This program is distributed in the hope that
+  .i_,=:_.   -<s.       This program is distributed in the hope that
-     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+  + . -:.    =       it will be useful,  but WITHOUT ANY WARRANTY;
-    : ..    .:,     . . .    without even the implied warranty of
+  : ..  .:,   . . .    without even the implied warranty of
-    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
-  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+ _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU
-..}^=.=       =       ;      Library General Public License for more
+..}^=.=    =    ;      Library General Public License for more
-++=   -.     .`     .:       details.
++=  -.   .`   .:       details.
- :     =  ...= . :.=-
+:   = ...= . :.=-
- -.   .:....=;==+<;          You should have received a copy of the GNU
+-.  .:....=;==+<;          You should have received a copy of the GNU
-  -_. . .   )=.  =           Library General Public License along with
+ -_. . .  )=. =           Library General Public License along with
-    --        :-=`           this library; see the file COPYING.LIB.
+  --    :-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
@@ -40,6 +40,7 @@
 #include <qpe/resource.h>
 #include <qpe/sound.h>
 #include <qpe/qcopenvelope_qws.h>
+#include <opie2/okeyfilter.h>
 /* STD */
 #include <fcntl.h>
@@ -145,8 +146,11 @@ void SIMpad::initButtons()
    if ( d->m_buttons )
        return;
-    if ( isQWS( ) )
+    if ( isQWS( ) ) {
-        QWSServer::setKeyboardFilter ( this );
+        Opie::Core::OKeyFilter::inst()->addPreHandler(this);
+//        QWSServer::setKeyboardFilter ( this );
+    }
    d->m_buttons = new QValueList <ODeviceButton>;
author	alwin <alwin>	2004-08-01 10:32:56 (UTC)
committer	alwin <alwin>	2004-08-01 10:32:56 (UTC)
commit	142d432ef9f8215636a81c358c828d4b6986a6ad (patch) (unidiff)
tree	faf33f40f3e19fdd0362256c61e6774ea949f70c /libopie2/opiecore/device
parent	24c8aff75cbb41ccb2acf3de79675c2f4fd7ecc9 (diff)
download	opie-142d432ef9f8215636a81c358c828d4b6986a6ad.zip opie-142d432ef9f8215636a81c358c828d4b6986a6ad.tar.gz opie-142d432ef9f8215636a81c358c828d4b6986a6ad.tar.bz2

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,27 +1,27 @@
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.
@@ -40,6 +40,7 @@
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>
@@ -167,8 +168,10 @@ void iPAQ::initButtons()
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
@@ -271,7 +274,7 @@ bool iPAQ::filter ( int /unicode/, int keycode, int modifiers, bool isPress, b
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 :
@@ -280,7 +283,7 @@ bool iPAQ::filter ( int /unicode/, int keycode, int modifiers, bool isPress, b
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


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,27 +1,27 @@
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.
@@ -40,6 +40,7 @@
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>
@@ -145,8 +146,11 @@ void SIMpad::initButtons()
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