Changeset 55:fa05d8dd30a2 in xplra

Timestamp:

02/16/13 18:14:55 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

(<MercurialRepository 3 'hg:/home/ivaradi/xplane/hg/xplra' '/'>, 'public')

Message:

Added the C client API for hotkey handling and the test program. Also changed the name of _sleep to xplra_sleep to be able to compile the code for Windows

Files:

• src/client/c/hu/varadiistvan/xplra/xplra.cc (modified) (1 diff)
• src/client/c/hu/varadiistvan/xplra/xplra.h (modified) (2 diffs)
• test/Makefile.am (modified) (2 diffs)
• test/basicctest.c (modified) (5 diffs)
• test/hotkeyctest.c (added)

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

@@ -1309 +1309 @@
 //------------------------------------------------------------------------------
 
+extern "C" int xplra_register_hotkeys(int connectionID,
+                                      const uint16_t* codes, size_t length)
+{
+    Connection* connection = ConnectionSlot::getValue(connectionID);
+    if (connection==0) return -1;
+
+    try {
+        connection->registerHotkeys(codes, length);
+        return 0;
+    } catch(...) {
+        connection->handleException();
+        return -1;
+    }
+}
+
+/*----------------------------------------------------------------------------*/
+
+extern "C" int xplra_query_hotkeys(int connectionID,
+                                   uint8_t* states, size_t length)
+{
+    Connection* connection = ConnectionSlot::getValue(connectionID);
+    if (connection==0) return -1;
+
+    try {
+        connection->queryHotkeys(states, length);
+        return 0;
+    } catch(...) {
+        connection->handleException();
+        return -1;
+    }
+}
+
+/*----------------------------------------------------------------------------*/
+
+extern "C" int xplra_unregister_hotkeys(int connectionID)
+{
+    Connection* connection = ConnectionSlot::getValue(connectionID);
+    if (connection==0) return -1;
+
+    try {
+        connection->unregisterHotkeys();
+        return 0;
+    } catch(...) {
+        connection->handleException();
+        return -1;
+    }
+}
+
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+
 extern "C" int xplra_disconnect(int connectionID)
 {

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

@@ -99 +99 @@
 /*----------------------------------------------------------------------------*/
 
+/** Hotkey modifier: Shift */
+#define HOTKEY_MODIFIER_SHIFT 0x01
+
+/** Hotkey modifier: Control */
+#define HOTKEY_MODIFIER_CONTROL 0x02
+
+/*----------------------------------------------------------------------------*/
+
 #define INVALID_DATAREF_ID ((size_t)-1)
 
@@ -751 +759 @@
 
 /**
+ * Register the given hotkey codes for listening. If there is an
+ * existing set of hotkeys registered, those will be overwritten.
+ */
+int xplra_register_hotkeys(int connectionID,
+                           const uint16_t* codes, size_t length);
+
+/*----------------------------------------------------------------------------*/
+
+/**
+ * Query the registered hotkeys whether they were pressed.
+ */
+int xplra_query_hotkeys(int connectionID, uint8_t* states, size_t length);
+
+/*----------------------------------------------------------------------------*/
+
+/**
+ * Unregister the hotkeys.
+ */
+int xplra_unregister_hotkeys(int connectionID);
+
+/*----------------------------------------------------------------------------*/
+/*----------------------------------------------------------------------------*/
+
+/**
  * Destroy the connection with the given ID.
  *

test/Makefile.am

@@ -6 +6 @@
 endif
 
-noinst_PROGRAMS=ctest basictest basicctest multigettest multigetctest multisettest multisetctest hotkeytest
+noinst_PROGRAMS=ctest basictest basicctest multigettest multigetctest multisettest multisetctest hotkeytest hotkeyctest
 
 ctest_SOURCES=ctest.c
@@ -36 +36 @@
 hotkeytest_SOURCES=hotkeytest.cc
 
+hotkeyctest_SOURCES=hotkeyctest.c
+if TARGET_API_WIN32
+hotkeyctest_LDFLAGS=-lstdc++
+endif
+
 EXTRA_DIST=\
         runpy.sh                \

test/basicctest.c

@@ -43 +43 @@
 
 #ifdef _WIN32
-void _sleep(int ms)
+void xplra_sleep(int ms)
 {
     Sleep(ms);
 }
 #else
-void _sleep(int ms)
+void xplra_sleep(int ms)
 {
     usleep(ms*1000);
@@ -367 +367 @@
 
     printf("Preparing for the message tests, sleeping for 5 seconds...\n");
-    _sleep(5*1000);
+    xplra_sleep(5*1000);
 
     printf("Showing a message for 10 seconds...\n");
@@ -375 +375 @@
 
     printf("Sleeping for 3 seconds...\n");
-    _sleep(3*1000);
+    xplra_sleep(3*1000);
 
     printf("Showing another message interrupting the previous one for 3 seconds");
@@ -383 +383 @@
 
     printf("Sleeping for 5 seconds...\n");
-    _sleep(5*1000);
+    xplra_sleep(5*1000);
     if (xplra_show_message(connectionID, "[basictest] and the tests come to an end!", 5.0)<0) {
         goto error;
@@ -389 +389 @@
 
     goto cleanup;
+
 error:
     errorString = xplra_get_last_error_string(connectionID);