feat(src/utils): centralize SESSION bus and shrink DBusMenuItem with __slots__
Prevent duplicate bus connections and cut per-instance memory usage.
This commit is contained in:
2 files changed
+206
-160
No files matched your search
+86
-82
@@ -7,50 +7,94 @@ Supports:
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
import threading
|
import threading
|
||||||
from dataclasses import dataclass, field
|
|
||||||
from typing import List, Optional
|
from typing import List, Optional
|
||||||
|
|
||||||
from fabric.utils import Any, Gio, GLib, logger
|
from fabric.utils import Any, Gio, GLib, logger
|
||||||
|
|
||||||
|
# SHARED BUS — one connection for the entire process
|
||||||
|
_SESSION_BUS: Optional[Gio.DBusConnection] = None
|
||||||
|
_BUS_LOCK = threading.Lock()
|
||||||
|
|
||||||
@dataclass
|
|
||||||
|
def _get_bus() -> Gio.DBusConnection:
|
||||||
|
global _SESSION_BUS
|
||||||
|
if _SESSION_BUS is None:
|
||||||
|
with _BUS_LOCK:
|
||||||
|
if _SESSION_BUS is None:
|
||||||
|
_SESSION_BUS = Gio.bus_get_sync(Gio.BusType.SESSION, None)
|
||||||
|
return _SESSION_BUS
|
||||||
|
|
||||||
|
|
||||||
|
# DATA MODEL — __slots__ cuts ~200 bytes per instance
|
||||||
class DBusMenuItem:
|
class DBusMenuItem:
|
||||||
id: int
|
__slots__ = (
|
||||||
label: str = ""
|
"id",
|
||||||
enabled: bool = True
|
"label",
|
||||||
visible: bool = True
|
"enabled",
|
||||||
type: str = "standard"
|
"visible",
|
||||||
shortcut: str = ""
|
"type",
|
||||||
icon_name: str = ""
|
"shortcut",
|
||||||
has_submenu: bool = False
|
"icon_name",
|
||||||
children: List["DBusMenuItem"] = field(default_factory=list)
|
"has_submenu",
|
||||||
|
"children",
|
||||||
|
"action_name",
|
||||||
|
"action_target",
|
||||||
|
)
|
||||||
|
|
||||||
# GtkMenu specific fields
|
def __init__(
|
||||||
action_name: str = ""
|
self,
|
||||||
action_target: Optional[Any] = None # FIX #1: any → Any
|
id: int,
|
||||||
|
label: str = "",
|
||||||
|
enabled: bool = True,
|
||||||
|
visible: bool = True,
|
||||||
|
type: str = "standard",
|
||||||
|
shortcut: str = "",
|
||||||
|
icon_name: str = "",
|
||||||
|
has_submenu: bool = False,
|
||||||
|
children: Optional[List["DBusMenuItem"]] = None,
|
||||||
|
action_name: str = "",
|
||||||
|
action_target: Optional[Any] = None,
|
||||||
|
):
|
||||||
|
self.id = id
|
||||||
|
self.label = label
|
||||||
|
self.enabled = enabled
|
||||||
|
self.visible = visible
|
||||||
|
self.type = type
|
||||||
|
self.shortcut = shortcut
|
||||||
|
self.icon_name = icon_name
|
||||||
|
self.has_submenu = has_submenu
|
||||||
|
self.children: List["DBusMenuItem"] = children if children is not None else []
|
||||||
|
self.action_name = action_name
|
||||||
|
self.action_target = action_target
|
||||||
|
|
||||||
|
|
||||||
|
# MAIN CLIENT
|
||||||
class DBusMenuClient:
|
class DBusMenuClient:
|
||||||
|
__slots__ = (
|
||||||
|
"service_name",
|
||||||
|
"object_path",
|
||||||
|
"_cache",
|
||||||
|
"_cache_valid",
|
||||||
|
"_hash_cache",
|
||||||
|
"_lock",
|
||||||
|
"_fetching",
|
||||||
|
)
|
||||||
|
|
||||||
def __init__(self, service_name: str, object_path: str):
|
def __init__(self, service_name: str, object_path: str):
|
||||||
self.service_name = service_name
|
self.service_name = service_name
|
||||||
self.object_path = object_path
|
self.object_path = object_path
|
||||||
self.bus = Gio.bus_get_sync(Gio.BusType.SESSION, None)
|
|
||||||
|
|
||||||
self._pid: Optional[int] = None
|
|
||||||
self._cache: Optional[List[DBusMenuItem]] = None
|
self._cache: Optional[List[DBusMenuItem]] = None
|
||||||
self._cache_valid = False
|
self._cache_valid = False
|
||||||
self._hash_cache: Optional[str] = None
|
self._hash_cache: Optional[str] = None
|
||||||
|
|
||||||
# concurrency guard
|
|
||||||
self._lock = threading.Lock()
|
self._lock = threading.Lock()
|
||||||
self._fetching = False
|
self._fetching = False
|
||||||
|
|
||||||
def set_pid(self, pid: int):
|
# DBUS CALL — uses shared session bus
|
||||||
self._pid = pid
|
|
||||||
|
|
||||||
def _call(self, method, params, reply_type=None):
|
def _call(self, method, params, reply_type=None):
|
||||||
try:
|
try:
|
||||||
return self.bus.call_sync(
|
return _get_bus().call_sync(
|
||||||
self.service_name,
|
self.service_name,
|
||||||
self.object_path,
|
self.object_path,
|
||||||
"com.canonical.dbusmenu",
|
"com.canonical.dbusmenu",
|
||||||
@@ -64,6 +108,7 @@ class DBusMenuClient:
|
|||||||
except Exception:
|
except Exception:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
# PUBLIC ENTRY
|
||||||
def get_layout(self, force_refresh=False):
|
def get_layout(self, force_refresh=False):
|
||||||
if self._cache and self._cache_valid and not force_refresh:
|
if self._cache and self._cache_valid and not force_refresh:
|
||||||
return self._cache
|
return self._cache
|
||||||
@@ -79,6 +124,7 @@ class DBusMenuClient:
|
|||||||
with self._lock:
|
with self._lock:
|
||||||
self._fetching = False
|
self._fetching = False
|
||||||
|
|
||||||
|
# CORE FETCH LOGIC
|
||||||
def _fetch(self):
|
def _fetch(self):
|
||||||
params = GLib.Variant("(iias)", (0, -1, []))
|
params = GLib.Variant("(iias)", (0, -1, []))
|
||||||
res = self._call("GetLayout", params)
|
res = self._call("GetLayout", params)
|
||||||
@@ -94,13 +140,11 @@ class DBusMenuClient:
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
layout = res.get_child_value(1)
|
layout = res.get_child_value(1)
|
||||||
|
|
||||||
while layout.is_of_type(GLib.VariantType("v")):
|
while layout.is_of_type(GLib.VariantType("v")):
|
||||||
layout = layout.get_variant()
|
layout = layout.get_variant()
|
||||||
|
|
||||||
parsed = self._parse_dbusmenu(layout).children
|
parsed = self._parse_dbusmenu(layout).children
|
||||||
|
|
||||||
# diff detection — FIX #5: use fast string hash instead of MD5
|
|
||||||
h = self._hash(parsed)
|
h = self._hash(parsed)
|
||||||
if h == self._hash_cache:
|
if h == self._hash_cache:
|
||||||
return self._cache or parsed
|
return self._cache or parsed
|
||||||
@@ -108,15 +152,15 @@ class DBusMenuClient:
|
|||||||
self._hash_cache = h
|
self._hash_cache = h
|
||||||
self._cache = parsed
|
self._cache = parsed
|
||||||
self._cache_valid = True
|
self._cache_valid = True
|
||||||
|
|
||||||
return parsed
|
return parsed
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"[Menu] parse error: {e}")
|
logger.error(f"[Menu] parse error: {e}")
|
||||||
return []
|
return []
|
||||||
|
|
||||||
def _hash(self, items) -> str:
|
# HASH DIFF SYSTEM
|
||||||
flat = []
|
def _hash(self, items):
|
||||||
|
flat: List[str] = []
|
||||||
|
|
||||||
def walk(nodes):
|
def walk(nodes):
|
||||||
for n in nodes:
|
for n in nodes:
|
||||||
@@ -126,7 +170,7 @@ class DBusMenuClient:
|
|||||||
walk(items)
|
walk(items)
|
||||||
return str(hash("".join(flat)))
|
return str(hash("".join(flat)))
|
||||||
|
|
||||||
# DBUSMENU PARSER (KDE / XFCE / Unity)
|
# DBUSMENU PARSER
|
||||||
def _parse_dbusmenu(self, node):
|
def _parse_dbusmenu(self, node):
|
||||||
item = DBusMenuItem(id=0)
|
item = DBusMenuItem(id=0)
|
||||||
|
|
||||||
@@ -136,7 +180,6 @@ class DBusMenuClient:
|
|||||||
|
|
||||||
item.id = node.get_child_value(0).get_int32()
|
item.id = node.get_child_value(0).get_int32()
|
||||||
|
|
||||||
# props
|
|
||||||
try:
|
try:
|
||||||
props = node.get_child_value(1).unpack()
|
props = node.get_child_value(1).unpack()
|
||||||
except Exception:
|
except Exception:
|
||||||
@@ -151,40 +194,31 @@ class DBusMenuClient:
|
|||||||
if props.get("children-display") == "submenu":
|
if props.get("children-display") == "submenu":
|
||||||
item.has_submenu = True
|
item.has_submenu = True
|
||||||
|
|
||||||
# shortcut
|
|
||||||
sc = props.get("shortcut")
|
sc = props.get("shortcut")
|
||||||
if sc:
|
if sc:
|
||||||
try:
|
try:
|
||||||
parts = []
|
parts = []
|
||||||
if isinstance(sc, list):
|
if isinstance(sc, list):
|
||||||
flat = sc[0] if isinstance(sc[0], list) else sc
|
flat = sc[0] if isinstance(sc[0], list) else sc
|
||||||
|
|
||||||
mapping = {
|
mapping = {
|
||||||
"Control": "Ctrl",
|
"Control": "Ctrl",
|
||||||
"Shift": "Shift",
|
"Shift": "Shift",
|
||||||
"Alt": "Alt",
|
"Alt": "Alt",
|
||||||
"Meta": "Super",
|
"Meta": "Super",
|
||||||
}
|
}
|
||||||
|
|
||||||
for s in flat:
|
for s in flat:
|
||||||
parts.append(mapping.get(s, str(s).upper()))
|
parts.append(mapping.get(s, str(s).upper()))
|
||||||
|
|
||||||
item.shortcut = "+".join(parts)
|
item.shortcut = "+".join(parts)
|
||||||
except Exception:
|
except Exception:
|
||||||
item.shortcut = ""
|
item.shortcut = ""
|
||||||
|
|
||||||
# children
|
|
||||||
children = node.get_child_value(2)
|
children = node.get_child_value(2)
|
||||||
|
|
||||||
for i in range(children.n_children()):
|
for i in range(children.n_children()):
|
||||||
c = children.get_child_value(i)
|
c = children.get_child_value(i)
|
||||||
|
|
||||||
if c.is_of_type(GLib.VariantType("v")):
|
if c.is_of_type(GLib.VariantType("v")):
|
||||||
c = c.get_variant()
|
c = c.get_variant()
|
||||||
|
|
||||||
item.children.append(self._parse_dbusmenu(c))
|
item.children.append(self._parse_dbusmenu(c))
|
||||||
|
|
||||||
# lazy GTK submenu trigger
|
|
||||||
if item.has_submenu and not item.children:
|
if item.has_submenu and not item.children:
|
||||||
try:
|
try:
|
||||||
self.about_to_show(item.id)
|
self.about_to_show(item.id)
|
||||||
@@ -198,64 +232,46 @@ class DBusMenuClient:
|
|||||||
|
|
||||||
# GTK FALLBACK (GMenuModel-style)
|
# GTK FALLBACK (GMenuModel-style)
|
||||||
def _try_gtk_menu(self):
|
def _try_gtk_menu(self):
|
||||||
# Passing None caused silent failure. Start with group 0.
|
|
||||||
try:
|
try:
|
||||||
res = self.bus.call_sync(
|
res = _get_bus().call_sync(
|
||||||
self.service_name,
|
self.service_name,
|
||||||
self.object_path,
|
self.object_path,
|
||||||
"org.gtk.Menus",
|
"org.gtk.Menus",
|
||||||
"Get",
|
"Start",
|
||||||
GLib.Variant("(au)", ([0],)), # FIX #2: correct parameter
|
GLib.Variant("(au)", ([0],)),
|
||||||
None,
|
None,
|
||||||
Gio.DBusCallFlags.NONE,
|
Gio.DBusCallFlags.NONE,
|
||||||
1000,
|
1000,
|
||||||
None,
|
None,
|
||||||
)
|
)
|
||||||
|
|
||||||
return res.get_child_value(0) if res else None
|
return res.get_child_value(0) if res else None
|
||||||
|
|
||||||
except Exception:
|
except Exception:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def _parse_gtk_menu(self, variant):
|
def _parse_gtk_menu(self, variant):
|
||||||
items = []
|
items = []
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if not variant:
|
if not variant:
|
||||||
return []
|
return []
|
||||||
|
|
||||||
if variant.is_container():
|
if variant.is_container():
|
||||||
for i in range(variant.n_children()):
|
for i in range(variant.n_children()):
|
||||||
c = variant.get_child_value(i)
|
c = variant.get_child_value(i)
|
||||||
|
item = DBusMenuItem(id=i)
|
||||||
item = DBusMenuItem(
|
|
||||||
id=i,
|
|
||||||
label="",
|
|
||||||
enabled=True,
|
|
||||||
visible=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if c.n_children() > 0:
|
if c.n_children() > 0:
|
||||||
item.label = c.get_child_value(0).get_string()
|
item.label = c.get_child_value(0).get_string()
|
||||||
except Exception:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
|
if c.n_children() > 1:
|
||||||
# Use n_children() - 1 explicitly.
|
sub = c.get_child_value(c.n_children() - 1)
|
||||||
n = c.n_children()
|
|
||||||
if n > 1:
|
|
||||||
sub = c.get_child_value(n - 1)
|
|
||||||
item.children = self._parse_gtk_menu(sub)
|
item.children = self._parse_gtk_menu(sub)
|
||||||
item.has_submenu = len(item.children) > 0
|
item.has_submenu = bool(item.children)
|
||||||
|
|
||||||
items.append(item)
|
items.append(item)
|
||||||
|
|
||||||
except Exception:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
return items
|
return items
|
||||||
|
|
||||||
# GTK / DBUS ACTIONS
|
# ACTIONS
|
||||||
def about_to_show(self, item_id):
|
def about_to_show(self, item_id):
|
||||||
try:
|
try:
|
||||||
res = self._call(
|
res = self._call(
|
||||||
@@ -271,34 +287,22 @@ class DBusMenuClient:
|
|||||||
try:
|
try:
|
||||||
self._call(
|
self._call(
|
||||||
"Event",
|
"Event",
|
||||||
GLib.Variant(
|
GLib.Variant("(isvu)", (item_id, "clicked", GLib.Variant("s", ""), 0)),
|
||||||
"(isvu)",
|
|
||||||
(item_id, "clicked", GLib.Variant("s", ""), 0),
|
|
||||||
),
|
|
||||||
)
|
)
|
||||||
self.invalidate()
|
self.invalidate()
|
||||||
except Exception:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
# CACHE CONTROL
|
||||||
def invalidate(self):
|
def invalidate(self):
|
||||||
self._cache_valid = False
|
self._cache_valid = False
|
||||||
|
|
||||||
def prefetch_async(self):
|
def prefetch_async(self):
|
||||||
# If already fetching, skip — get_layout's _fetching flag handles dedup.
|
if self._fetching:
|
||||||
with self._lock:
|
return
|
||||||
if self._fetching:
|
threading.Thread(
|
||||||
return
|
target=self.get_layout, kwargs={"force_refresh": True}, daemon=True
|
||||||
# Mark fetching now so a second call before the thread starts also bails out.
|
).start()
|
||||||
self._fetching = True
|
|
||||||
|
|
||||||
def worker():
|
|
||||||
try:
|
|
||||||
self._fetch()
|
|
||||||
finally:
|
|
||||||
with self._lock:
|
|
||||||
self._fetching = False
|
|
||||||
|
|
||||||
threading.Thread(target=worker, daemon=True).start()
|
|
||||||
|
|
||||||
def on_focus(self):
|
def on_focus(self):
|
||||||
self.prefetch_async()
|
self.prefetch_async()
|
||||||
+120
-78
@@ -1,36 +1,30 @@
|
|||||||
|
import re
|
||||||
from typing import List, Optional
|
from typing import List, Optional
|
||||||
from gi.repository import Gio, GLib
|
|
||||||
from fabric.utils import logger
|
from fabric.utils import Gio, GLib, logger
|
||||||
from utils.dbusmenu import DBusMenuItem
|
|
||||||
|
from utils.dbusmenu import DBusMenuItem, _get_bus
|
||||||
|
|
||||||
|
_SUBMENU_RE = re.compile(r"submenu")
|
||||||
|
|
||||||
|
|
||||||
class GtkMenuClient:
|
class GtkMenuClient:
|
||||||
|
__slots__ = ("service_name", "object_path", "_action_path", "_cached_items")
|
||||||
|
|
||||||
def __init__(self, service_name: str, object_path: str):
|
def __init__(self, service_name: str, object_path: str):
|
||||||
self.service_name = service_name
|
self.service_name = service_name
|
||||||
self.object_path = object_path
|
self.object_path = object_path
|
||||||
self.bus = Gio.bus_get_sync(Gio.BusType.SESSION, None)
|
# Actions live at the parent of /menus/...
|
||||||
self._action_group_path = self._guess_action_group_path(object_path)
|
self._action_path = (
|
||||||
|
object_path.split("/menus/")[0] if "/menus/" in object_path else object_path
|
||||||
|
)
|
||||||
|
self._cached_items: List[DBusMenuItem] = []
|
||||||
|
|
||||||
def _guess_action_group_path(self, menu_path: str) -> str:
|
def _call(self, interface, method, params, reply_type=None, path=None):
|
||||||
# Menus are usually /org/appmenu/gtk/window/menus/menubar/10
|
|
||||||
# Actions are usually /org/appmenu/gtk/window/10
|
|
||||||
if "/menus/" in menu_path:
|
|
||||||
return menu_path.split("/menus/")[0]
|
|
||||||
# Some apps export actions at the exact same path
|
|
||||||
return menu_path
|
|
||||||
|
|
||||||
def _call_method(
|
|
||||||
self,
|
|
||||||
interface: str,
|
|
||||||
method: str,
|
|
||||||
params: Optional[GLib.Variant],
|
|
||||||
reply_type: Optional[GLib.VariantType],
|
|
||||||
path_override: Optional[str] = None,
|
|
||||||
) -> Optional[GLib.Variant]:
|
|
||||||
try:
|
try:
|
||||||
return self.bus.call_sync(
|
return _get_bus().call_sync(
|
||||||
self.service_name,
|
self.service_name,
|
||||||
path_override or self.object_path,
|
path or self.object_path,
|
||||||
interface,
|
interface,
|
||||||
method,
|
method,
|
||||||
params,
|
params,
|
||||||
@@ -40,93 +34,141 @@ class GtkMenuClient:
|
|||||||
None,
|
None,
|
||||||
)
|
)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.debug(f"[GtkMenuClient] Call to {method} failed: {e}")
|
logger.debug(f"[GtkMenuClient] {method} failed: {e}")
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def get_layout(self, parent_id: int = 0) -> List[DBusMenuItem]:
|
def get_layout(self, parent_id: int = 0) -> List[DBusMenuItem]:
|
||||||
return self._fetch_menu(parent_id)
|
items = self._fetch_menu(parent_id)
|
||||||
|
self._cached_items = items
|
||||||
|
return items
|
||||||
|
|
||||||
def _fetch_menu(self, menu_id: int) -> List[DBusMenuItem]:
|
def _find_item(
|
||||||
params = GLib.Variant("(au)", ([menu_id],))
|
self, item_id: int, items: Optional[List[DBusMenuItem]] = None
|
||||||
res = self._call_method(
|
) -> Optional[DBusMenuItem]:
|
||||||
"org.gtk.Menus", "Start", params, GLib.VariantType("(a(uuaa{sv}))")
|
if items is None:
|
||||||
|
items = self._cached_items
|
||||||
|
for item in items:
|
||||||
|
if item.id == item_id:
|
||||||
|
return item
|
||||||
|
if item.children:
|
||||||
|
found = self._find_item(item_id, item.children)
|
||||||
|
if found:
|
||||||
|
return found
|
||||||
|
return None
|
||||||
|
|
||||||
|
def _fetch_menu(
|
||||||
|
self, menu_id: int, _depth: int = 0, _visited: Optional[set] = None
|
||||||
|
) -> List[DBusMenuItem]:
|
||||||
|
if _depth > 10:
|
||||||
|
return []
|
||||||
|
if _visited is None:
|
||||||
|
_visited = set()
|
||||||
|
if menu_id in _visited:
|
||||||
|
return []
|
||||||
|
_visited.add(menu_id)
|
||||||
|
res = self._call(
|
||||||
|
"org.gtk.Menus",
|
||||||
|
"Start",
|
||||||
|
GLib.Variant("(au)", ([menu_id],)),
|
||||||
|
GLib.VariantType("(a(uuaa{sv}))"),
|
||||||
)
|
)
|
||||||
if not res:
|
if not res:
|
||||||
return []
|
return []
|
||||||
|
|
||||||
try:
|
try:
|
||||||
# Unpack the response
|
|
||||||
# res is a tuple containing one element: the array
|
|
||||||
data = res.get_child_value(0).unpack()
|
data = res.get_child_value(0).unpack()
|
||||||
|
if not data:
|
||||||
if not data or len(data) == 0:
|
|
||||||
return []
|
return []
|
||||||
|
|
||||||
# data[0] is (subscription_id, menu_id, groups)
|
entry_map = {}
|
||||||
groups = data[0][2]
|
for entry in data:
|
||||||
|
gid, mid, sections = entry
|
||||||
|
entry_map[(gid, mid)] = sections
|
||||||
|
|
||||||
items = []
|
items: List[DBusMenuItem] = []
|
||||||
# each group is an array of dicts (items)
|
|
||||||
for group_idx, group in enumerate(groups):
|
|
||||||
# insert separator between groups
|
|
||||||
if group_idx > 0 and len(items) > 0 and len(group) > 0:
|
|
||||||
items.append(DBusMenuItem(id=-1, type="separator"))
|
|
||||||
|
|
||||||
for idx, props in enumerate(group):
|
|
||||||
item_id = hash(f"{menu_id}_{group_idx}_{idx}")
|
|
||||||
item = DBusMenuItem(id=item_id)
|
|
||||||
|
|
||||||
|
def resolve(sections, visited=None):
|
||||||
|
if visited is None:
|
||||||
|
visited = set()
|
||||||
|
for props in sections:
|
||||||
|
if not isinstance(props, dict):
|
||||||
|
continue
|
||||||
|
if ":section" in props:
|
||||||
|
ref = props[":section"]
|
||||||
|
if isinstance(ref, (list, tuple)) and len(ref) == 2:
|
||||||
|
key = (int(ref[0]), int(ref[1]))
|
||||||
|
if key not in visited:
|
||||||
|
visited.add(key)
|
||||||
|
child = entry_map.get(key)
|
||||||
|
if child is not None:
|
||||||
|
resolve(child, visited)
|
||||||
|
continue
|
||||||
|
if not props.get("label") and not any(
|
||||||
|
k in props for k in ("action", ":submenu", "submenu")
|
||||||
|
):
|
||||||
|
continue
|
||||||
|
item = DBusMenuItem(id=hash((menu_id, len(items))))
|
||||||
item.label = props.get("label", "").replace("_", "")
|
item.label = props.get("label", "").replace("_", "")
|
||||||
|
item.enabled = props.get("enabled", True)
|
||||||
if "submenu" in props:
|
item.visible = props.get("visible", True)
|
||||||
|
sub_ref = props.get(":submenu") or props.get("submenu")
|
||||||
|
if (
|
||||||
|
sub_ref
|
||||||
|
and isinstance(sub_ref, (list, tuple))
|
||||||
|
and len(sub_ref) == 2
|
||||||
|
):
|
||||||
item.has_submenu = True
|
item.has_submenu = True
|
||||||
submenu_id = props["submenu"]
|
item.children = self._fetch_menu(
|
||||||
item.children = self._fetch_menu(submenu_id)
|
int(sub_ref[0]), _depth + 1, _visited
|
||||||
|
)
|
||||||
if "action" in props:
|
if "action" in props:
|
||||||
item.action_name = props["action"]
|
item.action_name = props["action"]
|
||||||
if "target" in props:
|
if "target" in props:
|
||||||
# Variant target
|
try:
|
||||||
item.action_target = GLib.Variant.new_variant(
|
item.action_target = GLib.Variant.new_variant(
|
||||||
GLib.Variant("v", props["target"])
|
GLib.Variant("v", props["target"])
|
||||||
)
|
)
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
items.append(item)
|
items.append(item)
|
||||||
|
|
||||||
|
if data:
|
||||||
|
resolve(data[0][2])
|
||||||
|
|
||||||
return items
|
return items
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"[GtkMenuClient] Parse error: {e}")
|
logger.error(f"[GtkMenuClient] Parse error: {e}")
|
||||||
return []
|
return []
|
||||||
|
|
||||||
def about_to_show(self, item_id: int) -> bool:
|
def about_to_show(self, item_id: int) -> bool:
|
||||||
# org.gtk.Menus doesn't have AboutToShow
|
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def click_item(
|
def click_item(
|
||||||
self, item_id: int, action_name: str = "", action_target: GLib.Variant = None
|
self, item_id: int, action_name: str = "", action_target=None
|
||||||
) -> None:
|
) -> None:
|
||||||
|
if not action_name:
|
||||||
|
item = self._find_item(item_id)
|
||||||
|
if item and item.action_name:
|
||||||
|
action_name = item.action_name
|
||||||
|
action_target = item.action_target
|
||||||
if not action_name:
|
if not action_name:
|
||||||
return
|
return
|
||||||
|
# Strip the unity. prefix added by appmenu-gtk-module
|
||||||
|
if action_name.startswith("unity."):
|
||||||
|
action_name = action_name[6:]
|
||||||
try:
|
try:
|
||||||
# Action activation
|
params_arr = [action_target] if action_target is not None else []
|
||||||
# Signature: Activate (sava{sv})
|
# Try menu path first (Thunar), fall back to action path (LibreOffice)
|
||||||
# s: action_name
|
for act_path in (self.object_path, self._action_path):
|
||||||
# av: parameter (array of variants, empty if no target)
|
try:
|
||||||
# a{sv}: platform data
|
self._call(
|
||||||
|
"org.gtk.Actions",
|
||||||
params_arr = []
|
"Activate",
|
||||||
if action_target is not None:
|
GLib.Variant("(sava{sv})", (action_name, params_arr, {})),
|
||||||
params_arr = [action_target]
|
path=act_path,
|
||||||
|
)
|
||||||
params = GLib.Variant("(sava{sv})", (action_name, params_arr, {}))
|
return
|
||||||
|
except Exception:
|
||||||
self._call_method(
|
continue
|
||||||
"org.gtk.Actions",
|
|
||||||
"Activate",
|
|
||||||
params,
|
|
||||||
None,
|
|
||||||
path_override=self._action_group_path,
|
|
||||||
)
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"[GtkMenuClient] Failed to click item: {e}")
|
logger.error(f"[GtkMenuClient] click failed: {e}")
|
||||||
Reference in new issue
Block a user