| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_X11_SHARED_X_DISPLAY_H_ | 11 #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_X11_SHARED_X_DISPLAY_H_ |
| 12 #define WEBRTC_MODULES_DESKTOP_CAPTURE_X11_SHARED_X_DISPLAY_H_ | 12 #define WEBRTC_MODULES_DESKTOP_CAPTURE_X11_SHARED_X_DISPLAY_H_ |
| 13 | 13 |
| 14 #include <map> | 14 #include <map> |
| 15 #include <vector> | 15 #include <vector> |
| 16 | 16 |
| 17 #include <assert.h> | 17 #include <assert.h> |
| 18 #include <X11/Xlib.h> | 18 #include <X11/Xlib.h> |
| 19 | 19 |
| 20 #include <string> | 20 #include <string> |
| 21 | 21 |
| 22 #include "webrtc/base/scoped_ref_ptr.h" |
| 22 #include "webrtc/system_wrappers/interface/atomic32.h" | 23 #include "webrtc/system_wrappers/interface/atomic32.h" |
| 23 #include "webrtc/system_wrappers/interface/scoped_refptr.h" | |
| 24 | 24 |
| 25 namespace webrtc { | 25 namespace webrtc { |
| 26 | 26 |
| 27 // A ref-counted object to store XDisplay connection. | 27 // A ref-counted object to store XDisplay connection. |
| 28 class SharedXDisplay { | 28 class SharedXDisplay { |
| 29 public: | 29 public: |
| 30 class XEventHandler { | 30 class XEventHandler { |
| 31 public: | 31 public: |
| 32 virtual ~XEventHandler() {} | 32 virtual ~XEventHandler() {} |
| 33 | 33 |
| 34 // Processes XEvent. Returns true if the event has been handled. | 34 // Processes XEvent. Returns true if the event has been handled. |
| 35 virtual bool HandleXEvent(const XEvent& event) = 0; | 35 virtual bool HandleXEvent(const XEvent& event) = 0; |
| 36 }; | 36 }; |
| 37 | 37 |
| 38 // Takes ownership of |display|. | 38 // Takes ownership of |display|. |
| 39 explicit SharedXDisplay(Display* display); | 39 explicit SharedXDisplay(Display* display); |
| 40 | 40 |
| 41 // Creates a new X11 Display for the |display_name|. NULL is returned if X11 | 41 // Creates a new X11 Display for the |display_name|. NULL is returned if X11 |
| 42 // connection failed. Equivalent to CreateDefault() when |display_name| is | 42 // connection failed. Equivalent to CreateDefault() when |display_name| is |
| 43 // empty. | 43 // empty. |
| 44 static scoped_refptr<SharedXDisplay> Create(const std::string& display_name); | 44 static rtc::scoped_refptr<SharedXDisplay> Create( |
| 45 const std::string& display_name); |
| 45 | 46 |
| 46 // Creates X11 Display connection for the default display (e.g. specified in | 47 // Creates X11 Display connection for the default display (e.g. specified in |
| 47 // DISPLAY). NULL is returned if X11 connection failed. | 48 // DISPLAY). NULL is returned if X11 connection failed. |
| 48 static scoped_refptr<SharedXDisplay> CreateDefault(); | 49 static rtc::scoped_refptr<SharedXDisplay> CreateDefault(); |
| 49 | 50 |
| 50 void AddRef() { ++ref_count_; } | 51 void AddRef() { ++ref_count_; } |
| 51 void Release() { | 52 void Release() { |
| 52 if (--ref_count_ == 0) | 53 if (--ref_count_ == 0) |
| 53 delete this; | 54 delete this; |
| 54 } | 55 } |
| 55 | 56 |
| 56 Display* display() { return display_; } | 57 Display* display() { return display_; } |
| 57 | 58 |
| 58 // Adds a new event |handler| for XEvent's of |type|. | 59 // Adds a new event |handler| for XEvent's of |type|. |
| (...skipping 15 matching lines...) Expand all Loading... |
| 74 Display* display_; | 75 Display* display_; |
| 75 | 76 |
| 76 EventHandlersMap event_handlers_; | 77 EventHandlersMap event_handlers_; |
| 77 | 78 |
| 78 DISALLOW_COPY_AND_ASSIGN(SharedXDisplay); | 79 DISALLOW_COPY_AND_ASSIGN(SharedXDisplay); |
| 79 }; | 80 }; |
| 80 | 81 |
| 81 } // namespace webrtc | 82 } // namespace webrtc |
| 82 | 83 |
| 83 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_X11_SHARED_X_DISPLAY_H_ | 84 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_X11_SHARED_X_DISPLAY_H_ |
| OLD | NEW |