Refactor the client code. Move all x11-related code into X11View and create...

remoting/client/x11_view.cc

 // Copyright (c) 2010 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 "remoting/client/x11_view.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/Xrender.h>
 #include <X11/extensions/Xcomposite.h>
 
 #include "base/logging.h"
 #include "remoting/client/decoder_verbatim.h"
 
 namespace remoting {
 
+X11View::X11View()
+    : display_(NULL),
+      window_(0),
+      width_(0),
+      height_(0),
+      picture_(0) {
+}
+
 X11View::X11View(Display* display, XID window, int width, int height)
     : display_(display),
       window_(window),
       width_(width),
       height_(height),
       picture_(0) {
   media::VideoFrame::CreateFrame(media::VideoFrame::RGB32, width_, height_,
                                  base::TimeDelta(), base::TimeDelta(), &frame_);
   DCHECK(frame_);
 }
 
 X11View::~X11View() {
+  DCHECK(!display_);
+  DCHECK(!window_);
+}
+
+bool X11View::Initialize() {
+  display_ = XOpenDisplay(NULL);
+  if (!display_) {
+    return false;
+  }
+
+  // Get properties of the screen.
+  int screen = DefaultScreen(display_);
+  int root_window = RootWindow(display_, screen);
+
+  // Creates the window.
+  window_ = XCreateSimpleWindow(display_, root_window, 1, 1, 640, 480, 0,
+                                BlackPixel(display_, screen),
+                                BlackPixel(display_, screen));
+  DCHECK(window_);
+  XStoreName(display_, window_, "X11 Remoting");
+
+  // Specifies what kind of messages we want to receive.
+  XSelectInput(display_, window_, ExposureMask | ButtonPressMask);
+  XMapWindow(display_, window_);
+  return true;
+}
+
+void X11View::TearDown() {
+  if (display_ && window_) {
+    // Shutdown the window system.
+    XDestroyWindow(display_, window_);
+    XCloseDisplay(display_);
+  }
+  display_ = NULL;
+  window_ = 0;
 }
 
 void X11View::Paint() {
+  // Don't bother attempting to paint if the display hasn't been set up.
+  if (!display_ || !window_ || !height_ || !width_) {
+    return;
+  }
+
   // TODO(hclam): Paint only the updated regions.
   all_update_rects_.clear();
 
   // If we have not initialized the render target then do it now.
   if (!picture_)
     InitPaintTarget();
 
   // Upload the image to a pixmap. And then create a picture from the pixmap
   // and composite the picture over the picture representing the window.
 
@@ skipping 31 matching lines @@
   // Composite the picture over the picture representing the window.
   XRenderComposite(display_, PictOpSrc, picture, 0,
                    picture_, 0, 0, 0, 0, 0, 0,
                    width_, height_);
 
   XRenderFreePicture(display_, picture);
   XFreePixmap(display_, pixmap);
 }
 
 void X11View::SetSolidFill(uint32 color) {
-  // TODO(ajwong): Implement.
-  NOTIMPLEMENTED();
+  // TODO(garykac): Implement.
+  // NOTIMPLEMENTED();
 }
 
 void X11View::UnsetSolidFill() {
-  // TODO(ajwong): Implement.
-  NOTIMPLEMENTED();
+  // TODO(garykac): Implement.
+  // NOTIMPLEMENTED();
 }
 
 void X11View::SetViewport(int x, int y, int width, int height) {
-  // TODO(ajwong): Implement.
-  NOTIMPLEMENTED();
+  // TODO(garykac): Implement.
+  // NOTIMPLEMENTED();
 }
 
-void X11View::SetBackingStoreSize(int width, int height) {
-  // TODO(ajwong): Implement.
-  NOTIMPLEMENTED();
+void X11View::SetHostScreenSize(int width, int height) {
+  width_ = width;
+  height_ = height;
+  XResizeWindow(display_, window_, width_, height_);
 }
 
 void X11View::InitPaintTarget() {
   // Testing XRender support.
   int dummy;
   bool xrender_support = XRenderQueryExtension(display_, &dummy, &dummy);
   CHECK(xrender_support) << "XRender is not supported!";
 
   XWindowAttributes attr;
   XGetWindowAttributes(display_, window_, &attr);
@@ skipping 52 matching lines @@
   XEvent event;
   event.type = Expose;
   XSendEvent(display_, static_cast<int>(window_), true, ExposureMask, &event);
 }
 
 void X11View::OnDecodeDone() {
   // Since we do synchronous decoding here there's nothing in this method.
 }
 
 }  // namespace remoting