Chrome OS: Ash support for >=3 displays.

ui/display/chromeos/x11/native_display_delegate_x11.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/display/chromeos/x11/native_display_delegate_x11.h"
 
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/dpms.h>
 #include <X11/extensions/Xrandr.h>
@@ skipping 157 matching lines @@
 
 void NativeDisplayDelegateX11::ForceDPMSOn() {
   CHECK(DPMSEnable(display_));
   CHECK(DPMSForceLevel(display_, DPMSModeOn));
 }
 
 std::vector<DisplaySnapshot*> NativeDisplayDelegateX11::GetDisplays() {
   CHECK(screen_) << "Server not grabbed";
 
   cached_outputs_.clear();
-  RRCrtc last_used_crtc = None;
+  std::set<RRCrtc> last_used_crtcs;
 
   InitModes();
-  for (int i = 0; i < screen_->noutput && cached_outputs_.size() < 2; ++i) {
+  for (int i = 0; i < screen_->noutput; ++i) {
     RROutput output_id = screen_->outputs[i];
     XRROutputInfo* output_info = XRRGetOutputInfo(display_, screen_, output_id);
     if (output_info->connection == RR_Connected) {
       DisplaySnapshotX11* output =
-          InitDisplaySnapshot(output_id, output_info, &last_used_crtc, i);
+          InitDisplaySnapshot(output_id, output_info, &last_used_crtcs, i);
       cached_outputs_.push_back(output);
     }
     XRRFreeOutputInfo(output_info);
   }
 
   return cached_outputs_.get();
 }
 
 void NativeDisplayDelegateX11::AddMode(const DisplaySnapshot& output,
                                        const DisplayMode* mode) {
@@ skipping 111 matching lines @@
                        new DisplayModeX11(gfx::Size(info.width, info.height),
                                           info.modeFlags & RR_Interlace,
                                           refresh_rate,
                                           info.id)));
   }
 }
 
 DisplaySnapshotX11* NativeDisplayDelegateX11::InitDisplaySnapshot(
     RROutput output,
     XRROutputInfo* info,
-    RRCrtc* last_used_crtc,
+    std::set<RRCrtc>* last_used_crtcs,
     int index) {
   int64_t display_id = 0;
   if (!GetDisplayId(output, static_cast<uint8_t>(index), &display_id))
     display_id = index;
 
   bool has_overscan = false;
   GetOutputOverscanFlag(output, &has_overscan);
 
   DisplayConnectionType type = GetDisplayConnectionTypeFromName(info->name);
   if (type == DISPLAY_CONNECTION_TYPE_UNKNOWN)
     LOG(ERROR) << "Unknown link type: " << info->name;
 
   RRMode native_mode_id = GetOutputNativeMode(info);
   RRMode current_mode_id = None;
   gfx::Point origin;
   if (info->crtc) {
     XRRCrtcInfo* crtc_info = XRRGetCrtcInfo(display_, screen_, info->crtc);
     current_mode_id = crtc_info->mode;
     origin.SetPoint(crtc_info->x, crtc_info->y);
     XRRFreeCrtcInfo(crtc_info);
   }
 
   RRCrtc crtc = None;
   // Assign a CRTC that isn't already in use.
   for (int i = 0; i < info->ncrtc; ++i) {
-    if (info->crtcs[i] != *last_used_crtc) {
+    if (last_used_crtcs->find(info->crtcs[i]) == last_used_crtcs->end()) {
       crtc = info->crtcs[i];
-      *last_used_crtc = crtc;
+      last_used_crtcs->insert(crtc);
       break;
     }
   }
 
   const DisplayMode* current_mode = NULL;
   const DisplayMode* native_mode = NULL;
   std::vector<const DisplayMode*> display_modes;
 
   for (int i = 0; i < info->nmode; ++i) {
     const RRMode mode = info->modes[i];
@@ skipping 283 matching lines @@
   XSetForeground(display_, gc, color.pixel);
   XSetFillStyle(display_, gc, FillSolid);
   int width = DisplayWidth(display_, DefaultScreen(display_));
   int height = DisplayHeight(display_, DefaultScreen(display_));
   XFillRectangle(display_, window_, gc, 0, 0, width, height);
   XFreeGC(display_, gc);
   XFreeColors(display_, colormap, &color.pixel, 1, 0);
 }
 
 }  // namespace ui