Merge monitor_reconfigure into powerd.

resolution_selector.h

+// Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef POWER_MANAGER_RESOLUTION_SELECTOR_H_
+#define POWER_MANAGER_RESOLUTION_SELECTOR_H_
+
+#include <string>
+#include <vector>
+
+#include "base/basictypes.h"
+
+namespace power_manager {
+
+// ResolutionSelector takes the sets of resolutions supported by the
+// built-in and external displays as input and attempts to choose a shared
+// resolution that will work well on both devices.
+class ResolutionSelector {
+ public:
+  // A single mode supported by a device, equivalent to the XRRModeInfo
+  // struct.
+  struct Mode {
+    Mode(int width, int height, std::string name, int id)

[tfarina, 2011/04/15 15:00:37]

Could you move the implementation to the source file?

[marcheu, 2011/04/15 17:32:23]

Done.

+        : width(width),
+          height(height),
+          name(name),
+          id(id) {
+    }
+
+    Mode()
+        : width(0),
+          height(0),
+          name(""),
+          id(0) {
+    }
+    // Mode's dimensions.
+    int width;
+    int height;
+
+    // Mode's name from XRandR.  This uniquely describes the mode and can
+    // be used to set the devices's resolution later.
+    std::string name;
+
+    // The mode id, used for setting this mode.
+    unsigned id;
+  };
+
+  // Maximum screen size for the external output at which we assume that
+  // it's a projector (as opposed to a monitor) and try to find a size that
+  // will also fit on the LCD display.  Above this, we just use the
+  // external output's maximum resolution, even if it doesn't fit on the
+  // LCD.
+  static const int kMaxProjectorPixels;

[tfarina, 2011/04/15 15:00:37]

Is this constant going to be used by someone else? I didn't check. If not, could
you move to the source file into an unnamed namespace?

[marcheu, 2011/04/15 17:32:23]

No it's used by the unittest. Please look at the code next time.

+
+  ResolutionSelector() {}

[tfarina, 2011/04/15 15:00:37]

please, move the implementation to the source file.

[marcheu, 2011/04/15 17:32:23]

Done.

+  ~ResolutionSelector() {}
+
+  // Comparator used to sort Mode objects.
+  // Returns true if |mode_a| has more pixels than |mode_b| and false otherwise.
+  class ModeResolutionComparator {
+   public:
+    bool operator()(const Mode& mode_a, const Mode& mode_b) const {
+      return mode_a.width * mode_a.height > mode_b.width * mode_b.height;

[tfarina, 2011/04/15 15:00:37]

Could you move the implementation to the source file?

[marcheu, 2011/04/15 17:32:23]

Done.

+    }
+  };
+
+  // Find the "best" resolutions for various outputs.
+  // Returns the modes for both screens and the total screen resolution.
+  bool FindBestResolutions(
+      const std::vector<Mode>& lcd_modes,
+      const std::vector<Mode>& external_modes,
+      Mode* lcd_resolution,
+      Mode* external_resolution,
+      Mode* screen_resolution);
+
+ private:
+  // Find resolutions to use that are reasonably close together.
+  // |larger_device_modes| and |smaller_device_modes| should be sorted by
+  // descending resolution.  We choose the highest resolution from
+  // |smaller_device_modes| and the lowest resolution from |larger_device_modes|
+  // that's at least as high as the resolution from the smaller device.
+  // |screen_resolution| gets set to |smaller_resolution| to avoid clipping.
+  bool FindNearestResolutions(
+      const std::vector<Mode>& larger_device_modes,
+      const std::vector<Mode>& smaller_device_modes,
+      Mode* larger_resolution,
+      Mode* smaller_resolution,
+      Mode* screen_resolution);
+
+  DISALLOW_COPY_AND_ASSIGN(ResolutionSelector);
+};
+
+}  // namespace power_manager
+
+#endif  // POWER_MANAGER_RESOLUTION_SELECTOR_H_