Imported Upstream version 2.16.0

[lilypond.git] / lily / include / listener.hh

diff --git a/lily/include/listener.hh b/lily/include/listener.hh
index ed7aced9c9ca2a0e12fc27dff07f1ba54e515021..e0827f8786dc372ceaee9256f159e7d1dbe0c7d5 100644 (file)
--- a/lily/include/listener.hh
+++ b/lily/include/listener.hh
@@ -27,7 +27,7 @@
   register a method as an event handler in a dispatcher, then you
   must:
 
-  - declare the method using the DECLARE_LISTENER macro. 
+  - declare the method using the DECLARE_LISTENER macro.
   class Foo
   {
     DECLARE_LISTENER (method);
@@ -53,7 +53,7 @@
   Stream_distributor *d = (...);
   Listener l = GET_LISTENER (foo->method);
   d->register_listener (l, "EventClass");
-  
+
   Whenever d hears a stream-event ev of class "EventClass",
   the implemented procedure is called.
 
@@ -63,12 +63,15 @@
 
 #include "smobs.hh"
 
-typedef struct {
+typedef struct
+{
   void (*listen_callback) (void *, SCM);
   void (*mark_callback) (void *);
+  bool (*equal_callback) (void *, void *);
 } Listener_function_table;
 
-class Listener {
+class Listener
+{
   void *target_;
   Listener_function_table *type_;
 public:
@@ -79,40 +82,50 @@ public:
   void listen (SCM ev) const;
 
   bool operator == (Listener const &other) const
-  { return target_ == other.target_ && type_ == other.type_; }
+  {
+    return type_ == other.type_
+           && (*type_->equal_callback) ((void *) target_, (void *) other.target_);
+  }
 
   DECLARE_SIMPLE_SMOBS (Listener);
 };
 DECLARE_UNSMOB (Listener, listener);
 
-#define IMPLEMENT_LISTENER(cl, method)                 \
-void                                                   \
-cl :: method ## _callback (void *self, SCM ev)         \
-{                                                      \
-  cl *s = (cl *)self;                                  \
-  s->method (ev);                                      \
-}                                                      \
-void                                                   \
-cl :: method ## _mark (void *self)                     \
-{                                                      \
-  cl *s = (cl *)self;                                  \
-  scm_gc_mark (s->self_scm ());                                \
-}                                                      \
-Listener                                               \
-cl :: method ## _listener () const                     \
-{                                                      \
-  static Listener_function_table callbacks;            \
-  callbacks.listen_callback = &cl::method ## _callback;        \
-  callbacks.mark_callback = &cl::method ## _mark;      \
-  return Listener (this, &callbacks);                  \
+#define IMPLEMENT_LISTENER(cl, method)                  \
+void                                                    \
+cl :: method ## _callback (void *self, SCM ev)          \
+{                                                       \
+  cl *s = (cl *)self;                                   \
+  s->method (ev);                                       \
+}                                                       \
+void                                                    \
+cl :: method ## _mark (void *self)                      \
+{                                                       \
+  cl *s = (cl *)self;                                   \
+  scm_gc_mark (s->self_scm ());                         \
+}                                                       \
+bool                                                    \
+cl :: method ## _is_equal (void *a, void *b)            \
+{                                                       \
+  return a == b;                                        \
+}                                                       \
+Listener                                                \
+cl :: method ## _listener () const                      \
+{                                                       \
+  static Listener_function_table callbacks;             \
+  callbacks.listen_callback = &cl::method ## _callback; \
+  callbacks.mark_callback = &cl::method ## _mark;       \
+  callbacks.equal_callback = &cl::method ## _is_equal;  \
+  return Listener (this, &callbacks);                   \
 }
 
 #define GET_LISTENER(proc) proc ## _listener ()
 
-#define DECLARE_LISTENER(name)                         \
-  inline void name (SCM);                              \
-  static void name ## _callback (void *self, SCM ev);  \
-  static void name ## _mark (void *self);              \
+#define DECLARE_LISTENER(name)                          \
+  inline void name (SCM);                               \
+  static void name ## _callback (void *self, SCM ev);   \
+  static void name ## _mark (void *self);               \
+  static bool name ## _is_equal (void *a, void *b);     \
   Listener name ## _listener () const
 
 #endif /* LISTENER_HH */