Update to v094r29 release.

byuu says: Note: for Windows users, please go to nall/intrinsics.hpp line 60 and correct the typo from "DISPLAY_WINDOW" to "DISPLAY_WINDOWS" before compiling, otherwise things won't work at all. This will be a really major WIP for the core SNES emulation, so please test as thoroughly as possible. I rewrote the 65816 CPU core's dispatcher from a jump table to a switch table. This was so that I could pass class variables as parameters to opcodes without crazy theatrics. With that, I killed the regs.r[N] stuff, the flag_t operator|=, &=, ^= stuff, and all of the template versions of opcodes. I also removed some stupid pointless flag tests in xcn and pflag that would always be true. I sure hope that AWJ is happy with this; because this change was so that my flag assignments and branch tests won't need to build regs.P into a full 8-bit variable anymore. It does of course incur a slight performance hit when you pass in variables by-value to functions, but it should help with binary size (and thus cache) by reducing a lot of extra functions. (I know I could have used template parameters for some things even with a switch table, but chose not to for the aforementioned reasons.) Overall, it's about a ~1% speedup from the previous build. The CPU core instructions were never a bottleneck, but I did want to fix the P flag building stuff because that really was a dumb mistake v_v'
2025-08-31 19:51:52 +02:00 · 2015-06-22 23:31:49 +10:00
parent e0815b55b9
commit 83f684c66c
52 changed files with 1151 additions and 1033 deletions
--- a/hiro/gtk/application.cpp
+++ b/hiro/gtk/application.cpp
@@ -2,15 +2,15 @@

 namespace hiro {

-#if defined(PLATFORM_XORG)
+#if defined(DISPLAY_XORG)
 XlibDisplay* pApplication::display = nullptr;
 #endif

 void pApplication::run() {
  if(Application::state.onMain) {
-    while(Application::state.quit == false) {
-      processEvents();
+    while(!Application::state.quit) {
      Application::doMain();
+      processEvents();
    }
  } else {
    gtk_main();
@@ -29,7 +29,7 @@ void pApplication::quit() {
  //if gtk_main() was invoked, call gtk_main_quit()
  if(gtk_main_level()) gtk_main_quit();

-  #if defined(PLATFORM_XORG)
+  #if defined(DISPLAY_XORG)
  //todo: Keyboard::poll() is being called after Application::quit();
  //so if display is closed; this causes a segfault
  //XCloseDisplay(display);
@@ -38,7 +38,7 @@ void pApplication::quit() {
 }

 void pApplication::initialize() {
-  #if defined(PLATFORM_XORG)
+  #if defined(DISPLAY_XORG)
  display = XOpenDisplay(nullptr);
  #endif

@@ -69,7 +69,7 @@ void pApplication::initialize() {
  g_type_class_unref(g_type_class_ref(GTK_TYPE_BUTTON));
  g_object_set(gtkSettings, "gtk-button-images", true, nullptr);

-  #if defined(PLATFORM_WINDOWS)
+  #if defined(DISPLAY_WINDOWS)
  //there is a serious bug in GTK 2.24 for Windows with the "ime" (Windows IME) input method:
  //by default, it will be impossible to type in text fields at all.
  //there are various tricks to get around this; but they are unintuitive and unreliable.
--- a/hiro/gtk/application.hpp
+++ b/hiro/gtk/application.hpp
@@ -3,7 +3,7 @@
 namespace hiro {

 struct pApplication {
-  #if defined(PLATFORM_XORG)
+  #if defined(DISPLAY_XORG)
  static XlibDisplay* display;
  #endif

--- a/hiro/gtk/desktop.cpp
+++ b/hiro/gtk/desktop.cpp
@@ -10,13 +10,13 @@ Size pDesktop::size() {
 }

 Geometry pDesktop::workspace() {
-  #if defined(PLATFORM_WINDOWS)
+  #if defined(DISPLAY_WINDOWS)
  RECT rc;
  SystemParametersInfo(SPI_GETWORKAREA, 0, &rc, 0);
  return {rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top};
  #endif

-  #if defined(PLATFORM_XORG)
+  #if defined(DISPLAY_XORG)
  XlibDisplay* display = XOpenDisplay(nullptr);
  int screen = DefaultScreen(display);

--- a/hiro/gtk/header.hpp
+++ b/hiro/gtk/header.hpp
@@ -1,4 +1,4 @@
-#if defined(PLATFORM_WINDOWS)
+#if defined(DISPLAY_WINDOWS)
  #define UNICODE
  #define WINVER 0x0601
  #define _WIN32_WINNT WINVER
@@ -20,15 +20,15 @@
  #include <gdk/gdkkeysyms.h>
  #include <gtk/gtk.h>
  #if defined(Hiro_SourceEdit)
-  #include <gtksourceview/gtksourceview.h>
-  #include <gtksourceview/gtksourcelanguagemanager.h>
-  #include <gtksourceview/gtksourcestyleschememanager.h>
+    #include <gtksourceview/gtksourceview.h>
+    #include <gtksourceview/gtksourcelanguagemanager.h>
+    #include <gtksourceview/gtksourcestyleschememanager.h>
  #endif
  #include <nall/windows/registry.hpp>
  #include <nall/windows/utf8.hpp>
 #endif

-#if defined(PLATFORM_XORG)
+#if defined(DISPLAY_XORG)
  #include <nall/xorg/guard.hpp>
  #include <X11/Xatom.h>
  #include <cairo.h>
@@ -37,9 +37,9 @@
  #include <gdk/gdkkeysyms.h>
  #include <gtk/gtk.h>
  #if defined(Hiro_SourceEdit)
-  #include <gtksourceview/gtksourceview.h>
-  #include <gtksourceview/gtksourcelanguagemanager.h>
-  #include <gtksourceview/gtksourcestyleschememanager.h>
+    #include <gtksourceview/gtksourceview.h>
+    #include <gtksourceview/gtksourcelanguagemanager.h>
+    #include <gtksourceview/gtksourcestyleschememanager.h>
  #endif
  #include <nall/xorg/guard.hpp>
 #endif
--- a/hiro/gtk/keyboard.cpp
+++ b/hiro/gtk/keyboard.cpp
@@ -5,7 +5,7 @@ namespace hiro {
 auto pKeyboard::poll() -> vector<bool> {
  vector<bool> result;
  char state[256];
-  #if defined(PLATFORM_XORG)
+  #if defined(DISPLAY_XORG)
  XQueryKeymap(pApplication::display, state);
  #endif
  for(auto& code : settings->keycodes) {
@@ -16,7 +16,7 @@ auto pKeyboard::poll() -> vector<bool> {

 auto pKeyboard::pressed(unsigned code) -> bool {
  char state[256];
-  #if defined(PLATFORM_XORG)
+  #if defined(DISPLAY_XORG)
  XQueryKeymap(pApplication::display, state);
  #endif
  return _pressed(state, code);
@@ -26,12 +26,12 @@ auto pKeyboard::_pressed(const char* state, uint16_t code) -> bool {
  uint8_t lo = code >> 0;
  uint8_t hi = code >> 8;

-  #if defined(PLATFORM_WINDOWS)
+  #if defined(DISPLAY_WINDOWS)
  if(lo && GetAsyncKeyState(lo) & 0x8000) return true;
  if(hi && GetAsyncKeyState(hi) & 0x8000) return true;
  #endif

-  #if defined(PLATFORM_XORG)
+  #if defined(DISPLAY_XORG)
  if(lo && state[lo >> 3] & (1 << (lo & 7))) return true;
  if(hi && state[hi >> 3] & (1 << (hi & 7))) return true;
  #endif
@@ -223,7 +223,7 @@ auto pKeyboard::_translate(unsigned code) -> signed {

 auto pKeyboard::initialize() -> void {
  auto append = [](unsigned lo, unsigned hi = 0) {
-    #if defined(PLATFORM_XORG)
+    #if defined(DISPLAY_XORG)
    lo = lo ? (uint8_t)XKeysymToKeycode(pApplication::display, lo) : 0;
    hi = hi ? (uint8_t)XKeysymToKeycode(pApplication::display, hi) : 0;
    #endif
@@ -232,11 +232,11 @@ auto pKeyboard::initialize() -> void {

  #define map(name, ...) if(key == name) { append(__VA_ARGS__); continue; }
  for(auto& key : Keyboard::keys) {
-    #if defined(PLATFORM_WINDOWS)
+    #if defined(DISPLAY_WINDOWS)
      #include <hiro/platform/windows/keyboard.hpp>
    #endif

-    #if defined(PLATFORM_XORG)
+    #if defined(DISPLAY_XORG)
      #include <hiro/platform/xorg/keyboard.hpp>
    #endif

--- a/hiro/gtk/mouse.cpp
+++ b/hiro/gtk/mouse.cpp
@@ -3,13 +3,13 @@
 namespace hiro {

 auto pMouse::position() -> Position {
-  #if defined(PLATFORM_WINDOWS)
-  POINT point = {0};
+  #if defined(DISPLAY_WINDOWS)
+  POINT point{0};
  GetCursorPos(&point);
  return {point.x, point.y};
  #endif

-  #if defined(PLATFORM_XORG)
+  #if defined(DISPLAY_XORG)
  XlibWindow root, child;
  int rootx, rooty, winx, winy;
  unsigned int mask;
@@ -19,7 +19,7 @@ auto pMouse::position() -> Position {
 }

 auto pMouse::pressed(Mouse::Button button) -> bool {
-  #if defined(PLATFORM_WINDOWS)
+  #if defined(DISPLAY_WINDOWS)
  switch(button) {
  case Mouse::Button::Left: return GetAsyncKeyState(VK_LBUTTON) & 0x8000;
  case Mouse::Button::Middle: return GetAsyncKeyState(VK_MBUTTON) & 0x8000;
@@ -27,7 +27,7 @@ auto pMouse::pressed(Mouse::Button button) -> bool {
  }
  #endif

-  #if defined(PLATFORM_XORG)
+  #if defined(DISPLAY_XORG)
  XlibWindow root, child;
  int rootx, rooty, winx, winy;
  unsigned int mask;
--- a/hiro/gtk/widget/viewport.cpp
+++ b/hiro/gtk/widget/viewport.cpp
@@ -67,11 +67,11 @@ auto pViewport::destruct() -> void {
 }

 auto pViewport::handle() const -> uintptr_t {
-  #if defined(PLATFORM_WINDOWS)
+  #if defined(DISPLAY_WINDOWS)
  return (uintptr_t)GDK_WINDOW_HWND(gtk_widget_get_window(gtkWidget));
  #endif

-  #if defined(PLATFORM_XORG)
+  #if defined(DISPLAY_XORG)
  return GDK_WINDOW_XID(gtk_widget_get_window(gtkWidget));
  #endif
 }
--- a/hiro/gtk/window.cpp
+++ b/hiro/gtk/window.cpp
@@ -281,13 +281,13 @@ auto pWindow::setGeometry(Geometry geometry) -> void {
 auto pWindow::setModal(bool modal) -> void {
  if(modal) {
    gtk_window_set_modal(GTK_WINDOW(widget), true);
-    while(state().modal) {
-      Application::processEvents();
+    while(!Application::state.quit && state().modal) {
      if(Application::state.onMain) {
        Application::doMain();
      } else {
        usleep(20 * 1000);
      }
+      Application::processEvents();
    }
    gtk_window_set_modal(GTK_WINDOW(widget), false);
  }