Update to v072 release.

byuu says:

Just some very minor fixes.

bsnes/Makefile

@@ -0,0 +1,95 @@
+include nall/Makefile
+snes := snes
+profile := accuracy
+ui := ui-phoenix
+
+# compiler
+c       := $(compiler) -std=gnu99
+cpp     := $(subst cc,++,$(compiler)) -std=gnu++0x
+flags   := -O3 -fomit-frame-pointer -I. -I$(snes)
+link    :=
+objects :=
+
+# profile-guided instrumentation
+# flags += -fprofile-generate
+# link += -lgcov
+
+# profile-guided optimization
+# flags += -fprofile-use
+
+# platform
+ifeq ($(platform),x)
+  link += -s -ldl -lX11 -lXext
+else ifeq ($(platform),osx)
+else ifeq ($(platform),win)
+  link += -mwindows
+# link += -mconsole
+  link += -mthreads -s -luuid -lkernel32 -luser32 -lgdi32 -lcomctl32 -lcomdlg32 -lshell32 -lole32
+  link += -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc
+else
+  unknown_platform: help;
+endif
+
+# implicit rules
+compile = \
+  $(strip \
+    $(if $(filter %.c,$<), \
+      $(c) $(flags) $1 -c $< -o $@, \
+      $(if $(filter %.cpp,$<), \
+        $(cpp) $(flags) $1 -c $< -o $@ \
+      ) \
+    ) \
+  )
+
+%.o: $<; $(call compile)
+
+all: build;
+
+include $(snes)/Makefile
+include $(ui)/Makefile
+
+objects := $(patsubst %,obj/%.o,$(objects))
+
+# targets
+build: ui_build $(objects)
+ifeq ($(platform),osx)
+	test -d ../bsnes.app || mkdir -p ../bsnes.app/Contents/MacOS
+	$(strip $(cpp) -o ../bsnes.app/Contents/MacOS/bsnes $(objects) $(link))
+else
+	$(strip $(cpp) -o out/bsnes $(objects) $(link))
+endif
+
+install:
+ifeq ($(platform),x)
+	install -D -m 755 out/bsnes $(DESTDIR)$(prefix)/bin/bsnes
+	install -D -m 644 data/bsnes.png $(DESTDIR)$(prefix)/share/pixmaps/bsnes.png
+	install -D -m 644 data/bsnes.desktop $(DESTDIR)$(prefix)/share/applications/bsnes.desktop
+	test -d ~/.bsnes || mkdir ~/.bsnes
+	cp data/cheats.xml ~/.bsnes/cheats.xml
+	chmod 777 ~/.bsnes ~/.bsnes/cheats.xml
+endif
+
+uninstall:
+ifeq ($(platform),x)
+	rm $(DESTDIR)$(prefix)/bin/bsnes
+	rm $(DESTDIR)$(prefix)/share/pixmaps/bsnes.png
+	rm $(DESTDIR)$(prefix)/share/applications/bsnes.desktop
+endif
+
+clean: ui_clean
+	-@$(call delete,obj/*.o)
+	-@$(call delete,obj/*.a)
+	-@$(call delete,obj/*.so)
+	-@$(call delete,obj/*.dylib)
+	-@$(call delete,obj/*.dll)
+	-@$(call delete,*.res)
+	-@$(call delete,*.pgd)
+	-@$(call delete,*.pgc)
+	-@$(call delete,*.ilk)
+	-@$(call delete,*.pdb)
+	-@$(call delete,*.manifest)
+
+archive-all:
+	tar -cjf bsnes.tar.bz2 data launcher libco nall obj out phoenix ruby snes ui-phoenix ui-qt Makefile cc.bat clean.bat sync.sh
+
+help:;

bsnes/cc.bat

@@ -0,0 +1,2 @@
+@mingw32-make -j 2
+@pause

bsnes/clean.bat

@@ -1 +1 @@
-@mingw32-make clean
+@mingw32-make clean

bsnes/data/bsnes.Manifest

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity type="win32" name="bsnes" version="1.0.0.0" processorArchitecture="*"/>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/>
+    </dependentAssembly>
+  </dependency>
+</assembly>

bsnes/launcher/cc.bat

@@ -0,0 +1,4 @@
+@windres resource.rc resource.o
+@mingw32-g++ -std=gnu++0x -mwindows -s -O3 -fomit-frame-pointer -I.. -o ../out/bsnes launcher.cpp resource.o
+@del *.o
+@pause

bsnes/launcher/cc.sh

@@ -0,0 +1,2 @@
+clear
+g++ -std=gnu++0x -s -O3 -fomit-frame-pointer -I.. -o ../out/bsnes launcher.cpp

bsnes/launcher/launcher.cpp

@@ -0,0 +1,54 @@
+#include <nall/config.hpp>
+#include <nall/detect.hpp>
+#include <nall/file.hpp>
+#include <nall/foreach.hpp>
+#include <nall/platform.hpp>
+#include <nall/stdint.hpp>
+#include <nall/string.hpp>
+using namespace nall;
+
+int main(int argc, char **argv) {
+  char path[PATH_MAX], *unused;
+  #if !defined(PLATFORM_WIN)
+  unused = realpath(argv[0], path);
+  #else
+  wchar_t **argw = CommandLineToArgvW(GetCommandLineW(), &argc);
+  unused = realpath(nall::utf8_t(argw[0]), path);
+  #endif
+  string realPath = dir(path);
+  string basePath = string(dir(path), "bsnes-qt.cfg");
+  unused = userpath(path);
+  if(!strend(path, "/") && !strend(path, "\\")) strcat(path, "/");
+  string userPath = string(path, ".bsnes/bsnes-qt.cfg");
+
+  configuration config;
+  string profile;
+  config.attach(profile = "", "system.profile");
+  if(config.load(userPath) == false) config.load(basePath);
+  if(profile == "") profile = "compatibility";
+
+  string binaryName = string("bsnes-", profile);
+  #if defined(PLATFORM_WIN)
+  binaryName << ".dll";
+  #endif
+  string fileName = string(realPath, binaryName);
+
+  #if !defined(PLATFORM_WIN)
+  char **args = new char*[argc + 1];
+  args[0] = strdup(binaryName);
+  for(unsigned i = 1; i < argc; i++) args[i] = strdup(argv[i]);
+  args[argc] = 0;
+  execvp(args[0], args);
+  execv(fileName, args);
+  print("[bsnes] Error: unable to locate binary file: ", binaryName, "\n");
+  #else
+  STARTUPINFOW si;
+  PROCESS_INFORMATION pi;
+  memset(&si, 0, sizeof(STARTUPINFOW));
+  if(!CreateProcessW(nall::utf16_t(fileName), GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) {
+    MessageBoxA(0, string("Error: unable to locate binary file: ", binaryName), "bsnes", MB_OK);
+  }
+  #endif
+
+  return 0;
+}

bsnes/launcher/resource.rc

@@ -0,0 +1,2 @@
+1 24 "bsnes.Manifest"
+IDI_ICON1 ICON DISCARDABLE "bsnes.ico"

bsnes/nall/Makefile

@@ -29,10 +29,12 @@ ifeq ($(platform),)
 endif
 
 ifeq ($(compiler),)
-  ifeq ($(platform),osx)
-    compiler := gcc-4.2
-  else
+  ifeq ($(platform),win)
     compiler := gcc
+  else ifeq ($(platform),osx)
+    compiler := gcc-mp-4.5
+  else
+    compiler := gcc-4.5
   endif
 endif
 

bsnes/nall/algorithm.hpp

@@ -12,12 +12,6 @@ namespace nall {
   template<typename T, typename U> T max(const T &t, const U &u) {
     return t > u ? t : u;
   }
-
-  //pseudo-random number generator
-  inline unsigned prng() {
-    static unsigned n = 0;
-    return n = (n >> 1) ^ (((n & 1) - 1) & 0xedb88320);
-  }
 }
 
 #endif

bsnes/nall/any.hpp

@@ -2,8 +2,8 @@
 #define NALL_ANY_HPP
 
 #include <typeinfo>
+#include <type_traits>
 #include <nall/static.hpp>
-#include <nall/traits.hpp>
 
 namespace nall {
   class any {
@@ -13,8 +13,8 @@ namespace nall {
 
     template<typename T> any& operator=(const T& value_) {
       typedef typename static_if<
-        is_array<T>::value,
-        typename remove_extent<typename add_const<T>::type>::type*,
+        std::is_array<T>::value,
+        typename std::remove_extent<typename std::add_const<T>::type>::type*,
         T
       >::type auto_t;
 
@@ -49,13 +49,13 @@ namespace nall {
   };
 
   template<typename T> T any_cast(any &value) {
-    typedef typename remove_reference<T>::type nonref;
+    typedef typename std::remove_reference<T>::type nonref;
     if(value.type() != typeid(nonref)) throw;
     return static_cast<any::holder<nonref>*>(value.container)->value;
   }
 
   template<typename T> T any_cast(const any &value) {
-    typedef const typename remove_reference<T>::type nonref;
+    typedef const typename std::remove_reference<T>::type nonref;
     if(value.type() != typeid(nonref)) throw;
     return static_cast<any::holder<nonref>*>(value.container)->value;
   }

bsnes/nall/array.hpp

@@ -3,10 +3,13 @@
 
 #include <stdlib.h>
 #include <initializer_list>
+#include <type_traits>
+#include <utility>
 #include <nall/algorithm.hpp>
 #include <nall/bit.hpp>
 #include <nall/concept.hpp>
-#include <nall/traits.hpp>
+#include <nall/foreach.hpp>
+#include <nall/utility.hpp>
 
 namespace nall {
   //dynamic vector array
@@ -47,13 +50,32 @@ namespace nall {
       return pool;
     }
 
-    void add(const T data) {
+    void append(const T data) {
       operator[](buffersize) = data;
     }
 
-    signed find(const T data) {
-      for(unsigned i = 0; i < size(); i++) if(pool[i] == data) return i;
-      return -1;  //not found
+    template<typename U> void insert(unsigned index, const U list) {
+      unsigned listsize = container_size(list);
+      resize(buffersize + listsize);
+      memmove(pool + index + listsize, pool + index, (buffersize - index) * sizeof(T));
+      foreach(item, list) pool[index++] = item;
+    }
+
+    void insert(unsigned index, const T item) {
+      insert(index, array<T>{ item });
+    }
+
+    void remove(unsigned index, unsigned count = 1) {
+      for(unsigned i = index; count + i < buffersize; i++) {
+        pool[i] = pool[count + i];
+      }
+      if(count + index >= buffersize) resize(index);  //every element >= index was removed
+      else resize(buffersize - count);
+    }
+
+    optional<unsigned> find(const T data) {
+      for(unsigned i = 0; i < size(); i++) if(pool[i] == data) return { true, i };
+      return { false, 0 };
     }
 
     void clear() {
@@ -64,7 +86,7 @@ namespace nall {
     }
 
     array(std::initializer_list<T> list) : pool(0), poolsize(0), buffersize(0) {
-      for(const T *p = list.begin(); p != list.end(); ++p) add(*p);
+      for(const T *p = list.begin(); p != list.end(); ++p) append(*p);
     }
 
     ~array() {
@@ -81,7 +103,7 @@ namespace nall {
       return *this;
     }
 
-    array(const array &source) : pool(0) {
+    array(const array &source) : pool(0), poolsize(0), buffersize(0) {
       operator=(source);
     }
 
@@ -92,11 +114,12 @@ namespace nall {
       poolsize = source.poolsize;
       buffersize = source.buffersize;
       source.pool = 0;
+      source.reset();
       return *this;
     }
 
-    array(array &&source) {
-      operator=(move(source));
+    array(array &&source) : pool(0), poolsize(0), buffersize(0) {
+      operator=(std::move(source));
     }
 
     //index

bsnes/nall/concept.hpp

@@ -0,0 +1,34 @@
+#ifndef NALL_CONCEPT_HPP
+#define NALL_CONCEPT_HPP
+
+#include <nall/static.hpp>
+#include <nall/utility.hpp>
+
+namespace nall {
+  //unsigned count() const;
+  template<typename T> struct has_count { enum { value = false }; };
+
+  //unsigned length() const;
+  template<typename T> struct has_length { enum { value = false }; };
+
+  //unsigned size() const;
+  template<typename T> struct has_size { enum { value = false }; };
+
+  template<typename T> unsigned container_size(const T& object, typename mp_enable_if<has_count<T>>::type = 0) {
+    return object.count();
+  }
+
+  template<typename T> unsigned container_size(const T& object, typename mp_enable_if<has_length<T>>::type = 0) {
+    return object.length();
+  }
+
+  template<typename T> unsigned container_size(const T& object, typename mp_enable_if<has_size<T>>::type = 0) {
+    return object.size();
+  }
+
+  template<typename T> unsigned container_size(const T& object, typename mp_enable_if<std::is_array<T>>::type = 0) {
+    return sizeof(T) / sizeof(typename std::remove_extent<T>::type);
+  }
+}
+
+#endif

bsnes/nall/config.hpp

@@ -49,7 +49,7 @@ namespace nall {
           case signed_t:   *(signed*)data = strsigned(s);     break;
           case unsigned_t: *(unsigned*)data = strunsigned(s); break;
           case double_t:   *(double*)data = strdouble(s);     break;
-          case string_t:   trim(s, "\""); *(string*)data = s; break;
+          case string_t:   s.trim("\""); *(string*)data = s;  break;
         }
       }
     };
@@ -78,14 +78,13 @@ namespace nall {
         line.split("\n", data);
 
         for(unsigned i = 0; i < line.size(); i++) {
-          int position = qstrpos(line[i], "#");
-          if(position >= 0) line[i][position] = 0;
-          if(qstrpos(line[i], " = ") < 0) continue;
+          if(auto position = qstrpos(line[i], "#")) line[i][position()] = 0;
+          if(!qstrpos(line[i], " = ")) continue;
 
           lstring part;
           part.qsplit(" = ", line[i]);
-          trim(part[0]);
-          trim(part[1]);
+          part[0].trim();
+          part[1].trim();
 
           for(unsigned n = 0; n < list.size(); n++) {
             if(part[0] == list[n].name) {
@@ -103,7 +102,7 @@ namespace nall {
 
     virtual bool save(const char *filename) const {
       file fp;
-      if(fp.open(filename, file::mode_write)) {
+      if(fp.open(filename, file::mode::write)) {
         for(unsigned i = 0; i < list.size(); i++) {
           string output;
           output << list[i].name << " = " << list[i].get();

bsnes/nall/dictionary.hpp

@@ -15,9 +15,8 @@ namespace nall {
 
       //no match, use input; remove input identifier, if one exists
       if(strbegin(input, "{{")) {
-        int pos = strpos(input, "}}");
-        if(pos >= 0) {
-          string temp = substr(input, pos + 2);
+        if(auto pos = strpos(input, "}}")) {
+          string temp = substr(input, pos() + 2);
           return temp;
         }
       }
@@ -28,7 +27,7 @@ namespace nall {
     bool import(const char *filename) {
       string data;
       if(data.readfile(filename) == false) return false;
-      ltrim_once(data, "\xef\xbb\xbf"); //remove UTF-8 marker, if it exists
+      data.ltrim<1>("\xef\xbb\xbf"); //remove UTF-8 marker, if it exists
       data.replace("\r", "");
 
       lstring line;
@@ -40,12 +39,12 @@ namespace nall {
         if(part.size() != 2) continue;
 
         //remove whitespace
-        trim(part[0]);
-        trim(part[1]);
+        part[0].trim();
+        part[1].trim();
 
         //remove quotes
-        trim_once(part[0], "\"");
-        trim_once(part[1], "\"");
+        part[0].trim<1>("\"");
+        part[1].trim<1>("\"");
 
         unsigned n = index_input.size();
         index_input[n]  = part[0];

bsnes/nall/directory.hpp

@@ -0,0 +1,151 @@
+#ifndef NALL_DIRECTORY_HPP
+#define NALL_DIRECTORY_HPP
+
+#include <nall/foreach.hpp>
+#include <nall/sort.hpp>
+#include <nall/string.hpp>
+
+#if defined(_WIN32)
+  #include <nall/utf8.hpp>
+#else
+  #include <dirent.h>
+  #include <stdio.h>
+  #include <sys/types.h>
+#endif
+
+namespace nall {
+
+struct directory {
+  static bool exists(const string &pathname);
+  static lstring folders(const string &pathname, const string &pattern = "*");
+  static lstring files(const string &pathname, const string &pattern = "*");
+  static lstring contents(const string &pathname, const string &pattern = "*");
+};
+
+#if defined(_WIN32)
+  inline bool directory::exists(const string &pathname) {
+    DWORD result = GetFileAttributes(utf16_t(pathname));
+    if(result == INVALID_FILE_ATTRIBUTES) return false;
+    return (result & FILE_ATTRIBUTE_DIRECTORY);
+  }
+
+  inline lstring directory::folders(const string &pathname, const string &pattern) {
+    lstring list;
+    string path = pathname;
+    path.transform("/", "\\");
+    if(!strend(path, "\\")) path.append("\\");
+    path.append("*");
+    HANDLE handle;
+    WIN32_FIND_DATA data;
+    handle = FindFirstFile(utf16_t(path), &data);
+    if(handle != INVALID_HANDLE_VALUE) {
+      if(wcscmp(data.cFileName, L".") && wcscmp(data.cFileName, L"..")) {
+        if(data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+          string name = utf8_t(data.cFileName);
+          if(wildcard(name, pattern)) list.append(string(name, "/"));
+        }
+      }
+      while(FindNextFile(handle, &data) != false) {
+        if(wcscmp(data.cFileName, L".") && wcscmp(data.cFileName, L"..")) {
+          if(data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+            string name = utf8_t(data.cFileName);
+            if(wildcard(name, pattern)) list.append(string(name, "/"));
+          }
+        }
+      }
+      FindClose(handle);
+    }
+    if(list.size() > 0) sort(&list[0], list.size());
+    return list;
+  }
+
+  inline lstring directory::files(const string &pathname, const string &pattern) {
+    lstring list;
+    string path = pathname;
+    path.transform("/", "\\");
+    if(!strend(path, "\\")) path.append("\\");
+    path.append("*");
+    HANDLE handle;
+    WIN32_FIND_DATA data;
+    handle = FindFirstFile(utf16_t(path), &data);
+    if(handle != INVALID_HANDLE_VALUE) {
+      if((data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
+        string name = utf8_t(data.cFileName);
+        if(wildcard(name, pattern)) list.append(name);
+      }
+      while(FindNextFile(handle, &data) != false) {
+        if((data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
+          string name = utf8_t(data.cFileName);
+          if(wildcard(name, pattern)) list.append(name);
+        }
+      }
+      FindClose(handle);
+    }
+    if(list.size() > 0) sort(&list[0], list.size());
+    return list;
+  }
+
+  inline lstring directory::contents(const string &pathname, const string &pattern) {
+    lstring folders = directory::folders(pathname);  //pattern search of contents() should only filter files
+    lstring files = directory::files(pathname, pattern);
+    foreach(file, files) folders.append(file);
+    return folders;
+  }
+#else
+  inline bool directory::exists(const string &pathname) {
+    DIR *dp = opendir(pathname);
+    if(!dp) return false;
+    closedir(dp);
+    return true;
+  }
+
+  inline lstring directory::folders(const string &pathname, const string &pattern) {
+    lstring list;
+    DIR *dp;
+    struct dirent *ep;
+    dp = opendir(pathname);
+    if(dp) {
+      while(ep = readdir(dp)) {
+        if(!strcmp(ep->d_name, ".")) continue;
+        if(!strcmp(ep->d_name, "..")) continue;
+        if(ep->d_type & DT_DIR) {
+          if(wildcard(ep->d_name, pattern)) list.append(string(ep->d_name, "/"));
+        }
+      }
+      closedir(dp);
+    }
+    if(list.size() > 0) sort(&list[0], list.size());
+    return list;
+
+  }
+
+  inline lstring directory::files(const string &pathname, const string &pattern) {
+    lstring list;
+    DIR *dp;
+    struct dirent *ep;
+    dp = opendir(pathname);
+    if(dp) {
+      while(ep = readdir(dp)) {
+        if(!strcmp(ep->d_name, ".")) continue;
+        if(!strcmp(ep->d_name, "..")) continue;
+        if((ep->d_type & DT_DIR) == 0) {
+          if(wildcard(ep->d_name, pattern)) list.append(ep->d_name);
+        }
+      }
+      closedir(dp);
+    }
+    if(list.size() > 0) sort(&list[0], list.size());
+    return list;
+  }
+
+  inline lstring directory::contents(const string &pathname, const string &pattern) {
+    lstring folders = directory::folders(pathname);  //pattern search of contents() should only filter files
+    lstring files = directory::files(pathname, pattern);
+    foreach(file, files) folders.append(file);
+    return folders;
+  }
+#endif
+
+}
+
+#endif

bsnes/nall/dl.hpp

@@ -3,9 +3,9 @@
 
 //dynamic linking support
 
-#include <string.h>
 #include <nall/detect.hpp>
 #include <nall/stdint.hpp>
+#include <nall/string.hpp>
 #include <nall/utility.hpp>
 
 #if defined(PLATFORM_X) || defined(PLATFORM_OSX)
@@ -18,7 +18,7 @@
 namespace nall {
   struct library {
     bool opened() const { return handle; }
-    bool open(const char*);
+    bool open(const char*, const char* = "");
     void* sym(const char*);
     void close();
 
@@ -33,20 +33,10 @@ namespace nall {
   };
 
   #if defined(PLATFORM_X)
-  inline bool library::open(const char *name) {
+  inline bool library::open(const char *name, const char *path) {
     if(handle) close();
-    char *t = new char[strlen(name) + 256];
-    strcpy(t, "lib");
-    strcat(t, name);
-    strcat(t, ".so");
-    handle = (uintptr_t)dlopen(t, RTLD_LAZY);
-    if(!handle) {
-      strcpy(t, "/usr/local/lib/lib");
-      strcat(t, name);
-      strcat(t, ".so");
-      handle = (uintptr_t)dlopen(t, RTLD_LAZY);
-    }
-    delete[] t;
+    handle = (uintptr_t)dlopen(string(path, *path && !strend(path, "/") ? "/" : "", "lib", name, ".so"), RTLD_LAZY);
+    if(!handle) handle = (uintptr_t)dlopen(string("/usr/local/lib/lib", name, ".so"), RTLD_LAZY);
     return handle;
   }
 
@@ -61,20 +51,10 @@ namespace nall {
     handle = 0;
   }
   #elif defined(PLATFORM_OSX)
-  inline bool library::open(const char *name) {
+  inline bool library::open(const char *name, const char *path) {
     if(handle) close();
-    char *t = new char[strlen(name) + 256];
-    strcpy(t, "lib");
-    strcat(t, name);
-    strcat(t, ".dylib");
-    handle = (uintptr_t)dlopen(t, RTLD_LAZY);
-    if(!handle) {
-      strcpy(t, "/usr/local/lib/lib");
-      strcat(t, name);
-      strcat(t, ".dylib");
-      handle = (uintptr_t)dlopen(t, RTLD_LAZY);
-    }
-    delete[] t;
+    handle = (uintptr_t)dlopen(string(path, *path && !strend(path, "/") ? "/" : "", "lib", name, ".dylib"), RTLD_LAZY);
+    if(!handle) handle = (uintptr_t)dlopen(string("/usr/local/lib/lib", name, ".dylib"), RTLD_LAZY);
     return handle;
   }
 
@@ -89,13 +69,10 @@ namespace nall {
     handle = 0;
   }
   #elif defined(PLATFORM_WIN)
-  inline bool library::open(const char *name) {
+  inline bool library::open(const char *name, const char *path) {
     if(handle) close();
-    char *t = new char[strlen(name) + 8];
-    strcpy(t, name);
-    strcat(t, ".dll");
-    handle = (uintptr_t)LoadLibraryW(utf16_t(t));
-    delete[] t;
+    string filepath(path, *path && !strend(path, "/") && !strend(path, "\\") ? "\\" : "", name, ".dll");
+    handle = (uintptr_t)LoadLibraryW(utf16_t(filepath));
     return handle;
   }
 
@@ -110,7 +87,7 @@ namespace nall {
     handle = 0;
   }
   #else
-  inline bool library::open(const char*) { return false; }
+  inline bool library::open(const char*, const char*) { return false; }
   inline void* library::sym(const char*) { return 0; }
   inline void library::close() {}
   #endif

bsnes/nall/file.hpp

@@ -11,6 +11,7 @@
 #endif
 
 #include <nall/stdint.hpp>
+#include <nall/string.hpp>
 #include <nall/utf8.hpp>
 #include <nall/utility.hpp>
 
@@ -25,12 +26,12 @@ namespace nall {
 
   class file {
   public:
-    enum FileMode { mode_read, mode_write, mode_readwrite, mode_writeread };
-    enum SeekMode { seek_absolute, seek_relative };
+    enum class mode : unsigned { read, write, readwrite, writeread };
+    enum class index : unsigned { absolute, relative };
 
     uint8_t read() {
       if(!fp) return 0xff;                       //file not open
-      if(file_mode == mode_write) return 0xff;   //reads not permitted
+      if(file_mode == mode::write) return 0xff;  //reads not permitted
       if(file_offset >= file_size) return 0xff;  //cannot read past end of file
       buffer_sync();
       return buffer[(file_offset++) & buffer_mask];
@@ -58,8 +59,8 @@ namespace nall {
     }
 
     void write(uint8_t data) {
-      if(!fp) return;                     //file not open
-      if(file_mode == mode_read) return;  //writes not permitted
+      if(!fp) return;                      //file not open
+      if(file_mode == mode::read) return;  //writes not permitted
       buffer_sync();
       buffer[(file_offset++) & buffer_mask] = data;
       buffer_dirty = true;
@@ -83,9 +84,10 @@ namespace nall {
       while(length--) write(*buffer++);
     }
 
-    void print(const char *string) {
-      if(!string) return;
-      while(*string) write(*string++);
+    template<typename... Args> void print(Args... args) {
+      string data(args...);
+      const char *p = data;
+      while(*p) write(*p++);
     }
 
     void flush() {
@@ -93,19 +95,19 @@ namespace nall {
       fflush(fp);
     }
 
-    void seek(int offset, SeekMode mode = seek_absolute) {
+    void seek(int offset, index index_ = index::absolute) {
       if(!fp) return;  //file not open
       buffer_flush();
 
       uintmax_t req_offset = file_offset;
-      switch(mode) {
-        case seek_absolute: req_offset  = offset; break;
-        case seek_relative: req_offset += offset; break;
+      switch(index_) {
+        case index::absolute: req_offset  = offset; break;
+        case index::relative: req_offset += offset; break;
       }
 
       if(req_offset < 0) req_offset = 0;  //cannot seek before start of file
       if(req_offset > file_size) {
-        if(file_mode == mode_read) {      //cannot seek past end of file
+        if(file_mode == mode::read) {     //cannot seek past end of file
           req_offset = file_size;
         } else {                          //pad file to requested location
           file_offset = file_size;
@@ -172,20 +174,20 @@ namespace nall {
       return fp;
     }
 
-    bool open(const char *fn, FileMode mode) {
+    bool open(const char *fn, mode mode_) {
       if(fp) return false;
 
-      switch(file_mode = mode) {
+      switch(file_mode = mode_) {
         #if !defined(_WIN32)
-        case mode_read:      fp = fopen(fn, "rb");  break;
-        case mode_write:     fp = fopen(fn, "wb+"); break;  //need read permission for buffering
-        case mode_readwrite: fp = fopen(fn, "rb+"); break;
-        case mode_writeread: fp = fopen(fn, "wb+"); break;
+        case mode::read:      fp = fopen(fn, "rb");  break;
+        case mode::write:     fp = fopen(fn, "wb+"); break;  //need read permission for buffering
+        case mode::readwrite: fp = fopen(fn, "rb+"); break;
+        case mode::writeread: fp = fopen(fn, "wb+"); break;
         #else
-        case mode_read:      fp = _wfopen(utf16_t(fn), L"rb");  break;
-        case mode_write:     fp = _wfopen(utf16_t(fn), L"wb+"); break;
-        case mode_readwrite: fp = _wfopen(utf16_t(fn), L"rb+"); break;
-        case mode_writeread: fp = _wfopen(utf16_t(fn), L"wb+"); break;
+        case mode::read:      fp = _wfopen(utf16_t(fn), L"rb");  break;
+        case mode::write:     fp = _wfopen(utf16_t(fn), L"wb+"); break;
+        case mode::readwrite: fp = _wfopen(utf16_t(fn), L"rb+"); break;
+        case mode::writeread: fp = _wfopen(utf16_t(fn), L"wb+"); break;
         #endif
       }
       if(!fp) return false;
@@ -211,7 +213,7 @@ namespace nall {
       fp = 0;
       file_offset = 0;
       file_size = 0;
-      file_mode = mode_read;
+      file_mode = mode::read;
     }
 
     ~file() {
@@ -229,7 +231,7 @@ namespace nall {
     FILE *fp;
     unsigned file_offset;
     unsigned file_size;
-    FileMode file_mode;
+    mode file_mode;
 
     void buffer_sync() {
       if(!fp) return;  //file not open
@@ -243,14 +245,14 @@ namespace nall {
     }
 
     void buffer_flush() {
-      if(!fp) return;                     //file not open
-      if(file_mode == mode_read) return;  //buffer cannot be written to
-      if(buffer_offset < 0) return;       //buffer unused
-      if(buffer_dirty == false) return;   //buffer unmodified since read
+      if(!fp) return;                      //file not open
+      if(file_mode == mode::read) return;  //buffer cannot be written to
+      if(buffer_offset < 0) return;        //buffer unused
+      if(buffer_dirty == false) return;    //buffer unmodified since read
       fseek(fp, buffer_offset, SEEK_SET);
       unsigned length = (buffer_offset + buffer_size) <= file_size ? buffer_size : (file_size & buffer_mask);
       if(length) unsigned unused = fwrite(buffer, 1, length, fp);
-      buffer_offset = -1;                 //invalidate buffer
+      buffer_offset = -1;                  //invalidate buffer
       buffer_dirty = false;
     }
   };

bsnes/nall/filemap.hpp

@@ -19,14 +19,16 @@
 namespace nall {
   class filemap {
   public:
-    enum filemode { mode_read, mode_write, mode_readwrite, mode_writeread };
+    enum class mode : unsigned { read, write, readwrite, writeread };
 
-    bool open(const char *filename, filemode mode) { return p_open(filename, mode); }
+    bool opened() const { return p_opened(); }
+    bool open(const char *filename, mode mode_) { return p_open(filename, mode_); }
     void close() { return p_close(); }
     unsigned size() const { return p_size; }
-    uint8_t* handle() { return p_handle; }
-    const uint8_t* handle() const { return p_handle; }
+    uint8_t* data() { return p_handle; }
+    const uint8_t* data() const { return p_handle; }
     filemap() : p_size(0), p_handle(0) { p_ctor(); }
+    filemap(const char *filename, mode mode_) : p_size(0), p_handle(0) { p_ctor(); p_open(filename, mode_); }
     ~filemap() { p_dtor(); }
 
   private:
@@ -40,31 +42,35 @@ namespace nall {
 
     HANDLE p_filehandle, p_maphandle;
 
-    bool p_open(const char *filename, filemode mode) {
+    bool p_opened() const {
+      return p_handle;
+    }
+
+    bool p_open(const char *filename, mode mode_) {
       int desired_access, creation_disposition, flprotect, map_access;
 
-      switch(mode) {
+      switch(mode_) {
         default: return false;
-        case mode_read:
+        case mode::read:
           desired_access = GENERIC_READ;
           creation_disposition = OPEN_EXISTING;
           flprotect = PAGE_READONLY;
           map_access = FILE_MAP_READ;
           break;
-        case mode_write:
+        case mode::write:
           //write access requires read access
           desired_access = GENERIC_WRITE;
           creation_disposition = CREATE_ALWAYS;
           flprotect = PAGE_READWRITE;
           map_access = FILE_MAP_ALL_ACCESS;
           break;
-        case mode_readwrite:
+        case mode::readwrite:
           desired_access = GENERIC_READ | GENERIC_WRITE;
           creation_disposition = OPEN_EXISTING;
           flprotect = PAGE_READWRITE;
           map_access = FILE_MAP_ALL_ACCESS;
           break;
-        case mode_writeread:
+        case mode::writeread:
           desired_access = GENERIC_READ | GENERIC_WRITE;
           creation_disposition = CREATE_NEW;
           flprotect = PAGE_READWRITE;
@@ -122,30 +128,34 @@ namespace nall {
 
     int p_fd;
 
-    bool p_open(const char *filename, filemode mode) {
+    bool p_opened() const {
+      return p_handle;
+    }
+
+    bool p_open(const char *filename, mode mode_) {
       int open_flags, mmap_flags;
 
-      switch(mode) {
+      switch(mode_) {
         default: return false;
-        case mode_read:
+        case mode::read:
           open_flags = O_RDONLY;
           mmap_flags = PROT_READ;
           break;
-        case mode_write:
+        case mode::write:
           open_flags = O_RDWR | O_CREAT;  //mmap() requires read access
           mmap_flags = PROT_WRITE;
           break;
-        case mode_readwrite:
+        case mode::readwrite:
           open_flags = O_RDWR;
           mmap_flags = PROT_READ | PROT_WRITE;
           break;
-        case mode_writeread:
+        case mode::writeread:
           open_flags = O_RDWR | O_CREAT;
           mmap_flags = PROT_READ | PROT_WRITE;
           break;
       }
 
-      p_fd = ::open(filename, open_flags);
+      p_fd = ::open(filename, open_flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
       if(p_fd < 0) return false;
 
       struct stat p_stat;

bsnes/nall/foreach.hpp

@@ -0,0 +1,12 @@
+#ifndef NALL_FOREACH_HPP
+#define NALL_FOREACH_HPP
+
+#include <type_traits>
+#include <nall/concept.hpp>
+
+#undef foreach
+#define foreach(iter, object) \
+  for(unsigned foreach_counter = 0, foreach_limit = container_size(object), foreach_once = 0, foreach_broken = 0; foreach_counter < foreach_limit && foreach_broken == 0; foreach_counter++, foreach_once = 0) \
+    for(auto &iter = object[foreach_counter]; foreach_once == 0 && (foreach_broken = 1); foreach_once++, foreach_broken = 0)
+
+#endif

bsnes/nall/function.hpp

@@ -0,0 +1,60 @@
+#ifndef NALL_FUNCTION_HPP
+#define NALL_FUNCTION_HPP
+
+namespace nall {
+  template<typename T> class function;
+
+  template<typename R, typename... P> class function<R (P...)> {
+    struct container {
+      virtual R operator()(P... p) const = 0;
+      virtual container* copy() const = 0;
+      virtual ~container() {}
+    } *callback;
+
+    struct global : container {
+      R (*function)(P...);
+      R operator()(P... p) const { return function(std::forward<P>(p)...); }
+      container* copy() const { return new global(function); }
+      global(R (*function)(P...)) : function(function) {}
+    };
+
+    template<typename C> struct member : container {
+      R (C::*function)(P...);
+      C *object;
+      R operator()(P... p) const { return (object->*function)(std::forward<P>(p)...); }
+      container* copy() const { return new member(function, object); }
+      member(R (C::*function)(P...), C *object) : function(function), object(object) {}
+    };
+
+    template<typename L> struct lambda : container {
+      L object;
+      R operator()(P... p) const { return object(std::forward<P>(p)...); }
+      container* copy() const { return new lambda(object); }
+      lambda(const L& object) : object(object) {}
+    };
+
+  public:
+    operator bool() const { return callback; }
+    R operator()(P... p) const { return (*callback)(std::forward<P>(p)...); }
+    void reset() { if(callback) { delete callback; callback = 0; } }
+
+    function& operator=(const function &source) {
+      if(this != &source) {
+        if(callback) { delete callback; callback = 0; }
+        if(source.callback) callback = source.callback->copy();
+      }
+      return *this;
+    }
+
+    function(const function &source) { operator=(source); }
+    function() : callback(0) {}
+    function(void *function) : callback(0) { if(function) callback = new global((R (*)(P...))function); }
+    function(R (*function)(P...)) { callback = new global(function); }
+    template<typename C> function(R (C::*function)(P...), C *object) { callback = new member<C>(function, object); }
+    template<typename C> function(R (C::*function)(P...) const, C *object) { callback = new member<C>((R (C::*)(P...))function, object); }
+    template<typename L> function(const L& object) { callback = new lambda<L>(object); }
+    ~function() { if(callback) delete callback; }
+  };
+}
+
+#endif

bsnes/nall/input.hpp

@@ -91,11 +91,11 @@ struct Keyboard {
   static uint16_t decode(const char *name) {
     string s(name);
     if(!strbegin(name, "KB")) return 0;
-    ltrim(s, "KB");
+    s.ltrim("KB");
     unsigned id = strunsigned(s);
-    int pos = strpos(s, "::");
-    if(pos < 0) return 0;
-    s = substr(s, pos + 2);
+    auto pos = strpos(s, "::");
+    if(!pos) return 0;
+    s = substr(s, pos() + 2);
     for(unsigned i = 0; i < Limit; i++) {
       if(s == KeyboardScancodeName[i]) return Base + Size * id + i;
     }
@@ -188,11 +188,11 @@ struct Mouse {
   static uint16_t decode(const char *name) {
     string s(name);
     if(!strbegin(name, "MS")) return 0;
-    ltrim(s, "MS");
+    s.ltrim("MS");
     unsigned id = strunsigned(s);
-    int pos = strpos(s, "::");
-    if(pos < 0) return 0;
-    s = substr(s, pos + 2);
+    auto pos = strpos(s, "::");
+    if(!pos) return 0;
+    s = substr(s, pos() + 2);
     for(unsigned i = 0; i < Limit; i++) {
       if(s == MouseScancodeName[i]) return Base + Size * id + i;
     }
@@ -312,11 +312,11 @@ struct Joypad {
   static uint16_t decode(const char *name) {
     string s(name);
     if(!strbegin(name, "JP")) return 0;
-    ltrim(s, "JP");
+    s.ltrim("JP");
     unsigned id = strunsigned(s);
-    int pos = strpos(s, "::");
-    if(pos < 0) return 0;
-    s = substr(s, pos + 2);
+    auto pos = strpos(s, "::");
+    if(!pos) return 0;
+    s = substr(s, pos() + 2);
     for(unsigned i = 0; i < Limit; i++) {
       if(s == JoypadScancodeName[i]) return Base + Size * id + i;
     }

bsnes/nall/platform.hpp

@@ -23,10 +23,12 @@
   #include <direct.h>
   #include <shlobj.h>
   #undef interface
+  #define dllexport __declspec(dllexport)
 #else
   #include <unistd.h>
   #include <pwd.h>
   #include <sys/stat.h>
+  #define dllexport
 #endif
 
 //==================
@@ -76,5 +78,45 @@
   #define alwaysinline  inline
 #endif
 
+//=========================
+//file system functionality
+//=========================
+
+#if defined(_WIN32)
+  inline char* realpath(const char *filename, char *resolvedname) {
+    wchar_t fn[_MAX_PATH] = L"";
+    _wfullpath(fn, nall::utf16_t(filename), _MAX_PATH);
+    strcpy(resolvedname, nall::utf8_t(fn));
+    return resolvedname;
+  }
+
+  inline char* userpath(char *path) {
+    wchar_t fp[_MAX_PATH] = L"";
+    SHGetFolderPathW(0, CSIDL_APPDATA | CSIDL_FLAG_CREATE, 0, 0, fp);
+    strcpy(path, nall::utf8_t(fp));
+    return path;
+  }
+
+  inline char* getcwd(char *path) {
+    wchar_t fp[_MAX_PATH] = L"";
+    _wgetcwd(fp, _MAX_PATH);
+    strcpy(path, nall::utf8_t(fp));
+    return path;
+  }
+#else
+  //realpath() already exists
+
+  inline char* userpath(char *path) {
+    *path = 0;
+    struct passwd *userinfo = getpwuid(getuid());
+    if(userinfo) strcpy(path, userinfo->pw_dir);
+    return path;
+  }
+
+  inline char *getcwd(char *path) {
+    return getcwd(path, PATH_MAX);
+  }
+#endif
+
 #endif
 

bsnes/nall/random.hpp

@@ -0,0 +1,20 @@
+#ifndef NALL_RANDOM_HPP
+#define NALL_RANDOM_HPP
+
+namespace nall {
+  //pseudo-random number generator
+  inline unsigned prng() {
+    static unsigned n = 0;
+    return n = (n >> 1) ^ (((n & 1) - 1) & 0xedb88320);
+  }
+
+  struct random_cyclic {
+    unsigned seed;
+    inline unsigned operator()() {
+      return seed = (seed >> 1) ^ (((seed & 1) - 1) & 0xedb88320);
+    }
+    random_cyclic() : seed(0) {}
+  };
+}
+
+#endif

bsnes/nall/serial.hpp

@@ -23,7 +23,7 @@ namespace nall {
       return ::write(port, (void*)data, length);
     }
 
-    bool open(const char *portname, unsigned rate) {
+    bool open(const char *portname, unsigned rate, bool flowcontrol) {
       close();
 
       port = ::open(portname, O_RDWR | O_NOCTTY | O_NDELAY | O_NONBLOCK);
@@ -41,8 +41,13 @@ namespace nall {
       attr.c_iflag &=~ (BRKINT | PARMRK | INPCK | ISTRIP | INLCR | IGNCR | ICRNL | IXON | IXOFF | IXANY);
       attr.c_iflag |=  (IGNBRK | IGNPAR);
       attr.c_oflag &=~ (OPOST);
-      attr.c_cflag &=~ (CSIZE | CSTOPB | PARENB);
-      attr.c_cflag |=  (CS8 | CREAD | CLOCAL);
+      attr.c_cflag &=~ (CSIZE | CSTOPB | PARENB | CLOCAL);
+      attr.c_cflag |=  (CS8 | CREAD);
+      if(flowcontrol == false) {
+        attr.c_cflag &= ~CRTSCTS;
+      } else {
+        attr.c_cflag |=  CRTSCTS;
+      }
       attr.c_cc[VTIME] = attr.c_cc[VMIN] = 0;
 
       if(tcsetattr(port, TCSANOW, &attr) == -1) { close(); return false; }

bsnes/nall/serializer.hpp

@@ -1,8 +1,9 @@
 #ifndef NALL_SERIALIZER_HPP
 #define NALL_SERIALIZER_HPP
 
+#include <type_traits>
+#include <utility>
 #include <nall/stdint.hpp>
-#include <nall/traits.hpp>
 #include <nall/utility.hpp>
 
 namespace nall {
@@ -16,6 +17,7 @@ namespace nall {
   //caveats:
   //- only plain-old-data can be stored. complex classes must provide serialize(serializer&);
   //- floating-point usage is not portable across platforms
+
   class serializer {
   public:
     enum mode_t { Load, Save, Size };
@@ -51,7 +53,7 @@ namespace nall {
     }
 
     template<typename T> void integer(T &value) {
-      enum { size = is_bool<T>::value ? 1 : sizeof(T) };
+      enum { size = std::is_same<bool, T>::value ? 1 : sizeof(T) };
       if(imode == Save) {
         for(unsigned n = 0; n < size; n++) idata[isize++] = value >> (n << 3);
       } else if(imode == Load) {
@@ -63,7 +65,7 @@ namespace nall {
     }
 
     template<typename T> void array(T &array) {
-      enum { size = sizeof(T) / sizeof(typename remove_extent<T>::type) };
+      enum { size = sizeof(T) / sizeof(typename std::remove_extent<T>::type) };
       for(unsigned n = 0; n < size; n++) integer(array[n]);
     }
 
@@ -102,7 +104,7 @@ namespace nall {
     }
 
     serializer(serializer &&s) {
-      operator=(move(s));
+      operator=(std::move(s));
     }
 
     //construction
@@ -110,6 +112,7 @@ namespace nall {
       imode = Size;
       idata = 0;
       isize = 0;
+      icapacity = 0;
     }
 
     serializer(unsigned capacity) {

bsnes/nall/snes/info.hpp

@@ -0,0 +1,864 @@
+#ifndef NALL_SNES_INFO_HPP
+#define NALL_SNES_INFO_HPP
+
+namespace nall {
+
+class snes_information {
+public:
+  string xml_memory_map;
+
+  inline snes_information(const uint8_t *data, unsigned size);
+
+//private:
+  inline void read_header(const uint8_t *data, unsigned size);
+  inline unsigned find_header(const uint8_t *data, unsigned size);
+  inline unsigned score_header(const uint8_t *data, unsigned size, unsigned addr);
+  inline unsigned gameboy_ram_size(const uint8_t *data, unsigned size);
+  inline bool gameboy_has_rtc(const uint8_t *data, unsigned size);
+
+  enum HeaderField {
+    CartName    = 0x00,
+    Mapper      = 0x15,
+    RomType     = 0x16,
+    RomSize     = 0x17,
+    RamSize     = 0x18,
+    CartRegion  = 0x19,
+    Company     = 0x1a,
+    Version     = 0x1b,
+    Complement  = 0x1c,  //inverse checksum
+    Checksum    = 0x1e,
+    ResetVector = 0x3c,
+  };
+
+  enum Mode {
+    ModeNormal,
+    ModeBsxSlotted,
+    ModeBsx,
+    ModeSufamiTurbo,
+    ModeSuperGameBoy,
+  };
+
+  enum Type {
+    TypeNormal,
+    TypeBsxSlotted,
+    TypeBsxBios,
+    TypeBsx,
+    TypeSufamiTurboBios,
+    TypeSufamiTurbo,
+    TypeSuperGameBoy1Bios,
+    TypeSuperGameBoy2Bios,
+    TypeGameBoy,
+    TypeUnknown,
+  };
+
+  enum Region {
+    NTSC,
+    PAL,
+  };
+
+  enum MemoryMapper {
+    LoROM,
+    HiROM,
+    ExLoROM,
+    ExHiROM,
+    SuperFXROM,
+    SA1ROM,
+    SPC7110ROM,
+    BSCLoROM,
+    BSCHiROM,
+    BSXROM,
+    STROM,
+  };
+
+  enum DSP1MemoryMapper {
+    DSP1Unmapped,
+    DSP1LoROM1MB,
+    DSP1LoROM2MB,
+    DSP1HiROM,
+  };
+
+  bool loaded;        //is a base cartridge inserted?
+  unsigned crc32;     //crc32 of all cartridges (base+slot(s))
+  unsigned rom_size;
+  unsigned ram_size;
+
+  Mode mode;
+  Type type;
+  Region region;
+  MemoryMapper mapper;
+  DSP1MemoryMapper dsp1_mapper;
+
+  bool has_bsx_slot;
+  bool has_superfx;
+  bool has_sa1;
+  bool has_srtc;
+  bool has_sdd1;
+  bool has_spc7110;
+  bool has_spc7110rtc;
+  bool has_cx4;
+  bool has_dsp1;
+  bool has_dsp2;
+  bool has_dsp3;
+  bool has_dsp4;
+  bool has_obc1;
+  bool has_st010;
+  bool has_st011;
+  bool has_st018;
+};
+
+snes_information::snes_information(const uint8_t *data, unsigned size) {
+  read_header(data, size);
+
+  string xml = "<?xml version='1.0' encoding='UTF-8'?>\n";
+
+  if(type == TypeBsx) {
+    xml << "<cartridge/>";
+    xml_memory_map = xml;
+    return;
+  }
+
+  if(type == TypeSufamiTurbo) {
+    xml << "<cartridge/>";
+    xml_memory_map = xml;
+    return;
+  }
+
+  if(type == TypeGameBoy) {
+    xml << "<cartridge rtc='" << gameboy_has_rtc(data, size) << "'>\n";
+    if(gameboy_ram_size(data, size) > 0) {
+      xml << "  <ram size='" << strhex(gameboy_ram_size(data, size)) << "'/>\n";
+    }
+    xml << "</cartridge>\n";
+    xml_memory_map = xml;
+    return;
+  }
+
+  xml << "<cartridge";
+  if(region == NTSC) {
+    xml << " region='NTSC'";
+  } else {
+    xml << " region='PAL'";
+  }
+  xml << ">\n";
+
+  if(type == TypeSuperGameBoy1Bios) {
+    xml << "  <rom>\n";
+    xml << "    <map mode='linear' address='00-7f:8000-ffff'/>\n";
+    xml << "    <map mode='linear' address='80-ff:8000-ffff'/>\n";
+    xml << "  </rom>\n";
+    xml << "  <supergameboy revision='1'>\n";
+    xml << "    <mmio>\n";
+    xml << "      <map address='00-3f:6000-7fff'/>\n";
+    xml << "      <map address='80-bf:6000-7fff'/>\n";
+    xml << "    </mmio>\n";
+    xml << "  </supergameboy>\n";
+  } else if(type == TypeSuperGameBoy2Bios) {
+    xml << "  <rom>\n";
+    xml << "    <map mode='linear' address='00-7f:8000-ffff'/>\n";
+    xml << "    <map mode='linear' address='80-ff:8000-ffff'/>\n";
+    xml << "  </rom>\n";
+    xml << "  <supergameboy revision='2'>\n";
+    xml << "    <mmio>\n";
+    xml << "      <map address='00-3f:6000-7fff'/>\n";
+    xml << "      <map address='80-bf:6000-7fff'/>\n";
+    xml << "    </mmio>\n";
+    xml << "  </supergameboy>\n";
+  } else if(has_spc7110) {
+    xml << "  <rom>\n";
+    xml << "    <map mode='shadow' address='00-0f:8000-ffff'/>\n";
+    xml << "    <map mode='shadow' address='80-bf:8000-ffff'/>\n";
+    xml << "    <map mode='linear' address='c0-cf:0000-ffff'/>\n";
+    xml << "  </rom>\n";
+
+    xml << "  <spc7110>\n";
+    xml << "    <mcu>\n";
+    xml << "      <map address='d0-ff:0000-ffff' offset='100000' size='" << strhex(size - 0x100000) << "'/>\n";
+    xml << "    </mcu>\n";
+    xml << "    <ram size='" << strhex(ram_size) << "'>\n";
+    xml << "      <map mode='linear' address='00:6000-7fff'/>\n";
+    xml << "      <map mode='linear' address='30:6000-7fff'/>\n";
+    xml << "    </ram>\n";
+    xml << "    <mmio>\n";
+    xml << "      <map address='00-3f:4800-483f'/>\n";
+    xml << "      <map address='80-bf:4800-483f'/>\n";
+    xml << "    </mmio>\n";
+    if(has_spc7110rtc) {
+      xml << "    <rtc>\n";
+      xml << "      <map address='00-3f:4840-4842'/>\n";
+      xml << "      <map address='80-bf:4840-4842'/>\n";
+      xml << "    </rtc>\n";
+    }
+    xml << "    <dcu>\n";
+    xml << "      <map address='50:0000-ffff'/>\n";
+    xml << "    </dcu>\n";
+    xml << "  </spc7110>\n";
+  } else if(mapper == LoROM) {
+    xml << "  <rom>\n";
+    xml << "    <map mode='linear' address='00-7f:8000-ffff'/>\n";
+    xml << "    <map mode='linear' address='80-ff:8000-ffff'/>\n";
+    xml << "  </rom>\n";
+
+    if(ram_size > 0) {
+      xml << "  <ram size='" << strhex(ram_size) << "'>\n";
+      xml << "    <map mode='linear' address='20-3f:6000-7fff'/>\n";
+      xml << "    <map mode='linear' address='a0-bf:6000-7fff'/>\n";
+      if((rom_size > 0x200000) || (ram_size > 32 * 1024)) {
+        xml << "    <map mode='linear' address='70-7f:0000-7fff'/>\n";
+        xml << "    <map mode='linear' address='f0-ff:0000-7fff'/>\n";
+      } else {
+        xml << "    <map mode='linear' address='70-7f:0000-ffff'/>\n";
+        xml << "    <map mode='linear' address='f0-ff:0000-ffff'/>\n";
+      }
+      xml << "  </ram>\n";
+    }
+  } else if(mapper == HiROM) {
+    xml << "  <rom>\n";
+    xml << "    <map mode='shadow' address='00-3f:8000-ffff'/>\n";
+    xml << "    <map mode='linear' address='40-7f:0000-ffff'/>\n";
+    xml << "    <map mode='shadow' address='80-bf:8000-ffff'/>\n";
+    xml << "    <map mode='linear' address='c0-ff:0000-ffff'/>\n";
+    xml << "  </rom>\n";
+
+    if(ram_size > 0) {
+      xml << "  <ram size='" << strhex(ram_size) << "'>\n";
+      xml << "    <map mode='linear' address='20-3f:6000-7fff'/>\n";
+      xml << "    <map mode='linear' address='a0-bf:6000-7fff'/>\n";
+      if((rom_size > 0x200000) || (ram_size > 32 * 1024)) {
+        xml << "    <map mode='linear' address='70-7f:0000-7fff'/>\n";
+      } else {
+        xml << "    <map mode='linear' address='70-7f:0000-ffff'/>\n";
+      }
+      xml << "  </ram>\n";
+    }
+  } else if(mapper == ExLoROM) {
+    xml << "  <rom>\n";
+    xml << "    <map mode='linear' address='00-3f:8000-ffff'/>\n";
+    xml << "    <map mode='linear' address='40-7f:0000-ffff'/>\n";
+    xml << "    <map mode='linear' address='80-bf:8000-ffff'/>\n";
+    xml << "  </rom>\n";
+
+    if(ram_size > 0) {
+      xml << "  <ram size='" << strhex(ram_size) << "'>\n";
+      xml << "    <map mode='linear' address='20-3f:6000-7fff'/>\n";
+      xml << "    <map mode='linear' address='a0-bf:6000-7fff'/>\n";
+      xml << "    <map mode='linear' address='70-7f:0000-7fff'/>\n";
+      xml << "  </ram>\n";
+    }
+  } else if(mapper == ExHiROM) {
+    xml << "  <rom>\n";
+    xml << "    <map mode='shadow' address='00-3f:8000-ffff' offset='400000'/>\n";
+    xml << "    <map mode='linear' address='40-7f:0000-ffff' offset='400000'/>\n";
+    xml << "    <map mode='shadow' address='80-bf:8000-ffff' offset='000000'/>\n";
+    xml << "    <map mode='linear' address='c0-ff:0000-ffff' offset='000000'/>\n";
+    xml << "  </rom>\n";
+
+    if(ram_size > 0) {
+      xml << "  <ram size='" << strhex(ram_size) << "'>\n";
+      xml << "    <map mode='linear' address='20-3f:6000-7fff'/>\n";
+      xml << "    <map mode='linear' address='a0-bf:6000-7fff'/>\n";
+      if((rom_size > 0x200000) || (ram_size > 32 * 1024)) {
+        xml << "    <map mode='linear' address='70-7f:0000-7fff'/>\n";
+      } else {
+        xml << "    <map mode='linear' address='70-7f:0000-ffff'/>\n";
+      }
+      xml << "  </ram>\n";
+    }
+  } else if(mapper == SuperFXROM) {
+    xml << "  <superfx revision='2'>\n";
+    xml << "    <rom>\n";
+    xml << "      <map mode='linear' address='00-3f:8000-ffff'/>\n";
+    xml << "      <map mode='linear' address='40-5f:0000-ffff'/>\n";
+    xml << "      <map mode='linear' address='80-bf:8000-ffff'/>\n";
+    xml << "      <map mode='linear' address='c0-df:0000-ffff'/>\n";
+    xml << "    </rom>\n";
+    xml << "    <ram size='" << strhex(ram_size) << "'>\n";
+    xml << "      <map mode='linear' address='00-3f:6000-7fff' size='2000'/>\n";
+    xml << "      <map mode='linear' address='60-7f:0000-ffff'/>\n";
+    xml << "      <map mode='linear' address='80-bf:6000-7fff' size='2000'/>\n";
+    xml << "      <map mode='linear' address='e0-ff:0000-ffff'/>\n";
+    xml << "    </ram>\n";
+    xml << "    <mmio>\n";
+    xml << "      <map address='00-3f:3000-32ff'/>\n";
+    xml << "      <map address='80-bf:3000-32ff'/>\n";
+    xml << "    </mmio>\n";
+    xml << "  </superfx>\n";
+  } else if(mapper == SA1ROM) {
+    xml << "  <sa1>\n";
+    xml << "    <rom>\n";
+    xml << "      <map mode='linear' address='00-3f:8000-ffff'/>\n";
+    xml << "      <map mode='linear' address='80-bf:8000-ffff'/>\n";
+    xml << "      <map mode='linear' address='c0-ff:0000-ffff'/>\n";
+    xml << "    </rom>\n";
+    xml << "    <iram size='800'>\n";
+    xml << "      <map mode='linear' address='00-3f:3000-37ff'/>\n";
+    xml << "      <map mode='linear' address='80-bf:3000-37ff'/>\n";
+    xml << "    </iram>\n";
+    xml << "    <bwram size='" << strhex(ram_size) << "'>\n";
+    xml << "      <map mode='linear' address='00-3f:6000-7fff'/>\n";
+    xml << "      <map mode='linear' address='40-4f:0000-ffff'/>\n";
+    xml << "      <map mode='linear' address='80-bf:6000-7fff'/>\n";
+    xml << "    </bwram>\n";
+    xml << "    <mmio>\n";
+    xml << "      <map address='00-3f:2200-23ff'/>\n";
+    xml << "      <map address='80-bf:2200-23ff'/>\n";
+    xml << "    </mmio>\n";
+    xml << "  </sa1>\n";
+  } else if(mapper == BSCLoROM) {
+    xml << "  <rom>\n";
+    xml << "    <map mode='linear' address='00-1f:8000-ffff' offset='000000'/>\n";
+    xml << "    <map mode='linear' address='20-3f:8000-ffff' offset='100000'/>\n";
+    xml << "    <map mode='linear' address='80-9f:8000-ffff' offset='200000'/>\n";
+    xml << "    <map mode='linear' address='a0-bf:8000-ffff' offset='100000'/>\n";
+    xml << "  </rom>\n";
+    xml << "  <ram size='" << strhex(ram_size) << "'>\n";
+    xml << "    <map mode='linear' address='70-7f:0000-7fff'/>\n";
+    xml << "    <map mode='linear' address='f0-ff:0000-7fff'/>\n";
+    xml << "  </ram>\n";
+    xml << "  <bsx>\n";
+    xml << "    <slot>\n";
+    xml << "      <map mode='linear' address='c0-ef:0000-ffff'/>\n";
+    xml << "    </slot>\n";
+    xml << "  </bsx>\n";
+  } else if(mapper == BSCHiROM) {
+    xml << "  <rom>\n";
+    xml << "    <map mode='shadow' address='00-1f:8000-ffff'/>\n";
+    xml << "    <map mode='linear' address='40-5f:0000-ffff'/>\n";
+    xml << "    <map mode='shadow' address='80-9f:8000-ffff'/>\n";
+    xml << "    <map mode='linear' address='c0-df:0000-ffff'/>\n";
+    xml << "  </rom>\n";
+    xml << "  <ram size='" << strhex(ram_size) << "'>\n";
+    xml << "    <map mode='linear' address='20-3f:6000-7fff'/>\n";
+    xml << "    <map mode='linear' address='a0-bf:6000-7fff'/>\n";
+    xml << "  </ram>\n";
+    xml << "  <bsx>\n";
+    xml << "    <slot>\n";
+    xml << "      <map mode='shadow' address='20-3f:8000-ffff'/>\n";
+    xml << "      <map mode='linear' address='60-7f:0000-ffff'/>\n";
+    xml << "      <map mode='shadow' address='a0-bf:8000-ffff'/>\n";
+    xml << "      <map mode='linear' address='e0-ff:0000-ffff'/>\n";
+    xml << "    </slot>\n";
+    xml << "  </bsx>\n";
+  } else if(mapper == BSXROM) {
+    xml << "  <rom>\n";
+    xml << "    <map mode='linear' address='00-3f:8000-ffff'/>\n";
+    xml << "    <map mode='linear' address='80-bf:8000-ffff'/>\n";
+    xml << "  </rom>\n";
+    xml << "  <bsx>\n";
+    xml << "    <mmio>\n";
+    xml << "      <map address='00-3f:5000-5fff'/>\n";
+    xml << "      <map address='80-bf:5000-5fff'/>\n";
+    xml << "    </mmio>\n";
+    xml << "  </bsx>\n";
+  } else if(mapper == STROM) {
+    xml << "  <rom>\n";
+    xml << "    <map mode='linear' address='00-1f:8000-ffff'/>\n";
+    xml << "    <map mode='linear' address='80-9f:8000-ffff'/>\n";
+    xml << "  </rom>\n";
+    xml << "  <sufamiturbo>\n";
+    xml << "    <slot id='A'>\n";
+    xml << "      <rom>\n";
+    xml << "        <map mode='linear' address='20-3f:8000-ffff'/>\n";
+    xml << "        <map mode='linear' address='a0-bf:8000-ffff'/>\n";
+    xml << "      </rom>\n";
+    xml << "      <ram>\n";
+    xml << "        <map mode='linear' address='60-63:8000-ffff'/>\n";
+    xml << "        <map mode='linear' address='e0-e3:8000-ffff'/>\n";
+    xml << "      </ram>\n";
+    xml << "    </slot>\n";
+    xml << "    <slot id='B'>\n";
+    xml << "      <rom>\n";
+    xml << "        <map mode='linear' address='40-5f:8000-ffff'/>\n";
+    xml << "        <map mode='linear' address='c0-df:8000-ffff'/>\n";
+    xml << "      </rom>\n";
+    xml << "      <ram>\n";
+    xml << "        <map mode='linear' address='70-73:8000-ffff'/>\n";
+    xml << "        <map mode='linear' address='f0-f3:8000-ffff'/>\n";
+    xml << "      </ram>\n";
+    xml << "    </slot>\n";
+    xml << "  </sufamiturbo>\n";
+  }
+
+  if(has_srtc) {
+    xml << "  <srtc>\n";
+    xml << "    <mmio>\n";
+    xml << "      <map address='00-3f:2800-2801'/>\n";
+    xml << "      <map address='80-bf:2800-2801'/>\n";
+    xml << "    </mmio>\n";
+    xml << "  </srtc>\n";
+  }
+
+  if(has_sdd1) {
+    xml << "  <sdd1>\n";
+    xml << "    <mcu>\n";
+    xml << "      <map address='c0-ff:0000-ffff'/>\n";
+    xml << "    </mcu>\n";
+    xml << "    <mmio>\n";
+    xml << "      <map address='00-3f:4800-4807'/>\n";
+    xml << "      <map address='80-bf:4800-4807'/>\n";
+    xml << "    </mmio>\n";
+    xml << "  </sdd1>\n";
+  }
+
+  if(has_cx4) {
+    xml << "  <cx4>\n";
+    xml << "    <mmio>\n";
+    xml << "      <map address='00-3f:6000-7fff'/>\n";
+    xml << "      <map address='80-bf:6000-7fff'/>\n";
+    xml << "    </mmio>\n";
+    xml << "  </cx4>\n";
+  }
+
+  if(has_dsp1) {
+    xml << "  <necdsp program='DSP-1B'>\n";
+    if(dsp1_mapper == DSP1LoROM1MB) {
+      xml << "    <dr>\n";
+      xml << "      <map address='20-3f:8000-bfff'/>\n";
+      xml << "      <map address='a0-bf:8000-bfff'/>\n";
+      xml << "    </dr>\n";
+      xml << "    <sr>\n";
+      xml << "      <map address='20-3f:c000-ffff'/>\n";
+      xml << "      <map address='a0-bf:c000-ffff'/>\n";
+      xml << "    </sr>\n";
+    } else if(dsp1_mapper == DSP1LoROM2MB) {
+      xml << "    <dr>\n";
+      xml << "      <map address='60-6f:0000-3fff'/>\n";
+      xml << "      <map address='e0-ef:0000-3fff'/>\n";
+      xml << "    </dr>\n";
+      xml << "    <sr>\n";
+      xml << "      <map address='60-6f:4000-7fff'/>\n";
+      xml << "      <map address='e0-ef:4000-7fff'/>\n";
+      xml << "    </sr>\n";
+    } else if(dsp1_mapper == DSP1HiROM) {
+      xml << "    <dr>\n";
+      xml << "      <map address='00-1f:6000-6fff'/>\n";
+      xml << "      <map address='80-9f:6000-6fff'/>\n";
+      xml << "    </dr>\n";
+      xml << "    <sr>\n";
+      xml << "      <map address='00-1f:7000-7fff'/>\n";
+      xml << "      <map address='80-9f:7000-7fff'/>\n";
+      xml << "    </sr>\n";
+    }
+    xml << "  </necdsp>\n";
+  }
+
+  if(has_dsp2) {
+    xml << "  <necdsp program='DSP-2'>\n";
+    xml << "    <dr>\n";
+    xml << "      <map address='20-3f:8000-bfff'/>\n";
+    xml << "      <map address='a0-bf:8000-bfff'/>\n";
+    xml << "    </dr>\n";
+    xml << "    <sr>\n";
+    xml << "      <map address='20-3f:c000-ffff'/>\n";
+    xml << "      <map address='a0-bf:c000-ffff'/>\n";
+    xml << "    </sr>\n";
+    xml << "  </necdsp>\n";
+  }
+
+  if(has_dsp3) {
+    xml << "  <necdsp program='DSP-3'>\n";
+    xml << "    <dr>\n";
+    xml << "      <map address='20-3f:8000-bfff'/>\n";
+    xml << "      <map address='a0-bf:8000-bfff'/>\n";
+    xml << "    </dr>\n";
+    xml << "    <sr>\n";
+    xml << "      <map address='20-3f:c000-ffff'/>\n";
+    xml << "      <map address='a0-bf:c000-ffff'/>\n";
+    xml << "    </sr>\n";
+    xml << "  </necdsp>\n";
+  }
+
+  if(has_dsp4) {
+    xml << "  <necdsp program='DSP-4'>\n";
+    xml << "    <dr>\n";
+    xml << "      <map address='30-3f:8000-bfff'/>\n";
+    xml << "      <map address='b0-bf:8000-bfff'/>\n";
+    xml << "    </dr>\n";
+    xml << "    <sr>\n";
+    xml << "      <map address='30-3f:c000-ffff'/>\n";
+    xml << "      <map address='b0-bf:c000-ffff'/>\n";
+    xml << "    </sr>\n";
+    xml << "  </necdsp>\n";
+  }
+
+  if(has_obc1) {
+    xml << "  <obc1>\n";
+    xml << "    <mmio>\n";
+    xml << "      <map address='00-3f:6000-7fff'/>\n";
+    xml << "      <map address='80-bf:6000-7fff'/>\n";
+    xml << "    </mmio>\n";
+    xml << "  </obc1>\n";
+  }
+
+  if(has_st010) {
+    xml << "  <setadsp program='ST-0010'>\n";
+    xml << "    <mmio>\n";
+    xml << "      <map address='68-6f:0000-0fff'/>\n";
+    xml << "      <map address='e8-ef:0000-0fff'/>\n";
+    xml << "    </mmio>\n";
+    xml << "  </setadsp>\n";
+  }
+
+  if(has_st011) {
+    //ST-0011 addresses not verified; chip is unsupported
+    xml << "  <setadsp program='ST-0011'>\n";
+    xml << "    <mmio>\n";
+    xml << "      <map address='68-6f:0000-0fff'/>\n";
+    xml << "      <map address='e8-ef:0000-0fff'/>\n";
+    xml << "    </mmio>\n";
+    xml << "  </setadsp>\n";
+  }
+
+  if(has_st018) {
+    xml << "  <setarisc program='ST-0018'>\n";
+    xml << "    <mmio>\n";
+    xml << "      <map address='00-3f:3800-38ff'/>\n";
+    xml << "      <map address='80-bf:3800-38ff'/>\n";
+    xml << "    </mmio>\n";
+    xml << "  </setarisc>\n";
+  }
+
+  xml << "</cartridge>\n";
+  xml_memory_map = xml;
+}
+
+void snes_information::read_header(const uint8_t *data, unsigned size) {
+  type        = TypeUnknown;
+  mapper      = LoROM;
+  dsp1_mapper = DSP1Unmapped;
+  region      = NTSC;
+  rom_size    = size;
+  ram_size    = 0;
+
+  has_bsx_slot   = false;
+  has_superfx    = false;
+  has_sa1        = false;
+  has_srtc       = false;
+  has_sdd1       = false;
+  has_spc7110    = false;
+  has_spc7110rtc = false;
+  has_cx4        = false;
+  has_dsp1       = false;
+  has_dsp2       = false;
+  has_dsp3       = false;
+  has_dsp4       = false;
+  has_obc1       = false;
+  has_st010      = false;
+  has_st011      = false;
+  has_st018      = false;
+
+  //=====================
+  //detect Game Boy carts
+  //=====================
+
+  if(size >= 0x0140) {
+    if(data[0x0104] == 0xce && data[0x0105] == 0xed && data[0x0106] == 0x66 && data[0x0107] == 0x66
+    && data[0x0108] == 0xcc && data[0x0109] == 0x0d && data[0x010a] == 0x00 && data[0x010b] == 0x0b) {
+      type = TypeGameBoy;
+      return;
+    }
+  }
+
+  const unsigned index = find_header(data, size);
+  const uint8_t mapperid = data[index + Mapper];
+  const uint8_t rom_type = data[index + RomType];
+  const uint8_t rom_size = data[index + RomSize];
+  const uint8_t company  = data[index + Company];
+  const uint8_t regionid = data[index + CartRegion] & 0x7f;
+
+  ram_size = 1024 << (data[index + RamSize] & 7);
+  if(ram_size == 1024) ram_size = 0;  //no RAM present
+
+  //0, 1, 13 = NTSC; 2 - 12 = PAL
+  region = (regionid <= 1 || regionid >= 13) ? NTSC : PAL;
+
+  //=======================
+  //detect BS-X flash carts
+  //=======================
+
+  if(data[index + 0x13] == 0x00 || data[index + 0x13] == 0xff) {
+    if(data[index + 0x14] == 0x00) {
+      const uint8_t n15 = data[index + 0x15];
+      if(n15 == 0x00 || n15 == 0x80 || n15 == 0x84 || n15 == 0x9c || n15 == 0xbc || n15 == 0xfc) {
+        if(data[index + 0x1a] == 0x33 || data[index + 0x1a] == 0xff) {
+          type = TypeBsx;
+          mapper = BSXROM;
+          region = NTSC;  //BS-X only released in Japan
+          return;
+        }
+      }
+    }
+  }
+
+  //=========================
+  //detect Sufami Turbo carts
+  //=========================
+
+  if(!memcmp(data, "BANDAI SFC-ADX", 14)) {
+    if(!memcmp(data + 16, "SFC-ADX BACKUP", 14)) {
+      type = TypeSufamiTurboBios;
+    } else {
+      type = TypeSufamiTurbo;
+    }
+    mapper = STROM;
+    region = NTSC;  //Sufami Turbo only released in Japan
+    return;         //RAM size handled outside this routine
+  }
+
+  //==========================
+  //detect Super Game Boy BIOS
+  //==========================
+
+  if(!memcmp(data + index, "Super GAMEBOY2", 14)) {
+    type = TypeSuperGameBoy2Bios;
+    return;
+  }
+
+  if(!memcmp(data + index, "Super GAMEBOY", 13)) {
+    type = TypeSuperGameBoy1Bios;
+    return;
+  }
+
+  //=====================
+  //detect standard carts
+  //=====================
+
+  //detect presence of BS-X flash cartridge connector (reads extended header information)
+  if(data[index - 14] == 'Z') {
+    if(data[index - 11] == 'J') {
+      uint8_t n13 = data[index - 13];
+      if((n13 >= 'A' && n13 <= 'Z') || (n13 >= '0' && n13 <= '9')) {
+        if(company == 0x33 || (data[index - 10] == 0x00 && data[index - 4] == 0x00)) {
+          has_bsx_slot = true;
+        }
+      }
+    }
+  }
+
+  if(has_bsx_slot) {
+    if(!memcmp(data + index, "Satellaview BS-X     ", 21)) {
+      //BS-X base cart
+      type = TypeBsxBios;
+      mapper = BSXROM;
+      region = NTSC;  //BS-X only released in Japan
+      return;         //RAM size handled internally by load_cart_bsx() -> BSXCart class
+    } else {
+      type = TypeBsxSlotted;
+      mapper = (index == 0x7fc0 ? BSCLoROM : BSCHiROM);
+      region = NTSC;  //BS-X slotted cartridges only released in Japan
+    }
+  } else {
+    //standard cart
+    type = TypeNormal;
+
+    if(index == 0x7fc0 && size >= 0x401000) {
+      mapper = ExLoROM;
+    } else if(index == 0x7fc0 && mapperid == 0x32) {
+      mapper = ExLoROM;
+    } else if(index == 0x7fc0) {
+      mapper = LoROM;
+    } else if(index == 0xffc0) {
+      mapper = HiROM;
+    } else {  //index == 0x40ffc0
+      mapper = ExHiROM;
+    }
+  }
+
+  if(mapperid == 0x20 && (rom_type == 0x13 || rom_type == 0x14 || rom_type == 0x15 || rom_type == 0x1a)) {
+    has_superfx = true;
+    mapper = SuperFXROM;
+    ram_size = 1024 << (data[index - 3] & 7);
+    if(ram_size == 1024) ram_size = 0;
+  }
+
+  if(mapperid == 0x23 && (rom_type == 0x32 || rom_type == 0x34 || rom_type == 0x35)) {
+    has_sa1 = true;
+    mapper = SA1ROM;
+  }
+
+  if(mapperid == 0x35 && rom_type == 0x55) {
+    has_srtc = true;
+  }
+
+  if(mapperid == 0x32 && (rom_type == 0x43 || rom_type == 0x45)) {
+    has_sdd1 = true;
+  }
+
+  if(mapperid == 0x3a && (rom_type == 0xf5 || rom_type == 0xf9)) {
+    has_spc7110 = true;
+    has_spc7110rtc = (rom_type == 0xf9);
+    mapper = SPC7110ROM;
+  }
+
+  if(mapperid == 0x20 && rom_type == 0xf3) {
+    has_cx4 = true;
+  }
+
+  if((mapperid == 0x20 || mapperid == 0x21) && rom_type == 0x03) {
+    has_dsp1 = true;
+  }
+
+  if(mapperid == 0x30 && rom_type == 0x05 && company != 0xb2) {
+    has_dsp1 = true;
+  }
+
+  if(mapperid == 0x31 && (rom_type == 0x03 || rom_type == 0x05)) {
+    has_dsp1 = true;
+  }
+
+  if(has_dsp1 == true) {
+    if((mapperid & 0x2f) == 0x20 && size <= 0x100000) {
+      dsp1_mapper = DSP1LoROM1MB;
+    } else if((mapperid & 0x2f) == 0x20) {
+      dsp1_mapper = DSP1LoROM2MB;
+    } else if((mapperid & 0x2f) == 0x21) {
+      dsp1_mapper = DSP1HiROM;
+    }
+  }
+
+  if(mapperid == 0x20 && rom_type == 0x05) {
+    has_dsp2 = true;
+  }
+
+  if(mapperid == 0x30 && rom_type == 0x05 && company == 0xb2) {
+    has_dsp3 = true;
+  }
+
+  if(mapperid == 0x30 && rom_type == 0x03) {
+    has_dsp4 = true;
+  }
+
+  if(mapperid == 0x30 && rom_type == 0x25) {
+    has_obc1 = true;
+  }
+
+  if(mapperid == 0x30 && rom_type == 0xf6 && rom_size >= 10) {
+    has_st010 = true;
+  }
+
+  if(mapperid == 0x30 && rom_type == 0xf6 && rom_size < 10) {
+    has_st011 = true;
+  }
+
+  if(mapperid == 0x30 && rom_type == 0xf5) {
+    has_st018 = true;
+  }
+}
+
+unsigned snes_information::find_header(const uint8_t *data, unsigned size) {
+  unsigned score_lo = score_header(data, size, 0x007fc0);
+  unsigned score_hi = score_header(data, size, 0x00ffc0);
+  unsigned score_ex = score_header(data, size, 0x40ffc0);
+  if(score_ex) score_ex += 4;  //favor ExHiROM on images > 32mbits
+
+  if(score_lo >= score_hi && score_lo >= score_ex) {
+    return 0x007fc0;
+  } else if(score_hi >= score_ex) {
+    return 0x00ffc0;
+  } else {
+    return 0x40ffc0;
+  }
+}
+
+unsigned snes_information::score_header(const uint8_t *data, unsigned size, unsigned addr) {
+  if(size < addr + 64) return 0;  //image too small to contain header at this location?
+  int score = 0;
+
+  uint16_t resetvector = data[addr + ResetVector] | (data[addr + ResetVector + 1] << 8);
+  uint16_t checksum    = data[addr + Checksum   ] | (data[addr + Checksum    + 1] << 8);
+  uint16_t complement  = data[addr + Complement ] | (data[addr + Complement  + 1] << 8);
+
+  uint8_t resetop = data[(addr & ~0x7fff) | (resetvector & 0x7fff)];  //first opcode executed upon reset
+  uint8_t mapper  = data[addr + Mapper] & ~0x10;                      //mask off irrelevent FastROM-capable bit
+
+  //$00:[000-7fff] contains uninitialized RAM and MMIO.
+  //reset vector must point to ROM at $00:[8000-ffff] to be considered valid.
+  if(resetvector < 0x8000) return 0;
+
+  //some images duplicate the header in multiple locations, and others have completely
+  //invalid header information that cannot be relied upon.
+  //below code will analyze the first opcode executed at the specified reset vector to
+  //determine the probability that this is the correct header.
+
+  //most likely opcodes
+  if(resetop == 0x78  //sei
+  || resetop == 0x18  //clc (clc; xce)
+  || resetop == 0x38  //sec (sec; xce)
+  || resetop == 0x9c  //stz $nnnn (stz $4200)
+  || resetop == 0x4c  //jmp $nnnn
+  || resetop == 0x5c  //jml $nnnnnn
+  ) score += 8;
+
+  //plausible opcodes
+  if(resetop == 0xc2  //rep #$nn
+  || resetop == 0xe2  //sep #$nn
+  || resetop == 0xad  //lda $nnnn
+  || resetop == 0xae  //ldx $nnnn
+  || resetop == 0xac  //ldy $nnnn
+  || resetop == 0xaf  //lda $nnnnnn
+  || resetop == 0xa9  //lda #$nn
+  || resetop == 0xa2  //ldx #$nn
+  || resetop == 0xa0  //ldy #$nn
+  || resetop == 0x20  //jsr $nnnn
+  || resetop == 0x22  //jsl $nnnnnn
+  ) score += 4;
+
+  //implausible opcodes
+  if(resetop == 0x40  //rti
+  || resetop == 0x60  //rts
+  || resetop == 0x6b  //rtl
+  || resetop == 0xcd  //cmp $nnnn
+  || resetop == 0xec  //cpx $nnnn
+  || resetop == 0xcc  //cpy $nnnn
+  ) score -= 4;
+
+  //least likely opcodes
+  if(resetop == 0x00  //brk #$nn
+  || resetop == 0x02  //cop #$nn
+  || resetop == 0xdb  //stp
+  || resetop == 0x42  //wdm
+  || resetop == 0xff  //sbc $nnnnnn,x
+  ) score -= 8;
+
+  //at times, both the header and reset vector's first opcode will match ...
+  //fallback and rely on info validity in these cases to determine more likely header.
+
+  //a valid checksum is the biggest indicator of a valid header.
+  if((checksum + complement) == 0xffff && (checksum != 0) && (complement != 0)) score += 4;
+
+  if(addr == 0x007fc0 && mapper == 0x20) score += 2;  //0x20 is usually LoROM
+  if(addr == 0x00ffc0 && mapper == 0x21) score += 2;  //0x21 is usually HiROM
+  if(addr == 0x007fc0 && mapper == 0x22) score += 2;  //0x22 is usually ExLoROM
+  if(addr == 0x40ffc0 && mapper == 0x25) score += 2;  //0x25 is usually ExHiROM
+
+  if(data[addr + Company] == 0x33) score += 2;        //0x33 indicates extended header
+  if(data[addr + RomType] < 0x08) score++;
+  if(data[addr + RomSize] < 0x10) score++;
+  if(data[addr + RamSize] < 0x08) score++;
+  if(data[addr + CartRegion] < 14) score++;
+
+  if(score < 0) score = 0;
+  return score;
+}
+
+unsigned snes_information::gameboy_ram_size(const uint8_t *data, unsigned size) {
+  if(size < 512) return 0;
+  switch(data[0x0149]) {
+    case 0x00: return   0 * 1024;
+    case 0x01: return   8 * 1024;
+    case 0x02: return   8 * 1024;
+    case 0x03: return  32 * 1024;
+    case 0x04: return 128 * 1024;
+    case 0x05: return 128 * 1024;
+    default:   return 128 * 1024;
+  }
+}
+
+bool snes_information::gameboy_has_rtc(const uint8_t *data, unsigned size) {
+  if(size < 512) return false;
+  if(data[0x0147] == 0x0f ||data[0x0147] == 0x10) return true;
+  return false;
+}
+
+}
+
+#endif

bsnes/nall/string.hpp

@@ -2,20 +2,26 @@
 #define NALL_STRING_HPP
 
 #include <initializer_list>
+#include <nall/platform.hpp>
+#include <nall/utility.hpp>
+
 #include <nall/string/base.hpp>
+#include <nall/string/bsv.hpp>
 #include <nall/string/core.hpp>
 #include <nall/string/cast.hpp>
 #include <nall/string/compare.hpp>
 #include <nall/string/convert.hpp>
 #include <nall/string/filename.hpp>
-#include <nall/string/match.hpp>
 #include <nall/string/math.hpp>
+#include <nall/string/platform.hpp>
 #include <nall/string/strl.hpp>
+#include <nall/string/strpos.hpp>
 #include <nall/string/trim.hpp>
 #include <nall/string/replace.hpp>
 #include <nall/string/split.hpp>
 #include <nall/string/utility.hpp>
 #include <nall/string/variadic.hpp>
+#include <nall/string/wrapper.hpp>
 #include <nall/string/xml.hpp>
 
 namespace nall {

bsnes/nall/string/base.hpp

@@ -0,0 +1,159 @@
+#ifndef NALL_STRING_BASE_HPP
+#define NALL_STRING_BASE_HPP
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <nall/concept.hpp>
+#include <nall/stdint.hpp>
+#include <nall/utf8.hpp>
+#include <nall/vector.hpp>
+
+namespace nall {
+  class string;
+  template<typename T> inline string to_string(T);
+
+  class string {
+  public:
+    inline void reserve(unsigned);
+
+    inline string& assign(const char*);
+    inline string& append(const char*);
+    inline string& append(bool);
+    inline string& append(signed int value);
+    inline string& append(unsigned int value);
+    inline string& append(double value);
+
+    inline bool readfile(const char*);
+
+    inline string& replace (const char*, const char*);
+    inline string& qreplace(const char*, const char*);
+
+    inline unsigned length() const;
+
+    inline bool equals(const char*) const;
+    inline bool iequals(const char*) const;
+
+    inline bool wildcard(const char*) const;
+    inline bool iwildcard(const char*) const;
+
+    inline bool beginswith(const char*) const;
+    inline bool ibeginswith(const char*) const;
+    inline bool endswith(const char*) const;
+    inline bool iendswith(const char*) const;
+
+    inline string& lower();
+    inline string& upper();
+    inline string& transform(const char *before, const char *after);
+
+    template<unsigned limit = 0> inline string& ltrim(const char *key = " ");
+    template<unsigned limit = 0> inline string& rtrim(const char *key = " ");
+    template<unsigned limit = 0> inline string& trim (const char *key = " ");
+
+    inline optional<unsigned> position(const char *key) const;
+    inline optional<unsigned> qposition(const char *key) const;
+
+    template<typename T> inline string& operator= (T value);
+    template<typename T> inline string& operator<<(T value);
+
+    inline operator const char*() const;
+    inline char* operator()();
+    inline char& operator[](int);
+
+    inline bool operator==(const char*) const;
+    inline bool operator!=(const char*) const;
+    inline bool operator< (const char*) const;
+    inline bool operator<=(const char*) const;
+    inline bool operator> (const char*) const;
+    inline bool operator>=(const char*) const;
+
+    inline string& operator=(const string&);
+    inline string& operator=(string&&);
+
+    template<typename... Args> inline string(Args&&... args);
+    inline string(const string&);
+    inline string(string&&);
+    inline ~string();
+
+  protected:
+    char *data;
+    unsigned size;
+
+  #if defined(QSTRING_H)
+  public:
+    inline operator QString() const;
+  #endif
+  };
+
+  class lstring : public linear_vector<string> {
+  public:
+    template<typename T> inline lstring& operator<<(T value);
+
+    inline optional<unsigned> find(const char*) const;
+    template<unsigned limit = 0> inline void split (const char*, const char*);
+    template<unsigned limit = 0> inline void qsplit(const char*, const char*);
+
+    lstring();
+    lstring(std::initializer_list<string>);
+  };
+
+  //compare.hpp
+  inline char chrlower(char c);
+  inline char chrupper(char c);
+  inline int stricmp(const char *str1, const char *str2);
+  inline bool wildcard(const char *str, const char *pattern);
+  inline bool iwildcard(const char *str, const char *pattern);
+  inline bool strbegin (const char *str, const char *key);
+  inline bool stribegin(const char *str, const char *key);
+  inline bool strend (const char *str, const char *key);
+  inline bool striend(const char *str, const char *key);
+
+  //convert.hpp
+  inline char* strlower(char *str);
+  inline char* strupper(char *str);
+  inline char* strtr(char *dest, const char *before, const char *after);
+  inline uintmax_t strhex     (const char *str);
+  inline intmax_t  strsigned  (const char *str);
+  inline uintmax_t strunsigned(const char *str);
+  inline uintmax_t strbin     (const char *str);
+  inline double    strdouble  (const char *str);
+
+  //math.hpp
+  inline bool strint (const char *str, int &result);
+  inline bool strmath(const char *str, int &result);
+
+  //platform.hpp
+  inline string realpath(const char *name);
+  inline string userpath();
+  inline string currentpath();
+
+  //strl.hpp
+  inline unsigned strlcpy(char *dest, const char *src, unsigned length);
+  inline unsigned strlcat(char *dest, const char *src, unsigned length);
+
+  //strpos.hpp
+  inline optional<unsigned> strpos(const char *str, const char *key);
+  inline optional<unsigned> qstrpos(const char *str, const char *key);
+
+  //trim.hpp
+  template<unsigned limit = 0> inline char* ltrim(char *str, const char *key = " ");
+  template<unsigned limit = 0> inline char* rtrim(char *str, const char *key = " ");
+  template<unsigned limit = 0> inline char* trim (char *str, const char *key = " ");
+
+  //utility.hpp
+  inline unsigned strlcpy(string &dest, const char *src, unsigned length);
+  inline unsigned strlcat(string &dest, const char *src, unsigned length);
+  inline string substr(const char *src, unsigned start = 0, unsigned length = 0);
+  template<unsigned length = 0, char padding = '0'> inline string strhex(uintmax_t value);
+  template<unsigned length = 0, char padding = '0'> inline string strsigned(intmax_t value);
+  template<unsigned length = 0, char padding = '0'> inline string strunsigned(uintmax_t value);
+  template<unsigned length = 0, char padding = '0'> inline string strbin(uintmax_t value);
+  inline unsigned strdouble(char *str, double value);
+  inline string strdouble(double value);
+
+  //variadic.hpp
+  template<typename... Args> inline void print(Args&&... args);
+};
+
+#endif

bsnes/nall/string/bsv.hpp

@@ -0,0 +1,75 @@
+#ifndef NALL_STRING_BSV_HPP
+#define NALL_STRING_BSV_HPP
+
+//BSV parser
+//version 0.01
+
+namespace nall {
+
+inline string bsv_decode(const char *input) {
+  string output;
+  unsigned offset = 0;
+  while(*input) {
+    //illegal characters
+    if(*input == '}' ) return "";
+    if(*input == '\r') return "";
+    if(*input == '\n') return "";
+
+    //normal characters
+    if(*input != '{') { output[offset++] = *input++;  continue; }
+
+    //entities
+    if(strbegin(input, "{lf}")) { output[offset++] = '\n'; input += 4; continue; }
+    if(strbegin(input, "{lb}")) { output[offset++] = '{';  input += 4; continue; }
+    if(strbegin(input, "{rb}")) { output[offset++] = '}';  input += 4; continue; }
+
+    //illegal entities
+    return "";
+  }
+  output[offset] = 0;
+  return output;
+}
+
+inline string bsv_encode(const char *input) {
+  string output;
+  unsigned offset = 0;
+  while(*input) {
+    //illegal characters
+    if(*input == '\r') return "";
+
+    if(*input == '\n') {
+      output[offset++] = '{';
+      output[offset++] = 'l';
+      output[offset++] = 'f';
+      output[offset++] = '}';
+      input++;
+      continue;
+    }
+
+    if(*input == '{') {
+      output[offset++] = '{';
+      output[offset++] = 'l';
+      output[offset++] = 'b';
+      output[offset++] = '}';
+      input++;
+      continue;
+    }
+
+    if(*input == '}') {
+      output[offset++] = '{';
+      output[offset++] = 'r';
+      output[offset++] = 'b';
+      output[offset++] = '}';
+      input++;
+      continue;
+    }
+
+    output[offset++] = *input++;
+  }
+  output[offset] = 0;
+  return output;
+}
+
+}
+
+#endif

bsnes/nall/string/cast.hpp

@@ -0,0 +1,32 @@
+#ifndef NALL_STRING_CAST_HPP
+#define NALL_STRING_CAST_HPP
+
+namespace nall {
+
+//this is needed, as C++0x does not support explicit template specialization inside classes
+template<> inline string to_string<bool>         (bool v)          { return v ? "true" : "false"; }
+template<> inline string to_string<signed int>   (signed int v)    { return strsigned(v); }
+template<> inline string to_string<unsigned int> (unsigned int v)  { return strunsigned(v); }
+template<> inline string to_string<double>       (double v)        { return strdouble(v); }
+template<> inline string to_string<char*>        (char *v)         { return v; }
+template<> inline string to_string<const char*>  (const char *v)   { return v; }
+template<> inline string to_string<string>       (string v)        { return v; }
+template<> inline string to_string<const string&>(const string &v) { return v; }
+
+template<typename T> string& string::operator= (T value) { return assign(to_string<T>(value)); }
+template<typename T> string& string::operator<<(T value) { return append(to_string<T>(value)); }
+
+template<typename T> lstring& lstring::operator<<(T value) {
+  operator[](size()).assign(to_string<T>(value));
+  return *this;
+}
+
+#if defined(QSTRING_H)
+template<> inline string to_string<QString>(QString v) { return v.toUtf8().constData(); }
+template<> inline string to_string<const QString&>(const QString &v) { return v.toUtf8().constData(); }
+string::operator QString() const { return QString::fromUtf8(*this); }
+#endif
+
+}
+
+#endif

bsnes/nall/string/compare.hpp

@@ -1,6 +1,8 @@
 #ifndef NALL_STRING_COMPARE_HPP
 #define NALL_STRING_COMPARE_HPP
 
+namespace nall {
+
 char chrlower(char c) {
   return (c >= 'A' && c <= 'Z') ? c + ('a' - 'A') : c;
 }
@@ -9,46 +11,52 @@ char chrupper(char c) {
   return (c >= 'a' && c <= 'z') ? c - ('a' - 'A') : c;
 }
 
-int stricmp(const char *dest, const char *src) {
-  while(*dest) {
-    if(chrlower(*dest) != chrlower(*src)) break;
-    dest++;
-    src++;
+int stricmp(const char *str1, const char *str2) {
+  while(*str1) {
+    if(chrlower(*str1) != chrlower(*str2)) break;
+    str1++, str2++;
   }
-
-  return (int)chrlower(*dest) - (int)chrlower(*src);
+  return (int)chrlower(*str1) - (int)chrlower(*str2);
 }
 
-int strpos(const char *str, const char *key) {
-  int ssl = strlen(str), ksl = strlen(key);
-
-  if(ksl > ssl) return -1;
-  for(int i = 0; i <= ssl - ksl; i++) {
-    if(!memcmp(str + i, key, ksl)) {
-      return i;
-    }
+bool wildcard(const char *s, const char *p) {
+  const char *cp = 0, *mp = 0;
+  while(*s && *p != '*') {
+    if(*p != '?' && *s != *p) return false;
+    p++, s++;
   }
-  return -1;
-}
-
-int qstrpos(const char *str, const char *key) {
-  int ssl = strlen(str), ksl = strlen(key);
-
-  if(ksl > ssl) return -1;
-  for(int i = 0; i <= ssl - ksl;) {
-  uint8_t x = str[i];
-    if(x == '\"' || x == '\'') {
-    uint8_t z = i++;
-      while(str[i] != x && i < ssl) i++;
-      if(i >= ssl) i = z;
-    }
-    if(!memcmp(str + i, key, ksl)) {
-      return i;
+  while(*s) {
+    if(*p == '*') {
+      if(!*++p) return true;
+      mp = p, cp = s + 1;
+    } else if(*p == '?' || *p == *s) {
+      p++, s++;
     } else {
-      i++;
+      p = mp, s = cp++;
     }
   }
-  return -1;
+  while(*p == '*') p++;
+  return !*p;
+}
+
+bool iwildcard(const char *s, const char *p) {
+  const char *cp = 0, *mp = 0;
+  while(*s && *p != '*') {
+    if(*p != '?' && chrlower(*s) != chrlower(*p)) return false;
+    p++, s++;
+  }
+  while(*s) {
+    if(*p == '*') {
+      if(!*++p) return true;
+      mp = p, cp = s + 1;
+    } else if(*p == '?' || chrlower(*p) == chrlower(*s)) {
+      p++, s++;
+    } else {
+      p = mp, s = cp++;
+    }
+  }
+  while(*p == '*') p++;
+  return !*p;
 }
 
 bool strbegin(const char *str, const char *key) {
@@ -97,4 +105,6 @@ bool striend(const char *str, const char *key) {
   return true;
 }
 
+}
+
 #endif

bsnes/nall/string/convert.hpp

@@ -1,6 +1,8 @@
 #ifndef NALL_STRING_CONVERT_HPP
 #define NALL_STRING_CONVERT_HPP
 
+namespace nall {
+
 char* strlower(char *str) {
   if(!str) return 0;
   int i = 0;
@@ -125,7 +127,7 @@ double strdouble(const char *str) {
   while(*str) {
     uint8_t x = *str++;
     if(x >= '0' && x <= '9') x -= '0';
-    else if(x == '.') break;  //break loop and read fractional part
+    else if(x == '.' || x == ',') break;  //break loop and read fractional part
     else return (double)result_integral;  //invalid value, assume no fractional part
     result_integral = result_integral * 10 + x;
   }
@@ -146,4 +148,6 @@ double strdouble(const char *str) {
   return !negate ? result : -result;
 }
 
+}
+
 #endif

bsnes/nall/string/core.hpp

@@ -3,7 +3,7 @@
 
 namespace nall {
 
-void string::reserve(size_t size_) {
+void string::reserve(unsigned size_) {
   if(size_ > size) {
     size = size_;
     data = (char*)realloc(data, size + 1);
@@ -11,10 +11,6 @@ void string::reserve(size_t size_) {
   }
 }
 
-unsigned string::length() const {
-  return strlen(data);
-}
-
 string& string::assign(const char *s) {
   unsigned length = strlen(s);
   reserve(length);
@@ -29,6 +25,11 @@ string& string::append(const char *s) {
   return *this;
 }
 
+string& string::append(bool value) { append(value ? "true" : "false"); return *this; }
+string& string::append(signed int value) { append(strsigned(value)); return *this; }
+string& string::append(unsigned int value) { append(strunsigned(value)); return *this; }
+string& string::append(double value) { append(strdouble(value)); return *this; }
+
 string::operator const char*() const {
   return data;
 }
@@ -49,15 +50,34 @@ bool string::operator<=(const char *str) const { return strcmp(data, str) <= 0;
 bool string::operator> (const char *str) const { return strcmp(data, str)  > 0; }
 bool string::operator>=(const char *str) const { return strcmp(data, str) >= 0; }
 
-string::string() {
+string& string::operator=(const string &value) {
+  assign(value);
+  return *this;
+}
+
+string& string::operator=(string &&source) {
+  if(data) free(data);
+  size = source.size;
+  data = source.data;
+  source.data = 0;
+  source.size = 0;
+  return *this;
+}
+
+static void istring(string &output) {
+}
+
+template<typename T, typename... Args>
+static void istring(string &output, const T &value, Args&&... args) {
+  output.append(value);
+  istring(output, std::forward<Args>(args)...);
+}
+
+template<typename... Args> string::string(Args&&... args) {
   size = 64;
   data = (char*)malloc(size + 1);
   *data = 0;
-}
-
-string::string(const char *value) {
-  size = strlen(value);
-  data = strdup(value);
+  istring(*this, std::forward<Args>(args)...);
 }
 
 string::string(const string &value) {
@@ -71,21 +91,8 @@ string::string(string &&source) {
   source.data = 0;
 }
 
-string& string::operator=(const string &value) {
-  assign(value);
-  return *this;
-}
-
-string& string::operator=(string &&source) {
-  if(data) free(data);
-  size = source.size;
-  data = source.data;
-  source.data = 0;
-  return *this;
-}
-
 string::~string() {
-  free(data);
+  if(data) free(data);
 }
 
 bool string::readfile(const char *filename) {
@@ -94,12 +101,12 @@ bool string::readfile(const char *filename) {
   #if !defined(_WIN32)
   FILE *fp = fopen(filename, "rb");
   #else
-  FILE *fp = _wfopen(nall::utf16_t(filename), L"rb");
+  FILE *fp = _wfopen(utf16_t(filename), L"rb");
   #endif
   if(!fp) return false;
 
   fseek(fp, 0, SEEK_END);
-  size_t size = ftell(fp);
+  unsigned size = ftell(fp);
   rewind(fp);
   char *fdata = new char[size + 1];
   unsigned unused = fread(fdata, 1, size, fp);
@@ -111,11 +118,11 @@ bool string::readfile(const char *filename) {
   return true;
 }
 
-int lstring::find(const char *key) {
+optional<unsigned> lstring::find(const char *key) const {
   for(unsigned i = 0; i < size(); i++) {
-    if(operator[](i) == key) return i;
+    if(operator[](i) == key) return { true, i };
   }
-  return -1;
+  return { false, 0 };
 }
 
 inline lstring::lstring() {

bsnes/nall/string/filename.hpp

@@ -0,0 +1,63 @@
+#ifndef NALL_FILENAME_HPP
+#define NALL_FILENAME_HPP
+
+namespace nall {
+
+// "foo/bar.c" -> "foo/"
+// "foo/" -> "foo/"
+// "bar.c" -> "./"
+inline string dir(char const *name) {
+  string result = name;
+  for(signed i = strlen(result); i >= 0; i--) {
+    if(result[i] == '/' || result[i] == '\\') {
+      result[i + 1] = 0;
+      break;
+    }
+    if(i == 0) result = "./";
+  }
+  return result;
+}
+
+// "foo/bar.c" -> "bar.c"
+inline string notdir(char const *name) {
+  for(signed i = strlen(name); i >= 0; i--) {
+    if(name[i] == '/' || name[i] == '\\') {
+      name += i + 1;
+      break;
+    }
+  }
+  string result = name;
+  return result;
+}
+
+// "foo/bar.c" -> "foo/bar"
+inline string basename(char const *name) {
+  string result = name;
+  for(signed i = strlen(result); i >= 0; i--) {
+    if(result[i] == '/' || result[i] == '\\') {
+      //file has no extension
+      break;
+    }
+    if(result[i] == '.') {
+      result[i] = 0;
+      break;
+    }
+  }
+  return result;
+}
+
+// "foo/bar.c" -> "c"
+inline string extension(char const *name) {
+  for(signed i = strlen(name); i >= 0; i--) {
+    if(name[i] == '.') {
+      name += i + 1;
+      break;
+    }
+  }
+  string result = name;
+  return result;
+}
+
+}
+
+#endif

bsnes/nall/string/math.hpp

@@ -1,6 +1,8 @@
 #ifndef NALL_STRING_MATH_HPP
 #define NALL_STRING_MATH_HPP
 
+namespace nall {
+
 static int eval_integer(const char *&s) {
   if(!*s) throw "unrecognized_integer";
   int value = 0, x = *s, y = *(s + 1);
@@ -157,4 +159,6 @@ bool strmath(const char *s, int &result) {
   }
 }
 
+}
+
 #endif

bsnes/nall/string/platform.hpp

@@ -0,0 +1,41 @@
+#ifndef NALL_STRING_PLATFORM_HPP
+#define NALL_STRING_PLATFORM_HPP
+
+namespace nall {
+
+string realpath(const char *name) {
+  char path[PATH_MAX];
+  if(::realpath(name, path)) {
+    string result(path);
+    result.transform("\\", "/");
+    if(result.endswith("/") == false) result.append("/");
+    return result;
+  }
+  return "";
+}
+
+string userpath() {
+  char path[PATH_MAX];
+  if(::userpath(path)) {
+    string result(path);
+    result.transform("\\", "/");
+    if(result.endswith("/") == false) result.append("/");
+    return result;
+  }
+  return "";
+}
+
+string currentpath() {
+  char path[PATH_MAX];
+  if(::getcwd(path)) {
+    string result(path);
+    result.transform("\\", "/");
+    if(result.endswith("/") == false) result.append("/");
+    return result;
+  }
+  return "";
+}
+
+}
+
+#endif

bsnes/nall/string/split.hpp

@@ -3,7 +3,8 @@
 
 namespace nall {
 
-void lstring::split(const char *key, const char *src, unsigned limit) {
+template<unsigned Limit> void lstring::split(const char *key, const char *src) {
+  unsigned limit = Limit;
   reset();
 
   int ssl = strlen(src), ksl = strlen(key);
@@ -21,7 +22,8 @@ void lstring::split(const char *key, const char *src, unsigned limit) {
   operator[](split_count++) = src + lp;
 }
 
-void lstring::qsplit(const char *key, const char *src, unsigned limit) {
+template<unsigned Limit> void lstring::qsplit(const char *key, const char *src) {
+  unsigned limit = Limit;
   reset();
 
   int ssl = strlen(src), ksl = strlen(key);

bsnes/nall/string/strl.hpp

@@ -1,13 +1,15 @@
 #ifndef NALL_STRING_STRL_HPP
 #define NALL_STRING_STRL_HPP
 
+namespace nall {
+
 //strlcpy, strlcat based on OpenBSD implementation by Todd C. Miller
 
 //return = strlen(src)
-size_t strlcpy(char *dest, const char *src, size_t length) {
+unsigned strlcpy(char *dest, const char *src, unsigned length) {
   char *d = dest;
   const char *s = src;
-  size_t n = length;
+  unsigned n = length;
 
   if(n) {
     while(--n && (*d++ = *s++)); //copy as many bytes as possible, or until null terminator reached
@@ -22,13 +24,13 @@ size_t strlcpy(char *dest, const char *src, size_t length) {
 }
 
 //return = strlen(src) + min(length, strlen(dest))
-size_t strlcat(char *dest, const char *src, size_t length) {
+unsigned strlcat(char *dest, const char *src, unsigned length) {
   char *d = dest;
   const char *s = src;
-  size_t n = length;
+  unsigned n = length;
 
   while(n-- && *d) d++; //find end of dest
-  size_t dlength = d - dest;
+  unsigned dlength = d - dest;
   n = length - dlength; //subtract length of dest from maximum string length
 
   if(!n) return dlength + strlen(s);
@@ -45,4 +47,6 @@ size_t strlcat(char *dest, const char *src, size_t length) {
   return dlength + (s - src); //return length of resulting string, sans null terminator
 }
 
+}
+
 #endif

bsnes/nall/string/strpos.hpp

@@ -0,0 +1,41 @@
+#ifndef NALL_STRING_STRPOS_HPP
+#define NALL_STRING_STRPOS_HPP
+
+//usage example:
+//if(auto pos = strpos(str, key)) print(pos(), "\n");
+//prints position of key within str, only if it is found
+
+namespace nall {
+
+optional<unsigned> strpos(const char *str, const char *key) {
+  unsigned ssl = strlen(str), ksl = strlen(key);
+  if(ksl > ssl) return { false, 0 };
+
+  for(unsigned i = 0; i <= ssl - ksl; i++) {
+    if(!memcmp(str + i, key, ksl)) return { true, i };
+  }
+
+  return { false, 0 };
+}
+
+optional<unsigned> qstrpos(const char *str, const char *key) {
+  unsigned ssl = strlen(str), ksl = strlen(key);
+  if(ksl > ssl) return { false, 0 };
+
+  for(unsigned i = 0; i <= ssl - ksl;) {
+    uint8_t x = str[i];
+    if(x == '\"' || x == '\'') {
+      uint8_t z = i++;
+      while(str[i] != x && i < ssl) i++;
+      if(i >= ssl) i = z;
+    }
+    if(!memcmp(str + i, key, ksl)) return { true, i };
+    i++;
+  }
+
+  return { false, 0 };
+}
+
+}
+
+#endif

bsnes/nall/string/trim.hpp

@@ -0,0 +1,38 @@
+#ifndef NALL_STRING_TRIM_HPP
+#define NALL_STRING_TRIM_HPP
+
+namespace nall {
+
+//limit defaults to zero, which will underflow on first compare; equivalent to no limit
+template<unsigned Limit> char* ltrim(char *str, const char *key) {
+  unsigned limit = Limit;
+  if(!key || !*key) return str;
+  while(strbegin(str, key)) {
+    char *dest = str, *src = str + strlen(key);
+    while(true) {
+      *dest = *src++;
+      if(!*dest) break;
+      dest++;
+    }
+    if(--limit == 0) break;
+  }
+  return str;
+}
+
+template<unsigned Limit> char* rtrim(char *str, const char *key) {
+  unsigned limit = Limit;
+  if(!key || !*key) return str;
+  while(strend(str, key)) {
+    str[strlen(str) - strlen(key)] = 0;
+    if(--limit == 0) break;
+  }
+  return str;
+}
+
+template<unsigned limit> char* trim(char *str, const char *key) {
+  return ltrim<limit>(rtrim<limit>(str, key), key);
+}
+
+}
+
+#endif

bsnes/nall/string/utility.hpp

@@ -1,18 +1,20 @@
 #ifndef NALL_STRING_UTILITY_HPP
 #define NALL_STRING_UTILITY_HPP
 
-size_t strlcpy(nall::string &dest, const char *src, size_t length) {
+namespace nall {
+
+unsigned strlcpy(string &dest, const char *src, unsigned length) {
   dest.reserve(length);
   return strlcpy(dest(), src, length);
 }
 
-size_t strlcat(nall::string &dest, const char *src, size_t length) {
+unsigned strlcat(string &dest, const char *src, unsigned length) {
   dest.reserve(length);
   return strlcat(dest(), src, length);
 }
 
-nall::string substr(const char *src, size_t start, size_t length) {
-  nall::string dest;
+string substr(const char *src, unsigned start, unsigned length) {
+  string dest;
   if(length == 0) {
     //copy entire string
     dest = src + start;
@@ -23,22 +25,10 @@ nall::string substr(const char *src, size_t start, size_t length) {
   return dest;
 }
 
-/* very simplistic wrappers to return nall::string& instead of char* type */
-
-nall::string& strlower(nall::string &str) { strlower(str()); return str; }
-nall::string& strupper(nall::string &str) { strupper(str()); return str; }
-nall::string& strtr(nall::string &dest, const char *before, const char *after) { strtr(dest(), before, after); return dest; }
-nall::string& ltrim(nall::string &str, const char *key) { ltrim(str(), key); return str; }
-nall::string& rtrim(nall::string &str, const char *key) { rtrim(str(), key); return str; }
-nall::string& trim (nall::string &str, const char *key) { trim (str(), key); return str; }
-nall::string& ltrim_once(nall::string &str, const char *key) { ltrim_once(str(), key); return str; }
-nall::string& rtrim_once(nall::string &str, const char *key) { rtrim_once(str(), key); return str; }
-nall::string& trim_once (nall::string &str, const char *key) { trim_once (str(), key); return str; }
-
 /* arithmetic <> string */
 
-template<unsigned length, char padding> nall::string strhex(uintmax_t value) {
-  nall::string output;
+template<unsigned length, char padding> string strhex(uintmax_t value) {
+  string output;
   unsigned offset = 0;
 
   //render string backwards, as we do not know its length yet
@@ -61,8 +51,8 @@ template<unsigned length, char padding> nall::string strhex(uintmax_t value) {
   return output;
 }
 
-template<unsigned length, char padding> nall::string strsigned(intmax_t value) {
-  nall::string output;
+template<unsigned length, char padding> string strsigned(intmax_t value) {
+  string output;
   unsigned offset = 0;
 
   bool negative = value < 0;
@@ -87,8 +77,8 @@ template<unsigned length, char padding> nall::string strsigned(intmax_t value) {
   return output;
 }
 
-template<unsigned length, char padding> nall::string strunsigned(uintmax_t value) {
-  nall::string output;
+template<unsigned length, char padding> string strunsigned(uintmax_t value) {
+  string output;
   unsigned offset = 0;
 
   do {
@@ -109,8 +99,8 @@ template<unsigned length, char padding> nall::string strunsigned(uintmax_t value
   return output;
 }
 
-template<unsigned length, char padding> nall::string strbin(uintmax_t value) {
-  nall::string output;
+template<unsigned length, char padding> string strbin(uintmax_t value) {
+  string output;
   unsigned offset = 0;
 
   do {
@@ -134,7 +124,7 @@ template<unsigned length, char padding> nall::string strbin(uintmax_t value) {
 //using sprintf is certainly not the most ideal method to convert
 //a double to a string ... but attempting to parse a double by
 //hand, digit-by-digit, results in subtle rounding errors.
-size_t strdouble(char *str, double value) {
+unsigned strdouble(char *str, double value) {
   char buffer[256];
   sprintf(buffer, "%f", value);
 
@@ -155,11 +145,13 @@ size_t strdouble(char *str, double value) {
   return length + 1;
 }
 
-nall::string strdouble(double value) {
-  nall::string temp;
+string strdouble(double value) {
+  string temp;
   temp.reserve(strdouble(0, value));
   strdouble(temp(), value);
   return temp;
 }
 
+}
+
 #endif

bsnes/nall/string/variadic.hpp

@@ -0,0 +1,12 @@
+#ifndef NALL_STRING_VARIADIC_HPP
+#define NALL_STRING_VARIADIC_HPP
+
+namespace nall {
+
+template<typename... Args> inline void print(Args&&... args) {
+  printf("%s", (const char*)string(std::forward<Args>(args)...));
+}
+
+}
+
+#endif

bsnes/nall/string/wrapper.hpp

@@ -0,0 +1,33 @@
+#ifndef NALL_STRING_WRAPPER_HPP
+#define NALL_STRING_WRAPPER_HPP
+
+namespace nall {
+
+unsigned string::length() const { return strlen(data); }
+
+bool string::equals(const char *str) const { return !strcmp(data, str); }
+bool string::iequals(const char *str) const { return !stricmp(data, str); }
+
+bool string::wildcard(const char *str) const { return nall::wildcard(data, str); }
+bool string::iwildcard(const char *str) const { return nall::iwildcard(data, str); }
+
+bool string::beginswith(const char *str) const { return strbegin(data, str); }
+bool string::ibeginswith(const char *str) const { return stribegin(data, str); }
+
+bool string::endswith(const char *str) const { return strend(data, str); }
+bool string::iendswith(const char *str) const { return striend(data, str); }
+
+string& string::lower() { nall::strlower(data); return *this; }
+string& string::upper() { nall::strupper(data); return *this; }
+string& string::transform(const char *before, const char *after) { nall::strtr(data, before, after); return *this; }
+
+template<unsigned limit> string& string::ltrim(const char *key) { nall::ltrim<limit>(data, key); return *this; }
+template<unsigned limit> string& string::rtrim(const char *key) { nall::rtrim<limit>(data, key); return *this; }
+template<unsigned limit> string& string::trim (const char *key) { nall::trim <limit>(data, key); return *this; }
+
+optional<unsigned> string::position(const char *key) const { return strpos(data, key); }
+optional<unsigned> string::qposition(const char *key) const { return qstrpos(data, key); }
+
+}
+
+#endif

bsnes/nall/string/xml.hpp

@@ -2,9 +2,7 @@
 #define NALL_STRING_XML_HPP
 
 //XML subset parser
-//version 0.04
-
-#include <nall/array.hpp>
+//version 0.05
 
 namespace nall {
 
@@ -16,15 +14,14 @@ struct xml_attribute {
 
 struct xml_element : xml_attribute {
   string parse() const;
-  array<xml_attribute*> attribute;
-  array<xml_element*> element;
-  ~xml_element();
+  linear_vector<xml_attribute> attribute;
+  linear_vector<xml_element> element;
 
 protected:
   void parse_doctype(const char *&data);
   bool parse_head(string data);
   bool parse_body(const char *&data);
-  friend xml_element *xml_parse(const char *data);
+  friend xml_element xml_parse(const char *data);
 };
 
 inline string xml_attribute::parse() const {
@@ -68,21 +65,26 @@ inline string xml_element::parse() const {
     }
 
     if(strbegin(source, "<!--")) {
-      signed pos = strpos(source, "-->");
-      if(pos == -1) return "";
-      source += pos + 3;
-      continue;
+      if(auto pos = strpos(source, "-->")) {
+        source += pos() + 3;
+        continue;
+      } else {
+        return "";
+      }
     }
 
     if(strbegin(source, "<![CDATA[")) {
-      signed pos = strpos(source, "]]>");
-      if(pos == -1) return "";
-      string cdata = substr(source, 9, pos - 9);
-      data << cdata;
-      offset += strlen(cdata);
-
-      source += offset + 3;
-      continue;
+      if(auto pos = strpos(source, "]]>")) {
+        if(pos() - 9 > 0) {
+          string cdata = substr(source, 9, pos() - 9);
+          data << cdata;
+          offset += strlen(cdata);
+        }
+        source += 9 + offset + 3;
+        continue;
+      } else {
+        return "";
+      }
     }
 
     //reject illegal characters
@@ -118,10 +120,10 @@ inline bool xml_element::parse_head(string data) {
   data.qreplace("\t", " ");
   data.qreplace("\r", " ");
   data.qreplace("\n", " ");
-  while(qstrpos(data, "  ") >= 0) data.qreplace("  ", " ");
+  while(qstrpos(data, "  ")) data.qreplace("  ", " ");
   data.qreplace(" =", "=");
   data.qreplace("= ", "=");
-  rtrim(data);
+  data.rtrim();
 
   lstring part;
   part.qsplit(" ", data);
@@ -134,13 +136,13 @@ inline bool xml_element::parse_head(string data) {
     side.qsplit("=", part[i]);
     if(side.size() != 2) throw "...";
 
-    xml_attribute *attr = new xml_attribute;
-    attr->name = side[0];
-    attr->content = side[1];
-    if(strbegin(attr->content, "\"") && strend(attr->content, "\"")) trim_once(attr->content, "\"");
-    else if(strbegin(attr->content, "'") && strend(attr->content, "'")) trim_once(attr->content, "'");
+    xml_attribute attr;
+    attr.name = side[0];
+    attr.content = side[1];
+    if(strbegin(attr.content, "\"") && strend(attr.content, "\"")) attr.content.trim<1>("\"");
+    else if(strbegin(attr.content, "'") && strend(attr.content, "'")) attr.content.trim<1>("'");
     else throw "...";
-    attribute.add(attr);
+    attribute.append(attr);
   }
 }
 
@@ -156,34 +158,38 @@ inline bool xml_element::parse_body(const char *&data) {
     }
 
     if(strbegin(data, "!--")) {
-      signed offset = strpos(data, "-->");
-      if(offset == -1) throw "...";
-      data += offset + 3;
-      continue;
+      if(auto offset = strpos(data, "-->")) {
+        data += offset() + 3;
+        continue;
+      } else {
+        throw "...";
+      }
     }
 
     if(strbegin(data, "![CDATA[")) {
-      signed offset = strpos(data, "]]>");
-      if(offset == -1) throw "...";
-      data += offset + 3;
-      continue;
+      if(auto offset = strpos(data, "]]>")) {
+        data += offset() + 3;
+        continue;
+      } else {
+        throw "...";
+      }
     }
 
-    signed offset = strpos(data, ">");
-    if(offset == -1) throw "...";
+    auto offset = strpos(data, ">");
+    if(!offset) throw "...";
 
-    string tag = substr(data, 0, offset);
-    data += offset + 1;
+    string tag = substr(data, 0, offset());
+    data += offset() + 1;
     const char *content_begin = data;
 
     bool self_terminating = false;
 
     if(strend(tag, "?") == true) {
       self_terminating = true;
-      rtrim_once(tag, "?");
+      tag.rtrim<1>("?");
     } else if(strend(tag, "/") == true) {
       self_terminating = true;
-      rtrim_once(tag, "/");
+      tag.rtrim<1>("/");
     }
 
     parse_head(tag);
@@ -191,48 +197,41 @@ inline bool xml_element::parse_body(const char *&data) {
 
     while(*data) {
       unsigned index = element.size();
-      xml_element *elem = new xml_element;
-      if(elem->parse_body(data) == false) {
-        delete elem;
-
+      xml_element node;
+      if(node.parse_body(data) == false) {
         if(*data == '/') {
           signed length = data - content_begin - 1;
           if(length > 0) content = substr(content_begin, 0, length);
 
           data++;
-          offset = strpos(data, ">");
-          if(offset == -1) throw "...";
+          auto offset = strpos(data, ">");
+          if(!offset) throw "...";
 
-          tag = substr(data, 0, offset);
-          data += offset + 1;
+          tag = substr(data, 0, offset());
+          data += offset() + 1;
 
           tag.replace("\t", " ");
           tag.replace("\r", " ");
           tag.replace("\n", " ");
-          while(strpos(tag, "  ") >= 0) tag.replace("  ", " ");
-          rtrim(tag);
+          while(strpos(tag, "  ")) tag.replace("  ", " ");
+          tag.rtrim();
 
           if(name != tag) throw "...";
           return true;
         }
       } else {
-        element.add(elem);
+        element.append(node);
       }
     }
   }
 }
 
-inline xml_element::~xml_element() {
-  for(unsigned i = 0; i < attribute.size(); i++) delete attribute[i];
-  for(unsigned i = 0; i < element.size(); i++) delete element[i];
-}
-
 //ensure there is only one root element
-inline bool xml_validate(xml_element *document) {
+inline bool xml_validate(xml_element &document) {
   unsigned root_counter = 0;
 
-  for(unsigned i = 0; i < document->element.size(); i++) {
-    string &name = document->element[i]->name;
+  for(unsigned i = 0; i < document.element.size(); i++) {
+    string &name = document.element[i].name;
     if(strbegin(name, "?")) continue;
     if(strbegin(name, "!")) continue;
     if(++root_counter > 1) return false;
@@ -241,25 +240,24 @@ inline bool xml_validate(xml_element *document) {
   return true;
 }
 
-inline xml_element* xml_parse(const char *data) {
-  xml_element *self = new xml_element;
+inline xml_element xml_parse(const char *data) {
+  xml_element self;
 
   try {
     while(*data) {
-      xml_element *elem = new xml_element;
-      if(elem->parse_body(data) == false) {
-        delete elem;
+      xml_element node;
+      if(node.parse_body(data) == false) {
         break;
       } else {
-        self->element.add(elem);
+        self.element.append(node);
       }
     }
 
     if(xml_validate(self) == false) throw "...";
     return self;
   } catch(const char*) {
-    delete self;
-    return 0;
+    xml_element empty;
+    return empty;
   }
 }
 

bsnes/nall/ups.hpp

@@ -0,0 +1,223 @@
+#ifndef NALL_UPS_HPP
+#define NALL_UPS_HPP
+
+#include <nall/crc32.hpp>
+#include <nall/file.hpp>
+#include <nall/function.hpp>
+#include <nall/stdint.hpp>
+
+namespace nall {
+
+struct ups {
+  enum class result : unsigned {
+    unknown,
+    success,
+    patch_unwritable,
+    patch_invalid,
+    source_invalid,
+    target_invalid,
+    target_too_small,
+    patch_checksum_invalid,
+    source_checksum_invalid,
+    target_checksum_invalid,
+  };
+
+  function<void (unsigned offset, unsigned length)> progress;
+
+  result create(
+    const uint8_t *sourcedata, unsigned sourcelength,
+    const uint8_t *targetdata, unsigned targetlength,
+    const char *patchfilename
+  ) {
+    source_data = (uint8_t*)sourcedata, target_data = (uint8_t*)targetdata;
+    source_length = sourcelength, target_length = targetlength;
+    source_offset = target_offset = 0;
+    source_checksum = target_checksum = patch_checksum = ~0;
+
+    if(patch_file.open(patchfilename, file::mode::write) == false) return result::patch_unwritable;
+
+    patch_write('U');
+    patch_write('P');
+    patch_write('S');
+    patch_write('1');
+    encode(source_length);
+    encode(target_length);
+
+    unsigned output_length = source_length > target_length ? source_length : target_length;
+    unsigned relative = 0;
+    for(unsigned offset = 0; offset < output_length;) {
+      uint8_t x = source_read();
+      uint8_t y = target_read();
+
+      if(x == y) {
+        offset++;
+        continue;
+      }
+
+      encode(offset++ - relative);
+      patch_write(x ^ y);
+
+      while(true) {
+        if(offset >= output_length) {
+          patch_write(0x00);
+          break;
+        }
+
+        x = source_read();
+        y = target_read();
+        offset++;
+        patch_write(x ^ y);
+        if(x == y) break;
+      }
+
+      relative = offset;
+    }
+
+    source_checksum = ~source_checksum;
+    target_checksum = ~target_checksum;
+    for(unsigned i = 0; i < 4; i++) patch_write(source_checksum >> (i * 8));
+    for(unsigned i = 0; i < 4; i++) patch_write(target_checksum >> (i * 8));
+    uint32_t patch_result_checksum = ~patch_checksum;
+    for(unsigned i = 0; i < 4; i++) patch_write(patch_result_checksum >> (i * 8));
+
+    patch_file.close();
+    return result::success;
+  }
+
+  result apply(
+    const uint8_t *patchdata, unsigned patchlength,
+    const uint8_t *sourcedata, unsigned sourcelength,
+    uint8_t *targetdata, unsigned &targetlength
+  ) {
+    patch_data = (uint8_t*)patchdata, source_data = (uint8_t*)sourcedata, target_data = targetdata;
+    patch_length = patchlength, source_length = sourcelength, target_length = targetlength;
+    patch_offset = source_offset = target_offset = 0;
+    patch_checksum = source_checksum = target_checksum = ~0;
+
+    if(patch_length < 18) return result::patch_invalid;
+    if(patch_read() != 'U') return result::patch_invalid;
+    if(patch_read() != 'P') return result::patch_invalid;
+    if(patch_read() != 'S') return result::patch_invalid;
+    if(patch_read() != '1') return result::patch_invalid;
+
+    unsigned source_read_length = decode();
+    unsigned target_read_length = decode();
+
+    if(source_length != source_read_length && source_length != target_read_length) return result::source_invalid;
+    targetlength = (source_length == source_read_length ? target_read_length : source_read_length);
+    if(target_length < targetlength) return result::target_too_small;
+    target_length = targetlength;
+
+    while(patch_offset < patch_length - 12) {
+      unsigned length = decode();
+      while(length--) target_write(source_read());
+      while(true) {
+        uint8_t patch_xor = patch_read();
+        target_write(patch_xor ^ source_read());
+        if(patch_xor == 0) break;
+      }
+    }
+    while(source_offset < source_length) target_write(source_read());
+    while(target_offset < target_length) target_write(source_read());
+
+    uint32_t patch_read_checksum = 0, source_read_checksum = 0, target_read_checksum = 0;
+    for(unsigned i = 0; i < 4; i++) source_read_checksum |= patch_read() << (i * 8);
+    for(unsigned i = 0; i < 4; i++) target_read_checksum |= patch_read() << (i * 8);
+    uint32_t patch_result_checksum = ~patch_checksum;
+    source_checksum = ~source_checksum;
+    target_checksum = ~target_checksum;
+    for(unsigned i = 0; i < 4; i++) patch_read_checksum  |= patch_read() << (i * 8);
+
+    if(patch_result_checksum != patch_read_checksum) return result::patch_invalid;
+    if(source_checksum == source_read_checksum && source_length == source_read_length) {
+      if(target_checksum == target_read_checksum && target_length == target_read_length) return result::success;
+      return result::target_invalid;
+    } else if(source_checksum == target_read_checksum && source_length == target_read_length) {
+      if(target_checksum == source_read_checksum && target_length == source_read_length) return result::success;
+      return result::target_invalid;
+    } else {
+      return result::source_invalid;
+    }
+  }
+
+private:
+  uint8_t *patch_data, *source_data, *target_data;
+  unsigned patch_length, source_length, target_length;
+  unsigned patch_offset, source_offset, target_offset;
+  unsigned patch_checksum, source_checksum, target_checksum;
+  file patch_file;
+
+  uint8_t patch_read() {
+    if(patch_offset < patch_length) {
+      uint8_t n = patch_data[patch_offset++];
+      patch_checksum = crc32_adjust(patch_checksum, n);
+      return n;
+    }
+    return 0x00;
+  }
+
+  uint8_t source_read() {
+    if(source_offset < source_length) {
+      uint8_t n = source_data[source_offset++];
+      source_checksum = crc32_adjust(source_checksum, n);
+      return n;
+    }
+    return 0x00;
+  }
+
+  uint8_t target_read() {
+    uint8_t result = 0x00;
+    if(target_offset < target_length) {
+      result = target_data[target_offset];
+      target_checksum = crc32_adjust(target_checksum, result);
+    }
+    if(((target_offset++ & 255) == 0) && progress) {
+      progress(target_offset, source_length > target_length ? source_length : target_length);
+    }
+    return result;
+  }
+
+  void patch_write(uint8_t n) {
+    patch_file.write(n);
+    patch_checksum = crc32_adjust(patch_checksum, n);
+  }
+
+  void target_write(uint8_t n) {
+    if(target_offset < target_length) {
+      target_data[target_offset] = n;
+      target_checksum = crc32_adjust(target_checksum, n);
+    }
+    if(((target_offset++ & 255) == 0) && progress) {
+      progress(target_offset, source_length > target_length ? source_length : target_length);
+    }
+  }
+
+  void encode(uint64_t offset) {
+    while(true) {
+      uint64_t x = offset & 0x7f;
+      offset >>= 7;
+      if(offset == 0) {
+        patch_write(0x80 | x);
+        break;
+      }
+      patch_write(x);
+      offset--;
+    }
+  }
+
+  uint64_t decode() {
+    uint64_t offset = 0, shift = 1;
+    while(true) {
+      uint8_t x = patch_read();
+      offset += (x & 0x7f) * shift;
+      if(x & 0x80) break;
+      shift <<= 7;
+      offset += shift;
+    }
+    return offset;
+  }
+};
+
+}
+
+#endif

bsnes/nall/utf8.hpp

@@ -6,9 +6,11 @@
 
 #if defined(_WIN32)
 
+#undef UNICODE
 #undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0501
 #undef  NOMINMAX
+#define UNICODE
+#define _WIN32_WINNT 0x0501
 #define NOMINMAX
 #include <windows.h>
 #undef interface
@@ -62,9 +64,21 @@ namespace nall {
       delete[] buffer;
     }
 
+    utf8_t(const utf8_t&) = delete;
+    utf8_t& operator=(const utf8_t&) = delete;
+
   private:
     char *buffer;
   };
+
+  inline void utf8_args(int &argc, char **&argv) {
+    wchar_t **wargv = CommandLineToArgvW(GetCommandLineW(), &argc);
+    argv = new char*[argc];
+    for(unsigned i = 0; i < argc; i++) {
+      argv[i] = new char[_MAX_PATH];
+      strcpy(argv[i], nall::utf8_t(wargv[i]));
+    }
+  }
 }
 
 #endif  //if defined(_WIN32)

bsnes/nall/utility.hpp

@@ -1,29 +1,18 @@
 #ifndef NALL_UTILITY_HPP
 #define NALL_UTILITY_HPP
 
-#include <nall/traits.hpp>
+#include <type_traits>
+#include <utility>
 
 namespace nall {
-  template<typename T> struct identity {
-    typedef T type;
-  };
-
-  template<typename T> typename remove_reference<T>::type&& move(T &&value) {
-    return value;
-  }
-
-  template<typename T> T&& forward(typename identity<T>::type &&value) {
-    return value;
-  }
-
   template<bool C, typename T = bool> struct enable_if { typedef T type; };
   template<typename T> struct enable_if<false, T> {};
   template<typename C, typename T = bool> struct mp_enable_if : enable_if<C::value, T> {};
 
   template<typename T> inline void swap(T &x, T &y) {
-    T temp(move(x));
-    x = move(y);
-    y = move(temp);
+    T temp(std::move(x));
+    x = std::move(y);
+    y = std::move(temp);
   }
 
   template<typename T> struct base_from_member {
@@ -31,9 +20,18 @@ namespace nall {
     base_from_member(T value_) : value(value_) {}
   };
 
-  template<typename T> inline T* allocate(size_t size, const T &value) {
+  template<typename T> class optional {
+    bool valid;
+    T value;
+  public:
+    inline operator bool() const { return valid; }
+    inline const T& operator()() const { if(!valid) throw; return value; }
+    inline optional(bool valid, const T &value) : valid(valid), value(value) {}
+  };
+
+  template<typename T> inline T* allocate(unsigned size, const T &value) {
     T *array = new T[size];
-    for(size_t i = 0; i < size; i++) array[i] = value;
+    for(unsigned i = 0; i < size; i++) array[i] = value;
     return array;
   }
 }

bsnes/nall/varint.hpp

@@ -1,9 +1,9 @@
 #ifndef NALL_VARINT_HPP
 #define NALL_VARINT_HPP
 
+#include <type_traits>
 #include <nall/bit.hpp>
 #include <nall/static.hpp>
-#include <nall/traits.hpp>
 
 namespace nall {
   template<unsigned bits> class uint_t {
@@ -22,7 +22,7 @@ namespace nall {
         >::type
       >::type
     >::type T;
-    static_assert<!is_void<T>::value> uint_assert;
+    static_assert(!std::is_same<T, void>::value, "");
     T data;
 
   public:
@@ -63,7 +63,7 @@ namespace nall {
         >::type
       >::type
     >::type T;
-    static_assert<!is_void<T>::value> int_assert;
+    static_assert(!std::is_same<T, void>::value, "");
     T data;
 
   public:

bsnes/nall/vector.hpp

@@ -3,10 +3,12 @@
 
 #include <initializer_list>
 #include <new>
+#include <type_traits>
+#include <utility>
 #include <nall/algorithm.hpp>
 #include <nall/bit.hpp>
 #include <nall/concept.hpp>
-#include <nall/traits.hpp>
+#include <nall/foreach.hpp>
 #include <nall/utility.hpp>
 
 namespace nall {
@@ -67,11 +69,31 @@ namespace nall {
       objectsize = newsize;
     }
 
-    void add(const T data) {
+    void append(const T data) {
       if(objectsize + 1 > poolsize) reserve(objectsize + 1);
       new(pool + objectsize++) T(data);
     }
 
+    template<typename U> void insert(unsigned index, const U list) {
+      linear_vector<T> merged;
+      for(unsigned i = 0; i < index; i++) merged.append(pool[i]);
+      foreach(item, list) merged.append(item);
+      for(unsigned i = index; i < objectsize; i++) merged.append(pool[i]);
+      operator=(merged);
+    }
+
+    void insert(unsigned index, const T item) {
+      insert(index, linear_vector<T>{ item });
+    }
+
+    void remove(unsigned index, unsigned count = 1) {
+      for(unsigned i = index; count + i < objectsize; i++) {
+        pool[i] = pool[count + i];
+      }
+      if(count + index >= objectsize) resize(index);  //every element >= index was removed
+      else resize(objectsize - count);
+    }
+
     inline T& operator[](unsigned index) {
       if(index >= objectsize) resize(index + 1);
       return pool[index];
@@ -86,11 +108,12 @@ namespace nall {
     inline linear_vector<T>& operator=(const linear_vector<T> &source) {
       reset();
       reserve(source.capacity());
-      for(unsigned i = 0; i < source.size(); i++) add(source[i]);
+      resize(source.size());
+      for(unsigned i = 0; i < source.size(); i++) operator[](i) = source.operator[](i);
       return *this;
     }
 
-    linear_vector(const linear_vector<T> &source) {
+    linear_vector(const linear_vector<T> &source) : pool(0), poolsize(0), objectsize(0) {
       operator=(source);
     }
 
@@ -101,11 +124,12 @@ namespace nall {
       poolsize = source.poolsize;
       objectsize = source.objectsize;
       source.pool = 0;
+      source.reset();
       return *this;
     }
 
-    linear_vector(linear_vector<T> &&source) {
-      operator=(move(source));
+    linear_vector(linear_vector<T> &&source) : pool(0), poolsize(0), objectsize(0) {
+      operator=(std::move(source));
     }
 
     //construction
@@ -113,7 +137,7 @@ namespace nall {
     }
 
     linear_vector(std::initializer_list<T> list) : pool(0), poolsize(0), objectsize(0) {
-      for(const T *p = list.begin(); p != list.end(); ++p) add(*p);
+      for(const T *p = list.begin(); p != list.end(); ++p) append(*p);
     }
 
     ~linear_vector() {
@@ -173,11 +197,31 @@ namespace nall {
       objectsize = newsize;
     }
 
-    void add(const T data) {
+    void append(const T data) {
       if(objectsize + 1 > poolsize) reserve(objectsize + 1);
       pool[objectsize++] = new T(data);
     }
 
+    template<typename U> void insert(unsigned index, const U list) {
+      pointer_vector<T> merged;
+      for(unsigned i = 0; i < index; i++) merged.append(*pool[i]);
+      foreach(item, list) merged.append(item);
+      for(unsigned i = index; i < objectsize; i++) merged.append(*pool[i]);
+      operator=(merged);
+    }
+
+    void insert(unsigned index, const T item) {
+      insert(index, pointer_vector<T>{ item });
+    }
+
+    void remove(unsigned index, unsigned count = 1) {
+      for(unsigned i = index; count + i < objectsize; i++) {
+        *pool[i] = *pool[count + i];
+      }
+      if(count + index >= objectsize) resize(index);  //every element >= index was removed
+      else resize(objectsize - count);
+    }
+
     inline T& operator[](unsigned index) {
       if(index >= objectsize) resize(index + 1);
       if(!pool[index]) pool[index] = new T;
@@ -193,11 +237,12 @@ namespace nall {
     inline pointer_vector<T>& operator=(const pointer_vector<T> &source) {
       reset();
       reserve(source.capacity());
-      for(unsigned i = 0; i < source.size(); i++) add(source[i]);
+      resize(source.size());
+      for(unsigned i = 0; i < source.size(); i++) operator[](i) = source.operator[](i);
       return *this;
     }
 
-    pointer_vector(const pointer_vector<T> &source) {
+    pointer_vector(const pointer_vector<T> &source) : pool(0), poolsize(0), objectsize(0) {
       operator=(source);
     }
 
@@ -208,11 +253,12 @@ namespace nall {
       poolsize = source.poolsize;
       objectsize = source.objectsize;
       source.pool = 0;
+      source.reset();
       return *this;
     }
 
-    pointer_vector(pointer_vector<T> &&source) {
-      operator=(move(source));
+    pointer_vector(pointer_vector<T> &&source) : pool(0), poolsize(0), objectsize(0) {
+      operator=(std::move(source));
     }
 
     //construction
@@ -220,7 +266,7 @@ namespace nall {
     }
 
     pointer_vector(std::initializer_list<T> list) : pool(0), poolsize(0), objectsize(0) {
-      for(const T *p = list.begin(); p != list.end(); ++p) add(*p);
+      for(const T *p = list.begin(); p != list.end(); ++p) append(*p);
     }
 
     ~pointer_vector() {

bsnes/obj/.gitignore

@@ -0,0 +1 @@
+*

bsnes/out/.gitignore

@@ -0,0 +1 @@
+*

bsnes/phoenix/gtk/button.cpp

@@ -0,0 +1,13 @@
+static void Button_tick(Button *self) {
+  if(self->onTick) self->onTick();
+}
+
+void Button::create(Window &parent, unsigned x, unsigned y, unsigned width, unsigned height, const string &text) {
+  object->widget = gtk_button_new_with_label(text);
+  widget->parent = &parent;
+  gtk_widget_set_size_request(object->widget, width, height);
+  g_signal_connect_swapped(G_OBJECT(object->widget), "clicked", G_CALLBACK(Button_tick), (gpointer)this);
+  if(parent.window->defaultFont) setFont(*parent.window->defaultFont);
+  gtk_fixed_put(GTK_FIXED(parent.object->formContainer), object->widget, x, y);
+  gtk_widget_show(object->widget);
+}

bsnes/phoenix/gtk/canvas.cpp

@@ -0,0 +1,59 @@
+static void Canvas_expose(Canvas *self) {
+  uint32_t *rgb = self->canvas->bufferRGB;
+  uint32_t *bgr = self->canvas->bufferBGR;
+  for(unsigned y = self->object->widget->allocation.height; y; y--) {
+    for(unsigned x = self->object->widget->allocation.width; x; x--) {
+      uint32_t pixel = *rgb++;
+      *bgr++ = ((pixel << 16) & 0xff0000) | (pixel & 0x00ff00) | ((pixel >> 16) & 0x0000ff);
+    }
+  }
+
+  gdk_draw_rgb_32_image(
+    self->object->widget->window,
+    self->object->widget->style->fg_gc[GTK_WIDGET_STATE(self->object->widget)],
+    0, 0, self->object->widget->allocation.width, self->object->widget->allocation.height,
+    GDK_RGB_DITHER_NONE, (guchar*)self->canvas->bufferBGR, self->canvas->pitch
+  );
+}
+
+void Canvas::create(Window &parent, unsigned x, unsigned y, unsigned width, unsigned height) {
+  canvas->bufferRGB = new uint32_t[width * height]();
+  canvas->bufferBGR = new uint32_t[width * height]();
+  canvas->pitch = width * sizeof(uint32_t);
+
+  object->widget = gtk_drawing_area_new();
+  widget->parent = &parent;
+  GdkColor color;
+  color.pixel = color.red = color.green = color.blue = 0;
+  gtk_widget_modify_bg(object->widget, GTK_STATE_NORMAL, &color);
+  gtk_widget_set_double_buffered(object->widget, false);
+  gtk_widget_add_events(object->widget, GDK_EXPOSURE_MASK);
+  gtk_widget_set_size_request(object->widget, width, height);
+  g_signal_connect_swapped(G_OBJECT(object->widget), "expose_event", G_CALLBACK(Canvas_expose), (gpointer)this);
+  gtk_fixed_put(GTK_FIXED(parent.object->formContainer), object->widget, x, y);
+  gtk_widget_show(object->widget);
+}
+
+uint32_t* Canvas::buffer() {
+  return canvas->bufferRGB;
+}
+
+void Canvas::redraw() {
+  GdkRectangle rect;
+  rect.x = 0;
+  rect.y = 0;
+  rect.width = object->widget->allocation.width;
+  rect.height = object->widget->allocation.height;
+  gdk_window_invalidate_rect(object->widget->window, &rect, true);
+}
+
+Canvas::Canvas() {
+  canvas = new Canvas::Data;
+  canvas->bufferRGB = 0;
+  canvas->bufferBGR = 0;
+}
+
+Canvas::~Canvas() {
+  if(canvas->bufferRGB) delete[] canvas->bufferRGB;
+  if(canvas->bufferBGR) delete[] canvas->bufferBGR;
+}

bsnes/phoenix/gtk/checkbox.cpp

@@ -0,0 +1,23 @@
+static void CheckBox_tick(CheckBox *self) {
+  if(self->onTick && self->object->locked == false) self->onTick();
+}
+
+void CheckBox::create(Window &parent, unsigned x, unsigned y, unsigned width, unsigned height, const string &text) {
+  object->widget = gtk_check_button_new_with_label(text);
+  widget->parent = &parent;
+  gtk_widget_set_size_request(object->widget, width, height);
+  g_signal_connect_swapped(G_OBJECT(object->widget), "toggled", G_CALLBACK(CheckBox_tick), (gpointer)this);
+  if(parent.window->defaultFont) setFont(*parent.window->defaultFont);
+  gtk_fixed_put(GTK_FIXED(parent.object->formContainer), object->widget, x, y);
+  gtk_widget_show(object->widget);
+}
+
+bool CheckBox::checked() {
+  return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(object->widget));
+}
+
+void CheckBox::setChecked(bool checked) {
+  object->locked = true;
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(object->widget), checked);
+  object->locked = false;
+}

bsnes/phoenix/gtk/combobox.cpp

@@ -0,0 +1,48 @@
+void ComboBox_change(ComboBox *self) {
+  if(self->object->locked == false && self->onChange) self->onChange();
+}
+
+void ComboBox::create(Window &parent, unsigned x, unsigned y, unsigned width, unsigned height, const string &text) {
+  object->widget = gtk_combo_box_new_text();
+  widget->parent = &parent;
+  gtk_widget_set_size_request(object->widget, width, height);
+  g_signal_connect_swapped(G_OBJECT(object->widget), "changed", G_CALLBACK(ComboBox_change), (gpointer)this);
+
+  if(*text) {
+    lstring list;
+    list.split("\n", text);
+    foreach(item, list) addItem(item);
+  }
+
+  if(parent.window->defaultFont) setFont(*parent.window->defaultFont);
+  gtk_fixed_put(GTK_FIXED(parent.object->formContainer), object->widget, x, y);
+  gtk_widget_show(object->widget);
+}
+
+void ComboBox::reset() {
+  object->locked = true;
+  for(signed i = counter - 1; i >= 0; i--) {
+    gtk_combo_box_remove_text(GTK_COMBO_BOX(object->widget), i);
+  }
+  object->locked = false;
+  counter = 0;
+}
+
+void ComboBox::addItem(const string &text) {
+  gtk_combo_box_append_text(GTK_COMBO_BOX(object->widget), text);
+  if(counter++ == 0) setSelection(0);
+}
+
+unsigned ComboBox::selection() {
+  return gtk_combo_box_get_active(GTK_COMBO_BOX(object->widget));
+}
+
+void ComboBox::setSelection(unsigned item) {
+  object->locked = true;
+  gtk_combo_box_set_active(GTK_COMBO_BOX(object->widget), item);
+  object->locked = false;
+}
+
+ComboBox::ComboBox() {
+  counter = 0;
+}

bsnes/phoenix/gtk/editbox.cpp

@@ -0,0 +1,49 @@
+static void EditBox_change(EditBox *self) {
+  if(self->object->locked == false && self->onChange) self->onChange();
+}
+
+void EditBox::create(Window &parent, unsigned x, unsigned y, unsigned width, unsigned height, const string &text) {
+  object->widget = gtk_scrolled_window_new(0, 0);
+  widget->parent = &parent;
+  gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(object->widget), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+  gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(object->widget), GTK_SHADOW_ETCHED_IN);
+  gtk_widget_set_size_request(object->widget, width, height);
+  object->subWidget = gtk_text_view_new();
+  gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(object->subWidget), GTK_WRAP_WORD_CHAR);
+  gtk_container_add(GTK_CONTAINER(object->widget), object->subWidget);
+  object->textBuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(object->subWidget));
+  gtk_text_buffer_set_text(object->textBuffer, text, -1);
+  g_signal_connect_swapped(G_OBJECT(object->textBuffer), "changed", G_CALLBACK(EditBox_change), (gpointer)this);
+  if(parent.window->defaultFont) setFont(*parent.window->defaultFont);
+  gtk_fixed_put(GTK_FIXED(parent.object->formContainer), object->widget, x, y);
+  gtk_widget_show(object->subWidget);
+  gtk_widget_show(object->widget);
+}
+
+void EditBox::setFocused() {
+  gtk_widget_grab_focus(object->subWidget);
+}
+
+void EditBox::setEditable(bool editable) {
+  gtk_text_view_set_editable(GTK_TEXT_VIEW(object->subWidget), editable);
+}
+
+void EditBox::setWordWrap(bool wordWrap) {
+  gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(object->subWidget), wordWrap ? GTK_WRAP_WORD_CHAR : GTK_WRAP_NONE);
+}
+
+string EditBox::text() {
+  GtkTextIter start, end;
+  gtk_text_buffer_get_start_iter(object->textBuffer, &start);
+  gtk_text_buffer_get_end_iter(object->textBuffer, &end);
+  char *temp = gtk_text_buffer_get_text(object->textBuffer, &start, &end, true);
+  string text = temp;
+  g_free(temp);
+  return text;
+}
+
+void EditBox::setText(const string &text) {
+  object->locked = true;
+  gtk_text_buffer_set_text(object->textBuffer, text, -1);
+  object->locked = false;
+}

bsnes/phoenix/gtk/font.cpp

@@ -0,0 +1,18 @@
+bool Font::create(const string &name, unsigned size, Font::Style style) {
+  font->font = pango_font_description_new();
+  pango_font_description_set_family(font->font, name);
+  pango_font_description_set_size(font->font, size * PANGO_SCALE);
+  pango_font_description_set_style(font->font, (style & Style::Italic) == Style::Italic ? PANGO_STYLE_OBLIQUE : PANGO_STYLE_NORMAL);
+  pango_font_description_set_weight(font->font, (style & Style::Bold) == Style::Bold ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL);
+  return true;
+}
+
+Font::Font() {
+  font = new Font::Data;
+  font->font = 0;
+}
+
+Font::~Font() {
+  if(font->font) pango_font_description_free(font->font);
+  delete font;
+}

bsnes/phoenix/gtk/gtk.cpp

@@ -0,0 +1,189 @@
+#include <unistd.h>
+#include <pwd.h>
+#include <sys/stat.h>
+
+#define None X11None
+#define Window X11Window
+
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+#include <cairo.h>
+#include <gdk/gdkkeysyms.h>
+
+#undef None
+#undef Window
+
+using namespace nall;
+
+namespace phoenix {
+
+#include "object.cpp"
+#include "font.cpp"
+#include "menu.cpp"
+#include "widget.cpp"
+#include "window.cpp"
+#include "button.cpp"
+#include "canvas.cpp"
+#include "checkbox.cpp"
+#include "combobox.cpp"
+#include "editbox.cpp"
+#include "horizontalslider.cpp"
+#include "label.cpp"
+#include "listbox.cpp"
+#include "progressbar.cpp"
+#include "radiobox.cpp"
+#include "textbox.cpp"
+#include "verticalslider.cpp"
+#include "viewport.cpp"
+#include "messagewindow.cpp"
+
+Window Window::None;
+
+void OS::initialize() {
+  static bool initialized = false;
+  if(initialized == true) return;
+  initialized = true;
+
+  int argc = 1;
+  char *argv[2];
+  argv[0] = new char[8];
+  argv[1] = 0;
+  strcpy(argv[0], "phoenix");
+  char **argvp = argv;
+  gtk_init(&argc, &argvp);
+
+  gtk_rc_parse_string(
+    "style \"phoenix-gtk\"\n"
+    "{\n"
+    "  GtkComboBox::appears-as-list = 1\n"
+    "  GtkTreeView::vertical-separator = 0\n"
+    "}\n"
+    "class \"GtkComboBox\" style \"phoenix-gtk\"\n"
+    "class \"GtkTreeView\" style \"phoenix-gtk\"\n"
+  );
+}
+
+bool OS::pending() {
+  return gtk_events_pending();
+}
+
+void OS::run() {
+  while(pending()) gtk_main_iteration_do(false);
+}
+
+void OS::main() {
+  gtk_main();
+}
+
+void OS::quit() {
+  gtk_main_quit();
+}
+
+unsigned OS::desktopWidth() {
+  return gdk_screen_get_width(gdk_screen_get_default());
+}
+
+unsigned OS::desktopHeight() {
+  return gdk_screen_get_height(gdk_screen_get_default());
+}
+
+string OS::folderSelect(Window &parent, const string &path) {
+  string name;
+
+  GtkWidget *dialog = gtk_file_chooser_dialog_new(
+    "Select Folder",
+    &parent != &Window::None ? GTK_WINDOW(parent.object->widget) : (GtkWindow*)0,
+    GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
+    GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+    GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+    (const gchar*)0
+  );
+
+  if(path) gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), path);
+
+  if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
+    char *temp = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
+    name = temp;
+    g_free(temp);
+  }
+
+  gtk_widget_destroy(dialog);
+  if(name.endswith("/") == false) name.append("/");
+  return name;
+}
+
+string OS::fileOpen(Window &parent, const string &filter, const string &path) {
+  string name;
+
+  GtkWidget *dialog = gtk_file_chooser_dialog_new(
+    "Open File",
+    &parent != &Window::None ? GTK_WINDOW(parent.object->widget) : (GtkWindow*)0,
+    GTK_FILE_CHOOSER_ACTION_OPEN,
+    GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+    GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+    (const gchar*)0
+  );
+
+  if(path) gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), path);
+
+  lstring list;
+  list.split("\n", filter);
+  foreach(item, list) {
+    lstring part;
+    part.split("\t", item);
+    GtkFileFilter *filter = gtk_file_filter_new();
+    gtk_file_filter_set_name(filter, string(part[0], " (", part[1], ")"));
+    lstring patterns;
+    patterns.split(",", part[1]);
+    foreach(pattern, patterns) gtk_file_filter_add_pattern(filter, pattern);
+    gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter);
+  }
+
+  if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
+    char *temp = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
+    name = temp;
+    g_free(temp);
+  }
+
+  gtk_widget_destroy(dialog);
+  return name;
+}
+
+string OS::fileSave(Window &parent, const string &filter, const string &path) {
+  string name;
+
+  GtkWidget *dialog = gtk_file_chooser_dialog_new(
+    "Save File",
+    &parent != &Window::None ? GTK_WINDOW(parent.object->widget) : (GtkWindow*)0,
+    GTK_FILE_CHOOSER_ACTION_SAVE,
+    GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+    GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+    (const gchar*)0
+  );
+
+  if(path) gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), path);
+
+  lstring list;
+  list.split("\n", filter);
+  foreach(item, list) {
+    lstring part;
+    part.split("\t", item);
+    GtkFileFilter *filter = gtk_file_filter_new();
+    gtk_file_filter_set_name(filter, string(part[0], " (", part[1], ")"));
+    lstring patterns;
+    patterns.split(",", part[1]);
+    foreach(pattern, patterns) gtk_file_filter_add_pattern(filter, pattern);
+    gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter);
+  }
+
+  if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
+    char *temp = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
+    name = temp;
+    g_free(temp);
+  }
+
+  gtk_widget_destroy(dialog);
+  return name;
+}
+
+}

bsnes/phoenix/gtk/gtk.hpp

@@ -0,0 +1,265 @@
+namespace phoenix {
+
+struct Window;
+
+struct Object {
+  Object();
+  Object& operator=(const Object&) = delete;
+  Object(const Object&) = delete;
+//private:
+  virtual void unused();
+  struct Data;
+  Data *object;
+};
+
+struct Geometry {
+  unsigned x, y;
+  unsigned width, height;
+  inline Geometry() : x(0), y(0), width(0), height(0) {}
+  inline Geometry(unsigned x, unsigned y, unsigned width, unsigned height) : x(x), y(y), width(width), height(height) {}
+};
+
+struct Font : Object {
+  enum class Style : unsigned {
+    None = 0,
+    Bold = 1,
+    Italic = 2,
+  };
+  bool create(const nall::string &name, unsigned size, Font::Style style = Style::None);
+  Font();
+  ~Font();
+//private:
+  struct Data;
+  Data *font;
+};
+
+inline Font::Style operator|(Font::Style a, Font::Style b) { return (Font::Style)((unsigned)a | (unsigned)b); }
+inline Font::Style operator&(Font::Style a, Font::Style b) { return (Font::Style)((unsigned)a & (unsigned)b); }
+
+struct Action : Object {
+  bool visible();
+  void setVisible(bool visible = true);
+  bool enabled();
+  void setEnabled(bool enabled = true);
+  Action();
+//private:
+  struct Data;
+  Data *action;
+};
+
+struct Menu : Action {
+  void create(Window &parent, const nall::string &text);
+  void create(Menu &parent, const nall::string &text);
+};
+
+struct MenuSeparator : Action {
+  void create(Menu &parent);
+};
+
+struct MenuItem : Action {
+  nall::function<void ()> onTick;
+  void create(Menu &parent, const nall::string &text);
+};
+
+struct MenuCheckItem : Action {
+  nall::function<void ()> onTick;
+  void create(Menu &parent, const nall::string &text);
+  bool checked();
+  void setChecked(bool checked = true);
+};
+
+struct MenuRadioItem : Action {
+  nall::function<void ()> onTick;
+  void create(Menu &parent, const nall::string &text);
+  void create(MenuRadioItem &parent, const nall::string &text);
+  bool checked();
+  void setChecked();
+private:
+  MenuRadioItem *first;
+};
+
+struct Widget : Object {
+  virtual void setFont(Font &font);
+  bool visible();
+  void setVisible(bool visible = true);
+  bool enabled();
+  void setEnabled(bool enabled = true);
+  virtual bool focused();
+  virtual void setFocused();
+  virtual void setGeometry(unsigned x, unsigned y, unsigned width, unsigned height);
+  Widget();
+//private:
+  struct Data;
+  Data *widget;
+};
+
+struct Window : Widget {
+  nall::function<bool ()> onClose;
+  void create(unsigned x, unsigned y, unsigned width, unsigned height, const nall::string &text = "");
+  bool focused();
+  void setFocused();
+  Geometry geometry();
+  void setGeometry(unsigned x, unsigned y, unsigned width, unsigned height);
+  void setDefaultFont(Font &font);
+  void setFont(Font &font);
+  void setBackgroundColor(uint8_t red, uint8_t green, uint8_t blue);
+  void setTitle(const nall::string &text);
+  void setStatusText(const nall::string &text);
+  void setMenuVisible(bool visible = true);
+  void setStatusVisible(bool visible = true);
+  Window();
+//private:
+  struct Data;
+  Data *window;
+  static Window None;
+};
+
+struct Button : Widget {
+  nall::function<void ()> onTick;
+  void create(Window &parent, unsigned x, unsigned y, unsigned width, unsigned height, const nall::string &text = "");
+};
+
+struct Canvas : Widget {
+  void create(Window &parent, unsigned x, unsigned y, unsigned width, unsigned height);
+  uint32_t* buffer();
+  void redraw();
+  Canvas();
+  ~Canvas();
+//private:
+  struct Data;
+  Data *canvas;
+};
+
+struct CheckBox : Widget {
+  nall::function<void ()> onTick;
+  void create(Window &parent, unsigned x, unsigned y, unsigned width, unsigned height, const nall::string &text = "");
+  bool checked();
+  void setChecked(bool checked = true);
+};
+
+struct ComboBox : Widget {
+  nall::function<void ()> onChange;
+  void create(Window &parent, unsigned x, unsigned y, unsigned width, unsigned height, const nall::string &text = "");
+  void reset();
+  void addItem(const nall::string &text);
+  unsigned selection();
+  void setSelection(unsigned item);
+  ComboBox();
+private:
+  unsigned counter;
+};
+
+struct EditBox : Widget {
+  nall::function<void ()> onChange;
+  void create(Window &parent, unsigned x, unsigned y, unsigned width, unsigned height, const nall::string &text = "");
+  void setFocused();
+  void setEditable(bool editable = true);
+  void setWordWrap(bool wordWrap = true);
+  nall::string text();
+  void setText(const nall::string &text);
+};
+
+struct HorizontalSlider : Widget {
+  nall::function<void ()> onChange;
+  void create(Window &parent, unsigned x, unsigned y, unsigned width, unsigned height, unsigned length);
+  unsigned position();
+  void setPosition(unsigned position);
+};
+
+struct Label : Widget {
+  void create(Window &parent, unsigned x, unsigned y, unsigned width, unsigned height, const nall::string &text = "");
+  void setText(const nall::string &text);
+};
+
+struct ListBox : Widget {
+  nall::function<void ()> onActivate;
+  nall::function<void ()> onChange;
+  nall::function<void (unsigned)> onTick;
+  void create(Window &parent, unsigned x, unsigned y, unsigned width, unsigned height, const nall::string &text = "");
+  void setFocused();
+  void setHeaderVisible(bool headerVisible = true);
+  void setCheckable(bool checkable = true);
+  void setFont(Font &font);
+  void reset();
+  void resizeColumnsToContent();
+  void addItem(const nall::string &text);
+  void setItem(unsigned row, const nall::string &text);
+  bool checked(unsigned row);
+  void setChecked(unsigned row, bool checked = true);
+  nall::optional<unsigned> selection();
+  void setSelection(unsigned row);
+  ListBox();
+//private:
+  struct Data;
+  Data *listBox;
+};
+
+struct ProgressBar : Widget {
+  void create(Window &parent, unsigned x, unsigned y, unsigned width, unsigned height);
+  void setPosition(unsigned position);
+};
+
+struct RadioBox : Widget {
+  nall::function<void ()> onTick;
+  void create(Window &parent, unsigned x, unsigned y, unsigned width, unsigned height, const nall::string &text = "");
+  void create(RadioBox &parent, unsigned x, unsigned y, unsigned width, unsigned height, const nall::string &text = "");
+  bool checked();
+  void setChecked();
+private:
+  RadioBox *first;
+};
+
+struct TextBox : Widget {
+  nall::function<void ()> onActivate;
+  nall::function<void ()> onChange;
+  void create(Window &parent, unsigned x, unsigned y, unsigned width, unsigned height, const nall::string &text = "");
+  void setEditable(bool editable = true);
+  nall::string text();
+  void setText(const nall::string &text);
+};
+
+struct VerticalSlider : Widget {
+  nall::function<void ()> onChange;
+  void create(Window &parent, unsigned x, unsigned y, unsigned width, unsigned height, unsigned length);
+  unsigned position();
+  void setPosition(unsigned position);
+};
+
+struct Viewport : Widget {
+  void create(Window &parent, unsigned x, unsigned y, unsigned width, unsigned height);
+  uintptr_t handle();
+};
+
+struct MessageWindow : Object {
+  enum class Buttons : unsigned {
+    Ok,
+    OkCancel,
+    YesNo,
+  };
+  enum class Response : unsigned {
+    Ok,
+    Cancel,
+    Yes,
+    No,
+  };
+  static Response information(Window &parent, const nall::string &text, Buttons = Buttons::Ok);
+  static Response question(Window &parent, const nall::string &text, Buttons = Buttons::YesNo);
+  static Response warning(Window &parent, const nall::string &text, Buttons = Buttons::Ok);
+  static Response critical(Window &parent, const nall::string &text, Buttons = Buttons::Ok);
+};
+
+struct OS : Object {
+  static bool pending();
+  static void run();
+  static void main();
+  static void quit();
+  static unsigned desktopWidth();
+  static unsigned desktopHeight();
+  static nall::string folderSelect(Window &parent, const nall::string &path = "");
+  static nall::string fileOpen(Window &parent, const nall::string &filter, const nall::string &path = "");
+  static nall::string fileSave(Window &parent, const nall::string &filter, const nall::string &path = "");
+//private:
+  static void initialize();
+};
+
+}

bsnes/phoenix/gtk/horizontalslider.cpp

@@ -0,0 +1,25 @@
+static void HorizontalSlider_change(HorizontalSlider *self) {
+  if(self->object->position == self->position()) return;
+  self->object->position = self->position();
+  if(self->onChange) self->onChange();
+}
+
+void HorizontalSlider::create(Window &parent, unsigned x, unsigned y, unsigned width, unsigned height, unsigned length) {
+  object->position = 0;
+  length += (length == 0);
+  object->widget = gtk_hscale_new_with_range(0, length - 1, 1);
+  widget->parent = &parent;
+  gtk_scale_set_draw_value(GTK_SCALE(object->widget), false);
+  gtk_widget_set_size_request(object->widget, width, height);
+  g_signal_connect_swapped(G_OBJECT(object->widget), "value-changed", G_CALLBACK(HorizontalSlider_change), (gpointer)this);
+  gtk_fixed_put(GTK_FIXED(parent.object->formContainer), object->widget, x, y);
+  gtk_widget_show(object->widget);
+}
+
+unsigned HorizontalSlider::position() {
+  return (unsigned)gtk_range_get_value(GTK_RANGE(object->widget));
+}
+
+void HorizontalSlider::setPosition(unsigned position) {
+  gtk_range_set_value(GTK_RANGE(object->widget), position);
+}

bsnes/phoenix/gtk/label.cpp

@@ -0,0 +1,13 @@
+void Label::create(Window &parent, unsigned x, unsigned y, unsigned width, unsigned height, const string &text) {
+  object->widget = gtk_label_new(text);
+  widget->parent = &parent;
+  gtk_misc_set_alignment(GTK_MISC(object->widget), 0.0, 0.5);
+  gtk_widget_set_size_request(object->widget, width, height);
+  if(parent.window->defaultFont) setFont(*parent.window->defaultFont);
+  gtk_fixed_put(GTK_FIXED(parent.object->formContainer), object->widget, x, y);
+  gtk_widget_show(object->widget);
+}
+
+void Label::setText(const string &text) {
+  gtk_label_set_text(GTK_LABEL(object->widget), text);
+}

bsnes/phoenix/gtk/listbox.cpp

@@ -0,0 +1,195 @@
+static void ListBox_activate(ListBox *self) {
+  signed selection = -1;
+  if(auto position = self->selection()) selection = position();
+  self->listBox->selection = selection;
+  if(self->onActivate) self->onActivate();
+}
+
+static void ListBox_change(ListBox *self) {
+  signed selection = -1;
+  if(auto position = self->selection()) selection = position();
+  if(selection == self->listBox->selection) return;
+  self->listBox->selection = selection;
+  if(self->onChange) self->onChange();
+}
+
+static void ListBox_tick(GtkCellRendererToggle *cell, gchar *path_string, ListBox *self) {
+  unsigned index = strunsigned(path_string);
+  self->setChecked(index, !self->checked(index));
+  if(self->onTick) self->onTick(index);
+}
+
+void ListBox::create(Window &parent, unsigned x, unsigned y, unsigned width, unsigned height, const string &text) {
+  listBox->selection = -1;
+  object->widget = gtk_scrolled_window_new(0, 0);
+  widget->parent = &parent;
+  gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(object->widget), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+  gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(object->widget), GTK_SHADOW_ETCHED_IN);
+  gtk_widget_set_size_request(object->widget, width, height);
+
+  lstring list;
+  list.split("\t", string("\t", text));
+
+  GType *v = (GType*)malloc(list.size() * sizeof(GType));
+  for(unsigned i = 0; i < list.size(); i++) v[i] = (i == 0 ? G_TYPE_BOOLEAN : G_TYPE_STRING);
+  listBox->store = gtk_list_store_newv(list.size(), v);
+  free(v);
+
+  object->subWidget = gtk_tree_view_new_with_model(GTK_TREE_MODEL(listBox->store));
+  gtk_container_add(GTK_CONTAINER(object->widget), object->subWidget);
+  g_object_unref(G_OBJECT(listBox->store));
+
+  for(unsigned i = 0; i < list.size(); i++) {
+    if(i == 0) {
+      listBox->column[i].renderer = gtk_cell_renderer_toggle_new();
+      listBox->column[i].column = gtk_tree_view_column_new_with_attributes(
+        "", listBox->column[i].renderer, "active", i, (void*)0
+      );
+      gtk_tree_view_column_set_resizable(listBox->column[i].column, false);
+      gtk_tree_view_column_set_visible(listBox->column[i].column, listBox->checkable);
+      g_signal_connect(listBox->column[i].renderer, "toggled", G_CALLBACK(ListBox_tick), (gpointer)this);
+    } else {
+      listBox->column[i].renderer = gtk_cell_renderer_text_new();
+      listBox->column[i].column = gtk_tree_view_column_new_with_attributes(
+        "", listBox->column[i].renderer, "text", i, (void*)0
+      );
+      gtk_tree_view_column_set_resizable(listBox->column[i].column, true);
+    }
+    listBox->column[i].label = gtk_label_new(list[i]);
+    gtk_tree_view_column_set_widget(GTK_TREE_VIEW_COLUMN(listBox->column[i].column), listBox->column[i].label);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(object->subWidget), listBox->column[i].column);
+    gtk_widget_show(listBox->column[i].label);
+  }
+  gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(object->subWidget), false);
+  gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(object->subWidget), list.size() >= 3);  //>= 2 + one for the checkbox column
+  gtk_tree_view_set_search_column(GTK_TREE_VIEW(object->subWidget), 1);
+
+  g_signal_connect_swapped(G_OBJECT(object->subWidget), "cursor-changed", G_CALLBACK(ListBox_change), (gpointer)this);
+  g_signal_connect_swapped(G_OBJECT(object->subWidget), "row-activated", G_CALLBACK(ListBox_activate), (gpointer)this);
+
+  if(parent.window->defaultFont) setFont(*parent.window->defaultFont);
+  gtk_fixed_put(GTK_FIXED(parent.object->formContainer), object->widget, x, y);
+  gtk_widget_show(object->subWidget);
+  gtk_widget_show(object->widget);
+}
+
+void ListBox::setFocused() {
+  gtk_widget_grab_focus(object->subWidget);
+}
+
+void ListBox::setHeaderVisible(bool visible) {
+  gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(object->subWidget), visible);
+}
+
+void ListBox::setCheckable(bool checkable) {
+  listBox->checkable = checkable;
+  if(object->subWidget) gtk_tree_view_column_set_visible(listBox->column[0].column, checkable);
+}
+
+void ListBox::setFont(Font &font) {
+  Widget::setFont(font);
+  unsigned columns = 1;
+  while(true) {
+    if(gtk_tree_view_get_column(GTK_TREE_VIEW(object->subWidget), columns) == 0) break;
+    columns++;
+  }
+  for(unsigned i = 0; i < columns; i++) {
+    gtk_widget_modify_font(listBox->column[i].label, font.font->font);
+  }
+}
+
+void ListBox::reset() {
+  listBox->selection = -1;
+  gtk_list_store_clear(GTK_LIST_STORE(listBox->store));
+  gtk_tree_view_set_model(GTK_TREE_VIEW(object->subWidget), GTK_TREE_MODEL(listBox->store));
+  //reset gtk_scrolled_window scrollbar position to 0,0 (top-left), as ListBox is now empty
+  gtk_scrolled_window_set_hadjustment(GTK_SCROLLED_WINDOW(object->widget), 0);
+  gtk_scrolled_window_set_vadjustment(GTK_SCROLLED_WINDOW(object->widget), 0);
+}
+
+void ListBox::resizeColumnsToContent() {
+  gtk_tree_view_columns_autosize(GTK_TREE_VIEW(object->subWidget));
+}
+
+void ListBox::addItem(const string &text) {
+  lstring list;
+  list.split("\t", text);
+  GtkTreeIter iter;
+  gtk_list_store_append(listBox->store, &iter);
+  unsigned index = 1;
+  foreach(item, list) gtk_list_store_set(listBox->store, &iter, index++, (const char*)item, -1);
+}
+
+void ListBox::setItem(unsigned row, const string &text) {
+  GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(object->subWidget));
+  GtkTreeIter iter;
+  for(unsigned i = 0; i <= row; i++) {
+    if(i == 0) gtk_tree_model_get_iter_first(model, &iter);
+    else gtk_tree_model_iter_next(model, &iter);
+  }
+
+  lstring list;
+  list.split("\t", text);
+  unsigned index = 1;
+  foreach(item, list) gtk_list_store_set(listBox->store, &iter, index++, (const char*)item, -1);
+}
+
+bool ListBox::checked(unsigned row) {
+  GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(object->subWidget));
+  GtkTreePath *path = gtk_tree_path_new_from_string(string(row));
+  GtkTreeIter iter;
+  bool state;
+  gtk_tree_model_get_iter(model, &iter, path);
+  gtk_tree_model_get(model, &iter, 0, &state, -1);
+  gtk_tree_path_free(path);
+  return state;
+}
+
+void ListBox::setChecked(unsigned row, bool checked) {
+  GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(object->subWidget));
+  GtkTreePath *path = gtk_tree_path_new_from_string(string(row));
+  GtkTreeIter iter;
+  gtk_tree_model_get_iter(model, &iter, path);
+  gtk_list_store_set(GTK_LIST_STORE(model), &iter, 0, checked, -1);
+  gtk_tree_path_free(path);
+}
+
+optional<unsigned> ListBox::selection() {
+  GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(object->subWidget));
+  GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(object->subWidget));
+  GtkTreeIter iter;
+  if(gtk_tree_model_get_iter_first(model, &iter) == false) return { false, 0 };
+  if(gtk_tree_selection_iter_is_selected(selection, &iter) == true) return { true, 0 };
+  for(unsigned i = 1;; i++) {
+    if(gtk_tree_model_iter_next(model, &iter) == false) return { false, 0 };
+    if(gtk_tree_selection_iter_is_selected(selection, &iter) == true) return { true, i };
+  }
+  return { false, 0 };
+}
+
+void ListBox::setSelection(unsigned row) {
+  signed current = -1;
+  if(auto position = selection()) current = position();
+  GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(object->subWidget));
+  GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(object->subWidget));
+  gtk_tree_selection_unselect_all(selection);
+
+  GtkTreeIter iter;
+  if(gtk_tree_model_get_iter_first(model, &iter) == false) return;
+  if(row == 0) {
+    gtk_tree_selection_select_iter(selection, &iter);
+    return;
+  }
+  for(unsigned i = 1;; i++) {
+    if(gtk_tree_model_iter_next(model, &iter) == false) return;
+    if(row == i) {
+      gtk_tree_selection_select_iter(selection, &iter);
+      return;
+    }
+  }
+}
+
+ListBox::ListBox() {
+  listBox = new ListBox::Data;
+  listBox->checkable = false;
+}

bsnes/phoenix/gtk/menu.cpp

@@ -0,0 +1,129 @@
+static void Action_setFont(GtkWidget *widget, gpointer font) {
+  if(font) {
+    gtk_widget_modify_font(widget, (PangoFontDescription*)font);
+    if(GTK_IS_CONTAINER(widget)) {
+      gtk_container_foreach(GTK_CONTAINER(widget), (GtkCallback)Action_setFont, (PangoFontDescription*)font);
+    }
+  }
+}
+
+bool Action::visible() {
+  return gtk_widget_get_visible(object->widget);
+}
+
+void Action::setVisible(bool visible) {
+  gtk_widget_set_visible(object->widget, visible);
+}
+
+bool Action::enabled() {
+  return gtk_widget_get_sensitive(object->widget);
+}
+
+void Action::setEnabled(bool enabled) {
+  gtk_widget_set_sensitive(object->widget, enabled);
+}
+
+Action::Action() {
+  action = new Action::Data;
+  action->font = 0;
+}
+
+void Menu::create(Window &parent, const string &text) {
+  action->font = parent.window->defaultFont;
+  object->menu = gtk_menu_new();
+  object->widget = gtk_menu_item_new_with_label(text);
+  gtk_menu_item_set_submenu(GTK_MENU_ITEM(object->widget), object->menu);
+  if(action->font) Action_setFont(object->widget, action->font->font->font);
+  gtk_menu_bar_append(parent.object->menu, object->widget);
+  gtk_widget_show(object->widget);
+}
+
+void Menu::create(Menu &parent, const string &text) {
+  action->font = parent.action->font;
+  object->menu = gtk_menu_new();
+  object->widget = gtk_menu_item_new_with_label(text);
+  gtk_menu_item_set_submenu(GTK_MENU_ITEM(object->widget), object->menu);
+  if(action->font) Action_setFont(object->widget, action->font->font->font);
+  gtk_menu_shell_append(GTK_MENU_SHELL(parent.object->menu), object->widget);
+  gtk_widget_show(object->widget);
+}
+
+void MenuSeparator::create(Menu &parent) {
+  action->font = parent.action->font;
+  object->widget = gtk_separator_menu_item_new();
+  if(action->font) Action_setFont(object->widget, action->font->font->font);
+  gtk_menu_shell_append(GTK_MENU_SHELL(parent.object->menu), object->widget);
+  gtk_widget_show(object->widget);
+}
+
+static void MenuItem_tick(MenuItem *self) {
+  if(self->onTick) self->onTick();
+}
+
+void MenuItem::create(Menu &parent, const string &text) {
+  action->font = parent.action->font;
+  object->widget = gtk_menu_item_new_with_label(text);
+  g_signal_connect_swapped(G_OBJECT(object->widget), "activate", G_CALLBACK(MenuItem_tick), (gpointer)this);
+  if(action->font) Action_setFont(object->widget, action->font->font->font);
+  gtk_menu_shell_append(GTK_MENU_SHELL(parent.object->menu), object->widget);
+  gtk_widget_show(object->widget);
+}
+
+static void MenuCheckItem_tick(MenuCheckItem *self) {
+  if(self->onTick && self->object->locked == false) self->onTick();
+}
+
+void MenuCheckItem::create(Menu &parent, const string &text) {
+  action->font = parent.action->font;
+  object->widget = gtk_check_menu_item_new_with_label(text);
+  g_signal_connect_swapped(G_OBJECT(object->widget), "toggled", G_CALLBACK(MenuCheckItem_tick), (gpointer)this);
+  if(action->font) Action_setFont(object->widget, action->font->font->font);
+  gtk_menu_shell_append(GTK_MENU_SHELL(parent.object->menu), object->widget);
+  gtk_widget_show(object->widget);
+}
+
+bool MenuCheckItem::checked() {
+  return gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(object->widget));
+}
+
+void MenuCheckItem::setChecked(bool state) {
+  object->locked = true;
+  gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(object->widget), state);
+  object->locked = false;
+}
+
+static void MenuRadioItem_tick(MenuRadioItem *self) {
+  if(self->onTick && self->checked() && self->object->locked == false) self->onTick();
+}
+
+void MenuRadioItem::create(Menu &parent, const string &text) {
+  first = this;
+  action->font = parent.action->font;
+  object->parentMenu = &parent;
+  object->widget = gtk_radio_menu_item_new_with_label(0, text);
+  g_signal_connect_swapped(G_OBJECT(object->widget), "toggled", G_CALLBACK(MenuRadioItem_tick), (gpointer)this);
+  if(action->font) Action_setFont(object->widget, action->font->font->font);
+  gtk_menu_shell_append(GTK_MENU_SHELL(parent.object->menu), object->widget);
+  gtk_widget_show(object->widget);
+}
+
+void MenuRadioItem::create(MenuRadioItem &parent, const string &text) {
+  first = parent.first;
+  action->font = parent.action->font;
+  object->parentMenu = parent.object->parentMenu;
+  object->widget = gtk_radio_menu_item_new_with_label_from_widget(GTK_RADIO_MENU_ITEM(first->object->widget), text);
+  g_signal_connect_swapped(G_OBJECT(object->widget), "toggled", G_CALLBACK(MenuRadioItem_tick), (gpointer)this);
+  if(action->font) Action_setFont(object->widget, action->font->font->font);
+  gtk_menu_shell_append(GTK_MENU_SHELL(object->parentMenu->object->menu), object->widget);
+  gtk_widget_show(object->widget);
+}
+
+bool MenuRadioItem::checked() {
+  return gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(object->widget));
+}
+
+void MenuRadioItem::setChecked() {
+  object->locked = true;
+  gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(object->widget), true);
+  object->locked = false;
+}

bsnes/phoenix/gtk/messagewindow.cpp

@@ -0,0 +1,65 @@
+static MessageWindow::Response MessageWindow_response(MessageWindow::Buttons buttons, gint response) {
+  if(response == GTK_RESPONSE_OK) return MessageWindow::Response::Ok;
+  if(response == GTK_RESPONSE_CANCEL) return MessageWindow::Response::Cancel;
+  if(response == GTK_RESPONSE_YES) return MessageWindow::Response::Yes;
+  if(response == GTK_RESPONSE_NO) return MessageWindow::Response::No;
+  if(buttons == MessageWindow::Buttons::OkCancel) return MessageWindow::Response::Cancel;
+  if(buttons == MessageWindow::Buttons::YesNo) return MessageWindow::Response::No;
+  return MessageWindow::Response::Ok;
+}
+
+MessageWindow::Response MessageWindow::information(Window &parent, const string &text, MessageWindow::Buttons buttons) {
+  GtkButtonsType buttonsType = GTK_BUTTONS_OK;
+  if(buttons == Buttons::OkCancel) buttonsType = GTK_BUTTONS_OK_CANCEL;
+  if(buttons == Buttons::YesNo) buttonsType = GTK_BUTTONS_YES_NO;
+
+  GtkWidget *dialog = gtk_message_dialog_new(
+    &parent != &Window::None ? GTK_WINDOW(parent.object->widget) : (GtkWindow*)0,
+    GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, buttonsType, "%s", (const char*)text
+  );
+  gint response = gtk_dialog_run(GTK_DIALOG(dialog));
+  gtk_widget_destroy(dialog);
+  return MessageWindow_response(buttons, response);
+}
+
+MessageWindow::Response MessageWindow::question(Window &parent, const string &text, MessageWindow::Buttons buttons) {
+  GtkButtonsType buttonsType = GTK_BUTTONS_OK;
+  if(buttons == Buttons::OkCancel) buttonsType = GTK_BUTTONS_OK_CANCEL;
+  if(buttons == Buttons::YesNo) buttonsType = GTK_BUTTONS_YES_NO;
+
+  GtkWidget *dialog = gtk_message_dialog_new(
+    &parent != &Window::None ? GTK_WINDOW(parent.object->widget) : (GtkWindow*)0,
+    GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, buttonsType, "%s", (const char*)text
+  );
+  gint response = gtk_dialog_run(GTK_DIALOG(dialog));
+  gtk_widget_destroy(dialog);
+  return MessageWindow_response(buttons, response);
+}
+
+MessageWindow::Response MessageWindow::warning(Window &parent, const string &text, MessageWindow::Buttons buttons) {
+  GtkButtonsType buttonsType = GTK_BUTTONS_OK;
+  if(buttons == Buttons::OkCancel) buttonsType = GTK_BUTTONS_OK_CANCEL;
+  if(buttons == Buttons::YesNo) buttonsType = GTK_BUTTONS_YES_NO;
+
+  GtkWidget *dialog = gtk_message_dialog_new(
+    &parent != &Window::None ? GTK_WINDOW(parent.object->widget) : (GtkWindow*)0,
+    GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, buttonsType, "%s", (const char*)text
+  );
+  gint response = gtk_dialog_run(GTK_DIALOG(dialog));
+  gtk_widget_destroy(dialog);
+  return MessageWindow_response(buttons, response);
+}
+
+MessageWindow::Response MessageWindow::critical(Window &parent, const string &text, MessageWindow::Buttons buttons) {
+  GtkButtonsType buttonsType = GTK_BUTTONS_OK;
+  if(buttons == Buttons::OkCancel) buttonsType = GTK_BUTTONS_OK_CANCEL;
+  if(buttons == Buttons::YesNo) buttonsType = GTK_BUTTONS_YES_NO;
+
+  GtkWidget *dialog = gtk_message_dialog_new(
+    &parent != &Window::None ? GTK_WINDOW(parent.object->widget) : (GtkWindow*)0,
+    GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, buttonsType, "%s", (const char*)text
+  );
+  gint response = gtk_dialog_run(GTK_DIALOG(dialog));
+  gtk_widget_destroy(dialog);
+  return MessageWindow_response(buttons, response);
+}

bsnes/phoenix/gtk/object.cpp

@@ -0,0 +1,57 @@
+struct Object::Data {
+  bool locked;
+  GtkWidget *widget;
+  GtkWidget *subWidget;
+  GtkWidget *menuContainer;
+  GtkWidget *formContainer;
+  GtkWidget *statusContainer;
+  GtkWidget *menu;
+  GtkWidget *status;
+  Menu *parentMenu;
+  Window *parentWindow;
+  GtkTextBuffer *textBuffer;
+  unsigned position;
+};
+
+struct Font::Data {
+  PangoFontDescription *font;
+};
+
+struct Action::Data {
+  Font *font;
+};
+
+struct Widget::Data {
+  Window *parent;
+};
+
+struct Window::Data {
+  Font *defaultFont;
+};
+
+struct Canvas::Data {
+  uint32_t *bufferRGB;
+  uint32_t *bufferBGR;
+  unsigned pitch;
+};
+
+struct ListBox::Data {
+  GtkListStore *store;
+  struct GtkColumn {
+    GtkCellRenderer *renderer;
+    GtkTreeViewColumn *column;
+    GtkWidget *label;
+  };
+  linear_vector<GtkColumn> column;
+  bool checkable;
+  signed selection;
+};
+
+void Object::unused() {
+}
+
+Object::Object() {
+  OS::initialize();
+  object = new Object::Data;
+  object->locked = false;
+}