VirtualBox

Changeset 50338 in vbox


Ignore:
Timestamp:
Feb 6, 2014 9:07:50 AM (11 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
92068
Message:

Additions/x11/VBoxClient: seamless: renaming of files and classes.

Location:
trunk/src/VBox/Additions/x11/VBoxClient
Files:
5 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk

    r50337 r50338  
    5959 VBoxClient_DEFS += SEAMLESS_GUEST DYNAMIC_RESIZE
    6060 VBoxClient_SOURCES += \
    61         seamless-host.cpp \
     61        seamless.cpp \
    6262        seamless-x11.cpp \
    6363        display.cpp \
    … …  
    109109   tstSeamlessX11_SOURCES = \
    110110           testcase/tstSeamlessX11.cpp \
    111            seamless-host.cpp \
     111           seamless.cpp \
    112112           seamless-x11.cpp
    113113   tstSeamlessX11_LIBPATH = \

  • trunk/src/VBox/Additions/x11/VBoxClient/seamless-x11.cpp

    r50337 r50338  
    7171  * @returns true if it can handle seamless, false otherwise
    7272  */
    73 int VBoxGuestSeamlessX11::init(SeamlessHostProxy *pHost)
     73int SeamlessX11::init(SeamlessHostProxy *pHost)
    7474{
    7575    int rc = VINF_SUCCESS;
    … …  
    9999 * @todo This function should switch the guest to fullscreen mode.
    100100 */
    101 int VBoxGuestSeamlessX11::start(void)
     101int SeamlessX11::start(void)
    102102{
    103103    int rc = VINF_SUCCESS;
    … …  
    116116/** Stop reporting seamless events to the host.  Free information about guest windows
    117117    and stop requesting updates. */
    118 void VBoxGuestSeamlessX11::stop(void)
     118void SeamlessX11::stop(void)
    119119{
    120120    LogRelFlowFunc(("\n"));
    … …  
    125125}
    126126
    127 void VBoxGuestSeamlessX11::monitorClientList(void)
     127void SeamlessX11::monitorClientList(void)
    128128{
    129129    LogRelFlowFunc(("called\n"));
    … …  
    131131}
    132132
    133 void VBoxGuestSeamlessX11::unmonitorClientList(void)
     133void SeamlessX11::unmonitorClientList(void)
    134134{
    135135    LogRelFlowFunc(("called\n"));
    … …  
    141141 * X server.
    142142 */
    143 void VBoxGuestSeamlessX11::rebuildWindowTree(void)
     143void SeamlessX11::rebuildWindowTree(void)
    144144{
    145145    LogRelFlowFunc(("called\n"));
    … …  
    156156 * @param hRoot the virtual root window to be examined
    157157 */
    158 void VBoxGuestSeamlessX11::addClients(const Window hRoot)
     158void SeamlessX11::addClients(const Window hRoot)
    159159{
    160160    /** Unused out parameters of XQueryTree */
    … …  
    178178
    179179
    180 void VBoxGuestSeamlessX11::addClientWindow(const Window hWin)
     180void SeamlessX11::addClientWindow(const Window hWin)
    181181{
    182182    LogRelFlowFunc(("\n"));
    … …  
    241241 * @param hWin the window to be examined
    242242 */
    243 bool VBoxGuestSeamlessX11::isVirtualRoot(Window hWin)
     243bool SeamlessX11::isVirtualRoot(Window hWin)
    244244{
    245245    unsigned char *windowTypeRaw = NULL;
    … …  
    275275 * Free all information in the tree of visible windows
    276276 */
    277 void VBoxGuestSeamlessX11::freeWindowTree(void)
     277void SeamlessX11::freeWindowTree(void)
    278278{
    279279    /* We use post-increment in the operation to prevent the iterator from being invalidated. */
    … …  
    289289 * @note Called from the guest event thread.
    290290 */
    291 void VBoxGuestSeamlessX11::nextEvent(void)
     291void SeamlessX11::nextEvent(void)
    292292{
    293293    XEvent event;
    … …  
    345345 * @param event the X11 event structure
    346346 */
    347 void VBoxGuestSeamlessX11::doConfigureEvent(Window hWin)
     347void SeamlessX11::doConfigureEvent(Window hWin)
    348348{
    349349    VBoxGuestWinInfo *pInfo = mGuestWindows.find(hWin);
    … …  
    381381 * @param event the X11 event structure
    382382 */
    383 void VBoxGuestSeamlessX11::doMapEvent(Window hWin)
     383void SeamlessX11::doMapEvent(Window hWin)
    384384{
    385385    LogRelFlowFunc(("\n"));
    … …  
    399399 * @param event the X11 event structure
    400400 */
    401 void VBoxGuestSeamlessX11::doShapeEvent(Window hWin)
     401void SeamlessX11::doShapeEvent(Window hWin)
    402402{
    403403    LogRelFlowFunc(("\n"));
    … …  
    427427 * @param event the X11 event structure
    428428 */
    429 void VBoxGuestSeamlessX11::doUnmapEvent(Window hWin)
     429void SeamlessX11::doUnmapEvent(Window hWin)
    430430{
    431431    LogRelFlowFunc(("\n"));
    … …  
    442442 * Gets the list of visible rectangles
    443443 */
    444 RTRECT *VBoxGuestSeamlessX11::getRects(void)
     444RTRECT *SeamlessX11::getRects(void)
    445445{
    446446    return mpRects;
    … …  
    450450 * Gets the number of rectangles in the visible rectangle list
    451451 */
    452 size_t VBoxGuestSeamlessX11::getRectCount(void)
     452size_t SeamlessX11::getRectCount(void)
    453453{
    454454    return mcRects;
    … …  
    501501 * Updates the list of seamless rectangles
    502502 */
    503 int VBoxGuestSeamlessX11::updateRects(void)
     503int SeamlessX11::updateRects(void)
    504504{
    505505    LogRelFlowFunc(("\n"));
    … …  
    528528 * @note This function should only be called from the host event thread.
    529529 */
    530 bool VBoxGuestSeamlessX11::interruptEvent(void)
     530bool SeamlessX11::interruptEvent(void)
    531531{
    532532    bool rc = false;

  • trunk/src/VBox/Additions/x11/VBoxClient/seamless-x11.h

    r50337 r50338  
    155155};
    156156
    157 class VBoxGuestSeamlessX11
     157class SeamlessX11
    158158{
    159159private:
    160160    // We don't want a copy constructor or assignment operator
    161     VBoxGuestSeamlessX11(const VBoxGuestSeamlessX11&);
    162     VBoxGuestSeamlessX11& operator=(const VBoxGuestSeamlessX11&);
     161    SeamlessX11(const SeamlessX11&);
     162    SeamlessX11& operator=(const SeamlessX11&);
    163163
    164164    // Private member variables
    … …  
    248248    void doShapeEvent(Window hWin);
    249249
    250     VBoxGuestSeamlessX11(void)
     250    SeamlessX11(void)
    251251        : mHost(0), mDisplay(NULL), mpRects(NULL), mcRects(0),
    252252          mSupportsShape(false), mEnabled(false), mChanged(false) {}
    253253
    254     ~VBoxGuestSeamlessX11()
     254    ~SeamlessX11()
    255255    {
    256256        uninit();

  • trunk/src/VBox/Additions/x11/VBoxClient/seamless.cpp

    r50337 r50338  
    2929
    3030#include "VBoxClient.h"
    31 #include "seamless-host.h"
    32 #include "seamless-x11.h"
     31#include "seamless.h"
    3332
    3433/**
    … …  
    3635 * @returns iprt status value
    3736 */
    38 int VBoxGuestSeamlessHost::start(void)
     37int SeamlessMain::start(void)
    3938{
    4039    int rc = VERR_NOT_SUPPORTED;
    … …  
    7877
    7978/** Stops the service. */
    80 void VBoxGuestSeamlessHost::stop()
     79void SeamlessMain::stop()
    8180{
    8281    LogRelFlowFunc(("\n"));
    … …  
    9796 * @returns        IRPT return code.
    9897 */
    99 int VBoxGuestSeamlessHost::nextEvent(void)
     98int SeamlessMain::nextEvent(void)
    10099{
    101100    VMMDevSeamlessMode newMode = VMMDev_Seamless_Disabled;
    … …  
    148147 * Update the set of visible rectangles in the host.
    149148 */
    150 void VBoxGuestSeamlessHost::notify(RTRECT *pRects, size_t cRects)
     149void SeamlessMain::notify(RTRECT *pRects, size_t cRects)
    151150{
    152151    LogRelFlowFunc(("\n"));
    … …  
    164163 * The actual event thread function.
    165164 */
    166 int VBoxGuestSeamlessHost::threadFunction(RTTHREAD self, void *pvUser)
    167 {
    168     VBoxGuestSeamlessHost *pHost = (VBoxGuestSeamlessHost *)pvUser;
     165int SeamlessMain::threadFunction(RTTHREAD self, void *pvUser)
     166{
     167    SeamlessMain *pHost = (SeamlessMain *)pvUser;
    169168
    170169    LogRelFlowFunc(("\n"));
    … …  
    190189 * Send a signal to the thread that it should exit
    191190 */
    192 void VBoxGuestSeamlessHost::stopThread()
     191void SeamlessMain::stopThread()
    193192{
    194193    int rc;
    … …  
    219218 * The actual X11 event thread function.
    220219 */
    221 int VBoxGuestSeamlessHost::x11ThreadFunction(RTTHREAD self, void *pvUser)
    222 {
    223     VBoxGuestSeamlessHost *pHost = (VBoxGuestSeamlessHost *)pvUser;
     220int SeamlessMain::x11ThreadFunction(RTTHREAD self, void *pvUser)
     221{
     222    SeamlessMain *pHost = (SeamlessMain *)pvUser;
    224223    int rc = VINF_SUCCESS;
    225224
    … …  
    241240 * Send a signal to the thread function that it should exit
    242241 */
    243 void VBoxGuestSeamlessHost::stopX11Thread(void)
     242void SeamlessMain::stopX11Thread(void)
    244243{
    245244    int rc;
    … …  
    261260{
    262261private:
    263     VBoxGuestSeamlessHost mSeamless;
     262    SeamlessMain mSeamless;
    264263    bool mIsInitialised;
    265264public:

  • trunk/src/VBox/Additions/x11/VBoxClient/seamless.h

    r50337 r50338  
    2929 * Interface to the host
    3030 */
    31 class VBoxGuestSeamlessHost : public SeamlessHostProxy
     31class SeamlessMain : public SeamlessHostProxy
    3232{
    3333public:
    … …  
    4545private:
    4646    // We don't want a copy constructor or assignment operator
    47     VBoxGuestSeamlessHost(const VBoxGuestSeamlessHost&);
    48     VBoxGuestSeamlessHost& operator=(const VBoxGuestSeamlessHost&);
     47    SeamlessMain(const SeamlessMain&);
     48    SeamlessMain& operator=(const SeamlessMain&);
    4949
    5050    /** Have we been initialised yet? */
    5151    bool mIsInitialised;
    5252    /** X11 event monitor object */
    53     VBoxGuestSeamlessX11 mX11Monitor;
     53    SeamlessX11 mX11Monitor;
    5454
    5555    /** Thread to start and stop when we enter and leave seamless mode which
    … …  
    128128    virtual void notify(RTRECT *pRects, size_t cRects);
    129129
    130     VBoxGuestSeamlessHost(void)
     130    SeamlessMain(void)
    131131    {
    132132        mIsInitialised = false;
    … …  
    138138    }
    139139
    140     ~VBoxGuestSeamlessHost()
     140    ~SeamlessMain()
    141141    {
    142142        LogRelFlowFunc(("\n"));

  • trunk/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11-auto.cpp

    r50337 r50338  
    598598static unsigned smlsDoFixture(SMLSFIXTURE *pFixture, const char *pszDesc)
    599599{
    600     VBoxGuestSeamlessX11 subject;
     600    SeamlessX11 subject;
    601601    testHost host;
    602602    unsigned cErrs = 0;

  • trunk/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11.cpp

    r50337 r50338  
    119119    RTSemEventCreate(&eventSem);
    120120    /** Our instance of the seamless class. */
    121     VBoxGuestSeamless seamless;
     121    SeamlessMain seamless;
    122122    LogRel(("Starting seamless Guest Additions...\n"));
    123123    rc = seamless.init();
Note: See TracChangeset for help on using the changeset viewer.

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