/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2005--2011 Erik Sandberg <mandolaerik@gmail.com>
+ Copyright (C) 2005--2012 Erik Sandberg <mandolaerik@gmail.com>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
}
int
-Dispatcher::print_smob (SCM s, SCM p, scm_print_state*)
+Dispatcher::print_smob (SCM s, SCM p, scm_print_state *)
{
Dispatcher *me = (Dispatcher *) SCM_CELL_WORD_1 (s);
scm_puts ("#<Dispatcher ", p);
- scm_write (scm_vector_to_list (me->listeners_), p);
+ scm_write (scm_call_1 (ly_lily_module_constant ("hash-table->alist"),
+ me->listeners_), p);
scm_puts (">", p);
return 1;
}
Dispatcher::dispatch (SCM sev)
{
Stream_event *ev = unsmob_stream_event (sev);
- SCM class_symbol = ev->get_property ("class");
- if (!scm_symbol_p (class_symbol))
- {
- warning (_ ("Event class should be a symbol"));
- return;
- }
-
- SCM class_list = scm_call_1 (ly_lily_module_constant ("ly:make-event-class"), class_symbol);
+ SCM class_list = ev->get_property ("class");
if (!scm_is_pair (class_list))
{
- ev->origin ()->warning (_f ("Unknown event class %s", ly_symbol2string (class_symbol).c_str ()));
+ ev->origin ()->warning (_ ("Event class should be a list"));
return;
}
+
+#if 0
bool sent = false;
+#endif
int num_classes = scm_ilength (class_list);
/*
The first step is to collect all listener lists and to initially
insert them in the priority queue.
*/
- struct { int prio; SCM list; } lists[num_classes+1];
+ struct { int prio; SCM list; } lists[num_classes + 1];
int i = 0;
for (SCM cl = class_list; scm_is_pair (cl); cl = scm_cdr (cl))
{
SCM list = scm_hashq_ref (listeners_, scm_car (cl), SCM_EOL);
if (!scm_is_pair (list))
- num_classes--;
+ num_classes--;
else
- {
+ {
// bubblesort.
int prio = scm_to_int (scm_caar (list));
- int j;
- for (j = i; j > 0 && lists[j-1].prio > prio; j--)
- lists[j] = lists[j-1];
- lists[j].prio = prio;
- lists[j].list = list;
- i++;
+ int j;
+ for (j = i; j > 0 && lists[j - 1].prio > prio; j--)
+ lists[j] = lists[j - 1];
+ lists[j].prio = prio;
+ lists[j].list = list;
+ i++;
}
}
lists[num_classes].prio = INT_MAX;
Listener *l = unsmob_listener (scm_cdar (lists[0].list));
l->listen (ev->self_scm ());
+#if 0
sent = true;
+#endif
}
// go to the next listener; bubble-sort the class list.
SCM next = scm_cdr (lists[0].list);
if (!scm_is_pair (next))
num_classes--;
int prio = (scm_is_pair (next)) ? scm_to_int (scm_caar (next)) : INT_MAX;
- for (i = 0; prio > lists[i+1].prio; i++)
- lists[i] = lists[i+1];
+ for (i = 0; prio > lists[i + 1].prio; i++)
+ lists[i] = lists[i + 1];
lists[i].prio = prio;
lists[i].list = next;
}
-/* TODO: Uncomment.
+#if 0
+ /* TODO: Uncomment. */
if (!sent)
warning (_f ("Junking event: %s", ly_symbol2string (class_symbol).c_str ()));
-*/
+#endif
+}
+
+bool
+Dispatcher::is_listened_class (SCM cl)
+{
+ for (; scm_is_pair (cl); cl = scm_cdr (cl))
+ {
+ SCM list = scm_hashq_ref (listeners_, scm_car (cl), SCM_EOL);
+ if (scm_is_pair (list))
+ return true;
+ }
+ return false;
+}
+
+static SCM
+accumulate_types (void * /* closure */,
+ SCM key,
+ SCM val,
+ SCM result)
+{
+ if (scm_is_pair (val))
+ return scm_cons (key, result);
+ return result;
+}
+
+SCM
+Dispatcher::listened_types ()
+{
+ return scm_internal_hash_fold ((scm_t_hash_fold_fn) &accumulate_types,
+ NULL, SCM_EOL, listeners_);
}
void
/* Tell all dispatchers that we listen to, that we want to hear ev_class
events */
for (SCM disp = dispatchers_; scm_is_pair (disp); disp = scm_cdr (disp))
- {
- int priority = scm_to_int (scm_cdar (disp));
- Dispatcher *d = unsmob_dispatcher (scm_caar (disp));
- d->internal_add_listener (GET_LISTENER (dispatch), ev_class, priority);
- }
+ {
+ int priority = scm_to_int (scm_cdar (disp));
+ Dispatcher *d = unsmob_dispatcher (scm_caar (disp));
+ d->internal_add_listener (GET_LISTENER (dispatch), ev_class, priority);
+ }
listen_classes_ = scm_cons (ev_class, listen_classes_);
}
SCM entry = scm_cons (scm_from_int (priority), l.smobbed_copy ());
while (scm_is_pair (scm_cdr (e)))
if (*unsmob_listener (scm_cdadr (e)) == l && first)
{
- scm_set_cdr_x (e, scm_cddr (e));
- first = false;
- break;
+ scm_set_cdr_x (e, scm_cddr (e));
+ first = false;
+ break;
}
else
e = scm_cdr (e);
scm_hashq_set_x (listeners_, ev_class, list);
if (first)
- warning ("Attempting to remove nonexisting listener.");
+ warning (_ ("Attempting to remove nonexisting listener."));
else if (!scm_is_pair (list))
{
/* Unregister with all dispatchers. */
for (SCM disp = dispatchers_; scm_is_pair (disp); disp = scm_cdr (disp))
- {
- Dispatcher *d = unsmob_dispatcher (scm_caar (disp));
- d->remove_listener (GET_LISTENER (dispatch), ev_class);
- }
+ {
+ Dispatcher *d = unsmob_dispatcher (scm_caar (disp));
+ d->remove_listener (GET_LISTENER (dispatch), ev_class);
+ }
listen_classes_ = scm_delq_x (ev_class, listen_classes_);
}
}
// Don't register twice to the same dispatcher.
if (scm_assq (disp->self_scm (), dispatchers_) != SCM_BOOL_F)
{
- warning ("Already listening to dispatcher, ignoring request");
+ warning (_ ("Already listening to dispatcher, ignoring request"));
return;
}
projects / lilypond.git / blobdiff