comparison src/dbusbind.c @ 93156:3ef12fa772f2

* dbusbind.c (xd_read_message): Removed extra copying of message strings. Check for NULL `interface' or `member'.

93155:09cc3d0d41ce

			 ? XD_SYMBOL_TO_DBUS_TYPE (CAR_SAFE (object))	\
			 : DBUS_TYPE_ARRAY)				\
   : DBUS_TYPE_INVALID)

/* Return a list pointer which does not have a Lisp symbol as car.  */
#define XD_NEXT_VALUE(object)					\
  ((XD_DBUS_TYPE_P (CAR_SAFE (object))) ? CDR_SAFE (object) : object)

/* Compute SIGNATURE of OBJECT.  It must have a form that it can be
   used in dbus_message_iter_open_container.  DTYPE is the DBusType
   the object is related to.  It is passed as argument, because it

  DBusConnection *connection;
  DBusMessage *dmessage;
  DBusMessageIter iter;
  unsigned int dtype;
  int mtype;
  char uname[DBUS_MAXIMUM_NAME_LENGTH];
  char path[DBUS_MAXIMUM_MATCH_RULE_LENGTH]; /* Unlimited in D-Bus spec.  */
  char interface[DBUS_MAXIMUM_NAME_LENGTH];
  char member[DBUS_MAXIMUM_NAME_LENGTH];

  /* Open a connection to the bus.  */
  connection = xd_initialize (bus);

  /* Non blocking read of the next available message.  */

      args = Fnreverse (args);
    }

  /* Read message type, unique name, object path, interface and member
     from the message.  */
  mtype =            dbus_message_get_type (dmessage);
  strcpy (uname,     dbus_message_get_sender (dmessage));
  strcpy (path,      dbus_message_get_path (dmessage));
  strcpy (interface, dbus_message_get_interface (dmessage));
  strcpy (member,    dbus_message_get_member (dmessage));

  XD_DEBUG_MESSAGE ("Event received: %d %s %s %s %s %s",
		    mtype, uname, path, interface, member,
		    SDATA (format2 ("%s", args, Qnil)));

	  event.frame_or_window = Qnil;
	  event.arg = Fcons (CAR_SAFE (CDR_SAFE (CDR_SAFE (CDR_SAFE (key)))),
			     args);

	  /* Add uname, path, interface and member to the event.  */
	  event.arg = Fcons ((member == NULL ? Qnil : build_string (member)),
			     event.arg);
	  event.arg = Fcons ((interface == NULL
			      ? Qnil : build_string (interface)),
			     event.arg);
	  event.arg = Fcons ((path == NULL ? Qnil : build_string (path)),
			     event.arg);
	  event.arg = Fcons ((uname == NULL ? Qnil : build_string (uname)),
			     event.arg);

	  kbd_buffer_store_event (&event);
	}
     value = CDR_SAFE (value);
    }

  /* Cleanup.  */
  dbus_message_unref (dmessage);
  RETURN_UNGCPRO (Qnil);
}

/* Read queued incoming messages from the system and session buses.  */

93156:3ef12fa772f2

			 ? XD_SYMBOL_TO_DBUS_TYPE (CAR_SAFE (object))	\
			 : DBUS_TYPE_ARRAY)				\
   : DBUS_TYPE_INVALID)

/* Return a list pointer which does not have a Lisp symbol as car.  */
#define XD_NEXT_VALUE(object)						\
  ((XD_DBUS_TYPE_P (CAR_SAFE (object))) ? CDR_SAFE (object) : object)

/* Compute SIGNATURE of OBJECT.  It must have a form that it can be
   used in dbus_message_iter_open_container.  DTYPE is the DBusType
   the object is related to.  It is passed as argument, because it

  DBusConnection *connection;
  DBusMessage *dmessage;
  DBusMessageIter iter;
  unsigned int dtype;
  int mtype;
  const char *uname, *path, *interface, *member;

  /* Open a connection to the bus.  */
  connection = xd_initialize (bus);

  /* Non blocking read of the next available message.  */

      args = Fnreverse (args);
    }

  /* Read message type, unique name, object path, interface and member
     from the message.  */
  mtype     = dbus_message_get_type (dmessage);
  uname     = dbus_message_get_sender (dmessage);
  path      = dbus_message_get_path (dmessage);
  interface = dbus_message_get_interface (dmessage);
  member    = dbus_message_get_member (dmessage);

  /* dbus-registered-functions-table requires non nil interface and member. */
  if ((NULL == interface) || (NULL == member))
    goto cleanup;

  XD_DEBUG_MESSAGE ("Event received: %d %s %s %s %s %s",
		    mtype, uname, path, interface, member,
		    SDATA (format2 ("%s", args, Qnil)));

	  event.frame_or_window = Qnil;
	  event.arg = Fcons (CAR_SAFE (CDR_SAFE (CDR_SAFE (CDR_SAFE (key)))),
			     args);

	  /* Add uname, path, interface and member to the event.  */
	  event.arg = Fcons (build_string (member), event.arg);
	  event.arg = Fcons (build_string (interface), event.arg);
	  event.arg = Fcons ((path == NULL ? Qnil : build_string (path)),
			     event.arg);
	  event.arg = Fcons ((uname == NULL ? Qnil : build_string (uname)),
			     event.arg);

	  kbd_buffer_store_event (&event);
	}
     value = CDR_SAFE (value);
    }

 cleanup:
  dbus_message_unref (dmessage);
  RETURN_UNGCPRO (Qnil);
}

/* Read queued incoming messages from the system and session buses.  */