Changeset 57357 in vbox for trunk/src/VBox/Additions/x11

Timestamp:

Aug 14, 2015 3:04:46 PM (9 years ago)

Author:

vboxsync

Message:

Additions/x11/VBoxClient: remove global VT switching handling again.

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• VBoxClient.h (modified) (2 diffs)
• clipboard.cpp (modified) (1 diff)
• display.cpp (modified) (1 diff)
• draganddrop.cpp (modified) (1 diff)
• hostversion.cpp (modified) (1 diff)
• main.cpp (modified) (2 diffs)
• seamless.cpp (modified) (1 diff)

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

@@ -51 +51 @@
     /** Run the service main loop */
     int (*run)(struct VBCLSERVICE **ppInterface, bool fDaemonised);
-    /** Pause the service loop.  This is used to allow the service to disable
-     * itself when the X server is switched out.  It must be safe to call on a
-     * different thread if the VT monitoring thread is used. */
-    int (*pause)(struct VBCLSERVICE **ppInterface);
-    /** Resume after pausing.  The same applies here as for @a pause. */
-    int (*resume)(struct VBCLSERVICE **ppInterface);
     /** Clean up any global resources before we shut down hard.  The last calls
      * to @a pause and @a resume are guaranteed to finish before this is called.
@@ -77 +71 @@
 }
 
-union _XEvent;  /* We do not want to pull in the X11 header files here. */
-extern void VBClCheckXOrgVT(union _XEvent *pEvent);
-extern int VBClStartVTMonitor();
-
 extern struct VBCLSERVICE **VBClGetClipboardService();
 extern struct VBCLSERVICE **VBClGetSeamlessService();

trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp

@@ -314 +314 @@
     VBClServiceDefaultHandler, /* init */
     run,
-    VBClServiceDefaultHandler, /* pause */
-    VBClServiceDefaultHandler, /* resume */
     cleanup
 };

trunk/src/VBox/Additions/x11/VBoxClient/display.cpp

@@ -388 +388 @@
     init,
     run,
-    VBClServiceDefaultHandler, /* pause */
-    VBClServiceDefaultHandler, /* resume */
     cleanup
 };

trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp

@@ -3341 +3341 @@
     VBClServiceDefaultHandler, /* init */
     run,
-    VBClServiceDefaultHandler, /* pause */
-    VBClServiceDefaultHandler, /* resume */
     cleanup
 };

trunk/src/VBox/Additions/x11/VBoxClient/hostversion.cpp

@@ -208 +208 @@
     VBClServiceDefaultHandler, /* init */
     run,
-    VBClServiceDefaultHandler, /* pause */
-    VBClServiceDefaultHandler, /* resume */
     VBClServiceDefaultCleanup
 };

trunk/src/VBox/Additions/x11/VBoxClient/main.cpp

@@ -115 +115 @@
     XGetErrorText(pDisplay, pError->error_code, errorText, sizeof(errorText));
     LogRelFlow(("VBoxClient: an X Window protocol error occurred: %s (error code %d).  Request code: %d, minor code: %d, serial number: %d\n", errorText, pError->error_code, pError->request_code, pError->minor_code, pError->serial));
-    return 0;  /* We should never reach this. */
+    return 0;
 }
 
@@ -152 +152 @@
 }
 
-/** Check whether X.Org has acquired or lost the current virtual terminal and
- * call the service @a pause() or @a resume() call-back if appropriate.
- * The functionality is provided by the vboxvideo driver for pre-1.16 X servers
- * and by 1.16 and later series servers.
- * This can either be called directly from a service's event loop or the service
- * can call VBClStartVTMonitor() to start an event loop in a separate thread.
- * Property notification for the root window should be selected first.  Services
- * are not required to check VT changes if they do not need the information.
- * @param  pEvent an event received on a display connection which will be
- *                checked to see if it is change to the XFree86_has_VT property
- */
-void VBClCheckXOrgVT(union _XEvent *pEvent)
-{
-    Atom actualType;
-    int actualFormat;
-    unsigned long cItems, cbLeft;
-    bool fHasVT = false;
-    unsigned long *pValue;
-    int rc;
-    Display *pDisplay = pEvent->xany.display;
-    Atom hasVT = XInternAtom(pDisplay, "XFree86_has_VT", False);
-
-    if (   pEvent->type != PropertyNotify
-        || pEvent->xproperty.window != DefaultRootWindow(pDisplay)
-        || pEvent->xproperty.atom != hasVT)
-        return;
-    XGetWindowProperty(pDisplay, DefaultRootWindow(pDisplay), hasVT, 0, 1,
-                       False, XA_INTEGER, &actualType, &actualFormat, &cItems,
-                       &cbLeft, (unsigned char **)&pValue);
-    if (cItems && actualFormat == 32)
-    {
-        fHasVT = *pValue != 0;
-        XFree(pValue);
-    }
-    else
-        return;
-    if (fHasVT)
-    {
-        rc = (*g_pService)->resume(g_pService);
-        if (RT_FAILURE(rc))
-            VBClFatalError(("Error resuming the service: %Rrc\n", rc));
-    }
-    if (!fHasVT)
-    {
-        rc = (*g_pService)->pause(g_pService);
-        if (RT_FAILURE(rc))
-            VBClFatalError(("Error pausing the service: %Rrc\n", rc));
-    }
-}
-
-/**
- * Thread which notifies the service when we switch to a different VT or back
- * and cleans up when the X server exits.
- * @note runs until programme exit.
- */
-static int pfnMonitorThread(RTTHREAD self, void *pvUser)
-{
-    Display *pDisplay;
-    bool fHasVT = true;
-
-    pDisplay = XOpenDisplay(NULL);
-    if (!pDisplay)
-        VBClFatalError(("Failed to open the X11 display\n"));
-    XSelectInput(pDisplay, DefaultRootWindow(pDisplay), PropertyChangeMask);
-    while (true)
-    {
-        XEvent event;
-
-        XNextEvent(pDisplay, &event);
-        VBClCheckXOrgVT(&event);
-    }
-    return VINF_SUCCESS;  /* Should never be reached. */
-}
-
-/**
- * Start a thread which notifies the service when we switch to a different
- * VT or back, and terminates us when the X server exits.  This should be called
- * by most services which do not regularly run an X11 event loop.
- */
-int VBClStartVTMonitor()
-{
-    return RTThreadCreate(NULL, pfnMonitorThread, NULL, 0,
-                          RTTHREADTYPE_INFREQUENT_POLLER, 0, "MONITOR");
-}
-
 /**
  * Print out a usage message and exit with success.

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

@@ -355 +355 @@
     init,
     run,
-    VBClServiceDefaultHandler, /* pause */
-    VBClServiceDefaultHandler, /* resume */
     cleanup
 };