(context 'MAIN:Dbus)
;; Declaring the FOOP object
-(FOOP path bus)
+(FOOP path name bus)
;; "The FOOP Constructor". Creates an object for a given path.
-(define (Dbus:Dbus PATH (BUS 'SYSTEM-BUS))
- (list (context) PATH BUS))
-
-;; Return the bus name
-(define (bus-name)
- (join (find-all "([^/]+)" (%path) $1 0) "."))
+(define (Dbus:Dbus PATH (NAME (replace "/" (1 PATH) ".")) (BUS 'SYSTEM-BUS))
+ (list (context) PATH NAME BUS))
;; Update the connection serial and return it
(define (connection++)
;; until a reply is given, but any such signals are stocked up as
;; pending for later processing on demand.
(define (invoke METHOD ARGS (FLAGS 0))
- (when (regex "((.+)\\.)?([^(]+)\\((.*)\\)$" METHOD 0)
- (let ((INTERFACE $2) (MEMBER $3) (SIGNATURE $4))
- ;;(println (list 'invoke (bus-name) INTERFACE MEMBER SIGNATURE))
+ (when (regex "((.+):)?((.+)\\.)?([^(]+)\\((.*)\\)$" METHOD 0)
+ (let ((PATH $2) (INTERFACE $4) (MEMBER $5) (SIGNATURE $6))
+ ;;(println (list 'invoke (%name) INTERFACE MEMBER SIGNATURE))
(if (message 'METHOD_CALL FLAGS
(list nil ; (if SELF-NAME (list 'SENDER SELF-NAME))
- (list 'DESTINATION (bus-name))
- (list 'PATH (%path))
+ (list 'DESTINATION (%name))
+ (list 'PATH (if (empty? PATH) (%path) PATH))
(if (empty? INTERFACE) nil
(list 'INTERFACE INTERFACE))
(list 'MEMBER MEMBER)
;; Set up the Dbus event loop as prompt-event handler
(prompt-event Dbus:main-loop)
+(context 'DbusInterface)
+(FOOP name members)
+
+;; FOOP constructor; remember the interface name
+(define (DbusInterface:DbusInterface NAME (MEMBERS '()))
+ (list (context) NAME MEMBERS))
+
+;; Utility method to expand a member with interface prefix
+(define (m MEMBER)
+ (string (%name) "." MEMBER))
+
+;; Install this interface into the context of the caller
+(define (use)
+ (let ((IF (when (regex "([^.]+)$" (%name) 0) $1))
+ (CC (prefix (first (or (1 (history)) '(MAIN))))))
+ (letex ((S (sym $1 CC)) (V (self)))
+ (begin (context CC) (constant 'S 'V)))))
+
+;; Declare additional members for this interface
+(define (has)
+ (dolist (MEMBER (args))
+ (unless (member MEMBER (%members))
+ (!members (push MEMBER (%members) -1)))))
+
;;######################################################################
;;
-;; Some tidbits
-
-;;org.freedesktop.DBus.Peer.Ping ()
-;;org.freedesktop.DBus.Peer.GetMachineId (out STRING machine_uuid)
-;;org.freedesktop.DBus.Introspectable.Introspect (out STRING xml_data)
-;;org.freedesktop.DBus.Properties.Get (
-;; in STRING interface_name,
-;; in STRING property_name,
-;; out VARIANT value);
-;;org.freedesktop.DBus.Properties.Set (
-;; in STRING interface_name,
-;; in STRING property_name,
-;; in VARIANT value);
-;;org.freedesktop.DBus.Properties.GetAll (
-;; in STRING interface_name,
-;; out ARRAY of DICT_ENTRY<STRING,VARIANT> props);
-;;org.freedesktop.DBus.Properties.PropertiesChanged (
-;; STRING interface_name,
-;; ARRAY of DICT_ENTRY<STRING,VARIANT> changed_properties,
-;; ARRAY<STRING> invalidated_properties);
-;;org.freedesktop.DBus.ObjectManager.GetManagedObjects (
-;; out ARRAY of
-;; DICT_ENTRY<OBJPATH,ARRAY of
-;; DICT_ENTRY<STRING,ARRAY of
-;; DICT_ENTRY<STRING,VARIANT>>>
-;; objpath_interfaces_and_properties);
-;;;;
-;;org.freedesktop.DBus.Hello():s
-;;org.freedesktop.DBus.RequestName(su):u
-;;org.freedesktop.DBus.ReleaseName(s):u
-;;org.freedesktop.DBus.ListQueuedOwners (s):as
-;;org.freedesktop.DBus.ListNames():as
-;;org.freedesktop.DBus.ListActivatableNames():as
-;;org.freedesktop.DBus.NameHasOwner(s):b
-;;org.freedesktop.DBus.NameOwnerChanged(sss) -- signal
-;;org.freedesktop.DBus.NameLost(s) -- signal
-;;org.freedesktop.DBus.NameAcquired(s) -- signal
-;;org.freedesktop.DBus.ActivatableServicesChanged() -- signal
-;;org.freedesktop.DBus.StartServiceByName(s,u):u
-;;org.freedesktop.DBus.UpdateActivationEnvironment(a(ss)):?
-;;org.freedesktop.DBus.GetNameOwner(s):s
-;;org.freedesktop.DBus.GetConnectionUnixUser(s):u
-;;org.freedesktop.DBus.GetConnectionUnixProcessID(s):u
-;;org.freedesktop.DBus.GetConnectionCredentials(s):a(sv)
-;;org.freedesktop.DBus.GetAdtAuditSessionData(s):ay
-;;org.freedesktop.DBus.GetConnectionSELinuxSecurityContext(s):ay
-;;org.freedesktop.DBus.AddMatch(s):? (org.freedesktop.DBus.Error.OOM)
-;;org.freedesktop.DBus.RemoveMatch(s):?
-;;org.freedesktop.DBus.GetId():s
-;;org.freedesktop.DBus.Monitoring.BecomeMonitor(asu):?
-
-;;org.freedesktop.DBus.AddMatch(s)
-;eg
+;; Standard interfaces
+
+(context MAIN)
+
+(:use (DbusInterface "org.freedesktop.DBus.Peer"
+ '( "Ping()"
+ "GetMachineId()" ; s
+ )))
+
+(:use (DbusInterface "org.freedesktop.DBus.ObjectManager"
+ '( "GetManagedObjects()" ; a(oa(sa(sv)))
+ )))
+
+(:use (DbusInterface "org.freedesktop.DBus.Introspectable"
+ ' Introspectable "Introspect()" ; s (xml data)
+ ))
+; https://dbus.freedesktop.org/doc/dbus-specification.html#introspection-format
+
+(:use (DbusInterface "org.freedesktop.DBus.Properties"
+ '( "Get(ss)" ; v
+ "Set(ssv)" ; --
+ "GetAll(s)" ; a(sv)
+ "PropertiesChanged(sa(sv)as)" ; signal ?
+ )))
+
+(:use (DbusInterface "org.freedesktop.DBus"
+ '( "Hello()" ; s
+ "RequestName(su)" ; u
+ "ReleaseName(s)" ; u
+ "ListQueuedOwners (s)" ; as
+ "ListNames()" ; as
+ "ListActivatableNames()" ; as
+ "NameHasOwner(s)" ; b
+ "NameOwnerChanged(sss)" ; -- signal
+ "NameLost(s)" ; -- signal
+ "NameAcquired(s)" ; -- signal
+ "ActivatableServicesChanged()" ; -- signal
+ "StartServiceByName(s,u)" ; u
+ "UpdateActivationEnvironment(a(ss))" ; ?
+ "GetNameOwner(s)" ; s
+ "GetConnectionUnixUser(s)" ; u
+ "GetConnectionUnixProcessID(s)" ; u
+ "GetConnectionCredentials(s)" ; a(sv)
+ "GetAdtAuditSessionData(s)" ; ay
+ "GetConnectionSELinuxSecurityContext(s)" ; ay
+ "AddMatch(s)" ;
+ "RemoveMatch(s)" ; ?
+ "GetId()" ; s
+ "Monitoring.BecomeMonitor(asu)" ; ?
+ )))
+
+;eg AddMatch argument:
;"type='signal',sender='org.example.App2',path_namespace='/org/example/App2'"
-;;org.freedesktop.DBus.StartServiceByName(?)
-;;org.freedesktop.DBus.NameOwnerChanged(?)
-
"lsp-dbus.lsp"
projects / rrq / lsp-utils.git / blobdiff