08a51f3339
* chore: bump chromium in DEPS to 121.0.6154.0 * chore: bump chromium in DEPS to 121.0.6155.0 * fix patches * chore: update patches * patch out reference to GetOcclusionTracker * un-flag PIPOcclusionTracker * chore: bump chromium in DEPS to 121.0.6157.0 * fix conflicts https://chromium-review.googlesource.com/c/chromium/src/+/5038807 * add PIP occlusion tracker sources to chromium_src * 5037591: Replace feature_list's Initialize* methods with Init*. https://chromium-review.googlesource.com/c/chromium/src/+/5037591 * 4811903: Move //content/browser/renderer_host/input/synthetic_gesture_controller to //content/common/input https://chromium-review.googlesource.com/c/chromium/src/+/4811903 * 4917953: usb: Add usb-unrestricted to permission policy https://chromium-review.googlesource.com/c/chromium/src/+/4917953 * 5072395: Remove unused `creation_context` parameter from blink/public APIs https://chromium-review.googlesource.com/c/chromium/src/+/5072395 * 5052035: [X11] Change AtomCache from a singleton to owned by Connection https://chromium-review.googlesource.com/c/chromium/src/+/5052035 * fix v8/.patches * node script/gen-libc++-filenames.js * 5035771: Remove the SetImage method of ImageButton https://chromium-review.googlesource.com/c/chromium/src/+/5035771 * fixup! 5052035: [X11] Change AtomCache from a singleton to owned by Connection * fixup! 5035771: Remove the SetImage method of ImageButton * chore: bump chromium in DEPS to 121.0.6159.0 * 4505903: [Extensions] Add lastAccessed property to chrome.tabs.Tab https://chromium-review.googlesource.com/c/chromium/src/+/4505903 * update patches * don't duplicate tabs API types this causes weird memory bugs if the two get out of sync * fix UAF in TrayIconCocoa not sure why this is popping up just now ... this has been broken for ages afaict * Revert "don't duplicate tabs API types" This reverts commit 80dff2efaa1297e5c191b2c69648099d6665dbff. This is failing tests with extensions API schema check failures, so revert for now. we'll fix it later. * revert v8 change causing node crashes * chore: reduce diffs in revert_api_dcheck-fail_when_we_reenter_v8_while_terminating.patch --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com>
95 lines
3 KiB
C++
95 lines
3 KiB
C++
// Copyright (c) 2014 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/ui/x/x_window_utils.h"
|
|
|
|
#include <memory>
|
|
|
|
#include "base/environment.h"
|
|
#include "base/strings/string_util.h"
|
|
#include "dbus/bus.h"
|
|
#include "dbus/message.h"
|
|
#include "dbus/object_proxy.h"
|
|
#include "shell/common/thread_restrictions.h"
|
|
#include "ui/base/x/x11_util.h"
|
|
#include "ui/gfx/x/atom_cache.h"
|
|
#include "ui/gfx/x/connection.h"
|
|
#include "ui/gfx/x/xproto.h"
|
|
|
|
namespace electron {
|
|
|
|
void SetWMSpecState(x11::Window window, bool enabled, x11::Atom state) {
|
|
ui::SendClientMessage(
|
|
window, ui::GetX11RootWindow(), x11::GetAtom("_NET_WM_STATE"),
|
|
{static_cast<uint32_t>(enabled ? 1 : 0), static_cast<uint32_t>(state),
|
|
static_cast<uint32_t>(x11::Window::None), 1, 0});
|
|
}
|
|
|
|
void SetWindowType(x11::Window window, const std::string& type) {
|
|
std::string type_prefix = "_NET_WM_WINDOW_TYPE_";
|
|
std::string window_type_str = type_prefix + base::ToUpperASCII(type);
|
|
x11::Atom window_type = x11::GetAtom(window_type_str.c_str());
|
|
auto* connection = x11::Connection::Get();
|
|
connection->SetProperty(window, x11::GetAtom("_NET_WM_WINDOW_TYPE"),
|
|
x11::Atom::ATOM, window_type);
|
|
}
|
|
|
|
bool ShouldUseGlobalMenuBar() {
|
|
ScopedAllowBlockingForElectron allow_blocking;
|
|
auto env = base::Environment::Create();
|
|
if (env->HasVar("ELECTRON_FORCE_WINDOW_MENU_BAR"))
|
|
return false;
|
|
|
|
dbus::Bus::Options options;
|
|
auto bus = base::MakeRefCounted<dbus::Bus>(options);
|
|
|
|
dbus::ObjectProxy* object_proxy =
|
|
bus->GetObjectProxy(DBUS_SERVICE_DBUS, dbus::ObjectPath(DBUS_PATH_DBUS));
|
|
dbus::MethodCall method_call(DBUS_INTERFACE_DBUS, "ListNames");
|
|
std::unique_ptr<dbus::Response> response =
|
|
object_proxy
|
|
->CallMethodAndBlock(&method_call,
|
|
dbus::ObjectProxy::TIMEOUT_USE_DEFAULT)
|
|
.value_or(nullptr);
|
|
if (!response) {
|
|
bus->ShutdownAndBlock();
|
|
return false;
|
|
}
|
|
|
|
dbus::MessageReader reader(response.get());
|
|
dbus::MessageReader array_reader(nullptr);
|
|
if (!reader.PopArray(&array_reader)) {
|
|
bus->ShutdownAndBlock();
|
|
return false;
|
|
}
|
|
while (array_reader.HasMoreData()) {
|
|
std::string name;
|
|
if (array_reader.PopString(&name) &&
|
|
name == "com.canonical.AppMenu.Registrar") {
|
|
bus->ShutdownAndBlock();
|
|
return true;
|
|
}
|
|
}
|
|
|
|
bus->ShutdownAndBlock();
|
|
return false;
|
|
}
|
|
|
|
void MoveWindowToForeground(x11::Window window) {
|
|
MoveWindowAbove(window, static_cast<x11::Window>(0));
|
|
}
|
|
|
|
void MoveWindowAbove(x11::Window window, x11::Window other_window) {
|
|
ui::SendClientMessage(window, ui::GetX11RootWindow(),
|
|
x11::GetAtom("_NET_RESTACK_WINDOW"),
|
|
{2, static_cast<uint32_t>(other_window),
|
|
static_cast<uint32_t>(x11::StackMode::Above), 0, 0});
|
|
}
|
|
|
|
bool IsWindowValid(x11::Window window) {
|
|
auto* conn = x11::Connection::Get();
|
|
return conn->GetWindowAttributes({window}).Sync();
|
|
}
|
|
|
|
} // namespace electron
|