e9ab88570b
This reverts commit 3a285224b62b04fc84ce027b0306bcf9ef26041f. Reason for revert: Still breaking downstream projects due to not using forward headers. I will talk to Mark separately about the usage. Original change's description: > Reland "Linux capturers: organize X11 and Wayland implementations into separate folders" > > Bug: webrtc:13429 > Change-Id: I6e88de4f7ebcb64076312d83ac2c79db24f85ad8 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/239841 > Commit-Queue: Mark Foltz <mfoltz@chromium.org> > Reviewed-by: Mark Foltz <mfoltz@chromium.org> > Cr-Commit-Position: refs/heads/main@{#35481} TBR=grulja@gmail.com,mfoltz@chromium.org,webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com Change-Id: I1f75e3d89495f2a9a31d0f4406a3efdf0d95f74a No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:13429 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/240064 Owners-Override: Christoffer Jansson <jansson@google.com> Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Commit-Queue: Christoffer Jansson <jansson@google.com> Cr-Commit-Position: refs/heads/main@{#35484}
55 lines
1.5 KiB
C++
55 lines
1.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.
|
|
*/
|
|
|
|
#include "modules/desktop_capture/linux/x_error_trap.h"
|
|
|
|
#include <stddef.h>
|
|
|
|
#include "rtc_base/checks.h"
|
|
|
|
namespace webrtc {
|
|
|
|
namespace {
|
|
|
|
// TODO(sergeyu): This code is not thread safe. Fix it. Bug 2202.
|
|
static bool g_xserver_error_trap_enabled = false;
|
|
static int g_last_xserver_error_code = 0;
|
|
|
|
int XServerErrorHandler(Display* display, XErrorEvent* error_event) {
|
|
RTC_DCHECK(g_xserver_error_trap_enabled);
|
|
g_last_xserver_error_code = error_event->error_code;
|
|
return 0;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
XErrorTrap::XErrorTrap(Display* display)
|
|
: original_error_handler_(NULL), enabled_(true) {
|
|
RTC_DCHECK(!g_xserver_error_trap_enabled);
|
|
original_error_handler_ = XSetErrorHandler(&XServerErrorHandler);
|
|
g_xserver_error_trap_enabled = true;
|
|
g_last_xserver_error_code = 0;
|
|
}
|
|
|
|
int XErrorTrap::GetLastErrorAndDisable() {
|
|
enabled_ = false;
|
|
RTC_DCHECK(g_xserver_error_trap_enabled);
|
|
XSetErrorHandler(original_error_handler_);
|
|
g_xserver_error_trap_enabled = false;
|
|
return g_last_xserver_error_code;
|
|
}
|
|
|
|
XErrorTrap::~XErrorTrap() {
|
|
if (enabled_)
|
|
GetLastErrorAndDisable();
|
|
}
|
|
|
|
} // namespace webrtc
|