Changeset 102381 in vbox for trunk/src

Timestamp:

Nov 29, 2023 2:51:33 PM (14 months ago)

Author:

vboxsync

Message:

Main/Unattended: Added stubs for IUnattended:keyboardLayout + IUnattended:keyboardVariant attributes. bugref:10553

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (2 diffs)
• include/UnattendedImpl.h (modified) (1 diff)
• src-server/UnattendedImpl.cpp (modified) (1 diff)
• testcase/tstUnattendedScript.cpp (modified) (1 diff)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -4962 +4962 @@
   <interface
     name="IUnattended" extends="$unknown"
-    uuid="d1833215-78c9-4b42-9c2a-f44ef7b2d01f"
+    uuid="1136224d-0ba7-45d6-9aee-03b628da46b6"
     wsmap="managed"
     rest="managed"
@@ -5109 +5109 @@
               time zone formats.
         TODO: Take default from host (this requires mapping).
+      </desc>
+    </attribute>
+
+    <attribute name="keyboardLayout" type="wstring">
+      <desc>
+        Sets the keyboard layout of the guest, if available.
+
+        The 2 letter locale identifier, no codesets or such.
+
+        The format is two lower case country letter (ISO 3166-1 alpha-2).
+        For instance 'us', 'de', or 'no'.
+
+        The default is taken from the host if possible, with 'us' as fallback.
+
+        <result name="E_NOTIMPL">
+          Not implemented yet.
+        </result>
+      </desc>
+    </attribute>
+
+    <attribute name="keyboardVariant" type="wstring">
+      <desc>
+        Sets the keyboard variant of the guest, if available. Leave empty to use
+        the default variant for the current keyboard layout set.
+
+        TODO: Define + document a keyboard variants table (e.g. by using 'localectl list-x11-keymap-variants [layout]' as a base),
+              plus a mapping to Windows-based guests for that.
+
+        This depends on the current keyboard layout being set.
+
+        <result name="E_NOTIMPL">
+          Not implemented yet.
+        </result>
       </desc>
     </attribute>

trunk/src/VBox/Main/include/UnattendedImpl.h

@@ -218 +218 @@
     HRESULT getTimeZone(com::Utf8Str &aTimezone);
     HRESULT setTimeZone(const com::Utf8Str &aTimezone);
+    HRESULT getKeyboardLayout(com::Utf8Str &aKeyboardLayout);
+    HRESULT setKeyboardLayout(const com::Utf8Str &aKeyboardLayout);
+    HRESULT getKeyboardVariant(com::Utf8Str &aKeyboardVariant);
+    HRESULT setKeyboardVariant(const com::Utf8Str &aKeyboardVariant);
     HRESULT getLocale(com::Utf8Str &aLocale);
     HRESULT setLocale(const com::Utf8Str &aLocale);

trunk/src/VBox/Main/src-server/UnattendedImpl.cpp

@@ -3576 +3576 @@
 }
 
+HRESULT Unattended::getKeyboardLayout(com::Utf8Str &aKeyboardLayout)
+{
+    RT_NOREF(aKeyboardLayout);
+    return E_NOTIMPL;
+}
+
+HRESULT Unattended::setKeyboardLayout(const com::Utf8Str &aKeyboardLayout)
+{
+    RT_NOREF(aKeyboardLayout);
+    return E_NOTIMPL;
+}
+
+HRESULT Unattended::getKeyboardVariant(com::Utf8Str &aKeyboardVariant)
+{
+    RT_NOREF(aKeyboardVariant);
+    return E_NOTIMPL;
+}
+
+HRESULT Unattended::setKeyboardVariant(const com::Utf8Str &aKeyboardVariant)
+{
+    RT_NOREF(aKeyboardVariant);
+    return E_NOTIMPL;
+}
+
 HRESULT Unattended::getLocale(com::Utf8Str &aLocale)
 {

trunk/src/VBox/Main/testcase/tstUnattendedScript.cpp

@@ -288 +288 @@
 }
 
+HRESULT Unattended::getKeyboardLayout(com::Utf8Str &aKeyboardLayout)
+{
+    RT_NOREF(aKeyboardLayout);
+    return E_NOTIMPL;
+}
+
+HRESULT Unattended::setKeyboardLayout(const com::Utf8Str &aKeyboardLayout)
+{
+    RT_NOREF(aKeyboardLayout);
+    return E_NOTIMPL;
+}
+
+HRESULT Unattended::getKeyboardVariant(com::Utf8Str &aKeyboardVariant)
+{
+    RT_NOREF(aKeyboardVariant);
+    return E_NOTIMPL;
+}
+
+HRESULT Unattended::setKeyboardVariant(const com::Utf8Str &aKeyboardVariant)
+{
+    RT_NOREF(aKeyboardVariant);
+    return E_NOTIMPL;
+}
+
 HRESULT Unattended::getLocale(com::Utf8Str &aLocale)
 {