479 (Some(Protocol.command_status(status, markup)), color) |
479 (Some(Protocol.command_status(status, markup)), color) |
480 case (_, Text.Info(_, XML.Elem(Markup(Markup.BAD, _), _))) => |
480 case (_, Text.Info(_, XML.Elem(Markup(Markup.BAD, _), _))) => |
481 (None, Some(bad_color)) |
481 (None, Some(bad_color)) |
482 case (_, Text.Info(_, XML.Elem(Markup(Markup.INTENSIFY, _), _))) => |
482 case (_, Text.Info(_, XML.Elem(Markup(Markup.INTENSIFY, _), _))) => |
483 (None, Some(intensify_color)) |
483 (None, Some(intensify_color)) |
484 case (acc, Text.Info(_, elem @ XML.Elem(Markup(Markup.DIALOG, _), _))) => |
484 case (acc, Text.Info(_, Protocol.Dialog(_, serial, result))) => |
485 // FIXME pattern match problem in scala-2.9.2 (!??) |
485 command_state.results.get(serial) match { |
486 elem match { |
486 case Some(Protocol.Dialog_Result(res)) if res == result => |
487 case Protocol.Dialog(_, serial, result) => |
487 (None, Some(active_result_color)) |
488 command_state.results.get(serial) match { |
488 case _ => |
489 case Some(Protocol.Dialog_Result(res)) if res == result => |
489 (None, Some(active_color)) |
490 (None, Some(active_result_color)) |
|
491 case _ => |
|
492 (None, Some(active_color)) |
|
493 } |
|
494 case _ => acc |
|
495 } |
490 } |
496 case (_, Text.Info(_, XML.Elem(markup, _))) if active_include(markup.name) => |
491 case (_, Text.Info(_, XML.Elem(markup, _))) if active_include(markup.name) => |
497 (None, Some(active_color)) |
492 (None, Some(active_color)) |
498 }) |
493 }) |
499 color <- |
494 color <- |