d02c9f8bc6
* chore: bump chromium in DEPS to 111.0.5522.0 * chore: bump chromium in DEPS to 111.0.5524.0 * chore: bump chromium in DEPS to 111.0.5526.0 * chore: bump chromium in DEPS to 111.0.5528.0 * chore: update patches/chromium/mas_avoid_usage_of_private_macos_apis.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4132807 Fix simple code shear * chore: update patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4130675 Fix simple code shear * chore: update patches/chromium/hack_plugin_response_interceptor_to_point_to_electron.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/disable_unload_metrics.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4126173 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/feat_add_data_parameter_to_processsingleton.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/preconnect_manager.patch https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/v8/force_cppheapcreateparams_to_be_noncopyable.patch https://chromium-review.googlesource.com/c/v8/v8/+/3533019 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches * chore: update patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4128765 Upstream added a new call to HeaderContext(), whose signature we have patched * chore: bump chromium in DEPS to 111.0.5530.0 * chore: update patches * Move ChildProcessHost* from content/common to content/browser Xref: Move ChildProcessHost* from content/common to content/browser * Remove RenderViewHostChanged Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134103 [upstream removal of RenderViewHostChanged] Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4092763 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4093234 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133892 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134103 [examples of upstream code adjusting to the change] Upstream handles this change in roughly two approaches: 1. Move the code over to RenderFrameHostChanged(old_host, new_host) but test for new_host->IsInPrimaryMainFrame() before acting 2. Migrate to the PrimaryPageChanged(page) API and use page.GetMainDocument() to get the RenderFrameHost. I've chosen 1. because electron_api_web_contents needed that pointer to old_host to call RemoveInputEventListener(), but I may be missing some context & would appreciate review on this commit. * Make electron/shell/browser/relauncher_win.cc use <winternl.h> Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4129135 Many internal Windows types are now available in winternl.h so upstrem no longer defines the types themselves. * Move ChildProcessHost* from content/common to content/browser Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134795 * fixup! Make electron/shell/browser/relauncher_win.cc use <winternl.h> winternl.h does not define the field we need, so clone the struct Chromium was using into unnamed namespace * fixup! Move ChildProcessHost* from content/common to content/browser chore: update #includes too * chore: bump chromium in DEPS to 111.0.5532.0 * chore: sync patches/chromium/pepper_plugin_support.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 manually reync patch; no code changes * chore: sync patches/chromium/mas_no_private_api.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4143865 the content/common/pseudonymization_salt.cc patch is no longer needed * chore: sync patches/chromium/mas_disable_remote_accessibility.patch patch-fuzz update; no manual changes * chore: sync patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4111725 manually reync patch; no code changes * chore: sync patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 manually reync patch; no code changes * chore: sync patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch Xref: https://chromium-review.googlesource.com/c/v8/v8/+/4127230 patch-fuzz update; no manual changes * chore: rebuild patches * fixup! Remove RenderViewHostChanged Use PrimaryPageChanged() * chore: remove unused method TabsUpdateFunction::OnExecuteCodeFinished() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133991 This private, already-unused function showed up as a FTBFS because it took a base::ListValue parameter and ListValue was removed upstream. * task posting v3: remove includes of runner handles and IWYU task runners Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 * chore: lint * chore: more lint * fixup! task posting v3: remove includes of runner handles and IWYU task runners macOS, too * fixup! task posting v3: remove includes of runner handles and IWYU task runners * chore: bump chromium in DEPS to 111.0.5534.0 * chore: sync patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141862 patch-fuzz update; no manual changes * chore: sync patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4153110 Sync to minor upstream changes. Add const correctness. * chore: sync electron/patches/chromium/feat_configure_launch_options_for_service_process.patch https://chromium-review.googlesource.com/c/chromium/src/+/4141862 patch-fuzz update; no manual changes * chore: patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch sync https://chromium-review.googlesource.com/c/v8/v8/+/4147787 patch-fuzz update; no manual changes * chore: update patches * chore: bump chromium in DEPS to 111.0.5536.0 * chore: sync patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141863 Sync with upstream code changes. Minor code golf for readability. Note: upstream is laying groundwork for being able to work off of env vars instead of switches. Doesn't affect us yet but worth being aware of. > + // Environment variables could be supported in the future, but are not > + // currently supported when launching with the zygote. * chore: update patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4126836 patch-fuzz update; no manual changes * chore: sync electron/patches/chromium/feat_configure_launch_options_for_service_process.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141863 manual sync * chore: sync electron/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch https://chromium-review.googlesource.com/c/v8/v8/+/4147788 fuzz-patch * chore: rebuild patches * chore: bump chromium in DEPS to 111.0.5538.0 * chore: bump chromium in DEPS to 111.0.5540.0 * chore: update patches * Remove sdk_forward_declarations https://chromium-review.googlesource.com/c/chromium/src/+/4166680 * task posting v3: Remove task runner handles from codebase entirely Refs https://chromium-review.googlesource.com/c/chromium/src/+/4150928 * Cleanup child_process_launcher_helper* Refs https://chromium-review.googlesource.com/c/chromium/src/+/4141863 * fix: utilityprocess spec on macOS * fix: build on windows Refs https://chromium-review.googlesource.com/c/chromium/src/+/4141863 * chore: fix lint * chore: bump chromium 111.0.5544.3 * chore: gen filenames.libcxx.gni * Add check for Executable+Writable handles in renderer processes. Refs https://chromium-review.googlesource.com/c/chromium/src/+/3774416 * fixup! Add check for Executable+Writable handles in renderer processes. * 4143761: [110] Disable SwiftShader for WebGL on M1 Macs. https://chromium-review.googlesource.com/c/chromium/src/+/4143761 (cherry picked from commit 2f74db3c2139424c416f92d9169aeaa8a2f9c1ec) * chore: bump chromium to 111.0.5555.0 * 56085: Remove hmac.h include from ssl.h. https://boringssl-review.googlesource.com/c/boringssl/+/56085 * 4167020: Remove forwarding headers https://chromium-review.googlesource.com/c/chromium/src/+/4167020 * chore: bump chromium to 111.0.5559.0 * 4181044: Restrict WebCursor usage to RenderWidgetHostViewAura https://chromium-review.googlesource.com/c/chromium/src/+/4181044 * 4189437: views: rename ink_drop_host_view to ink_drop_host https://chromium-review.googlesource.com/c/chromium/src/+/4189437 * chore: bump chromium to 111.0.5560.0 * 4167016: win7dep: remove non aeroglass code https://chromium-review.googlesource.com/c/chromium/src/+/4167016 * fixup after rebase: Remove forwarding header s https://chromium-review.googlesource.com/c/chromium/src/+/4167020 * 4125755: Reland "Reject getDisplayMedia calls without user activation" https://chromium-review.googlesource.com/c/chromium/src/+/4125755 * test: add workaround * chore: update patches * fix: alter coreModuleRegExp to prevent arm crash * Revert "fix: alter coreModuleRegExp to prevent arm crash" This reverts commit 7e50630c98137831a711c5abdbc8809e60cf1d73. * 4218354: Disable the use of preserve_most on arm64 Windows https://chromium-review.googlesource.com/c/v8/v8/+/4218354 * chore: review changes --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
222 lines
7.1 KiB
C++
222 lines
7.1 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/win/notify_icon_host.h"
|
|
|
|
#include <commctrl.h>
|
|
#include <winuser.h>
|
|
|
|
#include "base/functional/bind.h"
|
|
#include "base/logging.h"
|
|
#include "base/memory/weak_ptr.h"
|
|
#include "base/stl_util.h"
|
|
#include "base/win/win_util.h"
|
|
#include "base/win/windows_types.h"
|
|
#include "base/win/wrapped_window_proc.h"
|
|
#include "content/public/browser/browser_task_traits.h"
|
|
#include "shell/browser/ui/win/notify_icon.h"
|
|
#include "ui/events/event_constants.h"
|
|
#include "ui/events/win/system_event_state_lookup.h"
|
|
#include "ui/gfx/win/hwnd_util.h"
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
const UINT kNotifyIconMessage = WM_APP + 1;
|
|
|
|
// |kBaseIconId| is 2 to avoid conflicts with plugins that hard-code id 1.
|
|
const UINT kBaseIconId = 2;
|
|
|
|
const wchar_t kNotifyIconHostWindowClass[] = L"Electron_NotifyIconHostWindow";
|
|
|
|
bool IsWinPressed() {
|
|
return ((::GetKeyState(VK_LWIN) & 0x8000) == 0x8000) ||
|
|
((::GetKeyState(VK_RWIN) & 0x8000) == 0x8000);
|
|
}
|
|
|
|
int GetKeyboardModifiers() {
|
|
int modifiers = ui::EF_NONE;
|
|
if (ui::win::IsShiftPressed())
|
|
modifiers |= ui::EF_SHIFT_DOWN;
|
|
if (ui::win::IsCtrlPressed())
|
|
modifiers |= ui::EF_CONTROL_DOWN;
|
|
if (ui::win::IsAltPressed())
|
|
modifiers |= ui::EF_ALT_DOWN;
|
|
if (IsWinPressed())
|
|
modifiers |= ui::EF_COMMAND_DOWN;
|
|
return modifiers;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
NotifyIconHost::NotifyIconHost() {
|
|
// Register our window class
|
|
WNDCLASSEX window_class;
|
|
base::win::InitializeWindowClass(
|
|
kNotifyIconHostWindowClass,
|
|
&base::win::WrappedWindowProc<NotifyIconHost::WndProcStatic>, 0, 0, 0,
|
|
NULL, NULL, NULL, NULL, NULL, &window_class);
|
|
instance_ = window_class.hInstance;
|
|
atom_ = RegisterClassEx(&window_class);
|
|
CHECK(atom_);
|
|
|
|
// If the taskbar is re-created after we start up, we have to rebuild all of
|
|
// our icons.
|
|
taskbar_created_message_ = RegisterWindowMessage(TEXT("TaskbarCreated"));
|
|
|
|
// Create an offscreen window for handling messages for the status icons. We
|
|
// create a hidden WS_POPUP window instead of an HWND_MESSAGE window, because
|
|
// only top-level windows such as popups can receive broadcast messages like
|
|
// "TaskbarCreated".
|
|
window_ = CreateWindow(MAKEINTATOM(atom_), 0, WS_POPUP, 0, 0, 0, 0, 0, 0,
|
|
instance_, 0);
|
|
gfx::CheckWindowCreated(window_, ::GetLastError());
|
|
gfx::SetWindowUserData(window_, this);
|
|
}
|
|
|
|
NotifyIconHost::~NotifyIconHost() {
|
|
if (window_)
|
|
DestroyWindow(window_);
|
|
|
|
if (atom_)
|
|
UnregisterClass(MAKEINTATOM(atom_), instance_);
|
|
|
|
for (NotifyIcon* ptr : notify_icons_)
|
|
delete ptr;
|
|
}
|
|
|
|
NotifyIcon* NotifyIconHost::CreateNotifyIcon(absl::optional<UUID> guid) {
|
|
if (guid.has_value()) {
|
|
for (NotifyIcons::const_iterator i(notify_icons_.begin());
|
|
i != notify_icons_.end(); ++i) {
|
|
auto* current_win_icon = static_cast<NotifyIcon*>(*i);
|
|
if (current_win_icon->guid() == guid.value()) {
|
|
LOG(WARNING)
|
|
<< "Guid already in use. Existing tray entry will be replaced.";
|
|
}
|
|
}
|
|
}
|
|
|
|
auto* notify_icon =
|
|
new NotifyIcon(this, NextIconId(), window_, kNotifyIconMessage,
|
|
guid.has_value() ? guid.value() : GUID_DEFAULT);
|
|
|
|
notify_icons_.push_back(notify_icon);
|
|
return notify_icon;
|
|
}
|
|
|
|
void NotifyIconHost::Remove(NotifyIcon* icon) {
|
|
NotifyIcons::iterator i(
|
|
std::find(notify_icons_.begin(), notify_icons_.end(), icon));
|
|
|
|
if (i == notify_icons_.end()) {
|
|
NOTREACHED();
|
|
return;
|
|
}
|
|
|
|
notify_icons_.erase(i);
|
|
}
|
|
|
|
LRESULT CALLBACK NotifyIconHost::WndProcStatic(HWND hwnd,
|
|
UINT message,
|
|
WPARAM wparam,
|
|
LPARAM lparam) {
|
|
auto* msg_wnd =
|
|
reinterpret_cast<NotifyIconHost*>(GetWindowLongPtr(hwnd, GWLP_USERDATA));
|
|
if (msg_wnd)
|
|
return msg_wnd->WndProc(hwnd, message, wparam, lparam);
|
|
else
|
|
return ::DefWindowProc(hwnd, message, wparam, lparam);
|
|
}
|
|
|
|
LRESULT CALLBACK NotifyIconHost::WndProc(HWND hwnd,
|
|
UINT message,
|
|
WPARAM wparam,
|
|
LPARAM lparam) {
|
|
if (message == taskbar_created_message_) {
|
|
// We need to reset all of our icons because the taskbar went away.
|
|
for (NotifyIcons::const_iterator i(notify_icons_.begin());
|
|
i != notify_icons_.end(); ++i) {
|
|
auto* win_icon = static_cast<NotifyIcon*>(*i);
|
|
win_icon->ResetIcon();
|
|
}
|
|
return TRUE;
|
|
} else if (message == kNotifyIconMessage) {
|
|
NotifyIcon* win_icon = NULL;
|
|
|
|
// Find the selected status icon.
|
|
for (NotifyIcons::const_iterator i(notify_icons_.begin());
|
|
i != notify_icons_.end(); ++i) {
|
|
auto* current_win_icon = static_cast<NotifyIcon*>(*i);
|
|
if (current_win_icon->icon_id() == wparam) {
|
|
win_icon = current_win_icon;
|
|
break;
|
|
}
|
|
}
|
|
|
|
// It is possible for this procedure to be called with an obsolete icon
|
|
// id. In that case we should just return early before handling any
|
|
// actions.
|
|
if (!win_icon)
|
|
return TRUE;
|
|
|
|
// We use a WeakPtr factory for NotifyIcons here so
|
|
// that the callback is aware if the NotifyIcon gets
|
|
// garbage-collected. This occurs when the tray gets
|
|
// GC'd, and the BALLOON events below will not emit.
|
|
base::WeakPtr<NotifyIcon> win_icon_weak = win_icon->GetWeakPtr();
|
|
|
|
switch (lparam) {
|
|
case NIN_BALLOONSHOW:
|
|
content::GetUIThreadTaskRunner({})->PostTask(
|
|
FROM_HERE,
|
|
base::BindOnce(&NotifyIcon::NotifyBalloonShow, win_icon_weak));
|
|
return TRUE;
|
|
|
|
case NIN_BALLOONUSERCLICK:
|
|
content::GetUIThreadTaskRunner({})->PostTask(
|
|
FROM_HERE,
|
|
base::BindOnce(&NotifyIcon::NotifyBalloonClicked, win_icon_weak));
|
|
return TRUE;
|
|
|
|
case NIN_BALLOONTIMEOUT:
|
|
content::GetUIThreadTaskRunner({})->PostTask(
|
|
FROM_HERE,
|
|
base::BindOnce(&NotifyIcon::NotifyBalloonClosed, win_icon_weak));
|
|
return TRUE;
|
|
|
|
case WM_LBUTTONDOWN:
|
|
case WM_RBUTTONDOWN:
|
|
case WM_LBUTTONDBLCLK:
|
|
case WM_RBUTTONDBLCLK:
|
|
case WM_CONTEXTMENU:
|
|
// Walk our icons, find which one was clicked on, and invoke its
|
|
// HandleClickEvent() method.
|
|
content::GetUIThreadTaskRunner({})->PostTask(
|
|
FROM_HERE,
|
|
base::BindOnce(
|
|
&NotifyIcon::HandleClickEvent, win_icon_weak,
|
|
GetKeyboardModifiers(),
|
|
(lparam == WM_LBUTTONDOWN || lparam == WM_LBUTTONDBLCLK),
|
|
(lparam == WM_LBUTTONDBLCLK || lparam == WM_RBUTTONDBLCLK)));
|
|
|
|
return TRUE;
|
|
|
|
case WM_MOUSEMOVE:
|
|
content::GetUIThreadTaskRunner({})->PostTask(
|
|
FROM_HERE, base::BindOnce(&NotifyIcon::HandleMouseMoveEvent,
|
|
win_icon_weak, GetKeyboardModifiers()));
|
|
return TRUE;
|
|
}
|
|
}
|
|
return ::DefWindowProc(hwnd, message, wparam, lparam);
|
|
}
|
|
|
|
UINT NotifyIconHost::NextIconId() {
|
|
UINT icon_id = next_icon_id_++;
|
|
return kBaseIconId + icon_id;
|
|
}
|
|
|
|
} // namespace electron
|