mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-17 23:57:59 +01:00
17a1654670
This is a reland of cf8ea9c259
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, thomasanderson@chromium.org
Bug: chromium:1066670
Change-Id: I8ea0a2ff5445524648243635724014ff5337767c
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/181460
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31917}
101 lines
2.9 KiB
C++
101 lines
2.9 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.
|
|
*/
|
|
|
|
#include "modules/desktop_capture/linux/shared_x_display.h"
|
|
|
|
#include <X11/Xlib.h>
|
|
#include <X11/extensions/XTest.h>
|
|
|
|
#include <algorithm>
|
|
|
|
#include "rtc_base/checks.h"
|
|
#include "rtc_base/logging.h"
|
|
|
|
namespace webrtc {
|
|
|
|
SharedXDisplay::SharedXDisplay(Display* display) : display_(display) {
|
|
RTC_DCHECK(display_);
|
|
}
|
|
|
|
SharedXDisplay::~SharedXDisplay() {
|
|
RTC_DCHECK(event_handlers_.empty());
|
|
XCloseDisplay(display_);
|
|
}
|
|
|
|
// static
|
|
rtc::scoped_refptr<SharedXDisplay> SharedXDisplay::Create(
|
|
const std::string& display_name) {
|
|
Display* display =
|
|
XOpenDisplay(display_name.empty() ? NULL : display_name.c_str());
|
|
if (!display) {
|
|
RTC_LOG(LS_ERROR) << "Unable to open display";
|
|
return NULL;
|
|
}
|
|
return new SharedXDisplay(display);
|
|
}
|
|
|
|
// static
|
|
rtc::scoped_refptr<SharedXDisplay> SharedXDisplay::CreateDefault() {
|
|
return Create(std::string());
|
|
}
|
|
|
|
void SharedXDisplay::AddEventHandler(int type, XEventHandler* handler) {
|
|
event_handlers_[type].push_back(handler);
|
|
}
|
|
|
|
void SharedXDisplay::RemoveEventHandler(int type, XEventHandler* handler) {
|
|
EventHandlersMap::iterator handlers = event_handlers_.find(type);
|
|
if (handlers == event_handlers_.end())
|
|
return;
|
|
|
|
std::vector<XEventHandler*>::iterator new_end =
|
|
std::remove(handlers->second.begin(), handlers->second.end(), handler);
|
|
handlers->second.erase(new_end, handlers->second.end());
|
|
|
|
// Check if no handlers left for this event.
|
|
if (handlers->second.empty())
|
|
event_handlers_.erase(handlers);
|
|
}
|
|
|
|
void SharedXDisplay::ProcessPendingXEvents() {
|
|
// Hold reference to |this| to prevent it from being destroyed while
|
|
// processing events.
|
|
rtc::scoped_refptr<SharedXDisplay> self(this);
|
|
|
|
// Find the number of events that are outstanding "now." We don't just loop
|
|
// on XPending because we want to guarantee this terminates.
|
|
int events_to_process = XPending(display());
|
|
XEvent e;
|
|
|
|
for (int i = 0; i < events_to_process; i++) {
|
|
XNextEvent(display(), &e);
|
|
EventHandlersMap::iterator handlers = event_handlers_.find(e.type);
|
|
if (handlers == event_handlers_.end())
|
|
continue;
|
|
for (std::vector<XEventHandler*>::iterator it = handlers->second.begin();
|
|
it != handlers->second.end(); ++it) {
|
|
if ((*it)->HandleXEvent(e))
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
void SharedXDisplay::IgnoreXServerGrabs() {
|
|
int test_event_base = 0;
|
|
int test_error_base = 0;
|
|
int major = 0;
|
|
int minor = 0;
|
|
if (XTestQueryExtension(display(), &test_event_base, &test_error_base, &major,
|
|
&minor)) {
|
|
XTestGrabControl(display(), true);
|
|
}
|
|
}
|
|
|
|
} // namespace webrtc
|