summaryrefslogtreecommitdiff
authoraquadran <aquadran>2006-12-13 20:36:14 (UTC)
committer aquadran <aquadran>2006-12-13 20:36:14 (UTC)
commitbb6f32ae999168fc44d50d3523c3ef232824185a (patch) (unidiff)
tree1d89bf239f98c4e3ce6fc83131b6b2c4ec5aac2c
parent5a0012fb3b75ff41437b0685386731d1367e4e7b (diff)
downloadopie-bb6f32ae999168fc44d50d3523c3ef232824185a.zip
opie-bb6f32ae999168fc44d50d3523c3ef232824185a.tar.gz
opie-bb6f32ae999168fc44d50d3523c3ef232824185a.tar.bz2
changed suspend button mapping for mypal too same as for ipaqs
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opiecore/device/odevice_mypal.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libopie2/opiecore/device/odevice_mypal.cpp b/libopie2/opiecore/device/odevice_mypal.cpp
index 208be46..73b31cb 100644
--- a/libopie2/opiecore/device/odevice_mypal.cpp
+++ b/libopie2/opiecore/device/odevice_mypal.cpp
@@ -132,50 +132,50 @@ void MyPal::initButtons()
132 d->m_buttons->append ( b ); 132 d->m_buttons->append ( b );
133 } 133 }
134 } 134 }
135 reloadButtonMapping(); 135 reloadButtonMapping();
136} 136}
137 137
138bool MyPal::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, bool autoRepeat ) 138bool MyPal::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, bool autoRepeat )
139{ 139{
140 int newkeycode = keycode; 140 int newkeycode = keycode;
141 141
142 switch ( keycode ) { 142 switch ( keycode ) {
143 case Key_Left : 143 case Key_Left :
144 case Key_Right: 144 case Key_Right:
145 case Key_Up : 145 case Key_Up :
146 case Key_Down : { 146 case Key_Down : {
147 // Rotate the cursor keys by 270 147 // Rotate the cursor keys by 270
148 // keycode - Key_Left = position of the button starting from left clockwise 148 // keycode - Key_Left = position of the button starting from left clockwise
149 // add the rotation to it and modolo. No we've the original offset 149 // add the rotation to it and modolo. No we've the original offset
150 // add the offset to the Key_Left key 150 // add the offset to the Key_Left key
151 if ( d->m_model == Model_MyPal_716 ) 151 if ( d->m_model == Model_MyPal_716 )
152 newkeycode = Key_Left + ( keycode - Key_Left + 3 ) % 4; 152 newkeycode = Key_Left + ( keycode - Key_Left + 3 ) % 4;
153 break; 153 break;
154 } 154 }
155 155
156 // map Power Button short/long press to F6 156 // map Power Button short/long press
157 case Key_F6: { 157 case HardKey_Suspend: { // Hope we don't have infinite recursion here:
158 if ( isPress ) { 158 if ( isPress ) {
159 if ( m_power_timer ) 159 if ( m_power_timer )
160 killTimer ( m_power_timer ); 160 killTimer ( m_power_timer );
161 m_power_timer = startTimer ( 500 ); 161 m_power_timer = startTimer ( 500 );
162 } 162 }
163 else if ( m_power_timer ) { 163 else if ( m_power_timer ) {
164 killTimer ( m_power_timer ); 164 killTimer ( m_power_timer );
165 m_power_timer = 0; 165 m_power_timer = 0;
166 QWSServer::sendKeyEvent ( -1, HardKey_Suspend, 0, true, false ); 166 QWSServer::sendKeyEvent ( -1, HardKey_Suspend, 0, true, false );
167 QWSServer::sendKeyEvent ( -1, HardKey_Suspend, 0, false, false ); 167 QWSServer::sendKeyEvent ( -1, HardKey_Suspend, 0, false, false );
168 } 168 }
169 newkeycode = Key_unknown; 169 newkeycode = Key_unknown;
170 break; 170 break;
171 } 171 }
172 } 172 }
173 173
174 if ( newkeycode != keycode ) { 174 if ( newkeycode != keycode ) {
175 if ( newkeycode != Key_unknown ) 175 if ( newkeycode != Key_unknown )
176 QWSServer::sendKeyEvent ( -1, newkeycode, modifiers, isPress, autoRepeat ); 176 QWSServer::sendKeyEvent ( -1, newkeycode, modifiers, isPress, autoRepeat );
177 return true; 177 return true;
178 } 178 }
179 else 179 else
180 return false; 180 return false;
181} 181}