c61e780dc8
This reverts commit cf8ea9c25903edb2c907a3cf18e1d31e0196e2e9. Reason for revert: Breaks an upstream project. Original change's description: > [XProto] Add SharedXDisplay::IgnoreXServerGrabs > > This is necessary for Chromium CL: > https://chromium-review.googlesource.com/c/chromium/src/+/2327373 > > BUG=chromium:1066670 > > Change-Id: I8c5e5976d6c4737135254b9715b3aa5c885bfc8c > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/180773 > Reviewed-by: Jamie Walch <jamiewalch@chromium.org> > Commit-Queue: Thomas Anderson <thomasanderson@chromium.org> > Cr-Commit-Position: refs/heads/master@{#31901} TBR=jamiewalch@chromium.org,sergeyu@chromium.org,thomasanderson@chromium.org Change-Id: I666996581e78e783d8028c601559f0c5871a7145 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: chromium:1066670 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/181362 Reviewed-by: Andrey Logvin <landrey@webrtc.org> Commit-Queue: Andrey Logvin <landrey@webrtc.org> Cr-Commit-Position: refs/heads/master@{#31903}
81 lines
2.5 KiB
C++
81 lines
2.5 KiB
C++
/*
|
|
* Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef MODULES_DESKTOP_CAPTURE_LINUX_SHARED_X_DISPLAY_H_
|
|
#define MODULES_DESKTOP_CAPTURE_LINUX_SHARED_X_DISPLAY_H_
|
|
|
|
#include <map>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "api/ref_counted_base.h"
|
|
#include "api/scoped_refptr.h"
|
|
#include "rtc_base/constructor_magic.h"
|
|
|
|
// Including Xlib.h will involve evil defines (Bool, Status, True, False), which
|
|
// easily conflict with other headers.
|
|
typedef struct _XDisplay Display;
|
|
typedef union _XEvent XEvent;
|
|
|
|
namespace webrtc {
|
|
|
|
// A ref-counted object to store XDisplay connection.
|
|
class SharedXDisplay : public rtc::RefCountedBase {
|
|
public:
|
|
class XEventHandler {
|
|
public:
|
|
virtual ~XEventHandler() {}
|
|
|
|
// Processes XEvent. Returns true if the event has been handled.
|
|
virtual bool HandleXEvent(const XEvent& event) = 0;
|
|
};
|
|
|
|
// Takes ownership of |display|.
|
|
explicit SharedXDisplay(Display* display);
|
|
|
|
// Creates a new X11 Display for the |display_name|. NULL is returned if X11
|
|
// connection failed. Equivalent to CreateDefault() when |display_name| is
|
|
// empty.
|
|
static rtc::scoped_refptr<SharedXDisplay> Create(
|
|
const std::string& display_name);
|
|
|
|
// Creates X11 Display connection for the default display (e.g. specified in
|
|
// DISPLAY). NULL is returned if X11 connection failed.
|
|
static rtc::scoped_refptr<SharedXDisplay> CreateDefault();
|
|
|
|
Display* display() { return display_; }
|
|
|
|
// Adds a new event |handler| for XEvent's of |type|.
|
|
void AddEventHandler(int type, XEventHandler* handler);
|
|
|
|
// Removes event |handler| added using |AddEventHandler|. Doesn't do anything
|
|
// if |handler| is not registered.
|
|
void RemoveEventHandler(int type, XEventHandler* handler);
|
|
|
|
// Processes pending XEvents, calling corresponding event handlers.
|
|
void ProcessPendingXEvents();
|
|
|
|
protected:
|
|
~SharedXDisplay() override;
|
|
|
|
private:
|
|
typedef std::map<int, std::vector<XEventHandler*> > EventHandlersMap;
|
|
|
|
Display* display_;
|
|
|
|
EventHandlersMap event_handlers_;
|
|
|
|
RTC_DISALLOW_COPY_AND_ASSIGN(SharedXDisplay);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_DESKTOP_CAPTURE_LINUX_SHARED_X_DISPLAY_H_
|