Ticket #9785: 0001-Terminal-work-around-missing-out-of-order-modifiers-.patch

src/apps/terminal/TermView.cpp

@@ -1156 +1156 @@
 TermView::AttachedToWindow()
 {
     fMouseButtons = 0;
-    fModifiers = modifiers();
+
+    _UpdateModifiers();
 
     // update the terminal size because it may have changed while the TermView
     // was detached from the window. On such conditions FrameResized was not
@@ -1380 +1381 @@
             _Deactivate();
     }
 
-    fActiveState->WindowActivated(active);
+    _UpdateModifiers();
 
-    if (active) {
-        int32 oldModifiers = fModifiers;
-        fModifiers = modifiers();
-        if (fModifiers != oldModifiers)
-            fActiveState->ModifiersChanged(oldModifiers, fModifiers);
-    }
+    fActiveState->WindowActivated(active);
 }
 
 
@@ -1409 +1405 @@
 void
 TermView::KeyDown(const char *bytes, int32 numBytes)
 {
+    _UpdateModifiers();
+
     fActiveState->KeyDown(bytes, numBytes);
 }
 
@@ -1601 +1599 @@
 
         case B_MODIFIERS_CHANGED:
         {
-            int32 oldModifiers = fModifiers;
-            fModifiers = msg->GetInt32("modifiers", 0);
-            if (fModifiers != oldModifiers)
-                fActiveState->ModifiersChanged(oldModifiers, fModifiers);
+            _UpdateModifiers();
             break;
         }
 
@@ -2376 +2371 @@
     if (!IsFocus())
         MakeFocus();
 
+    _UpdateModifiers();
+
     BMessage* currentMessage = Window()->CurrentMessage();
     int32 buttons = currentMessage->GetInt32("buttons", 0);
 
@@ -2389 +2386 @@
 void
 TermView::MouseMoved(BPoint where, uint32 transit, const BMessage *message)
 {
+    _UpdateModifiers();
+
     fActiveState->MouseMoved(where, transit, message, fModifiers);
 }
 
@@ -2396 +2395 @@
 void
 TermView::MouseUp(BPoint where)
 {
+    _UpdateModifiers();
+
     int32 buttons = Window()->CurrentMessage()->GetInt32("buttons", 0);
 
     fActiveState->MouseUp(where, buttons);
@@ -2976 +2977 @@
 
 
 void
+TermView::_UpdateModifiers()
+{
+    // TODO: This method is a general work-around for missing or out-of-order
+    // B_MODIFIERS_CHANGED messages. This should really be fixed where it is
+    // broken (app server?).
+    int32 oldModifiers = fModifiers;
+    fModifiers = modifiers();
+    if (fModifiers != oldModifiers && fActiveState != NULL)
+        fActiveState->ModifiersChanged(oldModifiers, fModifiers);
+}
+
+
+void
 TermView::_NextState(State* state)
 {
     if (state != fActiveState) {

src/apps/terminal/TermView.h

@@ -251 +251 @@
             void                _HandleInputMethodLocationRequest();
             void                _CancelInputMethod();
 
+            void                _UpdateModifiers();
+
             void                _NextState(State* state);
 
 private: