Make highlight colours configurable.

res/com/dmdirc/config/defaults/default/defaults

@@ -174,6 +174,8 @@ ui:
   miscellaneousNotificationColour=3
   messageNotificationColour=12
   highlightNotificationColour=4
+  highlightLineBackgroundColour=F9C4BB
+  highlightLineForegroundColour=
 
 treeview:
   dragSelection=true

src/com/dmdirc/Server.java

@@ -55,6 +55,7 @@ import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.messages.BackBufferFactory;
+import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.Formatter;
 import com.dmdirc.ui.messages.HighlightManager;
 import com.dmdirc.ui.messages.sink.MessageSinkManager;
@@ -239,7 +240,9 @@ public class Server extends FrameContainer implements Connection {
         getConfigManager().addChangeListener("formatter", "serverName", configListener);
         getConfigManager().addChangeListener("formatter", "serverTitle", configListener);
 
-        this.highlightManager = new HighlightManager();
+        this.highlightManager = new HighlightManager(getConfigManager(),
+                new ColourManager(getConfigManager(), getEventBus()));
+        highlightManager.init();
         getEventBus().subscribe(highlightManager);
     }
 
@@ -852,6 +855,7 @@ public class Server extends FrameContainer implements Connection {
         synchronized (myStateLock) {
             eventHandler.unregisterCallbacks();
             getConfigManager().removeListener(configListener);
+            highlightManager.stop();
             getEventBus().unsubscribe(highlightManager);
             executorService.shutdown();
 

src/com/dmdirc/ui/messages/HighlightManager.java

@@ -22,16 +22,21 @@
 
 package com.dmdirc.ui.messages;
 
+import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.events.BaseChannelTextEvent;
 import com.dmdirc.events.BaseQueryTextEvent;
 import com.dmdirc.events.ChannelHighlightEvent;
 import com.dmdirc.events.DisplayProperty;
+import com.dmdirc.events.DisplayableEvent;
 import com.dmdirc.events.QueryHighlightEvent;
 import com.dmdirc.events.ServerConnectedEvent;
 import com.dmdirc.events.ServerNickchangeEvent;
 import com.dmdirc.interfaces.User;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.util.colours.Colour;
 
+import com.google.common.base.Strings;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Optional;
@@ -48,35 +53,80 @@ public class HighlightManager {
             "(\\p{Space}|\\p{Punct}|$).*";
 
     private final Collection<Pattern> patterns = new ArrayList<>();
+    private final AggregateConfigProvider configProvider;
+    private final ColourManager colourManager;
 
     private Optional<Pattern> nicknamePattern = Optional.empty();
 
+    private Optional<Colour> backgroundColour = Optional.of(Colour.RED);
+    private Optional<Colour> foregroundColour = Optional.empty();
+
+    public HighlightManager(
+            final AggregateConfigProvider configProvider,
+            final ColourManager colourManager) {
+        this.configProvider = configProvider;
+        this.colourManager = colourManager;
+    }
+
+    public void init() {
+        configProvider.getBinder().bind(this, HighlightManager.class);
+    }
+
+    public void stop() {
+        configProvider.getBinder().unbind(this);
+    }
+
     @Handler
-    public void handleChannelMessage(final BaseChannelTextEvent event) {
+    void handleChannelMessage(final BaseChannelTextEvent event) {
         if (patterns.stream().anyMatch(p -> p.matcher(event.getMessage()).matches())) {
-            event.setDisplayProperty(DisplayProperty.BACKGROUND_COLOUR, Colour.RED);
+            setColours(event);
             event.getChannel().getEventBus().publishAsync(new ChannelHighlightEvent(event));
         }
     }
 
     @Handler
-    public void handleQueryMessage(final BaseQueryTextEvent event) {
+    void handleQueryMessage(final BaseQueryTextEvent event) {
         if (patterns.stream().anyMatch(p -> p.matcher(event.getMessage()).matches())) {
-            event.setDisplayProperty(DisplayProperty.BACKGROUND_COLOUR, Colour.RED);
+            setColours(event);
             event.getQuery().getEventBus().publishAsync(new QueryHighlightEvent(event));
         }
     }
 
     @Handler
-    public void handleNickChange(final ServerNickchangeEvent event) {
+    void handleNickChange(final ServerNickchangeEvent event) {
         setNickname(event.getNewNick());
     }
 
     @Handler
-    public void handleConnected(final ServerConnectedEvent event) {
+    void handleConnected(final ServerConnectedEvent event) {
         event.getConnection().getLocalUser().map(User::getNickname).ifPresent(this::setNickname);
     }
 
+    @ConfigBinding(domain = "ui", key = "highlightLineForegroundColour")
+    void handleForegroundColour(final String value) {
+        if (Strings.isNullOrEmpty(value)) {
+            foregroundColour = Optional.empty();
+        } else {
+            foregroundColour = Optional.ofNullable(colourManager.getColourFromString(value, null));
+        }
+    }
+
+    @ConfigBinding(domain = "ui", key = "highlightLineBackgroundColour")
+    void handleBackgroundColour(final String value) {
+        if (Strings.isNullOrEmpty(value)) {
+            backgroundColour = Optional.empty();
+        } else {
+            backgroundColour = Optional.ofNullable(colourManager.getColourFromString(value, null));
+        }
+    }
+
+    private void setColours(final DisplayableEvent event) {
+        backgroundColour.ifPresent(
+                c -> event.setDisplayProperty(DisplayProperty.BACKGROUND_COLOUR, c));
+        foregroundColour.ifPresent(
+                c -> event.setDisplayProperty(DisplayProperty.FOREGROUND_COLOUR, c));
+    }
+
     private void setNickname(final String newNick) {
         nicknamePattern.ifPresent(patterns::remove);
         nicknamePattern = Optional.of(compile(newNick));