message window no longer intercepts keys. refs #36

eclipse-sumo · Feb 25, 2022 · 4ab2fac · 4ab2fac
1 parent 7d59d3e
commit 4ab2fac
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/src/utils/gui/div/GUIMessageWindow.cpp b/src/utils/gui/div/GUIMessageWindow.cpp
@@ -37,6 +37,15 @@
 bool GUIMessageWindow::myLocateLinks = true;
 SUMOTime GUIMessageWindow::myBreakPointOffset = TIME2STEPS(-5);
 
+/* -------------------------------------------------------------------------
+ * GUISUMOAbstractView - FOX callback mapping
+ * ----------------------------------------------------------------------- */
+FXDEFMAP(GUIMessageWindow) GUIMessageWindowMap[] = {
+    FXMAPFUNC(SEL_KEYPRESS,             0,      GUIMessageWindow::onKeyPress),
+};
+
+
+FXIMPLEMENT_ABSTRACT(GUIMessageWindow, FXText, GUIMessageWindowMap, ARRAYNUMBER(GUIMessageWindowMap))
 
 // ===========================================================================
 // method definitions
@@ -344,5 +353,14 @@ GUIMessageWindow::unregisterMsgHandlers() {
     MsgHandler::getWarningInstance()->removeRetriever(myWarningRetriever);
 }
 
+long
+GUIMessageWindow::onKeyPress(FXObject* o, FXSelector sel, void* ptr) {
+    FXEvent* e = (FXEvent*) ptr;
+    // permit ctrl+a, ctrl+c
+    if (e->state & CONTROLMASK) {
+        return FXText::onKeyPress(o, sel, ptr);
+    }
+    return 0;
+}
 
 /****************************************************************************/
diff --git a/src/utils/gui/div/GUIMessageWindow.h b/src/utils/gui/div/GUIMessageWindow.h
@@ -50,6 +50,7 @@ class GUIGlObject;
  * Each time a new message is passed, the window is reopened.
  */
 class GUIMessageWindow : public FXText {
+    FXDECLARE(GUIMessageWindow)
 public:
     /** @brief Constructor
      *
@@ -105,6 +106,12 @@ class GUIMessageWindow : public FXText {
         return myBreakPointOffset;
     }
 
+    /// @brief handle keys
+    long onKeyPress(FXObject* o, FXSelector sel, void* data);
+
+protected:
+    FOX_CONSTRUCTOR(GUIMessageWindow)
+
 private:
     /// @brief class MsgOutputDevice
     class MsgOutputDevice : public OutputDevice {