author | mickeyl <mickeyl> | 2005-09-03 18:01:49 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-09-03 18:01:49 (UTC) |
commit | de950b18690b8981a2bddaca68cbd5d48c71f689 (patch) (side-by-side diff) | |
tree | 53e111efa326b6fbfb4e157c4c7d3776ea9af17b /libopie2/opiecore/device/odevice_zaurus.cpp | |
parent | ed772cdd53070ccc61c87a3b0e96769a9f558f71 (diff) | |
download | opie-de950b18690b8981a2bddaca68cbd5d48c71f689.zip opie-de950b18690b8981a2bddaca68cbd5d48c71f689.tar.gz opie-de950b18690b8981a2bddaca68cbd5d48c71f689.tar.bz2 |
fun with namespaces and moc... this patch fixes the hinge sensor on clamshell Zaurii
Diffstat (limited to 'libopie2/opiecore/device/odevice_zaurus.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opiecore/device/odevice_zaurus.cpp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp index a75f566..8a7e252 100644 --- a/libopie2/opiecore/device/odevice_zaurus.cpp +++ b/libopie2/opiecore/device/odevice_zaurus.cpp @@ -156,8 +156,9 @@ struct z_button z_buttons_6000 [] = { // Zaurus-Tosa (PXA-model w/ 480x640 lcd, for SL6000) void Zaurus::init(const QString& cpu_info) { + qDebug( "Zaurus::init()" ); // Set the time to wait until the system is really suspended // the delta between apm --suspend and sleeping setAPMTimeOut( 15000 ); @@ -258,8 +259,9 @@ void Zaurus::init(const QString& cpu_info) case Model_Zaurus_SLC3100: // fallthrough case Model_Zaurus_SLC3000: // fallthrough case Model_Zaurus_SLC1000: // fallthrough case Model_Zaurus_SLC7x0: + initHingeSensor(); d->m_rotation = rotation(); d->m_direction = direction(); break; case Model_Zaurus_SLB600: // fallthrough @@ -288,8 +290,9 @@ void Zaurus::init(const QString& cpu_info) } void Zaurus::initButtons() { + qDebug( "Zaurus::initButtons()" ); if ( d->m_buttons ) return; d->m_buttons = new QValueList <ODeviceButton>; @@ -306,11 +309,10 @@ void Zaurus::initButtons() case Model_Zaurus_SLC3000: // fallthrough case Model_Zaurus_SLC1000: // fallthrough case Model_Zaurus_SLC7x0: if ( isQWS( ) ) - { // setup hinge sensor stuff + { addPreHandler(this); - initHingeSensor(); } pz_buttons = z_buttons_c700; buttoncount = ARRAY_SIZE(z_buttons_c700); break; @@ -600,8 +602,9 @@ Transformation Zaurus::rotation() const rot = d->m_rotation; break; } + qDebug( "Zaurus::rotation() - returning '%d'", rot ); return rot; } ODirection Zaurus::direction() const { @@ -704,14 +707,16 @@ void Zaurus::initHingeSensor() m_hinge.setName( "/dev/input/event0" ); if ( !m_hinge.open( IO_ReadOnly ) ) { - qDebug( "Zaurus::init() - Couldn't open /dev/input/event0 for read (%s)", strerror( errno ) ); + qWarning( "Zaurus::init() - Couldn't open /dev/input/event0 for read (%s)", strerror( errno ) ); return; } QSocketNotifier* sn = new QSocketNotifier( m_hinge.handle(), QSocketNotifier::Read, this ); QObject::connect( sn, SIGNAL(activated(int)), this, SLOT(hingeSensorTriggered()) ); + + qDebug( "Zaurus::init() - Hinge Sensor Initialization successfully completed" ); } void Zaurus::hingeSensorTriggered() { @@ -728,8 +733,15 @@ void Zaurus::hingeSensorTriggered() } } } +void Zaurus::systemMessage( const QCString &msg, const QByteArray & ) +{ + if ( msg == "deviceButtonMappingChanged()" ) { + reloadButtonMapping(); + } +} + /* * Take code from iPAQ device. * That way we switch the cursor directions depending on status of hinge sensor, eg. hardware direction. * I hope that is ok - Alwin |