ozone: caca: Preparatory work for resize / multiple windows

Let's let caca decide the bitmap size. Also scopify caca objects.

BUG=none
TEST=use_ozone=1 chromeos=1 caca build
NOTRY=true

Review URL: https://codereview.chromium.org/387993002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282970 0039d316-1c4b-4281-b951-d872f2087c98

ui/ozone/platform/caca/caca.gypi

@@ -39,6 +39,8 @@
         'caca_surface_factory.h',
         'ozone_platform_caca.cc',
         'ozone_platform_caca.h',
+        'scoped_caca_types.cc',
+        'scoped_caca_types.h',
       ],
     },
   ],

ui/ozone/platform/caca/caca_connection.cc

@@ -8,33 +8,50 @@
 
 namespace ui {
 
-// TODO(dnicoara) As an optimization, |bitmap_size_| should be scaled based on
-// |physical_size_| and font size.
-CacaConnection::CacaConnection()
-    : canvas_(NULL),
-      display_(NULL),
-      physical_size_(160, 48),
-      bitmap_size_(800, 600) {}
+namespace {
+
+// Size of initial cnavas (in characters).
+const int kDefaultCanvasWidth = 160;
+const int kDefaultCanvasHeight = 48;
+
+}  // namespace
+
+CacaConnection::CacaConnection() {
+}
 
 CacaConnection::~CacaConnection() {
-  if (display_) {
-    caca_free_display(display_);
-    caca_free_canvas(canvas_);
-  }
 }
 
-void CacaConnection::Initialize() {
+bool CacaConnection::Initialize() {
   if (display_)
-    return;
+    return true;
+
+  canvas_.reset(caca_create_canvas(kDefaultCanvasWidth, kDefaultCanvasHeight));
+  if (!canvas_) {
+    PLOG(ERROR) << "failed to create libcaca canvas";
+    return false;
+  }
+
+  display_.reset(caca_create_display(canvas_.get()));
+  if (!display_) {
+    PLOG(ERROR) << "failed to initialize libcaca display";
+    return false;
+  }
 
-  canvas_ = caca_create_canvas(physical_size_.width(), physical_size_.height());
-  display_ = caca_create_display(canvas_);
+  caca_set_cursor(display_.get(), 1);
+  caca_set_display_title(display_.get(), "Ozone Content Shell");
+
+  UpdateDisplaySize();
+
+  return true;
+}
 
-  physical_size_.SetSize(caca_get_canvas_width(canvas_),
-                         caca_get_canvas_height(canvas_));
+void CacaConnection::UpdateDisplaySize() {
+  physical_size_.SetSize(caca_get_canvas_width(canvas_.get()),
+                         caca_get_canvas_height(canvas_.get()));
 
-  caca_set_cursor(display_, 1);
-  caca_set_display_title(display_, "Ozone Content Shell");
+  bitmap_size_.SetSize(caca_get_display_width(display_.get()),
+                       caca_get_display_height(display_.get()));
 }
 
 }  // namespace ui

ui/ozone/platform/caca/caca_connection.h

@@ -9,6 +9,7 @@
 
 #include "base/macros.h"
 #include "ui/gfx/geometry/size.h"
+#include "ui/ozone/platform/caca/scoped_caca_types.h"
 
 namespace ui {
 
@@ -21,16 +22,19 @@ class CacaConnection {
   CacaConnection();
   ~CacaConnection();
 
-  void Initialize();
+  bool Initialize();
 
   // This is the Caca canvas size.
   gfx::Size physical_size() const { return physical_size_; }
   gfx::Size bitmap_size() const { return bitmap_size_; }
-  caca_display_t* display() const { return display_; }
+  caca_display_t* display() const { return display_.get(); }
 
  private:
-  caca_canvas_t* canvas_;
-  caca_display_t* display_;
+  // Sync sizes with libcaca.
+  void UpdateDisplaySize();
+
+  ScopedCacaCanvas canvas_;
+  ScopedCacaDisplay display_;
 
   // Size of the console in characters. This can be changed by setting
   // CACA_GEOMETRY environment variable.

ui/ozone/platform/caca/scoped_caca_types.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/ozone/platform/caca/scoped_caca_types.h"
+
+#include <caca.h>
+
+namespace ui {
+
+void CacaCanvasDeleter::operator()(caca_canvas_t* canvas) const {
+  caca_free_canvas(canvas);
+}
+
+void CacaDisplayDeleter::operator()(caca_display_t* display) const {
+  caca_free_display(display);
+}
+
+void CacaDitherDeleter::operator()(caca_dither_t* dither) const {
+  caca_free_dither(dither);
+}
+
+}  // namespace ui

ui/ozone/platform/caca/scoped_caca_types.h

+// 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.
+
+#ifndef UI_OZONE_PLATFORM_CACA_SCOPED_CACA_TYPES_H_
+#define UI_OZONE_PLATFORM_CACA_SCOPED_CACA_TYPES_H_
+
+#include "base/memory/scoped_ptr.h"
+
+typedef struct caca_canvas caca_canvas_t;
+typedef struct caca_dither caca_dither_t;
+typedef struct caca_display caca_display_t;
+
+namespace ui {
+
+struct CacaCanvasDeleter {
+  void operator()(caca_canvas_t* canvas) const;
+};
+
+struct CacaDisplayDeleter {
+  void operator()(caca_display_t* display) const;
+};
+
+struct CacaDitherDeleter {
+  void operator()(caca_dither_t* dither) const;
+};
+
+typedef scoped_ptr<caca_canvas_t, CacaCanvasDeleter> ScopedCacaCanvas;
+typedef scoped_ptr<caca_display_t, CacaDisplayDeleter> ScopedCacaDisplay;
+typedef scoped_ptr<caca_dither_t, CacaDitherDeleter> ScopedCacaDither;
+
+}  // namespace ui
+
+#endif  // UI_OZONE_PLATFORM_CACA_SCOPED_CACA_TYPES_H_