Mercurial > emacs
annotate src/dbusbind.c @ 111679:33ed3cf8260b
Initial support for unified DVCS pull and merge.
* lisp/vc/vc-bzr.el (vc-bzr-admin-branchconf, vc-bzr-history): New vars.
(vc-bzr--branch-conf, vc-bzr-async-command, vc-bzr-pull)
(vc-bzr-merge-branch): New functions, implementing merge-branch
and pull operations.
* lisp/vc/vc.el (vc-merge): Use vc-BACKEND-merge-branch if available.
Accept optional prefix arg meaning to prompt for a command.
(vc-update): Use vc-BACKEND-pull if available. Accept optional
prefix arg meaning to prompt for a command.
(vc-pull): Alias for vc-update.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Mon, 22 Nov 2010 20:15:08 -0500 |
parents | 143e567b63bc |
children | f68ebb34e243 |
rev | line source |
---|---|
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1 /* Elisp bindings for D-Bus. |
106815 | 2 Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
3 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
4 This file is part of GNU Emacs. |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
5 |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94057
diff
changeset
|
6 GNU Emacs is free software: you can redistribute it and/or modify |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
7 it under the terms of the GNU General Public License as published by |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94057
diff
changeset
|
8 the Free Software Foundation, either version 3 of the License, or |
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94057
diff
changeset
|
9 (at your option) any later version. |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
10 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
11 GNU Emacs is distributed in the hope that it will be useful, |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
12 but WITHOUT ANY WARRANTY; without even the implied warranty of |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
14 GNU General Public License for more details. |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
15 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
16 You should have received a copy of the GNU General Public License |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94057
diff
changeset
|
17 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
18 |
108861
ad09f2bfce51
Fix config.h includes.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106815
diff
changeset
|
19 #include <config.h> |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
20 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
21 #ifdef HAVE_DBUS |
87307
710ac69daf1f
* dbusbind.c (top): Include <stdio.h>.
Michael Albinus <michael.albinus@gmx.de>
parents:
87280
diff
changeset
|
22 #include <stdio.h> |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
23 #include <dbus/dbus.h> |
105669
68dd71358159
* alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105575
diff
changeset
|
24 #include <setjmp.h> |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
25 #include "lisp.h" |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
26 #include "frame.h" |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
27 #include "termhooks.h" |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
28 #include "keyboard.h" |
110592
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
29 #include "process.h" |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
30 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
31 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
32 /* Subroutines. */ |
104339
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
33 Lisp_Object Qdbus_init_bus; |
109961
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
34 Lisp_Object Qdbus_close_bus; |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
35 Lisp_Object Qdbus_get_unique_name; |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
36 Lisp_Object Qdbus_call_method; |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
37 Lisp_Object Qdbus_call_method_asynchronously; |
87887
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
38 Lisp_Object Qdbus_method_return_internal; |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
39 Lisp_Object Qdbus_method_error_internal; |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
40 Lisp_Object Qdbus_send_signal; |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
41 Lisp_Object Qdbus_register_signal; |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
42 Lisp_Object Qdbus_register_method; |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
43 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
44 /* D-Bus error symbol. */ |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
45 Lisp_Object Qdbus_error; |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
46 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
47 /* Lisp symbols of the system and session buses. */ |
87051
1da959e791de
* dbusbind.c (QCdbus_system_bus, QCdbus_session_bus): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
86940
diff
changeset
|
48 Lisp_Object QCdbus_system_bus, QCdbus_session_bus; |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
49 |
93420
629d4147200e
* dbusbind.c (QCdbus_timeout): New D-Bus internal symbol.
Michael Albinus <michael.albinus@gmx.de>
parents:
93156
diff
changeset
|
50 /* Lisp symbol for method call timeout. */ |
629d4147200e
* dbusbind.c (QCdbus_timeout): New D-Bus internal symbol.
Michael Albinus <michael.albinus@gmx.de>
parents:
93156
diff
changeset
|
51 Lisp_Object QCdbus_timeout; |
629d4147200e
* dbusbind.c (QCdbus_timeout): New D-Bus internal symbol.
Michael Albinus <michael.albinus@gmx.de>
parents:
93156
diff
changeset
|
52 |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
53 /* Lisp symbols of D-Bus types. */ |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
54 Lisp_Object QCdbus_type_byte, QCdbus_type_boolean; |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
55 Lisp_Object QCdbus_type_int16, QCdbus_type_uint16; |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
56 Lisp_Object QCdbus_type_int32, QCdbus_type_uint32; |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
57 Lisp_Object QCdbus_type_int64, QCdbus_type_uint64; |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
58 Lisp_Object QCdbus_type_double, QCdbus_type_string; |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
59 Lisp_Object QCdbus_type_object_path, QCdbus_type_signature; |
111472
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
60 #ifdef DBUS_TYPE_UNIX_FD |
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
61 Lisp_Object QCdbus_type_unix_fd; |
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
62 #endif |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
63 Lisp_Object QCdbus_type_array, QCdbus_type_variant; |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
64 Lisp_Object QCdbus_type_struct, QCdbus_type_dict_entry; |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
65 |
109961
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
66 /* Registered buses. */ |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
67 Lisp_Object Vdbus_registered_buses; |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
68 |
87051
1da959e791de
* dbusbind.c (QCdbus_system_bus, QCdbus_session_bus): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
86940
diff
changeset
|
69 /* Hash table which keeps function definitions. */ |
105989
3ff20d1c63e0
* dbusbind.c (Vdbus_registered_objects_table): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
105877
diff
changeset
|
70 Lisp_Object Vdbus_registered_objects_table; |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
71 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
72 /* Whether to debug D-Bus. */ |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
73 Lisp_Object Vdbus_debug; |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
74 |
99098
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
75 /* Whether we are reading a D-Bus event. */ |
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
76 int xd_in_read_queued_messages = 0; |
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
77 |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
78 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
79 /* We use "xd_" and "XD_" as prefix for all internal symbols, because |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
80 we don't want to poison other namespaces with "dbus_". */ |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
81 |
99098
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
82 /* Raise a signal. If we are reading events, we cannot signal; we |
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
83 throw to xd_read_queued_messages then. */ |
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
84 #define XD_SIGNAL1(arg) \ |
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
85 do { \ |
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
86 if (xd_in_read_queued_messages) \ |
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
87 Fthrow (Qdbus_error, Qnil); \ |
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
88 else \ |
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
89 xsignal1 (Qdbus_error, arg); \ |
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
90 } while (0) |
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
91 |
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
92 #define XD_SIGNAL2(arg1, arg2) \ |
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
93 do { \ |
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
94 if (xd_in_read_queued_messages) \ |
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
95 Fthrow (Qdbus_error, Qnil); \ |
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
96 else \ |
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
97 xsignal2 (Qdbus_error, arg1, arg2); \ |
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
98 } while (0) |
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
99 |
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
100 #define XD_SIGNAL3(arg1, arg2, arg3) \ |
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
101 do { \ |
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
102 if (xd_in_read_queued_messages) \ |
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
103 Fthrow (Qdbus_error, Qnil); \ |
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
104 else \ |
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
105 xsignal3 (Qdbus_error, arg1, arg2, arg3); \ |
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
106 } while (0) |
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
107 |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
108 /* Raise a Lisp error from a D-Bus ERROR. */ |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
109 #define XD_ERROR(error) \ |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
110 do { \ |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
111 char s[1024]; \ |
97797
14fccbb34a16
* dbusbind.c (XD_ERROR, XD_DEBUG_MESSAGE): Use strncpy and
Michael Albinus <michael.albinus@gmx.de>
parents:
97211
diff
changeset
|
112 strncpy (s, error.message, 1023); \ |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
113 dbus_error_free (&error); \ |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
114 /* Remove the trailing newline. */ \ |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
115 if (strchr (s, '\n') != NULL) \ |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
116 s[strlen (s) - 1] = '\0'; \ |
99098
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
117 XD_SIGNAL1 (build_string (s)); \ |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
118 } while (0) |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
119 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
120 /* Macros for debugging. In order to enable them, build with |
109961
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
121 "MYCPPFLAGS='-DDBUS_DEBUG -Wall' make". */ |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
122 #ifdef DBUS_DEBUG |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
123 #define XD_DEBUG_MESSAGE(...) \ |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
124 do { \ |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
125 char s[1024]; \ |
97797
14fccbb34a16
* dbusbind.c (XD_ERROR, XD_DEBUG_MESSAGE): Use strncpy and
Michael Albinus <michael.albinus@gmx.de>
parents:
97211
diff
changeset
|
126 snprintf (s, 1023, __VA_ARGS__); \ |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
127 printf ("%s: %s\n", __func__, s); \ |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
128 message ("%s: %s", __func__, s); \ |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
129 } while (0) |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
130 #define XD_DEBUG_VALID_LISP_OBJECT_P(object) \ |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
131 do { \ |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
132 if (!valid_lisp_object_p (object)) \ |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
133 { \ |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
134 XD_DEBUG_MESSAGE ("%d Assertion failure", __LINE__); \ |
99098
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
135 XD_SIGNAL1 (build_string ("Assertion failure")); \ |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
136 } \ |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
137 } while (0) |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
138 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
139 #else /* !DBUS_DEBUG */ |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
140 #define XD_DEBUG_MESSAGE(...) \ |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
141 do { \ |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
142 if (!NILP (Vdbus_debug)) \ |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
143 { \ |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
144 char s[1024]; \ |
97797
14fccbb34a16
* dbusbind.c (XD_ERROR, XD_DEBUG_MESSAGE): Use strncpy and
Michael Albinus <michael.albinus@gmx.de>
parents:
97211
diff
changeset
|
145 snprintf (s, 1023, __VA_ARGS__); \ |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
146 message ("%s: %s", __func__, s); \ |
87493
42bd83957313
*** empty log message ***
Michael Albinus <michael.albinus@gmx.de>
parents:
87490
diff
changeset
|
147 } \ |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
148 } while (0) |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
149 #define XD_DEBUG_VALID_LISP_OBJECT_P(object) |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
150 #endif |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
151 |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
152 /* Check whether TYPE is a basic DBusType. */ |
111472
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
153 #ifdef DBUS_TYPE_UNIX_FD |
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
154 #define XD_BASIC_DBUS_TYPE(type) \ |
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
155 ((type == DBUS_TYPE_BYTE) \ |
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
156 || (type == DBUS_TYPE_BOOLEAN) \ |
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
157 || (type == DBUS_TYPE_INT16) \ |
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
158 || (type == DBUS_TYPE_UINT16) \ |
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
159 || (type == DBUS_TYPE_INT32) \ |
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
160 || (type == DBUS_TYPE_UINT32) \ |
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
161 || (type == DBUS_TYPE_INT64) \ |
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
162 || (type == DBUS_TYPE_UINT64) \ |
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
163 || (type == DBUS_TYPE_DOUBLE) \ |
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
164 || (type == DBUS_TYPE_STRING) \ |
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
165 || (type == DBUS_TYPE_OBJECT_PATH) \ |
111474
143e567b63bc
Fix syntax error in previous commit.
Michael Albinus <michael.albinus@gmx.de>
parents:
111472
diff
changeset
|
166 || (type == DBUS_TYPE_SIGNATURE) \ |
111472
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
167 || (type == DBUS_TYPE_UNIX_FD)) |
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
168 #else |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
169 #define XD_BASIC_DBUS_TYPE(type) \ |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
170 ((type == DBUS_TYPE_BYTE) \ |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
171 || (type == DBUS_TYPE_BOOLEAN) \ |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
172 || (type == DBUS_TYPE_INT16) \ |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
173 || (type == DBUS_TYPE_UINT16) \ |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
174 || (type == DBUS_TYPE_INT32) \ |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
175 || (type == DBUS_TYPE_UINT32) \ |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
176 || (type == DBUS_TYPE_INT64) \ |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
177 || (type == DBUS_TYPE_UINT64) \ |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
178 || (type == DBUS_TYPE_DOUBLE) \ |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
179 || (type == DBUS_TYPE_STRING) \ |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
180 || (type == DBUS_TYPE_OBJECT_PATH) \ |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
181 || (type == DBUS_TYPE_SIGNATURE)) |
111472
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
182 #endif |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
183 |
103612
25fc47c9b012
* dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
Michael Albinus <michael.albinus@gmx.de>
parents:
101276
diff
changeset
|
184 /* This was a macro. On Solaris 2.11 it was said to compile for |
25fc47c9b012
* dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
Michael Albinus <michael.albinus@gmx.de>
parents:
101276
diff
changeset
|
185 hours, when optimzation is enabled. So we have transferred it into |
25fc47c9b012
* dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
Michael Albinus <michael.albinus@gmx.de>
parents:
101276
diff
changeset
|
186 a function. */ |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
187 /* Determine the DBusType of a given Lisp symbol. OBJECT must be one |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
188 of the predefined D-Bus type symbols. */ |
103612
25fc47c9b012
* dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
Michael Albinus <michael.albinus@gmx.de>
parents:
101276
diff
changeset
|
189 static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108946
diff
changeset
|
190 xd_symbol_to_dbus_type (Lisp_Object object) |
103612
25fc47c9b012
* dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
Michael Albinus <michael.albinus@gmx.de>
parents:
101276
diff
changeset
|
191 { |
25fc47c9b012
* dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
Michael Albinus <michael.albinus@gmx.de>
parents:
101276
diff
changeset
|
192 return |
25fc47c9b012
* dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
Michael Albinus <michael.albinus@gmx.de>
parents:
101276
diff
changeset
|
193 ((EQ (object, QCdbus_type_byte)) ? DBUS_TYPE_BYTE |
25fc47c9b012
* dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
Michael Albinus <michael.albinus@gmx.de>
parents:
101276
diff
changeset
|
194 : (EQ (object, QCdbus_type_boolean)) ? DBUS_TYPE_BOOLEAN |
25fc47c9b012
* dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
Michael Albinus <michael.albinus@gmx.de>
parents:
101276
diff
changeset
|
195 : (EQ (object, QCdbus_type_int16)) ? DBUS_TYPE_INT16 |
25fc47c9b012
* dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
Michael Albinus <michael.albinus@gmx.de>
parents:
101276
diff
changeset
|
196 : (EQ (object, QCdbus_type_uint16)) ? DBUS_TYPE_UINT16 |
25fc47c9b012
* dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
Michael Albinus <michael.albinus@gmx.de>
parents:
101276
diff
changeset
|
197 : (EQ (object, QCdbus_type_int32)) ? DBUS_TYPE_INT32 |
25fc47c9b012
* dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
Michael Albinus <michael.albinus@gmx.de>
parents:
101276
diff
changeset
|
198 : (EQ (object, QCdbus_type_uint32)) ? DBUS_TYPE_UINT32 |
25fc47c9b012
* dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
Michael Albinus <michael.albinus@gmx.de>
parents:
101276
diff
changeset
|
199 : (EQ (object, QCdbus_type_int64)) ? DBUS_TYPE_INT64 |
25fc47c9b012
* dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
Michael Albinus <michael.albinus@gmx.de>
parents:
101276
diff
changeset
|
200 : (EQ (object, QCdbus_type_uint64)) ? DBUS_TYPE_UINT64 |
25fc47c9b012
* dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
Michael Albinus <michael.albinus@gmx.de>
parents:
101276
diff
changeset
|
201 : (EQ (object, QCdbus_type_double)) ? DBUS_TYPE_DOUBLE |
25fc47c9b012
* dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
Michael Albinus <michael.albinus@gmx.de>
parents:
101276
diff
changeset
|
202 : (EQ (object, QCdbus_type_string)) ? DBUS_TYPE_STRING |
25fc47c9b012
* dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
Michael Albinus <michael.albinus@gmx.de>
parents:
101276
diff
changeset
|
203 : (EQ (object, QCdbus_type_object_path)) ? DBUS_TYPE_OBJECT_PATH |
25fc47c9b012
* dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
Michael Albinus <michael.albinus@gmx.de>
parents:
101276
diff
changeset
|
204 : (EQ (object, QCdbus_type_signature)) ? DBUS_TYPE_SIGNATURE |
111472
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
205 #ifdef DBUS_TYPE_UNIX_FD |
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
206 : (EQ (object, QCdbus_type_unix_fd)) ? DBUS_TYPE_UNIX_FD |
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
207 #endif |
103612
25fc47c9b012
* dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
Michael Albinus <michael.albinus@gmx.de>
parents:
101276
diff
changeset
|
208 : (EQ (object, QCdbus_type_array)) ? DBUS_TYPE_ARRAY |
25fc47c9b012
* dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
Michael Albinus <michael.albinus@gmx.de>
parents:
101276
diff
changeset
|
209 : (EQ (object, QCdbus_type_variant)) ? DBUS_TYPE_VARIANT |
25fc47c9b012
* dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
Michael Albinus <michael.albinus@gmx.de>
parents:
101276
diff
changeset
|
210 : (EQ (object, QCdbus_type_struct)) ? DBUS_TYPE_STRUCT |
25fc47c9b012
* dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
Michael Albinus <michael.albinus@gmx.de>
parents:
101276
diff
changeset
|
211 : (EQ (object, QCdbus_type_dict_entry)) ? DBUS_TYPE_DICT_ENTRY |
25fc47c9b012
* dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
Michael Albinus <michael.albinus@gmx.de>
parents:
101276
diff
changeset
|
212 : DBUS_TYPE_INVALID); |
25fc47c9b012
* dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
Michael Albinus <michael.albinus@gmx.de>
parents:
101276
diff
changeset
|
213 } |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
214 |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
215 /* Check whether a Lisp symbol is a predefined D-Bus type symbol. */ |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
216 #define XD_DBUS_TYPE_P(object) \ |
103612
25fc47c9b012
* dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
Michael Albinus <michael.albinus@gmx.de>
parents:
101276
diff
changeset
|
217 (SYMBOLP (object) && ((xd_symbol_to_dbus_type (object) != DBUS_TYPE_INVALID))) |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
218 |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
219 /* Determine the DBusType of a given Lisp OBJECT. It is used to |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
220 convert Lisp objects, being arguments of `dbus-call-method' or |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
221 `dbus-send-signal', into corresponding C values appended as |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
222 arguments to a D-Bus message. */ |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
223 #define XD_OBJECT_TO_DBUS_TYPE(object) \ |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
224 ((EQ (object, Qt) || EQ (object, Qnil)) ? DBUS_TYPE_BOOLEAN \ |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
225 : (NATNUMP (object)) ? DBUS_TYPE_UINT32 \ |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
226 : (INTEGERP (object)) ? DBUS_TYPE_INT32 \ |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
227 : (FLOATP (object)) ? DBUS_TYPE_DOUBLE \ |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
228 : (STRINGP (object)) ? DBUS_TYPE_STRING \ |
103612
25fc47c9b012
* dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
Michael Albinus <michael.albinus@gmx.de>
parents:
101276
diff
changeset
|
229 : (XD_DBUS_TYPE_P (object)) ? xd_symbol_to_dbus_type (object) \ |
98901
f98d4eaeba07
* dbusbind.c (XD_OBJECT_TO_DBUS_TYPE): Handle simple type symbols
Michael Albinus <michael.albinus@gmx.de>
parents:
98783
diff
changeset
|
230 : (CONSP (object)) \ |
f98d4eaeba07
* dbusbind.c (XD_OBJECT_TO_DBUS_TYPE): Handle simple type symbols
Michael Albinus <michael.albinus@gmx.de>
parents:
98783
diff
changeset
|
231 ? ((XD_DBUS_TYPE_P (CAR_SAFE (object))) \ |
103612
25fc47c9b012
* dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
Michael Albinus <michael.albinus@gmx.de>
parents:
101276
diff
changeset
|
232 ? ((XD_BASIC_DBUS_TYPE (xd_symbol_to_dbus_type (CAR_SAFE (object)))) \ |
98901
f98d4eaeba07
* dbusbind.c (XD_OBJECT_TO_DBUS_TYPE): Handle simple type symbols
Michael Albinus <michael.albinus@gmx.de>
parents:
98783
diff
changeset
|
233 ? DBUS_TYPE_ARRAY \ |
103612
25fc47c9b012
* dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
Michael Albinus <michael.albinus@gmx.de>
parents:
101276
diff
changeset
|
234 : xd_symbol_to_dbus_type (CAR_SAFE (object))) \ |
98901
f98d4eaeba07
* dbusbind.c (XD_OBJECT_TO_DBUS_TYPE): Handle simple type symbols
Michael Albinus <michael.albinus@gmx.de>
parents:
98783
diff
changeset
|
235 : DBUS_TYPE_ARRAY) \ |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
236 : DBUS_TYPE_INVALID) |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
237 |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
238 /* Return a list pointer which does not have a Lisp symbol as car. */ |
93156
3ef12fa772f2
* dbusbind.c (xd_read_message): Removed extra copying of message
Michael Albinus <michael.albinus@gmx.de>
parents:
87972
diff
changeset
|
239 #define XD_NEXT_VALUE(object) \ |
87539
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
240 ((XD_DBUS_TYPE_P (CAR_SAFE (object))) ? CDR_SAFE (object) : object) |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
241 |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
242 /* Compute SIGNATURE of OBJECT. It must have a form that it can be |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
243 used in dbus_message_iter_open_container. DTYPE is the DBusType |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
244 the object is related to. It is passed as argument, because it |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
245 cannot be detected in basic type objects, when they are preceded by |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
246 a type symbol. PARENT_TYPE is the DBusType of a container this |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
247 signature is embedded, or DBUS_TYPE_INVALID. It is needed for the |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
248 check that DBUS_TYPE_DICT_ENTRY occurs only as array element. */ |
103612
25fc47c9b012
* dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
Michael Albinus <michael.albinus@gmx.de>
parents:
101276
diff
changeset
|
249 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108946
diff
changeset
|
250 xd_signature (char *signature, unsigned int dtype, unsigned int parent_type, Lisp_Object object) |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
251 { |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
252 unsigned int subtype; |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
253 Lisp_Object elt; |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
254 char x[DBUS_MAXIMUM_SIGNATURE_LENGTH]; |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
255 |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
256 elt = object; |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
257 |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
258 switch (dtype) |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
259 { |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
260 case DBUS_TYPE_BYTE: |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
261 case DBUS_TYPE_UINT16: |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
262 case DBUS_TYPE_UINT32: |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
263 case DBUS_TYPE_UINT64: |
111472
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
264 #ifdef DBUS_TYPE_UNIX_FD |
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
265 case DBUS_TYPE_UNIX_FD: |
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
266 #endif |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
267 CHECK_NATNUM (object); |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
268 sprintf (signature, "%c", dtype); |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
269 break; |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
270 |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
271 case DBUS_TYPE_BOOLEAN: |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
272 if (!EQ (object, Qt) && !EQ (object, Qnil)) |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
273 wrong_type_argument (intern ("booleanp"), object); |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
274 sprintf (signature, "%c", dtype); |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
275 break; |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
276 |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
277 case DBUS_TYPE_INT16: |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
278 case DBUS_TYPE_INT32: |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
279 case DBUS_TYPE_INT64: |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
280 CHECK_NUMBER (object); |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
281 sprintf (signature, "%c", dtype); |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
282 break; |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
283 |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
284 case DBUS_TYPE_DOUBLE: |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
285 CHECK_FLOAT (object); |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
286 sprintf (signature, "%c", dtype); |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
287 break; |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
288 |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
289 case DBUS_TYPE_STRING: |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
290 case DBUS_TYPE_OBJECT_PATH: |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
291 case DBUS_TYPE_SIGNATURE: |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
292 CHECK_STRING (object); |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
293 sprintf (signature, "%c", dtype); |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
294 break; |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
295 |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
296 case DBUS_TYPE_ARRAY: |
87363
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
297 /* Check that all list elements have the same D-Bus type. For |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
298 complex element types, we just check the container type, not |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
299 the whole element's signature. */ |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
300 CHECK_CONS (object); |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
301 |
87539
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
302 /* Type symbol is optional. */ |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
303 if (EQ (QCdbus_type_array, CAR_SAFE (elt))) |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
304 elt = XD_NEXT_VALUE (elt); |
87539
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
305 |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
306 /* If the array is empty, DBUS_TYPE_STRING is the default |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
307 element type. */ |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
308 if (NILP (elt)) |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
309 { |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
310 subtype = DBUS_TYPE_STRING; |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
311 strcpy (x, DBUS_TYPE_STRING_AS_STRING); |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
312 } |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
313 else |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
314 { |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
315 subtype = XD_OBJECT_TO_DBUS_TYPE (CAR_SAFE (elt)); |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
316 xd_signature (x, subtype, dtype, CAR_SAFE (XD_NEXT_VALUE (elt))); |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
317 } |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
318 |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
319 /* If the element type is DBUS_TYPE_SIGNATURE, and this is the |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
320 only element, the value of this element is used as he array's |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
321 element signature. */ |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
322 if ((subtype == DBUS_TYPE_SIGNATURE) |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
323 && STRINGP (CAR_SAFE (XD_NEXT_VALUE (elt))) |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
324 && NILP (CDR_SAFE (XD_NEXT_VALUE (elt)))) |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
325 strcpy (x, SDATA (CAR_SAFE (XD_NEXT_VALUE (elt)))); |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
326 |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
327 while (!NILP (elt)) |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
328 { |
87539
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
329 if (subtype != XD_OBJECT_TO_DBUS_TYPE (CAR_SAFE (elt))) |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
330 wrong_type_argument (intern ("D-Bus"), CAR_SAFE (elt)); |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
331 elt = CDR_SAFE (XD_NEXT_VALUE (elt)); |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
332 } |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
333 |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
334 sprintf (signature, "%c%s", dtype, x); |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
335 break; |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
336 |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
337 case DBUS_TYPE_VARIANT: |
87363
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
338 /* Check that there is exactly one list element. */ |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
339 CHECK_CONS (object); |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
340 |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
341 elt = XD_NEXT_VALUE (elt); |
87539
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
342 subtype = XD_OBJECT_TO_DBUS_TYPE (CAR_SAFE (elt)); |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
343 xd_signature (x, subtype, dtype, CAR_SAFE (XD_NEXT_VALUE (elt))); |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
344 |
87539
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
345 if (!NILP (CDR_SAFE (XD_NEXT_VALUE (elt)))) |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
346 wrong_type_argument (intern ("D-Bus"), |
87539
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
347 CAR_SAFE (CDR_SAFE (XD_NEXT_VALUE (elt)))); |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
348 |
87497
1d88fa50b198
* dbusbind.c (xd_signature): Signature of variant is just "v".
Magnus Henoch <mange@freemail.hu>
parents:
87493
diff
changeset
|
349 sprintf (signature, "%c", dtype); |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
350 break; |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
351 |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
352 case DBUS_TYPE_STRUCT: |
87363
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
353 /* A struct list might contain any number of elements with |
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
354 different types. No further check needed. */ |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
355 CHECK_CONS (object); |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
356 |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
357 elt = XD_NEXT_VALUE (elt); |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
358 |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
359 /* Compose the signature from the elements. It is enclosed by |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
360 parentheses. */ |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
361 sprintf (signature, "%c", DBUS_STRUCT_BEGIN_CHAR ); |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
362 while (!NILP (elt)) |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
363 { |
87539
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
364 subtype = XD_OBJECT_TO_DBUS_TYPE (CAR_SAFE (elt)); |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
365 xd_signature (x, subtype, dtype, CAR_SAFE (XD_NEXT_VALUE (elt))); |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
366 strcat (signature, x); |
87539
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
367 elt = CDR_SAFE (XD_NEXT_VALUE (elt)); |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
368 } |
98434
e5f33aa05b97
* dbusbind.c (xd_signature): Use strcat instead of sprintf.
Michael Albinus <michael.albinus@gmx.de>
parents:
97797
diff
changeset
|
369 strcat (signature, DBUS_STRUCT_END_CHAR_AS_STRING); |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
370 break; |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
371 |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
372 case DBUS_TYPE_DICT_ENTRY: |
87363
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
373 /* Check that there are exactly two list elements, and the first |
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
374 one is of basic type. The dictionary entry itself must be an |
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
375 element of an array. */ |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
376 CHECK_CONS (object); |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
377 |
87363
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
378 /* Check the parent object type. */ |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
379 if (parent_type != DBUS_TYPE_ARRAY) |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
380 wrong_type_argument (intern ("D-Bus"), object); |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
381 |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
382 /* Compose the signature from the elements. It is enclosed by |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
383 curly braces. */ |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
384 sprintf (signature, "%c", DBUS_DICT_ENTRY_BEGIN_CHAR); |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
385 |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
386 /* First element. */ |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
387 elt = XD_NEXT_VALUE (elt); |
87539
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
388 subtype = XD_OBJECT_TO_DBUS_TYPE (CAR_SAFE (elt)); |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
389 xd_signature (x, subtype, dtype, CAR_SAFE (XD_NEXT_VALUE (elt))); |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
390 strcat (signature, x); |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
391 |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
392 if (!XD_BASIC_DBUS_TYPE (subtype)) |
87539
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
393 wrong_type_argument (intern ("D-Bus"), CAR_SAFE (XD_NEXT_VALUE (elt))); |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
394 |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
395 /* Second element. */ |
87539
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
396 elt = CDR_SAFE (XD_NEXT_VALUE (elt)); |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
397 subtype = XD_OBJECT_TO_DBUS_TYPE (CAR_SAFE (elt)); |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
398 xd_signature (x, subtype, dtype, CAR_SAFE (XD_NEXT_VALUE (elt))); |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
399 strcat (signature, x); |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
400 |
87539
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
401 if (!NILP (CDR_SAFE (XD_NEXT_VALUE (elt)))) |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
402 wrong_type_argument (intern ("D-Bus"), |
87539
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
403 CAR_SAFE (CDR_SAFE (XD_NEXT_VALUE (elt)))); |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
404 |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
405 /* Closing signature. */ |
98434
e5f33aa05b97
* dbusbind.c (xd_signature): Use strcat instead of sprintf.
Michael Albinus <michael.albinus@gmx.de>
parents:
97797
diff
changeset
|
406 strcat (signature, DBUS_DICT_ENTRY_END_CHAR_AS_STRING); |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
407 break; |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
408 |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
409 default: |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
410 wrong_type_argument (intern ("D-Bus"), object); |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
411 } |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
412 |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
413 XD_DEBUG_MESSAGE ("%s", signature); |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
414 } |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
415 |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
416 /* Append C value, extracted from Lisp OBJECT, to iteration ITER. |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
417 DTYPE must be a valid DBusType. It is used to convert Lisp |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
418 objects, being arguments of `dbus-call-method' or |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
419 `dbus-send-signal', into corresponding C values appended as |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
420 arguments to a D-Bus message. */ |
103612
25fc47c9b012
* dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
Michael Albinus <michael.albinus@gmx.de>
parents:
101276
diff
changeset
|
421 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108946
diff
changeset
|
422 xd_append_arg (unsigned int dtype, Lisp_Object object, DBusMessageIter *iter) |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
423 { |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
424 char signature[DBUS_MAXIMUM_SIGNATURE_LENGTH]; |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
425 DBusMessageIter subiter; |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
426 |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
427 if (XD_BASIC_DBUS_TYPE (dtype)) |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
428 switch (dtype) |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
429 { |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
430 case DBUS_TYPE_BYTE: |
108945
998fccafba7a
* dbusbind.c (xd_append_arg): Don't "make-unibyte" the string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
431 CHECK_NUMBER (object); |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
432 { |
87533
d24ee3180427
* dbusbind.c (xd_append_arg): Use unsigned char instead of
Magnus Henoch <mange@freemail.hu>
parents:
87501
diff
changeset
|
433 unsigned char val = XUINT (object) & 0xFF; |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
434 XD_DEBUG_MESSAGE ("%c %d", dtype, val); |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
435 if (!dbus_message_iter_append_basic (iter, dtype, &val)) |
99098
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
436 XD_SIGNAL2 (build_string ("Unable to append argument"), object); |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
437 return; |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
438 } |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
439 |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
440 case DBUS_TYPE_BOOLEAN: |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
441 { |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
442 dbus_bool_t val = (NILP (object)) ? FALSE : TRUE; |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
443 XD_DEBUG_MESSAGE ("%c %s", dtype, (val == FALSE) ? "false" : "true"); |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
444 if (!dbus_message_iter_append_basic (iter, dtype, &val)) |
99098
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
445 XD_SIGNAL2 (build_string ("Unable to append argument"), object); |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
446 return; |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
447 } |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
448 |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
449 case DBUS_TYPE_INT16: |
108945
998fccafba7a
* dbusbind.c (xd_append_arg): Don't "make-unibyte" the string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
450 CHECK_NUMBER (object); |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
451 { |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
452 dbus_int16_t val = XINT (object); |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
453 XD_DEBUG_MESSAGE ("%c %d", dtype, (int) val); |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
454 if (!dbus_message_iter_append_basic (iter, dtype, &val)) |
99098
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
455 XD_SIGNAL2 (build_string ("Unable to append argument"), object); |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
456 return; |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
457 } |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
458 |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
459 case DBUS_TYPE_UINT16: |
108945
998fccafba7a
* dbusbind.c (xd_append_arg): Don't "make-unibyte" the string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
460 CHECK_NUMBER (object); |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
461 { |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
462 dbus_uint16_t val = XUINT (object); |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
463 XD_DEBUG_MESSAGE ("%c %u", dtype, (unsigned int) val); |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
464 if (!dbus_message_iter_append_basic (iter, dtype, &val)) |
99098
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
465 XD_SIGNAL2 (build_string ("Unable to append argument"), object); |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
466 return; |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
467 } |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
468 |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
469 case DBUS_TYPE_INT32: |
108945
998fccafba7a
* dbusbind.c (xd_append_arg): Don't "make-unibyte" the string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
470 CHECK_NUMBER (object); |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
471 { |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
472 dbus_int32_t val = XINT (object); |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
473 XD_DEBUG_MESSAGE ("%c %d", dtype, val); |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
474 if (!dbus_message_iter_append_basic (iter, dtype, &val)) |
99098
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
475 XD_SIGNAL2 (build_string ("Unable to append argument"), object); |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
476 return; |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
477 } |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
478 |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
479 case DBUS_TYPE_UINT32: |
111472
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
480 #ifdef DBUS_TYPE_UNIX_FD |
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
481 case DBUS_TYPE_UNIX_FD: |
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
482 #endif |
108945
998fccafba7a
* dbusbind.c (xd_append_arg): Don't "make-unibyte" the string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
483 CHECK_NUMBER (object); |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
484 { |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
485 dbus_uint32_t val = XUINT (object); |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
486 XD_DEBUG_MESSAGE ("%c %u", dtype, val); |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
487 if (!dbus_message_iter_append_basic (iter, dtype, &val)) |
99098
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
488 XD_SIGNAL2 (build_string ("Unable to append argument"), object); |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
489 return; |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
490 } |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
491 |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
492 case DBUS_TYPE_INT64: |
108945
998fccafba7a
* dbusbind.c (xd_append_arg): Don't "make-unibyte" the string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
493 CHECK_NUMBER (object); |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
494 { |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
495 dbus_int64_t val = XINT (object); |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
496 XD_DEBUG_MESSAGE ("%c %d", dtype, (int) val); |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
497 if (!dbus_message_iter_append_basic (iter, dtype, &val)) |
99098
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
498 XD_SIGNAL2 (build_string ("Unable to append argument"), object); |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
499 return; |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
500 } |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
501 |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
502 case DBUS_TYPE_UINT64: |
108945
998fccafba7a
* dbusbind.c (xd_append_arg): Don't "make-unibyte" the string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
503 CHECK_NUMBER (object); |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
504 { |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
505 dbus_uint64_t val = XUINT (object); |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
506 XD_DEBUG_MESSAGE ("%c %u", dtype, (unsigned int) val); |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
507 if (!dbus_message_iter_append_basic (iter, dtype, &val)) |
99098
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
508 XD_SIGNAL2 (build_string ("Unable to append argument"), object); |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
509 return; |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
510 } |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
511 |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
512 case DBUS_TYPE_DOUBLE: |
108945
998fccafba7a
* dbusbind.c (xd_append_arg): Don't "make-unibyte" the string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
513 CHECK_FLOAT (object); |
104313
73f76307d49b
* lisp.h (XFLOAT_DATA): Produce an rvalue by adding 0 to the value.
Ken Raeburn <raeburn@raeburn.org>
parents:
104305
diff
changeset
|
514 { |
73f76307d49b
* lisp.h (XFLOAT_DATA): Produce an rvalue by adding 0 to the value.
Ken Raeburn <raeburn@raeburn.org>
parents:
104305
diff
changeset
|
515 double val = XFLOAT_DATA (object); |
73f76307d49b
* lisp.h (XFLOAT_DATA): Produce an rvalue by adding 0 to the value.
Ken Raeburn <raeburn@raeburn.org>
parents:
104305
diff
changeset
|
516 XD_DEBUG_MESSAGE ("%c %f", dtype, val); |
73f76307d49b
* lisp.h (XFLOAT_DATA): Produce an rvalue by adding 0 to the value.
Ken Raeburn <raeburn@raeburn.org>
parents:
104305
diff
changeset
|
517 if (!dbus_message_iter_append_basic (iter, dtype, &val)) |
73f76307d49b
* lisp.h (XFLOAT_DATA): Produce an rvalue by adding 0 to the value.
Ken Raeburn <raeburn@raeburn.org>
parents:
104305
diff
changeset
|
518 XD_SIGNAL2 (build_string ("Unable to append argument"), object); |
73f76307d49b
* lisp.h (XFLOAT_DATA): Produce an rvalue by adding 0 to the value.
Ken Raeburn <raeburn@raeburn.org>
parents:
104305
diff
changeset
|
519 return; |
73f76307d49b
* lisp.h (XFLOAT_DATA): Produce an rvalue by adding 0 to the value.
Ken Raeburn <raeburn@raeburn.org>
parents:
104305
diff
changeset
|
520 } |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
521 |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
522 case DBUS_TYPE_STRING: |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
523 case DBUS_TYPE_OBJECT_PATH: |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
524 case DBUS_TYPE_SIGNATURE: |
108945
998fccafba7a
* dbusbind.c (xd_append_arg): Don't "make-unibyte" the string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
525 CHECK_STRING (object); |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
526 { |
108945
998fccafba7a
* dbusbind.c (xd_append_arg): Don't "make-unibyte" the string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
527 /* We need to send a valid UTF-8 string. We could encode `object' |
998fccafba7a
* dbusbind.c (xd_append_arg): Don't "make-unibyte" the string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
528 but by not encoding it, we guarantee it's valid utf-8, even if |
998fccafba7a
* dbusbind.c (xd_append_arg): Don't "make-unibyte" the string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
529 it contains eight-bit-bytes. Of course, you can still send |
998fccafba7a
* dbusbind.c (xd_append_arg): Don't "make-unibyte" the string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
530 manually-crafted junk by passing a unibyte string. */ |
998fccafba7a
* dbusbind.c (xd_append_arg): Don't "make-unibyte" the string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
531 char *val = SDATA (object); |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
532 XD_DEBUG_MESSAGE ("%c %s", dtype, val); |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
533 if (!dbus_message_iter_append_basic (iter, dtype, &val)) |
99098
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
534 XD_SIGNAL2 (build_string ("Unable to append argument"), object); |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
535 return; |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
536 } |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
537 } |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
538 |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
539 else /* Compound types. */ |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
540 { |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
541 |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
542 /* All compound types except array have a type symbol. For |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
543 array, it is optional. Skip it. */ |
87539
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
544 if (!XD_BASIC_DBUS_TYPE (XD_OBJECT_TO_DBUS_TYPE (CAR_SAFE (object)))) |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
545 object = XD_NEXT_VALUE (object); |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
546 |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
547 /* Open new subiteration. */ |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
548 switch (dtype) |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
549 { |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
550 case DBUS_TYPE_ARRAY: |
87539
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
551 /* An array has only elements of the same type. So it is |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
552 sufficient to check the first element's signature |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
553 only. */ |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
554 |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
555 if (NILP (object)) |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
556 /* If the array is empty, DBUS_TYPE_STRING is the default |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
557 element type. */ |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
558 strcpy (signature, DBUS_TYPE_STRING_AS_STRING); |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
559 |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
560 else |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
561 /* If the element type is DBUS_TYPE_SIGNATURE, and this is |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
562 the only element, the value of this element is used as |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
563 the array's element signature. */ |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
564 if ((XD_OBJECT_TO_DBUS_TYPE (CAR_SAFE (object)) |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
565 == DBUS_TYPE_SIGNATURE) |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
566 && STRINGP (CAR_SAFE (XD_NEXT_VALUE (object))) |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
567 && NILP (CDR_SAFE (XD_NEXT_VALUE (object)))) |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
568 { |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
569 strcpy (signature, SDATA (CAR_SAFE (XD_NEXT_VALUE (object)))); |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
570 object = CDR_SAFE (XD_NEXT_VALUE (object)); |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
571 } |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
572 |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
573 else |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
574 xd_signature (signature, |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
575 XD_OBJECT_TO_DBUS_TYPE (CAR_SAFE (object)), |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
576 dtype, CAR_SAFE (XD_NEXT_VALUE (object))); |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
577 |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
578 XD_DEBUG_MESSAGE ("%c %s %s", dtype, signature, |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
579 SDATA (format2 ("%s", object, Qnil))); |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
580 if (!dbus_message_iter_open_container (iter, dtype, |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
581 signature, &subiter)) |
99098
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
582 XD_SIGNAL3 (build_string ("Cannot open container"), |
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
583 make_number (dtype), build_string (signature)); |
87539
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
584 break; |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
585 |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
586 case DBUS_TYPE_VARIANT: |
87539
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
587 /* A variant has just one element. */ |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
588 xd_signature (signature, XD_OBJECT_TO_DBUS_TYPE (CAR_SAFE (object)), |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
589 dtype, CAR_SAFE (XD_NEXT_VALUE (object))); |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
590 |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
591 XD_DEBUG_MESSAGE ("%c %s %s", dtype, signature, |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
592 SDATA (format2 ("%s", object, Qnil))); |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
593 if (!dbus_message_iter_open_container (iter, dtype, |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
594 signature, &subiter)) |
99098
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
595 XD_SIGNAL3 (build_string ("Cannot open container"), |
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
596 make_number (dtype), build_string (signature)); |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
597 break; |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
598 |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
599 case DBUS_TYPE_STRUCT: |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
600 case DBUS_TYPE_DICT_ENTRY: |
87363
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
601 /* These containers do not require a signature. */ |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
602 XD_DEBUG_MESSAGE ("%c %s", dtype, |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
603 SDATA (format2 ("%s", object, Qnil))); |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
604 if (!dbus_message_iter_open_container (iter, dtype, NULL, &subiter)) |
99098
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
605 XD_SIGNAL2 (build_string ("Cannot open container"), |
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
606 make_number (dtype)); |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
607 break; |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
608 } |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
609 |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
610 /* Loop over list elements. */ |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
611 while (!NILP (object)) |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
612 { |
87539
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
613 dtype = XD_OBJECT_TO_DBUS_TYPE (CAR_SAFE (object)); |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
614 object = XD_NEXT_VALUE (object); |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
615 |
87539
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
616 xd_append_arg (dtype, CAR_SAFE (object), &subiter); |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
617 |
87539
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
618 object = CDR_SAFE (object); |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
619 } |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
620 |
87363
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
621 /* Close the subiteration. */ |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
622 if (!dbus_message_iter_close_container (iter, &subiter)) |
99098
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
623 XD_SIGNAL2 (build_string ("Cannot close container"), |
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
624 make_number (dtype)); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
625 } |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
626 } |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
627 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
628 /* Retrieve C value from a DBusMessageIter structure ITER, and return |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
629 a converted Lisp object. The type DTYPE of the argument of the |
87363
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
630 D-Bus message must be a valid DBusType. Compound D-Bus types |
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
631 result always in a Lisp list. */ |
103612
25fc47c9b012
* dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
Michael Albinus <michael.albinus@gmx.de>
parents:
101276
diff
changeset
|
632 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108946
diff
changeset
|
633 xd_retrieve_arg (unsigned int dtype, DBusMessageIter *iter) |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
634 { |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
635 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
636 switch (dtype) |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
637 { |
87363
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
638 case DBUS_TYPE_BYTE: |
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
639 { |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
640 unsigned int val; |
87363
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
641 dbus_message_iter_get_basic (iter, &val); |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
642 val = val & 0xFF; |
87363
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
643 XD_DEBUG_MESSAGE ("%c %d", dtype, val); |
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
644 return make_number (val); |
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
645 } |
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
646 |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
647 case DBUS_TYPE_BOOLEAN: |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
648 { |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
649 dbus_bool_t val; |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
650 dbus_message_iter_get_basic (iter, &val); |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
651 XD_DEBUG_MESSAGE ("%c %s", dtype, (val == FALSE) ? "false" : "true"); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
652 return (val == FALSE) ? Qnil : Qt; |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
653 } |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
654 |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
655 case DBUS_TYPE_INT16: |
105749
f955480a1d92
(xd_retrieve_arg): Handle DBUS_TYPE_INTnn and
Andreas Schwab <schwab@linux-m68k.org>
parents:
105669
diff
changeset
|
656 { |
f955480a1d92
(xd_retrieve_arg): Handle DBUS_TYPE_INTnn and
Andreas Schwab <schwab@linux-m68k.org>
parents:
105669
diff
changeset
|
657 dbus_int16_t val; |
f955480a1d92
(xd_retrieve_arg): Handle DBUS_TYPE_INTnn and
Andreas Schwab <schwab@linux-m68k.org>
parents:
105669
diff
changeset
|
658 dbus_message_iter_get_basic (iter, &val); |
f955480a1d92
(xd_retrieve_arg): Handle DBUS_TYPE_INTnn and
Andreas Schwab <schwab@linux-m68k.org>
parents:
105669
diff
changeset
|
659 XD_DEBUG_MESSAGE ("%c %d", dtype, val); |
f955480a1d92
(xd_retrieve_arg): Handle DBUS_TYPE_INTnn and
Andreas Schwab <schwab@linux-m68k.org>
parents:
105669
diff
changeset
|
660 return make_number (val); |
f955480a1d92
(xd_retrieve_arg): Handle DBUS_TYPE_INTnn and
Andreas Schwab <schwab@linux-m68k.org>
parents:
105669
diff
changeset
|
661 } |
f955480a1d92
(xd_retrieve_arg): Handle DBUS_TYPE_INTnn and
Andreas Schwab <schwab@linux-m68k.org>
parents:
105669
diff
changeset
|
662 |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
663 case DBUS_TYPE_UINT16: |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
664 { |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
665 dbus_uint16_t val; |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
666 dbus_message_iter_get_basic (iter, &val); |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
667 XD_DEBUG_MESSAGE ("%c %d", dtype, val); |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
668 return make_number (val); |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
669 } |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
670 |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
671 case DBUS_TYPE_INT32: |
105749
f955480a1d92
(xd_retrieve_arg): Handle DBUS_TYPE_INTnn and
Andreas Schwab <schwab@linux-m68k.org>
parents:
105669
diff
changeset
|
672 { |
f955480a1d92
(xd_retrieve_arg): Handle DBUS_TYPE_INTnn and
Andreas Schwab <schwab@linux-m68k.org>
parents:
105669
diff
changeset
|
673 dbus_int32_t val; |
f955480a1d92
(xd_retrieve_arg): Handle DBUS_TYPE_INTnn and
Andreas Schwab <schwab@linux-m68k.org>
parents:
105669
diff
changeset
|
674 dbus_message_iter_get_basic (iter, &val); |
f955480a1d92
(xd_retrieve_arg): Handle DBUS_TYPE_INTnn and
Andreas Schwab <schwab@linux-m68k.org>
parents:
105669
diff
changeset
|
675 XD_DEBUG_MESSAGE ("%c %d", dtype, val); |
f955480a1d92
(xd_retrieve_arg): Handle DBUS_TYPE_INTnn and
Andreas Schwab <schwab@linux-m68k.org>
parents:
105669
diff
changeset
|
676 return make_fixnum_or_float (val); |
f955480a1d92
(xd_retrieve_arg): Handle DBUS_TYPE_INTnn and
Andreas Schwab <schwab@linux-m68k.org>
parents:
105669
diff
changeset
|
677 } |
f955480a1d92
(xd_retrieve_arg): Handle DBUS_TYPE_INTnn and
Andreas Schwab <schwab@linux-m68k.org>
parents:
105669
diff
changeset
|
678 |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
679 case DBUS_TYPE_UINT32: |
111472
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
680 #ifdef DBUS_TYPE_UNIX_FD |
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
681 case DBUS_TYPE_UNIX_FD: |
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
682 #endif |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
683 { |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
684 dbus_uint32_t val; |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
685 dbus_message_iter_get_basic (iter, &val); |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
686 XD_DEBUG_MESSAGE ("%c %d", dtype, val); |
105749
f955480a1d92
(xd_retrieve_arg): Handle DBUS_TYPE_INTnn and
Andreas Schwab <schwab@linux-m68k.org>
parents:
105669
diff
changeset
|
687 return make_fixnum_or_float (val); |
87363
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
688 } |
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
689 |
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
690 case DBUS_TYPE_INT64: |
105749
f955480a1d92
(xd_retrieve_arg): Handle DBUS_TYPE_INTnn and
Andreas Schwab <schwab@linux-m68k.org>
parents:
105669
diff
changeset
|
691 { |
f955480a1d92
(xd_retrieve_arg): Handle DBUS_TYPE_INTnn and
Andreas Schwab <schwab@linux-m68k.org>
parents:
105669
diff
changeset
|
692 dbus_int64_t val; |
f955480a1d92
(xd_retrieve_arg): Handle DBUS_TYPE_INTnn and
Andreas Schwab <schwab@linux-m68k.org>
parents:
105669
diff
changeset
|
693 dbus_message_iter_get_basic (iter, &val); |
f955480a1d92
(xd_retrieve_arg): Handle DBUS_TYPE_INTnn and
Andreas Schwab <schwab@linux-m68k.org>
parents:
105669
diff
changeset
|
694 XD_DEBUG_MESSAGE ("%c %d", dtype, (int) val); |
f955480a1d92
(xd_retrieve_arg): Handle DBUS_TYPE_INTnn and
Andreas Schwab <schwab@linux-m68k.org>
parents:
105669
diff
changeset
|
695 return make_fixnum_or_float (val); |
f955480a1d92
(xd_retrieve_arg): Handle DBUS_TYPE_INTnn and
Andreas Schwab <schwab@linux-m68k.org>
parents:
105669
diff
changeset
|
696 } |
f955480a1d92
(xd_retrieve_arg): Handle DBUS_TYPE_INTnn and
Andreas Schwab <schwab@linux-m68k.org>
parents:
105669
diff
changeset
|
697 |
87363
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
698 case DBUS_TYPE_UINT64: |
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
699 { |
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
700 dbus_uint64_t val; |
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
701 dbus_message_iter_get_basic (iter, &val); |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
702 XD_DEBUG_MESSAGE ("%c %d", dtype, (int) val); |
87363
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
703 return make_fixnum_or_float (val); |
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
704 } |
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
705 |
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
706 case DBUS_TYPE_DOUBLE: |
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
707 { |
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
708 double val; |
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
709 dbus_message_iter_get_basic (iter, &val); |
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
710 XD_DEBUG_MESSAGE ("%c %f", dtype, val); |
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
711 return make_float (val); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
712 } |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
713 |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
714 case DBUS_TYPE_STRING: |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
715 case DBUS_TYPE_OBJECT_PATH: |
87363
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
716 case DBUS_TYPE_SIGNATURE: |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
717 { |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
718 char *val; |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
719 dbus_message_iter_get_basic (iter, &val); |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
720 XD_DEBUG_MESSAGE ("%c %s", dtype, val); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
721 return build_string (val); |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
722 } |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
723 |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
724 case DBUS_TYPE_ARRAY: |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
725 case DBUS_TYPE_VARIANT: |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
726 case DBUS_TYPE_STRUCT: |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
727 case DBUS_TYPE_DICT_ENTRY: |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
728 { |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
729 Lisp_Object result; |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
730 struct gcpro gcpro1; |
106596
cf8766d3e8ed
* dbusbind.c (xd_retrieve_arg): Reorder declarations in order to
Michael Albinus <michael.albinus@gmx.de>
parents:
105989
diff
changeset
|
731 DBusMessageIter subiter; |
cf8766d3e8ed
* dbusbind.c (xd_retrieve_arg): Reorder declarations in order to
Michael Albinus <michael.albinus@gmx.de>
parents:
105989
diff
changeset
|
732 int subtype; |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
733 result = Qnil; |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
734 GCPRO1 (result); |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
735 dbus_message_iter_recurse (iter, &subiter); |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
736 while ((subtype = dbus_message_iter_get_arg_type (&subiter)) |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
737 != DBUS_TYPE_INVALID) |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
738 { |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
739 result = Fcons (xd_retrieve_arg (subtype, &subiter), result); |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
740 dbus_message_iter_next (&subiter); |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
741 } |
87539
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
742 XD_DEBUG_MESSAGE ("%c %s", dtype, SDATA (format2 ("%s", result, Qnil))); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
743 RETURN_UNGCPRO (Fnreverse (result)); |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
744 } |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
745 |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
746 default: |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
747 XD_DEBUG_MESSAGE ("DBusType '%c' not supported", dtype); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
748 return Qnil; |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
749 } |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
750 } |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
751 |
109961
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
752 /* Initialize D-Bus connection. BUS is either a Lisp symbol, :system |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
753 or :session, or a string denoting the bus address. It tells which |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
754 D-Bus to initialize. If RAISE_ERROR is non-zero, signal an error |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
755 when the connection cannot be initialized. */ |
103612
25fc47c9b012
* dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
Michael Albinus <michael.albinus@gmx.de>
parents:
101276
diff
changeset
|
756 static DBusConnection * |
109183
a0cffb71f267
* dbusbind.c (xd_initialize): Add new argument RAISE_ERROR, which
Michael Albinus <michael.albinus@gmx.de>
parents:
109179
diff
changeset
|
757 xd_initialize (Lisp_Object bus, int raise_error) |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
758 { |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
759 DBusConnection *connection; |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
760 DBusError derror; |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
761 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
762 /* Parameter check. */ |
109961
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
763 if (!STRINGP (bus)) |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
764 { |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
765 CHECK_SYMBOL (bus); |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
766 if (!(EQ (bus, QCdbus_system_bus) || EQ (bus, QCdbus_session_bus))) |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
767 { |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
768 if (raise_error) |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
769 XD_SIGNAL2 (build_string ("Wrong bus name"), bus); |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
770 else |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
771 return NULL; |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
772 } |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
773 |
109961
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
774 /* We do not want to have an autolaunch for the session bus. */ |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
775 if (EQ (bus, QCdbus_session_bus) |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
776 && getenv ("DBUS_SESSION_BUS_ADDRESS") == NULL) |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
777 { |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
778 if (raise_error) |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
779 XD_SIGNAL2 (build_string ("No connection to bus"), bus); |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
780 else |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
781 return NULL; |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
782 } |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
783 } |
104375
cb9bcec90aa8
* dbusbind.c (XD_WITH_DBUS_WATCH_GET_UNIX_FD): New macro.
Michael Albinus <michael.albinus@gmx.de>
parents:
104339
diff
changeset
|
784 |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
785 /* Open a connection to the bus. */ |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
786 dbus_error_init (&derror); |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
787 |
109961
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
788 if (STRINGP (bus)) |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
789 connection = dbus_connection_open (SDATA (bus), &derror); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
790 else |
109961
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
791 if (EQ (bus, QCdbus_system_bus)) |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
792 connection = dbus_bus_get (DBUS_BUS_SYSTEM, &derror); |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
793 else |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
794 connection = dbus_bus_get (DBUS_BUS_SESSION, &derror); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
795 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
796 if (dbus_error_is_set (&derror)) |
109961
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
797 { |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
798 if (raise_error) |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
799 XD_ERROR (derror); |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
800 else |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
801 connection = NULL; |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
802 } |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
803 |
109961
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
804 /* If it is not the system or session bus, we must register |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
805 ourselves. Otherwise, we have called dbus_bus_get, which has |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
806 configured us to exit if the connection closes - we undo this |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
807 setting. */ |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
808 if (connection != NULL) |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
809 { |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
810 if (STRINGP (bus)) |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
811 dbus_bus_register (connection, &derror); |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
812 else |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
813 dbus_connection_set_exit_on_disconnect (connection, FALSE); |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
814 } |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
815 |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
816 if (dbus_error_is_set (&derror)) |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
817 { |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
818 if (raise_error) |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
819 XD_ERROR (derror); |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
820 else |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
821 connection = NULL; |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
822 } |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
823 |
109371
bf0e558ade02
* dbusbind.c (xd_initialize): Don't compare boolean with a constant.
Andreas Schwab <schwab@linux-m68k.org>
parents:
109183
diff
changeset
|
824 if (connection == NULL && raise_error) |
104375
cb9bcec90aa8
* dbusbind.c (XD_WITH_DBUS_WATCH_GET_UNIX_FD): New macro.
Michael Albinus <michael.albinus@gmx.de>
parents:
104339
diff
changeset
|
825 XD_SIGNAL2 (build_string ("No connection to bus"), bus); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
826 |
103785
50effbe728da
* dbusbind.c (xd_initialize, Fdbus_call_method, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
103612
diff
changeset
|
827 /* Cleanup. */ |
50effbe728da
* dbusbind.c (xd_initialize, Fdbus_call_method, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
103612
diff
changeset
|
828 dbus_error_free (&derror); |
50effbe728da
* dbusbind.c (xd_initialize, Fdbus_call_method, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
103612
diff
changeset
|
829 |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
830 /* Return the result. */ |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
831 return connection; |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
832 } |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
833 |
110592
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
834 /* Return the file descriptor for WATCH, -1 if not found. */ |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
835 static int |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
836 xd_find_watch_fd (DBusWatch *watch) |
104339
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
837 { |
104533
b466eba29a01
* dbusbind.c (XD_WITH_DBUS_WATCH_GET_UNIX_FD): Remove. It was
Michael Albinus <michael.albinus@gmx.de>
parents:
104375
diff
changeset
|
838 #if HAVE_DBUS_WATCH_GET_UNIX_FD |
110592
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
839 /* TODO: Reverse these on Win32, which prefers the opposite. */ |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
840 int fd = dbus_watch_get_unix_fd (watch); |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
841 if (fd == -1) |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
842 fd = dbus_watch_get_socket (watch); |
104375
cb9bcec90aa8
* dbusbind.c (XD_WITH_DBUS_WATCH_GET_UNIX_FD): New macro.
Michael Albinus <michael.albinus@gmx.de>
parents:
104339
diff
changeset
|
843 #else |
110592
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
844 int fd = dbus_watch_get_fd (watch); |
104375
cb9bcec90aa8
* dbusbind.c (XD_WITH_DBUS_WATCH_GET_UNIX_FD): New macro.
Michael Albinus <michael.albinus@gmx.de>
parents:
104339
diff
changeset
|
845 #endif |
110592
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
846 return fd; |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
847 } |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
848 |
110609
7867879a43ce
* dbusbind.c (dbus_fd_cb, xd_get_dispatch_status)
Michael Albinus <michael.albinus@gmx.de>
parents:
110592
diff
changeset
|
849 /* Prototype. */ |
7867879a43ce
* dbusbind.c (dbus_fd_cb, xd_get_dispatch_status)
Michael Albinus <michael.albinus@gmx.de>
parents:
110592
diff
changeset
|
850 static void |
7867879a43ce
* dbusbind.c (dbus_fd_cb, xd_get_dispatch_status)
Michael Albinus <michael.albinus@gmx.de>
parents:
110592
diff
changeset
|
851 xd_read_queued_messages (int fd, void *data, int for_read); |
104375
cb9bcec90aa8
* dbusbind.c (XD_WITH_DBUS_WATCH_GET_UNIX_FD): New macro.
Michael Albinus <michael.albinus@gmx.de>
parents:
104339
diff
changeset
|
852 |
110592
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
853 /* Start monitoring WATCH for possible I/O. */ |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
854 static dbus_bool_t |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108946
diff
changeset
|
855 xd_add_watch (DBusWatch *watch, void *data) |
104339
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
856 { |
110592
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
857 unsigned int flags = dbus_watch_get_flags (watch); |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
858 int fd = xd_find_watch_fd (watch); |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
859 |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
860 XD_DEBUG_MESSAGE ("fd %d, write %d, enabled %d", |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
861 fd, flags & DBUS_WATCH_WRITABLE, |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
862 dbus_watch_get_enabled (watch)); |
104339
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
863 |
110592
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
864 if (fd == -1) |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
865 return FALSE; |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
866 |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
867 if (dbus_watch_get_enabled (watch)) |
104339
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
868 { |
110592
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
869 if (flags & DBUS_WATCH_WRITABLE) |
110609
7867879a43ce
* dbusbind.c (dbus_fd_cb, xd_get_dispatch_status)
Michael Albinus <michael.albinus@gmx.de>
parents:
110592
diff
changeset
|
870 add_write_fd (fd, xd_read_queued_messages, data); |
110592
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
871 if (flags & DBUS_WATCH_READABLE) |
110609
7867879a43ce
* dbusbind.c (dbus_fd_cb, xd_get_dispatch_status)
Michael Albinus <michael.albinus@gmx.de>
parents:
110592
diff
changeset
|
872 add_read_fd (fd, xd_read_queued_messages, data); |
104339
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
873 } |
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
874 return TRUE; |
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
875 } |
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
876 |
110592
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
877 /* Stop monitoring WATCH for possible I/O. |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
878 DATA is the used bus, either a string or QCdbus_system_bus or |
109961
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
879 QCdbus_session_bus. */ |
110592
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
880 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108946
diff
changeset
|
881 xd_remove_watch (DBusWatch *watch, void *data) |
104339
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
882 { |
110592
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
883 unsigned int flags = dbus_watch_get_flags (watch); |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
884 int fd = xd_find_watch_fd (watch); |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
885 |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
886 XD_DEBUG_MESSAGE ("fd %d", fd); |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
887 |
110609
7867879a43ce
* dbusbind.c (dbus_fd_cb, xd_get_dispatch_status)
Michael Albinus <michael.albinus@gmx.de>
parents:
110592
diff
changeset
|
888 if (fd == -1) |
7867879a43ce
* dbusbind.c (dbus_fd_cb, xd_get_dispatch_status)
Michael Albinus <michael.albinus@gmx.de>
parents:
110592
diff
changeset
|
889 return; |
104339
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
890 |
110592
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
891 /* Unset session environment. */ |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
892 if (data != NULL && data == (void*) XHASH (QCdbus_session_bus)) |
104339
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
893 { |
110592
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
894 XD_DEBUG_MESSAGE ("unsetenv DBUS_SESSION_BUS_ADDRESS"); |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
895 unsetenv ("DBUS_SESSION_BUS_ADDRESS"); |
104339
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
896 } |
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
897 |
110592
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
898 if (flags & DBUS_WATCH_WRITABLE) |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
899 delete_write_fd (fd); |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
900 if (flags & DBUS_WATCH_READABLE) |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
901 delete_read_fd (fd); |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
902 } |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
903 |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
904 /* Toggle monitoring WATCH for possible I/O. */ |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
905 static void |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
906 xd_toggle_watch (DBusWatch *watch, void *data) |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
907 { |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
908 if (dbus_watch_get_enabled (watch)) |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
909 xd_add_watch (watch, data); |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
910 else |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
911 xd_remove_watch (watch, data); |
104339
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
912 } |
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
913 |
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
914 DEFUN ("dbus-init-bus", Fdbus_init_bus, Sdbus_init_bus, 1, 1, 0, |
109961
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
915 doc: /* Initialize connection to D-Bus BUS. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
916 (Lisp_Object bus) |
104339
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
917 { |
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
918 DBusConnection *connection; |
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
919 |
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
920 /* Open a connection to the bus. */ |
109183
a0cffb71f267
* dbusbind.c (xd_initialize): Add new argument RAISE_ERROR, which
Michael Albinus <michael.albinus@gmx.de>
parents:
109179
diff
changeset
|
921 connection = xd_initialize (bus, TRUE); |
104339
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
922 |
106722
d27fa5359486
* dbusbind.c (xd_add_watch): Improve debug message.
Michael Albinus <michael.albinus@gmx.de>
parents:
106596
diff
changeset
|
923 /* Add the watch functions. We pass also the bus as data, in order |
d27fa5359486
* dbusbind.c (xd_add_watch): Improve debug message.
Michael Albinus <michael.albinus@gmx.de>
parents:
106596
diff
changeset
|
924 to distinguish between the busses in xd_remove_watch. */ |
104339
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
925 if (!dbus_connection_set_watch_functions (connection, |
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
926 xd_add_watch, |
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
927 xd_remove_watch, |
110592
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
928 xd_toggle_watch, |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
929 (void*) XHASH (bus), NULL)) |
104339
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
930 XD_SIGNAL1 (build_string ("Cannot add watch functions")); |
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
931 |
109961
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
932 /* Add bus to list of registered buses. */ |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
933 Vdbus_registered_buses = Fcons (bus, Vdbus_registered_buses); |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
934 |
110840
eb0cb131cf06
* dbusbind.c (syms_of_dbusbind): Move putenv call ...
Michael Albinus <michael.albinus@gmx.de>
parents:
110823
diff
changeset
|
935 /* We do not want to abort. */ |
eb0cb131cf06
* dbusbind.c (syms_of_dbusbind): Move putenv call ...
Michael Albinus <michael.albinus@gmx.de>
parents:
110823
diff
changeset
|
936 putenv ("DBUS_FATAL_WARNINGS=0"); |
eb0cb131cf06
* dbusbind.c (syms_of_dbusbind): Move putenv call ...
Michael Albinus <michael.albinus@gmx.de>
parents:
110823
diff
changeset
|
937 |
104339
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
938 /* Return. */ |
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
939 return Qnil; |
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
940 } |
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
941 |
109961
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
942 DEFUN ("dbus-close-bus", Fdbus_close_bus, Sdbus_close_bus, 1, 1, 0, |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
943 doc: /* Close connection to D-Bus BUS. */) |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
944 (Lisp_Object bus) |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
945 { |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
946 DBusConnection *connection; |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
947 |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
948 /* Open a connection to the bus. */ |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
949 connection = xd_initialize (bus, TRUE); |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
950 |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
951 /* Decrement reference count to the bus. */ |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
952 dbus_connection_unref (connection); |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
953 |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
954 /* Remove bus from list of registered buses. */ |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
955 Vdbus_registered_buses = Fdelete (bus, Vdbus_registered_buses); |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
956 |
104339
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
957 /* Return. */ |
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
958 return Qnil; |
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
959 } |
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
960 |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
961 DEFUN ("dbus-get-unique-name", Fdbus_get_unique_name, Sdbus_get_unique_name, |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
962 1, 1, 0, |
87539
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
963 doc: /* Return the unique name of Emacs registered at D-Bus BUS. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
964 (Lisp_Object bus) |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
965 { |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
966 DBusConnection *connection; |
94057
a5a4ff3b6cc3
* dbusbind.c (dbus-get-unique-name): Remove extra copying of name string.
Michael Albinus <michael.albinus@gmx.de>
parents:
93420
diff
changeset
|
967 const char *name; |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
968 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
969 /* Open a connection to the bus. */ |
109183
a0cffb71f267
* dbusbind.c (xd_initialize): Add new argument RAISE_ERROR, which
Michael Albinus <michael.albinus@gmx.de>
parents:
109179
diff
changeset
|
970 connection = xd_initialize (bus, TRUE); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
971 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
972 /* Request the name. */ |
94057
a5a4ff3b6cc3
* dbusbind.c (dbus-get-unique-name): Remove extra copying of name string.
Michael Albinus <michael.albinus@gmx.de>
parents:
93420
diff
changeset
|
973 name = dbus_bus_get_unique_name (connection); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
974 if (name == NULL) |
99098
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
975 XD_SIGNAL1 (build_string ("No unique name available")); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
976 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
977 /* Return. */ |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
978 return build_string (name); |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
979 } |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
980 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
981 DEFUN ("dbus-call-method", Fdbus_call_method, Sdbus_call_method, 5, MANY, 0, |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
982 doc: /* Call METHOD on the D-Bus BUS. |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
983 |
109961
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
984 BUS is either a Lisp symbol, `:system' or `:session', or a string |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
985 denoting the bus address. |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
986 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
987 SERVICE is the D-Bus service name to be used. PATH is the D-Bus |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
988 object path SERVICE is registered at. INTERFACE is an interface |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
989 offered by SERVICE. It must provide METHOD. |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
990 |
93420
629d4147200e
* dbusbind.c (QCdbus_timeout): New D-Bus internal symbol.
Michael Albinus <michael.albinus@gmx.de>
parents:
93156
diff
changeset
|
991 If the parameter `:timeout' is given, the following integer TIMEOUT |
105989
3ff20d1c63e0
* dbusbind.c (Vdbus_registered_objects_table): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
105877
diff
changeset
|
992 specifies the maximum number of milliseconds the method call must |
104605
109ea433850d
* dbusbind.c (Fdbus_call_method)
Michael Albinus <michael.albinus@gmx.de>
parents:
104533
diff
changeset
|
993 return. The default value is 25,000. If the method call doesn't |
94057
a5a4ff3b6cc3
* dbusbind.c (dbus-get-unique-name): Remove extra copying of name string.
Michael Albinus <michael.albinus@gmx.de>
parents:
93420
diff
changeset
|
994 return in time, a D-Bus error is raised. |
93420
629d4147200e
* dbusbind.c (QCdbus_timeout): New D-Bus internal symbol.
Michael Albinus <michael.albinus@gmx.de>
parents:
93156
diff
changeset
|
995 |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
996 All other arguments ARGS are passed to METHOD as arguments. They are |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
997 converted into D-Bus types via the following rules: |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
998 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
999 t and nil => DBUS_TYPE_BOOLEAN |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1000 number => DBUS_TYPE_UINT32 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1001 integer => DBUS_TYPE_INT32 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1002 float => DBUS_TYPE_DOUBLE |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1003 string => DBUS_TYPE_STRING |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
1004 list => DBUS_TYPE_ARRAY |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1005 |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
1006 All arguments can be preceded by a type symbol. For details about |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
1007 type symbols, see Info node `(dbus)Type Conversion'. |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1008 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1009 `dbus-call-method' returns the resulting values of METHOD as a list of |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1010 Lisp objects. The type conversion happens the other direction as for |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
1011 input arguments. It follows the mapping rules: |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
1012 |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
1013 DBUS_TYPE_BOOLEAN => t or nil |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
1014 DBUS_TYPE_BYTE => number |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
1015 DBUS_TYPE_UINT16 => number |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
1016 DBUS_TYPE_INT16 => integer |
87363
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
1017 DBUS_TYPE_UINT32 => number or float |
111472
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
1018 DBUS_TYPE_UNIX_FD => number or float |
87363
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
1019 DBUS_TYPE_INT32 => integer or float |
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
1020 DBUS_TYPE_UINT64 => number or float |
28bc3dd3635f
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
Michael Albinus <michael.albinus@gmx.de>
parents:
87361
diff
changeset
|
1021 DBUS_TYPE_INT64 => integer or float |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
1022 DBUS_TYPE_DOUBLE => float |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
1023 DBUS_TYPE_STRING => string |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
1024 DBUS_TYPE_OBJECT_PATH => string |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
1025 DBUS_TYPE_SIGNATURE => string |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
1026 DBUS_TYPE_ARRAY => list |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
1027 DBUS_TYPE_VARIANT => list |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
1028 DBUS_TYPE_STRUCT => list |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
1029 DBUS_TYPE_DICT_ENTRY => list |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
1030 |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
1031 Example: |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1032 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1033 \(dbus-call-method |
87156
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1034 :session "org.gnome.seahorse" "/org/gnome/seahorse/keys/openpgp" |
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1035 "org.gnome.seahorse.Keys" "GetKeyField" |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1036 "openpgp:657984B8C7A966DD" "simple-name") |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1037 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1038 => (t ("Philip R. Zimmermann")) |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1039 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1040 If the result of the METHOD call is just one value, the converted Lisp |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1041 object is returned instead of a list containing this single Lisp object. |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1042 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1043 \(dbus-call-method |
87156
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1044 :system "org.freedesktop.Hal" "/org/freedesktop/Hal/devices/computer" |
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1045 "org.freedesktop.Hal.Device" "GetPropertyString" |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1046 "system.kernel.machine") |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1047 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1048 => "i686" |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1049 |
98783
9ae4dbce33ae
* dbusbind.c (Fdbus_call_method): Unbreak usage line.
Magnus Henoch <mange@freemail.hu>
parents:
98434
diff
changeset
|
1050 usage: (dbus-call-method BUS SERVICE PATH INTERFACE METHOD &optional :timeout TIMEOUT &rest ARGS) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1051 (int nargs, register Lisp_Object *args) |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1052 { |
87156
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1053 Lisp_Object bus, service, path, interface, method; |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1054 Lisp_Object result; |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1055 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5; |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1056 DBusConnection *connection; |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1057 DBusMessage *dmessage; |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1058 DBusMessage *reply; |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1059 DBusMessageIter iter; |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1060 DBusError derror; |
87280
e0d7140e5b0e
* dbusbind.c (xd_retrieve_value, xd_retrieve_arg)
Michael Albinus <michael.albinus@gmx.de>
parents:
87175
diff
changeset
|
1061 unsigned int dtype; |
93420
629d4147200e
* dbusbind.c (QCdbus_timeout): New D-Bus internal symbol.
Michael Albinus <michael.albinus@gmx.de>
parents:
93156
diff
changeset
|
1062 int timeout = -1; |
629d4147200e
* dbusbind.c (QCdbus_timeout): New D-Bus internal symbol.
Michael Albinus <michael.albinus@gmx.de>
parents:
93156
diff
changeset
|
1063 int i = 5; |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
1064 char signature[DBUS_MAXIMUM_SIGNATURE_LENGTH]; |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1065 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1066 /* Check parameters. */ |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1067 bus = args[0]; |
87156
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1068 service = args[1]; |
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1069 path = args[2]; |
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1070 interface = args[3]; |
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1071 method = args[4]; |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1072 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1073 CHECK_STRING (service); |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1074 CHECK_STRING (path); |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1075 CHECK_STRING (interface); |
87156
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1076 CHECK_STRING (method); |
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1077 GCPRO5 (bus, service, path, interface, method); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1078 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1079 XD_DEBUG_MESSAGE ("%s %s %s %s", |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1080 SDATA (service), |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1081 SDATA (path), |
87156
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1082 SDATA (interface), |
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1083 SDATA (method)); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1084 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1085 /* Open a connection to the bus. */ |
109183
a0cffb71f267
* dbusbind.c (xd_initialize): Add new argument RAISE_ERROR, which
Michael Albinus <michael.albinus@gmx.de>
parents:
109179
diff
changeset
|
1086 connection = xd_initialize (bus, TRUE); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1087 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1088 /* Create the message. */ |
87539
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
1089 dmessage = dbus_message_new_method_call (SDATA (service), |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
1090 SDATA (path), |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
1091 SDATA (interface), |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
1092 SDATA (method)); |
93420
629d4147200e
* dbusbind.c (QCdbus_timeout): New D-Bus internal symbol.
Michael Albinus <michael.albinus@gmx.de>
parents:
93156
diff
changeset
|
1093 UNGCPRO; |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1094 if (dmessage == NULL) |
99098
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
1095 XD_SIGNAL1 (build_string ("Unable to create a new message")); |
93420
629d4147200e
* dbusbind.c (QCdbus_timeout): New D-Bus internal symbol.
Michael Albinus <michael.albinus@gmx.de>
parents:
93156
diff
changeset
|
1096 |
629d4147200e
* dbusbind.c (QCdbus_timeout): New D-Bus internal symbol.
Michael Albinus <michael.albinus@gmx.de>
parents:
93156
diff
changeset
|
1097 /* Check for timeout parameter. */ |
629d4147200e
* dbusbind.c (QCdbus_timeout): New D-Bus internal symbol.
Michael Albinus <michael.albinus@gmx.de>
parents:
93156
diff
changeset
|
1098 if ((i+2 <= nargs) && (EQ ((args[i]), QCdbus_timeout))) |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1099 { |
93420
629d4147200e
* dbusbind.c (QCdbus_timeout): New D-Bus internal symbol.
Michael Albinus <michael.albinus@gmx.de>
parents:
93156
diff
changeset
|
1100 CHECK_NATNUM (args[i+1]); |
629d4147200e
* dbusbind.c (QCdbus_timeout): New D-Bus internal symbol.
Michael Albinus <michael.albinus@gmx.de>
parents:
93156
diff
changeset
|
1101 timeout = XUINT (args[i+1]); |
629d4147200e
* dbusbind.c (QCdbus_timeout): New D-Bus internal symbol.
Michael Albinus <michael.albinus@gmx.de>
parents:
93156
diff
changeset
|
1102 i = i+2; |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1103 } |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1104 |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
1105 /* Initialize parameter list of message. */ |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
1106 dbus_message_iter_init_append (dmessage, &iter); |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
1107 |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1108 /* Append parameters to the message. */ |
93420
629d4147200e
* dbusbind.c (QCdbus_timeout): New D-Bus internal symbol.
Michael Albinus <michael.albinus@gmx.de>
parents:
93156
diff
changeset
|
1109 for (; i < nargs; ++i) |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1110 { |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
1111 dtype = XD_OBJECT_TO_DBUS_TYPE (args[i]); |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
1112 if (XD_DBUS_TYPE_P (args[i])) |
87887
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1113 { |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1114 XD_DEBUG_VALID_LISP_OBJECT_P (args[i]); |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1115 XD_DEBUG_VALID_LISP_OBJECT_P (args[i+1]); |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1116 XD_DEBUG_MESSAGE ("Parameter%d %s %s", i-4, |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1117 SDATA (format2 ("%s", args[i], Qnil)), |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1118 SDATA (format2 ("%s", args[i+1], Qnil))); |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1119 ++i; |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1120 } |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1121 else |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1122 { |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1123 XD_DEBUG_VALID_LISP_OBJECT_P (args[i]); |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1124 XD_DEBUG_MESSAGE ("Parameter%d %s", i-4, |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1125 SDATA (format2 ("%s", args[i], Qnil))); |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1126 } |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1127 |
87584
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1128 /* Check for valid signature. We use DBUS_TYPE_INVALID as |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
1129 indication that there is no parent type. */ |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
1130 xd_signature (signature, dtype, DBUS_TYPE_INVALID, args[i]); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1131 |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
1132 xd_append_arg (dtype, args[i], &iter); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1133 } |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1134 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1135 /* Send the message. */ |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1136 dbus_error_init (&derror); |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1137 reply = dbus_connection_send_with_reply_and_block (connection, |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1138 dmessage, |
93420
629d4147200e
* dbusbind.c (QCdbus_timeout): New D-Bus internal symbol.
Michael Albinus <michael.albinus@gmx.de>
parents:
93156
diff
changeset
|
1139 timeout, |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1140 &derror); |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1141 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1142 if (dbus_error_is_set (&derror)) |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1143 XD_ERROR (derror); |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1144 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1145 if (reply == NULL) |
99098
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
1146 XD_SIGNAL1 (build_string ("No reply")); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1147 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1148 XD_DEBUG_MESSAGE ("Message sent"); |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1149 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1150 /* Collect the results. */ |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1151 result = Qnil; |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1152 GCPRO1 (result); |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1153 |
87535
6dcf49457032
* dbusbind.c (Fdbus_call_method): Handle the case of no returned
Magnus Henoch <mange@freemail.hu>
parents:
87533
diff
changeset
|
1154 if (dbus_message_iter_init (reply, &iter)) |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1155 { |
87535
6dcf49457032
* dbusbind.c (Fdbus_call_method): Handle the case of no returned
Magnus Henoch <mange@freemail.hu>
parents:
87533
diff
changeset
|
1156 /* Loop over the parameters of the D-Bus reply message. Construct a |
6dcf49457032
* dbusbind.c (Fdbus_call_method): Handle the case of no returned
Magnus Henoch <mange@freemail.hu>
parents:
87533
diff
changeset
|
1157 Lisp list, which is returned by `dbus-call-method'. */ |
87887
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1158 while ((dtype = dbus_message_iter_get_arg_type (&iter)) |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1159 != DBUS_TYPE_INVALID) |
87535
6dcf49457032
* dbusbind.c (Fdbus_call_method): Handle the case of no returned
Magnus Henoch <mange@freemail.hu>
parents:
87533
diff
changeset
|
1160 { |
6dcf49457032
* dbusbind.c (Fdbus_call_method): Handle the case of no returned
Magnus Henoch <mange@freemail.hu>
parents:
87533
diff
changeset
|
1161 result = Fcons (xd_retrieve_arg (dtype, &iter), result); |
6dcf49457032
* dbusbind.c (Fdbus_call_method): Handle the case of no returned
Magnus Henoch <mange@freemail.hu>
parents:
87533
diff
changeset
|
1162 dbus_message_iter_next (&iter); |
6dcf49457032
* dbusbind.c (Fdbus_call_method): Handle the case of no returned
Magnus Henoch <mange@freemail.hu>
parents:
87533
diff
changeset
|
1163 } |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1164 } |
87535
6dcf49457032
* dbusbind.c (Fdbus_call_method): Handle the case of no returned
Magnus Henoch <mange@freemail.hu>
parents:
87533
diff
changeset
|
1165 else |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1166 { |
87887
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1167 /* No arguments: just return nil. */ |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1168 } |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1169 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1170 /* Cleanup. */ |
103785
50effbe728da
* dbusbind.c (xd_initialize, Fdbus_call_method, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
103612
diff
changeset
|
1171 dbus_error_free (&derror); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1172 dbus_message_unref (dmessage); |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1173 dbus_message_unref (reply); |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1174 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1175 /* Return the result. If there is only one single Lisp object, |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1176 return it as-it-is, otherwise return the reversed list. */ |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1177 if (XUINT (Flength (result)) == 1) |
87539
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
1178 RETURN_UNGCPRO (CAR_SAFE (result)); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1179 else |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1180 RETURN_UNGCPRO (Fnreverse (result)); |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1181 } |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1182 |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1183 DEFUN ("dbus-call-method-asynchronously", Fdbus_call_method_asynchronously, |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1184 Sdbus_call_method_asynchronously, 6, MANY, 0, |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1185 doc: /* Call METHOD on the D-Bus BUS asynchronously. |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1186 |
109961
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
1187 BUS is either a Lisp symbol, `:system' or `:session', or a string |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
1188 denoting the bus address. |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1189 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1190 SERVICE is the D-Bus service name to be used. PATH is the D-Bus |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1191 object path SERVICE is registered at. INTERFACE is an interface |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1192 offered by SERVICE. It must provide METHOD. |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1193 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1194 HANDLER is a Lisp function, which is called when the corresponding |
104305
52ea0b8b565e
* dbusbind.c (Fdbus_call_method_asynchronously): Allow nil HANDLER.
Michael Albinus <michael.albinus@gmx.de>
parents:
104296
diff
changeset
|
1195 return message has arrived. If HANDLER is nil, no return message will |
52ea0b8b565e
* dbusbind.c (Fdbus_call_method_asynchronously): Allow nil HANDLER.
Michael Albinus <michael.albinus@gmx.de>
parents:
104296
diff
changeset
|
1196 be expected. |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1197 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1198 If the parameter `:timeout' is given, the following integer TIMEOUT |
105989
3ff20d1c63e0
* dbusbind.c (Vdbus_registered_objects_table): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
105877
diff
changeset
|
1199 specifies the maximum number of milliseconds the method call must |
104605
109ea433850d
* dbusbind.c (Fdbus_call_method)
Michael Albinus <michael.albinus@gmx.de>
parents:
104533
diff
changeset
|
1200 return. The default value is 25,000. If the method call doesn't |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1201 return in time, a D-Bus error is raised. |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1202 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1203 All other arguments ARGS are passed to METHOD as arguments. They are |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1204 converted into D-Bus types via the following rules: |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1205 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1206 t and nil => DBUS_TYPE_BOOLEAN |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1207 number => DBUS_TYPE_UINT32 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1208 integer => DBUS_TYPE_INT32 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1209 float => DBUS_TYPE_DOUBLE |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1210 string => DBUS_TYPE_STRING |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1211 list => DBUS_TYPE_ARRAY |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1212 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1213 All arguments can be preceded by a type symbol. For details about |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1214 type symbols, see Info node `(dbus)Type Conversion'. |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1215 |
104305
52ea0b8b565e
* dbusbind.c (Fdbus_call_method_asynchronously): Allow nil HANDLER.
Michael Albinus <michael.albinus@gmx.de>
parents:
104296
diff
changeset
|
1216 Unless HANDLER is nil, the function returns a key into the hash table |
105989
3ff20d1c63e0
* dbusbind.c (Vdbus_registered_objects_table): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
105877
diff
changeset
|
1217 `dbus-registered-objects-table'. The corresponding entry in the hash |
3ff20d1c63e0
* dbusbind.c (Vdbus_registered_objects_table): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
105877
diff
changeset
|
1218 table is removed, when the return message has been arrived, and |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1219 HANDLER is called. |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1220 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1221 Example: |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1222 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1223 \(dbus-call-method-asynchronously |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1224 :system "org.freedesktop.Hal" "/org/freedesktop/Hal/devices/computer" |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1225 "org.freedesktop.Hal.Device" "GetPropertyString" 'message |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1226 "system.kernel.machine") |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1227 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1228 => (:system 2) |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1229 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1230 -| i686 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1231 |
98783
9ae4dbce33ae
* dbusbind.c (Fdbus_call_method): Unbreak usage line.
Magnus Henoch <mange@freemail.hu>
parents:
98434
diff
changeset
|
1232 usage: (dbus-call-method-asynchronously BUS SERVICE PATH INTERFACE METHOD HANDLER &optional :timeout TIMEOUT &rest ARGS) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1233 (int nargs, register Lisp_Object *args) |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1234 { |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1235 Lisp_Object bus, service, path, interface, method, handler; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1236 Lisp_Object result; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1237 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1238 DBusConnection *connection; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1239 DBusMessage *dmessage; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1240 DBusMessageIter iter; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1241 unsigned int dtype; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1242 int timeout = -1; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1243 int i = 6; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1244 char signature[DBUS_MAXIMUM_SIGNATURE_LENGTH]; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1245 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1246 /* Check parameters. */ |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1247 bus = args[0]; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1248 service = args[1]; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1249 path = args[2]; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1250 interface = args[3]; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1251 method = args[4]; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1252 handler = args[5]; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1253 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1254 CHECK_STRING (service); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1255 CHECK_STRING (path); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1256 CHECK_STRING (interface); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1257 CHECK_STRING (method); |
104305
52ea0b8b565e
* dbusbind.c (Fdbus_call_method_asynchronously): Allow nil HANDLER.
Michael Albinus <michael.albinus@gmx.de>
parents:
104296
diff
changeset
|
1258 if (!NILP (handler) && !FUNCTIONP (handler)) |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1259 wrong_type_argument (intern ("functionp"), handler); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1260 GCPRO6 (bus, service, path, interface, method, handler); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1261 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1262 XD_DEBUG_MESSAGE ("%s %s %s %s", |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1263 SDATA (service), |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1264 SDATA (path), |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1265 SDATA (interface), |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1266 SDATA (method)); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1267 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1268 /* Open a connection to the bus. */ |
109183
a0cffb71f267
* dbusbind.c (xd_initialize): Add new argument RAISE_ERROR, which
Michael Albinus <michael.albinus@gmx.de>
parents:
109179
diff
changeset
|
1269 connection = xd_initialize (bus, TRUE); |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1270 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1271 /* Create the message. */ |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1272 dmessage = dbus_message_new_method_call (SDATA (service), |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1273 SDATA (path), |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1274 SDATA (interface), |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1275 SDATA (method)); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1276 if (dmessage == NULL) |
99098
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
1277 XD_SIGNAL1 (build_string ("Unable to create a new message")); |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1278 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1279 /* Check for timeout parameter. */ |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1280 if ((i+2 <= nargs) && (EQ ((args[i]), QCdbus_timeout))) |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1281 { |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1282 CHECK_NATNUM (args[i+1]); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1283 timeout = XUINT (args[i+1]); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1284 i = i+2; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1285 } |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1286 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1287 /* Initialize parameter list of message. */ |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1288 dbus_message_iter_init_append (dmessage, &iter); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1289 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1290 /* Append parameters to the message. */ |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1291 for (; i < nargs; ++i) |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1292 { |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1293 dtype = XD_OBJECT_TO_DBUS_TYPE (args[i]); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1294 if (XD_DBUS_TYPE_P (args[i])) |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1295 { |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1296 XD_DEBUG_VALID_LISP_OBJECT_P (args[i]); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1297 XD_DEBUG_VALID_LISP_OBJECT_P (args[i+1]); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1298 XD_DEBUG_MESSAGE ("Parameter%d %s %s", i-4, |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1299 SDATA (format2 ("%s", args[i], Qnil)), |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1300 SDATA (format2 ("%s", args[i+1], Qnil))); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1301 ++i; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1302 } |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1303 else |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1304 { |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1305 XD_DEBUG_VALID_LISP_OBJECT_P (args[i]); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1306 XD_DEBUG_MESSAGE ("Parameter%d %s", i-4, |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1307 SDATA (format2 ("%s", args[i], Qnil))); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1308 } |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1309 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1310 /* Check for valid signature. We use DBUS_TYPE_INVALID as |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1311 indication that there is no parent type. */ |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1312 xd_signature (signature, dtype, DBUS_TYPE_INVALID, args[i]); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1313 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1314 xd_append_arg (dtype, args[i], &iter); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1315 } |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1316 |
104305
52ea0b8b565e
* dbusbind.c (Fdbus_call_method_asynchronously): Allow nil HANDLER.
Michael Albinus <michael.albinus@gmx.de>
parents:
104296
diff
changeset
|
1317 if (!NILP (handler)) |
52ea0b8b565e
* dbusbind.c (Fdbus_call_method_asynchronously): Allow nil HANDLER.
Michael Albinus <michael.albinus@gmx.de>
parents:
104296
diff
changeset
|
1318 { |
52ea0b8b565e
* dbusbind.c (Fdbus_call_method_asynchronously): Allow nil HANDLER.
Michael Albinus <michael.albinus@gmx.de>
parents:
104296
diff
changeset
|
1319 /* Send the message. The message is just added to the outgoing |
52ea0b8b565e
* dbusbind.c (Fdbus_call_method_asynchronously): Allow nil HANDLER.
Michael Albinus <michael.albinus@gmx.de>
parents:
104296
diff
changeset
|
1320 message queue. */ |
52ea0b8b565e
* dbusbind.c (Fdbus_call_method_asynchronously): Allow nil HANDLER.
Michael Albinus <michael.albinus@gmx.de>
parents:
104296
diff
changeset
|
1321 if (!dbus_connection_send_with_reply (connection, dmessage, |
52ea0b8b565e
* dbusbind.c (Fdbus_call_method_asynchronously): Allow nil HANDLER.
Michael Albinus <michael.albinus@gmx.de>
parents:
104296
diff
changeset
|
1322 NULL, timeout)) |
52ea0b8b565e
* dbusbind.c (Fdbus_call_method_asynchronously): Allow nil HANDLER.
Michael Albinus <michael.albinus@gmx.de>
parents:
104296
diff
changeset
|
1323 XD_SIGNAL1 (build_string ("Cannot send message")); |
52ea0b8b565e
* dbusbind.c (Fdbus_call_method_asynchronously): Allow nil HANDLER.
Michael Albinus <michael.albinus@gmx.de>
parents:
104296
diff
changeset
|
1324 |
105989
3ff20d1c63e0
* dbusbind.c (Vdbus_registered_objects_table): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
105877
diff
changeset
|
1325 /* The result is the key in Vdbus_registered_objects_table. */ |
104305
52ea0b8b565e
* dbusbind.c (Fdbus_call_method_asynchronously): Allow nil HANDLER.
Michael Albinus <michael.albinus@gmx.de>
parents:
104296
diff
changeset
|
1326 result = (list2 (bus, make_number (dbus_message_get_serial (dmessage)))); |
52ea0b8b565e
* dbusbind.c (Fdbus_call_method_asynchronously): Allow nil HANDLER.
Michael Albinus <michael.albinus@gmx.de>
parents:
104296
diff
changeset
|
1327 |
52ea0b8b565e
* dbusbind.c (Fdbus_call_method_asynchronously): Allow nil HANDLER.
Michael Albinus <michael.albinus@gmx.de>
parents:
104296
diff
changeset
|
1328 /* Create a hash table entry. */ |
105989
3ff20d1c63e0
* dbusbind.c (Vdbus_registered_objects_table): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
105877
diff
changeset
|
1329 Fputhash (result, handler, Vdbus_registered_objects_table); |
104305
52ea0b8b565e
* dbusbind.c (Fdbus_call_method_asynchronously): Allow nil HANDLER.
Michael Albinus <michael.albinus@gmx.de>
parents:
104296
diff
changeset
|
1330 } |
52ea0b8b565e
* dbusbind.c (Fdbus_call_method_asynchronously): Allow nil HANDLER.
Michael Albinus <michael.albinus@gmx.de>
parents:
104296
diff
changeset
|
1331 else |
52ea0b8b565e
* dbusbind.c (Fdbus_call_method_asynchronously): Allow nil HANDLER.
Michael Albinus <michael.albinus@gmx.de>
parents:
104296
diff
changeset
|
1332 { |
52ea0b8b565e
* dbusbind.c (Fdbus_call_method_asynchronously): Allow nil HANDLER.
Michael Albinus <michael.albinus@gmx.de>
parents:
104296
diff
changeset
|
1333 /* Send the message. The message is just added to the outgoing |
52ea0b8b565e
* dbusbind.c (Fdbus_call_method_asynchronously): Allow nil HANDLER.
Michael Albinus <michael.albinus@gmx.de>
parents:
104296
diff
changeset
|
1334 message queue. */ |
52ea0b8b565e
* dbusbind.c (Fdbus_call_method_asynchronously): Allow nil HANDLER.
Michael Albinus <michael.albinus@gmx.de>
parents:
104296
diff
changeset
|
1335 if (!dbus_connection_send (connection, dmessage, NULL)) |
52ea0b8b565e
* dbusbind.c (Fdbus_call_method_asynchronously): Allow nil HANDLER.
Michael Albinus <michael.albinus@gmx.de>
parents:
104296
diff
changeset
|
1336 XD_SIGNAL1 (build_string ("Cannot send message")); |
52ea0b8b565e
* dbusbind.c (Fdbus_call_method_asynchronously): Allow nil HANDLER.
Michael Albinus <michael.albinus@gmx.de>
parents:
104296
diff
changeset
|
1337 |
52ea0b8b565e
* dbusbind.c (Fdbus_call_method_asynchronously): Allow nil HANDLER.
Michael Albinus <michael.albinus@gmx.de>
parents:
104296
diff
changeset
|
1338 result = Qnil; |
52ea0b8b565e
* dbusbind.c (Fdbus_call_method_asynchronously): Allow nil HANDLER.
Michael Albinus <michael.albinus@gmx.de>
parents:
104296
diff
changeset
|
1339 } |
52ea0b8b565e
* dbusbind.c (Fdbus_call_method_asynchronously): Allow nil HANDLER.
Michael Albinus <michael.albinus@gmx.de>
parents:
104296
diff
changeset
|
1340 |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1341 XD_DEBUG_MESSAGE ("Message sent"); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1342 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1343 /* Cleanup. */ |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1344 dbus_message_unref (dmessage); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1345 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1346 /* Return the result. */ |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1347 RETURN_UNGCPRO (result); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1348 } |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1349 |
87887
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1350 DEFUN ("dbus-method-return-internal", Fdbus_method_return_internal, |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1351 Sdbus_method_return_internal, |
87584
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1352 3, MANY, 0, |
87887
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1353 doc: /* Return for message SERIAL on the D-Bus BUS. |
87584
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1354 This is an internal function, it shall not be used outside dbus.el. |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1355 |
87887
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1356 usage: (dbus-method-return-internal BUS SERIAL SERVICE &rest ARGS) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1357 (int nargs, register Lisp_Object *args) |
87584
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1358 { |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1359 Lisp_Object bus, serial, service; |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1360 struct gcpro gcpro1, gcpro2, gcpro3; |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1361 DBusConnection *connection; |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1362 DBusMessage *dmessage; |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1363 DBusMessageIter iter; |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1364 unsigned int dtype; |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1365 int i; |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1366 char signature[DBUS_MAXIMUM_SIGNATURE_LENGTH]; |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1367 |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1368 /* Check parameters. */ |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1369 bus = args[0]; |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1370 serial = args[1]; |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1371 service = args[2]; |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1372 |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1373 CHECK_NUMBER (serial); |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1374 CHECK_STRING (service); |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1375 GCPRO3 (bus, serial, service); |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1376 |
105575
474fc7c0fe88
(dbus-method-return-internal, dbus-method-error-internal): Use long format in printf, and cast argument.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
104605
diff
changeset
|
1377 XD_DEBUG_MESSAGE ("%lu %s ", (unsigned long) XUINT (serial), SDATA (service)); |
87584
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1378 |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1379 /* Open a connection to the bus. */ |
109183
a0cffb71f267
* dbusbind.c (xd_initialize): Add new argument RAISE_ERROR, which
Michael Albinus <michael.albinus@gmx.de>
parents:
109179
diff
changeset
|
1380 connection = xd_initialize (bus, TRUE); |
87584
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1381 |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1382 /* Create the message. */ |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1383 dmessage = dbus_message_new (DBUS_MESSAGE_TYPE_METHOD_RETURN); |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1384 if ((dmessage == NULL) |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1385 || (!dbus_message_set_reply_serial (dmessage, XUINT (serial))) |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1386 || (!dbus_message_set_destination (dmessage, SDATA (service)))) |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1387 { |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1388 UNGCPRO; |
99098
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
1389 XD_SIGNAL1 (build_string ("Unable to create a return message")); |
87584
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1390 } |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1391 |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1392 UNGCPRO; |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1393 |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1394 /* Initialize parameter list of message. */ |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1395 dbus_message_iter_init_append (dmessage, &iter); |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1396 |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1397 /* Append parameters to the message. */ |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1398 for (i = 3; i < nargs; ++i) |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1399 { |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1400 dtype = XD_OBJECT_TO_DBUS_TYPE (args[i]); |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1401 if (XD_DBUS_TYPE_P (args[i])) |
87887
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1402 { |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1403 XD_DEBUG_VALID_LISP_OBJECT_P (args[i]); |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1404 XD_DEBUG_VALID_LISP_OBJECT_P (args[i+1]); |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1405 XD_DEBUG_MESSAGE ("Parameter%d %s %s", i-2, |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1406 SDATA (format2 ("%s", args[i], Qnil)), |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1407 SDATA (format2 ("%s", args[i+1], Qnil))); |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1408 ++i; |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1409 } |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1410 else |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1411 { |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1412 XD_DEBUG_VALID_LISP_OBJECT_P (args[i]); |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1413 XD_DEBUG_MESSAGE ("Parameter%d %s", i-2, |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1414 SDATA (format2 ("%s", args[i], Qnil))); |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1415 } |
87584
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1416 |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1417 /* Check for valid signature. We use DBUS_TYPE_INVALID as |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1418 indication that there is no parent type. */ |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1419 xd_signature (signature, dtype, DBUS_TYPE_INVALID, args[i]); |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1420 |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1421 xd_append_arg (dtype, args[i], &iter); |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1422 } |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1423 |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1424 /* Send the message. The message is just added to the outgoing |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1425 message queue. */ |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1426 if (!dbus_connection_send (connection, dmessage, NULL)) |
99098
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
1427 XD_SIGNAL1 (build_string ("Cannot send message")); |
87584
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1428 |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1429 XD_DEBUG_MESSAGE ("Message sent"); |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1430 |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1431 /* Cleanup. */ |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1432 dbus_message_unref (dmessage); |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1433 |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1434 /* Return. */ |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1435 return Qt; |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1436 } |
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1437 |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1438 DEFUN ("dbus-method-error-internal", Fdbus_method_error_internal, |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1439 Sdbus_method_error_internal, |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1440 3, MANY, 0, |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1441 doc: /* Return error message for message SERIAL on the D-Bus BUS. |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1442 This is an internal function, it shall not be used outside dbus.el. |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1443 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1444 usage: (dbus-method-error-internal BUS SERIAL SERVICE &rest ARGS) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1445 (int nargs, register Lisp_Object *args) |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1446 { |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1447 Lisp_Object bus, serial, service; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1448 struct gcpro gcpro1, gcpro2, gcpro3; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1449 DBusConnection *connection; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1450 DBusMessage *dmessage; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1451 DBusMessageIter iter; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1452 unsigned int dtype; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1453 int i; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1454 char signature[DBUS_MAXIMUM_SIGNATURE_LENGTH]; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1455 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1456 /* Check parameters. */ |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1457 bus = args[0]; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1458 serial = args[1]; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1459 service = args[2]; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1460 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1461 CHECK_NUMBER (serial); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1462 CHECK_STRING (service); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1463 GCPRO3 (bus, serial, service); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1464 |
105575
474fc7c0fe88
(dbus-method-return-internal, dbus-method-error-internal): Use long format in printf, and cast argument.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
104605
diff
changeset
|
1465 XD_DEBUG_MESSAGE ("%lu %s ", (unsigned long) XUINT (serial), SDATA (service)); |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1466 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1467 /* Open a connection to the bus. */ |
109183
a0cffb71f267
* dbusbind.c (xd_initialize): Add new argument RAISE_ERROR, which
Michael Albinus <michael.albinus@gmx.de>
parents:
109179
diff
changeset
|
1468 connection = xd_initialize (bus, TRUE); |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1469 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1470 /* Create the message. */ |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1471 dmessage = dbus_message_new (DBUS_MESSAGE_TYPE_ERROR); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1472 if ((dmessage == NULL) |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1473 || (!dbus_message_set_error_name (dmessage, DBUS_ERROR_FAILED)) |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1474 || (!dbus_message_set_reply_serial (dmessage, XUINT (serial))) |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1475 || (!dbus_message_set_destination (dmessage, SDATA (service)))) |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1476 { |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1477 UNGCPRO; |
99098
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
1478 XD_SIGNAL1 (build_string ("Unable to create a error message")); |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1479 } |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1480 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1481 UNGCPRO; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1482 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1483 /* Initialize parameter list of message. */ |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1484 dbus_message_iter_init_append (dmessage, &iter); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1485 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1486 /* Append parameters to the message. */ |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1487 for (i = 3; i < nargs; ++i) |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1488 { |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1489 dtype = XD_OBJECT_TO_DBUS_TYPE (args[i]); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1490 if (XD_DBUS_TYPE_P (args[i])) |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1491 { |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1492 XD_DEBUG_VALID_LISP_OBJECT_P (args[i]); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1493 XD_DEBUG_VALID_LISP_OBJECT_P (args[i+1]); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1494 XD_DEBUG_MESSAGE ("Parameter%d %s %s", i-2, |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1495 SDATA (format2 ("%s", args[i], Qnil)), |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1496 SDATA (format2 ("%s", args[i+1], Qnil))); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1497 ++i; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1498 } |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1499 else |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1500 { |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1501 XD_DEBUG_VALID_LISP_OBJECT_P (args[i]); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1502 XD_DEBUG_MESSAGE ("Parameter%d %s", i-2, |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1503 SDATA (format2 ("%s", args[i], Qnil))); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1504 } |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1505 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1506 /* Check for valid signature. We use DBUS_TYPE_INVALID as |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1507 indication that there is no parent type. */ |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1508 xd_signature (signature, dtype, DBUS_TYPE_INVALID, args[i]); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1509 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1510 xd_append_arg (dtype, args[i], &iter); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1511 } |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1512 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1513 /* Send the message. The message is just added to the outgoing |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1514 message queue. */ |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1515 if (!dbus_connection_send (connection, dmessage, NULL)) |
99098
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
1516 XD_SIGNAL1 (build_string ("Cannot send message")); |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1517 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1518 XD_DEBUG_MESSAGE ("Message sent"); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1519 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1520 /* Cleanup. */ |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1521 dbus_message_unref (dmessage); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1522 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1523 /* Return. */ |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1524 return Qt; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1525 } |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1526 |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1527 DEFUN ("dbus-send-signal", Fdbus_send_signal, Sdbus_send_signal, 5, MANY, 0, |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1528 doc: /* Send signal SIGNAL on the D-Bus BUS. |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1529 |
109961
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
1530 BUS is either a Lisp symbol, `:system' or `:session', or a string |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
1531 denoting the bus address. |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1532 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1533 SERVICE is the D-Bus service name SIGNAL is sent from. PATH is the |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1534 D-Bus object path SERVICE is registered at. INTERFACE is an interface |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1535 offered by SERVICE. It must provide signal SIGNAL. |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1536 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1537 All other arguments ARGS are passed to SIGNAL as arguments. They are |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1538 converted into D-Bus types via the following rules: |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1539 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1540 t and nil => DBUS_TYPE_BOOLEAN |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1541 number => DBUS_TYPE_UINT32 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1542 integer => DBUS_TYPE_INT32 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1543 float => DBUS_TYPE_DOUBLE |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1544 string => DBUS_TYPE_STRING |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
1545 list => DBUS_TYPE_ARRAY |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1546 |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
1547 All arguments can be preceded by a type symbol. For details about |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
1548 type symbols, see Info node `(dbus)Type Conversion'. |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1549 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1550 Example: |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1551 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1552 \(dbus-send-signal |
87156
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1553 :session "org.gnu.Emacs" "/org/gnu/Emacs" |
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1554 "org.gnu.Emacs.FileManager" "FileModified" "/home/albinus/.emacs") |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1555 |
87156
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1556 usage: (dbus-send-signal BUS SERVICE PATH INTERFACE SIGNAL &rest ARGS) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1557 (int nargs, register Lisp_Object *args) |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1558 { |
87156
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1559 Lisp_Object bus, service, path, interface, signal; |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1560 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5; |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1561 DBusConnection *connection; |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1562 DBusMessage *dmessage; |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
1563 DBusMessageIter iter; |
87280
e0d7140e5b0e
* dbusbind.c (xd_retrieve_value, xd_retrieve_arg)
Michael Albinus <michael.albinus@gmx.de>
parents:
87175
diff
changeset
|
1564 unsigned int dtype; |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1565 int i; |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
1566 char signature[DBUS_MAXIMUM_SIGNATURE_LENGTH]; |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1567 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1568 /* Check parameters. */ |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1569 bus = args[0]; |
87156
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1570 service = args[1]; |
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1571 path = args[2]; |
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1572 interface = args[3]; |
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1573 signal = args[4]; |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1574 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1575 CHECK_STRING (service); |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1576 CHECK_STRING (path); |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1577 CHECK_STRING (interface); |
87156
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1578 CHECK_STRING (signal); |
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1579 GCPRO5 (bus, service, path, interface, signal); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1580 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1581 XD_DEBUG_MESSAGE ("%s %s %s %s", |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1582 SDATA (service), |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1583 SDATA (path), |
87156
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1584 SDATA (interface), |
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1585 SDATA (signal)); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1586 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1587 /* Open a connection to the bus. */ |
109183
a0cffb71f267
* dbusbind.c (xd_initialize): Add new argument RAISE_ERROR, which
Michael Albinus <michael.albinus@gmx.de>
parents:
109179
diff
changeset
|
1588 connection = xd_initialize (bus, TRUE); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1589 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1590 /* Create the message. */ |
87539
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
1591 dmessage = dbus_message_new_signal (SDATA (path), |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
1592 SDATA (interface), |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
1593 SDATA (signal)); |
93420
629d4147200e
* dbusbind.c (QCdbus_timeout): New D-Bus internal symbol.
Michael Albinus <michael.albinus@gmx.de>
parents:
93156
diff
changeset
|
1594 UNGCPRO; |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1595 if (dmessage == NULL) |
99098
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
1596 XD_SIGNAL1 (build_string ("Unable to create a new message")); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1597 |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
1598 /* Initialize parameter list of message. */ |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
1599 dbus_message_iter_init_append (dmessage, &iter); |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
1600 |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1601 /* Append parameters to the message. */ |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1602 for (i = 5; i < nargs; ++i) |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1603 { |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
1604 dtype = XD_OBJECT_TO_DBUS_TYPE (args[i]); |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
1605 if (XD_DBUS_TYPE_P (args[i])) |
87887
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1606 { |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1607 XD_DEBUG_VALID_LISP_OBJECT_P (args[i]); |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1608 XD_DEBUG_VALID_LISP_OBJECT_P (args[i+1]); |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1609 XD_DEBUG_MESSAGE ("Parameter%d %s %s", i-4, |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1610 SDATA (format2 ("%s", args[i], Qnil)), |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1611 SDATA (format2 ("%s", args[i+1], Qnil))); |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1612 ++i; |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1613 } |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1614 else |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1615 { |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1616 XD_DEBUG_VALID_LISP_OBJECT_P (args[i]); |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1617 XD_DEBUG_MESSAGE ("Parameter%d %s", i-4, |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1618 SDATA (format2 ("%s", args[i], Qnil))); |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
1619 } |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1620 |
87584
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1621 /* Check for valid signature. We use DBUS_TYPE_INVALID as |
87361
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
1622 indication that there is no parent type. */ |
0b387233ea86
* dbusbind.c (XD_BASIC_DBUS_TYPE, XD_DBUS_TYPE_P, XD_NEXT_VALUE):
Michael Albinus <michael.albinus@gmx.de>
parents:
87343
diff
changeset
|
1623 xd_signature (signature, dtype, DBUS_TYPE_INVALID, args[i]); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1624 |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
1625 xd_append_arg (dtype, args[i], &iter); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1626 } |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1627 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1628 /* Send the message. The message is just added to the outgoing |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1629 message queue. */ |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1630 if (!dbus_connection_send (connection, dmessage, NULL)) |
99098
35372c2ca5c9
* dbusbind.c (xd_in_read_queued_messages): New variable.
Michael Albinus <michael.albinus@gmx.de>
parents:
98901
diff
changeset
|
1631 XD_SIGNAL1 (build_string ("Cannot send message")); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1632 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1633 XD_DEBUG_MESSAGE ("Signal sent"); |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1634 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1635 /* Cleanup. */ |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1636 dbus_message_unref (dmessage); |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1637 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1638 /* Return. */ |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1639 return Qt; |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1640 } |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1641 |
110592
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
1642 /* Read one queued incoming message of the D-Bus BUS. |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
1643 BUS is either a Lisp symbol, :system or :session, or a string denoting |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
1644 the bus address. */ |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
1645 static void |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
1646 xd_read_message_1 (DBusConnection *connection, Lisp_Object bus) |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1647 { |
87175
30175fd3b679
* dbusbind.c (xd_read_message): Generate an event for every
Michael Albinus <michael.albinus@gmx.de>
parents:
87156
diff
changeset
|
1648 Lisp_Object args, key, value; |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1649 struct gcpro gcpro1; |
87501
38cad849184d
* dbusbind.c (xd_read_message): Use non-static input_event struct.
Michael Albinus <michael.albinus@gmx.de>
parents:
87497
diff
changeset
|
1650 struct input_event event; |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1651 DBusMessage *dmessage; |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1652 DBusMessageIter iter; |
87280
e0d7140e5b0e
* dbusbind.c (xd_retrieve_value, xd_retrieve_arg)
Michael Albinus <michael.albinus@gmx.de>
parents:
87175
diff
changeset
|
1653 unsigned int dtype; |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1654 int mtype, serial; |
93156
3ef12fa772f2
* dbusbind.c (xd_read_message): Removed extra copying of message
Michael Albinus <michael.albinus@gmx.de>
parents:
87972
diff
changeset
|
1655 const char *uname, *path, *interface, *member; |
87051
1da959e791de
* dbusbind.c (QCdbus_system_bus, QCdbus_session_bus): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
86940
diff
changeset
|
1656 |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1657 dmessage = dbus_connection_pop_message (connection); |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1658 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1659 /* Return if there is no queued message. */ |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1660 if (dmessage == NULL) |
110592
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
1661 return; |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1662 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1663 /* Collect the parameters. */ |
87175
30175fd3b679
* dbusbind.c (xd_read_message): Generate an event for every
Michael Albinus <michael.albinus@gmx.de>
parents:
87156
diff
changeset
|
1664 args = Qnil; |
30175fd3b679
* dbusbind.c (xd_read_message): Generate an event for every
Michael Albinus <michael.albinus@gmx.de>
parents:
87156
diff
changeset
|
1665 GCPRO1 (args); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1666 |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
1667 /* Loop over the resulting parameters. Construct a list. */ |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
1668 if (dbus_message_iter_init (dmessage, &iter)) |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1669 { |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
1670 while ((dtype = dbus_message_iter_get_arg_type (&iter)) |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
1671 != DBUS_TYPE_INVALID) |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
1672 { |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
1673 args = Fcons (xd_retrieve_arg (dtype, &iter), args); |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
1674 dbus_message_iter_next (&iter); |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
1675 } |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
1676 /* The arguments are stored in reverse order. Reorder them. */ |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
1677 args = Fnreverse (args); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1678 } |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1679 |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1680 /* Read message type, message serial, unique name, object path, |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1681 interface and member from the message. */ |
97211
194ecdbbd8a3
* dbusbind.c (xd_read_message): Handle D-Bus error messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
97165
diff
changeset
|
1682 mtype = dbus_message_get_type (dmessage); |
194ecdbbd8a3
* dbusbind.c (xd_read_message): Handle D-Bus error messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
97165
diff
changeset
|
1683 serial = |
194ecdbbd8a3
* dbusbind.c (xd_read_message): Handle D-Bus error messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
97165
diff
changeset
|
1684 ((mtype == DBUS_MESSAGE_TYPE_METHOD_RETURN) |
194ecdbbd8a3
* dbusbind.c (xd_read_message): Handle D-Bus error messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
97165
diff
changeset
|
1685 || (mtype == DBUS_MESSAGE_TYPE_ERROR)) |
194ecdbbd8a3
* dbusbind.c (xd_read_message): Handle D-Bus error messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
97165
diff
changeset
|
1686 ? dbus_message_get_reply_serial (dmessage) |
194ecdbbd8a3
* dbusbind.c (xd_read_message): Handle D-Bus error messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
97165
diff
changeset
|
1687 : dbus_message_get_serial (dmessage); |
194ecdbbd8a3
* dbusbind.c (xd_read_message): Handle D-Bus error messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
97165
diff
changeset
|
1688 uname = dbus_message_get_sender (dmessage); |
194ecdbbd8a3
* dbusbind.c (xd_read_message): Handle D-Bus error messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
97165
diff
changeset
|
1689 path = dbus_message_get_path (dmessage); |
93156
3ef12fa772f2
* dbusbind.c (xd_read_message): Removed extra copying of message
Michael Albinus <michael.albinus@gmx.de>
parents:
87972
diff
changeset
|
1690 interface = dbus_message_get_interface (dmessage); |
97211
194ecdbbd8a3
* dbusbind.c (xd_read_message): Handle D-Bus error messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
97165
diff
changeset
|
1691 member = dbus_message_get_member (dmessage); |
93156
3ef12fa772f2
* dbusbind.c (xd_read_message): Removed extra copying of message
Michael Albinus <michael.albinus@gmx.de>
parents:
87972
diff
changeset
|
1692 |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1693 XD_DEBUG_MESSAGE ("Event received: %s %d %s %s %s %s %s", |
97211
194ecdbbd8a3
* dbusbind.c (xd_read_message): Handle D-Bus error messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
97165
diff
changeset
|
1694 (mtype == DBUS_MESSAGE_TYPE_INVALID) |
194ecdbbd8a3
* dbusbind.c (xd_read_message): Handle D-Bus error messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
97165
diff
changeset
|
1695 ? "DBUS_MESSAGE_TYPE_INVALID" |
194ecdbbd8a3
* dbusbind.c (xd_read_message): Handle D-Bus error messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
97165
diff
changeset
|
1696 : (mtype == DBUS_MESSAGE_TYPE_METHOD_CALL) |
194ecdbbd8a3
* dbusbind.c (xd_read_message): Handle D-Bus error messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
97165
diff
changeset
|
1697 ? "DBUS_MESSAGE_TYPE_METHOD_CALL" |
194ecdbbd8a3
* dbusbind.c (xd_read_message): Handle D-Bus error messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
97165
diff
changeset
|
1698 : (mtype == DBUS_MESSAGE_TYPE_METHOD_RETURN) |
194ecdbbd8a3
* dbusbind.c (xd_read_message): Handle D-Bus error messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
97165
diff
changeset
|
1699 ? "DBUS_MESSAGE_TYPE_METHOD_RETURN" |
194ecdbbd8a3
* dbusbind.c (xd_read_message): Handle D-Bus error messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
97165
diff
changeset
|
1700 : (mtype == DBUS_MESSAGE_TYPE_ERROR) |
194ecdbbd8a3
* dbusbind.c (xd_read_message): Handle D-Bus error messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
97165
diff
changeset
|
1701 ? "DBUS_MESSAGE_TYPE_ERROR" |
194ecdbbd8a3
* dbusbind.c (xd_read_message): Handle D-Bus error messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
97165
diff
changeset
|
1702 : "DBUS_MESSAGE_TYPE_SIGNAL", |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1703 serial, uname, path, interface, member, |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
1704 SDATA (format2 ("%s", args, Qnil))); |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
1705 |
97211
194ecdbbd8a3
* dbusbind.c (xd_read_message): Handle D-Bus error messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
97165
diff
changeset
|
1706 if ((mtype == DBUS_MESSAGE_TYPE_METHOD_RETURN) |
194ecdbbd8a3
* dbusbind.c (xd_read_message): Handle D-Bus error messages.
Michael Albinus <michael.albinus@gmx.de>
parents:
97165
diff
changeset
|
1707 || (mtype == DBUS_MESSAGE_TYPE_ERROR)) |
87175
30175fd3b679
* dbusbind.c (xd_read_message): Generate an event for every
Michael Albinus <michael.albinus@gmx.de>
parents:
87156
diff
changeset
|
1708 { |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1709 /* Search for a registered function of the message. */ |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1710 key = list2 (bus, make_number (serial)); |
105989
3ff20d1c63e0
* dbusbind.c (Vdbus_registered_objects_table): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
105877
diff
changeset
|
1711 value = Fgethash (key, Vdbus_registered_objects_table, Qnil); |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1712 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1713 /* There shall be exactly one entry. Construct an event. */ |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1714 if (NILP (value)) |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1715 goto cleanup; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1716 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1717 /* Remove the entry. */ |
105989
3ff20d1c63e0
* dbusbind.c (Vdbus_registered_objects_table): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
105877
diff
changeset
|
1718 Fremhash (key, Vdbus_registered_objects_table); |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1719 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1720 /* Construct an event. */ |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1721 EVENT_INIT (event); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1722 event.kind = DBUS_EVENT; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1723 event.frame_or_window = Qnil; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1724 event.arg = Fcons (value, args); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1725 } |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1726 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1727 else /* (mtype != DBUS_MESSAGE_TYPE_METHOD_RETURN) */ |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1728 { |
105989
3ff20d1c63e0
* dbusbind.c (Vdbus_registered_objects_table): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
105877
diff
changeset
|
1729 /* Vdbus_registered_objects_table requires non-nil interface and |
3ff20d1c63e0
* dbusbind.c (Vdbus_registered_objects_table): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
105877
diff
changeset
|
1730 member. */ |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1731 if ((interface == NULL) || (member == NULL)) |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1732 goto cleanup; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1733 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1734 /* Search for a registered function of the message. */ |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1735 key = list3 (bus, build_string (interface), build_string (member)); |
105989
3ff20d1c63e0
* dbusbind.c (Vdbus_registered_objects_table): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
105877
diff
changeset
|
1736 value = Fgethash (key, Vdbus_registered_objects_table, Qnil); |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1737 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1738 /* Loop over the registered functions. Construct an event. */ |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1739 while (!NILP (value)) |
87175
30175fd3b679
* dbusbind.c (xd_read_message): Generate an event for every
Michael Albinus <michael.albinus@gmx.de>
parents:
87156
diff
changeset
|
1740 { |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1741 key = CAR_SAFE (value); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1742 /* key has the structure (UNAME SERVICE PATH HANDLER). */ |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1743 if (((uname == NULL) |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1744 || (NILP (CAR_SAFE (key))) |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1745 || (strcmp (uname, SDATA (CAR_SAFE (key))) == 0)) |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1746 && ((path == NULL) |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1747 || (NILP (CAR_SAFE (CDR_SAFE (CDR_SAFE (key))))) |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1748 || (strcmp (path, |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1749 SDATA (CAR_SAFE (CDR_SAFE (CDR_SAFE (key))))) |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1750 == 0)) |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1751 && (!NILP (CAR_SAFE (CDR_SAFE (CDR_SAFE (CDR_SAFE (key))))))) |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1752 { |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1753 EVENT_INIT (event); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1754 event.kind = DBUS_EVENT; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1755 event.frame_or_window = Qnil; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1756 event.arg = Fcons (CAR_SAFE (CDR_SAFE (CDR_SAFE (CDR_SAFE (key)))), |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1757 args); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1758 break; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1759 } |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1760 value = CDR_SAFE (value); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1761 } |
87051
1da959e791de
* dbusbind.c (QCdbus_system_bus, QCdbus_session_bus): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
86940
diff
changeset
|
1762 |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1763 if (NILP (value)) |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1764 goto cleanup; |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1765 } |
87584
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1766 |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1767 /* Add type, serial, uname, path, interface and member to the event. */ |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1768 event.arg = Fcons ((member == NULL ? Qnil : build_string (member)), |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1769 event.arg); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1770 event.arg = Fcons ((interface == NULL ? Qnil : build_string (interface)), |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1771 event.arg); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1772 event.arg = Fcons ((path == NULL ? Qnil : build_string (path)), |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1773 event.arg); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1774 event.arg = Fcons ((uname == NULL ? Qnil : build_string (uname)), |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1775 event.arg); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1776 event.arg = Fcons (make_number (serial), event.arg); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1777 event.arg = Fcons (make_number (mtype), event.arg); |
87051
1da959e791de
* dbusbind.c (QCdbus_system_bus, QCdbus_session_bus): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
86940
diff
changeset
|
1778 |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1779 /* Add the bus symbol to the event. */ |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1780 event.arg = Fcons (bus, event.arg); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1781 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1782 /* Store it into the input event queue. */ |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1783 kbd_buffer_store_event (&event); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1784 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1785 XD_DEBUG_MESSAGE ("Event stored: %s", |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
1786 SDATA (format2 ("%s", event.arg, Qnil))); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1787 |
103785
50effbe728da
* dbusbind.c (xd_initialize, Fdbus_call_method, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
103612
diff
changeset
|
1788 /* Cleanup. */ |
93156
3ef12fa772f2
* dbusbind.c (xd_read_message): Removed extra copying of message
Michael Albinus <michael.albinus@gmx.de>
parents:
87972
diff
changeset
|
1789 cleanup: |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1790 dbus_message_unref (dmessage); |
103785
50effbe728da
* dbusbind.c (xd_initialize, Fdbus_call_method, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
103612
diff
changeset
|
1791 |
110592
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
1792 UNGCPRO; |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
1793 } |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
1794 |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
1795 /* Read queued incoming messages of the D-Bus BUS. |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
1796 BUS is either a Lisp symbol, :system or :session, or a string denoting |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
1797 the bus address. */ |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
1798 static Lisp_Object |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
1799 xd_read_message (Lisp_Object bus) |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
1800 { |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
1801 /* Open a connection to the bus. */ |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
1802 DBusConnection *connection = xd_initialize (bus, TRUE); |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
1803 |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
1804 /* Non blocking read of the next available message. */ |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
1805 dbus_connection_read_write (connection, 0); |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
1806 |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
1807 while (dbus_connection_get_dispatch_status (connection) |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
1808 != DBUS_DISPATCH_COMPLETE) |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
1809 xd_read_message_1 (connection, bus); |
c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
Jan D <jan.h.d@swipnet.se>
parents:
109961
diff
changeset
|
1810 return Qnil; |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1811 } |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1812 |
110609
7867879a43ce
* dbusbind.c (dbus_fd_cb, xd_get_dispatch_status)
Michael Albinus <michael.albinus@gmx.de>
parents:
110592
diff
changeset
|
1813 /* Callback called when something is ready to read or write. */ |
7867879a43ce
* dbusbind.c (dbus_fd_cb, xd_get_dispatch_status)
Michael Albinus <michael.albinus@gmx.de>
parents:
110592
diff
changeset
|
1814 static void |
7867879a43ce
* dbusbind.c (dbus_fd_cb, xd_get_dispatch_status)
Michael Albinus <michael.albinus@gmx.de>
parents:
110592
diff
changeset
|
1815 xd_read_queued_messages (int fd, void *data, int for_read) |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1816 { |
109961
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
1817 Lisp_Object busp = Vdbus_registered_buses; |
110609
7867879a43ce
* dbusbind.c (dbus_fd_cb, xd_get_dispatch_status)
Michael Albinus <michael.albinus@gmx.de>
parents:
110592
diff
changeset
|
1818 Lisp_Object bus = Qnil; |
87092
1ddad0de60e5
* dbusbind.c (xd_read_message): Return value is a Lisp_Object.
Michael Albinus <michael.albinus@gmx.de>
parents:
87053
diff
changeset
|
1819 |
110609
7867879a43ce
* dbusbind.c (dbus_fd_cb, xd_get_dispatch_status)
Michael Albinus <michael.albinus@gmx.de>
parents:
110592
diff
changeset
|
1820 /* Find bus related to fd. */ |
7867879a43ce
* dbusbind.c (dbus_fd_cb, xd_get_dispatch_status)
Michael Albinus <michael.albinus@gmx.de>
parents:
110592
diff
changeset
|
1821 if (data != NULL) |
7867879a43ce
* dbusbind.c (dbus_fd_cb, xd_get_dispatch_status)
Michael Albinus <michael.albinus@gmx.de>
parents:
110592
diff
changeset
|
1822 while (!NILP (busp)) |
7867879a43ce
* dbusbind.c (dbus_fd_cb, xd_get_dispatch_status)
Michael Albinus <michael.albinus@gmx.de>
parents:
110592
diff
changeset
|
1823 { |
7867879a43ce
* dbusbind.c (dbus_fd_cb, xd_get_dispatch_status)
Michael Albinus <michael.albinus@gmx.de>
parents:
110592
diff
changeset
|
1824 if (data == (void*) XHASH (CAR_SAFE (busp))) |
7867879a43ce
* dbusbind.c (dbus_fd_cb, xd_get_dispatch_status)
Michael Albinus <michael.albinus@gmx.de>
parents:
110592
diff
changeset
|
1825 bus = CAR_SAFE (busp); |
7867879a43ce
* dbusbind.c (dbus_fd_cb, xd_get_dispatch_status)
Michael Albinus <michael.albinus@gmx.de>
parents:
110592
diff
changeset
|
1826 busp = CDR_SAFE (busp); |
7867879a43ce
* dbusbind.c (dbus_fd_cb, xd_get_dispatch_status)
Michael Albinus <michael.albinus@gmx.de>
parents:
110592
diff
changeset
|
1827 } |
7867879a43ce
* dbusbind.c (dbus_fd_cb, xd_get_dispatch_status)
Michael Albinus <michael.albinus@gmx.de>
parents:
110592
diff
changeset
|
1828 |
7867879a43ce
* dbusbind.c (dbus_fd_cb, xd_get_dispatch_status)
Michael Albinus <michael.albinus@gmx.de>
parents:
110592
diff
changeset
|
1829 if (NILP(bus)) |
7867879a43ce
* dbusbind.c (dbus_fd_cb, xd_get_dispatch_status)
Michael Albinus <michael.albinus@gmx.de>
parents:
110592
diff
changeset
|
1830 return; |
7867879a43ce
* dbusbind.c (dbus_fd_cb, xd_get_dispatch_status)
Michael Albinus <michael.albinus@gmx.de>
parents:
110592
diff
changeset
|
1831 |
7867879a43ce
* dbusbind.c (dbus_fd_cb, xd_get_dispatch_status)
Michael Albinus <michael.albinus@gmx.de>
parents:
110592
diff
changeset
|
1832 /* We ignore all Lisp errors during the call. */ |
109961
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
1833 xd_in_read_queued_messages = 1; |
110609
7867879a43ce
* dbusbind.c (dbus_fd_cb, xd_get_dispatch_status)
Michael Albinus <michael.albinus@gmx.de>
parents:
110592
diff
changeset
|
1834 internal_catch (Qdbus_error, xd_read_message, bus); |
109961
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
1835 xd_in_read_queued_messages = 0; |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1836 } |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1837 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1838 DEFUN ("dbus-register-signal", Fdbus_register_signal, Sdbus_register_signal, |
96644
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1839 6, MANY, 0, |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1840 doc: /* Register for signal SIGNAL on the D-Bus BUS. |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1841 |
109961
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
1842 BUS is either a Lisp symbol, `:system' or `:session', or a string |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
1843 denoting the bus address. |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1844 |
87051
1da959e791de
* dbusbind.c (QCdbus_system_bus, QCdbus_session_bus): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
86940
diff
changeset
|
1845 SERVICE is the D-Bus service name used by the sending D-Bus object. |
1da959e791de
* dbusbind.c (QCdbus_system_bus, QCdbus_session_bus): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
86940
diff
changeset
|
1846 It can be either a known name or the unique name of the D-Bus object |
1da959e791de
* dbusbind.c (QCdbus_system_bus, QCdbus_session_bus): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
86940
diff
changeset
|
1847 sending the signal. When SERVICE is nil, related signals from all |
1da959e791de
* dbusbind.c (QCdbus_system_bus, QCdbus_session_bus): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
86940
diff
changeset
|
1848 D-Bus objects shall be accepted. |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1849 |
87051
1da959e791de
* dbusbind.c (QCdbus_system_bus, QCdbus_session_bus): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
86940
diff
changeset
|
1850 PATH is the D-Bus object path SERVICE is registered. It can also be |
1da959e791de
* dbusbind.c (QCdbus_system_bus, QCdbus_session_bus): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
86940
diff
changeset
|
1851 nil if the path name of incoming signals shall not be checked. |
1da959e791de
* dbusbind.c (QCdbus_system_bus, QCdbus_session_bus): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
86940
diff
changeset
|
1852 |
1da959e791de
* dbusbind.c (QCdbus_system_bus, QCdbus_session_bus): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
86940
diff
changeset
|
1853 INTERFACE is an interface offered by SERVICE. It must provide SIGNAL. |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1854 HANDLER is a Lisp function to be called when the signal is received. |
96644
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1855 It must accept as arguments the values SIGNAL is sending. |
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1856 |
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1857 All other arguments ARGS, if specified, must be strings. They stand |
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1858 for the respective arguments of the signal in their order, and are |
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1859 used for filtering as well. A nil argument might be used to preserve |
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1860 the order. |
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1861 |
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1862 INTERFACE, SIGNAL and HANDLER must not be nil. Example: |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1863 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1864 \(defun my-signal-handler (device) |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1865 (message "Device %s added" device)) |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1866 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1867 \(dbus-register-signal |
87156
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1868 :system "org.freedesktop.Hal" "/org/freedesktop/Hal/Manager" |
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1869 "org.freedesktop.Hal.Manager" "DeviceAdded" 'my-signal-handler) |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1870 |
87307
710ac69daf1f
* dbusbind.c (top): Include <stdio.h>.
Michael Albinus <michael.albinus@gmx.de>
parents:
87280
diff
changeset
|
1871 => ((:system "org.freedesktop.Hal.Manager" "DeviceAdded") |
710ac69daf1f
* dbusbind.c (top): Include <stdio.h>.
Michael Albinus <michael.albinus@gmx.de>
parents:
87280
diff
changeset
|
1872 ("org.freedesktop.Hal" "/org/freedesktop/Hal/Manager" my-signal-handler)) |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1873 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1874 `dbus-register-signal' returns an object, which can be used in |
96644
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1875 `dbus-unregister-object' for removing the registration. |
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1876 |
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1877 usage: (dbus-register-signal BUS SERVICE PATH INTERFACE SIGNAL HANDLER &rest ARGS) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1878 (int nargs, register Lisp_Object *args) |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1879 { |
96644
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1880 Lisp_Object bus, service, path, interface, signal, handler; |
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1881 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6; |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
1882 Lisp_Object uname, key, key1, value; |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1883 DBusConnection *connection; |
96644
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1884 int i; |
87156
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1885 char rule[DBUS_MAXIMUM_MATCH_RULE_LENGTH]; |
96847
5129bcf1c53e
* dbusbind.c (Fdbus_register_signal): Use sprintf + strcat instead
Michael Albinus <michael.albinus@gmx.de>
parents:
96644
diff
changeset
|
1886 char x[DBUS_MAXIMUM_MATCH_RULE_LENGTH]; |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1887 DBusError derror; |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1888 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1889 /* Check parameters. */ |
96644
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1890 bus = args[0]; |
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1891 service = args[1]; |
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1892 path = args[2]; |
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1893 interface = args[3]; |
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1894 signal = args[4]; |
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1895 handler = args[5]; |
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1896 |
87051
1da959e791de
* dbusbind.c (QCdbus_system_bus, QCdbus_session_bus): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
86940
diff
changeset
|
1897 if (!NILP (service)) CHECK_STRING (service); |
1da959e791de
* dbusbind.c (QCdbus_system_bus, QCdbus_session_bus): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
86940
diff
changeset
|
1898 if (!NILP (path)) CHECK_STRING (path); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1899 CHECK_STRING (interface); |
87156
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1900 CHECK_STRING (signal); |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
1901 if (!FUNCTIONP (handler)) |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
1902 wrong_type_argument (intern ("functionp"), handler); |
96644
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1903 GCPRO6 (bus, service, path, interface, signal, handler); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1904 |
87156
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1905 /* Retrieve unique name of service. If service is a known name, we |
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1906 will register for the corresponding unique name, if any. Signals |
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1907 are sent always with the unique name as sender. Note: the unique |
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1908 name of "org.freedesktop.DBus" is that string itself. */ |
87539
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
1909 if ((STRINGP (service)) |
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
1910 && (SBYTES (service) > 0) |
87280
e0d7140e5b0e
* dbusbind.c (xd_retrieve_value, xd_retrieve_arg)
Michael Albinus <michael.albinus@gmx.de>
parents:
87175
diff
changeset
|
1911 && (strcmp (SDATA (service), DBUS_SERVICE_DBUS) != 0) |
e0d7140e5b0e
* dbusbind.c (xd_retrieve_value, xd_retrieve_arg)
Michael Albinus <michael.albinus@gmx.de>
parents:
87175
diff
changeset
|
1912 && (strncmp (SDATA (service), ":", 1) != 0)) |
87307
710ac69daf1f
* dbusbind.c (top): Include <stdio.h>.
Michael Albinus <michael.albinus@gmx.de>
parents:
87280
diff
changeset
|
1913 { |
710ac69daf1f
* dbusbind.c (top): Include <stdio.h>.
Michael Albinus <michael.albinus@gmx.de>
parents:
87280
diff
changeset
|
1914 uname = call2 (intern ("dbus-get-name-owner"), bus, service); |
710ac69daf1f
* dbusbind.c (top): Include <stdio.h>.
Michael Albinus <michael.albinus@gmx.de>
parents:
87280
diff
changeset
|
1915 /* When there is no unique name, we mark it with an empty |
710ac69daf1f
* dbusbind.c (top): Include <stdio.h>.
Michael Albinus <michael.albinus@gmx.de>
parents:
87280
diff
changeset
|
1916 string. */ |
710ac69daf1f
* dbusbind.c (top): Include <stdio.h>.
Michael Albinus <michael.albinus@gmx.de>
parents:
87280
diff
changeset
|
1917 if (NILP (uname)) |
101276
dd95cb42c0aa
* dbusbind.c (Fdbus_register_signal):
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
1918 uname = empty_unibyte_string; |
87307
710ac69daf1f
* dbusbind.c (top): Include <stdio.h>.
Michael Albinus <michael.albinus@gmx.de>
parents:
87280
diff
changeset
|
1919 } |
87156
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1920 else |
87307
710ac69daf1f
* dbusbind.c (top): Include <stdio.h>.
Michael Albinus <michael.albinus@gmx.de>
parents:
87280
diff
changeset
|
1921 uname = service; |
87156
e0ab56e63db8
* dbusbind.c (Fdbus_get_unique_name, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
87092
diff
changeset
|
1922 |
87307
710ac69daf1f
* dbusbind.c (top): Include <stdio.h>.
Michael Albinus <michael.albinus@gmx.de>
parents:
87280
diff
changeset
|
1923 /* Create a matching rule if the unique name exists (when no |
710ac69daf1f
* dbusbind.c (top): Include <stdio.h>.
Michael Albinus <michael.albinus@gmx.de>
parents:
87280
diff
changeset
|
1924 wildcard). */ |
87539
6a710fa21688
* dbusbind.c (all): Replace XCAR by CAR_SAFE and XCDR by CDR_SAFE.
Michael Albinus <michael.albinus@gmx.de>
parents:
87535
diff
changeset
|
1925 if (NILP (uname) || (SBYTES (uname) > 0)) |
87307
710ac69daf1f
* dbusbind.c (top): Include <stdio.h>.
Michael Albinus <michael.albinus@gmx.de>
parents:
87280
diff
changeset
|
1926 { |
710ac69daf1f
* dbusbind.c (top): Include <stdio.h>.
Michael Albinus <michael.albinus@gmx.de>
parents:
87280
diff
changeset
|
1927 /* Open a connection to the bus. */ |
109183
a0cffb71f267
* dbusbind.c (xd_initialize): Add new argument RAISE_ERROR, which
Michael Albinus <michael.albinus@gmx.de>
parents:
109179
diff
changeset
|
1928 connection = xd_initialize (bus, TRUE); |
87051
1da959e791de
* dbusbind.c (QCdbus_system_bus, QCdbus_session_bus): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
86940
diff
changeset
|
1929 |
87307
710ac69daf1f
* dbusbind.c (top): Include <stdio.h>.
Michael Albinus <michael.albinus@gmx.de>
parents:
87280
diff
changeset
|
1930 /* Create a rule to receive related signals. */ |
710ac69daf1f
* dbusbind.c (top): Include <stdio.h>.
Michael Albinus <michael.albinus@gmx.de>
parents:
87280
diff
changeset
|
1931 sprintf (rule, |
710ac69daf1f
* dbusbind.c (top): Include <stdio.h>.
Michael Albinus <michael.albinus@gmx.de>
parents:
87280
diff
changeset
|
1932 "type='signal',interface='%s',member='%s'", |
710ac69daf1f
* dbusbind.c (top): Include <stdio.h>.
Michael Albinus <michael.albinus@gmx.de>
parents:
87280
diff
changeset
|
1933 SDATA (interface), |
710ac69daf1f
* dbusbind.c (top): Include <stdio.h>.
Michael Albinus <michael.albinus@gmx.de>
parents:
87280
diff
changeset
|
1934 SDATA (signal)); |
87051
1da959e791de
* dbusbind.c (QCdbus_system_bus, QCdbus_session_bus): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
86940
diff
changeset
|
1935 |
87307
710ac69daf1f
* dbusbind.c (top): Include <stdio.h>.
Michael Albinus <michael.albinus@gmx.de>
parents:
87280
diff
changeset
|
1936 /* Add unique name and path to the rule if they are non-nil. */ |
710ac69daf1f
* dbusbind.c (top): Include <stdio.h>.
Michael Albinus <michael.albinus@gmx.de>
parents:
87280
diff
changeset
|
1937 if (!NILP (uname)) |
96847
5129bcf1c53e
* dbusbind.c (Fdbus_register_signal): Use sprintf + strcat instead
Michael Albinus <michael.albinus@gmx.de>
parents:
96644
diff
changeset
|
1938 { |
5129bcf1c53e
* dbusbind.c (Fdbus_register_signal): Use sprintf + strcat instead
Michael Albinus <michael.albinus@gmx.de>
parents:
96644
diff
changeset
|
1939 sprintf (x, ",sender='%s'", SDATA (uname)); |
5129bcf1c53e
* dbusbind.c (Fdbus_register_signal): Use sprintf + strcat instead
Michael Albinus <michael.albinus@gmx.de>
parents:
96644
diff
changeset
|
1940 strcat (rule, x); |
5129bcf1c53e
* dbusbind.c (Fdbus_register_signal): Use sprintf + strcat instead
Michael Albinus <michael.albinus@gmx.de>
parents:
96644
diff
changeset
|
1941 } |
87051
1da959e791de
* dbusbind.c (QCdbus_system_bus, QCdbus_session_bus): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
86940
diff
changeset
|
1942 |
87307
710ac69daf1f
* dbusbind.c (top): Include <stdio.h>.
Michael Albinus <michael.albinus@gmx.de>
parents:
87280
diff
changeset
|
1943 if (!NILP (path)) |
96847
5129bcf1c53e
* dbusbind.c (Fdbus_register_signal): Use sprintf + strcat instead
Michael Albinus <michael.albinus@gmx.de>
parents:
96644
diff
changeset
|
1944 { |
5129bcf1c53e
* dbusbind.c (Fdbus_register_signal): Use sprintf + strcat instead
Michael Albinus <michael.albinus@gmx.de>
parents:
96644
diff
changeset
|
1945 sprintf (x, ",path='%s'", SDATA (path)); |
5129bcf1c53e
* dbusbind.c (Fdbus_register_signal): Use sprintf + strcat instead
Michael Albinus <michael.albinus@gmx.de>
parents:
96644
diff
changeset
|
1946 strcat (rule, x); |
5129bcf1c53e
* dbusbind.c (Fdbus_register_signal): Use sprintf + strcat instead
Michael Albinus <michael.albinus@gmx.de>
parents:
96644
diff
changeset
|
1947 } |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1948 |
96644
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1949 /* Add arguments to the rule if they are non-nil. */ |
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1950 for (i = 6; i < nargs; ++i) |
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1951 if (!NILP (args[i])) |
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1952 { |
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1953 CHECK_STRING (args[i]); |
96847
5129bcf1c53e
* dbusbind.c (Fdbus_register_signal): Use sprintf + strcat instead
Michael Albinus <michael.albinus@gmx.de>
parents:
96644
diff
changeset
|
1954 sprintf (x, ",arg%d='%s'", i-6, SDATA (args[i])); |
5129bcf1c53e
* dbusbind.c (Fdbus_register_signal): Use sprintf + strcat instead
Michael Albinus <michael.albinus@gmx.de>
parents:
96644
diff
changeset
|
1955 strcat (rule, x); |
96644
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1956 } |
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1957 |
87307
710ac69daf1f
* dbusbind.c (top): Include <stdio.h>.
Michael Albinus <michael.albinus@gmx.de>
parents:
87280
diff
changeset
|
1958 /* Add the rule to the bus. */ |
710ac69daf1f
* dbusbind.c (top): Include <stdio.h>.
Michael Albinus <michael.albinus@gmx.de>
parents:
87280
diff
changeset
|
1959 dbus_error_init (&derror); |
710ac69daf1f
* dbusbind.c (top): Include <stdio.h>.
Michael Albinus <michael.albinus@gmx.de>
parents:
87280
diff
changeset
|
1960 dbus_bus_add_match (connection, rule, &derror); |
710ac69daf1f
* dbusbind.c (top): Include <stdio.h>.
Michael Albinus <michael.albinus@gmx.de>
parents:
87280
diff
changeset
|
1961 if (dbus_error_is_set (&derror)) |
96644
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1962 { |
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1963 UNGCPRO; |
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1964 XD_ERROR (derror); |
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1965 } |
87307
710ac69daf1f
* dbusbind.c (top): Include <stdio.h>.
Michael Albinus <michael.albinus@gmx.de>
parents:
87280
diff
changeset
|
1966 |
103785
50effbe728da
* dbusbind.c (xd_initialize, Fdbus_call_method, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
103612
diff
changeset
|
1967 /* Cleanup. */ |
50effbe728da
* dbusbind.c (xd_initialize, Fdbus_call_method, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
103612
diff
changeset
|
1968 dbus_error_free (&derror); |
50effbe728da
* dbusbind.c (xd_initialize, Fdbus_call_method, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
103612
diff
changeset
|
1969 |
87307
710ac69daf1f
* dbusbind.c (top): Include <stdio.h>.
Michael Albinus <michael.albinus@gmx.de>
parents:
87280
diff
changeset
|
1970 XD_DEBUG_MESSAGE ("Matching rule \"%s\" created", rule); |
710ac69daf1f
* dbusbind.c (top): Include <stdio.h>.
Michael Albinus <michael.albinus@gmx.de>
parents:
87280
diff
changeset
|
1971 } |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1972 |
87051
1da959e791de
* dbusbind.c (QCdbus_system_bus, QCdbus_session_bus): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
86940
diff
changeset
|
1973 /* Create a hash table entry. */ |
87175
30175fd3b679
* dbusbind.c (xd_read_message): Generate an event for every
Michael Albinus <michael.albinus@gmx.de>
parents:
87156
diff
changeset
|
1974 key = list3 (bus, interface, signal); |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
1975 key1 = list4 (uname, service, path, handler); |
105989
3ff20d1c63e0
* dbusbind.c (Vdbus_registered_objects_table): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
105877
diff
changeset
|
1976 value = Fgethash (key, Vdbus_registered_objects_table, Qnil); |
87175
30175fd3b679
* dbusbind.c (xd_read_message): Generate an event for every
Michael Albinus <michael.albinus@gmx.de>
parents:
87156
diff
changeset
|
1977 |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
1978 if (NILP (Fmember (key1, value))) |
105989
3ff20d1c63e0
* dbusbind.c (Vdbus_registered_objects_table): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
105877
diff
changeset
|
1979 Fputhash (key, Fcons (key1, value), Vdbus_registered_objects_table); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1980 |
87307
710ac69daf1f
* dbusbind.c (top): Include <stdio.h>.
Michael Albinus <michael.albinus@gmx.de>
parents:
87280
diff
changeset
|
1981 /* Return object. */ |
96644
5d614d0d26de
* dbusbind.c (Fdbus_register_signal): Allow also signal arguments
Michael Albinus <michael.albinus@gmx.de>
parents:
94963
diff
changeset
|
1982 RETURN_UNGCPRO (list2 (key, list3 (service, path, handler))); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1983 } |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
1984 |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
1985 DEFUN ("dbus-register-method", Fdbus_register_method, Sdbus_register_method, |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
1986 6, 6, 0, |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
1987 doc: /* Register for method METHOD on the D-Bus BUS. |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
1988 |
109961
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
1989 BUS is either a Lisp symbol, `:system' or `:session', or a string |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
1990 denoting the bus address. |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
1991 |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
1992 SERVICE is the D-Bus service name of the D-Bus object METHOD is |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
1993 registered for. It must be a known name. |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
1994 |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
1995 PATH is the D-Bus object path SERVICE is registered. INTERFACE is the |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
1996 interface offered by SERVICE. It must provide METHOD. HANDLER is a |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
1997 Lisp function to be called when a method call is received. It must |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
1998 accept the input arguments of METHOD. The return value of HANDLER is |
87584
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
1999 used for composing the returning D-Bus message. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2000 (Lisp_Object bus, Lisp_Object service, Lisp_Object path, Lisp_Object interface, Lisp_Object method, Lisp_Object handler) |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2001 { |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2002 Lisp_Object key, key1, value; |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2003 DBusConnection *connection; |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2004 int result; |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2005 DBusError derror; |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2006 |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2007 /* Check parameters. */ |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2008 CHECK_STRING (service); |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2009 CHECK_STRING (path); |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2010 CHECK_STRING (interface); |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2011 CHECK_STRING (method); |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2012 if (!FUNCTIONP (handler)) |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2013 wrong_type_argument (intern ("functionp"), handler); |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2014 /* TODO: We must check for a valid service name, otherwise there is |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2015 a segmentation fault. */ |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2016 |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2017 /* Open a connection to the bus. */ |
109183
a0cffb71f267
* dbusbind.c (xd_initialize): Add new argument RAISE_ERROR, which
Michael Albinus <michael.albinus@gmx.de>
parents:
109179
diff
changeset
|
2018 connection = xd_initialize (bus, TRUE); |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2019 |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2020 /* Request the known name from the bus. We can ignore the result, |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2021 it is set to -1 if there is an error - kind of redundancy. */ |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2022 dbus_error_init (&derror); |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2023 result = dbus_bus_request_name (connection, SDATA (service), 0, &derror); |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2024 if (dbus_error_is_set (&derror)) |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2025 XD_ERROR (derror); |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2026 |
105989
3ff20d1c63e0
* dbusbind.c (Vdbus_registered_objects_table): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
105877
diff
changeset
|
2027 /* Create a hash table entry. We use nil for the unique name, |
3ff20d1c63e0
* dbusbind.c (Vdbus_registered_objects_table): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
105877
diff
changeset
|
2028 because the method might be called from anybody. */ |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2029 key = list3 (bus, interface, method); |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2030 key1 = list4 (Qnil, service, path, handler); |
105989
3ff20d1c63e0
* dbusbind.c (Vdbus_registered_objects_table): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
105877
diff
changeset
|
2031 value = Fgethash (key, Vdbus_registered_objects_table, Qnil); |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2032 |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2033 if (NILP (Fmember (key1, value))) |
105989
3ff20d1c63e0
* dbusbind.c (Vdbus_registered_objects_table): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
105877
diff
changeset
|
2034 Fputhash (key, Fcons (key1, value), Vdbus_registered_objects_table); |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2035 |
103785
50effbe728da
* dbusbind.c (xd_initialize, Fdbus_call_method, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
103612
diff
changeset
|
2036 /* Cleanup. */ |
50effbe728da
* dbusbind.c (xd_initialize, Fdbus_call_method, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
103612
diff
changeset
|
2037 dbus_error_free (&derror); |
50effbe728da
* dbusbind.c (xd_initialize, Fdbus_call_method, xd_read_message)
Michael Albinus <michael.albinus@gmx.de>
parents:
103612
diff
changeset
|
2038 |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2039 /* Return object. */ |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2040 return list2 (key, list3 (service, path, handler)); |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2041 } |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2042 |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2043 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2044 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108946
diff
changeset
|
2045 syms_of_dbusbind (void) |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2046 { |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2047 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105749
diff
changeset
|
2048 Qdbus_init_bus = intern_c_string ("dbus-init-bus"); |
104339
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
2049 staticpro (&Qdbus_init_bus); |
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
2050 defsubr (&Sdbus_init_bus); |
dfa6f847adcd
* dbusbind.c (xd_add_watch, xd_remove_watch, Fdbus_init_bus): New
Michael Albinus <michael.albinus@gmx.de>
parents:
104313
diff
changeset
|
2051 |
109961
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
2052 Qdbus_close_bus = intern_c_string ("dbus-close-bus"); |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
2053 staticpro (&Qdbus_close_bus); |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
2054 defsubr (&Sdbus_close_bus); |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
2055 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105749
diff
changeset
|
2056 Qdbus_get_unique_name = intern_c_string ("dbus-get-unique-name"); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2057 staticpro (&Qdbus_get_unique_name); |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2058 defsubr (&Sdbus_get_unique_name); |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2059 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105749
diff
changeset
|
2060 Qdbus_call_method = intern_c_string ("dbus-call-method"); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2061 staticpro (&Qdbus_call_method); |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2062 defsubr (&Sdbus_call_method); |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2063 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105749
diff
changeset
|
2064 Qdbus_call_method_asynchronously = intern_c_string ("dbus-call-method-asynchronously"); |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
2065 staticpro (&Qdbus_call_method_asynchronously); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
2066 defsubr (&Sdbus_call_method_asynchronously); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
2067 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105749
diff
changeset
|
2068 Qdbus_method_return_internal = intern_c_string ("dbus-method-return-internal"); |
87887
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
2069 staticpro (&Qdbus_method_return_internal); |
c7d6ce47abe2
* dbusbind.el (Fdbus_method_return_internal): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
87584
diff
changeset
|
2070 defsubr (&Sdbus_method_return_internal); |
87584
af7df042c392
* dbusbind.c (Fdbus_method_return): New function.
Michael Albinus <michael.albinus@gmx.de>
parents:
87539
diff
changeset
|
2071 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105749
diff
changeset
|
2072 Qdbus_method_error_internal = intern_c_string ("dbus-method-error-internal"); |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
2073 staticpro (&Qdbus_method_error_internal); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
2074 defsubr (&Sdbus_method_error_internal); |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
2075 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105749
diff
changeset
|
2076 Qdbus_send_signal = intern_c_string ("dbus-send-signal"); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2077 staticpro (&Qdbus_send_signal); |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2078 defsubr (&Sdbus_send_signal); |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2079 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105749
diff
changeset
|
2080 Qdbus_register_signal = intern_c_string ("dbus-register-signal"); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2081 staticpro (&Qdbus_register_signal); |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2082 defsubr (&Sdbus_register_signal); |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2083 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105749
diff
changeset
|
2084 Qdbus_register_method = intern_c_string ("dbus-register-method"); |
87490
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2085 staticpro (&Qdbus_register_method); |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2086 defsubr (&Sdbus_register_method); |
5db1ff3b9244
* dbusbind.c: Fix several errors and compiler warnings. Reported
Michael Albinus <michael.albinus@gmx.de>
parents:
87364
diff
changeset
|
2087 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105749
diff
changeset
|
2088 Qdbus_error = intern_c_string ("dbus-error"); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2089 staticpro (&Qdbus_error); |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2090 Fput (Qdbus_error, Qerror_conditions, |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2091 list2 (Qdbus_error, Qerror)); |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2092 Fput (Qdbus_error, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105749
diff
changeset
|
2093 make_pure_c_string ("D-Bus error")); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2094 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105749
diff
changeset
|
2095 QCdbus_system_bus = intern_c_string (":system"); |
87051
1da959e791de
* dbusbind.c (QCdbus_system_bus, QCdbus_session_bus): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
86940
diff
changeset
|
2096 staticpro (&QCdbus_system_bus); |
1da959e791de
* dbusbind.c (QCdbus_system_bus, QCdbus_session_bus): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
86940
diff
changeset
|
2097 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105749
diff
changeset
|
2098 QCdbus_session_bus = intern_c_string (":session"); |
87051
1da959e791de
* dbusbind.c (QCdbus_system_bus, QCdbus_session_bus): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
86940
diff
changeset
|
2099 staticpro (&QCdbus_session_bus); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2100 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105749
diff
changeset
|
2101 QCdbus_timeout = intern_c_string (":timeout"); |
93420
629d4147200e
* dbusbind.c (QCdbus_timeout): New D-Bus internal symbol.
Michael Albinus <michael.albinus@gmx.de>
parents:
93156
diff
changeset
|
2102 staticpro (&QCdbus_timeout); |
629d4147200e
* dbusbind.c (QCdbus_timeout): New D-Bus internal symbol.
Michael Albinus <michael.albinus@gmx.de>
parents:
93156
diff
changeset
|
2103 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105749
diff
changeset
|
2104 QCdbus_type_byte = intern_c_string (":byte"); |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
2105 staticpro (&QCdbus_type_byte); |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
2106 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105749
diff
changeset
|
2107 QCdbus_type_boolean = intern_c_string (":boolean"); |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
2108 staticpro (&QCdbus_type_boolean); |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
2109 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105749
diff
changeset
|
2110 QCdbus_type_int16 = intern_c_string (":int16"); |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
2111 staticpro (&QCdbus_type_int16); |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
2112 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105749
diff
changeset
|
2113 QCdbus_type_uint16 = intern_c_string (":uint16"); |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
2114 staticpro (&QCdbus_type_uint16); |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
2115 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105749
diff
changeset
|
2116 QCdbus_type_int32 = intern_c_string (":int32"); |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
2117 staticpro (&QCdbus_type_int32); |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
2118 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105749
diff
changeset
|
2119 QCdbus_type_uint32 = intern_c_string (":uint32"); |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
2120 staticpro (&QCdbus_type_uint32); |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
2121 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105749
diff
changeset
|
2122 QCdbus_type_int64 = intern_c_string (":int64"); |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
2123 staticpro (&QCdbus_type_int64); |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
2124 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105749
diff
changeset
|
2125 QCdbus_type_uint64 = intern_c_string (":uint64"); |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
2126 staticpro (&QCdbus_type_uint64); |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
2127 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105749
diff
changeset
|
2128 QCdbus_type_double = intern_c_string (":double"); |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
2129 staticpro (&QCdbus_type_double); |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
2130 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105749
diff
changeset
|
2131 QCdbus_type_string = intern_c_string (":string"); |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
2132 staticpro (&QCdbus_type_string); |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
2133 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105749
diff
changeset
|
2134 QCdbus_type_object_path = intern_c_string (":object-path"); |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
2135 staticpro (&QCdbus_type_object_path); |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
2136 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105749
diff
changeset
|
2137 QCdbus_type_signature = intern_c_string (":signature"); |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
2138 staticpro (&QCdbus_type_signature); |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
2139 |
111472
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
2140 #ifdef DBUS_TYPE_UNIX_FD |
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
2141 QCdbus_type_unix_fd = intern_c_string (":unix-fd"); |
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
2142 staticpro (&QCdbus_type_unix_fd); |
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
2143 #endif |
943d9b433fca
* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
Michael Albinus <michael.albinus@gmx.de>
parents:
111311
diff
changeset
|
2144 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105749
diff
changeset
|
2145 QCdbus_type_array = intern_c_string (":array"); |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
2146 staticpro (&QCdbus_type_array); |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
2147 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105749
diff
changeset
|
2148 QCdbus_type_variant = intern_c_string (":variant"); |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
2149 staticpro (&QCdbus_type_variant); |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
2150 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105749
diff
changeset
|
2151 QCdbus_type_struct = intern_c_string (":struct"); |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
2152 staticpro (&QCdbus_type_struct); |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
2153 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105749
diff
changeset
|
2154 QCdbus_type_dict_entry = intern_c_string (":dict-entry"); |
87343
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
2155 staticpro (&QCdbus_type_dict_entry); |
02e327d7d839
* dbusbind.c (QCdbus_type_byte, QCdbus_type_boolean)
Michael Albinus <michael.albinus@gmx.de>
parents:
87307
diff
changeset
|
2156 |
109961
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
2157 DEFVAR_LISP ("dbus-registered-buses", |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
2158 &Vdbus_registered_buses, |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
2159 doc: /* List of D-Bus buses we are polling for messages. */); |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
2160 Vdbus_registered_buses = Qnil; |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
2161 |
105989
3ff20d1c63e0
* dbusbind.c (Vdbus_registered_objects_table): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
105877
diff
changeset
|
2162 DEFVAR_LISP ("dbus-registered-objects-table", |
3ff20d1c63e0
* dbusbind.c (Vdbus_registered_objects_table): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
105877
diff
changeset
|
2163 &Vdbus_registered_objects_table, |
87051
1da959e791de
* dbusbind.c (QCdbus_system_bus, QCdbus_session_bus): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
86940
diff
changeset
|
2164 doc: /* Hash table of registered functions for D-Bus. |
109961
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
2165 |
105989
3ff20d1c63e0
* dbusbind.c (Vdbus_registered_objects_table): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
105877
diff
changeset
|
2166 There are two different uses of the hash table: for accessing |
3ff20d1c63e0
* dbusbind.c (Vdbus_registered_objects_table): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
105877
diff
changeset
|
2167 registered interfaces properties, targeted by signals or method calls, |
3ff20d1c63e0
* dbusbind.c (Vdbus_registered_objects_table): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
105877
diff
changeset
|
2168 and for calling handlers in case of non-blocking method call returns. |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
2169 |
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
2170 In the first case, the key in the hash table is the list (BUS |
109961
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
2171 INTERFACE MEMBER). BUS is either a Lisp symbol, `:system' or |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
2172 `:session', or a string denoting the bus address. INTERFACE is a |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
2173 string which denotes a D-Bus interface, and MEMBER, also a string, is |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
2174 either a method, a signal or a property INTERFACE is offering. All |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
2175 arguments but BUS must not be nil. |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2176 |
87307
710ac69daf1f
* dbusbind.c (top): Include <stdio.h>.
Michael Albinus <michael.albinus@gmx.de>
parents:
87280
diff
changeset
|
2177 The value in the hash table is a list of quadruple lists |
105989
3ff20d1c63e0
* dbusbind.c (Vdbus_registered_objects_table): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
105877
diff
changeset
|
2178 \((UNAME SERVICE PATH OBJECT) (UNAME SERVICE PATH OBJECT) ...). |
87175
30175fd3b679
* dbusbind.c (xd_read_message): Generate an event for every
Michael Albinus <michael.albinus@gmx.de>
parents:
87156
diff
changeset
|
2179 SERVICE is the service name as registered, UNAME is the corresponding |
105989
3ff20d1c63e0
* dbusbind.c (Vdbus_registered_objects_table): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
105877
diff
changeset
|
2180 unique name. In case of registered methods and properties, UNAME is |
3ff20d1c63e0
* dbusbind.c (Vdbus_registered_objects_table): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
105877
diff
changeset
|
2181 nil. PATH is the object path of the sending object. All of them can |
3ff20d1c63e0
* dbusbind.c (Vdbus_registered_objects_table): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
105877
diff
changeset
|
2182 be nil, which means a wildcard then. OBJECT is either the handler to |
3ff20d1c63e0
* dbusbind.c (Vdbus_registered_objects_table): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
105877
diff
changeset
|
2183 be called when a D-Bus message, which matches the key criteria, |
3ff20d1c63e0
* dbusbind.c (Vdbus_registered_objects_table): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
105877
diff
changeset
|
2184 arrives (methods and signals), or a cons cell containing the value of |
3ff20d1c63e0
* dbusbind.c (Vdbus_registered_objects_table): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
105877
diff
changeset
|
2185 the property. |
97165
b0fa771b5389
* dbusbind.c (Fdbus_call_method_asynchronously)
Michael Albinus <michael.albinus@gmx.de>
parents:
96847
diff
changeset
|
2186 |
109961
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
2187 In the second case, the key in the hash table is the list (BUS |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
2188 SERIAL). BUS is either a Lisp symbol, `:system' or `:session', or a |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
2189 string denoting the bus address. SERIAL is the serial number of the |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
2190 non-blocking method call, a reply is expected. Both arguments must |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
2191 not be nil. The value in the hash table is HANDLER, the function to |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
2192 be called when the D-Bus reply message arrives. */); |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
2193 { |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
2194 Lisp_Object args[2]; |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
2195 args[0] = QCtest; |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
2196 args[1] = Qequal; |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
2197 Vdbus_registered_objects_table = Fmake_hash_table (2, args); |
25b9c8c975be
* dbusbind.c: Accept UNIX domain sockets as bus address.
Michael Albinus <michael.albinus@gmx.de>
parents:
109371
diff
changeset
|
2198 } |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2199 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2200 DEFVAR_LISP ("dbus-debug", &Vdbus_debug, |
87051
1da959e791de
* dbusbind.c (QCdbus_system_bus, QCdbus_session_bus): Renamed from
Michael Albinus <michael.albinus@gmx.de>
parents:
86940
diff
changeset
|
2201 doc: /* If non-nil, debug messages of D-Bus bindings are raised. */); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2202 #ifdef DBUS_DEBUG |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2203 Vdbus_debug = Qt; |
110840
eb0cb131cf06
* dbusbind.c (syms_of_dbusbind): Move putenv call ...
Michael Albinus <michael.albinus@gmx.de>
parents:
110823
diff
changeset
|
2204 /* We can also set environment variable DBUS_VERBOSE=1 in order to |
eb0cb131cf06
* dbusbind.c (syms_of_dbusbind): Move putenv call ...
Michael Albinus <michael.albinus@gmx.de>
parents:
110823
diff
changeset
|
2205 see more traces. This requires libdbus-1 to be configured with |
eb0cb131cf06
* dbusbind.c (syms_of_dbusbind): Move putenv call ...
Michael Albinus <michael.albinus@gmx.de>
parents:
110823
diff
changeset
|
2206 --enable-verbose-mode. */ |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2207 #else |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2208 Vdbus_debug = Qnil; |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2209 #endif |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2210 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105749
diff
changeset
|
2211 Fprovide (intern_c_string ("dbusbind"), Qnil); |
86940
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2212 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2213 } |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2214 |
2dd672d9fe75
* config.in (HAVE_DBUS): Add.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2215 #endif /* HAVE_DBUS */ |
87053 | 2216 |
2217 /* arch-tag: 0e828477-b571-4fe4-b559-5c9211bc14b8 | |
2218 (do not change this comment) */ |