summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/device/odevice.h1
-rw-r--r--libopie2/opiecore/device/odevice_ipaq.cpp62
-rw-r--r--libopie2/opiecore/device/odevice_ipaq.h1
3 files changed, 50 insertions, 14 deletions
diff --git a/libopie2/opiecore/device/odevice.h b/libopie2/opiecore/device/odevice.h
index b8478b9..05bb167 100644
--- a/libopie2/opiecore/device/odevice.h
+++ b/libopie2/opiecore/device/odevice.h
@@ -68,6 +68,7 @@ enum OModel {
68 Model_iPAQ_H39xx = ( Model_iPAQ | 0x000010 ), 68 Model_iPAQ_H39xx = ( Model_iPAQ | 0x000010 ),
69 Model_iPAQ_H5xxx = ( Model_iPAQ | 0x000020 ), 69 Model_iPAQ_H5xxx = ( Model_iPAQ | 0x000020 ),
70 Model_iPAQ_H22xx = ( Model_iPAQ | 0x000040 ), 70 Model_iPAQ_H22xx = ( Model_iPAQ | 0x000040 ),
71 Model_iPAQ_H191x = ( Model_iPAQ | 0x000080 ),
71 72
72 Model_Jornada = ( 6 << 24 ), 73 Model_Jornada = ( 6 << 24 ),
73 Model_Jornada_56x = ( Model_Jornada | 0x000001 ), 74 Model_Jornada_56x = ( Model_Jornada | 0x000001 ),
diff --git a/libopie2/opiecore/device/odevice_ipaq.cpp b/libopie2/opiecore/device/odevice_ipaq.cpp
index 8bc775f..309e1e4 100644
--- a/libopie2/opiecore/device/odevice_ipaq.cpp
+++ b/libopie2/opiecore/device/odevice_ipaq.cpp
@@ -85,12 +85,12 @@ typedef struct {
85#define FLITE_ON OD_IOW( 'f', 7, FLITE_IN ) 85#define FLITE_ON OD_IOW( 'f', 7, FLITE_IN )
86 86
87struct i_button ipaq_buttons [] = { 87struct i_button ipaq_buttons [] = {
88 { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, 88 { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx | Model_iPAQ_H191x,
89 Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"), 89 Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"),
90 "devicebuttons/ipaq_calendar", 90 "devicebuttons/ipaq_calendar",
91 "datebook", "nextView()", 91 "datebook", "nextView()",
92 "today", "raise()" }, 92 "today", "raise()" },
93 { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, 93 { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx | Model_iPAQ_H191x,
94 Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"), 94 Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"),
95 "devicebuttons/ipaq_contact", 95 "devicebuttons/ipaq_contact",
96 "addressbook", "raise()", 96 "addressbook", "raise()",
@@ -100,17 +100,17 @@ struct i_button ipaq_buttons [] = {
100 "devicebuttons/ipaq_menu", 100 "devicebuttons/ipaq_menu",
101 "QPE/TaskBar", "toggleMenu()", 101 "QPE/TaskBar", "toggleMenu()",
102 "QPE/TaskBar", "toggleStartMenu()" }, 102 "QPE/TaskBar", "toggleStartMenu()" },
103 { Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, 103 { Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx | Model_iPAQ_H191x,
104 Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"), 104 Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"),
105 "devicebuttons/ipaq_mail", 105 "devicebuttons/ipaq_mail",
106 "opiemail", "raise()", 106 "opiemail", "raise()",
107 "opiemail", "newMail()" }, 107 "opiemail", "newMail()" },
108 { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, 108 { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx | Model_iPAQ_H191x,
109 Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"), 109 Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"),
110 "devicebuttons/ipaq_home", 110 "devicebuttons/ipaq_home",
111 "QPE/Launcher", "home()", 111 "QPE/Launcher", "home()",
112 "buttonsettings", "raise()" }, 112 "buttonsettings", "raise()" },
113 { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, 113 { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx | Model_iPAQ_H191x,
114 Qt::Key_F24, QT_TRANSLATE_NOOP("Button", "Record Button"), 114 Qt::Key_F24, QT_TRANSLATE_NOOP("Button", "Record Button"),
115 "devicebuttons/ipaq_record", 115 "devicebuttons/ipaq_record",
116 "QPE/VMemo", "toggleRecord()", 116 "QPE/VMemo", "toggleRecord()",
@@ -138,6 +138,8 @@ void iPAQ::init(const QString& model)
138 d->m_model = Model_iPAQ_H5xxx; 138 d->m_model = Model_iPAQ_H5xxx;
139 else if ( d->m_modelstr == "H2200" ) 139 else if ( d->m_modelstr == "H2200" )
140 d->m_model = Model_iPAQ_H22xx; 140 d->m_model = Model_iPAQ_H22xx;
141 else if ( d->m_modelstr == "H1910" )
142 d->m_model = Model_iPAQ_H191x;
141 else 143 else
142 d->m_model = Model_Unknown; 144 d->m_model = Model_Unknown;
143 145
@@ -148,6 +150,7 @@ void iPAQ::init(const QString& model)
148 break; 150 break;
149 case Model_iPAQ_H5xxx: 151 case Model_iPAQ_H5xxx:
150 case Model_iPAQ_H22xx: 152 case Model_iPAQ_H22xx:
153 case Model_iPAQ_H191x:
151 d->m_rotation = Rot0; 154 d->m_rotation = Rot0;
152 break; 155 break;
153 case Model_iPAQ_H36xx: 156 case Model_iPAQ_H36xx:
@@ -285,7 +288,8 @@ bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, b
285 // keycode - Key_Left = position of the button starting from left clockwise 288 // keycode - Key_Left = position of the button starting from left clockwise
286 // add the rotation to it and modolo. No we've the original offset 289 // add the rotation to it and modolo. No we've the original offset
287 // add the offset to the Key_Left key 290 // add the offset to the Key_Left key
288 if ( d-> m_model == Model_iPAQ_H5xxx ) 291 if (( d->m_model == Model_iPAQ_H5xxx ) ||
292 ( d->m_model == Model_iPAQ_H191x ))
289 newkeycode = Key_Left + ( keycode - Key_Left + 3 ) % 4; 293 newkeycode = Key_Left + ( keycode - Key_Left + 3 ) % 4;
290 break; 294 break;
291 } 295 }
@@ -348,13 +352,26 @@ bool iPAQ::setDisplayBrightness ( int bright )
348 if ( bright < 0 ) 352 if ( bright < 0 )
349 bright = 0; 353 bright = 0;
350 354
351 if (( fd = ::open ( "/dev/touchscreen/0", O_WRONLY )) >= 0 ) { 355 QString cmdline;
352 FLITE_IN bl; 356
353 bl. mode = 1; 357 switch ( model()) {
354 bl. pwr = bright ? 1 : 0; 358 case Model_iPAQ_H191x:
355 bl. brightness = ( bright * ( displayBrightnessResolution() - 1 ) + 127 ) / 255; 359 if ( !bright )
356 res = ( ::ioctl ( fd, FLITE_ON, &bl ) == 0 ); 360 cmdline = QString::fromLatin1( "echo 4 > /sys/class/backlight/pxafb/power");
357 ::close ( fd ); 361 else
362 cmdline = QString::fromLatin1( "echo 0 > /sys/class/backlight/pxafb/power; echo %1 > /sys/class/backlight/pxafb/brightness" ).arg( bright );
363 // No Global::shellQuote as we gurantee it to be sane
364 res = ( ::system( QFile::encodeName(cmdline) ) == 0 );
365 break;
366 default:
367 if (( fd = ::open ( "/dev/touchscreen/0", O_WRONLY )) >= 0 ) {
368 FLITE_IN bl;
369 bl. mode = 1;
370 bl. pwr = bright ? 1 : 0;
371 bl. brightness = ( bright * ( displayBrightnessResolution() - 1 ) + 127 ) / 255;
372 res = ( ::ioctl ( fd, FLITE_ON, &bl ) == 0 );
373 ::close ( fd );
374 }
358 } 375 }
359 return res; 376 return res;
360} 377}
@@ -372,12 +389,29 @@ int iPAQ::displayBrightnessResolution() const
372 return 64; 389 return 64;
373 case Model_iPAQ_H5xxx: 390 case Model_iPAQ_H5xxx:
374 return 255; 391 return 255;
375 392 case Model_iPAQ_H191x:
393 return 183;
376 default: 394 default:
377 return 2; 395 return 2;
378 } 396 }
379} 397}
380 398
399bool iPAQ::setDisplayStatus ( bool on )
400{
401 bool res = false;
402
403 QString cmdline;
404
405 if ( model() == Model_iPAQ_H191x ) {
406 cmdline = QString::fromLatin1( "echo %1 > /sys/class/lcd/pxafb/power; echo %2 > /sys/class/backlight/pxafb/power").arg( on ? "0" : "4" ).arg( on ? "0" : "4" );
407 } else {
408 res = OAbstractMobileDevice::setDisplayStatus(on);
409 }
410
411 res = ( ::system( QFile::encodeName(cmdline) ) == 0 );
412
413 return res;
414}
381 415
382bool iPAQ::hasLightSensor() const 416bool iPAQ::hasLightSensor() const
383{ 417{
diff --git a/libopie2/opiecore/device/odevice_ipaq.h b/libopie2/opiecore/device/odevice_ipaq.h
index 1889467..3c783bc 100644
--- a/libopie2/opiecore/device/odevice_ipaq.h
+++ b/libopie2/opiecore/device/odevice_ipaq.h
@@ -47,6 +47,7 @@ class iPAQ : public OAbstractMobileDevice, public QWSServer::KeyboardFilter
47 virtual void initButtons(); 47 virtual void initButtons();
48 48
49 public: 49 public:
50 virtual bool setDisplayStatus ( bool on );
50 virtual bool setDisplayBrightness( int b ); 51 virtual bool setDisplayBrightness( int b );
51 virtual int displayBrightnessResolution() const; 52 virtual int displayBrightnessResolution() const;
52 53