author | kergoth <kergoth> | 2003-04-16 22:46:26 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-04-16 22:46:26 (UTC) |
commit | 43f1d8c741f37b7fa3021bd480b5370b2b22cb53 (patch) (unidiff) | |
tree | 49c96c4048f3ff53242e7ee56105e66bc3126d1d /libopie/odevice.cpp | |
parent | b98b64367e3871f3b34cf090376130f79698ce94 (diff) | |
download | opie-43f1d8c741f37b7fa3021bd480b5370b2b22cb53.zip opie-43f1d8c741f37b7fa3021bd480b5370b2b22cb53.tar.gz opie-43f1d8c741f37b7fa3021bd480b5370b2b22cb53.tar.bz2 |
Attempt to workaround oliver's reported suspend issue. Check for a qws server at runtime rather than init time, and set the keyboard filter in initButtons rather than init.
-rw-r--r-- | libopie/odevice.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp index 8f954b1..0e1c0dd 100644 --- a/libopie/odevice.cpp +++ b/libopie/odevice.cpp | |||
@@ -275,12 +275,14 @@ void ODevice::init ( ) | |||
275 | */ | 275 | */ |
276 | void ODevice::initButtons ( ) | 276 | void ODevice::initButtons ( ) |
277 | { | 277 | { |
278 | if ( d-> m_buttons ) | 278 | if ( d-> m_buttons ) |
279 | return; | 279 | return; |
280 | 280 | ||
281 | d-> m_qwsserver = qApp ? ( qApp-> type ( ) == QApplication::GuiServer ) : false; | ||
282 | |||
281 | // Simulation uses iPAQ 3660 device buttons | 283 | // Simulation uses iPAQ 3660 device buttons |
282 | 284 | ||
283 | qDebug ( "init Buttons" ); | 285 | qDebug ( "init Buttons" ); |
284 | d-> m_buttons = new QValueList <ODeviceButton>; | 286 | d-> m_buttons = new QValueList <ODeviceButton>; |
285 | 287 | ||
286 | for ( uint i = 0; i < ( sizeof( ipaq_buttons ) / sizeof( i_button )); i++ ) { | 288 | for ( uint i = 0; i < ( sizeof( ipaq_buttons ) / sizeof( i_button )); i++ ) { |
@@ -759,21 +761,24 @@ void iPAQ::init ( ) | |||
759 | 761 | ||
760 | 762 | ||
761 | m_leds [0] = m_leds [1] = Led_Off; | 763 | m_leds [0] = m_leds [1] = Led_Off; |
762 | 764 | ||
763 | m_power_timer = 0; | 765 | m_power_timer = 0; |
764 | 766 | ||
765 | if ( d-> m_qwsserver ) | ||
766 | QWSServer::setKeyboardFilter ( this ); | ||
767 | } | 767 | } |
768 | 768 | ||
769 | void iPAQ::initButtons ( ) | 769 | void iPAQ::initButtons ( ) |
770 | { | 770 | { |
771 | if ( d-> m_buttons ) | 771 | if ( d-> m_buttons ) |
772 | return; | 772 | return; |
773 | 773 | ||
774 | d-> m_qwsserver = qApp ? ( qApp-> type ( ) == QApplication::GuiServer ) : false; | ||
775 | |||
776 | if ( d-> m_qwsserver ) | ||
777 | QWSServer::setKeyboardFilter ( this ); | ||
778 | |||
774 | d-> m_buttons = new QValueList <ODeviceButton>; | 779 | d-> m_buttons = new QValueList <ODeviceButton>; |
775 | 780 | ||
776 | for ( uint i = 0; i < ( sizeof( ipaq_buttons ) / sizeof( i_button )); i++ ) { | 781 | for ( uint i = 0; i < ( sizeof( ipaq_buttons ) / sizeof( i_button )); i++ ) { |
777 | i_button *ib = ipaq_buttons + i; | 782 | i_button *ib = ipaq_buttons + i; |
778 | ODeviceButton b; | 783 | ODeviceButton b; |
779 | 784 | ||
@@ -1146,12 +1151,14 @@ void Zaurus::init ( ) | |||
1146 | 1151 | ||
1147 | void Zaurus::initButtons ( ) | 1152 | void Zaurus::initButtons ( ) |
1148 | { | 1153 | { |
1149 | if ( d-> m_buttons ) | 1154 | if ( d-> m_buttons ) |
1150 | return; | 1155 | return; |
1151 | 1156 | ||
1157 | d-> m_qwsserver = qApp ? ( qApp-> type ( ) == QApplication::GuiServer ) : false; | ||
1158 | |||
1152 | d-> m_buttons = new QValueList <ODeviceButton>; | 1159 | d-> m_buttons = new QValueList <ODeviceButton>; |
1153 | 1160 | ||
1154 | for ( uint i = 0; i < ( sizeof( z_buttons ) / sizeof( z_button )); i++ ) { | 1161 | for ( uint i = 0; i < ( sizeof( z_buttons ) / sizeof( z_button )); i++ ) { |
1155 | z_button *zb = z_buttons + i; | 1162 | z_button *zb = z_buttons + i; |
1156 | ODeviceButton b; | 1163 | ODeviceButton b; |
1157 | 1164 | ||