-rw-r--r-- | libopie2/opiecore/device/odevice.h | 1 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice_ipaq.cpp | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/libopie2/opiecore/device/odevice.h b/libopie2/opiecore/device/odevice.h index 492c97b..c70d2af 100644 --- a/libopie2/opiecore/device/odevice.h +++ b/libopie2/opiecore/device/odevice.h | |||
@@ -66,12 +66,13 @@ enum OModel { | |||
66 | Model_iPAQ_H37xx = ( Model_iPAQ | 0x0003 ), | 66 | Model_iPAQ_H37xx = ( Model_iPAQ | 0x0003 ), |
67 | Model_iPAQ_H38xx = ( Model_iPAQ | 0x0004 ), | 67 | Model_iPAQ_H38xx = ( Model_iPAQ | 0x0004 ), |
68 | Model_iPAQ_H39xx = ( Model_iPAQ | 0x0005 ), | 68 | Model_iPAQ_H39xx = ( Model_iPAQ | 0x0005 ), |
69 | Model_iPAQ_H5xxx = ( Model_iPAQ | 0x0006 ), | 69 | Model_iPAQ_H5xxx = ( Model_iPAQ | 0x0006 ), |
70 | Model_iPAQ_H22xx = ( Model_iPAQ | 0x0007 ), | 70 | Model_iPAQ_H22xx = ( Model_iPAQ | 0x0007 ), |
71 | Model_iPAQ_H191x = ( Model_iPAQ | 0x0008 ), | 71 | Model_iPAQ_H191x = ( Model_iPAQ | 0x0008 ), |
72 | Model_iPAQ_H1940 = ( Model_iPAQ | 0x0009 ), | ||
72 | 73 | ||
73 | Model_Jornada = ( 6 << 16 ), | 74 | Model_Jornada = ( 6 << 16 ), |
74 | Model_Jornada_56x = ( Model_Jornada | 0x0001 ), | 75 | Model_Jornada_56x = ( Model_Jornada | 0x0001 ), |
75 | Model_Jornada_720 = ( Model_Jornada | 0x0002 ), | 76 | Model_Jornada_720 = ( Model_Jornada | 0x0002 ), |
76 | 77 | ||
77 | Model_Zaurus = ( 2 << 16 ), | 78 | Model_Zaurus = ( 2 << 16 ), |
diff --git a/libopie2/opiecore/device/odevice_ipaq.cpp b/libopie2/opiecore/device/odevice_ipaq.cpp index 3cc6cec..52da2d9 100644 --- a/libopie2/opiecore/device/odevice_ipaq.cpp +++ b/libopie2/opiecore/device/odevice_ipaq.cpp | |||
@@ -148,23 +148,26 @@ void iPAQ::init(const QString& model) | |||
148 | else if ( d->m_modelstr == "H5400" ) | 148 | else if ( d->m_modelstr == "H5400" ) |
149 | d->m_model = Model_iPAQ_H5xxx; | 149 | d->m_model = Model_iPAQ_H5xxx; |
150 | else if ( d->m_modelstr == "H2200" ) | 150 | else if ( d->m_modelstr == "H2200" ) |
151 | d->m_model = Model_iPAQ_H22xx; | 151 | d->m_model = Model_iPAQ_H22xx; |
152 | else if ( d->m_modelstr == "H1910" ) | 152 | else if ( d->m_modelstr == "H1910" ) |
153 | d->m_model = Model_iPAQ_H191x; | 153 | d->m_model = Model_iPAQ_H191x; |
154 | else if ( d->m_modelstr == "H1940" ) | ||
155 | d->m_model = Model_iPAQ_H1940; | ||
154 | else | 156 | else |
155 | d->m_model = Model_Unknown; | 157 | d->m_model = Model_Unknown; |
156 | 158 | ||
157 | switch ( d->m_model ) { | 159 | switch ( d->m_model ) { |
158 | case Model_iPAQ_H31xx: | 160 | case Model_iPAQ_H31xx: |
159 | case Model_iPAQ_H38xx: | 161 | case Model_iPAQ_H38xx: |
160 | d->m_rotation = Rot90; | 162 | d->m_rotation = Rot90; |
161 | break; | 163 | break; |
162 | case Model_iPAQ_H5xxx: | 164 | case Model_iPAQ_H5xxx: |
163 | case Model_iPAQ_H22xx: | 165 | case Model_iPAQ_H22xx: |
164 | case Model_iPAQ_H191x: | 166 | case Model_iPAQ_H191x: |
167 | case Model_iPAQ_H1940: | ||
165 | d->m_rotation = Rot0; | 168 | d->m_rotation = Rot0; |
166 | break; | 169 | break; |
167 | case Model_iPAQ_H36xx: | 170 | case Model_iPAQ_H36xx: |
168 | case Model_iPAQ_H37xx: | 171 | case Model_iPAQ_H37xx: |
169 | case Model_iPAQ_H39xx: | 172 | case Model_iPAQ_H39xx: |
170 | default: | 173 | default: |
@@ -297,13 +300,14 @@ bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, b | |||
297 | } | 300 | } |
298 | // Rotate the cursor keys by 270 | 301 | // Rotate the cursor keys by 270 |
299 | // keycode - Key_Left = position of the button starting from left clockwise | 302 | // keycode - Key_Left = position of the button starting from left clockwise |
300 | // add the rotation to it and modolo. No we've the original offset | 303 | // add the rotation to it and modolo. No we've the original offset |
301 | // add the offset to the Key_Left key | 304 | // add the offset to the Key_Left key |
302 | if (( d->m_model == Model_iPAQ_H5xxx ) || | 305 | if (( d->m_model == Model_iPAQ_H5xxx ) || |
303 | ( d->m_model == Model_iPAQ_H191x )) | 306 | ( d->m_model == Model_iPAQ_H191x ) || |
307 | ( d->m_model == Model_iPAQ_H1940 )) | ||
304 | newkeycode = Key_Left + ( keycode - Key_Left + 3 ) % 4; | 308 | newkeycode = Key_Left + ( keycode - Key_Left + 3 ) % 4; |
305 | break; | 309 | break; |
306 | } | 310 | } |
307 | 311 | ||
308 | // map Power Button short/long press to F34/F35 | 312 | // map Power Button short/long press to F34/F35 |
309 | case Key_SysReq: { | 313 | case Key_SysReq: { |
@@ -399,12 +403,14 @@ int iPAQ::displayBrightnessResolution() const | |||
399 | case Model_iPAQ_H39xx: | 403 | case Model_iPAQ_H39xx: |
400 | return 64; | 404 | return 64; |
401 | case Model_iPAQ_H5xxx: | 405 | case Model_iPAQ_H5xxx: |
402 | return 255; | 406 | return 255; |
403 | case Model_iPAQ_H191x: | 407 | case Model_iPAQ_H191x: |
404 | return 183; | 408 | return 183; |
409 | case Model_iPAQ_H191x: | ||
410 | return 44; | ||
405 | default: | 411 | default: |
406 | return 2; | 412 | return 2; |
407 | } | 413 | } |
408 | } | 414 | } |
409 | 415 | ||
410 | bool iPAQ::setDisplayStatus ( bool on ) | 416 | bool iPAQ::setDisplayStatus ( bool on ) |