Changeset 54:fb6a875ea5d2 in xplra

Timestamp:

02/16/13 18:04:17 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Added support for the hotkey functions in the C++ client and a test program as well

Files:

• src/client/c/hu/varadiistvan/xplra/XPlane.cc (modified) (2 diffs)
• src/client/c/hu/varadiistvan/xplra/XPlane.h (modified) (1 diff)
• test/Makefile.am (modified) (2 diffs)
• test/hotkeytest.cc (added)
• test/hotkeytest.py (modified) (2 diffs)

src/client/c/hu/varadiistvan/xplra/XPlane.cc

@@ -59 +59 @@
 using std::auto_ptr;
 using std::string;
+using std::min;
 
 //------------------------------------------------------------------------------
@@ -500 +501 @@
 //------------------------------------------------------------------------------
 
+void XPlane::registerHotkeys(const uint16_t* codes, size_t length)
+    throw(Exception)
+{
+    stream->writeU8(Protocol::COMMAND_REGISTER_HOTKEYS);
+    stream->writeU32(length);
+    stream->write(codes, sizeof(uint16_t)*length);
+    stream->flush();
+    checkResult();
+}
+
+//------------------------------------------------------------------------------
+
+void XPlane::queryHotkeys(uint8_t* states, size_t length) throw(Exception)
+{
+    stream->writeU8(Protocol::COMMAND_QUERY_HOTKEYS);
+    stream->flush();
+    checkResult();
+
+    size_t count = stream->readU32();
+    checkStream();
+    stream->read(states, min(length, count));
+    if (length<count) {
+        while(length<count) {
+            stream->readU8();
+            ++length;
+        }
+    } else if (length>count) {
+        memset(states + count, 0, length - count);
+    }
+    checkStream();
+}
+
+//------------------------------------------------------------------------------
+
+void XPlane::unregisterHotkeys()
+{
+    stream->writeU8(Protocol::COMMAND_UNREGISTER_HOTKEYS);
+    stream->flush();
+    checkResult();
+}
+
+//------------------------------------------------------------------------------
+
 // Local Variables:
 // mode: C++

src/client/c/hu/varadiistvan/xplra/XPlane.h

@@ -282 +282 @@
     void showMessage(const char* message, float duration) throw(Exception);
 
+    /**
+     * Register the given hotkey codes for listening. If there is an
+     * existing set of hotkeys registered, those will be overwritten.
+     */
+    void registerHotkeys(const uint16_t* codes, size_t length) throw(Exception);
+
+    /**
+     * Query the registered hotkeys whether they were pressed.
+     */
+    void queryHotkeys(uint8_t* states, size_t length) throw(Exception);
+
+    /**
+     * Unregister the hotkeys.
+     */
+    void unregisterHotkeys();
+
 private:
     /**

test/Makefile.am

@@ -6 +6 @@
 endif
 
-noinst_PROGRAMS=ctest basictest basicctest multigettest multigetctest multisettest multisetctest
+noinst_PROGRAMS=ctest basictest basicctest multigettest multigetctest multisettest multisetctest hotkeytest
 
 ctest_SOURCES=ctest.c
@@ -34 +34 @@
 endif
 
+hotkeytest_SOURCES=hotkeytest.cc
+
 EXTRA_DIST=\
         runpy.sh                \
-        basictest.py
+        basictest.py            \
+        multigettest.py         \
+        multisettest.py         \
+        hotkeytest.py

test/hotkeytest.py

@@ -21 +21 @@
         xplane.registerHotkeys([0x0241, 0x0142, 0x0343, 0x0251])
         print "Registered hotkeys..."
+        print
 
         print "Listening to hotkeys..."
@@ -45 +46 @@
         print ">>>>>>>>>>>>>>>>>>>>>> Exception caught:", str(e)
     finally:
+        xplane.unregisterHotkeys()
         xplane.disconnect()