v114.5

* improved appended firmware detection [devinacker]
* added dynamic rate control support to ALSA and PulseAudio drivers [RedDwarf]
* added option to use native file dialogs

bsnes/emulator/emulator.hpp

@@ -28,11 +28,11 @@ using namespace nall;
 #include <emulator/audio/audio.hpp>
 
 namespace Emulator {
-  static const string Name    = "bsnes";
+  static const string Name      = "bsnes";
-  static const string Version = "114.4";
+  static const string Version   = "114.5";
-  static const string Author  = "byuu";
+  static const string Copyright = "byuu";
-  static const string License = "GPLv3";
+  static const string License   = "GPLv3";
-  static const string Website = "https://byuu.org";
+  static const string Website   = "https://byuu.org";
 
   //incremented only when serialization format changes
   static const string SerializerVersion = "114.2";

bsnes/heuristics/super-famicom.cpp

@@ -433,13 +433,7 @@ auto SuperFamicom::serial() const -> string {
 }
 
 auto SuperFamicom::romSize() const -> uint {
-  //subtract appended firmware size, if firmware is present
+  return size() - firmwareRomSize();
-  if((size() &  0x7fff) ==   0x100) return size() -   0x100;
-  if((size() &  0x7fff) ==   0xc00) return size() -   0xc00;
-  if((size() &  0x7fff) ==  0x2000) return size() -  0x2000;
-  if((size() &  0xffff) ==  0xd000) return size() -  0xd000;
-  if((size() & 0x3ffff) == 0x28000) return size() - 0x28000;
-  return size();
 }
 
 auto SuperFamicom::programRomSize() const -> uint {
@@ -459,8 +453,38 @@ auto SuperFamicom::expansionRomSize() const -> uint {
   return 0;
 }
 
+//detect if any firmware is appended to the ROM image, and return its size if so
 auto SuperFamicom::firmwareRomSize() const -> uint {
-  return size() - romSize();
+  auto cartridgeTypeLo  = data[headerAddress + 0x26] & 15;
+  auto cartridgeTypeHi  = data[headerAddress + 0x26] >> 4;
+  auto cartridgeSubType = data[headerAddress + 0x0f];
+
+  if(serial() == "042J" || (cartridgeTypeLo == 0x3 && cartridgeTypeHi == 0xe)) {
+    //Game Boy
+    if((size() & 0x7fff) == 0x100) return 0x100;
+  }
+
+  if(cartridgeTypeLo >= 0x3 && cartridgeTypeHi == 0xf && cartridgeSubType == 0x10) {
+    //Hitachi HG51BS169
+    if((size() & 0x7fff) == 0xc00) return 0xc00;
+  }
+
+  if(cartridgeTypeLo >= 0x3 && cartridgeTypeHi == 0x0) {
+    //NEC uPD7725
+    if((size() & 0x7fff) == 0x2000) return 0x2000;
+  }
+
+  if(cartridgeTypeLo >= 0x3 && cartridgeTypeHi == 0xf && cartridgeSubType == 0x01) {
+    //NEC uPD96050
+    if((size() & 0xffff) == 0xd000) return 0xd000;
+  }
+
+  if(cartridgeTypeLo >= 0x3 && cartridgeTypeHi == 0xf && cartridgeSubType == 0x02) {
+    //ARM6
+    if((size() & 0x3ffff) == 0x28000) return 0x28000;
+  }
+
+  return 0;
 }
 
 auto SuperFamicom::ramSize() const -> uint {

bsnes/target-bsnes/bsnes.cpp

@@ -52,22 +52,6 @@ auto nall::main(Arguments arguments) -> void {
   emulator = new SuperFamicom::Interface;
   program.create();
 
-  if(Emulator::Version.find(".") && settings.general.betaWarning && 0) {
-    MessageDialog dialog;
-    dialog.setTitle(Emulator::Name);
-    dialog.setText(
-      "This is a nightly release. Bugs and regressions are possible!\n"
-      "If you experience issues, please report them to me.\n"
-      "If stability is required, please use a stable release.\n"
-    );
-    dialog.setOption("Don't show this message again");
-    dialog.information();
-    if(dialog.checked()) {
-      settings.general.betaWarning = false;
-      settings.save();
-    }
-  }
-
   Application::run();
   Instances::presentation.destruct();
   Instances::settingsWindow.destruct();

bsnes/target-bsnes/presentation/presentation.cpp

@@ -187,7 +187,7 @@ auto Presentation::create() -> void {
     .setLogo(Resource::SameBoy)
     .setDescription("Super Game Boy emulator")
     .setVersion("0.12.1")
-    .setAuthor("Lior Halphon")
+    .setCopyright("Lior Halphon")
     .setLicense("MIT")
     .setWebsite("https://sameboy.github.io")
     .setAlignment(*this)
@@ -199,7 +199,7 @@ auto Presentation::create() -> void {
     .setLogo(Resource::Logo)
     .setDescription("Super Nintendo emulator")
     .setVersion(Emulator::Version)
-    .setAuthor("byuu")
+    .setCopyright("byuu")
     .setLicense("GPLv3")
     .setWebsite("https://byuu.org")
     .setAlignment(*this)

bsnes/target-bsnes/program/movies.cpp

@@ -25,7 +25,7 @@ auto Program::moviePlay() -> void {
   dialog.setTitle("Play Movie");
   dialog.setPath(Path::desktop());
   dialog.setFilters({string{"Movies (.bsv)|*.bsv"}});
-  if(auto location = dialog.openFile()) {
+  if(auto location = openFile(dialog)) {
     if(auto fp = file::open(location, file::mode::read)) {
       bool failed = false;
       if(fp.read() != 'B') failed = true;
@@ -92,7 +92,7 @@ auto Program::movieStop() -> void {
     dialog.setTitle("Save Movie");
     dialog.setPath(Path::desktop());
     dialog.setFilters({string{"Movies (.bsv)|*.bsv"}});
-    if(auto location = dialog.saveFile()) {
+    if(auto location = saveFile(dialog)) {
       if(!location.endsWith(".bsv")) location.append(".bsv");
       if(auto fp = file::open(location, file::mode::write)) {
         fp.write('B');

bsnes/target-bsnes/program/platform.cpp

@@ -113,7 +113,7 @@ auto Program::load(uint id, string name, string type, vector<string> options) ->
       dialog.setTitle("Load SNES ROM");
       dialog.setPath(path("Games", settings.path.recent.superFamicom));
       dialog.setFilters({string{"SNES ROMs|*.sfc:*.smc:*.zip:*.7z:*.SFC:*.SMC:*.ZIP:*.7Z:*.Sfc:*.Smc:*.Zip"}, string{"All Files|*"}});
-      superFamicom.location = dialog.openObject();
+      superFamicom.location = openGame(dialog);
       superFamicom.option = dialog.option();
     }
     if(inode::exists(superFamicom.location)) {
@@ -133,7 +133,7 @@ auto Program::load(uint id, string name, string type, vector<string> options) ->
       dialog.setTitle("Load Game Boy ROM");
       dialog.setPath(path("Games", settings.path.recent.gameBoy));
       dialog.setFilters({string{"Game Boy ROMs|*.gb:*.gbc:*.zip:*.7z:*.GB:*.GBC:*.ZIP:*.7Z:*.Gb:*.Gbc:*.Zip"}, string{"All Files|*"}});
-      gameBoy.location = dialog.openObject();
+      gameBoy.location = openGame(dialog);
       gameBoy.option = dialog.option();
     }
     if(inode::exists(gameBoy.location)) {
@@ -153,7 +153,7 @@ auto Program::load(uint id, string name, string type, vector<string> options) ->
       dialog.setTitle("Load BS Memory ROM");
       dialog.setPath(path("Games", settings.path.recent.bsMemory));
       dialog.setFilters({string{"BS Memory ROMs|*.bs:*.zip:*.7z:*.BS:*.ZIP:*.7Z:*.Bs:*.Zip"}, string{"All Files|*"}});
-      bsMemory.location = dialog.openObject();
+      bsMemory.location = openGame(dialog);
       bsMemory.option = dialog.option();
     }
     if(inode::exists(bsMemory.location)) {
@@ -173,7 +173,7 @@ auto Program::load(uint id, string name, string type, vector<string> options) ->
       dialog.setTitle("Load Sufami Turbo ROM - Slot A");
       dialog.setPath(path("Games", settings.path.recent.sufamiTurboA));
       dialog.setFilters({string{"Sufami Turbo ROMs|*.st:*.zip:*.7z:*.ST:*.ZIP:*.7Z:*.St:*.Zip"}, string{"All Files|*"}});
-      sufamiTurboA.location = dialog.openObject();
+      sufamiTurboA.location = openGame(dialog);
       sufamiTurboA.option = dialog.option();
     }
     if(inode::exists(sufamiTurboA.location)) {
@@ -193,7 +193,7 @@ auto Program::load(uint id, string name, string type, vector<string> options) ->
       dialog.setTitle("Load Sufami Turbo ROM - Slot B");
       dialog.setPath(path("Games", settings.path.recent.sufamiTurboB));
       dialog.setFilters({string{"Sufami Turbo ROMs|*.st:*.zip:*.7z:*.ST:*.ZIP:*.7Z:*.St:*.Zip"}, string{"All Files|*"}});
-      sufamiTurboB.location = dialog.openObject();
+      sufamiTurboB.location = openGame(dialog);
       sufamiTurboB.option = dialog.option();
     }
     if(inode::exists(sufamiTurboB.location)) {

bsnes/target-bsnes/program/program.hpp

@@ -114,6 +114,10 @@ struct Program : Lock, Emulator::Platform {
   auto updateInputDriver(Window parent) -> void;
 
   //utility.cpp
+  auto openGame(BrowserDialog& dialog) -> string;
+  auto openFile(BrowserDialog& dialog) -> string;
+  auto saveFile(BrowserDialog& dialog) -> string;
+  auto selectPath() -> string;
   auto showMessage(string text) -> void;
   auto showFrameRate(string text) -> void;
   auto updateStatus() -> void;

bsnes/target-bsnes/program/utility.cpp

@@ -1,3 +1,54 @@
+auto Program::openGame(BrowserDialog& dialog) -> string {
+  if(!settings.general.nativeFileDialogs) {
+    return dialog.openObject();
+  }
+
+  BrowserWindow window;
+  window.setTitle(dialog.title());
+  window.setPath(dialog.path());
+  window.setFilters(dialog.filters());
+  window.setParent(dialog.alignmentWindow());
+  return window.open();
+}
+
+auto Program::openFile(BrowserDialog& dialog) -> string {
+  if(!settings.general.nativeFileDialogs) {
+    return dialog.openFile();
+  }
+
+  BrowserWindow window;
+  window.setTitle(dialog.title());
+  window.setPath(dialog.path());
+  window.setFilters(dialog.filters());
+  window.setParent(dialog.alignmentWindow());
+  return window.open();
+}
+
+auto Program::saveFile(BrowserDialog& dialog) -> string {
+  if(!settings.general.nativeFileDialogs) {
+    return dialog.saveFile();
+  }
+
+  BrowserWindow window;
+  window.setTitle(dialog.title());
+  window.setPath(dialog.path());
+  window.setFilters(dialog.filters());
+  window.setParent(dialog.alignmentWindow());
+  return window.save();
+}
+
+auto Program::selectPath() -> string {
+  if(!settings.general.nativeFileDialogs) {
+    BrowserDialog dialog;
+    dialog.setPath(Path::desktop());
+    return dialog.selectFolder();
+  }
+
+  BrowserWindow window;
+  window.setPath(Path::desktop());
+  return window.directory();
+}
+
 auto Program::showMessage(string text) -> void {
   statusTime = chrono::millisecond();
   statusMessage = text;

bsnes/target-bsnes/settings/emulator.cpp

@@ -20,6 +20,9 @@ auto EmulatorSettings::create() -> void {
   autoLoadStateOnLoad.setText("Auto-resume on load").setChecked(settings.emulator.autoLoadStateOnLoad).onToggle([&] {
     settings.emulator.autoLoadStateOnLoad = autoLoadStateOnLoad.checked();
   });
+  nativeFileDialogs.setText("Use native file dialogs").setChecked(settings.general.nativeFileDialogs).onToggle([&] {
+    settings.general.nativeFileDialogs = nativeFileDialogs.checked();
+  });
   optionsSpacer.setColor({192, 192, 192});
 
   fastForwardLabel.setText("Fast Forward").setFont(Font().setBold());

bsnes/target-bsnes/settings/paths.cpp

@@ -8,7 +8,7 @@ auto PathSettings::create() -> void {
   gamesLabel.setText("Games:");
   gamesPath.setEditable(false);
   gamesAssign.setText("Assign ...").onActivate([&] {
-    if(auto location = BrowserDialog().selectFolder()) {
+    if(auto location = program.selectPath()) {
       settings.path.games = location;
       refreshPaths();
     }
@@ -21,7 +21,7 @@ auto PathSettings::create() -> void {
   patchesLabel.setText("Patches:");
   patchesPath.setEditable(false);
   patchesAssign.setText("Assign ...").onActivate([&] {
-    if(auto location = BrowserDialog().selectFolder()) {
+    if(auto location = program.selectPath()) {
       settings.path.patches = location;
       refreshPaths();
     }
@@ -34,7 +34,7 @@ auto PathSettings::create() -> void {
   savesLabel.setText("Saves:");
   savesPath.setEditable(false);
   savesAssign.setText("Assign ...").onActivate([&] {
-    if(auto location = BrowserDialog().selectFolder()) {
+    if(auto location = program.selectPath()) {
       settings.path.saves = location;
       refreshPaths();
     }
@@ -47,7 +47,7 @@ auto PathSettings::create() -> void {
   cheatsLabel.setText("Cheats:");
   cheatsPath.setEditable(false);
   cheatsAssign.setText("Assign ...").onActivate([&] {
-    if(auto location = BrowserDialog().selectFolder()) {
+    if(auto location = program.selectPath()) {
       settings.path.cheats = location;
       refreshPaths();
     }
@@ -60,7 +60,7 @@ auto PathSettings::create() -> void {
   statesLabel.setText("States:");
   statesPath.setEditable(false);
   statesAssign.setText("Assign ...").onActivate([&] {
-    if(auto location = BrowserDialog().selectFolder()) {
+    if(auto location = program.selectPath()) {
       settings.path.states = location;
       refreshPaths();
     }
@@ -73,7 +73,7 @@ auto PathSettings::create() -> void {
   screenshotsLabel.setText("Screenshots:");
   screenshotsPath.setEditable(false);
   screenshotsAssign.setText("Assign ...").onActivate([&] {
-    if(auto location = BrowserDialog().selectFolder()) {
+    if(auto location = program.selectPath()) {
       settings.path.screenshots = location;
       refreshPaths();
     }

bsnes/target-bsnes/settings/settings.cpp

@@ -137,11 +137,11 @@ auto Settings::process(bool load) -> void {
   bind(natural, "Emulator/Hack/SuperFX/Overclock",       emulator.hack.superfx.overclock);
   bind(boolean, "Emulator/Cheats/Enable",                emulator.cheats.enable);
 
-  bind(boolean, "General/StatusBar",   general.statusBar);
+  bind(boolean, "General/StatusBar",         general.statusBar);
-  bind(boolean, "General/ScreenSaver", general.screenSaver);
+  bind(boolean, "General/ScreenSaver",       general.screenSaver);
-  bind(boolean, "General/ToolTips",    general.toolTips);
+  bind(boolean, "General/ToolTips",          general.toolTips);
-  bind(boolean, "General/Crashed",     general.crashed);
+  bind(boolean, "General/Crashed",           general.crashed);
-  bind(boolean, "General/BetaWarning", general.betaWarning);
+  bind(boolean, "General/NativeFileDialogs", general.nativeFileDialogs);
 
   #undef bind
 }

bsnes/target-bsnes/settings/settings.hpp

@@ -145,7 +145,7 @@ struct Settings : Markup::Node {
     bool screenSaver = false;
     bool toolTips = true;
     bool crashed = false;
-    bool betaWarning = true;
+    bool nativeFileDialogs = false;
   } general;
 };
 
@@ -303,11 +303,12 @@ struct EmulatorSettings : VerticalLayout {
 
 public:
   Label optionsLabel{this, Size{~0, 0}, 2};
-  CheckLabel warnOnUnverifiedGames{this, Size{~0, 0}};
+  CheckLabel warnOnUnverifiedGames{this, Size{~0, 0}, 2};
-  CheckLabel autoSaveMemory{this, Size{~0, 0}};
+  CheckLabel autoSaveMemory{this, Size{~0, 0}, 2};
-  HorizontalLayout autoStateLayout{this, Size{~0, 0}};
+  HorizontalLayout autoStateLayout{this, Size{~0, 0}, 2};
     CheckLabel autoSaveStateOnUnload{&autoStateLayout, Size{0, 0}};
     CheckLabel autoLoadStateOnLoad{&autoStateLayout, Size{0, 0}};
+  CheckLabel nativeFileDialogs{this, Size{~0, 0}};
   Canvas optionsSpacer{this, Size{~0, 1}};
   //
   Label fastForwardLabel{this, Size{~0, 0}, 2};

hiro/cocoa/application.cpp

@@ -37,6 +37,11 @@ NSTimer* applicationTimer = nullptr;
 
 namespace hiro {
 
+auto pApplication::exit() -> void {
+  quit();
+  ::exit(EXIT_SUCCESS);
+}
+
 auto pApplication::modal() -> bool {
   return Application::state().modal > 0;
 }

hiro/cocoa/application.hpp

@@ -11,6 +11,7 @@
 namespace hiro {
 
 struct pApplication {
+  static auto exit() -> void;
   static auto modal() -> bool;
   static auto run() -> void;
   static auto pendingEvents() -> bool;

hiro/cocoa/browser-window.cpp

@@ -26,7 +26,7 @@ auto pBrowserWindow::open(BrowserWindow::State& state) -> string {
   @autoreleasepool {
     NSMutableArray* filters = [[NSMutableArray alloc] init];
     for(auto& rule : state.filters) {
-      string pattern = rule.split("(", 1L)(1).trimRight(")", 1L);
+      string pattern = rule.split("|", 1L)(1).transform(":", ";");
       if(pattern) [filters addObject:[NSString stringWithUTF8String:pattern]];
     }
     NSOpenPanel* panel = [NSOpenPanel openPanel];
@@ -51,7 +51,7 @@ auto pBrowserWindow::save(BrowserWindow::State& state) -> string {
   @autoreleasepool {
     NSMutableArray* filters = [[NSMutableArray alloc] init];
     for(auto& rule : state.filters) {
-      string pattern = rule.split("(", 1L)(1).trimRight(")", 1L);
+      string pattern = rule.split("|", 1L)(1).transform(":", ";");
       if(pattern) [filters addObject:[NSString stringWithUTF8String:pattern]];
     }
     NSSavePanel* panel = [NSSavePanel savePanel];

hiro/core/application.cpp

@@ -10,8 +10,8 @@ auto Application::doMain() -> void {
 }
 
 auto Application::exit() -> void {
-  quit();
+  state().quit = true;
-  ::exit(EXIT_SUCCESS);
+  return pApplication::exit();
 }
 
 auto Application::font() -> Font {

hiro/extension/about-dialog.cpp

@@ -12,8 +12,8 @@ auto AboutDialog::setAlignment(sWindow relativeTo, Alignment alignment) -> type&
   return *this;
 }
 
-auto AboutDialog::setAuthor(const string& author) -> type& {
+auto AboutDialog::setCopyright(const string& copyright) -> type& {
-  state.author = author;
+  state.copyright = copyright;
   return *this;
 }
 
@@ -64,7 +64,7 @@ auto AboutDialog::show() -> void {
   nameLabel.setText(state.name ? state.name : Application::name());
   nameLabel.setVisible((bool)state.name && !(bool)state.logo);
 
-  Canvas logoCanvas{&layout, Size{~0, 0}};
+  Canvas logoCanvas{&layout, Size{~0, 0}, 5_sy};
   logoCanvas.setCollapsible();
   if(state.logo) {
     image logo{state.logo};
@@ -95,19 +95,19 @@ auto AboutDialog::show() -> void {
   versionValue.setText(state.version);
   if(!state.version) versionLayout.setVisible(false);
 
-  HorizontalLayout authorLayout{&layout, Size{~0, 0}, 0};
+  HorizontalLayout copyrightLayout{&layout, Size{~0, 0}, 0};
-  authorLayout.setCollapsible();
+  copyrightLayout.setCollapsible();
-  Label authorLabel{&authorLayout, Size{~0, 0}, 3_sx};
+  Label copyrightLabel{&copyrightLayout, Size{~0, 0}, 3_sx};
-  authorLabel.setAlignment(1.0);
+  copyrightLabel.setAlignment(1.0);
-  authorLabel.setFont(Font().setBold());
+  copyrightLabel.setFont(Font().setBold());
-  authorLabel.setForegroundColor({0, 0, 0});
+  copyrightLabel.setForegroundColor({0, 0, 0});
-  authorLabel.setText("Author:");
+  copyrightLabel.setText("Copyright:");
-  Label authorValue{&authorLayout, Size{~0, 0}};
+  Label copyrightValue{&copyrightLayout, Size{~0, 0}};
-  authorValue.setAlignment(0.0);
+  copyrightValue.setAlignment(0.0);
-  authorValue.setFont(Font().setBold());
+  copyrightValue.setFont(Font().setBold());
-  authorValue.setForegroundColor({0, 0, 0});
+  copyrightValue.setForegroundColor({0, 0, 0});
-  authorValue.setText(state.author);
+  copyrightValue.setText(state.copyright);
-  if(!state.author) authorLayout.setVisible(false);
+  if(!state.copyright) copyrightLayout.setVisible(false);
 
   HorizontalLayout licenseLayout{&layout, Size{~0, 0}, 0};
   licenseLayout.setCollapsible();
@@ -151,7 +151,7 @@ auto AboutDialog::show() -> void {
 
   window.setTitle({"About ", state.name ? state.name : Application::name(), " ..."});
   window.setBackgroundColor({255, 255, 240});
-  window.setSize({max(360_sx, layout.minimumSize().width()), layout.minimumSize().height()});
+  window.setSize({max(320_sx, layout.minimumSize().width()), layout.minimumSize().height()});
   window.setResizable(false);
   window.setAlignment(state.relativeTo, state.alignment);
   window.setDismissable();

hiro/extension/about-dialog.hpp

@@ -5,7 +5,7 @@ struct AboutDialog {
 
   auto setAlignment(Alignment = Alignment::Center) -> type&;
   auto setAlignment(sWindow relativeTo, Alignment = Alignment::Center) -> type&;
-  auto setAuthor(const string& author = "") -> type&;
+  auto setCopyright(const string& copyright = "") -> type&;
   auto setDescription(const string& description = "") -> type&;
   auto setLicense(const string& license = "") -> type&;
   auto setLogo(const image& logo = {}) -> type&;
@@ -17,7 +17,7 @@ struct AboutDialog {
 private:
   struct State {
     Alignment alignment = Alignment::Center;
-    string author;
+    string copyright;
     string description;
     string license;
     image logo;

hiro/extension/browser-dialog.cpp

@@ -241,12 +241,8 @@ auto BrowserDialogWindow::run() -> BrowserDialog::Response {
       return (void)window.setModal(false);
     }
     if(state.action == "openObject" && isObject(name)) {
-      if(isMatch(name)) {
+      response.selected.append({state.path, name});
-        response.selected.append({state.path, name});
+      return (void)window.setModal(false);
-        return (void)window.setModal(false);
-      } else if(isFolder(name)) {
-        return setPath({state.path, name});
-      }
     }
     if(state.action == "saveFile") return accept();
     setPath(state.path, name);
@@ -417,6 +413,18 @@ auto BrowserDialogWindow::setPath(string path, const string& contains) -> void {
 BrowserDialog::BrowserDialog() {
 }
 
+auto BrowserDialog::alignment() const -> Alignment {
+  return state.alignment;
+}
+
+auto BrowserDialog::alignmentWindow() const -> Window {
+  return state.relativeTo;
+}
+
+auto BrowserDialog::filters() const -> vector<string> {
+  return state.filters;
+}
+
 auto BrowserDialog::openFile() -> string {
   state.action = "openFile";
   if(!state.title) state.title = "Open File";
@@ -449,6 +457,10 @@ auto BrowserDialog::option() -> string {
   return response.option;
 }
 
+auto BrowserDialog::path() const -> string {
+  return state.path;
+}
+
 auto BrowserDialog::saveFile() -> string {
   state.action = "saveFile";
   if(!state.title) state.title = "Save File";
@@ -504,6 +516,10 @@ auto BrowserDialog::setTitle(const string& title) -> type& {
   return *this;
 }
 
+auto BrowserDialog::title() const -> string {
+  return state.title;
+}
+
 auto BrowserDialog::_run() -> vector<string> {
   if(!state.path) state.path = Path::user();
   response = BrowserDialogWindow(state).run();

hiro/extension/browser-dialog.hpp

@@ -6,11 +6,15 @@ struct BrowserDialog {
   using type = BrowserDialog;
 
   BrowserDialog();
+  auto alignment() const -> Alignment;
+  auto alignmentWindow() const -> Window;
+  auto filters() const -> vector<string>;
   auto openFile() -> string;           //one existing file
   auto openFiles() -> vector<string>;  //any existing files
   auto openFolder() -> string;         //one existing folder
   auto openObject() -> string;         //one existing file or folder
   auto option() -> string;
+  auto path() const -> string;
   auto saveFile() -> string;           //one file
   auto selected() -> vector<string>;
   auto selectFolder() -> string;       //one existing folder
@@ -21,6 +25,7 @@ struct BrowserDialog {
   auto setOptions(const vector<string>& options = {}) -> type&;
   auto setPath(const string& path = "") -> type&;
   auto setTitle(const string& title = "") -> type&;
+  auto title() const -> string;
 
 private:
   struct State {

hiro/gtk/application.cpp

@@ -15,6 +15,11 @@ auto Log_Filter(const char* logDomain, GLogLevelFlags logLevel, const char* mess
   print(terminal::color::yellow("hiro: "), logDomain, "::", message, "\n");
 }
 
+auto pApplication::exit() -> void {
+  quit();
+  ::exit(EXIT_SUCCESS);
+}
+
 auto pApplication::modal() -> bool {
   return Application::state().modal > 0;
 }

hiro/gtk/application.hpp

@@ -3,6 +3,7 @@
 namespace hiro {
 
 struct pApplication {
+  static auto exit() -> void;
   static auto modal() -> bool;
   static auto run() -> void;
   static auto pendingEvents() -> bool;

hiro/gtk/browser-window.cpp

@@ -4,9 +4,12 @@ namespace hiro {
 
 static auto BrowserWindow_addFilters(GtkWidget* dialog, vector<string> filters) -> void {
   for(auto& filter : filters) {
+    auto part = filter.split("|", 1L);
+    if(part.size() != 2) continue;
+
     GtkFileFilter* gtkFilter = gtk_file_filter_new();
-    gtk_file_filter_set_name(gtkFilter, filter);
+    gtk_file_filter_set_name(gtkFilter, part[0]);
-    auto patterns = filter.split("(", 1L)(1).trimRight(")", 1L).split(",").strip();
+    auto patterns = part[1].split(":");
     for(auto& pattern : patterns) gtk_file_filter_add_pattern(gtkFilter, pattern);
     gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), gtkFilter);
   }

hiro/gtk/widget/table-view-item.cpp

@@ -32,6 +32,9 @@ auto pTableViewItem::setBackgroundColor(Color color) -> void {
 
 auto pTableViewItem::setFocused() -> void {
   if(auto parent = _parent()) {
+    //calling setSelected() and then setFocused() right after sometimes fails to set focus
+    Application::processEvents();
+
     auto lock = parent->acquire();
     GtkTreePath* path = gtk_tree_path_new_from_string(string{self().offset()});
     gtk_tree_view_set_cursor(parent->gtkTreeView, path, nullptr, false);

hiro/gtk/widget/widget.cpp

@@ -127,6 +127,8 @@ auto pWidget::setGeometry(Geometry geometry) -> void {
     }
   }
   pSizable::setGeometry(geometry);
+  //this is needed to prevent some repainting issues (specifically with a Label which has a background color set for it)
+  gtk_widget_queue_draw(gtkWidget);
 }
 
 auto pWidget::setMouseCursor(const MouseCursor& mouseCursor) -> void {

hiro/qt/application.cpp

@@ -2,6 +2,11 @@
 
 namespace hiro {
 
+auto pApplication::exit() -> void {
+  quit();
+  ::exit(EXIT_SUCCESS);
+}
+
 auto pApplication::modal() -> bool {
   return Application::state().modal > 0;
 }

hiro/qt/application.hpp

@@ -3,6 +3,7 @@
 namespace hiro {
 
 struct pApplication {
+  static auto exit() -> void;
   static auto modal() -> bool;
   static auto run() -> void;
   static auto pendingEvents() -> bool;

hiro/qt/browser-window.cpp

@@ -3,63 +3,48 @@
 namespace hiro {
 
 auto pBrowserWindow::directory(BrowserWindow::State& state) -> string {
-  return {};
-/*
   QString directory = QFileDialog::getExistingDirectory(
-    state.parent ? state.parent->p.qtWindow : nullptr,
+    state.parent ? state.parent->self()->qtWindow : nullptr,
-    state.title ? state.title : "Select Directory",
+    state.title ? QString::fromUtf8(state.title) : "Select Directory",
     QString::fromUtf8(state.path), QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks
   );
   string name = directory.toUtf8().constData();
   if(name && name.endsWith("/") == false) name.append("/");
   return name;
-*/
 }
 
 auto pBrowserWindow::open(BrowserWindow::State& state) -> string {
-  return {};
+  string filters;
-/*
+  for(auto& filter : state.filters) {
-  string filters = state.filters.merge(";;");
+    auto part = filter.split("|", 1L);
-
+    if(part.size() != 2) continue;
-  //convert filter list from phoenix to Qt format, example:
+    filters.append(part[0], " (", part[1].transform(":", " "), ");;");
-  //"Text, XML files (*.txt,*.xml)" -> "Text, XML files (*.txt *.xml)"
-  signed parentheses = 0;
-  for(auto& n : filters) {
-    if(n == '(') parentheses++;
-    if(n == ')') parentheses--;
-    if(n == ',' && parentheses) n = ' ';
   }
+  filters.trimRight(";;", 1L);
 
   QString filename = QFileDialog::getOpenFileName(
-    state.parent ? state.parent->p.qtWindow : nullptr,
+    state.parent ? state.parent->self()->qtWindow : nullptr,
-    state.title ? state.title : "Open File",
+    state.title ? QString::fromUtf8(state.title) : "Open File",
     QString::fromUtf8(state.path), QString::fromUtf8(filters)
   );
   return filename.toUtf8().constData();
-*/
 }
 
 auto pBrowserWindow::save(BrowserWindow::State& state) -> string {
-  return {};
+  string filters;
-/*
+  for(auto& filter : state.filters) {
-  string filters = state.filters.merge(";;");
+    auto part = filter.split("|", 1L);
-
+    if(part.size() != 2) continue;
-  //convert filter list from phoenix to Qt format, example:
+    filters.append(part[0], " (", part[1].transform(":", " "), ");;");
-  //"Text, XML files (*.txt,*.xml)" -> "Text, XML files (*.txt *.xml)"
-  signed parentheses = 0;
-  for(auto& n : filters) {
-    if(n == '(') parentheses++;
-    if(n == ')') parentheses--;
-    if(n == ',' && parentheses) n = ' ';
   }
+  filters.trimRight(";;", 1L);
 
   QString filename = QFileDialog::getSaveFileName(
-    state.parent ? state.parent->p.qtWindow : nullptr,
+    state.parent ? state.parent->self()->qtWindow : nullptr,
-    state.title ? state.title : "Save File",
+    state.title ? QString::fromUtf8(state.title) : "Save File",
     QString::fromUtf8(state.path), QString::fromUtf8(filters)
   );
   return filename.toUtf8().constData();
-*/
 }
 
 }

hiro/qt/message-window.cpp

@@ -27,35 +27,31 @@ static auto MessageWindow_response(MessageWindow::Buttons buttons, QMessageBox::
 }
 
 auto pMessageWindow::error(MessageWindow::State& state) -> MessageWindow::Response {
-  return {};
+  return MessageWindow_response(
-//  return MessageWindow_response(
+    state.buttons, QMessageBox::critical(state.parent ? state.parent->self()->qtWindow : nullptr, state.title ? QString::fromUtf8(state.title) : " ",
-//    state.buttons, QMessageBox::critical(state.parent ? state.parent->p.qtWindow : nullptr, state.title ? state.title : " ",
+    QString::fromUtf8(state.text), MessageWindow_buttons(state.buttons))
-//    QString::fromUtf8(state.text), MessageWindow_buttons(state.buttons))
+  );
-//  );
 }
 
 auto pMessageWindow::information(MessageWindow::State& state) -> MessageWindow::Response {
-  return {};
+  return MessageWindow_response(
-//  return MessageWindow_response(
+    state.buttons, QMessageBox::information(state.parent ? state.parent->self()->qtWindow : nullptr, state.title ? QString::fromUtf8(state.title) : " ",
-//    state.buttons, QMessageBox::information(state.parent ? state.parent->p.qtWindow : nullptr, state.title ? state.title : " ",
+    QString::fromUtf8(state.text), MessageWindow_buttons(state.buttons))
-//    QString::fromUtf8(state.text), MessageWindow_buttons(state.buttons))
+  );
-//  );
 }
 
 auto pMessageWindow::question(MessageWindow::State& state) -> MessageWindow::Response {
-  return {};
+  return MessageWindow_response(
-//  return MessageWindow_response(
+    state.buttons, QMessageBox::question(state.parent ? state.parent->self()->qtWindow : nullptr, state.title ? QString::fromUtf8(state.title) : " ",
-//    state.buttons, QMessageBox::question(state.parent ? state.parent->p.qtWindow : nullptr, state.title ? state.title : " ",
+    QString::fromUtf8(state.text), MessageWindow_buttons(state.buttons))
-//    QString::fromUtf8(state.text), MessageWindow_buttons(state.buttons))
+  );
-//  );
 }
 
 auto pMessageWindow::warning(MessageWindow::State& state) -> MessageWindow::Response {
-  return {};
+  return MessageWindow_response(
-//  return MessageWindow_response(
+    state.buttons, QMessageBox::warning(state.parent ? state.parent->self()->qtWindow : nullptr, state.title ? QString::fromUtf8(state.title) : " ",
-//    state.buttons, QMessageBox::warning(state.parent ? state.parent->p.qtWindow : nullptr, state.title ? state.title : " ",
+    QString::fromUtf8(state.text), MessageWindow_buttons(state.buttons))
-//    QString::fromUtf8(state.text), MessageWindow_buttons(state.buttons))
+  );
-//  );
 }
 
 }

hiro/windows/application.cpp

@@ -6,6 +6,13 @@ static auto Application_keyboardProc(HWND, UINT, WPARAM, LPARAM) -> bool;
 static auto Application_processDialogMessage(MSG&) -> void;
 static auto CALLBACK Window_windowProc(HWND, UINT, WPARAM, LPARAM) -> LRESULT;
 
+auto pApplication::exit() -> void {
+  quit();
+  auto processID = GetCurrentProcessId();
+  auto handle = OpenProcess(SYNCHRONIZE | PROCESS_TERMINATE, true, processID);
+  TerminateProcess(handle, 0);
+}
+
 auto pApplication::modal() -> bool {
   return state().modalCount > 0;
 }

hiro/windows/application.hpp

@@ -3,6 +3,7 @@
 namespace hiro {
 
 struct pApplication {
+  static auto exit() -> void;
   static auto modal() -> bool;
   static auto run() -> void;
   static auto pendingEvents() -> bool;

hiro/windows/browser-window.cpp

@@ -19,12 +19,9 @@ static auto BrowserWindow_fileDialog(bool save, BrowserWindow::State& state) ->
 
   string filters;
   for(auto& filter : state.filters) {
-    auto part = filter.split("(");
+    auto part = filter.split("|", 1L);
     if(part.size() != 2) continue;
-    part[1].trimRight(")", 1L);
+    filters.append(filter, "\t", part[1].merge(";"), "\t");
-    part[1].replace(" ", "");
-    part[1].transform(",", ";");
-    filters.append(filter, "\t", part[1], "\t");
   }
 
   utf16_t wfilters(filters);

hiro/windows/widget/frame.cpp

@@ -3,7 +3,9 @@
 namespace hiro {
 
 auto pFrame::construct() -> void {
-  hwnd = CreateWindow(L"BUTTON", L"",
+  hwnd = CreateWindowEx(
+    //WS_EX_TRANSPARENT fixes rendering issues caused by Windows using WS_CLIPCHILDREN
+    WS_EX_TRANSPARENT, L"BUTTON", L"",
     WS_CHILD | BS_GROUPBOX,
     0, 0, 0, 0, _parentHandle(), nullptr, GetModuleHandle(0), 0);
   pWidget::construct();

hiro/windows/widget/label.cpp

@@ -94,22 +94,6 @@ auto pLabel::windowProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) -> ma
     return msg == WM_ERASEBKGND;
   }
 
-  if(msg == WM_LBUTTONDOWN || msg == WM_MBUTTONDOWN || msg == WM_RBUTTONDOWN) {
-    switch(msg) {
-    case WM_LBUTTONDOWN: self().doMousePress(Mouse::Button::Left); break;
-    case WM_MBUTTONDOWN: self().doMousePress(Mouse::Button::Middle); break;
-    case WM_RBUTTONDOWN: self().doMousePress(Mouse::Button::Right); break;
-    }
-  }
-
-  if(msg == WM_LBUTTONUP || msg == WM_MBUTTONUP || msg == WM_RBUTTONUP) {
-    switch(msg) {
-    case WM_LBUTTONUP: self().doMouseRelease(Mouse::Button::Left); break;
-    case WM_MBUTTONUP: self().doMouseRelease(Mouse::Button::Middle); break;
-    case WM_RBUTTONUP: self().doMouseRelease(Mouse::Button::Right); break;
-    }
-  }
-
   return pWidget::windowProc(hwnd, msg, wparam, lparam);
 }
 

hiro/windows/widget/widget.cpp

@@ -74,6 +74,8 @@ auto pWidget::setGeometry(Geometry geometry) -> void {
     geometry.setY(geometry.y() - displacement.y());
   }
   SetWindowPos(hwnd, nullptr, geometry.x(), geometry.y(), geometry.width(), geometry.height(), SWP_NOZORDER);
+  //RedrawWindow fixes painting problems when adjusting Layouts manually
+  RedrawWindow(hwnd, nullptr, nullptr, RDW_INVALIDATE | RDW_ALLCHILDREN);
   pSizable::setGeometry(geometry);
 }
 

hiro/windows/window.cpp

@@ -16,10 +16,9 @@ static auto CALLBACK Window_windowProc(HWND hwnd, UINT msg, WPARAM wparam, LPARA
   return Shared_windowProc(DefWindowProc, hwnd, msg, wparam, lparam);
 }
 
-//warning: do not add WS_CLIPCHILDREN; this will break painting of Frame ("BUTTON" BS_GROUPBOX) controls
+static const uint PopupStyle = WS_POPUP | WS_CLIPCHILDREN;
-static const uint PopupStyle = WS_POPUP;
+static const uint FixedStyle = WS_SYSMENU | WS_CAPTION | WS_MINIMIZEBOX | WS_BORDER | WS_CLIPCHILDREN;
-static const uint FixedStyle = WS_SYSMENU | WS_CAPTION | WS_MINIMIZEBOX | WS_BORDER;
+static const uint ResizableStyle = WS_SYSMENU | WS_CAPTION | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_THICKFRAME | WS_CLIPCHILDREN;
-static const uint ResizableStyle = WS_SYSMENU | WS_CAPTION | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_THICKFRAME;
 
 uint pWindow::minimumStatusHeight = 0;
 

nall/GNUmakefile

@@ -108,7 +108,7 @@ ifeq ($(findstring clang++,$(compiler)),clang++)
   flags += -fno-strict-aliasing -fwrapv -Wno-everything
 # gcc settings
 else ifeq ($(findstring g++,$(compiler)),g++)
-  flags += -fno-strict-aliasing -fwrapv
+  flags += -fno-strict-aliasing -fwrapv -Wno-trigraphs
 endif
 
 # windows settings

nall/chrono.hpp

@@ -49,6 +49,55 @@ inline auto timestamp() -> uint64_t {
   return ::time(nullptr);
 }
 
+//0 = failure condition
+inline auto timestamp(const string& datetime) -> uint64_t {
+  static const uint monthDays[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
+  uint64_t timestamp = 0;
+  if(datetime.match("??????????")) {
+    return datetime.natural();
+  }
+  if(datetime.match("????*")) {
+    uint year = datetime.slice(0, 4).natural();
+    if(year < 1970 || year > 2199) return 0;
+    for(uint y = 1970; y < year && y < 2999; y++) {
+      uint daysInYear = 365;
+      if(y % 4 == 0 && (y % 100 != 0 || y % 400 == 0)) daysInYear++;
+      timestamp += daysInYear * 24 * 60 * 60;
+    }
+  }
+  if(datetime.match("????-??*")) {
+    uint y = datetime.slice(0, 4).natural();
+    uint month = datetime.slice(5, 2).natural();
+    if(month < 1 || month > 12) return 0;
+    for(uint m = 1; m < month && m < 12; m++) {
+      uint daysInMonth = monthDays[m - 1];
+      if(m == 2 && y % 4 == 0 && (y % 100 != 0 || y % 400 == 0)) daysInMonth++;
+      timestamp += daysInMonth * 24 * 60 * 60;
+    }
+  }
+  if(datetime.match("????-??-??*")) {
+    uint day = datetime.slice(8, 2).natural();
+    if(day < 1 || day > 31) return 0;
+    timestamp += (day - 1) * 24 * 60 * 60;
+  }
+  if(datetime.match("????-??-?? ??*")) {
+    uint hour = datetime.slice(11, 2).natural();
+    if(hour > 23) return 0;
+    timestamp += hour * 60 * 60;
+  }
+  if(datetime.match("????-??-?? ??:??*")) {
+    uint minute = datetime.slice(14, 2).natural();
+    if(minute > 59) return 0;
+    timestamp += minute * 60;
+  }
+  if(datetime.match("????-??-?? ??:??:??*")) {
+    uint second = datetime.slice(17, 2).natural();
+    if(second > 59) return 0;
+    timestamp += second;
+  }
+  return timestamp;
+}
+
 namespace utc {
   inline auto timeinfo(uint64_t time = 0) -> chrono::timeinfo {
     auto stamp = time ? (time_t)time : (time_t)timestamp();

nall/database/sqlite3.hpp

@@ -1,9 +1,7 @@
 #pragma once
 
-/* SQLite3 C++ RAII wrapper for nall
+//SQLite3 C++ RAII wrapper for nall
- *
+//note: it is safe (no-op) to call sqlite3_* functions on null sqlite3 objects
- * Note on code below: it is safe (no-op) to call sqlite3_* functions on null sqlite3 objects
- */
 
 #include <sqlite3.h>
 
@@ -34,24 +32,28 @@ struct SQLite3 {
       return sqlite3_data_count(statement());
     }
 
-    auto columns() -> unsigned {
+    auto columns() -> uint {
       return sqlite3_column_count(statement());
     }
 
-    auto integer(unsigned column) -> int64_t {
+    auto boolean(uint column) -> bool {
+      return sqlite3_column_int64(statement(), column) != 0;
+    }
+
+    auto integer(uint column) -> int64_t {
       return sqlite3_column_int64(statement(), column);
     }
 
-    auto natural(unsigned column) -> uint64_t {
+    auto natural(uint column) -> uint64_t {
       return sqlite3_column_int64(statement(), column);
     }
 
-    auto real(unsigned column) -> double {
+    auto real(uint column) -> double {
       return sqlite3_column_double(statement(), column);
     }
 
-    auto text(unsigned column) -> string {
+    auto string(uint column) -> nall::string {
-      string result;
+      nall::string result;
       if(auto text = sqlite3_column_text(statement(), column)) {
         result.resize(sqlite3_column_bytes(statement(), column));
         memory::copy(result.get(), text, result.size());
@@ -59,7 +61,7 @@ struct SQLite3 {
       return result;
     }
 
-    auto data(unsigned column) -> vector<uint8_t> {
+    auto data(uint column) -> vector<uint8_t> {
       vector<uint8_t> result;
       if(auto data = sqlite3_column_blob(statement(), column)) {
         result.resize(sqlite3_column_bytes(statement(), column));
@@ -68,18 +70,19 @@ struct SQLite3 {
       return result;
     }
 
+    auto boolean() -> bool { return boolean(_output++); }
     auto integer() -> int64_t { return integer(_output++); }
     auto natural() -> uint64_t { return natural(_output++); }
     auto real() -> double { return real(_output++); }
-    auto text() -> string { return text(_output++); }
+    auto string() -> nall::string { return string(_output++); }
     auto data() -> vector<uint8_t> { return data(_output++); }
 
   protected:
     virtual auto statement() -> sqlite3_stmt* { return _statement; }
 
     sqlite3_stmt* _statement = nullptr;
-    signed _response = SQLITE_OK;
+    int _response = SQLITE_OK;
-    unsigned _output = 0;
+    uint _output = 0;
   };
 
   struct Query : Statement {
@@ -102,22 +105,34 @@ struct SQLite3 {
       return *this;
     }
 
-    auto& bind(unsigned column, nullptr_t) { sqlite3_bind_null(_statement, 1 + column); return *this; }
+    auto& bind(uint column, nullptr_t) { sqlite3_bind_null(_statement, 1 + column); return *this; }
-    auto& bind(unsigned column, int32_t value) { sqlite3_bind_int(_statement, 1 + column, value); return *this; }
+    auto& bind(uint column, bool value) { sqlite3_bind_int(_statement, 1 + column, value); return *this; }
-    auto& bind(unsigned column, uint32_t value) { sqlite3_bind_int(_statement, 1 + column, value); return *this; }
+    auto& bind(uint column, int32_t value) { sqlite3_bind_int(_statement, 1 + column, value); return *this; }
-    auto& bind(unsigned column, int64_t value) { sqlite3_bind_int64(_statement, 1 + column, value); return *this; }
+    auto& bind(uint column, uint32_t value) { sqlite3_bind_int(_statement, 1 + column, value); return *this; }
-    auto& bind(unsigned column, uint64_t value) { sqlite3_bind_int64(_statement, 1 + column, value); return *this; }
+    auto& bind(uint column, int64_t value) { sqlite3_bind_int64(_statement, 1 + column, value); return *this; }
-    auto& bind(unsigned column, double value) { sqlite3_bind_double(_statement, 1 + column, value); return *this; }
+    auto& bind(uint column, uint64_t value) { sqlite3_bind_int64(_statement, 1 + column, value); return *this; }
-    auto& bind(unsigned column, const string& value) { sqlite3_bind_text(_statement, 1 + column, value.data(), value.size(), SQLITE_TRANSIENT); return *this; }
+    auto& bind(uint column, intmax value) { sqlite3_bind_int64(_statement, 1 + column, value); return *this; }
-    auto& bind(unsigned column, const vector<uint8_t>& value) { sqlite3_bind_blob(_statement, 1 + column, value.data(), value.size(), SQLITE_TRANSIENT); return *this; }
+    auto& bind(uint column, uintmax value) { sqlite3_bind_int64(_statement, 1 + column, value); return *this; }
+    auto& bind(uint column, nall::boolean value) { sqlite3_bind_int64(_statement, 1 + column, value); return *this; }
+    auto& bind(uint column, nall::integer value) { sqlite3_bind_int64(_statement, 1 + column, value); return *this; }
+    auto& bind(uint column, nall::natural value) { sqlite3_bind_int64(_statement, 1 + column, value); return *this; }
+    auto& bind(uint column, double value) { sqlite3_bind_double(_statement, 1 + column, value); return *this; }
+    auto& bind(uint column, const nall::string& value) { sqlite3_bind_text(_statement, 1 + column, value.data(), value.size(), SQLITE_TRANSIENT); return *this; }
+    auto& bind(uint column, const vector<uint8_t>& value) { sqlite3_bind_blob(_statement, 1 + column, value.data(), value.size(), SQLITE_TRANSIENT); return *this; }
 
     auto& bind(nullptr_t) { return bind(_input++, nullptr); }
+    auto& bind(bool value) { return bind(_input++, value); }
     auto& bind(int32_t value) { return bind(_input++, value); }
     auto& bind(uint32_t value) { return bind(_input++, value); }
     auto& bind(int64_t value) { return bind(_input++, value); }
     auto& bind(uint64_t value) { return bind(_input++, value); }
+    auto& bind(intmax value) { return bind(_input++, value); }
+    auto& bind(uintmax value) { return bind(_input++, value); }
+    auto& bind(nall::boolean value) { return bind(_input++, value); }
+    auto& bind(nall::integer value) { return bind(_input++, value); }
+    auto& bind(nall::natural value) { return bind(_input++, value); }
     auto& bind(double value) { return bind(_input++, value); }
-    auto& bind(const string& value) { return bind(_input++, value); }
+    auto& bind(const nall::string& value) { return bind(_input++, value); }
     auto& bind(const vector<uint8_t>& value) { return bind(_input++, value); }
 
     auto step() -> bool {
@@ -145,7 +160,7 @@ struct SQLite3 {
       return _statement;
     }
 
-    unsigned _input = 0;
+    uint _input = 0;
     bool _stepped = false;
   };
 

nall/dsp/resampler/cubic.hpp

@@ -7,6 +7,9 @@
 namespace nall::DSP::Resampler {
 
 struct Cubic {
+  inline auto inputFrequency() const -> double { return _inputFrequency; }
+  inline auto outputFrequency() const -> double { return _outputFrequency; }
+
   inline auto reset(double inputFrequency, double outputFrequency = 0, uint queueSize = 0) -> void;
   inline auto setInputFrequency(double inputFrequency) -> void;
   inline auto pending() const -> bool;
@@ -15,41 +18,41 @@ struct Cubic {
   inline auto serialize(serializer&) -> void;
 
 private:
-  double inputFrequency;
+  double _inputFrequency;
-  double outputFrequency;
+  double _outputFrequency;
 
-  double ratio;
+  double _ratio;
-  double fraction;
+  double _fraction;
-  double history[4];
+  double _history[4];
-  queue<double> samples;
+  queue<double> _samples;
 };
 
 auto Cubic::reset(double inputFrequency, double outputFrequency, uint queueSize) -> void {
-  this->inputFrequency = inputFrequency;
+  _inputFrequency = inputFrequency;
-  this->outputFrequency = outputFrequency ? outputFrequency : this->inputFrequency;
+  _outputFrequency = outputFrequency ? outputFrequency : _inputFrequency;
 
-  ratio = inputFrequency / outputFrequency;
+  _ratio = _inputFrequency / _outputFrequency;
-  fraction = 0.0;
+  _fraction = 0.0;
-  for(auto& sample : history) sample = 0.0;
+  for(auto& sample : _history) sample = 0.0;
-  samples.resize(queueSize ? queueSize : this->outputFrequency * 0.02);  //default to 20ms max queue size
+  _samples.resize(queueSize ? queueSize : _outputFrequency * 0.02);  //default to 20ms max queue size
 }
 
 auto Cubic::setInputFrequency(double inputFrequency) -> void {
-  this->inputFrequency = inputFrequency;
+  _inputFrequency = inputFrequency;
-  ratio = inputFrequency / outputFrequency;
+  _ratio = _inputFrequency / _outputFrequency;
 }
 
 auto Cubic::pending() const -> bool {
-  return samples.pending();
+  return _samples.pending();
 }
 
 auto Cubic::read() -> double {
-  return samples.read();
+  return _samples.read();
 }
 
 auto Cubic::write(double sample) -> void {
-  auto& mu = fraction;
+  auto& mu = _fraction;
-  auto& s = history;
+  auto& s = _history;
 
   s[0] = s[1];
   s[1] = s[2];
@@ -62,20 +65,20 @@ auto Cubic::write(double sample) -> void {
     double C = s[2] - s[0];
     double D = s[1];
 
-    samples.write(A * mu * mu * mu + B * mu * mu + C * mu + D);
+    _samples.write(A * mu * mu * mu + B * mu * mu + C * mu + D);
-    mu += ratio;
+    mu += _ratio;
   }
 
   mu -= 1.0;
 }
 
 auto Cubic::serialize(serializer& s) -> void {
-  s.real(inputFrequency);
+  s.real(_inputFrequency);
-  s.real(outputFrequency);
+  s.real(_outputFrequency);
-  s.real(ratio);
+  s.real(_ratio);
-  s.real(fraction);
+  s.real(_fraction);
-  s.array(history);
+  s.array(_history);
-  samples.serialize(s);
+  _samples.serialize(s);
 }
 
 }

nall/encode/wav.hpp

@@ -0,0 +1,52 @@
+#pragma once
+
+namespace nall::Encode {
+
+struct WAV {
+  static auto stereo_16bit(const string& filename, array_view<int16_t> left, array_view<int16_t> right, uint frequency) -> bool {
+    if(left.size() != right.size()) return false;
+    static uint channels = 2;
+    static uint bits = 16;
+    static uint samples = left.size();
+
+    file_buffer fp;
+    if(!fp.open(filename, file::mode::write)) return false;
+
+    fp.write('R');
+    fp.write('I');
+    fp.write('F');
+    fp.write('F');
+    fp.writel(4 + (8 + 16) + (8 + samples * 4), 4);
+
+    fp.write('W');
+    fp.write('A');
+    fp.write('V');
+    fp.write('E');
+
+    fp.write('f');
+    fp.write('m');
+    fp.write('t');
+    fp.write(' ');
+    fp.writel(16, 4);
+    fp.writel(1, 2);
+    fp.writel(channels, 2);
+    fp.writel(frequency, 4);
+    fp.writel(frequency * channels * bits, 4);
+    fp.writel(channels * bits, 2);
+    fp.writel(bits, 2);
+
+    fp.write('d');
+    fp.write('a');
+    fp.write('t');
+    fp.write('a');
+    fp.writel(samples * 4, 4);
+    for(uint sample : range(samples)) {
+      fp.writel(left[sample], 2);
+      fp.writel(right[sample], 2);
+    }
+
+    return true;
+  }
+};
+
+}

nall/intrinsics.hpp

@@ -38,6 +38,7 @@ namespace nall {
   #pragma clang diagnostic ignored "-Wtautological-compare"
   #pragma clang diagnostic ignored "-Wabsolute-value"
   #pragma clang diagnostic ignored "-Wshift-count-overflow"
+  #pragma clang diagnostic ignored "-Wtrigraphs"
 
   //temporary
   #pragma clang diagnostic ignored "-Winconsistent-missing-override"
@@ -51,6 +52,7 @@ namespace nall {
   #pragma GCC diagnostic ignored "-Wunknown-pragmas"
   #pragma GCC diagnostic ignored "-Wpragmas"
   #pragma GCC diagnostic ignored "-Wswitch-bool"
+  #pragma GCC diagnostic ignored "-Wtrigraphs"
 #elif defined(_MSC_VER)
   #define COMPILER_MICROSOFT
   constexpr auto compiler() -> Compiler { return Compiler::Microsoft; }

nall/string.hpp

@@ -291,7 +291,7 @@ public:
   inline auto remove(uint offset, uint length) -> type&;
   inline auto reverse() -> type&;
   inline auto size(int length, char fill = ' ') -> type&;
-  inline auto slice(int offset = 0, int length = -1) -> string;
+  inline auto slice(int offset = 0, int length = -1) const -> string;
 };
 
 template<> struct vector<string> : vector_base<string> {

nall/string/transform/dml.hpp

@@ -9,16 +9,12 @@
 namespace nall {
 
 struct DML {
-  inline auto title() const -> string { return state.title; }
+  auto content() const -> string { return state.output; }
-  inline auto subtitle() const -> string { return state.subtitle; }
-  inline auto description() const -> string { return state.description; }
-  inline auto content() const -> string { return state.output; }
 
   auto& setAllowHTML(bool allowHTML) { settings.allowHTML = allowHTML; return *this; }
-  auto& setHost(const string& hostname) { settings.host = {hostname, "/"}; return *this; }
+  auto& setHost(const string& hostname) { settings.host = hostname; return *this; }
   auto& setPath(const string& pathname) { settings.path = pathname; return *this; }
   auto& setReader(const function<string (string)>& reader) { settings.reader = reader; return *this; }
-  auto& setSectioned(bool sectioned) { settings.sectioned = sectioned; return *this; }
 
   auto parse(const string& filedata, const string& pathname) -> string;
   auto parse(const string& filename) -> string;
@@ -28,18 +24,13 @@ struct DML {
 private:
   struct Settings {
     bool allowHTML = true;
-    string host = "localhost/";
+    string host = "localhost";
     string path;
     function<string (string)> reader;
-    bool sectioned = true;
   } settings;
 
   struct State {
-    string title;
-    string subtitle;
-    string description;
     string output;
-    uint sections = 0;
   } state;
 
   struct Attribute {
@@ -52,6 +43,7 @@ private:
   auto parseBlock(string& block, const string& pathname, uint depth) -> bool;
   auto count(const string& text, char value) -> uint;
 
+  auto address(string text) -> string;
   auto escape(const string& text) -> string;
   auto markup(const string& text) -> string;
 };
@@ -83,7 +75,6 @@ inline auto DML::parseDocument(const string& filedata, const string& pathname, u
 
   auto blocks = filedata.split("\n\n");
   for(auto& block : blocks) parseBlock(block, pathname, depth);
-  if(settings.sectioned && state.sections && depth == 0) state.output.append("</section>\n");
   return true;
 }
 
@@ -98,6 +89,18 @@ inline auto DML::parseBlock(string& block, const string& pathname, uint depth) -
     parseDocument(document, Location::path(filename), depth + 1);
   }
 
+  //attribute
+  else if(block.beginsWith("? ")) {
+    for(auto n : range(lines.size())) {
+      if(!lines[n].beginsWith("? ")) continue;
+      auto part = lines[n].trimLeft("? ", 1L).split(":", 1L);
+      if(part.size() != 2) continue;
+      auto name = part[0].strip();
+      auto value = part[1].strip();
+      attributes.append({name, value});
+    }
+  }
+
   //html
   else if(block.beginsWith("<html>\n") && settings.allowHTML) {
     for(auto n : range(lines.size())) {
@@ -106,52 +109,18 @@ inline auto DML::parseBlock(string& block, const string& pathname, uint depth) -
     }
   }
 
-  //attribute
-  else if(block.beginsWith("! ")) {
-    for(auto& line : lines) {
-      auto parts = line.trimLeft("! ", 1L).split(":", 1L);
-      if(parts.size() == 2) attributes.append({parts[0].strip(), parts[1].strip()});
-    }
-  }
-
-  //description
-  else if(block.beginsWith("? ")) {
-    while(lines) {
-      state.description.append(lines.takeLeft().trimLeft("? ", 1L), " ");
-    }
-    state.description.strip();
-  }
-
-  //section
-  else if(block.beginsWith("# ")) {
-    if(settings.sectioned) {
-      if(state.sections++) state.output.append("</section>");
-      state.output.append("<section>");
-    }
-    auto content = lines.takeLeft().trimLeft("# ", 1L).split("::", 1L).strip();
-    auto data = markup(content[0]);
-    auto name = escape(content(1, data.hash()));
-    state.subtitle = content[0];
-    state.output.append("<h2 id=\"", name, "\">", data);
-    for(auto& line : lines) {
-      if(!line.beginsWith("# ")) continue;
-      state.output.append("<span>", line.trimLeft("# ", 1L), "</span>");
-    }
-    state.output.append("</h2>\n");
-  }
-
   //header
-  else if(auto depth = count(block, '=')) {
+  else if(auto depth = count(block, '#')) {
     auto content = slice(lines.takeLeft(), depth + 1).split("::", 1L).strip();
     auto data = markup(content[0]);
     auto name = escape(content(1, data.hash()));
-    if(depth <= 4) {
+    if(depth <= 5) {
-      state.output.append("<h", depth + 2, " id=\"", name, "\">", data);
+      state.output.append("<h", depth + 1, " id=\"", name, "\">", data);
       for(auto& line : lines) {
-        if(count(line, '=') != depth) continue;
+        if(count(line, '#') != depth) continue;
         state.output.append("<span>", slice(line, depth + 1), "</span>");
       }
-      state.output.append("</h", depth + 2, ">\n");
+      state.output.append("</h", depth + 1, ">\n");
     }
   }
 
@@ -239,6 +208,29 @@ inline auto DML::count(const string& text, char value) -> uint {
   return 0;
 }
 
+// . => domain
+// ./* => domain/*
+// ../subdomain => subdomain.domain
+// ../subdomain/* => subdomain.domain/*
+inline auto DML::address(string s) -> string {
+  if(s.beginsWith("../")) {
+    s.trimLeft("../", 1L);
+    if(auto p = s.find("/")) {
+      return {"//", s.slice(0, *p), ".", settings.host, s.slice(*p)};
+    } else {
+      return {"//", s, ".", settings.host};
+    }
+  }
+  if(s.beginsWith("./")) {
+    s.trimLeft(".", 1L);
+    return {"//", settings.host, s};
+  }
+  if(s == ".") {
+    return {"//", settings.host};
+  }
+  return s;
+}
+
 inline auto DML::escape(const string& text) -> string {
   string output;
   for(auto c : text) {
@@ -281,8 +273,8 @@ inline auto DML::markup(const string& s) -> string {
 
     if(link && !image && a == ']' && b == ']') {
       auto list = slice(s, link(), n - link()).split("::", 1L);
-      string uri = list.last();
+      string uri = address(list.last());
-      string name = list.size() == 2 ? list.first() : list.last().split("//", 1L).last();
+      string name = list.size() == 2 ? list.first() : uri.split("//", 1L).last();
 
       t.append("<a href=\"", escape(uri), "\">", escape(name), "</a>");
 
@@ -294,8 +286,8 @@ inline auto DML::markup(const string& s) -> string {
     if(image && !link && a == '}' && b == '}') {
       auto side = slice(s, image(), n - image()).split("}{", 1L);
       auto list = side(0).split("::", 1L);
-      string uri = list.last();
+      string uri = address(list.last());
-      string name = list.size() == 2 ? list.first() : list.last().split("//", 1L).last();
+      string name = list.size() == 2 ? list.first() : uri.split("//", 1L).last();
       list = side(1).split("; ");
       boolean link, title, caption;
       string width, height;
@@ -322,7 +314,6 @@ inline auto DML::markup(const string& s) -> string {
         if(link) t.append("<a href=\"", escape(uri), "\">");
         t.append("<img loading=\"lazy\" src=\"", escape(uri), "\" alt=\"", escape(name ? name : uri.hash()), "\"");
         if(title) t.append(" title=\"", escape(name), "\"");
-        if(width && height) t.append(" style=\"width: ", escape(width), "px; max-height: ", escape(height), "px;\"");
         if(width) t.append(" width=\"", escape(width), "\"");
         if(height) t.append(" height=\"", escape(height), "\"");
         t.append(">");

nall/string/utility.hpp

@@ -95,7 +95,7 @@ auto slice(string_view self, int offset, int length) -> string {
   return result;
 }
 
-auto string::slice(int offset, int length) -> string {
+auto string::slice(int offset, int length) const -> string {
   return nall::slice(*this, offset, length);
 }
 

ruby/GNUmakefile

@@ -1,7 +1,7 @@
 ifeq ($(ruby),)
   ifeq ($(platform),windows)
     ruby += video.wgl video.direct3d video.directdraw video.gdi
-    ruby += audio.wasapi audio.xaudio2 audio.directsound audio.waveout #audio.asio
+    ruby += audio.asio audio.wasapi audio.xaudio2 audio.directsound audio.waveout
     ruby += input.windows
   else ifeq ($(platform),macos)
     ruby += video.cgl
@@ -13,7 +13,7 @@ ifeq ($(ruby),)
     ruby += input.sdl input.xlib input.udev
   else ifeq ($(platform),bsd)
     ruby += video.glx video.glx2 video.xvideo video.xshm
-    ruby += audio.oss #audio.pulseaudio
+    ruby += audio.oss audio.openal #audio.pulseaudio
     ruby += input.sdl input.xlib
   endif
 endif
@@ -65,7 +65,8 @@ endif
 
 ifeq ($(platform),bsd)
   ruby.options += -lX11 -lXext -lXrandr
-  ruby.options += $(if $(findstring audio.openal,$(ruby)),-lopenal)
+  ruby.options += $(if $(findstring audio.openal,$(ruby)),-lopenal -fuse-ld=bfd)
+  # -fuse-ld=bfd: see FreeBSD bug 219089
 endif
 
 ruby.objects := $(object.path)/ruby.o

ruby/audio/alsa.cpp

@@ -17,6 +17,7 @@ struct AudioALSA : AudioDriver {
   auto ready() -> bool override { return _ready; }
 
   auto hasBlocking() -> bool override { return true; }
+  auto hasDynamic() -> bool override { return true; }
 
   auto hasDevices() -> vector<string> override {
     vector<string> devices;
@@ -55,20 +56,27 @@ struct AudioALSA : AudioDriver {
   auto setLatency(uint latency) -> bool override { return initialize(); }
 
   auto level() -> double override {
-    snd_pcm_sframes_t available = snd_pcm_avail_update(_interface);
+    snd_pcm_sframes_t available;
-    if(available < 0) return 0.5;
+    for(uint timeout : range(256)) {
+      available = snd_pcm_avail_update(_interface);
+      if(available >= 0) break;
+      snd_pcm_recover(_interface, available, 1);
+    }
     return (double)(_bufferSize - available) / _bufferSize;
   }
 
   auto output(const double samples[]) -> void override {
     _buffer[_offset]  = (uint16_t)sclamp<16>(samples[0] * 32767.0) <<  0;
     _buffer[_offset] |= (uint16_t)sclamp<16>(samples[1] * 32767.0) << 16;
-    _offset++;
+    if(++_offset < _periodSize) return;
 
     snd_pcm_sframes_t available;
     do {
       available = snd_pcm_avail_update(_interface);
-      if(available < 0) snd_pcm_recover(_interface, available, 1);
+      if(available < 0) {
+        snd_pcm_recover(_interface, available, 1);
+        continue;
+      }
       if(available < _offset) {
         if(!self.blocking) {
           _offset = 0;

ruby/audio/asio.cpp

@@ -52,6 +52,11 @@ struct AudioASIO : AudioDriver {
       }
       latencies.append(latency);
     }
+    //it is possible that no latencies in the hard-coded list above will match; so ensure driver-declared latencies are available
+    if(!latencies.find(self.activeDevice.minimumBufferSize)) latencies.append(self.activeDevice.minimumBufferSize);
+    if(!latencies.find(self.activeDevice.maximumBufferSize)) latencies.append(self.activeDevice.maximumBufferSize);
+    if(!latencies.find(self.activeDevice.preferredBufferSize)) latencies.append(self.activeDevice.preferredBufferSize);
+    latencies.sort();
     return latencies;
   }
 
@@ -75,6 +80,15 @@ struct AudioASIO : AudioDriver {
 
   auto output(const double samples[]) -> void override {
     if(!ready()) return;
+    //defer call to IASIO::start(), because the drivers themselves will sometimes crash internally.
+    //if software initializes AudioASIO but does not play music at startup, this can prevent a crash loop.
+    if(!_started) {
+      _started = true;
+      if(_asio->start() != ASE_OK) {
+        _ready = false;
+        return;
+      }
+    }
     if(self.blocking) {
       while(_queue.count >= self.latency);
     }
@@ -151,13 +165,14 @@ private:
     }
 
     _ready = true;
+    _started = false;
     clear();
-    if(_asio->start() != ASE_OK) return _ready = false;
     return true;
   }
 
   auto terminate() -> void {
     _ready = false;
+    _started = false;
     self.activeDevice = {};
     if(_asio) {
       _asio->stop();
@@ -244,6 +259,7 @@ private:
   }
 
   bool _ready = false;
+  bool _started = false;
 
   struct Queue {
     double samples[65536][8];

ruby/audio/audio.cpp

@@ -242,10 +242,10 @@ auto Audio::hasDrivers() -> vector<string> {
 }
 
 auto Audio::optimalDriver() -> string {
-  #if defined(AUDIO_ASIO)
+  #if defined(AUDIO_WASAPI)
-  return "ASIO";
-  #elif defined(AUDIO_WASAPI)
   return "WASAPI";
+  #elif defined(AUDIO_ASIO)
+  return "ASIO";
   #elif defined(AUDIO_XAUDIO2)
   return "XAudio 2.1";
   #elif defined(AUDIO_DIRECTSOUND)

ruby/audio/pulseaudio.cpp

@@ -15,6 +15,7 @@ struct AudioPulseAudio : AudioDriver {
   auto ready() -> bool override { return _ready; }
 
   auto hasBlocking() -> bool override { return true; }
+  auto hasDynamic() -> bool override { return true; }
 
   auto hasFrequencies() -> vector<uint> override {
     return {44100, 48000, 96000};
@@ -28,6 +29,12 @@ struct AudioPulseAudio : AudioDriver {
   auto setFrequency(uint frequency) -> bool override { return initialize(); }
   auto setLatency(uint latency) -> bool override { return initialize(); }
 
+  auto level() -> double override {
+    pa_mainloop_iterate(_mainLoop, 0, nullptr);
+    auto length = pa_stream_writable_size(_stream);
+    return (double)(_bufferSize - length) / _bufferSize;
+  }
+
   auto output(const double samples[]) -> void override {
     pa_stream_begin_write(_stream, (void**)&_buffer, &_period);
     _buffer[_offset]  = (uint16_t)sclamp<16>(samples[0] * 32767.0) <<  0;
@@ -35,13 +42,8 @@ struct AudioPulseAudio : AudioDriver {
     if((++_offset + 1) * pa_frame_size(&_specification) <= _period) return;
 
     while(true) {
-      if(_first) {
+      pa_mainloop_iterate(_mainLoop, 0, nullptr);
-        _first = false;
+      auto length = pa_stream_writable_size(_stream);
-        pa_mainloop_iterate(_mainLoop, 0, nullptr);
-      } else {
-        pa_mainloop_iterate(_mainLoop, 1, nullptr);
-      }
-      uint length = pa_stream_writable_size(_stream);
       if(length >= _offset * pa_frame_size(&_specification)) break;
       if(!self.blocking) {
         _offset = 0;
@@ -91,9 +93,10 @@ private:
       if(!PA_STREAM_IS_GOOD(streamState)) return false;
     } while(streamState != PA_STREAM_READY);
 
-    _period = 960;
+    pa_buffer_attr* attributes = pa_stream_get_buffer_attr(_stream);
+    _period = attributes->minreq;
+    _bufferSize = attributes->tlength;
     _offset = 0;
-    _first = true;
     return _ready = true;
   }
 
@@ -127,11 +130,11 @@ private:
 
   uint32_t* _buffer = nullptr;
   size_t _period = 0;
+  size_t _bufferSize = 0;
   uint _offset = 0;
 
   pa_mainloop* _mainLoop = nullptr;
   pa_context* _context = nullptr;
   pa_stream* _stream = nullptr;
   pa_sample_spec _specification;
-  bool _first = true;
 };

ruby/input/joypad/iokit.cpp

@@ -14,7 +14,6 @@ struct InputJoypadIOKit {
       for(uint n : range(CFArrayGetCount(elements))) {
         IOHIDElementRef element = (IOHIDElementRef)CFArrayGetValueAtIndex(elements, n);
         IOHIDElementType type = IOHIDElementGetType(element);
-        uint32_t page = IOHIDElementGetUsagePage(element);
         uint32_t usage = IOHIDElementGetUsage(element);
         switch(type) {
         case kIOHIDElementTypeInput_Button:
@@ -22,7 +21,6 @@ struct InputJoypadIOKit {
           break;
         case kIOHIDElementTypeInput_Axis:
         case kIOHIDElementTypeInput_Misc:
-          if(page != kHIDPage_GenericDesktop && page != kHIDPage_Simulation) break;
           if(usage == kHIDUsage_Sim_Accelerator || usage == kHIDUsage_Sim_Brake
           || usage == kHIDUsage_Sim_Rudder      || usage == kHIDUsage_Sim_Throttle
           || usage == kHIDUsage_GD_X  || usage == kHIDUsage_GD_Y  || usage == kHIDUsage_GD_Z

ruby/video/cgl.cpp

@@ -66,6 +66,10 @@ struct VideoCGL : VideoDriver, OpenGL {
     return true;
   }
 
+  auto focused() -> bool override {
+    return true;
+  }
+
   auto clear() -> void override {
     @autoreleasepool {
       [view lockFocus];

ruby/video/direct3d.cpp

@@ -34,6 +34,12 @@ struct VideoDirect3D : VideoDriver {
   auto setBlocking(bool blocking) -> bool override { return true; }
   auto setShader(string shader) -> bool override { return updateFilter(); }
 
+  auto focused() -> bool override {
+    if(self.fullScreen && self.exclusive) return true;
+    auto focused = GetFocus();
+    return _context == focused || IsChild(_context, focused);
+  }
+
   auto clear() -> void override {
     if(_lost && !recover()) return;
 

ruby/video/directdraw.cpp

@@ -40,6 +40,12 @@ struct VideoDirectDraw : VideoDriver {
     return true;
   }
 
+  auto focused() -> bool override {
+    if(self.fullScreen && self.exclusive) return true;
+    auto focused = GetFocus();
+    return _context == focused || IsChild(_context, focused);
+  }
+
   auto clear() -> void override {
     DDBLTFX fx{};
     fx.dwSize = sizeof(DDBLTFX);

ruby/video/gdi.cpp

@@ -24,6 +24,12 @@ struct VideoGDI : VideoDriver {
   auto setMonitor(string monitor) -> bool override { return initialize(); }
   auto setContext(uintptr context) -> bool override { return initialize(); }
 
+  auto focused() -> bool override {
+    if(self.fullScreen && self.exclusive) return true;
+    auto focused = GetFocus();
+    return _context == focused || IsChild(_context, focused);
+  }
+
   auto size(uint& width, uint& height) -> void override {
     RECT rectangle;
     GetClientRect(_context, &rectangle);

ruby/video/glx.cpp

@@ -74,6 +74,10 @@ struct VideoGLX : VideoDriver, OpenGL {
     return true;
   }
 
+  auto focused() -> bool override {
+    return true;
+  }
+
   auto clear() -> void override {
     OpenGL::clear();
     if(_doubleBuffer) glXSwapBuffers(_display, _glXWindow);

ruby/video/glx2.cpp

@@ -83,6 +83,10 @@ struct VideoGLX2 : VideoDriver {
     return true;
   }
 
+  auto focused() -> bool override {
+    return true;
+  }
+
   auto clear() -> void override {
     memory::fill<uint32_t>(_glBuffer, _glWidth * _glHeight);
     glClearColor(0.0, 0.0, 0.0, 1.0);

ruby/video/video.cpp

@@ -94,6 +94,10 @@ auto Video::setShader(string shader) -> bool {
 
 //
 
+auto Video::focused() -> bool {
+  return instance->focused();
+}
+
 auto Video::clear() -> void {
   return instance->clear();
 }

ruby/video/video.hpp

@@ -28,6 +28,7 @@ struct VideoDriver {
   virtual auto setFormat(string format) -> bool { return true; }
   virtual auto setShader(string shader) -> bool { return true; }
 
+  virtual auto focused() -> bool { return true; }
   virtual auto clear() -> void {}
   virtual auto size(uint& width, uint& height) -> void {}
   virtual auto acquire(uint32_t*& data, uint& pitch, uint width, uint height) -> bool { return false; }
@@ -108,6 +109,7 @@ struct Video {
   auto setFormat(string format) -> bool;
   auto setShader(string shader) -> bool;
 
+  auto focused() -> bool;
   auto clear() -> void;
   struct Size {
     uint width = 0;

ruby/video/wgl.cpp

@@ -53,6 +53,12 @@ struct VideoWGL : VideoDriver, OpenGL {
     return true;
   }
 
+  auto focused() -> bool override {
+    if(self.fullScreen && self.exclusive) return true;
+    auto focused = GetFocus();
+    return _context == focused || IsChild(_context, focused);
+  }
+
   auto clear() -> void override {
     OpenGL::clear();
     SwapBuffers(_display);

ruby/video/xshm.cpp

@@ -31,6 +31,10 @@ struct VideoXShm : VideoDriver {
   auto setContext(uintptr context) -> bool override { return initialize(); }
   auto setShader(string shader) -> bool override { return true; }
 
+  auto focused() -> bool override {
+    return true;
+  }
+
   auto clear() -> void override {
     auto dp = _inputBuffer;
     uint length = _inputWidth * _inputHeight;

ruby/video/xvideo.cpp

@@ -57,6 +57,10 @@ struct VideoXVideo : VideoDriver {
     return initialize();
   }
 
+  auto focused() -> bool override {
+    return true;
+  }
+
   auto clear() -> void override {
     memory::fill<uint32_t>(_buffer, _bufferWidth * _bufferHeight);
     //clear twice in case video is double buffered ...