summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/device/odevice_zaurus.cpp89
-rw-r--r--libopie2/opiecore/device/odevice_zaurus.h54
2 files changed, 95 insertions, 48 deletions
diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp
index 67dfa41..89b9258 100644
--- a/libopie2/opiecore/device/odevice_zaurus.cpp
+++ b/libopie2/opiecore/device/odevice_zaurus.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) 2002,2003,2004 The Opie Team <opie-devel@handhelds.org>
4 =. Copyright (C) 2003-2005 Michael 'Mickey' Lauer <mickey@Vanille.de> 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.
@@ -135,7 +135,7 @@ void Zaurus::init(const QString& cpu_info)
135 // Set the time to wait until the system is realy suspended 135 // Set the time to wait until the system is realy suspended
136 // the delta between apm --suspend and sleeping 136 // the delta between apm --suspend and sleeping
137 setAPMTimeOut( 15000 ); 137 setAPMTimeOut( 15000 );
138 138
139 // generic distribution code already scanned /etc/issue at that point - 139 // generic distribution code already scanned /etc/issue at that point -
140 // embedix releases contain "Embedix <version> | Linux for Embedded Devices" 140 // embedix releases contain "Embedix <version> | Linux for Embedded Devices"
141 if ( d->m_sysverstr.contains( "embedix", false ) ) 141 if ( d->m_sysverstr.contains( "embedix", false ) )
@@ -238,6 +238,10 @@ void Zaurus::initButtons()
238 if ( d->m_buttons ) 238 if ( d->m_buttons )
239 return; 239 return;
240 240
241 if ( isQWS( ) ) {
242 addPreHandler(this);
243 }
244
241 d->m_buttons = new QValueList <ODeviceButton>; 245 d->m_buttons = new QValueList <ODeviceButton>;
242 246
243 struct z_button * pz_buttons; 247 struct z_button * pz_buttons;
@@ -591,3 +595,42 @@ OHingeStatus Zaurus::readHingeSensor() const
591 return CASE_UNKNOWN; 595 return CASE_UNKNOWN;
592 } 596 }
593} 597}
598
599/*
600 * Take code from iPAQ device.
601 * That way we switch the cursor directions depending on status of hinge sensor, eg. hardware direction.
602 * I hope that is ok - Alwin
603 */
604bool Zaurus::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, bool autoRepeat )
605{
606 Transformation rot;
607 int newkeycode = keycode;
608
609
610 if (d->m_model!=Model_Zaurus_SLC3000 && d->m_model!=Model_Zaurus_SLC7x0) return false;
611 rot = rotation();
612 if (rot==Rot0) return false;
613
614 /* map cursor keys depending on the hinge status */
615 switch ( keycode ) {
616 // Rotate cursor keys
617 case Key_Left :
618 case Key_Right:
619 case Key_Up :
620 case Key_Down :
621 {
622 if (rot==Rot90) {
623 newkeycode = Key_Left + ( keycode - Key_Left + 3 ) % 4;
624 }
625 }
626 break;
627
628 }
629 if (newkeycode!=keycode) {
630 if ( newkeycode != Key_unknown ) {
631 QWSServer::sendKeyEvent ( -1, newkeycode, modifiers, isPress, autoRepeat );
632 }
633 return true;
634 }
635 return false;
636}
diff --git a/libopie2/opiecore/device/odevice_zaurus.h b/libopie2/opiecore/device/odevice_zaurus.h
index 6e6ca46..1fb0cd9 100644
--- a/libopie2/opiecore/device/odevice_zaurus.h
+++ b/libopie2/opiecore/device/odevice_zaurus.h
@@ -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) 2002,2003,2004 The Opie Team <opie-devel@handhelds.org>
4 =. Copyright (C) 2003-2005 Michael 'Mickey' Lauer <mickey@Vanille.de> 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.
@@ -32,6 +32,9 @@
32 32
33#include "odevice_abstractmobiledevice.h" 33#include "odevice_abstractmobiledevice.h"
34 34
35/* QT */
36#include <qwindowsystem_qws.h>
37
35#ifndef ARRAY_SIZE 38#ifndef ARRAY_SIZE
36#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) 39#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
37#endif 40#endif
@@ -84,14 +87,14 @@
84#define SHARP_FL_IOCTL_GET_STEP 102 87#define SHARP_FL_IOCTL_GET_STEP 102
85 88
86// Vesa Standard 89// Vesa Standard
87 #define FB_BLANK_UNBLANK 0 90#define FB_BLANK_UNBLANK 0
88 #define FB_BLANK_POWERDOWN 4 91#define FB_BLANK_POWERDOWN 4
89 92
90namespace Opie { 93namespace Opie {
91namespace Core { 94namespace Core {
92namespace Internal { 95namespace Internal {
93 96
94class Zaurus : public OAbstractMobileDevice 97class Zaurus : public OAbstractMobileDevice, public QWSServer::KeyboardFilter
95{ 98{
96 protected: 99 protected:
97 virtual void init(const QString&); 100 virtual void init(const QString&);
@@ -119,6 +122,7 @@ class Zaurus : public OAbstractMobileDevice
119 122
120 protected: 123 protected:
121 virtual void buzzer( int snd ); 124 virtual void buzzer( int snd );
125 virtual bool filter( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat );
122 126
123 OLedState m_leds[1]; 127 OLedState m_leds[1];
124 bool m_embedix; 128 bool m_embedix;