46f3491c7d
* chore: bump chromium in DEPS to d5c9bf9e2a18fa508201a88e5803bec1d107b1ae * chore: bump chromium in DEPS to 45f1316afae33e52c92480b34bf4f7fe4a7db898 * update patches * WillCreateURLLoaderFactory now gets a ukm_source_id Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2346803 * ink_drop_visible_opacity -> GetInkDropVisibleOpacity Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2415368 * chore: bump chromium in DEPS to ddb5b6db5e35ab1a7b5adbd9f15373af6c35ea2a * 2418471: PDF Viewer update: Add missing aria-labels to various buttons. https://chromium-review.googlesource.com/c/chromium/src/+/2418471 * update printing.patch given print settings mojoification Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2409467 * update patches * content::BluetoothChooser::Event -> content::BluetoothChooserEvent Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2387901 * set_ink_drop_base_color -> SetInkDropBaseColor Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2419388 * chore: bump chromium in DEPS to ecf7c9ee830d4d85f300b461a2fa13aa40c79a4c * update patches * gfx::ConvertPointToPixel -> gfx::ConvertPointToPixels Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2418568 * remove ContentSettingsObserver::AllowStorage() Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2401847 * service_manager::kCrashDumpSignal -> kCrashDumpSignal Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2417073 * chore: bump chromium in DEPS to abdb7ebe5f8c8328b8f435283df90d0a3ecff7bd * chore: bump chromium in DEPS to 2a7e138ab1066534ceb2622e8a9d2c8ebf574215 * chore: bump chromium in DEPS to ab1884e75ced904e4276851eb4e1ad89919ca93b * chore: bump chromium in DEPS to a12413902380dcc2a73ac74d582328280a8af686 * Fixup printing patch https://chromium-review.googlesource.com/c/chromium/src/+/2428623 * Fixup OSR patch https://chromium-review.googlesource.com/c/chromium/src/+/2415128 * Make ExtensionURLLoaderFactory always owned by its |receivers_|. https://chromium-review.googlesource.com/c/chromium/src/+/2357523 * Add deprecated_default_sources_assignment_filter variable https://chromium-review.googlesource.com/c/chromium/src/+/2416496 * Fixup patch indices * Remove several references to BrowserPlugin from content https://chromium-review.googlesource.com/c/chromium/src/+/2401031 * Remove SurfaceEmbeddingTime and LocalSurfaceIdAllocation https://chromium-review.googlesource.com/c/chromium/src/+/2415128 * Add DragOperation and AllowedDragOperations Mojo types https://chromium-review.googlesource.com/c/chromium/src/+/2196167 * chore: bump chromium in DEPS to 378450342cf6aa160663d0ce3a178a11b570c25a * Fixup patch indices * Remove SurfaceEmbeddingTime and LocalSurfaceIdAllocation https://chromium-review.googlesource.com/c/chromium/src/+/2415128 * Add DragOperation and AllowedDragOperations Mojo types https://chromium-review.googlesource.com/c/chromium/src/+/2196167 * 2426564: Remove global sources assignment filter value https://chromium-review.googlesource.com/c/chromium/src/+/2426564 * Fixup blink_local_frame.patch * [XProto] Remove a subset of ui/gfx/x/x11.h https://chromium-review.googlesource.com/c/chromium/src/+/2430328 * Fixup patch indices * Remove several references to BrowserPlugin from content https://chromium-review.googlesource.com/c/chromium/src/+/2401031 * Remove lossy ConvertSizeToPixel() methods https://chromium-review.googlesource.com/c/chromium/src/+/2419534 * serial: Use USB driver name to disambiguate ports https://chromium-review.googlesource.com/c/chromium/src/+/2413176 * Remove set_sources_filter import * Fix ModMask usage * [XProto] Remove usage of all Xlib headers https://chromium-review.googlesource.com/c/chromium/src/+/2392140 * [XProto] Remove usage of Xlib Visuals https://chromium-review.googlesource.com/c/chromium/src/+/2429933 * Skip Angle manifest file https://chromium-review.googlesource.com/c/angle/angle/+/2425197 * Add whole src\third_party\angle\.git directory This directory is needed in order to properly generate gen/angle/angle_commit.h * [libvpx] Fix HighBD config on Windows ARM64 https://chromium-review.googlesource.com/c/chromium/src/+/2437745 * update patches * fix: correct calling convention for Windows on Arm https://chromium-review.googlesource.com/c/v8/v8/+/2440717 * Add third_party/angle/.git to the archive before adding the rest of the source * fixup source caching on Windows * Fixup erroneous close paren * fixup for goma issues * This should work * chore: bump chromium roll manually https://chromium-review.googlesource.com/c/chromium/src/+/2435142 This landed the day after we paused roller-bot and may resolve the visibility test flakes that we're seeing. h/t to @jkleinsc for finding this with me. * chore: remove obsoleted cherry-pick fix for libvpx https://chromium-review.googlesource.com/c/chromium/src/+/2437745 * chore: remove obsoleted cherry-pick libvpx patch https://chromium-review.googlesource.com/c/chromium/src/+/2437745 * chore: re-export patches * chore: add tracer comment to visibility-stat-spec. The line numbers between the source and the CI runs don't seem to match up, so this temp tracer is to help track the source of that difference. * chore: bump chromium in DEPS to 7c2b8cc3b8638aee8abeb013042a6c1d15b2da6b * update patches * impl SortingLSH service Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2425327 * 2446525: [Flash] Remove some Flash APIs https://chromium-review.googlesource.com/c/chromium/src/+/2446525 * 2440974: Reland "Delete service_manager/embedder/switches.h" https://chromium-review.googlesource.com/c/chromium/src/+/2440974 * 2359402: Remove ContentBrowserClient::NonNetworkURLLoaderFactoryDeprecatedMap. https://chromium-review.googlesource.com/c/chromium/src/+/2359402 * 2250506: Implement tabs.removeCSS https://chromium-review.googlesource.com/c/chromium/src/+/2250506 * 2429143: Remove implicit-conversion-to-integer ConvertRectToPixel() methods. https://chromium-review.googlesource.com/c/chromium/src/+/2429143 * 2444430: Remove DataElementType::kBlob https://chromium-review.googlesource.com/c/chromium/src/+/2444430 * 2441964: Clean up WebView public API https://chromium-review.googlesource.com/c/chromium/src/+/2441964 * 2357523: Make ExtensionURLLoaderFactory always owned by its |receivers_|. https://chromium-review.googlesource.com/c/chromium/src/+/2357523 * 2461606: Use blink::mojom::PreferredColorScheme instead of blink::PreferredColorScheme https://chromium-review.googlesource.com/c/chromium/src/+/2461606 * 2461235: a11y inspect reorg: move PropertyFilter struct to a new location https://chromium-review.googlesource.com/c/chromium/src/+/2461235 * remove flash support * fix frame_host_manager patch * fix lint * remove flash info from docs * fix build * fix osr * chore: bump chromium in DEPS to 9269f9eb1d98d29564c2b2ab97f30c6e148c4e11 * fix visibilityState tests * 2463049: Replace all uses of web_pref::AutoplayPolicy with mojom::AutoplayPolicy https://chromium-review.googlesource.com/c/chromium/src/+/2463049 * update patches * fix tests harder * 2414921: Add Group and Ungroup functions to Tabs extension API https://chromium-review.googlesource.com/c/chromium/src/+/2414921 * more test fix * Remove all keyboard related usage of Xlib Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2436787 * fix linux build * 2453807: [XProto] Remove usage of Xlib error handling https://chromium-review.googlesource.com/c/chromium/src/+/2453807 * lint * fixup! 2453807: [XProto] Remove usage of Xlib error handling * disable CalculateNativeWinOcclusion on win ci * remove UploadBlob from docs * Update appveyor.yml Co-authored-by: Andy Locascio <andy@slack-corp.com> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: Electron Bot <anonymous@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: Jeremy Rose <jeremya@chromium.org>
344 lines
12 KiB
C++
344 lines
12 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/logging.h"
|
|
#include "base/strings/string16.h"
|
|
#include "base/strings/stringprintf.h"
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h"
|
|
#include "shell/browser/native_window_views.h"
|
|
#include "shell/browser/ui/electron_menu_model.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/keysyms/keysyms.h"
|
|
#include "ui/gfx/x/x11.h"
|
|
#include "ui/gfx/x/xproto.h"
|
|
|
|
// libdbusmenu-glib types
|
|
typedef struct _DbusmenuMenuitem DbusmenuMenuitem;
|
|
typedef DbusmenuMenuitem* (*dbusmenu_menuitem_new_func)();
|
|
typedef DbusmenuMenuitem* (*dbusmenu_menuitem_new_with_id_func)(int id);
|
|
|
|
typedef int (*dbusmenu_menuitem_get_id_func)(DbusmenuMenuitem* item);
|
|
typedef GList* (*dbusmenu_menuitem_get_children_func)(DbusmenuMenuitem* item);
|
|
typedef DbusmenuMenuitem* (*dbusmenu_menuitem_child_append_func)(
|
|
DbusmenuMenuitem* parent,
|
|
DbusmenuMenuitem* child);
|
|
typedef DbusmenuMenuitem* (*dbusmenu_menuitem_property_set_func)(
|
|
DbusmenuMenuitem* item,
|
|
const char* property,
|
|
const char* value);
|
|
typedef DbusmenuMenuitem* (*dbusmenu_menuitem_property_set_variant_func)(
|
|
DbusmenuMenuitem* item,
|
|
const char* property,
|
|
GVariant* value);
|
|
typedef DbusmenuMenuitem* (*dbusmenu_menuitem_property_set_bool_func)(
|
|
DbusmenuMenuitem* item,
|
|
const char* property,
|
|
bool value);
|
|
typedef DbusmenuMenuitem* (*dbusmenu_menuitem_property_set_int_func)(
|
|
DbusmenuMenuitem* item,
|
|
const char* property,
|
|
int value);
|
|
|
|
typedef struct _DbusmenuServer DbusmenuServer;
|
|
typedef DbusmenuServer* (*dbusmenu_server_new_func)(const char* object);
|
|
typedef void (*dbusmenu_server_set_root_func)(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, int* 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 (int i = 0; i < model->GetItemCount(); ++i) {
|
|
int status = model->GetTypeAt(i) | (model->IsVisibleAt(i) << 3) |
|
|
(model->IsEnabledAt(i) << 4) |
|
|
(model->IsItemCheckedAt(i) << 5);
|
|
ret += base::StringPrintf(
|
|
"%s-%X\n", base::UTF16ToUTF8(model->GetLabelAt(i)).c_str(), status);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
GlobalMenuBarX11::GlobalMenuBarX11(NativeWindowViews* window)
|
|
: window_(window),
|
|
xwindow_(static_cast<x11::Window>(
|
|
window_->GetNativeWindow()->GetHost()->GetAcceleratedWidget())) {
|
|
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 base::StringPrintf("/com/canonical/menu/%X", 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) {
|
|
for (int 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);
|
|
g_signal_connect(item, "about-to-show", G_CALLBACK(OnSubMenuShowThunk),
|
|
this);
|
|
} else {
|
|
ui::Accelerator accelerator;
|
|
if (model->GetAcceleratorAtWithParams(i, true, &accelerator))
|
|
RegisterAccelerator(item, accelerator);
|
|
|
|
g_signal_connect(item, "item-activated",
|
|
G_CALLBACK(OnItemActivatedThunk), this);
|
|
|
|
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(base::string16(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) {
|
|
int id;
|
|
ElectronMenuModel* model = ModelForMenuItem(item);
|
|
if (model && GetMenuItemID(item, &id))
|
|
model->ActivatedAt(id, 0);
|
|
}
|
|
|
|
void GlobalMenuBarX11::OnSubMenuShow(DbusmenuMenuitem* item) {
|
|
int 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
|