← Back to branch summary

~ubuntu-branches/ubuntu/vivid/virtualbox/vivid

« back to all changes in this revision

Viewing changes to src/VBox/Main/src-client/DisplayImpl.cpp

  • Committer: Package Import Robot
  • Author(s): Felix Geyer
  • Date: 2013-03-31 23:25:01 UTC
  • mfrom: (1.1.14)
  • Revision ID: package-import@ubuntu.com-20130331232501-l72jhvixkeyyz6xc
Tags: 4.2.10-dfsg-0ubuntu1
http://bugs.debian.org/703358
* Start the virtualbox-guest-x11 init script earlier.
  The vboxvideo module needs to be loaded before X starts.
* Change runlevels of virtualbox-guest-x11 init script on upgrade.
* Fix build failure with the Debian wheezy kernel which backports the drm
  subsystem from Linux 3.4. (Closes: #703358)
* Drop build-dependency on bcc as it's not needed anymore.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Main/src-client/DisplayImpl.cpp
4097
4097
        pFBInfo->fDisabled = true;
4098
4098
        pFBInfo->flags = pScreen->u16Flags;
4099
4099
 
4100
 
        /* Temporary: ask framebuffer to resize using a default format. The framebuffer will be black. */
4101
 
        pThis->handleDisplayResize(pScreen->u32ViewIndex, 0,
4102
 
                                   (uint8_t *)NULL,
4103
 
                                   pScreen->u32LineSize, pScreen->u32Width,
4104
 
                                   pScreen->u32Height, pScreen->u16Flags);
 
4100
        /* Ask the framebuffer to resize using a default format. The framebuffer will be black.
 
4101
         * So if the frontend does not support GuestMonitorChangedEventType_Disabled event,
 
4102
         * the VM window will be black. */
 
4103
        uint32_t u32Width = pFBInfo->w ? pFBInfo->w : 640;
 
4104
        uint32_t u32Height = pFBInfo->h ? pFBInfo->h : 480;
 
4105
        pThis->handleDisplayResize(pScreen->u32ViewIndex, 0, (uint8_t *)NULL, 0,
 
4106
                                   u32Width, u32Height, pScreen->u16Flags);
4105
4107
 
4106
4108
        fireGuestMonitorChangedEvent(pThis->mParent->getEventSource(),
4107
4109
                                     GuestMonitorChangedEventType_Disabled,