author | mickeyl <mickeyl> | 2005-08-31 10:21:12 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-08-31 10:21:12 (UTC) |
commit | cde931654d1966be6989e6c8f3cfacb23e6822a2 (patch) (unidiff) | |
tree | 9a8244f4da0180a685554ebca0d7b628630fb42e /examples | |
parent | 142e7e82efa6dd45884805c34fadec2160225e4b (diff) | |
download | opie-cde931654d1966be6989e6c8f3cfacb23e6822a2.zip opie-cde931654d1966be6989e6c8f3cfacb23e6822a2.tar.gz opie-cde931654d1966be6989e6c8f3cfacb23e6822a2.tar.bz2 |
- add support for the new Switches type in the Linux Input System (coming with 2.6.14)
- use the new Switches support to rewrite the hinge sensor handling on Zaurus models w/ 2.6
- add Switches support to SysInfo, OInputSystem, oinputsystemdemo
-rw-r--r-- | examples/opiecore/oinputsystemdemo/oinputsystemdemo.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/examples/opiecore/oinputsystemdemo/oinputsystemdemo.cpp b/examples/opiecore/oinputsystemdemo/oinputsystemdemo.cpp index 6c95048..b49df99 100644 --- a/examples/opiecore/oinputsystemdemo/oinputsystemdemo.cpp +++ b/examples/opiecore/oinputsystemdemo/oinputsystemdemo.cpp | |||
@@ -60,12 +60,14 @@ int main( int argc, char** argv ) | |||
60 | features += QString( "\nRelative Axes: " ); | 60 | features += QString( "\nRelative Axes: " ); |
61 | if ( dev->hasFeature( OInputDevice::Relative ) ) features += "[ x ]"; else features += "[ ]"; | 61 | if ( dev->hasFeature( OInputDevice::Relative ) ) features += "[ x ]"; else features += "[ ]"; |
62 | features += QString( "\nAbsolute Axes: " ); | 62 | features += QString( "\nAbsolute Axes: " ); |
63 | if ( dev->hasFeature( OInputDevice::Absolute ) ) features += "[ x ]"; else features += "[ ]"; | 63 | if ( dev->hasFeature( OInputDevice::Absolute ) ) features += "[ x ]"; else features += "[ ]"; |
64 | features += QString( "\nMiscellaneous: " ); | 64 | features += QString( "\nMiscellaneous: " ); |
65 | if ( dev->hasFeature( OInputDevice::Miscellaneous ) ) features += "[ x ]"; else features += "[ ]"; | 65 | if ( dev->hasFeature( OInputDevice::Miscellaneous ) ) features += "[ x ]"; else features += "[ ]"; |
66 | features += QString( "\nSwitches: " ); | ||
67 | if ( dev->hasFeature( OInputDevice::Switches ) ) features += "[ x ]"; else features += "[ ]"; | ||
66 | features += QString( "\nLeds: " ); | 68 | features += QString( "\nLeds: " ); |
67 | if ( dev->hasFeature( OInputDevice::Leds ) ) features += "[ x ]"; else features += "[ ]"; | 69 | if ( dev->hasFeature( OInputDevice::Leds ) ) features += "[ x ]"; else features += "[ ]"; |
68 | features += QString( "\nSound: " ); | 70 | features += QString( "\nSound: " ); |
69 | if ( dev->hasFeature( OInputDevice::Sound ) ) features += "[ x ]"; else features += "[ ]"; | 71 | if ( dev->hasFeature( OInputDevice::Sound ) ) features += "[ x ]"; else features += "[ ]"; |
70 | features += QString( "\nAutoRepeat " ); | 72 | features += QString( "\nAutoRepeat " ); |
71 | if ( dev->hasFeature( OInputDevice::AutoRepeat ) ) features += "[ x ]"; else features += "[ ]"; | 73 | if ( dev->hasFeature( OInputDevice::AutoRepeat ) ) features += "[ x ]"; else features += "[ ]"; |
@@ -90,13 +92,15 @@ int main( int argc, char** argv ) | |||
90 | 92 | ||
91 | if ( dev->isHeld( OInputDevice::Button_LEFT ) ) | 93 | if ( dev->isHeld( OInputDevice::Button_LEFT ) ) |
92 | odebug << "Left Mouse Button is being held." << oendl; | 94 | odebug << "Left Mouse Button is being held." << oendl; |
93 | else odebug << "Left Mouse Button is _not_ being held." << oendl; | 95 | else odebug << "Left Mouse Button is _not_ being held." << oendl; |
94 | 96 | ||
95 | odebug << "Global key mask: " << dev->globalKeyMask() << oendl; | 97 | odebug << "Global key mask: " << dev->globalKeyMask() << oendl; |
96 | 98 | odebug << "Global switch mask: " << dev->globalSwitchMask() << oendl; | |
99 | |||
100 | |||
97 | ++it; | 101 | ++it; |
98 | } | 102 | } |
99 | } | 103 | } |
100 | 104 | ||
101 | #else | 105 | #else |
102 | 106 | ||
@@ -328,7 +332,7 @@ int main( int argc, char **argv ) | |||
328 | 332 | ||
329 | exit( EXIT_SUCCESS ); | 333 | exit( EXIT_SUCCESS ); |
330 | hell: | 334 | hell: |
331 | exit( EXIT_FAILURE ); | 335 | exit( EXIT_FAILURE ); |
332 | } | 336 | } |
333 | 337 | ||
334 | #endif \ No newline at end of file | 338 | #endif |