130 val tracing_message_color = color_value("tracing_message_color") |
130 val tracing_message_color = color_value("tracing_message_color") |
131 val warning_message_color = color_value("warning_message_color") |
131 val warning_message_color = color_value("warning_message_color") |
132 val error_message_color = color_value("error_message_color") |
132 val error_message_color = color_value("error_message_color") |
133 val bad_color = color_value("bad_color") |
133 val bad_color = color_value("bad_color") |
134 val intensify_color = color_value("intensify_color") |
134 val intensify_color = color_value("intensify_color") |
|
135 val information_color = color_value("information_color") |
135 val quoted_color = color_value("quoted_color") |
136 val quoted_color = color_value("quoted_color") |
136 val antiquoted_color = color_value("antiquoted_color") |
137 val antiquoted_color = color_value("antiquoted_color") |
137 val highlight_color = color_value("highlight_color") |
138 val highlight_color = color_value("highlight_color") |
138 val hyperlink_color = color_value("hyperlink_color") |
139 val hyperlink_color = color_value("hyperlink_color") |
139 val active_color = color_value("active_color") |
140 val active_color = color_value("active_color") |
467 } |
468 } |
468 |
469 |
469 |
470 |
470 private val background1_include = |
471 private val background1_include = |
471 Protocol.command_status_markup + Markup.WRITELN_MESSAGE + Markup.TRACING_MESSAGE + |
472 Protocol.command_status_markup + Markup.WRITELN_MESSAGE + Markup.TRACING_MESSAGE + |
472 Markup.WARNING_MESSAGE + Markup.ERROR_MESSAGE + Markup.BAD + Markup.INTENSIFY ++ |
473 Markup.WARNING_MESSAGE + Markup.ERROR_MESSAGE + Markup.BAD + Markup.INTENSIFY + |
473 active_include |
474 Markup.INFORMATION ++ active_include |
474 |
475 |
475 def background1(range: Text.Range): Stream[Text.Info[Color]] = |
476 def background1(range: Text.Range): Stream[Text.Info[Color]] = |
476 { |
477 { |
477 if (snapshot.is_outdated) Stream(Text.Info(range, outdated_color)) |
478 if (snapshot.is_outdated) Stream(Text.Info(range, outdated_color)) |
478 else |
479 else |
486 (Some(Protocol.command_status(status, markup)), color) |
487 (Some(Protocol.command_status(status, markup)), color) |
487 case (_, Text.Info(_, XML.Elem(Markup(Markup.BAD, _), _))) => |
488 case (_, Text.Info(_, XML.Elem(Markup(Markup.BAD, _), _))) => |
488 (None, Some(bad_color)) |
489 (None, Some(bad_color)) |
489 case (_, Text.Info(_, XML.Elem(Markup(Markup.INTENSIFY, _), _))) => |
490 case (_, Text.Info(_, XML.Elem(Markup(Markup.INTENSIFY, _), _))) => |
490 (None, Some(intensify_color)) |
491 (None, Some(intensify_color)) |
|
492 case (_, Text.Info(_, XML.Elem(Markup(Markup.INFORMATION, _), _))) => |
|
493 (None, Some(information_color)) |
491 case (acc, Text.Info(_, Protocol.Dialog(_, serial, result))) => |
494 case (acc, Text.Info(_, Protocol.Dialog(_, serial, result))) => |
492 command_state.results.get(serial) match { |
495 command_state.results.get(serial) match { |
493 case Some(Protocol.Dialog_Result(res)) if res == result => |
496 case Some(Protocol.Dialog_Result(res)) if res == result => |
494 (None, Some(active_result_color)) |
497 (None, Some(active_result_color)) |
495 case _ => |
498 case _ => |