Import Plugins

src/com/dmdirc/addons/audio/AudioCommand.java

@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.audio;
+
+import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.commands.GlobalCommand;
+import com.dmdirc.ui.interfaces.InputWindow;
+
+import java.io.File;
+
+/**
+ * The Audio Command allows playing of audio files.
+ *
+ * @author Shane "Dataforce" Mc Cormack
+ */
+public final class AudioCommand extends GlobalCommand {
+
+    /**
+     * Creates a new instance of LoggingCommand.
+     */
+    public AudioCommand() {
+        super();
+        CommandManager.registerCommand(this);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void execute(final InputWindow origin, final boolean isSilent,
+                        final CommandArguments args) {
+        final String filename = args.getArgumentsAsString();
+        final File file = new File(filename);
+        if (file.exists()) {
+            if (AudioPlayer.isValid(file)) {
+                new AudioPlayer(file).play();
+            } else {
+                sendLine(origin, isSilent, FORMAT_ERROR, "Invalid file type");
+            }
+        } else {
+            sendLine(origin, isSilent, FORMAT_ERROR, "File does not exist");
+        }
+    }
+
+    /**
+     * Returns this command's name.
+     *
+     * @return The name of this command
+     */
+    @Override
+    public String getName() {
+        return "audio";
+    }
+
+    /**
+     * Returns whether or not this command should be shown in help messages.
+     *
+     * @return True iff the command should be shown, false otherwise
+     */
+    @Override
+    public boolean showInHelp() {
+        return true;
+    }
+
+    /**
+     * Returns a string representing the help message for this command.
+     *
+     * @return the help message for this command
+     */
+    @Override
+    public String getHelp() {
+        return this.getName() + " <file>";
+    }
+
+}
+

src/com/dmdirc/addons/audio/AudioPlayer.java

@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.audio;
+
+import java.io.File;
+import java.io.IOException;
+import java.applet.AudioClip;
+import java.applet.Applet;
+
+import javax.sound.sampled.UnsupportedAudioFileException;
+import javax.sound.sampled.AudioSystem;
+
+import java.net.MalformedURLException;
+
+/**
+ * The AudioPlayer handles the playing of the audio
+ *
+ * @author Shane "Dataforce" Mc Cormack
+ */
+public final class AudioPlayer implements Runnable {
+
+    /** The AudioType enum */
+    public static enum AudioType {
+
+        WAV, INVALID;
+
+    }
+
+    /** The file object of the file to play */
+    final File myFile;
+
+    /**
+     * Create the AudioPlayer
+     *
+     * @param file The file to play
+     */
+    public AudioPlayer(final File file) {
+        myFile = file;
+    }
+
+    /**
+     * Play this AudioPlayer.
+     */
+    public void play() {
+        new Thread(this).start();
+    }
+
+    /**
+     * Run this AudioPlayer (Should not be invoked directly).
+     */
+    @Override
+    public void run() {
+        final AudioType type = getAudioType(myFile);
+        switch (type) {
+            case WAV:
+                playWav();
+                break;
+            default:
+                break;
+        }
+    }
+
+    /**
+     * Check if this File is a supported file type
+     *
+     * @param file the File to check
+     * @return true if playable, else false.
+     */
+    public static boolean isValid(final File file) {
+        final AudioType type = getAudioType(file);
+        return (type != AudioType.INVALID);
+    }
+
+    /**
+     * Get the AudioType of a given file
+     *
+     * @param file the File to check
+     * @return AudioType for this file.
+     */
+    public static AudioType getAudioType(final File file) {
+        AudioType type;
+        try {
+            AudioSystem.getAudioInputStream(file);
+            type = AudioType.WAV;
+        } catch (UnsupportedAudioFileException e) {
+            type = AudioType.INVALID;
+        } catch (IOException e) {
+            type = AudioType.INVALID;
+        }
+        return type;
+    }
+
+    /**
+     * Play the file as a wav file, using the Applet class.
+     * (This code seems to work better than the non-applet version, but can't play
+     * streams)
+     */
+    private void playWav() {
+        try {
+            final AudioClip ac = Applet.newAudioClip(myFile.toURI().toURL());
+            if (ac != null) {
+                ac.play();
+            }
+        } catch (MalformedURLException e) {
+        }
+    }
+
+}

src/com/dmdirc/addons/audio/AudioPlugin.java

@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.audio;
+
+import com.dmdirc.plugins.Plugin;
+import com.dmdirc.commandparser.CommandManager;
+
+/**
+ * Adds Audio playing facility to client.
+ *
+ * @author Shane 'Dataforce' McCormack
+ */
+public final class AudioPlugin extends Plugin {
+
+    /** The AudioCommand we created */
+    private AudioCommand audioCommand = null;
+
+    /** The BeepCommand we created */
+    private BeepCommand beepCommand = null;
+
+    /**
+     * Creates a new instance of the Audio Plugin.
+     */
+    public AudioPlugin() {
+        super();
+    }
+
+    /**
+     * Called when the plugin is loaded.
+     */
+    @Override
+    public void onLoad() {
+        audioCommand = new AudioCommand();
+        beepCommand = new BeepCommand();
+    }
+
+    /**
+     * Called when this plugin is Unloaded
+     */
+    @Override
+    public void onUnload() {
+        CommandManager.unregisterCommand(beepCommand);
+        CommandManager.unregisterCommand(audioCommand);
+    }
+
+}
+

src/com/dmdirc/addons/audio/BeepCommand.java

@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.audio;
+
+import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.commands.GlobalCommand;
+import com.dmdirc.ui.interfaces.InputWindow;
+
+import java.awt.Toolkit;
+
+/**
+ * The Beep Command emits a beep
+ *
+ * @author Shane "Dataforce" Mc Cormack
+ */
+public final class BeepCommand extends GlobalCommand {
+
+    /**
+     * Creates a new instance of BeepCommand.
+     */
+    public BeepCommand() {
+        super();
+        CommandManager.registerCommand(this);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void execute(final InputWindow origin, final boolean isSilent,
+                        final CommandArguments args) {
+        Toolkit.getDefaultToolkit().beep();
+    }
+
+    /**
+     * Returns this command's name.
+     *
+     * @return The name of this command
+     */
+    @Override
+    public String getName() {
+        return "beep";
+    }
+
+    /**
+     * Returns whether or not this command should be shown in help messages.
+     *
+     * @return True iff the command should be shown, false otherwise
+     */
+    @Override
+    public boolean showInHelp() {
+        return true;
+    }
+
+    /**
+     * Returns a string representing the help message for this command.
+     *
+     * @return the help message for this command
+     */
+    @Override
+    public String getHelp() {
+        return this.getName();
+    }
+
+}
+

src/com/dmdirc/addons/audio/plugin.config

@@ -0,0 +1,25 @@
+# This is a DMDirc configuration file.
+
+# This section indicates which sections below take key/value
+# pairs, rather than a simple list. It should be placed above
+# any sections that take key/values.
+keysections:
+  metadata
+  updates
+  version
+
+metadata:
+  author=Shane <shane@dmdirc.com>
+  mainclass=com.dmdirc.addons.audio.AudioPlugin
+  description=Allows playing audio files
+  name=audio
+  nicename=Audio Plugin
+
+updates:
+  id=14
+
+version:
+  friendly=0.3
+
+provides:
+  audio command

src/com/dmdirc/addons/dcc/DCC.java

@@ -0,0 +1,343 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc;
+
+import java.net.Socket;
+import java.net.ServerSocket;
+import java.io.IOException;
+import java.util.concurrent.Semaphore;
+
+/**
+ * This class handles the main "grunt work" of DCC, subclasses process the data
+ * received by this class.
+ *
+ * @author Shane 'Dataforce' McCormack
+ */
+public abstract class DCC implements Runnable {
+
+    /** Address. */
+    protected long address = 0;
+
+    /** Port. */
+    protected int port = 0;
+
+    /** Socket used to communicate with. */
+    protected Socket socket;
+
+    /** The Thread in use for this. */
+    private volatile Thread myThread;
+
+    /** Are we already running? */
+    protected boolean running = false;
+
+    /** Are we a listen socket? */
+    protected boolean listen = false;
+
+    /**
+     * The current socket in use if this is a listen socket.
+     * This reference may be changed if and only if exactly one permit from the
+     * <code>serverSocketSem</code> and <code>serverListenignSem</code>
+     * semaphores is held by the thread doing the modification.
+     */
+    private ServerSocket serverSocket;
+
+    /**
+     * Semaphore to control write access to ServerSocket.
+     * If an object acquires a permit from the <code>serverSocketSem</code>, then
+     * <code>serverSocket</code> is <em>guaranteed</em> not to be externally
+     * modified until that permit is released, <em>unless</em> the object also
+     * acquires a permit from the <code>serverListeningSem</code>.
+     */
+    private final Semaphore serverSocketSem = new Semaphore(1);
+
+    /**
+     * Semaphore used when we're blocking waiting for connections.
+     * If an object acquires a permit from the <code>serverListeningSem</code>,
+     * then it is <em>guaranteed</em> that the {@link #run()} method is blocking
+     * waiting for incoming connections. In addition, it is <em>guaranteed</em>
+     * that the {@link #run()} method is holding the <code>serverSocketSem</code>
+     * permit, and it will continue holding that permit until it can reaquire
+     * the <code>serverListeningSem</code> permit.
+     */
+    private final Semaphore serverListeningSem = new Semaphore(0);
+
+    /**
+     * Creates a new instance of DCC.
+     */
+    public DCC() {
+        super();
+    }
+
+    /**
+     * Connect this dcc.
+     */
+    public void connect() {
+        try {
+            if (listen) {
+                address = 0;
+                port = serverSocket.getLocalPort();
+            } else {
+                // socket = new Socket(longToIP(address), port, bindIP, 0);
+                socket = new Socket(longToIP(address), port);
+                socketOpened();
+            }
+        } catch (IOException ioe) {
+            socketClosed();
+            return;
+        }
+
+        myThread = new Thread(this);
+        myThread.start();
+    }
+
+    /**
+     * Start a listen socket rather than a connect socket.
+     *
+     * @throws IOException If the listen socket can't be created
+     */
+    public void listen() throws IOException {
+        serverSocketSem.acquireUninterruptibly();
+        serverSocket = new ServerSocket(0, 1);
+        serverSocketSem.release();
+
+        listen = true;
+        connect();
+    }
+
+    /**
+     * Start a listen socket rather than a connect socket, use a port from the
+     * given range.
+     *
+     * @param startPort Port to try first
+     * @param endPort Last port to try.
+     * @throws IOException If no sockets were available in the given range
+     */
+    public void listen(final int startPort, final int endPort) throws IOException {
+        listen = true;
+
+        for (int i = startPort; i <= endPort; ++i) {
+            try {
+                serverSocketSem.acquireUninterruptibly();
+                serverSocket = new ServerSocket(i, 1);
+                serverSocketSem.release();
+                // Found a socket we can use!
+                break;
+            } catch (IOException ioe) {
+                // Try next socket.
+            } catch (SecurityException se) {
+                // Try next socket.
+            }
+        }
+
+        if (serverSocket == null) {
+            throw new IOException("No available sockets in range " + startPort + ":" + endPort);
+        } else {
+            connect();
+        }
+    }
+
+    /**
+     * This handles the socket to keep it out of the main thread
+     */
+    @Override
+    public void run() {
+        if (running) {
+            return;
+        }
+        running = true;
+        // handleSocket is implemented by sub classes, and should return false
+        // when the socket is closed.
+        Thread thisThread = Thread.currentThread();
+
+        while (myThread == thisThread) {
+            serverSocketSem.acquireUninterruptibly();
+
+            if (serverSocket == null) {
+                serverSocketSem.release();
+
+                if (!handleSocket()) {
+                    close();
+                    break;
+                }
+            } else {
+                try {
+                    serverListeningSem.release();
+                    socket = serverSocket.accept();
+                    serverSocket.close();
+                    socketOpened();
+                } catch (IOException ioe) {
+                    socketClosed();
+                    break;
+                } finally {
+                    serverListeningSem.acquireUninterruptibly();
+                    serverSocket = null;
+                    serverSocketSem.release();
+                }
+            }
+
+            // Sleep for a short period of time to reduce CPU usage.
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException ie) {
+            }
+        }
+        // Socket closed
+
+        thisThread = null;
+        running = false;
+    }
+
+    /**
+     * Called to close the socket
+     */
+    protected void close() {
+        boolean haveSLS = false;
+
+        while (!serverSocketSem.tryAcquire() && !(haveSLS = serverListeningSem.tryAcquire())) {
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException ex) {
+                // Do we care? I doubt we do! Should be unchecked damnit.
+            }
+        }
+
+        if (serverSocket != null) {
+            try {
+                if (!serverSocket.isClosed()) {
+                    serverSocket.close();
+                }
+            } catch (IOException ioe) {
+            }
+            serverSocket = null;
+        }
+
+        if (haveSLS) {
+            serverListeningSem.release();
+        } else {
+            serverSocketSem.release();
+        }
+
+        if (socket != null) {
+            try {
+                if (!socket.isClosed()) {
+                    socket.close();
+                }
+            } catch (IOException ioe) {
+            }
+            socketClosed();
+            socket = null;
+        }
+    }
+
+    /**
+     * Called when the socket is first opened, before any data is handled.
+     */
+    protected void socketOpened() {
+    }
+
+    /**
+     * Called when the socket is closed, before the thread terminates.
+     */
+    protected void socketClosed() {
+    }
+
+    /**
+     * Check if this socket can be written to.
+     *
+     * @return True if the socket is writable, false otehrwise
+     */
+    public boolean isWriteable() {
+        return false;
+    }
+
+    /**
+     * Handle the socket.
+     *
+     * @return false when socket is closed, true will cause the method to be
+     *         called again.
+     */
+    protected abstract boolean handleSocket();
+
+    /**
+     * Set the address to connect to for this DCC
+     *
+     * @param address Address as an int (Network Byte Order, as specified in the DCC CTCP)
+     * @param port Port to connect to
+     */
+    public void setAddress(final long address, final int port) {
+        this.address = address;
+        this.port = port;
+    }
+
+    /**
+     * Is this a listening socket
+     *
+     * @return True if this is a listening socket
+     */
+    public boolean isListenSocket() {
+        return listen;
+    }
+
+    /**
+     * Get the host this socket is listening on/connecting to
+     *
+     * @return The IP that this socket is listening on/connecting to.
+     */
+    public String getHost() {
+        return longToIP(address);
+    }
+
+    /**
+     * Get the port this socket is listening on/connecting to
+     *
+     * @return The port that this socket is listening on/connecting to.
+     */
+    public int getPort() {
+        return port;
+    }
+
+    /**
+     * Convert the given IP Address to a long
+     *
+     * @param ip Input IP Address
+     * @return ip as a long
+     */
+    public static long ipToLong(final String ip) {
+        final String bits[] = ip.split("\\.");
+        if (bits.length > 3) {
+            return (Long.parseLong(bits[0]) << 24) + (Long.parseLong(bits[1]) << 16) + (Long.parseLong(bits[2]) << 8) + Long.parseLong(bits[3]);
+        }
+        return 0;
+    }
+
+    /**
+     * Convert the given long to an IP Address
+     *
+     * @param in Input long
+     * @return long as an IP
+     */
+    public static String longToIP(final long in) {
+        return ((in & 0xff000000) >> 24) + "." + ((in & 0x00ff0000) >> 16) + "." + ((in & 0x0000ff00) >> 8) + "." + (in & 0x000000ff);
+    }
+
+}

src/com/dmdirc/addons/dcc/DCCChat.java

@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+
+/**
+ * This class handles a DCC Chat
+ *
+ * @author Shane 'Dataforce' McCormack
+ */
+public class DCCChat extends DCC {
+
+    /** The handler for this DCCChat. */
+    private DCCChatInterface handler = null;
+
+    /** Used to send data out the socket. */
+    private PrintWriter out;
+
+    /** Used to read data from the socket. */
+    private BufferedReader in;
+
+    /**
+     * Creates a new instance of DCCChat.
+     */
+    public DCCChat() {
+        super();
+    }
+
+    /**
+     * Change the handler for this DCC Chat.
+     *
+     * @param handler A class implementing DCCChatInterface
+     */
+    public void setHandler(final DCCChatInterface handler) {
+        this.handler = handler;
+    }
+
+    /**
+     * Called when the socket is first opened, before any data is handled.
+     */
+    @Override
+    protected void socketOpened() {
+        try {
+            out = new PrintWriter(socket.getOutputStream(), true);
+            in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+            if (handler != null) {
+                handler.socketOpened(this);
+            }
+        } catch (IOException ioe) {
+            socketClosed();
+        }
+    }
+
+    /**
+     * Called when the socket is closed, before the thread terminates.
+     */
+    @Override
+    protected void socketClosed() {
+        out = null;
+        in = null;
+        if (handler != null) {
+            handler.socketClosed(this);
+        }
+    }
+
+    /**
+     * Handle the socket.
+     *
+     * @return false when socket is closed, true will cause the method to be
+     *         called again.
+     */
+    @Override
+    protected boolean handleSocket() {
+        if (out == null || in == null) {
+            return false;
+        }
+        final String inLine;
+        try {
+            inLine = in.readLine();
+            if (inLine == null) {
+                return false;
+            } else {
+                if (handler != null) {
+                    handler.handleChatMessage(this, inLine);
+                }
+                return true;
+            }
+        } catch (IOException e) {
+            return false;
+        }
+    }
+
+    /**
+     * Check if this socket can be written to.
+     */
+    @Override
+    public boolean isWriteable() {
+        return out != null;
+    }
+
+    /**
+     * Send a line out the socket.
+     *
+     * @param line The line to be sent
+     */
+    public void sendLine(final String line) {
+        if (out != null) {
+            out.printf("%s\r\n", line);
+        }
+    }
+
+}

src/com/dmdirc/addons/dcc/DCCChatInterface.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc;
+
+/**
+ * This interfaces allows DCC Chat Windows to receive data from a DCCChat
+ *
+ * @author Shane 'Dataforce' McCormack
+ */
+public interface DCCChatInterface {
+
+    /**
+     * Handle a received message
+     *
+     * @param dcc The DCCChat that this message is from
+     * @param message The message
+     */
+    void handleChatMessage(final DCCChat dcc, final String message);
+
+    /**
+     * Called when the socket is closed
+     *
+     * @param dcc The DCCChat that this message is from
+     */
+    void socketClosed(final DCCChat dcc);
+
+    /**
+     * Called when the socket is opened
+     *
+     * @param dcc The DCCChat that this message is from
+     */
+    void socketOpened(final DCCChat dcc);
+
+}

src/com/dmdirc/addons/dcc/DCCChatWindow.java

@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc;
+
+import com.dmdirc.actions.ActionManager;
+import com.dmdirc.addons.dcc.actions.DCCActions;
+import com.dmdirc.Main;
+
+/**
+ * This class links DCC Chat objects to a window.
+ *
+ * @author Shane 'Dataforce' McCormack
+ */
+public class DCCChatWindow extends DCCFrame implements DCCChatInterface {
+
+    /** The DCCChat object we are a window for */
+    private final DCCChat dcc;
+
+    /** My Nickname */
+    private final String nickname;
+
+    /** Other Nickname */
+    private final String otherNickname;
+
+    /**
+     * Creates a new instance of DCCChatWindow with a given DCCChat object.
+     *
+     * @param plugin the DCC Plugin responsible for this window
+     * @param dcc The DCCChat object this window wraps around
+     * @param title The title of this window
+     * @param nick My Current Nickname
+     * @param targetNick Nickname of target
+     */
+    public DCCChatWindow(final DCCPlugin plugin, final DCCChat dcc, final String title, final String nick, final String targetNick) {
+        super(plugin, title, "dcc-chat-inactive", false);
+        this.dcc = dcc;
+        dcc.setHandler(this);
+        nickname = nick;
+        otherNickname = targetNick;
+
+        myWindow = Main.getUI().getInputWindow(this, DCCCommandParser.getDCCCommandParser());
+        plugin.addWindow(this);
+
+        myWindow.setTitle(title);
+        myWindow.open();
+    }
+
+    /**
+     * Get the DCCChat Object associated with this window
+     *
+     * @return The DCCChat Object associated with this window
+     */
+    public DCCChat getDCC() {
+        return dcc;
+    }
+
+    /**
+     * Sends a line of text to this container's source.
+     *
+     * @param line The line to be sent
+     */
+    @Override
+    public void sendLine(final String line) {
+        if (dcc.isWriteable()) {
+            final StringBuffer buff = new StringBuffer("DCCChatSelfMessage");
+            ActionManager.processEvent(DCCActions.DCC_CHAT_SELFMESSAGE, buff, this, line);
+            addLine(buff, nickname, myWindow.getTranscoder().encode(line));
+            dcc.sendLine(line);
+        } else {
+            final StringBuffer buff = new StringBuffer("DCCChatError");
+            addLine(buff, "Socket is closed.", myWindow.getTranscoder().encode(line));
+        }
+    }
+
+    /**
+     * Handle a received message
+     *
+     * @param dcc The DCCChat that this message is from
+     * @param message The message
+     */
+    @Override
+    public void handleChatMessage(final DCCChat dcc, final String message) {
+        final StringBuffer buff = new StringBuffer("DCCChatMessage");
+        ActionManager.processEvent(DCCActions.DCC_CHAT_MESSAGE, buff, this, otherNickname, message);
+        addLine(buff, otherNickname, myWindow.getTranscoder().encode(message));
+    }
+
+    /**
+     * Called when the socket is closed
+     *
+     * @param dcc The DCCChat that this message is from
+     */
+    @Override
+    public void socketClosed(final DCCChat dcc) {
+        final StringBuffer buff = new StringBuffer("DCCChatInfo");
+        ActionManager.processEvent(DCCActions.DCC_CHAT_SOCKETCLOSED, buff, this);
+        addLine(buff, "Socket closed");
+        if (!isWindowClosing()) {
+            setIcon("dcc-chat-inactive");
+        }
+    }
+
+    /**
+     * Called when the socket is opened
+     *
+     * @param dcc The DCCChat that this message is from
+     */
+    @Override
+    public void socketOpened(final DCCChat dcc) {
+        final StringBuffer buff = new StringBuffer("DCCChatInfo");
+        ActionManager.processEvent(DCCActions.DCC_CHAT_SOCKETOPENED, buff, this);
+        addLine(buff, "Socket opened");
+        setIcon("dcc-chat-active");
+    }
+
+    /**
+     * Closes this container (and it's associated frame).
+     */
+    @Override
+    public void windowClosing() {
+        super.windowClosing();
+        dcc.close();
+    }
+
+}

src/com/dmdirc/addons/dcc/DCCCommand.java

@@ -0,0 +1,243 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc;
+
+import com.dmdirc.Main;
+import com.dmdirc.Server;
+import com.dmdirc.actions.ActionManager;
+import com.dmdirc.addons.dcc.actions.DCCActions;
+import com.dmdirc.addons.dcc.kde.KFileChooser;
+import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.commands.IntelligentCommand;
+import com.dmdirc.commandparser.commands.ServerCommand;
+import com.dmdirc.config.IdentityManager;
+import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.ui.input.AdditionalTabTargets;
+import com.dmdirc.ui.input.TabCompletionType;
+import com.dmdirc.ui.interfaces.InputWindow;
+
+import java.io.File;
+import java.util.List;
+
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.JOptionPane;
+
+/**
+ * This command allows starting dcc chats/file transfers
+ *
+ * @author Shane "Dataforce" Mc Cormack
+ */
+public final class DCCCommand extends ServerCommand implements IntelligentCommand {
+
+    /** My Plugin */
+    private final DCCPlugin myPlugin;
+
+    /**
+     * Creates a new instance of DCCCommand.
+     *
+     * @param plugin The DCC Plugin that this command belongs to
+     */
+    public DCCCommand(final DCCPlugin plugin) {
+        super();
+        myPlugin = plugin;
+        CommandManager.registerCommand(this);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void execute(final InputWindow origin, final Server server,
+                        final boolean isSilent, final CommandArguments args) {
+        if (args.getArguments().length > 1) {
+            final String type = args.getArguments()[0];
+            final String target = args.getArguments()[1];
+            final Parser parser = server.getParser();
+            final String myNickname = parser.getLocalClient().getNickname();
+
+            if (parser.isValidChannelName(target) || parser.getStringConverter().equalsIgnoreCase(target, myNickname)) {
+                final Thread errorThread = new Thread(new Runnable() {
+
+                    /** {@inheritDoc} */
+                    @Override
+                    public void run() {
+                        if (parser.getStringConverter().equalsIgnoreCase(target, myNickname)) {
+                            JOptionPane.showMessageDialog(null, "You can't DCC yourself.", "DCC Error", JOptionPane.ERROR_MESSAGE);
+                        } else {
+                            JOptionPane.showMessageDialog(null, "You can't DCC a channel.", "DCC Error", JOptionPane.ERROR_MESSAGE);
+                        }
+                    }
+
+                });
+                errorThread.start();
+                return;
+            }
+            if (type.equalsIgnoreCase("chat")) {
+                final DCCChat chat = new DCCChat();
+                if (myPlugin.listen(chat)) {
+                    final DCCChatWindow window = new DCCChatWindow(myPlugin, chat, "*Chat: " + target, myNickname, target);
+
+                    parser.sendCTCP(target, "DCC", "CHAT chat " + DCC.ipToLong(myPlugin.getListenIP(parser)) + " " + chat.getPort());
+
+                    ActionManager.processEvent(DCCActions.DCC_CHAT_REQUEST_SENT, null, server, target);
+
+                    sendLine(origin, isSilent, "DCCChatStarting", target, chat.getHost(), chat.getPort());
+                    window.getFrame().addLine("DCCChatStarting", target, chat.getHost(), chat.getPort());
+                } else {
+                    sendLine(origin, isSilent, "DCCChatError", "Unable to start chat with " + target + " - unable to create listen socket");
+                }
+            } else if (type.equalsIgnoreCase("send")) {
+                sendFile(target, origin, server, isSilent, args.getArgumentsAsString(2));
+            } else {
+                sendLine(origin, isSilent, FORMAT_ERROR, "Unknown DCC Type: '" + type + "'");
+            }
+        } else {
+            sendLine(origin, isSilent, FORMAT_ERROR, "Syntax: dcc <type> <target> [params]");
+        }
+    }
+
+    /**
+     * Ask for the file to send, then start the send.
+     *
+     * @param target Person this dcc is to.
+     * @param origin The InputWindow this command was issued on
+     * @param server The server instance that this command is being executed on
+     * @param isSilent Whether this command is silenced or not
+     * @param filename The file to send
+     * @since 0.6.3m1
+     */
+    public void sendFile(final String target, final InputWindow origin, final Server server, final boolean isSilent, final String filename) {
+        // New thread to ask the user what file to send
+        final File givenFile = new File(filename);
+        final Thread dccThread = new Thread(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                final JFileChooser jc = (givenFile.exists()) ? KFileChooser.getFileChooser(myPlugin, givenFile) : KFileChooser.getFileChooser(myPlugin);
+                int result;
+                if (!givenFile.exists() || !givenFile.isFile()) {
+                    jc.setDialogTitle("Send file to " + target + " - DMDirc ");
+                    jc.setFileSelectionMode(JFileChooser.FILES_ONLY);
+                    jc.setMultiSelectionEnabled(false);
+                    result = jc.showOpenDialog((JFrame) Main.getUI().getMainWindow());
+                } else {
+                    jc.setSelectedFile(givenFile);
+                    result = JFileChooser.APPROVE_OPTION;
+                }
+                if (result == JFileChooser.APPROVE_OPTION) {
+                    if (jc.getSelectedFile().length() == 0) {
+                        JOptionPane.showMessageDialog(null, "You can't send empty files over DCC.", "DCC Error", JOptionPane.ERROR_MESSAGE);
+                        return;
+                    } else if (!jc.getSelectedFile().exists()) {
+                        JOptionPane.showMessageDialog(null, "Invalid file specified", "DCC Error", JOptionPane.ERROR_MESSAGE);
+                        return;
+                    }
+                    final Parser parser = server.getParser();
+                    DCCSend send = new DCCSend(IdentityManager.getGlobalConfig().getOptionInt(myPlugin.getDomain(), "send.blocksize"));
+                    send.setTurbo(IdentityManager.getGlobalConfig().getOptionBool(myPlugin.getDomain(), "send.forceturbo"));
+                    send.setType(DCCSend.TransferType.SEND);
+
+                    ActionManager.processEvent(DCCActions.DCC_SEND_REQUEST_SENT, null, server, target, jc.getSelectedFile());
+
+                    sendLine(origin, isSilent, FORMAT_OUTPUT, "Starting DCC Send with: " + target);
+
+                    send.setFileName(jc.getSelectedFile().getAbsolutePath());
+                    send.setFileSize(jc.getSelectedFile().length());
+
+                    if (IdentityManager.getGlobalConfig().getOptionBool(myPlugin.getDomain(), "send.reverse")) {
+                        new DCCSendWindow(myPlugin, send, "Send: " + target, target, server);
+                        parser.sendCTCP(target, "DCC", "SEND \"" + jc.getSelectedFile().getName() + "\" " + DCC.ipToLong(myPlugin.getListenIP(parser)) + " 0 " + send.getFileSize() + " " + send.makeToken() + ((send.isTurbo()) ? " T" : ""));
+                    } else {
+                        if (myPlugin.listen(send)) {
+                            new DCCSendWindow(myPlugin, send, "*Send: " + target, target, server);
+                            parser.sendCTCP(target, "DCC", "SEND \"" + jc.getSelectedFile().getName() + "\" " + DCC.ipToLong(myPlugin.getListenIP(parser)) + " " + send.getPort() + " " + send.getFileSize() + ((send.isTurbo()) ? " T" : ""));
+                        } else {
+                            sendLine(origin, isSilent, "DCCSendError", "Unable to start dcc send with " + target + " - unable to create listen socket");
+                        }
+                    }
+                }
+            }
+
+        }, "openFileThread");
+        // Start the thread
+        dccThread.start();
+    }
+
+    /**
+     * Returns this command's name.
+     *
+     * @return The name of this command
+     */
+    @Override
+    public String getName() {
+        return "dcc";
+    }
+
+    /**
+     * Returns whether or not this command should be shown in help messages.
+     *
+     * @return True iff the command should be shown, false otherwise
+     */
+    @Override
+    public boolean showInHelp() {
+        return true;
+    }
+
+    /**
+     * Returns a string representing the help message for this command.
+     *
+     * @return the help message for this command
+     */
+    @Override
+    public String getHelp() {
+        return "dcc - Allows DCC";
+    }
+
+    /**
+     * Returns a list of suggestions for the specified argument, given the list
+     * of previous arguments.
+     * @param arg The argument that is being completed
+     * @param previousArgs The contents of the previous arguments, if any
+     * @return A list of suggestions for the argument
+     */
+    @Override
+    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+        final AdditionalTabTargets res = new AdditionalTabTargets();
+
+        if (arg == 0) {
+            res.add("SEND");
+            res.add("CHAT");
+            res.excludeAll();
+        } else if (arg == 1) {
+            res.exclude(TabCompletionType.COMMAND);
+            res.exclude(TabCompletionType.CHANNEL);
+        } else {
+            res.excludeAll();
+        }
+
+        return res;
+    }
+
+}
+

src/com/dmdirc/addons/dcc/DCCCommandParser.java

@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc;
+
+import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandType;
+import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.GlobalCommand;
+import com.dmdirc.commandparser.parsers.CommandParser;
+import com.dmdirc.ui.interfaces.InputWindow;
+
+/**
+ * DCC CommandParser
+ */
+public class DCCCommandParser extends CommandParser {
+
+    /** The singleton instance of the DCC command parser. */
+    private static DCCCommandParser me;
+
+    /** A version number for this class. */
+    private static final long serialVersionUID = 2009290901;
+
+    /**
+     * Creates a new instance of the GlobalCommandParser.
+     */
+    private DCCCommandParser() {
+        super();
+    }
+
+    /**
+     * Retrieves the singleton dcc command parser.
+     *
+     * @return The singleton DCCCommandParser
+     */
+    public static synchronized DCCCommandParser getDCCCommandParser() {
+        if (me == null) {
+            me = new DCCCommandParser();
+        }
+
+        return me;
+    }
+
+    /** Loads the relevant commands into the parser. */
+    @Override
+    protected void loadCommands() {
+        CommandManager.loadCommands(this, CommandType.TYPE_GLOBAL);
+    }
+
+    /**
+     * Executes the specified command with the given arguments.
+     *
+     * @param origin The window in which the command was typed
+     * @param isSilent Whether the command is being silenced or not
+     * @param command The command to be executed
+     * @param args The arguments to the command
+     */
+    @Override
+    protected void executeCommand(final InputWindow origin, final boolean isSilent, final Command command, final CommandArguments args) {
+        ((GlobalCommand) command).execute(origin, isSilent, args);
+    }
+
+    /**
+     * Called when the input was a line of text that was not a command.
+     * This normally means it is sent to the server/channel/user as-is, with
+     * no further processing.
+     *
+     * @param origin The window in which the command was typed
+     * @param line The line input by the user
+     */
+    @Override
+    protected void handleNonCommand(final InputWindow origin, final String line) {
+        origin.getContainer().sendLine(line);
+    }
+
+}

src/com/dmdirc/addons/dcc/DCCFrame.java

@@ -0,0 +1,239 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc;
+
+import com.dmdirc.Main;
+import com.dmdirc.Server;
+import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.addons.ui_swing.components.frames.InputTextFrame;
+import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
+import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.commandparser.PopupType;
+import com.dmdirc.commandparser.parsers.CommandParser;
+import com.dmdirc.commandparser.parsers.GlobalCommandParser;
+import com.dmdirc.config.IdentityManager;
+import com.dmdirc.ui.WindowManager;
+import com.dmdirc.ui.interfaces.InputWindow;
+
+import com.dmdirc.util.ReturnableThread;
+import java.awt.Container;
+
+import javax.swing.JPopupMenu;
+
+/**
+ * This class links DCC objects to a window.
+ *
+ * @author Shane 'Dataforce' McCormack
+ */
+public abstract class DCCFrame extends WritableFrameContainer {
+
+    /**
+     * Empty Frame.
+     */
+    private class EmptyFrame extends InputTextFrame {
+
+        /** A version number for this class. */
+        private static final long serialVersionUID = 200711271;
+
+        /**
+         * Creates a new instance of EmptyFrame.
+         *
+         * @param owner The frame container that owns this frame
+         */
+        public EmptyFrame(final WritableFrameContainer owner) {
+            super(owner, (SwingController) Main.getUI());
+            setTextPane(null);
+            pack();
+        }
+
+        /**
+         * Retrieves the command Parser for this input window.
+         *
+         * @return This window's command parser
+         */
+        @Override
+        public final CommandParser getCommandParser() {
+            return GlobalCommandParser.getGlobalCommandParser();
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public PopupType getNicknamePopupType() {
+            return null;
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public PopupType getChannelPopupType() {
+            return null;
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public PopupType getHyperlinkPopupType() {
+            return null;
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public PopupType getNormalPopupType() {
+            return null;
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public void addCustomPopupItems(final JPopupMenu popupMenu) {
+            //Add no custom popup items
+        }
+
+    }
+
+    /** The Window we're using. */
+    protected InputWindow myWindow = null;
+
+    /** The dcc plugin that owns this frame */
+    protected final DCCPlugin plugin;
+
+    /** The Window we're using. */
+    private boolean windowClosing = false;
+
+    /**
+     * Creates a new instance of DCCFrame with an empty window.
+     *
+     * @param plugin The DCCPlugin that owns this frame
+     * @param title The title of this window
+     * @param icon The icon to use
+     */
+    public DCCFrame(final DCCPlugin plugin, final String title, final String icon) {
+        this(plugin, title, icon, true);
+    }
+
+    /**
+     * Creates a new instance of DCCFrame.
+     *
+     * @param plugin The DCCPlugin that owns this frame
+     * @param title The title of this window
+     * @param defaultWindow Create default (empty) window. (non-default = chat frame)
+     * @param icon The icon to use
+     */
+    public DCCFrame(final DCCPlugin plugin, final String title, final String icon, final boolean defaultWindow) {
+        super(icon, title, IdentityManager.getGlobalConfig());
+        this.plugin = plugin;
+
+        if (defaultWindow) {
+            myWindow = UIUtilities.invokeAndWait(new ReturnableThread<EmptyFrame>() {
+
+                /** {@inheritDoc} */
+                @Override
+                public void run() {
+                    final EmptyFrame frame = new EmptyFrame(DCCFrame.this);
+                    frame.setTitle(title);
+                    setObject(frame);
+                }
+
+            });
+        }
+    }
+
+    /**
+     * Sends a line of text to this container's source.
+     *
+     * @param line The line to be sent
+     */
+    @Override
+    public void sendLine(final String line) {
+    }
+
+    /**
+     * Returns the maximum length that a line passed to sendLine() should be,
+     * in order to prevent it being truncated or causing protocol violations.
+     *
+     * @return The maximum line length for this container
+     */
+    @Override
+    public int getMaxLineLength() {
+        return 512;
+    }
+
+    /**
+     * Returns the internal frame associated with this object.
+     *
+     * @return The internal frame associated with this object
+     */
+    @Override
+    public InputWindow getFrame() {
+        return myWindow;
+    }
+
+    /**
+     * Returns the content pane of the internal frame associated with this object.
+     *
+     * @return The content pane of the internal frame associated with this object
+     */
+    public Container getContentPane() {
+        return ((TextFrame) getFrame()).getContentPane();
+    }
+
+    /**
+     * Returns the server instance associated with this container.
+     *
+     * @return the associated server connection
+     */
+    @Override
+    public Server getServer() {
+        return null;
+    }
+
+    /**
+     * Is the window closing?
+     *
+     * @return True if windowClosing has been called.
+     */
+    public final boolean isWindowClosing() {
+        return windowClosing;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void windowClosing() {
+        windowClosing = true;
+
+        // 1: Make the window non-visible
+        myWindow.setVisible(false);
+
+        // 2: Remove any callbacks or listeners
+        // 3: Trigger any actions neccessary
+        // 4: Trigger action for the window closing
+
+        // 5: Inform any parents that the window is closing
+        plugin.delWindow(this);
+
+        // 6: Remove the window from the window manager
+        WindowManager.removeWindow(myWindow);
+
+        // 7: Remove any references to the window and parents
+        myWindow = null; // NOPMD
+    }
+
+}

src/com/dmdirc/addons/dcc/DCCPlugin.java

@@ -0,0 +1,611 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc;
+
+import com.dmdirc.Main;
+import com.dmdirc.Server;
+import com.dmdirc.actions.ActionManager;
+import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.addons.dcc.kde.KFileChooser;
+import com.dmdirc.addons.dcc.actions.DCCActions;
+import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.config.Identity;
+import com.dmdirc.config.IdentityManager;
+import com.dmdirc.config.prefs.PreferencesCategory;
+import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.config.prefs.PreferencesSetting;
+import com.dmdirc.config.prefs.PreferencesType;
+import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
+import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.plugins.Plugin;
+import com.dmdirc.ui.WindowManager;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.JOptionPane;
+
+/**
+ * This plugin adds DCC to dmdirc.
+ *
+ * @author Shane 'Dataforce' McCormack
+ */
+public final class DCCPlugin extends Plugin implements ActionListener {
+
+    /** The DCCCommand we created. */
+    private DCCCommand command;
+
+    /** Our DCC Container window. */
+    private DCCFrame container;
+
+    /** Child Frames. */
+    private final List<DCCFrame> childFrames = new ArrayList<DCCFrame>();
+
+    /**
+     * Creates a new instance of the DCC Plugin.
+     */
+    public DCCPlugin() {
+        super();
+    }
+
+    /**
+     * Ask a question, if the answer is the answer required, then recall handleProcessEvent.
+     *
+     * @param question Question to ask
+     * @param title Title of question dialog
+     * @param desiredAnswer Answer required
+     * @param type Actiontype to pass back
+     * @param format StringBuffer to pass back
+     * @param arguments arguments to pass back
+     */
+    public void askQuestion(final String question, final String title, final int desiredAnswer, final ActionType type, final StringBuffer format, final Object... arguments) {
+        // New thread to ask the question in to stop us locking the UI
+        final Thread questionThread = new Thread(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                int result = JOptionPane.showConfirmDialog(null, question, title, JOptionPane.YES_NO_OPTION);
+                if (result == desiredAnswer) {
+                    handleProcessEvent(type, format, true, arguments);
+                }
+            }
+
+        }, "QuestionThread: " + title);
+        // Start the thread
+        questionThread.start();
+    }
+
+    /**
+     * Ask the location to save a file, then start the download.
+     *
+     * @param nickname Person this dcc is from.
+     * @param send The DCCSend to save for.
+     * @param parser The parser this send was received on
+     * @param reverse Is this a reverse dcc?
+     * @param sendFilename The name of the file which is being received
+     * @param token Token used in reverse dcc.
+     */
+    public void saveFile(final String nickname, final DCCSend send, final Parser parser, final boolean reverse, final String sendFilename, final String token) {
+        // New thread to ask the user where to save in to stop us locking the UI
+        final Thread dccThread = new Thread(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                final JFileChooser jc = KFileChooser.getFileChooser(DCCPlugin.this, IdentityManager.getGlobalConfig().getOption(getDomain(), "receive.savelocation"));
+                jc.setDialogTitle("Save " + sendFilename + " As - DMDirc");
+                jc.setFileSelectionMode(JFileChooser.FILES_ONLY);
+                jc.setMultiSelectionEnabled(false);
+                jc.setSelectedFile(new File(send.getFileName()));
+                int result;
+                if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "receive.autoaccept")) {
+                    result = JFileChooser.APPROVE_OPTION;
+                } else {
+                    result = jc.showSaveDialog((JFrame) Main.getUI().getMainWindow());
+                }
+                if (result == JFileChooser.APPROVE_OPTION) {
+                    send.setFileName(jc.getSelectedFile().getPath());
+                    boolean resume = false;
+                    if (jc.getSelectedFile().exists()) {
+                        if (send.getFileSize() > -1 && send.getFileSize() <= jc.getSelectedFile().length()) {
+                            if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "receive.autoaccept")) {
+                                return;
+                            } else {
+                                JOptionPane.showMessageDialog((JFrame) Main.getUI().getMainWindow(), "This file has already been completed, or is longer than the file you are receiving.\nPlease choose a different file.", "Problem with selected file", JOptionPane.ERROR_MESSAGE);
+                                saveFile(nickname, send, parser, reverse, sendFilename, token);
+                                return;
+                            }
+                        } else {
+                            if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "receive.autoaccept")) {
+                                resume = true;
+                            } else {
+                                result = JOptionPane.showConfirmDialog((JFrame) Main.getUI().getMainWindow(), "This file exists already, do you want to resume an exisiting download?", "Resume Download?", JOptionPane.YES_NO_OPTION);
+                                resume = (result == JOptionPane.YES_OPTION);
+                            }
+                        }
+                    }
+                    if (reverse && !token.isEmpty()) {
+                        new DCCSendWindow(DCCPlugin.this, send, "*Receive: " + nickname, nickname, null);
+                        send.setToken(token);
+                        if (resume) {
+                            if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "receive.reverse.sendtoken")) {
+                                parser.sendCTCP(nickname, "DCC", "RESUME " + sendFilename + " 0 " + jc.getSelectedFile().length() + " " + token);
+                            } else {
+                                parser.sendCTCP(nickname, "DCC", "RESUME " + sendFilename + " 0 " + jc.getSelectedFile().length());
+                            }
+                        } else {
+                            if (listen(send)) {
+                                parser.sendCTCP(nickname, "DCC", "SEND " + sendFilename + " " + DCC.ipToLong(getListenIP(parser)) + " " + send.getPort() + " " + send.getFileSize() + " " + token);
+                            } else {
+                                // Listen failed.
+                            }
+                        }
+                    } else {
+                        new DCCSendWindow(DCCPlugin.this, send, "Receive: " + nickname, nickname, null);
+                        if (resume) {
+                            parser.sendCTCP(nickname, "DCC", "RESUME " + sendFilename + " " + send.getPort() + " " + jc.getSelectedFile().length());
+                        } else {
+                            send.connect();
+                        }
+                    }
+                }
+            }
+
+        }, "saveFileThread: " + sendFilename);
+        // Start the thread
+        dccThread.start();
+    }
+
+    /**
+     * Process an event of the specified type.
+     *
+     * @param type The type of the event to process
+     * @param format Format of messages that are about to be sent. (May be null)
+     * @param arguments The arguments for the event
+     */
+    @Override
+    public void processEvent(final ActionType type, final StringBuffer format, final Object... arguments) {
+        handleProcessEvent(type, format, false, arguments);
+    }
+
+    /**
+     * Make the given DCC start listening.
+     * This will either call dcc.listen() or dcc.listen(startPort, endPort)
+     * depending on config.
+     *
+     * @param dcc DCC to start listening.
+     * @return True if Socket was opened.
+     */
+    protected boolean listen(final DCC dcc) {
+
+        final boolean usePortRange = IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "firewall.ports.usePortRange");
+        final int startPort = IdentityManager.getGlobalConfig().getOptionInt(getDomain(), "firewall.ports.startPort");
+        final int endPort = IdentityManager.getGlobalConfig().getOptionInt(getDomain(), "firewall.ports.endPort");
+
+        try {
+            if (usePortRange) {
+                dcc.listen(startPort, endPort);
+            } else {
+                dcc.listen();
+            }
+            return true;
+        } catch (IOException ioe) {
+            return false;
+        }
+    }
+
+    /**
+     * Process an event of the specified type.
+     *
+     * @param type The type of the event to process
+     * @param format Format of messages that are about to be sent. (May be null)
+     * @param dontAsk Don't ask any questions, assume yes.
+     * @param arguments The arguments for the event
+     */
+    public void handleProcessEvent(final ActionType type, final StringBuffer format, final boolean dontAsk, final Object... arguments) {
+        if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "receive.autoaccept") && !dontAsk) {
+            handleProcessEvent(type, format, true, arguments);
+            return;
+        }
+
+        if (type == CoreActionType.SERVER_CTCP) {
+            final String ctcpType = (String) arguments[2];
+            final String[] ctcpData = ((String) arguments[3]).split(" ");
+            if (ctcpType.equalsIgnoreCase("DCC")) {
+                if (ctcpData[0].equalsIgnoreCase("chat") && ctcpData.length > 3) {
+                    final String nickname = ((ClientInfo) arguments[1]).getNickname();
+                    if (dontAsk) {
+                        final DCCChat chat = new DCCChat();
+                        try {
+                            chat.setAddress(Long.parseLong(ctcpData[2]), Integer.parseInt(ctcpData[3]));
+                        } catch (NumberFormatException nfe) {
+                            return;
+                        }
+                        final String myNickname = ((Server) arguments[0]).getParser().getLocalClient().getNickname();
+                        final DCCFrame f = new DCCChatWindow(this, chat, "Chat: " + nickname, myNickname, nickname);
+                        f.getFrame().addLine("DCCChatStarting", nickname, chat.getHost(), chat.getPort());
+                        chat.connect();
+                    } else {
+                        ActionManager.processEvent(DCCActions.DCC_CHAT_REQUEST, null, ((Server) arguments[0]), nickname);
+                        askQuestion("User " + nickname + " on " + ((Server) arguments[0]).toString() + " would like to start a DCC Chat with you.\n\nDo you want to continue?", "DCC Chat Request", JOptionPane.YES_OPTION, type, format, arguments);
+                        return;
+                    }
+                } else if (ctcpData[0].equalsIgnoreCase("send") && ctcpData.length > 3) {
+                    final String nickname = ((ClientInfo) arguments[1]).getNickname();
+                    final String filename;
+                    String tmpFilename;
+                    // Clients tend to put files with spaces in the name in "" so lets look for that.
+                    final StringBuilder filenameBits = new StringBuilder();
+                    int i;
+                    final boolean quoted = ctcpData[1].startsWith("\"");
+                    if (quoted) {
+                        for (i = 1; i < ctcpData.length; i++) {
+                            String bit = ctcpData[i];
+                            if (i == 1) {
+                                bit = bit.substring(1);
+                            }
+                            if (bit.endsWith("\"")) {
+                                filenameBits.append(" " + bit.substring(0, bit.length() - 1));
+                                break;
+                            } else {
+                                filenameBits.append(" " + bit);
+                            }
+                        }
+                        tmpFilename = filenameBits.toString().trim();
+                    } else {
+                        tmpFilename = ctcpData[1];
+                        i = 1;
+                    }
+
+                    // Try to remove path names if sent.
+                    // Change file separatorChar from other OSs first
+                    if (File.separatorChar == '/') {
+                        tmpFilename = tmpFilename.replace('\\', File.separatorChar);
+                    } else {
+                        tmpFilename = tmpFilename.replace('/', File.separatorChar);
+                    }
+                    // Then get just the name of the file.
+                    filename = (new File(tmpFilename)).getName();
+
+                    final String ip = ctcpData[++i];
+                    final String port = ctcpData[++i];
+                    long size;
+                    if (ctcpData.length + 1 > i) {
+                        try {
+                            size = Integer.parseInt(ctcpData[++i]);
+                        } catch (NumberFormatException nfe) {
+                            size = -1;
+                        }
+                    } else {
+                        size = -1;
+                    }
+                    final String token = (ctcpData.length - 1 > i && !ctcpData[i + 1].equals("T")) ? ctcpData[++i] : "";
+
+                    // Ignore incorrect ports, or non-numeric IP/Port
+                    try {
+                        int portInt = Integer.parseInt(port);
+                        if (portInt > 65535 || portInt < 0) {
+                            return;
+                        }
+                        Long.parseLong(ip);
+                    } catch (NumberFormatException nfe) {
+                        return;
+                    }
+
+                    DCCSend send = DCCSend.findByToken(token);
+
+                    if (send == null && !dontAsk) {
+                        if (!token.isEmpty() && !port.equals("0")) {
+                            // This is a reverse DCC Send that we no longer care about.
+                            return;
+                        } else {
+                            ActionManager.processEvent(DCCActions.DCC_SEND_REQUEST, null, ((Server) arguments[0]), nickname, filename);
+                            askQuestion("User " + nickname + " on " + ((Server) arguments[0]).toString() + " would like to send you a file over DCC.\n\nFile: " + filename + "\n\nDo you want to continue?", "DCC Send Request", JOptionPane.YES_OPTION, type, format, arguments);
+                            return;
+                        }
+                    } else {
+                        final boolean newSend = send == null;
+                        if (newSend) {
+                            send = new DCCSend(IdentityManager.getGlobalConfig().getOptionInt(getDomain(), "send.blocksize"));
+                            send.setTurbo(IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "send.forceturbo"));
+                        }
+                        try {
+                            send.setAddress(Long.parseLong(ip), Integer.parseInt(port));
+                        } catch (NumberFormatException nfe) {
+                            return;
+                        }
+                        if (newSend) {
+                            send.setFileName(filename);
+                            send.setFileSize(size);
+                            saveFile(nickname, send, ((Server) arguments[0]).getParser(), "0".equals(port), (quoted) ? "\"" + filename + "\"" : filename, token);
+                        } else {
+                            send.connect();
+                        }
+                    }
+                } else if ((ctcpData[0].equalsIgnoreCase("resume") || ctcpData[0].equalsIgnoreCase("accept")) && ctcpData.length > 2) {
+
+                    final String filename;
+                    // Clients tend to put files with spaces in the name in "" so lets look for that.
+                    final StringBuilder filenameBits = new StringBuilder();
+                    int i;
+                    final boolean quoted = ctcpData[1].startsWith("\"");
+                    if (quoted) {
+                        for (i = 1; i < ctcpData.length; i++) {
+                            String bit = ctcpData[i];
+                            if (i == 1) {
+                                bit = bit.substring(1);
+                            }
+                            if (bit.endsWith("\"")) {
+                                filenameBits.append(" " + bit.substring(0, bit.length() - 1));
+                                break;
+                            } else {
+                                filenameBits.append(" " + bit);
+                            }
+                        }
+                        filename = filenameBits.toString().trim();
+                    } else {
+                        filename = ctcpData[1];
+                        i = 1;
+                    }
+
+                    try {
+                        final int port = Integer.parseInt(ctcpData[++i]);
+                        final int position = Integer.parseInt(ctcpData[++i]);
+                        final String token = (ctcpData.length - 1 > i) ? " " + ctcpData[++i] : "";
+
+                        // Now look for a dcc that matches.
+                        for (DCCSend send : DCCSend.getSends()) {
+                            if (send.port == port && (new File(send.getFileName())).getName().equalsIgnoreCase(filename)) {
+                                if ((!token.isEmpty() && !send.getToken().isEmpty()) && (!token.equals(send.getToken()))) {
+                                    continue;
+                                }
+                                final Parser parser = ((Server) arguments[0]).getParser();
+                                final String nickname = ((ClientInfo) arguments[1]).getNickname();
+                                if (ctcpData[0].equalsIgnoreCase("resume")) {
+                                    parser.sendCTCP(nickname, "DCC", "ACCEPT " + ((quoted) ? "\"" + filename + "\"" : filename) + " " + port + " " + send.setFileStart(position) + token);
+                                } else {
+                                    send.setFileStart(position);
+                                    if (port == 0) {
+                                        // Reverse dcc
+                                        if (listen(send)) {
+                                            if (send.getToken().isEmpty()) {
+                                                parser.sendCTCP(nickname, "DCC", "SEND " + ((quoted) ? "\"" + filename + "\"" : filename) + " " + DCC.ipToLong(send.getHost()) + " " + send.getPort() + " " + send.getFileSize());
+                                            } else {
+                                                parser.sendCTCP(nickname, "DCC", "SEND " + ((quoted) ? "\"" + filename + "\"" : filename) + " " + DCC.ipToLong(send.getHost()) + " " + send.getPort() + " " + send.getFileSize() + " " + send.getToken());
+                                            }
+                                        } else {
+                                            // Listen failed.
+                                        }
+                                    } else {
+                                        send.connect();
+                                    }
+                                }
+                            }
+                        }
+                    } catch (NumberFormatException nfe) {
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Create the container window.
+     */
+    protected void createContainer() {
+        container = new DCCFrame(this, "DCCs", "dcc") {
+        };
+        final TextLabel label = new TextLabel("This is a placeholder window to group DCCs together.");
+        label.setText(label.getText() + "\n\nClosing this window will close all the active DCCs");
+        ((TextFrame) container.getFrame()).getContentPane().add(label);
+        WindowManager.addWindow(container.getFrame());
+        container.getFrame().open();
+    }
+
+    /**
+     * Add a window to the container window.
+     *
+     * @param window Window to remove
+     */
+    protected synchronized void addWindow(final DCCFrame window) {
+        if (window == container) {
+            return;
+        }
+        if (container == null) {
+            createContainer();
+        }
+
+        WindowManager.addWindow(container.getFrame(), window.getFrame());
+        childFrames.add(window);
+        window.getFrame().open();
+    }
+
+    /**
+     * Remove a window from the container window.
+     *
+     * @param window Window to remove
+     */
+    protected synchronized void delWindow(final DCCFrame window) {
+        if (container == null) {
+            return;
+        }
+        if (window == container) {
+            container = null;
+            for (DCCFrame win : childFrames) {
+                if (win != window) {
+                    win.close();
+                }
+            }
+            childFrames.clear();
+        } else {
+            childFrames.remove(window);
+            if (childFrames.isEmpty()) {
+                container.close();
+                container = null;
+            }
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void domainUpdated() {
+        final Identity defaults = IdentityManager.getAddonIdentity();
+
+        defaults.setOption(getDomain(), "receive.savelocation",
+                Main.getConfigDir() + "downloads" + System.getProperty("file.separator"));
+    }
+
+    /**
+     * Called when the plugin is loaded.
+     */
+    @Override
+    public void onLoad() {
+        final File dir = new File(IdentityManager.getGlobalConfig().getOption(getDomain(), "receive.savelocation"));
+        if (dir.exists()) {
+            if (!dir.isDirectory()) {
+                Logger.userError(ErrorLevel.LOW, "Unable to create download dir (file exists instead)");
+            }
+        } else {
+            try {
+                dir.mkdirs();
+                dir.createNewFile();
+            } catch (IOException ex) {
+                Logger.userError(ErrorLevel.LOW, "Unable to create download dir");
+            }
+        }
+
+        command = new DCCCommand(this);
+        ActionManager.registerActionTypes(DCCActions.values());
+        ActionManager.addListener(this, CoreActionType.SERVER_CTCP);
+    }
+
+    /**
+     * Called when this plugin is Unloaded.
+     */
+    @Override
+    public synchronized void onUnload() {
+        CommandManager.unregisterCommand(command);
+        ActionManager.removeListener(this);
+        if (container != null) {
+            container.close();
+        }
+    }
+
+    /**
+     * Get the IP Address we should send as our listening IP.
+     *
+     * @return The IP Address we should send as our listening IP.
+     */
+    public String getListenIP() {
+        return getListenIP(null);
+    }
+
+    /**
+     * Get the IP Address we should send as our listening IP.
+     *
+     * @param parser Parser the IRC Parser where this dcc is initiated
+     * @return The IP Address we should send as our listening IP.
+     */
+    public String getListenIP(final Parser parser) {
+        final String configIP = IdentityManager.getGlobalConfig().getOption(getDomain(), "firewall.ip");
+        if (!configIP.isEmpty()) {
+            return configIP;
+        } else if (parser != null) {
+            final String myHost = parser.getLocalClient().getHostname();
+            if (!myHost.isEmpty()) {
+                try {
+                    return InetAddress.getByName(myHost).getHostAddress();
+                } catch (UnknownHostException e) { /* Will return default host below */ }
+            }
+        }
+        try {
+            return InetAddress.getLocalHost().getHostAddress();
+        } catch (UnknownHostException e) {
+            // This is almost certainly not what we want, but we can't work out
+            // the right one.
+            return "127.0.0.1";
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void showConfig(final PreferencesManager manager) {
+        final PreferencesCategory general = new PreferencesCategory("DCC", "", "category-dcc");
+        final PreferencesCategory firewall = new PreferencesCategory("Firewall", "");
+        final PreferencesCategory sending = new PreferencesCategory("Sending", "");
+        final PreferencesCategory receiving = new PreferencesCategory("Receiving", "");
+
+        manager.getCategory("Plugins").addSubCategory(general.setInlineAfter());
+        general.addSubCategory(firewall.setInline());
+        general.addSubCategory(sending.setInline());
+        general.addSubCategory(receiving.setInline());
+
+        firewall.addSetting(new PreferencesSetting(PreferencesType.TEXT,
+                getDomain(), "firewall.ip", "Forced IP",
+                "What IP should be sent as our IP (Blank = work it out)"));
+        firewall.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "firewall.ports.usePortRange", "Use Port Range",
+                "Useful if you have a firewall that only forwards specific ports"));
+        firewall.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
+                getDomain(), "firewall.ports.startPort", "Start Port",
+                "Port to try to listen on first"));
+        firewall.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
+                getDomain(), "firewall.ports.endPort", "End Port",
+                "Port to try to listen on last"));
+        receiving.addSetting(new PreferencesSetting(PreferencesType.TEXT,
+                getDomain(), "receive.savelocation", "Default save location",
+                "Where the save as window defaults to?"));
+        sending.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "send.reverse", "Reverse DCC",
+                "With reverse DCC, the sender connects rather than " +
+                "listens like normal dcc"));
+        sending.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "send.forceturbo", "Use Turbo DCC",
+                "Turbo DCC doesn't wait for ack packets. this is " +
+                "faster but not always supported."));
+        receiving.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "receive.reverse.sendtoken",
+                "Send token in reverse receive",
+                "If you have problems with reverse dcc receive resume," +
+                " try toggling this."));
+        general.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
+                getDomain(), "send.blocksize", "Blocksize to use for DCC",
+                "Change the block size for send/receive, this can " +
+                "sometimes speed up transfers."));
+    }
+
+}
+

src/com/dmdirc/addons/dcc/DCCSend.java

@@ -0,0 +1,491 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * This class handles a DCC Send.
+ *
+ * @author Shane 'Dataforce' McCormack
+ */
+public class DCCSend extends DCC {
+
+    /** List of active sends. */
+    private static final List<DCCSend> SENDS = new ArrayList<DCCSend>();
+
+    /** File Transfer Types. */
+    public enum TransferType {
+
+        SEND, RECEIVE;
+
+    }
+
+    /** The File transfer type for this file. */
+    private TransferType transferType = TransferType.RECEIVE;
+
+    /** The handler for this DCCSend. */
+    private DCCSendInterface handler;
+
+    /** Used to send data out the socket. */
+    private DataOutputStream out;
+
+    /** Used to read data from the socket. */
+    private DataInputStream in;
+
+    /** File we are using. */
+    private File transferFile;
+
+    /** Used to write data to the file. */
+    private DataOutputStream fileOut;
+
+    /** Used to read data from the file. */
+    private DataInputStream fileIn;
+
+    /** Where are we starting from? */
+    private int startpos;
+
+    /** How big is this file? */
+    private long size = -1;
+
+    /** How much of this file have we read so far? */
+    private long readSize;
+
+    /** What is the name of the file? */
+    private String filename = "";
+
+    /** What is the token for this send? */
+    private String token = "";
+
+    /** Block Size. */
+    private final int blockSize;
+
+    /** Is this a turbo dcc? */
+    private boolean turbo = false;
+
+    /** Creates a new instance of DCCSend with a default block size. */
+    public DCCSend() {
+        this(1024);
+    }
+
+    /**
+     * Creates a new instance of DCCSend.
+     *
+     * @param blockSize Block size to use
+     */
+    public DCCSend(final int blockSize) {
+        super();
+        this.blockSize = blockSize;
+        synchronized (SENDS) {
+            SENDS.add(this);
+        }
+    }
+
+    /**
+     * Reset this send to be used again (eg a resend).
+     */
+    public void reset() {
+        close();
+        setFileName(filename);
+        setFileStart(startpos);
+    }
+
+    /**
+     * Get a copy of the list of active sends.
+     *
+     * @return A copy of the list of active sends.
+     */
+    public static List<DCCSend> getSends() {
+        synchronized (SENDS) {
+            return new ArrayList<DCCSend>(SENDS);
+        }
+    }
+
+    /**
+     * Called to remove this object from the sends list.
+     */
+    public void removeFromSends() {
+        synchronized (SENDS) {
+            SENDS.remove(this);
+        }
+    }
+
+    /**
+     * Set the filename of this file
+     *
+     * @param filename Filename
+     */
+    public void setFileName(final String filename) {
+        this.filename = filename;
+        if (transferType == TransferType.SEND) {
+            transferFile = new File(filename);
+            try {
+                fileIn = new DataInputStream(new FileInputStream(transferFile.getAbsolutePath()));
+            } catch (FileNotFoundException e) {
+                fileIn = null;
+            } catch (SecurityException e) {
+                fileIn = null;
+            }
+        }
+    }
+
+    /**
+     * Get the filename of this file
+     *
+     * @return Filename
+     */
+    public String getFileName() {
+        return filename;
+    }
+
+    /**
+     * Get the filename of this file, without the path
+     *
+     * @return Filename without path
+     */
+    public String getShortFileName() {
+        return (new File(filename)).getName();
+    }
+
+    /**
+     * Set dcc Type.
+     *
+     * @param type Type of DCC Send this is.
+     */
+    public void setType(final TransferType type) {
+        this.transferType = type;
+    }
+
+    /**
+     * Get dcc Type.
+     *
+     * @return Type of DCC Send this is.
+     */
+    public TransferType getType() {
+        return transferType;
+    }
+
+    /**
+     * Set turbo mode on/off.
+     * Turbo mode doesn't wait for ack packets. Only relevent when sending.
+     *
+     * @param turbo True for turbo dcc, else false
+     */
+    public void setTurbo(final boolean turbo) {
+        this.turbo = turbo;
+    }
+
+    /**
+     * Is turbo mode on/off.
+     * Turbo mode doesn't wait for ack packets. Only relevent when sending.
+     *
+     * @return True for turbo dcc, else false
+     */
+    public boolean isTurbo() {
+        return turbo;
+    }
+
+    /**
+     * Set the Token for this send
+     *
+     * @param token Token for this send
+     */
+    public void setToken(final String token) {
+        this.token = token;
+    }
+
+    /**
+     * Get the Token for this send
+     *
+     * @return Token for this send
+     */
+    public String getToken() {
+        return token;
+    }
+
+    /**
+     * Make a Token for this send.
+     * This token will be unique compared to all the other known sends
+     *
+     * @return The Token for this send.
+     */
+    public String makeToken() {
+        String myToken = "";
+        boolean unique = true;
+        do {
+            myToken = Integer.toString(Math.abs((myToken + filename).hashCode()));
+            unique = (findByToken(myToken) == null);
+        } while (!unique);
+        setToken(myToken);
+        return myToken;
+    }
+
+    /**
+     * Find a send based on a given token.
+     *
+     * @param token Token to look for. (case sensitive)
+     * @return The first DCCSend that matches the given token.
+     *         null if none match, or token is "" or null.
+     */
+    public static DCCSend findByToken(final String token) {
+        if (token == null || token.isEmpty()) {
+            return null;
+        }
+        for (DCCSend send : getSends()) {
+            if (send.getToken().equals(token)) {
+                return send;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Set the size of the file
+     *
+     * @param size File size
+     */
+    public void setFileSize(final long size) {
+        this.size = size;
+    }
+
+    /**
+     * Get the expected size of the file
+     *
+     * @return The expected File size (-1 if unknown)
+     */
+    public long getFileSize() {
+        return size;
+    }
+
+    /**
+     * Set the starting position of the file
+     *
+     * @param startpos Starting position
+     * @return -1 if fileIn is null or if dcc receive, else the result of fileIn.skipBytes()
+     */
+    public int setFileStart(final int startpos) {
+        this.startpos = startpos;
+        if (transferType == TransferType.SEND && fileIn != null) {
+            try {
+                this.startpos = fileIn.skipBytes(startpos);
+                readSize = startpos;
+                return this.startpos;
+            } catch (IOException ioe) {
+            }
+        }
+        return -1;
+    }
+
+    /**
+     * Get the starting position of the file
+     *
+     * @return starting position of file.
+     */
+    public int getFileStart() {
+        return this.startpos;
+    }
+
+    /**
+     * Change the handler for this DCC Send
+     *
+     * @param handler A class implementing DCCSendInterface
+     */
+    public void setHandler(final DCCSendInterface handler) {
+        this.handler = handler;
+    }
+
+    /**
+     * Called when the socket is first opened, before any data is handled.
+     */
+    @Override
+    protected void socketOpened() {
+        try {
+            transferFile = new File(filename);
+            if (transferType == TransferType.RECEIVE) {
+                fileOut = new DataOutputStream(new FileOutputStream(transferFile.getAbsolutePath(), (startpos > 0)));
+            }
+            out = new DataOutputStream(socket.getOutputStream());
+            in = new DataInputStream(socket.getInputStream());
+            if (handler != null) {
+                handler.socketOpened(this);
+            }
+        } catch (IOException ioe) {
+            socketClosed();
+        }
+    }
+
+    /**
+     * Called when the socket is closed, before the thread terminates.
+     */
+    @Override
+    protected void socketClosed() {
+        // Try to close both, even if one fails.
+        if (out != null) {
+            try {
+                out.close();
+            } catch (IOException e) {
+            }
+        }
+        if (in != null) {
+            try {
+                in.close();
+            } catch (IOException e) {
+            }
+        }
+        out = null;
+        in = null;
+        if (handler != null) {
+            handler.socketClosed(this);
+        }
+        // Try to delete empty files.
+        if (transferType == TransferType.RECEIVE && transferFile.length() == 0) {
+            transferFile.delete();
+        }
+        synchronized (SENDS) {
+            SENDS.remove(this);
+        }
+    }
+
+    /**
+     * Handle the socket.
+     *
+     * @return false when socket is closed, true will cause the method to be
+     *         called again.
+     */
+    @Override
+    protected boolean handleSocket() {
+        if (out == null || in == null) {
+            return false;
+        }
+        if (transferType == TransferType.RECEIVE) {
+            return handleReceive();
+        } else {
+            return handleSend();
+        }
+    }
+
+    /**
+     * Handle the socket as a RECEIVE.
+     *
+     * @return false when socket is closed (or should be closed), true will cause the method to be
+     *         called again.
+     */
+    protected boolean handleReceive() {
+        try {
+            final byte[] data = new byte[blockSize];
+            final int bytesRead = in.read(data);
+            readSize = readSize + bytesRead;
+
+            if (bytesRead > 0) {
+                if (handler != null) {
+                    handler.dataTransfered(this, bytesRead);
+                }
+                fileOut.write(data, 0, bytesRead);
+                // Send ack
+                out.writeInt((int) readSize);
+                out.flush();
+                if (readSize == size) {
+                    fileOut.close();
+                    return false;
+                } else {
+                    return true;
+                }
+            } else if (bytesRead < 0) {
+                fileOut.close();
+                return false;
+            }
+        } catch (IOException e) {
+            return false;
+        }
+        return false;
+    }
+
+    /**
+     * Handle the socket as a SEND.
+     *
+     * @return false when socket is closed (or should be closed), true will cause the method to be
+     *         called again.
+     */
+    protected boolean handleSend() {
+        try {
+            final byte[] data = new byte[blockSize];
+            int bytesRead = fileIn.read(data);
+            readSize = readSize + bytesRead;
+
+            if (bytesRead > 0) {
+                if (handler != null) {
+                    handler.dataTransfered(this, bytesRead);
+                }
+                out.write(data, 0, bytesRead);
+                out.flush();
+
+                // Wait for acknowlegement packet.
+                if (!turbo) {
+                    int bytesRecieved;
+                    do {
+                        bytesRecieved = in.readInt();
+                    } while ((readSize - bytesRecieved) > 0);
+                }
+
+                if (readSize == size) {
+                    fileIn.close();
+
+                    // Process all the ack packets that may have been sent.
+                    // In true turbo dcc mode, none will have been sent and the socket
+                    // will just close, in fast-dcc mode all the acks will be here,
+                    // So keep reading acks untill the socket closes (IOException) or we
+                    // have recieved all the acks.
+                    if (turbo) {
+                        int ack = 0;
+                        do {
+                            try {
+                                ack = in.readInt();
+                            } catch (IOException e) {
+                                break;
+                            }
+                        } while (ack > 0 && (readSize - ack) > 0);
+                    }
+
+                    return false;
+                }
+
+                return true;
+            } else if (bytesRead < 0) {
+                fileIn.close();
+                return true;
+            }
+        } catch (IOException e) {
+            return false;
+        }
+        return false;
+    }
+
+}

src/com/dmdirc/addons/dcc/DCCSendInterface.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc;
+
+/**
+ * This interfaces allows DCC Send Windows to receive data from a DCCSend
+ *
+ * @author Shane 'Dataforce' McCormack
+ */
+public interface DCCSendInterface {
+
+    /**
+     * Called when the socket is closed
+     *
+     * @param dcc The DCCSend that this message is from
+     */
+    void socketClosed(final DCCSend dcc);
+
+    /**
+     * Called when the socket is opened
+     *
+     * @param dcc The DCCSend that this message is from
+     */
+    void socketOpened(final DCCSend dcc);
+
+    /**
+     * Called when data is sent/recieved
+     *
+     * @param dcc The DCCSend that this message is from
+     * @param bytes The number of new bytes that were transfered
+     */
+    void dataTransfered(final DCCSend dcc, final int bytes);
+
+}

src/com/dmdirc/addons/dcc/DCCSendWindow.java

@@ -0,0 +1,339 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc;
+
+import com.dmdirc.Server;
+import com.dmdirc.ServerState;
+import com.dmdirc.actions.ActionManager;
+import com.dmdirc.addons.dcc.actions.DCCActions;
+import com.dmdirc.config.IdentityManager;
+import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.interfaces.callbacks.SocketCloseListener;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JProgressBar;
+
+import net.miginfocom.swing.MigLayout;
+
+/**
+ * This class links DCC Send objects to a window.
+ *
+ * @author Shane 'Dataforce' McCormack
+ */
+public class DCCSendWindow extends DCCFrame implements DCCSendInterface, ActionListener, SocketCloseListener {
+
+    /** The DCCSend object we are a window for */
+    private final DCCSend dcc;
+
+    /** Other Nickname */
+    private final String otherNickname;
+
+    /** Total data transfered */
+    private volatile long transferCount = 0;
+
+    /** Time Started */
+    private long timeStarted = 0;
+
+    /** Progress Bar */
+    private final JProgressBar progress = new JProgressBar();
+
+    /** Status Label */
+    private final JLabel status = new JLabel("Status: Waiting");
+
+    /** Speed Label */
+    private final JLabel speed = new JLabel("Speed: Unknown");
+
+    /** Time Label */
+    private final JLabel remaining = new JLabel("Time Remaining: Unknown");
+
+    /** Time Taken */
+    private final JLabel taken = new JLabel("Time Taken: 00:00");
+
+    /** Button */
+    private final JButton button = new JButton("Cancel");
+
+    /** Plugin that this send belongs to. */
+    private final DCCPlugin myPlugin;
+
+    /** IRC Parser that caused this send */
+    private Parser parser = null;
+
+    /** Server that caused this send */
+    private Server server = null;
+
+    /**
+     * Creates a new instance of DCCSendWindow with a given DCCSend object.
+     *
+     * @param plugin the DCC Plugin responsible for this window
+     * @param dcc The DCCSend object this window wraps around
+     * @param title The title of this window
+     * @param targetNick Nickname of target
+     * @param server The server that initiated this send
+     */
+    public DCCSendWindow(final DCCPlugin plugin, final DCCSend dcc, final String title, final String targetNick, final Server server) {
+        super(plugin, title, dcc.getType() == DCCSend.TransferType.SEND ? "dcc-send-inactive" : "dcc-receive-inactive");
+        this.dcc = dcc;
+        this.server = server;
+        this.parser = server == null ? null : server.getParser();
+        this.myPlugin = plugin;
+
+        if (parser != null) {
+            parser.getCallbackManager().addNonCriticalCallback(SocketCloseListener.class, this);
+        }
+        dcc.setHandler(this);
+
+        otherNickname = targetNick;
+
+        getContentPane().setLayout(new MigLayout());
+
+        progress.setMinimum(0);
+        progress.setMaximum(100);
+        progress.setStringPainted(true);
+        progress.setValue(0);
+
+        if (dcc.getType() == DCCSend.TransferType.SEND) {
+            getContentPane().add(new JLabel("Sending: " + dcc.getShortFileName()), "wrap");
+            getContentPane().add(new JLabel("To: " + targetNick), "wrap");
+        } else {
+            getContentPane().add(new JLabel("Recieving: " + dcc.getShortFileName()), "wrap");
+            getContentPane().add(new JLabel("From: " + targetNick), "wrap");
+        }
+        getContentPane().add(status, "wrap");
+        getContentPane().add(speed, "wrap");
+        getContentPane().add(remaining, "wrap");
+        getContentPane().add(taken, "wrap");
+        getContentPane().add(progress, "growx, wrap");
+
+        button.addActionListener(this);
+        getContentPane().add(button, "wrap, align right");
+
+        plugin.addWindow(this);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void onSocketClosed(final Parser tParser) {
+        // Remove our reference to the parser (and its reference to us)
+        parser.getCallbackManager().delAllCallback(this);
+        parser = null;
+        // Can't resend without the parser.
+        if ("Resend".equals(button.getText())) {
+            button.setText("Close Window");
+        }
+    }
+
+    /**
+     * Get the DCCSend Object associated with this window
+     *
+     * @return The DCCSend Object associated with this window
+     */
+    public DCCSend getDCC() {
+        return dcc;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void actionPerformed(final ActionEvent e) {
+        if (e.getActionCommand().equals("Cancel")) {
+            if (dcc.getType() == DCCSend.TransferType.SEND) {
+                button.setText("Resend");
+            } else {
+                button.setText("Close Window");
+            }
+            status.setText("Status: Cancelled");
+            dcc.close();
+        } else if (e.getActionCommand().equals("Resend")) {
+            button.setText("Cancel");
+            status.setText("Status: Resending...");
+            synchronized (this) {
+                transferCount = 0;
+            }
+            dcc.reset();
+            if (parser != null && server.getState() == ServerState.CONNECTED) {
+                final String myNickname = parser.getLocalClient().getNickname();
+                // Check again incase we have changed nickname to the same nickname that
+                // this send is for.
+                if (parser.getStringConverter().equalsIgnoreCase(otherNickname, myNickname)) {
+                    final Thread errorThread = new Thread(new Runnable() {
+
+                        /** {@inheritDoc} */
+                        @Override
+                        public void run() {
+                            JOptionPane.showMessageDialog(null, "You can't DCC yourself.", "DCC Error", JOptionPane.ERROR_MESSAGE);
+                        }
+
+                    });
+                    errorThread.start();
+                    return;
+                } else {
+                    if (IdentityManager.getGlobalConfig().getOptionBool(plugin.getDomain(), "send.reverse")) {
+                        parser.sendCTCP(otherNickname, "DCC", "SEND \"" + (new File(dcc.getFileName())).getName() + "\" " + DCC.ipToLong(myPlugin.getListenIP(parser)) + " 0 " + dcc.getFileSize() + " " + dcc.makeToken() + ((dcc.isTurbo()) ? " T" : ""));
+                        return;
+                    } else if (plugin.listen(dcc)) {
+                        parser.sendCTCP(otherNickname, "DCC", "SEND \"" + (new File(dcc.getFileName())).getName() + "\" " + DCC.ipToLong(myPlugin.getListenIP(parser)) + " " + dcc.getPort() + " " + dcc.getFileSize() + ((dcc.isTurbo()) ? " T" : ""));
+                        return;
+                    }
+                }
+            } else {
+                status.setText("Status: Resend failed.");
+                button.setText("Close Window");
+            }
+        } else if (e.getActionCommand().equals("Close Window")) {
+            close();
+        }
+    }
+
+    /**
+     * Called when data is sent/recieved
+     *
+     * @param dcc The DCCSend that this message is from
+     * @param bytes The number of new bytes that were transfered
+     */
+    @Override
+    public void dataTransfered(final DCCSend dcc, final int bytes) {
+        final double percent;
+        synchronized (this) {
+            transferCount += bytes;
+            percent = (100.00 / dcc.getFileSize()) * (transferCount + dcc.getFileStart());
+        }
+
+        if (dcc.getType() == DCCSend.TransferType.SEND) {
+            status.setText("Status: Sending");
+        } else {
+            status.setText("Status: Recieving");
+        }
+
+        updateSpeedAndTime();
+
+        progress.setValue((int) Math.floor(percent));
+
+        ActionManager.processEvent(DCCActions.DCC_SEND_DATATRANSFERED, null, this, bytes);
+    }
+
+    /**
+     * Update the transfer speed, time remaining and time taken labels.
+     */
+    public void updateSpeedAndTime() {
+        final long time = (System.currentTimeMillis() - timeStarted) / 1000;
+        final double bytesPerSecond;
+        synchronized (this) {
+            bytesPerSecond = (time > 0) ? (transferCount / time) : transferCount;
+        }
+
+        if (bytesPerSecond > 1048576) {
+            speed.setText(String.format("Speed: %.2f MB/s", (bytesPerSecond / 1048576)));
+        } else if (bytesPerSecond > 1024) {
+            speed.setText(String.format("Speed: %.2f KB/s", (bytesPerSecond / 1024)));
+        } else {
+            speed.setText(String.format("Speed: %f B/s", bytesPerSecond));
+        }
+
+        final long remaningBytes;
+        synchronized (this) {
+            remaningBytes = dcc.getFileSize() - dcc.getFileStart() - transferCount;
+        }
+        final double remainingSeconds = (bytesPerSecond > 0) ? (remaningBytes / bytesPerSecond) : 1;
+
+        remaining.setText(String.format("Time Remaining: %s", duration((int) Math.floor(remainingSeconds))));
+        taken.setText(String.format("Time Taken: %s", timeStarted == 0 ? "N/A" : duration(time)));
+    }
+
+    /**
+     * Get the duration in seconds as a string.
+     *
+     * @param secondsInput to get duration for
+     * @return Duration as a string
+     */
+    private String duration(final long secondsInput) {
+        final StringBuilder result = new StringBuilder();
+        final long hours = (secondsInput / 3600);
+        final long minutes = (secondsInput / 60 % 60);
+        final long seconds = (secondsInput % 60);
+
+        if (hours > 0) {
+            result.append(hours + ":");
+        }
+        result.append(String.format("%0,2d:%0,2d", minutes, seconds));
+
+        return result.toString();
+    }
+
+    /**
+     * Called when the socket is closed
+     *
+     * @param dcc The DCCSend that this message is from
+     */
+    @Override
+    public void socketClosed(final DCCSend dcc) {
+        ActionManager.processEvent(DCCActions.DCC_SEND_SOCKETCLOSED, null, this);
+        if (!isWindowClosing()) {
+            synchronized (this) {
+                if (transferCount == dcc.getFileSize()) {
+                    status.setText("Status: Transfer Compelete.");
+                    progress.setValue(100);
+                    setIcon(dcc.getType() == DCCSend.TransferType.SEND ? "dcc-send-done" : "dcc-receive-done");
+                    button.setText("Close Window");
+                } else {
+                    status.setText("Status: Transfer Failed.");
+                    setIcon(dcc.getType() == DCCSend.TransferType.SEND ? "dcc-send-failed" : "dcc-receive-failed");
+                    if (dcc.getType() == DCCSend.TransferType.SEND) {
+                        button.setText("Resend");
+                    } else {
+                        button.setText("Close Window");
+                    }
+                }
+            }
+            updateSpeedAndTime();
+        }
+    }
+
+    /**
+     * Called when the socket is opened
+     *
+     * @param dcc The DCCSend that this message is from
+     */
+    @Override
+    public void socketOpened(final DCCSend dcc) {
+        ActionManager.processEvent(DCCActions.DCC_SEND_SOCKETOPENED, null, this);
+        status.setText("Status: Socket Opened");
+        timeStarted = System.currentTimeMillis();
+        setIcon(dcc.getType() == DCCSend.TransferType.SEND ? "dcc-send-active" : "dcc-receive-active");
+    }
+
+    /**
+     * Closes this container (and it's associated frame).
+     */
+    @Override
+    public void windowClosing() {
+        super.windowClosing();
+        dcc.removeFromSends();
+        dcc.close();
+    }
+
+}

src/com/dmdirc/addons/dcc/actions/DCCActions.java

@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc.actions;
+
+import com.dmdirc.actions.interfaces.ActionMetaType;
+import com.dmdirc.actions.interfaces.ActionType;
+
+/**
+ * DCC actions.
+ *
+ * @author chris
+ */
+public enum DCCActions implements ActionType {
+
+    /** DCC Chat Request. */
+    DCC_CHAT_REQUEST(DCCEvents.DCC_CHAT_REQUEST, "DCC Chat Requested"),
+    /** DCC Chat Request Sent. */
+    DCC_CHAT_REQUEST_SENT(DCCEvents.DCC_CHAT_REQUEST_SENT, "DCC Chat Request Sent"),
+    /** DCC Message from another person. */
+    DCC_CHAT_MESSAGE(DCCEvents.DCC_CHAT_MESSAGE, "DCC Chat Message Recieved"),
+    /** DCC Message to another person. */
+    DCC_CHAT_SELFMESSAGE(DCCEvents.DCC_CHAT_SELFMESSAGE, "DCC Chat Message Sent"),
+    /** DCC Chat Socket Closed. */
+    DCC_CHAT_SOCKETCLOSED(DCCEvents.DCC_CHAT_SOCKETCLOSED, "DCC Chat Socket Closed"),
+    /** DCC Chat Socket Opened. */
+    DCC_CHAT_SOCKETOPENED(DCCEvents.DCC_CHAT_SOCKETOPENED, "DCC Chat Socket Opened"),
+    /** DCC Send Socket Closed. */
+    DCC_SEND_SOCKETCLOSED(DCCEvents.DCC_SEND_SOCKETCLOSED, "DCC Send Socket Closed"),
+    /** DCC Send Socket Opened. */
+    DCC_SEND_SOCKETOPENED(DCCEvents.DCC_SEND_SOCKETOPENED, "DCC Send Socket Opened"),
+    /** DCC Send Data Transfered */
+    DCC_SEND_DATATRANSFERED(DCCEvents.DCC_SEND_DATATRANSFERED, "DCC Send Socket Closed"),
+    /** DCC Send Request. */
+    DCC_SEND_REQUEST(DCCEvents.DCC_SEND_REQUEST, "DCC Chat Requested"),
+    /** DCC Send Request Sent. */
+    DCC_SEND_REQUEST_SENT(DCCEvents.DCC_SEND_REQUEST_SENT, "DCC Chat Request Sent");
+
+    /** The type of this action. */
+    private final ActionMetaType type;
+
+    /** The name of this action. */
+    private final String name;
+
+    /**
+     * Constructs a new core action.
+     * @param type The type of this action
+     * @param name The name of this action
+     */
+    DCCActions(final ActionMetaType type, final String name) {
+        this.type = type;
+        this.name = name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ActionMetaType getType() {
+        return type;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+}

src/com/dmdirc/addons/dcc/actions/DCCEvents.java

@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc.actions;
+
+import com.dmdirc.Server;
+import com.dmdirc.actions.interfaces.ActionMetaType;
+
+import com.dmdirc.addons.dcc.DCCChatWindow;
+import com.dmdirc.addons.dcc.DCCSendWindow;
+
+import java.io.File;
+
+/**
+ * Defines DCC-related events.
+ *
+ * @author Chris
+ */
+public enum DCCEvents implements ActionMetaType {
+
+    /** DCC Chat Request. */
+    DCC_CHAT_REQUEST(new String[]{"server", "client"}, Server.class, String.class),
+    /** DCC Chat Request Sent. */
+    DCC_CHAT_REQUEST_SENT(new String[]{"server", "client"}, Server.class, String.class),
+    /** DCC Message from another person. */
+    DCC_CHAT_MESSAGE(new String[]{"DCCChatWindow", "Nickname", "Message"}, DCCChatWindow.class, String.class, String.class),
+    /** DCC Message to another person. */
+    DCC_CHAT_SELFMESSAGE(new String[]{"DCCChatWindow", "Message"}, DCCChatWindow.class, String.class),
+    /** DCC Chat Socket Closed. */
+    DCC_CHAT_SOCKETCLOSED(new String[]{"DCCChatWindow"}, DCCChatWindow.class),
+    /** DCC Chat Socket Opened. */
+    DCC_CHAT_SOCKETOPENED(new String[]{"DCCChatWindow"}, DCCChatWindow.class),
+    /** DCC Send Socket Closed. */
+    DCC_SEND_SOCKETCLOSED(new String[]{"DCCSendWindow"}, DCCSendWindow.class),
+    /** DCC Send Socket Opened. */
+    DCC_SEND_SOCKETOPENED(new String[]{"DCCSendWindow"}, DCCSendWindow.class),
+    /** DCC Send Data Transfered */
+    DCC_SEND_DATATRANSFERED(new String[]{"DCCSendWindow", "Bytes Transfered"}, DCCSendWindow.class, int.class),
+    /** DCC Send Request. */
+    DCC_SEND_REQUEST(new String[]{"server", "client", "file"}, Server.class, String.class, String.class),
+    /** DCC Send Request Sent. */
+    DCC_SEND_REQUEST_SENT(new String[]{"server", "client", "file"}, Server.class, String.class, File.class);
+
+    /** The names of the arguments for this meta type. */
+    private String[] argNames;
+
+    /** The classes of the arguments for this meta type. */
+    private Class[] argTypes;
+
+    /**
+     * Creates a new instance of this meta-type.
+     *
+     * @param argNames The names of the meta-type's arguments
+     * @param argTypes The types of the meta-type's arguments
+     */
+    DCCEvents(final String[] argNames, final Class... argTypes) {
+        this.argNames = argNames;
+        this.argTypes = argTypes;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getArity() {
+        return argNames.length;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Class[] getArgTypes() {
+        return argTypes;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String[] getArgNames() {
+        return argNames;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getGroup() {
+        return "DCC Events";
+    }
+
+}

src/com/dmdirc/addons/dcc/kde/KDialogProcess.java

@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc.kde;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+
+/**
+ * Hold a Process and stream readers for a KDialog Process
+ */
+public class KDialogProcess {
+
+    /** Is kdialog in /bin? */
+    private final static boolean isBin = (new File("/bin/kdialog")).exists();
+
+    /** Does KDialog exist? */
+    private final static boolean hasKDialog = (new File("/usr/bin/kdialog")).exists() || isBin;
+
+    /** Stream for the stdout stream for this process */
+    private final StreamReader stdOutputStream;
+
+    /** Stream for the stderr stream for this process */
+    private final StreamReader stdErrorStream;
+
+    /** The actual process for this process */
+    private final Process process;
+
+    /**
+     * Execute kdialog with the Parameters in params
+     *
+     * @param params Parameters to pass to kdialog
+     */
+    public KDialogProcess(final String[] params) throws IOException {
+        final String[] exec = new String[params.length + 1];
+        System.arraycopy(params, 0, exec, 1, params.length);
+        exec[0] = (isBin) ? "/bin/kdialog" : "/usr/bin/kdialog";
+        process = Runtime.getRuntime().exec(exec);
+        stdOutputStream = new StreamReader(process.getInputStream(), new ArrayList<String>());
+        stdErrorStream = new StreamReader(process.getErrorStream(), new ArrayList<String>());
+        stdOutputStream.start();
+        stdErrorStream.start();
+    }
+
+    /**
+     * Does this system have kdialog?
+     *
+     * @return True if kdialog was found, else false
+     */
+    public static boolean hasKDialog() {
+        return hasKDialog;
+    }
+
+    /**
+     * Get the process object for this KDialogProcess
+     *
+     * @return The process object for this KDialogProcess
+     */
+    public Process getProcess() {
+        return process;
+    }
+
+    /**
+     * Get the StreamReader for this KDialogProcess's stdout stream
+     *
+     * @return The StreamReader for this KDialogProcess's stdout stream
+     */
+    public StreamReader getStdOutStream() {
+        return stdOutputStream;
+    }
+
+    /**
+     * Get the StreamReader for this KDialogProcess's stderr stream
+     *
+     * @return The StreamReader for this KDialogProcess's stderr stream
+     */
+    public StreamReader getStdErrStream() {
+        return stdErrorStream;
+    }
+
+    /**
+     * Wait for the process to finish.
+     */
+    public void waitFor() throws InterruptedException {
+        process.waitFor();
+    }
+
+}

src/com/dmdirc/addons/dcc/kde/KFileChooser.java

@@ -0,0 +1,336 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc.kde;
+
+import com.dmdirc.addons.dcc.DCCPlugin;
+
+import com.dmdirc.config.IdentityManager;
+
+import java.awt.Component;
+import java.awt.HeadlessException;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.JFileChooser;
+import javax.swing.filechooser.FileSystemView;
+
+/**
+ * JFileChooser that uses KDialog to show the actual chooser.
+ * This is quite hacky, and not guarenteed to behave identically to JFileChooser,
+ * altho it tries to be as close as possible.
+ * Almost a drop in replacement for JFileChooser, replace:
+ *    new JFileChooser();
+ * with:
+ *    KFileChooser.getFileChooser();
+ *
+ * There are obviously some differences:
+ * - File filters must be set using setKDEFileFilter() not using FileFilter objects.
+ * - FileSystemView's are ignored
+ * - showOpenDialog and showSaveDialog shell kdialog, so only options available
+ *   in kdialog work.
+ * - getFileChooser() will return a JFileChooser object unless the DCC plugin's
+ *   config option "general.useKFileChooser" is set to "true" (defaults to false)
+ *   and kdialog is in either /usr/bin or /bin
+ * - Selection mode FILES_AND_DIRECTORIES can not be used
+ */
+public class KFileChooser extends JFileChooser {
+
+    /**
+     * A version number for this class.
+     * It should be changed whenever the class structure is changed (or anything
+     * else that would prevent serialized objects being unserialized with the new
+     * class).
+     */
+    private static final long serialVersionUID = 200806141;
+
+    /** File Filter */
+    private String fileFilter = null;
+
+    /** The plugin that this file chooser is for. */
+    private final DCCPlugin plugin;
+
+    /**
+     * Should a KFileChooser be used rather than a JFileChooser?
+     *
+     * @param plugin The DCC Plugin that is requesting a chooser
+     * @return return true if getFileChooser() will return a KFileChooser not a
+     *         JFileChooser
+     */
+    public static boolean useKFileChooser(final DCCPlugin plugin) {
+        return KDialogProcess.hasKDialog() && IdentityManager.getGlobalConfig().getOptionBool(plugin.getDomain(), "general.useKFileChooser");
+    }
+
+    /**
+     * Constructs a FileChooser pointing to the user's default directory.
+     *
+     * @param plugin The DCC Plugin that is requesting a chooser
+     * @return The relevant FileChooser
+     */
+    public static JFileChooser getFileChooser(final DCCPlugin plugin) {
+        return useKFileChooser(plugin) ? new KFileChooser(plugin) : new JFileChooser();
+    }
+
+    /**
+     * Constructs a FileChooser using the given File as the path.
+     *
+     * @param plugin The DCC Plugin that is requesting a chooser
+     * @param currentDirectory Directory to use as the base directory
+     * @return The relevant FileChooser
+     */
+    public static JFileChooser getFileChooser(final DCCPlugin plugin, final File currentDirectory) {
+        return useKFileChooser(plugin) ? new KFileChooser(plugin, currentDirectory) : new JFileChooser(currentDirectory);
+    }
+
+    /**
+     * Constructs a FileChooser using the given current directory and FileSystemView.
+     *
+     * @param plugin The DCC Plugin that is requesting a chooser
+     * @param currentDirectory Directory to use as the base directory
+     * @param fsv The FileSystemView to use
+     * @return The relevant FileChooser
+     */
+    public static JFileChooser getFileChooser(final DCCPlugin plugin, final File currentDirectory, final FileSystemView fsv) {
+        return useKFileChooser(plugin) ? new KFileChooser(plugin, currentDirectory, fsv) : new JFileChooser(currentDirectory, fsv);
+    }
+
+    /**
+     * Constructs a FileChooser using the given FileSystemView.
+     *
+     * @param plugin The DCC Plugin that is requesting a chooser
+     * @param fsv The FileSystemView to use
+     * @return The relevant FileChooser
+     */
+    public static JFileChooser getFileChooser(final DCCPlugin plugin, final FileSystemView fsv) {
+        return useKFileChooser(plugin) ? new KFileChooser(plugin, fsv) : new JFileChooser(fsv);
+    }
+
+    /**
+     * Constructs a FileChooser using the given path.
+     *
+     * @param plugin The DCC Plugin that is requesting a chooser
+     * @param currentDirectoryPath Directory to use as the base directory
+     * @return The relevant FileChooser
+     */
+    public static JFileChooser getFileChooser(final DCCPlugin plugin, final String currentDirectoryPath) {
+        return useKFileChooser(plugin) ? new KFileChooser(plugin, currentDirectoryPath) : new JFileChooser(currentDirectoryPath);
+    }
+
+    /**
+     * Constructs a FileChooser using the given current directory path and FileSystemView.
+     *
+     * @param plugin The DCC Plugin that is requesting a chooser
+     * @param currentDirectoryPath Directory to use as the base directory
+     * @param fsv The FileSystemView to use
+     * @return The relevant FileChooser
+     */
+    public static JFileChooser getFileChooser(final DCCPlugin plugin, final String currentDirectoryPath, final FileSystemView fsv) {
+        return useKFileChooser(plugin) ? new KFileChooser(plugin, currentDirectoryPath, fsv) : new JFileChooser(currentDirectoryPath, fsv);
+    }
+
+    /**
+     * Constructs a FileChooser pointing to the user's default directory.
+     *
+     * @param plugin The plugin that owns this KFileChooser
+     */
+    private KFileChooser(final DCCPlugin plugin) {
+        super();
+
+        this.plugin = plugin;
+    }
+
+    /**
+     * Constructs a FileChooser using the given File as the path.
+     *
+     * @param plugin The plugin that owns this KFileChooser
+     * @param currentDirectory Directory to use as the base directory
+     */
+    private KFileChooser(final DCCPlugin plugin, final File currentDirectory) {
+        super(currentDirectory);
+
+        this.plugin = plugin;
+    }
+
+    /**
+     * Constructs a FileChooser using the given current directory and FileSystemView.
+     *
+     * @param plugin The plugin that owns this KFileChooser
+     * @param currentDirectory Directory to use as the base directory
+     * @param fsv The FileSystemView to use
+     */
+    private KFileChooser(final DCCPlugin plugin, final File currentDirectory, final FileSystemView fsv) {
+        super(currentDirectory, fsv);
+
+        this.plugin = plugin;
+    }
+
+    /**
+     * Constructs a FileChooser using the given FileSystemView.
+     *
+     * @param plugin The plugin that owns this KFileChooser
+     * @param fsv The FileSystemView to use
+     */
+    private KFileChooser(final DCCPlugin plugin, final FileSystemView fsv) {
+        super(fsv);
+
+        this.plugin = plugin;
+    }
+
+    /**
+     * Constructs a FileChooser using the given path.
+     *
+     * @param plugin The plugin that owns this KFileChooser
+     * @param currentDirectoryPath Directory to use as the base directory
+     */
+    private KFileChooser(final DCCPlugin plugin, final String currentDirectoryPath) {
+        super(currentDirectoryPath);
+
+        this.plugin = plugin;
+    }
+
+    /**
+     * Constructs a FileChooser using the given current directory path and FileSystemView.
+     *
+     * @param plugin The plugin that owns this KFileChooser
+     * @param currentDirectoryPath Directory to use as the base directory
+     * @param fsv The FileSystemView to use
+     */
+    private KFileChooser(final DCCPlugin plugin, final String currentDirectoryPath, final FileSystemView fsv) {
+        super(currentDirectoryPath, fsv);
+
+        this.plugin = plugin;
+    }
+
+    /**
+     * Set the file filter.
+     *
+     * @param fileFilter File filter (eg "*.php *.jpg" or null for no filter)
+     */
+    public void setKDEFileFilter(final String fileFilter) {
+        this.fileFilter = fileFilter;
+    }
+
+    /**
+     * Get the file filter.
+     *
+     * @return File filter (eg "*.php *.jpg" or null for no filter)
+     */
+    public String getKDEFileFilter() {
+        return fileFilter;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int showOpenDialog(final Component parent) throws HeadlessException {
+        if (!useKFileChooser(plugin)) {
+            return super.showOpenDialog(parent);
+        }
+        final ArrayList<String> params = new ArrayList<String>();
+        if (isMultiSelectionEnabled()) {
+            params.add("--multiple");
+            params.add("--separate-output");
+        }
+        if (getDialogTitle() != null && !getDialogTitle().isEmpty()) {
+            params.add("--caption");
+            params.add(getDialogTitle());
+        }
+        if (getFileSelectionMode() == DIRECTORIES_ONLY) {
+            params.add("--getexistingdirectory");
+        } else {
+            params.add("--getopenfilename");
+        }
+        if (getSelectedFile() != null && getFileSelectionMode() != DIRECTORIES_ONLY && !getSelectedFile().getPath().isEmpty()) {
+            if (getSelectedFile().getPath().charAt(0) != '/') {
+                params.add(getCurrentDirectory().getPath() + File.separator + getSelectedFile().getPath());
+            } else {
+                params.add(getSelectedFile().getPath());
+            }
+        } else if (getCurrentDirectory() != null) {
+            params.add(getCurrentDirectory().getPath());
+        }
+        if (getFileSelectionMode() != DIRECTORIES_ONLY && fileFilter != null && !fileFilter.isEmpty()) {
+            params.add(fileFilter);
+        }
+        KDialogProcess kdp;
+        try {
+            kdp = new KDialogProcess(params.toArray(new String[0]));
+            kdp.waitFor();
+        } catch (Exception e) {
+            return JFileChooser.ERROR_OPTION;
+        }
+
+        if (kdp.getProcess().exitValue() == 0) {
+            if (isMultiSelectionEnabled()) {
+                final List<String> list = kdp.getStdOutStream().getList();
+                final File[] fileList = new File[list.size()];
+                for (int i = 0; i < list.size(); ++i) {
+                    fileList[i] = new File(list.get(i));
+                }
+                setSelectedFiles(fileList);
+            } else {
+                setSelectedFile(new File(kdp.getStdOutStream().getList().get(0)));
+            }
+            return JFileChooser.APPROVE_OPTION;
+        } else {
+            return JFileChooser.ERROR_OPTION;
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int showSaveDialog(final Component parent) throws HeadlessException {
+        if (!useKFileChooser(plugin)) {
+            return super.showSaveDialog(parent);
+        }
+        final ArrayList<String> params = new ArrayList<String>();
+        if (getDialogTitle() != null && !getDialogTitle().isEmpty()) {
+            params.add("--caption");
+            params.add(getDialogTitle());
+        }
+        params.add("--getsavefilename");
+        if (getSelectedFile() != null && !getSelectedFile().getPath().isEmpty()) {
+            if (getSelectedFile().getPath().charAt(0) != '/') {
+                params.add(getCurrentDirectory().getPath() + File.separator + getSelectedFile().getPath());
+            } else {
+                params.add(getSelectedFile().getPath());
+            }
+        } else if (getCurrentDirectory() != null) {
+            params.add(getCurrentDirectory().getPath());
+        }
+        KDialogProcess kdp;
+        try {
+            kdp = new KDialogProcess(params.toArray(new String[0]));
+            kdp.waitFor();
+        } catch (Exception e) {
+            return JFileChooser.ERROR_OPTION;
+        }
+
+        if (kdp.getProcess().exitValue() == 0) {
+            setSelectedFile(new File(kdp.getStdOutStream().getList().get(0)));
+            return JFileChooser.APPROVE_OPTION;
+        } else {
+            return JFileChooser.ERROR_OPTION;
+        }
+    }
+
+}

src/com/dmdirc/addons/dcc/kde/StreamReader.java

@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc.kde;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.List;
+
+public class StreamReader extends Thread {
+
+    /** This is the Input Stream we are reading */
+    private InputStream stream;
+
+    /** This is the output Prefix */
+    private String prefix = null;
+
+    /** List to store output in */
+    private List<String> list = null;
+
+    /**
+     * Create a new Stream Reader
+     *
+     * @param stream The stream to read
+     * @param list The list to store the output from the stream in (null for no saving)
+     */
+    public StreamReader(final InputStream stream, final List<String> list) {
+        this.stream = stream;
+        this.list = list;
+    }
+
+    /**
+     * Create a new Stream Reader that outputs what it reads
+     *
+     * @param stream The stream to read
+     * @param list The list to store the output from the stream in (null for no saving)
+     * @param prefix Prefix of outputed messages
+     */
+    public StreamReader(final InputStream stream, final List<String> list, final String prefix) {
+        this.stream = stream;
+        this.prefix = prefix;
+        this.list = list;
+
+        System.out.printf("[%s] Started%n", prefix);
+    }
+
+    /**
+     * Get the list that the output is being stored in.
+     */
+    public List<String> getList() {
+        return list;
+    }
+
+    /**
+     * Wait for input on stream, and output/throw away/save to list
+     */
+    public void run() {
+        BufferedReader reader = new BufferedReader(new InputStreamReader(stream));
+        try {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                if (prefix != null) {
+                    System.out.printf("[%s] %s%n", prefix, line);
+                }
+                if (list != null) {
+                    list.add(line);
+                }
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                stream.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+}

src/com/dmdirc/addons/dcc/plugin.config

@@ -0,0 +1,74 @@
+# This is a DMDirc configuration file.
+
+# This section indicates which sections below take key/value
+# pairs, rather than a simple list. It should be placed above
+# any sections that take key/values.
+keysections:
+  metadata
+  requires
+  updates
+  defaults
+  formatters
+  icons
+  version
+
+metadata:
+  author=Shane <shane@dmdirc.com>
+  mainclass=com.dmdirc.addons.dcc.DCCPlugin
+  description=Adds DCC Support to dmdirc
+  name=dcc
+  nicename=DCC Plugin
+
+requires:
+  parent=ui_swing
+
+updates:
+  id=23
+
+version:
+  friendly=0.4
+
+persistent:
+  com.dmdirc.addons.dcc.actions.DCCActions
+  com.dmdirc.addons.dcc.actions.DCCEvents
+
+provides:
+  dcc command
+  dcc feature
+
+required-services:
+  swing ui
+
+defaults:
+  general.useKFileChooser=false
+  send.reverse=false
+  send.forceturbo=true
+  receive.reverse.sendtoken=false
+  send.blocksize=1024
+  receive.autoaccept=false
+  firewall.ip=
+  firewall.ports.usePortRange=false
+  firewall.ports.startPort=11000
+  firewall.ports.endPort=11019
+
+formatters:
+  DCCChatStarting=Starting DCC Chat with: %1$s on %2$s:%3$s
+  DCCChatInfo=%1$s
+  DCCChatError=\u00034 Error: %1$s
+  DCCSendError=\u00034 Error: %1$s
+  DCCChatSelfMessage=<%1$s> %2$s
+  DCCChatMessage=<%1$s> %2$s
+
+icons:
+  category-dcc=plugin://dcc:com/dmdirc/addons/dcc/res/transfers.png
+  dcc=plugin://dcc:com/dmdirc/addons/dcc/res/transfers.png
+  dcc-chat-active=plugin://dcc:com/dmdirc/addons/dcc/res/chat.png
+  dcc-chat-inactive=plugin://dcc:com/dmdirc/addons/dcc/res/chat-inactive.png
+  dcc-send-active=plugin://dcc:com/dmdirc/addons/dcc/res/send.png
+  dcc-send-inactive=plugin://dcc:com/dmdirc/addons/dcc/res/send-inactive.png
+  dcc-send-done=plugin://dcc:com/dmdirc/addons/dcc/res/send-done.png
+  dcc-send-failed=plugin://dcc:com/dmdirc/addons/dcc/res/send-failed.png
+  dcc-receive-active=plugin://dcc:com/dmdirc/addons/dcc/res/receive.png
+  dcc-receive-inactive=plugin://dcc:com/dmdirc/addons/dcc/res/receive-inactive.png
+  dcc-receive-done=plugin://dcc:com/dmdirc/addons/dcc/res/receive-done.png
+  dcc-receive-failed=plugin://dcc:com/dmdirc/addons/dcc/res/receive-failed.png

src/com/dmdirc/addons/dcc/res/source/chat-inactive.svg

@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   id="svg1872"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/chris/DMDirc/src/com/dmdirc/addons/dcc/res/source"
+   sodipodi:docname="chat-inactive.svg"
+   inkscape:export-filename="/home/chris/DMDirc/src/com/dmdirc/addons/dcc/res/transfers.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs1874" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="10.049476"
+     inkscape:cy="8.1008816"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="849"
+     inkscape:window-height="581"
+     inkscape:window-x="195"
+     inkscape:window-y="150" />
+  <metadata
+     id="metadata1877">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="fill-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill:#b3b3b3"
+       id="rect4588"
+       width="11.064357"
+       height="9.19802"
+       x="2.5856435"
+       y="4.5044556" />
+    <path
+       style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 11.361387,8.723268 L 11.885149,11.75 L 9.7678225,10.398515"
+       id="path3235"
+       sodipodi:nodetypes="ccc" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3671"
+       width="11.033788"
+       height="2.4977343"
+       x="2.4819307"
+       y="2.5022655" />
+    <rect
+       style="fill:none;fill-opacity:1;stroke:black;stroke-width:0.8987385;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1880"
+       width="11.011163"
+       height="10.988637"
+       x="2.5394683"
+       y="2.5619929" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.62419522;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path2262"
+       sodipodi:cx="7.9962873"
+       sodipodi:cy="8.8596535"
+       sodipodi:rx="4.0319309"
+       sodipodi:ry="2.9507425"
+       d="M 12.028218 8.8596535 A 4.0319309 2.9507425 0 1 1  3.9643564,8.8596535 A 4.0319309 2.9507425 0 1 1  12.028218 8.8596535 z"
+       transform="matrix(0.8414881,0,0,0.7625199,1.0878033,1.7443377)" />
+  </g>
+</svg>

src/com/dmdirc/addons/dcc/res/source/chat.svg

@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   id="svg1872"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/chris/DMDirc/src/com/dmdirc/addons/dcc/res/source"
+   sodipodi:docname="chat.svg"
+   inkscape:export-filename="/home/chris/DMDirc/src/com/dmdirc/addons/dcc/res/transfers.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs1874" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="10.049476"
+     inkscape:cy="8.1008816"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="849"
+     inkscape:window-height="581"
+     inkscape:window-x="195"
+     inkscape:window-y="150" />
+  <metadata
+     id="metadata1877">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="fill-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill:white"
+       id="rect4588"
+       width="11.064357"
+       height="9.19802"
+       x="2.5856435"
+       y="4.5044556" />
+    <path
+       style="fill:#b3b3b3;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 11.361387,8.723268 L 11.885149,11.75 L 9.7678225,10.398515"
+       id="path3235"
+       sodipodi:nodetypes="ccc" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3671"
+       width="11.033788"
+       height="2.4977343"
+       x="2.4819307"
+       y="2.5022655" />
+    <rect
+       style="fill:none;fill-opacity:1;stroke:black;stroke-width:0.8987385;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1880"
+       width="11.011163"
+       height="10.988637"
+       x="2.5394683"
+       y="2.5619929" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#b3b3b3;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.62419522;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path2262"
+       sodipodi:cx="7.9962873"
+       sodipodi:cy="8.8596535"
+       sodipodi:rx="4.0319309"
+       sodipodi:ry="2.9507425"
+       d="M 12.028218 8.8596535 A 4.0319309 2.9507425 0 1 1  3.9643564,8.8596535 A 4.0319309 2.9507425 0 1 1  12.028218 8.8596535 z"
+       transform="matrix(0.8414881,0,0,0.7625199,1.0878033,1.7443377)" />
+  </g>
+</svg>

src/com/dmdirc/addons/dcc/res/source/receive-done.svg

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   id="svg1872"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docbase="/home/chris/DMDirc/src/com/dmdirc/addons/dcc/res/source"
+   sodipodi:docname="receive-done.svg"
+   inkscape:export-filename="/home/chris/DMDirc/src/com/dmdirc/addons/dcc/res/receive-done.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs1874">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       id="perspective2601" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.392433"
+     inkscape:cx="7.4318491"
+     inkscape:cy="8.4618511"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1062"
+     inkscape:window-height="667"
+     inkscape:window-x="195"
+     inkscape:window-y="150">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2725" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata1877">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="fill-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill:#ffffff"
+       id="rect4588"
+       width="11.064357"
+       height="9.19802"
+       x="2.5856435"
+       y="4.5044556" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3671"
+       width="11.033788"
+       height="2.4977343"
+       x="2.4819307"
+       y="2.5022655" />
+    <rect
+       style="fill:none;fill-opacity:1;stroke:black;stroke-width:0.8987385;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1880"
+       width="11.011163"
+       height="10.988637"
+       x="2.5394683"
+       y="2.5619929" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#008000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 4.6508023,9.4697644 L 6.5939458,11.476617 L 11.435877,6.5072663"
+       id="path2727"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>

src/com/dmdirc/addons/dcc/res/source/receive-failed.svg

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   id="svg1872"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docbase="/home/chris/DMDirc/src/com/dmdirc/addons/dcc/res/source"
+   sodipodi:docname="receive-failed.svg"
+   inkscape:export-filename="/home/chris/DMDirc/src/com/dmdirc/addons/dcc/res/send-failed.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs1874">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       id="perspective2601" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.392433"
+     inkscape:cx="7.4318491"
+     inkscape:cy="8.4618511"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1062"
+     inkscape:window-height="667"
+     inkscape:window-x="195"
+     inkscape:window-y="150">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2725" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata1877">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="fill-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill:#ffffff"
+       id="rect4588"
+       width="11.064357"
+       height="9.19802"
+       x="2.5856435"
+       y="4.5044556" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3671"
+       width="11.033788"
+       height="2.4977343"
+       x="2.4819307"
+       y="2.5022655" />
+    <rect
+       style="fill:none;fill-opacity:1;stroke:black;stroke-width:0.8987385;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1880"
+       width="11.011163"
+       height="10.988637"
+       x="2.5394683"
+       y="2.5619929" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#008000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 5.383463,11.699601 L 10.543942,6.4435568"
+       id="path2780" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#008000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 5.3197534,6.5072664 L 10.384668,11.604036"
+       id="path2782" />
+  </g>
+</svg>

src/com/dmdirc/addons/dcc/res/source/receive-inactive.svg

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   id="svg1872"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/chris/DMDirc/src/com/dmdirc/addons/dcc/res/source"
+   sodipodi:docname="receive-inactive.svg"
+   inkscape:export-filename="/home/chris/DMDirc/src/com/dmdirc/addons/dcc/res/send.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs1874" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="-28.047481"
+     inkscape:cy="106.93464"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="849"
+     inkscape:window-height="581"
+     inkscape:window-x="195"
+     inkscape:window-y="150" />
+  <metadata
+     id="metadata1877">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="fill-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill:#cccccc"
+       id="rect4588"
+       width="11.064357"
+       height="9.19802"
+       x="2.5856435"
+       y="4.5044556" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3671"
+       width="11.033788"
+       height="2.4977343"
+       x="2.4819307"
+       y="2.5022655" />
+    <rect
+       style="fill:none;fill-opacity:1;stroke:black;stroke-width:0.8987385;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1880"
+       width="11.011163"
+       height="10.988637"
+       x="2.5394683"
+       y="2.5619929" />
+    <rect
+       style="fill:#008000;fill-opacity:1;fill-rule:evenodd;stroke:#cccccc;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2226"
+       width="7.2534657"
+       height="2.9999995"
+       x="-12.5"
+       y="7.5000005"
+       transform="scale(-1,1)" />
+    <path
+       sodipodi:type="star"
+       style="fill:#008000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path2228"
+       sodipodi:sides="3"
+       sodipodi:cx="9.3702974"
+       sodipodi:cy="7.0801978"
+       sodipodi:r1="4.1024742"
+       sodipodi:r2="2.0512371"
+       sodipodi:arg1="0.54230274"
+       sodipodi:arg2="1.5895003"
+       inkscape:flatsided="true"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 12.884159,9.1975246 L 5.779708,9.0646277 L 9.4470255,2.9784412 L 12.884159,9.1975246 z "
+       transform="matrix(0,0.8351333,0.6431815,0,2.084322,1.2400099)" />
+  </g>
+</svg>

src/com/dmdirc/addons/dcc/res/source/receive.svg

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   id="svg1872"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docbase="/home/chris/DMDirc/src/com/dmdirc/addons/dcc/res/source"
+   sodipodi:docname="receive.svg"
+   inkscape:export-filename="/home/chris/DMDirc/src/com/dmdirc/addons/dcc/res/send.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs1874">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       id="perspective2601" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="10.049476"
+     inkscape:cy="6.1075996"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="849"
+     inkscape:window-height="667"
+     inkscape:window-x="195"
+     inkscape:window-y="150" />
+  <metadata
+     id="metadata1877">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="fill-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill:#ffffff"
+       id="rect4588"
+       width="11.064357"
+       height="9.19802"
+       x="2.5856435"
+       y="4.5044556" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3671"
+       width="11.033788"
+       height="2.4977343"
+       x="2.4819307"
+       y="2.5022655" />
+    <rect
+       style="fill:none;fill-opacity:1;stroke:black;stroke-width:0.8987385;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1880"
+       width="11.011163"
+       height="10.988637"
+       x="2.5394683"
+       y="2.5619929" />
+    <rect
+       style="fill:#008000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2226"
+       width="7.2534657"
+       height="2.9999995"
+       x="-12.5"
+       y="7.5000005"
+       transform="scale(-1,1)" />
+    <path
+       sodipodi:type="star"
+       style="fill:#008000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path2228"
+       sodipodi:sides="3"
+       sodipodi:cx="9.3702974"
+       sodipodi:cy="7.0801978"
+       sodipodi:r1="4.1024742"
+       sodipodi:r2="2.0512371"
+       sodipodi:arg1="0.54230274"
+       sodipodi:arg2="1.5895003"
+       inkscape:flatsided="true"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 12.884159,9.1975246 L 5.779708,9.0646277 L 9.4470255,2.9784412 L 12.884159,9.1975246 z "
+       transform="matrix(0,0.8351333,0.6431815,0,2.084322,1.2400099)" />
+  </g>
+</svg>

src/com/dmdirc/addons/dcc/res/source/send-done.svg

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   id="svg1872"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docbase="/home/chris/DMDirc/src/com/dmdirc/addons/dcc/res/source"
+   sodipodi:docname="send-done.svg"
+   inkscape:export-filename="/home/chris/DMDirc/src/com/dmdirc/addons/dcc/res/receive-done.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs1874">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       id="perspective2601" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.392433"
+     inkscape:cx="7.4318491"
+     inkscape:cy="8.4618511"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1062"
+     inkscape:window-height="667"
+     inkscape:window-x="195"
+     inkscape:window-y="150">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2725" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata1877">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="fill-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill:#ffffff"
+       id="rect4588"
+       width="11.064357"
+       height="9.19802"
+       x="2.5856435"
+       y="4.5044556" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3671"
+       width="11.033788"
+       height="2.4977343"
+       x="2.4819307"
+       y="2.5022655" />
+    <rect
+       style="fill:none;fill-opacity:1;stroke:black;stroke-width:0.8987385;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1880"
+       width="11.011163"
+       height="10.988637"
+       x="2.5394683"
+       y="2.5619929" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ff0000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 4.6508023,9.4697644 L 6.5939458,11.476617 L 11.435877,6.5072663"
+       id="path2727"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>

src/com/dmdirc/addons/dcc/res/source/send-failed.svg

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   id="svg1872"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docbase="/home/chris/DMDirc/src/com/dmdirc/addons/dcc/res/source"
+   sodipodi:docname="send-failed.svg"
+   inkscape:export-filename="/home/chris/DMDirc/src/com/dmdirc/addons/dcc/res/send-done.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs1874">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       id="perspective2601" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.392433"
+     inkscape:cx="7.4318491"
+     inkscape:cy="8.4618511"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1062"
+     inkscape:window-height="667"
+     inkscape:window-x="195"
+     inkscape:window-y="150">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2725" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata1877">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="fill-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill:#ffffff"
+       id="rect4588"
+       width="11.064357"
+       height="9.19802"
+       x="2.5856435"
+       y="4.5044556" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3671"
+       width="11.033788"
+       height="2.4977343"
+       x="2.4819307"
+       y="2.5022655" />
+    <rect
+       style="fill:none;fill-opacity:1;stroke:black;stroke-width:0.8987385;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1880"
+       width="11.011163"
+       height="10.988637"
+       x="2.5394683"
+       y="2.5619929" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ff0000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 5.383463,11.699601 L 10.543942,6.4435568"
+       id="path2780" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ff0000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 5.3197534,6.5072664 L 10.384668,11.604036"
+       id="path2782" />
+  </g>
+</svg>

src/com/dmdirc/addons/dcc/res/source/send-inactive.svg

@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   id="svg1872"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/chris/DMDirc/src/com/dmdirc/addons/dcc/res/source"
+   sodipodi:docname="send-inactive.svg"
+   inkscape:export-filename="/home/chris/DMDirc/trunk/src/com/dmdirc/res/server-normal.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs1874" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="10.049476"
+     inkscape:cy="9.9028618"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="849"
+     inkscape:window-height="581"
+     inkscape:window-x="195"
+     inkscape:window-y="150" />
+  <metadata
+     id="metadata1877">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="fill-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill:#b3b3b3"
+       id="rect4588"
+       width="11.064357"
+       height="9.19802"
+       x="2.5856435"
+       y="4.5044556" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3671"
+       width="11.033788"
+       height="2.4977343"
+       x="2.4819307"
+       y="2.5022655" />
+    <rect
+       style="fill:none;fill-opacity:1;stroke:black;stroke-width:0.8987385;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1880"
+       width="11.011163"
+       height="10.988637"
+       x="2.5394683"
+       y="2.5619929" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#b3b3b3;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2226"
+       width="7.2534657"
+       height="2.9999995"
+       x="3.5"
+       y="7.5000005" />
+    <path
+       sodipodi:type="star"
+       style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path2228"
+       sodipodi:sides="3"
+       sodipodi:cx="9.3702974"
+       sodipodi:cy="7.0801978"
+       sodipodi:r1="4.1024742"
+       sodipodi:r2="2.0512371"
+       sodipodi:arg1="0.54230274"
+       sodipodi:arg2="1.5895003"
+       inkscape:flatsided="true"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 12.884159,9.1975246 L 5.779708,9.0646277 L 9.4470255,2.9784412 L 12.884159,9.1975246 z "
+       transform="matrix(0,0.8351333,-0.6431815,0,13.915678,1.2400099)" />
+  </g>
+</svg>

src/com/dmdirc/addons/dcc/res/source/send.svg

@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   id="svg1872"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/chris/DMDirc/src/com/dmdirc/addons/dcc/res/source"
+   sodipodi:docname="send.svg"
+   inkscape:export-filename="/home/chris/DMDirc/trunk/src/com/dmdirc/res/server-normal.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs1874" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="10.049476"
+     inkscape:cy="9.9028618"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="849"
+     inkscape:window-height="581"
+     inkscape:window-x="195"
+     inkscape:window-y="150" />
+  <metadata
+     id="metadata1877">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="fill-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill:white"
+       id="rect4588"
+       width="11.064357"
+       height="9.19802"
+       x="2.5856435"
+       y="4.5044556" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3671"
+       width="11.033788"
+       height="2.4977343"
+       x="2.4819307"
+       y="2.5022655" />
+    <rect
+       style="fill:none;fill-opacity:1;stroke:black;stroke-width:0.8987385;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1880"
+       width="11.011163"
+       height="10.988637"
+       x="2.5394683"
+       y="2.5619929" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2226"
+       width="7.2534657"
+       height="2.9999995"
+       x="3.5"
+       y="7.5000005" />
+    <path
+       sodipodi:type="star"
+       style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path2228"
+       sodipodi:sides="3"
+       sodipodi:cx="9.3702974"
+       sodipodi:cy="7.0801978"
+       sodipodi:r1="4.1024742"
+       sodipodi:r2="2.0512371"
+       sodipodi:arg1="0.54230274"
+       sodipodi:arg2="1.5895003"
+       inkscape:flatsided="true"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 12.884159,9.1975246 L 5.779708,9.0646277 L 9.4470255,2.9784412 L 12.884159,9.1975246 z "
+       transform="matrix(0,0.8351333,-0.6431815,0,13.915678,1.2400099)" />
+  </g>
+</svg>

src/com/dmdirc/addons/dcc/res/source/transfers.svg

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   id="svg1872"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/chris/DMDirc/src/com/dmdirc/addons/dcc/res/source"
+   sodipodi:docname="transfers.svg"
+   inkscape:export-filename="/home/chris/DMDirc/src/com/dmdirc/addons/dcc/res/transfers.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs1874" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="10.049476"
+     inkscape:cy="8.1008816"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="849"
+     inkscape:window-height="581"
+     inkscape:window-x="195"
+     inkscape:window-y="150" />
+  <metadata
+     id="metadata1877">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="fill-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill:white"
+       id="rect4588"
+       width="11.064357"
+       height="9.19802"
+       x="2.5856435"
+       y="4.5044556" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3671"
+       width="11.033788"
+       height="2.4977343"
+       x="2.4819307"
+       y="2.5022655" />
+    <rect
+       style="fill:none;fill-opacity:1;stroke:black;stroke-width:0.8987385;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1880"
+       width="11.011163"
+       height="10.988637"
+       x="2.5394683"
+       y="2.5619929" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2254"
+       width="4.9718494"
+       height="1"
+       x="6"
+       y="10" />
+    <path
+       sodipodi:type="star"
+       style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path2256"
+       sodipodi:sides="3"
+       sodipodi:cx="9.3702974"
+       sodipodi:cy="7.0801978"
+       sodipodi:r1="4.1024742"
+       sodipodi:r2="2.0512371"
+       sodipodi:arg1="0.54230274"
+       sodipodi:arg2="1.5895003"
+       inkscape:flatsided="true"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 12.884159,9.1975246 L 5.779708,9.0646277 L 9.4470255,2.9784412 L 12.884159,9.1975246 z "
+       transform="matrix(0,0.5630273,-0.5305009,0,13.580066,5.241411)" />
+    <rect
+       style="fill:#008000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2226"
+       width="5.1801977"
+       height="1"
+       x="-10"
+       y="6.9549503"
+       transform="scale(-1,1)" />
+    <path
+       sodipodi:type="star"
+       style="fill:#008000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path2228"
+       sodipodi:sides="3"
+       sodipodi:cx="9.3702974"
+       sodipodi:cy="7.0801978"
+       sodipodi:r1="4.1024742"
+       sodipodi:r2="2.0512371"
+       sodipodi:arg1="0.54230274"
+       sodipodi:arg2="1.5895003"
+       inkscape:flatsided="true"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 12.884159,9.1975246 L 5.779708,9.0646277 L 9.4470255,2.9784412 L 12.884159,9.1975246 z "
+       transform="matrix(0,0.5630273,0.5305009,0,2.2397364,2.1602229)" />
+  </g>
+</svg>

src/com/dmdirc/addons/dcop/DcopCommand.java

@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcop;
+
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.commands.ServerCommand;
+import com.dmdirc.ui.interfaces.InputWindow;
+
+import java.util.List;
+
+/**
+ * The dcop command retrieves information from a dcop application.
+ * @author chris
+ */
+public final class DcopCommand extends ServerCommand {
+    
+    /**
+     * Creates a new instance of DcopCommand.
+     */
+    public DcopCommand() {
+        super();
+        
+        CommandManager.registerCommand(this);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void execute(final InputWindow origin, final Server server,
+            final boolean isSilent, final CommandArguments args) {
+        if (args.getArguments().length != 3) {
+            showUsage(origin, isSilent, "dcop", "<app> <object> <function>");
+            return;
+        }
+        
+        final List<String> res = DcopPlugin.getDcopResult("dcop " + args.getArgumentsAsString());
+        for (String line : res) {
+            sendLine(origin, isSilent, FORMAT_OUTPUT, line);
+        }
+    }
+    
+    
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return "dcop";
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public boolean showInHelp() {
+        return true;
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public String getHelp() {
+        return "dcop <app> <object> <function> - retrieves information from a DCOP aplication";
+    }
+    
+}

src/com/dmdirc/addons/dcop/DcopPlugin.java

@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcop;
+
+import com.dmdirc.plugins.Plugin;
+import com.dmdirc.commandparser.CommandManager;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Allows the user to execute dcop commands (and read the results).
+ * 
+ * @author chris
+ */
+public final class DcopPlugin extends Plugin {
+    /** The DcopCommand we created */
+    private DcopCommand command = null;
+    
+    /** Creates a new instance of DcopPlugin. */
+    public DcopPlugin() {
+        super();
+    }
+    
+    /**
+     * Retrieves the result from executing the specified command.
+     *
+     * @param command The command to be executed
+     * @return The output of the specified command
+     */
+    public static List<String> getDcopResult(final String command) {
+        final ArrayList<String> result = new ArrayList<String>();
+
+        InputStreamReader reader;
+        BufferedReader input;
+        Process process;
+        
+        try {
+            process = Runtime.getRuntime().exec(command);
+            
+            reader = new InputStreamReader(process.getInputStream());
+            input = new BufferedReader(reader);
+            
+            String line = "";
+            
+            while ((line = input.readLine()) != null) {
+                result.add(line);
+            }
+            
+            reader.close();
+            input.close();
+            process.destroy();
+        } catch (IOException ex) {
+            // Do nothing
+        }
+        
+        return result;
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public void onLoad() {
+        command = new DcopCommand();
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public void onUnload() {
+        CommandManager.unregisterCommand(command);
+    }
+
+}

src/com/dmdirc/addons/dcop/package-info.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * DCOP interface for DMDirc.
+ */
+package com.dmdirc.addons.dcop;

src/com/dmdirc/addons/dcop/plugin.config

@@ -0,0 +1,33 @@
+# This is a DMDirc configuration file.
+
+# This section indicates which sections below take key/value
+# pairs, rather than a simple list. It should be placed above
+# any sections that take key/values.
+keysections:
+  metadata
+  updates
+  version
+
+metadata:
+  author=Chris <chris@dmdirc.com>
+  mainclass=com.dmdirc.addons.dcop.DcopPlugin
+  description=Provides commands to interface with DCOP applications
+  name=dcop
+  nicename=DCOP Plugin
+
+updates:
+  id=1
+
+version:
+  friendly=0.4
+
+persistent:
+
+provides:
+  dcop command
+
+required-services:
+#  linux os
+
+exports:
+  getDcopResult in com.dmdirc.addons.dcop.DcopPlugin as dcop

src/com/dmdirc/addons/dns/DNSCommand.java

@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dns;
+
+import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.commands.GlobalCommand;
+import com.dmdirc.ui.interfaces.InputWindow;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+/**
+ * Performs DNS lookups for nicknames, hostnames or IPs.
+ */
+public final class DNSCommand extends GlobalCommand {
+    
+    /** Creates a new instance of DNSCommand. */
+    public DNSCommand() {
+        super();
+        
+        CommandManager.registerCommand(this);
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public void execute(final InputWindow origin, final boolean isSilent,
+            final CommandArguments args) {
+        if (args.getArguments().length == 0) {
+            showUsage(origin, isSilent, "dns", "<IP|hostname>");
+            return;
+        }
+        
+        sendLine(origin, isSilent, FORMAT_OUTPUT, "Resolving: " + args.getArguments()[0]);
+        new Timer("DNS Command Timer").schedule(new TimerTask() {
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                if (args.getArguments()[0].matches("\\b(?:\\d{1,3}\\.){3}\\d{1,3}\\b")) {
+                    sendLine(origin, isSilent, FORMAT_OUTPUT, "Resolved: "
+                            + args.getArguments()[0] + ": "
+                            + DNSPlugin.getHostname(args.getArguments()[0]));
+                } else {
+                    sendLine(origin, isSilent, FORMAT_OUTPUT, "Resolved: "
+                            + args.getArguments()[0] + ": "
+                            + DNSPlugin.getIPs(args.getArguments()[0]));
+                }
+            }
+        }, 0);
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return "dns";
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public boolean showInHelp() {
+        return true;
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public String getHelp() {
+        return "dns <IP|hostname> - Performs DNS lookup of the specified ip/hostname/nickname";
+    }
+    
+}

src/com/dmdirc/addons/dns/DNSPlugin.java

@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dns;
+
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.plugins.Plugin;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * DNS plugin.
+ */
+public final class DNSPlugin extends Plugin {
+    
+    /** The DNSCommand we've registered. */
+    private DNSCommand command;
+    
+    /** Creates a new instance of DNSPlugin. */
+    public DNSPlugin() {
+        super();
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public void onLoad() {
+        command = new DNSCommand();
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public void onUnload() {
+        CommandManager.unregisterCommand(command);
+    }
+    
+    /**
+     * Returns the IP(s) for a hostname.
+     *
+     * @param hostname Hostname to resolve.
+     *
+     * @return Resolved IP(s)
+     */
+    public static String getIPs(final String hostname) {
+        List<String> results = new ArrayList<String>();
+        
+        try {
+            final InetAddress[] ips = InetAddress.getAllByName(hostname);
+            
+            for (InetAddress ip : ips) {
+                results.add(ip.getHostAddress());
+            }
+            
+        } catch (UnknownHostException ex) {
+            results = new ArrayList<String>();
+        }
+        
+        return results.toString();
+    }
+    
+    /**
+     * Returns the hostname for an ip.
+     *
+     * @param ip IP to resolve
+     *
+     * @return Resolved hostname
+     */
+    public static String getHostname(final String ip) {
+        try {
+            return InetAddress.getByName(ip).getHostName();
+        } catch (UnknownHostException ex) {
+            return "";
+        }
+    }
+    
+}

src/com/dmdirc/addons/dns/package-info.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * DNS plugin and command.
+ */
+package com.dmdirc.addons.dns;

src/com/dmdirc/addons/dns/plugin.config

@@ -0,0 +1,27 @@
+# This is a DMDirc configuration file.
+
+# This section indicates which sections below take key/value
+# pairs, rather than a simple list. It should be placed above
+# any sections that take key/values.
+keysections:
+  metadata
+  updates
+  version
+
+metadata:
+  author=Greboid <greg@dmdirc.com>
+  mainclass=com.dmdirc.addons.dns.DNSPlugin
+  description=Provides a DNS command and method to the client
+  name=dns
+  nicename=DNS Plugin
+
+updates:
+  id=10
+
+version:
+  friendly=0.3
+
+provides:
+  dns command
+
+required-services:

src/com/dmdirc/addons/identd/IdentClient.java

@@ -0,0 +1,235 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.identd;
+
+import com.dmdirc.Server;
+import com.dmdirc.ServerManager;
+import com.dmdirc.config.ConfigManager;
+import com.dmdirc.config.IdentityManager;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.Socket;
+
+/**
+ * The IdentClient responds to an ident request.
+ *
+ * @author Shane "Dataforce" Mc Cormack
+ */
+public final class IdentClient implements Runnable {
+
+    /** The IdentdServer that owns this Client. */
+    private final IdentdServer myServer;
+
+    /** The Socket that we are in charge of. */
+    private final Socket mySocket;
+
+    /** The Thread in use for this client. */
+    private volatile Thread myThread;
+
+    /** The plugin that owns us. */
+    private final IdentdPlugin myPlugin;
+
+    /**
+     * Create the IdentClient.
+     *
+     * @param server The server that owns this
+     * @param socket The socket we are handing
+     */
+    public IdentClient(final IdentdServer server, final Socket socket, final IdentdPlugin plugin) {
+        myServer = server;
+        mySocket = socket;
+        myPlugin = plugin;
+
+        myThread = new Thread(this);
+        myThread.start();
+    }
+
+    /**
+     * Process this connection.
+     */
+    @Override
+    public void run() {
+        final Thread thisThread = Thread.currentThread();
+        PrintWriter out = null;
+        BufferedReader in = null;
+        try {
+            out = new PrintWriter(mySocket.getOutputStream(), true);
+            in = new BufferedReader(new InputStreamReader(mySocket.getInputStream()));
+            final String inputLine;
+            if ((inputLine = in.readLine()) != null) {
+                out.println(getIdentResponse(inputLine, IdentityManager.getGlobalConfig()));
+            }
+        } catch (IOException e) {
+            if (thisThread == myThread) {
+                Logger.userError(ErrorLevel.HIGH, "ClientSocket Error: " + e.getMessage());
+            }
+        } finally {
+            try {
+                out.close();
+                in.close();
+                mySocket.close();
+            } catch (IOException e) {
+            }
+        }
+        myServer.delClient(this);
+    }
+
+    /**
+     * Get the ident response for a given line.
+     * Complies with rfc1413 (http://www.faqs.org/rfcs/rfc1413.html)
+     *
+     * @param input Line to generate response for
+     * @param config The config manager to use for settings
+     * @return the ident response for the given line
+     */
+    protected String getIdentResponse(final String input, final ConfigManager config) {
+        final String unescapedInput = unescapeString(input);
+        final String[] bits = unescapedInput.replaceAll("\\s+", "").split(",", 2);
+        if (bits.length < 2) {
+            return String.format("%s : ERROR : X-INVALID-INPUT", escapeString(unescapedInput));
+        }
+        final int myPort;
+        final int theirPort;
+        try {
+            myPort = Integer.parseInt(bits[0].trim());
+            theirPort = Integer.parseInt(bits[1].trim());
+        } catch (NumberFormatException e) {
+            return String.format("%s , %s : ERROR : X-INVALID-INPUT", escapeString(bits[0]), escapeString(bits[1]));
+        }
+
+        if (myPort > 65535 || myPort < 1 || theirPort > 65535 || theirPort < 1) {
+            return String.format("%d , %d : ERROR : INVALID-PORT", myPort, theirPort);
+        }
+
+        final Server server = getServerByPort(myPort);
+        if (!config.getOptionBool(myPlugin.getDomain(), "advanced.alwaysOn") && (server == null || config.getOptionBool(myPlugin.getDomain(), "advanced.isNoUser"))) {
+            return String.format("%d , %d : ERROR : NO-USER", myPort, theirPort);
+        }
+
+        if (config.getOptionBool(myPlugin.getDomain(), "advanced.isHiddenUser")) {
+            return String.format("%d , %d : ERROR : HIDDEN-USER", myPort, theirPort);
+        }
+
+        final String osName = System.getProperty("os.name").toLowerCase();
+        final String os;
+        final String username;
+
+        final String customSystem = config.getOption(myPlugin.getDomain(), "advanced.customSystem");
+        if (config.getOptionBool(myPlugin.getDomain(), "advanced.useCustomSystem") && customSystem != null && customSystem.length() > 0 && customSystem.length() < 513) {
+            os = customSystem;
+        } else {
+            // Tad excessive maybe, but complete!
+            // Based on: http://mindprod.com/jgloss/properties.html
+            // and the SYSTEM NAMES section of rfc1340 (http://www.faqs.org/rfcs/rfc1340.html)
+            if (osName.startsWith("windows")) {
+                os = "WIN32";
+            } else if (osName.startsWith("mac")) {
+                os = "MACOS";
+            } else if (osName.startsWith("linux")) {
+                os = "UNIX";
+            } else if (osName.indexOf("bsd") > -1) {
+                os = "UNIX-BSD";
+            } else if ("os/2".equals(osName)) {
+                os = "OS/2";
+            } else if (osName.indexOf("unix") > -1) {
+                os = "UNIX";
+            } else if ("irix".equals(osName)) {
+                os = "IRIX";
+            } else {
+                os = "UNKNOWN";
+            }
+        }
+
+        final String customName = config.getOption(myPlugin.getDomain(), "general.customName");
+        if (config.getOptionBool(myPlugin.getDomain(), "general.useCustomName") && customName != null && customName.length() > 0 && customName.length() < 513) {
+            username = customName;
+        } else if (server != null && config.getOptionBool(myPlugin.getDomain(), "general.useNickname")) {
+            username = server.getParser().getLocalClient().getNickname();
+        } else if (server != null && config.getOptionBool(myPlugin.getDomain(), "general.useUsername")) {
+            username = server.getParser().getLocalClient().getUsername();
+        } else {
+            username = System.getProperty("user.name");
+        }
+
+        return String.format("%d , %d : USERID : %s : %s", myPort, theirPort, escapeString(os), escapeString(username));
+    }
+
+    /**
+     * Escape special chars.
+     *
+     * @param str String to escape
+     * @return Escaped string.
+     */
+    public static String escapeString(final String str) {
+        return str.replaceAll("\\\\", "\\\\\\\\").replaceAll(":", "\\\\:").replaceAll(",", "\\\\,").replaceAll(" ", "\\\\ ");
+    }
+
+    /**
+     * Unescape special chars.
+     *
+     * @param str String to escape
+     * @return Escaped string.
+     */
+    public static String unescapeString(final String str) {
+        return str.replaceAll("\\\\:", ":").replaceAll("\\\\ ", " ").replaceAll("\\\\,", ",").replaceAll("\\\\\\\\", "\\\\");
+    }
+
+    /**
+     * Close this IdentClient.
+     */
+    public void close() {
+        if (myThread != null) {
+            final Thread tmpThread = myThread;
+            myThread = null;
+            if (tmpThread != null) {
+                tmpThread.interrupt();
+            }
+            try {
+                mySocket.close();
+            } catch (IOException e) {
+            }
+        }
+    }
+
+    /**
+     * Retrieves the server that is bound to the specified local port.
+     *
+     * @param port Port to check for
+     * @return The server instance listening on the given port
+     */
+    protected static Server getServerByPort(final int port) {
+        for (Server server : ServerManager.getServerManager().getServers()) {
+            if (server.getParser().getLocalPort() == port) {
+                return server;
+            }
+        }
+        return null;
+    }
+
+}
+

src/com/dmdirc/addons/identd/IdentdPlugin.java

@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.identd;
+
+import com.dmdirc.Server;
+import com.dmdirc.actions.ActionManager;
+import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.config.IdentityManager;
+import com.dmdirc.config.prefs.PreferencesCategory;
+import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.config.prefs.PreferencesSetting;
+import com.dmdirc.config.prefs.PreferencesType;
+import com.dmdirc.config.prefs.validator.PortValidator;
+import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.plugins.Plugin;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * The Identd plugin answers ident requests from IRC servers.
+ *
+ * @author Shane
+ */
+public class IdentdPlugin extends Plugin implements ActionListener {
+
+    /** Array list to store all the servers in that need ident replies. */
+    private final List<Server> servers = new ArrayList<Server>();
+
+    /** The IdentdServer that we use. */
+    private IdentdServer myServer;
+
+    /**
+     * Creates a new instance of IdentdPlugin.
+     */
+    public IdentdPlugin() {
+    }
+
+    /**
+     * Called when the plugin is loaded.
+     */
+    @Override
+    public void onLoad() {
+        // Add action hooks
+        ActionManager.addListener(this, CoreActionType.SERVER_CONNECTED, CoreActionType.SERVER_CONNECTING, CoreActionType.SERVER_CONNECTERROR);
+
+        myServer = new IdentdServer(this);
+        if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "advanced.alwaysOn")) {
+            myServer.startServer();
+        }
+    }
+
+    /**
+     * Called when this plugin is unloaded.
+     */
+    @Override
+    public void onUnload() {
+        myServer.stopServer();
+        servers.clear();
+        ActionManager.removeListener(this);
+    }
+
+    /**
+     * Process an event of the specified type.
+     *
+     * @param type The type of the event to process
+     * @param format Format of messages that are about to be sent. (May be null)
+     * @param arguments The arguments for the event
+     */
+    @Override
+    public void processEvent(final ActionType type, final StringBuffer format, final Object... arguments) {
+        if (type == CoreActionType.SERVER_CONNECTING) {
+            synchronized (servers) {
+                if (servers.isEmpty()) {
+                    myServer.startServer();
+                }
+                servers.add((Server) arguments[0]);
+            }
+        } else if (type == CoreActionType.SERVER_CONNECTED || type == CoreActionType.SERVER_CONNECTERROR) {
+            synchronized (servers) {
+                servers.remove(arguments[0]);
+
+                if (servers.isEmpty() && !IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "advanced.alwaysOn")) {
+                    myServer.stopServer();
+                }
+            }
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void showConfig(final PreferencesManager manager) {
+        final PreferencesCategory general = new PreferencesCategory("Identd",
+                "General Identd Plugin config ('Lower' options take priority " +
+                "over those above them)");
+        final PreferencesCategory advanced = new PreferencesCategory("Advanced",
+                "Advanced Identd Plugin config - Only edit these if you need " +
+                "to/know what you are doing. Editing these could prevent " +
+                "access to some servers. ('Lower' options take priority over " +
+                "those above them)");
+
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "general.useUsername", "Use connection " +
+                "username rather than system username", "If this is enabled," +
+                " the username for the connection will be used rather than " +
+                "'" + System.getProperty("user.name") + "'"));
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "general.useNickname", "Use connection " +
+                "nickname rather than system username", "If this is enabled, " +
+                "the nickname for the connection will be used rather than " +
+                "'" + System.getProperty("user.name") + "'"));
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "general.useCustomName", "Use custom name" +
+                " all the time", "If this is enabled, the name specified below" +
+                " will be used all the time"));
+        general.addSetting(new PreferencesSetting(PreferencesType.TEXT,
+                getDomain(), "general.customName", "Custom Name to use",
+                "The custom name to use when 'Use Custom Name' is enabled"));
+
+        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "advanced.alwaysOn", "Always have ident " +
+                "port open", "By default the identd only runs when there are " +
+                "active connection attempts. This overrides that."));
+        advanced.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
+                new PortValidator(), getDomain(), "advanced.port",
+                "What port should the identd listen on", "Default port is 113," +
+                " this is probably useless if changed unless you port forward" +
+                " ident to a different port"));
+        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "advanced.useCustomSystem", "Use custom OS",
+                "By default the plugin uses 'UNIX' or 'WIN32' as the system " +
+                "type, this can be overriden by enabling this."));
+        advanced.addSetting(new PreferencesSetting(PreferencesType.TEXT,
+                getDomain(), "advanced.customSystem", "Custom OS to use",
+                "The custom system to use when 'Use Custom System' is enabled"));
+        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "advanced.isHiddenUser", "Respond to ident" +
+                " requests with HIDDEN-USER error", "By default the plugin will" +
+                " give a USERID response, this can force an 'ERROR :" +
+                " HIDDEN-USER' response instead."));
+        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "advanced.isNoUser", "Respond to ident" +
+                " requests with NO-USER error", "By default the plugin will" +
+                " give a USERID response, this can force an 'ERROR : NO-USER'" +
+                " response instead. (Overrides HIDDEN-USER)"));
+
+        manager.getCategory("Plugins").addSubCategory(general);
+        general.addSubCategory(advanced);
+    }
+
+}

src/com/dmdirc/addons/identd/IdentdServer.java

@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.identd;
+
+import com.dmdirc.config.IdentityManager;
+import com.dmdirc.logger.Logger;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.plugins.PluginInfo;
+import com.dmdirc.plugins.PluginManager;
+
+import java.net.Socket;
+import java.net.ServerSocket;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * The IdentdServer watches over the ident port when required
+ *
+ * @author Shane "Dataforce" Mc Cormack
+ */
+public final class IdentdServer implements Runnable {
+
+    /** The Thread in use for this server */
+    private volatile Thread myThread = null;
+
+    /** The current socket in use for this server */
+    private ServerSocket serverSocket;
+
+    /** Arraylist of all the clients we have */
+    private final List<IdentClient> clientList = new ArrayList<IdentClient>();
+
+    /** The plugin that owns us. */
+    private final IdentdPlugin myPlugin;
+
+    /**
+     * Create the IdentdServer.
+     */
+    public IdentdServer(final IdentdPlugin plugin) {
+        super();
+        myPlugin = plugin;
+    }
+
+    /**
+     * Run this IdentdServer.
+     */
+    @Override
+    public void run() {
+        final Thread thisThread = Thread.currentThread();
+        while (myThread == thisThread) {
+            try {
+                final Socket clientSocket = serverSocket.accept();
+                final IdentClient client = new IdentClient(this, clientSocket, myPlugin);
+                addClient(client);
+            } catch (IOException e) {
+                if (myThread == thisThread) {
+                    Logger.userError(ErrorLevel.HIGH, "Accepting client failed: " + e.getMessage());
+                }
+            }
+        }
+    }
+
+    /**
+     * Add an IdentClient to the clientList
+     *
+     * @param client Client to add
+     */
+    public void addClient(final IdentClient client) {
+        synchronized (clientList) {
+            clientList.add(client);
+        }
+    }
+
+    /**
+     * Remove an IdentClient from the clientList
+     *
+     * @param client Client to remove
+     */
+    public void delClient(final IdentClient client) {
+        synchronized (clientList) {
+            for (int i = 0; i < clientList.size(); ++i) {
+                if (clientList.get(i) == client) {
+                    clientList.remove(i);
+                    break;
+                }
+            }
+        }
+    }
+
+    /**
+     * Check if the server is currently running
+     *
+     * @return True if the server is running
+     */
+    public boolean isRunning() {
+        return (myThread != null);
+    }
+
+    /**
+     * Start the ident server
+     */
+    public void startServer() {
+        if (myThread == null) {
+            try {
+                final int identPort = IdentityManager.getGlobalConfig().getOptionInt(myPlugin.getDomain(), "advanced.port");
+                serverSocket = new ServerSocket(identPort);
+                myThread = new Thread(this);
+                myThread.start();
+            } catch (IOException e) {
+                Logger.userError(ErrorLevel.MEDIUM, "Unable to start identd server: " + e.getMessage());
+                if (e.getMessage().equals("Permission denied")) {
+                    final PluginInfo plugin = PluginManager.getPluginManager().getPluginInfoByName("identd");
+                    if (plugin != null) {
+                        if (PluginManager.getPluginManager().delPlugin(plugin.getRelativeFilename())) {
+                            PluginManager.getPluginManager().updateAutoLoad(plugin);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Stop the ident server
+     */
+    public void stopServer() {
+        if (myThread != null) {
+            final Thread tmpThread = myThread;
+            myThread = null;
+            if (tmpThread != null) {
+                tmpThread.interrupt();
+            }
+            try {
+                serverSocket.close();
+            } catch (IOException e) {
+            }
+
+            synchronized (clientList) {
+                for (int i = 0; i < clientList.size(); ++i) {
+                    clientList.get(i).close();
+                }
+                clientList.clear();
+            }
+        }
+    }
+
+}
+

src/com/dmdirc/addons/identd/plugin.config

@@ -0,0 +1,41 @@
+# This is a DMDirc configuration file.
+
+# This section indicates which sections below take key/value
+# pairs, rather than a simple list. It should be placed above
+# any sections that take key/values.
+keysections:
+  metadata
+  updates
+  defaults
+  version
+
+metadata:
+  author=Shane <shane@dmdirc.com>
+  mainclass=com.dmdirc.addons.identd.IdentdPlugin
+  description=Answers ident requests from IRC servers
+  name=identd
+  nicename=Identd Plugin
+
+updates:
+  id=15
+
+version:
+  friendly=0.3
+
+provides:
+  ident feature
+
+required-services:
+
+defaults:
+  general.useUsername=false
+  general.useNickname=false
+  general.useCustomName=false
+  general.customName=DMDirc-user
+
+  advanced.alwaysOn=false
+  advanced.port=113
+  advanced.useCustomSystem=false
+  advanced.customSystem=OTHER
+  advanced.isHiddenUser=false
+  advanced.isNoUser=false

src/com/dmdirc/addons/lagdisplay/LagDisplayPanel.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.dmdirc.addons.lagdisplay;
+
+import com.dmdirc.addons.ui_swing.components.statusbar.StatusbarPopupPanel;
+import com.dmdirc.addons.ui_swing.components.statusbar.StatusbarPopupWindow;
+
+/**
+ * Shows the user's lag in the status bar, and reveals details of all servers
+ * when the user hovers over it.
+ * 
+ * @author chris
+ */
+public class LagDisplayPanel extends StatusbarPopupPanel {
+
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
+    private static final long serialVersionUID = 2;
+
+    /** Lag display plugin. */
+    private LagDisplayPlugin plugin;
+
+    /**
+     * Creates a new {@link LagDisplayPanel} for the specified plugin.
+     *
+     * @param plugin The plugin that owns this panel
+     */
+    public LagDisplayPanel(final LagDisplayPlugin plugin) {
+        super();
+        
+        this.plugin = plugin;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected StatusbarPopupWindow getWindow() {
+        return new ServerInfoDialog(plugin, this);
+    }
+    
+  
+}

src/com/dmdirc/addons/lagdisplay/LagDisplayPlugin.java

@@ -0,0 +1,285 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.lagdisplay;
+
+import com.dmdirc.FrameContainer;
+import com.dmdirc.Main;
+import com.dmdirc.Server;
+import com.dmdirc.ServerState;
+import com.dmdirc.actions.ActionManager;
+import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.config.ConfigManager;
+import com.dmdirc.config.IdentityManager;
+import com.dmdirc.config.prefs.PreferencesCategory;
+import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.config.prefs.PreferencesSetting;
+import com.dmdirc.config.prefs.PreferencesType;
+import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.interfaces.ConfigChangeListener;
+import com.dmdirc.plugins.Plugin;
+import com.dmdirc.ui.interfaces.Window;
+import com.dmdirc.util.RollingList;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.WeakHashMap;
+
+/**
+ * Displays the current server's lag in the status bar.
+ * @author chris
+ */
+public final class LagDisplayPlugin extends Plugin implements ActionListener, ConfigChangeListener {
+    
+    /** The panel we use in the status bar. */
+    private final LagDisplayPanel panel = new LagDisplayPanel(this);
+    
+    /** A cache of ping times. */
+    private final Map<Server, String> pings = new WeakHashMap<Server, String>();
+
+    /** Ping history. */
+    private final Map<Server, RollingList<Long>> history
+            = new HashMap<Server, RollingList<Long>>();
+
+    /** Whether or not to show a graph in the info popup. */
+    private boolean showGraph = true;
+
+    /** Whether or not to show labels on that graph. */
+    private boolean showLabels = true;
+
+    /** The length of history to keep per-server. */
+    private int historySize = 100;
+    
+    /** Creates a new instance of LagDisplayPlugin. */
+    public LagDisplayPlugin() {
+        super();
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public void onLoad() {
+        Main.getUI().getStatusBar().addComponent(panel);
+        IdentityManager.getGlobalConfig().addChangeListener(getDomain(), this);
+
+        readConfig();
+        
+        ActionManager.addListener(this, CoreActionType.SERVER_GOTPING,
+                CoreActionType.SERVER_NOPING, CoreActionType.CLIENT_FRAME_CHANGED,
+                CoreActionType.SERVER_DISCONNECTED, CoreActionType.SERVER_PINGSENT,
+                CoreActionType.SERVER_NUMERIC);
+    }
+
+    /**
+     * Reads the plugin's global configuration settings.
+     */
+    protected void readConfig() {
+        final ConfigManager manager = IdentityManager.getGlobalConfig();
+        showGraph = manager.getOptionBool(getDomain(), "graph");
+        showLabels = manager.getOptionBool(getDomain(), "labels");
+        historySize = manager.getOptionInt(getDomain(), "history");
+    }
+
+    /**
+     * Retrieves the history of the specified server. If there is no history,
+     * a new list is added to the history map and returned.
+     * 
+     * @param server The server whose history is being requested
+     * @return The history for the specified server
+     */
+    protected RollingList<Long> getHistory(final Server server) {
+        if (!history.containsKey(server)) {
+            history.put(server, new RollingList<Long>(historySize));
+        }
+
+        return history.get(server);
+    }
+
+    /**
+     * Determines if the {@link ServerInfoDialog} should show a graph of the
+     * ping time for the current server.
+     * 
+     * @return True if a graph should be shown, false otherwise
+     */
+    public boolean shouldShowGraph() {
+        return showGraph;
+    }
+
+    /**
+     * Determines if the {@link PingHistoryPanel} should show labels on selected
+     * points.
+     *
+     * @return True if labels should be shown, false otherwise
+     */
+    public boolean shouldShowLabels() {
+        return showLabels;
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public void onUnload() {
+        Main.getUI().getStatusBar().removeComponent(panel);
+        IdentityManager.getConfigIdentity().removeListener(this);
+        
+        ActionManager.removeListener(this);
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public void processEvent(final ActionType type, final StringBuffer format,
+            final Object... arguments) {
+        boolean useAlternate = false;
+
+        for (Object obj : arguments) {
+            if (obj instanceof FrameContainer
+                    && ((FrameContainer) obj).getConfigManager() != null) {
+                useAlternate = ((FrameContainer) obj).getConfigManager()
+                        .getOptionBool(getDomain(), "usealternate");
+                break;
+            }
+        }
+
+        if (!useAlternate && type.equals(CoreActionType.SERVER_GOTPING)) {
+            final Window active = Main.getUI().getActiveWindow();
+            final String value = formatTime(arguments[1]);
+
+            getHistory(((Server) arguments[0])).add((Long) arguments[1]);
+            pings.put(((Server) arguments[0]), value);
+
+            if (((Server) arguments[0]).ownsFrame(active)) {
+                panel.setText(value);
+            }
+
+            panel.refreshDialog();
+        } else if (!useAlternate && type.equals(CoreActionType.SERVER_NOPING)) {
+            final Window active = Main.getUI().getActiveWindow();
+            final String value = formatTime(arguments[1]) + "+";
+
+            pings.put(((Server) arguments[0]), value);
+
+            if (((Server) arguments[0]).ownsFrame(active)) {
+                panel.setText(value);
+            }
+
+            panel.refreshDialog();
+        } else if (type.equals(CoreActionType.SERVER_DISCONNECTED)) {
+            final Window active = Main.getUI().getActiveWindow();
+
+            if (((Server) arguments[0]).ownsFrame(active)) {
+                panel.setText("Not connected");
+                pings.remove(arguments[0]);
+            }
+
+            panel.refreshDialog();
+        } else if (type.equals(CoreActionType.CLIENT_FRAME_CHANGED)) {
+            final FrameContainer source = (FrameContainer) arguments[0];
+            if (source.getServer() == null) {
+                panel.setText("Unknown");
+            } else if (source.getServer().getState() != ServerState.CONNECTED) {
+                panel.setText("Not connected");
+            } else {
+                panel.setText(getTime(source.getServer()));
+            }
+
+            panel.refreshDialog();
+        } else if (useAlternate && type.equals(CoreActionType.SERVER_PINGSENT)) {
+            ((Server) arguments[0]).getParser().sendRawMessage("LAGCHECK_" + new Date().getTime());
+        } else if (useAlternate && type.equals(CoreActionType.SERVER_NUMERIC)
+                && ((Integer) arguments[1]).intValue() == 421
+                && ((String[]) arguments[2])[3].startsWith("LAGCHECK_")) {
+            try {
+                final long sent = Long.parseLong(((String[]) arguments[2])[3].substring(9));
+                final Long duration = Long.valueOf(new Date().getTime() - sent);
+                final String value = formatTime(duration);
+                final Window active = Main.getUI().getActiveWindow();
+
+                pings.put((Server) arguments[0], value);
+                getHistory(((Server) arguments[0])).add(duration);
+
+                if (((Server) arguments[0]).ownsFrame(active)) {
+                    panel.setText(value);
+                }
+            } catch (NumberFormatException ex) {
+                pings.remove((Server) arguments[0]);
+            }
+
+            if (format != null) {
+                format.delete(0, format.length());
+            }
+
+            panel.refreshDialog();
+        }
+    }
+
+    /**
+     * Retrieves the ping time for the specified server.
+     *
+     * @param server The server whose ping time is being requested
+     * @return A String representation of the current lag, or "Unknown"
+     */
+    public String getTime(final Server server) {
+        return pings.get(server) == null ? "Unknown" : pings.get(server);
+    }
+    
+    /**
+     * Formats the specified time so it's a nice size to display in the label.
+     * @param object An uncast Long representing the time to be formatted
+     * @return Formatted time string
+     */
+    protected String formatTime(final Object object) {
+        final Long time = (Long) object;
+        
+        if (time >= 10000) {
+            return Math.round(time / 1000.0) + "s";
+        } else {
+            return time + "ms";
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void showConfig(final PreferencesManager manager) {
+        final PreferencesCategory cat = new PreferencesCategory("Lag display plugin",
+                                                                "");
+        cat.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "usealternate",
+                "Alternate method", "Use an alternate method of determining "
+                + "lag which bypasses bouncers or proxies that may reply?"));
+        cat.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "graph", "Show graph", "Show a graph of ping times " +
+                "for the current server in the information popup?"));
+        cat.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "labels", "Show labels", "Show labels on selected " +
+                "points on the ping graph?"));
+        cat.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
+                getDomain(), "history", "Graph points", "Number of data points " +
+                "to plot on the graph, if enabled."));
+        manager.getCategory("Plugins").addSubCategory(cat);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void configChanged(final String domain, final String key) {
+        readConfig();
+    }
+}

src/com/dmdirc/addons/lagdisplay/PingHistoryPanel.java

@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.lagdisplay;
+
+import com.dmdirc.Main;
+import com.dmdirc.ServerManager;
+import com.dmdirc.util.RollingList;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
+import java.awt.geom.Rectangle2D;
+import java.util.ArrayList;
+import java.util.List;
+import javax.swing.JPanel;
+
+/**
+ * Shows a ping history graph for the current server.
+ *
+ * @author chris
+ */
+public class PingHistoryPanel extends JPanel {
+
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
+    private static final long serialVersionUID = 1;
+
+    /** The plugin that this panel is for. */
+    protected final LagDisplayPlugin plugin;
+
+    /** The history that we're graphing. */
+    protected final RollingList<Long> history;
+
+    /** The maximum ping value. */
+    protected long maximum = 0l;
+
+    /**
+     * Creates a new history panel for the specified plugin.
+     *
+     * @param plugin The plugin that owns this panel
+     */
+    public PingHistoryPanel(final LagDisplayPlugin plugin) {
+        super();
+
+        setMinimumSize(new Dimension(50, 100));
+        setMaximumSize(new Dimension(Integer.MAX_VALUE, 100));
+        setOpaque(false);
+        
+        this.plugin = plugin;
+        this.history = plugin.getHistory(ServerManager.getServerManager()
+                .getServerFromFrame(Main.getUI().getActiveWindow()));
+
+        for (Long value : history.getList()) {
+            maximum = Math.max(value, maximum);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void paint(final Graphics g) {
+        super.paint(g);
+        
+        g.setColor(Color.DARK_GRAY);
+        g.drawLine(2, 1, 2, getHeight() - 1);
+        g.drawLine(1, getHeight() - 2, getWidth() - 1, getHeight() - 2);
+        g.setFont(g.getFont().deriveFont(10f));
+
+        float lastX = -1, lastY = -1;
+        float pixelsperpointX = (getWidth() - 3) / (float) (history.getList().size() == 1 ? 1
+                : history.getList().size() - 1);
+        float pixelsperpointY = (getHeight() - 10) / (float) maximum;
+
+        if (history.isEmpty()) {
+            g.drawString("No data", getWidth() / 2 - 25, getHeight() / 2 + 5);
+        }
+
+        long last1 = -1, last2 = -1;
+        final List<Long> list = history.getList();
+        final List<Rectangle> rects = new ArrayList<Rectangle>();
+
+        for (int i = 0; i < list.size(); i++) {
+            final Long value = list.get(i);
+           
+            float x = lastX == -1 ? 2 : lastX + pixelsperpointX;
+            float y = getHeight() - 5 - value * pixelsperpointY;
+
+            if (lastX > -1) {
+                g.drawLine((int) lastX, (int) lastY, (int) x, (int) y);
+            }
+
+            g.drawRect((int) x - 1, (int) y - 1, 2, 2);
+
+            if (plugin.shouldShowLabels() && last1 > -1 && (last2 <= last1 || last1 >= value)) {
+                final String text = plugin.formatTime(last1);
+                final Rectangle2D rect = g.getFont().getStringBounds(text,
+                        ((Graphics2D) g).getFontRenderContext());
+                final int width = 10 + (int) rect.getWidth();
+                final int points = (int) Math.ceil(width / pixelsperpointX);
+                final int diffy = (int) (last1 - (10 + rect.getHeight()) / pixelsperpointY);
+
+                float posX = lastX - width + 7;
+                float posY = (float) (lastY + rect.getHeight() / 2) - 1;
+                boolean failed = posX < 0;
+
+                // Check left
+                for (int j = Math.max(0, i - points); j < i - 1; j++) {
+                    if (list.get(j) > diffy) {
+                        failed = true;
+                        break;
+                    }
+                }
+
+                if (failed) {
+                    posX = lastX + 3;
+                    failed = posX + width > getWidth();
+
+                    // Check right
+                    for (int j = i; j < Math.min(list.size(), i + points); j++) {
+                        if (list.get(j) > diffy) {
+                            failed = true;
+                            break;
+                        }
+                    }
+                }
+
+                if (!failed) {
+                    final Rectangle myrect = new Rectangle((int) posX - 2,
+                            (int) lastY - 7, 5 + (int) rect.getWidth(),
+                            3 + (int) rect.getHeight());
+
+                    for (Rectangle test : rects) {
+                        if (test.intersects(myrect)) {
+                            failed = true;
+                        }
+                    }
+
+                    if (!failed) {
+                        g.drawString(text, (int) posX, (int) posY);
+                        rects.add(myrect);
+                    }
+                }
+            }
+
+            lastX = x;
+            lastY = y;
+
+            last2 = last1;
+            last1 = value;
+        }
+    }
+
+}

src/com/dmdirc/addons/lagdisplay/ServerInfoDialog.java

@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.lagdisplay;
+
+import com.dmdirc.Main;
+import com.dmdirc.Server;
+import com.dmdirc.ServerManager;
+import com.dmdirc.ServerState;
+import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.components.statusbar.StatusbarPopupPanel;
+import com.dmdirc.addons.ui_swing.components.statusbar.StatusbarPopupWindow;
+
+import java.util.List;
+
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JSeparator;
+
+
+/**
+ * Shows information about all connected servers.
+ *
+ * @author chris
+ */
+public class ServerInfoDialog extends StatusbarPopupWindow {
+
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
+    private static final long serialVersionUID = 3;
+
+    /** The lag display plugin. */
+    protected final LagDisplayPlugin plugin;
+
+    /**
+     * Creates a new ServerInfoDialog.
+     *
+     * @param ldp The {@link LagDisplayPlugin} we're using for info
+     * @param parent The {@link JPanel} to use for positioning
+     */
+    public ServerInfoDialog(final LagDisplayPlugin ldp, final StatusbarPopupPanel parent) {
+        super(parent, (MainFrame) Main.getUI().getMainWindow());
+
+        this.plugin = ldp;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void initContent(final JPanel panel) {
+        final List<Server> servers = ServerManager.getServerManager().getServers();
+
+        if (servers.isEmpty()) {
+            panel.add(new JLabel("No open servers."));
+        } else {
+            if (plugin.shouldShowGraph()) {
+                panel.add(new PingHistoryPanel(plugin), "span, grow, wrap");
+                panel.add(new JSeparator(), "span, grow, wrap");
+            }
+
+            for (Server server : servers) {
+                panel.add(new JLabel(server.getName()));
+                panel.add(new JLabel(server.getState() == ServerState.CONNECTED
+                        ? server.getNetwork() : "---", JLabel.CENTER), "grow");
+                panel.add(new JLabel(server.getState() == ServerState.CONNECTED
+                        ? plugin.getTime(server) : "---", JLabel.RIGHT), "grow, wrap");
+            }
+        }
+    }
+
+
+}

src/com/dmdirc/addons/lagdisplay/package-info.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * Shows your current lag in the status bar.
+ */
+package com.dmdirc.addons.lagdisplay;

src/com/dmdirc/addons/lagdisplay/plugin.config

@@ -0,0 +1,39 @@
+# This is a DMDirc configuration file.
+
+# This section indicates which sections below take key/value
+# pairs, rather than a simple list. It should be placed above
+# any sections that take key/values.
+keysections:
+  metadata
+  updates
+  requires
+  defaults
+  version
+
+metadata:
+  author=Chris <chris@dmdirc.com>
+  mainclass=com.dmdirc.addons.lagdisplay.LagDisplayPlugin
+  description=Displays the server lag in the status bar
+  name=lagdisplay
+  nicename=Lag Displayer
+
+requires:
+  parent=ui_swing
+
+updates:
+  id=2
+
+version:
+  friendly=0.6
+
+provides:
+  lagdisplay statusbar_entry
+
+required-services:
+  swing ui
+
+defaults:
+  usealternate=false
+  graph=true
+  labels=true
+  history=50

src/com/dmdirc/addons/logging/HistoryWindow.java

@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.logging;
+
+import com.dmdirc.FrameContainer;
+import com.dmdirc.Main;
+import com.dmdirc.Server;
+import com.dmdirc.config.IdentityManager;
+import com.dmdirc.ui.WindowManager;
+import com.dmdirc.ui.interfaces.Window;
+
+/**
+ * Displays an extended history of a window.
+ *
+ * @author Chris
+ */
+public class HistoryWindow extends FrameContainer {
+
+    /** The window we're using. */
+    private Window window;
+
+    /** Our parent window. */
+    private Window parent;
+
+    /**
+     * Creates a new HistoryWindow.
+     *
+     * @param title The title of the window
+     * @param reader The reader to use to get the history
+     * @param parent The window this history window was opened from
+     * @param numLines The number of lines to show
+     */
+    public HistoryWindow(final String title, final ReverseFileReader reader,
+                         final Window parent, final int numLines) {
+        super("raw", title, parent.getConfigManager());
+
+        this.parent = parent;
+
+        window = Main.getUI().getWindow(this);
+
+        WindowManager.addWindow(parent, window);
+        window.setTitle(title);
+        window.open();
+        final int frameBufferSize = IdentityManager.getGlobalConfig().getOptionInt(
+                "ui", "frameBufferSize");
+        window.addLine(reader.getLinesAsString(Math.min(frameBufferSize, numLines)), false);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Window getFrame() {
+        return window;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void windowClosing() {
+        // 1: Make the window non-visible
+        window.setVisible(false);
+
+        // 2: Remove any callbacks or listeners
+        // 3: Trigger any actions neccessary
+        // 4: Trigger action for the window closing
+        // 5: Inform any parents that the window is closing
+
+        // 6: Remove the window from the window manager
+        WindowManager.removeWindow(window);
+
+        // 7: Remove any references to the window and parents
+        window = null; // NOPMD
+        parent = null; // NOPMD
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Server getServer() {
+        return parent == null ? null : parent.getContainer().getServer();
+    }
+
+}

src/com/dmdirc/addons/logging/LoggingCommand.java

@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.logging;
+
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.commands.IntelligentCommand;
+import com.dmdirc.commandparser.commands.ServerCommand;
+import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.PluginInfo;
+import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.ui.input.AdditionalTabTargets;
+import com.dmdirc.ui.interfaces.InputWindow;
+import java.util.List;
+
+/**
+ * The dcop command retrieves information from a dcop application.
+ *
+ * @author Shane "Dataforce" Mc Cormack
+ */
+public final class LoggingCommand extends ServerCommand implements IntelligentCommand {
+
+    /**
+     * Creates a new instance of LoggingCommand.
+     */
+    public LoggingCommand() {
+        super();
+        CommandManager.registerCommand(this);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void execute(final InputWindow origin, final Server server,
+                        final boolean isSilent, final CommandArguments args) {
+        final PluginInfo pluginInfo = PluginManager.getPluginManager().getPluginInfoByName("logging");
+        if (pluginInfo == null) {
+            sendLine(origin, isSilent, FORMAT_ERROR, "Logging Plugin is not loaded.");
+            return;
+        }
+        final Plugin gotPlugin = pluginInfo.getPlugin();
+
+        if (!(gotPlugin instanceof LoggingPlugin)) {
+            sendLine(origin, isSilent, FORMAT_ERROR, "Logging Plugin is not loaded.");
+            return;
+        }
+
+        final LoggingPlugin plugin = (LoggingPlugin) gotPlugin;
+
+        if (args.getArguments().length > 0) {
+            if (args.getArguments()[0].equalsIgnoreCase("reload")) {
+                if (PluginManager.getPluginManager().reloadPlugin(pluginInfo.getFilename())) {
+                    sendLine(origin, isSilent, FORMAT_OUTPUT, "Plugin reloaded.");
+                } else {
+                    sendLine(origin, isSilent, FORMAT_ERROR, "Plugin failed to reload.");
+                }
+            } else if (args.getArguments()[0].equalsIgnoreCase("history")) {
+                if (!plugin.showHistory(origin)) {
+                    sendLine(origin, isSilent, FORMAT_ERROR, "Unable to open history for this window.");
+                }
+            } else if (args.getArguments()[0].equalsIgnoreCase("help")) {
+                sendLine(origin, isSilent, FORMAT_OUTPUT, getName() + " reload           - Reload the logging plugin.");
+                sendLine(origin, isSilent, FORMAT_OUTPUT, getName() + " history          - Open the history of this window, if available.");
+                sendLine(origin, isSilent, FORMAT_OUTPUT, getName() + " help             - Show this help.");
+            } else {
+                sendLine(origin, isSilent, FORMAT_ERROR, "Unknown command '" + args.getArguments()[0] + "'. Use " + getName() + " help for a list of commands.");
+            }
+        } else {
+            sendLine(origin, isSilent, FORMAT_ERROR, "Use " + getName() + " help for a list of commands.");
+        }
+    }
+
+    /**
+     * Returns a list of suggestions for the specified argument, given the list
+     * of previous arguments.
+     *
+     * @param arg The argument that is being completed
+     * @param previousArgs The contents of the previous arguments, if any
+     * @return A list of suggestions for the argument
+     */
+    @Override
+    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+        final AdditionalTabTargets res = new AdditionalTabTargets();
+        if (arg == 0) {
+            res.add("reload");
+            res.add("history");
+            res.add("help");
+            res.excludeAll();
+        }
+        return res;
+    }
+
+    /**
+     * Returns this command's name.
+     *
+     * @return The name of this command
+     */
+    @Override
+    public String getName() {
+        return "logging";
+    }
+
+    /**
+     * Returns whether or not this command should be shown in help messages.
+     *
+     * @return True iff the command should be shown, false otherwise
+     */
+    @Override
+    public boolean showInHelp() {
+        return true;
+    }
+
+    /**
+     * Returns a string representing the help message for this command.
+     *
+     * @return the help message for this command
+     */
+    @Override
+    public String getHelp() {
+        return this.getName() + " <set|help> [parameters]";
+    }
+
+}
+

src/com/dmdirc/addons/logging/LoggingPlugin.java

@@ -0,0 +1,821 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.logging;
+
+import com.dmdirc.Channel;
+import com.dmdirc.Main;
+import com.dmdirc.Query;
+import com.dmdirc.Server;
+import com.dmdirc.actions.ActionManager;
+import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.config.IdentityManager;
+import com.dmdirc.config.prefs.PreferencesCategory;
+import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.config.prefs.PreferencesSetting;
+import com.dmdirc.config.prefs.PreferencesType;
+import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
+import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.parser.interfaces.ChannelInfo;
+import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.plugins.Plugin;
+import com.dmdirc.ui.interfaces.InputWindow;
+import com.dmdirc.ui.interfaces.Window;
+import com.dmdirc.ui.messages.Styliser;
+
+import java.awt.Color;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.Stack;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+/**
+ * Adds logging facility to client.
+ *
+ * @author Shane 'Dataforce' McCormack
+ */
+public class LoggingPlugin extends Plugin implements ActionListener {
+
+    /** The command we registered. */
+    private LoggingCommand command;
+
+    /** Open File */
+    protected class OpenFile {
+
+        public long lastUsedTime = System.currentTimeMillis();
+
+        public BufferedWriter writer = null;
+
+        public OpenFile(final BufferedWriter writer) {
+            this.writer = writer;
+        }
+
+    }
+
+    /** Timer used to close idle files */
+    protected Timer idleFileTimer;
+
+    /** Hashtable of open files. */
+    protected final Map<String, OpenFile> openFiles = new Hashtable<String, OpenFile>();
+
+    /** Date format used for "File Opened At" log. */
+    final DateFormat openedAtFormat = new SimpleDateFormat("EEEE MMMM dd, yyyy - HH:mm:ss");
+
+    /**
+     * Creates a new instance of the Logging Plugin.
+     */
+    public LoggingPlugin() {
+        super();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void domainUpdated() {
+        IdentityManager.getAddonIdentity().setOption(getDomain(),
+                "general.directory", Main.getConfigDir() + "logs" + System.getProperty("file.separator"));
+    }
+
+    /**
+     * Called when the plugin is loaded.
+     */
+    @Override
+    public void onLoad() {
+        final File dir = new File(IdentityManager.getGlobalConfig().getOption(getDomain(), "general.directory"));
+        if (dir.exists()) {
+            if (!dir.isDirectory()) {
+                Logger.userError(ErrorLevel.LOW, "Unable to create logging dir (file exists instead)");
+            }
+        } else {
+            if (!dir.mkdirs()) {
+                Logger.userError(ErrorLevel.LOW, "Unable to create logging dir");
+            }
+        }
+
+        command = new LoggingCommand();
+        ActionManager.addListener(this,
+                CoreActionType.CHANNEL_OPENED,
+                CoreActionType.CHANNEL_CLOSED,
+                CoreActionType.CHANNEL_MESSAGE,
+                CoreActionType.CHANNEL_SELF_MESSAGE,
+                CoreActionType.CHANNEL_ACTION,
+                CoreActionType.CHANNEL_SELF_ACTION,
+                CoreActionType.CHANNEL_GOTTOPIC,
+                CoreActionType.CHANNEL_TOPICCHANGE,
+                CoreActionType.CHANNEL_JOIN,
+                CoreActionType.CHANNEL_PART,
+                CoreActionType.CHANNEL_QUIT,
+                CoreActionType.CHANNEL_KICK,
+                CoreActionType.CHANNEL_NICKCHANGE,
+                CoreActionType.CHANNEL_MODECHANGE,
+                CoreActionType.QUERY_OPENED,
+                CoreActionType.QUERY_CLOSED,
+                CoreActionType.QUERY_MESSAGE,
+                CoreActionType.QUERY_SELF_MESSAGE,
+                CoreActionType.QUERY_ACTION,
+                CoreActionType.QUERY_SELF_ACTION);
+
+        // Close idle files every hour.
+        idleFileTimer = new Timer("LoggingPlugin Timer");
+        idleFileTimer.schedule(new TimerTask() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                timerTask();
+            }
+
+        }, 3600000);
+    }
+
+    /**
+     * What to do every hour when the timer fires.
+     */
+    protected void timerTask() {
+        // Oldest time to allow
+        final long oldestTime = System.currentTimeMillis() - 3480000;
+
+        synchronized (openFiles) {
+            for (String filename : (new Hashtable<String, OpenFile>(openFiles)).keySet()) {
+                OpenFile file = openFiles.get(filename);
+                if (file.lastUsedTime < oldestTime) {
+                    try {
+                        file.writer.close();
+                        openFiles.remove(filename);
+                    } catch (IOException e) {
+                        Logger.userError(ErrorLevel.LOW, "Unable to close idle file (File: " + filename + ")");
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Called when this plugin is unloaded.
+     */
+    @Override
+    public void onUnload() {
+        idleFileTimer.cancel();
+        idleFileTimer.purge();
+
+        CommandManager.unregisterCommand(command);
+        ActionManager.removeListener(this);
+
+        synchronized (openFiles) {
+            for (String filename : openFiles.keySet()) {
+                OpenFile file = openFiles.get(filename);
+                try {
+                    file.writer.close();
+                } catch (IOException e) {
+                    Logger.userError(ErrorLevel.LOW, "Unable to close file (File: " + filename + ")");
+                }
+            }
+            openFiles.clear();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void showConfig(final PreferencesManager manager) {
+        final PreferencesCategory general = new PreferencesCategory("Logging", "General configuration for Logging plugin.");
+        final PreferencesCategory backbuffer = new PreferencesCategory("Back Buffer", "Options related to the automatic backbuffer");
+        final PreferencesCategory advanced = new PreferencesCategory("Advanced", "Advanced configuration for Logging plugin. You shouldn't need to edit this unless you know what you are doing.");
+
+        general.addSetting(new PreferencesSetting(PreferencesType.TEXT, getDomain(), "general.directory", "Directory", "Directory for log files"));
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "general.networkfolders", "Separate logs by network", "Should the files be stored in a sub-dir with the networks name?"));
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "general.addtime", "Timestamp logs", "Should a timestamp be added to the log files?"));
+        general.addSetting(new PreferencesSetting(PreferencesType.TEXT, getDomain(), "general.timestamp", "Timestamp format", "The String to pass to 'SimpleDateFormat' to format the timestamp"));
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "general.stripcodes", "Strip Control Codes", "Remove known irc control codes from lines before saving?"));
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "general.channelmodeprefix", "Show channel mode prefix", "Show the @,+ etc next to nicknames"));
+
+        backbuffer.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "backbuffer.autobackbuffer", "Automatically display", "Automatically display the backbuffer when a channel is joined"));
+        backbuffer.addSetting(new PreferencesSetting(PreferencesType.COLOUR, getDomain(), "backbuffer.colour", "Colour to use for display", "Colour used when displaying the backbuffer"));
+        backbuffer.addSetting(new PreferencesSetting(PreferencesType.INTEGER, getDomain(), "backbuffer.lines", "Number of lines to show", "Number of lines used when displaying backbuffer"));
+        backbuffer.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "backbuffer.timestamp", "Show Formatter-Timestamp", "Should the line be added to the frame with the timestamp from the formatter aswell as the file contents"));
+
+        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "advanced.filenamehash", "Add Filename hash", "Add the MD5 hash of the channel/client name to the filename. (This is used to allow channels with similar names (ie a _ not a  -) to be logged separately)"));
+
+        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "advanced.usedate", "Use Date directories", "Should the log files be in separate directories based on the date?"));
+        advanced.addSetting(new PreferencesSetting(PreferencesType.TEXT, getDomain(), "advanced.usedateformat", "Archive format", "The String to pass to 'SimpleDateFormat' to format the directory name(s) for archiving"));
+
+        general.addSubCategory(backbuffer.setInline());
+        general.addSubCategory(advanced.setInline());
+        manager.getCategory("Plugins").addSubCategory(general.setInlineAfter());
+    }
+
+    /**
+     * Log a query-related event
+     *
+     * @param type The type of the event to process
+     * @param format Format of messages that are about to be sent. (May be null)
+     * @param arguments The arguments for the event
+     */
+    protected void handleQueryEvent(final CoreActionType type, final StringBuffer format, final Object... arguments) {
+        final Query query = (Query) arguments[0];
+        if (query.getServer() == null) {
+            Logger.appError(ErrorLevel.MEDIUM, "Query object has no server (" + type.toString() + ")", new Exception("Query object has no server (" + type.toString() + ")"));
+            return;
+        }
+
+        final Parser parser = query.getServer().getParser();
+        ClientInfo client;
+
+        if (parser == null) {
+            // Without a parser object, we might not be able to find the file to log this to.
+            if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "general.networkfolders")) {
+                // We *wont* be able to, so rather than logging to an incorrect file we just won't log.
+                return;
+            }
+            client = null;
+        } else {
+            client = parser.getClient(query.getHost());
+        }
+
+        final String filename = getLogFile(client);
+
+        switch (type) {
+            case QUERY_OPENED:
+                if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "backbuffer.autobackbuffer")) {
+                    showBackBuffer(query.getFrame(), filename);
+                }
+
+                appendLine(filename, "*** Query opened at: %s", openedAtFormat.format(new Date()));
+                appendLine(filename, "*** Query with User: %s", query.getHost());
+                appendLine(filename, "");
+                break;
+            case QUERY_CLOSED:
+                appendLine(filename, "*** Query closed at: %s", openedAtFormat.format(new Date()));
+                if (openFiles.containsKey(filename)) {
+                    final BufferedWriter file = openFiles.get(filename).writer;
+                    try {
+                        file.close();
+                    } catch (IOException e) {
+                        Logger.userError(ErrorLevel.LOW, "Unable to close file (Filename: " + filename + ")");
+                    }
+                    openFiles.remove(filename);
+                }
+                break;
+            case QUERY_MESSAGE:
+            case QUERY_SELF_MESSAGE:
+            case QUERY_ACTION:
+            case QUERY_SELF_ACTION:
+                final boolean isME = (type == CoreActionType.QUERY_SELF_MESSAGE || type == CoreActionType.QUERY_SELF_ACTION);
+                final String overrideNick = (isME) ? getDisplayName(parser.getLocalClient()) : "";
+
+                if (type == CoreActionType.QUERY_MESSAGE || type == CoreActionType.QUERY_SELF_MESSAGE) {
+                    appendLine(filename, "<%s> %s", getDisplayName(client, overrideNick), (String) arguments[1]);
+                } else {
+                    appendLine(filename, "* %s %s", getDisplayName(client, overrideNick), (String) arguments[1]);
+                }
+                break;
+        }
+    }
+
+    /**
+     * Log a channel-related event
+     *
+     * @param type The type of the event to process
+     * @param format Format of messages that are about to be sent. (May be null)
+     * @param arguments The arguments for the event
+     */
+    protected void handleChannelEvent(final CoreActionType type, final StringBuffer format, final Object... arguments) {
+        final Channel chan = ((Channel) arguments[0]);
+        final ChannelInfo channel = chan.getChannelInfo();
+        final String filename = getLogFile(channel);
+
+        final ChannelClientInfo channelClient = (arguments.length > 1 && arguments[1] instanceof ChannelClientInfo) ? (ChannelClientInfo) arguments[1] : null;
+        final ClientInfo client = (channelClient != null) ? channelClient.getClient() : null;
+
+        final String message = (arguments.length > 2 && arguments[2] instanceof String) ? (String) arguments[2] : null;
+
+        switch (type) {
+            case CHANNEL_OPENED:
+                if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "backbuffer.autobackbuffer")) {
+                    showBackBuffer(chan.getFrame(), filename);
+                }
+
+                appendLine(filename, "*** Channel opened at: %s", openedAtFormat.format(new Date()));
+                appendLine(filename, "");
+                break;
+            case CHANNEL_CLOSED:
+                appendLine(filename, "*** Channel closed at: %s", openedAtFormat.format(new Date()));
+                if (openFiles.containsKey(filename)) {
+                    final BufferedWriter file = openFiles.get(filename).writer;
+                    try {
+                        file.close();
+                    } catch (IOException e) {
+                        Logger.userError(ErrorLevel.LOW, "Unable to close file (Filename: " + filename + ")");
+                    }
+                    openFiles.remove(filename);
+                }
+                break;
+            case CHANNEL_MESSAGE:
+            case CHANNEL_SELF_MESSAGE:
+            case CHANNEL_ACTION:
+            case CHANNEL_SELF_ACTION:
+                if (type == CoreActionType.CHANNEL_MESSAGE || type == CoreActionType.CHANNEL_SELF_MESSAGE) {
+                    appendLine(filename, "<%s> %s", getDisplayName(client), message);
+                } else {
+                    appendLine(filename, "* %s %s", getDisplayName(client), message);
+                }
+                break;
+            case CHANNEL_GOTTOPIC:
+                // ActionManager.processEvent(CoreActionType.CHANNEL_GOTTOPIC, this);
+                final DateFormat timeFormat = new SimpleDateFormat("HH:mm:ss");
+                final DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
+
+                appendLine(filename, "*** Topic is: %s", channel.getTopic());
+                appendLine(filename, "*** Set at: %s on %s by %s", timeFormat.format(1000 * channel.getTopicTime()), dateFormat.format(1000 * channel.getTopicTime()), channel.getTopicSetter());
+                break;
+            case CHANNEL_TOPICCHANGE:
+                appendLine(filename, "*** %s Changed the topic to: %s", getDisplayName(channelClient), message);
+                break;
+            case CHANNEL_JOIN:
+                appendLine(filename, "*** %s (%s) joined the channel", getDisplayName(channelClient), client.toString());
+                break;
+            case CHANNEL_PART:
+                if (message.isEmpty()) {
+                    appendLine(filename, "*** %s (%s) left the channel", getDisplayName(channelClient), client.toString());
+                } else {
+                    appendLine(filename, "*** %s (%s) left the channel (%s)", getDisplayName(channelClient), client.toString(), message);
+                }
+                break;
+            case CHANNEL_QUIT:
+                if (message.isEmpty()) {
+                    appendLine(filename, "*** %s (%s) Quit IRC", getDisplayName(channelClient), client.toString());
+                } else {
+                    appendLine(filename, "*** %s (%s) Quit IRC (%s)", getDisplayName(channelClient), client.toString(), message);
+                }
+                break;
+            case CHANNEL_KICK:
+                final String kickReason = (String) arguments[3];
+                final ChannelClientInfo kickedClient = (ChannelClientInfo) arguments[2];
+
+                if (kickReason.isEmpty()) {
+                    appendLine(filename, "*** %s was kicked by %s", getDisplayName(kickedClient), getDisplayName(channelClient));
+                } else {
+                    appendLine(filename, "*** %s was kicked by %s (%s)", getDisplayName(kickedClient), getDisplayName(channelClient), kickReason);
+                }
+                break;
+            case CHANNEL_NICKCHANGE:
+                appendLine(filename, "*** %s is now %s", getDisplayName(channelClient, message), getDisplayName(channelClient));
+                break;
+            case CHANNEL_MODECHANGE:
+                if (channelClient.getClient().getNickname().isEmpty()) {
+                    appendLine(filename, "*** Channel modes are: %s", message);
+                } else {
+                    appendLine(filename, "*** %s set modes: %s", getDisplayName(channelClient), message);
+                }
+                break;
+        }
+    }
+
+    /**
+     * Process an event of the specified type.
+     *
+     * @param type The type of the event to process
+     * @param format Format of messages that are about to be sent. (May be null)
+     * @param arguments The arguments for the event
+     */
+    @Override
+    public void processEvent(final ActionType type, final StringBuffer format, final Object... arguments) {
+        if (type instanceof CoreActionType) {
+            final CoreActionType thisType = (CoreActionType) type;
+
+            switch (thisType) {
+                case CHANNEL_OPENED:
+                case CHANNEL_CLOSED:
+                case CHANNEL_MESSAGE:
+                case CHANNEL_SELF_MESSAGE:
+                case CHANNEL_ACTION:
+                case CHANNEL_SELF_ACTION:
+                case CHANNEL_GOTTOPIC:
+                case CHANNEL_TOPICCHANGE:
+                case CHANNEL_JOIN:
+                case CHANNEL_PART:
+                case CHANNEL_QUIT:
+                case CHANNEL_KICK:
+                case CHANNEL_NICKCHANGE:
+                case CHANNEL_MODECHANGE:
+                    handleChannelEvent(thisType, format, arguments);
+                    break;
+                case QUERY_OPENED:
+                case QUERY_CLOSED:
+                case QUERY_MESSAGE:
+                case QUERY_SELF_MESSAGE:
+                case QUERY_ACTION:
+                case QUERY_SELF_ACTION:
+                    handleQueryEvent(thisType, format, arguments);
+                    break;
+                default:
+                    break;
+            }
+        }
+    }
+
+    /**
+     * Add a backbuffer to a frame.
+     *
+     * @param frame The frame to add the backbuffer lines to
+     * @param filename File to get backbuffer from
+     */
+    protected void showBackBuffer(final Window frame, final String filename) {
+        final int numLines = IdentityManager.getGlobalConfig().getOptionInt(getDomain(), "backbuffer.lines");
+        final String colour = IdentityManager.getGlobalConfig().getOption(getDomain(), "backbuffer.colour");
+        final boolean showTimestamp = IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "backbuffer.timestamp");
+        if (frame == null) {
+            Logger.userError(ErrorLevel.LOW, "Given a null frame");
+            return;
+        }
+
+        final File testFile = new File(filename);
+        if (testFile.exists()) {
+            try {
+                final ReverseFileReader file = new ReverseFileReader(testFile);
+                // Because the file includes a newline char at the end, an empty line
+                // is returned by getLines. To counter this, we call getLines(1) and do
+                // nothing with the output.
+                file.getLines(1);
+                final Stack<String> lines = file.getLines(numLines);
+                while (!lines.empty()) {
+                    frame.addLine(getColouredString(colour, lines.pop()), showTimestamp);
+                }
+                file.close();
+                frame.addLine(getColouredString(colour, "--- End of backbuffer\n"), showTimestamp);
+            } catch (FileNotFoundException e) {
+                Logger.userError(ErrorLevel.LOW, "Unable to show backbuffer (Filename: " + filename + "): " + e.getMessage());
+            } catch (IOException e) {
+                Logger.userError(ErrorLevel.LOW, "Unable to show backbuffer (Filename: " + filename + "): " + e.getMessage());
+            } catch (SecurityException e) {
+                Logger.userError(ErrorLevel.LOW, "Unable to show backbuffer (Filename: " + filename + "): " + e.getMessage());
+            }
+        }
+    }
+
+    /**
+     * Get a coloured String.
+     * If colour is invalid, IRC Colour 14 will be used.
+     *
+     * @param colour The colour the string should be (IRC Colour or 6-digit hex colour)
+     * @param line the line to colour
+     * @return The given line with the appropriate irc codes appended/prepended to colour it.
+     */
+    protected static String getColouredString(final String colour, final String line) {
+        String res = null;
+        if (colour.length() < 3) {
+            int num;
+
+            try {
+                num = Integer.parseInt(colour);
+            } catch (NumberFormatException ex) {
+                num = -1;
+            }
+
+            if (num >= 0 && num <= 15) {
+                res = String.format("%c%02d%s%1$c", Styliser.CODE_COLOUR, num, line);
+            }
+        } else if (colour.length() == 6) {
+            try {
+                Color.decode("#" + colour);
+                res = String.format("%c%s%s%1$c", Styliser.CODE_HEXCOLOUR, colour, line);
+            } catch (NumberFormatException ex) { /* Do Nothing */ }
+        }
+
+        if (res == null) {
+            res = String.format("%c%02d%s%1$c", Styliser.CODE_COLOUR, 14, line);
+        }
+        return res;
+    }
+
+    /**
+     * Add a line to a file.
+     *
+     * @param filename Name of file to write to
+     * @param format Format of line to add. (NewLine will be added Automatically)
+     * @param args Arguments for format
+     * @return true on success, else false.
+     */
+    protected boolean appendLine(final String filename, final String format, final Object... args) {
+        return appendLine(filename, String.format(format, args));
+    }
+
+    /**
+     * Add a line to a file.
+     *
+     * @param filename Name of file to write to
+     * @param line Line to add. (NewLine will be added Automatically)
+     * @return true on success, else false.
+     */
+    protected boolean appendLine(final String filename, final String line) {
+        final StringBuffer finalLine = new StringBuffer();
+
+        if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "general.addtime")) {
+            String dateString;
+            final String dateFormatString = IdentityManager.getGlobalConfig().getOption(getDomain(), "general.timestamp");
+            try {
+                final DateFormat dateFormat = new SimpleDateFormat(dateFormatString);
+                dateString = dateFormat.format(new Date()).trim();
+            } catch (IllegalArgumentException iae) {
+                // Default to known good format
+                final DateFormat dateFormat = new SimpleDateFormat("[dd/MM/yyyy HH:mm:ss]");
+                dateString = dateFormat.format(new Date()).trim();
+
+                Logger.userError(ErrorLevel.LOW, "Dateformat String '" + dateFormatString + "' is invalid. For more information: http://java.sun.com/javase/6/docs/api/java/text/SimpleDateFormat.html");
+            }
+            finalLine.append(dateString);
+            finalLine.append(" ");
+        }
+
+        if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "general.stripcodes")) {
+            finalLine.append(Styliser.stipControlCodes(line));
+        } else {
+            finalLine.append(line);
+        }
+        //System.out.println("[Adding] "+filename+" => "+finalLine);
+        BufferedWriter out = null;
+        try {
+            if (openFiles.containsKey(filename)) {
+                OpenFile of = openFiles.get(filename);
+                of.lastUsedTime = System.currentTimeMillis();
+                out = of.writer;
+            } else {
+                out = new BufferedWriter(new FileWriter(filename, true));
+                openFiles.put(filename, new OpenFile(out));
+            }
+            out.write(finalLine.toString());
+            out.newLine();
+            out.flush();
+            return true;
+        } catch (IOException e) {
+            /*
+             * Do Nothing
+             *
+             * Makes no sense to keep adding errors to the logger when we can't
+             * write to the file, as chances are it will happen on every incomming
+             * line.
+             */
+        }
+        return false;
+    }
+
+    /**
+     * Get the name of the log file for a specific object.
+     *
+     * @param obj Object to get name for
+     * @return the name of the log file to use for this object.
+     */
+    protected String getLogFile(final Object obj) {
+        final StringBuffer directory = new StringBuffer();
+        final StringBuffer file = new StringBuffer();
+        String md5String = "";
+
+        directory.append(IdentityManager.getGlobalConfig().getOption(getDomain(), "general.directory"));
+        if (directory.charAt(directory.length() - 1) != File.separatorChar) {
+            directory.append(File.separatorChar);
+        }
+
+        if (obj == null) {
+            file.append("null.log");
+        } else if (obj instanceof ChannelInfo) {
+            final ChannelInfo channel = (ChannelInfo) obj;
+            if (channel.getParser() != null) {
+                addNetworkDir(directory, file, channel.getParser().getNetworkName());
+            }
+            file.append(sanitise(channel.getName().toLowerCase()));
+            md5String = channel.getName();
+        } else if (obj instanceof ClientInfo) {
+            final ClientInfo client = (ClientInfo) obj;
+            if (client.getParser() != null) {
+                addNetworkDir(directory, file, client.getParser().getNetworkName());
+            }
+            file.append(sanitise(client.getNickname().toLowerCase()));
+            md5String = client.getNickname();
+        } else {
+            file.append(sanitise(obj.toString().toLowerCase()));
+            md5String = obj.toString();
+        }
+
+        if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "advanced.usedate")) {
+            final String dateFormat = IdentityManager.getGlobalConfig().getOption(getDomain(), "advanced.usedateformat");
+            final String dateDir = (new SimpleDateFormat(dateFormat)).format(new Date());
+            directory.append(dateDir);
+            if (directory.charAt(directory.length() - 1) != File.separatorChar) {
+                directory.append(File.separatorChar);
+            }
+
+            if (!new File(directory.toString()).exists() && !(new File(directory.toString())).mkdirs()) {
+                Logger.userError(ErrorLevel.LOW, "Unable to create date dirs");
+            }
+        }
+
+        if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "advanced.filenamehash")) {
+            file.append('.');
+            file.append(md5(md5String));
+        }
+        file.append(".log");
+
+        return directory.toString() + file.toString();
+    }
+
+    /**
+     * This function adds the networkName to the log file.
+     * It first tries to create a directory for each network, if that fails
+     * it will prepend the networkName to the filename instead.
+     *
+     * @param directory Current directory name
+     * @param file Current file name
+     * @param networkName Name of network
+     */
+    protected void addNetworkDir(final StringBuffer directory, final StringBuffer file, final String networkName) {
+        if (!IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "general.networkfolders")) {
+            return;
+        }
+
+        final String network = sanitise(networkName.toLowerCase());
+
+        boolean prependNetwork = false;
+
+        // Check dir exists
+        final File dir = new File(directory.toString() + network + System.getProperty("file.separator"));
+        if (dir.exists() && !dir.isDirectory()) {
+            Logger.userError(ErrorLevel.LOW, "Unable to create networkfolders dir (file exists instead)");
+            // Prepend network name to file instead.
+            prependNetwork = true;
+        } else if (!dir.exists() && !dir.mkdirs()) {
+            Logger.userError(ErrorLevel.LOW, "Unable to create networkfolders dir");
+            prependNetwork = true;
+        }
+
+        if (prependNetwork) {
+            file.insert(0, " -- ");
+            file.insert(0, network);
+        } else {
+            directory.append(network);
+            directory.append(System.getProperty("file.separator"));
+        }
+    }
+
+    /**
+     * Sanitise a string to be used as a filename.
+     *
+     * @param name String to sanitise
+     * @return Sanitised version of name that can be used as a filename.
+     */
+    protected static String sanitise(final String name) {
+        // Replace illegal chars with
+        return name.replaceAll("[^\\w\\.\\s\\-\\#\\&\\_]", "_");
+    }
+
+    /**
+     * Get the md5 hash of a string.
+     *
+     * @param string String to hash
+     * @return md5 hash of given string
+     */
+    protected static String md5(final String string) {
+        try {
+            final MessageDigest m = MessageDigest.getInstance("MD5");
+            m.update(string.getBytes(), 0, string.length());
+            return new BigInteger(1, m.digest()).toString(16);
+        } catch (NoSuchAlgorithmException e) {
+            return "";
+        }
+    }
+
+    /**
+     * Get name to display for client.
+     *
+     * @param client The client to get the display name for
+     * @return name to display
+     */
+    protected String getDisplayName(final ClientInfo client) {
+        return getDisplayName(client, "");
+    }
+
+    /**
+     * Get name to display for client.
+     *
+     * @param client The client to get the display name for
+     * @param overrideNick Nickname to display instead of real nickname
+     * @return name to display
+     */
+    protected String getDisplayName(final ClientInfo client, final String overrideNick) {
+        if (overrideNick.isEmpty()) {
+            return (client == null) ? "Unknown Client" : client.getNickname();
+        } else {
+            return overrideNick;
+        }
+    }
+
+    /**
+     * Get name to display for channelClient (Taking into account the channelmodeprefix setting).
+     *
+     * @param channelClient The client to get the display name for
+     * @return name to display
+     */
+    protected String getDisplayName(final ChannelClientInfo channelClient) {
+        return getDisplayName(channelClient, "");
+    }
+
+    /**
+     * Get name to display for channelClient (Taking into account the channelmodeprefix setting).
+     *
+     * @param channelClient The client to get the display name for
+     * @param overrideNick Nickname to display instead of real nickname
+     * @return name to display
+     */
+    protected String getDisplayName(final ChannelClientInfo channelClient, final String overrideNick) {
+        final boolean addModePrefix = (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "general.channelmodeprefix"));
+
+        if (channelClient == null) {
+            return (overrideNick.isEmpty()) ? "Unknown Client" : overrideNick;
+        } else if (overrideNick.isEmpty()) {
+            return (addModePrefix) ? channelClient.toString() : channelClient.getClient().getNickname();
+        } else {
+            return (addModePrefix) ? channelClient.getImportantModePrefix() + overrideNick : overrideNick;
+        }
+    }
+
+    /**
+     * Shows the history window for the specified target, if available.
+     *
+     * @param target The window whose history we're trying to open
+     * @return True if the history is available, false otherwise
+     */
+    protected boolean showHistory(final InputWindow target) {
+        Object component;
+
+        if (target.getContainer() instanceof Channel) {
+            component = ((Channel) target.getContainer()).getChannelInfo();
+        } else if (target.getContainer() instanceof Query) {
+            final Parser parser = ((Query) target.getContainer()).getServer().getParser();
+            component = parser.getClient(((Query) target.getContainer()).getHost());
+        } else if (target.getContainer() instanceof Server) {
+            component = target.getContainer().getServer().getParser();
+        } else {
+            // Unknown component
+            return false;
+        }
+
+        final String log = getLogFile(component);
+
+        if (!new File(log).exists()) {
+            // File doesn't exist
+            return false;
+        }
+
+        ReverseFileReader reader;
+
+        try {
+            reader = new ReverseFileReader(log);
+        } catch (FileNotFoundException ex) {
+            return false;
+        } catch (IOException ex) {
+            return false;
+        } catch (SecurityException ex) {
+            return false;
+        }
+
+        new HistoryWindow("History", reader, target,
+                IdentityManager.getGlobalConfig().getOptionInt(getDomain(), "history.lines"));
+
+        return true;
+    }
+
+}

src/com/dmdirc/addons/logging/ReverseFileReader.java

@@ -0,0 +1,261 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.logging;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.RandomAccessFile;
+import java.io.IOException;
+import java.io.EOFException;
+import java.nio.charset.Charset;
+import java.util.Stack;
+import java.util.ArrayList;
+
+/**
+ * Reads a file in reverse.
+ *
+ * @author Shane 'Dataforce' McCormack
+ */
+public class ReverseFileReader {
+
+    /** File to manipulate. */
+    private RandomAccessFile file;
+
+    /** Number of bytes to skip backwards at a time. */
+    private byte seekLength = 50;
+
+    /**
+     * Create a new ReverseFileReader.
+     *
+     * @param filename File to open.
+     * @throws FileNotFoundException If the file is not a regular file.
+     * @throws SecurityException If a security manager exists and its checkRead method denies read access to the file.
+     * @throws IOException If there is an error seeking to the end of the file.
+     */
+    public ReverseFileReader(String filename) throws FileNotFoundException, SecurityException, IOException {
+        file = new RandomAccessFile(filename, "r");
+        reset();
+    }
+
+    /**
+     * Create a new ReverseFileReader.
+     *
+     * @param myFile Existing file to use.
+     * @throws FileNotFoundException If the file is not a regular file.
+     * @throws SecurityException If a security manager exists and its checkRead method denies read access to the file.
+     * @throws IOException If there is an error seeking to the end of the file.
+     */
+    public ReverseFileReader(File myFile) throws FileNotFoundException, SecurityException, IOException {
+        file = new RandomAccessFile(myFile, "r");
+        reset();
+    }
+
+    /**
+     * Reset the file pointer to the end of the file.
+     *
+     * @throws IOException If there is an error seeking, or the file is closed.
+     */
+    public void reset() throws IOException {
+        if (file == null) {
+            throw new IOException("File has been closed.");
+        }
+        file.seek(file.length());
+    }
+
+    /**
+     * Get the current seekLength.
+     *
+     * @return current seekLength
+     */
+    public byte getSeekLength() {
+        return seekLength;
+    }
+
+    /**
+     * Set the seekLength.
+     *
+     * @param newValue New value for seekLength
+     */
+    public void setSeekLength(final byte newValue) {
+        seekLength = newValue;
+    }
+
+    /**
+     * Close the file pointer.
+     * This should be called before removing the reference to this object
+     *
+     * @throws IOException If there is an error closing the file, or if it has been closed already.
+     */
+    public void close() throws IOException {
+        if (file == null) {
+            throw new IOException("File has been closed.");
+        }
+        file.close();
+        file = null;
+    }
+
+    /**
+     * Get the next full line.
+     *
+     * @return The next full line.
+     * @throws EOFException If there is no more lines.
+     * @throws IOException If an error reading or seeking occured, or if the fiel is closed.
+     */
+    public String getNextLine() throws EOFException, IOException {
+        if (file == null) {
+            throw new IOException("File has been closed.");
+        }
+        // Used to store result to output.
+//		StringBuilder line = new StringBuilder();
+        final ArrayList<Byte> line = new ArrayList<Byte>(seekLength);
+        // Used to store position in file pre-read
+        long fp = 0;
+        // Used to store position in file when this is called
+        long startfp = 0;
+        // Used to store read bytes
+        byte[] bytes;
+        // Distance seeked
+        int seekDistance = 0;
+
+        // Check current position, if 0 we are at the start of the file
+        // and should throw an exception.
+        startfp = file.getFilePointer();
+        if (startfp == 0) {
+            throw new EOFException("Reached Start of file");
+        }
+
+        // Keep looping untill we get a full line, or the end of the file
+        boolean keepLooping = true;
+        boolean gotNewLine;
+        while (keepLooping) {
+            gotNewLine = false;
+            // Get Current Position
+            fp = file.getFilePointer();
+
+            // Check how far to seek backwards (seekLength or to the start of the file)
+            if (fp < seekLength) {
+                // Seek to the start of the file;
+                seekDistance = (int) fp;
+                fp = 0;
+            } else {
+                // Seek to position current-seekLength
+                seekDistance = seekLength;
+                fp = fp - seekDistance;
+            }
+            // Seek!
+            file.seek(fp);
+
+            bytes = new byte[seekDistance];
+            // Read into the bytes array
+            file.read(bytes);
+
+            // And loop looking for data
+            // This uses seekDistance so that only wanted data is checked.
+            for (int i = seekDistance - 1; i >= 0; --i) {
+                // Check for New line Character, or a non carraige-return char
+                if (bytes[i] == '\n') {
+                    // Seek to the location of this character and exit this loop.
+                    file.seek(fp + i);
+                    gotNewLine = true;
+                    break;
+                } else if (bytes[i] != '\r') {
+                    // Add to the result, the loop will continue going.
+                    line.add(0, bytes[i]);
+                }
+            }
+
+            // We have now processed the data we read (Either added it all to the
+            // buffer, or found a newline character.)
+
+            if (fp == 0 && !gotNewLine) {
+                // This part of the loop started from the start of the file, but didn't
+                // find a new line anywhere. no more loops are posssible, so Treat
+                // this as "got new line"
+                gotNewLine = true;
+                file.seek(0);
+            }
+
+            // Do we need to continue?
+            if (gotNewLine) {
+                // We have found a new line somewhere, thus we don't need
+                // to read any more bytes, so exit the while loop!
+                keepLooping = false;
+            } else {
+                // We have not found a new line anywhere,
+                // Seek to the pre-read position, and repeat.
+                file.seek(fp);
+            }
+
+        }
+
+        // Return the data obtained.
+        byte[] result = new byte[line.size()];
+        for (int i = 0; i < line.size(); ++i) {
+            result[i] = line.get(i);
+        }
+        return new String(result, Charset.forName("UTF-8"));
+    }
+
+    /**
+     * Try and get x number of lines.
+     * If the file is closed, an empty stack will be returned.
+     *
+     * @param numLines Number of lines to try and get.
+     * @return The requested lines
+     */
+    public Stack<String> getLines(final int numLines) {
+        final Stack<String> result = new Stack<String>();
+        for (int i = 0; i < numLines; ++i) {
+            try {
+                result.push(getNextLine());
+            } catch (IOException e) {
+                break;
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Try and get x number of lines and return a \n delimited String.
+     * If the file is closed, an empty string will be returned.
+     *
+     * @param numLines Number of lines to try and get.
+     * @return The requested lines
+     */
+    public String getLinesAsString(final int numLines) {
+        final StringBuilder result = new StringBuilder();
+        for (int i = 0; i < numLines; ++i) {
+            try {
+                result.insert(0, "\n");
+                result.insert(0, getNextLine());
+            } catch (IOException e) {
+                break;
+            }
+        }
+        if (result.charAt(0) == '\n') {
+            result.deleteCharAt(0);
+        }
+        return result.toString();
+    }
+
+}

src/com/dmdirc/addons/logging/package-info.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * Adds logging functionality to the client. 
+ */
+package com.dmdirc.addons.logging;

src/com/dmdirc/addons/logging/plugin.config

@@ -0,0 +1,49 @@
+# This is a DMDirc configuration file.
+
+# This section indicates which sections below take key/value
+# pairs, rather than a simple list. It should be placed above
+# any sections that take key/values.
+keysections:
+  metadata
+  requires
+  updates
+  defaults
+  version
+
+metadata:
+  author=Shane <shane@dmdirc.com>
+  mainclass=com.dmdirc.addons.logging.LoggingPlugin
+  description=Allows logging of conversations
+  name=logging
+  nicename=Logging Plugin
+
+requires:
+  parent=ui_swing
+
+updates:
+  id=16
+
+version:
+  friendly=0.6
+
+provides:
+  logging command
+  logging feature
+
+required-services:
+  swing ui
+
+defaults:
+  general.networkfolders=true
+  advanced.filenamehash=false
+  general.addtime=true
+  general.timestamp=[dd/MM/yyyy HH:mm:ss]
+  general.stripcodes=true
+  general.channelmodeprefix=true
+  backbuffer.autobackbuffer=true
+  backbuffer.lines=10
+  backbuffer.colour=14
+  backbuffer.timestamp=false
+  history.lines=50000
+  advanced.usedate=false
+  advanced.usedateformat=yyyy/MMMM

src/com/dmdirc/addons/mediasource_dcop/AmarokSource.java

@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.mediasource_dcop;
+
+import com.dmdirc.addons.nowplaying.MediaSource;
+import com.dmdirc.addons.nowplaying.MediaSourceState;
+
+import java.util.List;
+
+/**
+ * Uses DCOP to retrieve now playing info from Amarok.
+ *
+ * @author chris
+ */
+public class AmarokSource implements MediaSource {
+    
+    /** Instantiates the media source. */
+    public AmarokSource() {
+        //Do nothing
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public MediaSourceState getState() {
+        final List<String> res = DcopMediaSourcePlugin.getDcopResult("dcop amarok player status");
+        if (res.size() > 0) {
+            final String result = res.get(0).trim();
+            try {
+                final int status = (Integer.parseInt(result));
+                switch (status) {
+                    case 0:
+                        return MediaSourceState.STOPPED;
+                    case 1:
+                        return MediaSourceState.PAUSED;
+                    case 2:
+                        return MediaSourceState.PLAYING;
+                    default:
+                        return MediaSourceState.NOTKNOWN;
+                }
+            } catch (NumberFormatException nfe) {
+                return MediaSourceState.CLOSED;
+            }
+        } else {
+            return MediaSourceState.CLOSED;
+        }
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public String getAppName() {
+        return "Amarok";
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public String getArtist() {
+        return DcopMediaSourcePlugin.getDcopResult("dcop amarok player artist").get(0);
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public String getTitle() {
+        return DcopMediaSourcePlugin.getDcopResult("dcop amarok player title").get(0);
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public String getAlbum() {
+        return DcopMediaSourcePlugin.getDcopResult("dcop amarok player album").get(0);
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public String getLength() {
+        return DcopMediaSourcePlugin.getDcopResult("dcop amarok player totalTime").get(0);
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public String getTime() {
+        return DcopMediaSourcePlugin.getDcopResult(
+                "dcop amarok player currentTime").get(0);
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public String getFormat() {
+        return DcopMediaSourcePlugin.getDcopResult("dcop amarok player type").get(0);
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public String getBitrate() {
+        return DcopMediaSourcePlugin.getDcopResult("dcop amarok player bitrate").get(0);
+    }
+    
+}

src/com/dmdirc/addons/mediasource_dcop/DcopMediaSourcePlugin.java

@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.mediasource_dcop;
+
+import com.dmdirc.addons.nowplaying.MediaSource;
+import com.dmdirc.addons.nowplaying.MediaSourceManager;
+import com.dmdirc.plugins.NoSuchProviderException;
+import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.PluginManager;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Manages all DCOP based media sources.
+ */
+public class DcopMediaSourcePlugin extends Plugin
+        implements MediaSourceManager {
+    
+    /** Media sources. */
+    private final List<MediaSource> sources;
+    
+    /**
+     * Creates a new instance of DcopMediaSourcePlugin.
+     */
+    public DcopMediaSourcePlugin() {
+        super();
+        sources = new ArrayList<MediaSource>();
+        sources.add(new AmarokSource());
+        sources.add(new KaffeineSource());
+        sources.add(new NoatunSource());
+    }
+    
+    /**
+     * Get DCOP Result
+     *
+     * @param query Query to try
+     * @return The result of the dcop query, line-by-line
+     */
+    @SuppressWarnings("unchecked")
+    protected static List<String> getDcopResult(final String query) {
+        try {
+            return (List<String>) PluginManager.getPluginManager()
+                    .getExportedService("dcop").execute(query);
+        } catch (NoSuchProviderException nspe) {
+            return new ArrayList<String>();
+        }
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public List<MediaSource> getSources() {
+        return sources;
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public void onLoad() {
+        // Nothing to do
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public void onUnload() {
+        // Nothing to do
+    }
+
+}

src/com/dmdirc/addons/mediasource_dcop/KaffeineSource.java

@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.mediasource_dcop;
+
+import com.dmdirc.addons.nowplaying.MediaSource;
+import com.dmdirc.addons.nowplaying.MediaSourceState;
+
+import java.util.List;
+
+/**
+ * Uses DCOP to retrieve now playing info from Kaffeine.
+ *
+ * @author chris
+ */
+public class KaffeineSource implements MediaSource {
+    
+    /** Instantiates the media source. */
+    public KaffeineSource() {
+        //Do nothing
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public MediaSourceState getState() {
+        final List<String> res = DcopMediaSourcePlugin.getDcopResult("dcop kaffeine KaffeineIface isPlaying");
+        if (res.size() > 0) {
+            final String result = res.get(0);
+            if (Boolean.parseBoolean(result)) {
+                return MediaSourceState.PLAYING;
+            } else {
+                return MediaSourceState.CLOSED;
+            }
+        } else {
+            return MediaSourceState.CLOSED;
+        }
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public String getAppName() {
+        return "Kaffeine";
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public String getArtist() {
+        return DcopMediaSourcePlugin.getDcopResult(
+                "dcop kaffeine KaffeineIface artist").get(0);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getTitle() {
+        return DcopMediaSourcePlugin.getDcopResult(
+                "dcop kaffeine KaffeineIface title").get(0);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getAlbum() {
+        return DcopMediaSourcePlugin.getDcopResult(
+                "dcop kaffeine KaffeineIface album").get(0);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getLength() {
+        return duration(Integer.parseInt(DcopMediaSourcePlugin.getDcopResult(
+                "dcop kaffeine KaffeineIface getLength").get(0)));
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getTime() {
+        return duration(Integer.parseInt(DcopMediaSourcePlugin.getDcopResult(
+                "dcop kaffeine KaffeineIface getTimePos").get(0)));
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getFormat() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getBitrate() {
+        return null;
+    }
+    
+    /**
+     * Get the duration in seconds as a string.
+     *
+     * @param secondsInput to get duration for
+     *
+     * @return Duration as a string
+     */
+    private String duration(final long secondsInput) {
+        final StringBuilder result = new StringBuilder();
+        final long hours = secondsInput / 3600;
+        final long minutes = secondsInput / 60 % 60;
+        final long seconds = secondsInput % 60;
+        
+        if (hours > 0) {
+            if (hours < 10) {
+                result.append('0');
+            }
+
+            result.append(hours).append(":");
+        }
+
+        if (minutes < 10) {
+            result.append('0');
+        }
+        
+        result.append(minutes).append(":");
+
+        if (seconds < 10) {
+            result.append('0');
+        }
+
+        result.append(seconds);
+        
+        return result.toString();
+    }
+    
+}

src/com/dmdirc/addons/mediasource_dcop/NoatunSource.java

@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.mediasource_dcop;
+
+import com.dmdirc.addons.nowplaying.MediaSource;
+import com.dmdirc.addons.nowplaying.MediaSourceState;
+
+import java.util.List;
+
+/**
+ * Uses DCOP to retrieve now playing info from Noatun.
+ *
+ * @author chris
+ */
+public class NoatunSource implements MediaSource {
+    
+    /** Instantiates the media source. */
+    public NoatunSource() {
+        //Do nothing
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public MediaSourceState getState() {
+        final List<String> res = DcopMediaSourcePlugin.getDcopResult("dcop noatun Noatun state");
+        if (res.size() > 0) {
+            final String result = res.get(0).trim();
+            try {
+                final int status = (Integer.parseInt(result));
+                switch (status) {
+                    case 0:
+                        return MediaSourceState.STOPPED;
+                    case 1:
+                        return MediaSourceState.PAUSED;
+                    case 2:
+                        return MediaSourceState.PLAYING;
+                    default:
+                        return MediaSourceState.NOTKNOWN;
+                }
+            } catch (NumberFormatException nfe) {
+                return MediaSourceState.CLOSED;
+            }
+        } else {
+            return MediaSourceState.CLOSED;
+        }
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public String getAppName() {
+        return "Noatun";
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public String getArtist() {
+        final String result = DcopMediaSourcePlugin.getDcopResult(
+                "dcop noatun Noatun title").get(0);
+        if (result.indexOf(" - ") == -1) {
+            return "";
+        }
+        return result.substring(0, result.indexOf(" - "));
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getTitle() {
+        final String result = DcopMediaSourcePlugin.getDcopResult(
+                "dcop noatun Noatun title").get(0);
+        if (result.indexOf(" - ") == -1) {
+            return "";
+        }
+        return result.substring(result.indexOf(" - ") + 3, result.length());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getAlbum() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getLength() {
+        return DcopMediaSourcePlugin.getDcopResult(
+                "dcop noatun Noatun lengthString").get(0);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getTime() {
+        return duration(Integer.parseInt(DcopMediaSourcePlugin.getDcopResult(
+                "dcop noatun Noatun position").get(0)) /1000);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getFormat() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getBitrate() {
+        return null;
+    }
+    
+    /**
+     * Get the duration in seconds as a string.
+     *
+     * @param secondsInput to get duration for
+     *
+     * @return Duration as a string
+     */
+    private String duration(final long secondsInput) {
+        final StringBuilder result = new StringBuilder();
+        final long hours = secondsInput / 3600;
+        final long minutes = secondsInput / 60 % 60;
+        final long seconds = secondsInput % 60;
+        
+        if (hours > 0) { 
+            result.append(hours).append(":");
+        }
+        
+        result.append(minutes).append(":");
+        result.append(seconds).append(":");
+        
+        return result.toString();
+    }
+    
+}

src/com/dmdirc/addons/mediasource_dcop/plugin.config

@@ -0,0 +1,31 @@
+# This is a DMDirc configuration file.
+
+# This section indicates which sections below take key/value
+# pairs, rather than a simple list. It should be placed above
+# any sections that take key/values.
+keysections:
+  metadata
+  updates
+  version
+
+metadata:
+  author=Greboid <greg@dmdirc.com>
+  mainclass=com.dmdirc.addons.mediasource_dcop.DcopMediaSourcePlugin
+  description=Provides DCOP media sources for the now playing plugin
+  name=dcopmediasource
+  nicename=DCOP Media Sources
+
+updates:
+  id=9
+
+version:
+  friendly=0.3
+
+provides:
+  amarok mediasource
+  kaffeine mediasource
+  noatum mediasource
+
+required-services:
+  dcop export
+  mediasource manager

src/com/dmdirc/addons/mediasource_vlc/InstructionsPanel.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.mediasource_vlc;
+
+import com.dmdirc.config.prefs.PreferencesInterface;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
+
+import javax.swing.JPanel;
+
+import net.miginfocom.swing.MigLayout;
+
+/**
+ * Shows installation instructions for the VLC media source.
+ * 
+ * @author chris
+ */
+class InstructionsPanel extends JPanel implements PreferencesInterface {
+    
+    private static final long serialVersionUID = 1;
+
+    public InstructionsPanel() {
+        setLayout(new MigLayout());
+        final TextLabel instructions = new TextLabel("<html><p>"                
+                + "The VLC media source requires that VLC's web interface is" +
+                " enabled. To do this, follow the steps below:</p>"
+                + "<ol style='margin-left: 20px; padding-left: 0px;'>" +
+                "<li>Open VLC's preferences dialog (found in the 'Tools' menu)" +
+                "<li>Set the 'Show settings' option to 'All'" +
+                "<li>Expand the 'Interface' category by clicking on the plus sign next to it" +
+                "<li>Select the 'Main interfaces' category" +
+                "<li>Check the box next to 'HTTP remote control interface'" +
+                "<li>Expand the 'Main interfaces' category" +
+                "<li>Select the 'HTTP' category" +
+                "<li>In the 'Host address' field, enter 'localhost:8082'" +
+                "<li>In the 'Source directory' field enter the path to VLC's" +
+                " http directory<ul style='margin-left: 5px; padding-left: 0px;" +
+                "list-style-type: none;'>" +
+                "<li style='padding-bottom: 5px'>For Linux users this may be /usr/share/vlc/http/" +
+                "<li>For Windows users this will be under the main VLC directory, e.g. " +
+                "C:\\Program Files\\VLC\\http</ul><li>Click 'Save'<li>Restart VLC</ol></html>");
+        add(instructions);
+    }
+
+    /** {@inheritDpc} */
+    @Override
+    public void save() {
+        // Do nothing
+    }
+
+}

src/com/dmdirc/addons/mediasource_vlc/VlcMediaSourcePlugin.java

@@ -0,0 +1,310 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.mediasource_vlc;
+
+import com.dmdirc.addons.nowplaying.MediaSource;
+import com.dmdirc.addons.nowplaying.MediaSourceState;
+import com.dmdirc.config.IdentityManager;
+import com.dmdirc.config.prefs.PreferencesCategory;
+import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.config.prefs.PreferencesSetting;
+import com.dmdirc.config.prefs.PreferencesType;
+import com.dmdirc.plugins.Plugin;
+import com.dmdirc.util.Downloader;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Retrieves information from VLC using its HTTP interface.
+ * 
+ * @author chris
+ */
+public class VlcMediaSourcePlugin extends Plugin implements MediaSource {
+    
+    /** The information obtained from VLC. */
+    private final Map<String, String> information
+            = new HashMap<String, String>();
+
+    /** {@inheritDoc} */
+    @Override
+    public MediaSourceState getState() {
+        if (fetchInformation()) {
+            final String output = information.get("state");
+            if (output.equalsIgnoreCase("stop")) {
+                return MediaSourceState.STOPPED;
+            } else if (output.equalsIgnoreCase("playing")) {
+                return MediaSourceState.PLAYING;
+            } else if (output.equalsIgnoreCase("paused")) {
+                return MediaSourceState.PAUSED;
+            } else {
+                return MediaSourceState.NOTKNOWN;
+            }
+        } else {
+            return MediaSourceState.CLOSED;
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override    
+    public String getAppName() {
+        return "VLC";
+    }
+
+    /** {@inheritDoc} */
+    @Override    
+    public String getArtist() {
+        return information.containsKey("artist") ? information.get("artist") :
+                getFallbackArtist();
+    }
+     
+    /**
+     * Retrieves the fallback artist (parsed from the file name).
+     * 
+     * @return The fallback artist
+     */
+    private String getFallbackArtist() {
+        String result = "unknown";
+        
+        if (information.containsKey("playlist_current")) {
+            try {
+                final int item = Integer.parseInt(information.get("playlist_current"));
+                String[] bits = information.get("playlist_item_" + item).split(
+                        (File.separatorChar=='\\' ? "\\\\" : File.separator));
+                result = bits[bits.length-1];
+                bits = result.split("-");
+                if (bits.length > 1) {
+                    result = bits[0];
+                } else {
+                    // Whole filename is the title, so no artist is known.
+                    result = "unknown";
+                }
+            } catch (NumberFormatException nfe) {
+                // DO nothing
+            }
+        }
+        
+        return result;
+    }
+
+    /** {@inheritDoc} */
+    @Override    
+    public String getTitle() {
+        return information.containsKey("title") ? information.get("title")
+                : getFallbackTitle();
+    }
+    
+    /**
+     * Retrieves the fallback title (parsed from the file name).
+     * 
+     * @return The fallback title
+     */
+    private String getFallbackTitle() {
+        String result = "unknown";
+        
+        // Title is unknown, lets guess using the filename
+        if (information.containsKey("playlist_current")) {
+            try {
+                final int item = Integer.parseInt(information.get("playlist_current"));
+                result = information.get("playlist_item_" + item);
+                
+                final int sepIndex = result.lastIndexOf(File.separatorChar);
+                final int extIndex = result.lastIndexOf('.');
+                result = result.substring(sepIndex,
+                        extIndex > sepIndex ? extIndex : result.length());
+                
+                final int offset = result.indexOf('-');
+                if (offset > -1) {
+                    result = result.substring(offset + 1).trim();
+                }
+            } catch (NumberFormatException nfe) {
+                // Do nothing
+            }
+        }
+        
+        return result;
+    }
+
+    /** {@inheritDoc} */
+    @Override    
+    public String getAlbum() {
+        return information.containsKey("album/movie/show title")
+                ? information.get("album/movie/show title") : "unknown";
+    }
+
+    /** {@inheritDoc} */
+    @Override    
+    public String getLength() {
+        // This is just seconds, could do with formatting.
+        return information.containsKey("length") ? information.get("length")
+                : "unknown";
+    }
+
+    /** {@inheritDoc} */
+    @Override    
+    public String getTime() {
+        // This is just seconds, could do with formatting.
+        return information.containsKey("time") ? information.get("time")
+                : "unknown";
+    }
+
+    /** {@inheritDoc} */
+    @Override    
+    public String getFormat() {
+        return information.containsKey("codec") ? information.get("codec")
+                : "unknown";
+    }
+
+    /** {@inheritDoc} */
+    @Override    
+    public String getBitrate() {
+        return information.containsKey("bitrate") ? information.get("bitrate")
+                : "unknown";
+    }
+
+    /** {@inheritDoc} */
+    @Override    
+    public void onLoad() {
+        // Do nothing
+    }
+
+    /** {@inheritDoc} */
+    @Override    
+    public void onUnload() {
+        // Do nothing
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void showConfig(final PreferencesManager manager) {
+        final PreferencesCategory general = new PreferencesCategory("VLC Media Source",
+                "", "category-vlc");
+        final PreferencesCategory instr = new PreferencesCategory("Instructions",
+                "", new InstructionsPanel());
+        
+        general.addSetting(new PreferencesSetting(PreferencesType.TEXT, 
+                getDomain(), "host", "Hostname and port",
+                "The host and port that VLC listens on for web connections"));
+        
+        manager.getCategory("Plugins").addSubCategory(general);
+        general.addSubCategory(instr.setInline());
+    }
+    
+    /**
+     * Attempts to fetch information from VLC's web interface.
+     * 
+     * @return True on success, false otherwise
+     */
+    private boolean fetchInformation() {
+        information.clear();
+        List<String> res;
+        List<String> res2;
+        
+        try {
+            res = Downloader.getPage("http://" +
+                    IdentityManager.getGlobalConfig().getOption(getDomain(),
+                    "host") + "/old/info.html");
+            res2 = Downloader.getPage("http://" +
+                    IdentityManager.getGlobalConfig().getOption(getDomain(),
+                    "host") + "/old/");
+        } catch (MalformedURLException ex) {
+            return false;
+        } catch (IOException ex) {
+            return false;
+        }
+        
+        parseInformation(res, res2);
+        
+        return true;
+    }
+    
+    /**
+     * Parses the information from the two pages obtained from VLC's web
+     * interface.
+     * 
+     * @param res The first page of VLC info (/old/info.html)
+     * @param res2 The second page of VLC info (/old/)
+     */
+    protected void parseInformation(final List<String> res,
+            final List<String> res2) {
+        for (String line : res) {
+            final String tline = line.trim();
+            
+            if (tline.startsWith("<li>")) {
+                final int colon = tline.indexOf(':');
+                final String key = tline.substring(5, colon).trim().toLowerCase();
+                final String value = tline.substring(colon + 1, tline.length() - 5).trim();
+                
+                information.put(key, value);
+            }
+        }
+        
+        boolean isPlaylist = false;
+        boolean isCurrent = false;
+        boolean isItem = false;
+        int playlistItem = 0;
+        for (String line : res2) {
+            final String tline = line.trim();
+            
+            if (isPlaylist) {
+                if (tline.startsWith("</ul>")) {
+                    isPlaylist = false;
+                    information.put("playlist_items", Integer.toString(playlistItem));
+                } else if (tline.equalsIgnoreCase("<strong>")) {
+                    isCurrent = true;
+                } else if (tline.equalsIgnoreCase("</strong>")) {
+                    isCurrent = false;
+                } else if (tline.startsWith("<a href=\"?control=play&amp")) {
+                    isItem = true;
+                } else if (isItem) {
+                    String itemname = tline;
+                    if (itemname.endsWith("</a>")) {
+                        itemname = itemname.substring(0, itemname.length()-4);
+                    }
+                    if (!itemname.isEmpty()) {
+                        if (isCurrent) {
+                            information.put("playlist_current", Integer.toString(playlistItem));
+                        }
+                        information.put("playlist_item_"+Integer.toString(playlistItem++),
+                                itemname);
+                    }
+                    isItem = false;
+                }
+            } else if (tline.equalsIgnoreCase("<!-- Playlist -->")) {
+                isPlaylist = true;
+            } else if (tline.startsWith("State:")) {
+                information.put("state", tline.substring(6, tline.indexOf('<')).trim());
+            } else if (tline.startsWith("got_")) {
+                final int equals = tline.indexOf('=');
+                
+                information.put(tline.substring(4, equals).trim(),
+                        tline.substring(equals + 1, tline.length() - 1).trim());
+            }
+        }
+    }
+
+}

src/com/dmdirc/addons/mediasource_vlc/plugin.config

@@ -0,0 +1,40 @@
+# This is a DMDirc configuration file.
+
+# This section indicates which sections below take key/value
+# pairs, rather than a simple list. It should be placed above
+# any sections that take key/values.
+keysections:
+  metadata
+  requires
+  updates
+  version
+  defaults
+  icons
+
+metadata:
+  author=Chris <chris@dmdirc.com>
+  mainclass=com.dmdirc.addons.mediasource_vlc.VlcMediaSourcePlugin
+  description=Provides VLC nowplaying information
+  name=vlcmediasource
+  nicename=VLC Media Sources
+
+requires:
+  dmdirc=4641
+
+updates:
+  id=24
+
+version:
+  friendly=0.3
+
+provides:
+  vlc mediasource
+
+required-services:
+  mediasource manager
+
+defaults:
+  host=localhost:8082
+
+icons:
+  category-vlc=plugin://vlcmediasource:com/dmdirc/addons/mediasource_vlc/vlc.png

src/com/dmdirc/addons/mediasource_windows/DllSource.java

@@ -0,0 +1,180 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.mediasource_windows;
+
+import com.dmdirc.addons.nowplaying.MediaSource;
+import com.dmdirc.addons.nowplaying.MediaSourceState;
+
+/**
+ * Uses WindowsMediaSourcePlugin to retrieve now playing info.
+ *
+ * @author Shane
+ */
+public class DllSource implements MediaSource {
+
+    /** Player name */
+    private final String playerName;
+
+    /** Use getArtistTitle */
+    private final boolean useArtistTitle;
+
+    /**
+     * Instantiates the media source.
+     *
+     * @param playerName Name of Player and DLL
+     */
+    public DllSource(final String playerName) {
+        this(playerName, false);
+    }
+
+    /**
+     * Instantiates the media source.
+     *
+     * @param playerName Name of Player and DLL
+     * @param useArtistTitle True if getArtistTitle should be parsed rather than
+     *                       using getArtist() and getTitle()
+     */
+    public DllSource(final String playerName, final boolean useArtistTitle) {
+        this.playerName = playerName;
+        this.useArtistTitle = useArtistTitle;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getAppName() {
+        return playerName;
+    }
+
+    /**
+     * Get the "goodoutput" from GetMediaInfo for the given command
+     *
+     * @param command Command to run
+     * @return "Good" Output
+     */
+    private String getOutput(final String command) {
+        return WindowsMediaSourcePlugin.getOutput(playerName, command).getGoodOutput();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public MediaSourceState getState() {
+        final MediaInfoOutput result = WindowsMediaSourcePlugin.getOutput(playerName, "getPlayState");
+
+        if (result.getExitCode() == 0) {
+            final String output = result.getGoodOutput();
+            if (output.equalsIgnoreCase("stopped")) {
+                return MediaSourceState.STOPPED;
+            } else if (output.equalsIgnoreCase("playing")) {
+                return MediaSourceState.PLAYING;
+            } else if (output.equalsIgnoreCase("paused")) {
+                return MediaSourceState.PAUSED;
+            } else {
+                return MediaSourceState.NOTKNOWN;
+            }
+        } else {
+            return MediaSourceState.CLOSED;
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getArtist() {
+        if (useArtistTitle) {
+            return getOutput("getArtistTitle").split("\\s-\\s", 2)[0];
+        } else {
+            return getOutput("getArtist");
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getTitle() {
+        if (useArtistTitle) {
+            String bits[] = getOutput("getArtistTitle").split("\\s-\\s", 2);
+            return (bits.length > 1) ? bits[1] : "";
+        } else {
+            return getOutput("getTitle");
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getAlbum() {
+        return getOutput("getAlbum");
+    }
+
+    /**
+     * Get the duration in seconds as a string.
+     *
+     * @param secondsInput to get duration for
+     * @return Duration as a string
+     */
+    private String duration(final long secondsInput) {
+        final StringBuilder result = new StringBuilder();
+        final long hours = (secondsInput / 3600);
+        final long minutes = (secondsInput / 60 % 60);
+        final long seconds = (secondsInput % 60);
+
+        if (hours > 0) {
+            result.append(hours + ":");
+        }
+        result.append(String.format("%0,2d:%0,2d", minutes, seconds));
+
+        return result.toString();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getLength() {
+        try {
+            final int seconds = Integer.parseInt(getOutput("getLength"));
+            return duration(seconds);
+        } catch (NumberFormatException nfe) {
+        }
+        return "Unknown";
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getTime() {
+        try {
+            final int seconds = Integer.parseInt(getOutput("getTime"));
+            return duration(seconds);
+        } catch (NumberFormatException nfe) {
+        }
+        return "Unknown";
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getFormat() {
+        return getOutput("getFormat");
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getBitrate() {
+        return getOutput("getBitrate");
+    }
+
+}

src/com/dmdirc/addons/mediasource_windows/MediaInfoOutput.java

@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.mediasource_windows;
+
+/**
+ * Holds Output from GetMediaInfo.exe
+ */
+public class MediaInfoOutput {
+
+    /** Exit Code from GetMediaInfo.exe */
+    private final int exitCode;
+
+    /** Output from GetMediaInfo.exe */
+    private final String output;
+
+    /**
+     * Create a MediaInfoOutput
+     *
+     * @param exitCode Exit code from GetMediaInfo.exe
+     * @param output Output from GetMediaInfo.exe
+     */
+    public MediaInfoOutput(final int exitCode, final String output) {
+        this.exitCode = exitCode;
+        this.output = output;
+    }
+
+    /**
+     * Get the exit code
+     *
+     * @return exit Code
+     */
+    public int getExitCode() {
+        return exitCode;
+    }
+
+    /**
+     * Get the output
+     *
+     * @return output
+     */
+    public String getOutput() {
+        return output;
+    }
+
+    /**
+     * Get the output only if the exitCode was 0, else a blank string.
+     *
+     * @return The output only if the exitCode was 0, else a blank string.
+     */
+    public String getGoodOutput() {
+        return (getExitCode() == 0) ? output : "";
+    }
+
+}

src/com/dmdirc/addons/mediasource_windows/WindowsMediaSourcePlugin.java

@@ -0,0 +1,158 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.mediasource_windows;
+
+import com.dmdirc.Main;
+import com.dmdirc.addons.nowplaying.MediaSource;
+import com.dmdirc.addons.nowplaying.MediaSourceManager;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
+import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.PluginInfo;
+import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.util.resourcemanager.ResourceManager;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.io.File;
+import java.io.IOException;
+
+import com.dmdirc.installer.StreamReader;
+
+/**
+ * Manages all Windows based media sources.
+ */
+public class WindowsMediaSourcePlugin extends Plugin implements MediaSourceManager {
+
+    /** Media sources. */
+    private final List<MediaSource> sources;
+
+    /** Files dir */
+    private static final String filesDir = Main.getConfigDir() + "plugins/windowsmediasource_files/";
+
+    /**
+     * Creates a new instance of DcopMediaSourcePlugin.
+     */
+    public WindowsMediaSourcePlugin() {
+        super();
+        sources = new ArrayList<MediaSource>();
+        sources.add(new DllSource("Winamp", true));
+        sources.add(new DllSource("iTunes", false));
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<MediaSource> getSources() {
+        return sources;
+    }
+
+    /**
+     * Get the output from GetMediaInfo.exe for the given player and method
+     *
+     * @param player Player to ask about
+     * @param method Method to call
+     * @return a MediaInfoOutput with the results
+     */
+    protected static MediaInfoOutput getOutput(final String player, final String method) {
+        try {
+            final Process myProcess = Runtime.getRuntime().exec(new String[]{filesDir + "GetMediaInfo.exe", player, method});
+            final StringBuffer data = new StringBuffer();
+            new StreamReader(myProcess.getErrorStream()).start();
+            new StreamReader(myProcess.getInputStream(), data).start();
+            try {
+                myProcess.waitFor();
+            } catch (InterruptedException e) {
+            }
+
+            return new MediaInfoOutput(myProcess.exitValue(), data.toString());
+        } catch (SecurityException e) {
+        } catch (IOException e) {
+        }
+
+        return new MediaInfoOutput(-1, "Error executing GetMediaInfo.exe");
+    }
+
+    /**
+     * Use the given resource manager to extract files ending with the given suffix
+     *
+     * @param res ResourceManager
+     * @param newDir Directory to extract to.
+     * @param suffix Suffix to extract
+     */
+    private void extractFiles(final ResourceManager res, final File newDir, final String suffix) {
+        final Map<String, byte[]> resources = res.getResourcesEndingWithAsBytes(suffix);
+        for (Entry<String, byte[]> resource : resources.entrySet()) {
+            try {
+                final String key = resource.getKey();
+                final String resourceName = key.substring(key.lastIndexOf('/'), key.length());
+
+                final File newFile = new File(newDir, resourceName);
+
+                if (!newFile.isDirectory()) {
+                    if (newFile.exists()) {
+                        newFile.delete();
+                    }
+                    ResourceManager.getResourceManager().resourceToFile(resource.getValue(), newFile);
+                }
+            } catch (IOException ex) {
+                Logger.userError(ErrorLevel.LOW, "Failed to extract " + suffix + "s for windowsmediasource: " + ex.getMessage(), ex);
+            }
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void onLoad() {
+        // Extract GetMediaInfo.exe and required DLLs
+        final PluginInfo pi = PluginManager.getPluginManager().getPluginInfoByName("windowsmediasource");
+
+        // This shouldn't actually happen, but check to make sure.
+        if (pi == null) {
+            return;
+        }
+
+        // Now get the RM
+        try {
+            final ResourceManager res = pi.getResourceManager();
+
+            // Make sure our files dir exists
+            final File newDir = new File(filesDir);
+            if (!newDir.exists()) {
+                newDir.mkdirs();
+            }
+
+            // Now extract the .dlls and .exe
+            extractFiles(res, newDir, ".dll");
+            extractFiles(res, newDir, ".exe");
+        } catch (IOException ioe) {
+            Logger.userError(ErrorLevel.LOW, "Unable to open ResourceManager for windowsmediasource: " + ioe.getMessage(), ioe);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void onUnload() { /* Do Nothing */ }
+
+}

src/com/dmdirc/addons/mediasource_windows/files/GetMediaInfo.dpr

@@ -0,0 +1,91 @@
+{*
+ * DMDirc - Open Source IRC Client
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ *
+ * This application attempts to load a dll for media source information.
+ * It can be run from the commandline like so:
+ *  - GetMediaInfo.exe winamp getArtist
+ * and it will load the winamp dll and attempt to execute the function "artist"
+ * Any output will be echoed to the command line with an exit code of 0.
+ * An exit code of 1 means there was an error from the DLL
+ * An exit code of 2 means there was an error before the DLL
+ *
+ * Methods are very simple:
+ *   Method: function (data: PChar): integer; stdcall;
+ * A pchar of size 1024 is passed, resulting data should be written to this
+ * pchar inside the dll.
+ * The method should then return either 0 to indicate success, or 1 to indicate
+ * an error. (This will be used as the exit code, and the contents of Data is 
+ * printed to stdout - any returned value > 1 will still give an exitcode of 1)
+ *}
+program GetMediaInfo;
+{$MODE Delphi}
+
+uses Windows, sysutils;
+var
+	I: Integer;
+	Player: String;
+	MethodName: String;
+	DLL: HINST;
+	
+	Method: function (data: PChar): integer; stdcall;
+	Data: PChar;
+begin
+	// By default, assume fail.
+	ExitCode := 2;
+
+	if ParamCount > 1 then begin
+		// Params
+		Player := paramstr(1);
+		MethodName := paramstr(2);
+		
+		// Load the DLL
+		DLL := LoadLibrary(PChar(Player+'.dll'));
+		
+		if DLL <> HINST(0) then begin
+			// DLL Exists and is loaded
+			// Now the actual method we want!
+			Method := GetProcAddress(DLL, PChar(MethodName));
+			if @Method <> nil then begin
+				try
+					GetMem(Data, 1024);
+					I := Method(Data);
+					if I > 1 then I := 1;
+					writeln(Data);
+					ExitCode := I;
+				finally
+					FreeMem(Data);
+				end;
+			end
+			else begin
+				writeln('No Method ('+MethodName+') Found');
+			end;
+		end
+		else begin
+			writeln('No DLL ('+Player+'.dll) Found');
+		end;
+	end
+	else begin
+		writeln('Usage: GetMediaInfo.exe player function');
+		writeln('Example: GetMediaInfo.exe winamp getArtist');
+	end;
+end.

src/com/dmdirc/addons/mediasource_windows/files/itunes.dpr

@@ -0,0 +1,220 @@
+{*
+ * winamp.dpr -> Code for winamp.dll for DMDirc
+ * DMDirc - Open Source IRC Client
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *}
+
+// References:
+// http://www.informit.com/articles/article.aspx?p=130494&seqNum=3
+// http://developer.apple.com/sdk/itunescomsdk.html
+
+library winamp;
+uses
+	windows, messages, SysUtils, Classes, ComObj, ActiveX;
+
+var
+	oldExitProc: Pointer;
+	
+function getITunes(): Variant;
+begin
+	if FindWindow('iTunes', nil) <> 0 then begin
+		Result := CreateOLEObject('iTunes.Application');
+	end
+	else Raise Exception.Create('iTunes is not running');
+end;
+
+// Freepascal sucks.
+// In Delphi I could just do V.Foo to call function Foo, but FPC hasn't added
+// this functionality yet, so yay for horrible callOLEFunction(V, 'Foo'); to
+// do the exact same thing!
+function callOLEFunction(V: IDispatch; S: WideString): Variant;
+const
+	GUID_NULL: TGUID = '{00000000-0000-0000-0000-000000000000}';
+	DEFAULT_PARAMS: TDispParams = ();
+var
+	mres: HRESULT;
+	invres: Variant;
+	id: Integer;
+begin
+	mres := V.GetIDsOfNames(GUID_NULL, @S, 1, locale_system_default, @id);
+	olecheck(mres);
+	mres := V.Invoke(id, GUID_NULL, locale_system_default, DISPATCH_PROPERTYGET, DEFAULT_PARAMS, @invres, nil, nil);
+	olecheck(mres);
+	Result := invres;
+end;
+
+function getPlayState(data: PChar):integer; stdcall;
+var
+	V: Variant;
+	B: array[0..255] of char;
+	state: Integer;
+begin
+  result := 1;
+	try
+		V := getITunes();
+		state := callOLEFunction(V, 'PlayerState');
+		if state = 0 then begin
+			try
+				callOLEFunction(V, 'PlayerPosition');
+				B := 'Paused';
+			except
+				B := 'Stopped';
+			end
+		end
+		else if state = 1 then B := 'Playing';
+		result := 0;
+	except
+		on E : Exception do B:= 'Unable to find iTunes Application ('+E.ClassName+'/'+E.Message+')';
+	end;
+	StrCopy(data,B);
+end;
+
+function getArtist(data: PChar):integer; stdcall;
+var
+	V: Variant;
+	B: array[0..255] of char;
+begin
+  result := 1;
+	try
+		V := getITunes();
+		V := callOLEFunction(V, 'CurrentTrack');
+		B := String(callOLEFunction(V, 'Artist'));
+		result := 0;
+	except
+		on E : Exception do B:= 'Unable to find iTunes Application ('+E.ClassName+'/'+E.Message+')';
+	end;
+	StrCopy(data,B);
+end;
+
+function getTitle(data: PChar):integer; stdcall;
+var
+	V: Variant;
+	B: array[0..255] of char;
+	kind: Integer;
+begin
+  result := 1;
+	try
+		V := getITunes();
+		V := callOLEFunction(V, 'CurrentTrack');
+		kind := callOLEFunction(V, 'Kind');
+		if kind = 3 then begin
+			V := getITunes();
+			B := String(callOLEFunction(V, 'CurrentStreamTitle'));
+		end
+		else begin
+			B := String(callOLEFunction(V, 'Name'));
+		end;
+		result := 0;
+	except
+		on E : Exception do B:= 'Unable to find iTunes Application ('+E.ClassName+'/'+E.Message+')';
+	end;
+	StrCopy(data,B);
+end;
+
+function getAlbum(data: PChar):integer; stdcall;
+var
+	V: Variant;
+	B: array[0..255] of char;
+begin
+  result := 1;
+	try
+		V := getITunes();
+		V := callOLEFunction(V, 'CurrentTrack');
+		B := String(callOLEFunction(V, 'Album'));
+		result := 0;
+	except
+		on E : Exception do B:= 'Unable to find iTunes Application ('+E.ClassName+'/'+E.Message+')';
+	end;
+	StrCopy(data,B);
+end;
+
+function getLength(data: PChar):integer; stdcall;
+var
+	V: Variant;
+	B: array[0..255] of char;
+begin
+  result := 1;
+	try
+		V := getITunes();
+		V := callOLEFunction(V, 'CurrentTrack');
+		B := String(callOLEFunction(V, 'Duration'));
+		result := 0;
+	except
+		on E : Exception do B:= 'Unable to find iTunes Application ('+E.ClassName+'/'+E.Message+')';
+	end;
+	StrCopy(data,B);
+end;
+
+function getTime(data: PChar):integer; stdcall;
+var
+	V: Variant;
+	B: array[0..255] of char;
+begin
+  result := 1;
+	try
+		V := getITunes();
+		B := String(callOLEFunction(V, 'PlayerPosition'));
+		result := 0;
+	except
+		on E : Exception do B:= 'Unable to find iTunes Application ('+E.ClassName+'/'+E.Message+')';
+	end;
+	StrCopy(data,B);
+end;
+
+function getFormat(data: PChar):integer; stdcall;
+var
+	B: array[0..255] of char;
+begin
+	Result := 0;
+	B := 'Unknown';
+	StrCopy(data,B);
+end;
+
+function getBitrate(data: PChar):integer; stdcall;
+var
+	V: Variant;
+	B: array[0..255] of char;
+begin
+  result := 1;
+	try
+		V := getITunes();
+		V := callOLEFunction(V, 'CurrentTrack');
+		B := String(callOLEFunction(V, 'BitRate'));
+		result := 0;
+	except
+		on E : Exception do B:= 'Unable to find iTunes Application ('+E.ClassName+'/'+E.Message+')';
+	end;
+	StrCopy(data,B);
+end;
+
+exports getPlayState, getArtist, getTitle, getAlbum, getLength, getTime, getFormat, getBitrate;
+
+procedure myExitProc;
+begin
+	CoUnInitialize();
+	ExitProc := oldExitProc;
+end; 
+
+begin
+	CoInitialize(nil);
+	oldExitProc := ExitProc;
+	ExitProc := @myExitProc;
+end.

src/com/dmdirc/addons/mediasource_windows/files/prePackage.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+# Check if there have been any changes to these files from the svn version
+CHANGES=`svn status | grep -v ?`
+
+compile() {
+	# Is there any changes to this file?
+	THISCHANGES=`echo ${CHANGES} | grep ${1}`
+	
+	# Compile if the output doesn't exist, or the local version differs from SVN
+	if [ ! -e ${2} -o "" != "${THISCHANGES}" ]; then
+		echo "	Compiling: ${1} -> ${2}"
+		fpc -Sd -Twin32 ${1} >/dev/null 2>&1
+		if [ $? -ne 0 ]; then
+			echo "		Failed"
+		fi;
+		rm -Rf *.o
+	fi;
+}
+
+compile "itunes.dpr" "itunes.dll"
+compile "winamp.dpr" "winamp.dll"
+compile "GetMediaInfo.dpr" "GetMediaInfo.exe"

src/com/dmdirc/addons/mediasource_windows/files/winamp.dpr

@@ -0,0 +1,222 @@
+{*
+ * winamp.dpr -> Code for winamp.dll for DMDirc
+ * DMDirc - Open Source IRC Client
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *}
+
+// References:
+// http://krizzprograming.blogspot.com/2007/08/controlling-winamp-programmatically.html
+// http://forums.winamp.com/showthread.php?threadid=85389
+
+library winamp;
+uses
+  windows, messages, SysUtils, Classes;
+  
+function VirtualFreeEx(hProcess:HANDLE; lpAddress:LPVOID; dwSize:DWORD ; dwFreeType : DWORD):WINBOOL; external 'kernel32' name 'VirtualFreeEx';
+function VirtualAllocEx(hProcess:HANDLE; lpAddress:LPVOID; dwSize:SIZE_T ; flAllocationType : DWORD;  flProtect : DWORD):POINTER; external 'kernel32' name 'VirtualAllocEx';
+
+type
+	extendedFileInfoStruct = packed record
+		filename: pchar;
+		metadata: pchar;
+		ret: pchar;
+		retlen: integer;
+	end;
+
+
+const
+	WM_WINAMP = WM_USER;
+
+function getPlayState(data: PChar):integer; stdcall;
+var
+	hand: THandle;
+	res: LongInt;
+	B: array[0..255] of char;
+begin
+	result := 1;
+	B := 'Error finding window';
+	hand := FindWindow('Winamp v1.x', nil);
+	if hand <> 0 then begin
+		B := 'Error getting data';
+		result := 0;
+		res := SendMessage(hand, WM_WINAMP, 0, 104);
+		if res = 1 then B := 'Playing'
+		else if res = 3 then B := 'Paused'
+		else B := 'Stopped';
+		StrCopy(data,B);
+	end;
+end;
+
+function getArtistTitle(data: PChar):integer; stdcall;
+var
+	hand: THandle;
+	B: array[0..255] of char;
+	tempHand: THandle;
+	memLoc: LongInt;
+	temp: LongWord;
+begin
+	result := 1;
+	B := 'Error finding window';
+	hand := FindWindow('Winamp v1.x', nil);
+	if hand <> 0 then begin
+		B := 'Error getting data';
+		result := 0;
+		memLoc := SendMessage(hand, WM_WINAMP, 0, 125); // Get number of current track
+		memLoc := SendMessage(hand, WM_WINAMP, memLoc, 212); // And now its name
+		GetWindowThreadProcessId(hand, @tempHand);
+		hand := OpenProcess(PROCESS_ALL_ACCESS, False, tempHand);
+		ReadProcessMemory(hand, Pointer(memLoc), @B, sizeof(B)-1, temp);
+		CloseHandle(hand);
+		StrCopy(data,B);
+	end;
+end;
+
+function getMetaData(metadata: PChar): PChar;
+var
+	hand: THandle;
+	readhand: THandle;
+	B: array[0..255] of char;
+	C: array[0..255] of char;
+	tempHand: THandle;
+	memPtr: Pointer;
+	memLoc: LongInt;
+	temp: LongWord;
+	extinfo: extendedFileInfoStruct;
+begin
+	B := '';
+	C := '';
+	Result := '';
+	hand := FindWindow('Winamp v1.x', nil);
+	if hand <> 0 then begin
+		memLoc := SendMessage(hand, WM_WINAMP, 0, 125); // Get number of current track
+		memLoc := SendMessage(hand, WM_WINAMP, memLoc, 211); // And now its filename
+		GetWindowThreadProcessId(hand, @tempHand);
+		
+		readhand := OpenProcess(PROCESS_ALL_ACCESS, False, tempHand);
+		ReadProcessMemory(readhand, Pointer(memLoc), @C, sizeof(C)-1, temp);
+		
+		extinfo.filename := C;
+		extinfo.metadata := metadata;
+		extinfo.ret := B;
+		extinfo.retlen := sizeof(B)-1;
+
+		// This doesn't actually work yet :/
+		// memPtr is nil
+		memPtr := VirtualAllocEx(tempHand, nil, 2048, MEM_COMMIT or MEM_RESERVE, PAGE_READWRITE);
+		if memPtr <> nil then begin
+			WriteProcessMemory(readhand, memPtr, (@extinfo), sizeof(extendedFileInfoStruct), temp);
+			SendMessage(readhand, WM_WINAMP, LongInt(memPtr), 290);
+		end;
+		
+		StrCopy(Result, B);
+		
+		if memPtr <> nil then begin
+			VirtualFreeEx(readhand, memPtr, 0, MEM_RELEASE);
+		end;
+		CloseHandle(readhand);
+	end;
+end;
+
+function getArtist(data: PChar):integer; stdcall;
+var
+	B: PChar;
+begin
+	B := getMetaData('artist');
+	StrCopy(data,B);
+	if (B <> '') then Result := 0 else Result := 1;
+end;
+
+function getTitle(data: PChar):integer; stdcall;
+var
+	B: PChar;
+begin
+	B := getMetaData('title');
+	StrCopy(data,B);
+	if (B <> '') then Result := 0 else Result := 1;
+end;
+
+function getAlbum(data: PChar):integer; stdcall;
+var
+	B: PChar;
+begin
+	B := getMetaData('album');
+	StrCopy(data,B);
+	if (B <> '') then Result := 0 else Result := 1;
+end;
+
+function getLength(data: PChar):integer; stdcall;
+var
+	hand: THandle;
+	res: LongInt;
+begin
+	result := 1;
+	StrCopy(data, 'Error finding window');
+	hand := FindWindow('Winamp v1.x', nil);
+	if hand <> 0 then begin
+		result := 0;
+		res := SendMessage(hand, WM_WINAMP, 1, 105);
+		StrCopy(data, PChar(inttostr(res)));
+	end;
+end;
+
+function getTime(data: PChar):integer; stdcall;
+var
+	hand: THandle;
+	res: LongInt;
+begin
+	result := 1;
+	StrCopy(data, 'Error finding window');
+	hand := FindWindow('Winamp v1.x', nil);
+	if hand <> 0 then begin
+		result := 0;
+		res := SendMessage(hand, WM_WINAMP, 0, 105);
+		StrCopy(data, PChar(inttostr(res div 1000)));
+	end;
+end;
+
+function getFormat(data: PChar):integer; stdcall;
+var
+	B: array[0..255] of char;
+begin
+	Result := 0;
+	B := 'Unknown';
+	StrCopy(data,B);
+end;
+
+function getBitrate(data: PChar):integer; stdcall;
+var
+	hand: THandle;
+	res: LongInt;
+begin
+	result := 1;
+	StrCopy(data, 'Error finding window');
+	hand := FindWindow('Winamp v1.x', nil);
+	if hand <> 0 then begin
+		result := 0;
+		res := SendMessage(hand, WM_WINAMP, 1, 126);
+		StrCopy(data, PChar(inttostr(res)));
+	end;
+end;
+
+exports getPlayState, getArtistTitle, getArtist, getTitle, getAlbum, getLength, getTime, getFormat, getBitrate;
+
+begin
+end.

src/com/dmdirc/addons/mediasource_windows/plugin.config

@@ -0,0 +1,34 @@
+# This is a DMDirc configuration file.
+
+# This section indicates which sections below take key/value
+# pairs, rather than a simple list. It should be placed above
+# any sections that take key/values.
+keysections:
+  metadata
+  requires
+  updates
+  version
+
+metadata:
+  author=Shane Mc Cormack <shane@dmdirc.com>
+  mainclass=com.dmdirc.addons.mediasource_windows.WindowsMediaSourcePlugin
+  description=Provides windows media sources for the now playing plugin
+  name=windowsmediasource
+  nicename=Windows Media Sources
+
+requires:
+  os=.*windows.*
+
+updates:
+  id=30
+
+version:
+  friendly=0.2
+
+provides:
+  winamp mediasource
+  itunes mediasource
+
+required-services:
+  mediasource manager
+#  windows os

src/com/dmdirc/addons/nickcolours/ColourRenderer.java

@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.nickcolours;
+
+import com.dmdirc.ui.messages.ColourManager;
+
+import java.awt.Color;
+import java.awt.Component;
+import javax.swing.JTable;
+import javax.swing.border.LineBorder;
+import javax.swing.table.DefaultTableCellRenderer;
+
+/**
+ * Provides a colour renderer for JTables.
+ *
+ * @author Chris
+ */
+public class ColourRenderer extends DefaultTableCellRenderer {
+    
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
+    private static final long serialVersionUID = 1;
+    
+    /**
+     * Creates a new instance of ColourRenderer.
+     */
+    public ColourRenderer() {
+        super();
+        
+        setOpaque(true);
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public Component getTableCellRendererComponent(final JTable table,
+            final Object value, final boolean isSelected,
+            final boolean hasFocus, final int row, final int column) {
+        Color colour = null;
+        if (value != null && !((String) value).isEmpty()) {
+            colour = ColourManager.parseColour((String) value, null);
+        }
+        
+        setHorizontalAlignment(CENTER);
+        
+        if (colour == null) {
+            setBorder(new LineBorder(Color.GRAY));
+            setText("Not Set");
+            setBackground(table.getBackground());
+        } else {
+            setBorder(new LineBorder(Color.BLACK));
+            setText("");
+            setBackground(colour);
+        }
+        
+        return this;
+    }
+    
+}

src/com/dmdirc/addons/nickcolours/NickColourInputDialog.java

@@ -0,0 +1,183 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.nickcolours;
+
+import com.dmdirc.Main;
+import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
+import com.dmdirc.addons.ui_swing.components.colours.ColourChooser;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JTextField;
+import javax.swing.WindowConstants;
+
+import net.miginfocom.swing.MigLayout;
+
+/**
+ * New nick colour input dialog.
+ */
+public class NickColourInputDialog extends StandardDialog
+        implements ActionListener {
+    
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
+    private static final long serialVersionUID = 1;
+    
+    /** Whether or not this is a new entry (as opposed to editing an old one). */
+    private boolean isnew;
+    /** The row we're editing, if this isn't a new entry. */
+    private int row;
+    
+    /** The NickColourPanel we're reporting to. */
+    private final NickColourPanel panel;
+    
+    /** nickname textfield. */
+    private JTextField nickname;
+    /** network textfield. */
+    private JTextField network;
+    /** text colour input. */
+    private ColourChooser textColour;
+    /** nicklist colour input. */
+    private ColourChooser nicklistColour;
+    
+    /**
+     * Creates a new instance of NickColourInputDialog.
+     *
+     * @param panel The panel that's opening this dialog
+     * @param row The row of the table we're editing
+     * @param nickname The nickname that's currently set
+     * @param network The network that's currently set
+     * @param textcolour The text colour that's currently set
+     * @param nickcolour The nicklist colour that's currently set
+     */
+    public NickColourInputDialog(final NickColourPanel panel, final int row,
+            final String nickname, final String network,
+            final String textcolour, final String nickcolour) {
+        super((MainFrame) Main.getUI().getMainWindow(), false);
+        
+        this.panel = panel;
+        this.row = row;
+        
+        setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+        
+        initComponents(nickname, network, textcolour, nickcolour);
+        initListeners();
+        layoutComponents();
+        
+        setTitle("Nick colour editor");
+        display();
+    }
+    
+    /**
+     * Creates a new instance of NickColourInputDialog.
+     *
+     * @param panel The panel that's opening this dialog
+     */
+    public NickColourInputDialog(final NickColourPanel panel) {
+        this(panel, -1, "", "", "", "");
+        
+        isnew = true;
+    }
+    
+    /**
+     * Initialises the components.
+     *
+     * @param defaultNickname The default value for the nickname text field
+     * @param defaultNetwork The default value for the network text field
+     * @param defaultTextColour The default value for the text colour option
+     * @param defaultNickColour The default value for the nick colour option
+     */
+    private void initComponents(final String defaultNickname,
+            final String defaultNetwork, final String defaultTextColour,
+            final String defaultNickColour) {        
+        orderButtons(new JButton(), new JButton());
+        
+        nickname = new JTextField(defaultNickname);
+        network = new JTextField(defaultNetwork);
+        textColour = new ColourChooser(defaultTextColour, true, true);
+        nicklistColour = new ColourChooser(defaultNickColour, true, true);
+    }
+    
+    /** Initialises the listeners. */
+    private void initListeners() {
+        getOkButton().addActionListener(this);
+        getCancelButton().addActionListener(this);
+    }
+    
+    /** Lays out the components. */
+    private void layoutComponents() {        
+        setLayout(new MigLayout("wrap 2"));
+        
+        add(new JLabel("Nickname: "));
+        add(nickname, "growx");
+        
+        add(new JLabel("Network: "));
+        add(network, "growx");
+        
+        add(new JLabel("Text colour: "));
+        add(textColour, "growx");
+        
+        add(new JLabel("Nicklist colour: "));
+        add(nicklistColour, "growx");
+        
+        add(getLeftButton(), "right");
+        add(getRightButton(), "right");
+        
+        pack();
+    }
+    
+    /** 
+     * {@inheritDoc} 
+     * 
+     * @param e Action event
+     */
+    @Override
+    public void actionPerformed(final ActionEvent e) {
+        if (e.getSource() == getOkButton()) {
+            saveSettings();
+        }
+        dispose();
+    }
+    
+    /** Saves settings. */
+    public void saveSettings() {
+        final String myNetwork = network.getText().toLowerCase();
+        final String myNickname = nickname.getText().toLowerCase();
+        final String myTextColour = textColour.getColour();
+        final String myNickColour = nicklistColour.getColour();
+        
+        if (!isnew) {
+            panel.removeRow(row);
+        }
+        
+        panel.addRow(myNetwork, myNickname, myTextColour, myNickColour);
+    }
+    
+}

src/com/dmdirc/addons/nickcolours/NickColourPanel.java

@@ -0,0 +1,245 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.nickcolours;
+
+import com.dmdirc.addons.ui_swing.dialogs.prefs.SwingPreferencesDialog;
+import com.dmdirc.config.IdentityManager;
+import com.dmdirc.config.prefs.PreferencesInterface;
+
+import java.awt.Color;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Vector;
+
+import javax.swing.JButton;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableCellRenderer;
+
+import net.miginfocom.swing.MigLayout;
+
+/**
+ * Panel used for the custom nick colour settings component in the plugin's
+ * config dialog.
+ *
+ * @author Chris
+ */
+public class NickColourPanel extends JPanel implements ActionListener,
+        PreferencesInterface, ListSelectionListener {
+
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
+    private static final long serialVersionUID = 1;
+    /** The table used for displaying the options. */
+    private final JTable table;
+    /** The plugin we're associated with. */
+    private final transient NickColourPlugin plugin;
+    /** The table headings. */
+    private static final String[] headers = {"Network", "Nickname",
+        "Text colour", "Nicklist colour"};
+
+    /** Edit and delete buttons. */
+    private final JButton editButton, deleteButton;
+
+    /**
+     * Creates a new instance of NickColourPanel.
+     * 
+     * @param plugin The plugin that owns this panel
+     */
+    public NickColourPanel(final NickColourPlugin plugin) {
+        super();
+
+        this.plugin = plugin;
+
+        final Object[][] data = plugin.getData();
+
+        table = new JTable(new DefaultTableModel(data, headers)) {
+
+            /**
+             * A version number for this class. It should be changed whenever the class
+             * structure is changed (or anything else that would prevent serialized
+             * objects being unserialized with the new class).
+             */
+            private static final long serialVersionUID = 1;
+            /** The colour renderer we're using for colour cells. */
+            private final ColourRenderer colourRenderer = new ColourRenderer();
+
+            /** {@inheritDoc} */
+            @Override
+            public TableCellRenderer getCellRenderer(final int row,
+                    final int column) {
+                if (column == 2 || column == 3) {
+                    return colourRenderer;
+                } else {
+                    return super.getCellRenderer(row, column);
+                }
+            }
+
+            /** {@inheritDoc} */
+            @Override
+            public boolean isCellEditable(final int row, final int column) {
+                return false;
+            }
+        };
+
+        final JScrollPane scrollPane = new JScrollPane(table);
+
+        table.getSelectionModel().addListSelectionListener(this);
+        table.setFillsViewportHeight(true);
+        table.setDefaultRenderer(Color.class, new ColourRenderer());
+
+        setLayout(new MigLayout("ins 0, fill, h " +
+                SwingPreferencesDialog.CLIENT_HEIGHT));
+        add(scrollPane, "grow, wrap, spanx, hmax 100%");
+
+        final JButton addButton = new JButton("Add");
+        addButton.addActionListener(this);
+        add(addButton, "sg button, growx, pushx");
+
+        editButton = new JButton("Edit");
+        editButton.addActionListener(this);
+        add(editButton, "sg button, growx, pushx");
+
+        deleteButton = new JButton("Delete");
+        deleteButton.addActionListener(this);
+        add(deleteButton, "sg button, growx, pushx");
+
+        editButton.setEnabled(false);
+        deleteButton.setEnabled(false);
+    }
+
+    /** 
+     * {@inheritDoc}
+     * 
+     * @param e Action event
+     */
+    @Override
+    public void actionPerformed(final ActionEvent e) {
+        final DefaultTableModel model = ((DefaultTableModel) table.getModel());
+
+        if (e.getActionCommand().equals("Add")) {
+            new NickColourInputDialog(this);
+        } else if (e.getActionCommand().equals("Edit")) {
+            final int row = table.getSelectedRow();
+
+            final String network = (String) model.getValueAt(row, 0);
+            final String nickname = (String) model.getValueAt(row, 1);
+
+            String textcolour = (String) model.getValueAt(row, 2);
+            String nickcolour = (String) model.getValueAt(row, 3);
+
+            if (textcolour == null) {
+                textcolour = "";
+            }
+
+            if (nickcolour == null) {
+                nickcolour = "";
+            }
+
+            new NickColourInputDialog(this, row, nickname, network, textcolour,
+                    nickcolour);
+        } else if (e.getActionCommand().equals("Delete")) {
+            final int row = table.getSelectedRow();
+
+            if (row > -1) {
+                model.removeRow(row);
+            }
+        }
+    }
+
+    /**
+     * Removes a row from the table.
+     * 
+     * @param row The row to be removed
+     */
+    void removeRow(final int row) {
+        ((DefaultTableModel) table.getModel()).removeRow(row);
+    }
+
+    /**
+     * Adds a row to the table.
+     * 
+     * @param network The network setting
+     * @param nickname The nickname setting
+     * @param textcolour The textpane colour setting
+     * @param nickcolour The nick list colour setting
+     */
+    void addRow(final String network, final String nickname,
+            final String textcolour, final String nickcolour) {
+        final DefaultTableModel model = ((DefaultTableModel) table.getModel());
+        model.addRow(new Object[]{network, nickname, textcolour, nickcolour});
+    }
+
+    /**
+     * Retrieves the current data in use by this panel.
+     * 
+     * @return This panel's current data.
+     */
+    List<Object[]> getData() {
+        final List<Object[]> res = new ArrayList<Object[]>();
+        final DefaultTableModel model = ((DefaultTableModel) table.getModel());
+
+        for (Object row : model.getDataVector()) {
+            final Vector vrow = (Vector) row;
+
+            res.add(new Object[]{vrow.elementAt(0), vrow.elementAt(1), vrow.
+                        elementAt(2), vrow.elementAt(3)});
+        }
+
+        return res;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void save() {
+        // Remove all old config entries
+        for (Object[] parts : plugin.getData()) {
+            IdentityManager.getConfigIdentity().unsetOption(
+                    plugin.getDomain(), "color:" + parts[0] + ":" + parts[1]);
+        }
+
+        // And write the new ones
+        for (Object[] row : getData()) {
+            IdentityManager.getConfigIdentity().setOption(plugin.getDomain(),
+                    "color:" + row[0] + ":" + row[1], row[2] + ":" + row[3]);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void valueChanged(ListSelectionEvent e) {
+        boolean enable = table.getSelectedRow() > -1 && table.getModel().getRowCount() > 0;
+
+        editButton.setEnabled(enable);
+        deleteButton.setEnabled(enable);
+    }
+}

src/com/dmdirc/addons/nickcolours/NickColourPlugin.java

@@ -0,0 +1,269 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.nickcolours;
+
+import com.dmdirc.Channel;
+import com.dmdirc.ChannelClientProperty;
+import com.dmdirc.actions.ActionManager;
+import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.config.IdentityManager;
+import com.dmdirc.config.prefs.PreferencesCategory;
+import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.config.prefs.PreferencesSetting;
+import com.dmdirc.config.prefs.PreferencesType;
+import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.parser.interfaces.ChannelInfo;
+import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.plugins.Plugin;
+import com.dmdirc.ui.messages.ColourManager;
+
+import java.awt.Color;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Provides various features related to nickname colouring.
+ *
+ * @author chris
+ */
+public final class NickColourPlugin extends Plugin implements ActionListener {
+    
+    /** "Random" colours to use to colour nicknames. */
+    private String[] randColours = new String[] {
+        "E90E7F", "8E55E9", "B30E0E", "18B33C",
+        "58ADB3", "9E54B3", "B39875", "3176B3",
+    };
+    
+    /** Creates a new instance of NickColourPlugin. */
+    public NickColourPlugin() {
+        super();
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public void processEvent(final ActionType type, final StringBuffer format,
+            final Object... arguments) {
+        if (type.equals(CoreActionType.CHANNEL_GOTNAMES)) {
+            final ChannelInfo chanInfo = ((Channel) arguments[0]).getChannelInfo();
+            final String network = ((Channel) arguments[0]).getServer().getNetwork();
+            
+            for (ChannelClientInfo client : chanInfo.getChannelClients()) {
+                colourClient(network, client);
+            }
+        } else if (type.equals(CoreActionType.CHANNEL_JOIN)) {
+            final String network = ((Channel) arguments[0]).getServer().getNetwork();
+            
+            colourClient(network, (ChannelClientInfo) arguments[1]);
+        }
+    }
+    
+    /**
+     * Colours the specified client according to the user's config.
+     *
+     * @param network The network to use for the colouring
+     * @param client The client to be coloured
+     */
+    private void colourClient(final String network, final ChannelClientInfo client) {
+        final Map map = client.getMap();
+        final ClientInfo myself = client.getClient().getParser().getLocalClient();
+        final String nickOption1 = "color:"
+                + client.getClient().getParser().getStringConverter().toLowerCase(network + ":" + client.getClient().getNickname());
+        final String nickOption2 = "color:"
+                + client.getClient().getParser().getStringConverter().toLowerCase("*:" + client.getClient().getNickname());
+        
+        if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "useowncolour")
+                && client.getClient().equals(myself)) {
+            final Color color = ColourManager.parseColour(
+                    IdentityManager.getGlobalConfig().getOption(getDomain(), "owncolour"));
+            putColour(map, color, color);
+        }  else if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "userandomcolour")) {
+            putColour(map, getColour(client.getClient().getNickname()), getColour(client.getClient().getNickname()));
+        }
+        
+        String[] parts = null;
+                
+        if (IdentityManager.getGlobalConfig().hasOptionString(getDomain(), nickOption1)) {
+            parts = getParts(nickOption1);
+        } else if (IdentityManager.getGlobalConfig().hasOptionString(getDomain(), nickOption2)) {
+            parts = getParts(nickOption2);
+        }
+        
+        if (parts != null) {
+            Color textColor = null;
+            Color nickColor = null;
+            
+            if (parts[0] != null) {
+                textColor = ColourManager.parseColour(parts[0], null);
+            }
+            if (parts[1] != null) {
+                nickColor = ColourManager.parseColour(parts[1], null);
+            }
+            
+            putColour(map, textColor, nickColor);
+        }
+    }
+    
+    /**
+     * Puts the specified colour into the given map. The keys are determined
+     * by config settings.
+     *
+     * @param map The map to use
+     * @param textColour Text colour to be inserted
+     * @param nickColour Nick colour to be inserted
+     */
+    @SuppressWarnings("unchecked")
+    private void putColour(final Map map, final Color textColour, final Color nickColour) {
+        if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "settext")
+                && textColour != null) {
+            map.put(ChannelClientProperty.TEXT_FOREGROUND, textColour);
+        }
+        
+        if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "setnicklist")
+                && nickColour != null) {
+            map.put(ChannelClientProperty.NICKLIST_FOREGROUND, nickColour);
+        }
+    }
+    
+    /**
+     * Retrieves a pseudo-random colour for the specified nickname.
+     *
+     * @param nick The nickname of the client whose colour we're determining
+     * @return Colour of the specified nickname
+     */
+    private Color getColour(final String nick) {
+        int count = 0;
+        
+        for (int i = 0; i < nick.length(); i++) {
+            count += nick.charAt(i);
+        }
+        
+        count = count % randColours.length;
+        
+        return ColourManager.parseColour(randColours[count]);
+    }
+    
+    /**
+     * Reads the nick colour data from the config.
+     *
+     * @return A multi-dimensional array of nick colour info.
+     */
+    public Object[][] getData() {
+        final List<Object[]> data = new ArrayList<Object[]>();
+        
+        for (String key : IdentityManager.getGlobalConfig().getOptions(getDomain()).keySet()) {
+            if (key.startsWith("color:")) {
+                final String network = key.substring(6, key.indexOf(':', 6));
+                final String user = key.substring(1 + key.indexOf(':', 6));
+                final String[] parts = getParts(key);
+                
+                
+                data.add(new Object[]{network, user, parts[0], parts[1]});
+            }
+        }
+        
+        final Object[][] res = new Object[data.size()][4];
+        
+        int i = 0;
+        for (Object[] row : data) {
+            res[i] = row;
+            
+            i++;
+        }
+        
+        return res;
+    }
+    
+    /**
+     * Retrieves the config option with the specified key, and returns an
+     * array of the colours that should be used for it.
+     * 
+     * @param key The config key to look up
+     * @return The colours specified by the given key
+     */
+    private String[] getParts(final String key) {
+        String[] parts = IdentityManager.getGlobalConfig().getOption(getDomain(), key).split(":");
+        
+        if (parts.length == 0) {
+            parts = new String[]{null, null};
+        } else if (parts.length == 1) {
+            parts = new String[]{parts[0], null};
+        }
+        
+        return parts;
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public void onLoad() {
+        if (IdentityManager.getGlobalConfig().hasOptionString(getDomain(), "randomcolours")) {
+            randColours = IdentityManager.getGlobalConfig().getOptionList(getDomain(), "randomcolours").toArray(new String[0]);
+        }
+        
+        ActionManager.addListener(this, CoreActionType.CHANNEL_GOTNAMES,
+                CoreActionType.CHANNEL_JOIN);
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public void onUnload() {
+        ActionManager.removeListener(this);
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public void showConfig(final PreferencesManager manager) {
+        final PreferencesCategory general = new PreferencesCategory("Nick Colours",
+                "General configuration for NickColour plugin.");
+        final PreferencesCategory colours = new PreferencesCategory("Colours",
+                "Set colours for specific nicknames.", new NickColourPanel(this));
+        
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                "ui", "shownickcoloursintext", "Show colours in text" +
+                "area", "Colour nicknames in main text area?"));
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                "ui", "shownickcoloursinnicklist", "Show colours in" +
+                " nick list", "Colour nicknames in channel nick lists?"));
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "settext", "Set colours in textarea",
+                "Should the plugin set the textarea colour of nicks?"));
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "setnicklist", "Set colours in nick list",
+                "Should the plugin set the nick list colour of nicks?"));
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "userandomcolour", "Use random colour",
+                "Use a pseudo-random colour for each person?"));
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "useowncolour", "Use colour for own nick",
+                "Always use the same colour for our own nickname?"));
+        general.addSetting(new PreferencesSetting(PreferencesType.COLOUR,
+                getDomain(), "owncolour", "Colour to use for own nick",
+                "Colour used for our own nickname, if above setting is enabled."));        
+
+        general.addSubCategory(colours);
+        manager.getCategory("Plugins").addSubCategory(general);
+    }
+    
+}

src/com/dmdirc/addons/nickcolours/package-info.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * Plugin to colourise nicks.
+ */
+package com.dmdirc.addons.nickcolours;

src/com/dmdirc/addons/nickcolours/plugin.config

@@ -0,0 +1,40 @@
+# This is a DMDirc configuration file.
+
+# This section indicates which sections below take key/value
+# pairs, rather than a simple list. It should be placed above
+# any sections that take key/values.
+keysections:
+  metadata
+  updates
+  requires
+  defaults
+  version
+
+metadata:
+  author=Chris <chris@dmdirc.com>
+  mainclass=com.dmdirc.addons.nickcolours.NickColourPlugin
+  description=Provides various nick colouring tools
+  name=nickcolour
+  nicename=Nick Colour Plugin
+
+updates:
+  id=12
+
+requires:
+  parent=ui_swing
+
+version:
+  friendly=0.7
+
+persistent:
+
+provides:
+
+required-services:
+
+defaults:
+  useowncolour=false
+  owncolour=ff0000
+  userandomcolour=false
+  settext=false
+  setnicklist=false

src/com/dmdirc/addons/nowplaying/ConfigPanel.java

@@ -0,0 +1,309 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.nowplaying;
+
+import com.dmdirc.config.IdentityManager;
+import com.dmdirc.config.prefs.PreferencesInterface;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
+import com.dmdirc.addons.ui_swing.components.reorderablelist.ReorderableJList;
+
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import javax.swing.BorderFactory;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextField;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+
+import net.miginfocom.swing.MigLayout;
+
+/**
+ * Now playing plugin config panel.
+ */
+public class ConfigPanel extends JPanel implements PreferencesInterface,
+        KeyListener {
+
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
+    private static final long serialVersionUID = 1;
+    /** Media source order list. */
+    private ReorderableJList list;
+    /** Media sources. */
+    private final List<String> sources;
+    /** The plugin that owns this panel. */
+    private final NowPlayingPlugin plugin;
+    /** Text field for our setting. */
+    private JTextField textfield;
+    /** Panel that the preview is in. */
+    private JPanel previewPanel;
+    /** Label for previews. */
+    private TextLabel preview;
+    /** Update timer. */
+    private Timer updateTimer;
+
+    /**
+     * Creates a new instance of ConfigPanel.
+     *
+     * @param plugin The plugin that owns this panel
+     * @param sources A list of sources to be used in the panel
+     */
+    public ConfigPanel(final NowPlayingPlugin plugin, final List<String> sources) {
+        super();
+
+        if (sources == null) {
+            this.sources = new LinkedList<String>();
+        } else {
+            this.sources = new LinkedList<String>(sources);
+        }
+        this.plugin = plugin;
+
+        initComponents();
+    }
+
+    /**
+     * Initialises the components.
+     */
+    private void initComponents() {
+        list = new ReorderableJList();
+
+        for (String source : sources) {
+            list.getModel().addElement(source);
+        }
+
+        textfield = new JTextField(IdentityManager.getGlobalConfig().getOption(
+                plugin.getDomain(), "format"));
+        textfield.addKeyListener(this);
+        preview = new TextLabel("Preview:\n");
+
+        setLayout(new MigLayout("fillx, ins 0"));
+
+        JPanel panel = new JPanel();
+
+        panel.setBorder(BorderFactory.createTitledBorder(UIManager.getBorder(
+                "TitledBorder.border"), "Source order"));
+        panel.setLayout(new MigLayout("fillx, ins 5"));
+
+        panel.add(new JLabel("Drag and drop items to reorder"), "wrap");
+        panel.add(new JScrollPane(list), "growx");
+
+        add(panel, "growx, wrap");
+
+        panel = new JPanel();
+
+        panel.setBorder(BorderFactory.createTitledBorder(UIManager.getBorder(
+                "TitledBorder.border"), "Output format"));
+        panel.setLayout(new MigLayout("fillx, ins 5"));
+
+        panel.add(textfield, "span, growx, wrap");
+        panel.add(preview, "span, grow, wrap, gaptop 10");
+        add(panel, "growx, wrap");
+
+        previewPanel = panel;
+
+        add(new NowPlayingSubsitutionPanel(Arrays.asList(new String[]{"app",
+                    "title", "artist", "album", "bitrate", "format", "length",
+                    "time",
+                    "state"})), "growx");
+        schedulePreviewUpdate();
+    }
+
+    /**
+     * Updates the preview text.
+     */
+    private void updatePreview() {
+        updateTimer.cancel();
+
+        MediaSource source = plugin.getBestSource();
+
+        if (source == null) {
+            source = new DummyMediaSource();
+        }
+
+        preview.setText("Preview:\n" + plugin.doSubstitution(textfield.getText(),
+                source));
+        preview.repaint();
+
+        SwingUtilities.invokeLater(new Runnable() {
+
+            @Override
+            public void run() {
+                previewPanel.revalidate();
+                revalidate();
+            }
+        });
+    }
+
+    /**
+     * Retrieves the (new) source order from this config panel.
+     *
+     * @return An ordered list of sources
+     */
+    public List<String> getSources() {
+        final List<String> newSources = new LinkedList<String>();
+
+        final Enumeration<?> values = list.getModel().elements();
+
+        while (values.hasMoreElements()) {
+            newSources.add((String) values.nextElement());
+        }
+
+        return newSources;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void save() {
+        plugin.saveSettings(getSources());
+        IdentityManager.getConfigIdentity().setOption(plugin.getDomain(),
+                "format", textfield.getText());
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param e Key event action
+     */
+    @Override
+    public void keyTyped(final KeyEvent e) {
+        // Do nothing
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param e Key event action
+     */
+    @Override
+    public void keyPressed(final KeyEvent e) {
+        // Do nothing
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param e Key event action
+     */
+    @Override
+    public void keyReleased(final KeyEvent e) {
+        schedulePreviewUpdate();
+    }
+
+    /**
+     * Schedules an update to the preview text.
+     */
+    private void schedulePreviewUpdate() {
+        if (updateTimer != null) {
+            updateTimer.cancel();
+        }
+
+        updateTimer = new Timer("Nowplaying config timer");
+        updateTimer.schedule(new TimerTask() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                try {
+                    updatePreview();
+                } catch (Throwable ex) {
+                    Logger.appError(ErrorLevel.MEDIUM,
+                            "Error when updating nowplaying preview", ex);
+                }
+            }
+        }, 500);
+    }
+
+    /**
+     * A dummy media source for use in previews.
+     */
+    private class DummyMediaSource implements MediaSource {
+
+        /** {@inheritDoc} */
+        @Override
+        public MediaSourceState getState() {
+            return MediaSourceState.PLAYING;
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public String getAppName() {
+            return "MyProgram";
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public String getArtist() {
+            return "The Artist";
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public String getTitle() {
+            return "Song about nothing";
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public String getAlbum() {
+            return "Album 45";
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public String getLength() {
+            return "3:45";
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public String getTime() {
+            return "1:20";
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public String getFormat() {
+            return "flac";
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public String getBitrate() {
+            return "128";
+        }
+    }
+
+}

src/com/dmdirc/addons/nowplaying/MediaSource.java

@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.nowplaying;
+
+/**
+ * The media source describes one source of "now playing" information
+ * (i.e., one method of getting information from one media player).
+ * 
+ * @author chris
+ */
+public interface MediaSource {
+    /**
+     * Get the state of this media source
+     *
+     * @return State for this media source.
+     * @since 0.6.3m1
+     */
+    MediaSourceState getState();
+    
+    /**
+     * Retrieves the name of the application that this source is for.
+     * 
+     * @return This source's application name
+     */
+    String getAppName();
+    
+    /**
+     * Retrieves the artist of the curently loaded track.
+     *
+     * @return Current track artist
+     */
+    String getArtist();
+    
+    /**
+     * Retrieves the title of the currently loaded track.
+     *
+     * @return Current track title
+     */
+    String getTitle();
+    
+    /**
+     * Retrieves the album of the currently loaded track.
+     *
+     * @return Current track album
+     */
+    String getAlbum();
+    
+    /**
+     * Retrieves the length of the currently loaded track ([h:]mm:ss).
+     *
+     * @return Current track length
+     */
+    String getLength();
+    
+    /**
+     * Retrieves the time of the currently loaded track ([h:]mm:ss).
+     *
+     * @return Current track time
+     */
+    String getTime();
+    
+    /**
+     * Retrives the format of the currently loaded track.
+     *
+     * @return Current track format
+     */
+    String getFormat();
+    
+    /**
+     * Retrieves the bitrate of the currently loaded track.
+     *
+     * @return Current track bitrate
+     */
+    String getBitrate();
+
+}

src/com/dmdirc/addons/nowplaying/MediaSourceComparator.java

@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.nowplaying;
+
+import java.io.Serializable;
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * Sorts media sources according to an ordered list of their names.
+ *
+ * @author chris
+ */
+public class MediaSourceComparator implements Comparator<MediaSource>, Serializable {
+    
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
+    private static final long serialVersionUID = 1;
+    
+    /** The order that the sources should be checked. */
+    private final List<String> order;
+    
+    /**
+     * Creates a new instance of MediaSourceComparator.
+     * NB: The order list may be altered during comparisons.
+     *
+     * @param order An ordered list of media source names
+     */
+    public MediaSourceComparator(final List<String> order) {
+        this.order = order;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int compare(final MediaSource o1, final MediaSource o2) {
+        return getPosition(o1) - getPosition(o2);
+    }
+    
+    /**
+     * Retrieves the position of the source within the order list.
+     * If the source is not present it is appended to the list.
+     *
+     * @param source The media source to be tested
+     */
+    private int getPosition(final MediaSource source) {
+        if (!order.contains(source.getAppName())) {
+            order.add(source.getAppName());
+        }
+        
+        return order.indexOf(source.getAppName());
+    }
+    
+}

src/com/dmdirc/addons/nowplaying/MediaSourceManager.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.nowplaying;
+
+import java.util.List;
+
+/**
+ * The media source manager is a standard interface for an object that controls
+ * one or more media sources.
+ * 
+ * @author chris
+ */
+public interface MediaSourceManager {
+    
+    /**
+     * Retrieves the sources that this manager manages.
+     * 
+     * @return A list of sources that this manager manages
+     */
+    List<MediaSource> getSources();
+    
+}

src/com/dmdirc/addons/nowplaying/MediaSourceState.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.nowplaying;
+
+/**
+ * The state of a media source.
+ *
+ * @author Shane McCormack
+ * @since 0.6.3m1
+ */
+public enum MediaSourceState {
+	/** Media Source is closed. */
+	CLOSED ("Closed"),
+	/** Media Source is stopped. */
+	STOPPED ("Stopped"),
+	/** Media Source is paused. */
+	PAUSED ("Paused"),
+	/** Media Source is playing. */
+	PLAYING ("Playing"),
+	/** Media Source is giving an unknown state. */
+	NOTKNOWN ("Unknown");
+	
+	/** Nice name for this state. */
+	final String niceName;
+	
+	/**
+	 * Create a new MediaSourceState
+	 *
+	 * @param niceName Nice name for this state.
+	 */
+	MediaSourceState(final String niceName) {
+		this.niceName = niceName;
+	}
+	
+	/**
+	 * Get the nice name for this state.
+     *
+     * @return This state's nice name
+	 */
+	public String getNiceName() {
+		return niceName;
+	}
+}