VirtualBox

Changeset 51249 in vbox


Ignore:
Timestamp:
May 13, 2014 4:41:52 PM (11 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
93686
Message:

FE/Qt: Mac OS X: Runtime UI: Native Full Screen: Advanced release logging.

Location:
trunk/src/VBox/Frontends/VirtualBox/src/runtime
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp

    r51248 r51249  
    109109    /* Get sender machine-window: */
    110110    UIMachineWindow *pMachineWindow = qobject_cast<UIMachineWindow*>(sender());
    111     AssertReturnVoid(pMachineWindow);
     111    AssertPtrReturnVoid(pMachineWindow);
     112    LogRel(("UIMachineLogicFullscreen::sltHandleNativeFullscreenWillEnter: "
     113            "Machine-window #%d will enter native fullscreen.\n",
     114            (int)pMachineWindow->screenId()));
    112115
    113116    /* Fade to black: */
    … …  
    122125    /* Get sender machine-window: */
    123126    UIMachineWindow *pMachineWindow = qobject_cast<UIMachineWindow*>(sender());
    124     AssertReturnVoid(pMachineWindow);
     127    AssertPtrReturnVoid(pMachineWindow);
     128    LogRel(("UIMachineLogicFullscreen::sltHandleNativeFullscreenDidEnter: "
     129            "Machine-window #%d did enter native fullscreen.\n",
     130            (int)pMachineWindow->screenId()));
    125131
    126132    /* Add machine-window to corresponding set: */
    … …  
    146152    /* Get sender machine-window: */
    147153    UIMachineWindow *pMachineWindow = qobject_cast<UIMachineWindow*>(sender());
    148     AssertReturnVoid(pMachineWindow);
     154    AssertPtrReturnVoid(pMachineWindow);
     155    LogRel(("UIMachineLogicFullscreen::sltHandleNativeFullscreenWillExit: "
     156            "Machine-window #%d will exit native fullscreen.\n",
     157            (int)pMachineWindow->screenId()));
    149158
    150159    /* Fade to black: */
    … …  
    159168    /* Get sender machine-window: */
    160169    UIMachineWindow *pMachineWindow = qobject_cast<UIMachineWindow*>(sender());
    161     AssertReturnVoid(pMachineWindow);
     170    AssertPtrReturnVoid(pMachineWindow);
    162171
    163172    /* Remove machine-window from corresponding set: */
    … …  
    175184    {
    176185        LogRel(("UIMachineLogicFullscreen::sltHandleNativeFullscreenDidExit: "
    177                 "Machine-window #%d exited invalidated fullscreen, revalidate it.\n",
     186                "Machine-window #%d exited invalidated native fullscreen, revalidate it.\n",
    178187                (int)pMachineWindow->screenId()));
    179188
    … …  
    182191
    183192        /* Revalidate 'fullscreen' window: */
    184         revalidateFullscreenWindow(pMachineWindow);
     193        revalidateNativeFullScreen(pMachineWindow);
    185194    }
    186195    /* If there are no invalidated windows: */
    … …  
    191200        {
    192201            LogRel(("UIMachineLogicFullscreen::sltHandleNativeFullscreenDidExit: "
    193                     "Machine-window exited fullscreen, asking others to exit too...\n"));
     202                    "Machine-window #%d exited native fullscreen, asking others to exit too...\n",
     203                    (int)pMachineWindow->screenId()));
    194204
    195205            /* Ask window(s) to exit 'fullscreen' mode: */
    … …  
    200210        {
    201211            LogRel(("UIMachineLogicFullscreen::sltHandleNativeFullscreenDidExit: "
    202                     "Machine-window(s) exited fullscreen, changing visual-state to requested...\n"));
     212                    "Machine-window #%d exited native fullscreen, changing visual-state to requested...\n",
     213                    (int)pMachineWindow->screenId()));
    203214
    204215            /* Change visual-state to requested: */
    … …  
    350361void UIMachineLogicFullscreen::sltScreenLayoutChanged()
    351362{
    352     LogRel(("UIMachineLogicFullscreen: Multi-screen layout changed.\n"));
     363    LogRel(("UIMachineLogicFullscreen::sltScreenLayoutChanged: Multi-screen layout changed.\n"));
    353364
    354365#ifdef Q_WS_MAC
    … …  
    363374    }
    364375    /* Revalidate 'fullscreen' windows for ML and next: */
    365     else revalidateFullscreenWindows();
     376    else revalidateNativeFullScreen();
    366377#else /* !Q_WS_MAC */
    367378    /* Make sure all machine-window(s) have proper geometry: */
    … …  
    373384void UIMachineLogicFullscreen::sltGuestMonitorChange(KGuestMonitorChangedEventType changeType, ulong uScreenId, QRect screenGeo)
    374385{
    375     LogRel(("UIMachineLogicFullscreen: Guest-screen count changed.\n"));
     386    LogRel(("UIMachineLogicFullscreen::sltGuestMonitorChange: Guest-screen count changed.\n"));
    376387
    377388    /* Update multi-screen layout before any window update: */
    … …  
    385396        UIMachineLogic::sltGuestMonitorChange(changeType, uScreenId, screenGeo);
    386397    /* Revalidate 'fullscreen' windows for ML and next: */
    387     else revalidateFullscreenWindows();
     398    else revalidateNativeFullScreen();
    388399#else /* !Q_WS_MAC */
    389400    /* Call to base-class: */
    … …  
    394405void UIMachineLogicFullscreen::sltHostScreenCountChanged()
    395406{
    396     LogRel(("UIMachineLogicFullscreen: Host-screen count changed.\n"));
     407    LogRel(("UIMachineLogicFullscreen::sltHostScreenCountChanged: Host-screen count changed.\n"));
    397408
    398409    /* Update multi-screen layout before any window update: */
    … …  
    404415        UIMachineLogic::sltHostScreenCountChanged();
    405416    /* Revalidate 'fullscreen' windows for ML and next: */
    406     else revalidateFullscreenWindows();
     417    else revalidateNativeFullScreen();
    407418#else /* !Q_WS_MAC */
    408419    /* Call to base-class: */
    … …  
    518529        }
    519530        /* Revalidate 'fullscreen' windows: */
    520         revalidateFullscreenWindows();
     531        revalidateNativeFullScreen();
    521532    }
    522533#endif /* Q_WS_MAC */
    … …  
    639650
    640651    /* Acquire fade-token: */
     652    LogRel(("UIMachineLogicFullscreen::fadeToBlack\n"));
    641653    CGAcquireDisplayFadeReservation(kCGMaxDisplayReservationInterval, &m_fadeToken);
    642654    CGDisplayFade(m_fadeToken, 0.3, kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0.0, 0.0, 0.0, true);
    … …  
    650662
    651663    /* Release fade-token: */
     664    LogRel(("UIMachineLogicFullscreen::fadeToNormal\n"));
    652665    CGDisplayFade(m_fadeToken, 0.5, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0.0, 0.0, 0.0, false);
    653666    CGReleaseDisplayFadeReservation(m_fadeToken);
    … …  
    655668}
    656669
    657 void UIMachineLogicFullscreen::revalidateFullscreenWindow(UIMachineWindow *pMachineWindow)
    658 {
    659     LogRel(("UIMachineLogicFullscreen::revalidateFullscreenWindow #%d begin.\n", pMachineWindow->screenId()));
    660 
     670void UIMachineLogicFullscreen::revalidateNativeFullScreen(UIMachineWindow *pMachineWindow)
     671{
    661672    /* Make sure window is not already invalidated: */
    662673    if (m_invalidFullscreenMachineWindows.contains(pMachineWindow))
    … …  
    669680    /* Get screen ID: */
    670681    ulong uScreenID = pMachineWindow->screenId();
     682    LogRel(("UIMachineLogicFullscreen::revalidateNativeFullScreen: For machine-window #%d.\n",
     683            (int)uScreenID));
    671684
    672685    /* Validate window which can't be fullscreen: */
    673686    if (uScreenID != 0 && !darwinScreensHaveSeparateSpaces())
    674687    {
     688        LogRel(("UIMachineLogicFullscreen::revalidateNativeFullScreen: "
     689                "Ask machine-window #%d to show/normalize.\n", (int)uScreenID));
     690
    675691        /* Make sure window have proper geometry: */
    676692        pMachineWindow->showInNecessaryMode();
    … …  
    688704                && hasHostScreenForGuestScreen(uScreenID))
    689705            {
    690                 LogRel(("UIMachineLogicFullscreen::revalidateFullscreenWindow: "
    691                         "Ask machine-window #%d to enter fullscreen.\n", (int)uScreenID));
     706                LogRel(("UIMachineLogicFullscreen::revalidateNativeFullScreen: "
     707                        "Ask machine-window #%d to enter native fullscreen.\n", (int)uScreenID));
    692708
    693709                /* Fade to black: */
    … …  
    707723            else if (pMachineWindow->isVisible())
    708724            {
     725                LogRel(("UIMachineLogicFullscreen::revalidateNativeFullScreen: "
     726                        "Ask machine-window #%d to hide.\n", (int)uScreenID));
     727
    709728                /* Else make sure that window is hidden: */
    710729                pMachineWindow->showInNecessaryMode();
    … …  
    733752                || frameBufferSize != screenSize)
    734753            {
    735                 LogRel(("UIMachineLogicFullscreen::revalidateFullscreenWindow: "
    736                         "Ask machine-window #%d to exit fullscreen.\n", (int)uScreenID));
     754                LogRel(("UIMachineLogicFullscreen::revalidateNativeFullScreen: "
     755                        "Ask machine-window #%d to exit native fullscreen.\n", (int)uScreenID));
    737756
    738757                /* Fade to black: */
    … …  
    747766        }
    748767    }
    749 
    750     LogRel(("UIMachineLogicFullscreen::revalidateFullscreenWindow #%d end.\n", pMachineWindow->screenId()));
    751 }
    752 
    753 void UIMachineLogicFullscreen::revalidateFullscreenWindows()
     768}
     769
     770void UIMachineLogicFullscreen::revalidateNativeFullScreen()
    754771{
    755772    /* Revalidate all fullscreen windows: */
    756773    foreach (UIMachineWindow *pMachineWindow, machineWindows())
    757         revalidateFullscreenWindow(pMachineWindow);
     774        revalidateNativeFullScreen(pMachineWindow);
    758775}
    759776#endif /* Q_WS_MAC */

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.h

    r51248 r51249  
    123123
    124124    /** Mac OS X: Revalidates 'fullscreen' mode for @a pMachineWindow. */
    125     void revalidateFullscreenWindow(UIMachineWindow *pMachineWindow);
     125    void revalidateNativeFullScreen(UIMachineWindow *pMachineWindow);
    126126    /** Mac OS X: Revalidates 'fullscreen' mode for all windows. */
    127     void revalidateFullscreenWindows();
     127    void revalidateNativeFullScreen();
    128128#endif /* Q_WS_MAC */
    129129

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp

    r50490 r51249  
    5656            if (uisession()->isGuestSupportsSeamless())
    5757            {
    58                 LogRel(("UIMachineLogicNormal: Going 'seamless' as requested...\n"));
     58                LogRel(("UIMachineLogicNormal::sltCheckForRequestedVisualStateType: "
     59                        "Going 'seamless' as requested...\n"));
    5960                uisession()->setRequestedVisualState(UIVisualStateType_Invalid);
    6061                uisession()->changeVisualState(UIVisualStateType_Seamless);

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp

    r50631 r51249  
    118118    if (!uisession()->isGuestSupportsSeamless())
    119119    {
    120         LogRel(("UIMachineLogicSeamless: Leaving 'seamless' as it is no more supported...\n"));
     120        LogRel(("UIMachineLogicSeamless::sltCheckForRequestedVisualStateType: "
     121                "Leaving 'seamless' as it is no more supported...\n"));
    121122        uisession()->setRequestedVisualState(UIVisualStateType_Seamless);
    122123        uisession()->changeVisualState(UIVisualStateType_Normal);
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette