summaryrefslogtreecommitdiff
path: root/app/mac
diff options
context:
space:
mode:
Diffstat (limited to 'app/mac')
-rw-r--r--app/mac/CMakeLists.txt4
-rw-r--r--app/mac/impl/CMakeLists.txt13
-rw-r--r--app/mac/impl/display-spritekit.hh24
-rw-r--r--app/mac/impl/display-spritekit.mm50
-rw-r--r--app/mac/impl/file-browser-posix.cc129
-rw-r--r--app/mac/impl/file-browser-posix.hh30
-rw-r--r--app/mac/impl/input-device-gc-gamepad.hh24
-rw-r--r--app/mac/impl/input-device-gc-gamepad.mm60
-rw-r--r--app/mac/impl/input-device-gc-keyboard.hh30
-rw-r--r--app/mac/impl/input-device-gc-keyboard.mm119
-rw-r--r--app/mac/impl/input-device-serial-controller.cc96
-rw-r--r--app/mac/impl/input-device-serial-controller.hh29
-rw-r--r--app/mac/scene.mm503
13 files changed, 624 insertions, 487 deletions
diff --git a/app/mac/CMakeLists.txt b/app/mac/CMakeLists.txt
index e20edb5..e7471d1 100644
--- a/app/mac/CMakeLists.txt
+++ b/app/mac/CMakeLists.txt
@@ -21,4 +21,6 @@ target_sources(
scene.hh
scene.mm
view-controller.hh
- view-controller.mm) \ No newline at end of file
+ view-controller.mm)
+
+add_subdirectory(impl) \ No newline at end of file
diff --git a/app/mac/impl/CMakeLists.txt b/app/mac/impl/CMakeLists.txt
new file mode 100644
index 0000000..f8ff091
--- /dev/null
+++ b/app/mac/impl/CMakeLists.txt
@@ -0,0 +1,13 @@
+target_sources(
+ nes_app_mac
+ PRIVATE
+ display-spritekit.hh
+ display-spritekit.mm
+ input-device-gc-gamepad.hh
+ input-device-gc-gamepad.mm
+ input-device-gc-keyboard.hh
+ input-device-gc-keyboard.mm
+ input-device-serial-controller.hh
+ input-device-serial-controller.cc
+ file-browser-posix.hh
+ file-browser-posix.cc)
diff --git a/app/mac/impl/display-spritekit.hh b/app/mac/impl/display-spritekit.hh
new file mode 100644
index 0000000..64e3b03
--- /dev/null
+++ b/app/mac/impl/display-spritekit.hh
@@ -0,0 +1,24 @@
+#pragma once
+
+#import "nes/common/display.hh"
+
+#import <SpriteKit/SpriteKit.h>
+
+namespace nes::app::mac
+{
+ /// Display implementation rendering contents into a SpriteKit node.
+ class display_spritekit final : public display
+ {
+ SKSpriteNode* node_;
+ NSMutableData* buffer_front_;
+ NSMutableData* buffer_back_;
+ u8* bytes_back_;
+
+ public:
+ explicit display_spritekit(SKSpriteNode* node);
+
+ virtual auto switch_buffers() -> void override;
+ virtual auto set(u32 x, u32 y, rgb value) -> void override;
+ virtual auto get(u32 x, u32 y) const -> rgb override;
+ };
+} // namespace nes::app::mac \ No newline at end of file
diff --git a/app/mac/impl/display-spritekit.mm b/app/mac/impl/display-spritekit.mm
new file mode 100644
index 0000000..b6123d6
--- /dev/null
+++ b/app/mac/impl/display-spritekit.mm
@@ -0,0 +1,50 @@
+#import "impl/display-spritekit.hh"
+
+namespace nes::app::mac
+{
+ namespace
+ {
+ auto make_buffer() -> NSMutableData*
+ {
+ auto const length = NSUInteger{ display::width * display::height * 4 };
+ return [NSMutableData dataWithLength:length];
+ }
+ } // namespace
+
+ display_spritekit::display_spritekit(SKSpriteNode* node)
+ : node_{ node }
+ , buffer_front_{ make_buffer() }
+ , buffer_back_{ make_buffer() }
+ , bytes_back_{ static_cast<u8*>([buffer_back_ mutableBytes]) }
+ {
+ }
+
+ auto display_spritekit::switch_buffers() -> void
+ {
+ std::swap(buffer_back_, buffer_front_);
+ bytes_back_ = static_cast<u8*>([buffer_back_ mutableBytes]);
+
+ auto texture = [SKTexture textureWithData:buffer_front_ size:CGSizeMake(width, height) flipped:YES];
+ [texture setFilteringMode:SKTextureFilteringNearest];
+ [node_ setTexture:texture];
+ }
+
+ auto display_spritekit::set(u32 const x, u32 const y, rgb const value) -> void
+ {
+ auto const offset = (y * width + x) * 4;
+ bytes_back_[offset + 0] = value.r;
+ bytes_back_[offset + 1] = value.g;
+ bytes_back_[offset + 2] = value.b;
+ bytes_back_[offset + 3] = 255;
+ }
+
+ auto display_spritekit::get(u32 const x, u32 const y) const -> rgb
+ {
+ auto const offset = (y * width + x) * 4;
+ auto res = rgb{};
+ res.r = bytes_back_[offset + 0];
+ res.g = bytes_back_[offset + 1];
+ res.b = bytes_back_[offset + 2];
+ return res;
+ }
+} // namespace nes::app::mac \ No newline at end of file
diff --git a/app/mac/impl/file-browser-posix.cc b/app/mac/impl/file-browser-posix.cc
new file mode 100644
index 0000000..4c717fd
--- /dev/null
+++ b/app/mac/impl/file-browser-posix.cc
@@ -0,0 +1,129 @@
+#include "impl/file-browser-posix.hh"
+#include <string>
+#include <errno.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+namespace nes::app::mac
+{
+ file_browser_posix::file_browser_posix()
+ {
+ reopen_directory(path_.get_path());
+ }
+
+ file_browser_posix::~file_browser_posix()
+ {
+ if (it_) { closedir(it_); }
+ }
+
+ auto file_browser_posix::seek(u32 const pos) -> void
+ {
+ if (it_pos_ > pos)
+ {
+ reopen_directory(path_.get_path());
+ }
+
+ while (it_pos_ < pos)
+ {
+ if (!read_next(nullptr)) { break; }
+ }
+ }
+
+ auto file_browser_posix::read_next(item* out_item) -> bool
+ {
+ if (!it_) { return false; }
+
+ while (true)
+ {
+ errno = 0;
+ auto const entry = readdir(it_);
+ if (!entry)
+ {
+ if (errno) { perror("file_browser_posix: readdir"); }
+ return false;
+ }
+
+ auto const name = std::string_view{ entry->d_name };
+ if (name.length() > max_name_length) { continue; }
+ if (name[0] == '.') { continue; }
+
+ auto type = item_type::directory;
+ if (entry->d_type == DT_DIR) { type = item_type::directory; }
+ else if (entry->d_type == DT_REG) { type = item_type::file; }
+ else { continue; }
+
+ it_pos_ += 1;
+ if (out_item) { *out_item = item{ type, name }; }
+ return true;
+ }
+ }
+
+ auto file_browser_posix::navigate_up() -> status
+ {
+ auto new_path = path_;
+ if (auto const s = new_path.pop(); s != status::success) { return s; }
+ if (auto const s = reopen_directory(new_path.get_path()); s != status::success) { return s; }
+ path_ = new_path;
+ return status::success;
+ }
+
+ auto file_browser_posix::navigate(std::string_view const item) -> status
+ {
+ auto new_path = path_;
+ if (auto const s = new_path.push(item); s != status::success) { return s; }
+ if (auto const s = reopen_directory(new_path.get_path()); s != status::success) { return s; }
+ path_ = new_path;
+ return status::success;
+ }
+
+ auto file_browser_posix::load(std::string_view const item, span<u8> const buffer, u32* out_length) -> status
+ {
+ auto file_path = path_;
+ if (auto const s = file_path.push(item); s != status::success) { return s; }
+
+ auto const file_path_str = std::string{ file_path.get_path() };
+ auto const fd = open(file_path_str.c_str(), O_RDONLY);
+ if (fd == -1)
+ {
+ perror("file_browser_posix: open");
+ return status::error_system_error;
+ }
+
+ auto const res = read(fd, buffer.get_data(), buffer.get_length());
+ if (res < 0)
+ {
+ perror("file_browser_posix: read");
+ close(fd);
+ return status::error_system_error;
+ }
+ if (out_length) { *out_length = static_cast<u32>(res); }
+
+ auto remaining = char{};
+ if (read(fd, &remaining, 1) != 0)
+ {
+ // File was too long.
+ close(fd);
+ return status::error_invalid_ines_data;
+ }
+
+ close(fd);
+
+ return status::success;
+ }
+
+ auto file_browser_posix::reopen_directory(std::string_view const path) -> status
+ {
+ auto const path_str = std::string{ path };
+ auto const new_it = opendir(path_str.c_str());
+ if (!new_it)
+ {
+ perror("file_browser_posix: opendir");
+ return status::error_system_error;
+ }
+
+ if (it_) { closedir(it_); }
+ it_ = new_it;
+ it_pos_ = 0;
+ return status::success;
+ }
+} // namespace nes::app::mac \ No newline at end of file
diff --git a/app/mac/impl/file-browser-posix.hh b/app/mac/impl/file-browser-posix.hh
new file mode 100644
index 0000000..b760e53
--- /dev/null
+++ b/app/mac/impl/file-browser-posix.hh
@@ -0,0 +1,30 @@
+#pragma once
+
+#include "nes/app/file-browser.hh"
+#include "nes/common/path-builder.hh"
+#include <dirent.h>
+
+namespace nes::app::mac
+{
+ /// File browser implementation using the POSIX directory API.
+ class file_browser_posix final : public file_browser
+ {
+ path_buffer<1024> path_;
+ DIR* it_{ nullptr };
+ u32 it_pos_{ 0 };
+
+ public:
+ explicit file_browser_posix();
+ ~file_browser_posix() override;
+
+ auto get_path() const -> path_view override { return path_.get_components(); }
+ auto seek(u32) -> void override;
+ auto read_next(item* out_item) -> bool override;
+ auto navigate_up() -> status override;
+ auto navigate(std::string_view) -> status override;
+ auto load(std::string_view, span<u8>, u32* out_length) -> status override;
+
+ private:
+ auto reopen_directory(std::string_view path) -> status;
+ };
+} // namespace nes::app::mac \ No newline at end of file
diff --git a/app/mac/impl/input-device-gc-gamepad.hh b/app/mac/impl/input-device-gc-gamepad.hh
new file mode 100644
index 0000000..b4b4a4e
--- /dev/null
+++ b/app/mac/impl/input-device-gc-gamepad.hh
@@ -0,0 +1,24 @@
+#pragma once
+
+#import "nes/app/input/input-device-controller.hh"
+
+#import <GameController/GameController.h>
+
+namespace nes::app::mac
+{
+ /// Input device wrapping a GCExtendedGamepad.
+ class input_device_gc_gamepad final : public input_device_controller
+ {
+ GCExtendedGamepad* profile_;
+
+ public:
+ explicit input_device_gc_gamepad(GCExtendedGamepad* profile);
+
+ auto is_reliable() const -> bool override { return true; }
+ auto get_controller() const -> GCController* { return [profile_ controller]; }
+ auto get_name() const -> std::string_view override;
+ auto get_index() const -> index override;
+ auto set_index(index) -> void override;
+ auto read_buttons() -> sys::button_mask override;
+ };
+} // namespace nes::app::mac \ No newline at end of file
diff --git a/app/mac/impl/input-device-gc-gamepad.mm b/app/mac/impl/input-device-gc-gamepad.mm
new file mode 100644
index 0000000..d2f84ec
--- /dev/null
+++ b/app/mac/impl/input-device-gc-gamepad.mm
@@ -0,0 +1,60 @@
+#import "impl/input-device-gc-gamepad.hh"
+
+namespace nes::app::mac
+{
+ input_device_gc_gamepad::input_device_gc_gamepad(GCExtendedGamepad* profile)
+ : profile_{ profile }
+ {
+ }
+
+ auto input_device_gc_gamepad::get_name() const -> std::string_view
+ {
+ return [[get_controller() vendorName] UTF8String];
+ }
+
+ auto input_device_gc_gamepad::get_index() const -> index
+ {
+ switch ([get_controller() playerIndex])
+ {
+ case GCControllerPlayerIndex1:
+ return index::player_1;
+ case GCControllerPlayerIndex2:
+ return index::player_2;
+ case GCControllerPlayerIndex3:
+ case GCControllerPlayerIndex4:
+ case GCControllerPlayerIndexUnset:
+ break;
+ }
+ return index::unused;
+ }
+
+ auto input_device_gc_gamepad::set_index(index const idx) -> void
+ {
+ switch (idx)
+ {
+ case index::unused:
+ [get_controller() setPlayerIndex:GCControllerPlayerIndexUnset];
+ break;
+ case index::player_1:
+ [get_controller() setPlayerIndex:GCControllerPlayerIndex1];
+ break;
+ case index::player_2:
+ [get_controller() setPlayerIndex:GCControllerPlayerIndex2];
+ break;
+ }
+ }
+
+ auto input_device_gc_gamepad::read_buttons() -> sys::button_mask
+ {
+ auto res = sys::button_mask{};
+ if ([[[profile_ dpad] up] isPressed]) { res.add(sys::buttons::up); }
+ if ([[[profile_ dpad] down] isPressed]) { res.add(sys::buttons::down); }
+ if ([[[profile_ dpad] left] isPressed]) { res.add(sys::buttons::left); }
+ if ([[[profile_ dpad] right] isPressed]) { res.add(sys::buttons::right); }
+ if ([[profile_ buttonA] isPressed]) { res.add(sys::buttons::a); }
+ if ([[profile_ buttonB] isPressed]) { res.add(sys::buttons::b); }
+ if ([[profile_ leftTrigger] isPressed]) { res.add(sys::buttons::select); }
+ if ([[profile_ rightTrigger] isPressed]) { res.add(sys::buttons::start); }
+ return res;
+ }
+} // namespace nes::app::mac \ No newline at end of file
diff --git a/app/mac/impl/input-device-gc-keyboard.hh b/app/mac/impl/input-device-gc-keyboard.hh
new file mode 100644
index 0000000..c879dcc
--- /dev/null
+++ b/app/mac/impl/input-device-gc-keyboard.hh
@@ -0,0 +1,30 @@
+#pragma once
+
+#import "nes/app/input/input-device-keyboard.hh"
+#import "nes/app/input/input-buffer.hh"
+#import <optional>
+
+#import <GameController/GameController.h>
+
+namespace nes::app::mac
+{
+ /// Input device wrapping a GCKeyboard.
+ class input_device_gc_keyboard final : public input_device_keyboard
+ {
+ GCKeyboardInput* profile_{ nil };
+ input_buffer buffer_;
+
+ public:
+ explicit input_device_gc_keyboard(GCKeyboardInput* profile);
+ ~input_device_gc_keyboard() override;
+
+ auto set_profile(GCKeyboardInput* profile) -> void;
+
+ auto read_key(key const key) -> bool override { return buffer_.read_key(key); }
+ auto poll_event() -> input_event override { return buffer_.poll_event(); }
+
+ private:
+ auto handle_key_changed(GCKeyCode key_code, BOOL pressed) -> void;
+ auto convert_key_code(GCKeyCode key_code) -> std::optional<key>;
+ };
+} // namespace nes::app::mac \ No newline at end of file
diff --git a/app/mac/impl/input-device-gc-keyboard.mm b/app/mac/impl/input-device-gc-keyboard.mm
new file mode 100644
index 0000000..34ab98d
--- /dev/null
+++ b/app/mac/impl/input-device-gc-keyboard.mm
@@ -0,0 +1,119 @@
+#import "impl/input-device-gc-keyboard.hh"
+
+namespace nes::app::mac
+{
+ input_device_gc_keyboard::input_device_gc_keyboard(GCKeyboardInput* profile)
+ {
+ set_profile(profile);
+ }
+
+ input_device_gc_keyboard::~input_device_gc_keyboard()
+ {
+ set_profile(nil);
+ }
+
+ auto input_device_gc_keyboard::set_profile(GCKeyboardInput* profile) -> void
+ {
+ [profile_ setKeyChangedHandler:nil];
+ profile_ = profile;
+ [profile_ setKeyChangedHandler:^(GCKeyboardInput*, GCControllerButtonInput*, GCKeyCode key_code, BOOL pressed) {
+ handle_key_changed(key_code, pressed);
+ }];
+ }
+
+ auto input_device_gc_keyboard::handle_key_changed(GCKeyCode const key_code, BOOL const pressed) -> void
+ {
+ auto const key = convert_key_code(key_code);
+ if (key)
+ {
+ if (pressed)
+ {
+ buffer_.key_down(*key);
+ }
+ else
+ {
+ buffer_.key_up(*key);
+ }
+ }
+ }
+
+ auto input_device_gc_keyboard::convert_key_code(GCKeyCode const key_code) -> std::optional<key>
+ {
+ if (key_code == GCKeyCodeZero) { return key::digit_0; }
+ if (key_code == GCKeyCodeOne) { return key::digit_1; }
+ if (key_code == GCKeyCodeTwo) { return key::digit_2; }
+ if (key_code == GCKeyCodeThree) { return key::digit_3; }
+ if (key_code == GCKeyCodeFour) { return key::digit_4; }
+ if (key_code == GCKeyCodeFive) { return key::digit_5; }
+ if (key_code == GCKeyCodeSix) { return key::digit_6; }
+ if (key_code == GCKeyCodeSeven) { return key::digit_7; }
+ if (key_code == GCKeyCodeEight) { return key::digit_8; }
+ if (key_code == GCKeyCodeNine) { return key::digit_9; }
+ if (key_code == GCKeyCodeKeyA) { return key::letter_a; }
+ if (key_code == GCKeyCodeKeyB) { return key::letter_b; }
+ if (key_code == GCKeyCodeKeyC) { return key::letter_c; }
+ if (key_code == GCKeyCodeKeyD) { return key::letter_d; }
+ if (key_code == GCKeyCodeKeyE) { return key::letter_e; }
+ if (key_code == GCKeyCodeKeyF) { return key::letter_f; }
+ if (key_code == GCKeyCodeKeyG) { return key::letter_g; }
+ if (key_code == GCKeyCodeKeyH) { return key::letter_h; }
+ if (key_code == GCKeyCodeKeyI) { return key::letter_i; }
+ if (key_code == GCKeyCodeKeyJ) { return key::letter_j; }
+ if (key_code == GCKeyCodeKeyK) { return key::letter_k; }
+ if (key_code == GCKeyCodeKeyL) { return key::letter_l; }
+ if (key_code == GCKeyCodeKeyM) { return key::letter_m; }
+ if (key_code == GCKeyCodeKeyN) { return key::letter_n; }
+ if (key_code == GCKeyCodeKeyO) { return key::letter_o; }
+ if (key_code == GCKeyCodeKeyP) { return key::letter_p; }
+ if (key_code == GCKeyCodeKeyQ) { return key::letter_q; }
+ if (key_code == GCKeyCodeKeyR) { return key::letter_r; }
+ if (key_code == GCKeyCodeKeyS) { return key::letter_s; }
+ if (key_code == GCKeyCodeKeyT) { return key::letter_t; }
+ if (key_code == GCKeyCodeKeyU) { return key::letter_u; }
+ if (key_code == GCKeyCodeKeyV) { return key::letter_v; }
+ if (key_code == GCKeyCodeKeyW) { return key::letter_w; }
+ if (key_code == GCKeyCodeKeyX) { return key::letter_x; }
+ if (key_code == GCKeyCodeKeyY) { return key::letter_y; }
+ if (key_code == GCKeyCodeKeyZ) { return key::letter_z; }
+ if (key_code == GCKeyCodeEscape) { return key::escape; }
+ if (key_code == GCKeyCodeHyphen) { return key::dash; }
+ if (key_code == GCKeyCodeEqualSign) { return key::equal; }
+ if (key_code == GCKeyCodeDeleteOrBackspace) { return key::backspace; }
+ if (key_code == GCKeyCodeTab) { return key::tab; }
+ if (key_code == GCKeyCodeReturnOrEnter) { return key::enter; }
+ if (key_code == GCKeyCodeSemicolon) { return key::semicolon; }
+ if (key_code == GCKeyCodeQuote) { return key::apostrophe; }
+ if (key_code == GCKeyCodeBackslash) { return key::backslash; }
+ if (key_code == GCKeyCodeComma) { return key::comma; }
+ if (key_code == GCKeyCodePeriod) { return key::period; }
+ if (key_code == GCKeyCodeSlash) { return key::slash; }
+ if (key_code == GCKeyCodeSpacebar) { return key::space; }
+ if (key_code == GCKeyCodeCapsLock) { return key::caps_lock; }
+ if (key_code == GCKeyCodeOpenBracket) { return key::bracket_open; }
+ if (key_code == GCKeyCodeCloseBracket) { return key::bracket_close; }
+ if (key_code == GCKeyCodeLeftControl) { return key::control_left; }
+ if (key_code == GCKeyCodeRightControl) { return key::control_right; }
+ if (key_code == GCKeyCodeLeftShift) { return key::shift_left; }
+ if (key_code == GCKeyCodeRightShift) { return key::shift_right; }
+ if (key_code == GCKeyCodeLeftAlt) { return key::alt_left; }
+ if (key_code == GCKeyCodeRightAlt) { return key::alt_right; }
+ if (key_code == GCKeyCodeLeftArrow) { return key::arrow_left; }
+ if (key_code == GCKeyCodeRightArrow) { return key::arrow_right; }
+ if (key_code == GCKeyCodeUpArrow) { return key::arrow_up; }
+ if (key_code == GCKeyCodeDownArrow) { return key::arrow_down; }
+ if (key_code == GCKeyCodeF1) { return key::f1; }
+ if (key_code == GCKeyCodeF2) { return key::f2; }
+ if (key_code == GCKeyCodeF3) { return key::f3; }
+ if (key_code == GCKeyCodeF4) { return key::f4; }
+ if (key_code == GCKeyCodeF5) { return key::f5; }
+ if (key_code == GCKeyCodeF6) { return key::f6; }
+ if (key_code == GCKeyCodeF7) { return key::f7; }
+ if (key_code == GCKeyCodeF8) { return key::f8; }
+ if (key_code == GCKeyCodeF9) { return key::f9; }
+ if (key_code == GCKeyCodeF10) { return key::f10; }
+ if (key_code == GCKeyCodeF11) { return key::f11; }
+ if (key_code == GCKeyCodeF12) { return key::f12; }
+
+ return std::nullopt;
+ }
+} // namespace nes::app::mac \ No newline at end of file
diff --git a/app/mac/impl/input-device-serial-controller.cc b/app/mac/impl/input-device-serial-controller.cc
new file mode 100644
index 0000000..7a493a7
--- /dev/null
+++ b/app/mac/impl/input-device-serial-controller.cc
@@ -0,0 +1,96 @@
+#include "impl/input-device-serial-controller.hh"
+#include <stdio.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <termios.h>
+#include <sys/ioctl.h>
+
+namespace nes::app::mac
+{
+ input_device_serial_controller::input_device_serial_controller(char const* path)
+ : path_{ path }
+ {
+ fd_ = open(path, O_RDONLY | O_NOCTTY | O_NDELAY | O_NONBLOCK);
+ if (fd_ == -1)
+ {
+ perror("input_device_serial_controller: open");
+ return;
+ }
+
+ if (!set_up()) { close(); }
+ }
+
+ input_device_serial_controller::~input_device_serial_controller()
+ {
+ close();
+ }
+
+ auto input_device_serial_controller::is_reliable() const -> bool
+ {
+ return fd_ != -1;
+ }
+
+ auto input_device_serial_controller::read_buttons() -> sys::button_mask
+ {
+ if (fd_ == -1) { return sys::button_mask{}; }
+
+ // Poll for any updates until we can't read anymore.
+ while (true)
+ {
+ auto buf = u8{};
+ auto const res = read(fd_, &buf, 1);
+ if (res == -1)
+ {
+ if (errno == EAGAIN || errno == EWOULDBLOCK) { break; }
+
+ perror("read from controller");
+ close();
+ break;
+ }
+
+ current_ = sys::button_mask::from_raw_value(buf);
+ }
+
+ return current_;
+ }
+
+
+ auto input_device_serial_controller::set_up() -> bool
+ {
+ if (ioctl(fd_, TIOCEXCL) == -1)
+ {
+ perror("input_device_serial_controller: ioctl");
+ return false;
+ }
+
+ auto attr = termios{};
+ if (tcgetattr(fd_, &attr) == -1)
+ {
+ perror("input_device_serial_controller: tcgetattr");
+ return false;
+ }
+
+ cfsetispeed(&attr, B57600);
+ cfsetospeed(&attr, B57600);
+ attr.c_cflag = attr.c_cflag | CLOCAL | CREAD;
+ attr.c_cflag = (attr.c_cflag & static_cast<tcflag_t>(~CSIZE)) | CS8;
+
+ if (tcsetattr(fd_, TCSANOW, &attr) == -1)
+ {
+ perror("input_device_serial_controller: tcsetattr");
+ return false;
+ }
+
+ return true;
+ }
+
+ auto input_device_serial_controller::close() -> void
+ {
+ if (fd_ != -1)
+ {
+ ::close(fd_);
+ fd_ = -1;
+ }
+ }
+} // namespace nes::app::mac \ No newline at end of file
diff --git a/app/mac/impl/input-device-serial-controller.hh b/app/mac/impl/input-device-serial-controller.hh
new file mode 100644
index 0000000..2022ed2
--- /dev/null
+++ b/app/mac/impl/input-device-serial-controller.hh
@@ -0,0 +1,29 @@
+#pragma once
+
+#include "nes/app/input/input-device-controller.hh"
+
+namespace nes::app::mac
+{
+ /// Input device for an NES controller plugged in via serial port.
+ class input_device_serial_controller final : public input_device_controller
+ {
+ char const* path_;
+ int fd_{ -1 };
+ sys::button_mask current_{};
+ index index_{ index::unused };
+
+ public:
+ explicit input_device_serial_controller(char const* path);
+ ~input_device_serial_controller() override;
+
+ auto is_reliable() const -> bool override;
+ auto get_name() const -> std::string_view override { return path_; }
+ auto get_index() const -> index override { return index_; }
+ auto set_index(index const v) -> void override { index_ = v; }
+ auto read_buttons() -> sys::button_mask override;
+
+ private:
+ auto set_up() -> bool;
+ auto close() -> void;
+ };
+} // namespace nes::app:mac \ No newline at end of file
diff --git a/app/mac/scene.mm b/app/mac/scene.mm
index 901af64..3650156 100644
--- a/app/mac/scene.mm
+++ b/app/mac/scene.mm
@@ -1,4 +1,9 @@
#import "scene.hh"
+#import "impl/display-spritekit.hh"
+#import "impl/file-browser-posix.hh"
+#import "impl/input-device-gc-keyboard.hh"
+#import "impl/input-device-gc-gamepad.hh"
+#import "impl/input-device-serial-controller.hh"
#import "nes/app/application.hh"
#import "nes/app/input/input-device-keyboard.hh"
#import "nes/app/input/input-device-controller.hh"
@@ -8,494 +13,20 @@
#import "nes/common/path-view.hh"
#import "nes/common/path-builder.hh"
#import <memory>
-#import <iostream>
#import <optional>
-#import <fcntl.h>
-#import <unistd.h>
-#import <termios.h>
-#import <dirent.h>
-#import <sys/ioctl.h>
namespace
{
- class display_impl final : public nes::display
- {
- SKSpriteNode* node_;
- NSMutableData* buffer_front_;
- NSMutableData* buffer_back_;
- nes::u8* bytes_back_;
-
- public:
- explicit display_impl(SKSpriteNode* node)
- : node_{ node }
- , buffer_front_{ make_buffer() }
- , buffer_back_{ make_buffer() }
- , bytes_back_{ static_cast<nes::u8*>([buffer_back_ mutableBytes]) }
- {
- }
-
- ~display_impl() = default;
-
- virtual auto switch_buffers() -> void override
- {
- auto tmp = buffer_back_;
- buffer_back_ = buffer_front_;
- buffer_front_ = tmp;
- bytes_back_ = static_cast<nes::u8*>([buffer_back_ mutableBytes]);
-
- auto texture = [SKTexture textureWithData:buffer_front_ size:CGSizeMake(width, height) flipped:YES];
- [texture setFilteringMode:SKTextureFilteringNearest];
- [node_ setTexture:texture];
- }
-
- virtual auto set(nes::u32 x, nes::u32 y, nes::rgb value) -> void override
- {
- auto const offset = (y * width + x) * 4;
- bytes_back_[offset + 0] = value.r;
- bytes_back_[offset + 1] = value.g;
- bytes_back_[offset + 2] = value.b;
- bytes_back_[offset + 3] = 255;
- }
-
- virtual auto get(nes::u32 x, nes::u32 y) const -> nes::rgb override
- {
- auto const offset = (y * width + x) * 4;
- auto res = nes::rgb{};
- res.r = bytes_back_[offset + 0];
- res.g = bytes_back_[offset + 1];
- res.b = bytes_back_[offset + 2];
- return res;
- }
-
- private:
- static auto make_buffer() -> NSMutableData*
- {
- auto const length = NSUInteger{ width * height * 4 };
- return [NSMutableData dataWithLength:length];
- }
- };
-
- class input_device_keyboard_impl final : public nes::app::input_device_keyboard
- {
- GCKeyboardInput* profile_{ nil };
- nes::app::input_buffer buffer_;
-
- public:
- explicit input_device_keyboard_impl(GCKeyboardInput* profile)
- {
- set_profile(profile);
- }
-
- ~input_device_keyboard_impl()
- {
- set_profile(nil);
- }
-
- auto set_profile(GCKeyboardInput* profile) -> void
- {
- [profile_ setKeyChangedHandler:nil];
- profile_ = profile;
- [profile_ setKeyChangedHandler:^(GCKeyboardInput*, GCControllerButtonInput*, GCKeyCode key_code, BOOL pressed) {
- handle_key_changed(key_code, pressed);
- }];
- }
-
- auto read_key(nes::app::key const key) -> bool override { return buffer_.read_key(key); }
- auto poll_event() -> nes::app::input_event override { return buffer_.poll_event(); }
-
- private:
- auto handle_key_changed(GCKeyCode const key_code, BOOL const pressed) -> void
- {
- auto const key = convert_key_code(key_code);
- if (key)
- {
- if (pressed)
- {
- buffer_.key_down(*key);
- }
- else
- {
- buffer_.key_up(*key);
- }
- }
- }
-
- auto convert_key_code(GCKeyCode const key_code) -> std::optional<nes::app::key>
- {
- if (key_code == GCKeyCodeZero) { return nes::app::key::digit_0; }
- if (key_code == GCKeyCodeOne) { return nes::app::key::digit_1; }
- if (key_code == GCKeyCodeTwo) { return nes::app::key::digit_2; }
- if (key_code == GCKeyCodeThree) { return nes::app::key::digit_3; }
- if (key_code == GCKeyCodeFour) { return nes::app::key::digit_4; }
- if (key_code == GCKeyCodeFive) { return nes::app::key::digit_5; }
- if (key_code == GCKeyCodeSix) { return nes::app::key::digit_6; }
- if (key_code == GCKeyCodeSeven) { return nes::app::key::digit_7; }
- if (key_code == GCKeyCodeEight) { return nes::app::key::digit_8; }
- if (key_code == GCKeyCodeNine) { return nes::app::key::digit_9; }
- if (key_code == GCKeyCodeKeyA) { return nes::app::key::letter_a; }
- if (key_code == GCKeyCodeKeyB) { return nes::app::key::letter_b; }
- if (key_code == GCKeyCodeKeyC) { return nes::app::key::letter_c; }
- if (key_code == GCKeyCodeKeyD) { return nes::app::key::letter_d; }
- if (key_code == GCKeyCodeKeyE) { return nes::app::key::letter_e; }
- if (key_code == GCKeyCodeKeyF) { return nes::app::key::letter_f; }
- if (key_code == GCKeyCodeKeyG) { return nes::app::key::letter_g; }
- if (key_code == GCKeyCodeKeyH) { return nes::app::key::letter_h; }
- if (key_code == GCKeyCodeKeyI) { return nes::app::key::letter_i; }
- if (key_code == GCKeyCodeKeyJ) { return nes::app::key::letter_j; }
- if (key_code == GCKeyCodeKeyK) { return nes::app::key::letter_k; }
- if (key_code == GCKeyCodeKeyL) { return nes::app::key::letter_l; }
- if (key_code == GCKeyCodeKeyM) { return nes::app::key::letter_m; }
- if (key_code == GCKeyCodeKeyN) { return nes::app::key::letter_n; }
- if (key_code == GCKeyCodeKeyO) { return nes::app::key::letter_o; }
- if (key_code == GCKeyCodeKeyP) { return nes::app::key::letter_p; }
- if (key_code == GCKeyCodeKeyQ) { return nes::app::key::letter_q; }
- if (key_code == GCKeyCodeKeyR) { return nes::app::key::letter_r; }
- if (key_code == GCKeyCodeKeyS) { return nes::app::key::letter_s; }
- if (key_code == GCKeyCodeKeyT) { return nes::app::key::letter_t; }
- if (key_code == GCKeyCodeKeyU) { return nes::app::key::letter_u; }
- if (key_code == GCKeyCodeKeyV) { return nes::app::key::letter_v; }
- if (key_code == GCKeyCodeKeyW) { return nes::app::key::letter_w; }
- if (key_code == GCKeyCodeKeyX) { return nes::app::key::letter_x; }
- if (key_code == GCKeyCodeKeyY) { return nes::app::key::letter_y; }
- if (key_code == GCKeyCodeKeyZ) { return nes::app::key::letter_z; }
- if (key_code == GCKeyCodeEscape) { return nes::app::key::escape; }
- if (key_code == GCKeyCodeHyphen) { return nes::app::key::dash; }
- if (key_code == GCKeyCodeEqualSign) { return nes::app::key::equal; }
- if (key_code == GCKeyCodeDeleteOrBackspace) { return nes::app::key::backspace; }
- if (key_code == GCKeyCodeTab) { return nes::app::key::tab; }
- if (key_code == GCKeyCodeReturnOrEnter) { return nes::app::key::enter; }
- if (key_code == GCKeyCodeSemicolon) { return nes::app::key::semicolon; }
- if (key_code == GCKeyCodeQuote) { return nes::app::key::apostrophe; }
- if (key_code == GCKeyCodeBackslash) { return nes::app::key::backslash; }
- if (key_code == GCKeyCodeComma) { return nes::app::key::comma; }
- if (key_code == GCKeyCodePeriod) { return nes::app::key::period; }
- if (key_code == GCKeyCodeSlash) { return nes::app::key::slash; }
- if (key_code == GCKeyCodeSpacebar) { return nes::app::key::space; }
- if (key_code == GCKeyCodeCapsLock) { return nes::app::key::caps_lock; }
- if (key_code == GCKeyCodeOpenBracket) { return nes::app::key::bracket_open; }
- if (key_code == GCKeyCodeCloseBracket) { return nes::app::key::bracket_close; }
- if (key_code == GCKeyCodeLeftControl) { return nes::app::key::control_left; }
- if (key_code == GCKeyCodeRightControl) { return nes::app::key::control_right; }
- if (key_code == GCKeyCodeLeftShift) { return nes::app::key::shift_left; }
- if (key_code == GCKeyCodeRightShift) { return nes::app::key::shift_right; }
- if (key_code == GCKeyCodeLeftAlt) { return nes::app::key::alt_left; }
- if (key_code == GCKeyCodeRightAlt) { return nes::app::key::alt_right; }
- if (key_code == GCKeyCodeLeftArrow) { return nes::app::key::arrow_left; }
- if (key_code == GCKeyCodeRightArrow) { return nes::app::key::arrow_right; }
- if (key_code == GCKeyCodeUpArrow) { return nes::app::key::arrow_up; }
- if (key_code == GCKeyCodeDownArrow) { return nes::app::key::arrow_down; }
- if (key_code == GCKeyCodeF1) { return nes::app::key::f1; }
- if (key_code == GCKeyCodeF2) { return nes::app::key::f2; }
- if (key_code == GCKeyCodeF3) { return nes::app::key::f3; }
- if (key_code == GCKeyCodeF4) { return nes::app::key::f4; }
- if (key_code == GCKeyCodeF5) { return nes::app::key::f5; }
- if (key_code == GCKeyCodeF6) { return nes::app::key::f6; }
- if (key_code == GCKeyCodeF7) { return nes::app::key::f7; }
- if (key_code == GCKeyCodeF8) { return nes::app::key::f8; }
- if (key_code == GCKeyCodeF9) { return nes::app::key::f9; }
- if (key_code == GCKeyCodeF10) { return nes::app::key::f10; }
- if (key_code == GCKeyCodeF11) { return nes::app::key::f11; }
- if (key_code == GCKeyCodeF12) { return nes::app::key::f12; }
-
- return std::nullopt;
- }
- };
-
- class input_device_controller_impl final : public nes::app::input_device_controller
- {
- GCExtendedGamepad* profile_;
-
- public:
- explicit input_device_controller_impl(GCExtendedGamepad* profile)
- : profile_{ profile }
- {
- }
-
- auto is_reliable() const -> bool override { return true; }
- auto get_controller() const -> GCController* { return [profile_ controller]; }
- auto get_name() const -> std::string_view override { return [[get_controller() vendorName] UTF8String]; }
-
- auto get_index() const -> index override
- {
- switch ([get_controller() playerIndex])
- {
- case GCControllerPlayerIndex1:
- return index::player_1;
- case GCControllerPlayerIndex2:
- return index::player_2;
- case GCControllerPlayerIndex3:
- case GCControllerPlayerIndex4:
- case GCControllerPlayerIndexUnset:
- break;
- }
- return index::unused;
- }
-
- auto set_index(index idx) -> void override
- {
- switch (idx)
- {
- case index::unused:
- [get_controller() setPlayerIndex:GCControllerPlayerIndexUnset];
- break;
- case index::player_1:
- [get_controller() setPlayerIndex:GCControllerPlayerIndex1];
- break;
- case index::player_2:
- [get_controller() setPlayerIndex:GCControllerPlayerIndex2];
- break;
- }
- }
-
- auto read_buttons() -> nes::sys::button_mask override
- {
- auto res = nes::sys::button_mask{};
- if ([[[profile_ dpad] up] isPressed]) { res.add(nes::sys::buttons::up); }
- if ([[[profile_ dpad] down] isPressed]) { res.add(nes::sys::buttons::down); }
- if ([[[profile_ dpad] left] isPressed]) { res.add(nes::sys::buttons::left); }
- if ([[[profile_ dpad] right] isPressed]) { res.add(nes::sys::buttons::right); }
- if ([[profile_ buttonA] isPressed]) { res.add(nes::sys::buttons::a); }
- if ([[profile_ buttonB] isPressed]) { res.add(nes::sys::buttons::b); }
- if ([[profile_ leftTrigger] isPressed]) { res.add(nes::sys::buttons::select); }
- if ([[profile_ rightTrigger] isPressed]) { res.add(nes::sys::buttons::start); }
- return res;
- }
- };
-
- class input_device_controller_serial : public nes::app::input_device_controller
- {
- char const* path_;
- int fd_{ 0 };
- nes::sys::button_mask current_{};
- index index_{ index::unused };
-
- public:
- explicit input_device_controller_serial(char const* path)
- : path_{ path }
- {
- fd_ = open(path, O_RDONLY | O_NOCTTY | O_NDELAY | O_NONBLOCK);
- if (fd_ == -1)
- {
- perror("open controller");
- return;
- }
-
- if (!setup()) { close(); }
- }
-
- ~input_device_controller_serial() override
- {
- close();
- }
-
- auto read_buttons() -> nes::sys::button_mask override
- {
- if (fd_ == -1) { return nes::sys::button_mask{}; }
-
- // Poll for any updates until we can't read anymore.
- while (true)
- {
- auto buf = nes::u8{};
- auto res = read(fd_, &buf, 1);
- if (res == -1)
- {
- if (errno == EAGAIN || errno == EWOULDBLOCK) { break; }
-
- perror("read from controller");
- close();
- break;
- }
-
- current_ = nes::sys::button_mask::from_raw_value(buf);
- }
-
- return current_;
- }
-
- auto is_reliable() const -> bool override { return fd_ != -1; }
- auto get_name() const -> std::string_view override { return path_; }
- auto set_index(index const index) -> void override { index_ = index; }
- auto get_index() const -> index override { return index_; }
-
- private:
- auto close() -> void
- {
- if (fd_ != -1)
- {
- ::close(fd_);
- fd_ = -1;
- }
- }
-
- auto setup() -> bool
- {
- if (ioctl(fd_, TIOCEXCL) == -1)
- {
- perror("ioctl for controller");
- return false;
- }
-
- auto attr = termios{};
- if (tcgetattr(fd_, &attr) == -1)
- {
- perror("tcgetattr for controller");
- return false;
- }
-
- cfsetispeed(&attr, B57600);
- cfsetospeed(&attr, B57600);
- attr.c_cflag = attr.c_cflag | CLOCAL | CREAD;
- attr.c_cflag = (attr.c_cflag & static_cast<tcflag_t>(~CSIZE)) | CS8;
-
- if (tcsetattr(fd_, TCSANOW, &attr) == -1)
- {
- perror("tcsetattr for controller");
- return false;
- }
-
- return true;
- }
- };
-
- class file_browser_impl final : public nes::app::file_browser
- {
- nes::path_buffer<256> path_;
- DIR* it_{ nullptr };
- nes::u32 it_pos_{ 0 };
-
- public:
- explicit file_browser_impl()
- {
- reopen_dir();
- }
-
- ~file_browser_impl() override
- {
- closedir(it_);
- }
-
- auto get_path() const -> nes::path_view override
- {
- return path_.get_components();
- }
-
- auto seek(nes::u32 const position) -> void override
- {
- if (it_pos_ > position)
- {
- reopen_dir();
- }
-
- while (it_pos_ < position)
- {
- if (!read_next(nullptr)) { break; }
- }
- }
-
- auto read_next(item* out_item) -> bool override
- {
- if (!it_) { return false; }
-
- while (true)
- {
- errno = 0;
- auto entry = readdir(it_);
- if (!entry)
- {
- if (errno)
- {
- perror("readdir");
- std::abort();
- }
-
- return false;
- }
-
- auto const name = std::string_view{ entry->d_name };
- if (name.length() > max_name_length) { continue; }
- if (name[0] == '.') { continue; }
-
- auto type = item_type::directory;
- if (entry->d_type == DT_DIR) { type = item_type::directory; }
- else if (entry->d_type == DT_REG) { type = item_type::file; }
- else { continue; }
-
- it_pos_ += 1;
- if (out_item) { *out_item = item{ type, name }; }
- return true;
- }
- }
-
- auto navigate_up() -> void override
- {
- if (!path_.pop()) { return; }
-
- reopen_dir();
- }
-
- auto navigate(std::string_view const item) -> void override
- {
- if (!path_.push(item)) { std::abort(); }
-
- reopen_dir();
- }
-
- auto load(std::string_view const item, nes::span<nes::u8> const buffer) -> nes::u32 override
- {
- auto file_path = path_;
- if (!file_path.push(item)) { std::abort(); }
-
- auto const path = std::string{ file_path.get_path() };
- auto const fd = open(path.c_str(), O_RDONLY);
- if (fd == -1)
- {
- perror("open");
- std::abort();
- }
-
- auto const res = read(fd, buffer.get_data(), buffer.get_length());
- if (res < 0)
- {
- perror("read");
- std::abort();
- }
-
- auto remaining = char{};
- if (read(fd, &remaining, 1) != 0)
- {
- std::cerr << "Expected EOF" << std::endl;
- std::abort();
- }
-
- close(fd);
-
- return static_cast<nes::u32>(res);
- }
-
- private:
- auto reopen_dir() -> void
- {
- if (it_) { closedir(it_); }
-
- auto const path = std::string{ path_.get_path() };
- it_ = opendir(path.c_str());
- if (!it_)
- {
- perror("opendir");
- std::abort();
- }
- it_pos_ = 0;
- }
- };
+ constexpr auto const serial_controller_path = "/dev/cu.usbserial-FTB6SPL3";
} // namespace
@implementation Scene
{
- std::unique_ptr<display_impl> _display;
- std::unique_ptr<file_browser_impl> _fileBrowser;
- std::unique_ptr<input_device_keyboard_impl> _keyboard;
- std::unique_ptr<input_device_controller_serial> _serialController;
- std::vector<std::unique_ptr<input_device_controller_impl>> _controllers;
+ std::unique_ptr<nes::app::mac::display_spritekit> _display;
+ std::unique_ptr<nes::app::mac::file_browser_posix> _fileBrowser;
+ std::unique_ptr<nes::app::mac::input_device_serial_controller> _serialController;
+ std::unique_ptr<nes::app::mac::input_device_gc_keyboard> _keyboard;
+ std::vector<std::unique_ptr<nes::app::mac::input_device_gc_gamepad>> _controllers;
std::unique_ptr<nes::app::application> _app;
std::optional<NSTimeInterval> _lastTimestamp;
}
@@ -512,10 +43,10 @@ namespace
[self setScaleMode:SKSceneScaleModeAspectFit];
[self addChild:node];
- _display = std::make_unique<display_impl>(node);
- _fileBrowser = std::make_unique<file_browser_impl>();
- _keyboard = std::make_unique<input_device_keyboard_impl>([[GCKeyboard coalescedKeyboard] keyboardInput]);
- _serialController = std::make_unique<input_device_controller_serial>("/dev/cu.usbserial-FTB6SPL3");
+ _display = std::make_unique<nes::app::mac::display_spritekit>(node);
+ _fileBrowser = std::make_unique<nes::app::mac::file_browser_posix>();
+ _serialController = std::make_unique<nes::app::mac::input_device_serial_controller>(serial_controller_path);
+ _keyboard = std::make_unique<nes::app::mac::input_device_gc_keyboard>([[GCKeyboard coalescedKeyboard] keyboardInput]);
_app = std::make_unique<nes::app::application>(*_display, *_keyboard, *_fileBrowser);
_app->add_controller(*_serialController);
@@ -525,7 +56,7 @@ namespace
auto gamepad = [controller extendedGamepad];
if (gamepad)
{
- auto adapter = std::make_unique<input_device_controller_impl>(gamepad);
+ auto adapter = std::make_unique<nes::app::mac::input_device_gc_gamepad>(gamepad);
_app->add_controller(*adapter);
_controllers.emplace_back(std::move(adapter));
}
@@ -582,7 +113,7 @@ namespace
auto gamepad = [controller extendedGamepad];
if (gamepad)
{
- auto adapter = std::make_unique<input_device_controller_impl>(gamepad);
+ auto adapter = std::make_unique<nes::app::mac::input_device_gc_gamepad>(gamepad);
_app->add_controller(*adapter);
_controllers.emplace_back(std::move(adapter));
}