mirror/vincentbernat.i3wm-configuration
1
0
Fork 0
mirror of https://github.com/vincentbernat/i3wm-configuration.git synced 2025-06-30 13:24:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

i3-companion: specify bus to listen to for DBus events

Browse source
This commit is contained in:
Vincent Bernat 2021-07-14 16:57:23 +02:00
parent a44cd7dc54
commit de9c33eaad
1 changed files with 23 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

42
bin/i3-companion
View file

@ -72,7 +72,7 @@ logger = logging.getLogger("i3-companion")
# Events for @on decorator # Events for @on decorator
DBusSignal = collections.namedtuple( DBusSignal = collections.namedtuple(
"DBusSignal", ["path", "interface", "member", "signature"] "DBusSignal", ["system", "path", "interface", "member", "signature"]
) )
StartEvent = object() StartEvent = object()
I3Event = i3ipc.Event I3Event = i3ipc.Event
@ -521,6 +521,7 @@ async def output_update(i3, event):
@on( @on(
DBusSignal( DBusSignal(
system=True,
path="/org/bluez", path="/org/bluez",
interface="org.freedesktop.DBus.Properties", interface="org.freedesktop.DBus.Properties",
member="PropertiesChanged", member="PropertiesChanged",
@ -551,6 +552,7 @@ async def bluetooth_notifications(
@on( @on(
DBusSignal( DBusSignal(
system=True,
path="/", path="/",
interface="org.freedesktop.NetworkManager.Connection.Active", interface="org.freedesktop.NetworkManager.Connection.Active",
member="StateChanged", member="StateChanged",
@ -596,12 +598,14 @@ async def network_manager_notifications(i3, event, path, state, reason):
@on( @on(
StartEvent, StartEvent,
DBusSignal( DBusSignal(
system=True,
path="/", path="/",
interface="org.freedesktop.NetworkManager.Connection.Active", interface="org.freedesktop.NetworkManager.Connection.Active",
member="StateChanged", member="StateChanged",
signature="uu", signature="uu",
), ),
DBusSignal( DBusSignal(
system=True,
path="/", path="/",
interface="org.freedesktop.NetworkManager.AccessPoint", interface="org.freedesktop.NetworkManager.AccessPoint",
member="PropertiesChanged", member="PropertiesChanged",
@ -723,27 +727,27 @@ async def main(options):
for fn, events in on.functions.items(): for fn, events in on.functions.items():
for event in events: for event in events:
if isinstance(event, DBusSignal): if isinstance(event, DBusSignal):
for bus in {i3.session_bus, i3.system_bus}: bus = i3.system_bus if event.system else i3.session_bus
def wrapping(fn, event): def wrapping(fn, event):
@ravel.signal( @ravel.signal(
name=event.member,
in_signature=event.signature,
path_keyword="path",
args_keyword="args",
)
async def wrapped(path, args):
return await fn(i3, event, path, *args)
return wrapped
bus.listen_signal(
path=event.path,
fallback=True,
interface=event.interface,
name=event.member, name=event.member,
func=wrapping(fn, event), in_signature=event.signature,
path_keyword="path",
args_keyword="args",
) )
async def wrapped(path, args):
return await fn(i3, event, path, *args)
return wrapped
bus.listen_signal(
path=event.path,
fallback=True,
interface=event.interface,
name=event.member,
func=wrapping(fn, event),
)
# Run events that should run on start # Run events that should run on start
for fn, events in on.functions.items(): for fn, events in on.functions.items():