X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fcontext.hh;h=eaa280ff588d8e63315675a4030d89735516f69b;hb=b3cf2199183a184c7eef9a9f8f3c9a691db1f0ad;hp=6a2fcb0d22480d8b77e75d8dae64c65c51324cb3;hpb=40e563210ec7bdedfbdc629056a062e4b6d72de2;p=lilypond.git

diff --git a/lily/include/context.hh b/lily/include/context.hh
index 6a2fcb0d22..eaa280ff58 100644
--- a/lily/include/context.hh
+++ b/lily/include/context.hh
@@ -9,11 +9,12 @@
 #ifndef CONTEXT_HH
 #define CONTEXT_HH
 
-
-#include "moment.hh"
+#include "context-key-manager.hh"
 #include "lily-proto.hh"
+#include "listener.hh"
+#include "moment.hh"
+#include "std-vector.hh"
 #include "virtual-methods.hh"
-#include "context-key-manager.hh"
 
 class Context
 {
@@ -27,11 +28,16 @@ class Context
 private:
   friend class Context_handle;
   int iterator_count_;
-  bool init_;
+  
+  /* Used internally by create_context */
+  Stream_event *infant_event_;
 
 protected:
   Context *daddy_context_;
+  /* The used Context_def */
   SCM definition_;
+  /* Additions to the Context_def, given by \with */
+  SCM definition_mods_;
   Context_key_manager key_manager_;
   
   SCM properties_scm_;
@@ -40,20 +46,40 @@ protected:
   SCM aliases_;
   Translator_group *implementation_;
   string id_string_;
+  
+  /* Events reported in the context is sent to this dispatcher. */
+  Dispatcher *event_source_;
 
+  /* Events reported to this context or recursively in any of its
+     children, are sent to this dispatcher. */
+  Dispatcher *events_below_;
+
+  // Translator_group is allowed to set implementation_.
+  friend class Translator_group;
+  // Context_def::instantiate initialises some protected members.
   friend class Context_def;
+  // UGH! initialises implementation_
+  friend SCM ly_make_global_translator (SCM);
   void clear_key_disambiguations ();
 
+  DECLARE_LISTENER (set_property_from_event);
+  DECLARE_LISTENER (unset_property_from_event);
   
 public:
   Object_key const *get_grob_key (string name);
   Object_key const *get_context_key (string name, string id);
 
-  Context *create_context (Context_def *, string, SCM);
   string id_string () const { return id_string_; }
   SCM children_contexts () const { return context_list_; }
   SCM default_child_context_name () const;
 
+  Dispatcher *event_source () const { return event_source_; }
+  Dispatcher *events_below () const { return events_below_; }
+  void internal_send_stream_event (SCM type, Input *origin, SCM props[]);
+
+  SCM get_definition () const { return definition_; }
+  SCM get_definition_mods () const { return definition_mods_; }
+
   Translator_group *implementation () const { return implementation_; }
   Context *get_parent_context () const;
   Context (Object_key const *);
@@ -65,7 +91,12 @@ public:
   Context *where_defined (SCM name_sym, SCM *value) const;
   void unset_property (SCM var_sym);
 
-  Context *remove_context (Context *trans);
+  Context *create_context (Context_def *, string, SCM);
+  DECLARE_LISTENER (create_context_from_event);
+  DECLARE_LISTENER (acknowledge_infant);
+  DECLARE_LISTENER (remove_context);
+  DECLARE_LISTENER (change_parent);
+  void disconnect_from_parent ();
   void check_removal ();
   string context_name () const;
   SCM context_name_symbol () const;
@@ -113,5 +144,12 @@ Moment measure_position (Context const *context);
 Rational measure_length (Context const *context);
 void set_context_property_on_children (Context *trans, SCM sym, SCM val);
 
+/* Shorthand for creating and broadcasting stream events. */
+#define send_stream_event(ctx, type, origin, ...)				\
+{									\
+  SCM props[] = { __VA_ARGS__, 0 };					\
+  ctx->internal_send_stream_event (ly_symbol2scm (type), origin, props);	\
+}
+
 #endif /* CONTEXT_HH */