Add AsClone to Enable-Display

Author: MartinGC94

Docs/Enable-Display.md

@@ -14,7 +14,7 @@ If the display is already active, but is used for display cloning then this will
 ## SYNTAX
 
 ```
-Enable-Display [-DisplayId] <UInt32[]> [<CommonParameters>]
+Enable-Display [-DisplayId] <UInt32[]> [-AsClone] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -51,6 +51,23 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -AsClone
+When specified, the specified displays are put into one clone group.
+This allows you to turn on displays and add them to a clone group in one go.
+You can use this over Copy-DisplaySource when you want to let Windows determine the best mode, rather than copying it from an existing display.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### CommonParameters
 This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216).
 

Release notes.txt

@@ -8,6 +8,8 @@
         Removed the "ApplyNow" parameter as it is no longer needed. If the DisplayConfig parameter is not specified, it will apply the changes immediately.
         The "Position" parameter set is now the default and "XPosition" and "YPosition" are no longer mandatory, allowing adjustment of one without the other.
     Fix index out of bounds error when cloning a display while another display is disabled.
+    Add new switch parameter "AsClone" to "Enable-Display". When this is set, the specified displays are enabled as needed and put into one clone group.
+        This allows Windows to determine the best clone source instead of manually specifying it with "Copy-DisplaySource" and it works with disabled displays.
     Update the displayId completer list item text and tooltip to include the connection type.
     Update "Use-DisplayConfig" so the "UpdateAdapterIds" parameter defaults to true for imported configs.
 2.0:

src/DisplayConfig/Commands/EnableDisplayCommand.cs

@@ -15,6 +15,9 @@ public sealed class EnableDisplayCommand : Cmdlet
         [ArgumentCompleter(typeof(DisplayIdCompleter))]
         public uint[] DisplayId { get; set; }
 
+        [Parameter()]
+        public SwitchParameter AsClone { get; set; }
+
         protected override void EndProcessing()
         {
             var config = API.DisplayConfig.GetConfig();
@@ -35,8 +38,10 @@ protected override void EndProcessing()
             // This is done by invalidating all the mode indexes and setting a clone group for each display that should be active.
             // Displays with the same desktop position are considered cloned.
             // We keep track of the existing display clones so we don't accidentally stop cloning a display while enabling another.
+            // If the AsClone switch is set, we add all the specified displays to Clone group 0.
+            // This puts them in one clone group regardless if they are disabled or already in a different clone group.
             var cloneGroupTable = new Dictionary<POINTL, uint>();
-            uint cloneGroup = 0;
+            uint cloneGroup = AsClone ? (uint)1 : 0;
             foreach (int index in config.AvailablePathIndexes)
             {
                 config.PathArray[index].targetInfo.modeInfoIdx = API.DisplayConfig.DISPLAYCONFIG_PATH_MODE_IDX_INVALID;
@@ -45,8 +50,8 @@ protected override void EndProcessing()
                 {
                     if (displaysToEnable.Contains(index))
                     {
-                        config.PathArray[index].sourceInfo.ResetModeAndSetCloneGroup(cloneGroup);
-                        cloneGroup++;
+                        uint cloneGroupToSet = AsClone ? 0 : cloneGroup++;
+                        config.PathArray[index].sourceInfo.ResetModeAndSetCloneGroup(cloneGroupToSet);
                     }
                     else
                     {
@@ -65,9 +70,9 @@ protected override void EndProcessing()
                 }
                 else if (displaysToEnable.Contains(index))
                 {
-                    config.PathArray[index].sourceInfo.CloneGroupId = cloneGroup;
+                    uint cloneGroupToSet = AsClone ? 0 : cloneGroup++;
+                    config.PathArray[index].sourceInfo.CloneGroupId = cloneGroupToSet;
                     config.PathArray[index].flags |= PathInfoFlags.DISPLAYCONFIG_PATH_ACTIVE;
-                    cloneGroup++;
                 }
             }