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:
Tim Allen
2015-12-30 17:41:46 +11:00
parent 27660505c8
commit 47d4bd4d81
707 changed files with 3789 additions and 3373 deletions

View File

@@ -1,11 +1,13 @@
#if defined(Hiro_Window)
@interface CocoaWindow : NSWindow <NSWindowDelegate> {
@public
phoenix::Window* window;
hiro::mWindow* window;
NSMenu* menuBar;
NSMenu* rootMenu;
NSTextField* statusBar;
}
-(id) initWith:(phoenix::Window&)window;
-(id) initWith:(hiro::mWindow&)window;
-(BOOL) canBecomeKeyWindow;
-(BOOL) canBecomeMainWindow;
-(void) windowDidBecomeMain:(NSNotification*)notification;
@@ -21,46 +23,41 @@
-(NSTextField*) statusBar;
@end
namespace phoenix {
namespace hiro {
struct pWindow : pObject {
Declare(Window, Object)
static auto none() -> Window&;
auto append(sLayout layout) -> void;
auto append(sMenuBar menuBar) -> void;
auto append(sStatusBar statusBar) -> void;
auto focused() const -> bool override;
auto frameMargin() const -> Geometry;
auto remove(sLayout layout) -> void;
auto remove(sMenuBar menuBar) -> void;
auto remove(sStatusBar statusBar) -> void;
auto setBackgroundColor(Color color) -> void;
auto setDroppable(bool droppable) -> void;
auto setFocused() -> void override;
auto setFullScreen(bool fullScreen) -> void;
auto setGeometry(Geometry geometry) -> void;
auto setModal(bool modal) -> void;
auto setResizable(bool resizable) -> void;
auto setTitle(const string& text) -> void;
auto setVisible(bool visible) -> void;
auto moveEvent() -> void;
auto sizeEvent() -> void;
auto statusBarHeight() -> uint;
auto statusBarReposition() -> void;
auto _append(mWidget& widget) -> void;
struct pWindow : public pObject {
Window& window;
CocoaWindow* cocoaWindow = nullptr;
static Window& none();
void append(Layout& layout);
void append(Menu& menu);
void append(Widget& widget);
bool focused();
Geometry frameMargin();
Geometry geometry();
void remove(Layout& layout);
void remove(Menu& menu);
void remove(Widget& widget);
void setBackgroundColor(Color color);
void setDroppable(bool droppable);
void setFocused();
void setFullScreen(bool fullScreen);
void setGeometry(Geometry geometry);
void setMenuFont(string font);
void setMenuVisible(bool visible);
void setModal(bool modal);
void setResizable(bool resizable);
void setStatusFont(string font);
void setStatusText(string text);
void setStatusVisible(bool visible);
void setTitle(string text);
void setVisible(bool visible);
void setWidgetFont(string font);
pWindow(Window& window) : pObject(window), window(window) {}
void constructor();
void destructor();
void moveEvent();
void sizeEvent();
unsigned statusBarHeight();
void statusBarReposition();
};
}
#endif