diff options
Diffstat (limited to 'doc/misc')
| -rw-r--r-- | doc/misc/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/misc/dbus.texi | 32 |
2 files changed, 23 insertions, 13 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 67ca3866e7d..69b54a0bea5 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2007-12-22 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * dbus.texi (Type Conversion): Correct input parameters mapping. | ||
| 4 | |||
| 1 | 2007-12-21 Michael Albinus <michael.albinus@gmx.de> | 5 | 2007-12-21 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 6 | ||
| 3 | * dbus.texi (Type Conversion): Extend for D-Bus compound types. | 7 | * dbus.texi (Type Conversion): Extend for D-Bus compound types. |
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi index 7f4d0f7243b..352e57f0faa 100644 --- a/doc/misc/dbus.texi +++ b/doc/misc/dbus.texi | |||
| @@ -268,9 +268,10 @@ input parameter. | |||
| 268 | 268 | ||
| 269 | If it is necessary to use another D-Bus type, a corresponding type | 269 | If it is necessary to use another D-Bus type, a corresponding type |
| 270 | symbol can be preceeded to the corresponding Lisp object. Basic D-Bus | 270 | symbol can be preceeded to the corresponding Lisp object. Basic D-Bus |
| 271 | types are represented by the type symbols `:byte', `:boolean', | 271 | types are represented by the type symbols @code{:byte}, |
| 272 | `:int16', `:uint16', `:int32', `:uint32', `:int64', `:uint64', | 272 | @code{:boolean}, @code{:int16}, @code{:uint16}, @code{:int32}, |
| 273 | `:double', `:string', `:object-path' and `:signature'. | 273 | @code{:uint32}, @code{:int64}, @code{:uint64}, @code{:double}, |
| 274 | @code{:string}, @code{:object-path} and @code{:signature}. | ||
| 274 | 275 | ||
| 275 | @noindent | 276 | @noindent |
| 276 | Example: | 277 | Example: |
| @@ -292,10 +293,10 @@ but different to | |||
| 292 | @end lisp | 293 | @end lisp |
| 293 | 294 | ||
| 294 | A D-Bus compound type is always represented as list. The car of this | 295 | A D-Bus compound type is always represented as list. The car of this |
| 295 | list can be the type symbol `:array', `:variant', `:struct' or | 296 | list can be the type symbol @code{:array}, @code{:variant}, |
| 296 | `:dict-entry', which would result in a corresponding D-Bus container. | 297 | @code{:struct} or @code{:dict-entry}, which would result in a |
| 297 | `:array' is optional, because this is the default compoud type for a | 298 | corresponding D-Bus container. @code{:array} is optional, because |
| 298 | list. | 299 | this is the default compoud type for a list. |
| 299 | 300 | ||
| 300 | The objects being elements of the list are checked according to the | 301 | The objects being elements of the list are checked according to the |
| 301 | D-Bus compound type rules. | 302 | D-Bus compound type rules. |
| @@ -332,13 +333,13 @@ objects. | |||
| 332 | @item D-Bus type @tab @tab Lisp type | 333 | @item D-Bus type @tab @tab Lisp type |
| 333 | @item | 334 | @item |
| 334 | @item DBUS_TYPE_BOOLEAN @tab @expansion{} @tab @code{t} or @code{nil} | 335 | @item DBUS_TYPE_BOOLEAN @tab @expansion{} @tab @code{t} or @code{nil} |
| 335 | @item DBUS_TYPE_BYTE @tab @expansion{} @tab | 336 | @item DBUS_TYPE_BYTE @tab @expansion{} @tab number |
| 336 | @item DBUS_TYPE_UINT16 @tab @expansion{} @tab number | 337 | @item DBUS_TYPE_UINT16 @tab @expansion{} @tab number |
| 337 | @item DBUS_TYPE_INT32 @tab @expansion{} @tab number | 338 | @item DBUS_TYPE_INT16 @tab @expansion{} @tab number |
| 338 | @item DBUS_TYPE_UINT32 @tab @expansion{} @tab number | 339 | @item DBUS_TYPE_UINT32 @tab @expansion{} @tab number or float |
| 339 | @item DBUS_TYPE_INT32 @tab @expansion{} @tab number | 340 | @item DBUS_TYPE_INT32 @tab @expansion{} @tab number or float |
| 340 | @item DBUS_TYPE_UINT64 @tab @expansion{} @tab number | 341 | @item DBUS_TYPE_UINT64 @tab @expansion{} @tab number or float |
| 341 | @item DBUS_TYPE_INT64 @tab @expansion{} @tab number | 342 | @item DBUS_TYPE_INT64 @tab @expansion{} @tab number or float |
| 342 | @item DBUS_TYPE_DOUBLE @tab @expansion{} @tab float | 343 | @item DBUS_TYPE_DOUBLE @tab @expansion{} @tab float |
| 343 | @item DBUS_TYPE_STRING @tab @expansion{} @tab string | 344 | @item DBUS_TYPE_STRING @tab @expansion{} @tab string |
| 344 | @item DBUS_TYPE_OBJECT_PATH @tab @expansion{} @tab string | 345 | @item DBUS_TYPE_OBJECT_PATH @tab @expansion{} @tab string |
| @@ -350,6 +351,11 @@ objects. | |||
| 350 | @end multitable | 351 | @end multitable |
| 351 | @end example | 352 | @end example |
| 352 | 353 | ||
| 354 | A float object in case of @code{DBUS_TYPE_UINT32}, | ||
| 355 | @code{DBUS_TYPE_INT32}, @code{DBUS_TYPE_UINT64} and | ||
| 356 | @code{DBUS_TYPE_INT6432} is returned, when the C value exceeds the | ||
| 357 | Emacs number size range. | ||
| 358 | |||
| 353 | The resulting list of the last 4 D-Bus compound types contains as | 359 | The resulting list of the last 4 D-Bus compound types contains as |
| 354 | elements the elements of the D-Bus container, mapped according to the | 360 | elements the elements of the D-Bus container, mapped according to the |
| 355 | same rules. | 361 | same rules. |