Changeset 42:719f590e4878 in xplra

Timestamp:

02/14/13 19:09:26 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

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

Message:

Added initial support for the menu

Location:

src/plugin/src/xplra

Files:

• MessageWindow.cc (modified) (3 diffs)
• MessageWindow.h (modified) (2 diffs)
• plugin.cc (modified) (3 diffs)

src/plugin/src/xplra/MessageWindow.cc

@@ -73 +73 @@
 
 MessageWindow::MessageWindow() :
+    showForced(false),
     hideTime(0.0),
     duration(0.0)
@@ -104 +105 @@
 //------------------------------------------------------------------------------
 
+void MessageWindow::show()
+{
+    showForced = true;
+    XPLMSetWindowIsVisible(windowID, 1);
+}
+
+//------------------------------------------------------------------------------
+
+void MessageWindow::hide()
+{
+    showForced = false;
+}
+
+//------------------------------------------------------------------------------
+
 void MessageWindow::drawWindow()
 {
@@ -115 +131 @@
     }
 
-    if (now>=hideTime) {
+    if (now>=hideTime) hideTime = 0.0;
+
+    if (hideTime==0.0 && !showForced) {
         XPLMSetWindowIsVisible(windowID, 0);
     } else {
         XPLMDrawTranslucentDarkBox(left, top, right, bottom);
-        XPLMDrawString(colour, left + 25, top - 15,
-                       const_cast<char*>(displayedMessage.c_str()), 0,
-                       xplmFont_Basic);
+        if (hideTime!=0.0) {
+            XPLMDrawString(colour, left + 25, top - 15,
+                           const_cast<char*>(displayedMessage.c_str()), 0,
+                           xplmFont_Basic);
+        }
     }
 }

src/plugin/src/xplra/MessageWindow.h

@@ -105 +105 @@
 
     /**
+     * Indicate if the message window should be shown
+     */
+    bool showForced;
+
+    /**
      * The currently displayed message.
      */
@@ -144 +149 @@
      */
     ~MessageWindow();
+
+    /**
+     * Force showing the message window.
+     */
+    void show();
+
+    /**
+     * Hide the message window if it does not have to display an
+     * actual message.
+     */
+    void hide();
 
 private:

src/plugin/src/xplra/plugin.cc

@@ -39 +39 @@
 #include <XPLMUtilities.h>
 #include <XPLMProcessing.h>
+#include <XPLMMenus.h>
 
 #include <cstdio>
@@ -66 +67 @@
  */
 static ListenThread* listenThread = 0;
+
+/**
+ * The ID of the menu of the plugin.
+ */
+static XPLMMenuID menuID = 0;
+
+/**
+ * The index of the show message area menu item.
+ */
+static int showMessageAreaIndex = 0;
+
+//------------------------------------------------------------------------------
+
+static void menuHandler(void* /*menuRef*/, void* /*itemRef*/)
+{
+    // Util::debug("hu.varadiistvan.xplra menuHandler called\n");
+    XPLMMenuCheck checked = xplm_Menu_NoCheck;
+    XPLMCheckMenuItemState(menuID, showMessageAreaIndex, &checked);
+    if (checked==xplm_Menu_Unchecked) {
+        XPLMCheckMenuItem(menuID, showMessageAreaIndex, xplm_Menu_Checked);
+        messageWindow->show();
+    } else if (checked==xplm_Menu_Checked) {
+        XPLMCheckMenuItem(menuID, showMessageAreaIndex, xplm_Menu_Unchecked);
+        messageWindow->hide();
+    }
+}
 
 //------------------------------------------------------------------------------
@@ -96 +123 @@
     XPLMHostApplicationID hostID = 0;
     XPLMGetVersions(&xplaneVersion, &xplmVersion, &hostID);
+
+    int menuIndex = XPLMAppendMenuItem(XPLMFindPluginsMenu(),
+                                       "Remote Access", NULL, 1);
+    menuID = XPLMCreateMenu("Remote Access", XPLMFindPluginsMenu(), menuIndex,
+                            &menuHandler, 0);
+    showMessageAreaIndex = XPLMAppendMenuItem(menuID, "Show message area",
+                                              0, 1);
+    XPLMCheckMenuItem(menuID, showMessageAreaIndex, xplm_Menu_Unchecked);
 
     messageWindow = new MessageWindow();