Changeset 8733 in vbox for trunk/src/VBox/Frontends

Timestamp:

May 9, 2008 8:39:56 AM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: Backported r30301 (FE/Qt-OSX: Added several debug functions for event tracking. Added detection for apple+space (spotlight).)

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxUtils.h (modified) (1 diff)
• src/VBoxConsoleView.cpp (modified) (3 diffs)
• src/darwin/VBoxUtils-darwin.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxUtils.h

@@ -277 +277 @@
 OSStatus darwinRegionHandler (EventHandlerCallRef aInHandlerCallRef, EventRef aInEvent, void *aInUserData);
 
+# ifdef DEBUG
+void darwinDebugPrintEvent (const char *aPrefix, EventRef aEvent);
+# endif
 #endif /* Q_WS_MAC */
 

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleView.cpp

@@ -115 +115 @@
                                                          EventRef inEvent, void *inUserData)
 {
-    VBoxConsoleView *view = (VBoxConsoleView *)inUserData;
-    UInt32 EventClass = ::GetEventClass (inEvent);
-    if (EventClass == kEventClassKeyboard)
+    VBoxConsoleView *view = static_cast<VBoxConsoleView *> (inUserData);
+    UInt32 eventClass = ::GetEventClass (inEvent);
+    UInt32 eventKind = ::GetEventKind (inEvent);
+    /* For debugging events */
+    /* 
+    if (!(eventClass == 'cute'))
+        ::darwinDebugPrintEvent ("view: ", inEvent);
+    */
+
+    /* Not sure but this seems an triggered event if the spotlight searchbar is
+     * displayed. So flag that the host key isn't pressed alone. */
+    if (eventClass == 'cgs ' && eventKind == 0x15 &&
+        view->mIsHostkeyPressed)
+        view->mIsHostkeyAlone = false;
+
+    if (eventClass == kEventClassKeyboard)
     {
         if (view->darwinKeyboardEvent (inEvent))
@@ -129 +142 @@
      * get any key down/up events, so these combinations are dead to the guest...
      */
-    else if (EventClass == kEventClassCommand)
+    else if (eventClass == kEventClassCommand)
     {
         if (view->mKbdCaptured)
@@ -145 +158 @@
 bool VBoxConsoleView::macEventFilter (EventRef inEvent, void *inUserData)
 {
-    VBoxConsoleView *view = (VBoxConsoleView *)inUserData;
-    UInt32 EventClass = ::GetEventClass (inEvent);
-    if (EventClass == kEventClassKeyboard)
+    VBoxConsoleView *view = static_cast<VBoxConsoleView *> (inUserData);
+    UInt32 eventClass = ::GetEventClass (inEvent);
+    UInt32 eventKind = ::GetEventKind (inEvent);
+
+    /* For debugging events */
+    /* 
+    if (!(eventClass == 'cute'))
+        ::darwinDebugPrintEvent ("view: ", inEvent);
+    */
+
+    /* Not sure but this seems an triggered event if the spotlight searchbar is
+     * displayed. So flag that the host key isn't pressed alone. */
+    if (eventClass == 'cgs ' && eventKind == 0x15 &&
+        view->mIsHostkeyPressed)
+        view->mIsHostkeyAlone = false;
+
+    if (eventClass == kEventClassKeyboard)
     {
         if (view->darwinKeyboardEvent (inEvent))

trunk/src/VBox/Frontends/VirtualBox4/src/darwin/VBoxUtils-darwin.cpp

@@ -293 +293 @@
 }
 
+/* Event debugging stuff. Borrowed from the Knuts Qt patch. */
+#ifdef DEBUG
+
+# define MY_CASE(a) case a: return #a
+const char * DarwinDebugEventName (UInt32 ekind)
+{
+    switch (ekind)
+    {
+        MY_CASE(kEventWindowUpdate                );
+        MY_CASE(kEventWindowDrawContent           );
+        MY_CASE(kEventWindowActivated             );
+        MY_CASE(kEventWindowDeactivated           );
+        MY_CASE(kEventWindowHandleActivate        );
+        MY_CASE(kEventWindowHandleDeactivate      );
+        MY_CASE(kEventWindowGetClickActivation    );
+        MY_CASE(kEventWindowGetClickModality      );
+        MY_CASE(kEventWindowShowing               );
+        MY_CASE(kEventWindowHiding                );
+        MY_CASE(kEventWindowShown                 );
+        MY_CASE(kEventWindowHidden                );
+        MY_CASE(kEventWindowCollapsing            );
+        MY_CASE(kEventWindowCollapsed             );
+        MY_CASE(kEventWindowExpanding             );
+        MY_CASE(kEventWindowExpanded              );
+        MY_CASE(kEventWindowZoomed                );
+        MY_CASE(kEventWindowBoundsChanging        );
+        MY_CASE(kEventWindowBoundsChanged         );
+        MY_CASE(kEventWindowResizeStarted         );
+        MY_CASE(kEventWindowResizeCompleted       );
+        MY_CASE(kEventWindowDragStarted           );
+        MY_CASE(kEventWindowDragCompleted         );
+        MY_CASE(kEventWindowClosed                );
+        MY_CASE(kEventWindowTransitionStarted     );
+        MY_CASE(kEventWindowTransitionCompleted   );
+        MY_CASE(kEventWindowClickDragRgn          );
+        MY_CASE(kEventWindowClickResizeRgn        );
+        MY_CASE(kEventWindowClickCollapseRgn      );
+        MY_CASE(kEventWindowClickCloseRgn         );
+        MY_CASE(kEventWindowClickZoomRgn          );
+        MY_CASE(kEventWindowClickContentRgn       );
+        MY_CASE(kEventWindowClickProxyIconRgn     );
+        MY_CASE(kEventWindowClickToolbarButtonRgn );
+        MY_CASE(kEventWindowClickStructureRgn     );
+        MY_CASE(kEventWindowCursorChange          );
+        MY_CASE(kEventWindowCollapse              );
+        MY_CASE(kEventWindowCollapseAll           );
+        MY_CASE(kEventWindowExpand                );
+        MY_CASE(kEventWindowExpandAll             );
+        MY_CASE(kEventWindowClose                 );
+        MY_CASE(kEventWindowCloseAll              );
+        MY_CASE(kEventWindowZoom                  );
+        MY_CASE(kEventWindowZoomAll               );
+        MY_CASE(kEventWindowContextualMenuSelect  );
+        MY_CASE(kEventWindowPathSelect            );
+        MY_CASE(kEventWindowGetIdealSize          );
+        MY_CASE(kEventWindowGetMinimumSize        );
+        MY_CASE(kEventWindowGetMaximumSize        );
+        MY_CASE(kEventWindowConstrain             );
+        MY_CASE(kEventWindowHandleContentClick    );
+        MY_CASE(kEventWindowGetDockTileMenu       );
+        MY_CASE(kEventWindowProxyBeginDrag        );
+        MY_CASE(kEventWindowProxyEndDrag          );
+        MY_CASE(kEventWindowToolbarSwitchMode     );
+        MY_CASE(kEventWindowFocusAcquired         );
+        MY_CASE(kEventWindowFocusRelinquish       );
+        MY_CASE(kEventWindowFocusContent          );
+        MY_CASE(kEventWindowFocusToolbar          );
+        MY_CASE(kEventWindowFocusDrawer           );
+        MY_CASE(kEventWindowSheetOpening          );
+        MY_CASE(kEventWindowSheetOpened           );
+        MY_CASE(kEventWindowSheetClosing          );
+        MY_CASE(kEventWindowSheetClosed           );
+        MY_CASE(kEventWindowDrawerOpening         );
+        MY_CASE(kEventWindowDrawerOpened          );
+        MY_CASE(kEventWindowDrawerClosing         );
+        MY_CASE(kEventWindowDrawerClosed          );
+        MY_CASE(kEventWindowDrawFrame             );
+        MY_CASE(kEventWindowDrawPart              );
+        MY_CASE(kEventWindowGetRegion             );
+        MY_CASE(kEventWindowHitTest               );
+        MY_CASE(kEventWindowInit                  );
+        MY_CASE(kEventWindowDispose               );
+        MY_CASE(kEventWindowDragHilite            );
+        MY_CASE(kEventWindowModified              );
+        MY_CASE(kEventWindowSetupProxyDragImage   );
+        MY_CASE(kEventWindowStateChanged          );
+        MY_CASE(kEventWindowMeasureTitle          );
+        MY_CASE(kEventWindowDrawGrowBox           );
+        MY_CASE(kEventWindowGetGrowImageRegion    );
+        MY_CASE(kEventWindowPaint                 );
+    }
+    static char s_sz[64];
+    sprintf(s_sz, "kind=%u", (uint)ekind);
+    return s_sz;
+}
+# undef MY_CASE
+
+/* Convert a class into the 4 char code defined in
+ * 'Developer/Headers/CFMCarbon/CarbonEvents.h' to 
+ * identify the event. */
+const char * darwinDebugClassName (UInt32 eclass)
+{
+    char *pclass = (char*)&eclass;
+    static char s_sz[11];
+    sprintf(s_sz, "class=%c%c%c%c", pclass[3], 
+                                    pclass[2], 
+                                    pclass[1], 
+                                    pclass[0]);
+    return s_sz;
+}
+
+void darwinDebugPrintEvent (const char *psz, EventRef event)
+{
+  if (!event)
+      return;
+  UInt32 ekind = GetEventKind (event), eclass = GetEventClass (event);
+  if (eclass == kEventClassWindow)
+  {
+      switch (ekind)
+      {
+          case kEventWindowDrawContent:
+          case kEventWindowUpdate:
+          case kEventWindowBoundsChanged:
+              break;
+          default:
+          {
+              WindowRef wid = NULL;
+              GetEventParameter(event, kEventParamDirectObject, typeWindowRef, NULL, sizeof(WindowRef), NULL, &wid);
+              QWidget *widget = QWidget::find((WId)wid);
+              printf("%d %s: (%s) %#x win=%p wid=%p (%s)\n", (int)time(NULL), psz, darwinDebugClassName (eclass), (uint)ekind, wid, widget, DarwinDebugEventName (ekind));
+              break;
+          }
+      }
+  }
+  else if (eclass == kEventClassCommand)
+  {
+      WindowRef wid = NULL;
+      GetEventParameter(event, kEventParamDirectObject, typeWindowRef, NULL, sizeof(WindowRef), NULL, &wid);
+      QWidget *widget = QWidget::find((WId)wid);
+      const char *name = "Unknown";
+      switch (ekind)
+      {
+          case kEventCommandProcess:
+              name = "kEventCommandProcess";
+              break;
+          case kEventCommandUpdateStatus:
+              name = "kEventCommandUpdateStatus";
+              break;
+      }
+      printf("%d %s: (%s) %#x win=%p wid=%p (%s)\n", (int)time(NULL), psz, darwinDebugClassName (eclass), (uint)ekind, wid, widget, name);
+  }
+  else if (eclass == kEventClassKeyboard)
+      printf("%d %s: %#x(%s) %#x (kEventClassKeyboard)\n", (int)time(NULL), psz, (uint)eclass, darwinDebugClassName (eclass), (uint)ekind);
+
+  else
+      printf("%d %s: %#x(%s) %#x\n", (int)time(NULL), psz, (uint)eclass, darwinDebugClassName (eclass), (uint)ekind);
+}
+
+#endif /* DEBUG */