|
 |
df53b5 |
Shared Clipboard: ticketref:19336 Linux guest: shared clipboard doesn't work (on fresh VirtualBox-6.1.4-136177)
|
|
|
df53b5 |
|
|
|
df53b5 |
git-svn-id: http://www.virtualbox.org/svn/vbox@83184 cfe28804-0f27-0410-a406-dd0f0b0b656f
|
|
|
df53b5 |
diff --git trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp b/trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp
|
|
|
df53b5 |
index ad9e3bf69c..9063b212cd 100644
|
|
|
df53b5 |
--- trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp
|
|
|
df53b5 |
+++ trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp
|
|
|
df53b5 |
@@ -107,7 +107,7 @@ DECLCALLBACK(int) ShClX11RequestDataForX11Callback(PSHCLCONTEXT pCtx, SHCLFORMAT
|
|
|
df53b5 |
else
|
|
|
df53b5 |
#endif
|
|
|
df53b5 |
{
|
|
|
df53b5 |
- uint32_t cbData = _4K; /** @ŧodo Make this dynamic. */
|
|
|
df53b5 |
+ uint32_t cbData = _4K; /** @todo Make this dynamic. */
|
|
|
df53b5 |
void *pvData = RTMemAlloc(cbData);
|
|
|
df53b5 |
if (pvData)
|
|
|
df53b5 |
{
|
|
|
df53b5 |
@@ -215,7 +215,6 @@ DECLCALLBACK(void) ShClX11RequestFromX11CompleteCallback(PSHCLCONTEXT pCtx, int
|
|
|
df53b5 |
*
|
|
|
df53b5 |
* @returns VBox status code.
|
|
|
df53b5 |
*/
|
|
|
df53b5 |
-#if 0
|
|
|
df53b5 |
static int vboxClipboardConnect(void)
|
|
|
df53b5 |
{
|
|
|
df53b5 |
LogFlowFuncEnter();
|
|
|
df53b5 |
@@ -245,7 +244,6 @@ static int vboxClipboardConnect(void)
|
|
|
df53b5 |
LogFlowFuncLeaveRC(rc);
|
|
|
df53b5 |
return rc;
|
|
|
df53b5 |
}
|
|
|
df53b5 |
-#endif
|
|
|
df53b5 |
|
|
|
df53b5 |
/**
|
|
|
df53b5 |
* The main loop of our clipboard reader.
|
|
|
df53b5 |
@@ -469,7 +467,7 @@ static int run(struct VBCLSERVICE **ppInterface, bool fDaemonised)
|
|
|
df53b5 |
RT_NOREF(ppInterface, fDaemonised);
|
|
|
df53b5 |
|
|
|
df53b5 |
/* Initialise the guest library. */
|
|
|
df53b5 |
- int rc = 0; //vboxClipboardConnect();
|
|
|
df53b5 |
+ int rc = vboxClipboardConnect();
|
|
|
df53b5 |
if (RT_SUCCESS(rc))
|
|
|
df53b5 |
{
|
|
|
df53b5 |
#ifdef VBOX_WITH_SHARED_CLIPBOARD_FUSE
|
|
|
df53b5 |
@@ -477,9 +475,7 @@ static int run(struct VBCLSERVICE **ppInterface, bool fDaemonised)
|
|
|
df53b5 |
if (RT_SUCCESS(rc))
|
|
|
df53b5 |
{
|
|
|
df53b5 |
#endif
|
|
|
df53b5 |
- RTThreadSleep(60 * 1000);
|
|
|
df53b5 |
-
|
|
|
df53b5 |
- //rc = vboxClipboardMain();
|
|
|
df53b5 |
+ rc = vboxClipboardMain();
|
|
|
df53b5 |
|
|
|
df53b5 |
#ifdef VBOX_WITH_SHARED_CLIPBOARD_FUSE
|
|
|
df53b5 |
int rc2 = vboxClipboardFUSEStop();
|