Shuffling files around.

src/xenia/app/emulator_window.cc

@@ -0,0 +1,227 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2015 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#include "xenia/app/emulator_window.h"
+
+#include "xenia/base/clock.h"
+#include "xenia/base/logging.h"
+#include "xenia/base/platform.h"
+#include "xenia/base/threading.h"
+#include "xenia/gpu/graphics_system.h"
+#include "xenia/emulator.h"
+#include "xenia/profiling.h"
+
+namespace xe {
+namespace app {
+
+using xe::ui::KeyEvent;
+using xe::ui::MenuItem;
+using xe::ui::MouseEvent;
+using xe::ui::UIEvent;
+
+const std::wstring kBaseTitle = L"xenia";
+
+EmulatorWindow::EmulatorWindow(Emulator* emulator)
+    : emulator_(emulator),
+      loop_(ui::Loop::Create()),
+      window_(ui::Window::Create(loop_.get(), kBaseTitle)) {}
+
+EmulatorWindow::~EmulatorWindow() = default;
+
+std::unique_ptr<EmulatorWindow> EmulatorWindow::Create(Emulator* emulator) {
+  std::unique_ptr<EmulatorWindow> emulator_window(new EmulatorWindow(emulator));
+
+  emulator_window->loop()->PostSynchronous([&emulator_window]() {
+    xe::threading::set_name("Win32 Loop");
+    xe::Profiler::ThreadEnter("Win32 Loop");
+
+    if (!emulator_window->Initialize()) {
+      XEFATAL("Failed to initialize main window");
+      exit(1);
+    }
+  });
+
+  return emulator_window;
+}
+
+bool EmulatorWindow::Initialize() {
+  if (!window_->Initialize()) {
+    XELOGE("Failed to initialize platform window");
+    return false;
+  }
+
+  UpdateTitle();
+
+  window_->on_closed.AddListener([this](UIEvent& e) {
+    loop_->Quit();
+
+    // TODO(benvanik): proper exit.
+    XELOGI("User-initiated death!");
+    exit(1);
+  });
+  loop_->on_quit.AddListener([this](UIEvent& e) { window_.reset(); });
+
+  window_->on_key_down.AddListener([this](KeyEvent& e) {
+    bool handled = true;
+    switch (e.key_code()) {
+      case 0x0D: {  // numpad enter
+        CpuTimeScalarReset();
+      } break;
+      case 0x6D: {  // numpad minus
+        CpuTimeScalarSetHalf();
+      } break;
+      case 0x6B: {  // numpad plus
+        CpuTimeScalarSetDouble();
+      } break;
+
+      case 0x73: {  // VK_F4
+        GpuTraceFrame();
+      } break;
+      case 0x74: {  // VK_F5
+        GpuClearCaches();
+      } break;
+
+      case 0x7A: {  // VK_F11
+        ToggleFullscreen();
+      } break;
+      case 0x1B: {  // VK_ESCAPE
+                    // Allow users to escape fullscreen (but not enter it).
+        if (window_->is_fullscreen()) {
+          window_->ToggleFullscreen(false);
+        }
+      } break;
+
+      case 0x70: {  // VK_F1
+        ShowHelpWebsite();
+      } break;
+
+      default: { handled = false; } break;
+    }
+    e.set_handled(handled);
+  });
+
+  // Main menu.
+  // FIXME: This code is really messy.
+  auto main_menu = MenuItem::Create(MenuItem::Type::kNormal);
+  auto file_menu = MenuItem::Create(MenuItem::Type::kPopup, L"&File");
+  {
+    file_menu->AddChild(MenuItem::Create(MenuItem::Type::kString, L"E&xit",
+                                         L"Alt+F4",
+                                         [this]() { window_->Close(); }));
+  }
+  main_menu->AddChild(std::move(file_menu));
+
+  // CPU menu.
+  auto cpu_menu = MenuItem::Create(MenuItem::Type::kPopup, L"&CPU");
+  {
+    cpu_menu->AddChild(MenuItem::Create(
+        MenuItem::Type::kString, L"&Reset Time Scalar", L"Numpad Enter",
+        std::bind(&EmulatorWindow::CpuTimeScalarReset, this)));
+    cpu_menu->AddChild(MenuItem::Create(
+        MenuItem::Type::kString, L"Time Scalar /= 2", L"Numpad -",
+        std::bind(&EmulatorWindow::CpuTimeScalarSetHalf, this)));
+    cpu_menu->AddChild(MenuItem::Create(
+        MenuItem::Type::kString, L"Time Scalar *= 2", L"Numpad +",
+        std::bind(&EmulatorWindow::CpuTimeScalarSetDouble, this)));
+  }
+  cpu_menu->AddChild(MenuItem::Create(MenuItem::Type::kSeparator));
+  {
+    cpu_menu->AddChild(MenuItem::Create(MenuItem::Type::kString,
+                                        L"Toggle Profiler &Display", L"Tab",
+                                        []() { Profiler::ToggleDisplay(); }));
+    cpu_menu->AddChild(MenuItem::Create(MenuItem::Type::kString,
+                                        L"&Pause/Resume Profiler", L"`",
+                                        []() { Profiler::TogglePause(); }));
+  }
+  main_menu->AddChild(std::move(cpu_menu));
+
+  // GPU menu.
+  auto gpu_menu = MenuItem::Create(MenuItem::Type::kPopup, L"&GPU");
+  {
+    gpu_menu->AddChild(
+        MenuItem::Create(MenuItem::Type::kString, L"&Trace Frame", L"F4",
+                         std::bind(&EmulatorWindow::GpuTraceFrame, this)));
+  }
+  gpu_menu->AddChild(MenuItem::Create(MenuItem::Type::kSeparator));
+  {
+    gpu_menu->AddChild(
+        MenuItem::Create(MenuItem::Type::kString, L"&Clear Caches", L"F5",
+                         std::bind(&EmulatorWindow::GpuClearCaches, this)));
+  }
+  main_menu->AddChild(std::move(gpu_menu));
+
+  // Window menu.
+  auto window_menu = MenuItem::Create(MenuItem::Type::kPopup, L"&Window");
+  {
+    window_menu->AddChild(
+        MenuItem::Create(MenuItem::Type::kString, L"&Fullscreen", L"F11",
+                         std::bind(&EmulatorWindow::ToggleFullscreen, this)));
+  }
+  main_menu->AddChild(std::move(window_menu));
+
+  // Help menu.
+  auto help_menu = MenuItem::Create(MenuItem::Type::kPopup, L"&Help");
+  {
+    help_menu->AddChild(
+        MenuItem::Create(MenuItem::Type::kString, L"&Website...", L"F1",
+                         std::bind(&EmulatorWindow::ShowHelpWebsite, this)));
+    help_menu->AddChild(MenuItem::Create(
+        MenuItem::Type::kString, L"&About...",
+        [this]() { LaunchBrowser("http://xenia.jp/about/"); }));
+  }
+  main_menu->AddChild(std::move(help_menu));
+
+  window_->set_main_menu(std::move(main_menu));
+
+  window_->Resize(1280, 720);
+
+  return true;
+}
+
+void EmulatorWindow::CpuTimeScalarReset() {
+  Clock::set_guest_time_scalar(1.0);
+  UpdateTitle();
+}
+
+void EmulatorWindow::CpuTimeScalarSetHalf() {
+  Clock::set_guest_time_scalar(Clock::guest_time_scalar() / 2.0);
+  UpdateTitle();
+}
+
+void EmulatorWindow::CpuTimeScalarSetDouble() {
+  Clock::set_guest_time_scalar(Clock::guest_time_scalar() * 2.0);
+  UpdateTitle();
+}
+
+void EmulatorWindow::GpuTraceFrame() {
+  emulator()->graphics_system()->RequestFrameTrace();
+}
+
+void EmulatorWindow::GpuClearCaches() {
+  emulator()->graphics_system()->ClearCaches();
+}
+
+void EmulatorWindow::ToggleFullscreen() {
+  window_->ToggleFullscreen(!window_->is_fullscreen());
+}
+
+void EmulatorWindow::ShowHelpWebsite() { LaunchBrowser("http://xenia.jp"); }
+
+void EmulatorWindow::UpdateTitle() {
+  std::wstring title(kBaseTitle);
+  if (Clock::guest_time_scalar() != 1.0) {
+    title += L" (@";
+    title += xe::to_wstring(std::to_string(Clock::guest_time_scalar()));
+    title += L"x)";
+  }
+  window_->set_title(title);
+}
+
+}  // namespace app
+}  // namespace xe

src/xenia/app/emulator_window.h

@@ -0,0 +1,59 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2015 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#ifndef XENIA_APP_EMULATOR_WINDOW_H_
+#define XENIA_APP_EMULATOR_WINDOW_H_
+
+#include <memory>
+
+#include "xenia/ui/loop.h"
+#include "xenia/ui/menu_item.h"
+#include "xenia/ui/window.h"
+#include "xenia/xbox.h"
+
+namespace xe {
+class Emulator;
+}  // namespace xe
+
+namespace xe {
+namespace app {
+
+class EmulatorWindow {
+ public:
+  virtual ~EmulatorWindow();
+
+  static std::unique_ptr<EmulatorWindow> Create(Emulator* emulator);
+
+  Emulator* emulator() const { return emulator_; }
+  ui::Loop* loop() const { return loop_.get(); }
+  ui::Window* window() const { return window_.get(); }
+
+ private:
+  explicit EmulatorWindow(Emulator* emulator);
+
+  bool Initialize();
+  void UpdateTitle();
+
+  void CpuTimeScalarReset();
+  void CpuTimeScalarSetHalf();
+  void CpuTimeScalarSetDouble();
+  void GpuTraceFrame();
+  void GpuClearCaches();
+  void ToggleFullscreen();
+  void ShowHelpWebsite();
+
+  Emulator* emulator_;
+  std::unique_ptr<ui::Loop> loop_;
+  std::unique_ptr<ui::Window> window_;
+};
+
+}  // namespace app
+}  // namespace xe
+
+#endif  // XENIA_APP_EMULATOR_WINDOW_H_

src/xenia/app/main_resources.rc

@@ -0,0 +1,5 @@
+//{{NO_DEPENDENCIES}}
+
+#include "third_party\\elemental-forms\\resources.rc"
+
+//IDR_xe_ui_main_resources_skin_bg_tile_png                                   RCDATA ".\\resources\\skin\\bg_tile.png"

src/xenia/app/xenia_main.cc

@@ -0,0 +1,104 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2013 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#include <gflags/gflags.h>
+
+#include "xenia/app/emulator_window.h"
+#include "xenia/base/logging.h"
+#include "xenia/base/main.h"
+#include "xenia/emulator.h"
+#include "xenia/kernel/kernel.h"
+#include "xenia/profiling.h"
+#include "xenia/ui/file_picker.h"
+
+DEFINE_string(target, "", "Specifies the target .xex or .iso to execute.");
+
+namespace xe {
+namespace app {
+
+int xenia_main(std::vector<std::wstring>& args) {
+  Profiler::Initialize();
+  Profiler::ThreadEnter("main");
+
+  // Create the emulator but don't initialize so we can setup the window.
+  auto emulator = std::make_unique<Emulator>(L"");
+
+  // Main emulator display window.
+  auto emulator_window = EmulatorWindow::Create(emulator.get());
+
+  // Setup and initialize all subsystems. If we can't do something
+  // (unsupported system, memory issues, etc) this will fail early.
+  X_STATUS result = emulator->Setup(emulator_window->window());
+  if (XFAILED(result)) {
+    XELOGE("Failed to setup emulator: %.8X", result);
+    return 1;
+  }
+
+  // Grab path from the flag or unnamed argument.
+  std::wstring path;
+  if (!FLAGS_target.empty() || args.size() >= 2) {
+    if (!FLAGS_target.empty()) {
+      // Passed as a named argument.
+      // TODO(benvanik): find something better than gflags that supports
+      // unicode.
+      path = xe::to_wstring(FLAGS_target);
+    } else {
+      // Passed as an unnamed argument.
+      path = args[1];
+    }
+  }
+
+  // If no path passed, ask the user.
+  if (path.empty()) {
+    auto file_picker = xe::ui::FilePicker::Create();
+    file_picker->set_mode(ui::FilePicker::Mode::kOpen);
+    file_picker->set_type(ui::FilePicker::Type::kFile);
+    file_picker->set_multi_selection(false);
+    file_picker->set_title(L"Select Content Package");
+    file_picker->set_extensions({
+        {L"Supported Files", L"*.iso;*.xex;*.xcp;*.*"},
+        {L"Disc Image (*.iso)", L"*.iso"},
+        {L"Xbox Executable (*.xex)", L"*.xex"},
+        //{ L"Content Package (*.xcp)", L"*.xcp" },
+        {L"All Files (*.*)", L"*.*"},
+    });
+    if (file_picker->Show(emulator->display_window()->native_handle())) {
+      auto selected_files = file_picker->selected_files();
+      if (!selected_files.empty()) {
+        path = selected_files[0];
+      }
+    }
+  }
+
+  if (!path.empty()) {
+    // Normalize the path and make absolute.
+    std::wstring abs_path = xe::to_absolute_path(path);
+
+    result = emulator->LaunchPath(abs_path);
+    if (XFAILED(result)) {
+      XELOGE("Failed to launch target: %.8X", result);
+      return 1;
+    }
+
+    // Wait until we are exited.
+    emulator->display_window()->loop()->AwaitQuit();
+  }
+
+  emulator.reset();
+  emulator_window.reset();
+
+  Profiler::Dump();
+  Profiler::Shutdown();
+  return 0;
+}
+
+}  // namespace app
+}  // namespace xe
+
+DEFINE_ENTRY_POINT(L"xenia", L"xenia some.xex", xe::app::xenia_main);