← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-03-11 17:16:37 UTC
  • mfrom: (0.3.4 upstream) (0.4.8 sid)
  • Revision ID: james.westby@ubuntu.com-20100311171637-43z64ia3ccpj8vqn
Tags: 3.1.4-dfsg-2ubuntu1
https://launchpad.net/bugs/528561
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/535297
* Merge from Debian unstable (LP: #528561), remaining changes:
  - VirtualBox should go in Accessories, not in System tools (LP: #288590)
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Add Launchpad integration
    - debian/control
    - debian/lpi-bug.xpm
    - debian/patches/u02-lp-integration.dpatch
  - Replace *-source packages with transitional packages for *-dkms
* Fix crash in vboxvideo_drm with kernel 2.6.33 / backported drm code
  (LP: #535297)
* Add a list of linux-headers packages to the apport hook
* Update debian/patches/u02-lp-integration.dpatch with a
  DEP-3 compliant header
* Add ${misc:Depends} to virtualbox-ose-source and virtualbox-ose-guest-source
  Depends

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp
1346
1346
                    mIgnoreFrameBufferResize = false;
1347
1347
                }
1348
1348
 
 
1349
                mMainWnd->onDisplayResize (re->width(), re->height());
 
1350
 
1349
1351
                return true;
1350
1352
            }
1351
1353
 
2343
2345
            flags |= KeyPrint;
2344
2346
            break;
2345
2347
        case XK_Pause:
2346
 
            flags |= KeyPause;
 
2348
            if (event->xkey.state & ControlMask) /* Break */
 
2349
            {
 
2350
                ks = XK_Break;
 
2351
                flags |= KeyExtended;
 
2352
                scan = 0x46;
 
2353
            }
 
2354
            else
 
2355
                flags |= KeyPause;
2347
2356
            break;
2348
2357
    }
2349
2358
 
4152
4161
         * screen, this will exclude space taken up by desktop taskbars
4153
4162
         * and things, but this is unfortunately not true for the more
4154
4163
         * complex case of a desktop spanning multiple screens. */
4155
 
        QRect desktop = QApplication::desktop()->availableGeometry (this);
 
4164
        QRect desktop = availableGeometry();
4156
4165
        /* The area taken up by the console window on the desktop,
4157
4166
         * including window frame, title and menu bar and whatnot. */
4158
4167
        QRect frame = mMainWnd->frameGeometry();
4193
4202
    }
4194
4203
}
4195
4204
 
 
4205
QRect VBoxConsoleView::availableGeometry() const
 
4206
{
 
4207
    return mMainWnd->isWindowFullScreen() ?
 
4208
           QApplication::desktop()->screenGeometry(this) :
 
4209
           QApplication::desktop()->availableGeometry(this);
 
4210
}
 
4211
 
4196
4212
int VBoxConsoleView::contentsWidth() const
4197
4213
{
4198
4214
    return mFrameBuf->width();