summaryrefslogtreecommitdiffstats
path: root/remoting/client/x11_view.h
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-09 21:56:39 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-09 21:56:39 +0000
commitef0a59a6fd722a0910196c951dc676c19127a28b (patch)
tree9d90ab9227e4222fa312dadae114c8d2247028bf /remoting/client/x11_view.h
parente9fdd159ffd94e3e097bd6905d84e6b564b04c2c (diff)
downloadchromium_src-ef0a59a6fd722a0910196c951dc676c19127a28b.zip
chromium_src-ef0a59a6fd722a0910196c951dc676c19127a28b.tar.gz
chromium_src-ef0a59a6fd722a0910196c951dc676c19127a28b.tar.bz2
Implement a chromoting client using X11
Using XRender to render the chromoting client. This patch has done several things: 1. Rename chromotocol_pb to remoting 2. Defined ChromotingView as the display area of the remote view 3. Implemented X11Client as the client that uses X11 for display 4. Implemented X11View that uses XRender for drawing 5. Fixed several problems in host capturer and encoder Review URL: http://codereview.chromium.org/2745006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49329 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/client/x11_view.h')
-rw-r--r--remoting/client/x11_view.h56
1 files changed, 56 insertions, 0 deletions
diff --git a/remoting/client/x11_view.h b/remoting/client/x11_view.h
new file mode 100644
index 0000000..1959e18
--- /dev/null
+++ b/remoting/client/x11_view.h
@@ -0,0 +1,56 @@
+// 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.
+
+#ifndef REMOTING_CLIENT_X11_VIEW_H_
+#define REMOTING_CLIENT_X11_VIEW_H_
+
+#include "base/basictypes.h"
+#include "base/scoped_ptr.h"
+#include "media/base/video_frame.h"
+#include "remoting/client/decoder.h"
+#include "remoting/client/chromoting_view.h"
+
+typedef struct _XDisplay Display;
+
+namespace remoting {
+
+// A ChromotingView implemented using X11 and XRender.
+class X11View : public ChromotingView {
+ public:
+ X11View(Display* display, int window, int width, int height);
+
+ virtual ~X11View();
+
+ // ChromotingView implementations.
+ virtual void Paint();
+ virtual void HandleBeginUpdateStream(HostMessage* msg);
+ virtual void HandleUpdateStreamPacket(HostMessage* msg);
+ virtual void HandleEndUpdateStream(HostMessage* msg) ;
+
+ private:
+ void InitPaintTarget();
+ void OnPartialDecodeDone();
+ void OnDecodeDone();
+
+ Display* display_;
+ int window_;
+ int width_;
+ int height_;
+
+ // A picture created in the X server that represents drawing area of the
+ // window.
+ int picture_;
+
+ scoped_refptr<media::VideoFrame> frame_;
+ UpdatedRects update_rects_;
+ UpdatedRects all_update_rects_;
+
+ scoped_ptr<Decoder> decoder_;
+
+ DISALLOW_COPY_AND_ASSIGN(X11View);
+};
+
+} // namespace remoting
+
+#endif // REMOTING_CLIENT_X11_VIEW_H_