mirror of
https://github.com/bsnes-emu/bsnes.git
synced 2025-08-31 19:51:52 +02:00
Update to v096r01 release.
byuu says: Changelog: - restructured the project and removed a whole bunch of old/dead directives from higan/GNUmakefile - huge amounts of work on hiro/cocoa (compiles but ~70% of the functionality is commented out) - fixed a masking error in my ARM CPU disassembler [Lioncash] - SFC: decided to change board cic=(411,413) back to board region=(ntsc,pal) ... the former was too obtuse If you rename Boolean (it's a problem with an include from ruby, not from hiro) and disable all the ruby drivers, you can compile an OS X binary, but obviously it's not going to do anything. It's a boring WIP, I just wanted to push out the project structure change now at the start of this WIP cycle.
This commit is contained in:
@@ -6,7 +6,7 @@ namespace hiro {
|
||||
XlibDisplay* pApplication::display = nullptr;
|
||||
#endif
|
||||
|
||||
void pApplication::run() {
|
||||
auto pApplication::run() -> void {
|
||||
if(Application::state.onMain) {
|
||||
while(!Application::state.quit) {
|
||||
Application::doMain();
|
||||
@@ -17,15 +17,15 @@ void pApplication::run() {
|
||||
}
|
||||
}
|
||||
|
||||
bool pApplication::pendingEvents() {
|
||||
auto pApplication::pendingEvents() -> bool {
|
||||
return gtk_events_pending();
|
||||
}
|
||||
|
||||
void pApplication::processEvents() {
|
||||
auto pApplication::processEvents() -> void {
|
||||
while(pendingEvents()) gtk_main_iteration_do(false);
|
||||
}
|
||||
|
||||
void pApplication::quit() {
|
||||
auto pApplication::quit() -> void {
|
||||
//if gtk_main() was invoked, call gtk_main_quit()
|
||||
if(gtk_main_level()) gtk_main_quit();
|
||||
|
||||
@@ -37,7 +37,7 @@ void pApplication::quit() {
|
||||
#endif
|
||||
}
|
||||
|
||||
void pApplication::initialize() {
|
||||
auto pApplication::initialize() -> void {
|
||||
#if defined(DISPLAY_XORG)
|
||||
display = XOpenDisplay(nullptr);
|
||||
#endif
|
||||
|
@@ -7,12 +7,12 @@ struct pApplication {
|
||||
static XlibDisplay* display;
|
||||
#endif
|
||||
|
||||
static void run();
|
||||
static bool pendingEvents();
|
||||
static void processEvents();
|
||||
static void quit();
|
||||
static auto run() -> void;
|
||||
static auto pendingEvents() -> bool;
|
||||
static auto processEvents() -> void;
|
||||
static auto quit() -> void;
|
||||
|
||||
static void initialize();
|
||||
static auto initialize() -> void;
|
||||
};
|
||||
|
||||
}
|
||||
|
@@ -2,7 +2,7 @@
|
||||
|
||||
namespace hiro {
|
||||
|
||||
static void BrowserWindow_addFilters(GtkWidget* dialog, lstring filters) {
|
||||
static auto BrowserWindow_addFilters(GtkWidget* dialog, lstring filters) -> void {
|
||||
for(auto& filter : filters) {
|
||||
GtkFileFilter* gtkFilter = gtk_file_filter_new();
|
||||
gtk_file_filter_set_name(gtkFilter, filter);
|
||||
|
@@ -2,14 +2,14 @@
|
||||
|
||||
namespace hiro {
|
||||
|
||||
Size pDesktop::size() {
|
||||
auto pDesktop::size() -> Size {
|
||||
return {
|
||||
gdk_screen_get_width(gdk_screen_get_default()),
|
||||
gdk_screen_get_height(gdk_screen_get_default())
|
||||
};
|
||||
}
|
||||
|
||||
Geometry pDesktop::workspace() {
|
||||
auto pDesktop::workspace() -> Geometry {
|
||||
#if defined(DISPLAY_WINDOWS)
|
||||
RECT rc;
|
||||
SystemParametersInfo(SPI_GETWORKAREA, 0, &rc, 0);
|
||||
|
@@ -3,8 +3,8 @@
|
||||
namespace hiro {
|
||||
|
||||
struct pDesktop {
|
||||
static Size size();
|
||||
static Geometry workspace();
|
||||
static auto size() -> Size;
|
||||
static auto workspace() -> Geometry;
|
||||
};
|
||||
|
||||
}
|
||||
|
@@ -1,4 +1,4 @@
|
||||
#if defined(Hiro_Mouse)
|
||||
#if defined(Hiro_Keyboard)
|
||||
|
||||
namespace hiro {
|
||||
|
||||
|
@@ -2,17 +2,17 @@
|
||||
|
||||
namespace hiro {
|
||||
|
||||
unsigned pMonitor::count() {
|
||||
auto pMonitor::count() -> uint {
|
||||
return gdk_screen_get_n_monitors(gdk_screen_get_default());
|
||||
}
|
||||
|
||||
Geometry pMonitor::geometry(unsigned monitor) {
|
||||
auto pMonitor::geometry(uint monitor) -> Geometry {
|
||||
GdkRectangle rectangle = {0};
|
||||
gdk_screen_get_monitor_geometry(gdk_screen_get_default(), monitor, &rectangle);
|
||||
return {rectangle.x, rectangle.y, rectangle.width, rectangle.height};
|
||||
}
|
||||
|
||||
unsigned pMonitor::primary() {
|
||||
auto pMonitor::primary() -> uint {
|
||||
return gdk_screen_get_primary_monitor(gdk_screen_get_default());
|
||||
}
|
||||
|
||||
|
@@ -3,9 +3,9 @@
|
||||
namespace hiro {
|
||||
|
||||
struct pMonitor {
|
||||
static unsigned count();
|
||||
static Geometry geometry(unsigned monitor);
|
||||
static unsigned primary();
|
||||
static auto count() -> uint;
|
||||
static auto geometry(unsigned monitor) -> Geometry;
|
||||
static auto primary() -> uint;
|
||||
};
|
||||
|
||||
}
|
||||
|
@@ -27,7 +27,7 @@ auto pTimer::setEnabled(bool enabled) -> void {
|
||||
}
|
||||
}
|
||||
|
||||
auto pTimer::setInterval(unsigned interval) -> void {
|
||||
auto pTimer::setInterval(uint interval) -> void {
|
||||
}
|
||||
|
||||
}
|
||||
|
@@ -6,7 +6,7 @@ struct pTimer : pObject {
|
||||
Declare(Timer, Object)
|
||||
|
||||
auto setEnabled(bool enabled) -> void;
|
||||
auto setInterval(unsigned interval) -> void;
|
||||
auto setInterval(uint interval) -> void;
|
||||
};
|
||||
|
||||
}
|
||||
|
@@ -6,9 +6,9 @@ struct pWidget : pSizable {
|
||||
Declare(Widget, Sizable)
|
||||
|
||||
virtual auto container(mWidget& widget) -> GtkWidget*;
|
||||
virtual auto focused() const -> bool override;
|
||||
auto focused() const -> bool override;
|
||||
auto setEnabled(bool enabled) -> void override;
|
||||
virtual auto setFocused() -> void override;
|
||||
auto setFocused() -> void override;
|
||||
auto setFont(const Font& font) -> void override;
|
||||
auto setGeometry(Geometry geometry) -> void override;
|
||||
auto setVisible(bool visible) -> void override;
|
||||
|
Reference in New Issue
Block a user