![trop[bot]](/assets/img/avatar_default.png)
* chore: bump chromium in DEPS to 139.0.7242.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: update render_widget_host_view_mac.patch no code changes; just updating patch context Do a cleanup pass on the history swiper code |6604367
Co-authored-by: Charles Kerr <charles@charleskerr.com> * chore: update mas_avoid_private_macos_api_usage.patch.patch no code changes; just updating patch context [tracing] Delete base/trace_event/base_tracing.h |6624012
Co-authored-by: Charles Kerr <charles@charleskerr.com> * chore: update chore_provide_iswebcontentscreationoverridden_with_full_params.patch no manual changes; just updating patch context [ActorFramework] Refactor Actor Task Management |6618684
Co-authored-by: Charles Kerr <charles@charleskerr.com> * chore: update fix_move_autopipsettingshelper_behind_branding_buildflag.patch [pip] Tuck picture-in-picture windows when a file dialog is open |6449682
Reland "[document pip] Restrict the size that a website can request" |6372104
Co-authored-by: Charles Kerr <charles@charleskerr.com> * chore: update feat_corner_smoothing_css_rule_and_blink_painting.patch Xref: corner-shape: constraint radii based on opposite corner overlap |6592572
Co-authored-by: Charles Kerr <charles@charleskerr.com> * chore: update revert_code_health_clean_up_stale_macwebcontentsocclusion.patch no manual changes; just updating patch context Co-authored-by: Charles Kerr <charles@charleskerr.com> * chore: update fix_rename_sqlite_win32_exports_to_avoid_conflicts_with_node_js.patch no code changes; just updating patch context Co-authored-by: Charles Kerr <charles@charleskerr.com> * chore: e patches all Co-authored-by: Charles Kerr <charles@charleskerr.com> * Plumb Verify2QwacBinding and hook it up in QwacWebContentsObserver6624719
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * Remove host delegate OnMainFrameCreatedForBackgroundPage6631123
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * Extensions: Rename GetResourceURL to ResolveExtensionURL6625053
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * Consolidate NativeFrameViewMac6614239
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * ICWYU Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * Remove dead code WidgetAXTreeIDMap6619701
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * Reland "extensions: Add `WillPrepareForEvaluation` to setup MojoJS"6630056
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * NavigationThrottleRunner2: Remove MaybeAddThrottle6628079
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * Tuck picture-in-picture windows when a file dialog is open6449682
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * build: fix snapshot_blob.bin build error xref: https://issues.chromium.org/issues/416540976 Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * chore: e patches all Co-authored-by: Charles Kerr <charles@charleskerr.com> * build: freeup disk space on macos Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * chore: bump chromium in DEPS to 139.0.7244.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: update printing.patch no manual changes; just updating patch context Co-authored-by: Charles Kerr <charles@charleskerr.com> * chore: remove upstreamed ignore_parse_errors_for_resolveshortcutproperties.patch Prevent Windows crash on unexpected shortcut type |6633298
Co-authored-by: Charles Kerr <charles@charleskerr.com> * chore: e patches all Co-authored-by: Charles Kerr <charles@charleskerr.com> * Revert "Reland "extensions: Add `WillPrepareForEvaluation` to setup MojoJS"" This reverts commit 77c4f967a637f7e8970114f91311f9fddede0f7c. Revert CL for the high confidence crash culprit for http://crash/28f897bb9743dfe0 |6641819
Co-authored-by: Charles Kerr <charles@charleskerr.com> * Fix spec's expected base64-encoded PNG strings to match upstream changes. [rust png] Enable by default. |6085801
Co-authored-by: Charles Kerr <charles@charleskerr.com> * chore: bump chromium in DEPS to 139.0.7246.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: e patches all Co-authored-by: Charles Kerr <charles@charleskerr.com> * chore: bump chromium in DEPS to 139.0.7248.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: update patches Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * siso: Enable Siso by default for non-Google builds6638830
Disabling for now until we are ready to build siso on all platforms. Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * Revert "revert Don't use static variable for UseExternalPopupMenus" This reverts commit e91e3894e6c34cc0ffe69ed45417c0ebec882fb1. Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * Update mac_sdk_min to match minimum required SDK version6493969
(cherry picked from commit 3e7cbe912d8fe1062d68ed06968aaee22013985f) Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * Use default window styling on Mac6648665
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * Reland "Force the unintentional renderer process creation check by default"6626905
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * fixup: Reland "Force the unintentional renderer process creation check by default6626905
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * chore: bump chromium in DEPS to 139.0.7249.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * fixup: Reland "Force the unintentional renderer process creation check by default6626905
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * chore: update patches Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * chore: bump chromium in DEPS to 139.0.7250.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: bump chromium in DEPS to 139.0.7252.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: bump chromium in DEPS to 139.0.7254.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * 6638187: browser level TOCTOU check for coordinate target6638187
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: fixup patch indices Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: add missing base/notimplemented includes Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6652910: [Frame Cleanup] Push down/hide implementation-specific API6652910
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: bump chromium in DEPS to 139.0.7256.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: fix lint Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * fixup! 6652910: [Frame Cleanup] Push down/hide implementation-specific API Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * fix: move HandleScope location Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: bump chromium in DEPS to 139.0.7258.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * fixup! [NonClientFrameView] Consolidate NativeFrameViewMac Co-authored-by: deepak1556 <hop2deep@gmail.com> * Revert "chore: bump chromium in DEPS to 139.0.7258.0" This reverts commit 264b2e934f4b2705c47d9761010052b95d9dd5de. Co-authored-by: deepak1556 <hop2deep@gmail.com> * chore: update patches --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> 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: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: patchup[bot] <73610968+patchup[bot]@users.noreply.github.com>
345 lines
13 KiB
C++
345 lines
13 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/views/global_menu_bar_x11.h"
|
|
|
|
#include <dlfcn.h>
|
|
#include <glib-object.h>
|
|
|
|
#include "base/functional/bind.h"
|
|
#include "base/notimplemented.h"
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "shell/browser/ui/electron_menu_model.h"
|
|
#include "shell/browser/ui/views/global_menu_bar_registrar_x11.h"
|
|
#include "third_party/abseil-cpp/absl/strings/str_format.h"
|
|
#include "ui/aura/window.h"
|
|
#include "ui/aura/window_tree_host.h"
|
|
#include "ui/base/accelerators/menu_label_accelerator_util_linux.h"
|
|
#include "ui/events/keycodes/keyboard_code_conversion_x.h"
|
|
#include "ui/events/keycodes/keysym_to_unicode.h"
|
|
#include "ui/gfx/x/connection.h"
|
|
#include "ui/gfx/x/event.h"
|
|
#include "ui/gfx/x/keysyms/keysyms.h"
|
|
#include "ui/gfx/x/xproto.h"
|
|
|
|
// libdbusmenu-glib types
|
|
using DbusmenuMenuitem = struct _DbusmenuMenuitem;
|
|
using dbusmenu_menuitem_new_func = DbusmenuMenuitem* (*)();
|
|
using dbusmenu_menuitem_new_with_id_func = DbusmenuMenuitem* (*)(int id);
|
|
|
|
using dbusmenu_menuitem_get_id_func = int (*)(DbusmenuMenuitem* item);
|
|
using dbusmenu_menuitem_get_children_func = GList* (*)(DbusmenuMenuitem * item);
|
|
using dbusmenu_menuitem_child_append_func =
|
|
DbusmenuMenuitem* (*)(DbusmenuMenuitem * parent, DbusmenuMenuitem* child);
|
|
using dbusmenu_menuitem_property_set_func =
|
|
DbusmenuMenuitem* (*)(DbusmenuMenuitem * item,
|
|
const char* property,
|
|
const char* value);
|
|
using dbusmenu_menuitem_property_set_variant_func =
|
|
DbusmenuMenuitem* (*)(DbusmenuMenuitem * item,
|
|
const char* property,
|
|
GVariant* value);
|
|
using dbusmenu_menuitem_property_set_bool_func =
|
|
DbusmenuMenuitem* (*)(DbusmenuMenuitem * item,
|
|
const char* property,
|
|
bool value);
|
|
using dbusmenu_menuitem_property_set_int_func =
|
|
DbusmenuMenuitem* (*)(DbusmenuMenuitem * item,
|
|
const char* property,
|
|
int value);
|
|
|
|
using DbusmenuServer = struct _DbusmenuServer;
|
|
using dbusmenu_server_new_func = DbusmenuServer* (*)(const char* object);
|
|
using dbusmenu_server_set_root_func = void (*)(DbusmenuServer* self,
|
|
DbusmenuMenuitem* root);
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
// Retrieved functions from libdbusmenu-glib.
|
|
|
|
// DbusmenuMenuItem methods:
|
|
dbusmenu_menuitem_new_func menuitem_new = nullptr;
|
|
dbusmenu_menuitem_new_with_id_func menuitem_new_with_id = nullptr;
|
|
dbusmenu_menuitem_get_id_func menuitem_get_id = nullptr;
|
|
dbusmenu_menuitem_get_children_func menuitem_get_children = nullptr;
|
|
dbusmenu_menuitem_get_children_func menuitem_take_children = nullptr;
|
|
dbusmenu_menuitem_child_append_func menuitem_child_append = nullptr;
|
|
dbusmenu_menuitem_property_set_func menuitem_property_set = nullptr;
|
|
dbusmenu_menuitem_property_set_variant_func menuitem_property_set_variant =
|
|
nullptr;
|
|
dbusmenu_menuitem_property_set_bool_func menuitem_property_set_bool = nullptr;
|
|
dbusmenu_menuitem_property_set_int_func menuitem_property_set_int = nullptr;
|
|
|
|
// DbusmenuServer methods:
|
|
dbusmenu_server_new_func server_new = nullptr;
|
|
dbusmenu_server_set_root_func server_set_root = nullptr;
|
|
|
|
// Properties that we set on menu items:
|
|
const char kPropertyEnabled[] = "enabled";
|
|
const char kPropertyLabel[] = "label";
|
|
const char kPropertyShortcut[] = "shortcut";
|
|
const char kPropertyType[] = "type";
|
|
const char kPropertyToggleType[] = "toggle-type";
|
|
const char kPropertyToggleState[] = "toggle-state";
|
|
const char kPropertyVisible[] = "visible";
|
|
const char kPropertyChildrenDisplay[] = "children-display";
|
|
|
|
const char kToggleCheck[] = "checkmark";
|
|
const char kToggleRadio[] = "radio";
|
|
const char kTypeSeparator[] = "separator";
|
|
const char kDisplaySubmenu[] = "submenu";
|
|
|
|
void EnsureMethodsLoaded() {
|
|
static bool attempted_load = false;
|
|
if (attempted_load)
|
|
return;
|
|
attempted_load = true;
|
|
|
|
void* dbusmenu_lib = dlopen("libdbusmenu-glib.so", RTLD_LAZY);
|
|
if (!dbusmenu_lib)
|
|
dbusmenu_lib = dlopen("libdbusmenu-glib.so.4", RTLD_LAZY);
|
|
if (!dbusmenu_lib)
|
|
return;
|
|
|
|
// DbusmenuMenuItem methods.
|
|
menuitem_new = reinterpret_cast<dbusmenu_menuitem_new_func>(
|
|
dlsym(dbusmenu_lib, "dbusmenu_menuitem_new"));
|
|
menuitem_new_with_id = reinterpret_cast<dbusmenu_menuitem_new_with_id_func>(
|
|
dlsym(dbusmenu_lib, "dbusmenu_menuitem_new_with_id"));
|
|
menuitem_get_id = reinterpret_cast<dbusmenu_menuitem_get_id_func>(
|
|
dlsym(dbusmenu_lib, "dbusmenu_menuitem_get_id"));
|
|
menuitem_get_children = reinterpret_cast<dbusmenu_menuitem_get_children_func>(
|
|
dlsym(dbusmenu_lib, "dbusmenu_menuitem_get_children"));
|
|
menuitem_take_children =
|
|
reinterpret_cast<dbusmenu_menuitem_get_children_func>(
|
|
dlsym(dbusmenu_lib, "dbusmenu_menuitem_take_children"));
|
|
menuitem_child_append = reinterpret_cast<dbusmenu_menuitem_child_append_func>(
|
|
dlsym(dbusmenu_lib, "dbusmenu_menuitem_child_append"));
|
|
menuitem_property_set = reinterpret_cast<dbusmenu_menuitem_property_set_func>(
|
|
dlsym(dbusmenu_lib, "dbusmenu_menuitem_property_set"));
|
|
menuitem_property_set_variant =
|
|
reinterpret_cast<dbusmenu_menuitem_property_set_variant_func>(
|
|
dlsym(dbusmenu_lib, "dbusmenu_menuitem_property_set_variant"));
|
|
menuitem_property_set_bool =
|
|
reinterpret_cast<dbusmenu_menuitem_property_set_bool_func>(
|
|
dlsym(dbusmenu_lib, "dbusmenu_menuitem_property_set_bool"));
|
|
menuitem_property_set_int =
|
|
reinterpret_cast<dbusmenu_menuitem_property_set_int_func>(
|
|
dlsym(dbusmenu_lib, "dbusmenu_menuitem_property_set_int"));
|
|
|
|
// DbusmenuServer methods.
|
|
server_new = reinterpret_cast<dbusmenu_server_new_func>(
|
|
dlsym(dbusmenu_lib, "dbusmenu_server_new"));
|
|
server_set_root = reinterpret_cast<dbusmenu_server_set_root_func>(
|
|
dlsym(dbusmenu_lib, "dbusmenu_server_set_root"));
|
|
}
|
|
|
|
ElectronMenuModel* ModelForMenuItem(DbusmenuMenuitem* item) {
|
|
return reinterpret_cast<ElectronMenuModel*>(
|
|
g_object_get_data(G_OBJECT(item), "model"));
|
|
}
|
|
|
|
bool GetMenuItemID(DbusmenuMenuitem* item, size_t* id) {
|
|
gpointer id_ptr = g_object_get_data(G_OBJECT(item), "menu-id");
|
|
if (id_ptr != nullptr) {
|
|
*id = GPOINTER_TO_INT(id_ptr) - 1;
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
void SetMenuItemID(DbusmenuMenuitem* item, int id) {
|
|
DCHECK_GE(id, 0);
|
|
|
|
// Add 1 to the menu_id to avoid setting zero (null) to "menu-id".
|
|
g_object_set_data(G_OBJECT(item), "menu-id", GINT_TO_POINTER(id + 1));
|
|
}
|
|
|
|
std::string GetMenuModelStatus(ElectronMenuModel* model) {
|
|
std::string ret;
|
|
for (size_t i = 0; i < model->GetItemCount(); ++i) {
|
|
int status = model->GetTypeAt(i) | (model->IsVisibleAt(i) << 3) |
|
|
(model->IsEnabledAt(i) << 4) |
|
|
(model->IsItemCheckedAt(i) << 5);
|
|
ret += absl::StrFormat("%s-%X\n", base::UTF16ToUTF8(model->GetLabelAt(i)),
|
|
status);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
GlobalMenuBarX11::GlobalMenuBarX11(gfx::AcceleratedWidget accelerated_widget)
|
|
: xwindow_(static_cast<x11::Window>(accelerated_widget)) {
|
|
EnsureMethodsLoaded();
|
|
if (server_new)
|
|
InitServer(xwindow_);
|
|
|
|
GlobalMenuBarRegistrarX11::GetInstance()->OnWindowMapped(xwindow_);
|
|
}
|
|
|
|
GlobalMenuBarX11::~GlobalMenuBarX11() {
|
|
if (IsServerStarted())
|
|
g_object_unref(server_);
|
|
|
|
GlobalMenuBarRegistrarX11::GetInstance()->OnWindowUnmapped(xwindow_);
|
|
}
|
|
|
|
// static
|
|
std::string GlobalMenuBarX11::GetPathForWindow(x11::Window window) {
|
|
return absl::StrFormat("/com/canonical/menu/%X", static_cast<uint>(window));
|
|
}
|
|
|
|
void GlobalMenuBarX11::SetMenu(ElectronMenuModel* menu_model) {
|
|
if (!IsServerStarted())
|
|
return;
|
|
|
|
DbusmenuMenuitem* root_item = menuitem_new();
|
|
menuitem_property_set(root_item, kPropertyLabel, "Root");
|
|
menuitem_property_set_bool(root_item, kPropertyVisible, true);
|
|
if (menu_model != nullptr) {
|
|
BuildMenuFromModel(menu_model, root_item);
|
|
}
|
|
|
|
server_set_root(server_, root_item);
|
|
g_object_unref(root_item);
|
|
}
|
|
|
|
bool GlobalMenuBarX11::IsServerStarted() const {
|
|
return server_;
|
|
}
|
|
|
|
void GlobalMenuBarX11::InitServer(x11::Window window) {
|
|
std::string path = GetPathForWindow(window);
|
|
server_ = server_new(path.c_str());
|
|
}
|
|
|
|
void GlobalMenuBarX11::OnWindowMapped() {
|
|
GlobalMenuBarRegistrarX11::GetInstance()->OnWindowMapped(xwindow_);
|
|
}
|
|
|
|
void GlobalMenuBarX11::OnWindowUnmapped() {
|
|
GlobalMenuBarRegistrarX11::GetInstance()->OnWindowUnmapped(xwindow_);
|
|
}
|
|
|
|
void GlobalMenuBarX11::BuildMenuFromModel(ElectronMenuModel* model,
|
|
DbusmenuMenuitem* parent) {
|
|
auto connect = [&](auto* sender, const char* detailed_signal, auto receiver) {
|
|
// Unretained() is safe since GlobalMenuBarX11 will own the
|
|
// ScopedGSignal.
|
|
signals_.emplace_back(
|
|
sender, detailed_signal,
|
|
base::BindRepeating(receiver, base::Unretained(this)));
|
|
};
|
|
for (size_t i = 0; i < model->GetItemCount(); ++i) {
|
|
DbusmenuMenuitem* item = menuitem_new();
|
|
menuitem_property_set_bool(item, kPropertyVisible, model->IsVisibleAt(i));
|
|
|
|
ElectronMenuModel::ItemType type = model->GetTypeAt(i);
|
|
if (type == ElectronMenuModel::TYPE_SEPARATOR) {
|
|
menuitem_property_set(item, kPropertyType, kTypeSeparator);
|
|
} else {
|
|
std::string label = ui::ConvertAcceleratorsFromWindowsStyle(
|
|
base::UTF16ToUTF8(model->GetLabelAt(i)));
|
|
menuitem_property_set(item, kPropertyLabel, label.c_str());
|
|
menuitem_property_set_bool(item, kPropertyEnabled, model->IsEnabledAt(i));
|
|
|
|
g_object_set_data(G_OBJECT(item), "model", model);
|
|
SetMenuItemID(item, i);
|
|
|
|
if (type == ElectronMenuModel::TYPE_SUBMENU) {
|
|
menuitem_property_set(item, kPropertyChildrenDisplay, kDisplaySubmenu);
|
|
connect(item, "about-to-show", &GlobalMenuBarX11::OnSubMenuShow);
|
|
} else {
|
|
ui::Accelerator accelerator;
|
|
if (model->GetAcceleratorAtWithParams(i, true, &accelerator))
|
|
RegisterAccelerator(item, accelerator);
|
|
|
|
connect(item, "item-activated", &GlobalMenuBarX11::OnItemActivated);
|
|
|
|
if (type == ElectronMenuModel::TYPE_CHECK ||
|
|
type == ElectronMenuModel::TYPE_RADIO) {
|
|
menuitem_property_set(item, kPropertyToggleType,
|
|
type == ElectronMenuModel::TYPE_CHECK
|
|
? kToggleCheck
|
|
: kToggleRadio);
|
|
menuitem_property_set_int(item, kPropertyToggleState,
|
|
model->IsItemCheckedAt(i));
|
|
}
|
|
}
|
|
}
|
|
|
|
menuitem_child_append(parent, item);
|
|
g_object_unref(item);
|
|
}
|
|
}
|
|
|
|
void GlobalMenuBarX11::RegisterAccelerator(DbusmenuMenuitem* item,
|
|
const ui::Accelerator& accelerator) {
|
|
// A translation of libdbusmenu-gtk's menuitem_property_set_shortcut()
|
|
// translated from GDK types to ui::Accelerator types.
|
|
GVariantBuilder builder;
|
|
g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY);
|
|
|
|
if (accelerator.IsCtrlDown())
|
|
g_variant_builder_add(&builder, "s", "Control");
|
|
if (accelerator.IsAltDown())
|
|
g_variant_builder_add(&builder, "s", "Alt");
|
|
if (accelerator.IsShiftDown())
|
|
g_variant_builder_add(&builder, "s", "Shift");
|
|
|
|
uint16_t keysym = ui::GetUnicodeCharacterFromXKeySym(
|
|
XKeysymForWindowsKeyCode(accelerator.key_code(), false));
|
|
if (!keysym) {
|
|
NOTIMPLEMENTED();
|
|
return;
|
|
}
|
|
std::string name = base::UTF16ToUTF8(std::u16string(1, keysym));
|
|
g_variant_builder_add(&builder, "s", name.c_str());
|
|
|
|
GVariant* inside_array = g_variant_builder_end(&builder);
|
|
g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY);
|
|
g_variant_builder_add_value(&builder, inside_array);
|
|
GVariant* outside_array = g_variant_builder_end(&builder);
|
|
|
|
menuitem_property_set_variant(item, kPropertyShortcut, outside_array);
|
|
}
|
|
|
|
void GlobalMenuBarX11::OnItemActivated(DbusmenuMenuitem* item,
|
|
unsigned int timestamp) {
|
|
size_t id;
|
|
ElectronMenuModel* model = ModelForMenuItem(item);
|
|
if (model && GetMenuItemID(item, &id))
|
|
model->ActivatedAt(id, 0);
|
|
}
|
|
|
|
void GlobalMenuBarX11::OnSubMenuShow(DbusmenuMenuitem* item) {
|
|
size_t id;
|
|
ElectronMenuModel* model = ModelForMenuItem(item);
|
|
if (!model || !GetMenuItemID(item, &id))
|
|
return;
|
|
|
|
// Do not update menu if the submenu has not been changed.
|
|
std::string status = GetMenuModelStatus(model);
|
|
char* old = static_cast<char*>(g_object_get_data(G_OBJECT(item), "status"));
|
|
if (old && status == old)
|
|
return;
|
|
|
|
// Save the new status.
|
|
g_object_set_data_full(G_OBJECT(item), "status", g_strdup(status.c_str()),
|
|
g_free);
|
|
|
|
// Clear children.
|
|
GList* children = menuitem_take_children(item);
|
|
g_list_foreach(children, reinterpret_cast<GFunc>(g_object_unref), nullptr);
|
|
g_list_free(children);
|
|
|
|
// Build children.
|
|
BuildMenuFromModel(model->GetSubmenuModelAt(id), item);
|
|
}
|
|
|
|
} // namespace electron
|