Merge branch 'master' of git://github.com/peterix/MultiMC5

Conflicts:
	CMakeLists.txt
	main.cpp

2 files changed, 344 insertions, 0 deletions

diff --git a/data/minecraftprocess.cpp b/data/minecraftprocess.cpp
new file mode 100644
index 00000000..d08b767c
--- /dev/null
+++ b/data/minecraftprocess.cpp
@@ -0,0 +1,246 @@
+/* Copyright 2013 MultiMC Contributors
+ *
+ * Authors: Orochimarufan <orochimarufan.x3@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "minecraftprocess.h"
+
+#include <QDataStream>
+#include <QFile>
+#include <QDir>
+#include <QImage>
+#include <QProcessEnvironment>
+
+#include "instance.h"
+
+#include "osutils.h"
+#include "pathutils.h"
+
+#define LAUNCHER_FILE "MultiMCLauncher.jar"
+#define IBUS "@im=ibus"
+
+// commandline splitter
+QStringList MinecraftProcess::splitArgs(QString args)
+{
+    QStringList argv;
+    QString current;
+    bool escape = false;
+    QChar inquotes;
+    for (int i=0; i<args.length(); i++)
+    {
+        QChar cchar = args.at(i);
+
+        // \ escaped
+        if (escape) {
+            current += cchar;
+            escape = false;
+        // in "quotes"
+        } else if (!inquotes.isNull()) {
+            if (cchar == 0x5C)
+                escape = true;
+            else if (cchar == inquotes)
+                inquotes = 0;
+            else
+                current += cchar;
+        // otherwise
+        } else {
+            if (cchar == 0x20) {
+                if (!current.isEmpty()) {
+                    argv << current;
+                    current.clear();
+                }
+            } else if (cchar == 0x22 || cchar == 0x27)
+                inquotes = cchar;
+            else
+                current += cchar;
+        }
+    }
+    if (!current.isEmpty())
+        argv << current;
+    return argv;
+}
+
+// prepare tools
+inline void MinecraftProcess::extractIcon(InstancePtr inst, QString destination)
+{
+    QImage(":/icons/instances/" + inst->iconKey()).save(destination);
+}
+
+inline void MinecraftProcess::extractLauncher(QString destination)
+{
+    QFile(":/launcher/launcher.jar").copy(destination);
+}
+
+void MinecraftProcess::prepare(InstancePtr inst)
+{
+    extractLauncher(PathCombine(inst->minecraftDir(), LAUNCHER_FILE));
+    extractIcon(inst, PathCombine(inst->minecraftDir(), "icon.png"));
+}
+
+// constructor
+MinecraftProcess::MinecraftProcess(InstancePtr inst, QString user, QString session, ConsoleWindow *console) :
+    m_instance(inst), m_user(user), m_session(session), m_console(console)
+{
+    connect(this, SIGNAL(finished(int, QProcess::ExitStatus)), SLOT(finish(int, QProcess::ExitStatus)));
+
+    // prepare the process environment
+    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+
+#ifdef LINUX
+    // Strip IBus
+    if (env.value("XMODIFIERS").contains(IBUS))
+        env.insert("XMODIFIERS", env.value("XMODIFIERS").replace(IBUS, ""));
+#endif
+
+    // export some infos
+    env.insert("INST_NAME", inst->name());
+    env.insert("INST_ID", inst->id());
+    env.insert("INST_DIR", QDir(inst->rootDir()).absolutePath());
+
+    this->setProcessEnvironment(env);
+    m_prepostlaunchprocess.setProcessEnvironment(env);
+
+    // set the cwd
+    QDir mcDir(inst->minecraftDir());
+    this->setWorkingDirectory(mcDir.absolutePath());
+    m_prepostlaunchprocess.setWorkingDirectory(mcDir.absolutePath());
+
+    // std channels
+    connect(this, SIGNAL(readyReadStandardError()), SLOT(on_stdErr()));
+    connect(this, SIGNAL(readyReadStandardOutput()), SLOT(on_stdOut()));
+}
+
+// console window
+void MinecraftProcess::on_stdErr()
+{
+    if (m_console != nullptr)
+        m_console->write(readAllStandardError(), ConsoleWindow::ERROR);
+}
+
+void MinecraftProcess::on_stdOut()
+{
+    if (m_console != nullptr)
+        m_console->write(readAllStandardOutput(), ConsoleWindow::DEFAULT);
+}
+
+void MinecraftProcess::log(QString text)
+{
+    if (m_console != nullptr)
+        m_console->write(text);
+    else
+        qDebug(qPrintable(text));
+}
+
+// exit handler
+void MinecraftProcess::finish(int code, ExitStatus status)
+{
+    if (status != NormalExit)
+    {
+        //TODO: error handling
+    }
+
+    log("Minecraft exited.");
+
+    m_prepostlaunchprocess.processEnvironment().insert("INST_EXITCODE", QString(code));
+
+    // run post-exit
+    if (!m_instance->getPostExitCommand().isEmpty())
+    {
+        m_prepostlaunchprocess.start(m_instance->getPostExitCommand());
+        m_prepostlaunchprocess.waitForFinished();
+        if (m_prepostlaunchprocess.exitStatus() != NormalExit)
+        {
+            //TODO: error handling
+        }
+    }
+
+    if (m_console != nullptr)
+        m_console->setMayClose(true);
+
+    emit ended();
+}
+
+void MinecraftProcess::launch()
+{
+    if (!m_instance->getPreLaunchCommand().isEmpty())
+    {
+        m_prepostlaunchprocess.start(m_instance->getPreLaunchCommand());
+        m_prepostlaunchprocess.waitForFinished();
+        if (m_prepostlaunchprocess.exitStatus() != NormalExit)
+        {
+            //TODO: error handling
+            return;
+        }
+    }
+
+    m_instance->setLastLaunch();
+
+    prepare(m_instance);
+
+    genArgs();
+
+    log(QString("Minecraft folder is: '%1'").arg(workingDirectory()));
+    log(QString("Instance launched with arguments: '%1'").arg(m_arguments.join("' '")));
+
+    start(m_instance->getJavaPath(), m_arguments);
+    if (!waitForStarted())
+    {
+        //TODO: error handling
+    }
+
+    if(m_console != nullptr)
+        m_console->setMayClose(false);
+}
+
+void MinecraftProcess::genArgs()
+{
+    // start fresh
+    m_arguments.clear();
+
+    // window size
+    QString windowSize;
+    if (m_instance->getLaunchMaximized())
+        windowSize = "max";
+    else
+        windowSize = QString("%1x%2").arg(m_instance->getMinecraftWinWidth()).arg(m_instance->getMinecraftWinHeight());
+
+    // window title
+    QString windowTitle;
+    windowTitle.append("MultiMC: ").append(m_instance->name());
+
+    // Java arguments
+    m_arguments.append(splitArgs(m_instance->getJvmArgs()));
+
+#ifdef OSX
+    // OSX dock icon and name
+    m_arguments << "-Xdock:icon=icon.png";
+    m_arguments << QString("-Xdock:name=\"%1\"").arg(windowTitle);
+#endif
+
+    // lwjgl
+    QString lwjgl = m_instance->lwjglVersion();
+    if (lwjgl != "Mojang")
+        lwjgl = QDir(settings->getLWJGLDir() + "/" + lwjgl).absolutePath();
+
+    // launcher arguments
+    m_arguments << QString("-Xms%1m").arg(m_instance->getMinMemAlloc());
+    m_arguments << QString("-Xmx%1m").arg(m_instance->getMaxMemAlloc());
+    m_arguments << "-jar" << LAUNCHER_FILE;
+    m_arguments << m_user;
+    m_arguments << m_session;
+    m_arguments << windowTitle;
+    m_arguments << windowSize;
+    m_arguments << lwjgl;
+}
diff --git a/data/minecraftprocess.h b/data/minecraftprocess.h
new file mode 100644
index 00000000..bede9486
--- /dev/null
+++ b/data/minecraftprocess.h
@@ -0,0 +1,98 @@
+/* Copyright 2013 MultiMC Contributors
+ *
+ * Authors: Orochimarufan <orochimarufan.x3@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef MINECRAFTPROCESS_H
+#define MINECRAFTPROCESS_H
+
+#include <QProcess>
+
+#include "gui/consolewindow.h"
+
+#include "instance.h"
+
+/**
+ * @file data/minecraftprocess.h
+ * @brief The MinecraftProcess class
+ */
+class MinecraftProcess : public QProcess
+{
+    Q_OBJECT
+public:
+    /**
+     * @brief MinecraftProcess constructor
+     * @param inst the Instance pointer to launch
+     * @param user the minecraft username
+     * @param session the minecraft session id
+     * @param console the instance console window
+     */
+    MinecraftProcess(InstancePtr inst, QString user, QString session, ConsoleWindow *console);
+
+    /**
+     * @brief launch minecraft
+     */
+    void launch();
+
+    /**
+     * @brief extract the instance icon
+     * @param inst the instance
+     * @param destination the destination path
+     */
+    static inline void extractIcon(InstancePtr inst, QString destination);
+
+    /**
+     * @brief extract the MultiMC launcher.jar
+     * @param destination the destination path
+     */
+    static inline void extractLauncher(QString destination);
+
+    /**
+     * @brief prepare the launch by extracting icon and launcher
+     * @param inst the instance
+     */
+    static void prepare(InstancePtr inst);
+
+    /**
+     * @brief split a string into argv items like a shell would do
+     * @param args the argument string
+     * @return a QStringList containing all arguments
+     */
+    static QStringList splitArgs(QString args);
+
+signals:
+    /**
+     * @brief emitted when mc has finished and the PostLaunchCommand was run
+     */
+    void ended();
+
+protected:
+    ConsoleWindow *m_console;
+    InstancePtr m_instance;
+    QString m_user;
+    QString m_session;
+    QProcess m_prepostlaunchprocess;
+    QStringList m_arguments;
+
+    void genArgs();
+    void log(QString text);
+
+protected slots:
+    void finish(int, QProcess::ExitStatus status);
+    void on_stdErr();
+    void on_stdOut();
+
+};
+
+#endif // MINECRAFTPROCESS_H