Skip to content

Commit 9927ac8

Browse files
bird2toribird2tori
committed
VBoxClient: Disabled the --wayland service, since it is no longer used. Keeping the code around till drag&drop code shows up and is tackled. bugref:10194
svn:sync-xref-src-repo-rev: r174580
1 parent 3501612 commit 9927ac8

10 files changed

Lines changed: 41 additions & 24 deletions

‎src/VBox/Additions/x11/VBoxClient/Makefile.kmk‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Id: Makefile.kmk 114742 2026-07-21 18:04:56Z knut.osmundsen@oracle.com $
1+
# $Id: Makefile.kmk 114743 2026-07-21 18:31:58Z knut.osmundsen@oracle.com $
22
## @file
33
# Sub-Makefile for the VirtualBox Guest Addition X11 Client.
44
#
@@ -144,8 +144,6 @@ ifdef VBOX_WITH_VMSVGA
144144
display-ipc.cpp \
145145
display-helper-gnome3.cpp \
146146
display-helper-generic.cpp
147-
148-
### include $(PATH_SUB_CURRENT)/helpers/Makefile.kmk
149147
endif
150148

151149
ifdef VBOX_WITH_SHARED_CLIPBOARD
@@ -180,13 +178,6 @@ ifdef VBOX_WITH_SHARED_CLIPBOARD
180178
clipboard-wayland.cpp \
181179
clipboard-wayland-popup.cpp \
182180
host-input-focus.cpp \
183-
wayland-helper-xdcp-common.cpp \
184-
$(VBoxClient_0_OUTDIR)/wayland-helper-dcp.cpp \
185-
wayland-helper-edcp.cpp \
186-
wayland-helper-gtk.cpp \
187-
wayland-helper.cpp \
188-
wayland.cpp \
189-
wayland-helper-ipc.cpp \
190181
$(PATH_ROOT)/src/VBox/GuestHost/common/mime-type-converter.cpp \
191182
$(PATH_ROOT)/src/VBox/GuestHost/common/VbghWayland.cpp \
192183
$(PATH_ROOT)/src/VBox/GuestHost/common/VbghWaylandPopup.cpp \
@@ -197,7 +188,18 @@ ifdef VBOX_WITH_SHARED_CLIPBOARD
197188
../wlInclude/xdg-shell.c \
198189
../wlInclude/xdg-activation-v1.c \
199190
../wlInclude/gtk-shell.c
191+
endif
200192

193+
ifdef VBOX_WITH_WAYLAND_ADDITIONS_LEGACY # Old code.
194+
VBoxClient_DEFS.linux += VBOX_WITH_WAYLAND_ADDITIONS_LEGACY
195+
VBoxClient_SOURCES.linux += \
196+
wayland-helper-xdcp-common.cpp \
197+
$(VBoxClient_0_OUTDIR)/wayland-helper-dcp.cpp \
198+
wayland-helper-edcp.cpp \
199+
wayland-helper-gtk.cpp \
200+
wayland-helper.cpp \
201+
wayland.cpp \
202+
wayland-helper-ipc.cpp
201203
VBoxClient_CLEAN.linux += $(VBoxClient_0_OUTDIR)/wayland-helper-dcp.cpp
202204
$$(VBoxClient_0_OUTDIR)/wayland-helper-dcp.cpp: \
203205
$(VBOX_PATH_X11_VBOXCLIENT)/wayland-helper-dcp-from-edcp.sed \
@@ -209,7 +211,7 @@ ifdef VBOX_WITH_SHARED_CLIPBOARD
209211
--output "$(@)" \
210212
"$(VBOX_PATH_X11_VBOXCLIENT)/wayland-helper-edcp.cpp"
211213
endif
212-
endif
214+
endif # VBOX_WITH_SHARED_CLIPBOARD
213215

214216
ifdef VBOX_WITH_SHARED_CLIPBOARD_X11_LAZY_LOAD
215217
# Macro for generating the lazy loading assembly stub loader for a specific .def file.
@@ -253,6 +255,7 @@ ifdef VBOX_WITH_SHARED_CLIPBOARD_X11_LAZY_LOAD
253255
$(evalcall2 VBOXCLIENT_LAZYLOAD_GEN_ASM_FN,$(PATH_ROOT)/src/VBox/GuestHost/libwayland-client.def,libwayland-client,$(VBOX_VBOXCLIENT_LIBWAYLANDCLIENT_VER))
254256
endif
255257

258+
256259
if 0 #def VBOX_WITH_WAYLAND_ADDITIONS - not needed any more.
257260
#
258261
# vboxwl - GTK Wayland helper for VBoxClient.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: VBoxClient.h 114741 2026-07-21 17:38:02Z knut.osmundsen@oracle.com $ */
1+
/* $Id: VBoxClient.h 114743 2026-07-21 18:31:58Z knut.osmundsen@oracle.com $ */
22
/** @file
33
*
44
* VirtualBox additions user session daemon.
@@ -205,7 +205,7 @@ extern VBCLSERVICE g_SvcDisplaySVGASession;
205205
extern VBCLSERVICE g_SvcDragAndDrop;
206206
extern VBCLSERVICE g_SvcHostVersion;
207207
extern VBCLSERVICE g_SvcSeamless;
208-
# ifdef VBOX_WITH_WAYLAND_ADDITIONS
208+
# ifdef VBOX_WITH_WAYLAND_ADDITIONS_LEGACY
209209
extern VBCLSERVICE const g_SvcWayland;
210210
# endif
211211

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: main.cpp 114740 2026-07-21 14:36:59Z knut.osmundsen@oracle.com $ */
1+
/* $Id: main.cpp 114743 2026-07-21 18:31:58Z knut.osmundsen@oracle.com $ */
22
/** @file
33
* VirtualBox Guest Additions - X11 Client.
44
*/
@@ -507,7 +507,7 @@ static RTEXITCODE vboxClientUsage(void)
507507
#endif
508508
RTPrintf(" --display starts VMSVGA dynamic resizing for legacy guests\n");
509509
#endif
510-
#ifdef VBOX_WITH_WAYLAND_ADDITIONS
510+
#ifdef VBOX_WITH_WAYLAND_ADDITIONS_LEGACY
511511
RTPrintf(" --wayland starts the shared clipboard and drag-and-drop services for Wayland\n");
512512
#endif
513513
RTPrintf("\n");
@@ -734,7 +734,7 @@ int main(int argc, char *argv[])
734734
{ "--vmsvga-session", VBOXCLIENT_OPT_VMSVGA_SESSION, RTGETOPT_REQ_NOTHING },
735735
{ "--display", VBOXCLIENT_OPT_DISPLAY, RTGETOPT_REQ_NOTHING },
736736
#endif
737-
#ifdef VBOX_WITH_WAYLAND_ADDITIONS
737+
#ifdef VBOX_WITH_WAYLAND_ADDITIONS_LEGACY
738738
{ "--wayland", VBOXCLIENT_OPT_WAYLAND, RTGETOPT_REQ_NOTHING },
739739
#endif
740740

@@ -849,7 +849,7 @@ int main(int argc, char *argv[])
849849
# endif
850850
VBOXCLIENT_OPT_CASE_SERVICE(VBOXCLIENT_OPT_DISPLAY, g_SvcDisplayLegacy);
851851
#endif
852-
#ifdef VBOX_WITH_WAYLAND_ADDITIONS
852+
#ifdef VBOX_WITH_WAYLAND_ADDITIONS_LEGACY
853853
VBOXCLIENT_OPT_CASE_SERVICE(VBOXCLIENT_OPT_WAYLAND, g_SvcWayland);
854854
#endif
855855
#undef VBOXCLIENT_OPT_CASE_SERVICE

‎src/VBox/Additions/x11/VBoxClient/wayland-helper-dcp-from-edcp.sed‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
# $Id: wayland-helper-dcp-from-edcp.sed 114479 2026-06-22 12:02:16Z knut.osmundsen@oracle.com $ */
1+
# $Id: wayland-helper-dcp-from-edcp.sed 114743 2026-07-21 18:31:58Z knut.osmundsen@oracle.com $ */
22
## @file
33
# Guest Additions - Generate DCP code from EDCP.
44
#
55
# The two differs only in interface names.
66
#
7+
# @note Obsolete. Only used with 'kmk VBOX_WITH_WAYLAND_ADDITIONS_LEGACY=1'.
8+
#
79

810
#
911
# Copyright (C) 2006-2026 Oracle and/or its affiliates.

‎src/VBox/Additions/x11/VBoxClient/wayland-helper-edcp.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
/* $Id: wayland-helper-edcp.cpp 114738 2026-07-21 13:40:26Z knut.osmundsen@oracle.com $ */
1+
/* $Id: wayland-helper-edcp.cpp 114743 2026-07-21 18:31:58Z knut.osmundsen@oracle.com $ */
22
/** @file
33
* Guest Additions - Ext Data Control Protocol (EDCP) helper for Wayland.
44
*
55
* This module implements Shared Clipboard support for Wayland guests
66
* using Data Control Protocol interface.
7+
*
8+
* @note Obsolete. Compiled with 'kmk VBOX_WITH_WAYLAND_ADDITIONS_LEGACY=1'.
79
*/
810

911
/*

‎src/VBox/Additions/x11/VBoxClient/wayland-helper-gtk.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
/* $Id: wayland-helper-gtk.cpp 114738 2026-07-21 13:40:26Z knut.osmundsen@oracle.com $ */
1+
/* $Id: wayland-helper-gtk.cpp 114743 2026-07-21 18:31:58Z knut.osmundsen@oracle.com $ */
22
/** @file
33
* Guest Additions - Gtk helper for Wayland.
44
*
55
* This module implements Shared Clipboard and Drag-n-Drop
66
* support for Wayland guests using the basic protocols.
7+
*
8+
* @note Obsolete. Compiled with 'kmk VBOX_WITH_WAYLAND_ADDITIONS_LEGACY=1'.
79
*/
810

911
/*

‎src/VBox/Additions/x11/VBoxClient/wayland-helper-ipc.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
/* $Id: wayland-helper-ipc.cpp 114495 2026-06-22 21:47:36Z knut.osmundsen@oracle.com $ */
1+
/* $Id: wayland-helper-ipc.cpp 114743 2026-07-21 18:31:58Z knut.osmundsen@oracle.com $ */
22
/** @file
33
* Guest Additions - IPC between VBoxClient and vboxwl tool.
4+
*
5+
* @note Obsolete. Compiled with 'kmk VBOX_WITH_WAYLAND_ADDITIONS_LEGACY=1'.
46
*/
57

68
/*

‎src/VBox/Additions/x11/VBoxClient/wayland-helper-xdcp-common.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
/* $Id: wayland-helper-xdcp-common.cpp 114505 2026-06-24 08:58:53Z knut.osmundsen@oracle.com $ */
1+
/* $Id: wayland-helper-xdcp-common.cpp 114743 2026-07-21 18:31:58Z knut.osmundsen@oracle.com $ */
22
/** @file
33
* Guest Additions - Common code for Data Control Protocol (DCP) family helper for Wayland.
4+
*
5+
* @note Obsolete. Compiled with 'kmk VBOX_WITH_WAYLAND_ADDITIONS_LEGACY=1'.
46
*/
57

68
/*

‎src/VBox/Additions/x11/VBoxClient/wayland-helper.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
/* $Id: wayland-helper.cpp 114738 2026-07-21 13:40:26Z knut.osmundsen@oracle.com $ */
1+
/* $Id: wayland-helper.cpp 114743 2026-07-21 18:31:58Z knut.osmundsen@oracle.com $ */
22
/** @file
33
* Guest Additions - Common code for Wayland Desktop Environment helpers.
4+
*
5+
* @note Obsolete. Compiled with 'kmk VBOX_WITH_WAYLAND_ADDITIONS_LEGACY=1'.
46
*/
57

68
/*

‎src/VBox/Additions/x11/VBoxClient/wayland.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
/* $Id: wayland.cpp 114738 2026-07-21 13:40:26Z knut.osmundsen@oracle.com $ */
1+
/* $Id: wayland.cpp 114743 2026-07-21 18:31:58Z knut.osmundsen@oracle.com $ */
22
/** @file
33
* Guest Additions - Wayland Desktop Environment assistant.
4+
*
5+
* @note Obsolete. Compiled with 'kmk VBOX_WITH_WAYLAND_ADDITIONS_LEGACY=1'.
46
*/
57

68
/*

0 commit comments

Comments
 (0)